From 0aaae88d6e7a75cd4aeed4ea5bf574afe77ace27 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Mon, 28 Feb 2022 23:12:57 +0800 Subject: [PATCH 01/64] Rename movement action 0x9F --- asm/macros/movement.inc | 2 +- include/constants/event_object_movement.h | 2 +- include/field_player_avatar.h | 2 +- src/data/object_events/movement_action_func_tables.h | 2 +- src/field_player_avatar.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc index b6c151730..7cbd1ffc4 100644 --- a/asm/macros/movement.inc +++ b/asm/macros/movement.inc @@ -124,7 +124,7 @@ create_movement walk_slowest_up create_movement walk_slowest_left create_movement walk_slowest_right - create_movement shake_head + create_movement shake_head_or_walk_in_place enum_start 0xa6 create_movement jump_special_with_effect_down diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 87625860b..a9b390b6f 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -247,7 +247,7 @@ #define MOVEMENT_ACTION_WALK_SLOWEST_UP 0x9C #define MOVEMENT_ACTION_WALK_SLOWEST_LEFT 0x9D #define MOVEMENT_ACTION_WALK_SLOWEST_RIGHT 0x9E -#define MOVEMENT_ACTION_SHAKE_HEAD 0x9F +#define MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE 0x9F #define MOVEMENT_ACTION_0xA0 0xA0 #define MOVEMENT_ACTION_0xA1 0xA1 #define MOVEMENT_ACTION_0xA2 0xA2 diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 7e051f0dd..a970385db 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -56,7 +56,7 @@ void PlayerFaceDirection(u8 direction); void PlayerFaceDirectionFast(u8 direction); void PlayerTurnInPlace(u8 direction); void PlayerJumpLedge(u8 direction); -void PlayerShakeHead(void); +void PlayerShakeHeadOrWalkInPlace(void); void player_step(u8 direction, u16 newKeys, u16 heldKeys); bool32 PlayerIsMovingOnRockStairs(u8 direction); void UpdatePlayerAvatarTransitionState(void); diff --git a/src/data/object_events/movement_action_func_tables.h b/src/data/object_events/movement_action_func_tables.h index e55687c03..9abd6452a 100644 --- a/src/data/object_events/movement_action_func_tables.h +++ b/src/data/object_events/movement_action_func_tables.h @@ -622,7 +622,7 @@ bool8 (*const *const gMovementActionFuncs[])(struct ObjectEvent *, struct Sprite [MOVEMENT_ACTION_WALK_SLOWEST_UP] = sMovementActionFuncs_x9C, [MOVEMENT_ACTION_WALK_SLOWEST_LEFT] = sMovementActionFuncs_x9D, [MOVEMENT_ACTION_WALK_SLOWEST_RIGHT] = sMovementActionFuncs_x9E, - [MOVEMENT_ACTION_SHAKE_HEAD] = sMovementActionFuncs_x9F, + [MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE] = sMovementActionFuncs_x9F, [MOVEMENT_ACTION_0xA0] = sMovementActionFuncs_xA0, [MOVEMENT_ACTION_0xA1] = sMovementActionFuncs_xA1, [MOVEMENT_ACTION_0xA2] = sMovementActionFuncs_xA2, diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index bafe7fd22..4126cc650 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -909,9 +909,9 @@ void PlayerJumpLedge(u8 direction) PlayerSetAnimId(GetJump2MovementAction(direction), 8); } -void PlayerShakeHead(void) +void PlayerShakeHeadOrWalkInPlace(void) { - PlayerSetAnimId(MOVEMENT_ACTION_SHAKE_HEAD, 0); + PlayerSetAnimId(MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE, 0); } void HandleEnforcedLookDirectionOnPlayerStopMoving(void) From 7ae187a2dd49243bfa423fa402299c77b494fd4c Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Mon, 28 Feb 2022 23:27:26 +0800 Subject: [PATCH 02/64] Add clarifying comment --- src/field_player_avatar.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 4126cc650..c4e2a5ed7 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -909,6 +909,8 @@ void PlayerJumpLedge(u8 direction) PlayerSetAnimId(GetJump2MovementAction(direction), 8); } +// Shakes head for male player character, +// walk in place for female player character void PlayerShakeHeadOrWalkInPlace(void) { PlayerSetAnimId(MOVEMENT_ACTION_SHAKE_HEAD_OR_WALK_IN_PLACE, 0); From a5e6e9160569ae905e81a9e0833005df2e8ca977 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 28 Feb 2022 12:06:38 -0500 Subject: [PATCH 03/64] Document/sync object event anims --- include/constants/event_object_movement.h | 82 ++ include/event_object_movement.h | 2 +- src/data/field_effects/field_effect_objects.h | 4 +- src/data/object_events/object_event_anims.h | 766 +++++++++--------- .../object_event_graphics_info.h | 308 +++---- .../object_events/object_event_pic_tables.h | 302 +++---- src/event_object_movement.c | 437 +++++----- src/field_player_avatar.c | 4 +- 8 files changed, 976 insertions(+), 929 deletions(-) diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index a9b390b6f..88056783e 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -261,4 +261,86 @@ #define MOVEMENT_ACTION_STEP_END 0xFE +#define ANIM_STD_FACE_SOUTH 0 +#define ANIM_STD_FACE_NORTH 1 +#define ANIM_STD_FACE_WEST 2 +#define ANIM_STD_FACE_EAST 3 +#define ANIM_STD_GO_SOUTH 4 +#define ANIM_STD_GO_NORTH 5 +#define ANIM_STD_GO_WEST 6 +#define ANIM_STD_GO_EAST 7 +#define ANIM_STD_GO_FAST_SOUTH 8 +#define ANIM_STD_GO_FAST_NORTH 9 +#define ANIM_STD_GO_FAST_WEST 10 +#define ANIM_STD_GO_FAST_EAST 11 +#define ANIM_STD_GO_FASTER_SOUTH 12 +#define ANIM_STD_GO_FASTER_NORTH 13 +#define ANIM_STD_GO_FASTER_WEST 14 +#define ANIM_STD_GO_FASTER_EAST 15 +#define ANIM_STD_GO_FASTEST_SOUTH 16 +#define ANIM_STD_GO_FASTEST_NORTH 17 +#define ANIM_STD_GO_FASTEST_WEST 18 +#define ANIM_STD_GO_FASTEST_EAST 19 +#define ANIM_STD_COUNT 20 + +#define ANIM_RUN_SOUTH (ANIM_STD_COUNT + 0) +#define ANIM_RUN_NORTH (ANIM_STD_COUNT + 1) +#define ANIM_RUN_WEST (ANIM_STD_COUNT + 2) +#define ANIM_RUN_EAST (ANIM_STD_COUNT + 3) +#define ANIM_SPIN_SOUTH (ANIM_STD_COUNT + 4) +#define ANIM_SPIN_NORTH (ANIM_STD_COUNT + 5) +#define ANIM_SPIN_WEST (ANIM_STD_COUNT + 6) +#define ANIM_SPIN_EAST (ANIM_STD_COUNT + 7) +#define ANIM_SHAKE_HEAD_OR_WALK_IN_PLACE (ANIM_STD_COUNT + 8) + +#define ANIM_BUNNY_HOP_BACK_WHEEL_SOUTH (ANIM_STD_COUNT + 0) +#define ANIM_BUNNY_HOP_BACK_WHEEL_NORTH (ANIM_STD_COUNT + 1) +#define ANIM_BUNNY_HOP_BACK_WHEEL_WEST (ANIM_STD_COUNT + 2) +#define ANIM_BUNNY_HOP_BACK_WHEEL_EAST (ANIM_STD_COUNT + 3) +#define ANIM_BUNNY_HOP_FRONT_WHEEL_SOUTH (ANIM_STD_COUNT + 4) +#define ANIM_BUNNY_HOP_FRONT_WHEEL_NORTH (ANIM_STD_COUNT + 5) +#define ANIM_BUNNY_HOP_FRONT_WHEEL_WEST (ANIM_STD_COUNT + 6) +#define ANIM_BUNNY_HOP_FRONT_WHEEL_EAST (ANIM_STD_COUNT + 7) +#define ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH (ANIM_STD_COUNT + 8) +#define ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH (ANIM_STD_COUNT + 9) +#define ANIM_STANDING_WHEELIE_BACK_WHEEL_WEST (ANIM_STD_COUNT + 10) +#define ANIM_STANDING_WHEELIE_BACK_WHEEL_EAST (ANIM_STD_COUNT + 11) +#define ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH (ANIM_STD_COUNT + 12) +#define ANIM_STANDING_WHEELIE_FRONT_WHEEL_NORTH (ANIM_STD_COUNT + 13) +#define ANIM_STANDING_WHEELIE_FRONT_WHEEL_WEST (ANIM_STD_COUNT + 14) +#define ANIM_STANDING_WHEELIE_FRONT_WHEEL_EAST (ANIM_STD_COUNT + 15) +#define ANIM_MOVING_WHEELIE_SOUTH (ANIM_STD_COUNT + 16) +#define ANIM_MOVING_WHEELIE_NORTH (ANIM_STD_COUNT + 17) +#define ANIM_MOVING_WHEELIE_WEST (ANIM_STD_COUNT + 18) +#define ANIM_MOVING_WHEELIE_EAST (ANIM_STD_COUNT + 19) + +#define ANIM_GET_ON_OFF_POKEMON_SOUTH (ANIM_STD_COUNT + 0) +#define ANIM_GET_ON_OFF_POKEMON_NORTH (ANIM_STD_COUNT + 1) +#define ANIM_GET_ON_OFF_POKEMON_WEST (ANIM_STD_COUNT + 2) +#define ANIM_GET_ON_OFF_POKEMON_EAST (ANIM_STD_COUNT + 3) + +#define ANIM_NURSE_BOW (ANIM_STD_COUNT + 0) + +#define ANIM_RAISE_HAND (ANIM_STD_COUNT + 0) + +#define ANIM_FIELD_MOVE 0 + +#define ANIM_VS_SEEKER 0 + +#define ANIM_STAY_STILL 0 +#define ANIM_REMOVE_OBSTACLE 1 + +#define ANIM_TAKE_OUT_ROD_SOUTH 0 +#define ANIM_TAKE_OUT_ROD_NORTH 1 +#define ANIM_TAKE_OUT_ROD_WEST 2 +#define ANIM_TAKE_OUT_ROD_EAST 3 +#define ANIM_PUT_AWAY_ROD_SOUTH 4 +#define ANIM_PUT_AWAY_ROD_NORTH 5 +#define ANIM_PUT_AWAY_ROD_WEST 6 +#define ANIM_PUT_AWAY_ROD_EAST 7 +#define ANIM_HOOKED_POKEMON_SOUTH 8 +#define ANIM_HOOKED_POKEMON_NORTH 9 +#define ANIM_HOOKED_POKEMON_WEST 10 +#define ANIM_HOOKED_POKEMON_EAST 11 + #endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index c53cb7d67..d167699d9 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -20,7 +20,7 @@ enum SpinnerRunnerFollowPatterns RUNFOLLOW_SOUTH_EAST_WEST }; -struct UnkStruct_083A3698 +struct StepAnimTable { const union AnimCmd *const *anims; u8 animPos[4]; diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index 7a764d3d5..86b1f2fac 100644 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -169,7 +169,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = .callback = UpdateAshFieldEffect, }; -static const struct SpriteFrameImage gObjectEventPicTable_SurfBlob[] = +static const struct SpriteFrameImage sPicTable_SurfBlob[] = { overworld_frame(gObjectEventPic_SurfBlob, 2, 8, 0), overworld_frame(gObjectEventPic_SurfBlob, 2, 8, 1), @@ -221,7 +221,7 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = .paletteTag = SPRITE_INVALID_TAG, .oam = &gObjectEventBaseOam_32x32, .anims = sAnimTable_SurfBlob, - .images = gObjectEventPicTable_SurfBlob, + .images = sPicTable_SurfBlob, .affineAnims = gDummySpriteAffineAnimTable, .callback = UpdateSurfBlobFieldEffect, }; diff --git a/src/data/object_events/object_event_anims.h b/src/data/object_events/object_event_anims.h index ae79226e3..cfbfe0f58 100644 --- a/src/data/object_events/object_event_anims.h +++ b/src/data/object_events/object_event_anims.h @@ -1,4 +1,4 @@ -const union AnimCmd gAnimCmd_83A2950[] = { +static const union AnimCmd sAnim_StayStill[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(0, 8), @@ -6,27 +6,27 @@ const union AnimCmd gAnimCmd_83A2950[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2964[] = { +static const union AnimCmd sAnim_QuintyPlumpFaceSouth[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A296C[] = { +static const union AnimCmd sAnim_QuintyPlumpFaceNorth[] = { ANIMCMD_FRAME(1, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2974[] = { +static const union AnimCmd sAnim_QuintyPlumpFaceWest[] = { ANIMCMD_FRAME(2, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A297C[] = { +static const union AnimCmd sAnim_QuintyPlumpFaceEast[] = { ANIMCMD_FRAME(2, 16, .hFlip = TRUE), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2984[] = { +static const union AnimCmd sAnim_QuintyPlumpGoSouth[] = { ANIMCMD_FRAME(3, 8), ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(3, 8, .hFlip = TRUE), @@ -34,7 +34,7 @@ const union AnimCmd gAnimCmd_83A2984[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2998[] = { +static const union AnimCmd sAnim_QuintyPlumpGoNorth[] = { ANIMCMD_FRAME(4, 8), ANIMCMD_FRAME(1, 8), ANIMCMD_FRAME(4, 8, .hFlip = TRUE), @@ -42,7 +42,7 @@ const union AnimCmd gAnimCmd_83A2998[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A29AC[] = { +static const union AnimCmd sAnim_QuintyPlumpGoWest[] = { ANIMCMD_FRAME(5, 8), ANIMCMD_FRAME(2, 8), ANIMCMD_FRAME(6, 8), @@ -50,7 +50,7 @@ const union AnimCmd gAnimCmd_83A29AC[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A29C0[] = { +static const union AnimCmd sAnim_QuintyPlumpGoEast[] = { ANIMCMD_FRAME(5, 8, .hFlip = TRUE), ANIMCMD_FRAME(2, 8, .hFlip = TRUE), ANIMCMD_FRAME(6, 8, .hFlip = TRUE), @@ -58,7 +58,7 @@ const union AnimCmd gAnimCmd_83A29C0[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A29D4[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFastSouth[] = { ANIMCMD_FRAME(3, 4), ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(3, 4, .hFlip = TRUE), @@ -66,7 +66,7 @@ const union AnimCmd gAnimCmd_83A29D4[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A29E8[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFastNorth[] = { ANIMCMD_FRAME(4, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_FRAME(4, 4, .hFlip = TRUE), @@ -74,7 +74,7 @@ const union AnimCmd gAnimCmd_83A29E8[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A29FC[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFastWest[] = { ANIMCMD_FRAME(5, 4), ANIMCMD_FRAME(2, 4), ANIMCMD_FRAME(6, 4), @@ -82,7 +82,7 @@ const union AnimCmd gAnimCmd_83A29FC[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2A10[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFastEast[] = { ANIMCMD_FRAME(5, 4, .hFlip = TRUE), ANIMCMD_FRAME(2, 4, .hFlip = TRUE), ANIMCMD_FRAME(6, 4, .hFlip = TRUE), @@ -90,7 +90,7 @@ const union AnimCmd gAnimCmd_83A2A10[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2A24[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFasterSouth[] = { ANIMCMD_FRAME(3, 2), ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(3, 2, .hFlip = TRUE), @@ -98,7 +98,7 @@ const union AnimCmd gAnimCmd_83A2A24[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2A38[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFasterNorth[] = { ANIMCMD_FRAME(4, 2), ANIMCMD_FRAME(1, 2), ANIMCMD_FRAME(4, 2, .hFlip = TRUE), @@ -106,7 +106,7 @@ const union AnimCmd gAnimCmd_83A2A38[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2A4C[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFasterWest[] = { ANIMCMD_FRAME(5, 2), ANIMCMD_FRAME(2, 2), ANIMCMD_FRAME(6, 2), @@ -114,7 +114,7 @@ const union AnimCmd gAnimCmd_83A2A4C[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2A60[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFasterEast[] = { ANIMCMD_FRAME(5, 2, .hFlip = TRUE), ANIMCMD_FRAME(2, 2, .hFlip = TRUE), ANIMCMD_FRAME(6, 2, .hFlip = TRUE), @@ -122,7 +122,7 @@ const union AnimCmd gAnimCmd_83A2A60[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2A74[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFastestSouth[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(3, 1, .hFlip = TRUE), @@ -130,7 +130,7 @@ const union AnimCmd gAnimCmd_83A2A74[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2A88[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFastestNorth[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_FRAME(1, 1), ANIMCMD_FRAME(4, 1, .hFlip = TRUE), @@ -138,7 +138,7 @@ const union AnimCmd gAnimCmd_83A2A88[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2A9C[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFastestWest[] = { ANIMCMD_FRAME(5, 1), ANIMCMD_FRAME(2, 1), ANIMCMD_FRAME(6, 1), @@ -146,7 +146,7 @@ const union AnimCmd gAnimCmd_83A2A9C[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2AB0[] = { +static const union AnimCmd sAnim_QuintyPlumpGoFastestEast[] = { ANIMCMD_FRAME(5, 1, .hFlip = TRUE), ANIMCMD_FRAME(2, 1, .hFlip = TRUE), ANIMCMD_FRAME(6, 1, .hFlip = TRUE), @@ -154,27 +154,27 @@ const union AnimCmd gAnimCmd_83A2AB0[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2AC4[] = { +static const union AnimCmd sAnim_FaceSouth[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2ACC[] = { +static const union AnimCmd sAnim_FaceNorth[] = { ANIMCMD_FRAME(1, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2AD4[] = { +static const union AnimCmd sAnim_FaceWest[] = { ANIMCMD_FRAME(2, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2ADC[] = { +static const union AnimCmd sAnim_FaceEast[] = { ANIMCMD_FRAME(2, 16, .hFlip = TRUE), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2AE4[] = { +static const union AnimCmd sAnim_GoSouth[] = { ANIMCMD_FRAME(3, 8), ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(4, 8), @@ -182,7 +182,7 @@ const union AnimCmd gAnimCmd_83A2AE4[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2AF8[] = { +static const union AnimCmd sAnim_GoNorth[] = { ANIMCMD_FRAME(5, 8), ANIMCMD_FRAME(1, 8), ANIMCMD_FRAME(6, 8), @@ -190,7 +190,7 @@ const union AnimCmd gAnimCmd_83A2AF8[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2B0C[] = { +static const union AnimCmd sAnim_GoWest[] = { ANIMCMD_FRAME(7, 8), ANIMCMD_FRAME(2, 8), ANIMCMD_FRAME(8, 8), @@ -198,7 +198,7 @@ const union AnimCmd gAnimCmd_83A2B0C[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2B20[] = { +static const union AnimCmd sAnim_GoEast[] = { ANIMCMD_FRAME(7, 8, .hFlip = TRUE), ANIMCMD_FRAME(2, 8, .hFlip = TRUE), ANIMCMD_FRAME(8, 8, .hFlip = TRUE), @@ -206,7 +206,7 @@ const union AnimCmd gAnimCmd_83A2B20[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2B34[] = { +static const union AnimCmd sAnim_GoFastSouth[] = { ANIMCMD_FRAME(3, 4), ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(4, 4), @@ -214,7 +214,7 @@ const union AnimCmd gAnimCmd_83A2B34[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2B48[] = { +static const union AnimCmd sAnim_GoFastNorth[] = { ANIMCMD_FRAME(5, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_FRAME(6, 4), @@ -222,7 +222,7 @@ const union AnimCmd gAnimCmd_83A2B48[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2B5C[] = { +static const union AnimCmd sAnim_GoFastWest[] = { ANIMCMD_FRAME(7, 4), ANIMCMD_FRAME(2, 4), ANIMCMD_FRAME(8, 4), @@ -230,7 +230,7 @@ const union AnimCmd gAnimCmd_83A2B5C[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2B70[] = { +static const union AnimCmd sAnim_GoFastEast[] = { ANIMCMD_FRAME(7, 4, .hFlip = TRUE), ANIMCMD_FRAME(2, 4, .hFlip = TRUE), ANIMCMD_FRAME(8, 4, .hFlip = TRUE), @@ -238,7 +238,7 @@ const union AnimCmd gAnimCmd_83A2B70[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2B84[] = { +static const union AnimCmd sAnim_GoFasterSouth[] = { ANIMCMD_FRAME(3, 2), ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(4, 2), @@ -246,7 +246,7 @@ const union AnimCmd gAnimCmd_83A2B84[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2B98[] = { +static const union AnimCmd sAnim_GoFasterNorth[] = { ANIMCMD_FRAME(5, 2), ANIMCMD_FRAME(1, 2), ANIMCMD_FRAME(6, 2), @@ -254,7 +254,7 @@ const union AnimCmd gAnimCmd_83A2B98[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2BAC[] = { +static const union AnimCmd sAnim_GoFasterWest[] = { ANIMCMD_FRAME(7, 2), ANIMCMD_FRAME(2, 2), ANIMCMD_FRAME(8, 2), @@ -262,7 +262,7 @@ const union AnimCmd gAnimCmd_83A2BAC[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2BC0[] = { +static const union AnimCmd sAnim_GoFasterEast[] = { ANIMCMD_FRAME(7, 2, .hFlip = TRUE), ANIMCMD_FRAME(2, 2, .hFlip = TRUE), ANIMCMD_FRAME(8, 2, .hFlip = TRUE), @@ -270,7 +270,7 @@ const union AnimCmd gAnimCmd_83A2BC0[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2BD4[] = { +static const union AnimCmd sAnim_GoFastestSouth[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(4, 1), @@ -278,7 +278,7 @@ const union AnimCmd gAnimCmd_83A2BD4[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2BE8[] = { +static const union AnimCmd sAnim_GoFastestNorth[] = { ANIMCMD_FRAME(5, 1), ANIMCMD_FRAME(1, 1), ANIMCMD_FRAME(6, 1), @@ -286,7 +286,7 @@ const union AnimCmd gAnimCmd_83A2BE8[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2BFC[] = { +static const union AnimCmd sAnim_GoFastestWest[] = { ANIMCMD_FRAME(7, 1), ANIMCMD_FRAME(2, 1), ANIMCMD_FRAME(8, 1), @@ -294,7 +294,7 @@ const union AnimCmd gAnimCmd_83A2BFC[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C10[] = { +static const union AnimCmd sAnim_GoFastestEast[] = { ANIMCMD_FRAME(7, 1, .hFlip = TRUE), ANIMCMD_FRAME(2, 1, .hFlip = TRUE), ANIMCMD_FRAME(8, 1, .hFlip = TRUE), @@ -302,12 +302,13 @@ const union AnimCmd gAnimCmd_83A2C10[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C24[] = { +// For indicating a VS Seeker rematch +static const union AnimCmd sAnim_RaiseHand[] = { ANIMCMD_FRAME(9, 0), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A2C2C[] = { +static const union AnimCmd sAnim_HoOhFlapWings[] = { ANIMCMD_FRAME(3, 8), ANIMCMD_FRAME(4, 8), ANIMCMD_FRAME(3, 8), @@ -315,52 +316,52 @@ const union AnimCmd gAnimCmd_83A2C2C[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C40[] = { +static const union AnimCmd sAnim_HoOhStayStill[] = { ANIMCMD_FRAME(3, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C48[] = { +static const union AnimCmd sAnim_SurfFaceSouth[] = { ANIMCMD_FRAME(0, 60), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C50[] = { +static const union AnimCmd sAnim_SurfFaceNorth[] = { ANIMCMD_FRAME(1, 60), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C58[] = { +static const union AnimCmd sAnim_SurfFaceWest[] = { ANIMCMD_FRAME(2, 60), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C60[] = { +static const union AnimCmd sAnim_SurfFaceEast[] = { ANIMCMD_FRAME(2, 60, .hFlip = TRUE), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C68[] = { +static const union AnimCmd sAnim_UnknownFaceSouth[] = { ANIMCMD_FRAME(0, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C70[] = { +static const union AnimCmd sAnim_UnknownFaceNorth[] = { ANIMCMD_FRAME(1, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C78[] = { +static const union AnimCmd sAnim_UnknownFaceWest[] = { ANIMCMD_FRAME(2, 16), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C80[] = { +static const union AnimCmd sAnim_UnknownFaceEast[] = { ANIMCMD_FRAME(2, 16, .hFlip = TRUE), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2C88[] = { +static const union AnimCmd sAnim_UnknownGoSouth[] = { ANIMCMD_FRAME(3, 4), ANIMCMD_FRAME(4, 4), ANIMCMD_FRAME(3, 4), @@ -372,7 +373,7 @@ const union AnimCmd gAnimCmd_83A2C88[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2CAC[] = { +static const union AnimCmd sAnim_UnknownGoNorth[] = { ANIMCMD_FRAME(7, 4), ANIMCMD_FRAME(8, 4), ANIMCMD_FRAME(7, 4), @@ -384,7 +385,7 @@ const union AnimCmd gAnimCmd_83A2CAC[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2CD0[] = { +static const union AnimCmd sAnim_UnknownGoWest[] = { ANIMCMD_FRAME(11, 4), ANIMCMD_FRAME(12, 4), ANIMCMD_FRAME(11, 4), @@ -396,7 +397,7 @@ const union AnimCmd gAnimCmd_83A2CD0[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2CF4[] = { +static const union AnimCmd sAnim_UnknownGoEast[] = { ANIMCMD_FRAME(11, 4, .hFlip = TRUE), ANIMCMD_FRAME(12, 4, .hFlip = TRUE), ANIMCMD_FRAME(11, 4, .hFlip = TRUE), @@ -408,7 +409,7 @@ const union AnimCmd gAnimCmd_83A2CF4[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2D18[] = { +static const union AnimCmd sAnim_UnknownGoFastNorth[] = { ANIMCMD_FRAME(3, 2), ANIMCMD_FRAME(4, 2), ANIMCMD_FRAME(3, 2), @@ -420,7 +421,7 @@ const union AnimCmd gAnimCmd_83A2D18[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2D3C[] = { +static const union AnimCmd sAnim_UnknownGoFastSouth[] = { ANIMCMD_FRAME(7, 2), ANIMCMD_FRAME(8, 2), ANIMCMD_FRAME(7, 2), @@ -432,7 +433,7 @@ const union AnimCmd gAnimCmd_83A2D3C[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2D60[] = { +static const union AnimCmd sAnim_UnknownGoFastWest[] = { ANIMCMD_FRAME(11, 2), ANIMCMD_FRAME(12, 2), ANIMCMD_FRAME(11, 2), @@ -444,7 +445,7 @@ const union AnimCmd gAnimCmd_83A2D60[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2D84[] = { +static const union AnimCmd sAnim_UnknownGoFastEast[] = { ANIMCMD_FRAME(11, 2, .hFlip = TRUE), ANIMCMD_FRAME(12, 2, .hFlip = TRUE), ANIMCMD_FRAME(11, 2, .hFlip = TRUE), @@ -456,7 +457,7 @@ const union AnimCmd gAnimCmd_83A2D84[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2DA8[] = { +static const union AnimCmd sAnim_UnknownGoFasterNorth[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_FRAME(4, 1), ANIMCMD_FRAME(3, 1), @@ -468,7 +469,7 @@ const union AnimCmd gAnimCmd_83A2DA8[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2DCC[] = { +static const union AnimCmd sAnim_UnknownGoFasterSouth[] = { ANIMCMD_FRAME(7, 1), ANIMCMD_FRAME(8, 1), ANIMCMD_FRAME(7, 1), @@ -480,7 +481,7 @@ const union AnimCmd gAnimCmd_83A2DCC[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2DF0[] = { +static const union AnimCmd sAnim_UnknownGoFasterWest[] = { ANIMCMD_FRAME(11, 1), ANIMCMD_FRAME(12, 1), ANIMCMD_FRAME(11, 1), @@ -492,7 +493,7 @@ const union AnimCmd gAnimCmd_83A2DF0[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2E14[] = { +static const union AnimCmd sAnim_UnknownGoFasterEast[] = { ANIMCMD_FRAME(11, 1, .hFlip = TRUE), ANIMCMD_FRAME(12, 1, .hFlip = TRUE), ANIMCMD_FRAME(11, 1, .hFlip = TRUE), @@ -504,7 +505,7 @@ const union AnimCmd gAnimCmd_83A2E14[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2E38[] = { +static const union AnimCmd sAnim_UnknownGoFastestNorth[] = { ANIMCMD_FRAME(3, 0), ANIMCMD_FRAME(4, 0), ANIMCMD_FRAME(3, 0), @@ -516,7 +517,7 @@ const union AnimCmd gAnimCmd_83A2E38[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2E5C[] = { +static const union AnimCmd sAnim_UnknownGoFastestSouth[] = { ANIMCMD_FRAME(7, 0), ANIMCMD_FRAME(8, 0), ANIMCMD_FRAME(7, 0), @@ -528,7 +529,7 @@ const union AnimCmd gAnimCmd_83A2E5C[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2E80[] = { +static const union AnimCmd sAnim_UnknownGoFastestWest[] = { ANIMCMD_FRAME(11, 0), ANIMCMD_FRAME(12, 0), ANIMCMD_FRAME(11, 0), @@ -540,7 +541,7 @@ const union AnimCmd gAnimCmd_83A2E80[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2EA4[] = { +static const union AnimCmd sAnim_UnknownGoFastestEast[] = { ANIMCMD_FRAME(11, 0, .hFlip = TRUE), ANIMCMD_FRAME(12, 0, .hFlip = TRUE), ANIMCMD_FRAME(11, 0, .hFlip = TRUE), @@ -552,7 +553,7 @@ const union AnimCmd gAnimCmd_83A2EA4[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2EC8[] = { +static const union AnimCmd sAnim_SpinSouth[] = { ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(2, 2, .hFlip = TRUE), ANIMCMD_FRAME(1, 2), @@ -561,7 +562,7 @@ const union AnimCmd gAnimCmd_83A2EC8[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A2EE0[] = { +static const union AnimCmd sAnim_SpinNorth[] = { ANIMCMD_FRAME(1, 2), ANIMCMD_FRAME(2, 2), ANIMCMD_FRAME(0, 2), @@ -570,8 +571,8 @@ const union AnimCmd gAnimCmd_83A2EE0[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A2EF8[] = { - ANIMCMD_FRAME(2, 2, .hFlip = TRUE), +static const union AnimCmd sAnim_SpinWest[] = { + ANIMCMD_FRAME(2, 2, .hFlip = TRUE), // Starts by facing East? ANIMCMD_FRAME(1, 2), ANIMCMD_FRAME(2, 2), ANIMCMD_FRAME(0, 2), @@ -579,8 +580,8 @@ const union AnimCmd gAnimCmd_83A2EF8[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A2F10[] = { - ANIMCMD_FRAME(2, 2), +static const union AnimCmd sAnim_SpinEast[] = { + ANIMCMD_FRAME(2, 2), // Starts by facing West? ANIMCMD_FRAME(0, 2), ANIMCMD_FRAME(2, 2, .hFlip = TRUE), ANIMCMD_FRAME(1, 2), @@ -588,7 +589,7 @@ const union AnimCmd gAnimCmd_83A2F10[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A2F28[] = { +static const union AnimCmd sAnim_ShakeHeadOrWalkInPlace[] = { ANIMCMD_FRAME(18, 16), ANIMCMD_FRAME(0, 16), ANIMCMD_FRAME(19, 16), @@ -597,7 +598,7 @@ const union AnimCmd gAnimCmd_83A2F28[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A2F40[] = { +static const union AnimCmd sAnim_RunSouth[] = { ANIMCMD_FRAME(9, 5), ANIMCMD_FRAME(10, 3), ANIMCMD_FRAME(9, 5), @@ -605,7 +606,7 @@ const union AnimCmd gAnimCmd_83A2F40[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2F54[] = { +static const union AnimCmd sAnim_RunNorth[] = { ANIMCMD_FRAME(12, 5), ANIMCMD_FRAME(13, 3), ANIMCMD_FRAME(12, 5), @@ -613,7 +614,7 @@ const union AnimCmd gAnimCmd_83A2F54[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2F68[] = { +static const union AnimCmd sAnim_RunWest[] = { ANIMCMD_FRAME(15, 5), ANIMCMD_FRAME(16, 3), ANIMCMD_FRAME(15, 5), @@ -621,7 +622,7 @@ const union AnimCmd gAnimCmd_83A2F68[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2F7C[] = { +static const union AnimCmd sAnim_RunEast[] = { ANIMCMD_FRAME(15, 5, .hFlip = TRUE), ANIMCMD_FRAME(16, 3, .hFlip = TRUE), ANIMCMD_FRAME(15, 5, .hFlip = TRUE), @@ -629,7 +630,7 @@ const union AnimCmd gAnimCmd_83A2F7C[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A2F90[] = { +static const union AnimCmd sAnim_FieldMove[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_FRAME(2, 4), @@ -638,7 +639,7 @@ const union AnimCmd gAnimCmd_83A2F90[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A2FA8[] = { +static const union AnimCmd sAnim_VSSeeker[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_FRAME(5, 4), @@ -653,7 +654,7 @@ const union AnimCmd gAnimCmd_83A2FA8[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A2FD8[] = { +static const union AnimCmd sAnim_VSSeekerBike[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_FRAME(2, 4), @@ -669,123 +670,123 @@ const union AnimCmd gAnimCmd_83A2FD8[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A300C[] = { +static const union AnimCmd sAnim_GetOnOffSurfSouth[] = { ANIMCMD_FRAME(9, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A3014[] = { +static const union AnimCmd sAnim_GetOnOffSurfNorth[] = { ANIMCMD_FRAME(10, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A301C[] = { +static const union AnimCmd sAnim_GetOnOffSurfWest[] = { ANIMCMD_FRAME(11, 32), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A3024[] = { +static const union AnimCmd sAnim_GetOnOffSurfEast[] = { ANIMCMD_FRAME(11, 32, .hFlip = TRUE), ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A302C[] = { +static const union AnimCmd sAnim_BunnyHopBackWheelSouth[] = { ANIMCMD_FRAME(15, 4), ANIMCMD_FRAME(16, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3038[] = { +static const union AnimCmd sAnim_BunnyHopBackWheelNorth[] = { ANIMCMD_FRAME(19, 4), ANIMCMD_FRAME(20, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3044[] = { +static const union AnimCmd sAnim_BunnyHopBackWheelWest[] = { ANIMCMD_FRAME(23, 4), ANIMCMD_FRAME(24, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3050[] = { +static const union AnimCmd sAnim_BunnyHopBackWheelEast[] = { ANIMCMD_FRAME(23, 4, .hFlip = TRUE), ANIMCMD_FRAME(24, 4, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A305C[] = { +static const union AnimCmd sAnim_BunnyHopFrontWheelSouth[] = { ANIMCMD_FRAME(17, 4), ANIMCMD_FRAME(18, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3068[] = { +static const union AnimCmd sAnim_BunnyHopFrontWheelNorth[] = { ANIMCMD_FRAME(21, 4), ANIMCMD_FRAME(22, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3074[] = { +static const union AnimCmd sAnim_BunnyHopFrontWheelWest[] = { ANIMCMD_FRAME(25, 4), ANIMCMD_FRAME(26, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3080[] = { +static const union AnimCmd sAnim_BunnyHopFrontWheelEast[] = { ANIMCMD_FRAME(25, 4, .hFlip = TRUE), ANIMCMD_FRAME(26, 4, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A308C[] = { +static const union AnimCmd sAnim_StandingWheelieBackWheelSouth[] = { ANIMCMD_FRAME(15, 4), ANIMCMD_FRAME(0, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3098[] = { +static const union AnimCmd sAnim_StandingWheelieBackWheelNorth[] = { ANIMCMD_FRAME(19, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A30A4[] = { +static const union AnimCmd sAnim_StandingWheelieBackWheelWest[] = { ANIMCMD_FRAME(23, 4), ANIMCMD_FRAME(2, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A30B0[] = { +static const union AnimCmd sAnim_StandingWheelieBackWheelEast[] = { ANIMCMD_FRAME(23, 4, .hFlip = TRUE), ANIMCMD_FRAME(2, 4, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A30BC[] = { +static const union AnimCmd sAnim_StandingWheelieFrontWheelSouth[] = { ANIMCMD_FRAME(17, 4), ANIMCMD_FRAME(0, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A30C8[] = { +static const union AnimCmd sAnim_StandingWheelieFrontWheelNorth[] = { ANIMCMD_FRAME(21, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A30D4[] = { +static const union AnimCmd sAnim_StandingWheelieFrontWheelWest[] = { ANIMCMD_FRAME(25, 4), ANIMCMD_FRAME(2, 4), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A30E0[] = { +static const union AnimCmd sAnim_StandingWheelieFrontWheelEast[] = { ANIMCMD_FRAME(25, 4, .hFlip = TRUE), ANIMCMD_FRAME(2, 4, .hFlip = TRUE), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A30EC[] = { +static const union AnimCmd sAnim_MovingWheelieSouth[] = { ANIMCMD_FRAME(27, 4), ANIMCMD_FRAME(16, 4), ANIMCMD_FRAME(28, 4), @@ -793,7 +794,7 @@ const union AnimCmd gAnimCmd_83A30EC[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A3100[] = { +static const union AnimCmd sAnim_MovingWheelieNorth[] = { ANIMCMD_FRAME(29, 4), ANIMCMD_FRAME(20, 4), ANIMCMD_FRAME(30, 4), @@ -801,7 +802,7 @@ const union AnimCmd gAnimCmd_83A3100[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A3114[] = { +static const union AnimCmd sAnim_MovingWheelieWest[] = { ANIMCMD_FRAME(31, 4), ANIMCMD_FRAME(24, 4), ANIMCMD_FRAME(32, 4), @@ -809,7 +810,7 @@ const union AnimCmd gAnimCmd_83A3114[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A3128[] = { +static const union AnimCmd sAnim_MovingWheelieEast[] = { ANIMCMD_FRAME(31, 4, .hFlip = TRUE), ANIMCMD_FRAME(24, 4, .hFlip = TRUE), ANIMCMD_FRAME(32, 4, .hFlip = TRUE), @@ -817,24 +818,24 @@ const union AnimCmd gAnimCmd_83A3128[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A313C[] = { +static const union AnimCmd sAnim_BerryTreeStage0[] = { ANIMCMD_FRAME(0, 32), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3144[] = { +static const union AnimCmd sAnim_BerryTreeStage1[] = { ANIMCMD_FRAME(1, 32), ANIMCMD_FRAME(2, 32), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3150[] = { +static const union AnimCmd sAnim_BerryTreeStage2[] = { ANIMCMD_FRAME(3, 48), ANIMCMD_FRAME(4, 48), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A315C[] = { +static const union AnimCmd sAnim_BerryTreeStage3[] = { ANIMCMD_FRAME(5, 32), ANIMCMD_FRAME(5, 32), ANIMCMD_FRAME(6, 32), @@ -842,7 +843,7 @@ const union AnimCmd gAnimCmd_83A315C[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3170[] = { +static const union AnimCmd sAnim_BerryTreeStage4[] = { ANIMCMD_FRAME(7, 48), ANIMCMD_FRAME(7, 48), ANIMCMD_FRAME(8, 48), @@ -850,14 +851,14 @@ const union AnimCmd gAnimCmd_83A3170[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3184[] = { +static const union AnimCmd sAnim_NurseBow[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(9, 32), ANIMCMD_FRAME(0, 8), ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3194[] = { +static const union AnimCmd sAnim_RockBreak[] = { ANIMCMD_FRAME(0, 8), ANIMCMD_FRAME(1, 8), ANIMCMD_FRAME(2, 8), @@ -865,7 +866,7 @@ const union AnimCmd gAnimCmd_83A3194[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A31A8[] = { +static const union AnimCmd sAnim_TreeCut[] = { ANIMCMD_FRAME(0, 6), ANIMCMD_FRAME(1, 6), ANIMCMD_FRAME(2, 6), @@ -873,7 +874,7 @@ const union AnimCmd gAnimCmd_83A31A8[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A31BC[] = { +static const union AnimCmd sAnim_TakeOutRodSouth[] = { ANIMCMD_FRAME(8, 4), ANIMCMD_FRAME(9, 4), ANIMCMD_FRAME(10, 4), @@ -881,7 +882,7 @@ const union AnimCmd gAnimCmd_83A31BC[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A31D0[] = { +static const union AnimCmd sAnim_TakeOutRodNorth[] = { ANIMCMD_FRAME(4, 4), ANIMCMD_FRAME(5, 4), ANIMCMD_FRAME(6, 4), @@ -889,7 +890,7 @@ const union AnimCmd gAnimCmd_83A31D0[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A31E4[] = { +static const union AnimCmd sAnim_TakeOutRodWest[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(1, 4), ANIMCMD_FRAME(2, 4), @@ -897,7 +898,7 @@ const union AnimCmd gAnimCmd_83A31E4[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A31F8[] = { +static const union AnimCmd sAnim_TakeOutRodEast[] = { ANIMCMD_FRAME(0, 4, .hFlip = TRUE), ANIMCMD_FRAME(1, 4, .hFlip = TRUE), ANIMCMD_FRAME(2, 4, .hFlip = TRUE), @@ -905,7 +906,7 @@ const union AnimCmd gAnimCmd_83A31F8[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A320C[] = { +static const union AnimCmd sAnim_PutAwayRodSouth[] = { ANIMCMD_FRAME(11, 4), ANIMCMD_FRAME(10, 6), ANIMCMD_FRAME(9, 6), @@ -913,7 +914,7 @@ const union AnimCmd gAnimCmd_83A320C[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3220[] = { +static const union AnimCmd sAnim_PutAwayRodNorth[] = { ANIMCMD_FRAME(7, 4), ANIMCMD_FRAME(6, 6), ANIMCMD_FRAME(5, 6), @@ -921,7 +922,7 @@ const union AnimCmd gAnimCmd_83A3220[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3234[] = { +static const union AnimCmd sAnim_PutAwayRodWest[] = { ANIMCMD_FRAME(3, 4), ANIMCMD_FRAME(2, 4), ANIMCMD_FRAME(1, 4), @@ -929,7 +930,7 @@ const union AnimCmd gAnimCmd_83A3234[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A3248[] = { +static const union AnimCmd sAnim_PutAwayRodEast[] = { ANIMCMD_FRAME(3, 4, .hFlip = TRUE), ANIMCMD_FRAME(2, 4, .hFlip = TRUE), ANIMCMD_FRAME(1, 4, .hFlip = TRUE), @@ -937,7 +938,7 @@ const union AnimCmd gAnimCmd_83A3248[] = { ANIMCMD_END, }; -const union AnimCmd gAnimCmd_83A325C[] = { +static const union AnimCmd sAnim_HookedPokemonSouth[] = { ANIMCMD_FRAME(10, 6), ANIMCMD_FRAME(11, 6), ANIMCMD_LOOP(1), @@ -945,7 +946,7 @@ const union AnimCmd gAnimCmd_83A325C[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A3270[] = { +static const union AnimCmd sAnim_HookedPokemonNorth[] = { ANIMCMD_FRAME(6, 6), ANIMCMD_FRAME(7, 6), ANIMCMD_LOOP(1), @@ -953,7 +954,7 @@ const union AnimCmd gAnimCmd_83A3270[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A3284[] = { +static const union AnimCmd sAnim_HookedPokemonWest[] = { ANIMCMD_FRAME(2, 6), ANIMCMD_FRAME(3, 6), ANIMCMD_LOOP(1), @@ -961,7 +962,7 @@ const union AnimCmd gAnimCmd_83A3284[] = { ANIMCMD_JUMP(0), }; -const union AnimCmd gAnimCmd_83A3298[] = { +static const union AnimCmd sAnim_HookedPokemonEast[] = { ANIMCMD_FRAME(2, 6, .hFlip = TRUE), ANIMCMD_FRAME(3, 6, .hFlip = TRUE), ANIMCMD_LOOP(1), @@ -969,7 +970,8 @@ const union AnimCmd gAnimCmd_83A3298[] = { ANIMCMD_JUMP(0), }; -const union AffineAnimCmd gUnknown_83A32AC[] = { +// Unused +static const union AffineAnimCmd sAffineAnim_KyogreGroudon_GoSouthStart[] = { AFFINEANIMCMD_FRAME(0, 0, 1, 1), AFFINEANIMCMD_FRAME(0, 0, 0, 1), AFFINEANIMCMD_FRAME(0, 0, 0, 1), @@ -978,7 +980,8 @@ const union AffineAnimCmd gUnknown_83A32AC[] = { AFFINEANIMCMD_JUMP(0), }; -const union AffineAnimCmd gUnknown_83A32DC[] = { +// Unused +static const union AffineAnimCmd sAffineAnim_KyogreGroudon_GoSouth[] = { AFFINEANIMCMD_FRAME(0, 0, -1, 1), AFFINEANIMCMD_FRAME(0, 0, 0, 1), AFFINEANIMCMD_LOOP(15), @@ -988,311 +991,312 @@ const union AffineAnimCmd gUnknown_83A32DC[] = { AFFINEANIMCMD_JUMP(0), }; -const union AnimCmd *const gObjectEventImageAnimTable_Inanimate[] = { - gAnimCmd_83A2950 +static const union AnimCmd *const sAnimTable_Inanimate[] = { + [ANIM_STAY_STILL] = sAnim_StayStill }; -const union AnimCmd *const gAnimTable_83A3318[] = { - gAnimCmd_83A2964, - gAnimCmd_83A296C, - gAnimCmd_83A2974, - gAnimCmd_83A297C, - gAnimCmd_83A2984, - gAnimCmd_83A2998, - gAnimCmd_83A29AC, - gAnimCmd_83A29C0, - gAnimCmd_83A29D4, - gAnimCmd_83A29E8, - gAnimCmd_83A29FC, - gAnimCmd_83A2A10, - gAnimCmd_83A2A24, - gAnimCmd_83A2A38, - gAnimCmd_83A2A4C, - gAnimCmd_83A2A60, - gAnimCmd_83A2A74, - gAnimCmd_83A2A88, - gAnimCmd_83A2A9C, - gAnimCmd_83A2AB0, +static const union AnimCmd *const sAnimTable_QuintyPlump[] = { + [ANIM_STD_FACE_SOUTH] = sAnim_QuintyPlumpFaceSouth, + [ANIM_STD_FACE_NORTH] = sAnim_QuintyPlumpFaceNorth, + [ANIM_STD_FACE_WEST] = sAnim_QuintyPlumpFaceWest, + [ANIM_STD_FACE_EAST] = sAnim_QuintyPlumpFaceEast, + [ANIM_STD_GO_SOUTH] = sAnim_QuintyPlumpGoSouth, + [ANIM_STD_GO_NORTH] = sAnim_QuintyPlumpGoNorth, + [ANIM_STD_GO_WEST] = sAnim_QuintyPlumpGoWest, + [ANIM_STD_GO_EAST] = sAnim_QuintyPlumpGoEast, + [ANIM_STD_GO_FAST_SOUTH] = sAnim_QuintyPlumpGoFastSouth, + [ANIM_STD_GO_FAST_NORTH] = sAnim_QuintyPlumpGoFastNorth, + [ANIM_STD_GO_FAST_WEST] = sAnim_QuintyPlumpGoFastWest, + [ANIM_STD_GO_FAST_EAST] = sAnim_QuintyPlumpGoFastEast, + [ANIM_STD_GO_FASTER_SOUTH] = sAnim_QuintyPlumpGoFasterSouth, + [ANIM_STD_GO_FASTER_NORTH] = sAnim_QuintyPlumpGoFasterNorth, + [ANIM_STD_GO_FASTER_WEST] = sAnim_QuintyPlumpGoFasterWest, + [ANIM_STD_GO_FASTER_EAST] = sAnim_QuintyPlumpGoFasterEast, + [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_QuintyPlumpGoFastestSouth, + [ANIM_STD_GO_FASTEST_NORTH] = sAnim_QuintyPlumpGoFastestNorth, + [ANIM_STD_GO_FASTEST_WEST] = sAnim_QuintyPlumpGoFastestWest, + [ANIM_STD_GO_FASTEST_EAST] = sAnim_QuintyPlumpGoFastestEast, }; -const union AnimCmd *const gObjectEventImageAnimTable_Standard[] = { - gAnimCmd_83A2AC4, - gAnimCmd_83A2ACC, - gAnimCmd_83A2AD4, - gAnimCmd_83A2ADC, - gAnimCmd_83A2AE4, - gAnimCmd_83A2AF8, - gAnimCmd_83A2B0C, - gAnimCmd_83A2B20, - gAnimCmd_83A2B34, - gAnimCmd_83A2B48, - gAnimCmd_83A2B5C, - gAnimCmd_83A2B70, - gAnimCmd_83A2B84, - gAnimCmd_83A2B98, - gAnimCmd_83A2BAC, - gAnimCmd_83A2BC0, - gAnimCmd_83A2BD4, - gAnimCmd_83A2BE8, - gAnimCmd_83A2BFC, - gAnimCmd_83A2C10, - gAnimCmd_83A2C24, +static const union AnimCmd *const sAnimTable_Standard[] = { + [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth, + [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth, + [ANIM_STD_FACE_WEST] = sAnim_FaceWest, + [ANIM_STD_FACE_EAST] = sAnim_FaceEast, + [ANIM_STD_GO_SOUTH] = sAnim_GoSouth, + [ANIM_STD_GO_NORTH] = sAnim_GoNorth, + [ANIM_STD_GO_WEST] = sAnim_GoWest, + [ANIM_STD_GO_EAST] = sAnim_GoEast, + [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth, + [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth, + [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest, + [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast, + [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth, + [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth, + [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest, + [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast, + [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth, + [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth, + [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest, + [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast, + [ANIM_RAISE_HAND] = sAnim_RaiseHand, }; -const union AnimCmd *const gObjectEventImageAnimTable_HoOh[] = { - gAnimCmd_83A2AC4, - gAnimCmd_83A2ACC, - gAnimCmd_83A2AD4, - gAnimCmd_83A2ADC, - gAnimCmd_83A2C2C, - gAnimCmd_83A2C40, - gAnimCmd_83A2B0C, - gAnimCmd_83A2B20, - gAnimCmd_83A2B34, - gAnimCmd_83A2B48, - gAnimCmd_83A2B5C, - gAnimCmd_83A2B70, - gAnimCmd_83A2B84, - gAnimCmd_83A2B98, - gAnimCmd_83A2BAC, - gAnimCmd_83A2BC0, - gAnimCmd_83A2BD4, - gAnimCmd_83A2BE8, - gAnimCmd_83A2BFC, - gAnimCmd_83A2C10, - gAnimCmd_83A2C24, +static const union AnimCmd *const sAnimTable_HoOh[] = { + [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth, + [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth, + [ANIM_STD_FACE_WEST] = sAnim_FaceWest, + [ANIM_STD_FACE_EAST] = sAnim_FaceEast, + [ANIM_STD_GO_SOUTH] = sAnim_HoOhFlapWings, + [ANIM_STD_GO_NORTH] = sAnim_HoOhStayStill, + [ANIM_STD_GO_WEST] = sAnim_GoWest, + [ANIM_STD_GO_EAST] = sAnim_GoEast, + [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth, + [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth, + [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest, + [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast, + [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth, + [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth, + [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest, + [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast, + [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth, + [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth, + [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest, + [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast, + [ANIM_RAISE_HAND] = sAnim_RaiseHand, }; -const union AnimCmd *const gAnimTable_83A3410[] = { - gAnimCmd_83A2C68, - gAnimCmd_83A2C70, - gAnimCmd_83A2C78, - gAnimCmd_83A2C80, - gAnimCmd_83A2C88, - gAnimCmd_83A2CAC, - gAnimCmd_83A2CD0, - gAnimCmd_83A2CF4, - gAnimCmd_83A2D18, - gAnimCmd_83A2D3C, - gAnimCmd_83A2D60, - gAnimCmd_83A2D84, - gAnimCmd_83A2DA8, - gAnimCmd_83A2DCC, - gAnimCmd_83A2DF0, - gAnimCmd_83A2E14, - gAnimCmd_83A2E38, - gAnimCmd_83A2E5C, - gAnimCmd_83A2E80, - gAnimCmd_83A2EA4, - gAnimCmd_83A2F40, - gAnimCmd_83A2F54, - gAnimCmd_83A2F68, - gAnimCmd_83A2F7C, +static const union AnimCmd *const sAnimTable_Unknown[] = { + [ANIM_STD_FACE_SOUTH] = sAnim_UnknownFaceSouth, + [ANIM_STD_FACE_NORTH] = sAnim_UnknownFaceNorth, + [ANIM_STD_FACE_WEST] = sAnim_UnknownFaceWest, + [ANIM_STD_FACE_EAST] = sAnim_UnknownFaceEast, + [ANIM_STD_GO_SOUTH] = sAnim_UnknownGoSouth, + [ANIM_STD_GO_NORTH] = sAnim_UnknownGoNorth, + [ANIM_STD_GO_WEST] = sAnim_UnknownGoWest, + [ANIM_STD_GO_EAST] = sAnim_UnknownGoEast, + [ANIM_STD_GO_FAST_SOUTH] = sAnim_UnknownGoFastNorth, + [ANIM_STD_GO_FAST_NORTH] = sAnim_UnknownGoFastSouth, + [ANIM_STD_GO_FAST_WEST] = sAnim_UnknownGoFastWest, + [ANIM_STD_GO_FAST_EAST] = sAnim_UnknownGoFastEast, + [ANIM_STD_GO_FASTER_SOUTH] = sAnim_UnknownGoFasterNorth, + [ANIM_STD_GO_FASTER_NORTH] = sAnim_UnknownGoFasterSouth, + [ANIM_STD_GO_FASTER_WEST] = sAnim_UnknownGoFasterWest, + [ANIM_STD_GO_FASTER_EAST] = sAnim_UnknownGoFasterEast, + [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_UnknownGoFastestNorth, + [ANIM_STD_GO_FASTEST_NORTH] = sAnim_UnknownGoFastestSouth, + [ANIM_STD_GO_FASTEST_WEST] = sAnim_UnknownGoFastestWest, + [ANIM_STD_GO_FASTEST_EAST] = sAnim_UnknownGoFastestEast, + [ANIM_RUN_SOUTH] = sAnim_RunSouth, + [ANIM_RUN_NORTH] = sAnim_RunNorth, + [ANIM_RUN_WEST] = sAnim_RunWest, + [ANIM_RUN_EAST] = sAnim_RunEast, }; -const union AnimCmd *const gObjectEventImageAnimTable_RedGreenNormal[] = { - gAnimCmd_83A2AC4, - gAnimCmd_83A2ACC, - gAnimCmd_83A2AD4, - gAnimCmd_83A2ADC, - gAnimCmd_83A2AE4, - gAnimCmd_83A2AF8, - gAnimCmd_83A2B0C, - gAnimCmd_83A2B20, - gAnimCmd_83A2B34, - gAnimCmd_83A2B48, - gAnimCmd_83A2B5C, - gAnimCmd_83A2B70, - gAnimCmd_83A2B84, - gAnimCmd_83A2B98, - gAnimCmd_83A2BAC, - gAnimCmd_83A2BC0, - gAnimCmd_83A2BD4, - gAnimCmd_83A2BE8, - gAnimCmd_83A2BFC, - gAnimCmd_83A2C10, - gAnimCmd_83A2F40, - gAnimCmd_83A2F54, - gAnimCmd_83A2F68, - gAnimCmd_83A2F7C, - gAnimCmd_83A2EC8, - gAnimCmd_83A2EE0, - gAnimCmd_83A2EF8, - gAnimCmd_83A2F10, - gAnimCmd_83A2F28, +static const union AnimCmd *const sAnimTable_RedGreenNormal[] = { + [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth, + [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth, + [ANIM_STD_FACE_WEST] = sAnim_FaceWest, + [ANIM_STD_FACE_EAST] = sAnim_FaceEast, + [ANIM_STD_GO_SOUTH] = sAnim_GoSouth, + [ANIM_STD_GO_NORTH] = sAnim_GoNorth, + [ANIM_STD_GO_WEST] = sAnim_GoWest, + [ANIM_STD_GO_EAST] = sAnim_GoEast, + [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth, + [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth, + [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest, + [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast, + [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth, + [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth, + [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest, + [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast, + [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth, + [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth, + [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest, + [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast, + [ANIM_RUN_SOUTH] = sAnim_RunSouth, + [ANIM_RUN_NORTH] = sAnim_RunNorth, + [ANIM_RUN_WEST] = sAnim_RunWest, + [ANIM_RUN_EAST] = sAnim_RunEast, + [ANIM_SPIN_SOUTH] = sAnim_SpinSouth, + [ANIM_SPIN_NORTH] = sAnim_SpinNorth, + [ANIM_SPIN_WEST] = sAnim_SpinWest, + [ANIM_SPIN_EAST] = sAnim_SpinEast, + [ANIM_SHAKE_HEAD_OR_WALK_IN_PLACE] = sAnim_ShakeHeadOrWalkInPlace, }; -const union AnimCmd *const gAnimTable_83A34E4[] = { - gAnimCmd_83A2AC4, - gAnimCmd_83A2ACC, - gAnimCmd_83A2AD4, - gAnimCmd_83A2ADC, - gAnimCmd_83A2AE4, - gAnimCmd_83A2AF8, - gAnimCmd_83A2B0C, - gAnimCmd_83A2B20, - gAnimCmd_83A2B34, - gAnimCmd_83A2B48, - gAnimCmd_83A2B5C, - gAnimCmd_83A2B70, - gAnimCmd_83A2B84, - gAnimCmd_83A2B98, - gAnimCmd_83A2BAC, - gAnimCmd_83A2BC0, - gAnimCmd_83A2BD4, - gAnimCmd_83A2BE8, - gAnimCmd_83A2BFC, - gAnimCmd_83A2C10, - gAnimCmd_83A302C, - gAnimCmd_83A3038, - gAnimCmd_83A3044, - gAnimCmd_83A3050, - gAnimCmd_83A305C, - gAnimCmd_83A3068, - gAnimCmd_83A3074, - gAnimCmd_83A3080, - gAnimCmd_83A308C, - gAnimCmd_83A3098, - gAnimCmd_83A30A4, - gAnimCmd_83A30B0, - gAnimCmd_83A30BC, - gAnimCmd_83A30C8, - gAnimCmd_83A30D4, - gAnimCmd_83A30E0, - gAnimCmd_83A30EC, - gAnimCmd_83A3100, - gAnimCmd_83A3114, - gAnimCmd_83A3128, +static const union AnimCmd *const sAnimTable_AcroBike[] = { + [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth, + [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth, + [ANIM_STD_FACE_WEST] = sAnim_FaceWest, + [ANIM_STD_FACE_EAST] = sAnim_FaceEast, + [ANIM_STD_GO_SOUTH] = sAnim_GoSouth, + [ANIM_STD_GO_NORTH] = sAnim_GoNorth, + [ANIM_STD_GO_WEST] = sAnim_GoWest, + [ANIM_STD_GO_EAST] = sAnim_GoEast, + [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth, + [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth, + [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest, + [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast, + [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth, + [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth, + [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest, + [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast, + [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth, + [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth, + [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest, + [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast, + [ANIM_BUNNY_HOP_BACK_WHEEL_SOUTH] = sAnim_BunnyHopBackWheelSouth, + [ANIM_BUNNY_HOP_BACK_WHEEL_NORTH] = sAnim_BunnyHopBackWheelNorth, + [ANIM_BUNNY_HOP_BACK_WHEEL_WEST] = sAnim_BunnyHopBackWheelWest, + [ANIM_BUNNY_HOP_BACK_WHEEL_EAST] = sAnim_BunnyHopBackWheelEast, + [ANIM_BUNNY_HOP_FRONT_WHEEL_SOUTH] = sAnim_BunnyHopFrontWheelSouth, + [ANIM_BUNNY_HOP_FRONT_WHEEL_NORTH] = sAnim_BunnyHopFrontWheelNorth, + [ANIM_BUNNY_HOP_FRONT_WHEEL_WEST] = sAnim_BunnyHopFrontWheelWest, + [ANIM_BUNNY_HOP_FRONT_WHEEL_EAST] = sAnim_BunnyHopFrontWheelEast, + [ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH] = sAnim_StandingWheelieBackWheelSouth, + [ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH] = sAnim_StandingWheelieBackWheelNorth, + [ANIM_STANDING_WHEELIE_BACK_WHEEL_WEST] = sAnim_StandingWheelieBackWheelWest, + [ANIM_STANDING_WHEELIE_BACK_WHEEL_EAST] = sAnim_StandingWheelieBackWheelEast, + [ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH] = sAnim_StandingWheelieFrontWheelSouth, + [ANIM_STANDING_WHEELIE_FRONT_WHEEL_NORTH] = sAnim_StandingWheelieFrontWheelNorth, + [ANIM_STANDING_WHEELIE_FRONT_WHEEL_WEST] = sAnim_StandingWheelieFrontWheelWest, + [ANIM_STANDING_WHEELIE_FRONT_WHEEL_EAST] = sAnim_StandingWheelieFrontWheelEast, + [ANIM_MOVING_WHEELIE_SOUTH] = sAnim_MovingWheelieSouth, + [ANIM_MOVING_WHEELIE_NORTH] = sAnim_MovingWheelieNorth, + [ANIM_MOVING_WHEELIE_WEST] = sAnim_MovingWheelieWest, + [ANIM_MOVING_WHEELIE_EAST] = sAnim_MovingWheelieEast, }; -const union AnimCmd *const gObjectEventImageAnimTable_RedGreenSurf[] = { - gAnimCmd_83A2C48, - gAnimCmd_83A2C50, - gAnimCmd_83A2C58, - gAnimCmd_83A2C60, - gAnimCmd_83A2C48, - gAnimCmd_83A2C50, - gAnimCmd_83A2C58, - gAnimCmd_83A2C60, - gAnimCmd_83A2C48, - gAnimCmd_83A2C50, - gAnimCmd_83A2C58, - gAnimCmd_83A2C60, - gAnimCmd_83A2C48, - gAnimCmd_83A2C50, - gAnimCmd_83A2C58, - gAnimCmd_83A2C60, - gAnimCmd_83A2C48, - gAnimCmd_83A2C50, - gAnimCmd_83A2C58, - gAnimCmd_83A2C60, - gAnimCmd_83A300C, - gAnimCmd_83A3014, - gAnimCmd_83A301C, - gAnimCmd_83A3024, +static const union AnimCmd *const sAnimTable_RedGreenSurf[] = { + [ANIM_STD_FACE_SOUTH] = sAnim_SurfFaceSouth, + [ANIM_STD_FACE_NORTH] = sAnim_SurfFaceNorth, + [ANIM_STD_FACE_WEST] = sAnim_SurfFaceWest, + [ANIM_STD_FACE_EAST] = sAnim_SurfFaceEast, + [ANIM_STD_GO_SOUTH] = sAnim_SurfFaceSouth, + [ANIM_STD_GO_NORTH] = sAnim_SurfFaceNorth, + [ANIM_STD_GO_WEST] = sAnim_SurfFaceWest, + [ANIM_STD_GO_EAST] = sAnim_SurfFaceEast, + [ANIM_STD_GO_FAST_SOUTH] = sAnim_SurfFaceSouth, + [ANIM_STD_GO_FAST_NORTH] = sAnim_SurfFaceNorth, + [ANIM_STD_GO_FAST_WEST] = sAnim_SurfFaceWest, + [ANIM_STD_GO_FAST_EAST] = sAnim_SurfFaceEast, + [ANIM_STD_GO_FASTER_SOUTH] = sAnim_SurfFaceSouth, + [ANIM_STD_GO_FASTER_NORTH] = sAnim_SurfFaceNorth, + [ANIM_STD_GO_FASTER_WEST] = sAnim_SurfFaceWest, + [ANIM_STD_GO_FASTER_EAST] = sAnim_SurfFaceEast, + [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_SurfFaceSouth, + [ANIM_STD_GO_FASTEST_NORTH] = sAnim_SurfFaceNorth, + [ANIM_STD_GO_FASTEST_WEST] = sAnim_SurfFaceWest, + [ANIM_STD_GO_FASTEST_EAST] = sAnim_SurfFaceEast, + [ANIM_GET_ON_OFF_POKEMON_SOUTH] = sAnim_GetOnOffSurfSouth, + [ANIM_GET_ON_OFF_POKEMON_NORTH] = sAnim_GetOnOffSurfNorth, + [ANIM_GET_ON_OFF_POKEMON_WEST] = sAnim_GetOnOffSurfWest, + [ANIM_GET_ON_OFF_POKEMON_EAST] = sAnim_GetOnOffSurfEast, }; -const union AnimCmd *const gObjectEventImageAnimTable_Nurse[] = { - gAnimCmd_83A2AC4, - gAnimCmd_83A2ACC, - gAnimCmd_83A2AD4, - gAnimCmd_83A2ADC, - gAnimCmd_83A2AE4, - gAnimCmd_83A2AF8, - gAnimCmd_83A2B0C, - gAnimCmd_83A2B20, - gAnimCmd_83A2B34, - gAnimCmd_83A2B48, - gAnimCmd_83A2B5C, - gAnimCmd_83A2B70, - gAnimCmd_83A2B84, - gAnimCmd_83A2B98, - gAnimCmd_83A2BAC, - gAnimCmd_83A2BC0, - gAnimCmd_83A2BD4, - gAnimCmd_83A2BE8, - gAnimCmd_83A2BFC, - gAnimCmd_83A2C10, - gAnimCmd_83A3184, +static const union AnimCmd *const sAnimTable_Nurse[] = { + [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth, + [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth, + [ANIM_STD_FACE_WEST] = sAnim_FaceWest, + [ANIM_STD_FACE_EAST] = sAnim_FaceEast, + [ANIM_STD_GO_SOUTH] = sAnim_GoSouth, + [ANIM_STD_GO_NORTH] = sAnim_GoNorth, + [ANIM_STD_GO_WEST] = sAnim_GoWest, + [ANIM_STD_GO_EAST] = sAnim_GoEast, + [ANIM_STD_GO_FAST_SOUTH] = sAnim_GoFastSouth, + [ANIM_STD_GO_FAST_NORTH] = sAnim_GoFastNorth, + [ANIM_STD_GO_FAST_WEST] = sAnim_GoFastWest, + [ANIM_STD_GO_FAST_EAST] = sAnim_GoFastEast, + [ANIM_STD_GO_FASTER_SOUTH] = sAnim_GoFasterSouth, + [ANIM_STD_GO_FASTER_NORTH] = sAnim_GoFasterNorth, + [ANIM_STD_GO_FASTER_WEST] = sAnim_GoFasterWest, + [ANIM_STD_GO_FASTER_EAST] = sAnim_GoFasterEast, + [ANIM_STD_GO_FASTEST_SOUTH] = sAnim_GoFastestSouth, + [ANIM_STD_GO_FASTEST_NORTH] = sAnim_GoFastestNorth, + [ANIM_STD_GO_FASTEST_WEST] = sAnim_GoFastestWest, + [ANIM_STD_GO_FASTEST_EAST] = sAnim_GoFastestEast, + [ANIM_NURSE_BOW] = sAnim_NurseBow, }; -const union AnimCmd *const gObjectEventImageAnimTable_RedGreenItem[] = { - gAnimCmd_83A2F90, +static const union AnimCmd *const sAnimTable_RedGreenFieldMove[] = { + [ANIM_FIELD_MOVE] = sAnim_FieldMove, }; -const union AnimCmd *const gObjectEventImageAnimTable_RedGreenVSSeeker[] = { - gAnimCmd_83A2FA8, +static const union AnimCmd *const sAnimTable_RedGreenVSSeeker[] = { + [ANIM_VS_SEEKER] = sAnim_VSSeeker, }; -const union AnimCmd *const gObjectEventImageAnimTable_RedGreenVSSeekerBike[] = { - gAnimCmd_83A2FD8, - gAnimCmd_83A313C, - gAnimCmd_83A3144, - gAnimCmd_83A3150, - gAnimCmd_83A315C, - gAnimCmd_83A3170, +static const union AnimCmd *const sAnimTable_RedGreenVSSeekerBike[] = { + [ANIM_VS_SEEKER] = sAnim_VSSeekerBike, }; -const union AnimCmd *const gObjectEventImageAnimTable_RockSmashRock[] = { - gAnimCmd_83A2950, - gAnimCmd_83A3194, +// Unused +static const union AnimCmd *const sAnimTable_BerryTree[] = { + sAnim_BerryTreeStage0, + sAnim_BerryTreeStage1, + sAnim_BerryTreeStage2, + sAnim_BerryTreeStage3, + sAnim_BerryTreeStage4, }; -const union AnimCmd *const gObjectEventImageAnimTable_CutTree[] = { - gAnimCmd_83A2950, - gAnimCmd_83A31A8, +static const union AnimCmd *const sAnimTable_RockSmashRock[] = { + [ANIM_STAY_STILL] = sAnim_StayStill, + [ANIM_REMOVE_OBSTACLE] = sAnim_RockBreak, }; -const union AnimCmd *const gObjectEventImageAnimTable_RedGreenFish[] = { - gAnimCmd_83A31BC, - gAnimCmd_83A31D0, - gAnimCmd_83A31E4, - gAnimCmd_83A31F8, - gAnimCmd_83A320C, - gAnimCmd_83A3220, - gAnimCmd_83A3234, - gAnimCmd_83A3248, - gAnimCmd_83A325C, - gAnimCmd_83A3270, - gAnimCmd_83A3284, - gAnimCmd_83A3298, +static const union AnimCmd *const sAnimTable_CutTree[] = { + [ANIM_STAY_STILL] = sAnim_StayStill, + [ANIM_REMOVE_OBSTACLE] = sAnim_TreeCut, }; -const struct UnkStruct_083A3698 gUnknown_83A3698[] = { +static const union AnimCmd *const sAnimTable_RedGreenFish[] = { + [ANIM_TAKE_OUT_ROD_SOUTH] = sAnim_TakeOutRodSouth, + [ANIM_TAKE_OUT_ROD_NORTH] = sAnim_TakeOutRodNorth, + [ANIM_TAKE_OUT_ROD_WEST] = sAnim_TakeOutRodWest, + [ANIM_TAKE_OUT_ROD_EAST] = sAnim_TakeOutRodEast, + [ANIM_PUT_AWAY_ROD_SOUTH] = sAnim_PutAwayRodSouth, + [ANIM_PUT_AWAY_ROD_NORTH] = sAnim_PutAwayRodNorth, + [ANIM_PUT_AWAY_ROD_WEST] = sAnim_PutAwayRodWest, + [ANIM_PUT_AWAY_ROD_EAST] = sAnim_PutAwayRodEast, + [ANIM_HOOKED_POKEMON_SOUTH] = sAnim_HookedPokemonSouth, + [ANIM_HOOKED_POKEMON_NORTH] = sAnim_HookedPokemonNorth, + [ANIM_HOOKED_POKEMON_WEST] = sAnim_HookedPokemonWest, + [ANIM_HOOKED_POKEMON_EAST] = sAnim_HookedPokemonEast, +}; + +static const struct StepAnimTable sStepAnimTables[] = { { - .anims = gAnimTable_83A3318, + .anims = sAnimTable_QuintyPlump, .animPos = {1, 3, 0, 2}, }, { - .anims = gObjectEventImageAnimTable_Standard, + .anims = sAnimTable_Standard, .animPos = {1, 3, 0, 2}, }, { - .anims = gObjectEventImageAnimTable_RedGreenNormal, + .anims = sAnimTable_RedGreenNormal, .animPos = {1, 3, 0, 2}, }, { - .anims = gAnimTable_83A34E4, + .anims = sAnimTable_AcroBike, .animPos = {1, 3, 0, 2}, }, { - .anims = gObjectEventImageAnimTable_RedGreenSurf, + .anims = sAnimTable_RedGreenSurf, .animPos = {1, 3, 0, 2}, }, { - .anims = gObjectEventImageAnimTable_Nurse, + .anims = sAnimTable_Nurse, .animPos = {1, 3, 0, 2}, }, { - .anims = gObjectEventImageAnimTable_RedGreenFish, + .anims = sAnimTable_RedGreenFish, .animPos = {1, 3, 0, 2}, }, { - .anims = gAnimTable_83A3410, + .anims = sAnimTable_Unknown, .animPos = {3, 7, 0, 4}, }, - { - .anims = NULL, - .animPos = {0, 0, 0, 0}, - } + {} }; diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index 71f3ea5f8..3cf2686ab 100644 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -1,154 +1,154 @@ -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_RedNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_RedSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Policeman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Policeman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSBrendan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSBrendan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSMay = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RSMay, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleBoy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LittleGirl, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SittingBoy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SittingBoy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lass, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Youngster, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman3, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Boy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BattleGirl, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BugCatcher, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_FatMan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaldingMan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_BaldingMan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Woman2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan1 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_WorkerM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_WorkerF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Beauty, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chef = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Chef, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan2 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldMan2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldWoman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Camper, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Picnicker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_CooltrainerM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_CooltrainerF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SuperNerd, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Channeler = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Channeler, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RocketF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerMWater, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerFWater, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerMLand, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SwimmerFLand, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blackbelt, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Scientist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Gentleman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sailor, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Captain = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Captain, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisher = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fisher, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TeachyTVHost = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TeachyTVHost, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWoman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnusedWoman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMWater, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TuberMLand, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Hiker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Biker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Biker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymGuy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GymGuy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Nurse, gObjectEventPicTable_Nurse, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMaleReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnusedMaleReceptionist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_ItemBall, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfOak = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_ProfOak, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Man, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rocker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Rocker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrFuji = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MrFuji, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bruno = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Bruno, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldManLyingDown = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_OldManLyingDown, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CutTree = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_CutTree, gObjectEventPicTable_CutTree, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clerk = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Clerk, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MGDeliveryman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_MGDeliveryman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTowerDude = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_TrainerTowerDude, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableClubReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_CableClubReceptionist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_UnionRoomReceptionist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RockSmashRock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_RockSmashRock, gObjectEventPicTable_RockSmashRock, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_StrengthBoulder = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_StrengthBoulder, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenNormal, gObjectEventPicTable_GreenNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GreenBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenSurf, gObjectEventPicTable_GreenSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenItem, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_83A45F4 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RedBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_RocketM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celio = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Celio, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Agatha = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Agatha, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Brock, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Misty = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Misty, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LtSurge = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_LtSurge, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Erika = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Erika, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Koga = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Koga, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giovanni = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Giovanni, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blaine = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blaine, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sabrina = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Sabrina, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bill = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Bill, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Daisy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Daisy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lorelei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lorelei, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lance = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lance, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blue = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Blue, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_RedFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenFish, gObjectEventPicTable_GreenFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_RedItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_RedGreenVSSeeker, gObjectEventPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_RedGreenVSSeekerBike, gObjectEventPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TownMap = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 32, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_TownMap, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pokedex = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Pokedex, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_GBAKid, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Snorlax = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Snorlax, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Fossil, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Ruby = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Ruby, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sapphire = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Sapphire, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldAmber = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_OldAmber, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymSign = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_GymSign, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sign = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Sign, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTips = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_WoodenSign, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clipboard = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_Clipboard, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meteorite = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_METEORITE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LaprasDoll = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Inanimate, gObjectEventPicTable_LaprasDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spearow = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Spearow, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Omanyte = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Omanyte, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kangaskhan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kangaskhan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Psyduck = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Psyduck, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NidoranF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_NidoranM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nidorino = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Nidorino, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meowth = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Meowth, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seel = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Seel, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Voltorb = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Voltorb, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowpoke = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Slowpoke, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowbro = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Slowbro, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Machop, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wigglytuff = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Wigglytuff, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Doduo = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Doduo, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fearow = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Fearow, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lapras = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lapras, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zapdos = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Zapdos, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Moltres = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Moltres, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Articuno = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Articuno, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysD = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DeoxysD, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysA = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DeoxysA, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysN = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_DeoxysN, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mewtwo = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mewtwo, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mew, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Entei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Entei, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Raikou = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Raikou, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Suicune = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Suicune, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Lugia, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, gObjectEventImageAnimTable_HoOh, gObjectEventPicTable_HoOh, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celebi = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Celebi, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cubone = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Cubone, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machoke = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Machoke, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kabuto = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Kabuto, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poliwrath = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Poliwrath, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgeot = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pidgeot, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chansey = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Chansey, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pikachu, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Jigglypuff = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Jigglypuff, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgey = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Pidgey, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clefairy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Clefairy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Mom, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seagallop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_SEAGALLOP, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_Seagallop, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSAnne = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_SS_ANNE, OBJ_EVENT_PAL_TAG_NONE, 4096, 128, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_128x64, gObjectEventImageAnimTable_Standard, gObjectEventPicTable_SSAnne, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenNormal, sPicTable_RedNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenSurf, sPicTable_RedSurf, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenFieldMove, sPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Policeman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Policeman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSBrendan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RSBrendan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSMay = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RSMay, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_LittleBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_LittleGirl, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SittingBoy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SittingBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Lass, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Youngster, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Woman1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Boy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_BattleGirl, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_BugCatcher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_FatMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaldingMan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_BaldingMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan1 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_OldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_WorkerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_WorkerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Beauty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chef = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Chef, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan2 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_OldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_OldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Camper, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Picnicker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_CooltrainerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_CooltrainerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SuperNerd, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Channeler = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Channeler, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RocketF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerMWater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerFWater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerMLand, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerFLand, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Blackbelt, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Scientist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Gentleman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Sailor, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Captain = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Captain, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisher = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Fisher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TeachyTVHost = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_TeachyTVHost, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWoman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_UnusedWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_TuberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_TuberMWater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_TuberMLand, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Hiker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Biker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Biker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymGuy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_GymGuy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Nurse, sPicTable_Nurse, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMaleReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_UnusedMaleReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_ItemBall, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfOak = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_ProfOak, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Man, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rocker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Rocker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrFuji = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_MrFuji, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bruno = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Bruno, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldManLyingDown = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_OldManLyingDown, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CutTree = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_CutTree, sPicTable_CutTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clerk = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Clerk, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MGDeliveryman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_MGDeliveryman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTowerDude = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_TrainerTowerDude, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableClubReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_CableClubReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_UnionRoomReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RockSmashRock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_RockSmashRock, sPicTable_RockSmashRock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_StrengthBoulder = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_StrengthBoulder, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenNormal, sPicTable_GreenNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_GreenBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenSurf, sPicTable_GreenSurf, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenFieldMove, sPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBikeAlt = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RocketM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celio = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Celio, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Agatha = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Agatha, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Brock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Misty = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Misty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LtSurge = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_LtSurge, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Erika = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Erika, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Koga = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Koga, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giovanni = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Giovanni, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blaine = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Blaine, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sabrina = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Sabrina, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bill = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Bill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Daisy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Daisy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lorelei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Lorelei, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lance = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Lance, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blue = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Blue, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenFish, sPicTable_RedFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenFish, sPicTable_GreenFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenVSSeeker, sPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenVSSeekerBike, sPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenVSSeeker, sPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenVSSeekerBike, sPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TownMap = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 32, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_TownMap, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pokedex = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Pokedex, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_GBAKid, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Snorlax = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Snorlax, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Fossil, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Ruby = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Ruby, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sapphire = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Sapphire, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldAmber = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_OldAmber, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymSign = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Inanimate, sPicTable_GymSign, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sign = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Sign, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTips = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_WoodenSign, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clipboard = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Clipboard, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meteorite = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_METEORITE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Inanimate, sPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LaprasDoll = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Inanimate, sPicTable_LaprasDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spearow = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Spearow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Omanyte = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Omanyte, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kangaskhan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Kangaskhan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Psyduck = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Psyduck, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_NidoranF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_NidoranM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nidorino = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Nidorino, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meowth = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Meowth, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seel = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Seel, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Voltorb = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Voltorb, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowpoke = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Slowpoke, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowbro = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Slowbro, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Machop, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wigglytuff = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Wigglytuff, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Doduo = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Doduo, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fearow = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Fearow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lapras = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Lapras, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zapdos = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Zapdos, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Moltres = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Moltres, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Articuno = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Articuno, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysD = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_DeoxysD, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysA = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_DeoxysA, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysN = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_DeoxysN, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mewtwo = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Mewtwo, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Mew, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Entei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Entei, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Raikou = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Raikou, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Suicune = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Suicune, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Lugia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_HoOh, sPicTable_HoOh, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celebi = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Celebi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cubone = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Cubone, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machoke = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Machoke, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kabuto = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Kabuto, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poliwrath = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Poliwrath, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgeot = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Pidgeot, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chansey = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Chansey, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Pikachu, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Jigglypuff = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Jigglypuff, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgey = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Pidgey, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clefairy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Clefairy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Mom, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seagallop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_SEAGALLOP, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, sAnimTable_Standard, sPicTable_Seagallop, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSAnne = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_SS_ANNE, OBJ_EVENT_PAL_TAG_NONE, 4096, 128, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_128x64, sAnimTable_Standard, sPicTable_SSAnne, gDummySpriteAffineAnimTable}; diff --git a/src/data/object_events/object_event_pic_tables.h b/src/data/object_events/object_event_pic_tables.h index 9c0abfba4..43c52d6f9 100644 --- a/src/data/object_events/object_event_pic_tables.h +++ b/src/data/object_events/object_event_pic_tables.h @@ -1,4 +1,4 @@ -const struct SpriteFrameImage gObjectEventPicTable_RedNormal[] = { +static const struct SpriteFrameImage sPicTable_RedNormal[] = { overworld_frame(gObjectEventPic_RedNormal, 2, 4, 0), overworld_frame(gObjectEventPic_RedNormal, 2, 4, 1), overworld_frame(gObjectEventPic_RedNormal, 2, 4, 2), @@ -21,7 +21,7 @@ const struct SpriteFrameImage gObjectEventPicTable_RedNormal[] = { overworld_frame(gObjectEventPic_RedSurfRun, 2, 4, 13), }; -const struct SpriteFrameImage gObjectEventPicTable_RedBike[] = { +static const struct SpriteFrameImage sPicTable_RedBike[] = { overworld_frame(gObjectEventPic_RedBike, 4, 4, 0), overworld_frame(gObjectEventPic_RedBike, 4, 4, 1), overworld_frame(gObjectEventPic_RedBike, 4, 4, 2), @@ -33,7 +33,7 @@ const struct SpriteFrameImage gObjectEventPicTable_RedBike[] = { overworld_frame(gObjectEventPic_RedBike, 4, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_GreenNormal[] = { +static const struct SpriteFrameImage sPicTable_GreenNormal[] = { overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 0), overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 1), overworld_frame(gObjectEventPic_GreenNormal, 2, 4, 2), @@ -56,7 +56,7 @@ const struct SpriteFrameImage gObjectEventPicTable_GreenNormal[] = { overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 13), }; -const struct SpriteFrameImage gObjectEventPicTable_GreenBike[] = { +static const struct SpriteFrameImage sPicTable_GreenBike[] = { overworld_frame(gObjectEventPic_GreenBike, 4, 4, 0), overworld_frame(gObjectEventPic_GreenBike, 4, 4, 1), overworld_frame(gObjectEventPic_GreenBike, 4, 4, 2), @@ -68,7 +68,7 @@ const struct SpriteFrameImage gObjectEventPicTable_GreenBike[] = { overworld_frame(gObjectEventPic_GreenBike, 4, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_RedSurf[] = { +static const struct SpriteFrameImage sPicTable_RedSurf[] = { overworld_frame(gObjectEventPic_RedSurfRun, 2, 4, 0), overworld_frame(gObjectEventPic_RedSurfRun, 2, 4, 1), overworld_frame(gObjectEventPic_RedSurfRun, 2, 4, 2), @@ -83,7 +83,7 @@ const struct SpriteFrameImage gObjectEventPicTable_RedSurf[] = { overworld_frame(gObjectEventPic_RedSurfRun, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_GreenSurf[] = { +static const struct SpriteFrameImage sPicTable_GreenSurf[] = { overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 0), overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 1), overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 2), @@ -98,7 +98,7 @@ const struct SpriteFrameImage gObjectEventPicTable_GreenSurf[] = { overworld_frame(gObjectEventPic_GreenSurfRun, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_RedItem[] = { +static const struct SpriteFrameImage sPicTable_RedItem[] = { overworld_frame(gObjectEventPic_RedItem, 2, 4, 0), overworld_frame(gObjectEventPic_RedItem, 2, 4, 1), overworld_frame(gObjectEventPic_RedItem, 2, 4, 2), @@ -110,7 +110,7 @@ const struct SpriteFrameImage gObjectEventPicTable_RedItem[] = { overworld_frame(gObjectEventPic_RedItem, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_GreenItem[] = { +static const struct SpriteFrameImage sPicTable_GreenItem[] = { overworld_frame(gObjectEventPic_GreenItem, 2, 4, 0), overworld_frame(gObjectEventPic_GreenItem, 2, 4, 1), overworld_frame(gObjectEventPic_GreenItem, 2, 4, 2), @@ -122,7 +122,7 @@ const struct SpriteFrameImage gObjectEventPicTable_GreenItem[] = { overworld_frame(gObjectEventPic_GreenItem, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_RedVSSeekerBike[] = { +static const struct SpriteFrameImage sPicTable_RedVSSeekerBike[] = { overworld_frame(gObjectEventPic_RedVSSeekerBike, 4, 4, 0), overworld_frame(gObjectEventPic_RedVSSeekerBike, 4, 4, 1), overworld_frame(gObjectEventPic_RedVSSeekerBike, 4, 4, 2), @@ -131,7 +131,7 @@ const struct SpriteFrameImage gObjectEventPicTable_RedVSSeekerBike[] = { overworld_frame(gObjectEventPic_RedVSSeekerBike, 4, 4, 5), }; -const struct SpriteFrameImage gObjectEventPicTable_GreenVSSeekerBike[] = { +static const struct SpriteFrameImage sPicTable_GreenVSSeekerBike[] = { overworld_frame(gObjectEventPic_GreenVSSeekerBike, 4, 4, 0), overworld_frame(gObjectEventPic_GreenVSSeekerBike, 4, 4, 1), overworld_frame(gObjectEventPic_GreenVSSeekerBike, 4, 4, 2), @@ -140,7 +140,7 @@ const struct SpriteFrameImage gObjectEventPicTable_GreenVSSeekerBike[] = { overworld_frame(gObjectEventPic_GreenVSSeekerBike, 4, 4, 5), }; -const struct SpriteFrameImage gObjectEventPicTable_RSBrendan[] = { +static const struct SpriteFrameImage sPicTable_RSBrendan[] = { overworld_frame(gObjectEventPic_RSBrendan, 2, 4, 0), overworld_frame(gObjectEventPic_RSBrendan, 2, 4, 1), overworld_frame(gObjectEventPic_RSBrendan, 2, 4, 2), @@ -153,7 +153,7 @@ const struct SpriteFrameImage gObjectEventPicTable_RSBrendan[] = { overworld_frame(gObjectEventPic_RSMay, 2, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_RSMay[] = { +static const struct SpriteFrameImage sPicTable_RSMay[] = { overworld_frame(gObjectEventPic_RSMay, 2, 4, 0), overworld_frame(gObjectEventPic_RSMay, 2, 4, 1), overworld_frame(gObjectEventPic_RSMay, 2, 4, 2), @@ -166,7 +166,7 @@ const struct SpriteFrameImage gObjectEventPicTable_RSMay[] = { overworld_frame(gObjectEventPic_RedFish, 2, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Policeman[] = { +static const struct SpriteFrameImage sPicTable_Policeman[] = { overworld_frame(gObjectEventPic_Policeman, 2, 4, 0), overworld_frame(gObjectEventPic_Policeman, 2, 4, 1), overworld_frame(gObjectEventPic_Policeman, 2, 4, 2), @@ -178,7 +178,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Policeman[] = { overworld_frame(gObjectEventPic_Policeman, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_LittleBoy[] = { +static const struct SpriteFrameImage sPicTable_LittleBoy[] = { overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 0), overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 1), overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 2), @@ -190,7 +190,7 @@ const struct SpriteFrameImage gObjectEventPicTable_LittleBoy[] = { overworld_frame(gObjectEventPic_LittleBoy, 2, 2, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_LittleGirl[] = { +static const struct SpriteFrameImage sPicTable_LittleGirl[] = { overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 0), overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 1), overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 2), @@ -203,7 +203,7 @@ const struct SpriteFrameImage gObjectEventPicTable_LittleGirl[] = { overworld_frame(gObjectEventPic_LittleGirl, 2, 2, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_SittingBoy[] = { +static const struct SpriteFrameImage sPicTable_SittingBoy[] = { overworld_frame(gObjectEventPic_SittingBoy, 2, 4, 0), overworld_frame(gObjectEventPic_SittingBoy, 2, 4, 2), overworld_frame(gObjectEventPic_SittingBoy, 2, 4, 1), @@ -215,7 +215,7 @@ const struct SpriteFrameImage gObjectEventPicTable_SittingBoy[] = { overworld_frame(gObjectEventPic_SittingBoy, 2, 4, 1), }; -const struct SpriteFrameImage gObjectEventPicTable_Lass[] = { +static const struct SpriteFrameImage sPicTable_Lass[] = { overworld_frame(gObjectEventPic_Lass, 2, 4, 0), overworld_frame(gObjectEventPic_Lass, 2, 4, 1), overworld_frame(gObjectEventPic_Lass, 2, 4, 2), @@ -228,7 +228,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Lass[] = { overworld_frame(gObjectEventPic_Lass, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Youngster[] = { +static const struct SpriteFrameImage sPicTable_Youngster[] = { overworld_frame(gObjectEventPic_Youngster, 2, 4, 0), overworld_frame(gObjectEventPic_Youngster, 2, 4, 1), overworld_frame(gObjectEventPic_Youngster, 2, 4, 2), @@ -241,7 +241,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Youngster[] = { overworld_frame(gObjectEventPic_Youngster, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Woman1[] = { +static const struct SpriteFrameImage sPicTable_Woman1[] = { overworld_frame(gObjectEventPic_Woman1, 2, 4, 0), overworld_frame(gObjectEventPic_Woman1, 2, 4, 1), overworld_frame(gObjectEventPic_Woman1, 2, 4, 2), @@ -254,7 +254,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Woman1[] = { overworld_frame(gObjectEventPic_Woman1, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Woman3[] = { +static const struct SpriteFrameImage sPicTable_Woman3[] = { overworld_frame(gObjectEventPic_Woman3, 2, 4, 0), overworld_frame(gObjectEventPic_Woman3, 2, 4, 1), overworld_frame(gObjectEventPic_Woman3, 2, 4, 2), @@ -266,7 +266,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Woman3[] = { overworld_frame(gObjectEventPic_Woman3, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_BattleGirl[] = { +static const struct SpriteFrameImage sPicTable_BattleGirl[] = { overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 0), overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 1), overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 2), @@ -279,7 +279,7 @@ const struct SpriteFrameImage gObjectEventPicTable_BattleGirl[] = { overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_BugCatcher[] = { +static const struct SpriteFrameImage sPicTable_BugCatcher[] = { overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 0), overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 1), overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 2), @@ -292,7 +292,7 @@ const struct SpriteFrameImage gObjectEventPicTable_BugCatcher[] = { overworld_frame(gObjectEventPic_BugCatcher, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_FatMan[] = { +static const struct SpriteFrameImage sPicTable_FatMan[] = { overworld_frame(gObjectEventPic_FatMan, 2, 4, 0), overworld_frame(gObjectEventPic_FatMan, 2, 4, 1), overworld_frame(gObjectEventPic_FatMan, 2, 4, 2), @@ -304,7 +304,7 @@ const struct SpriteFrameImage gObjectEventPicTable_FatMan[] = { overworld_frame(gObjectEventPic_FatMan, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_BaldingMan[] = { +static const struct SpriteFrameImage sPicTable_BaldingMan[] = { overworld_frame(gObjectEventPic_BaldingMan, 2, 4, 0), overworld_frame(gObjectEventPic_BaldingMan, 2, 4, 1), overworld_frame(gObjectEventPic_BaldingMan, 2, 4, 2), @@ -317,7 +317,7 @@ const struct SpriteFrameImage gObjectEventPicTable_BaldingMan[] = { overworld_frame(gObjectEventPic_BaldingMan, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Woman2[] = { +static const struct SpriteFrameImage sPicTable_Woman2[] = { overworld_frame(gObjectEventPic_Woman2, 2, 4, 0), overworld_frame(gObjectEventPic_Woman2, 2, 4, 1), overworld_frame(gObjectEventPic_Woman2, 2, 4, 2), @@ -330,7 +330,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Woman2[] = { overworld_frame(gObjectEventPic_Woman2, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_OldMan1[] = { +static const struct SpriteFrameImage sPicTable_OldMan1[] = { overworld_frame(gObjectEventPic_OldMan1, 2, 4, 0), overworld_frame(gObjectEventPic_OldMan1, 2, 4, 1), overworld_frame(gObjectEventPic_OldMan1, 2, 4, 2), @@ -343,7 +343,7 @@ const struct SpriteFrameImage gObjectEventPicTable_OldMan1[] = { overworld_frame(gObjectEventPic_OldMan1, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_WorkerM[] = { +static const struct SpriteFrameImage sPicTable_WorkerM[] = { overworld_frame(gObjectEventPic_WorkerM, 2, 4, 0), overworld_frame(gObjectEventPic_WorkerM, 2, 4, 1), overworld_frame(gObjectEventPic_WorkerM, 2, 4, 2), @@ -355,7 +355,7 @@ const struct SpriteFrameImage gObjectEventPicTable_WorkerM[] = { overworld_frame(gObjectEventPic_WorkerM, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_WorkerF[] = { +static const struct SpriteFrameImage sPicTable_WorkerF[] = { overworld_frame(gObjectEventPic_WorkerF, 2, 4, 0), overworld_frame(gObjectEventPic_WorkerF, 2, 4, 1), overworld_frame(gObjectEventPic_WorkerF, 2, 4, 2), @@ -367,7 +367,7 @@ const struct SpriteFrameImage gObjectEventPicTable_WorkerF[] = { overworld_frame(gObjectEventPic_WorkerF, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Beauty[] = { +static const struct SpriteFrameImage sPicTable_Beauty[] = { overworld_frame(gObjectEventPic_Beauty, 2, 4, 0), overworld_frame(gObjectEventPic_Beauty, 2, 4, 1), overworld_frame(gObjectEventPic_Beauty, 2, 4, 2), @@ -380,7 +380,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Beauty[] = { overworld_frame(gObjectEventPic_Beauty, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Chef[] = { +static const struct SpriteFrameImage sPicTable_Chef[] = { overworld_frame(gObjectEventPic_Chef, 2, 4, 0), overworld_frame(gObjectEventPic_Chef, 2, 4, 1), overworld_frame(gObjectEventPic_Chef, 2, 4, 2), @@ -392,7 +392,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Chef[] = { overworld_frame(gObjectEventPic_Chef, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_OldMan2[] = { +static const struct SpriteFrameImage sPicTable_OldMan2[] = { overworld_frame(gObjectEventPic_OldMan2, 2, 4, 0), overworld_frame(gObjectEventPic_OldMan2, 2, 4, 1), overworld_frame(gObjectEventPic_OldMan2, 2, 4, 2), @@ -405,7 +405,7 @@ const struct SpriteFrameImage gObjectEventPicTable_OldMan2[] = { overworld_frame(gObjectEventPic_OldWoman, 2, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_OldManLyingDown[] = { +static const struct SpriteFrameImage sPicTable_OldManLyingDown[] = { overworld_frame(gObjectEventPic_OldManLyingDown, 4, 4, 0), overworld_frame(gObjectEventPic_OldManLyingDown, 4, 4, 0), overworld_frame(gObjectEventPic_OldManLyingDown, 4, 4, 0), @@ -417,7 +417,7 @@ const struct SpriteFrameImage gObjectEventPicTable_OldManLyingDown[] = { overworld_frame(gObjectEventPic_OldManLyingDown, 4, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_OldWoman[] = { +static const struct SpriteFrameImage sPicTable_OldWoman[] = { overworld_frame(gObjectEventPic_OldWoman, 2, 4, 0), overworld_frame(gObjectEventPic_OldWoman, 2, 4, 1), overworld_frame(gObjectEventPic_OldWoman, 2, 4, 2), @@ -429,7 +429,7 @@ const struct SpriteFrameImage gObjectEventPicTable_OldWoman[] = { overworld_frame(gObjectEventPic_OldWoman, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Camper[] = { +static const struct SpriteFrameImage sPicTable_Camper[] = { overworld_frame(gObjectEventPic_Camper, 2, 4, 0), overworld_frame(gObjectEventPic_Camper, 2, 4, 1), overworld_frame(gObjectEventPic_Camper, 2, 4, 2), @@ -442,7 +442,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Camper[] = { overworld_frame(gObjectEventPic_Camper, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Picnicker[] = { +static const struct SpriteFrameImage sPicTable_Picnicker[] = { overworld_frame(gObjectEventPic_Picnicker, 2, 4, 0), overworld_frame(gObjectEventPic_Picnicker, 2, 4, 1), overworld_frame(gObjectEventPic_Picnicker, 2, 4, 2), @@ -455,7 +455,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Picnicker[] = { overworld_frame(gObjectEventPic_Picnicker, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_CooltrainerM[] = { +static const struct SpriteFrameImage sPicTable_CooltrainerM[] = { overworld_frame(gObjectEventPic_CooltrainerM, 2, 4, 0), overworld_frame(gObjectEventPic_CooltrainerM, 2, 4, 1), overworld_frame(gObjectEventPic_CooltrainerM, 2, 4, 2), @@ -468,7 +468,7 @@ const struct SpriteFrameImage gObjectEventPicTable_CooltrainerM[] = { overworld_frame(gObjectEventPic_CooltrainerM, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_CooltrainerF[] = { +static const struct SpriteFrameImage sPicTable_CooltrainerF[] = { overworld_frame(gObjectEventPic_CooltrainerF, 2, 4, 0), overworld_frame(gObjectEventPic_CooltrainerF, 2, 4, 1), overworld_frame(gObjectEventPic_CooltrainerF, 2, 4, 2), @@ -481,7 +481,7 @@ const struct SpriteFrameImage gObjectEventPicTable_CooltrainerF[] = { overworld_frame(gObjectEventPic_CooltrainerF, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Boy[] = { +static const struct SpriteFrameImage sPicTable_Boy[] = { overworld_frame(gObjectEventPic_Boy, 2, 4, 0), overworld_frame(gObjectEventPic_Boy, 2, 4, 1), overworld_frame(gObjectEventPic_Boy, 2, 4, 2), @@ -494,7 +494,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Boy[] = { overworld_frame(gObjectEventPic_Boy, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_SuperNerd[] = { +static const struct SpriteFrameImage sPicTable_SuperNerd[] = { overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 0), overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 1), overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 2), @@ -507,7 +507,7 @@ const struct SpriteFrameImage gObjectEventPicTable_SuperNerd[] = { overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Channeler[] = { +static const struct SpriteFrameImage sPicTable_Channeler[] = { overworld_frame(gObjectEventPic_Channeler, 2, 4, 0), overworld_frame(gObjectEventPic_Channeler, 2, 4, 1), overworld_frame(gObjectEventPic_Channeler, 2, 4, 2), @@ -520,7 +520,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Channeler[] = { overworld_frame(gObjectEventPic_Channeler, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_RocketF[] = { +static const struct SpriteFrameImage sPicTable_RocketF[] = { overworld_frame(gObjectEventPic_RocketF, 2, 4, 0), overworld_frame(gObjectEventPic_RocketF, 2, 4, 1), overworld_frame(gObjectEventPic_RocketF, 2, 4, 2), @@ -532,7 +532,7 @@ const struct SpriteFrameImage gObjectEventPicTable_RocketF[] = { overworld_frame(gObjectEventPic_RocketF, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_SwimmerMWater[] = { +static const struct SpriteFrameImage sPicTable_SwimmerMWater[] = { overworld_frame(gObjectEventPic_SwimmerMWater, 2, 4, 0), overworld_frame(gObjectEventPic_SwimmerMWater, 2, 4, 1), overworld_frame(gObjectEventPic_SwimmerMWater, 2, 4, 2), @@ -545,7 +545,7 @@ const struct SpriteFrameImage gObjectEventPicTable_SwimmerMWater[] = { overworld_frame(gObjectEventPic_SwimmerMWater, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_SwimmerFWater[] = { +static const struct SpriteFrameImage sPicTable_SwimmerFWater[] = { overworld_frame(gObjectEventPic_SwimmerFWater, 2, 4, 0), overworld_frame(gObjectEventPic_SwimmerFWater, 2, 4, 1), overworld_frame(gObjectEventPic_SwimmerFWater, 2, 4, 2), @@ -558,7 +558,7 @@ const struct SpriteFrameImage gObjectEventPicTable_SwimmerFWater[] = { overworld_frame(gObjectEventPic_SwimmerFWater, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_SwimmerMLand[] = { +static const struct SpriteFrameImage sPicTable_SwimmerMLand[] = { overworld_frame(gObjectEventPic_SwimmerMLand, 2, 4, 0), overworld_frame(gObjectEventPic_SwimmerMLand, 2, 4, 1), overworld_frame(gObjectEventPic_SwimmerMLand, 2, 4, 2), @@ -571,7 +571,7 @@ const struct SpriteFrameImage gObjectEventPicTable_SwimmerMLand[] = { overworld_frame(gObjectEventPic_SwimmerMLand, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_SwimmerFLand[] = { +static const struct SpriteFrameImage sPicTable_SwimmerFLand[] = { overworld_frame(gObjectEventPic_SwimmerFLand, 2, 4, 0), overworld_frame(gObjectEventPic_SwimmerFLand, 2, 4, 1), overworld_frame(gObjectEventPic_SwimmerFLand, 2, 4, 2), @@ -584,7 +584,7 @@ const struct SpriteFrameImage gObjectEventPicTable_SwimmerFLand[] = { overworld_frame(gObjectEventPic_SwimmerFLand, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Blackbelt[] = { +static const struct SpriteFrameImage sPicTable_Blackbelt[] = { overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 0), overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 1), overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 2), @@ -597,7 +597,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Blackbelt[] = { overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Scientist[] = { +static const struct SpriteFrameImage sPicTable_Scientist[] = { overworld_frame(gObjectEventPic_Scientist, 2, 4, 0), overworld_frame(gObjectEventPic_Scientist, 2, 4, 1), overworld_frame(gObjectEventPic_Scientist, 2, 4, 2), @@ -610,7 +610,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Scientist[] = { overworld_frame(gObjectEventPic_Scientist, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Gentleman[] = { +static const struct SpriteFrameImage sPicTable_Gentleman[] = { overworld_frame(gObjectEventPic_Gentleman, 2, 4, 0), overworld_frame(gObjectEventPic_Gentleman, 2, 4, 1), overworld_frame(gObjectEventPic_Gentleman, 2, 4, 2), @@ -623,7 +623,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Gentleman[] = { overworld_frame(gObjectEventPic_Gentleman, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Sailor[] = { +static const struct SpriteFrameImage sPicTable_Sailor[] = { overworld_frame(gObjectEventPic_Sailor, 2, 4, 0), overworld_frame(gObjectEventPic_Sailor, 2, 4, 1), overworld_frame(gObjectEventPic_Sailor, 2, 4, 2), @@ -636,7 +636,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Sailor[] = { overworld_frame(gObjectEventPic_Sailor, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Captain[] = { +static const struct SpriteFrameImage sPicTable_Captain[] = { overworld_frame(gObjectEventPic_Captain, 2, 4, 0), overworld_frame(gObjectEventPic_Captain, 2, 4, 1), overworld_frame(gObjectEventPic_Captain, 2, 4, 2), @@ -648,7 +648,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Captain[] = { overworld_frame(gObjectEventPic_Captain, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Fisher[] = { +static const struct SpriteFrameImage sPicTable_Fisher[] = { overworld_frame(gObjectEventPic_Fisher, 2, 4, 0), overworld_frame(gObjectEventPic_Fisher, 2, 4, 1), overworld_frame(gObjectEventPic_Fisher, 2, 4, 2), @@ -661,7 +661,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Fisher[] = { overworld_frame(gObjectEventPic_Fisher, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_TeachyTVHost[] = { +static const struct SpriteFrameImage sPicTable_TeachyTVHost[] = { overworld_frame(gObjectEventPic_TeachyTVHost, 2, 4, 0), overworld_frame(gObjectEventPic_TeachyTVHost, 2, 4, 1), overworld_frame(gObjectEventPic_TeachyTVHost, 2, 4, 2), @@ -673,7 +673,7 @@ const struct SpriteFrameImage gObjectEventPicTable_TeachyTVHost[] = { overworld_frame(gObjectEventPic_TeachyTVHost, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_UnusedWoman[] = { +static const struct SpriteFrameImage sPicTable_UnusedWoman[] = { overworld_frame(gObjectEventPic_UnusedWoman, 2, 4, 0), overworld_frame(gObjectEventPic_UnusedWoman, 2, 4, 1), overworld_frame(gObjectEventPic_UnusedWoman, 2, 4, 2), @@ -685,7 +685,7 @@ const struct SpriteFrameImage gObjectEventPicTable_UnusedWoman[] = { overworld_frame(gObjectEventPic_UnusedWoman, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_TuberF[] = { +static const struct SpriteFrameImage sPicTable_TuberF[] = { overworld_frame(gObjectEventPic_TuberF, 2, 2, 0), overworld_frame(gObjectEventPic_TuberF, 2, 2, 1), overworld_frame(gObjectEventPic_TuberF, 2, 2, 2), @@ -698,7 +698,7 @@ const struct SpriteFrameImage gObjectEventPicTable_TuberF[] = { overworld_frame(gObjectEventPic_TuberF, 2, 2, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_TuberMWater[] = { +static const struct SpriteFrameImage sPicTable_TuberMWater[] = { overworld_frame(gObjectEventPic_TuberMWater, 2, 2, 0), overworld_frame(gObjectEventPic_TuberMWater, 2, 2, 1), overworld_frame(gObjectEventPic_TuberMWater, 2, 2, 2), @@ -711,7 +711,7 @@ const struct SpriteFrameImage gObjectEventPicTable_TuberMWater[] = { overworld_frame(gObjectEventPic_TuberMWater, 2, 2, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_TuberMLand[] = { +static const struct SpriteFrameImage sPicTable_TuberMLand[] = { overworld_frame(gObjectEventPic_TuberMLand, 2, 2, 0), overworld_frame(gObjectEventPic_TuberMLand, 2, 2, 1), overworld_frame(gObjectEventPic_TuberMLand, 2, 2, 2), @@ -724,7 +724,7 @@ const struct SpriteFrameImage gObjectEventPicTable_TuberMLand[] = { overworld_frame(gObjectEventPic_TuberMLand, 2, 2, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Hiker[] = { +static const struct SpriteFrameImage sPicTable_Hiker[] = { overworld_frame(gObjectEventPic_Hiker, 2, 4, 0), overworld_frame(gObjectEventPic_Hiker, 2, 4, 1), overworld_frame(gObjectEventPic_Hiker, 2, 4, 2), @@ -737,7 +737,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Hiker[] = { overworld_frame(gObjectEventPic_Hiker, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Biker[] = { +static const struct SpriteFrameImage sPicTable_Biker[] = { overworld_frame(gObjectEventPic_Biker, 4, 4, 0), overworld_frame(gObjectEventPic_Biker, 4, 4, 1), overworld_frame(gObjectEventPic_Biker, 4, 4, 2), @@ -750,7 +750,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Biker[] = { overworld_frame(gObjectEventPic_Biker, 4, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_GymGuy[] = { +static const struct SpriteFrameImage sPicTable_GymGuy[] = { overworld_frame(gObjectEventPic_GymGuy, 2, 4, 0), overworld_frame(gObjectEventPic_GymGuy, 2, 4, 1), overworld_frame(gObjectEventPic_GymGuy, 2, 4, 2), @@ -762,7 +762,7 @@ const struct SpriteFrameImage gObjectEventPicTable_GymGuy[] = { overworld_frame(gObjectEventPic_GymGuy, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Nurse[] = { +static const struct SpriteFrameImage sPicTable_Nurse[] = { overworld_frame(gObjectEventPic_Nurse, 2, 4, 0), overworld_frame(gObjectEventPic_Nurse, 2, 4, 1), overworld_frame(gObjectEventPic_Nurse, 2, 4, 2), @@ -775,7 +775,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Nurse[] = { overworld_frame(gObjectEventPic_Nurse, 2, 4, 3), }; -const struct SpriteFrameImage gObjectEventPicTable_UnusedMaleReceptionist[] = { +static const struct SpriteFrameImage sPicTable_UnusedMaleReceptionist[] = { overworld_frame(gObjectEventPic_UnusedMaleReceptionist, 2, 4, 0), overworld_frame(gObjectEventPic_UnusedMaleReceptionist, 2, 4, 1), overworld_frame(gObjectEventPic_UnusedMaleReceptionist, 2, 4, 2), @@ -787,11 +787,11 @@ const struct SpriteFrameImage gObjectEventPicTable_UnusedMaleReceptionist[] = { overworld_frame(gObjectEventPic_UnusedMaleReceptionist, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_ItemBall[] = { +static const struct SpriteFrameImage sPicTable_ItemBall[] = { overworld_frame(gObjectEventPic_ItemBall, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_ProfOak[] = { +static const struct SpriteFrameImage sPicTable_ProfOak[] = { overworld_frame(gObjectEventPic_ProfOak, 2, 4, 0), overworld_frame(gObjectEventPic_ProfOak, 2, 4, 1), overworld_frame(gObjectEventPic_ProfOak, 2, 4, 2), @@ -803,7 +803,7 @@ const struct SpriteFrameImage gObjectEventPicTable_ProfOak[] = { overworld_frame(gObjectEventPic_ProfOak, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Man[] = { +static const struct SpriteFrameImage sPicTable_Man[] = { overworld_frame(gObjectEventPic_Man, 2, 4, 0), overworld_frame(gObjectEventPic_Man, 2, 4, 1), overworld_frame(gObjectEventPic_Man, 2, 4, 2), @@ -816,7 +816,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Man[] = { overworld_frame(gObjectEventPic_Man, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_Rocker[] = { +static const struct SpriteFrameImage sPicTable_Rocker[] = { overworld_frame(gObjectEventPic_Rocker, 2, 4, 0), overworld_frame(gObjectEventPic_Rocker, 2, 4, 1), overworld_frame(gObjectEventPic_Rocker, 2, 4, 2), @@ -829,7 +829,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Rocker[] = { overworld_frame(gObjectEventPic_Rocker, 2, 4, 9), }; -const struct SpriteFrameImage gObjectEventPicTable_MrFuji[] = { +static const struct SpriteFrameImage sPicTable_MrFuji[] = { overworld_frame(gObjectEventPic_MrFuji, 2, 4, 0), overworld_frame(gObjectEventPic_MrFuji, 2, 4, 1), overworld_frame(gObjectEventPic_MrFuji, 2, 4, 2), @@ -841,7 +841,7 @@ const struct SpriteFrameImage gObjectEventPicTable_MrFuji[] = { overworld_frame(gObjectEventPic_MrFuji, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Bruno[] = { +static const struct SpriteFrameImage sPicTable_Bruno[] = { overworld_frame(gObjectEventPic_Bruno, 2, 4, 0), overworld_frame(gObjectEventPic_Bruno, 2, 4, 1), overworld_frame(gObjectEventPic_Bruno, 2, 4, 2), @@ -853,14 +853,14 @@ const struct SpriteFrameImage gObjectEventPicTable_Bruno[] = { overworld_frame(gObjectEventPic_Bruno, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_CutTree[] = { +static const struct SpriteFrameImage sPicTable_CutTree[] = { overworld_frame(gObjectEventPic_CutTree, 2, 2, 0), overworld_frame(gObjectEventPic_CutTree, 2, 2, 1), overworld_frame(gObjectEventPic_CutTree, 2, 2, 2), overworld_frame(gObjectEventPic_CutTree, 2, 2, 3), }; -const struct SpriteFrameImage gObjectEventPicTable_Clerk[] = { +static const struct SpriteFrameImage sPicTable_Clerk[] = { overworld_frame(gObjectEventPic_Clerk, 2, 4, 0), overworld_frame(gObjectEventPic_Clerk, 2, 4, 1), overworld_frame(gObjectEventPic_Clerk, 2, 4, 2), @@ -872,7 +872,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Clerk[] = { overworld_frame(gObjectEventPic_Clerk, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_MGDeliveryman[] = { +static const struct SpriteFrameImage sPicTable_MGDeliveryman[] = { overworld_frame(gObjectEventPic_MGDeliveryman, 2, 4, 0), overworld_frame(gObjectEventPic_MGDeliveryman, 2, 4, 1), overworld_frame(gObjectEventPic_MGDeliveryman, 2, 4, 2), @@ -884,7 +884,7 @@ const struct SpriteFrameImage gObjectEventPicTable_MGDeliveryman[] = { overworld_frame(gObjectEventPic_MGDeliveryman, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_TrainerTowerDude[] = { +static const struct SpriteFrameImage sPicTable_TrainerTowerDude[] = { overworld_frame(gObjectEventPic_TrainerTowerDude, 2, 4, 0), overworld_frame(gObjectEventPic_TrainerTowerDude, 2, 4, 1), overworld_frame(gObjectEventPic_TrainerTowerDude, 2, 4, 2), @@ -896,7 +896,7 @@ const struct SpriteFrameImage gObjectEventPicTable_TrainerTowerDude[] = { overworld_frame(gObjectEventPic_TrainerTowerDude, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_CableClubReceptionist[] = { +static const struct SpriteFrameImage sPicTable_CableClubReceptionist[] = { overworld_frame(gObjectEventPic_CableClubReceptionist, 2, 4, 0), overworld_frame(gObjectEventPic_CableClubReceptionist, 2, 4, 1), overworld_frame(gObjectEventPic_CableClubReceptionist, 2, 4, 2), @@ -908,7 +908,7 @@ const struct SpriteFrameImage gObjectEventPicTable_CableClubReceptionist[] = { overworld_frame(gObjectEventPic_CableClubReceptionist, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_UnionRoomReceptionist[] = { +static const struct SpriteFrameImage sPicTable_UnionRoomReceptionist[] = { overworld_frame(gObjectEventPic_UnionRoomReceptionist, 2, 4, 0), overworld_frame(gObjectEventPic_UnionRoomReceptionist, 2, 4, 1), overworld_frame(gObjectEventPic_UnionRoomReceptionist, 2, 4, 2), @@ -920,18 +920,18 @@ const struct SpriteFrameImage gObjectEventPicTable_UnionRoomReceptionist[] = { overworld_frame(gObjectEventPic_UnionRoomReceptionist, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_RockSmashRock[] = { +static const struct SpriteFrameImage sPicTable_RockSmashRock[] = { overworld_frame(gObjectEventPic_RockSmashRock, 2, 2, 0), overworld_frame(gObjectEventPic_RockSmashRock, 2, 2, 1), overworld_frame(gObjectEventPic_RockSmashRock, 2, 2, 2), overworld_frame(gObjectEventPic_RockSmashRock, 2, 2, 3), }; -const struct SpriteFrameImage gObjectEventPicTable_StrengthBoulder[] = { +static const struct SpriteFrameImage sPicTable_StrengthBoulder[] = { overworld_frame(gObjectEventPic_StrengthBoulder, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_RocketM[] = { +static const struct SpriteFrameImage sPicTable_RocketM[] = { overworld_frame(gObjectEventPic_RocketM, 2, 4, 0), overworld_frame(gObjectEventPic_RocketM, 2, 4, 1), overworld_frame(gObjectEventPic_RocketM, 2, 4, 2), @@ -943,7 +943,7 @@ const struct SpriteFrameImage gObjectEventPicTable_RocketM[] = { overworld_frame(gObjectEventPic_RocketM, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Celio[] = { +static const struct SpriteFrameImage sPicTable_Celio[] = { overworld_frame(gObjectEventPic_Celio, 2, 4, 0), overworld_frame(gObjectEventPic_Celio, 2, 4, 1), overworld_frame(gObjectEventPic_Celio, 2, 4, 2), @@ -955,7 +955,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Celio[] = { overworld_frame(gObjectEventPic_Celio, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Agatha[] = { +static const struct SpriteFrameImage sPicTable_Agatha[] = { overworld_frame(gObjectEventPic_Agatha, 2, 4, 0), overworld_frame(gObjectEventPic_Agatha, 2, 4, 1), overworld_frame(gObjectEventPic_Agatha, 2, 4, 2), @@ -967,7 +967,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Agatha[] = { overworld_frame(gObjectEventPic_Agatha, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Brock[] = { +static const struct SpriteFrameImage sPicTable_Brock[] = { overworld_frame(gObjectEventPic_Brock, 2, 4, 0), overworld_frame(gObjectEventPic_Brock, 2, 4, 1), overworld_frame(gObjectEventPic_Brock, 2, 4, 2), @@ -979,7 +979,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Brock[] = { overworld_frame(gObjectEventPic_Brock, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Misty[] = { +static const struct SpriteFrameImage sPicTable_Misty[] = { overworld_frame(gObjectEventPic_Misty, 2, 4, 0), overworld_frame(gObjectEventPic_Misty, 2, 4, 1), overworld_frame(gObjectEventPic_Misty, 2, 4, 2), @@ -991,7 +991,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Misty[] = { overworld_frame(gObjectEventPic_Misty, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_LtSurge[] = { +static const struct SpriteFrameImage sPicTable_LtSurge[] = { overworld_frame(gObjectEventPic_LtSurge, 2, 4, 0), overworld_frame(gObjectEventPic_LtSurge, 2, 4, 1), overworld_frame(gObjectEventPic_LtSurge, 2, 4, 2), @@ -1003,7 +1003,7 @@ const struct SpriteFrameImage gObjectEventPicTable_LtSurge[] = { overworld_frame(gObjectEventPic_LtSurge, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Erika[] = { +static const struct SpriteFrameImage sPicTable_Erika[] = { overworld_frame(gObjectEventPic_Erika, 2, 4, 0), overworld_frame(gObjectEventPic_Erika, 2, 4, 1), overworld_frame(gObjectEventPic_Erika, 2, 4, 2), @@ -1015,7 +1015,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Erika[] = { overworld_frame(gObjectEventPic_Erika, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Koga[] = { +static const struct SpriteFrameImage sPicTable_Koga[] = { overworld_frame(gObjectEventPic_Koga, 2, 4, 0), overworld_frame(gObjectEventPic_Koga, 2, 4, 1), overworld_frame(gObjectEventPic_Koga, 2, 4, 2), @@ -1027,7 +1027,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Koga[] = { overworld_frame(gObjectEventPic_Koga, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Giovanni[] = { +static const struct SpriteFrameImage sPicTable_Giovanni[] = { overworld_frame(gObjectEventPic_Giovanni, 2, 4, 0), overworld_frame(gObjectEventPic_Giovanni, 2, 4, 1), overworld_frame(gObjectEventPic_Giovanni, 2, 4, 2), @@ -1039,7 +1039,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Giovanni[] = { overworld_frame(gObjectEventPic_Giovanni, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Blaine[] = { +static const struct SpriteFrameImage sPicTable_Blaine[] = { overworld_frame(gObjectEventPic_Blaine, 2, 4, 0), overworld_frame(gObjectEventPic_Blaine, 2, 4, 1), overworld_frame(gObjectEventPic_Blaine, 2, 4, 2), @@ -1051,7 +1051,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Blaine[] = { overworld_frame(gObjectEventPic_Blaine, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Sabrina[] = { +static const struct SpriteFrameImage sPicTable_Sabrina[] = { overworld_frame(gObjectEventPic_Sabrina, 2, 4, 0), overworld_frame(gObjectEventPic_Sabrina, 2, 4, 1), overworld_frame(gObjectEventPic_Sabrina, 2, 4, 2), @@ -1063,7 +1063,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Sabrina[] = { overworld_frame(gObjectEventPic_Sabrina, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Bill[] = { +static const struct SpriteFrameImage sPicTable_Bill[] = { overworld_frame(gObjectEventPic_Bill, 2, 4, 0), overworld_frame(gObjectEventPic_Bill, 2, 4, 1), overworld_frame(gObjectEventPic_Bill, 2, 4, 2), @@ -1075,7 +1075,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Bill[] = { overworld_frame(gObjectEventPic_Bill, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Daisy[] = { +static const struct SpriteFrameImage sPicTable_Daisy[] = { overworld_frame(gObjectEventPic_Daisy, 2, 4, 0), overworld_frame(gObjectEventPic_Daisy, 2, 4, 1), overworld_frame(gObjectEventPic_Daisy, 2, 4, 2), @@ -1087,7 +1087,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Daisy[] = { overworld_frame(gObjectEventPic_Daisy, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Lorelei[] = { +static const struct SpriteFrameImage sPicTable_Lorelei[] = { overworld_frame(gObjectEventPic_Lorelei, 2, 4, 0), overworld_frame(gObjectEventPic_Lorelei, 2, 4, 1), overworld_frame(gObjectEventPic_Lorelei, 2, 4, 2), @@ -1099,7 +1099,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Lorelei[] = { overworld_frame(gObjectEventPic_Lorelei, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_Lance[] = { +static const struct SpriteFrameImage sPicTable_Lance[] = { overworld_frame(gObjectEventPic_Lance, 2, 4, 0), overworld_frame(gObjectEventPic_Lance, 2, 4, 1), overworld_frame(gObjectEventPic_Lance, 2, 4, 2), @@ -1111,7 +1111,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Lance[] = { overworld_frame(gObjectEventPic_Lance, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Blue[] = { +static const struct SpriteFrameImage sPicTable_Blue[] = { overworld_frame(gObjectEventPic_Blue, 2, 4, 0), overworld_frame(gObjectEventPic_Blue, 2, 4, 1), overworld_frame(gObjectEventPic_Blue, 2, 4, 2), @@ -1123,7 +1123,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Blue[] = { overworld_frame(gObjectEventPic_Blue, 2, 4, 8), }; -const struct SpriteFrameImage gObjectEventPicTable_RedFish[] = { +static const struct SpriteFrameImage sPicTable_RedFish[] = { overworld_frame(gObjectEventPic_RedFish, 4, 4, 0), overworld_frame(gObjectEventPic_RedFish, 4, 4, 1), overworld_frame(gObjectEventPic_RedFish, 4, 4, 2), @@ -1138,7 +1138,7 @@ const struct SpriteFrameImage gObjectEventPicTable_RedFish[] = { overworld_frame(gObjectEventPic_RedFish, 4, 4, 11), }; -const struct SpriteFrameImage gObjectEventPicTable_GreenFish[] = { +static const struct SpriteFrameImage sPicTable_GreenFish[] = { overworld_frame(gObjectEventPic_GreenFish, 4, 4, 0), overworld_frame(gObjectEventPic_GreenFish, 4, 4, 1), overworld_frame(gObjectEventPic_GreenFish, 4, 4, 2), @@ -1153,15 +1153,15 @@ const struct SpriteFrameImage gObjectEventPicTable_GreenFish[] = { overworld_frame(gObjectEventPic_GreenFish, 4, 4, 11), }; -const struct SpriteFrameImage gObjectEventPicTable_TownMap[] = { +static const struct SpriteFrameImage sPicTable_TownMap[] = { overworld_frame(gObjectEventPic_TownMap, 2, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Pokedex[] = { +static const struct SpriteFrameImage sPicTable_Pokedex[] = { overworld_frame(gObjectEventPic_Pokedex, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_GBAKid[] = { +static const struct SpriteFrameImage sPicTable_GBAKid[] = { overworld_frame(gObjectEventPic_GBAKid, 2, 4, 0), overworld_frame(gObjectEventPic_GBAKid, 2, 4, 1), overworld_frame(gObjectEventPic_GBAKid, 2, 4, 2), @@ -1173,47 +1173,47 @@ const struct SpriteFrameImage gObjectEventPicTable_GBAKid[] = { overworld_frame(gObjectEventPic_GBAKid, 2, 4, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Fossil[] = { +static const struct SpriteFrameImage sPicTable_Fossil[] = { overworld_frame(gObjectEventPic_Fossil, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Ruby[] = { +static const struct SpriteFrameImage sPicTable_Ruby[] = { overworld_frame(gObjectEventPic_Ruby, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Sapphire[] = { +static const struct SpriteFrameImage sPicTable_Sapphire[] = { overworld_frame(gObjectEventPic_Sapphire, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_OldAmber[] = { +static const struct SpriteFrameImage sPicTable_OldAmber[] = { overworld_frame(gObjectEventPic_OldAmber, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_GymSign[] = { +static const struct SpriteFrameImage sPicTable_GymSign[] = { overworld_frame(gObjectEventPic_GymSign, 2, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Sign[] = { +static const struct SpriteFrameImage sPicTable_Sign[] = { overworld_frame(gObjectEventPic_Sign, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_WoodenSign[] = { +static const struct SpriteFrameImage sPicTable_WoodenSign[] = { overworld_frame(gObjectEventPic_WoodenSign, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Clipboard[] = { +static const struct SpriteFrameImage sPicTable_Clipboard[] = { overworld_frame(gObjectEventPic_Clipboard, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_BirthIslandStone[] = { +static const struct SpriteFrameImage sPicTable_BirthIslandStone[] = { overworld_frame(gObjectEventPic_BirthIslandStone, 4, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_LaprasDoll[] = { +static const struct SpriteFrameImage sPicTable_LaprasDoll[] = { overworld_frame(gObjectEventPic_LaprasDoll, 4, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Seagallop[] = { +static const struct SpriteFrameImage sPicTable_Seagallop[] = { overworld_frame(gObjectEventPic_Seagallop, 4, 16, 0), overworld_frame(gObjectEventPic_Seagallop, 4, 16, 0), overworld_frame(gObjectEventPic_Seagallop, 4, 16, 0), @@ -1225,7 +1225,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Seagallop[] = { overworld_frame(gObjectEventPic_Seagallop, 4, 16, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_SSAnne[] = { +static const struct SpriteFrameImage sPicTable_SSAnne[] = { overworld_frame(gObjectEventPic_SSAnne, 8, 16, 0), overworld_frame(gObjectEventPic_SSAnne, 8, 16, 0), overworld_frame(gObjectEventPic_SSAnne, 8, 16, 0), @@ -1237,7 +1237,7 @@ const struct SpriteFrameImage gObjectEventPicTable_SSAnne[] = { overworld_frame(gObjectEventPic_SSAnne, 8, 16, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Snorlax[] = { +static const struct SpriteFrameImage sPicTable_Snorlax[] = { overworld_frame(gObjectEventPic_Snorlax, 4, 4, 0), overworld_frame(gObjectEventPic_Snorlax, 4, 4, 0), overworld_frame(gObjectEventPic_Snorlax, 4, 4, 0), @@ -1249,7 +1249,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Snorlax[] = { overworld_frame(gObjectEventPic_Snorlax, 4, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Spearow[] = { +static const struct SpriteFrameImage sPicTable_Spearow[] = { overworld_frame(gObjectEventPic_Spearow, 2, 2, 0), overworld_frame(gObjectEventPic_Spearow, 2, 2, 1), overworld_frame(gObjectEventPic_Spearow, 2, 2, 2), @@ -1261,7 +1261,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Spearow[] = { overworld_frame(gObjectEventPic_Spearow, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Pidgeot[] = { +static const struct SpriteFrameImage sPicTable_Pidgeot[] = { overworld_frame(gObjectEventPic_Pidgeot, 2, 2, 0), overworld_frame(gObjectEventPic_Pidgeot, 2, 2, 1), overworld_frame(gObjectEventPic_Pidgeot, 2, 2, 2), @@ -1273,7 +1273,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Pidgeot[] = { overworld_frame(gObjectEventPic_Pidgeot, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Omanyte[] = { +static const struct SpriteFrameImage sPicTable_Omanyte[] = { overworld_frame(gObjectEventPic_Omanyte, 2, 2, 0), overworld_frame(gObjectEventPic_Omanyte, 2, 2, 1), overworld_frame(gObjectEventPic_Omanyte, 2, 2, 2), @@ -1285,7 +1285,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Omanyte[] = { overworld_frame(gObjectEventPic_Omanyte, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Kangaskhan[] = { +static const struct SpriteFrameImage sPicTable_Kangaskhan[] = { overworld_frame(gObjectEventPic_Kangaskhan, 2, 2, 0), overworld_frame(gObjectEventPic_Kangaskhan, 2, 2, 1), overworld_frame(gObjectEventPic_Kangaskhan, 2, 2, 2), @@ -1297,7 +1297,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Kangaskhan[] = { overworld_frame(gObjectEventPic_Kangaskhan, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Psyduck[] = { +static const struct SpriteFrameImage sPicTable_Psyduck[] = { overworld_frame(gObjectEventPic_Psyduck, 2, 2, 0), overworld_frame(gObjectEventPic_Psyduck, 2, 2, 1), overworld_frame(gObjectEventPic_Psyduck, 2, 2, 2), @@ -1309,7 +1309,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Psyduck[] = { overworld_frame(gObjectEventPic_Psyduck, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_NidoranF[] = { +static const struct SpriteFrameImage sPicTable_NidoranF[] = { overworld_frame(gObjectEventPic_NidoranF, 2, 2, 0), overworld_frame(gObjectEventPic_NidoranF, 2, 2, 1), overworld_frame(gObjectEventPic_NidoranF, 2, 2, 2), @@ -1321,7 +1321,7 @@ const struct SpriteFrameImage gObjectEventPicTable_NidoranF[] = { overworld_frame(gObjectEventPic_NidoranF, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_NidoranM[] = { +static const struct SpriteFrameImage sPicTable_NidoranM[] = { overworld_frame(gObjectEventPic_NidoranM, 2, 2, 0), overworld_frame(gObjectEventPic_NidoranM, 2, 2, 1), overworld_frame(gObjectEventPic_NidoranM, 2, 2, 2), @@ -1333,7 +1333,7 @@ const struct SpriteFrameImage gObjectEventPicTable_NidoranM[] = { overworld_frame(gObjectEventPic_NidoranM, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Nidorino[] = { +static const struct SpriteFrameImage sPicTable_Nidorino[] = { overworld_frame(gObjectEventPic_Nidorino, 2, 2, 0), overworld_frame(gObjectEventPic_Nidorino, 2, 2, 1), overworld_frame(gObjectEventPic_Nidorino, 2, 2, 2), @@ -1345,7 +1345,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Nidorino[] = { overworld_frame(gObjectEventPic_Nidorino, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Meowth[] = { +static const struct SpriteFrameImage sPicTable_Meowth[] = { overworld_frame(gObjectEventPic_Meowth, 2, 2, 0), overworld_frame(gObjectEventPic_Meowth, 2, 2, 1), overworld_frame(gObjectEventPic_Meowth, 2, 2, 2), @@ -1357,7 +1357,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Meowth[] = { overworld_frame(gObjectEventPic_Meowth, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Seel[] = { +static const struct SpriteFrameImage sPicTable_Seel[] = { overworld_frame(gObjectEventPic_Seel, 2, 2, 0), overworld_frame(gObjectEventPic_Seel, 2, 2, 1), overworld_frame(gObjectEventPic_Seel, 2, 2, 2), @@ -1369,7 +1369,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Seel[] = { overworld_frame(gObjectEventPic_Seel, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Voltorb[] = { +static const struct SpriteFrameImage sPicTable_Voltorb[] = { overworld_frame(gObjectEventPic_Voltorb, 2, 2, 0), overworld_frame(gObjectEventPic_Voltorb, 2, 2, 1), overworld_frame(gObjectEventPic_Voltorb, 2, 2, 2), @@ -1381,7 +1381,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Voltorb[] = { overworld_frame(gObjectEventPic_Voltorb, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Slowpoke[] = { +static const struct SpriteFrameImage sPicTable_Slowpoke[] = { overworld_frame(gObjectEventPic_Slowpoke, 2, 2, 0), overworld_frame(gObjectEventPic_Slowpoke, 2, 2, 1), overworld_frame(gObjectEventPic_Slowpoke, 2, 2, 2), @@ -1393,7 +1393,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Slowpoke[] = { overworld_frame(gObjectEventPic_Slowpoke, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Slowbro[] = { +static const struct SpriteFrameImage sPicTable_Slowbro[] = { overworld_frame(gObjectEventPic_Slowbro, 2, 2, 0), overworld_frame(gObjectEventPic_Slowbro, 2, 2, 1), overworld_frame(gObjectEventPic_Slowbro, 2, 2, 2), @@ -1405,7 +1405,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Slowbro[] = { overworld_frame(gObjectEventPic_Slowbro, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Machop[] = { +static const struct SpriteFrameImage sPicTable_Machop[] = { overworld_frame(gObjectEventPic_Machop, 2, 2, 0), overworld_frame(gObjectEventPic_Machop, 2, 2, 1), overworld_frame(gObjectEventPic_Machop, 2, 2, 2), @@ -1417,7 +1417,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Machop[] = { overworld_frame(gObjectEventPic_Machop, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Wigglytuff[] = { +static const struct SpriteFrameImage sPicTable_Wigglytuff[] = { overworld_frame(gObjectEventPic_Wigglytuff, 2, 2, 0), overworld_frame(gObjectEventPic_Wigglytuff, 2, 2, 1), overworld_frame(gObjectEventPic_Wigglytuff, 2, 2, 2), @@ -1429,7 +1429,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Wigglytuff[] = { overworld_frame(gObjectEventPic_Wigglytuff, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Doduo[] = { +static const struct SpriteFrameImage sPicTable_Doduo[] = { overworld_frame(gObjectEventPic_Doduo, 2, 2, 0), overworld_frame(gObjectEventPic_Doduo, 2, 2, 1), overworld_frame(gObjectEventPic_Doduo, 2, 2, 2), @@ -1441,7 +1441,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Doduo[] = { overworld_frame(gObjectEventPic_Doduo, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Fearow[] = { +static const struct SpriteFrameImage sPicTable_Fearow[] = { overworld_frame(gObjectEventPic_Fearow, 2, 2, 0), overworld_frame(gObjectEventPic_Fearow, 2, 2, 1), overworld_frame(gObjectEventPic_Fearow, 2, 2, 2), @@ -1453,7 +1453,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Fearow[] = { overworld_frame(gObjectEventPic_Fearow, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Lapras[] = { +static const struct SpriteFrameImage sPicTable_Lapras[] = { overworld_frame(gObjectEventPic_Lapras, 2, 2, 0), overworld_frame(gObjectEventPic_Lapras, 2, 2, 1), overworld_frame(gObjectEventPic_Lapras, 2, 2, 2), @@ -1465,7 +1465,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Lapras[] = { overworld_frame(gObjectEventPic_Lapras, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Zapdos[] = { +static const struct SpriteFrameImage sPicTable_Zapdos[] = { overworld_frame(gObjectEventPic_Zapdos, 4, 4, 0), overworld_frame(gObjectEventPic_Zapdos, 4, 4, 0), overworld_frame(gObjectEventPic_Zapdos, 4, 4, 0), @@ -1477,7 +1477,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Zapdos[] = { overworld_frame(gObjectEventPic_Zapdos, 4, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Moltres[] = { +static const struct SpriteFrameImage sPicTable_Moltres[] = { overworld_frame(gObjectEventPic_Moltres, 4, 4, 0), overworld_frame(gObjectEventPic_Moltres, 4, 4, 0), overworld_frame(gObjectEventPic_Moltres, 4, 4, 0), @@ -1489,7 +1489,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Moltres[] = { overworld_frame(gObjectEventPic_Moltres, 4, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Articuno[] = { +static const struct SpriteFrameImage sPicTable_Articuno[] = { overworld_frame(gObjectEventPic_Articuno, 4, 4, 0), overworld_frame(gObjectEventPic_Articuno, 4, 4, 0), overworld_frame(gObjectEventPic_Articuno, 4, 4, 0), @@ -1501,7 +1501,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Articuno[] = { overworld_frame(gObjectEventPic_Articuno, 4, 4, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_DeoxysD[] = { +static const struct SpriteFrameImage sPicTable_DeoxysD[] = { overworld_frame(gObjectEventPic_DeoxysD, 4, 4, 0), overworld_frame(gObjectEventPic_DeoxysD, 4, 4, 0), overworld_frame(gObjectEventPic_DeoxysD, 4, 4, 0), @@ -1513,7 +1513,7 @@ const struct SpriteFrameImage gObjectEventPicTable_DeoxysD[] = { overworld_frame(gObjectEventPic_DeoxysD, 4, 4, 1), }; -const struct SpriteFrameImage gObjectEventPicTable_DeoxysA[] = { +static const struct SpriteFrameImage sPicTable_DeoxysA[] = { overworld_frame(gObjectEventPic_DeoxysA, 4, 4, 0), overworld_frame(gObjectEventPic_DeoxysA, 4, 4, 0), overworld_frame(gObjectEventPic_DeoxysA, 4, 4, 0), @@ -1525,7 +1525,7 @@ const struct SpriteFrameImage gObjectEventPicTable_DeoxysA[] = { overworld_frame(gObjectEventPic_DeoxysA, 4, 4, 1), }; -const struct SpriteFrameImage gObjectEventPicTable_DeoxysN[] = { +static const struct SpriteFrameImage sPicTable_DeoxysN[] = { overworld_frame(gObjectEventPic_DeoxysN, 4, 4, 0), overworld_frame(gObjectEventPic_DeoxysN, 4, 4, 0), overworld_frame(gObjectEventPic_DeoxysN, 4, 4, 0), @@ -1537,7 +1537,7 @@ const struct SpriteFrameImage gObjectEventPicTable_DeoxysN[] = { overworld_frame(gObjectEventPic_DeoxysN, 4, 4, 1), }; -const struct SpriteFrameImage gObjectEventPicTable_Mewtwo[] = { +static const struct SpriteFrameImage sPicTable_Mewtwo[] = { overworld_frame(gObjectEventPic_Mewtwo, 2, 2, 0), overworld_frame(gObjectEventPic_Mewtwo, 2, 2, 0), overworld_frame(gObjectEventPic_Mewtwo, 2, 2, 0), @@ -1549,7 +1549,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Mewtwo[] = { overworld_frame(gObjectEventPic_Mewtwo, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Mew[] = { +static const struct SpriteFrameImage sPicTable_Mew[] = { overworld_frame(gObjectEventPic_Mew, 2, 2, 0), overworld_frame(gObjectEventPic_Mew, 2, 2, 0), overworld_frame(gObjectEventPic_Mew, 2, 2, 0), @@ -1561,7 +1561,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Mew[] = { overworld_frame(gObjectEventPic_Mew, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Entei[] = { +static const struct SpriteFrameImage sPicTable_Entei[] = { overworld_frame(gObjectEventPic_Entei, 2, 2, 0), overworld_frame(gObjectEventPic_Entei, 2, 2, 0), overworld_frame(gObjectEventPic_Entei, 2, 2, 0), @@ -1573,7 +1573,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Entei[] = { overworld_frame(gObjectEventPic_Entei, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Raikou[] = { +static const struct SpriteFrameImage sPicTable_Raikou[] = { overworld_frame(gObjectEventPic_Raikou, 2, 2, 0), overworld_frame(gObjectEventPic_Raikou, 2, 2, 0), overworld_frame(gObjectEventPic_Raikou, 2, 2, 0), @@ -1585,7 +1585,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Raikou[] = { overworld_frame(gObjectEventPic_Raikou, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Suicune[] = { +static const struct SpriteFrameImage sPicTable_Suicune[] = { overworld_frame(gObjectEventPic_Suicune, 2, 2, 0), overworld_frame(gObjectEventPic_Suicune, 2, 2, 0), overworld_frame(gObjectEventPic_Suicune, 2, 2, 0), @@ -1597,7 +1597,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Suicune[] = { overworld_frame(gObjectEventPic_Suicune, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Lugia[] = { +static const struct SpriteFrameImage sPicTable_Lugia[] = { overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), overworld_frame(gObjectEventPic_Lugia, 4, 4, 0), @@ -1609,7 +1609,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Lugia[] = { overworld_frame(gObjectEventPic_Lugia, 4, 4, 1), }; -const struct SpriteFrameImage gObjectEventPicTable_HoOh[] = { +static const struct SpriteFrameImage sPicTable_HoOh[] = { overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), overworld_frame(gObjectEventPic_HoOh, 4, 4, 0), @@ -1621,7 +1621,7 @@ const struct SpriteFrameImage gObjectEventPicTable_HoOh[] = { overworld_frame(gObjectEventPic_HoOh, 4, 4, 1), }; -const struct SpriteFrameImage gObjectEventPicTable_Celebi[] = { +static const struct SpriteFrameImage sPicTable_Celebi[] = { overworld_frame(gObjectEventPic_Celebi, 2, 2, 0), overworld_frame(gObjectEventPic_Celebi, 2, 2, 0), overworld_frame(gObjectEventPic_Celebi, 2, 2, 0), @@ -1633,7 +1633,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Celebi[] = { overworld_frame(gObjectEventPic_Celebi, 2, 2, 0), }; -const struct SpriteFrameImage gObjectEventPicTable_Cubone[] = { +static const struct SpriteFrameImage sPicTable_Cubone[] = { overworld_frame(gObjectEventPic_Cubone, 2, 2, 0), overworld_frame(gObjectEventPic_Cubone, 2, 2, 1), overworld_frame(gObjectEventPic_Cubone, 2, 2, 2), @@ -1645,7 +1645,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Cubone[] = { overworld_frame(gObjectEventPic_Cubone, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Poliwrath[] = { +static const struct SpriteFrameImage sPicTable_Poliwrath[] = { overworld_frame(gObjectEventPic_Poliwrath, 2, 2, 0), overworld_frame(gObjectEventPic_Poliwrath, 2, 2, 1), overworld_frame(gObjectEventPic_Poliwrath, 2, 2, 2), @@ -1657,7 +1657,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Poliwrath[] = { overworld_frame(gObjectEventPic_Poliwrath, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Chansey[] = { +static const struct SpriteFrameImage sPicTable_Chansey[] = { overworld_frame(gObjectEventPic_Chansey, 2, 2, 0), overworld_frame(gObjectEventPic_Chansey, 2, 2, 1), overworld_frame(gObjectEventPic_Chansey, 2, 2, 2), @@ -1669,7 +1669,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Chansey[] = { overworld_frame(gObjectEventPic_Chansey, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Pikachu[] = { +static const struct SpriteFrameImage sPicTable_Pikachu[] = { overworld_frame(gObjectEventPic_Pikachu, 2, 2, 0), overworld_frame(gObjectEventPic_Pikachu, 2, 2, 1), overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), @@ -1681,7 +1681,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Pikachu[] = { overworld_frame(gObjectEventPic_Pikachu, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Jigglypuff[] = { +static const struct SpriteFrameImage sPicTable_Jigglypuff[] = { overworld_frame(gObjectEventPic_Jigglypuff, 2, 2, 0), overworld_frame(gObjectEventPic_Jigglypuff, 2, 2, 1), overworld_frame(gObjectEventPic_Jigglypuff, 2, 2, 2), @@ -1693,7 +1693,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Jigglypuff[] = { overworld_frame(gObjectEventPic_Jigglypuff, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Pidgey[] = { +static const struct SpriteFrameImage sPicTable_Pidgey[] = { overworld_frame(gObjectEventPic_Pidgey, 2, 2, 0), overworld_frame(gObjectEventPic_Pidgey, 2, 2, 1), overworld_frame(gObjectEventPic_Pidgey, 2, 2, 2), @@ -1705,7 +1705,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Pidgey[] = { overworld_frame(gObjectEventPic_Pidgey, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Clefairy[] = { +static const struct SpriteFrameImage sPicTable_Clefairy[] = { overworld_frame(gObjectEventPic_Clefairy, 2, 2, 0), overworld_frame(gObjectEventPic_Clefairy, 2, 2, 1), overworld_frame(gObjectEventPic_Clefairy, 2, 2, 2), @@ -1717,7 +1717,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Clefairy[] = { overworld_frame(gObjectEventPic_Clefairy, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Machoke[] = { +static const struct SpriteFrameImage sPicTable_Machoke[] = { overworld_frame(gObjectEventPic_Machoke, 2, 2, 0), overworld_frame(gObjectEventPic_Machoke, 2, 2, 1), overworld_frame(gObjectEventPic_Machoke, 2, 2, 2), @@ -1729,7 +1729,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Machoke[] = { overworld_frame(gObjectEventPic_Machoke, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Kabuto[] = { +static const struct SpriteFrameImage sPicTable_Kabuto[] = { overworld_frame(gObjectEventPic_Kabuto, 2, 2, 0), overworld_frame(gObjectEventPic_Kabuto, 2, 2, 1), overworld_frame(gObjectEventPic_Kabuto, 2, 2, 2), @@ -1741,7 +1741,7 @@ const struct SpriteFrameImage gObjectEventPicTable_Kabuto[] = { overworld_frame(gObjectEventPic_Kabuto, 2, 2, 2), }; -const struct SpriteFrameImage gObjectEventPicTable_Mom[] = { +static const struct SpriteFrameImage sPicTable_Mom[] = { overworld_frame(gObjectEventPic_Mom, 2, 4, 0), overworld_frame(gObjectEventPic_Mom, 2, 4, 1), overworld_frame(gObjectEventPic_Mom, 2, 4, 2), diff --git a/src/event_object_movement.c b/src/event_object_movement.c index c304b8b52..099211d4c 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -282,31 +282,11 @@ static void (*const sMovementTypeCallbacks[MOVEMENT_TYPES_COUNT])(struct Sprite }; static const bool8 gRangedMovementTypes[MOVEMENT_TYPES_COUNT] = { - [MOVEMENT_TYPE_NONE] = FALSE, - [MOVEMENT_TYPE_LOOK_AROUND] = FALSE, [MOVEMENT_TYPE_WANDER_AROUND] = TRUE, [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = TRUE, [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = TRUE, [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = TRUE, [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = TRUE, - [MOVEMENT_TYPE_FACE_UP] = FALSE, - [MOVEMENT_TYPE_FACE_DOWN] = FALSE, - [MOVEMENT_TYPE_FACE_LEFT] = FALSE, - [MOVEMENT_TYPE_FACE_RIGHT] = FALSE, - [MOVEMENT_TYPE_PLAYER] = FALSE, - [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = FALSE, - [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = FALSE, - [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = FALSE, - [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = FALSE, - [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = FALSE, - [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = FALSE, - [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = FALSE, - [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = FALSE, - [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = FALSE, - [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = FALSE, - [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = FALSE, - [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = FALSE, - [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = FALSE, [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = TRUE, [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = TRUE, [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = TRUE, @@ -339,29 +319,10 @@ static const bool8 gRangedMovementTypes[MOVEMENT_TYPES_COUNT] = { [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = TRUE, [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = TRUE, [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = TRUE, - [MOVEMENT_TYPE_TREE_DISGUISE] = FALSE, - [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = FALSE, [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = TRUE, [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = TRUE, [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = TRUE, [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = TRUE, - [MOVEMENT_TYPE_BURIED] = FALSE, - [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = FALSE, - [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = FALSE, - [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = FALSE, - [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = FALSE, - [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = FALSE, - [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = FALSE, - [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = FALSE, - [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = FALSE, - [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = FALSE, - [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = FALSE, - [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = FALSE, - [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = FALSE, - [MOVEMENT_TYPE_INVISIBLE] = FALSE, - [MOVEMENT_TYPE_VS_SEEKER_4D] = FALSE, - [MOVEMENT_TYPE_VS_SEEKER_4E] = FALSE, - [MOVEMENT_TYPE_VS_SEEKER_4F] = FALSE, [MOVEMENT_TYPE_WANDER_AROUND_SLOWER] = TRUE, }; @@ -691,208 +652,208 @@ static const s16 gMovementDelaysShort[] = {32, 48, 64, 80}; #include "data/object_events/movement_type_func_tables.h" -static const u8 gFaceDirectionAnimNums[] = { - [DIR_NONE] = 0x00, - [DIR_SOUTH] = 0x00, - [DIR_NORTH] = 0x01, - [DIR_WEST] = 0x02, - [DIR_EAST] = 0x03, - [DIR_SOUTHWEST] = 0x00, - [DIR_SOUTHEAST] = 0x00, - [DIR_NORTHWEST] = 0x01, - [DIR_NORTHEAST] = 0x01, +static const u8 sFaceDirectionAnimNums[] = { + [DIR_NONE] = ANIM_STD_FACE_SOUTH, + [DIR_SOUTH] = ANIM_STD_FACE_SOUTH, + [DIR_NORTH] = ANIM_STD_FACE_NORTH, + [DIR_WEST] = ANIM_STD_FACE_WEST, + [DIR_EAST] = ANIM_STD_FACE_EAST, + [DIR_SOUTHWEST] = ANIM_STD_FACE_SOUTH, + [DIR_SOUTHEAST] = ANIM_STD_FACE_SOUTH, + [DIR_NORTHWEST] = ANIM_STD_FACE_NORTH, + [DIR_NORTHEAST] = ANIM_STD_FACE_NORTH, }; -static const u8 gMoveDirectionAnimNums[] = { - [DIR_NONE] = 0x4, - [DIR_SOUTH] = 0x4, - [DIR_NORTH] = 0x5, - [DIR_WEST] = 0x6, - [DIR_EAST] = 0x7, - [DIR_SOUTHWEST] = 0x4, - [DIR_SOUTHEAST] = 0x4, - [DIR_NORTHWEST] = 0x5, - [DIR_NORTHEAST] = 0x5, +static const u8 sMoveDirectionAnimNums[] = { + [DIR_NONE] = ANIM_STD_GO_SOUTH, + [DIR_SOUTH] = ANIM_STD_GO_SOUTH, + [DIR_NORTH] = ANIM_STD_GO_NORTH, + [DIR_WEST] = ANIM_STD_GO_WEST, + [DIR_EAST] = ANIM_STD_GO_EAST, + [DIR_SOUTHWEST] = ANIM_STD_GO_SOUTH, + [DIR_SOUTHEAST] = ANIM_STD_GO_SOUTH, + [DIR_NORTHWEST] = ANIM_STD_GO_NORTH, + [DIR_NORTHEAST] = ANIM_STD_GO_NORTH, }; -static const u8 gMoveDirectionFastAnimNums[] = { - [DIR_NONE] = 0x8, - [DIR_SOUTH] = 0x8, - [DIR_NORTH] = 0x9, - [DIR_WEST] = 0xA, - [DIR_EAST] = 0xB, - [DIR_SOUTHWEST] = 0x8, - [DIR_SOUTHEAST] = 0x8, - [DIR_NORTHWEST] = 0x9, - [DIR_NORTHEAST] = 0x9, +static const u8 sMoveDirectionFastAnimNums[] = { + [DIR_NONE] = ANIM_STD_GO_FAST_SOUTH, + [DIR_SOUTH] = ANIM_STD_GO_FAST_SOUTH, + [DIR_NORTH] = ANIM_STD_GO_FAST_NORTH, + [DIR_WEST] = ANIM_STD_GO_FAST_WEST, + [DIR_EAST] = ANIM_STD_GO_FAST_EAST, + [DIR_SOUTHWEST] = ANIM_STD_GO_FAST_SOUTH, + [DIR_SOUTHEAST] = ANIM_STD_GO_FAST_SOUTH, + [DIR_NORTHWEST] = ANIM_STD_GO_FAST_NORTH, + [DIR_NORTHEAST] = ANIM_STD_GO_FAST_NORTH, }; -static const u8 gMoveDirectionFasterAnimNums[] = { - [DIR_NONE] = 0xC, - [DIR_SOUTH] = 0xC, - [DIR_NORTH] = 0xD, - [DIR_WEST] = 0xE, - [DIR_EAST] = 0xF, - [DIR_SOUTHWEST] = 0xC, - [DIR_SOUTHEAST] = 0xC, - [DIR_NORTHWEST] = 0xD, - [DIR_NORTHEAST] = 0xD, +static const u8 sMoveDirectionFasterAnimNums[] = { + [DIR_NONE] = ANIM_STD_GO_FASTER_SOUTH, + [DIR_SOUTH] = ANIM_STD_GO_FASTER_SOUTH, + [DIR_NORTH] = ANIM_STD_GO_FASTER_NORTH, + [DIR_WEST] = ANIM_STD_GO_FASTER_WEST, + [DIR_EAST] = ANIM_STD_GO_FASTER_EAST, + [DIR_SOUTHWEST] = ANIM_STD_GO_FASTER_SOUTH, + [DIR_SOUTHEAST] = ANIM_STD_GO_FASTER_SOUTH, + [DIR_NORTHWEST] = ANIM_STD_GO_FASTER_NORTH, + [DIR_NORTHEAST] = ANIM_STD_GO_FASTER_NORTH, }; -static const u8 gMoveDirectionFastestAnimNums[] = { - [DIR_NONE] = 0x10, - [DIR_SOUTH] = 0x10, - [DIR_NORTH] = 0x11, - [DIR_WEST] = 0x12, - [DIR_EAST] = 0x13, - [DIR_SOUTHWEST] = 0x10, - [DIR_SOUTHEAST] = 0x10, - [DIR_NORTHWEST] = 0x11, - [DIR_NORTHEAST] = 0x11, +static const u8 sMoveDirectionFastestAnimNums[] = { + [DIR_NONE] = ANIM_STD_GO_FASTEST_SOUTH, + [DIR_SOUTH] = ANIM_STD_GO_FASTEST_SOUTH, + [DIR_NORTH] = ANIM_STD_GO_FASTEST_NORTH, + [DIR_WEST] = ANIM_STD_GO_FASTEST_WEST, + [DIR_EAST] = ANIM_STD_GO_FASTEST_EAST, + [DIR_SOUTHWEST] = ANIM_STD_GO_FASTEST_SOUTH, + [DIR_SOUTHEAST] = ANIM_STD_GO_FASTEST_SOUTH, + [DIR_NORTHWEST] = ANIM_STD_GO_FASTEST_NORTH, + [DIR_NORTHEAST] = ANIM_STD_GO_FASTEST_NORTH, }; -static const u8 gJumpSpecialDirectionAnimNums[] = { - [DIR_NONE] = 0x14, - [DIR_SOUTH] = 0x14, - [DIR_NORTH] = 0x15, - [DIR_WEST] = 0x16, - [DIR_EAST] = 0x17, - [DIR_SOUTHWEST] = 0x14, - [DIR_SOUTHEAST] = 0x14, - [DIR_NORTHWEST] = 0x15, - [DIR_NORTHEAST] = 0x15, +static const u8 sJumpSpecialDirectionAnimNums[] = { + [DIR_NONE] = ANIM_GET_ON_OFF_POKEMON_SOUTH, + [DIR_SOUTH] = ANIM_GET_ON_OFF_POKEMON_SOUTH, + [DIR_NORTH] = ANIM_GET_ON_OFF_POKEMON_NORTH, + [DIR_WEST] = ANIM_GET_ON_OFF_POKEMON_WEST, + [DIR_EAST] = ANIM_GET_ON_OFF_POKEMON_EAST, + [DIR_SOUTHWEST] = ANIM_GET_ON_OFF_POKEMON_SOUTH, + [DIR_SOUTHEAST] = ANIM_GET_ON_OFF_POKEMON_SOUTH, + [DIR_NORTHWEST] = ANIM_GET_ON_OFF_POKEMON_NORTH, + [DIR_NORTHEAST] = ANIM_GET_ON_OFF_POKEMON_NORTH, }; -static const u8 gAcroWheelieDirectionAnimNums[] = { - [DIR_NONE] = 0x14, - [DIR_SOUTH] = 0x14, - [DIR_NORTH] = 0x15, - [DIR_WEST] = 0x16, - [DIR_EAST] = 0x17, - [DIR_SOUTHWEST] = 0x14, - [DIR_SOUTHEAST] = 0x14, - [DIR_NORTHWEST] = 0x15, - [DIR_NORTHEAST] = 0x15, +static const u8 sAcroBunnyHopBackWheelDirectionAnimNums[] = { + [DIR_NONE] = ANIM_BUNNY_HOP_BACK_WHEEL_SOUTH, + [DIR_SOUTH] = ANIM_BUNNY_HOP_BACK_WHEEL_SOUTH, + [DIR_NORTH] = ANIM_BUNNY_HOP_BACK_WHEEL_NORTH, + [DIR_WEST] = ANIM_BUNNY_HOP_BACK_WHEEL_WEST, + [DIR_EAST] = ANIM_BUNNY_HOP_BACK_WHEEL_EAST, + [DIR_SOUTHWEST] = ANIM_BUNNY_HOP_BACK_WHEEL_SOUTH, + [DIR_SOUTHEAST] = ANIM_BUNNY_HOP_BACK_WHEEL_SOUTH, + [DIR_NORTHWEST] = ANIM_BUNNY_HOP_BACK_WHEEL_NORTH, + [DIR_NORTHEAST] = ANIM_BUNNY_HOP_BACK_WHEEL_NORTH, }; -static const u8 gUnrefAnimNums_080634A0[] = { - [DIR_NONE] = 0x18, - [DIR_SOUTH] = 0x18, - [DIR_NORTH] = 0x19, - [DIR_WEST] = 0x1A, - [DIR_EAST] = 0x1B, - [DIR_SOUTHWEST] = 0x18, - [DIR_SOUTHEAST] = 0x18, - [DIR_NORTHWEST] = 0x19, - [DIR_NORTHEAST] = 0x19, +static const u8 sAcroBunnyHopFrontWheelDirectionAnimNums[] = { + [DIR_NONE] = ANIM_BUNNY_HOP_FRONT_WHEEL_SOUTH, + [DIR_SOUTH] = ANIM_BUNNY_HOP_FRONT_WHEEL_SOUTH, + [DIR_NORTH] = ANIM_BUNNY_HOP_FRONT_WHEEL_NORTH, + [DIR_WEST] = ANIM_BUNNY_HOP_FRONT_WHEEL_WEST, + [DIR_EAST] = ANIM_BUNNY_HOP_FRONT_WHEEL_EAST, + [DIR_SOUTHWEST] = ANIM_BUNNY_HOP_FRONT_WHEEL_SOUTH, + [DIR_SOUTHEAST] = ANIM_BUNNY_HOP_FRONT_WHEEL_SOUTH, + [DIR_NORTHWEST] = ANIM_BUNNY_HOP_FRONT_WHEEL_NORTH, + [DIR_NORTHEAST] = ANIM_BUNNY_HOP_FRONT_WHEEL_NORTH, }; -static const u8 gAcroEndWheelieDirectionAnimNums[] = { - [DIR_NONE] = 0x1C, - [DIR_SOUTH] = 0x1C, - [DIR_NORTH] = 0x1D, - [DIR_WEST] = 0x1E, - [DIR_EAST] = 0x1F, - [DIR_SOUTHWEST] = 0x1C, - [DIR_SOUTHEAST] = 0x1C, - [DIR_NORTHWEST] = 0x1D, - [DIR_NORTHEAST] = 0x1D, +static const u8 sAcroStandingWheelieBackWheelDirectionAnimNums[] = { + [DIR_NONE] = ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH, + [DIR_SOUTH] = ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH, + [DIR_NORTH] = ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH, + [DIR_WEST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_WEST, + [DIR_EAST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_EAST, + [DIR_SOUTHWEST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH, + [DIR_SOUTHEAST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_SOUTH, + [DIR_NORTHWEST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH, + [DIR_NORTHEAST] = ANIM_STANDING_WHEELIE_BACK_WHEEL_NORTH, }; -static const u8 gUnknown_83A6465[] = { - [DIR_NONE] = 0x18, - [DIR_SOUTH] = 0x18, - [DIR_NORTH] = 0x19, - [DIR_WEST] = 0x1A, - [DIR_EAST] = 0x1B, - [DIR_SOUTHWEST] = 0x18, - [DIR_SOUTHEAST] = 0x19, - [DIR_NORTHWEST] = 0x1A, - [DIR_NORTHEAST] = 0x1B, +static const u8 sSpinDirectionAnimNums[] = { + [DIR_NONE] = ANIM_SPIN_SOUTH, + [DIR_SOUTH] = ANIM_SPIN_SOUTH, + [DIR_NORTH] = ANIM_SPIN_NORTH, + [DIR_WEST] = ANIM_SPIN_WEST, + [DIR_EAST] = ANIM_SPIN_EAST, + [DIR_SOUTHWEST] = ANIM_SPIN_SOUTH, + [DIR_SOUTHEAST] = ANIM_SPIN_NORTH, + [DIR_NORTHWEST] = ANIM_SPIN_WEST, + [DIR_NORTHEAST] = ANIM_SPIN_EAST, }; -static const u8 gAcroUnusedActionDirectionAnimNums[] = { - [DIR_NONE] = 0x20, - [DIR_SOUTH] = 0x20, - [DIR_NORTH] = 0x21, - [DIR_WEST] = 0x22, - [DIR_EAST] = 0x23, - [DIR_SOUTHWEST] = 0x20, - [DIR_SOUTHEAST] = 0x20, - [DIR_NORTHWEST] = 0x21, - [DIR_NORTHEAST] = 0x21, +static const u8 sAcroStandingWheelieFrontWheelDirectionAnimNums[] = { + [DIR_NONE] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH, + [DIR_SOUTH] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH, + [DIR_NORTH] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_NORTH, + [DIR_WEST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_WEST, + [DIR_EAST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_EAST, + [DIR_SOUTHWEST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH, + [DIR_SOUTHEAST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_SOUTH, + [DIR_NORTHWEST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_NORTH, + [DIR_NORTHEAST] = ANIM_STANDING_WHEELIE_FRONT_WHEEL_NORTH, }; -static const u8 gAcroWheeliePedalDirectionAnimNums[] = { - [DIR_NONE] = 0x24, - [DIR_SOUTH] = 0x24, - [DIR_NORTH] = 0x25, - [DIR_WEST] = 0x26, - [DIR_EAST] = 0x27, - [DIR_SOUTHWEST] = 0x24, - [DIR_SOUTHEAST] = 0x24, - [DIR_NORTHWEST] = 0x25, - [DIR_NORTHEAST] = 0x25, +static const u8 sAcroMovingWheelieDirectionAnimNums[] = { + [DIR_NONE] = ANIM_MOVING_WHEELIE_SOUTH, + [DIR_SOUTH] = ANIM_MOVING_WHEELIE_SOUTH, + [DIR_NORTH] = ANIM_MOVING_WHEELIE_NORTH, + [DIR_WEST] = ANIM_MOVING_WHEELIE_WEST, + [DIR_EAST] = ANIM_MOVING_WHEELIE_EAST, + [DIR_SOUTHWEST] = ANIM_MOVING_WHEELIE_SOUTH, + [DIR_SOUTHEAST] = ANIM_MOVING_WHEELIE_SOUTH, + [DIR_NORTHWEST] = ANIM_MOVING_WHEELIE_NORTH, + [DIR_NORTHEAST] = ANIM_MOVING_WHEELIE_NORTH, }; -static const u8 gFishingDirectionAnimNums[] = { - [DIR_NONE] = 0x0, - [DIR_SOUTH] = 0x0, - [DIR_NORTH] = 0x1, - [DIR_WEST] = 0x2, - [DIR_EAST] = 0x3, - [DIR_SOUTHWEST] = 0x0, - [DIR_SOUTHEAST] = 0x0, - [DIR_NORTHWEST] = 0x1, - [DIR_NORTHEAST] = 0x1, +static const u8 sFishingDirectionAnimNums[] = { + [DIR_NONE] = ANIM_TAKE_OUT_ROD_SOUTH, + [DIR_SOUTH] = ANIM_TAKE_OUT_ROD_SOUTH, + [DIR_NORTH] = ANIM_TAKE_OUT_ROD_NORTH, + [DIR_WEST] = ANIM_TAKE_OUT_ROD_WEST, + [DIR_EAST] = ANIM_TAKE_OUT_ROD_EAST, + [DIR_SOUTHWEST] = ANIM_TAKE_OUT_ROD_SOUTH, + [DIR_SOUTHEAST] = ANIM_TAKE_OUT_ROD_SOUTH, + [DIR_NORTHWEST] = ANIM_TAKE_OUT_ROD_NORTH, + [DIR_NORTHEAST] = ANIM_TAKE_OUT_ROD_NORTH, }; -static const u8 gFishingNoCatchDirectionAnimNums[] = { - [DIR_NONE] = 0x4, - [DIR_SOUTH] = 0x4, - [DIR_NORTH] = 0x5, - [DIR_WEST] = 0x6, - [DIR_EAST] = 0x7, - [DIR_SOUTHWEST] = 0x4, - [DIR_SOUTHEAST] = 0x4, - [DIR_NORTHWEST] = 0x5, - [DIR_NORTHEAST] = 0x5, +static const u8 sFishingNoCatchDirectionAnimNums[] = { + [DIR_NONE] = ANIM_PUT_AWAY_ROD_SOUTH, + [DIR_SOUTH] = ANIM_PUT_AWAY_ROD_SOUTH, + [DIR_NORTH] = ANIM_PUT_AWAY_ROD_NORTH, + [DIR_WEST] = ANIM_PUT_AWAY_ROD_WEST, + [DIR_EAST] = ANIM_PUT_AWAY_ROD_EAST, + [DIR_SOUTHWEST] = ANIM_PUT_AWAY_ROD_SOUTH, + [DIR_SOUTHEAST] = ANIM_PUT_AWAY_ROD_SOUTH, + [DIR_NORTHWEST] = ANIM_PUT_AWAY_ROD_NORTH, + [DIR_NORTHEAST] = ANIM_PUT_AWAY_ROD_NORTH, }; -static const u8 gFishingBiteDirectionAnimNums[] = { - [DIR_NONE] = 0x8, - [DIR_SOUTH] = 0x8, - [DIR_NORTH] = 0x9, - [DIR_WEST] = 0xA, - [DIR_EAST] = 0xB, - [DIR_SOUTHWEST] = 0x8, - [DIR_SOUTHEAST] = 0x8, - [DIR_NORTHWEST] = 0x9, - [DIR_NORTHEAST] = 0x9, +static const u8 sFishingBiteDirectionAnimNums[] = { + [DIR_NONE] = ANIM_HOOKED_POKEMON_SOUTH, + [DIR_SOUTH] = ANIM_HOOKED_POKEMON_SOUTH, + [DIR_NORTH] = ANIM_HOOKED_POKEMON_NORTH, + [DIR_WEST] = ANIM_HOOKED_POKEMON_WEST, + [DIR_EAST] = ANIM_HOOKED_POKEMON_EAST, + [DIR_SOUTHWEST] = ANIM_HOOKED_POKEMON_SOUTH, + [DIR_SOUTHEAST] = ANIM_HOOKED_POKEMON_SOUTH, + [DIR_NORTHWEST] = ANIM_HOOKED_POKEMON_NORTH, + [DIR_NORTHEAST] = ANIM_HOOKED_POKEMON_NORTH, }; -static const u8 gRunningDirectionAnimNums[] = { - [DIR_NONE] = 0x14, - [DIR_SOUTH] = 0x14, - [DIR_NORTH] = 0x15, - [DIR_WEST] = 0x16, - [DIR_EAST] = 0x17, - [DIR_SOUTHWEST] = 0x14, - [DIR_SOUTHEAST] = 0x14, - [DIR_NORTHWEST] = 0x15, - [DIR_NORTHEAST] = 0x15, +static const u8 sRunningDirectionAnimNums[] = { + [DIR_NONE] = ANIM_RUN_SOUTH, + [DIR_SOUTH] = ANIM_RUN_SOUTH, + [DIR_NORTH] = ANIM_RUN_NORTH, + [DIR_WEST] = ANIM_RUN_WEST, + [DIR_EAST] = ANIM_RUN_EAST, + [DIR_SOUTHWEST] = ANIM_RUN_SOUTH, + [DIR_SOUTHEAST] = ANIM_RUN_SOUTH, + [DIR_NORTHWEST] = ANIM_RUN_NORTH, + [DIR_NORTHEAST] = ANIM_RUN_NORTH, }; -static const u8 gTrainerFacingDirectionMovementTypes[] = { - [DIR_NONE] = 0x08, - [DIR_SOUTH] = 0x08, - [DIR_NORTH] = 0x07, - [DIR_WEST] = 0x09, - [DIR_EAST] = 0x0A, - [DIR_SOUTHWEST] = 0x08, - [DIR_SOUTHEAST] = 0x08, - [DIR_NORTHWEST] = 0x07, - [DIR_NORTHEAST] = 0x07, +static const u8 sTrainerFacingDirectionMovementTypes[] = { + [DIR_NONE] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_SOUTH] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_NORTH] = MOVEMENT_TYPE_FACE_UP, + [DIR_WEST] = MOVEMENT_TYPE_FACE_LEFT, + [DIR_EAST] = MOVEMENT_TYPE_FACE_RIGHT, + [DIR_SOUTHWEST] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_SOUTHEAST] = MOVEMENT_TYPE_FACE_DOWN, + [DIR_NORTHWEST] = MOVEMENT_TYPE_FACE_UP, + [DIR_NORTHEAST] = MOVEMENT_TYPE_FACE_UP, }; bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = { @@ -4702,89 +4663,89 @@ static void ClearObjectEventMovement(struct ObjectEvent *objectEvent, struct Spr u8 GetFaceDirectionAnimNum(u8 direction) { - return gFaceDirectionAnimNums[direction]; + return sFaceDirectionAnimNums[direction]; } u8 GetMoveDirectionAnimNum(u8 direction) { - return gMoveDirectionAnimNums[direction]; + return sMoveDirectionAnimNums[direction]; } static u8 GetMoveDirectionFastAnimNum(u8 direction) { - return gMoveDirectionFastAnimNums[direction]; + return sMoveDirectionFastAnimNums[direction]; } static u8 GetMoveDirectionFasterAnimNum(u8 direction) { - return gMoveDirectionFasterAnimNums[direction]; + return sMoveDirectionFasterAnimNums[direction]; } static u8 GetMoveDirectionFastestAnimNum(u8 direction) { - return gMoveDirectionFastestAnimNums[direction]; + return sMoveDirectionFastestAnimNums[direction]; } u8 GetJumpSpecialDirectionAnimNum(u8 direction) { - return gJumpSpecialDirectionAnimNums[direction]; + return sJumpSpecialDirectionAnimNums[direction]; } u8 GetAcroWheelieDirectionAnimNum(u8 direction) { - return gAcroWheelieDirectionAnimNums[direction]; + return sAcroBunnyHopBackWheelDirectionAnimNums[direction]; } u8 Unref_GetAnimNums_080634A0(u8 direction) { - return gUnrefAnimNums_080634A0[direction]; + return sAcroBunnyHopFrontWheelDirectionAnimNums[direction]; } u8 GetAcroEndWheelieDirectionAnimNum(u8 direction) { - return gAcroEndWheelieDirectionAnimNums[direction]; + return sAcroStandingWheelieBackWheelDirectionAnimNums[direction]; } u8 GetSpinDirectionAnimNum(u8 direction) { - return gUnknown_83A6465[direction]; + return sSpinDirectionAnimNums[direction]; } u8 GetAcroUnusedActionDirectionAnimNum(u8 direction) { - return gAcroUnusedActionDirectionAnimNums[direction]; + return sAcroStandingWheelieFrontWheelDirectionAnimNums[direction]; } u8 GetAcroWheeliePedalDirectionAnimNum(u8 direction) { - return gAcroWheeliePedalDirectionAnimNums[direction]; + return sAcroMovingWheelieDirectionAnimNums[direction]; } u8 GetFishingDirectionAnimNum(u8 direction) { - return gFishingDirectionAnimNums[direction]; + return sFishingDirectionAnimNums[direction]; } u8 GetFishingNoCatchDirectionAnimNum(u8 direction) { - return gFishingNoCatchDirectionAnimNums[direction]; + return sFishingNoCatchDirectionAnimNums[direction]; } u8 GetFishingBiteDirectionAnimNum(u8 direction) { - return gFishingBiteDirectionAnimNums[direction]; + return sFishingBiteDirectionAnimNums[direction]; } u8 GetRunningDirectionAnimNum(u8 direction) { - return gRunningDirectionAnimNums[direction]; + return sRunningDirectionAnimNums[direction]; } -static const struct UnkStruct_083A3698 *GetStepAnimTable(const union AnimCmd *const *anims) +static const struct StepAnimTable *GetStepAnimTable(const union AnimCmd *const *anims) { - const struct UnkStruct_083A3698 *stepTable; + const struct StepAnimTable *stepTable; - for (stepTable = gUnknown_83A3698; stepTable->anims != NULL; stepTable++) + for (stepTable = sStepAnimTables; stepTable->anims != NULL; stepTable++) if (stepTable->anims == anims) return stepTable; @@ -4793,7 +4754,7 @@ static const struct UnkStruct_083A3698 *GetStepAnimTable(const union AnimCmd *co void SetStepAnimHandleAlternation(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { - const struct UnkStruct_083A3698 *stepTable; + const struct StepAnimTable *stepTable; if (!objectEvent->inanimate) { @@ -4812,7 +4773,7 @@ void SetStepAnimHandleAlternation(struct ObjectEvent *objectEvent, struct Sprite void SetStepAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 animNum) { - const struct UnkStruct_083A3698 *stepTable; + const struct StepAnimTable *stepTable; if (!objectEvent->inanimate) { @@ -4861,7 +4822,7 @@ void SetTrainerMovementType(struct ObjectEvent *objectEvent, u8 movementType) u8 GetTrainerFacingDirectionMovementType(u8 direction) { - return gTrainerFacingDirectionMovementTypes[direction]; + return sTrainerFacingDirectionMovementTypes[direction]; } static u8 GetCollisionInDirection(struct ObjectEvent *objectEvent, u8 direction) @@ -7066,7 +7027,7 @@ static bool8 MovementAction_FaceOriginalDirection_Step0(struct ObjectEvent *obje static bool8 MovementAction_NurseJoyBowDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, 0x14); + StartSpriteAnimInDirection(objectEvent, sprite, DIR_SOUTH, ANIM_NURSE_BOW); return FALSE; } @@ -7181,7 +7142,7 @@ static bool8 MovementAction_RevealTrainer_Step1(struct ObjectEvent *objectEvent, static bool8 MovementAction_RockSmashBreak_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - SetAndStartSpriteAnim(sprite, 1, 0); + SetAndStartSpriteAnim(sprite, ANIM_REMOVE_OBSTACLE, 0); sprite->data[2] = 1; return FALSE; } @@ -7209,7 +7170,7 @@ static bool8 MovementAction_RockSmashBreak_Step2(struct ObjectEvent *objectEvent static bool8 MovementAction_CutTree_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - SetAndStartSpriteAnim(sprite, 1, 0); + SetAndStartSpriteAnim(sprite, ANIM_REMOVE_OBSTACLE, 0); sprite->data[2] = 1; return FALSE; } @@ -7858,7 +7819,7 @@ static bool8 MovementActionFunc_x97_1(struct ObjectEvent *objectEvent, struct Sp static bool8 MovementActionFunc_x98_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnim(sprite, 20); + StartSpriteAnim(sprite, ANIM_RAISE_HAND); sprite->animPaused = FALSE; objectEvent->disableAnim = FALSE; sprite->data[2] = 1; @@ -7884,7 +7845,7 @@ static bool8 MovementActionFunc_x99_1(struct ObjectEvent *objectEvent, struct Sp sprite->data[6] = 0; sprite->data[5]++; sprite->data[7] = sprite->data[5]; - StartSpriteAnim(sprite, 0); + StartSpriteAnim(sprite, ANIM_STD_FACE_SOUTH); sprite->animPaused = FALSE; objectEvent->disableAnim = FALSE; } @@ -7895,7 +7856,7 @@ static bool8 MovementActionFunc_x99_1(struct ObjectEvent *objectEvent, struct Sp if (++sprite->data[4] > 16) { sprite->data[4] = 0; - StartSpriteAnim(sprite, 20); + StartSpriteAnim(sprite, ANIM_RAISE_HAND); sprite->animPaused = FALSE; objectEvent->disableAnim = FALSE; sprite->data[7] = 0; @@ -7934,7 +7895,7 @@ static bool8 MovementActionFunc_x9A_1(struct ObjectEvent *objectEvent, struct Sp static bool8 MovementActionFunc_x9F_0(struct ObjectEvent *objectEvent, struct Sprite *sprite) { - StartSpriteAnim(sprite, 28); + StartSpriteAnim(sprite, ANIM_SHAKE_HEAD_OR_WALK_IN_PLACE); sprite->animPaused = FALSE; objectEvent->disableAnim = FALSE; sprite->data[2] = 1; diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index c4e2a5ed7..b406a7e21 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1326,7 +1326,7 @@ void SetPlayerInvisibility(bool8 invisible) void StartPlayerAvatarSummonMonForFieldMoveAnim(void) { ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_FIELD_MOVE)); - StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0); + StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], ANIM_FIELD_MOVE); } static const u8 sPlayerAvatarVsSeekerBikeGfxIds[] = { @@ -1345,7 +1345,7 @@ u8 GetPlayerAvatarVsSeekerGfxId(void) void StartPlayerAvatarVsSeekerAnim(void) { ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarVsSeekerGfxId()); - StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0); + StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], ANIM_VS_SEEKER); } void StartPlayerAvatarFishAnim(u8 direction) From cd9d40b3cd1f14a69682bdf751f77e2865b1f698 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 28 Feb 2022 15:10:53 -0500 Subject: [PATCH 04/64] Add usage of ANIM_GET_ON_OFF_POKEMON_WEST, unused comments --- src/data/object_events/object_event_anims.h | 2 ++ src/field_effect.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/data/object_events/object_event_anims.h b/src/data/object_events/object_event_anims.h index cfbfe0f58..cd6a8a04b 100644 --- a/src/data/object_events/object_event_anims.h +++ b/src/data/object_events/object_event_anims.h @@ -995,6 +995,7 @@ static const union AnimCmd *const sAnimTable_Inanimate[] = { [ANIM_STAY_STILL] = sAnim_StayStill }; +// Leftover from Ruby/Sapphire static const union AnimCmd *const sAnimTable_QuintyPlump[] = { [ANIM_STD_FACE_SOUTH] = sAnim_QuintyPlumpFaceSouth, [ANIM_STD_FACE_NORTH] = sAnim_QuintyPlumpFaceNorth, @@ -1125,6 +1126,7 @@ static const union AnimCmd *const sAnimTable_RedGreenNormal[] = { [ANIM_SHAKE_HEAD_OR_WALK_IN_PLACE] = sAnim_ShakeHeadOrWalkInPlace, }; +// Leftover from Ruby/Sapphire static const union AnimCmd *const sAnimTable_AcroBike[] = { [ANIM_STD_FACE_SOUTH] = sAnim_FaceSouth, [ANIM_STD_FACE_NORTH] = sAnim_FaceNorth, diff --git a/src/field_effect.c b/src/field_effect.c index b44218dd5..220d9cdee 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -3192,7 +3192,7 @@ static void UseFlyEffect_6(struct Task * task) { struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE)); - StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + StartSpriteAnim(&gSprites[objectEvent->spriteId], ANIM_GET_ON_OFF_POKEMON_WEST); objectEvent->inanimate = TRUE; ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); task->data[0]++; @@ -3445,7 +3445,7 @@ static void FlyInEffect_1(struct Task * task) ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE)); CameraObjectReset2(); ObjectEventTurn(objectEvent, DIR_WEST); - StartSpriteAnim(&gSprites[objectEvent->spriteId], 0x16); + StartSpriteAnim(&gSprites[objectEvent->spriteId], ANIM_GET_ON_OFF_POKEMON_WEST); objectEvent->invisible = FALSE; task->data[1] = CreateFlyBirdSprite(); StartFlyBirdSwoopDown(task->data[1]); From 82f0cced2dbe3265681c140a91e2970b64a31422 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 1 Mar 2022 17:38:24 -0500 Subject: [PATCH 05/64] Merge pokemon jump files --- include/pokemon_jump.h | 113 -- ld_script.txt | 9 - src/pokemon_jump.c | 3979 ++++++++++++++++++++++++++++++++++++++++ src/pokemon_jump_2.c | 2034 -------------------- src/pokemon_jump_3.c | 167 -- src/pokemon_jump_4.c | 922 ---------- src/pokemon_jump_5.c | 637 ------- src/pokemon_jump_6.c | 140 -- sym_ewram.txt | 3 +- 9 files changed, 3980 insertions(+), 4024 deletions(-) delete mode 100644 src/pokemon_jump_2.c delete mode 100644 src/pokemon_jump_3.c delete mode 100644 src/pokemon_jump_4.c delete mode 100644 src/pokemon_jump_5.c delete mode 100644 src/pokemon_jump_6.c diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h index 83e28d2fd..fa4105a0e 100644 --- a/include/pokemon_jump.h +++ b/include/pokemon_jump.h @@ -2,122 +2,9 @@ #define GUARD_POKEMON_JUMP_H #include "main.h" -#include "link.h" - -struct PokemonJump1_MonInfo -{ - u16 species; - u32 otId; - u32 personality; -}; - -struct PokemonJump1_82E4 -{ - int unk0; - int unk4; - u8 filler8[0x4]; - u16 unkC; - u16 unkE; - u16 unk10; - u16 unk12; - int unk14; - int unk18; - u8 unk1C[11]; -}; - -struct PokemonJump2 -{ - int unk0; - u16 unk4; - u8 unk6; - u8 filler7[0xa - 0x7]; - u8 unkA; - u8 unkB; - u8 unkC; - u8 unkD; - u8 unkE; - u8 unkF; - u16 filler10; - u16 unk12; - u16 unk14; - u32 unk18; - u16 unk1C[5]; - u8 txtBuff[2][0x40]; - u8 strBuff[0x100]; - u16 tilemapBuffer[0x4000]; // Bug: way larger than it should be - struct Sprite *unk81A8[MAX_RFU_PLAYERS]; - struct Sprite *unk81BC[MAX_RFU_PLAYERS]; - struct Sprite *unk81D0[8]; - u8 filler81F0[0xC]; - u8 unk81FC[MAX_RFU_PLAYERS]; -}; - -struct PokemonJump1Sub -{ - u8 unk0; - u8 unk1; - u16 unk2; - u16 unk4; - u32 unk8; -}; void ResetPokeJumpResults(void); bool32 IsSpeciesAllowedInPokemonJump(u16 species); void StartPokemonJump(u16 species, MainCallback callback); -u16 sub_81499A4(void); -u16 sub_81499B4(void); -struct PokemonJump1_MonInfo *sub_81499C0(u8 multiplayerId); -u8 *sub_81499E0(u8 multiplayerId); - -void sub_814A95C(int id); -void sub_8149CEC(struct PokemonJump2 *); -void sub_8149D24(void); -void sub_8149D40(int); -bool32 sub_8149D68(void); -void sub_814A3E4(void); -bool32 sub_814A408(void); -void sub_814A468(u16 itemId, u16 quantity); -void sub_814A53C(u16 itemId); -void sub_814A5B4(u16 itemId); -bool32 sub_814A62C(void); -void sub_814A6CC(void); -void sub_814A940(u32 id, s16 y); -void sub_814AA48(u8 multiplayerId); -bool32 sub_814A6FC(void); -void sub_814AA24(int); -s8 sub_814A744(void); -int sub_814A98C(u8 flags); -void sub_814AA34(u16); -void sub_814AA60(u8 multiplayerId); -int sub_814AA78(int multiplayerId); -void sub_814AA8C(void); -void sub_814AAA0(void); -void sub_814AAB4(int); -int sub_814AAC8(void); -void sub_8149A6C(struct PokemonJump1_MonInfo *arg0); -bool32 sub_8149A90(int multiplayerId, struct PokemonJump1_MonInfo *arg0); -void sub_8149AF8(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1); -bool32 sub_8149B7C(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1); -void sub_8149BF4(struct PokemonJump1_82E4 *arg0, u8 arg1, u16 arg2); -bool32 sub_8149C24(struct PokemonJump1_82E4 *arg0, int multiplayerId, u8 *arg2, u16 *arg3); -bool32 sub_8149C90(struct PokemonJump1_82E4 *arg0, int multiplayerId); -bool32 sub_814B494(u32 jumpScore, u16 jumpsInRow, u16 excellentsInRow); -void sub_814B4E8(void); - -void sub_814AD6C(struct PokemonJump2 *); -void sub_814B294(struct PokemonJump2 *); -void sub_814B43C(struct PokemonJump2 *); -bool32 sub_814B460(void); -void sub_814B348(struct PokemonJump2 *, int); -void sub_814AF0C(struct PokemonJump2 *, int); -void sub_814ADCC(struct PokemonJump2 *, struct PokemonJump1_MonInfo *,s16, s16, u8); -void sub_814B240(struct PokemonJump2 *,s16, s16, u8); -void sub_814AFE8(struct PokemonJump2 *, int multiplayerId); -void sub_814B080(struct PokemonJump2 *, int multiplayerId); -bool32 sub_814B010(struct PokemonJump2 *, int multiplayerId); -void sub_814B0A8(struct PokemonJump2 *); -void sub_814B134(struct PokemonJump2 *); -void sub_814B168(struct PokemonJump2 *, int multiplayerId); -bool32 sub_814B190(struct PokemonJump2 *); #endif // GUARD_POKEMON_JUMP_H diff --git a/ld_script.txt b/ld_script.txt index a637721dd..aa4e7906d 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -285,11 +285,6 @@ SECTIONS { src/menews_jisan.o(.text); src/seagallop.o(.text); src/pokemon_jump.o(.text); - src/pokemon_jump_2.o(.text); - src/pokemon_jump_3.o(.text); - src/pokemon_jump_4.o(.text); - src/pokemon_jump_5.o(.text); - src/pokemon_jump_6.o(.text); src/berry_crush.o(.text); src/wireless_communication_status_screen.o(.text); src/braille_text.o(.text); @@ -588,10 +583,6 @@ SECTIONS { src/menews_jisan.o(.rodata.str1.4); src/seagallop.o(.rodata); src/pokemon_jump.o(.rodata); - src/pokemon_jump_2.o(.rodata); - src/pokemon_jump_4.o(.rodata); - src/pokemon_jump_5.o(.rodata); - src/pokemon_jump_6.o(.rodata); src/berry_crush.o(.rodata); src/wireless_communication_status_screen.o(.rodata); src/braille_text.o(.rodata); diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index ef9f92e4e..26f2e18f1 100644 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -2,16 +2,312 @@ #include "gflib.h" #include "battle_anim.h" #include "decompress.h" +#include "digit_obj_util.h" +#include "dynamic_placeholder_text_util.h" +#include "event_data.h" +#include "item.h" #include "link.h" #include "link_rfu.h" +#include "menu.h" +#include "minigame_countdown.h" +#include "new_menu_helpers.h" +#include "pokemon_jump.h" +#include "random.h" +#include "save.h" +#include "script.h" +#include "strings.h" #include "task.h" +#include "text_window.h" +#include "trig.h" +#include "constants/items.h" #include "constants/songs.h" +struct PokemonJump1_MonInfo +{ + u16 species; + u32 otId; + u32 personality; +}; + +struct PokemonJump1_82E4 +{ + int unk0; + int unk4; + u8 filler8[0x4]; + u16 unkC; + u16 unkE; + u16 unk10; + u16 unk12; + int unk14; + int unk18; + u8 unk1C[11]; +}; + +struct PokemonJump2 +{ + int unk0; + u16 unk4; + u8 unk6; + u8 filler7[0xa - 0x7]; + u8 unkA; + u8 unkB; + u8 unkC; + u8 unkD; + u8 unkE; + u8 unkF; + u16 filler10; + u16 unk12; + u16 unk14; + u32 unk18; + u16 unk1C[5]; + u8 txtBuff[2][0x40]; + u8 strBuff[0x100]; + u16 tilemapBuffer[0x4000]; // Bug: way larger than it should be + struct Sprite *unk81A8[MAX_RFU_PLAYERS]; + struct Sprite *unk81BC[MAX_RFU_PLAYERS]; + struct Sprite *unk81D0[8]; + u8 filler81F0[0xC]; + u8 unk81FC[MAX_RFU_PLAYERS]; +}; + +struct PokemonJump1Sub +{ + u8 unk0; + u8 unk1; + u16 unk2; + u16 unk4; + u32 unk8; +}; + +struct MonInfoPacket +{ + u8 id; // packet id + u16 species; + u32 personality; + u32 otId; +}; + +struct PokemonJump1 +{ + MainCallback returnCallback; + u8 unk4; + u8 unk5; + u8 unk6; + u8 unk7; + u16 unk8; + u16 unkA; + u16 unkC; + u16 unkE; + int unk10; + u32 unk14; + u32 unk18; + int unk1C; + u32 unk20; + u32 unk24; + u32 unk28; + int unk2C; + u32 unk30; + u16 unk34; + u16 unk36; + u8 filler38[0x2]; + u16 unk3A; + u16 unk3C; + u16 unk3E; + u16 unk40; + u16 unk42; + u8 unk44; + u8 unk45; + u8 unk46; + u8 isLeader; + u8 unk48; + u8 unk49; + u16 unk4A; + u8 unk4C; + u8 unk4D; + u16 unk4E; + u8 unk50; + u8 unk51; + u8 filler52[0x2]; + int unk54; + int unk58; + int unk5C; + int unk60; + int unk64; + int unk68; + int unk6C; + struct PokemonJump1Sub unk70; + u8 unk7C[MAX_RFU_PLAYERS]; + u8 unk81[MAX_RFU_PLAYERS]; + u8 unk86[MAX_RFU_PLAYERS]; + u8 unk8B[MAX_RFU_PLAYERS]; + u16 unk90[MAX_RFU_PLAYERS]; + u16 unk9A[MAX_RFU_PLAYERS]; + struct PokemonJump2 unkA4; + struct PokemonJump1_MonInfo unk82A8[MAX_RFU_PLAYERS]; + struct PokemonJump1_82E4 unk82E4[MAX_RFU_PLAYERS]; + struct PokemonJump1_82E4 *unk83AC; +}; + + static void sub_8147654(u8 taskId); static void sub_81477C0(u8 taskId); static void sub_814784C(u8 taskId); static void sub_81479D4(u8 taskId); static void sub_8147A34(u8 taskId); +static void sub_8147B60(struct PokemonJump1 *); +static void sub_8147B94(struct PokemonJump1 *); +static void sub_8147C20(void); +static void sub_8147C98(void); +static s16 GetPokemonJumpSpeciesIdx(u16 species); +static void sub_8147D2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon); +static void sub_8147D6C(void); +static void sub_8147DA0(u8 taskId); +static void sub_814807C(u8 taskId); +static void sub_8148104(void); +static void sub_8148290(u8 taskId); +static void sub_81482F8(void); +static bool32 sub_8148344(void); +static bool32 sub_81483D0(void); +static bool32 sub_8148464(void); +static bool32 sub_81484D0(void); +static bool32 sub_814856C(void); +static bool32 sub_81485C8(void); +static bool32 sub_8148664(void); +static bool32 sub_81486C4(void); +static bool32 sub_8148724(void); +static bool32 sub_8148760(void); +static bool32 sub_81487B4(void); +static bool32 sub_8148800(void); +static bool32 sub_814881C(void); +static bool32 sub_81488DC(void); +static bool32 sub_81489C8(void); +static bool32 sub_8148A60(void); +static bool32 sub_8148398(void); +static bool32 sub_8148418(void); +static bool32 sub_81484B0(void); +static bool32 sub_8148B54(void); +static bool32 sub_8148C80(void); +static bool32 sub_8148D5C(void); +static bool32 sub_8148E2C(void); +static void sub_8148E80(u8 taskId); +static void sub_8148F5C(TaskFunc func, u8 taskPriority); +static void sub_8148F7C(void); +static void sub_8148F9C(void); +static void sub_8148FE0(void); +static int sub_8149044(void); +static void sub_8149078(void); +static int sub_8149194(void); +static void sub_81491B4(void); +static void sub_81491E4(void); +static void sub_8149210(void); +static bool32 sub_814922C(u16); +static void sub_8149260(void); +static void sub_81492D8(void); +static void sub_814933C(void); +static void sub_814935C(void); +static void sub_814936C(void); +static void sub_814937C(void); +static void sub_8149490(int); +static void sub_8149534(void); +static bool32 sub_8149630(void); +static bool32 sub_81496D4(void); +static bool32 sub_8149710(void); +static bool32 sub_8149748(void); +static void sub_8149780(int); +static int sub_81497A8(void); +static bool32 sub_8149804(void); +static int sub_8149834(u8 *); +static void sub_8149878(void); +static int sub_8149888(int); +static void sub_8149898(u16); +static bool32 sub_81498B4(void); +static u16 sub_81498D8(void); +static void sub_8149900(u16, u16 *, u16 *); +static u16 sub_8149910(void); +static u16 sub_8149930(void); +static u16 sub_8149978(u16 item, u16 quantity); +static void sub_8149D80(void (*func)(void)); +static void sub_8149DA4(u8 taskId); +static void sub_8149DC8(void); +static void sub_8149F64(void); +static void sub_8149FD0(void); +static void sub_814A03C(void); +static void sub_814A0C8(void); +static void sub_814A174(void); +static void sub_814A218(void); +static void sub_814A264(void); +static void sub_814A308(void); +static void sub_814A3AC(void); +static u32 sub_814A754(u32 left, u32 top, u32 width, u32 height); +static void sub_814A7D0(u16 left, u16 top, u8 cursorPos); +static void sub_814A84C(void); +static void sub_814A8B8(void); +static void sub_814A9C8(void); +static void sub_814AADC(void); +static void sub_814AC30(bool32 arg0); +static void sub_814AC94(void); +static void sub_814ACCC(u8 arg0); +static void sub_814AD50(u8 taskId); +static void sub_8149D34(struct PokemonJump2 *); +static void sub_814AF74(struct Sprite *sprite); +static void sub_814B038(struct Sprite *sprite); +static void sub_814B100(struct Sprite *sprite); +static void sub_814B1CC(struct Sprite *sprite); +static void Task_ShowPokemonJumpRecords(u8 taskId); +static void TruncateToFirstWordOnly(u8 *str); +static void sub_814B5C4(u16 windowId); +void sub_814A95C(int id); +void sub_8149CEC(struct PokemonJump2 *); +void sub_8149D24(void); +void sub_8149D40(int); +bool32 sub_8149D68(void); +void sub_814A3E4(void); +bool32 sub_814A408(void); +void sub_814A468(u16 itemId, u16 quantity); +void sub_814A53C(u16 itemId); +void sub_814A5B4(u16 itemId); +bool32 sub_814A62C(void); +void sub_814A6CC(void); +void sub_814A940(u32 id, s16 y); +void sub_814AA48(u8 multiplayerId); +bool32 sub_814A6FC(void); +void sub_814AA24(int); +s8 sub_814A744(void); +int sub_814A98C(u8 flags); +void sub_814AA34(u16); +void sub_814AA60(u8 multiplayerId); +int sub_814AA78(int multiplayerId); +void sub_814AA8C(void); +void sub_814AAA0(void); +void sub_814AAB4(int); +int sub_814AAC8(void); +void sub_8149A6C(struct PokemonJump1_MonInfo *arg0); +bool32 sub_8149A90(int multiplayerId, struct PokemonJump1_MonInfo *arg0); +void sub_8149AF8(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1); +bool32 sub_8149B7C(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1); +void sub_8149BF4(struct PokemonJump1_82E4 *arg0, u8 arg1, u16 arg2); +bool32 sub_8149C24(struct PokemonJump1_82E4 *arg0, int multiplayerId, u8 *arg2, u16 *arg3); +bool32 sub_8149C90(struct PokemonJump1_82E4 *arg0, int multiplayerId); +bool32 sub_814B494(u32 jumpScore, u16 jumpsInRow, u16 excellentsInRow); +void sub_814B4E8(void); +void sub_814AD6C(struct PokemonJump2 *); +void sub_814B294(struct PokemonJump2 *); +void sub_814B43C(struct PokemonJump2 *); +bool32 sub_814B460(void); +void sub_814B348(struct PokemonJump2 *, int); +void sub_814AF0C(struct PokemonJump2 *, int); +void sub_814ADCC(struct PokemonJump2 *, struct PokemonJump1_MonInfo *,s16, s16, u8); +void sub_814B240(struct PokemonJump2 *,s16, s16, u8); +void sub_814AFE8(struct PokemonJump2 *, int multiplayerId); +void sub_814B080(struct PokemonJump2 *, int multiplayerId); +bool32 sub_814B010(struct PokemonJump2 *, int multiplayerId); +void sub_814B0A8(struct PokemonJump2 *); +void sub_814B134(struct PokemonJump2 *); +void sub_814B168(struct PokemonJump2 *, int multiplayerId); +bool32 sub_814B190(struct PokemonJump2 *); + +EWRAM_DATA static struct PokemonJump1 *gUnknown_203F3D4 = NULL; +EWRAM_DATA static struct PokemonJump2 *gUnknown_203F3D8 = NULL; static const u16 gUnknown_846AFE8[] = INCBIN_U16("graphics/misc/unk_846B008.gbapal"); static const u32 gUnknown_846B008[] = INCBIN_U32("graphics/misc/unk_846B008.4bpp.lz"); @@ -80,6 +376,146 @@ static const TaskFunc gUnknown_846B4AC[][4] = { { sub_81477C0, sub_814784C, sub_81479D4, sub_8147A34 } }; +/* + According to the clerk, the Pokémon allowed in + Pokémon Jump are all <= 28 inches, and do not + only swim, burrow, or fly. +*/ +static const struct PokemonJumpMons +{ + u16 species; + u16 unk2; +} sPkmnJumpSpecies[] = +{ + { .species = SPECIES_BULBASAUR, .unk2 = 2, }, + { .species = SPECIES_CHARMANDER, .unk2 = 1, }, + { .species = SPECIES_SQUIRTLE, .unk2 = 0, }, + { .species = SPECIES_CATERPIE, .unk2 = 1, }, + { .species = SPECIES_METAPOD, .unk2 = 1, }, + { .species = SPECIES_WEEDLE, .unk2 = 1, }, + { .species = SPECIES_KAKUNA, .unk2 = 1, }, + { .species = SPECIES_RATTATA, .unk2 = 1, }, + { .species = SPECIES_RATICATE, .unk2 = 1, }, + { .species = SPECIES_PIKACHU, .unk2 = 0, }, + { .species = SPECIES_SANDSHREW, .unk2 = 0, }, + { .species = SPECIES_NIDORAN_F, .unk2 = 0, }, + { .species = SPECIES_NIDORAN_M, .unk2 = 0, }, + { .species = SPECIES_CLEFAIRY, .unk2 = 0, }, + { .species = SPECIES_VULPIX, .unk2 = 0, }, + { .species = SPECIES_JIGGLYPUFF, .unk2 = 2, }, + { .species = SPECIES_ODDISH, .unk2 = 2, }, + { .species = SPECIES_PARAS, .unk2 = 1, }, + { .species = SPECIES_MEOWTH, .unk2 = 0, }, + { .species = SPECIES_PSYDUCK, .unk2 = 2, }, + { .species = SPECIES_MANKEY, .unk2 = 1, }, + { .species = SPECIES_GROWLITHE, .unk2 = 1, }, + { .species = SPECIES_POLIWAG, .unk2 = 2, }, + { .species = SPECIES_BELLSPROUT, .unk2 = 2, }, + { .species = SPECIES_SHELLDER, .unk2 = 1, }, + { .species = SPECIES_KRABBY, .unk2 = 1, }, + { .species = SPECIES_EXEGGCUTE, .unk2 = 2, }, + { .species = SPECIES_CUBONE, .unk2 = 0, }, + { .species = SPECIES_DITTO, .unk2 = 2, }, + { .species = SPECIES_EEVEE, .unk2 = 0, }, + { .species = SPECIES_OMANYTE, .unk2 = 1, }, + { .species = SPECIES_KABUTO, .unk2 = 1, }, + { .species = SPECIES_CHIKORITA, .unk2 = 2, }, + { .species = SPECIES_CYNDAQUIL, .unk2 = 1, }, + { .species = SPECIES_TOTODILE, .unk2 = 0, }, + { .species = SPECIES_SPINARAK, .unk2 = 1, }, + { .species = SPECIES_PICHU, .unk2 = 0, }, + { .species = SPECIES_CLEFFA, .unk2 = 0, }, + { .species = SPECIES_IGGLYBUFF, .unk2 = 2, }, + { .species = SPECIES_TOGEPI, .unk2 = 2, }, + { .species = SPECIES_MAREEP, .unk2 = 0, }, + { .species = SPECIES_BELLOSSOM, .unk2 = 2, }, + { .species = SPECIES_MARILL, .unk2 = 2, }, + { .species = SPECIES_SUNKERN, .unk2 = 2, }, + { .species = SPECIES_WOOPER, .unk2 = 2, }, + { .species = SPECIES_PINECO, .unk2 = 2, }, + { .species = SPECIES_SNUBBULL, .unk2 = 0, }, + { .species = SPECIES_SHUCKLE, .unk2 = 2, }, + { .species = SPECIES_TEDDIURSA, .unk2 = 0, }, + { .species = SPECIES_SLUGMA, .unk2 = 2, }, + { .species = SPECIES_SWINUB, .unk2 = 0, }, + { .species = SPECIES_HOUNDOUR, .unk2 = 1, }, + { .species = SPECIES_PHANPY, .unk2 = 0, }, + { .species = SPECIES_PORYGON2, .unk2 = 0, }, + { .species = SPECIES_TYROGUE, .unk2 = 1, }, + { .species = SPECIES_SMOOCHUM, .unk2 = 2, }, + { .species = SPECIES_ELEKID, .unk2 = 1, }, + { .species = SPECIES_MAGBY, .unk2 = 1, }, + { .species = SPECIES_LARVITAR, .unk2 = 1, }, + { .species = SPECIES_TREECKO, .unk2 = 1, }, + { .species = SPECIES_TORCHIC, .unk2 = 2, }, + { .species = SPECIES_MUDKIP, .unk2 = 0, }, + { .species = SPECIES_MARSHTOMP, .unk2 = 0, }, + { .species = SPECIES_POOCHYENA, .unk2 = 1, }, + { .species = SPECIES_ZIGZAGOON, .unk2 = 0, }, + { .species = SPECIES_LINOONE, .unk2 = 0, }, + { .species = SPECIES_WURMPLE, .unk2 = 1, }, + { .species = SPECIES_SILCOON, .unk2 = 2, }, + { .species = SPECIES_CASCOON, .unk2 = 2, }, + { .species = SPECIES_LOTAD, .unk2 = 2, }, + { .species = SPECIES_SEEDOT, .unk2 = 1, }, + { .species = SPECIES_RALTS, .unk2 = 0, }, + { .species = SPECIES_KIRLIA, .unk2 = 0, }, + { .species = SPECIES_SURSKIT, .unk2 = 2, }, + { .species = SPECIES_SHROOMISH, .unk2 = 2, }, + { .species = SPECIES_NINCADA, .unk2 = 1, }, + { .species = SPECIES_WHISMUR, .unk2 = 0, }, + { .species = SPECIES_AZURILL, .unk2 = 2, }, + { .species = SPECIES_SKITTY, .unk2 = 0, }, + { .species = SPECIES_SABLEYE, .unk2 = 0, }, + { .species = SPECIES_MAWILE, .unk2 = 0, }, + { .species = SPECIES_ARON, .unk2 = 1, }, + { .species = SPECIES_MEDITITE, .unk2 = 2, }, + { .species = SPECIES_ELECTRIKE, .unk2 = 1, }, + { .species = SPECIES_PLUSLE, .unk2 = 1, }, + { .species = SPECIES_MINUN, .unk2 = 1, }, + { .species = SPECIES_VOLBEAT, .unk2 = 0, }, + { .species = SPECIES_ILLUMISE, .unk2 = 0, }, + { .species = SPECIES_ROSELIA, .unk2 = 2, }, + { .species = SPECIES_GULPIN, .unk2 = 2, }, + { .species = SPECIES_NUMEL, .unk2 = 2, }, + { .species = SPECIES_TORKOAL, .unk2 = 2, }, + { .species = SPECIES_SPOINK, .unk2 = 0, }, + { .species = SPECIES_TRAPINCH, .unk2 = 2, }, + { .species = SPECIES_CACNEA, .unk2 = 2, }, + { .species = SPECIES_ANORITH, .unk2 = 1, }, + { .species = SPECIES_WYNAUT, .unk2 = 0, }, + { .species = SPECIES_SNORUNT, .unk2 = 0, }, + { .species = SPECIES_CLAMPERL, .unk2 = 1, }, + { .species = SPECIES_BAGON, .unk2 = 1, }, +}; + +static bool32 (* const gUnknown_846B64C[])(void) = +{ + sub_8148344, + sub_81483D0, + sub_8148464, + sub_81484D0, + sub_81485C8, + sub_81486C4, + sub_8148760, + sub_81487B4, + sub_814881C, +}; + + +static bool32 (* const gUnknown_846B670[])(void) = +{ + sub_8148398, + sub_8148418, + sub_81484B0, + sub_814856C, + sub_8148664, + sub_8148724, + sub_8148760, + sub_8148800, + sub_814881C, +}; + // Unused, but looks like it was intended to be a hook UNUSED u8 sub_81475C0(u8 data1, u8 priority) { @@ -252,3 +688,3546 @@ static void sub_8147A34(u8 taskId) data[11]++; } } + +void StartPokemonJump(u16 partyIndex, MainCallback callback) +{ + u8 taskId; + + if (gReceivedRemoteLinkPlayers) + { + gUnknown_203F3D4 = Alloc(sizeof(*gUnknown_203F3D4)); + if (gUnknown_203F3D4 != NULL) + { + ResetTasks(); + taskId = CreateTask(sub_8147DA0, 1); + gUnknown_203F3D4->unk8 = 0; + gUnknown_203F3D4->returnCallback = callback; + gUnknown_203F3D4->unk4 = taskId; + gUnknown_203F3D4->unk6 = GetMultiplayerId(); + sub_8147D2C(&gUnknown_203F3D4->unk82A8[gUnknown_203F3D4->unk6], &gPlayerParty[partyIndex]); + sub_8147B60(gUnknown_203F3D4); + SetWordTaskArg(taskId, 2, (uintptr_t)gUnknown_203F3D4); + SetMainCallback2(sub_8147D6C); + return; + } + } + + SetMainCallback2(callback); +} + +static void sub_8147B48(void) +{ + sub_8149D24(); + Free(gUnknown_203F3D4); +} + +static void sub_8147B60(struct PokemonJump1 *arg0) +{ + arg0->unk5 = GetLinkPlayerCount(); + arg0->unk70.unk0 = 5; + arg0->unk70.unk2 = 0; + sub_8147C20(); + sub_8147B94(arg0); + if (arg0->unk5 == MAX_RFU_PLAYERS) + sub_814B4E8(); +} + +static void sub_8147B94(struct PokemonJump1 *arg0) +{ + int i; + + arg0->unk14 = 6; + arg0->unk18 = 6; + arg0->unk4A = 0; + arg0->unk1C = 0; + arg0->unk5C = 0; + arg0->isLeader = GetMultiplayerId() == 0; + arg0->unk8 = 0; + arg0->unkA = 0; + arg0->unkC = 0; + arg0->unkE = 0; + arg0->unk58 = 0; + arg0->unk3A = 0; + arg0->unk44 = 0; + arg0->unk54 = 0; + arg0->unk46 = 0; + arg0->unk49 = 0; + arg0->unk48 = 1; + arg0->unk70.unk8 = 0; + arg0->unk70.unk1 = 0; + arg0->unk70.unk4 = 0; + arg0->unk60 = 1; + arg0->unk4D = 0; + arg0->unk68 = 0; + arg0->unk64 = 0; + arg0->unk2C = 0; + arg0->unk30 = 0; + sub_8147C98(); + sub_81491E4(); + + for (i = 0; i < MAX_RFU_PLAYERS; i++) + { + arg0->unk7C[i] = 0; + arg0->unk9A[i] = 0; + } +} + +static void sub_8147C20(void) +{ + int i, index; + + for (i = 0; i < MAX_RFU_PLAYERS; i++) + { + index = GetPokemonJumpSpeciesIdx(gUnknown_203F3D4->unk82A8[i].species); + gUnknown_203F3D4->unk82E4[i].unkC = sPkmnJumpSpecies[index].unk2; + } + + gUnknown_203F3D4->unk83AC = &gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6]; +} + +static void sub_8147C98(void) +{ + int i; + + for (i = 0; i < MAX_RFU_PLAYERS; i++) + { + gUnknown_203F3D4->unk82E4[i].unkE = 0; + gUnknown_203F3D4->unk82E4[i].unk10 = 0; + gUnknown_203F3D4->unk82E4[i].unk12 = 0; + gUnknown_203F3D4->unk82E4[i].unk0 = 0; + gUnknown_203F3D4->unk82E4[i].unk4 = 0x7FFFFFFF; + gUnknown_203F3D4->unk82E4[i].unk14 = 0; + gUnknown_203F3D4->unk8B[i] = 9; + } +} + +static s16 GetPokemonJumpSpeciesIdx(u16 species) +{ + u32 i; + for (i = 0; i < NELEMS(sPkmnJumpSpecies); i++) + { + if (sPkmnJumpSpecies[i].species == species) + return i; + } + + return -1; // species isnt allowed +} + +static void sub_8147D2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon) +{ + monInfo->species = GetMonData(mon, MON_DATA_SPECIES); + monInfo->otId = GetMonData(mon, MON_DATA_OT_ID); + monInfo->personality = GetMonData(mon, MON_DATA_PERSONALITY); +} + +static void sub_8147D58(void) +{ + TransferPlttBuffer(); + LoadOam(); + ProcessSpriteCopyRequests(); +} + +static void sub_8147D6C(void) +{ + RunTasks(); + AnimateSprites(); + BuildOamBuffer(); + UpdatePaletteFade(); +} + +static void sub_8147D84(TaskFunc func) +{ + gUnknown_203F3D4->unk4 = CreateTask(func, 1); + gUnknown_203F3D4->unk8 = 0; +} + +static void sub_8147DA0(u8 taskId) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + SetVBlankCallback(NULL); + ResetSpriteData(); + FreeAllSpritePalettes(); + sub_8148F5C(sub_8148E80, 5); + FadeOutMapMusic(4); + gUnknown_203F3D4->unk8++; + break; + case 1: + if (!FuncIsActiveTask(sub_8148E80)) + { + sub_8149CEC(&gUnknown_203F3D4->unkA4); + LoadWirelessStatusIndicatorSpriteGfx(); + CreateWirelessStatusIndicatorSprite(0, 0); + gUnknown_203F3D4->unk8++; + } + break; + case 2: + if (!sub_8149D68() && IsNotWaitingForBGMStop() == TRUE) + { + FadeOutAndPlayNewMapMusic(MUS_POKE_JUMP, 8); + gUnknown_203F3D4->unk8++; + } + break; + case 3: + if (IsLinkTaskFinished()) + { + BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + SetVBlankCallback(sub_8147D58); + gUnknown_203F3D4->unk8++; + } + break; + case 4: + UpdatePaletteFade(); + if (!gPaletteFade.active) + { + gUnknown_203F3D4->unk7 = 0; + gUnknown_203F3D4->unk8++; + } + break; + case 5: + gUnknown_203F3D4->unk7++; + if (gUnknown_203F3D4->unk7 >= 20) + { + if (gUnknown_203F3D4->isLeader) + sub_8147D84(sub_814807C); + else + sub_8147D84(sub_8148290); + + sub_8148F7C(); + DestroyTask(taskId); + } + break; + } +} + +static void sub_8147F10(int arg0) +{ + if (arg0 == 0) + { + gUnknown_203F3D4->unk30 = 0x1111; + gUnknown_203F3D4->unk2C = 1; + } + else + { + gUnknown_203F3D4->unk30 = (1 << (arg0 - 1)) - 1; + gUnknown_203F3D4->unk2C = 0; + } +} + +static void sub_8147F4C(u8 arg0) +{ + int i; + + gUnknown_203F3D4->unk70.unk0 = arg0; + gUnknown_203F3D4->unk8 = 0; + gUnknown_203F3D4->unkA = 0; + gUnknown_203F3D4->unk48 = 1; + gUnknown_203F3D4->unk49 = 0; + for (i = 1; i < gUnknown_203F3D4->unk5; i++) + gUnknown_203F3D4->unk82E4[i].unk18 = 0; +} + +static void sub_8147FA0(void) +{ + int i; + int count; + u16 var0; + u8 var1; + u16 var2; + + for (i = 1, count = 0; i < gUnknown_203F3D4->unk5; i++) + { + var0 = gUnknown_203F3D4->unk82E4[i].unk10; + if (sub_8149C24(&gUnknown_203F3D4->unk82E4[i], i, &var1, &var2)) + { + gUnknown_203F3D4->unk90[i] = var2; + gUnknown_203F3D4->unk8B[i] = var1; + gUnknown_203F3D4->unk82E4[i].unk12 = var0; + } + + if (gUnknown_203F3D4->unk82E4[i].unk18 && gUnknown_203F3D4->unk8B[i] == gUnknown_203F3D4->unk70.unk0) + count++; + } + + if (count == gUnknown_203F3D4->unk5 - 1) + gUnknown_203F3D4->unk49 = 1; +} + +static void sub_814807C(u8 taskId) +{ + sub_8147FA0(); + sub_8149534(); + if (!gUnknown_203F3D4->unk48 && gUnknown_203F3D4->unk49) + { + sub_8147F4C(gUnknown_203F3D4->unk4C); + sub_8147F10(3); + } + + if (gUnknown_203F3D4->unk48 == 1) + { + if (!gUnknown_846B64C[gUnknown_203F3D4->unk70.unk0]()) + { + gUnknown_203F3D4->unk48 = 0; + gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 = 1; + } + } + + sub_81492D8(); + sub_8148104(); +} + +static void sub_8148104(void) +{ + if (!gUnknown_203F3D4->unk2C) + sub_8149AF8(gUnknown_203F3D4->unk82E4, &gUnknown_203F3D4->unk70); + + if (gUnknown_203F3D4->unk30 != 0x1111) + { + gUnknown_203F3D4->unk2C++; + gUnknown_203F3D4->unk2C &= gUnknown_203F3D4->unk30; + } +} + +static void sub_8148140(u8 arg0) +{ + gUnknown_203F3D4->unk70.unk0 = arg0; + gUnknown_203F3D4->unk8 = 0; + gUnknown_203F3D4->unkA = 0; + gUnknown_203F3D4->unk48 = 1; + gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 = 0; +} + +static void sub_8148174(void) +{ + int i; + u16 var0; + struct PokemonJump1Sub sp0; + + var0 = gUnknown_203F3D4->unk82E4[0].unk10; + if (sub_8149B7C(gUnknown_203F3D4->unk82E4, &sp0)) + { + if (gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 == 1 + && sp0.unk0 != gUnknown_203F3D4->unk70.unk0) + { + sub_8148140(sp0.unk0); + } + + if (gUnknown_203F3D4->unk70.unk8 != sp0.unk8) + { + gUnknown_203F3D4->unk70.unk8 = sp0.unk8; + gUnknown_203F3D4->unk5C = 1; + gUnknown_203F3D4->unk70.unk1 = sp0.unk1; + if (gUnknown_203F3D4->unk70.unk1) + gUnknown_203F3D4->unk4D = 1; + else + gUnknown_203F3D4->unk4D = 0; + } + + gUnknown_203F3D4->unk70.unk2 = sp0.unk2; + gUnknown_203F3D4->unk70.unk4 = sp0.unk4; + gUnknown_203F3D4->unk82E4[0].unk12 = var0; + } + + for (i = 1; i < gUnknown_203F3D4->unk5; i++) + { + if (i != gUnknown_203F3D4->unk6) + { + var0 = gUnknown_203F3D4->unk82E4[i].unk10; + if (sub_8149C90(&gUnknown_203F3D4->unk82E4[i], i)) + gUnknown_203F3D4->unk82E4[i].unk12 = var0; + } + } +} + +static void sub_8148290(u8 taskId) +{ + sub_8148174(); + if (gUnknown_203F3D4->unk48) + { + if (!gUnknown_846B670[gUnknown_203F3D4->unk70.unk0]()) + { + gUnknown_203F3D4->unk48 = 0; + gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 = 1; + sub_8147F10(3); + } + } + + sub_81492D8(); + sub_81482F8(); +} + +static void sub_81482F8(void) +{ + if (!gUnknown_203F3D4->unk2C) + sub_8149BF4(&gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6], gUnknown_203F3D4->unk70.unk0, gUnknown_203F3D4->unk42); + + if (gUnknown_203F3D4->unk30 != 0x1111) + { + gUnknown_203F3D4->unk2C++; + gUnknown_203F3D4->unk2C &= gUnknown_203F3D4->unk30; + } +} + +static bool32 sub_8148344(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + sub_8147F10(3); + gUnknown_203F3D4->unk8++; + // fall through + case 1: + if (!sub_81488DC()) + { + gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unk4A; + gUnknown_203F3D4->unk4C = 1; + return FALSE; + } + break; + } + + return TRUE; +} + +static bool32 sub_8148398(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + sub_8147F10(0); + gUnknown_203F3D4->unk24 = gUnknown_203F3D4->unk70.unk2; + gUnknown_203F3D4->unk8++; + // fall through + case 1: + return sub_81488DC(); + } + + return TRUE; +} + +static bool32 sub_81483D0(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + sub_81491E4(); + sub_8147F10(5); + gUnknown_203F3D4->unk8++; + break; + case 1: + if (gUnknown_203F3D4->unk49) + { + gUnknown_203F3D4->unk4C = 2; + return FALSE; + } + break; + } + + return TRUE; +} + +static bool32 sub_8148418(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + sub_81491E4(); + sub_8147F10(0); + gUnknown_203F3D4->unk4A = gUnknown_203F3D4->unk70.unk2; + gUnknown_203F3D4->unk8++; + // fall through + case 1: + if (sub_8149804()) + return FALSE; + break; + } + + return TRUE; +} + +static bool32 sub_8148464(void) +{ + if (!sub_81489C8()) + { + gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unk4A; + gUnknown_203F3D4->unk4C = 1; + } + else if (sub_8149630()) + { + return TRUE; + } + else + { + sub_81491B4(); + gUnknown_203F3D4->unk4C = 3; + } + + return FALSE; +} + +static bool32 sub_81484B0(void) +{ + if (!sub_81489C8()) + ; + else if (sub_8149630()) + return TRUE; + else + sub_81491B4(); + + return FALSE; +} + +static bool32 sub_81484D0(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + sub_8149630(); + if (sub_81496D4()) + gUnknown_203F3D4->unk8++; + break; + case 1: + if (!sub_8148A60()) + { + if (sub_81498B4()) + { + gUnknown_203F3D4->unk70.unk2 = sub_81498D8(); + gUnknown_203F3D4->unk4C = 7; + } + else if (gUnknown_203F3D4->unk70.unk4 >= 200) + { + gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unkE; + gUnknown_203F3D4->unk4C = 8; + } + else + { + gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unkE; + gUnknown_203F3D4->unk4C = 4; + } + + gUnknown_203F3D4->unk8++; + return FALSE; + } + break; + case 2: + return FALSE; + } + + return TRUE; +} + +static bool32 sub_814856C(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + if (!sub_8149630()) + sub_81491B4(); + if (sub_81496D4()) + gUnknown_203F3D4->unk8++; + break; + case 1: + if (!sub_8148A60()) + { + gUnknown_203F3D4->unk8++; + return FALSE; + } + break; + case 2: + return FALSE; + } + + return TRUE; +} + +static bool32 sub_81485C8(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + sub_8147F10(4); + gUnknown_203F3D4->unk8++; + // fall through + case 1: + if (!sub_8148C80()) + { + sub_814B494(gUnknown_203F3D4->unk70.unk8, gUnknown_203F3D4->unk70.unk4, gUnknown_203F3D4->unk70.unk2); + gUnknown_203F3D4->unk8++; + } + break; + case 2: + if (gUnknown_203F3D4->unk49) + { + if (sub_8149748()) + gUnknown_203F3D4->unk4C = 5; + else + gUnknown_203F3D4->unk4C = 6; + + gUnknown_203F3D4->unk8++; + return FALSE; + } + break; + case 3: + return FALSE; + } + + return TRUE; +} + +static bool32 sub_8148664(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + sub_8147F10(0); + gUnknown_203F3D4->unk8++; + // fall through + case 1: + if (!sub_8148C80()) + { + sub_814B494(gUnknown_203F3D4->unk70.unk8, gUnknown_203F3D4->unk70.unk4, gUnknown_203F3D4->unk70.unk2); + gUnknown_203F3D4->unk42 = gUnknown_203F3D4->unk45; + return FALSE; + } + break; + } + + return TRUE; +} + +static bool32 sub_81486C4(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + if (!sub_8148E2C()) + gUnknown_203F3D4->unk8++; + break; + case 1: + if (gUnknown_203F3D4->unk49) + { + sub_8147B94(gUnknown_203F3D4); + gUnknown_203F3D4->unk24 = Random(); + gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unk24; + gUnknown_203F3D4->unk4C = 0; + return FALSE; + } + break; + } + + return TRUE; +} + +static bool32 sub_8148724(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + if (!sub_8148E2C()) + { + sub_8147B94(gUnknown_203F3D4); + gUnknown_203F3D4->unk8++; + return FALSE; + } + break; + case 1: + return FALSE; + } + + return TRUE; +} + +static bool32 sub_8148760(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + gUnknown_203F3D4->unk8 = 1; + break; + case 1: + sub_8147F10(0); + gUnknown_203F3D4->unk8++; + break; + case 2: + if (!sub_8148D5C()) + { + SetMainCallback2(gUnknown_203F3D4->returnCallback); + sub_8147B48(); + } + break; + } + + return TRUE; +} + +static bool32 sub_81487B4(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + sub_8147F10(4); + gUnknown_203F3D4->unk8++; + break; + case 1: + if (!sub_8148B54()) + { + gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unkE; + gUnknown_203F3D4->unk4C = 8; + return FALSE; + } + break; + } + + return TRUE; +} + +static bool32 sub_8148800(void) +{ + sub_8147F10(0); + if (!sub_8148B54()) + return FALSE; + else + return TRUE; +} + +static bool32 sub_814881C(void) +{ + switch (gUnknown_203F3D4->unk8) + { + case 0: + sub_814B494(gUnknown_203F3D4->unk70.unk8, gUnknown_203F3D4->unk70.unk4, gUnknown_203F3D4->unk70.unk2); + sub_8149D40(5); + gUnknown_203F3D4->unk8++; + break; + case 1: + if (!sub_8149D68()) + { + sub_8147F10(0); + gUnknown_203F3D4->unk8++; + } + break; + case 2: + if (sub_8149804()) + { + CreateTask(Task_LinkSave, 6); + gUnknown_203F3D4->unk8++; + } + break; + case 3: + if (!FuncIsActiveTask(Task_LinkSave)) + { + sub_814A6CC(); + gUnknown_203F3D4->unk8++; + } + break; + case 4: + if (!sub_814A6FC()) + { + gUnknown_203F3D4->unk4C = 4; + return FALSE; + } + break; + } + + return TRUE; +} + +static bool32 sub_81488DC(void) +{ + switch (gUnknown_203F3D4->unkA) + { + case 0: + sub_8149D40(2); + sub_814AAA0(); + gUnknown_203F3D4->unkA++; + break; + case 1: + if (!sub_8149D68()) + { + sub_814AAB4(gUnknown_203F3D4->unk6); + gUnknown_203F3D4->unk3C = 0; + gUnknown_203F3D4->unkA++; + } + break; + case 2: + if (++gUnknown_203F3D4->unk3C > 120) + { + sub_8149D40(3); + gUnknown_203F3D4->unkA++; + } + break; + case 3: + if (sub_8149D68() != 1 && sub_814AAC8() != 1) + gUnknown_203F3D4->unkA++; + break; + case 4: + sub_8149D40(9); + gUnknown_203F3D4->unkA++; + break; + case 5: + if (!sub_8149D68()) + { + sub_814935C(); + sub_814A3E4(); + gUnknown_203F3D4->unkA++; + } + break; + case 6: + if (!sub_814A408()) + { + sub_814936C(); + sub_8148F9C(); + gUnknown_203F3D4->unkA++; + return FALSE; + } + break; + case 7: + return FALSE; + } + + return TRUE; +} + +static bool32 sub_81489C8(void) +{ + sub_8148FE0(); + if (gUnknown_203F3D4->unk36) + { + gUnknown_203F3D4->unk36 = 0; + return FALSE; + } + + switch (gUnknown_203F3D4->unkA) + { + case 0: + if (sub_814922C(0)) + gUnknown_203F3D4->unkA++; + else + break; + // fall through + case 1: + if (gMain.newKeys & A_BUTTON) + { + sub_8149260(); + sub_8147F10(3); + gUnknown_203F3D4->unkA++; + } + break; + case 2: + if (sub_814922C(1) == TRUE) + gUnknown_203F3D4->unkA++; + break; + case 3: + if (sub_814922C(0) == TRUE) + gUnknown_203F3D4->unkA = 0; + break; + } + + return TRUE; +} + +static bool32 sub_8148A60(void) +{ + int i; + + switch (gUnknown_203F3D4->unkA) + { + case 0: + for (i = 0; i < gUnknown_203F3D4->unk5; i++) + { + if (sub_814AA78(i) == 1) + return TRUE; + } + + gUnknown_203F3D4->unkA++; + break; + case 1: + for (i = 0; i < gUnknown_203F3D4->unk5; i++) + { + if (gUnknown_203F3D4->unk82E4[i].unk10 == 2) + sub_814AA60(i); + } + + sub_8149D40(1); + gUnknown_203F3D4->unk3C = 0; + gUnknown_203F3D4->unkA++; + break; + case 2: + if (++gUnknown_203F3D4->unk3C > 100) + { + sub_8149D40(3); + gUnknown_203F3D4->unk3C = 0; + gUnknown_203F3D4->unkA++; + } + break; + case 3: + if (!sub_8149D68()) + { + sub_814AA8C(); + gUnknown_203F3D4->unk70.unk1 = 0; + sub_8149210(); + gUnknown_203F3D4->unkA++; + return FALSE; + } + break; + case 4: + return FALSE; + } + + return TRUE; +} + +static bool32 sub_8148B54(void) +{ + switch (gUnknown_203F3D4->unkA) + { + case 0: + sub_8149900(gUnknown_203F3D4->unk70.unk2, &gUnknown_203F3D4->unk3E, &gUnknown_203F3D4->unk40); + sub_814A468(gUnknown_203F3D4->unk3E, gUnknown_203F3D4->unk40); + gUnknown_203F3D4->unkA++; + break; + case 1: + case 4: + if (!sub_814A62C()) + { + gUnknown_203F3D4->unk3C = 0; + gUnknown_203F3D4->unkA++; + } + break; + case 2: + case 5: + gUnknown_203F3D4->unk3C++; + if (gMain.newKeys & (A_BUTTON | B_BUTTON) || gUnknown_203F3D4->unk3C > 180) + { + sub_814A6CC(); + gUnknown_203F3D4->unkA++; + } + break; + case 3: + if (!sub_814A6FC()) + { + gUnknown_203F3D4->unk40 = sub_8149978(gUnknown_203F3D4->unk3E, gUnknown_203F3D4->unk40); + if (gUnknown_203F3D4->unk40 && AddBagItem(gUnknown_203F3D4->unk3E, gUnknown_203F3D4->unk40)) + { + if (!CheckBagHasSpace(gUnknown_203F3D4->unk3E, 1)) + { + sub_814A53C(gUnknown_203F3D4->unk3E); + gUnknown_203F3D4->unkA = 4; + } + else + { + gUnknown_203F3D4->unkA = 6; + break; + } + } + else + { + sub_814A5B4(gUnknown_203F3D4->unk3E); + gUnknown_203F3D4->unkA = 4; + } + } + break; + case 6: + if (!sub_814A6FC()) + return FALSE; + break; + } + + return TRUE; +} + +static bool32 sub_8148C80(void) +{ + s8 input; + + switch (gUnknown_203F3D4->unkA) + { + case 0: + sub_8149D40(4); + gUnknown_203F3D4->unkA++; + break; + case 1: + if (!sub_8149D68()) + gUnknown_203F3D4->unkA++; + break; + case 2: + input = sub_814A744(); + switch (input) + { + case MENU_B_PRESSED: + case 1: + gUnknown_203F3D4->unk45 = 1; + sub_8149D40(6); + gUnknown_203F3D4->unkA++; + break; + case 0: + gUnknown_203F3D4->unk45 = 2; + sub_8149D40(6); + gUnknown_203F3D4->unkA++; + break; + } + break; + case 3: + if (!sub_8149D68()) + gUnknown_203F3D4->unkA++; + break; + case 4: + sub_8149D40(8); + gUnknown_203F3D4->unkA++; + break; + case 5: + if (!sub_8149D68()) + { + gUnknown_203F3D4->unkA++; + return FALSE; + } + break; + case 6: + return FALSE; + } + + return TRUE; +} + +static bool32 sub_8148D5C(void) +{ + int var0; + + switch (gUnknown_203F3D4->unkA) + { + case 0: + sub_814A6CC(); + gUnknown_203F3D4->unkA++; + break; + case 1: + if (!sub_814A6FC()) + { + sub_8149D40(7); + gUnknown_203F3D4->unkA++; + } + break; + case 2: + var0 = sub_8149D68(); + if (!var0) + { + gUnknown_203F3D4->unk3C = var0; + gUnknown_203F3D4->unkA++; + } + break; + case 3: + if (++gUnknown_203F3D4->unk3C > 120) + { + BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); + gUnknown_203F3D4->unkA++; + } + break; + case 4: + if (!gPaletteFade.active) + { + SetCloseLinkCallback(); + gUnknown_203F3D4->unkA++; + } + break; + case 5: + if (!gReceivedRemoteLinkPlayers) + return FALSE; + break; + } + + return TRUE; +} + +static bool32 sub_8148E2C(void) +{ + switch (gUnknown_203F3D4->unkA) + { + case 0: + sub_814A6CC(); + sub_814AA24(0); + gUnknown_203F3D4->unkA++; + break; + case 1: + if (!sub_814A6FC()) + { + gUnknown_203F3D4->unkA++; + return FALSE; + } + break; + case 2: + return FALSE; + } + + return TRUE; +} + +static void sub_8148E80(u8 taskId) +{ + int i; + s16 *taskData = gTasks[taskId].data; + struct PokemonJump1 *ptr = (struct PokemonJump1 *)GetWordTaskArg(taskId, 14); + + switch (taskData[0]) + { + case 0: + for (i = 0; i < MAX_RFU_PLAYERS; i++) + taskData[i + 2] = 0; + + taskData[0]++; + // fall through + case 1: + sub_8149A6C(&ptr->unk82A8[ptr->unk6]); + for (i = 0; i < MAX_RFU_PLAYERS; i++) + { + if (!taskData[i + 2] && sub_8149A90(i, &ptr->unk82A8[i])) + { + StringCopy(ptr->unk82E4[i].unk1C, gLinkPlayers[i].name); + taskData[i + 2] = 1; + taskData[1]++; + if (taskData[1] == ptr->unk5) + { + sub_8147C20(); + DestroyTask(taskId); + break; + } + } + } + break; + } +} + +static void sub_8148F5C(TaskFunc func, u8 taskPriority) +{ + u8 taskId = CreateTask(func, taskPriority); + SetWordTaskArg(taskId, 14, (uintptr_t)gUnknown_203F3D4); +} + +static void sub_8148F7C(void) +{ + gUnknown_203F3D4->unk4A = 0; + gUnknown_203F3D4->unk14 = 6; + gUnknown_203F3D4->unk34 = 0; + gUnknown_203F3D4->unk1C = 0; + gUnknown_203F3D4->unk36 = 0; + gUnknown_203F3D4->unk10 = 0; +} + +static void sub_8148F9C(void) +{ + gUnknown_203F3D4->unk4A = 0; + gUnknown_203F3D4->unk34 = 0x6FF; + gUnknown_203F3D4->unk14 = 7; + gUnknown_203F3D4->unk36 = 0; + gUnknown_203F3D4->unk10 = 0; + gUnknown_203F3D4->unk51 = 0; + gUnknown_203F3D4->unk50 = 0; + gUnknown_203F3D4->unk20 = 0; + gUnknown_203F3D4->unk4E = 0; + gUnknown_203F3D4->unk6C = 0; + sub_8149078(); +} + +static void sub_8148FE0(void) +{ + if (gUnknown_203F3D4->unk46) + { + gUnknown_203F3D4->unk4A++; + gUnknown_203F3D4->unk34 += sub_8149044(); + if (gUnknown_203F3D4->unk34 >= 0x9FF) + gUnknown_203F3D4->unk34 -= 0x9FF; + + gUnknown_203F3D4->unk18 = gUnknown_203F3D4->unk14; + gUnknown_203F3D4->unk14 = gUnknown_203F3D4->unk34 >> 8; + if (gUnknown_203F3D4->unk14 > 6 && gUnknown_203F3D4->unk18 < 7) + { + gUnknown_203F3D4->unk36++; + sub_8149078(); + } + } +} + +static int sub_8149044(void) +{ + int result; + + if (gUnknown_203F3D4->unk10) + return 0; + + result = gUnknown_203F3D4->unk1C; + if (gUnknown_203F3D4->unk34 <= 0x5FF) + { + gUnknown_203F3D4->unk20 += 80; + result += gUnknown_203F3D4->unk20 >> 8; + } + + return result; +} + +static const u16 gUnknown_846B694[] = {0x1a, 0x1f, 0x24, 0x29, 0x2e, 0x33, 0x38, 0x3d}; +static const u16 gUnknown_846B6A4[] = {0, 1, 1, 2}; + +static void sub_8149078(void) +{ + int var0; + + gUnknown_203F3D4->unk20 = 0; + if (gUnknown_203F3D4->unk4E) + { + gUnknown_203F3D4->unk4E--; + if (gUnknown_203F3D4->unk6C) + { + if (sub_8149194() % 4 != 0) + { + gUnknown_203F3D4->unk1C = gUnknown_203F3D4->unk28; + } + else + { + if (gUnknown_203F3D4->unk28 > 54) + gUnknown_203F3D4->unk1C = 30; + else + gUnknown_203F3D4->unk1C = 82; + } + } + } + else + { + if (!(gUnknown_203F3D4->unk50 & 8)) + { + gUnknown_203F3D4->unk28 = gUnknown_846B694[gUnknown_203F3D4->unk50] + (gUnknown_203F3D4->unk51 * 7); + gUnknown_203F3D4->unk4E = gUnknown_846B6A4[sub_8149194() % NELEMS(gUnknown_846B6A4)] + 2; + gUnknown_203F3D4->unk50++; + } + else + { + if (gUnknown_203F3D4->unk50 == 8) + { + if (gUnknown_203F3D4->unk51 < 3) + gUnknown_203F3D4->unk51++; + else + gUnknown_203F3D4->unk6C = 1; + } + + var0 = gUnknown_846B694[15 - gUnknown_203F3D4->unk50]; + gUnknown_203F3D4->unk28 = var0 + (gUnknown_203F3D4->unk51 * 7); + if (++gUnknown_203F3D4->unk50 > 15) + { + if (sub_8149194() % 4 == 0) + gUnknown_203F3D4->unk28 -= 5; + + gUnknown_203F3D4->unk50 = 0; + } + } + + gUnknown_203F3D4->unk1C = gUnknown_203F3D4->unk28; + } +} + +static int sub_8149194(void) +{ + // The number 1103515245 comes from the example implementation of rand and srand + gUnknown_203F3D4->unk24 = gUnknown_203F3D4->unk24 * 1103515245 + 24691; + return gUnknown_203F3D4->unk24 >> 16; +} + +static void sub_81491B4(void) +{ + gUnknown_203F3D4->unk10 = 1; + gUnknown_203F3D4->unk14 = 6; + gUnknown_203F3D4->unk34 = 0x5FF; + sub_814936C(); +} + +static int sub_81491D8(void) +{ + return gUnknown_203F3D4->unk10; +} + +static void sub_81491E4(void) +{ + int i; + for (i = 0; i < MAX_RFU_PLAYERS; i++) + gUnknown_203F3D4->unk82E4[i].unk14 = 0; +} + +static void sub_8149210(void) +{ + gUnknown_203F3D4->unk83AC->unk10 = 0; + gUnknown_203F3D4->unk83AC->unk12 = 0; +} + +static bool32 sub_814922C(u16 arg0) +{ + if (gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk10 == arg0) + return TRUE; + else + return FALSE; +} + +static void sub_8149260(void) +{ + gUnknown_203F3D4->unk83AC->unkE = gUnknown_203F3D4->unk4A; + gUnknown_203F3D4->unk83AC->unk12 = gUnknown_203F3D4->unk83AC->unk10; + gUnknown_203F3D4->unk83AC->unk10 = 1; +} + +static void sub_8149288(void) +{ + gUnknown_203F3D4->unk83AC->unk12 = gUnknown_203F3D4->unk83AC->unk10; + gUnknown_203F3D4->unk83AC->unk10 = 2; + gUnknown_203F3D4->unk83AC->unkE = gUnknown_203F3D4->unk4A; + gUnknown_203F3D4->unk83AC->unk14 = 2; +} + +static void sub_81492B8(void) +{ + gUnknown_203F3D4->unk83AC->unk12 = gUnknown_203F3D4->unk83AC->unk10; + gUnknown_203F3D4->unk83AC->unk10 = 0; +} + +static const u16 gUnknown_846B6AC[] = {SE_RS_SHOP, SE_SHINY, SE_M_MORNING_SUN, SE_POKE_JUMP_SUCCESS}; + +static void sub_81492D8(void) +{ + if (gUnknown_203F3D4->unk5C) + { + sub_814AA24(gUnknown_203F3D4->unk70.unk8); + gUnknown_203F3D4->unk5C = 0; + if (gUnknown_203F3D4->unk4D) + { + int index = sub_814A98C(gUnknown_203F3D4->unk70.unk1); + PlaySE(gUnknown_846B6AC[index - 2]); + gUnknown_203F3D4->unk4D = 0; + } + } + + sub_814AA34(gUnknown_203F3D4->unk70.unk4); + sub_814937C(); + sub_814933C(); +} + +static void sub_814933C(void) +{ + if (gUnknown_203F3D4->unk46) + sub_814A95C(gUnknown_203F3D4->unk14); +} + +static void sub_814935C(void) +{ + gUnknown_203F3D4->unk46 = 0; +} + +static void sub_814936C(void) +{ + gUnknown_203F3D4->unk46 = 1; +} + +static void sub_814937C(void) +{ + int i; + int whichSound = 0; + int numLinkPlayers = gUnknown_203F3D4->unk5; + + for (i = 0; i < numLinkPlayers; i++) + { + switch (gUnknown_203F3D4->unk82E4[i].unk10) + { + case 0: + sub_814A940(i, 0); + break; + case 1: + if (gUnknown_203F3D4->unk82E4[i].unk12 != 1 || gUnknown_203F3D4->unk82E4[i].unkE != gUnknown_203F3D4->unk9A[i]) + { + if (i == gUnknown_203F3D4->unk6) + gUnknown_203F3D4->unk82E4[i].unk12 = 1; + + whichSound |= 0x1; + gUnknown_203F3D4->unk82E4[i].unk4 = 0x7FFFFFFF; + gUnknown_203F3D4->unk9A[i] = gUnknown_203F3D4->unk82E4[i].unkE; + } + + sub_8149490(i); + break; + case 2: + if (gUnknown_203F3D4->unk82E4[i].unk12 != 2) + { + if (i == gUnknown_203F3D4->unk6) + gUnknown_203F3D4->unk82E4[i].unk12 = 2; + + whichSound |= 0x2; + sub_814AA48(i); + } + break; + } + } + + if (whichSound & 0x2) + PlaySE(SE_POKE_JUMP_FAILURE); + else if (whichSound & 0x1) + PlaySE(SE_LEDGE); +} + +static const s8 gUnknown_846B6B4[][48] = +{ + {-3, -6, -8, -10, -13, -15, -17, -19, -21, -23, -25, -27, -28, -29, -30, -30, -30, -28, -27, + -26, -25, -23, -22, -20, -18, -17, -15, -13, -11, -8, -6, -4, -1}, + + {-3, -6, -9, -11, -14, -16, -18, -20, -22, -24, -26, -28, -29, -30, -30, -28, -26, -24, -22, + -20, -18, -16, -14, -11, -9, -6, -4, -1}, + + {-3, -6, -9, -11, -13, -15, -17, -19, -21, -23, -25, -27, -28, -29, -30, -30, -30, -30, -29, + -29, -28, -28, -27, -27, -26, -25, -24, -22, -20, -18, -16, -14, + -12, -11, -9, -6, -4, -1}, +}; + +static void sub_8149490(int multiplayerId) +{ + int var0; + int var1; + struct PokemonJump1_82E4 *player; + + if (gUnknown_203F3D4->unk68) + return; + + player = &gUnknown_203F3D4->unk82E4[multiplayerId]; + if (player->unk4 != 0x7FFFFFFF) + { + player->unk4++; + var0 = player->unk4; + } + else + { + var0 = gUnknown_203F3D4->unk4A - player->unkE; + if (var0 >= 65000) + { + var0 -= 65000; + var0 += gUnknown_203F3D4->unk4A; + } + + player->unk4 = var0; + } + + if (var0 < 4) + return; + + var0 -= 4; + if (var0 < 48) + var1 = gUnknown_846B6B4[player->unkC][var0]; + else + var1 = 0; + + sub_814A940(multiplayerId, var1); + if (!var1 && multiplayerId == gUnknown_203F3D4->unk6) + sub_81492B8(); + + player->unk0 = var1; +} + +static void sub_8149534(void) +{ + if (gUnknown_203F3D4->unk14 == 8 && gUnknown_203F3D4->unk18 == 7) + { + if (gUnknown_203F3D4->unk58 == 0) + { + sub_8149878(); + gUnknown_203F3D4->unk54 = 0; + gUnknown_203F3D4->unk58 = 1; + gUnknown_203F3D4->unk70.unk1 = 0; + } + else + { + if (gUnknown_203F3D4->unk54 == 5) + { + gUnknown_203F3D4->unkC++; + sub_8149898(gUnknown_203F3D4->unkC); + } + else + { + gUnknown_203F3D4->unkC = 0; + } + + if (gUnknown_203F3D4->unk54 > 1) + { + gUnknown_203F3D4->unk64 = 1; + memcpy(gUnknown_203F3D4->unk86, gUnknown_203F3D4->unk81, sizeof(u8) * MAX_RFU_PLAYERS); + } + + sub_8149878(); + gUnknown_203F3D4->unk54 = 0; + gUnknown_203F3D4->unk58 = 1; + gUnknown_203F3D4->unk70.unk1 = 0; + if (gUnknown_203F3D4->unk70.unk4 < 9999) + gUnknown_203F3D4->unk70.unk4++; + + sub_8149780(10); + sub_8147F10(3); + } + } + + if (gUnknown_203F3D4->unk64 && (sub_8149710() == TRUE || !gUnknown_203F3D4->unk14)) + { + int var0 = sub_8149834(gUnknown_203F3D4->unk86); + sub_8149780(sub_8149888(var0)); + sub_8147F10(3); + gUnknown_203F3D4->unk64 = 0; + } + + if (gUnknown_203F3D4->unk58) + { + int var1 = sub_81497A8(); + if (var1 > gUnknown_203F3D4->unk54) + { + gUnknown_203F3D4->unk54 = var1; + memcpy(gUnknown_203F3D4->unk81, gUnknown_203F3D4->unk7C, sizeof(u8) * MAX_RFU_PLAYERS); + } + } +} + +static bool32 sub_8149630(void) +{ + int i; + + if (gUnknown_203F3D4->unk14 == 6 && !gUnknown_203F3D4->unk83AC->unk0) + { + if (gUnknown_203F3D4->unk83AC->unk12 == 1 && sub_81491D8() == 1) + { + gUnknown_203F3D4->unk83AC->unk14 = 1; + } + else + { + sub_8149288(); + sub_8147F10(3); + } + } + + if (gUnknown_203F3D4->unk14 == 7 + && gUnknown_203F3D4->unk18 == 6 + && gUnknown_203F3D4->unk83AC->unk10 != 2) + { + gUnknown_203F3D4->unk83AC->unk14 = 1; + sub_8147F10(3); + } + + for (i = 0; i < gUnknown_203F3D4->unk5; i++) + { + if (gUnknown_203F3D4->unk82E4[i].unk10 == 2) + return FALSE; + } + + return TRUE; +} + +static bool32 sub_81496D4(void) +{ + int i; + int numPlayers = gUnknown_203F3D4->unk5; + int count = 0; + for (i = 0; i < numPlayers; i++) + { + if (gUnknown_203F3D4->unk82E4[i].unk14) + count++; + } + + return count == numPlayers; +} + +static bool32 sub_8149710(void) +{ + int i; + for (i = 0; i < gUnknown_203F3D4->unk5; i++) + { + if (gUnknown_203F3D4->unk82E4[i].unk14 != 1) + return FALSE; + } + + return TRUE; +} + +static bool32 sub_8149748(void) +{ + int i; + + if (gUnknown_203F3D4->unk45 == 1) + return FALSE; + + for (i = 1; i < gUnknown_203F3D4->unk5; i++) + { + if (gUnknown_203F3D4->unk90[i] == 1) + return FALSE; + } + + return TRUE; +} + +static void sub_8149780(int arg0) +{ + gUnknown_203F3D4->unk70.unk8 += arg0; + gUnknown_203F3D4->unk5C = 1; + if (gUnknown_203F3D4->unk70.unk8 >= 99990) + gUnknown_203F3D4->unk70.unk8 = 99990; +} + +static int sub_81497A8(void) +{ + int i; + int count = 0; + int numPlayers = gUnknown_203F3D4->unk5; + + for (i = 0; i < numPlayers; i++) + { + if (gUnknown_203F3D4->unk82E4[i].unk0 == -30) + { + gUnknown_203F3D4->unk7C[i] = 1; + count++; + } + else + { + gUnknown_203F3D4->unk7C[i] = 0; + } + } + + return count; +} + +static bool32 sub_8149804(void) +{ + return !Rfu.recvQueue.count && !Rfu.sendQueue.count; +} + +static int sub_8149834(u8 *arg0) +{ + int i; + int flags; + int count; + + for (i = 0, flags = 0, count = 0; i < MAX_RFU_PLAYERS; i++) + { + if (arg0[i]) + { + flags |= 1 << i; + count++; + } + } + + gUnknown_203F3D4->unk70.unk1 = flags; + if (flags) + gUnknown_203F3D4->unk4D = 1; + + return count; +} + +static void sub_8149878(void) +{ + gUnknown_203F3D4->unk44 = 0; +} + +static const int gUnknown_846B74C[] = {0, 0, 50, 100, 200, 500}; + +static int sub_8149888(int arg0) +{ + return gUnknown_846B74C[arg0]; +} + +static void sub_8149898(u16 arg0) +{ + if (arg0 > gUnknown_203F3D4->unkE) + gUnknown_203F3D4->unkE = arg0; +} + +static const u16 gUnknown_846B764[] = {0x8a, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93}; +static const u32 gUnknown_846B76C[][2] = +{ + {0x1388, 1}, + {0x1f40, 2}, + {0x2ee0, 3}, + {0x3e80, 4}, + {0x4e20, 5}, +}; + +static bool32 sub_81498B4(void) +{ + if (gUnknown_203F3D4->unk70.unk8 >= gUnknown_846B76C[0][0]) + return TRUE; + else + return FALSE; +} + +static u16 sub_81498D8(void) +{ + u16 lo = sub_8149910(); + u16 hi = sub_8149930(); + return (hi << 12) | (lo & 0xFFF); +} + +static void sub_8149900(u16 arg0, u16 *arg1, u16 *arg2) +{ + *arg2 = arg0 >> 12; + *arg1 = arg0 & 0xFFF; +} + +static u16 sub_8149910(void) +{ + u16 index = Random() % NELEMS(gUnknown_846B764); + return gUnknown_846B764[index]; +} + +static u16 sub_8149930(void) +{ + u32 val, i; + + val = 0; + for (i = 0; i < 5; i++) + { + if (gUnknown_203F3D4->unk70.unk8 < gUnknown_846B76C[i][0]) + break; + else if (1) // required to match, see pret/pokeemerald#982 + val = gUnknown_846B76C[i][1]; + else + break; + } + + return val; +} + +static u16 sub_8149978(u16 item, u16 quantity) +{ + while (quantity && !CheckBagHasSpace(item, quantity)) + quantity--; + + return quantity; +} + +u16 sub_81499A4(void) +{ + return GetLinkPlayerCount(); +} + +u16 sub_81499B4(void) +{ + return gUnknown_203F3D4->unk6; +} + +struct PokemonJump1_MonInfo *sub_81499C0(u8 multiplayerId) +{ + return &gUnknown_203F3D4->unk82A8[multiplayerId]; +} + +u8 *sub_81499E0(u8 multiplayerId) +{ + return gUnknown_203F3D4->unk82E4[multiplayerId].unk1C; +} + +bool32 IsSpeciesAllowedInPokemonJump(u16 species) +{ + return GetPokemonJumpSpeciesIdx(species) > -1; +} + +void IsPokemonJumpSpeciesInParty(void) +{ + int i; + + for (i = 0; i < PARTY_SIZE; i++) + { + if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES)) + { + u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); + if (IsSpeciesAllowedInPokemonJump(species)) + { + gSpecialVar_Result = TRUE; + return; + } + } + } + + gSpecialVar_Result = FALSE; +} + +void sub_8149A6C(struct PokemonJump1_MonInfo *arg0) +{ + struct MonInfoPacket packet; + packet.id = 1; + packet.species = arg0->species; + packet.otId = arg0->otId; + packet.personality = arg0->personality; + Rfu_SendPacket(&packet); +} + +bool32 sub_8149A90(int multiplayerId, struct PokemonJump1_MonInfo *arg0) +{ + struct MonInfoPacket packet; + + if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) + return FALSE; + + memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); + if (packet.id == 1) + { + arg0->species = packet.species; + arg0->otId = packet.otId; + arg0->personality = packet.personality; + return TRUE; + } + + return FALSE; +} + +struct UnkPacket2 +{ + u8 id; // packet id + u32 unk4; + u32 unk8; +}; + +void sub_8149AE0(u32 arg0) +{ + struct UnkPacket2 packet; + packet.id = 2; + packet.unk4 = arg0; + Rfu_SendPacket(&packet); +} + +struct UnkPacket3 +{ + u8 id; // packet id + u8 unk1; + u8 unk2; + u8 unk3_0:5; + u8 unk3_1:3; + u16 unk4; + u16 unk6; + u32 unk8_0:15; + u32 unk8_1:17; +}; + +void sub_8149AF8(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1) +{ + struct UnkPacket3 packet; + packet.id = 3; + packet.unk8_1 = arg1->unk8; + packet.unk3_0 = arg1->unk1; + packet.unk1 = arg1->unk0; + packet.unk6 = arg1->unk2; + packet.unk8_0 = arg1->unk4; + packet.unk2 = arg0->unk10; + packet.unk3_1 = arg0->unk14; + packet.unk4 = arg0->unkE; + Rfu_SendPacket(&packet); +} + +bool32 sub_8149B7C(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1) +{ + struct UnkPacket3 packet; + + if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00) + return FALSE; + + memcpy(&packet, &gRecvCmds[0][1], sizeof(packet)); + if (packet.id != 3) + return FALSE; + + arg1->unk8 = packet.unk8_1; + arg1->unk1 = packet.unk3_0; + arg1->unk0 = packet.unk1; + arg1->unk2 = packet.unk6; + arg1->unk4 = packet.unk8_0; + arg0->unk10 = packet.unk2; + arg0->unk14 = packet.unk3_1; + arg0->unkE = packet.unk4; + return TRUE; +} + +struct UnkPacket4 +{ + u8 id; // packet id + u8 unk1; + u8 unk2; + u8 unk3; + u16 unk4; + u8 unk6; + u16 unk8; +}; + +void sub_8149BF4(struct PokemonJump1_82E4 *arg0, u8 arg1, u16 arg2) +{ + struct UnkPacket4 packet; + packet.id = 4; + packet.unk1 = arg0->unk10; + packet.unk2 = arg0->unk14; + packet.unk3 = arg0->unk18; + packet.unk4 = arg0->unkE; + packet.unk6 = arg1; + packet.unk8 = arg2; + Rfu_SendPacket(&packet); +} + +bool32 sub_8149C24(struct PokemonJump1_82E4 *arg0, int multiplayerId, u8 *arg2, u16 *arg3) +{ + struct UnkPacket4 packet; + + if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) + return FALSE; + + memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); + if (packet.id != 4) + return FALSE; + + arg0->unk10 = packet.unk1; + arg0->unk14 = packet.unk2; + arg0->unk18 = packet.unk3; + arg0->unkE = packet.unk4; + *arg2 = packet.unk6; + *arg3 = packet.unk8; + return TRUE; +} + +bool32 sub_8149C90(struct PokemonJump1_82E4 *arg0, int multiplayerId) +{ + struct UnkPacket4 packet; + + if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) + return FALSE; + + memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); + if (packet.id != 4) + return FALSE; + + arg0->unk10 = packet.unk1; + arg0->unk14 = packet.unk2; + arg0->unk18 = packet.unk3; + arg0->unkE = packet.unk4; + return TRUE; +} + +void sub_8149CEC(struct PokemonJump2 *arg0) +{ + u8 taskId; + + gUnknown_203F3D8 = arg0; + sub_8149D34(gUnknown_203F3D8); + taskId = CreateTask(sub_8149DA4, 3); + gUnknown_203F3D8->unk6 = taskId; + SetWordTaskArg(gUnknown_203F3D8->unk6, 2, (uintptr_t)gUnknown_203F3D8); + sub_8149D80(sub_8149DC8); +} + +void sub_8149D24(void) +{ + FreeAllWindowBuffers(); + DigitObjUtil_Free(); +} + +static void sub_8149D34(struct PokemonJump2 *arg0) +{ + arg0->unk4 = 0; + arg0->unk0 = 0; + arg0->unk12 = 0xFF; +} + +// Gfx +static const u16 sPkmnJumpPal3[] = INCBIN_U16("graphics/link_games/pkmnjump_pal3.gbapal"); + +static const u16 sPkmnJumpBgPal[] = INCBIN_U16("graphics/link_games/pkmnjump_bg.gbapal"); +static const u32 sPkmnJumpBgGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_bg.4bpp.lz"); +static const u32 sPkmnJumpBgTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_bg.bin.lz"); + +static const u16 sPkmnJumpVenusaurPal[] = INCBIN_U16("graphics/link_games/pkmnjump_venusaur.gbapal"); +static const u32 sPkmnJumpVenusaurGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_venusaur.4bpp.lz"); +static const u32 sPkmnJumpVenusaurTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_venusaur.bin.lz"); + +static const u16 sPkmnJumpResultsPal[] = INCBIN_U16("graphics/link_games/pkmnjump_results.gbapal"); +static const u32 sPkmnJumpResultsGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_results.4bpp.lz"); +static const u32 sPkmnJumpResultsTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_results.bin.lz"); + +static const struct BgTemplate gUnknown_846D8D4[] = +{ + { + .bg = 0, + .charBaseIndex = 0, + .mapBaseIndex = 27, + .screenSize = 0, + .paletteMode = 0, + .priority = 0, + .baseTile = 0 + }, + { + .bg = 2, + .charBaseIndex = 1, + .mapBaseIndex = 30, + .screenSize = 2, + .paletteMode = 0, + .priority = 2, + .baseTile = 0 + }, + { + .bg = 1, + .charBaseIndex = 2, + .mapBaseIndex = 12, + .screenSize = 3, + .paletteMode = 0, + .priority = 1, + .baseTile = 0 + }, + { + .bg = 3, + .charBaseIndex = 3, + .mapBaseIndex = 29, + .screenSize = 0, + .paletteMode = 0, + .priority = 3, + .baseTile = 0 + }, +}; + +static const struct WindowTemplate gUnknown_846D8E4[] = +{ + { + .bg = 0, + .tilemapLeft = 19, + .tilemapTop = 0, + .width = 6, + .height = 2, + .paletteNum = 2, + .baseBlock = 0x13, + }, + { + .bg = 0, + .tilemapLeft = 8, + .tilemapTop = 0, + .width = 6, + .height = 2, + .paletteNum = 2, + .baseBlock = 0x1F, + }, + DUMMY_WIN_TEMPLATE, +}; + +struct +{ + int id; + void (*func)(void); +} static const gUnknown_846D8FC[] = +{ + {0x00, sub_8149DC8}, + {0x01, sub_8149F64}, + {0x02, sub_8149FD0}, + {0x03, sub_814A03C}, + {0x04, sub_814A0C8}, + {0x05, sub_814A174}, + {0x06, sub_814A218}, + {0x07, sub_814A264}, + {0x09, sub_814A3AC}, + {0x08, sub_814A308}, +}; + +void sub_8149D40(int arg0) +{ + int i; + + for (i = 0; i < NELEMS(gUnknown_846D8FC); i++) + { + if (gUnknown_846D8FC[i].id == arg0) + sub_8149D80(gUnknown_846D8FC[i].func); + } +} + +bool32 sub_8149D68(void) +{ + return (gUnknown_203F3D8->unk0 != 1); +} + +static void sub_8149D80(void (*func)(void)) +{ + SetWordTaskArg(gUnknown_203F3D8->unk6, 0, (uintptr_t)func); + gUnknown_203F3D8->unk4 = 0; + gUnknown_203F3D8->unk0 = 0; +} + +static void sub_8149DA4(u8 taskId) +{ + if (!gUnknown_203F3D8->unk0) + { + void (*func)(void) = (void *)(GetWordTaskArg(taskId, 0)); + + func(); + } +} + +static void sub_8149DC8(void) +{ + switch (gUnknown_203F3D8->unk4) + { + case 0: + ResetBgsAndClearDma3BusyFlags(FALSE); + InitBgsFromTemplates(0, gUnknown_846D8D4, NELEMS(gUnknown_846D8D4)); + InitWindows(gUnknown_846D8E4); + ResetBgPositions(); + ResetTempTileDataBuffers(); + sub_814AD6C(gUnknown_203F3D8); + sub_814A9C8(); + LoadPalette(sPkmnJumpBgPal, 0, 0x20); + DecompressAndCopyTileDataToVram(3, sPkmnJumpBgGfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(3, sPkmnJumpBgTilemap, 0, 0, 1); + LoadPalette(sPkmnJumpVenusaurPal, 0x30, 0x20); + DecompressAndCopyTileDataToVram(2, sPkmnJumpVenusaurGfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(2, sPkmnJumpVenusaurTilemap, 0, 0, 1); + LoadPalette(sPkmnJumpResultsPal, 0x10, 0x20); + DecompressAndCopyTileDataToVram(1, sPkmnJumpResultsGfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, sPkmnJumpResultsTilemap, 0, 0, 1); + LoadPalette(sPkmnJumpPal3, 0x20, 0x20); + SetBgTilemapBuffer(0, gUnknown_203F3D8->tilemapBuffer); + FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); + sub_814A84C(); + sub_814AA24(0); + DrawWindowBorderWithStdpal3(0, 1, 0xE0); + LoadUserWindowBorderGfx(0, 0x00A, 0xD0); + CopyBgTilemapBufferToVram(0); + CopyBgTilemapBufferToVram(2); + CopyBgTilemapBufferToVram(1); + gUnknown_203F3D8->unk4++; + break; + case 1: + if (!FreeTempTileDataBuffersIfPossible()) + { + sub_814A8B8(); + sub_814B294(gUnknown_203F3D8); + sub_814B348(gUnknown_203F3D8, 6); + ShowBg(3); + ShowBg(0); + ShowBg(2); + HideBg(1); + gUnknown_203F3D8->unk4++; + } + break; + case 2: + gUnknown_203F3D8->unk0 = 1; + break; + } +} + +static void sub_8149F64(void) +{ + switch (gUnknown_203F3D8->unk4) + { + case 0: + sub_814AADC(); + gUnknown_203F3D8->unk4++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_814AC30(FALSE); + gUnknown_203F3D8->unk4++; + } + break; + case 2: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_814AC94(); + gUnknown_203F3D8->unk4++; + } + break; + case 3: + if (!IsDma3ManagerBusyWithBgCopy()) + gUnknown_203F3D8->unk0 = 1; + break; + } +} + +static void sub_8149FD0(void) +{ + switch (gUnknown_203F3D8->unk4) + { + case 0: + sub_814AADC(); + gUnknown_203F3D8->unk4++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_814AC30(TRUE); + gUnknown_203F3D8->unk4++; + } + break; + case 2: + if (!IsDma3ManagerBusyWithBgCopy()) + { + sub_814AC94(); + gUnknown_203F3D8->unk4++; + } + break; + case 3: + if (!IsDma3ManagerBusyWithBgCopy()) + gUnknown_203F3D8->unk0 = 1; + break; + } +} + +static void sub_814A03C(void) +{ + int i, numPlayers; + + numPlayers = sub_81499A4(); + switch (gUnknown_203F3D8->unk4) + { + case 0: + for (i = 0; i < numPlayers; i++) + ClearWindowTilemap(gUnknown_203F3D8->unk1C[i]); + + CopyBgTilemapBufferToVram(0); + gUnknown_203F3D8->unk4++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + for (i = 0; i < numPlayers; i++) + RemoveWindow(gUnknown_203F3D8->unk1C[i]); + + gUnknown_203F3D8->unk0 = 1; + } + break; + } +} + +static void sub_814A0C8(void) +{ + switch (gUnknown_203F3D8->unk4) + { + case 0: + gUnknown_203F3D8->unk12 = sub_814A754(1, 8, 20, 2); + AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_WantToPlayAgain2, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); + gUnknown_203F3D8->unk4++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + PutWindowTilemap(gUnknown_203F3D8->unk12); + DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); + sub_814A7D0(23, 7, 0); + CopyBgTilemapBufferToVram(0); + gUnknown_203F3D8->unk4++; + } + break; + case 2: + if (!IsDma3ManagerBusyWithBgCopy()) + gUnknown_203F3D8->unk0 = 1; + break; + } +} + +static void sub_814A174(void) +{ + switch (gUnknown_203F3D8->unk4) + { + case 0: + gUnknown_203F3D8->unk12 = sub_814A754(2, 7, 26, 4); + AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_SavingDontTurnOffPower, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); + gUnknown_203F3D8->unk4++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + PutWindowTilemap(gUnknown_203F3D8->unk12); + DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); + CopyBgTilemapBufferToVram(0); + gUnknown_203F3D8->unk4++; + } + break; + case 2: + if (!IsDma3ManagerBusyWithBgCopy()) + gUnknown_203F3D8->unk0 = 1; + break; + } +} + +static void sub_814A218(void) +{ + switch (gUnknown_203F3D8->unk4) + { + case 0: + sub_814A6CC(); + DestroyYesNoMenu(); + CopyBgTilemapBufferToVram(0); + gUnknown_203F3D8->unk4++; + break; + case 1: + if (!sub_814A6FC() && !IsDma3ManagerBusyWithBgCopy()) + gUnknown_203F3D8->unk0 = 1; + break; + } +} + +static void sub_814A264(void) +{ + switch (gUnknown_203F3D8->unk4) + { + case 0: + gUnknown_203F3D8->unk12 = sub_814A754(2, 8, 22, 4); + AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_SomeoneDroppedOut2, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); + gUnknown_203F3D8->unk4++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + PutWindowTilemap(gUnknown_203F3D8->unk12); + DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); + CopyBgTilemapBufferToVram(0); + gUnknown_203F3D8->unk4++; + } + break; + case 2: + if (!IsDma3ManagerBusyWithBgCopy()) + gUnknown_203F3D8->unk0 = 1; + break; + } +} + +static void sub_814A308(void) +{ + switch (gUnknown_203F3D8->unk4) + { + case 0: + gUnknown_203F3D8->unk12 = sub_814A754(7, 10, 16, 2); + AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_CommunicationStandby4, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); + gUnknown_203F3D8->unk4++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + { + PutWindowTilemap(gUnknown_203F3D8->unk12); + DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); + CopyBgTilemapBufferToVram(0); + gUnknown_203F3D8->unk4++; + } + break; + case 2: + if (!IsDma3ManagerBusyWithBgCopy()) + gUnknown_203F3D8->unk0 = 1; + break; + } +} + +static void sub_814A3AC(void) +{ + switch (gUnknown_203F3D8->unk4) + { + case 0: + sub_814B43C(gUnknown_203F3D8); + gUnknown_203F3D8->unk4++; + break; + case 1: + if (!sub_814B460()) + gUnknown_203F3D8->unk0 = 1; + break; + } +} + +void sub_814A3E4(void) +{ + gUnknown_203F3D8->unkA = 0; + gUnknown_203F3D8->unkB = 0; + gUnknown_203F3D8->unkC = 6; + sub_814A95C(gUnknown_203F3D8->unkC); +} + +bool32 sub_814A408(void) +{ + switch (gUnknown_203F3D8->unkA) + { + case 0: + gUnknown_203F3D8->unkB++; + if (gUnknown_203F3D8->unkB > 10) + { + gUnknown_203F3D8->unkB = 0; + gUnknown_203F3D8->unkC++; + if (gUnknown_203F3D8->unkC >= 10) + { + gUnknown_203F3D8->unkC = 0; + gUnknown_203F3D8->unkA++; + } + } + sub_814A95C(gUnknown_203F3D8->unkC); + if (gUnknown_203F3D8->unkC != 7) + break; + case 1: + return FALSE; + } + + return TRUE; +} + +static const u8 sPluralTxt[] = _("IES"); + +void sub_814A468(u16 itemId, u16 quantity) +{ + CopyItemName(itemId, gUnknown_203F3D8->txtBuff[0]); + ConvertIntToDecimalStringN(gUnknown_203F3D8->txtBuff[1], quantity, STR_CONV_MODE_LEFT_ALIGN, 1); + if (itemId >= FIRST_BERRY_INDEX && itemId < LAST_BERRY_INDEX) + { + if (quantity > 1) + { + int endi = StringLength(gUnknown_203F3D8->txtBuff[0]); + if (endi != 0) + { + endi--; + endi[gUnknown_203F3D8->txtBuff[0]] = EOS; + StringAppend(gUnknown_203F3D8->txtBuff[0], sPluralTxt); + } + } + } + DynamicPlaceholderTextUtil_Reset(); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_203F3D8->txtBuff[0]); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gUnknown_203F3D8->txtBuff[1]); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_AwesomeWonF701F700); + gUnknown_203F3D8->unk12 = sub_814A754(4, 8, 22, 4); + AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); + gUnknown_203F3D8->unk14 = MUS_LEVEL_UP; + gUnknown_203F3D8->unkD = 0; +} + +void sub_814A53C(u16 itemId) +{ + CopyItemName(itemId, gUnknown_203F3D8->txtBuff[0]); + DynamicPlaceholderTextUtil_Reset(); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_203F3D8->txtBuff[0]); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_FilledStorageSpace2); + gUnknown_203F3D8->unk12 = sub_814A754(4, 8, 22, 4); + AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); + gUnknown_203F3D8->unk14 = 0; + gUnknown_203F3D8->unkD = 0; +} + +void sub_814A5B4(u16 itemId) +{ + CopyItemName(itemId, gUnknown_203F3D8->txtBuff[0]); + DynamicPlaceholderTextUtil_Reset(); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_203F3D8->txtBuff[0]); + DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_CantHoldMore); + gUnknown_203F3D8->unk12 = sub_814A754(4, 9, 22, 2); + AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); + gUnknown_203F3D8->unk14 = 0; + gUnknown_203F3D8->unkD = 0; +} + +bool32 sub_814A62C(void) +{ + switch (gUnknown_203F3D8->unkD) + { + case 0: + if (!IsDma3ManagerBusyWithBgCopy()) + { + PutWindowTilemap(gUnknown_203F3D8->unk12); + DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); + CopyBgTilemapBufferToVram(0); + gUnknown_203F3D8->unkD++; + } + break; + case 1: + if (IsDma3ManagerBusyWithBgCopy()) + break; + if (gUnknown_203F3D8->unk14 == 0) + { + gUnknown_203F3D8->unkD += 2; + return FALSE; + } + PlayFanfare(gUnknown_203F3D8->unk14); + gUnknown_203F3D8->unkD++; + case 2: + if (!IsFanfareTaskInactive()) + break; + gUnknown_203F3D8->unkD++; + case 3: + return FALSE; + } + + return TRUE; +} + +void sub_814A6CC(void) +{ + if (gUnknown_203F3D8->unk12 != 0xFF) + { + rbox_fill_rectangle(gUnknown_203F3D8->unk12); + CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_MAP); + gUnknown_203F3D8->unkD = 0; + } +} + +// Can't match this without the ugly GOTO, oh well. +bool32 sub_814A6FC(void) +{ + if (gUnknown_203F3D8->unk12 == 0xFF) + { + RET_FALSE: + return FALSE; + } + + if (gUnknown_203F3D8->unkD == 0) + { + if (!IsDma3ManagerBusyWithBgCopy()) + { + RemoveWindow(gUnknown_203F3D8->unk12); + gUnknown_203F3D8->unk12 = 0xFF; + gUnknown_203F3D8->unkD++; + goto RET_FALSE; + } + } + else if (gUnknown_203F3D8->unkD == 1) + goto RET_FALSE; + + return TRUE; +} + +s8 sub_814A744(void) +{ + return Menu_ProcessInputNoWrapClearOnChoose(); +} + +static u32 sub_814A754(u32 left, u32 top, u32 width, u32 height) +{ + u32 windowId; + struct WindowTemplate window; + + window.bg = 0; + window.tilemapLeft = left; + window.tilemapTop = top; + window.width = width; + window.height = height; + window.paletteNum = 0xF; + window.baseBlock = 0x43; + + windowId = AddWindow(&window); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); + return windowId; +} + +static void sub_814A7D0(u16 left, u16 top, u8 cursorPos) +{ + struct WindowTemplate window; + u8 a = cursorPos; + + window.bg = 0; + window.tilemapLeft = left; + window.tilemapTop = top; + window.width = 6; + window.height = 4; + window.paletteNum = 2; + window.baseBlock = 0x2B; + + CreateYesNoMenu(&window, 2, 0, 2, 0x00a, 0xD, a); +} + +static void sub_814A84C(void) +{ + u8 color[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY}; + + PutWindowTilemap(0); + PutWindowTilemap(1); + FillWindowPixelBuffer(0, PIXEL_FILL(0)); + FillWindowPixelBuffer(1, PIXEL_FILL(0)); + AddTextPrinterParameterized3(0, 0, 0, 2, color, 0, gText_SpacePoints2); + AddTextPrinterParameterized3(1, 0, 0, 2, color, 0, gText_SpaceTimes3); +} + +static const u8 gUnknown_846D953[] = {2, 2, 0, 0, 1, 1, 1, 0, 0, 2, 0, 0, 0}; + +static const struct CompressedSpriteSheet gUnknown_846D960 = {gUnknown_8479688, 0, 0x320}; +static const struct SpritePalette gUnknown_846D968 = {gUnknown_8479668, 0x320}; + +static const u16 gUnknown_846D970[] = {0x06, 0x08, 0x10, 0x08}; +static const u16 gUnknown_846D978[] = {0x06, 0x08, 0x0b, 0x06, 0x10, 0x08}; +static const u16 gUnknown_846D984[] = {0x02, 0x06, 0x06, 0x08, 0x10, 0x08, 0x14, 0x06}; +static const u16 gUnknown_846D994[] = {0x02, 0x06, 0x06, 0x08, 0x0b, 0x06, 0x10, 0x08, 0x14, 0x06}; + +static const u16 *const gUnknown_846D9A8[] = +{ + gUnknown_846D970, + gUnknown_846D978, + gUnknown_846D984, + gUnknown_846D994, +}; + +static const s16 gUnknown_846D9B8[] = {0x0058, 0x0098}; +static const s16 gUnknown_846D9BC[] = {0x0058, 0x0078, 0x0098}; +static const s16 gUnknown_846D9C2[] = {0x0038, 0x0058, 0x0098, 0x00b8}; +static const s16 gUnknown_846D9CA[] = {0x0038, 0x0058, 0x0078, 0x0098, 0x00b8}; + +static const s16 *const gUnknown_846D9D4[] = +{ + gUnknown_846D9B8, + gUnknown_846D9BC, + gUnknown_846D9C2, + gUnknown_846D9CA, +}; + +static void sub_814A8B8(void) +{ + int i, y, playersCount = sub_81499A4(); + const s16 *xCoords = gUnknown_846D9D4[playersCount - 2]; + + for (i = 0; i < playersCount; i++) + { + struct PokemonJump1_MonInfo *info = sub_81499C0(i); + + y = gMonFrontPicCoords[info->species].y_offset; + sub_814ADCC(gUnknown_203F3D8, info, *xCoords, y + 112, i); + sub_814B240(gUnknown_203F3D8, *xCoords, 112, i); + xCoords++; + } +} + +void sub_814A940(u32 id, s16 y) +{ + gUnknown_203F3D8->unk81A8[id]->y2 = y; +} + +void sub_814A95C(int id) +{ + sub_814B348(gUnknown_203F3D8, id); + ChangeBgY(2, (gUnknown_846D953[id] * 5) << 0xD, 0); +} + +int sub_814A98C(u8 flags) +{ + int i, count; + + for (i = 0, count = 0; i < 5; i++) + { + if (flags & 1) + { + sub_814AF0C(gUnknown_203F3D8, i); + count++; + } + flags >>= 1; + } + + sub_814ACCC(count - 2); + return count; +} + +static void sub_814A9C8(void) +{ + struct DigitObjUtilTemplate unkStruct; + struct DigitObjUtilTemplate *ptr = &unkStruct; // This temp variable is needed to match, don't ask me why. + + ptr->shape = SPRITE_SHAPE(8x8); + ptr->size = SPRITE_SIZE(8x8); + ptr->strConvMode = 0; + ptr->priority = 1; + ptr->oamCount = 5; + ptr->xDelta = 8; + ptr->x = 108; + ptr->y = 6; + ptr->spriteSheet.compressed = &gUnknown_846D960; + ptr->spritePal = &gUnknown_846D968; + + DigitObjUtil_Init(2); + DigitObjUtil_CreatePrinter(0, 0, ptr); + + unkStruct.oamCount = 4; + unkStruct.x = 30; + unkStruct.y = 6; + DigitObjUtil_CreatePrinter(1, 0, &unkStruct); +} + +void sub_814AA24(int arg0) +{ + DigitObjUtil_PrintNumOn(0, arg0); +} + +void sub_814AA34(u16 arg0) +{ + DigitObjUtil_PrintNumOn(1, arg0); +} + +void sub_814AA48(u8 multiplayerId) +{ + sub_814AFE8(gUnknown_203F3D8, multiplayerId); +} + +void sub_814AA60(u8 multiplayerId) +{ + sub_814B080(gUnknown_203F3D8, multiplayerId); +} + +int sub_814AA78(int multiplayerId) +{ + return sub_814B010(gUnknown_203F3D8, multiplayerId); +} + +void sub_814AA8C(void) +{ + sub_814B0A8(gUnknown_203F3D8); +} + +void sub_814AAA0(void) +{ + sub_814B134(gUnknown_203F3D8); +} + +void sub_814AAB4(int multiplayerId) +{ + sub_814B168(gUnknown_203F3D8, multiplayerId); +} + +int sub_814AAC8(void) +{ + return sub_814B190(gUnknown_203F3D8); +} + +static void sub_814AADC(void) +{ + struct WindowTemplate window; + int i, playersCount = sub_81499A4(); + const u16 *winCoords = gUnknown_846D9A8[playersCount - 2]; + + window.bg = 0; + window.width = 8; + window.height = 2; + window.paletteNum = 2; + window.baseBlock = 0x2B; + + for (i = 0; i < playersCount; i++) + { + window.tilemapLeft = winCoords[0]; + window.tilemapTop = winCoords[1]; + gUnknown_203F3D8->unk1C[i] = AddWindow(&window); + ClearWindowTilemap(gUnknown_203F3D8->unk1C[i]); + window.baseBlock += 0x10; + winCoords += 2; + } + + CopyBgTilemapBufferToVram(0); +} + +static void sub_814AB98(int multiplayerId, u8 clr1, u8 clr2, u8 clr3) +{ + u32 x; + u8 colors[3] = {clr1, clr2, clr3}; + + FillWindowPixelBuffer(gUnknown_203F3D8->unk1C[multiplayerId], PIXEL_FILL(0)); + x = 64 - GetStringWidth(0, sub_81499E0(multiplayerId), -1); + x /= 2; + AddTextPrinterParameterized3(gUnknown_203F3D8->unk1C[multiplayerId], 0, x, 2, colors, -1, sub_81499E0(multiplayerId)); + CopyWindowToVram(gUnknown_203F3D8->unk1C[multiplayerId], COPYWIN_GFX); +} + +static void sub_814AC30(bool32 arg0) +{ + int i, var, playersCount = sub_81499A4(); + + if (!arg0) + { + for (i = 0; i < playersCount; i++) + sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); + } + else + { + var = sub_81499B4(); + for (i = 0; i < playersCount; i++) + { + if (var != i) + sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); + else + sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED); + } + } +} + +static void sub_814AC94(void) +{ + int i, playersCount = sub_81499A4(); + + for (i = 0; i < playersCount; i++) + PutWindowTilemap(gUnknown_203F3D8->unk1C[i]); + CopyBgTilemapBufferToVram(0); +} + +static void sub_814ACCC(u8 arg0) +{ + gUnknown_203F3D8->unk18 = 0; + ChangeBgX(1, (arg0 / 2) << 16, 0); + ChangeBgY(1, (((arg0 % 2) << 8) - 40) << 8, 0); + ShowBg(1); + CreateTask(sub_814AD50, 4); +} + +static bool32 sub_814AD18(void) +{ + if (gUnknown_203F3D8->unk18 >= 32) + { + return FALSE; + } + else + { + ChangeBgY(1, 128, 1); + if (++gUnknown_203F3D8->unk18 >= 32) + HideBg(1); + return TRUE; + } +} + +static void sub_814AD50(u8 taskId) +{ + if (!sub_814AD18()) + DestroyTask(taskId); +} + +static const u16 sPkmnJumpPal1[] = INCBIN_U16("graphics/link_games/pkmnjump_pal1.gbapal"); +static const u16 sPkmnJumpPal2[] = INCBIN_U16("graphics/link_games/pkmnjump_pal2.gbapal"); + +static const u32 sPkmnJumpRopeGfx1[] = INCBIN_U32("graphics/link_games/pkmnjump_rope1.4bpp.lz"); +static const u32 sPkmnJumpRopeGfx2[] = INCBIN_U32("graphics/link_games/pkmnjump_rope2.4bpp.lz"); +static const u32 sPkmnJumpRopeGfx3[] = INCBIN_U32("graphics/link_games/pkmnjump_rope3.4bpp.lz"); +static const u32 sPkmnJumpRopeGfx4[] = INCBIN_U32("graphics/link_games/pkmnjump_rope4.4bpp.lz"); + +static const u32 sPkmnJumpStarGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_star.4bpp.lz"); + +static const struct CompressedSpriteSheet gUnknown_846E0B0[] = +{ + {sPkmnJumpRopeGfx1, 0x600, 5}, + {sPkmnJumpRopeGfx2, 0x0c00, 6}, + {sPkmnJumpRopeGfx3, 0x0600, 7}, + {sPkmnJumpRopeGfx4, 0x0600, 8}, + {sPkmnJumpStarGfx, 0x0200, 10}, +}; + +static const struct SpritePalette gUnknown_846E0D8[] = +{ + {sPkmnJumpPal1, 5}, + {sPkmnJumpPal2, 6}, +}; + +// Forward declarations. +static const struct OamData sOamData_846E170; +static const struct SpriteTemplate gUnknown_846E220; +static const struct SpriteTemplate gUnknown_846E238; +static const struct SpriteTemplate gUnknown_846E250; +static const struct SpriteTemplate gUnknown_846E268; + +static const struct SpriteTemplate gUnknown_846E0E8 = +{ + .tileTag = 0, + .paletteTag = 0, + .oam = &sOamData_846E170, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const s16 gUnknown_846E100[][10] = +{ + {0x60, 0x60, 0x60, 0x72, 0x78, 0x78, 0x78, 0x72, 0x60, 0x60}, + {0x46, 0x50, 0x60, 0x72, 0x78, 0x80, 0x78, 0x72, 0x60, 0x50}, + {0x32, 0x48, 0x60, 0x72, 0x80, 0x88, 0x80, 0x72, 0x60, 0x48}, + {0x2a, 0x48, 0x60, 0x72, 0x80, 0x88, 0x80, 0x72, 0x60, 0x48}, +}; + +static const s16 gUnknown_846E150[] = {0x10, 0x28, 0x48, 0x68, 0x88, 0xa8, 0xc8, 0xe0}; + +static const struct SpriteTemplate *const gUnknown_846E160[] = +{ + &gUnknown_846E220, + &gUnknown_846E238, + &gUnknown_846E250, + &gUnknown_846E268, +}; + +static const struct OamData sOamData_846E170 = +{ + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(64x64), + .x = 0, + .matrixNum = 0, + .size = SPRITE_SIZE(64x64), + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0 +}; + +static const struct OamData sOamData_846E178 = +{ + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(16x32), + .x = 0, + .matrixNum = 0, + .size = SPRITE_SIZE(16x32), + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0 +}; + +static const struct OamData sOamData_846E180 = +{ + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(32x32), + .x = 0, + .matrixNum = 0, + .size = SPRITE_SIZE(32x32), + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0 +}; + +static const struct OamData sOamData_846E188 = +{ + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(32x16), + .x = 0, + .matrixNum = 0, + .size = SPRITE_SIZE(32x16), + .tileNum = 0, + .priority = 2, + .paletteNum = 0, + .affineParam = 0 +}; + +static const union AnimCmd sSpriteAnim_846E190[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E198[] = +{ + ANIMCMD_FRAME(8, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E1A0[] = +{ + ANIMCMD_FRAME(16, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E1A8[] = +{ + ANIMCMD_FRAME(24, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E1B0[] = +{ + ANIMCMD_FRAME(32, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E1B8[] = +{ + ANIMCMD_FRAME(40, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E1C0[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E1C8[] = +{ + ANIMCMD_FRAME(16, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E1D0[] = +{ + ANIMCMD_FRAME(32, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E1D8[] = +{ + ANIMCMD_FRAME(48, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E1E0[] = +{ + ANIMCMD_FRAME(64, 1), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E1E8[] = +{ + ANIMCMD_FRAME(80, 1), + ANIMCMD_END +}; + +static const union AnimCmd *const sSpriteAnimTable_846E1F0[] = +{ + sSpriteAnim_846E190, + sSpriteAnim_846E198, + sSpriteAnim_846E1A0, + sSpriteAnim_846E1A8, + sSpriteAnim_846E1B0, + sSpriteAnim_846E1B8 +}; + +static const union AnimCmd *const sSpriteAnimTable_846E208[] = +{ + sSpriteAnim_846E1C0, + sSpriteAnim_846E1C8, + sSpriteAnim_846E1D0, + sSpriteAnim_846E1D8, + sSpriteAnim_846E1E0, + sSpriteAnim_846E1E8 +}; + +static const struct SpriteTemplate gUnknown_846E220 = +{ + .tileTag = 5, + .paletteTag = 5, + .oam = &sOamData_846E178, + .anims = sSpriteAnimTable_846E1F0, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const struct SpriteTemplate gUnknown_846E238 = +{ + .tileTag = 6, + .paletteTag = 5, + .oam = &sOamData_846E180, + .anims = sSpriteAnimTable_846E208, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const struct SpriteTemplate gUnknown_846E250 = +{ + .tileTag = 7, + .paletteTag = 5, + .oam = &sOamData_846E188, + .anims = sSpriteAnimTable_846E1F0, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const struct SpriteTemplate gUnknown_846E268 = +{ + .tileTag = 8, + .paletteTag = 5, + .oam = &sOamData_846E188, + .anims = sSpriteAnimTable_846E1F0, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +static const struct OamData sOamData_846E280 = +{ + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = 0, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(16x16), + .x = 0, + .matrixNum = 0, + .size = SPRITE_SIZE(16x16), + .tileNum = 0, + .priority = 1, + .paletteNum = 0, + .affineParam = 0 +}; + +static const union AnimCmd sSpriteAnim_846E288[] = +{ + ANIMCMD_FRAME(0, 0), + ANIMCMD_END +}; + +static const union AnimCmd sSpriteAnim_846E290[] = +{ + ANIMCMD_FRAME(0, 4), + ANIMCMD_FRAME(4, 4), + ANIMCMD_FRAME(8, 4), + ANIMCMD_FRAME(12, 4), + ANIMCMD_LOOP(1), + ANIMCMD_FRAME(0, 4), + ANIMCMD_END +}; + +static const union AnimCmd *const sSpriteAnimTable_846E2AC[] = +{ + sSpriteAnim_846E288, + sSpriteAnim_846E290 +}; + +static const struct SpriteTemplate gUnknown_846E2B4 = +{ + .tileTag = 10, + .paletteTag = 5, + .oam = &sOamData_846E280, + .anims = sSpriteAnimTable_846E2AC, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, +}; + +void sub_814AD6C(struct PokemonJump2 *arg0) +{ + int i; + + for (i = 0; i < NELEMS(gUnknown_846E0B0); i++) + LoadCompressedSpriteSheet(&gUnknown_846E0B0[i]); + + for (i = 0; i < NELEMS(gUnknown_846E0D8); i++) + LoadSpritePalette(&gUnknown_846E0D8[i]); + + arg0->unkE = IndexOfSpritePaletteTag(5); + arg0->unkF = IndexOfSpritePaletteTag(6); +} + +static void sub_814ADB4(struct Sprite *sprite) +{ + int i; + for (i = 0; i < 8; i++) + sprite->data[i] = 0; +} + +void sub_814ADCC(struct PokemonJump2 *arg0, struct PokemonJump1_MonInfo *jumpMon, s16 x, s16 y, u8 multiplayerId) +{ + struct SpriteTemplate spriteTemplate; + struct SpriteSheet spriteSheet; + struct CompressedSpritePalette spritePalette; + u8 *buffer; + u8 *unusedBuffer; + u8 subpriority; + u8 spriteId; + + spriteTemplate = gUnknown_846E0E8; + buffer = Alloc(0x2000); + unusedBuffer = Alloc(0x800); + if (multiplayerId == sub_81499B4()) + subpriority = 3; + else + subpriority = multiplayerId + 4; + + if (buffer && unusedBuffer) + { + HandleLoadSpecialPokePic( + &gMonFrontPicTable[jumpMon->species], + buffer, + jumpMon->species, + jumpMon->personality); + + spriteSheet.data = buffer; + spriteSheet.tag = multiplayerId; + spriteSheet.size = 0x800; + LoadSpriteSheet(&spriteSheet); + + spritePalette.data = GetMonSpritePalFromSpeciesAndPersonality(jumpMon->species, jumpMon->otId, jumpMon->personality); + spritePalette.tag = multiplayerId; + LoadCompressedSpritePalette(&spritePalette); + + Free(buffer); + Free(unusedBuffer); + + spriteTemplate.tileTag += multiplayerId; + spriteTemplate.paletteTag += multiplayerId; + spriteId = CreateSprite(&spriteTemplate, x, y, subpriority); + if (spriteId != MAX_SPRITES) + { + arg0->unk81A8[multiplayerId] = &gSprites[spriteId]; + arg0->unk81FC[multiplayerId] = subpriority; + return; + } + } + + arg0->unk81A8[multiplayerId] = NULL; +} + +void sub_814AF0C(struct PokemonJump2 *arg0, int multiplayerId) +{ + sub_814ADB4(arg0->unk81BC[multiplayerId]); + arg0->unk81BC[multiplayerId]->data[7] = arg0->unk81A8[multiplayerId] - gSprites; + arg0->unk81BC[multiplayerId]->invisible = FALSE; + arg0->unk81BC[multiplayerId]->y = 96; + arg0->unk81BC[multiplayerId]->callback = sub_814AF74; + StartSpriteAnim(arg0->unk81BC[multiplayerId], 1); +} + +static void sub_814AF74(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + if (sprite->animEnded) + { + sprite->invisible = TRUE; + sprite->callback = SpriteCallbackDummy; + } + break; + case 1: + sprite->y--; + sprite->data[1]++; + if (sprite->y <= 72) + { + sprite->y = 72; + sprite->data[0]++; + } + break; + case 2: + if (++sprite->data[1] >= 48) + { + sprite->invisible = TRUE; + sprite->callback = SpriteCallbackDummy; + } + break; + } +} + +void sub_814AFE8(struct PokemonJump2 *arg0, int multiplayerId) +{ + arg0->unk81A8[multiplayerId]->callback = sub_814B038; + arg0->unk81A8[multiplayerId]->y2 = 0; + sub_814ADB4(arg0->unk81A8[multiplayerId]); +} + +bool32 sub_814B010(struct PokemonJump2 *arg0, int multiplayerId) +{ + return arg0->unk81A8[multiplayerId]->callback == sub_814B038; +} + +static void sub_814B038(struct Sprite *sprite) +{ + if (++sprite->data[1] > 1) + { + if (++sprite->data[2] & 1) + sprite->y2 = 2; + else + sprite->y2 = -2; + + sprite->data[1] = 0; + } + + if (sprite->data[2] > 12) + { + sprite->y2 = 0; + sprite->callback = SpriteCallbackDummy; + } +} + +void sub_814B080(struct PokemonJump2 *arg0, int multiplayerId) +{ + sub_814ADB4(arg0->unk81A8[multiplayerId]); + arg0->unk81A8[multiplayerId]->callback = sub_814B100; +} + +void sub_814B0A8(struct PokemonJump2 *arg0) +{ + int i; + u16 numPlayers = sub_81499A4(); + for (i = 0; i < numPlayers; i++) + { + if (arg0->unk81A8[i]->callback == sub_814B100) + { + arg0->unk81A8[i]->invisible = FALSE; + arg0->unk81A8[i]->callback = SpriteCallbackDummy; + arg0->unk81A8[i]->subpriority = 10; + } + } +} + +static void sub_814B100(struct Sprite *sprite) +{ + if (++sprite->data[0] > 3) + { + sprite->data[0] = 0; + sprite->invisible ^= 1; + } +} + +void sub_814B134(struct PokemonJump2 *arg0) +{ + int i; + u16 numPlayers = sub_81499A4(); + for (i = 0; i < numPlayers; i++) + arg0->unk81A8[i]->subpriority = arg0->unk81FC[i]; +} + +void sub_814B168(struct PokemonJump2 *arg0, int multiplayerId) +{ + sub_814ADB4(arg0->unk81A8[multiplayerId]); + arg0->unk81A8[multiplayerId]->callback = sub_814B1CC; +} + +bool32 sub_814B190(struct PokemonJump2 *arg0) +{ + int i; + u16 numPlayers = sub_81499A4(); + for (i = 0; i < numPlayers; i++) + { + if (arg0->unk81A8[i]->callback == sub_814B1CC) + return TRUE; + } + + return FALSE; +} + +static void sub_814B1CC(struct Sprite *sprite) +{ + switch (sprite->data[0]) + { + case 0: + PlaySE(SE_BIKE_HOP); + sprite->data[1] = 0; + sprite->data[0]++; + // fall through + case 1: + sprite->data[1] += 4; + if (sprite->data[1] > 0x7F) + sprite->data[1] = 0; + + sprite->y2 = -(gSineTable[sprite->data[1]] >> 3); + if (sprite->data[1] == 0) + { + if (++sprite->data[2] < 2) + sprite->data[0] = 0; + else + sprite->callback = SpriteCallbackDummy; + } + break; + } +} + +void sub_814B240(struct PokemonJump2 *arg0, s16 x, s16 y, u8 multiplayerId) +{ + u8 spriteId = CreateSprite(&gUnknown_846E2B4, x, y, 1); + if (spriteId != MAX_SPRITES) + { + gSprites[spriteId].invisible = TRUE; + arg0->unk81BC[multiplayerId] = &gSprites[spriteId]; + } +} + +void sub_814B294(struct PokemonJump2 *arg0) +{ + int i; + int count; + u8 spriteId; + + count = 0; + for (i = 0; i < 4; i++) + { + spriteId = CreateSprite(gUnknown_846E160[i], gUnknown_846E150[count], gUnknown_846E100[i][0], 2); + arg0->unk81D0[count] = &gSprites[spriteId]; + count++; + } + + for (i = 3; i >= 0; i--) + { + spriteId = CreateSprite(gUnknown_846E160[i], gUnknown_846E150[count], gUnknown_846E100[i][0], 2); + arg0->unk81D0[count] = &gSprites[spriteId]; + arg0->unk81D0[count]->hFlip = 1; + count++; + } +} + +void sub_814B348(struct PokemonJump2 *arg0, int arg1) +{ + int i, count, palNum; + int priority; + + if (arg1 > 5) + { + arg1 = 10 - arg1; + priority = 3; + palNum = arg0->unkF; + } + else + { + priority = 2; + palNum = arg0->unkE; + } + + count = 0; + for (i = 0; i < 4; i++) + { + arg0->unk81D0[count]->y = gUnknown_846E100[i][arg1]; + arg0->unk81D0[count]->oam.priority = priority; + arg0->unk81D0[count]->oam.paletteNum = palNum; + StartSpriteAnim(arg0->unk81D0[count], arg1); + count++; + } + + for (i = 3; i >= 0; i--) + { + arg0->unk81D0[count]->y = gUnknown_846E100[i][arg1]; + arg0->unk81D0[count]->oam.priority = priority; + arg0->unk81D0[count]->oam.paletteNum = palNum; + StartSpriteAnim(arg0->unk81D0[count], arg1); + count++; + } +} + +void sub_814B43C(struct PokemonJump2 *arg0) +{ + StartMinigameCountdown(9, 7, 120, 80, 0); + sub_814B134(arg0); +} + +bool32 sub_814B460(void) +{ + return IsMinigameCountdownRunning(); +} + +static struct PokemonJumpRecords *sub_814B46C(void) +{ + return &gSaveBlock2Ptr->pokeJump; +} + +void ResetPokeJumpResults(void) +{ + struct PokemonJumpRecords *pokeJump = sub_814B46C(); + pokeJump->jumpsInRow = 0; + pokeJump->bestJumpScore = 0; + pokeJump->excellentsInRow = 0; + pokeJump->gamesWithMaxPlayers = 0; + pokeJump->unused2 = 0; + pokeJump->unused1 = 0; +} + +bool32 sub_814B494(u32 jumpScore, u16 jumpsInRow, u16 excellentsInRow) +{ + struct PokemonJumpRecords *pokeJump = sub_814B46C(); + bool32 ret = FALSE; + + if (pokeJump->bestJumpScore < jumpScore && jumpScore <= 99990) + pokeJump->bestJumpScore = jumpScore, ret = TRUE; + if (pokeJump->jumpsInRow < jumpsInRow && jumpsInRow <= 9999) + pokeJump->jumpsInRow = jumpsInRow, ret = TRUE; + if (pokeJump->excellentsInRow < excellentsInRow && excellentsInRow <= 9999) + pokeJump->excellentsInRow = excellentsInRow, ret = TRUE; + + return ret; +} + +void sub_814B4E8(void) +{ + struct PokemonJumpRecords *pokeJump = sub_814B46C(); + if (pokeJump->gamesWithMaxPlayers < 9999) + pokeJump->gamesWithMaxPlayers++; +} + +void ShowPokemonJumpRecords(void) +{ + u8 taskId = CreateTask(Task_ShowPokemonJumpRecords, 0); + Task_ShowPokemonJumpRecords(taskId); +} + +static const struct WindowTemplate gUnknown_846E2CC = +{ + .bg = 0, + .tilemapLeft = 1, + .tilemapTop = 1, + .width = 28, + .height = 9, + .paletteNum = 15, + .baseBlock = 0x1, +}; + +static const u8 *const gUnknown_846E2D4[] = {gText_JumpsInARow, gText_BestScore2, gText_ExcellentsInARow}; + +static void Task_ShowPokemonJumpRecords(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (data[0]) + { + case 0: + data[1] = AddWindow(&gUnknown_846E2CC); + sub_814B5C4(data[1]); + CopyWindowToVram(data[1], COPYWIN_BOTH); + data[0]++; + break; + case 1: + if (!IsDma3ManagerBusyWithBgCopy()) + data[0]++; + break; + case 2: + if (JOY_NEW(A_BUTTON | B_BUTTON)) + { + rbox_fill_rectangle(data[1]); + CopyWindowToVram(data[1], COPYWIN_MAP); + data[0]++; + } + break; + case 3: + if (!IsDma3ManagerBusyWithBgCopy()) + { + RemoveWindow(data[1]); + DestroyTask(taskId); + EnableBothScriptContexts(); + } + break; + } +} + +static void sub_814B5C4(u16 windowId) +{ + int i, x; + int results[3]; + struct PokemonJumpRecords *pokeJump = sub_814B46C(); + u8 strbuf[8]; + results[0] = pokeJump->jumpsInRow; + results[1] = pokeJump->bestJumpScore; + results[2] = pokeJump->excellentsInRow; + + TextWindow_SetStdFrame0_WithPal(windowId, 0x21D, 0xD0); + DrawTextBorderOuter(windowId, 0x21D, 0xD); + FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); + AddTextPrinterParameterized5(windowId, 2, gText_PkmnJumpRecords, 0, 0, TEXT_SPEED_FF, NULL, 1, 0); + for (i = 0; i < NELEMS(gUnknown_846E2D4); i++) + { + AddTextPrinterParameterized5(windowId, 2, gUnknown_846E2D4[i], 0, 20 + (i * 14), TEXT_SPEED_FF, NULL, 1, 0); + ConvertIntToDecimalStringN(strbuf, results[i], STR_CONV_MODE_LEFT_ALIGN, 5); + TruncateToFirstWordOnly(strbuf); + x = 0xDE - GetStringWidth(2, strbuf, 0); + AddTextPrinterParameterized5(windowId, 2, strbuf, x, 20 + (i * 14), TEXT_SPEED_FF, NULL, 0, 0); + } + PutWindowTilemap(windowId); +} + +static void TruncateToFirstWordOnly(u8 *str) +{ + for (;*str != EOS; str++) + { + if (*str == CHAR_SPACE) + { + *str = EOS; + break; + } + } +} diff --git a/src/pokemon_jump_2.c b/src/pokemon_jump_2.c deleted file mode 100644 index a771b8fcc..000000000 --- a/src/pokemon_jump_2.c +++ /dev/null @@ -1,2034 +0,0 @@ -#include "global.h" -#include "gflib.h" -#include "event_data.h" -#include "item.h" -#include "link_rfu.h" -#include "menu.h" -#include "random.h" -#include "save.h" -#include "task.h" -#include "pokemon_jump.h" -#include "constants/songs.h" - -struct PokemonJump1 -{ - MainCallback returnCallback; - u8 unk4; - u8 unk5; - u8 unk6; - u8 unk7; - u16 unk8; - u16 unkA; - u16 unkC; - u16 unkE; - int unk10; - u32 unk14; - u32 unk18; - int unk1C; - u32 unk20; - u32 unk24; - u32 unk28; - int unk2C; - u32 unk30; - u16 unk34; - u16 unk36; - u8 filler38[0x2]; - u16 unk3A; - u16 unk3C; - u16 unk3E; - u16 unk40; - u16 unk42; - u8 unk44; - u8 unk45; - u8 unk46; - u8 isLeader; - u8 unk48; - u8 unk49; - u16 unk4A; - u8 unk4C; - u8 unk4D; - u16 unk4E; - u8 unk50; - u8 unk51; - u8 filler52[0x2]; - int unk54; - int unk58; - int unk5C; - int unk60; - int unk64; - int unk68; - int unk6C; - struct PokemonJump1Sub unk70; - u8 unk7C[MAX_RFU_PLAYERS]; - u8 unk81[MAX_RFU_PLAYERS]; - u8 unk86[MAX_RFU_PLAYERS]; - u8 unk8B[MAX_RFU_PLAYERS]; - u16 unk90[MAX_RFU_PLAYERS]; - u16 unk9A[MAX_RFU_PLAYERS]; - struct PokemonJump2 unkA4; - struct PokemonJump1_MonInfo unk82A8[MAX_RFU_PLAYERS]; - struct PokemonJump1_82E4 unk82E4[MAX_RFU_PLAYERS]; - struct PokemonJump1_82E4 *unk83AC; -}; - -static void sub_8147B60(struct PokemonJump1 *); -static void sub_8147B94(struct PokemonJump1 *); -static void sub_8147C20(void); -static void sub_8147C98(void); -static s16 GetPokemonJumpSpeciesIdx(u16 species); -static void sub_8147D2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon); -static void sub_8147D6C(void); -static void sub_8147DA0(u8 taskId); -static void sub_814807C(u8 taskId); -static void sub_8148104(void); -static void sub_8148290(u8 taskId); -static void sub_81482F8(void); -static bool32 sub_8148344(void); -static bool32 sub_81483D0(void); -static bool32 sub_8148464(void); -static bool32 sub_81484D0(void); -static bool32 sub_814856C(void); -static bool32 sub_81485C8(void); -static bool32 sub_8148664(void); -static bool32 sub_81486C4(void); -static bool32 sub_8148724(void); -static bool32 sub_8148760(void); -static bool32 sub_81487B4(void); -static bool32 sub_8148800(void); -static bool32 sub_814881C(void); -static bool32 sub_81488DC(void); -static bool32 sub_81489C8(void); -static bool32 sub_8148A60(void); -static bool32 sub_8148398(void); -static bool32 sub_8148418(void); -static bool32 sub_81484B0(void); -static bool32 sub_8148B54(void); -static bool32 sub_8148C80(void); -static bool32 sub_8148D5C(void); -static bool32 sub_8148E2C(void); -static void sub_8148E80(u8 taskId); -static void sub_8148F5C(TaskFunc func, u8 taskPriority); -static void sub_8148F7C(void); -static void sub_8148F9C(void); -static void sub_8148FE0(void); -static int sub_8149044(void); -static void sub_8149078(void); -static int sub_8149194(void); -static void sub_81491B4(void); -static void sub_81491E4(void); -static void sub_8149210(void); -static bool32 sub_814922C(u16); -static void sub_8149260(void); -static void sub_81492D8(void); -static void sub_814933C(void); -static void sub_814935C(void); -static void sub_814936C(void); -static void sub_814937C(void); -static void sub_8149490(int); -static void sub_8149534(void); -static bool32 sub_8149630(void); -static bool32 sub_81496D4(void); -static bool32 sub_8149710(void); -static bool32 sub_8149748(void); -static void sub_8149780(int); -static int sub_81497A8(void); -static bool32 sub_8149804(void); -static int sub_8149834(u8 *); -static void sub_8149878(void); -static int sub_8149888(int); -static void sub_8149898(u16); -static bool32 sub_81498B4(void); -static u16 sub_81498D8(void); -static void sub_8149900(u16, u16 *, u16 *); -static u16 sub_8149910(void); -static u16 sub_8149930(void); -static u16 sub_8149978(u16 item, u16 quantity); - -EWRAM_DATA static struct PokemonJump1 *gUnknown_203F3D4 = NULL; - -static const struct PokemonJumpMons -{ - u16 species; - u16 unk2; -} sPkmnJumpSpecies[] = -{ - { .species = SPECIES_BULBASAUR, .unk2 = 2, }, - { .species = SPECIES_CHARMANDER, .unk2 = 1, }, - { .species = SPECIES_SQUIRTLE, .unk2 = 0, }, - { .species = SPECIES_CATERPIE, .unk2 = 1, }, - { .species = SPECIES_METAPOD, .unk2 = 1, }, - { .species = SPECIES_WEEDLE, .unk2 = 1, }, - { .species = SPECIES_KAKUNA, .unk2 = 1, }, - { .species = SPECIES_RATTATA, .unk2 = 1, }, - { .species = SPECIES_RATICATE, .unk2 = 1, }, - { .species = SPECIES_PIKACHU, .unk2 = 0, }, - { .species = SPECIES_SANDSHREW, .unk2 = 0, }, - { .species = SPECIES_NIDORAN_F, .unk2 = 0, }, - { .species = SPECIES_NIDORAN_M, .unk2 = 0, }, - { .species = SPECIES_CLEFAIRY, .unk2 = 0, }, - { .species = SPECIES_VULPIX, .unk2 = 0, }, - { .species = SPECIES_JIGGLYPUFF, .unk2 = 2, }, - { .species = SPECIES_ODDISH, .unk2 = 2, }, - { .species = SPECIES_PARAS, .unk2 = 1, }, - { .species = SPECIES_MEOWTH, .unk2 = 0, }, - { .species = SPECIES_PSYDUCK, .unk2 = 2, }, - { .species = SPECIES_MANKEY, .unk2 = 1, }, - { .species = SPECIES_GROWLITHE, .unk2 = 1, }, - { .species = SPECIES_POLIWAG, .unk2 = 2, }, - { .species = SPECIES_BELLSPROUT, .unk2 = 2, }, - { .species = SPECIES_SHELLDER, .unk2 = 1, }, - { .species = SPECIES_KRABBY, .unk2 = 1, }, - { .species = SPECIES_EXEGGCUTE, .unk2 = 2, }, - { .species = SPECIES_CUBONE, .unk2 = 0, }, - { .species = SPECIES_DITTO, .unk2 = 2, }, - { .species = SPECIES_EEVEE, .unk2 = 0, }, - { .species = SPECIES_OMANYTE, .unk2 = 1, }, - { .species = SPECIES_KABUTO, .unk2 = 1, }, - { .species = SPECIES_CHIKORITA, .unk2 = 2, }, - { .species = SPECIES_CYNDAQUIL, .unk2 = 1, }, - { .species = SPECIES_TOTODILE, .unk2 = 0, }, - { .species = SPECIES_SPINARAK, .unk2 = 1, }, - { .species = SPECIES_PICHU, .unk2 = 0, }, - { .species = SPECIES_CLEFFA, .unk2 = 0, }, - { .species = SPECIES_IGGLYBUFF, .unk2 = 2, }, - { .species = SPECIES_TOGEPI, .unk2 = 2, }, - { .species = SPECIES_MAREEP, .unk2 = 0, }, - { .species = SPECIES_BELLOSSOM, .unk2 = 2, }, - { .species = SPECIES_MARILL, .unk2 = 2, }, - { .species = SPECIES_SUNKERN, .unk2 = 2, }, - { .species = SPECIES_WOOPER, .unk2 = 2, }, - { .species = SPECIES_PINECO, .unk2 = 2, }, - { .species = SPECIES_SNUBBULL, .unk2 = 0, }, - { .species = SPECIES_SHUCKLE, .unk2 = 2, }, - { .species = SPECIES_TEDDIURSA, .unk2 = 0, }, - { .species = SPECIES_SLUGMA, .unk2 = 2, }, - { .species = SPECIES_SWINUB, .unk2 = 0, }, - { .species = SPECIES_HOUNDOUR, .unk2 = 1, }, - { .species = SPECIES_PHANPY, .unk2 = 0, }, - { .species = SPECIES_PORYGON2, .unk2 = 0, }, - { .species = SPECIES_TYROGUE, .unk2 = 1, }, - { .species = SPECIES_SMOOCHUM, .unk2 = 2, }, - { .species = SPECIES_ELEKID, .unk2 = 1, }, - { .species = SPECIES_MAGBY, .unk2 = 1, }, - { .species = SPECIES_LARVITAR, .unk2 = 1, }, - { .species = SPECIES_TREECKO, .unk2 = 1, }, - { .species = SPECIES_TORCHIC, .unk2 = 2, }, - { .species = SPECIES_MUDKIP, .unk2 = 0, }, - { .species = SPECIES_MARSHTOMP, .unk2 = 0, }, - { .species = SPECIES_POOCHYENA, .unk2 = 1, }, - { .species = SPECIES_ZIGZAGOON, .unk2 = 0, }, - { .species = SPECIES_LINOONE, .unk2 = 0, }, - { .species = SPECIES_WURMPLE, .unk2 = 1, }, - { .species = SPECIES_SILCOON, .unk2 = 2, }, - { .species = SPECIES_CASCOON, .unk2 = 2, }, - { .species = SPECIES_LOTAD, .unk2 = 2, }, - { .species = SPECIES_SEEDOT, .unk2 = 1, }, - { .species = SPECIES_RALTS, .unk2 = 0, }, - { .species = SPECIES_KIRLIA, .unk2 = 0, }, - { .species = SPECIES_SURSKIT, .unk2 = 2, }, - { .species = SPECIES_SHROOMISH, .unk2 = 2, }, - { .species = SPECIES_NINCADA, .unk2 = 1, }, - { .species = SPECIES_WHISMUR, .unk2 = 0, }, - { .species = SPECIES_AZURILL, .unk2 = 2, }, - { .species = SPECIES_SKITTY, .unk2 = 0, }, - { .species = SPECIES_SABLEYE, .unk2 = 0, }, - { .species = SPECIES_MAWILE, .unk2 = 0, }, - { .species = SPECIES_ARON, .unk2 = 1, }, - { .species = SPECIES_MEDITITE, .unk2 = 2, }, - { .species = SPECIES_ELECTRIKE, .unk2 = 1, }, - { .species = SPECIES_PLUSLE, .unk2 = 1, }, - { .species = SPECIES_MINUN, .unk2 = 1, }, - { .species = SPECIES_VOLBEAT, .unk2 = 0, }, - { .species = SPECIES_ILLUMISE, .unk2 = 0, }, - { .species = SPECIES_ROSELIA, .unk2 = 2, }, - { .species = SPECIES_GULPIN, .unk2 = 2, }, - { .species = SPECIES_NUMEL, .unk2 = 2, }, - { .species = SPECIES_TORKOAL, .unk2 = 2, }, - { .species = SPECIES_SPOINK, .unk2 = 0, }, - { .species = SPECIES_TRAPINCH, .unk2 = 2, }, - { .species = SPECIES_CACNEA, .unk2 = 2, }, - { .species = SPECIES_ANORITH, .unk2 = 1, }, - { .species = SPECIES_WYNAUT, .unk2 = 0, }, - { .species = SPECIES_SNORUNT, .unk2 = 0, }, - { .species = SPECIES_CLAMPERL, .unk2 = 1, }, - { .species = SPECIES_BAGON, .unk2 = 1, }, -}; - -void StartPokemonJump(u16 partyIndex, MainCallback callback) -{ - u8 taskId; - - if (gReceivedRemoteLinkPlayers) - { - gUnknown_203F3D4 = Alloc(sizeof(*gUnknown_203F3D4)); - if (gUnknown_203F3D4 != NULL) - { - ResetTasks(); - taskId = CreateTask(sub_8147DA0, 1); - gUnknown_203F3D4->unk8 = 0; - gUnknown_203F3D4->returnCallback = callback; - gUnknown_203F3D4->unk4 = taskId; - gUnknown_203F3D4->unk6 = GetMultiplayerId(); - sub_8147D2C(&gUnknown_203F3D4->unk82A8[gUnknown_203F3D4->unk6], &gPlayerParty[partyIndex]); - sub_8147B60(gUnknown_203F3D4); - SetWordTaskArg(taskId, 2, (uintptr_t)gUnknown_203F3D4); - SetMainCallback2(sub_8147D6C); - return; - } - } - - SetMainCallback2(callback); -} - -static void sub_8147B48(void) -{ - sub_8149D24(); - Free(gUnknown_203F3D4); -} - -static void sub_8147B60(struct PokemonJump1 *arg0) -{ - arg0->unk5 = GetLinkPlayerCount(); - arg0->unk70.unk0 = 5; - arg0->unk70.unk2 = 0; - sub_8147C20(); - sub_8147B94(arg0); - if (arg0->unk5 == MAX_RFU_PLAYERS) - sub_814B4E8(); -} - -static void sub_8147B94(struct PokemonJump1 *arg0) -{ - int i; - - arg0->unk14 = 6; - arg0->unk18 = 6; - arg0->unk4A = 0; - arg0->unk1C = 0; - arg0->unk5C = 0; - arg0->isLeader = GetMultiplayerId() == 0; - arg0->unk8 = 0; - arg0->unkA = 0; - arg0->unkC = 0; - arg0->unkE = 0; - arg0->unk58 = 0; - arg0->unk3A = 0; - arg0->unk44 = 0; - arg0->unk54 = 0; - arg0->unk46 = 0; - arg0->unk49 = 0; - arg0->unk48 = 1; - arg0->unk70.unk8 = 0; - arg0->unk70.unk1 = 0; - arg0->unk70.unk4 = 0; - arg0->unk60 = 1; - arg0->unk4D = 0; - arg0->unk68 = 0; - arg0->unk64 = 0; - arg0->unk2C = 0; - arg0->unk30 = 0; - sub_8147C98(); - sub_81491E4(); - - for (i = 0; i < MAX_RFU_PLAYERS; i++) - { - arg0->unk7C[i] = 0; - arg0->unk9A[i] = 0; - } -} - -static void sub_8147C20(void) -{ - int i, index; - - for (i = 0; i < MAX_RFU_PLAYERS; i++) - { - index = GetPokemonJumpSpeciesIdx(gUnknown_203F3D4->unk82A8[i].species); - gUnknown_203F3D4->unk82E4[i].unkC = sPkmnJumpSpecies[index].unk2; - } - - gUnknown_203F3D4->unk83AC = &gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6]; -} - -static void sub_8147C98(void) -{ - int i; - - for (i = 0; i < MAX_RFU_PLAYERS; i++) - { - gUnknown_203F3D4->unk82E4[i].unkE = 0; - gUnknown_203F3D4->unk82E4[i].unk10 = 0; - gUnknown_203F3D4->unk82E4[i].unk12 = 0; - gUnknown_203F3D4->unk82E4[i].unk0 = 0; - gUnknown_203F3D4->unk82E4[i].unk4 = 0x7FFFFFFF; - gUnknown_203F3D4->unk82E4[i].unk14 = 0; - gUnknown_203F3D4->unk8B[i] = 9; - } -} - -static s16 GetPokemonJumpSpeciesIdx(u16 species) -{ - u32 i; - for (i = 0; i < NELEMS(sPkmnJumpSpecies); i++) - { - if (sPkmnJumpSpecies[i].species == species) - return i; - } - - return -1; // species isnt allowed -} - -static void sub_8147D2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon) -{ - monInfo->species = GetMonData(mon, MON_DATA_SPECIES); - monInfo->otId = GetMonData(mon, MON_DATA_OT_ID); - monInfo->personality = GetMonData(mon, MON_DATA_PERSONALITY); -} - -static void sub_8147D58(void) -{ - TransferPlttBuffer(); - LoadOam(); - ProcessSpriteCopyRequests(); -} - -static void sub_8147D6C(void) -{ - RunTasks(); - AnimateSprites(); - BuildOamBuffer(); - UpdatePaletteFade(); -} - -static void sub_8147D84(TaskFunc func) -{ - gUnknown_203F3D4->unk4 = CreateTask(func, 1); - gUnknown_203F3D4->unk8 = 0; -} - -static void sub_8147DA0(u8 taskId) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - SetVBlankCallback(NULL); - ResetSpriteData(); - FreeAllSpritePalettes(); - sub_8148F5C(sub_8148E80, 5); - FadeOutMapMusic(4); - gUnknown_203F3D4->unk8++; - break; - case 1: - if (!FuncIsActiveTask(sub_8148E80)) - { - sub_8149CEC(&gUnknown_203F3D4->unkA4); - LoadWirelessStatusIndicatorSpriteGfx(); - CreateWirelessStatusIndicatorSprite(0, 0); - gUnknown_203F3D4->unk8++; - } - break; - case 2: - if (!sub_8149D68() && IsNotWaitingForBGMStop() == TRUE) - { - FadeOutAndPlayNewMapMusic(MUS_POKE_JUMP, 8); - gUnknown_203F3D4->unk8++; - } - break; - case 3: - if (IsLinkTaskFinished()) - { - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); - SetVBlankCallback(sub_8147D58); - gUnknown_203F3D4->unk8++; - } - break; - case 4: - UpdatePaletteFade(); - if (!gPaletteFade.active) - { - gUnknown_203F3D4->unk7 = 0; - gUnknown_203F3D4->unk8++; - } - break; - case 5: - gUnknown_203F3D4->unk7++; - if (gUnknown_203F3D4->unk7 >= 20) - { - if (gUnknown_203F3D4->isLeader) - sub_8147D84(sub_814807C); - else - sub_8147D84(sub_8148290); - - sub_8148F7C(); - DestroyTask(taskId); - } - break; - } -} - -static void sub_8147F10(int arg0) -{ - if (arg0 == 0) - { - gUnknown_203F3D4->unk30 = 0x1111; - gUnknown_203F3D4->unk2C = 1; - } - else - { - gUnknown_203F3D4->unk30 = (1 << (arg0 - 1)) - 1; - gUnknown_203F3D4->unk2C = 0; - } -} - -static void sub_8147F4C(u8 arg0) -{ - int i; - - gUnknown_203F3D4->unk70.unk0 = arg0; - gUnknown_203F3D4->unk8 = 0; - gUnknown_203F3D4->unkA = 0; - gUnknown_203F3D4->unk48 = 1; - gUnknown_203F3D4->unk49 = 0; - for (i = 1; i < gUnknown_203F3D4->unk5; i++) - gUnknown_203F3D4->unk82E4[i].unk18 = 0; -} - -static void sub_8147FA0(void) -{ - int i; - int count; - u16 var0; - u8 var1; - u16 var2; - - for (i = 1, count = 0; i < gUnknown_203F3D4->unk5; i++) - { - var0 = gUnknown_203F3D4->unk82E4[i].unk10; - if (sub_8149C24(&gUnknown_203F3D4->unk82E4[i], i, &var1, &var2)) - { - gUnknown_203F3D4->unk90[i] = var2; - gUnknown_203F3D4->unk8B[i] = var1; - gUnknown_203F3D4->unk82E4[i].unk12 = var0; - } - - if (gUnknown_203F3D4->unk82E4[i].unk18 && gUnknown_203F3D4->unk8B[i] == gUnknown_203F3D4->unk70.unk0) - count++; - } - - if (count == gUnknown_203F3D4->unk5 - 1) - gUnknown_203F3D4->unk49 = 1; -} - -static bool32 (* const gUnknown_846B64C[])(void) = -{ - sub_8148344, - sub_81483D0, - sub_8148464, - sub_81484D0, - sub_81485C8, - sub_81486C4, - sub_8148760, - sub_81487B4, - sub_814881C, -}; - -static void sub_814807C(u8 taskId) -{ - sub_8147FA0(); - sub_8149534(); - if (!gUnknown_203F3D4->unk48 && gUnknown_203F3D4->unk49) - { - sub_8147F4C(gUnknown_203F3D4->unk4C); - sub_8147F10(3); - } - - if (gUnknown_203F3D4->unk48 == 1) - { - if (!gUnknown_846B64C[gUnknown_203F3D4->unk70.unk0]()) - { - gUnknown_203F3D4->unk48 = 0; - gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 = 1; - } - } - - sub_81492D8(); - sub_8148104(); -} - -static void sub_8148104(void) -{ - if (!gUnknown_203F3D4->unk2C) - sub_8149AF8(gUnknown_203F3D4->unk82E4, &gUnknown_203F3D4->unk70); - - if (gUnknown_203F3D4->unk30 != 0x1111) - { - gUnknown_203F3D4->unk2C++; - gUnknown_203F3D4->unk2C &= gUnknown_203F3D4->unk30; - } -} - -static void sub_8148140(u8 arg0) -{ - gUnknown_203F3D4->unk70.unk0 = arg0; - gUnknown_203F3D4->unk8 = 0; - gUnknown_203F3D4->unkA = 0; - gUnknown_203F3D4->unk48 = 1; - gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 = 0; -} - -static void sub_8148174(void) -{ - int i; - u16 var0; - struct PokemonJump1Sub sp0; - - var0 = gUnknown_203F3D4->unk82E4[0].unk10; - if (sub_8149B7C(gUnknown_203F3D4->unk82E4, &sp0)) - { - if (gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 == 1 - && sp0.unk0 != gUnknown_203F3D4->unk70.unk0) - { - sub_8148140(sp0.unk0); - } - - if (gUnknown_203F3D4->unk70.unk8 != sp0.unk8) - { - gUnknown_203F3D4->unk70.unk8 = sp0.unk8; - gUnknown_203F3D4->unk5C = 1; - gUnknown_203F3D4->unk70.unk1 = sp0.unk1; - if (gUnknown_203F3D4->unk70.unk1) - gUnknown_203F3D4->unk4D = 1; - else - gUnknown_203F3D4->unk4D = 0; - } - - gUnknown_203F3D4->unk70.unk2 = sp0.unk2; - gUnknown_203F3D4->unk70.unk4 = sp0.unk4; - gUnknown_203F3D4->unk82E4[0].unk12 = var0; - } - - for (i = 1; i < gUnknown_203F3D4->unk5; i++) - { - if (i != gUnknown_203F3D4->unk6) - { - var0 = gUnknown_203F3D4->unk82E4[i].unk10; - if (sub_8149C90(&gUnknown_203F3D4->unk82E4[i], i)) - gUnknown_203F3D4->unk82E4[i].unk12 = var0; - } - } -} - -static bool32 (* const gUnknown_846B670[])(void) = -{ - sub_8148398, - sub_8148418, - sub_81484B0, - sub_814856C, - sub_8148664, - sub_8148724, - sub_8148760, - sub_8148800, - sub_814881C, -}; - -static void sub_8148290(u8 taskId) -{ - sub_8148174(); - if (gUnknown_203F3D4->unk48) - { - if (!gUnknown_846B670[gUnknown_203F3D4->unk70.unk0]()) - { - gUnknown_203F3D4->unk48 = 0; - gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 = 1; - sub_8147F10(3); - } - } - - sub_81492D8(); - sub_81482F8(); -} - -static void sub_81482F8(void) -{ - if (!gUnknown_203F3D4->unk2C) - sub_8149BF4(&gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6], gUnknown_203F3D4->unk70.unk0, gUnknown_203F3D4->unk42); - - if (gUnknown_203F3D4->unk30 != 0x1111) - { - gUnknown_203F3D4->unk2C++; - gUnknown_203F3D4->unk2C &= gUnknown_203F3D4->unk30; - } -} - -static bool32 sub_8148344(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - sub_8147F10(3); - gUnknown_203F3D4->unk8++; - // fall through - case 1: - if (!sub_81488DC()) - { - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unk4A; - gUnknown_203F3D4->unk4C = 1; - return FALSE; - } - break; - } - - return TRUE; -} - -static bool32 sub_8148398(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - sub_8147F10(0); - gUnknown_203F3D4->unk24 = gUnknown_203F3D4->unk70.unk2; - gUnknown_203F3D4->unk8++; - // fall through - case 1: - return sub_81488DC(); - } - - return TRUE; -} - -static bool32 sub_81483D0(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - sub_81491E4(); - sub_8147F10(5); - gUnknown_203F3D4->unk8++; - break; - case 1: - if (gUnknown_203F3D4->unk49) - { - gUnknown_203F3D4->unk4C = 2; - return FALSE; - } - break; - } - - return TRUE; -} - -static bool32 sub_8148418(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - sub_81491E4(); - sub_8147F10(0); - gUnknown_203F3D4->unk4A = gUnknown_203F3D4->unk70.unk2; - gUnknown_203F3D4->unk8++; - // fall through - case 1: - if (sub_8149804()) - return FALSE; - break; - } - - return TRUE; -} - -static bool32 sub_8148464(void) -{ - if (!sub_81489C8()) - { - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unk4A; - gUnknown_203F3D4->unk4C = 1; - } - else if (sub_8149630()) - { - return TRUE; - } - else - { - sub_81491B4(); - gUnknown_203F3D4->unk4C = 3; - } - - return FALSE; -} - -static bool32 sub_81484B0(void) -{ - if (!sub_81489C8()) - ; - else if (sub_8149630()) - return TRUE; - else - sub_81491B4(); - - return FALSE; -} - -static bool32 sub_81484D0(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - sub_8149630(); - if (sub_81496D4()) - gUnknown_203F3D4->unk8++; - break; - case 1: - if (!sub_8148A60()) - { - if (sub_81498B4()) - { - gUnknown_203F3D4->unk70.unk2 = sub_81498D8(); - gUnknown_203F3D4->unk4C = 7; - } - else if (gUnknown_203F3D4->unk70.unk4 >= 200) - { - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unkE; - gUnknown_203F3D4->unk4C = 8; - } - else - { - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unkE; - gUnknown_203F3D4->unk4C = 4; - } - - gUnknown_203F3D4->unk8++; - return FALSE; - } - break; - case 2: - return FALSE; - } - - return TRUE; -} - -static bool32 sub_814856C(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - if (!sub_8149630()) - sub_81491B4(); - if (sub_81496D4()) - gUnknown_203F3D4->unk8++; - break; - case 1: - if (!sub_8148A60()) - { - gUnknown_203F3D4->unk8++; - return FALSE; - } - break; - case 2: - return FALSE; - } - - return TRUE; -} - -static bool32 sub_81485C8(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - sub_8147F10(4); - gUnknown_203F3D4->unk8++; - // fall through - case 1: - if (!sub_8148C80()) - { - sub_814B494(gUnknown_203F3D4->unk70.unk8, gUnknown_203F3D4->unk70.unk4, gUnknown_203F3D4->unk70.unk2); - gUnknown_203F3D4->unk8++; - } - break; - case 2: - if (gUnknown_203F3D4->unk49) - { - if (sub_8149748()) - gUnknown_203F3D4->unk4C = 5; - else - gUnknown_203F3D4->unk4C = 6; - - gUnknown_203F3D4->unk8++; - return FALSE; - } - break; - case 3: - return FALSE; - } - - return TRUE; -} - -static bool32 sub_8148664(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - sub_8147F10(0); - gUnknown_203F3D4->unk8++; - // fall through - case 1: - if (!sub_8148C80()) - { - sub_814B494(gUnknown_203F3D4->unk70.unk8, gUnknown_203F3D4->unk70.unk4, gUnknown_203F3D4->unk70.unk2); - gUnknown_203F3D4->unk42 = gUnknown_203F3D4->unk45; - return FALSE; - } - break; - } - - return TRUE; -} - -static bool32 sub_81486C4(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - if (!sub_8148E2C()) - gUnknown_203F3D4->unk8++; - break; - case 1: - if (gUnknown_203F3D4->unk49) - { - sub_8147B94(gUnknown_203F3D4); - gUnknown_203F3D4->unk24 = Random(); - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unk24; - gUnknown_203F3D4->unk4C = 0; - return FALSE; - } - break; - } - - return TRUE; -} - -static bool32 sub_8148724(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - if (!sub_8148E2C()) - { - sub_8147B94(gUnknown_203F3D4); - gUnknown_203F3D4->unk8++; - return FALSE; - } - break; - case 1: - return FALSE; - } - - return TRUE; -} - -static bool32 sub_8148760(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - gUnknown_203F3D4->unk8 = 1; - break; - case 1: - sub_8147F10(0); - gUnknown_203F3D4->unk8++; - break; - case 2: - if (!sub_8148D5C()) - { - SetMainCallback2(gUnknown_203F3D4->returnCallback); - sub_8147B48(); - } - break; - } - - return TRUE; -} - -static bool32 sub_81487B4(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - sub_8147F10(4); - gUnknown_203F3D4->unk8++; - break; - case 1: - if (!sub_8148B54()) - { - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unkE; - gUnknown_203F3D4->unk4C = 8; - return FALSE; - } - break; - } - - return TRUE; -} - -static bool32 sub_8148800(void) -{ - sub_8147F10(0); - if (!sub_8148B54()) - return FALSE; - else - return TRUE; -} - -static bool32 sub_814881C(void) -{ - switch (gUnknown_203F3D4->unk8) - { - case 0: - sub_814B494(gUnknown_203F3D4->unk70.unk8, gUnknown_203F3D4->unk70.unk4, gUnknown_203F3D4->unk70.unk2); - sub_8149D40(5); - gUnknown_203F3D4->unk8++; - break; - case 1: - if (!sub_8149D68()) - { - sub_8147F10(0); - gUnknown_203F3D4->unk8++; - } - break; - case 2: - if (sub_8149804()) - { - CreateTask(Task_LinkSave, 6); - gUnknown_203F3D4->unk8++; - } - break; - case 3: - if (!FuncIsActiveTask(Task_LinkSave)) - { - sub_814A6CC(); - gUnknown_203F3D4->unk8++; - } - break; - case 4: - if (!sub_814A6FC()) - { - gUnknown_203F3D4->unk4C = 4; - return FALSE; - } - break; - } - - return TRUE; -} - -static bool32 sub_81488DC(void) -{ - switch (gUnknown_203F3D4->unkA) - { - case 0: - sub_8149D40(2); - sub_814AAA0(); - gUnknown_203F3D4->unkA++; - break; - case 1: - if (!sub_8149D68()) - { - sub_814AAB4(gUnknown_203F3D4->unk6); - gUnknown_203F3D4->unk3C = 0; - gUnknown_203F3D4->unkA++; - } - break; - case 2: - if (++gUnknown_203F3D4->unk3C > 120) - { - sub_8149D40(3); - gUnknown_203F3D4->unkA++; - } - break; - case 3: - if (sub_8149D68() != 1 && sub_814AAC8() != 1) - gUnknown_203F3D4->unkA++; - break; - case 4: - sub_8149D40(9); - gUnknown_203F3D4->unkA++; - break; - case 5: - if (!sub_8149D68()) - { - sub_814935C(); - sub_814A3E4(); - gUnknown_203F3D4->unkA++; - } - break; - case 6: - if (!sub_814A408()) - { - sub_814936C(); - sub_8148F9C(); - gUnknown_203F3D4->unkA++; - return FALSE; - } - break; - case 7: - return FALSE; - } - - return TRUE; -} - -static bool32 sub_81489C8(void) -{ - sub_8148FE0(); - if (gUnknown_203F3D4->unk36) - { - gUnknown_203F3D4->unk36 = 0; - return FALSE; - } - - switch (gUnknown_203F3D4->unkA) - { - case 0: - if (sub_814922C(0)) - gUnknown_203F3D4->unkA++; - else - break; - // fall through - case 1: - if (gMain.newKeys & A_BUTTON) - { - sub_8149260(); - sub_8147F10(3); - gUnknown_203F3D4->unkA++; - } - break; - case 2: - if (sub_814922C(1) == TRUE) - gUnknown_203F3D4->unkA++; - break; - case 3: - if (sub_814922C(0) == TRUE) - gUnknown_203F3D4->unkA = 0; - break; - } - - return TRUE; -} - -static bool32 sub_8148A60(void) -{ - int i; - - switch (gUnknown_203F3D4->unkA) - { - case 0: - for (i = 0; i < gUnknown_203F3D4->unk5; i++) - { - if (sub_814AA78(i) == 1) - return TRUE; - } - - gUnknown_203F3D4->unkA++; - break; - case 1: - for (i = 0; i < gUnknown_203F3D4->unk5; i++) - { - if (gUnknown_203F3D4->unk82E4[i].unk10 == 2) - sub_814AA60(i); - } - - sub_8149D40(1); - gUnknown_203F3D4->unk3C = 0; - gUnknown_203F3D4->unkA++; - break; - case 2: - if (++gUnknown_203F3D4->unk3C > 100) - { - sub_8149D40(3); - gUnknown_203F3D4->unk3C = 0; - gUnknown_203F3D4->unkA++; - } - break; - case 3: - if (!sub_8149D68()) - { - sub_814AA8C(); - gUnknown_203F3D4->unk70.unk1 = 0; - sub_8149210(); - gUnknown_203F3D4->unkA++; - return FALSE; - } - break; - case 4: - return FALSE; - } - - return TRUE; -} - -static bool32 sub_8148B54(void) -{ - switch (gUnknown_203F3D4->unkA) - { - case 0: - sub_8149900(gUnknown_203F3D4->unk70.unk2, &gUnknown_203F3D4->unk3E, &gUnknown_203F3D4->unk40); - sub_814A468(gUnknown_203F3D4->unk3E, gUnknown_203F3D4->unk40); - gUnknown_203F3D4->unkA++; - break; - case 1: - case 4: - if (!sub_814A62C()) - { - gUnknown_203F3D4->unk3C = 0; - gUnknown_203F3D4->unkA++; - } - break; - case 2: - case 5: - gUnknown_203F3D4->unk3C++; - if (gMain.newKeys & (A_BUTTON | B_BUTTON) || gUnknown_203F3D4->unk3C > 180) - { - sub_814A6CC(); - gUnknown_203F3D4->unkA++; - } - break; - case 3: - if (!sub_814A6FC()) - { - gUnknown_203F3D4->unk40 = sub_8149978(gUnknown_203F3D4->unk3E, gUnknown_203F3D4->unk40); - if (gUnknown_203F3D4->unk40 && AddBagItem(gUnknown_203F3D4->unk3E, gUnknown_203F3D4->unk40)) - { - if (!CheckBagHasSpace(gUnknown_203F3D4->unk3E, 1)) - { - sub_814A53C(gUnknown_203F3D4->unk3E); - gUnknown_203F3D4->unkA = 4; - } - else - { - gUnknown_203F3D4->unkA = 6; - break; - } - } - else - { - sub_814A5B4(gUnknown_203F3D4->unk3E); - gUnknown_203F3D4->unkA = 4; - } - } - break; - case 6: - if (!sub_814A6FC()) - return FALSE; - break; - } - - return TRUE; -} - -static bool32 sub_8148C80(void) -{ - s8 input; - - switch (gUnknown_203F3D4->unkA) - { - case 0: - sub_8149D40(4); - gUnknown_203F3D4->unkA++; - break; - case 1: - if (!sub_8149D68()) - gUnknown_203F3D4->unkA++; - break; - case 2: - input = sub_814A744(); - switch (input) - { - case MENU_B_PRESSED: - case 1: - gUnknown_203F3D4->unk45 = 1; - sub_8149D40(6); - gUnknown_203F3D4->unkA++; - break; - case 0: - gUnknown_203F3D4->unk45 = 2; - sub_8149D40(6); - gUnknown_203F3D4->unkA++; - break; - } - break; - case 3: - if (!sub_8149D68()) - gUnknown_203F3D4->unkA++; - break; - case 4: - sub_8149D40(8); - gUnknown_203F3D4->unkA++; - break; - case 5: - if (!sub_8149D68()) - { - gUnknown_203F3D4->unkA++; - return FALSE; - } - break; - case 6: - return FALSE; - } - - return TRUE; -} - -static bool32 sub_8148D5C(void) -{ - int var0; - - switch (gUnknown_203F3D4->unkA) - { - case 0: - sub_814A6CC(); - gUnknown_203F3D4->unkA++; - break; - case 1: - if (!sub_814A6FC()) - { - sub_8149D40(7); - gUnknown_203F3D4->unkA++; - } - break; - case 2: - var0 = sub_8149D68(); - if (!var0) - { - gUnknown_203F3D4->unk3C = var0; - gUnknown_203F3D4->unkA++; - } - break; - case 3: - if (++gUnknown_203F3D4->unk3C > 120) - { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); - gUnknown_203F3D4->unkA++; - } - break; - case 4: - if (!gPaletteFade.active) - { - SetCloseLinkCallback(); - gUnknown_203F3D4->unkA++; - } - break; - case 5: - if (!gReceivedRemoteLinkPlayers) - return FALSE; - break; - } - - return TRUE; -} - -static bool32 sub_8148E2C(void) -{ - switch (gUnknown_203F3D4->unkA) - { - case 0: - sub_814A6CC(); - sub_814AA24(0); - gUnknown_203F3D4->unkA++; - break; - case 1: - if (!sub_814A6FC()) - { - gUnknown_203F3D4->unkA++; - return FALSE; - } - break; - case 2: - return FALSE; - } - - return TRUE; -} - -static void sub_8148E80(u8 taskId) -{ - int i; - s16 *taskData = gTasks[taskId].data; - struct PokemonJump1 *ptr = (struct PokemonJump1 *)GetWordTaskArg(taskId, 14); - - switch (taskData[0]) - { - case 0: - for (i = 0; i < MAX_RFU_PLAYERS; i++) - taskData[i + 2] = 0; - - taskData[0]++; - // fall through - case 1: - sub_8149A6C(&ptr->unk82A8[ptr->unk6]); - for (i = 0; i < MAX_RFU_PLAYERS; i++) - { - if (!taskData[i + 2] && sub_8149A90(i, &ptr->unk82A8[i])) - { - StringCopy(ptr->unk82E4[i].unk1C, gLinkPlayers[i].name); - taskData[i + 2] = 1; - taskData[1]++; - if (taskData[1] == ptr->unk5) - { - sub_8147C20(); - DestroyTask(taskId); - break; - } - } - } - break; - } -} - -static void sub_8148F5C(TaskFunc func, u8 taskPriority) -{ - u8 taskId = CreateTask(func, taskPriority); - SetWordTaskArg(taskId, 14, (uintptr_t)gUnknown_203F3D4); -} - -static void sub_8148F7C(void) -{ - gUnknown_203F3D4->unk4A = 0; - gUnknown_203F3D4->unk14 = 6; - gUnknown_203F3D4->unk34 = 0; - gUnknown_203F3D4->unk1C = 0; - gUnknown_203F3D4->unk36 = 0; - gUnknown_203F3D4->unk10 = 0; -} - -static void sub_8148F9C(void) -{ - gUnknown_203F3D4->unk4A = 0; - gUnknown_203F3D4->unk34 = 0x6FF; - gUnknown_203F3D4->unk14 = 7; - gUnknown_203F3D4->unk36 = 0; - gUnknown_203F3D4->unk10 = 0; - gUnknown_203F3D4->unk51 = 0; - gUnknown_203F3D4->unk50 = 0; - gUnknown_203F3D4->unk20 = 0; - gUnknown_203F3D4->unk4E = 0; - gUnknown_203F3D4->unk6C = 0; - sub_8149078(); -} - -static void sub_8148FE0(void) -{ - if (gUnknown_203F3D4->unk46) - { - gUnknown_203F3D4->unk4A++; - gUnknown_203F3D4->unk34 += sub_8149044(); - if (gUnknown_203F3D4->unk34 >= 0x9FF) - gUnknown_203F3D4->unk34 -= 0x9FF; - - gUnknown_203F3D4->unk18 = gUnknown_203F3D4->unk14; - gUnknown_203F3D4->unk14 = gUnknown_203F3D4->unk34 >> 8; - if (gUnknown_203F3D4->unk14 > 6 && gUnknown_203F3D4->unk18 < 7) - { - gUnknown_203F3D4->unk36++; - sub_8149078(); - } - } -} - -static int sub_8149044(void) -{ - int result; - - if (gUnknown_203F3D4->unk10) - return 0; - - result = gUnknown_203F3D4->unk1C; - if (gUnknown_203F3D4->unk34 <= 0x5FF) - { - gUnknown_203F3D4->unk20 += 80; - result += gUnknown_203F3D4->unk20 >> 8; - } - - return result; -} - -static const u16 gUnknown_846B694[] = {0x1a, 0x1f, 0x24, 0x29, 0x2e, 0x33, 0x38, 0x3d}; -static const u16 gUnknown_846B6A4[] = {0, 1, 1, 2}; - -static void sub_8149078(void) -{ - int var0; - - gUnknown_203F3D4->unk20 = 0; - if (gUnknown_203F3D4->unk4E) - { - gUnknown_203F3D4->unk4E--; - if (gUnknown_203F3D4->unk6C) - { - if (sub_8149194() % 4 != 0) - { - gUnknown_203F3D4->unk1C = gUnknown_203F3D4->unk28; - } - else - { - if (gUnknown_203F3D4->unk28 > 54) - gUnknown_203F3D4->unk1C = 30; - else - gUnknown_203F3D4->unk1C = 82; - } - } - } - else - { - if (!(gUnknown_203F3D4->unk50 & 8)) - { - gUnknown_203F3D4->unk28 = gUnknown_846B694[gUnknown_203F3D4->unk50] + (gUnknown_203F3D4->unk51 * 7); - gUnknown_203F3D4->unk4E = gUnknown_846B6A4[sub_8149194() % NELEMS(gUnknown_846B6A4)] + 2; - gUnknown_203F3D4->unk50++; - } - else - { - if (gUnknown_203F3D4->unk50 == 8) - { - if (gUnknown_203F3D4->unk51 < 3) - gUnknown_203F3D4->unk51++; - else - gUnknown_203F3D4->unk6C = 1; - } - - var0 = gUnknown_846B694[15 - gUnknown_203F3D4->unk50]; - gUnknown_203F3D4->unk28 = var0 + (gUnknown_203F3D4->unk51 * 7); - if (++gUnknown_203F3D4->unk50 > 15) - { - if (sub_8149194() % 4 == 0) - gUnknown_203F3D4->unk28 -= 5; - - gUnknown_203F3D4->unk50 = 0; - } - } - - gUnknown_203F3D4->unk1C = gUnknown_203F3D4->unk28; - } -} - -static int sub_8149194(void) -{ - // The number 1103515245 comes from the example implementation of rand and srand - gUnknown_203F3D4->unk24 = gUnknown_203F3D4->unk24 * 1103515245 + 24691; - return gUnknown_203F3D4->unk24 >> 16; -} - -static void sub_81491B4(void) -{ - gUnknown_203F3D4->unk10 = 1; - gUnknown_203F3D4->unk14 = 6; - gUnknown_203F3D4->unk34 = 0x5FF; - sub_814936C(); -} - -static int sub_81491D8(void) -{ - return gUnknown_203F3D4->unk10; -} - -static void sub_81491E4(void) -{ - int i; - for (i = 0; i < MAX_RFU_PLAYERS; i++) - gUnknown_203F3D4->unk82E4[i].unk14 = 0; -} - -static void sub_8149210(void) -{ - gUnknown_203F3D4->unk83AC->unk10 = 0; - gUnknown_203F3D4->unk83AC->unk12 = 0; -} - -static bool32 sub_814922C(u16 arg0) -{ - if (gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk10 == arg0) - return TRUE; - else - return FALSE; -} - -static void sub_8149260(void) -{ - gUnknown_203F3D4->unk83AC->unkE = gUnknown_203F3D4->unk4A; - gUnknown_203F3D4->unk83AC->unk12 = gUnknown_203F3D4->unk83AC->unk10; - gUnknown_203F3D4->unk83AC->unk10 = 1; -} - -static void sub_8149288(void) -{ - gUnknown_203F3D4->unk83AC->unk12 = gUnknown_203F3D4->unk83AC->unk10; - gUnknown_203F3D4->unk83AC->unk10 = 2; - gUnknown_203F3D4->unk83AC->unkE = gUnknown_203F3D4->unk4A; - gUnknown_203F3D4->unk83AC->unk14 = 2; -} - -static void sub_81492B8(void) -{ - gUnknown_203F3D4->unk83AC->unk12 = gUnknown_203F3D4->unk83AC->unk10; - gUnknown_203F3D4->unk83AC->unk10 = 0; -} - -static const u16 gUnknown_846B6AC[] = {SE_RS_SHOP, SE_SHINY, SE_M_MORNING_SUN, SE_POKE_JUMP_SUCCESS}; - -static void sub_81492D8(void) -{ - if (gUnknown_203F3D4->unk5C) - { - sub_814AA24(gUnknown_203F3D4->unk70.unk8); - gUnknown_203F3D4->unk5C = 0; - if (gUnknown_203F3D4->unk4D) - { - int index = sub_814A98C(gUnknown_203F3D4->unk70.unk1); - PlaySE(gUnknown_846B6AC[index - 2]); - gUnknown_203F3D4->unk4D = 0; - } - } - - sub_814AA34(gUnknown_203F3D4->unk70.unk4); - sub_814937C(); - sub_814933C(); -} - -static void sub_814933C(void) -{ - if (gUnknown_203F3D4->unk46) - sub_814A95C(gUnknown_203F3D4->unk14); -} - -static void sub_814935C(void) -{ - gUnknown_203F3D4->unk46 = 0; -} - -static void sub_814936C(void) -{ - gUnknown_203F3D4->unk46 = 1; -} - -static void sub_814937C(void) -{ - int i; - int whichSound = 0; - int numLinkPlayers = gUnknown_203F3D4->unk5; - - for (i = 0; i < numLinkPlayers; i++) - { - switch (gUnknown_203F3D4->unk82E4[i].unk10) - { - case 0: - sub_814A940(i, 0); - break; - case 1: - if (gUnknown_203F3D4->unk82E4[i].unk12 != 1 || gUnknown_203F3D4->unk82E4[i].unkE != gUnknown_203F3D4->unk9A[i]) - { - if (i == gUnknown_203F3D4->unk6) - gUnknown_203F3D4->unk82E4[i].unk12 = 1; - - whichSound |= 0x1; - gUnknown_203F3D4->unk82E4[i].unk4 = 0x7FFFFFFF; - gUnknown_203F3D4->unk9A[i] = gUnknown_203F3D4->unk82E4[i].unkE; - } - - sub_8149490(i); - break; - case 2: - if (gUnknown_203F3D4->unk82E4[i].unk12 != 2) - { - if (i == gUnknown_203F3D4->unk6) - gUnknown_203F3D4->unk82E4[i].unk12 = 2; - - whichSound |= 0x2; - sub_814AA48(i); - } - break; - } - } - - if (whichSound & 0x2) - PlaySE(SE_POKE_JUMP_FAILURE); - else if (whichSound & 0x1) - PlaySE(SE_LEDGE); -} - -static const s8 gUnknown_846B6B4[][48] = -{ - {-3, -6, -8, -10, -13, -15, -17, -19, -21, -23, -25, -27, -28, -29, -30, -30, -30, -28, -27, - -26, -25, -23, -22, -20, -18, -17, -15, -13, -11, -8, -6, -4, -1}, - - {-3, -6, -9, -11, -14, -16, -18, -20, -22, -24, -26, -28, -29, -30, -30, -28, -26, -24, -22, - -20, -18, -16, -14, -11, -9, -6, -4, -1}, - - {-3, -6, -9, -11, -13, -15, -17, -19, -21, -23, -25, -27, -28, -29, -30, -30, -30, -30, -29, - -29, -28, -28, -27, -27, -26, -25, -24, -22, -20, -18, -16, -14, - -12, -11, -9, -6, -4, -1}, -}; - -static void sub_8149490(int multiplayerId) -{ - int var0; - int var1; - struct PokemonJump1_82E4 *player; - - if (gUnknown_203F3D4->unk68) - return; - - player = &gUnknown_203F3D4->unk82E4[multiplayerId]; - if (player->unk4 != 0x7FFFFFFF) - { - player->unk4++; - var0 = player->unk4; - } - else - { - var0 = gUnknown_203F3D4->unk4A - player->unkE; - if (var0 >= 65000) - { - var0 -= 65000; - var0 += gUnknown_203F3D4->unk4A; - } - - player->unk4 = var0; - } - - if (var0 < 4) - return; - - var0 -= 4; - if (var0 < 48) - var1 = gUnknown_846B6B4[player->unkC][var0]; - else - var1 = 0; - - sub_814A940(multiplayerId, var1); - if (!var1 && multiplayerId == gUnknown_203F3D4->unk6) - sub_81492B8(); - - player->unk0 = var1; -} - -static void sub_8149534(void) -{ - if (gUnknown_203F3D4->unk14 == 8 && gUnknown_203F3D4->unk18 == 7) - { - if (gUnknown_203F3D4->unk58 == 0) - { - sub_8149878(); - gUnknown_203F3D4->unk54 = 0; - gUnknown_203F3D4->unk58 = 1; - gUnknown_203F3D4->unk70.unk1 = 0; - } - else - { - if (gUnknown_203F3D4->unk54 == 5) - { - gUnknown_203F3D4->unkC++; - sub_8149898(gUnknown_203F3D4->unkC); - } - else - { - gUnknown_203F3D4->unkC = 0; - } - - if (gUnknown_203F3D4->unk54 > 1) - { - gUnknown_203F3D4->unk64 = 1; - memcpy(gUnknown_203F3D4->unk86, gUnknown_203F3D4->unk81, sizeof(u8) * MAX_RFU_PLAYERS); - } - - sub_8149878(); - gUnknown_203F3D4->unk54 = 0; - gUnknown_203F3D4->unk58 = 1; - gUnknown_203F3D4->unk70.unk1 = 0; - if (gUnknown_203F3D4->unk70.unk4 < 9999) - gUnknown_203F3D4->unk70.unk4++; - - sub_8149780(10); - sub_8147F10(3); - } - } - - if (gUnknown_203F3D4->unk64 && (sub_8149710() == TRUE || !gUnknown_203F3D4->unk14)) - { - int var0 = sub_8149834(gUnknown_203F3D4->unk86); - sub_8149780(sub_8149888(var0)); - sub_8147F10(3); - gUnknown_203F3D4->unk64 = 0; - } - - if (gUnknown_203F3D4->unk58) - { - int var1 = sub_81497A8(); - if (var1 > gUnknown_203F3D4->unk54) - { - gUnknown_203F3D4->unk54 = var1; - memcpy(gUnknown_203F3D4->unk81, gUnknown_203F3D4->unk7C, sizeof(u8) * MAX_RFU_PLAYERS); - } - } -} - -static bool32 sub_8149630(void) -{ - int i; - - if (gUnknown_203F3D4->unk14 == 6 && !gUnknown_203F3D4->unk83AC->unk0) - { - if (gUnknown_203F3D4->unk83AC->unk12 == 1 && sub_81491D8() == 1) - { - gUnknown_203F3D4->unk83AC->unk14 = 1; - } - else - { - sub_8149288(); - sub_8147F10(3); - } - } - - if (gUnknown_203F3D4->unk14 == 7 - && gUnknown_203F3D4->unk18 == 6 - && gUnknown_203F3D4->unk83AC->unk10 != 2) - { - gUnknown_203F3D4->unk83AC->unk14 = 1; - sub_8147F10(3); - } - - for (i = 0; i < gUnknown_203F3D4->unk5; i++) - { - if (gUnknown_203F3D4->unk82E4[i].unk10 == 2) - return FALSE; - } - - return TRUE; -} - -static bool32 sub_81496D4(void) -{ - int i; - int numPlayers = gUnknown_203F3D4->unk5; - int count = 0; - for (i = 0; i < numPlayers; i++) - { - if (gUnknown_203F3D4->unk82E4[i].unk14) - count++; - } - - return count == numPlayers; -} - -static bool32 sub_8149710(void) -{ - int i; - for (i = 0; i < gUnknown_203F3D4->unk5; i++) - { - if (gUnknown_203F3D4->unk82E4[i].unk14 != 1) - return FALSE; - } - - return TRUE; -} - -static bool32 sub_8149748(void) -{ - int i; - - if (gUnknown_203F3D4->unk45 == 1) - return FALSE; - - for (i = 1; i < gUnknown_203F3D4->unk5; i++) - { - if (gUnknown_203F3D4->unk90[i] == 1) - return FALSE; - } - - return TRUE; -} - -static void sub_8149780(int arg0) -{ - gUnknown_203F3D4->unk70.unk8 += arg0; - gUnknown_203F3D4->unk5C = 1; - if (gUnknown_203F3D4->unk70.unk8 >= 99990) - gUnknown_203F3D4->unk70.unk8 = 99990; -} - -static int sub_81497A8(void) -{ - int i; - int count = 0; - int numPlayers = gUnknown_203F3D4->unk5; - - for (i = 0; i < numPlayers; i++) - { - if (gUnknown_203F3D4->unk82E4[i].unk0 == -30) - { - gUnknown_203F3D4->unk7C[i] = 1; - count++; - } - else - { - gUnknown_203F3D4->unk7C[i] = 0; - } - } - - return count; -} - -static bool32 sub_8149804(void) -{ - return !Rfu.recvQueue.count && !Rfu.sendQueue.count; -} - -static int sub_8149834(u8 *arg0) -{ - int i; - int flags; - int count; - - for (i = 0, flags = 0, count = 0; i < MAX_RFU_PLAYERS; i++) - { - if (arg0[i]) - { - flags |= 1 << i; - count++; - } - } - - gUnknown_203F3D4->unk70.unk1 = flags; - if (flags) - gUnknown_203F3D4->unk4D = 1; - - return count; -} - -static void sub_8149878(void) -{ - gUnknown_203F3D4->unk44 = 0; -} - -static const int gUnknown_846B74C[] = {0, 0, 50, 100, 200, 500}; - -static int sub_8149888(int arg0) -{ - return gUnknown_846B74C[arg0]; -} - -static void sub_8149898(u16 arg0) -{ - if (arg0 > gUnknown_203F3D4->unkE) - gUnknown_203F3D4->unkE = arg0; -} - -static const u16 gUnknown_846B764[] = {0x8a, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93}; -static const u32 gUnknown_846B76C[][2] = -{ - {0x1388, 1}, - {0x1f40, 2}, - {0x2ee0, 3}, - {0x3e80, 4}, - {0x4e20, 5}, -}; - -static bool32 sub_81498B4(void) -{ - if (gUnknown_203F3D4->unk70.unk8 >= gUnknown_846B76C[0][0]) - return TRUE; - else - return FALSE; -} - -static u16 sub_81498D8(void) -{ - u16 lo = sub_8149910(); - u16 hi = sub_8149930(); - return (hi << 12) | (lo & 0xFFF); -} - -static void sub_8149900(u16 arg0, u16 *arg1, u16 *arg2) -{ - *arg2 = arg0 >> 12; - *arg1 = arg0 & 0xFFF; -} - -static u16 sub_8149910(void) -{ - u16 index = Random() % NELEMS(gUnknown_846B764); - return gUnknown_846B764[index]; -} - -static u16 sub_8149930(void) -{ - u32 val, i; - - val = 0; - for (i = 0; i < 5; i++) - { - if (gUnknown_203F3D4->unk70.unk8 < gUnknown_846B76C[i][0]) - break; - else if (1) // required to match, see pret/pokeemerald#982 - val = gUnknown_846B76C[i][1]; - else - break; - } - - return val; -} - -static u16 sub_8149978(u16 item, u16 quantity) -{ - while (quantity && !CheckBagHasSpace(item, quantity)) - quantity--; - - return quantity; -} - -u16 sub_81499A4(void) -{ - return GetLinkPlayerCount(); -} - -u16 sub_81499B4(void) -{ - return gUnknown_203F3D4->unk6; -} - -struct PokemonJump1_MonInfo *sub_81499C0(u8 multiplayerId) -{ - return &gUnknown_203F3D4->unk82A8[multiplayerId]; -} - -u8 *sub_81499E0(u8 multiplayerId) -{ - return gUnknown_203F3D4->unk82E4[multiplayerId].unk1C; -} - -bool32 IsSpeciesAllowedInPokemonJump(u16 species) -{ - return GetPokemonJumpSpeciesIdx(species) > -1; -} - -void IsPokemonJumpSpeciesInParty(void) -{ - int i; - - for (i = 0; i < PARTY_SIZE; i++) - { - if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_HAS_SPECIES)) - { - u16 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); - if (IsSpeciesAllowedInPokemonJump(species)) - { - gSpecialVar_Result = TRUE; - return; - } - } - } - - gSpecialVar_Result = FALSE; -} diff --git a/src/pokemon_jump_3.c b/src/pokemon_jump_3.c deleted file mode 100644 index 978c4ab71..000000000 --- a/src/pokemon_jump_3.c +++ /dev/null @@ -1,167 +0,0 @@ -#include "global.h" -#include "link_rfu.h" -#include "pokemon_jump.h" - -struct MonInfoPacket -{ - u8 id; // packet id - u16 species; - u32 personality; - u32 otId; -}; - -void sub_8149A6C(struct PokemonJump1_MonInfo *arg0) -{ - struct MonInfoPacket packet; - packet.id = 1; - packet.species = arg0->species; - packet.otId = arg0->otId; - packet.personality = arg0->personality; - Rfu_SendPacket(&packet); -} - -bool32 sub_8149A90(int multiplayerId, struct PokemonJump1_MonInfo *arg0) -{ - struct MonInfoPacket packet; - - if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) - return FALSE; - - memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); - if (packet.id == 1) - { - arg0->species = packet.species; - arg0->otId = packet.otId; - arg0->personality = packet.personality; - return TRUE; - } - - return FALSE; -} - -struct UnkPacket2 -{ - u8 id; // packet id - u32 unk4; - u32 unk8; -}; - -void sub_8149AE0(u32 arg0) -{ - struct UnkPacket2 packet; - packet.id = 2; - packet.unk4 = arg0; - Rfu_SendPacket(&packet); -} - -struct UnkPacket3 -{ - u8 id; // packet id - u8 unk1; - u8 unk2; - u8 unk3_0:5; - u8 unk3_1:3; - u16 unk4; - u16 unk6; - u32 unk8_0:15; - u32 unk8_1:17; -}; - -void sub_8149AF8(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1) -{ - struct UnkPacket3 packet; - packet.id = 3; - packet.unk8_1 = arg1->unk8; - packet.unk3_0 = arg1->unk1; - packet.unk1 = arg1->unk0; - packet.unk6 = arg1->unk2; - packet.unk8_0 = arg1->unk4; - packet.unk2 = arg0->unk10; - packet.unk3_1 = arg0->unk14; - packet.unk4 = arg0->unkE; - Rfu_SendPacket(&packet); -} - -bool32 sub_8149B7C(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1) -{ - struct UnkPacket3 packet; - - if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00) - return FALSE; - - memcpy(&packet, &gRecvCmds[0][1], sizeof(packet)); - if (packet.id != 3) - return FALSE; - - arg1->unk8 = packet.unk8_1; - arg1->unk1 = packet.unk3_0; - arg1->unk0 = packet.unk1; - arg1->unk2 = packet.unk6; - arg1->unk4 = packet.unk8_0; - arg0->unk10 = packet.unk2; - arg0->unk14 = packet.unk3_1; - arg0->unkE = packet.unk4; - return TRUE; -} - -struct UnkPacket4 -{ - u8 id; // packet id - u8 unk1; - u8 unk2; - u8 unk3; - u16 unk4; - u8 unk6; - u16 unk8; -}; - -void sub_8149BF4(struct PokemonJump1_82E4 *arg0, u8 arg1, u16 arg2) -{ - struct UnkPacket4 packet; - packet.id = 4; - packet.unk1 = arg0->unk10; - packet.unk2 = arg0->unk14; - packet.unk3 = arg0->unk18; - packet.unk4 = arg0->unkE; - packet.unk6 = arg1; - packet.unk8 = arg2; - Rfu_SendPacket(&packet); -} - -bool32 sub_8149C24(struct PokemonJump1_82E4 *arg0, int multiplayerId, u8 *arg2, u16 *arg3) -{ - struct UnkPacket4 packet; - - if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) - return FALSE; - - memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); - if (packet.id != 4) - return FALSE; - - arg0->unk10 = packet.unk1; - arg0->unk14 = packet.unk2; - arg0->unk18 = packet.unk3; - arg0->unkE = packet.unk4; - *arg2 = packet.unk6; - *arg3 = packet.unk8; - return TRUE; -} - -bool32 sub_8149C90(struct PokemonJump1_82E4 *arg0, int multiplayerId) -{ - struct UnkPacket4 packet; - - if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) - return FALSE; - - memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); - if (packet.id != 4) - return FALSE; - - arg0->unk10 = packet.unk1; - arg0->unk14 = packet.unk2; - arg0->unk18 = packet.unk3; - arg0->unkE = packet.unk4; - return TRUE; -} diff --git a/src/pokemon_jump_4.c b/src/pokemon_jump_4.c deleted file mode 100644 index 8ca248ada..000000000 --- a/src/pokemon_jump_4.c +++ /dev/null @@ -1,922 +0,0 @@ -#include "global.h" -#include "gflib.h" -#include "data.h" -#include "digit_obj_util.h" -#include "dynamic_placeholder_text_util.h" -#include "item.h" -#include "menu.h" -#include "new_menu_helpers.h" -#include "pokemon_jump.h" -#include "strings.h" -#include "task.h" -#include "text_window.h" -#include "constants/songs.h" -#include "constants/items.h" - -EWRAM_DATA static struct PokemonJump2 *gUnknown_203F3D8 = NULL; - -static void sub_8149D80(void (*func)(void)); -static void sub_8149DA4(u8 taskId); -static void sub_8149DC8(void); -static void sub_8149F64(void); -static void sub_8149FD0(void); -static void sub_814A03C(void); -static void sub_814A0C8(void); -static void sub_814A174(void); -static void sub_814A218(void); -static void sub_814A264(void); -static void sub_814A308(void); -static void sub_814A3AC(void); -static u32 sub_814A754(u32 left, u32 top, u32 width, u32 height); -static void sub_814A7D0(u16 left, u16 top, u8 cursorPos); -static void sub_814A84C(void); -static void sub_814A8B8(void); -static void sub_814A9C8(void); -static void sub_814AADC(void); -static void sub_814AC30(bool32 arg0); -static void sub_814AC94(void); -static void sub_814ACCC(u8 arg0); -static void sub_814AD50(u8 taskId); - -static void sub_8149D34(struct PokemonJump2 *); - -void sub_8149CEC(struct PokemonJump2 *arg0) -{ - u8 taskId; - - gUnknown_203F3D8 = arg0; - sub_8149D34(gUnknown_203F3D8); - taskId = CreateTask(sub_8149DA4, 3); - gUnknown_203F3D8->unk6 = taskId; - SetWordTaskArg(gUnknown_203F3D8->unk6, 2, (uintptr_t)gUnknown_203F3D8); - sub_8149D80(sub_8149DC8); -} - -void sub_8149D24(void) -{ - FreeAllWindowBuffers(); - DigitObjUtil_Free(); -} - -static void sub_8149D34(struct PokemonJump2 *arg0) -{ - arg0->unk4 = 0; - arg0->unk0 = 0; - arg0->unk12 = 0xFF; -} - -// Gfx -static const u16 sPkmnJumpPal3[] = INCBIN_U16("graphics/link_games/pkmnjump_pal3.gbapal"); - -static const u16 sPkmnJumpBgPal[] = INCBIN_U16("graphics/link_games/pkmnjump_bg.gbapal"); -static const u32 sPkmnJumpBgGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_bg.4bpp.lz"); -static const u32 sPkmnJumpBgTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_bg.bin.lz"); - -static const u16 sPkmnJumpVenusaurPal[] = INCBIN_U16("graphics/link_games/pkmnjump_venusaur.gbapal"); -static const u32 sPkmnJumpVenusaurGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_venusaur.4bpp.lz"); -static const u32 sPkmnJumpVenusaurTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_venusaur.bin.lz"); - -static const u16 sPkmnJumpResultsPal[] = INCBIN_U16("graphics/link_games/pkmnjump_results.gbapal"); -static const u32 sPkmnJumpResultsGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_results.4bpp.lz"); -static const u32 sPkmnJumpResultsTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_results.bin.lz"); - -static const struct BgTemplate gUnknown_846D8D4[] = -{ - { - .bg = 0, - .charBaseIndex = 0, - .mapBaseIndex = 27, - .screenSize = 0, - .paletteMode = 0, - .priority = 0, - .baseTile = 0 - }, - { - .bg = 2, - .charBaseIndex = 1, - .mapBaseIndex = 30, - .screenSize = 2, - .paletteMode = 0, - .priority = 2, - .baseTile = 0 - }, - { - .bg = 1, - .charBaseIndex = 2, - .mapBaseIndex = 12, - .screenSize = 3, - .paletteMode = 0, - .priority = 1, - .baseTile = 0 - }, - { - .bg = 3, - .charBaseIndex = 3, - .mapBaseIndex = 29, - .screenSize = 0, - .paletteMode = 0, - .priority = 3, - .baseTile = 0 - }, -}; - -static const struct WindowTemplate gUnknown_846D8E4[] = -{ - { - .bg = 0, - .tilemapLeft = 19, - .tilemapTop = 0, - .width = 6, - .height = 2, - .paletteNum = 2, - .baseBlock = 0x13, - }, - { - .bg = 0, - .tilemapLeft = 8, - .tilemapTop = 0, - .width = 6, - .height = 2, - .paletteNum = 2, - .baseBlock = 0x1F, - }, - DUMMY_WIN_TEMPLATE, -}; - -struct -{ - int id; - void (*func)(void); -} static const gUnknown_846D8FC[] = -{ - {0x00, sub_8149DC8}, - {0x01, sub_8149F64}, - {0x02, sub_8149FD0}, - {0x03, sub_814A03C}, - {0x04, sub_814A0C8}, - {0x05, sub_814A174}, - {0x06, sub_814A218}, - {0x07, sub_814A264}, - {0x09, sub_814A3AC}, - {0x08, sub_814A308}, -}; - -void sub_8149D40(int arg0) -{ - int i; - - for (i = 0; i < NELEMS(gUnknown_846D8FC); i++) - { - if (gUnknown_846D8FC[i].id == arg0) - sub_8149D80(gUnknown_846D8FC[i].func); - } -} - -bool32 sub_8149D68(void) -{ - return (gUnknown_203F3D8->unk0 != 1); -} - -static void sub_8149D80(void (*func)(void)) -{ - SetWordTaskArg(gUnknown_203F3D8->unk6, 0, (uintptr_t)func); - gUnknown_203F3D8->unk4 = 0; - gUnknown_203F3D8->unk0 = 0; -} - -static void sub_8149DA4(u8 taskId) -{ - if (!gUnknown_203F3D8->unk0) - { - void (*func)(void) = (void *)(GetWordTaskArg(taskId, 0)); - - func(); - } -} - -static void sub_8149DC8(void) -{ - switch (gUnknown_203F3D8->unk4) - { - case 0: - ResetBgsAndClearDma3BusyFlags(FALSE); - InitBgsFromTemplates(0, gUnknown_846D8D4, NELEMS(gUnknown_846D8D4)); - InitWindows(gUnknown_846D8E4); - ResetBgPositions(); - ResetTempTileDataBuffers(); - sub_814AD6C(gUnknown_203F3D8); - sub_814A9C8(); - LoadPalette(sPkmnJumpBgPal, 0, 0x20); - DecompressAndCopyTileDataToVram(3, sPkmnJumpBgGfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(3, sPkmnJumpBgTilemap, 0, 0, 1); - LoadPalette(sPkmnJumpVenusaurPal, 0x30, 0x20); - DecompressAndCopyTileDataToVram(2, sPkmnJumpVenusaurGfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(2, sPkmnJumpVenusaurTilemap, 0, 0, 1); - LoadPalette(sPkmnJumpResultsPal, 0x10, 0x20); - DecompressAndCopyTileDataToVram(1, sPkmnJumpResultsGfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(1, sPkmnJumpResultsTilemap, 0, 0, 1); - LoadPalette(sPkmnJumpPal3, 0x20, 0x20); - SetBgTilemapBuffer(0, gUnknown_203F3D8->tilemapBuffer); - FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); - sub_814A84C(); - sub_814AA24(0); - DrawWindowBorderWithStdpal3(0, 1, 0xE0); - LoadUserWindowBorderGfx(0, 0x00A, 0xD0); - CopyBgTilemapBufferToVram(0); - CopyBgTilemapBufferToVram(2); - CopyBgTilemapBufferToVram(1); - gUnknown_203F3D8->unk4++; - break; - case 1: - if (!FreeTempTileDataBuffersIfPossible()) - { - sub_814A8B8(); - sub_814B294(gUnknown_203F3D8); - sub_814B348(gUnknown_203F3D8, 6); - ShowBg(3); - ShowBg(0); - ShowBg(2); - HideBg(1); - gUnknown_203F3D8->unk4++; - } - break; - case 2: - gUnknown_203F3D8->unk0 = 1; - break; - } -} - -static void sub_8149F64(void) -{ - switch (gUnknown_203F3D8->unk4) - { - case 0: - sub_814AADC(); - gUnknown_203F3D8->unk4++; - break; - case 1: - if (!IsDma3ManagerBusyWithBgCopy()) - { - sub_814AC30(FALSE); - gUnknown_203F3D8->unk4++; - } - break; - case 2: - if (!IsDma3ManagerBusyWithBgCopy()) - { - sub_814AC94(); - gUnknown_203F3D8->unk4++; - } - break; - case 3: - if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; - break; - } -} - -static void sub_8149FD0(void) -{ - switch (gUnknown_203F3D8->unk4) - { - case 0: - sub_814AADC(); - gUnknown_203F3D8->unk4++; - break; - case 1: - if (!IsDma3ManagerBusyWithBgCopy()) - { - sub_814AC30(TRUE); - gUnknown_203F3D8->unk4++; - } - break; - case 2: - if (!IsDma3ManagerBusyWithBgCopy()) - { - sub_814AC94(); - gUnknown_203F3D8->unk4++; - } - break; - case 3: - if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; - break; - } -} - -static void sub_814A03C(void) -{ - int i, numPlayers; - - numPlayers = sub_81499A4(); - switch (gUnknown_203F3D8->unk4) - { - case 0: - for (i = 0; i < numPlayers; i++) - ClearWindowTilemap(gUnknown_203F3D8->unk1C[i]); - - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; - break; - case 1: - if (!IsDma3ManagerBusyWithBgCopy()) - { - for (i = 0; i < numPlayers; i++) - RemoveWindow(gUnknown_203F3D8->unk1C[i]); - - gUnknown_203F3D8->unk0 = 1; - } - break; - } -} - -static void sub_814A0C8(void) -{ - switch (gUnknown_203F3D8->unk4) - { - case 0: - gUnknown_203F3D8->unk12 = sub_814A754(1, 8, 20, 2); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_WantToPlayAgain2, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk4++; - break; - case 1: - if (!IsDma3ManagerBusyWithBgCopy()) - { - PutWindowTilemap(gUnknown_203F3D8->unk12); - DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); - sub_814A7D0(23, 7, 0); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; - } - break; - case 2: - if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; - break; - } -} - -static void sub_814A174(void) -{ - switch (gUnknown_203F3D8->unk4) - { - case 0: - gUnknown_203F3D8->unk12 = sub_814A754(2, 7, 26, 4); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_SavingDontTurnOffPower, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk4++; - break; - case 1: - if (!IsDma3ManagerBusyWithBgCopy()) - { - PutWindowTilemap(gUnknown_203F3D8->unk12); - DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; - } - break; - case 2: - if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; - break; - } -} - -static void sub_814A218(void) -{ - switch (gUnknown_203F3D8->unk4) - { - case 0: - sub_814A6CC(); - DestroyYesNoMenu(); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; - break; - case 1: - if (!sub_814A6FC() && !IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; - break; - } -} - -static void sub_814A264(void) -{ - switch (gUnknown_203F3D8->unk4) - { - case 0: - gUnknown_203F3D8->unk12 = sub_814A754(2, 8, 22, 4); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_SomeoneDroppedOut2, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk4++; - break; - case 1: - if (!IsDma3ManagerBusyWithBgCopy()) - { - PutWindowTilemap(gUnknown_203F3D8->unk12); - DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; - } - break; - case 2: - if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; - break; - } -} - -static void sub_814A308(void) -{ - switch (gUnknown_203F3D8->unk4) - { - case 0: - gUnknown_203F3D8->unk12 = sub_814A754(7, 10, 16, 2); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_CommunicationStandby4, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk4++; - break; - case 1: - if (!IsDma3ManagerBusyWithBgCopy()) - { - PutWindowTilemap(gUnknown_203F3D8->unk12); - DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; - } - break; - case 2: - if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; - break; - } -} - -static void sub_814A3AC(void) -{ - switch (gUnknown_203F3D8->unk4) - { - case 0: - sub_814B43C(gUnknown_203F3D8); - gUnknown_203F3D8->unk4++; - break; - case 1: - if (!sub_814B460()) - gUnknown_203F3D8->unk0 = 1; - break; - } -} - -void sub_814A3E4(void) -{ - gUnknown_203F3D8->unkA = 0; - gUnknown_203F3D8->unkB = 0; - gUnknown_203F3D8->unkC = 6; - sub_814A95C(gUnknown_203F3D8->unkC); -} - -bool32 sub_814A408(void) -{ - switch (gUnknown_203F3D8->unkA) - { - case 0: - gUnknown_203F3D8->unkB++; - if (gUnknown_203F3D8->unkB > 10) - { - gUnknown_203F3D8->unkB = 0; - gUnknown_203F3D8->unkC++; - if (gUnknown_203F3D8->unkC >= 10) - { - gUnknown_203F3D8->unkC = 0; - gUnknown_203F3D8->unkA++; - } - } - sub_814A95C(gUnknown_203F3D8->unkC); - if (gUnknown_203F3D8->unkC != 7) - break; - case 1: - return FALSE; - } - - return TRUE; -} - -static const u8 sPluralTxt[] = _("IES"); - -void sub_814A468(u16 itemId, u16 quantity) -{ - CopyItemName(itemId, gUnknown_203F3D8->txtBuff[0]); - ConvertIntToDecimalStringN(gUnknown_203F3D8->txtBuff[1], quantity, STR_CONV_MODE_LEFT_ALIGN, 1); - if (itemId >= FIRST_BERRY_INDEX && itemId < LAST_BERRY_INDEX) - { - if (quantity > 1) - { - int endi = StringLength(gUnknown_203F3D8->txtBuff[0]); - if (endi != 0) - { - endi--; - endi[gUnknown_203F3D8->txtBuff[0]] = EOS; - StringAppend(gUnknown_203F3D8->txtBuff[0], sPluralTxt); - } - } - } - DynamicPlaceholderTextUtil_Reset(); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_203F3D8->txtBuff[0]); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gUnknown_203F3D8->txtBuff[1]); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_AwesomeWonF701F700); - gUnknown_203F3D8->unk12 = sub_814A754(4, 8, 22, 4); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk14 = MUS_LEVEL_UP; - gUnknown_203F3D8->unkD = 0; -} - -void sub_814A53C(u16 itemId) -{ - CopyItemName(itemId, gUnknown_203F3D8->txtBuff[0]); - DynamicPlaceholderTextUtil_Reset(); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_203F3D8->txtBuff[0]); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_FilledStorageSpace2); - gUnknown_203F3D8->unk12 = sub_814A754(4, 8, 22, 4); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk14 = 0; - gUnknown_203F3D8->unkD = 0; -} - -void sub_814A5B4(u16 itemId) -{ - CopyItemName(itemId, gUnknown_203F3D8->txtBuff[0]); - DynamicPlaceholderTextUtil_Reset(); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_203F3D8->txtBuff[0]); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_CantHoldMore); - gUnknown_203F3D8->unk12 = sub_814A754(4, 9, 22, 2); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk14 = 0; - gUnknown_203F3D8->unkD = 0; -} - -bool32 sub_814A62C(void) -{ - switch (gUnknown_203F3D8->unkD) - { - case 0: - if (!IsDma3ManagerBusyWithBgCopy()) - { - PutWindowTilemap(gUnknown_203F3D8->unk12); - DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unkD++; - } - break; - case 1: - if (IsDma3ManagerBusyWithBgCopy()) - break; - if (gUnknown_203F3D8->unk14 == 0) - { - gUnknown_203F3D8->unkD += 2; - return FALSE; - } - PlayFanfare(gUnknown_203F3D8->unk14); - gUnknown_203F3D8->unkD++; - case 2: - if (!IsFanfareTaskInactive()) - break; - gUnknown_203F3D8->unkD++; - case 3: - return FALSE; - } - - return TRUE; -} - -void sub_814A6CC(void) -{ - if (gUnknown_203F3D8->unk12 != 0xFF) - { - rbox_fill_rectangle(gUnknown_203F3D8->unk12); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_MAP); - gUnknown_203F3D8->unkD = 0; - } -} - -// Can't match this without the ugly GOTO, oh well. -bool32 sub_814A6FC(void) -{ - if (gUnknown_203F3D8->unk12 == 0xFF) - { - RET_FALSE: - return FALSE; - } - - if (gUnknown_203F3D8->unkD == 0) - { - if (!IsDma3ManagerBusyWithBgCopy()) - { - RemoveWindow(gUnknown_203F3D8->unk12); - gUnknown_203F3D8->unk12 = 0xFF; - gUnknown_203F3D8->unkD++; - goto RET_FALSE; - } - } - else if (gUnknown_203F3D8->unkD == 1) - goto RET_FALSE; - - return TRUE; -} - -s8 sub_814A744(void) -{ - return Menu_ProcessInputNoWrapClearOnChoose(); -} - -static u32 sub_814A754(u32 left, u32 top, u32 width, u32 height) -{ - u32 windowId; - struct WindowTemplate window; - - window.bg = 0; - window.tilemapLeft = left; - window.tilemapTop = top; - window.width = width; - window.height = height; - window.paletteNum = 0xF; - window.baseBlock = 0x43; - - windowId = AddWindow(&window); - FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - return windowId; -} - -static void sub_814A7D0(u16 left, u16 top, u8 cursorPos) -{ - struct WindowTemplate window; - u8 a = cursorPos; - - window.bg = 0; - window.tilemapLeft = left; - window.tilemapTop = top; - window.width = 6; - window.height = 4; - window.paletteNum = 2; - window.baseBlock = 0x2B; - - CreateYesNoMenu(&window, 2, 0, 2, 0x00a, 0xD, a); -} - -static void sub_814A84C(void) -{ - u8 color[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY}; - - PutWindowTilemap(0); - PutWindowTilemap(1); - FillWindowPixelBuffer(0, PIXEL_FILL(0)); - FillWindowPixelBuffer(1, PIXEL_FILL(0)); - AddTextPrinterParameterized3(0, 0, 0, 2, color, 0, gText_SpacePoints2); - AddTextPrinterParameterized3(1, 0, 0, 2, color, 0, gText_SpaceTimes3); -} - -static const u8 gUnknown_846D953[] = {2, 2, 0, 0, 1, 1, 1, 0, 0, 2, 0, 0, 0}; - -static const struct CompressedSpriteSheet gUnknown_846D960 = {gUnknown_8479688, 0, 0x320}; -static const struct SpritePalette gUnknown_846D968 = {gUnknown_8479668, 0x320}; - -static const u16 gUnknown_846D970[] = {0x06, 0x08, 0x10, 0x08}; -static const u16 gUnknown_846D978[] = {0x06, 0x08, 0x0b, 0x06, 0x10, 0x08}; -static const u16 gUnknown_846D984[] = {0x02, 0x06, 0x06, 0x08, 0x10, 0x08, 0x14, 0x06}; -static const u16 gUnknown_846D994[] = {0x02, 0x06, 0x06, 0x08, 0x0b, 0x06, 0x10, 0x08, 0x14, 0x06}; - -static const u16 *const gUnknown_846D9A8[] = -{ - gUnknown_846D970, - gUnknown_846D978, - gUnknown_846D984, - gUnknown_846D994, -}; - -static const s16 gUnknown_846D9B8[] = {0x0058, 0x0098}; -static const s16 gUnknown_846D9BC[] = {0x0058, 0x0078, 0x0098}; -static const s16 gUnknown_846D9C2[] = {0x0038, 0x0058, 0x0098, 0x00b8}; -static const s16 gUnknown_846D9CA[] = {0x0038, 0x0058, 0x0078, 0x0098, 0x00b8}; - -static const s16 *const gUnknown_846D9D4[] = -{ - gUnknown_846D9B8, - gUnknown_846D9BC, - gUnknown_846D9C2, - gUnknown_846D9CA, -}; - -static void sub_814A8B8(void) -{ - int i, y, playersCount = sub_81499A4(); - const s16 *xCoords = gUnknown_846D9D4[playersCount - 2]; - - for (i = 0; i < playersCount; i++) - { - struct PokemonJump1_MonInfo *info = sub_81499C0(i); - - y = gMonFrontPicCoords[info->species].y_offset; - sub_814ADCC(gUnknown_203F3D8, info, *xCoords, y + 112, i); - sub_814B240(gUnknown_203F3D8, *xCoords, 112, i); - xCoords++; - } -} - -void sub_814A940(u32 id, s16 y) -{ - gUnknown_203F3D8->unk81A8[id]->y2 = y; -} - -void sub_814A95C(int id) -{ - sub_814B348(gUnknown_203F3D8, id); - ChangeBgY(2, (gUnknown_846D953[id] * 5) << 0xD, 0); -} - -int sub_814A98C(u8 flags) -{ - int i, count; - - for (i = 0, count = 0; i < 5; i++) - { - if (flags & 1) - { - sub_814AF0C(gUnknown_203F3D8, i); - count++; - } - flags >>= 1; - } - - sub_814ACCC(count - 2); - return count; -} - -static void sub_814A9C8(void) -{ - struct DigitObjUtilTemplate unkStruct; - struct DigitObjUtilTemplate *ptr = &unkStruct; // This temp variable is needed to match, don't ask me why. - - ptr->shape = SPRITE_SHAPE(8x8); - ptr->size = SPRITE_SIZE(8x8); - ptr->strConvMode = 0; - ptr->priority = 1; - ptr->oamCount = 5; - ptr->xDelta = 8; - ptr->x = 108; - ptr->y = 6; - ptr->spriteSheet.compressed = &gUnknown_846D960; - ptr->spritePal = &gUnknown_846D968; - - DigitObjUtil_Init(2); - DigitObjUtil_CreatePrinter(0, 0, ptr); - - unkStruct.oamCount = 4; - unkStruct.x = 30; - unkStruct.y = 6; - DigitObjUtil_CreatePrinter(1, 0, &unkStruct); -} - -void sub_814AA24(int arg0) -{ - DigitObjUtil_PrintNumOn(0, arg0); -} - -void sub_814AA34(u16 arg0) -{ - DigitObjUtil_PrintNumOn(1, arg0); -} - -void sub_814AA48(u8 multiplayerId) -{ - sub_814AFE8(gUnknown_203F3D8, multiplayerId); -} - -void sub_814AA60(u8 multiplayerId) -{ - sub_814B080(gUnknown_203F3D8, multiplayerId); -} - -int sub_814AA78(int multiplayerId) -{ - return sub_814B010(gUnknown_203F3D8, multiplayerId); -} - -void sub_814AA8C(void) -{ - sub_814B0A8(gUnknown_203F3D8); -} - -void sub_814AAA0(void) -{ - sub_814B134(gUnknown_203F3D8); -} - -void sub_814AAB4(int multiplayerId) -{ - sub_814B168(gUnknown_203F3D8, multiplayerId); -} - -int sub_814AAC8(void) -{ - return sub_814B190(gUnknown_203F3D8); -} - -static void sub_814AADC(void) -{ - struct WindowTemplate window; - int i, playersCount = sub_81499A4(); - const u16 *winCoords = gUnknown_846D9A8[playersCount - 2]; - - window.bg = 0; - window.width = 8; - window.height = 2; - window.paletteNum = 2; - window.baseBlock = 0x2B; - - for (i = 0; i < playersCount; i++) - { - window.tilemapLeft = winCoords[0]; - window.tilemapTop = winCoords[1]; - gUnknown_203F3D8->unk1C[i] = AddWindow(&window); - ClearWindowTilemap(gUnknown_203F3D8->unk1C[i]); - window.baseBlock += 0x10; - winCoords += 2; - } - - CopyBgTilemapBufferToVram(0); -} - -static void sub_814AB98(int multiplayerId, u8 clr1, u8 clr2, u8 clr3) -{ - u32 x; - u8 colors[3] = {clr1, clr2, clr3}; - - FillWindowPixelBuffer(gUnknown_203F3D8->unk1C[multiplayerId], PIXEL_FILL(0)); - x = 64 - GetStringWidth(0, sub_81499E0(multiplayerId), -1); - x /= 2; - AddTextPrinterParameterized3(gUnknown_203F3D8->unk1C[multiplayerId], 0, x, 2, colors, -1, sub_81499E0(multiplayerId)); - CopyWindowToVram(gUnknown_203F3D8->unk1C[multiplayerId], COPYWIN_GFX); -} - -static void sub_814AC30(bool32 arg0) -{ - int i, var, playersCount = sub_81499A4(); - - if (!arg0) - { - for (i = 0; i < playersCount; i++) - sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); - } - else - { - var = sub_81499B4(); - for (i = 0; i < playersCount; i++) - { - if (var != i) - sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); - else - sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED); - } - } -} - -static void sub_814AC94(void) -{ - int i, playersCount = sub_81499A4(); - - for (i = 0; i < playersCount; i++) - PutWindowTilemap(gUnknown_203F3D8->unk1C[i]); - CopyBgTilemapBufferToVram(0); -} - -static void sub_814ACCC(u8 arg0) -{ - gUnknown_203F3D8->unk18 = 0; - ChangeBgX(1, (arg0 / 2) << 16, 0); - ChangeBgY(1, (((arg0 % 2) << 8) - 40) << 8, 0); - ShowBg(1); - CreateTask(sub_814AD50, 4); -} - -static bool32 sub_814AD18(void) -{ - if (gUnknown_203F3D8->unk18 >= 32) - { - return FALSE; - } - else - { - ChangeBgY(1, 128, 1); - if (++gUnknown_203F3D8->unk18 >= 32) - HideBg(1); - return TRUE; - } -} - -static void sub_814AD50(u8 taskId) -{ - if (!sub_814AD18()) - DestroyTask(taskId); -} diff --git a/src/pokemon_jump_5.c b/src/pokemon_jump_5.c deleted file mode 100644 index 80e8abd81..000000000 --- a/src/pokemon_jump_5.c +++ /dev/null @@ -1,637 +0,0 @@ -#include "global.h" -#include "gflib.h" -#include "decompress.h" -#include "minigame_countdown.h" -#include "pokemon_jump.h" -#include "data.h" -#include "trig.h" -#include "constants/songs.h" - -static void sub_814AF74(struct Sprite *sprite); -static void sub_814B038(struct Sprite *sprite); -static void sub_814B100(struct Sprite *sprite); -static void sub_814B1CC(struct Sprite *sprite); - -static const u16 sPkmnJumpPal1[] = INCBIN_U16("graphics/link_games/pkmnjump_pal1.gbapal"); -static const u16 sPkmnJumpPal2[] = INCBIN_U16("graphics/link_games/pkmnjump_pal2.gbapal"); - -static const u32 sPkmnJumpRopeGfx1[] = INCBIN_U32("graphics/link_games/pkmnjump_rope1.4bpp.lz"); -static const u32 sPkmnJumpRopeGfx2[] = INCBIN_U32("graphics/link_games/pkmnjump_rope2.4bpp.lz"); -static const u32 sPkmnJumpRopeGfx3[] = INCBIN_U32("graphics/link_games/pkmnjump_rope3.4bpp.lz"); -static const u32 sPkmnJumpRopeGfx4[] = INCBIN_U32("graphics/link_games/pkmnjump_rope4.4bpp.lz"); - -static const u32 sPkmnJumpStarGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_star.4bpp.lz"); - -static const struct CompressedSpriteSheet gUnknown_846E0B0[] = -{ - {sPkmnJumpRopeGfx1, 0x600, 5}, - {sPkmnJumpRopeGfx2, 0x0c00, 6}, - {sPkmnJumpRopeGfx3, 0x0600, 7}, - {sPkmnJumpRopeGfx4, 0x0600, 8}, - {sPkmnJumpStarGfx, 0x0200, 10}, -}; - -static const struct SpritePalette gUnknown_846E0D8[] = -{ - {sPkmnJumpPal1, 5}, - {sPkmnJumpPal2, 6}, -}; - -// Forward declarations. -static const struct OamData sOamData_846E170; -static const struct SpriteTemplate gUnknown_846E220; -static const struct SpriteTemplate gUnknown_846E238; -static const struct SpriteTemplate gUnknown_846E250; -static const struct SpriteTemplate gUnknown_846E268; - -static const struct SpriteTemplate gUnknown_846E0E8 = -{ - .tileTag = 0, - .paletteTag = 0, - .oam = &sOamData_846E170, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCallbackDummy, -}; - -static const s16 gUnknown_846E100[][10] = -{ - {0x60, 0x60, 0x60, 0x72, 0x78, 0x78, 0x78, 0x72, 0x60, 0x60}, - {0x46, 0x50, 0x60, 0x72, 0x78, 0x80, 0x78, 0x72, 0x60, 0x50}, - {0x32, 0x48, 0x60, 0x72, 0x80, 0x88, 0x80, 0x72, 0x60, 0x48}, - {0x2a, 0x48, 0x60, 0x72, 0x80, 0x88, 0x80, 0x72, 0x60, 0x48}, -}; - -static const s16 gUnknown_846E150[] = {0x10, 0x28, 0x48, 0x68, 0x88, 0xa8, 0xc8, 0xe0}; - -static const struct SpriteTemplate *const gUnknown_846E160[] = -{ - &gUnknown_846E220, - &gUnknown_846E238, - &gUnknown_846E250, - &gUnknown_846E268, -}; - -static const struct OamData sOamData_846E170 = -{ - .y = 0, - .affineMode = ST_OAM_AFFINE_OFF, - .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, - .bpp = ST_OAM_4BPP, - .shape = SPRITE_SHAPE(64x64), - .x = 0, - .matrixNum = 0, - .size = SPRITE_SIZE(64x64), - .tileNum = 0, - .priority = 2, - .paletteNum = 0, - .affineParam = 0 -}; - -static const struct OamData sOamData_846E178 = -{ - .y = 0, - .affineMode = ST_OAM_AFFINE_OFF, - .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, - .bpp = ST_OAM_4BPP, - .shape = SPRITE_SHAPE(16x32), - .x = 0, - .matrixNum = 0, - .size = SPRITE_SIZE(16x32), - .tileNum = 0, - .priority = 2, - .paletteNum = 0, - .affineParam = 0 -}; - -static const struct OamData sOamData_846E180 = -{ - .y = 0, - .affineMode = ST_OAM_AFFINE_OFF, - .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, - .bpp = ST_OAM_4BPP, - .shape = SPRITE_SHAPE(32x32), - .x = 0, - .matrixNum = 0, - .size = SPRITE_SIZE(32x32), - .tileNum = 0, - .priority = 2, - .paletteNum = 0, - .affineParam = 0 -}; - -static const struct OamData sOamData_846E188 = -{ - .y = 0, - .affineMode = ST_OAM_AFFINE_OFF, - .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, - .bpp = ST_OAM_4BPP, - .shape = SPRITE_SHAPE(32x16), - .x = 0, - .matrixNum = 0, - .size = SPRITE_SIZE(32x16), - .tileNum = 0, - .priority = 2, - .paletteNum = 0, - .affineParam = 0 -}; - -static const union AnimCmd sSpriteAnim_846E190[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E198[] = -{ - ANIMCMD_FRAME(8, 1), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E1A0[] = -{ - ANIMCMD_FRAME(16, 1), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E1A8[] = -{ - ANIMCMD_FRAME(24, 1), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E1B0[] = -{ - ANIMCMD_FRAME(32, 1), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E1B8[] = -{ - ANIMCMD_FRAME(40, 1), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E1C0[] = -{ - ANIMCMD_FRAME(0, 1), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E1C8[] = -{ - ANIMCMD_FRAME(16, 1), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E1D0[] = -{ - ANIMCMD_FRAME(32, 1), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E1D8[] = -{ - ANIMCMD_FRAME(48, 1), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E1E0[] = -{ - ANIMCMD_FRAME(64, 1), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E1E8[] = -{ - ANIMCMD_FRAME(80, 1), - ANIMCMD_END -}; - -static const union AnimCmd *const sSpriteAnimTable_846E1F0[] = -{ - sSpriteAnim_846E190, - sSpriteAnim_846E198, - sSpriteAnim_846E1A0, - sSpriteAnim_846E1A8, - sSpriteAnim_846E1B0, - sSpriteAnim_846E1B8 -}; - -static const union AnimCmd *const sSpriteAnimTable_846E208[] = -{ - sSpriteAnim_846E1C0, - sSpriteAnim_846E1C8, - sSpriteAnim_846E1D0, - sSpriteAnim_846E1D8, - sSpriteAnim_846E1E0, - sSpriteAnim_846E1E8 -}; - -static const struct SpriteTemplate gUnknown_846E220 = -{ - .tileTag = 5, - .paletteTag = 5, - .oam = &sOamData_846E178, - .anims = sSpriteAnimTable_846E1F0, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCallbackDummy, -}; - -static const struct SpriteTemplate gUnknown_846E238 = -{ - .tileTag = 6, - .paletteTag = 5, - .oam = &sOamData_846E180, - .anims = sSpriteAnimTable_846E208, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCallbackDummy, -}; - -static const struct SpriteTemplate gUnknown_846E250 = -{ - .tileTag = 7, - .paletteTag = 5, - .oam = &sOamData_846E188, - .anims = sSpriteAnimTable_846E1F0, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCallbackDummy, -}; - -static const struct SpriteTemplate gUnknown_846E268 = -{ - .tileTag = 8, - .paletteTag = 5, - .oam = &sOamData_846E188, - .anims = sSpriteAnimTable_846E1F0, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCallbackDummy, -}; - -static const struct OamData sOamData_846E280 = -{ - .y = 0, - .affineMode = ST_OAM_AFFINE_OFF, - .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, - .bpp = ST_OAM_4BPP, - .shape = SPRITE_SHAPE(16x16), - .x = 0, - .matrixNum = 0, - .size = SPRITE_SIZE(16x16), - .tileNum = 0, - .priority = 1, - .paletteNum = 0, - .affineParam = 0 -}; - -static const union AnimCmd sSpriteAnim_846E288[] = -{ - ANIMCMD_FRAME(0, 0), - ANIMCMD_END -}; - -static const union AnimCmd sSpriteAnim_846E290[] = -{ - ANIMCMD_FRAME(0, 4), - ANIMCMD_FRAME(4, 4), - ANIMCMD_FRAME(8, 4), - ANIMCMD_FRAME(12, 4), - ANIMCMD_LOOP(1), - ANIMCMD_FRAME(0, 4), - ANIMCMD_END -}; - -static const union AnimCmd *const sSpriteAnimTable_846E2AC[] = -{ - sSpriteAnim_846E288, - sSpriteAnim_846E290 -}; - -static const struct SpriteTemplate gUnknown_846E2B4 = -{ - .tileTag = 10, - .paletteTag = 5, - .oam = &sOamData_846E280, - .anims = sSpriteAnimTable_846E2AC, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCallbackDummy, -}; - -void sub_814AD6C(struct PokemonJump2 *arg0) -{ - int i; - - for (i = 0; i < NELEMS(gUnknown_846E0B0); i++) - LoadCompressedSpriteSheet(&gUnknown_846E0B0[i]); - - for (i = 0; i < NELEMS(gUnknown_846E0D8); i++) - LoadSpritePalette(&gUnknown_846E0D8[i]); - - arg0->unkE = IndexOfSpritePaletteTag(5); - arg0->unkF = IndexOfSpritePaletteTag(6); -} - -static void sub_814ADB4(struct Sprite *sprite) -{ - int i; - for (i = 0; i < 8; i++) - sprite->data[i] = 0; -} - -void sub_814ADCC(struct PokemonJump2 *arg0, struct PokemonJump1_MonInfo *jumpMon, s16 x, s16 y, u8 multiplayerId) -{ - struct SpriteTemplate spriteTemplate; - struct SpriteSheet spriteSheet; - struct CompressedSpritePalette spritePalette; - u8 *buffer; - u8 *unusedBuffer; - u8 subpriority; - u8 spriteId; - - spriteTemplate = gUnknown_846E0E8; - buffer = Alloc(0x2000); - unusedBuffer = Alloc(0x800); - if (multiplayerId == sub_81499B4()) - subpriority = 3; - else - subpriority = multiplayerId + 4; - - if (buffer && unusedBuffer) - { - HandleLoadSpecialPokePic( - &gMonFrontPicTable[jumpMon->species], - buffer, - jumpMon->species, - jumpMon->personality); - - spriteSheet.data = buffer; - spriteSheet.tag = multiplayerId; - spriteSheet.size = 0x800; - LoadSpriteSheet(&spriteSheet); - - spritePalette.data = GetMonSpritePalFromSpeciesAndPersonality(jumpMon->species, jumpMon->otId, jumpMon->personality); - spritePalette.tag = multiplayerId; - LoadCompressedSpritePalette(&spritePalette); - - Free(buffer); - Free(unusedBuffer); - - spriteTemplate.tileTag += multiplayerId; - spriteTemplate.paletteTag += multiplayerId; - spriteId = CreateSprite(&spriteTemplate, x, y, subpriority); - if (spriteId != MAX_SPRITES) - { - arg0->unk81A8[multiplayerId] = &gSprites[spriteId]; - arg0->unk81FC[multiplayerId] = subpriority; - return; - } - } - - arg0->unk81A8[multiplayerId] = NULL; -} - -void sub_814AF0C(struct PokemonJump2 *arg0, int multiplayerId) -{ - sub_814ADB4(arg0->unk81BC[multiplayerId]); - arg0->unk81BC[multiplayerId]->data[7] = arg0->unk81A8[multiplayerId] - gSprites; - arg0->unk81BC[multiplayerId]->invisible = FALSE; - arg0->unk81BC[multiplayerId]->y = 96; - arg0->unk81BC[multiplayerId]->callback = sub_814AF74; - StartSpriteAnim(arg0->unk81BC[multiplayerId], 1); -} - -static void sub_814AF74(struct Sprite *sprite) -{ - switch (sprite->data[0]) - { - case 0: - if (sprite->animEnded) - { - sprite->invisible = TRUE; - sprite->callback = SpriteCallbackDummy; - } - break; - case 1: - sprite->y--; - sprite->data[1]++; - if (sprite->y <= 72) - { - sprite->y = 72; - sprite->data[0]++; - } - break; - case 2: - if (++sprite->data[1] >= 48) - { - sprite->invisible = TRUE; - sprite->callback = SpriteCallbackDummy; - } - break; - } -} - -void sub_814AFE8(struct PokemonJump2 *arg0, int multiplayerId) -{ - arg0->unk81A8[multiplayerId]->callback = sub_814B038; - arg0->unk81A8[multiplayerId]->y2 = 0; - sub_814ADB4(arg0->unk81A8[multiplayerId]); -} - -bool32 sub_814B010(struct PokemonJump2 *arg0, int multiplayerId) -{ - return arg0->unk81A8[multiplayerId]->callback == sub_814B038; -} - -static void sub_814B038(struct Sprite *sprite) -{ - if (++sprite->data[1] > 1) - { - if (++sprite->data[2] & 1) - sprite->y2 = 2; - else - sprite->y2 = -2; - - sprite->data[1] = 0; - } - - if (sprite->data[2] > 12) - { - sprite->y2 = 0; - sprite->callback = SpriteCallbackDummy; - } -} - -void sub_814B080(struct PokemonJump2 *arg0, int multiplayerId) -{ - sub_814ADB4(arg0->unk81A8[multiplayerId]); - arg0->unk81A8[multiplayerId]->callback = sub_814B100; -} - -void sub_814B0A8(struct PokemonJump2 *arg0) -{ - int i; - u16 numPlayers = sub_81499A4(); - for (i = 0; i < numPlayers; i++) - { - if (arg0->unk81A8[i]->callback == sub_814B100) - { - arg0->unk81A8[i]->invisible = FALSE; - arg0->unk81A8[i]->callback = SpriteCallbackDummy; - arg0->unk81A8[i]->subpriority = 10; - } - } -} - -static void sub_814B100(struct Sprite *sprite) -{ - if (++sprite->data[0] > 3) - { - sprite->data[0] = 0; - sprite->invisible ^= 1; - } -} - -void sub_814B134(struct PokemonJump2 *arg0) -{ - int i; - u16 numPlayers = sub_81499A4(); - for (i = 0; i < numPlayers; i++) - arg0->unk81A8[i]->subpriority = arg0->unk81FC[i]; -} - -void sub_814B168(struct PokemonJump2 *arg0, int multiplayerId) -{ - sub_814ADB4(arg0->unk81A8[multiplayerId]); - arg0->unk81A8[multiplayerId]->callback = sub_814B1CC; -} - -bool32 sub_814B190(struct PokemonJump2 *arg0) -{ - int i; - u16 numPlayers = sub_81499A4(); - for (i = 0; i < numPlayers; i++) - { - if (arg0->unk81A8[i]->callback == sub_814B1CC) - return TRUE; - } - - return FALSE; -} - -static void sub_814B1CC(struct Sprite *sprite) -{ - switch (sprite->data[0]) - { - case 0: - PlaySE(SE_BIKE_HOP); - sprite->data[1] = 0; - sprite->data[0]++; - // fall through - case 1: - sprite->data[1] += 4; - if (sprite->data[1] > 0x7F) - sprite->data[1] = 0; - - sprite->y2 = -(gSineTable[sprite->data[1]] >> 3); - if (sprite->data[1] == 0) - { - if (++sprite->data[2] < 2) - sprite->data[0] = 0; - else - sprite->callback = SpriteCallbackDummy; - } - break; - } -} - -void sub_814B240(struct PokemonJump2 *arg0, s16 x, s16 y, u8 multiplayerId) -{ - u8 spriteId = CreateSprite(&gUnknown_846E2B4, x, y, 1); - if (spriteId != MAX_SPRITES) - { - gSprites[spriteId].invisible = TRUE; - arg0->unk81BC[multiplayerId] = &gSprites[spriteId]; - } -} - -void sub_814B294(struct PokemonJump2 *arg0) -{ - int i; - int count; - u8 spriteId; - - count = 0; - for (i = 0; i < 4; i++) - { - spriteId = CreateSprite(gUnknown_846E160[i], gUnknown_846E150[count], gUnknown_846E100[i][0], 2); - arg0->unk81D0[count] = &gSprites[spriteId]; - count++; - } - - for (i = 3; i >= 0; i--) - { - spriteId = CreateSprite(gUnknown_846E160[i], gUnknown_846E150[count], gUnknown_846E100[i][0], 2); - arg0->unk81D0[count] = &gSprites[spriteId]; - arg0->unk81D0[count]->hFlip = 1; - count++; - } -} - -void sub_814B348(struct PokemonJump2 *arg0, int arg1) -{ - int i, count, palNum; - int priority; - - if (arg1 > 5) - { - arg1 = 10 - arg1; - priority = 3; - palNum = arg0->unkF; - } - else - { - priority = 2; - palNum = arg0->unkE; - } - - count = 0; - for (i = 0; i < 4; i++) - { - arg0->unk81D0[count]->y = gUnknown_846E100[i][arg1]; - arg0->unk81D0[count]->oam.priority = priority; - arg0->unk81D0[count]->oam.paletteNum = palNum; - StartSpriteAnim(arg0->unk81D0[count], arg1); - count++; - } - - for (i = 3; i >= 0; i--) - { - arg0->unk81D0[count]->y = gUnknown_846E100[i][arg1]; - arg0->unk81D0[count]->oam.priority = priority; - arg0->unk81D0[count]->oam.paletteNum = palNum; - StartSpriteAnim(arg0->unk81D0[count], arg1); - count++; - } -} - -void sub_814B43C(struct PokemonJump2 *arg0) -{ - StartMinigameCountdown(9, 7, 120, 80, 0); - sub_814B134(arg0); -} - -bool32 sub_814B460(void) -{ - return IsMinigameCountdownRunning(); -} diff --git a/src/pokemon_jump_6.c b/src/pokemon_jump_6.c deleted file mode 100644 index 1266a0f75..000000000 --- a/src/pokemon_jump_6.c +++ /dev/null @@ -1,140 +0,0 @@ -#include "global.h" -#include "gflib.h" -#include "menu.h" -#include "script.h" -#include "strings.h" -#include "task.h" -#include "text_window.h" - -static void Task_ShowPokemonJumpRecords(u8 taskId); -static void TruncateToFirstWordOnly(u8 *str); -static void sub_814B5C4(u16 windowId); - -static struct PokemonJumpRecords *sub_814B46C(void) -{ - return &gSaveBlock2Ptr->pokeJump; -} - -void ResetPokeJumpResults(void) -{ - struct PokemonJumpRecords *pokeJump = sub_814B46C(); - pokeJump->jumpsInRow = 0; - pokeJump->bestJumpScore = 0; - pokeJump->excellentsInRow = 0; - pokeJump->gamesWithMaxPlayers = 0; - pokeJump->unused2 = 0; - pokeJump->unused1 = 0; -} - -bool32 sub_814B494(u32 jumpScore, u16 jumpsInRow, u16 excellentsInRow) -{ - struct PokemonJumpRecords *pokeJump = sub_814B46C(); - bool32 ret = FALSE; - - if (pokeJump->bestJumpScore < jumpScore && jumpScore <= 99990) - pokeJump->bestJumpScore = jumpScore, ret = TRUE; - if (pokeJump->jumpsInRow < jumpsInRow && jumpsInRow <= 9999) - pokeJump->jumpsInRow = jumpsInRow, ret = TRUE; - if (pokeJump->excellentsInRow < excellentsInRow && excellentsInRow <= 9999) - pokeJump->excellentsInRow = excellentsInRow, ret = TRUE; - - return ret; -} - -void sub_814B4E8(void) -{ - struct PokemonJumpRecords *pokeJump = sub_814B46C(); - if (pokeJump->gamesWithMaxPlayers < 9999) - pokeJump->gamesWithMaxPlayers++; -} - -void ShowPokemonJumpRecords(void) -{ - u8 taskId = CreateTask(Task_ShowPokemonJumpRecords, 0); - Task_ShowPokemonJumpRecords(taskId); -} - -static const struct WindowTemplate gUnknown_846E2CC = -{ - .bg = 0, - .tilemapLeft = 1, - .tilemapTop = 1, - .width = 28, - .height = 9, - .paletteNum = 15, - .baseBlock = 0x1, -}; - -static const u8 *const gUnknown_846E2D4[] = {gText_JumpsInARow, gText_BestScore2, gText_ExcellentsInARow}; - -static void Task_ShowPokemonJumpRecords(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - switch (data[0]) - { - case 0: - data[1] = AddWindow(&gUnknown_846E2CC); - sub_814B5C4(data[1]); - CopyWindowToVram(data[1], COPYWIN_BOTH); - data[0]++; - break; - case 1: - if (!IsDma3ManagerBusyWithBgCopy()) - data[0]++; - break; - case 2: - if (JOY_NEW(A_BUTTON | B_BUTTON)) - { - rbox_fill_rectangle(data[1]); - CopyWindowToVram(data[1], COPYWIN_MAP); - data[0]++; - } - break; - case 3: - if (!IsDma3ManagerBusyWithBgCopy()) - { - RemoveWindow(data[1]); - DestroyTask(taskId); - EnableBothScriptContexts(); - } - break; - } -} - -static void sub_814B5C4(u16 windowId) -{ - int i, x; - int results[3]; - struct PokemonJumpRecords *pokeJump = sub_814B46C(); - u8 strbuf[8]; - results[0] = pokeJump->jumpsInRow; - results[1] = pokeJump->bestJumpScore; - results[2] = pokeJump->excellentsInRow; - - TextWindow_SetStdFrame0_WithPal(windowId, 0x21D, 0xD0); - DrawTextBorderOuter(windowId, 0x21D, 0xD); - FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - AddTextPrinterParameterized5(windowId, 2, gText_PkmnJumpRecords, 0, 0, TEXT_SPEED_FF, NULL, 1, 0); - for (i = 0; i < NELEMS(gUnknown_846E2D4); i++) - { - AddTextPrinterParameterized5(windowId, 2, gUnknown_846E2D4[i], 0, 20 + (i * 14), TEXT_SPEED_FF, NULL, 1, 0); - ConvertIntToDecimalStringN(strbuf, results[i], STR_CONV_MODE_LEFT_ALIGN, 5); - TruncateToFirstWordOnly(strbuf); - x = 0xDE - GetStringWidth(2, strbuf, 0); - AddTextPrinterParameterized5(windowId, 2, strbuf, x, 20 + (i * 14), TEXT_SPEED_FF, NULL, 0, 0); - } - PutWindowTilemap(windowId); -} - -static void TruncateToFirstWordOnly(u8 *str) -{ - for (;*str != EOS; str++) - { - if (*str == CHAR_SPACE) - { - *str = EOS; - break; - } - } -} diff --git a/sym_ewram.txt b/sym_ewram.txt index 4d6a6dd51..b426b2ddf 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -129,8 +129,7 @@ .include "src/mevent_show_card.o" .include "src/mevent_show_news.o" .include "src/seagallop.o" - .include "src/pokemon_jump_2.o" - .include "src/pokemon_jump_4.o" + .include "src/pokemon_jump.o" .include "src/berry_crush.o" .include "src/dodrio_berry_picking.o" .include "src/dodrio_berry_picking_2.o" From 16aacb064835c11204004d8e1115131ef718eeaf Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 1 Mar 2022 18:04:42 -0500 Subject: [PATCH 06/64] Sync pokemon jump documentation --- .../unk_846B008.png => link/321start.png} | Bin graphics/link_games/pkmnjump_bg.png | Bin 582 -> 0 bytes graphics/link_games/pkmnjump_results.png | Bin 2401 -> 0 bytes .../pkmnjump_bg.bin => pokemon_jump/bg.bin} | Bin .../pkmnjump_bg.pal => pokemon_jump/bg.pal} | 0 graphics/pokemon_jump/bg.png | Bin 0 -> 532 bytes .../bonuses.bin} | Bin .../bonuses.pal} | 0 graphics/pokemon_jump/bonuses.png | Bin 0 -> 2129 bytes .../interface.pal} | 0 .../pal1.pal} | 0 .../pal2.pal} | 0 .../star.png} | Bin .../venusaur.bin} | Bin .../venusaur.pal} | 0 .../venusaur.png} | Bin .../vine1.png} | Bin .../vine2.png} | Bin .../vine3.png} | Bin .../vine4.png} | Bin graphics_file_rules.mk | 4 +- include/bg.h | 7 + include/constants/pokemon.h | 4 + include/link.h | 1 + include/link_rfu.h | 2 + include/pokemon_jump.h | 2 +- include/random.h | 5 + include/task.h | 1 + include/window.h | 2 + src/new_game.c | 2 +- src/pokemon_jump.c | 4477 +++++++++-------- src/random.c | 3 +- 32 files changed, 2441 insertions(+), 2069 deletions(-) rename graphics/{misc/unk_846B008.png => link/321start.png} (100%) delete mode 100644 graphics/link_games/pkmnjump_bg.png delete mode 100644 graphics/link_games/pkmnjump_results.png rename graphics/{link_games/pkmnjump_bg.bin => pokemon_jump/bg.bin} (100%) rename graphics/{link_games/pkmnjump_bg.pal => pokemon_jump/bg.pal} (100%) create mode 100644 graphics/pokemon_jump/bg.png rename graphics/{link_games/pkmnjump_results.bin => pokemon_jump/bonuses.bin} (100%) rename graphics/{link_games/pkmnjump_results.pal => pokemon_jump/bonuses.pal} (100%) create mode 100644 graphics/pokemon_jump/bonuses.png rename graphics/{link_games/pkmnjump_pal3.pal => pokemon_jump/interface.pal} (100%) rename graphics/{link_games/pkmnjump_pal1.pal => pokemon_jump/pal1.pal} (100%) rename graphics/{link_games/pkmnjump_pal2.pal => pokemon_jump/pal2.pal} (100%) rename graphics/{link_games/pkmnjump_star.png => pokemon_jump/star.png} (100%) rename graphics/{link_games/pkmnjump_venusaur.bin => pokemon_jump/venusaur.bin} (100%) rename graphics/{link_games/pkmnjump_venusaur.pal => pokemon_jump/venusaur.pal} (100%) rename graphics/{link_games/pkmnjump_venusaur.png => pokemon_jump/venusaur.png} (100%) rename graphics/{link_games/pkmnjump_rope1.png => pokemon_jump/vine1.png} (100%) rename graphics/{link_games/pkmnjump_rope2.png => pokemon_jump/vine2.png} (100%) rename graphics/{link_games/pkmnjump_rope3.png => pokemon_jump/vine3.png} (100%) rename graphics/{link_games/pkmnjump_rope4.png => pokemon_jump/vine4.png} (100%) diff --git a/graphics/misc/unk_846B008.png b/graphics/link/321start.png similarity index 100% rename from graphics/misc/unk_846B008.png rename to graphics/link/321start.png diff --git a/graphics/link_games/pkmnjump_bg.png b/graphics/link_games/pkmnjump_bg.png deleted file mode 100644 index ceef49004d1e857d23eeb966b7e27f9877392364..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 582 zcmV-M0=fN(P)n zE6mtr{6cu#AUs4XryHjttPmbw5FTCg z{=YE5ZX(ETGXAD(9hq#fVTO#y4($kX8a9L-RX0F!c(L(f0L({h$@3LpgV>bfy>Q`~ z;Mn81ifQ3RxKwb_m53vC*f(*-bz!7T(FR(I+Nkzsz7L>8}>Z|v{?|Qtu2;)7i zYu~a;H<2_uQ@Taw#iNQg-ffJBp0L7$PwJ?Q-ZT|+B^6X9`{e>~udlQ*a23?W%Xa$g zejMdNz6ktz7ceildT%^8)Ym@8hTWh93irx^M=M)CkCdN-d>7UpxJdnz4XE*Nt$F__m0zf(?Ls1wLr&JvYqXpi*kKz*GWL@vWOLt&Yz72idon U#0>!viU0rr07*qoM6N<$f|8va9RL6T diff --git a/graphics/link_games/pkmnjump_results.png b/graphics/link_games/pkmnjump_results.png deleted file mode 100644 index b87d50659d4745ed21576eaacc46c5ef24a622fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2401 zcmV-n37+XzO@S{wF}3s)9JqNAt_PgxpzL?3@{HkBIod&^Bz&8l={CvH~9Yb6ZrQN8c)FO z(}V5%>*hw?-2V8Xem@q3*tQox-=XCh$=|@UcUP3w%_^Ap%&xz%;+UVTy+i zxa%;_w+`0@Ut81aI;~arT-HF-?4!Nze|FDWop)ISQQTh>;9TPr@exxTuZLmj`o@zxtB>;?qC^{KXY<{ZW>KrY+gF%rDHbsuxnkK;GTG2 z5S3|FyjF1zv|1COFAs1_Ks@51rJ!Gpw1Yf{0RdWM2cB~BlD_2V*j)=s>)Nh`<86Db zeR&R`puHXK4e}UJGT$f!Z85P)oygOQjHQWu$0&Ccv_(qV)`)U#AVN8{3@B(zX+;!~ zNAK`A0e%9NYnf{zGUd7EYz8H!Y?)%XW>Iyc@GazL-niDa_9R0H7K4HkjHczUGg9mcM4)?Fz&T?aWpZ~fZdv>QqPRYU zxGs1fm=?xPfJp`*2Vsb8gp-m$VuO>$wzOV`2)|f*87f!|OZF~KSbEeA_6U^4U}Y)e zSQY`XH1|22g!nXCi_xViny?=yEw~1I6S|hs7Z&w|<0kwE+*_Cy+=HpYI7w8Y%4m6S z+=NbMESlUyl@Sx-#I%-7VquIDmAEVB1&e^KiI;IWx}=jf1cA;? zb7*l~y~MZ%X#?^R7Ov&X2;347nRo~&{CiUZgNzmsB|v(Cj5x`FfI&l}AtfTMU-!iV zk|AgjZ!v)5e9I6X_OvHs;I9V@%DtfQ0qg~VCyxQg1r#~R#Hevn?~lvGN>fpV0w~}b z+zZAso;Yb;SR(w1tS=PL%1G2i70?t=&=kIbU0=q*1QZ!gEf{KGV8o-0!C~0Ecrxw- zq1FqG(;WAnM(@BQ>&xK5AFVH+;#lDuA6Z{w4iUKZ415U_Xw` zT+7v(Mpsc}TQBXQRqC;_^|35@D7cp zdc`$@`K#EfsX2t74k&Rg(mFb#zJxlJb%P?;EBLJGy`Wz4{$1sL$5c~uKWj)DwpJW0 zC>ZpL<3!|wa#sg{j*P`H9m#zF7^skz$cQX*+w6KN)=Y6^0Fg!RDJQZh2$?Oih(_uc z+QD6uUb!zna_}8^WW5?Z_@njeOPVTt(xrf3a>91*>&T%hnu}N)+dYhSRwqrA6N2>IeKdUsi;N64WD)V<`^JmtVEu6#< z?tJGMQp_=A%N@X$b+uvTq~=_a;%~L6Q2WKj-YS9jl?j@0%+ax(Hx{soV;ZrUF^;*! z0VkpAoHxnbv~bM=KWC-`(_-FQ1|PyEF)cT5ZOrc>>E{(u5cB*XHc2uwEh(;-OOUqc zuWdPR!Feki>L_x~TbX(18iOOfY07s5J%w#Z2Z-`t96B$WtaY@=|=qP5c>IBIQe@haH zqq1eD^~SrjIH1#=O{_J7b zn$`vF|Ne=oy1y|=cS-!lOu(aRzXQ^Gwyy*PS1(>M&>Be_DB(CA4{~h>#X%go0{L7?M68jJG9EPtid1QReq8^UO{-(0#n~5rS!0A()Bl3g+ zP8ttaJTu7=O1pFN-f4FKTpOBTUNfwa0fr1Ue2t)iM-{vRq&0X@`>#rd_a!_x>cC8X zVj&JS7Ugi*Gv~72jWOhe#>1JM^9DB@?o~i11G@XF*8?Y`SHP=3(<6@0F1c$y<9-d# z1=;hjxkRq>5mv5+pogQ!|IlqX2b?kyvVC*7QZpv(RCHT&|5p&ToNV^6vio)k`i$Yn zOhn9-#Aiqj@Tj6UfV9L(*|@&g$MPJynqre5Mf$kD+>h(XI61YrA{q;Z6=kyL7kvkJ z$Ea8SK6Y@|;a)`yCSq7`dVR5zd;`4sGkw$a-6gjq@A`d-fR71m#;{~J23Wz}p0M9p zYND3y+W_;(s!}yS{Jx0~X7t*Y+5h1=SfrV^|HBT<&WoozMBz`E+x8_jY&sfy;ONhn z-u{od-{u}_KBFqODzmR^%)YKjjn9J8`j;3_CE4$o_LKsolp=ixQGiF4yal9X_Ag9R zLZ2NP_w4@J^%&=N0A4)-cy5)-ELZC}rb`7QAFNIm}tHDim) TvcTwz00000NkvXXu0mjfzU!NK diff --git a/graphics/link_games/pkmnjump_bg.bin b/graphics/pokemon_jump/bg.bin similarity index 100% rename from graphics/link_games/pkmnjump_bg.bin rename to graphics/pokemon_jump/bg.bin diff --git a/graphics/link_games/pkmnjump_bg.pal b/graphics/pokemon_jump/bg.pal similarity index 100% rename from graphics/link_games/pkmnjump_bg.pal rename to graphics/pokemon_jump/bg.pal diff --git a/graphics/pokemon_jump/bg.png b/graphics/pokemon_jump/bg.png new file mode 100644 index 0000000000000000000000000000000000000000..449bbf6272383ca671891de4ff737914e34b694c GIT binary patch literal 532 zcmV+v0_**WP) zNklN{-JtarEuMB<*raeO4f zUwlZCS*{?U5URH;(H066=JA0cHf^9#8}d|Yf)~=Vle5Gy4PhDs@upx{^#uJvng%kS z-a~T!(mO)6b^}o`1lGax=#-||Le$p?jY+O#nPPPLv}jHY(cBVRf=6T^SJ^$9S{Ev9 zW@@5$1O*F)$QYhgv=H>)g-DZy@Gvf+XdpU31+lNH0f+4JeUo>f9F literal 0 HcmV?d00001 diff --git a/graphics/link_games/pkmnjump_results.bin b/graphics/pokemon_jump/bonuses.bin similarity index 100% rename from graphics/link_games/pkmnjump_results.bin rename to graphics/pokemon_jump/bonuses.bin diff --git a/graphics/link_games/pkmnjump_results.pal b/graphics/pokemon_jump/bonuses.pal similarity index 100% rename from graphics/link_games/pkmnjump_results.pal rename to graphics/pokemon_jump/bonuses.pal diff --git a/graphics/pokemon_jump/bonuses.png b/graphics/pokemon_jump/bonuses.png new file mode 100644 index 0000000000000000000000000000000000000000..fe1cb2609ee6462354d6e3242e26e889b644ada0 GIT binary patch literal 2129 zcmV-X2(I^uP)LqZ0000mP)t-soSem! z#dECQd)2f#?#)5wq=WXotYTtPq?B6Cy;A?~N}QzTT3TwXlxpV9d$hgwK!bc3000Nv zNkl^!19k@I0z-HQ=Y0f#fE=9>2;1wVii~Lx1@2R@=qY!q}V|%k+$GBeqjMvI> z!F2;1+$$Y?fBk#?v#hVz^QKT9%chPS@c!YO(n0$Jl{L-vdeKzOf0j+t)Yl#Ny|r}E zJ_#&3uwioWz`6FJ{aaw=;2aH?P0@MKKHVriCa}3q;KII16@tTirpNZr)#|Qk76slS zze2W(@yfu5_DAB@UgM(b)rb_R5(G=>r%DdTW&;O#UpP3YhlMvE%T4n^-dAhu3|P&Q zg8+6w)TmA{uy}CrE`g8;U@aTf8PowKh@QaGK>Xf@JKOy=|yu(4O{|z!kzWr;gMqa(u*l$Jq6;5Ekkt-&dU_TUPPxcV?7mo zA&6@DTd102i@|@*-vGKnOn=3`}Cy%!<9ZFlQY60nqx6HN&S1 zFA9tUvjT&IZF4kS3-kR!RlFv;=vI z$;kRtS#2dNFyDYEXq40wWfPSudxjiUPpoIUhXQK{yBg=boCJ={i2|5lK^qs%Ex;3X z?1V*D8zv_rs*?_cx{(zd(ShUR7>BrrRAV(gKIXF8jE8(W91d0Sa2TY4%^k^^6Mr$WPo=d z2Ip{SUsu}-EbM_me1hQ)&^o*iHhmCImk1!X%^)6wFOExdgV%x&P>Z}~NTNzeKjw8j zgmuRhScPLf4Lwm$r~s-~>c@3{&Iw@CO~=Ha64{IEKk_-J6oO_jz#{I6>pWlV1K-AV zACzZm`fXhQL9j@mc}DPUTsv3{Jss2QF0S#O>9PGi%h)ul@a{Z|9EQsdqC*ROX1vEBbd@XIoABKr32`JP}pO0U;{ zwFGY+yt!GnA;J&mD-5_&RVdWYw^r;H^8LqYKYL zFhizsF2oyY9bWjNvORdz_Wwisg3Z(W zz-qgr363Nm&{Snx>!>Z`dxGzmfrb+Cqs$?UuS~i`_-?a~P3U{q5yzAdyK-m~&doQz+tLyHn*Ppl z#FyHK*;Y*3CFxjjKepL9j!w~>HXgRW&<0F8))U)!XbZsY8ywJ9rWAN9P&%f4mhZzx zO9S~#OKt+&H{faeT#t7^>PV2ybX&GlNM!r6LThsk5Kos)GW^VUjvw0>>?2DNa&Sm+ zbh;}AYmByhYd6F-J@6sc^pDgtt>xV2M6Ka5t>RdT0-FK1q@J?`nsv$wt=3qH1kxeu zIZI2v`J2}7^cBHpkJwpS^6dbg)^Ga?U>a{EeG=DyG_zeWjW;&m18teLWt= literal 0 HcmV?d00001 diff --git a/graphics/link_games/pkmnjump_pal3.pal b/graphics/pokemon_jump/interface.pal similarity index 100% rename from graphics/link_games/pkmnjump_pal3.pal rename to graphics/pokemon_jump/interface.pal diff --git a/graphics/link_games/pkmnjump_pal1.pal b/graphics/pokemon_jump/pal1.pal similarity index 100% rename from graphics/link_games/pkmnjump_pal1.pal rename to graphics/pokemon_jump/pal1.pal diff --git a/graphics/link_games/pkmnjump_pal2.pal b/graphics/pokemon_jump/pal2.pal similarity index 100% rename from graphics/link_games/pkmnjump_pal2.pal rename to graphics/pokemon_jump/pal2.pal diff --git a/graphics/link_games/pkmnjump_star.png b/graphics/pokemon_jump/star.png similarity index 100% rename from graphics/link_games/pkmnjump_star.png rename to graphics/pokemon_jump/star.png diff --git a/graphics/link_games/pkmnjump_venusaur.bin b/graphics/pokemon_jump/venusaur.bin similarity index 100% rename from graphics/link_games/pkmnjump_venusaur.bin rename to graphics/pokemon_jump/venusaur.bin diff --git a/graphics/link_games/pkmnjump_venusaur.pal b/graphics/pokemon_jump/venusaur.pal similarity index 100% rename from graphics/link_games/pkmnjump_venusaur.pal rename to graphics/pokemon_jump/venusaur.pal diff --git a/graphics/link_games/pkmnjump_venusaur.png b/graphics/pokemon_jump/venusaur.png similarity index 100% rename from graphics/link_games/pkmnjump_venusaur.png rename to graphics/pokemon_jump/venusaur.png diff --git a/graphics/link_games/pkmnjump_rope1.png b/graphics/pokemon_jump/vine1.png similarity index 100% rename from graphics/link_games/pkmnjump_rope1.png rename to graphics/pokemon_jump/vine1.png diff --git a/graphics/link_games/pkmnjump_rope2.png b/graphics/pokemon_jump/vine2.png similarity index 100% rename from graphics/link_games/pkmnjump_rope2.png rename to graphics/pokemon_jump/vine2.png diff --git a/graphics/link_games/pkmnjump_rope3.png b/graphics/pokemon_jump/vine3.png similarity index 100% rename from graphics/link_games/pkmnjump_rope3.png rename to graphics/pokemon_jump/vine3.png diff --git a/graphics/link_games/pkmnjump_rope4.png b/graphics/pokemon_jump/vine4.png similarity index 100% rename from graphics/link_games/pkmnjump_rope4.png rename to graphics/pokemon_jump/vine4.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 859b7b8d6..8e5cd789f 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -97,7 +97,7 @@ $(FONTGFXDIR)/font9_jap.fwjpnfont: $(FONTGFXDIR)/font9_jap.png graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal $(GFX) $< $@ -num_colors 224 -graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png +graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 63 $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png @@ -482,7 +482,7 @@ $(FAMECHECKERGFXDIR)/bg.4bpp: %.4bpp: %.png graphics/seagallop/water.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 41 -$(MISCGFXDIR)/unk_846B008.4bpp: %.4bpp: %.png +graphics/link/321start.4bpp: %.4bpp: %.png $(GFX) $< $@ -mwidth 4 -mheight 4 $(TEXTWINDOWGFXDIR)/unk_8470B0C.4bpp: %.4bpp: %.png diff --git a/include/bg.h b/include/bg.h index f6c307146..ca6264ca8 100644 --- a/include/bg.h +++ b/include/bg.h @@ -39,6 +39,13 @@ enum BG_ATTR_BASETILE = 10 }; +// Modes for ChangeBgX / ChangeBgY +enum { + BG_COORD_SET, + BG_COORD_ADD, + BG_COORD_SUB, +}; + enum AdjustBgMosaicMode { BG_MOSAIC_SET, diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 43a6231ca..43a3a59d4 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -225,6 +225,10 @@ #define EVO_MODE_ITEM_USE 2 #define EVO_MODE_ITEM_CHECK 3 // If an Everstone is being held, still want to show that the stone *could* be used on that Pokémon to evolve +#define MON_PIC_WIDTH 64 +#define MON_PIC_HEIGHT 64 +#define MON_PIC_SIZE (MON_PIC_WIDTH * MON_PIC_HEIGHT / 2) + // used by ShouldIgnoreDeoxysForm #define DEOXYS_CHECK_BATTLE_SPRITE 1 #define DEOXYS_CHECK_TRADE_MAIN 3 diff --git a/include/link.h b/include/link.h index e009c2724..e7dafadf6 100644 --- a/include/link.h +++ b/include/link.h @@ -58,6 +58,7 @@ #define LINKCMD_0x5FFF 0x5FFF #define LINKCMD_0x6666 0x6666 #define LINKCMD_0x7777 0x7777 +#define LINKCMD_COUNTDOWN 0x7FFF #define LINKCMD_CONT_BLOCK 0x8888 #define LINKCMD_0xAAAA 0xAAAA #define LINKCMD_0xAAAB 0xAAAB diff --git a/include/link_rfu.h b/include/link_rfu.h index 6d7e54129..7dac12fbb 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -6,6 +6,8 @@ #include "link.h" #include "AgbRfu_LinkManager.h" +#define RFUCMD_MASK 0xFF00 + #define RFUCMD_SEND_PACKET 0x2F00 #define RFUCMD_READY_CLOSE_LINK 0x5f00 #define RFUCMD_READY_EXIT_STANDBY 0x6600 diff --git a/include/pokemon_jump.h b/include/pokemon_jump.h index fa4105a0e..20f96ec10 100644 --- a/include/pokemon_jump.h +++ b/include/pokemon_jump.h @@ -3,7 +3,7 @@ #include "main.h" -void ResetPokeJumpResults(void); +void ResetPokemonJumpRecords(void); bool32 IsSpeciesAllowedInPokemonJump(u16 species); void StartPokemonJump(u16 species, MainCallback callback); diff --git a/include/random.h b/include/random.h index 139316f9d..bf4af42d0 100644 --- a/include/random.h +++ b/include/random.h @@ -13,6 +13,11 @@ u16 Random2(void); //Returns a 32-bit pseudorandom number #define Random32() (Random() | (Random() << 16)) +// The number 1103515245 comes from the example implementation of rand and srand +// in the ISO C standard. +#define ISO_RANDOMIZE1(val)(1103515245 * (val) + 24691) +#define ISO_RANDOMIZE2(val)(1103515245 * (val) + 12345) + //Sets the initial seed value of the pseudorandom number generator void SeedRng(u16 seed); void SeedRng2(u16 seed); diff --git a/include/task.h b/include/task.h index fd7f5a4e1..2f9f1c0d8 100644 --- a/include/task.h +++ b/include/task.h @@ -5,6 +5,7 @@ #define HEAD_SENTINEL 0xFE #define TAIL_SENTINEL 0xFF +#define TASK_NONE TAIL_SENTINEL #define NUM_TASKS 16 #define NUM_TASK_DATA 16 diff --git a/include/window.h b/include/window.h index 3cb904626..1c3d9be9c 100644 --- a/include/window.h +++ b/include/window.h @@ -41,6 +41,8 @@ struct WindowTemplate 0, \ } +#define WINDOW_NONE 0xFF + struct Window { struct WindowTemplate window; diff --git a/src/new_game.c b/src/new_game.c index d570e3886..741d1d602 100644 --- a/src/new_game.c +++ b/src/new_game.c @@ -155,6 +155,6 @@ static void ResetMiniGamesResults(void) { CpuFill16(0, &gSaveBlock2Ptr->berryCrush, sizeof(struct BerryCrush)); SetBerryPowder(&gSaveBlock2Ptr->berryCrush.berryPowderAmount, 0); - ResetPokeJumpResults(); + ResetPokemonJumpRecords(); CpuFill16(0, &gSaveBlock2Ptr->berryPick, sizeof(struct BerryPickingResults)); } diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 26f2e18f1..7cd7223a2 100644 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -22,360 +22,738 @@ #include "constants/items.h" #include "constants/songs.h" -struct PokemonJump1_MonInfo +#define MAX_JUMP_SCORE 99990 +#define MAX_JUMPS 9999 + +#define JUMP_PEAK (-30) + +enum { + BG_INTERFACE, + BG_BONUSES, + BG_VENUSAUR, + BG_SCENERY, +}; + +// IDs for persistent windows +enum { + WIN_POINTS, + WIN_TIMES, + NUM_WINDOWS +}; + +enum { + PACKET_MON_INFO = 1, + PACKET_UNUSED, + PACKET_LEADER_STATE, + PACKET_MEMBER_STATE, +}; + +enum { + JUMP_TYPE_NORMAL, + JUMP_TYPE_FAST, + JUMP_TYPE_SLOW, +}; + +enum { + FUNC_GAME_INTRO, + FUNC_WAIT_ROUND, + FUNC_GAME_ROUND, + FUNC_GAME_OVER, + FUNC_ASK_PLAY_AGAIN, + FUNC_RESET_GAME, + FUNC_EXIT, + FUNC_GIVE_PRIZE, + FUNC_SAVE, + FUNC_NONE +}; + +enum { + GFXFUNC_LOAD, + GFXFUNC_SHOW_NAMES, + GFXFUNC_SHOW_NAMES_HIGHLIGHT, + GFXFUNC_ERASE_NAMES, + GFXFUNC_MSG_PLAY_AGAIN, + GFXFUNC_MSG_SAVING, + GFXFUNC_ERASE_MSG, + GFXFUNC_MSG_PLAYER_DROPPED, + GFXFUNC_MSG_COMM_STANDBY, + GFXFUNC_COUNTDOWN, +}; + +enum { + VINE_HIGHEST, + VINE_DOWNSWING_HIGHER, + VINE_DOWNSWING_HIGH, + VINE_DOWNSWING_LOW, + VINE_DOWNSWING_LOWER, + VINE_LOWEST, + VINE_UPSWING_LOWER, + VINE_UPSWING_LOW, + VINE_UPSWING_HIGH, + VINE_UPSWING_HIGHER, + NUM_VINESTATES +}; + +// Used to compare limits for vineStateTimer +// The upper 8 bits of vineStateTimer are the vine state, +// the lower 8 bits are a timer to the next state. +// When the timer is incremented above 255, it increments +// the vine state and the timer is reset. +#define VINE_STATE_TIMER(vineState)(((vineState) << 8) | 0xFF) + +enum { + MONSTATE_NORMAL, // Pokémon is either on the ground or in the middle of a jump + MONSTATE_JUMP, // Pokémon has begun a jump + MONSTATE_HIT, // Pokémon got hit by the vine +}; + +enum { + JUMPSTATE_NONE, + JUMPSTATE_SUCCESS, // Cleared vine + JUMPSTATE_FAILURE, // Hit vine +}; + +#define PLAY_AGAIN_NO 1 +#define PLAY_AGAIN_YES 2 + +#define TAG_MON1 0 +#define TAG_MON2 1 // MON2-5 used implicitly by adding multiplayer id to tag +#define TAG_MON3 2 +#define TAG_MON4 3 +#define TAG_MON5 4 + +#define GFXTAG_VINE1 5 +#define GFXTAG_VINE2 6 +#define GFXTAG_VINE3 7 +#define GFXTAG_VINE4 8 +#define GFXTAG_COUNTDOWN 9 +#define GFXTAG_STAR 10 + +#define PALTAG_1 5 +#define PALTAG_2 6 +#define PALTAG_COUNTDOWN 7 + +#define TAG_DIGITS 800 + +#define VINE_SPRITES_PER_SIDE 4 // Vine rope is divided into 8 sprites, 4 per side copied and flipped horizontally + +// Used by SetLinkTimeInterval to get a bit mask for capping +// a timer that controls how frequently link data is sent. +#define LINK_INTERVAL_NONE 0 +#define LINK_INTERVAL_SHORT 3 // 3 frame interval +#define LINK_INTERVAL_MEDIUM 4 // 7 frame interval +#define LINK_INTERVAL_LONG 5 // 15 frame interval + +#define LINK_TIMER_STOPPED 0x1111 + +struct PokemonJump_MonInfo { u16 species; u32 otId; u32 personality; }; -struct PokemonJump1_82E4 +struct PokemonJump_Player { - int unk0; - int unk4; - u8 filler8[0x4]; - u16 unkC; - u16 unkE; - u16 unk10; - u16 unk12; - int unk14; - int unk18; - u8 unk1C[11]; + int jumpOffset; + int jumpOffsetIdx; + u32 unused; + u16 monJumpType; + u16 jumpTimeStart; + u16 monState; + u16 prevMonState; + int jumpState; + bool32 funcFinished; + u8 name[11]; }; -struct PokemonJump2 +struct PokemonJumpGfx { - int unk0; - u16 unk4; - u8 unk6; - u8 filler7[0xa - 0x7]; - u8 unkA; - u8 unkB; - u8 unkC; - u8 unkD; - u8 unkE; - u8 unkF; - u16 filler10; - u16 unk12; - u16 unk14; - u32 unk18; - u16 unk1C[5]; - u8 txtBuff[2][0x40]; - u8 strBuff[0x100]; + bool32 funcFinished; + u16 mainState; + u8 taskId; + u8 unused1[3]; + u8 resetVineState; + u8 resetVineTimer; + u8 vineState; + u8 msgWindowState; + u8 vinePalNumDownswing; + u8 vinePalNumUpswing; + u16 unused2; + u16 msgWindowId; + u16 fanfare; + u32 bonusTimer; + u16 nameWindowIds[MAX_RFU_PLAYERS]; + u8 itemName[64]; + u8 itemQuantityStr[64]; + u8 prizeMsg[256]; u16 tilemapBuffer[0x4000]; // Bug: way larger than it should be - struct Sprite *unk81A8[MAX_RFU_PLAYERS]; - struct Sprite *unk81BC[MAX_RFU_PLAYERS]; - struct Sprite *unk81D0[8]; - u8 filler81F0[0xC]; - u8 unk81FC[MAX_RFU_PLAYERS]; + struct Sprite *monSprites[MAX_RFU_PLAYERS]; + struct Sprite *starSprites[MAX_RFU_PLAYERS]; + struct Sprite *vineSprites[VINE_SPRITES_PER_SIDE * 2]; + u8 unused3[12]; + u8 monSpriteSubpriorities[MAX_RFU_PLAYERS]; }; -struct PokemonJump1Sub +struct PokemonJump_CommData { - u8 unk0; - u8 unk1; - u16 unk2; - u16 unk4; - u32 unk8; + u8 funcId; + u8 receivedBonusFlags; + u16 data; // Multi-use + u16 jumpsInRow; + u32 jumpScore; }; -struct MonInfoPacket +struct PokemonJump { - u8 id; // packet id - u16 species; - u32 personality; - u32 otId; + MainCallback exitCallback; + u8 taskId; + u8 numPlayers; + u8 multiplayerId; + u8 startDelayTimer; + u16 mainState; + u16 helperState; + u16 excellentsInRow; + u16 excellentsInRowRecord; + bool32 gameOver; + u32 vineState; + u32 prevVineState; + int vineSpeed; + u32 vineSpeedAccel; + u32 rngSeed; + u32 nextVineSpeed; + int linkTimer; + u32 linkTimerLimit; + u16 vineStateTimer; + bool16 ignoreJumpInput; + u16 unused1; + u16 unused2; // Set to 0, never read + u16 timer; + u16 prizeItemId; + u16 prizeItemQuantity; + u16 playAgainComm; + u8 unused3; // Set to 0, never read + u8 playAgainState; + bool8 allowVineUpdates; + bool8 isLeader; + bool8 funcActive; + bool8 allPlayersReady; + u16 vineTimer; + u8 nextFuncId; + bool8 showBonus; + u16 vineSpeedDelay; + u8 vineBaseSpeedIdx; + u8 vineSpeedStage; + int numPlayersAtPeak; + bool32 initScoreUpdate; + bool32 updateScore; + bool32 unused4; // Set to TRUE, never read + bool32 giveBonus; + bool32 skipJumpUpdate; + bool32 atMaxSpeedStage; + struct PokemonJump_CommData comm; + bool8 atJumpPeak[MAX_RFU_PLAYERS]; + bool8 atJumpPeak2[MAX_RFU_PLAYERS]; + bool8 atJumpPeak3[MAX_RFU_PLAYERS]; + u8 memberFuncIds[MAX_RFU_PLAYERS]; + u16 playAgainStates[MAX_RFU_PLAYERS]; + u16 jumpTimeStarts[MAX_RFU_PLAYERS]; + struct PokemonJumpGfx jumpGfx; + struct PokemonJump_MonInfo monInfo[MAX_RFU_PLAYERS]; + struct PokemonJump_Player players[MAX_RFU_PLAYERS]; + struct PokemonJump_Player *player; }; -struct PokemonJump1 -{ - MainCallback returnCallback; - u8 unk4; - u8 unk5; - u8 unk6; - u8 unk7; - u16 unk8; - u16 unkA; - u16 unkC; - u16 unkE; - int unk10; - u32 unk14; - u32 unk18; - int unk1C; - u32 unk20; - u32 unk24; - u32 unk28; - int unk2C; - u32 unk30; - u16 unk34; - u16 unk36; - u8 filler38[0x2]; - u16 unk3A; - u16 unk3C; - u16 unk3E; - u16 unk40; - u16 unk42; - u8 unk44; - u8 unk45; - u8 unk46; - u8 isLeader; - u8 unk48; - u8 unk49; - u16 unk4A; - u8 unk4C; - u8 unk4D; - u16 unk4E; - u8 unk50; - u8 unk51; - u8 filler52[0x2]; - int unk54; - int unk58; - int unk5C; - int unk60; - int unk64; - int unk68; - int unk6C; - struct PokemonJump1Sub unk70; - u8 unk7C[MAX_RFU_PLAYERS]; - u8 unk81[MAX_RFU_PLAYERS]; - u8 unk86[MAX_RFU_PLAYERS]; - u8 unk8B[MAX_RFU_PLAYERS]; - u16 unk90[MAX_RFU_PLAYERS]; - u16 unk9A[MAX_RFU_PLAYERS]; - struct PokemonJump2 unkA4; - struct PokemonJump1_MonInfo unk82A8[MAX_RFU_PLAYERS]; - struct PokemonJump1_82E4 unk82E4[MAX_RFU_PLAYERS]; - struct PokemonJump1_82E4 *unk83AC; -}; - - -static void sub_8147654(u8 taskId); -static void sub_81477C0(u8 taskId); -static void sub_814784C(u8 taskId); -static void sub_81479D4(u8 taskId); -static void sub_8147A34(u8 taskId); -static void sub_8147B60(struct PokemonJump1 *); -static void sub_8147B94(struct PokemonJump1 *); -static void sub_8147C20(void); -static void sub_8147C98(void); +static void Task_StaticCountdown(u8 taskId); +static void Task_StaticCountdown_Init(u8 taskId); +static void Task_StaticCountdown_Free(u8 taskId); +static void Task_StaticCountdown_Start(u8 taskId); +static void Task_StaticCountdown_Run(u8 taskId); +static void InitGame(struct PokemonJump *); +static void ResetForNewGame(struct PokemonJump *); +static void InitPlayerAndJumpTypes(void); +static void ResetPlayersForNewGame(void); static s16 GetPokemonJumpSpeciesIdx(u16 species); -static void sub_8147D2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon); -static void sub_8147D6C(void); -static void sub_8147DA0(u8 taskId); -static void sub_814807C(u8 taskId); -static void sub_8148104(void); -static void sub_8148290(u8 taskId); -static void sub_81482F8(void); -static bool32 sub_8148344(void); -static bool32 sub_81483D0(void); -static bool32 sub_8148464(void); -static bool32 sub_81484D0(void); -static bool32 sub_814856C(void); -static bool32 sub_81485C8(void); -static bool32 sub_8148664(void); -static bool32 sub_81486C4(void); -static bool32 sub_8148724(void); -static bool32 sub_8148760(void); -static bool32 sub_81487B4(void); -static bool32 sub_8148800(void); -static bool32 sub_814881C(void); -static bool32 sub_81488DC(void); -static bool32 sub_81489C8(void); -static bool32 sub_8148A60(void); -static bool32 sub_8148398(void); -static bool32 sub_8148418(void); -static bool32 sub_81484B0(void); -static bool32 sub_8148B54(void); -static bool32 sub_8148C80(void); -static bool32 sub_8148D5C(void); -static bool32 sub_8148E2C(void); -static void sub_8148E80(u8 taskId); -static void sub_8148F5C(TaskFunc func, u8 taskPriority); -static void sub_8148F7C(void); -static void sub_8148F9C(void); -static void sub_8148FE0(void); -static int sub_8149044(void); -static void sub_8149078(void); -static int sub_8149194(void); -static void sub_81491B4(void); -static void sub_81491E4(void); -static void sub_8149210(void); -static bool32 sub_814922C(u16); -static void sub_8149260(void); -static void sub_81492D8(void); -static void sub_814933C(void); -static void sub_814935C(void); -static void sub_814936C(void); -static void sub_814937C(void); -static void sub_8149490(int); -static void sub_8149534(void); -static bool32 sub_8149630(void); -static bool32 sub_81496D4(void); -static bool32 sub_8149710(void); -static bool32 sub_8149748(void); -static void sub_8149780(int); -static int sub_81497A8(void); -static bool32 sub_8149804(void); -static int sub_8149834(u8 *); -static void sub_8149878(void); -static int sub_8149888(int); -static void sub_8149898(u16); -static bool32 sub_81498B4(void); -static u16 sub_81498D8(void); -static void sub_8149900(u16, u16 *, u16 *); -static u16 sub_8149910(void); -static u16 sub_8149930(void); -static u16 sub_8149978(u16 item, u16 quantity); -static void sub_8149D80(void (*func)(void)); -static void sub_8149DA4(u8 taskId); -static void sub_8149DC8(void); -static void sub_8149F64(void); -static void sub_8149FD0(void); -static void sub_814A03C(void); -static void sub_814A0C8(void); -static void sub_814A174(void); -static void sub_814A218(void); -static void sub_814A264(void); -static void sub_814A308(void); -static void sub_814A3AC(void); -static u32 sub_814A754(u32 left, u32 top, u32 width, u32 height); -static void sub_814A7D0(u16 left, u16 top, u8 cursorPos); -static void sub_814A84C(void); -static void sub_814A8B8(void); -static void sub_814A9C8(void); -static void sub_814AADC(void); -static void sub_814AC30(bool32 arg0); -static void sub_814AC94(void); -static void sub_814ACCC(u8 arg0); -static void sub_814AD50(u8 taskId); -static void sub_8149D34(struct PokemonJump2 *); -static void sub_814AF74(struct Sprite *sprite); -static void sub_814B038(struct Sprite *sprite); -static void sub_814B100(struct Sprite *sprite); -static void sub_814B1CC(struct Sprite *sprite); +static void InitJumpMonInfo(struct PokemonJump_MonInfo *monInfo, struct Pokemon *mon); +static void CB2_PokemonJump(void); +static void Task_StartPokemonJump(u8 taskId); +static void Task_PokemonJump_Leader(u8 taskId); +static void SendLinkData_Leader(void); +static void Task_PokemonJump_Member(u8 taskId); +static void SendLinkData_Member(void); +static bool32 GameIntro_Leader(void); +static bool32 WaitRound_Leader(void); +static bool32 GameRound_Leader(void); +static bool32 GameOver_Leader(void); +static bool32 GameOver_Member(void); +static bool32 AskPlayAgain_Leader(void); +static bool32 AskPlayAgain_Member(void); +static bool32 ResetGame_Leader(void); +static bool32 ResetGame_Member(void); +static bool32 ExitGame(void); +static bool32 GivePrize_Leader(void); +static bool32 GivePrize_Member(void); +static bool32 SavePokeJump(void); +static bool32 DoGameIntro(void); +static bool32 HandleSwingRound(void); +static bool32 DoVineHitEffect(void); +static bool32 GameIntro_Member(void); +static bool32 WaitRound_Member(void); +static bool32 GameRound_Member(void); +static bool32 TryGivePrize(void); +static bool32 DoPlayAgainPrompt(void); +static bool32 ClosePokeJumpLink(void); +static bool32 CloseMessageAndResetScore(void); +static void Task_CommunicateMonInfo(u8 taskId); +static void SetTaskWithPokeJumpStruct(TaskFunc func, u8 taskPriority); +static void InitVineState(void); +static void ResetVineState(void); +static void UpdateVineState(void); +static int GetVineSpeed(void); +static void UpdateVineSpeed(void); +static int PokeJumpRandom(void); +static void ResetVineAfterHit(void); +static void ResetPlayersJumpStates(void); +static void ResetPlayersMonState(void); +static bool32 IsPlayersMonState(u16); +static void SetMonStateJump(void); +static void UpdateGame(void); +static void TryUpdateVineSwing(void); +static void DisallowVineUpdates(void); +static void AllowVineUpdates(void); +static void HandleMonState(void); +static void UpdateJump(int); +static void TryUpdateScore(void); +static bool32 UpdateVineHitStates(void); +static bool32 AllPlayersJumpedOrHit(void); +static bool32 DidAllPlayersClearVine(void); +static bool32 ShouldPlayAgain(void); +static void AddJumpScore(int); +static int GetPlayersAtJumpPeak(void); +static bool32 AreLinkQueuesEmpty(void); +static int GetNumPlayersForBonus(u8 *); +static void ClearUnreadField(void); +static int GetScoreBonus(int); +static void TryUpdateExcellentsRecord(u16); +static bool32 HasEnoughScoreForPrize(void); +static u16 GetPrizeData(void); +static void UnpackPrizeData(u16, u16 *, u16 *); +static u16 GetPrizeItemId(void); +static u16 GetPrizeQuantity(void); +static u16 GetQuantityLimitedByBag(u16 item, u16 quantity); +static void SetUpPokeJumpGfxFunc(void (*func)(void)); +static void Task_RunPokeJumpGfxFunc(u8 taskId); +static void LoadPokeJumpGfx(void); +static void PrintPlayerNamesNoHighlight(void); +static void PrintPlayerNamesWithHighlight(void); +static void ErasePlayerNames(void); +static void Msg_WantToPlayAgain(void); +static void Msg_SavingDontTurnOff(void); +static void EraseMessage(void); +static void Msg_SomeoneDroppedOut(void); +static void Msg_CommunicationStandby(void); +static void DoPokeJumpCountdown(void); +static u32 AddMessageWindow(u32 left, u32 top, u32 width, u32 height); +static void CreatePokeJumpYesNoMenu(u16 left, u16 top, u8 cursorPos); +static void PrintScoreSuffixes(void); +static void CreateJumpMonSprites(void); +static void InitDigitPrinters(void); +static void AddPlayerNameWindows(void); +static void PrintPokeJumpPlayerNames(bool32); +static void DrawPlayerNameWindows(void); +static void ShowBonus(u8); +static void Task_UpdateBonus(u8 taskId); +static void InitPokeJumpGfx(struct PokemonJumpGfx *); +static void SpriteCB_Star(struct Sprite *sprite); +static void SpriteCB_MonHitShake(struct Sprite *sprite); +static void SpriteCB_MonHitFlash(struct Sprite *sprite); +static void SpriteCB_MonIntroBounce(struct Sprite *sprite); static void Task_ShowPokemonJumpRecords(u8 taskId); static void TruncateToFirstWordOnly(u8 *str); -static void sub_814B5C4(u16 windowId); -void sub_814A95C(int id); -void sub_8149CEC(struct PokemonJump2 *); -void sub_8149D24(void); -void sub_8149D40(int); -bool32 sub_8149D68(void); -void sub_814A3E4(void); -bool32 sub_814A408(void); -void sub_814A468(u16 itemId, u16 quantity); -void sub_814A53C(u16 itemId); -void sub_814A5B4(u16 itemId); -bool32 sub_814A62C(void); -void sub_814A6CC(void); -void sub_814A940(u32 id, s16 y); -void sub_814AA48(u8 multiplayerId); -bool32 sub_814A6FC(void); -void sub_814AA24(int); -s8 sub_814A744(void); -int sub_814A98C(u8 flags); -void sub_814AA34(u16); -void sub_814AA60(u8 multiplayerId); -int sub_814AA78(int multiplayerId); -void sub_814AA8C(void); -void sub_814AAA0(void); -void sub_814AAB4(int); -int sub_814AAC8(void); -void sub_8149A6C(struct PokemonJump1_MonInfo *arg0); -bool32 sub_8149A90(int multiplayerId, struct PokemonJump1_MonInfo *arg0); -void sub_8149AF8(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1); -bool32 sub_8149B7C(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1); -void sub_8149BF4(struct PokemonJump1_82E4 *arg0, u8 arg1, u16 arg2); -bool32 sub_8149C24(struct PokemonJump1_82E4 *arg0, int multiplayerId, u8 *arg2, u16 *arg3); -bool32 sub_8149C90(struct PokemonJump1_82E4 *arg0, int multiplayerId); -bool32 sub_814B494(u32 jumpScore, u16 jumpsInRow, u16 excellentsInRow); -void sub_814B4E8(void); -void sub_814AD6C(struct PokemonJump2 *); -void sub_814B294(struct PokemonJump2 *); -void sub_814B43C(struct PokemonJump2 *); -bool32 sub_814B460(void); -void sub_814B348(struct PokemonJump2 *, int); -void sub_814AF0C(struct PokemonJump2 *, int); -void sub_814ADCC(struct PokemonJump2 *, struct PokemonJump1_MonInfo *,s16, s16, u8); -void sub_814B240(struct PokemonJump2 *,s16, s16, u8); -void sub_814AFE8(struct PokemonJump2 *, int multiplayerId); -void sub_814B080(struct PokemonJump2 *, int multiplayerId); -bool32 sub_814B010(struct PokemonJump2 *, int multiplayerId); -void sub_814B0A8(struct PokemonJump2 *); -void sub_814B134(struct PokemonJump2 *); -void sub_814B168(struct PokemonJump2 *, int multiplayerId); -bool32 sub_814B190(struct PokemonJump2 *); +static void PrintRecordsText(u16 windowId); +static void UpdateVineSwing(int id); +static void StartPokeJumpGfx(struct PokemonJumpGfx *); +static void FreeWindowsAndDigitObj(void); +static void SetUpPokeJumpGfxFuncById(int); +static bool32 IsPokeJumpGfxFuncFinished(void); +static void SetUpResetVineGfx(void); +static bool32 ResetVineGfx(void); +static void PrintPrizeMessage(u16, u16); +static void PrintPrizeFilledBagMessage(u16); +static void PrintNoRoomForPrizeMessage(u16); +static bool32 DoPrizeMessageAndFanfare(void); +static void ClearMessageWindow(void); +static void SetMonSpriteY(u32 , s16); +static void StartMonHitShake(u8); +static bool32 RemoveMessageWindow(void); +static void PrintScore(int); +static s8 HandlePlayAgainInput(void); +static int DoSameJumpTimeBonus(u8); +static void PrintJumpsInRow(u16); +static void StartMonHitFlash(u8); +static int IsMonHitShakeActive(int); +static void StopMonHitFlash(void); +static void ResetMonSpriteSubpriorities(void); +static void StartMonIntroBounce(int); +static int IsMonIntroBounceActive(void); +static void SendPacket_MonInfo(struct PokemonJump_MonInfo *); +static bool32 RecvPacket_MonInfo(int multiplayerId, struct PokemonJump_MonInfo *); +static void SendPacket_LeaderState(struct PokemonJump_Player *, struct PokemonJump_CommData *); +static bool32 RecvPacket_LeaderState(struct PokemonJump_Player *, struct PokemonJump_CommData *); +static void SendPacket_MemberState(struct PokemonJump_Player *, u8, u16); +static bool32 RecvPacket_MemberStateToLeader(struct PokemonJump_Player *, int, u8 *, u16 *); +static bool32 RecvPacket_MemberStateToMember(struct PokemonJump_Player *, int); +static bool32 TryUpdateRecords(u32, u16, u16); +static void IncrementGamesWithMaxPlayers(void); +static void LoadSpriteSheetsAndPalettes(struct PokemonJumpGfx *); +static void CreateVineSprites(struct PokemonJumpGfx *); +static void StartPokeJumpCountdown(struct PokemonJumpGfx *); +static bool32 IsPokeJumpCountdownRunning(void); +static void UpdateVineAnim(struct PokemonJumpGfx *, int); +static void DoStarAnim(struct PokemonJumpGfx *, int); +static void CreateJumpMonSprite(struct PokemonJumpGfx *, struct PokemonJump_MonInfo *,s16, s16, u8); +static void CreateStarSprite(struct PokemonJumpGfx *,s16, s16, u8); +static void Gfx_StartMonHitShake(struct PokemonJumpGfx *, int); +static void Gfx_StartMonHitFlash(struct PokemonJumpGfx *, int); +static bool32 Gfx_IsMonHitShakeActive(struct PokemonJumpGfx *, int); +static void Gfx_StopMonHitFlash(struct PokemonJumpGfx *); +static void Gfx_ResetMonSpriteSubpriorities(struct PokemonJumpGfx *); +static void Gfx_StartMonIntroBounce(struct PokemonJumpGfx *, int); +static bool32 Gfx_IsMonIntroBounceActive(struct PokemonJumpGfx *); -EWRAM_DATA static struct PokemonJump1 *gUnknown_203F3D4 = NULL; -EWRAM_DATA static struct PokemonJump2 *gUnknown_203F3D8 = NULL; +EWRAM_DATA static struct PokemonJump *sPokemonJump = NULL; +EWRAM_DATA static struct PokemonJumpGfx *sPokemonJumpGfx = NULL; -static const u16 gUnknown_846AFE8[] = INCBIN_U16("graphics/misc/unk_846B008.gbapal"); -static const u32 gUnknown_846B008[] = INCBIN_U32("graphics/misc/unk_846B008.4bpp.lz"); +// Unused static version of the wireless minigame countdown -static const struct CompressedSpriteSheet gUnknown_846B42C[] = { - {gUnknown_846B008, 0x0C00, 0x2000}, +#define TAG_STATIC_COUNTDOWN 0x2000 + +enum { + STATE_IDLE = 1, + STATE_START, + STATE_RUN, + STATE_END, +}; + +enum { + FUNC_INIT, + FUNC_FREE, + FUNC_START, + FUNC_RUN, +}; + +enum { + ANIM_THREE, + ANIM_TWO, + ANIM_ONE, + ANIM_START_LEFT, + ANIM_START_MID, + ANIM_START_RIGHT, +}; + +static const u16 s321Start_Static_Pal[] = INCBIN_U16("graphics/link/321start.gbapal"); +static const u32 s321Start_Static_Gfx[] = INCBIN_U32("graphics/link/321start.4bpp.lz"); + +static const struct CompressedSpriteSheet sSpriteSheet_321Start_Static[] = { + {s321Start_Static_Gfx, 0xC00, TAG_STATIC_COUNTDOWN}, {} }; -static const struct SpritePalette gUnknown_846B43C[] = { - {gUnknown_846AFE8, 0x2000}, +static const struct SpritePalette sSpritePalette_321Start_Static[] = { + {s321Start_Static_Pal, TAG_STATIC_COUNTDOWN}, {} }; -static const union AnimCmd gUnknown_846B44C[] = { - ANIMCMD_FRAME(0x00, 0), +static const union AnimCmd sAnim_StaticCountdown_Three[] = { + ANIMCMD_FRAME(0, 0), ANIMCMD_END }; -static const union AnimCmd gUnknown_846B454[] = { - ANIMCMD_FRAME(0x10, 0), +static const union AnimCmd sAnim_StaticCountdown_Two[] = { + ANIMCMD_FRAME(16, 0), ANIMCMD_END }; -static const union AnimCmd gUnknown_846B45C[] = { - ANIMCMD_FRAME(0x20, 0), +static const union AnimCmd sAnim_StaticCountdown_One[] = { + ANIMCMD_FRAME(32, 0), ANIMCMD_END }; -static const union AnimCmd gUnknown_846B464[] = { - ANIMCMD_FRAME(0x40, 0), +static const union AnimCmd sAnim_StaticCountdown_StartLeft[] = { + ANIMCMD_FRAME(64, 0), ANIMCMD_END }; -static const union AnimCmd gUnknown_846B46C[] = { - ANIMCMD_FRAME(0x30, 0), +static const union AnimCmd sAnim_StaticCountdown_StartMid[] = { + ANIMCMD_FRAME(48, 0), ANIMCMD_END }; -static const union AnimCmd gUnknown_846B474[] = { - ANIMCMD_FRAME(0x50, 0), +static const union AnimCmd sAnim_StaticCountdown_StartRight[] = { + ANIMCMD_FRAME(80, 0), ANIMCMD_END }; -static const union AnimCmd *const gUnknown_846B47C[] = { - gUnknown_846B44C, - gUnknown_846B454, - gUnknown_846B45C, - gUnknown_846B464, - gUnknown_846B46C, - gUnknown_846B474 +static const union AnimCmd *const sAnims_StaticCountdown[] = { + [ANIM_THREE] = sAnim_StaticCountdown_Three, + [ANIM_TWO] = sAnim_StaticCountdown_Two, + [ANIM_ONE] = sAnim_StaticCountdown_One, + [ANIM_START_LEFT] = sAnim_StaticCountdown_StartLeft, + [ANIM_START_MID] = sAnim_StaticCountdown_StartMid, + [ANIM_START_RIGHT] = sAnim_StaticCountdown_StartRight }; -static const struct SpriteTemplate gUnknown_846B494[] = { +static const struct SpriteTemplate sSpriteTemplate_StaticCountdown[] = { { - .tileTag = 0x2000, - .paletteTag = 0x2000, + .tileTag = TAG_STATIC_COUNTDOWN, + .paletteTag = TAG_STATIC_COUNTDOWN, .oam = &gOamData_AffineOff_ObjNormal_32x32, - .anims = gUnknown_846B47C, + .anims = sAnims_StaticCountdown, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }, }; -static const TaskFunc gUnknown_846B4AC[][4] = { - { sub_81477C0, sub_814784C, sub_81479D4, sub_8147A34 } +static const TaskFunc sStaticCountdownFuncs[][4] = +{ + { + [FUNC_INIT] = Task_StaticCountdown_Init, + [FUNC_FREE] = Task_StaticCountdown_Free, + [FUNC_START] = Task_StaticCountdown_Start, + [FUNC_RUN] = Task_StaticCountdown_Run + }, }; +#define tState data[0] +#define tFuncSetId data[1] // These 4 data elements are indexes into +#define tSpriteTemplateId data[2] // arrays that only have 1 element with +#define tSpriteSheetId data[3] // data. As such their only legal value +#define tSpritePalId data[4] // is 0. Unclear why they were used. +#define tInterval data[5] +#define tPriority data[6] +#define tSubpriority data[7] +#define tNumSprites data[8] +#define tX data[9] +#define tY data[10] +#define tPrevTime data[10] // Re-used +#define tTimer data[11] +#define tLinkTimer data[12] +// 13-15 hold sprite ids +// tSpriteIds(0) is used for the number sprites, and the leftmost part of 'Start' +// tSpriteIds(1) is used for the middle part of 'Start' +// tSpriteIds(2) is used for for the rightmost part of 'Start' +#define tSpriteIds(i) data[13 + i] + +#define sInterval data[1] // Never read +#define sAnimNum data[2] +#define sTaskId data[3] +#define sId data[4] // Never read +#define sNumberSpriteId data[5] // Never read + +// Unused +static u8 CreateStaticCountdownTask(u8 funcSetId, u8 taskPriority) +{ + u8 taskId = CreateTask(Task_StaticCountdown, taskPriority); + struct Task *task = &gTasks[taskId]; + + task->tState = STATE_IDLE; + task->tFuncSetId = funcSetId; + sStaticCountdownFuncs[funcSetId][FUNC_INIT](taskId); + return taskId; +} + +// Unused +static bool32 StartStaticCountdown(void) +{ + u8 taskId = FindTaskIdByFunc(Task_StaticCountdown); + if (taskId == TASK_NONE) + return FALSE; + + gTasks[taskId].tState = STATE_START; + return TRUE; +} + +// Unused +static bool32 IsStaticCountdownRunning(void) +{ + return FuncIsActiveTask(Task_StaticCountdown); +} + +static void Task_StaticCountdown(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + + switch (tState) + { + // STATE_IDLE does nothing; wait until started + case STATE_START: + sStaticCountdownFuncs[tFuncSetId][FUNC_START](taskId); + tState = STATE_RUN; + break; + case STATE_RUN: + sStaticCountdownFuncs[tFuncSetId][FUNC_RUN](taskId); + break; + case STATE_END: + sStaticCountdownFuncs[tFuncSetId][FUNC_FREE](taskId); + DestroyTask(taskId); + break; + } +} + +static void StaticCountdown_CreateSprites(u8 taskId, s16 *data) +{ + u8 i; + struct Sprite *sprite; + + LoadCompressedSpriteSheet(&sSpriteSheet_321Start_Static[tSpriteSheetId]); + LoadSpritePalette(&sSpritePalette_321Start_Static[tSpritePalId]); + for (i = 0; i < tNumSprites; i++) + tSpriteIds(i) = CreateSprite(&sSpriteTemplate_StaticCountdown[tSpriteTemplateId], tX, tY, tSubpriority); + for (i = 0; i < tNumSprites; i++) + { + sprite = &gSprites[tSpriteIds(i)]; + sprite->oam.priority = tPriority; + sprite->invisible = TRUE; + sprite->sInterval = tInterval; + sprite->sTaskId = taskId; + sprite->sId = i; + sprite->sNumberSpriteId = tSpriteIds(0); + } +} + +static void Task_StaticCountdown_Init(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + tSpriteTemplateId = 0; + tSpriteSheetId = 0; + tSpritePalId = 0; + tInterval = 60; + tPriority = 0; + tSubpriority = 0; + tNumSprites = 3; + tX = 120; + tY = 88; + StaticCountdown_CreateSprites(taskId, data); + + StartSpriteAnim(&gSprites[tSpriteIds(1)], ANIM_START_MID); + gSprites[tSpriteIds(1)].x2 = -32; + + StartSpriteAnim(&gSprites[tSpriteIds(2)], ANIM_START_RIGHT); + gSprites[tSpriteIds(2)].x2 = 32; +} + +static void Task_StaticCountdown_Free(u8 taskId) +{ + u8 i = 0; + s16 *data = gTasks[taskId].data; + + for (i = 0; i < tNumSprites; i++) + DestroySprite(&gSprites[tSpriteIds(i)]); + FreeSpriteTilesByTag(sSpriteSheet_321Start_Static[tSpriteSheetId].tag); + FreeSpritePaletteByTag(sSpritePalette_321Start_Static[tSpritePalId].tag); +} + +static void SpriteCB_StaticCountdown(struct Sprite *sprite) +{ + s16 *data = gTasks[sprite->sTaskId].data; + + if (tTimer % tInterval != 0) + return; + if (tTimer == tPrevTime) + return; + + tPrevTime = tTimer; + switch (sprite->sAnimNum) + { + case ANIM_THREE: + sprite->invisible = FALSE; + case ANIM_TWO: + case ANIM_ONE: + // Set sprite to a number + PlaySE(SE_BALL_BOUNCE_1); + StartSpriteAnim(sprite, sprite->sAnimNum); + break; + case ANIM_START_LEFT: + // Set sprite to 'Start' + PlaySE(SE_PIN); + StartSpriteAnim(sprite, sprite->sAnimNum); + gSprites[tSpriteIds(1)].invisible = FALSE; + gSprites[tSpriteIds(2)].invisible = FALSE; + break; + case ANIM_START_LEFT + 1: // End + // Hide countdown + sprite->invisible = TRUE; + gSprites[tSpriteIds(1)].invisible = TRUE; + gSprites[tSpriteIds(2)].invisible = TRUE; + tState = STATE_END; + return; + } + sprite->sAnimNum++; +} + +static void Task_StaticCountdown_Start(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + PlaySE(SE_BALL_BOUNCE_1); + gSprites[tSpriteIds(0)].callback = SpriteCB_StaticCountdown; + gSprites[tSpriteIds(0)].invisible = FALSE; + gTasks[taskId].tState = STATE_RUN; +} + +// Increment timer for progressing the countdown. +// If the player is the link leader, increment a +// separate timer and send it to group members for +// them to read and use. +static void Task_StaticCountdown_Run(u8 taskId) +{ + u16 packet[RFU_PACKET_SIZE]; + s16 *data = gTasks[taskId].data; + + if (gReceivedRemoteLinkPlayers != 0) + { + // Read link timer + if (gRecvCmds[0][1] == LINKCMD_COUNTDOWN) + tTimer = gRecvCmds[0][2]; + + if (GetMultiplayerId() == 0) + { + // Player is link leader. + // Send timer to group members + tLinkTimer++; + memset(packet, 0, sizeof(packet)); + packet[0] = LINKCMD_COUNTDOWN; + packet[1] = tLinkTimer; + Rfu_SendPacket(packet); + } + } + else + { + // Local, just increment own timer + tTimer++; + } +} + +#undef tState +#undef tFuncSetId +#undef tSpriteTemplateId +#undef tSpriteSheetId +#undef tSpritePalId +#undef tInterval +#undef tPriority +#undef tSubpriority +#undef tNumSprites +#undef tX +#undef tY +#undef tPrevTime +#undef tTimer +#undef tLinkTimer +#undef tSpriteIds +#undef sInterval +#undef sAnimNum +#undef sTaskId +#undef sId +#undef sNumberSpriteId + /* According to the clerk, the Pokémon allowed in Pokémon Jump are all <= 28 inches, and do not @@ -384,450 +762,251 @@ static const TaskFunc gUnknown_846B4AC[][4] = { static const struct PokemonJumpMons { u16 species; - u16 unk2; -} sPkmnJumpSpecies[] = + u16 jumpType; +} sPokeJumpMons[] = { - { .species = SPECIES_BULBASAUR, .unk2 = 2, }, - { .species = SPECIES_CHARMANDER, .unk2 = 1, }, - { .species = SPECIES_SQUIRTLE, .unk2 = 0, }, - { .species = SPECIES_CATERPIE, .unk2 = 1, }, - { .species = SPECIES_METAPOD, .unk2 = 1, }, - { .species = SPECIES_WEEDLE, .unk2 = 1, }, - { .species = SPECIES_KAKUNA, .unk2 = 1, }, - { .species = SPECIES_RATTATA, .unk2 = 1, }, - { .species = SPECIES_RATICATE, .unk2 = 1, }, - { .species = SPECIES_PIKACHU, .unk2 = 0, }, - { .species = SPECIES_SANDSHREW, .unk2 = 0, }, - { .species = SPECIES_NIDORAN_F, .unk2 = 0, }, - { .species = SPECIES_NIDORAN_M, .unk2 = 0, }, - { .species = SPECIES_CLEFAIRY, .unk2 = 0, }, - { .species = SPECIES_VULPIX, .unk2 = 0, }, - { .species = SPECIES_JIGGLYPUFF, .unk2 = 2, }, - { .species = SPECIES_ODDISH, .unk2 = 2, }, - { .species = SPECIES_PARAS, .unk2 = 1, }, - { .species = SPECIES_MEOWTH, .unk2 = 0, }, - { .species = SPECIES_PSYDUCK, .unk2 = 2, }, - { .species = SPECIES_MANKEY, .unk2 = 1, }, - { .species = SPECIES_GROWLITHE, .unk2 = 1, }, - { .species = SPECIES_POLIWAG, .unk2 = 2, }, - { .species = SPECIES_BELLSPROUT, .unk2 = 2, }, - { .species = SPECIES_SHELLDER, .unk2 = 1, }, - { .species = SPECIES_KRABBY, .unk2 = 1, }, - { .species = SPECIES_EXEGGCUTE, .unk2 = 2, }, - { .species = SPECIES_CUBONE, .unk2 = 0, }, - { .species = SPECIES_DITTO, .unk2 = 2, }, - { .species = SPECIES_EEVEE, .unk2 = 0, }, - { .species = SPECIES_OMANYTE, .unk2 = 1, }, - { .species = SPECIES_KABUTO, .unk2 = 1, }, - { .species = SPECIES_CHIKORITA, .unk2 = 2, }, - { .species = SPECIES_CYNDAQUIL, .unk2 = 1, }, - { .species = SPECIES_TOTODILE, .unk2 = 0, }, - { .species = SPECIES_SPINARAK, .unk2 = 1, }, - { .species = SPECIES_PICHU, .unk2 = 0, }, - { .species = SPECIES_CLEFFA, .unk2 = 0, }, - { .species = SPECIES_IGGLYBUFF, .unk2 = 2, }, - { .species = SPECIES_TOGEPI, .unk2 = 2, }, - { .species = SPECIES_MAREEP, .unk2 = 0, }, - { .species = SPECIES_BELLOSSOM, .unk2 = 2, }, - { .species = SPECIES_MARILL, .unk2 = 2, }, - { .species = SPECIES_SUNKERN, .unk2 = 2, }, - { .species = SPECIES_WOOPER, .unk2 = 2, }, - { .species = SPECIES_PINECO, .unk2 = 2, }, - { .species = SPECIES_SNUBBULL, .unk2 = 0, }, - { .species = SPECIES_SHUCKLE, .unk2 = 2, }, - { .species = SPECIES_TEDDIURSA, .unk2 = 0, }, - { .species = SPECIES_SLUGMA, .unk2 = 2, }, - { .species = SPECIES_SWINUB, .unk2 = 0, }, - { .species = SPECIES_HOUNDOUR, .unk2 = 1, }, - { .species = SPECIES_PHANPY, .unk2 = 0, }, - { .species = SPECIES_PORYGON2, .unk2 = 0, }, - { .species = SPECIES_TYROGUE, .unk2 = 1, }, - { .species = SPECIES_SMOOCHUM, .unk2 = 2, }, - { .species = SPECIES_ELEKID, .unk2 = 1, }, - { .species = SPECIES_MAGBY, .unk2 = 1, }, - { .species = SPECIES_LARVITAR, .unk2 = 1, }, - { .species = SPECIES_TREECKO, .unk2 = 1, }, - { .species = SPECIES_TORCHIC, .unk2 = 2, }, - { .species = SPECIES_MUDKIP, .unk2 = 0, }, - { .species = SPECIES_MARSHTOMP, .unk2 = 0, }, - { .species = SPECIES_POOCHYENA, .unk2 = 1, }, - { .species = SPECIES_ZIGZAGOON, .unk2 = 0, }, - { .species = SPECIES_LINOONE, .unk2 = 0, }, - { .species = SPECIES_WURMPLE, .unk2 = 1, }, - { .species = SPECIES_SILCOON, .unk2 = 2, }, - { .species = SPECIES_CASCOON, .unk2 = 2, }, - { .species = SPECIES_LOTAD, .unk2 = 2, }, - { .species = SPECIES_SEEDOT, .unk2 = 1, }, - { .species = SPECIES_RALTS, .unk2 = 0, }, - { .species = SPECIES_KIRLIA, .unk2 = 0, }, - { .species = SPECIES_SURSKIT, .unk2 = 2, }, - { .species = SPECIES_SHROOMISH, .unk2 = 2, }, - { .species = SPECIES_NINCADA, .unk2 = 1, }, - { .species = SPECIES_WHISMUR, .unk2 = 0, }, - { .species = SPECIES_AZURILL, .unk2 = 2, }, - { .species = SPECIES_SKITTY, .unk2 = 0, }, - { .species = SPECIES_SABLEYE, .unk2 = 0, }, - { .species = SPECIES_MAWILE, .unk2 = 0, }, - { .species = SPECIES_ARON, .unk2 = 1, }, - { .species = SPECIES_MEDITITE, .unk2 = 2, }, - { .species = SPECIES_ELECTRIKE, .unk2 = 1, }, - { .species = SPECIES_PLUSLE, .unk2 = 1, }, - { .species = SPECIES_MINUN, .unk2 = 1, }, - { .species = SPECIES_VOLBEAT, .unk2 = 0, }, - { .species = SPECIES_ILLUMISE, .unk2 = 0, }, - { .species = SPECIES_ROSELIA, .unk2 = 2, }, - { .species = SPECIES_GULPIN, .unk2 = 2, }, - { .species = SPECIES_NUMEL, .unk2 = 2, }, - { .species = SPECIES_TORKOAL, .unk2 = 2, }, - { .species = SPECIES_SPOINK, .unk2 = 0, }, - { .species = SPECIES_TRAPINCH, .unk2 = 2, }, - { .species = SPECIES_CACNEA, .unk2 = 2, }, - { .species = SPECIES_ANORITH, .unk2 = 1, }, - { .species = SPECIES_WYNAUT, .unk2 = 0, }, - { .species = SPECIES_SNORUNT, .unk2 = 0, }, - { .species = SPECIES_CLAMPERL, .unk2 = 1, }, - { .species = SPECIES_BAGON, .unk2 = 1, }, + { .species = SPECIES_BULBASAUR, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_CHARMANDER, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_SQUIRTLE, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_CATERPIE, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_METAPOD, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_WEEDLE, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_KAKUNA, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_RATTATA, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_RATICATE, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_PIKACHU, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_SANDSHREW, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_NIDORAN_F, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_NIDORAN_M, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_CLEFAIRY, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_VULPIX, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_JIGGLYPUFF, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_ODDISH, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_PARAS, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_MEOWTH, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_PSYDUCK, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_MANKEY, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_GROWLITHE, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_POLIWAG, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_BELLSPROUT, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_SHELLDER, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_KRABBY, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_EXEGGCUTE, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_CUBONE, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_DITTO, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_EEVEE, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_OMANYTE, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_KABUTO, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_CHIKORITA, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_CYNDAQUIL, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_TOTODILE, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_SPINARAK, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_PICHU, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_CLEFFA, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_IGGLYBUFF, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_TOGEPI, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_MAREEP, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_BELLOSSOM, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_MARILL, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_SUNKERN, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_WOOPER, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_PINECO, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_SNUBBULL, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_SHUCKLE, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_TEDDIURSA, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_SLUGMA, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_SWINUB, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_HOUNDOUR, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_PHANPY, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_PORYGON2, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_TYROGUE, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_SMOOCHUM, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_ELEKID, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_MAGBY, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_LARVITAR, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_TREECKO, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_TORCHIC, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_MUDKIP, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_MARSHTOMP, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_POOCHYENA, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_ZIGZAGOON, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_LINOONE, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_WURMPLE, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_SILCOON, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_CASCOON, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_LOTAD, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_SEEDOT, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_RALTS, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_KIRLIA, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_SURSKIT, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_SHROOMISH, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_NINCADA, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_WHISMUR, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_AZURILL, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_SKITTY, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_SABLEYE, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_MAWILE, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_ARON, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_MEDITITE, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_ELECTRIKE, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_PLUSLE, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_MINUN, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_VOLBEAT, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_ILLUMISE, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_ROSELIA, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_GULPIN, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_NUMEL, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_TORKOAL, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_SPOINK, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_TRAPINCH, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_CACNEA, .jumpType = JUMP_TYPE_SLOW }, + { .species = SPECIES_ANORITH, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_WYNAUT, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_SNORUNT, .jumpType = JUMP_TYPE_NORMAL }, + { .species = SPECIES_CLAMPERL, .jumpType = JUMP_TYPE_FAST }, + { .species = SPECIES_BAGON, .jumpType = JUMP_TYPE_FAST }, }; -static bool32 (* const gUnknown_846B64C[])(void) = -{ - sub_8148344, - sub_81483D0, - sub_8148464, - sub_81484D0, - sub_81485C8, - sub_81486C4, - sub_8148760, - sub_81487B4, - sub_814881C, -}; - - -static bool32 (* const gUnknown_846B670[])(void) = -{ - sub_8148398, - sub_8148418, - sub_81484B0, - sub_814856C, - sub_8148664, - sub_8148724, - sub_8148760, - sub_8148800, - sub_814881C, -}; - -// Unused, but looks like it was intended to be a hook -UNUSED u8 sub_81475C0(u8 data1, u8 priority) -{ - u8 taskId; - struct Task * task; - - taskId = CreateTask(sub_8147654, priority); - task = &gTasks[taskId]; - task->data[0] = 1; - task->data[1] = data1; - gUnknown_846B4AC[data1][0](taskId); - return taskId; -} - -// Unused, but looks like it was intended to be a hook -UNUSED bool32 sub_814760C(void) -{ - u8 taskId; - - taskId = FindTaskIdByFunc(sub_8147654); - if (taskId == 0xFF) - return FALSE; - gTasks[taskId].data[0] = 2; - return TRUE; -} - -// Unused, but looks like it was intended to be a hook -UNUSED bool32 sub_8147640(void) -{ - return FuncIsActiveTask(sub_8147654); -} - -static void sub_8147654(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - - switch (data[0]) - { - case 2: - gUnknown_846B4AC[data[1]][2](taskId); - data[0] = 3; - break; - case 3: - gUnknown_846B4AC[data[1]][3](taskId); - break; - case 4: - gUnknown_846B4AC[data[1]][1](taskId); - DestroyTask(taskId); - break; - } -} - -static void sub_81476E0(u8 taskId, s16 *data) -{ - u8 i; - struct Sprite *sprite; - - LoadCompressedSpriteSheet(&gUnknown_846B42C[data[3]]); - LoadSpritePalette(&gUnknown_846B43C[data[4]]); - for (i = 0; i < data[8]; i++) - data[13 + i] = CreateSprite(&gUnknown_846B494[data[2]], data[9], data[10], data[7]); - for (i = 0; i < data[8]; i++) - { - sprite = &gSprites[data[13 + i]]; - sprite->oam.priority = data[6]; - sprite->invisible = TRUE; - sprite->data[1] = data[5]; - sprite->data[3] = taskId; - sprite->data[4] = i; - sprite->data[5] = data[13]; - } -} - -static void sub_81477C0(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - data[2] = 0; - data[3] = 0; - data[4] = 0; - data[5] = 60; - data[6] = 0; - data[7] = 0; - data[8] = 3; - data[9] = 120; - data[10] = 88; - sub_81476E0(taskId, data); - - StartSpriteAnim(&gSprites[data[14]], 4); - gSprites[data[14]].x2 = -32; - - StartSpriteAnim(&gSprites[data[15]], 5); - gSprites[data[15]].x2 = 32; -} - -static void sub_814784C(u8 taskId) -{ - u8 i = 0; - s16 *data = gTasks[taskId].data; - - for (i = 0; i < data[8]; i++) - DestroySprite(&gSprites[data[13 + i]]); - FreeSpriteTilesByTag(gUnknown_846B42C[data[3]].tag); - FreeSpritePaletteByTag(gUnknown_846B43C[data[4]].tag); -} - -static void sub_81478BC(struct Sprite *sprite) -{ - s16 *data = gTasks[sprite->data[3]].data; - - if (data[11] % data[5] != 0) - return; - if (data[11] == data[10]) - return; - - data[10] = data[11]; - switch (sprite->data[2]) - { - case 0: - sprite->invisible = FALSE; - case 1: - case 2: - PlaySE(SE_BALL_BOUNCE_1); - StartSpriteAnim(sprite, sprite->data[2]); - break; - case 3: - PlaySE(SE_PIN); - StartSpriteAnim(sprite, sprite->data[2]); - gSprites[data[14]].invisible = FALSE; - gSprites[data[15]].invisible = FALSE; - break; - case 4: - sprite->invisible = TRUE; - gSprites[data[14]].invisible = TRUE; - gSprites[data[15]].invisible = TRUE; - data[0] = 4; - return; - } - sprite->data[2]++; -} - -static void sub_81479D4(u8 taskId) -{ - s16 *data = gTasks[taskId].data; - PlaySE(SE_BALL_BOUNCE_1); - gSprites[data[13]].callback = sub_81478BC; - gSprites[data[13]].invisible = FALSE; - gTasks[taskId].data[0] = 3; -} - -static void sub_8147A34(u8 taskId) -{ - u16 packet[6]; - s16 *data = gTasks[taskId].data; - - if (gReceivedRemoteLinkPlayers) - { - if (gRecvCmds[0][1] == 0x7FFF) - data[11] = gRecvCmds[0][2]; - if (GetMultiplayerId() == 0) - { - data[12]++; - memset(packet, 0, sizeof(packet)); - packet[0] = 0x7FFF; - packet[1] = data[12]; - Rfu_SendPacket(packet); - } - } - else - { - data[11]++; - } -} - -void StartPokemonJump(u16 partyIndex, MainCallback callback) +void StartPokemonJump(u16 partyId, MainCallback exitCallback) { u8 taskId; if (gReceivedRemoteLinkPlayers) { - gUnknown_203F3D4 = Alloc(sizeof(*gUnknown_203F3D4)); - if (gUnknown_203F3D4 != NULL) + sPokemonJump = Alloc(sizeof(*sPokemonJump)); + if (sPokemonJump) { ResetTasks(); - taskId = CreateTask(sub_8147DA0, 1); - gUnknown_203F3D4->unk8 = 0; - gUnknown_203F3D4->returnCallback = callback; - gUnknown_203F3D4->unk4 = taskId; - gUnknown_203F3D4->unk6 = GetMultiplayerId(); - sub_8147D2C(&gUnknown_203F3D4->unk82A8[gUnknown_203F3D4->unk6], &gPlayerParty[partyIndex]); - sub_8147B60(gUnknown_203F3D4); - SetWordTaskArg(taskId, 2, (uintptr_t)gUnknown_203F3D4); - SetMainCallback2(sub_8147D6C); + taskId = CreateTask(Task_StartPokemonJump, 1); + sPokemonJump->mainState = 0; + sPokemonJump->exitCallback = exitCallback; + sPokemonJump->taskId = taskId; + sPokemonJump->multiplayerId = GetMultiplayerId(); + InitJumpMonInfo(&sPokemonJump->monInfo[sPokemonJump->multiplayerId], &gPlayerParty[partyId]); + InitGame(sPokemonJump); + SetWordTaskArg(taskId, 2, (uintptr_t)sPokemonJump); + SetMainCallback2(CB2_PokemonJump); return; } } - SetMainCallback2(callback); + // Exit - Players not connected, or alloc failed + SetMainCallback2(exitCallback); } -static void sub_8147B48(void) +static void FreePokemonJump(void) { - sub_8149D24(); - Free(gUnknown_203F3D4); + FreeWindowsAndDigitObj(); + Free(sPokemonJump); } -static void sub_8147B60(struct PokemonJump1 *arg0) +static void InitGame(struct PokemonJump *jump) { - arg0->unk5 = GetLinkPlayerCount(); - arg0->unk70.unk0 = 5; - arg0->unk70.unk2 = 0; - sub_8147C20(); - sub_8147B94(arg0); - if (arg0->unk5 == MAX_RFU_PLAYERS) - sub_814B4E8(); + jump->numPlayers = GetLinkPlayerCount(); + jump->comm.funcId = FUNC_RESET_GAME; + jump->comm.data = 0; + InitPlayerAndJumpTypes(); + ResetForNewGame(jump); + if (jump->numPlayers == MAX_RFU_PLAYERS) + IncrementGamesWithMaxPlayers(); } -static void sub_8147B94(struct PokemonJump1 *arg0) +static void ResetForNewGame(struct PokemonJump *jump) { int i; - arg0->unk14 = 6; - arg0->unk18 = 6; - arg0->unk4A = 0; - arg0->unk1C = 0; - arg0->unk5C = 0; - arg0->isLeader = GetMultiplayerId() == 0; - arg0->unk8 = 0; - arg0->unkA = 0; - arg0->unkC = 0; - arg0->unkE = 0; - arg0->unk58 = 0; - arg0->unk3A = 0; - arg0->unk44 = 0; - arg0->unk54 = 0; - arg0->unk46 = 0; - arg0->unk49 = 0; - arg0->unk48 = 1; - arg0->unk70.unk8 = 0; - arg0->unk70.unk1 = 0; - arg0->unk70.unk4 = 0; - arg0->unk60 = 1; - arg0->unk4D = 0; - arg0->unk68 = 0; - arg0->unk64 = 0; - arg0->unk2C = 0; - arg0->unk30 = 0; - sub_8147C98(); - sub_81491E4(); + jump->vineState = VINE_UPSWING_LOWER; + jump->prevVineState = VINE_UPSWING_LOWER; + jump->vineTimer = 0; + jump->vineSpeed = 0; + jump->updateScore = FALSE; + jump->isLeader = GetMultiplayerId() == 0; + jump->mainState = 0; + jump->helperState = 0; + jump->excellentsInRow = 0; + jump->excellentsInRowRecord = 0; + jump->initScoreUpdate = FALSE; + jump->unused2 = 0; + jump->unused3 = 0; + jump->numPlayersAtPeak = 0; + jump->allowVineUpdates = FALSE; + jump->allPlayersReady = FALSE; + jump->funcActive = TRUE; + jump->comm.jumpScore = 0; + jump->comm.receivedBonusFlags = 0; + jump->comm.jumpsInRow = 0; + jump->unused4 = TRUE; + jump->showBonus = FALSE; + jump->skipJumpUpdate = FALSE; + jump->giveBonus = FALSE; + jump->linkTimer = 0; + jump->linkTimerLimit = 0; + ResetPlayersForNewGame(); + ResetPlayersJumpStates(); for (i = 0; i < MAX_RFU_PLAYERS; i++) { - arg0->unk7C[i] = 0; - arg0->unk9A[i] = 0; + jump->atJumpPeak[i] = FALSE; + jump->jumpTimeStarts[i] = 0; } } -static void sub_8147C20(void) +static void InitPlayerAndJumpTypes(void) { int i, index; for (i = 0; i < MAX_RFU_PLAYERS; i++) { - index = GetPokemonJumpSpeciesIdx(gUnknown_203F3D4->unk82A8[i].species); - gUnknown_203F3D4->unk82E4[i].unkC = sPkmnJumpSpecies[index].unk2; + index = GetPokemonJumpSpeciesIdx(sPokemonJump->monInfo[i].species); + sPokemonJump->players[i].monJumpType = sPokeJumpMons[index].jumpType; } - gUnknown_203F3D4->unk83AC = &gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6]; + sPokemonJump->player = &sPokemonJump->players[sPokemonJump->multiplayerId]; } -static void sub_8147C98(void) +static void ResetPlayersForNewGame(void) { int i; for (i = 0; i < MAX_RFU_PLAYERS; i++) { - gUnknown_203F3D4->unk82E4[i].unkE = 0; - gUnknown_203F3D4->unk82E4[i].unk10 = 0; - gUnknown_203F3D4->unk82E4[i].unk12 = 0; - gUnknown_203F3D4->unk82E4[i].unk0 = 0; - gUnknown_203F3D4->unk82E4[i].unk4 = 0x7FFFFFFF; - gUnknown_203F3D4->unk82E4[i].unk14 = 0; - gUnknown_203F3D4->unk8B[i] = 9; + sPokemonJump->players[i].jumpTimeStart = 0; + sPokemonJump->players[i].monState = MONSTATE_NORMAL; + sPokemonJump->players[i].prevMonState = MONSTATE_NORMAL; + sPokemonJump->players[i].jumpOffset = 0; + sPokemonJump->players[i].jumpOffsetIdx = INT_MAX; + sPokemonJump->players[i].jumpState = JUMPSTATE_NONE; + sPokemonJump->memberFuncIds[i] = FUNC_NONE; } } static s16 GetPokemonJumpSpeciesIdx(u16 species) { u32 i; - for (i = 0; i < NELEMS(sPkmnJumpSpecies); i++) + for (i = 0; i < ARRAY_COUNT(sPokeJumpMons); i++) { - if (sPkmnJumpSpecies[i].species == species) + if (sPokeJumpMons[i].species == species) return i; } return -1; // species isnt allowed } -static void sub_8147D2C(struct PokemonJump1_MonInfo *monInfo, struct Pokemon *mon) +static void InitJumpMonInfo(struct PokemonJump_MonInfo *monInfo, struct Pokemon *mon) { monInfo->species = GetMonData(mon, MON_DATA_SPECIES); monInfo->otId = GetMonData(mon, MON_DATA_OT_ID); monInfo->personality = GetMonData(mon, MON_DATA_PERSONALITY); } -static void sub_8147D58(void) +static void VBlankCB_PokemonJump(void) { TransferPlttBuffer(); LoadOam(); ProcessSpriteCopyRequests(); } -static void sub_8147D6C(void) +static void CB2_PokemonJump(void) { RunTasks(); AnimateSprites(); @@ -835,254 +1014,283 @@ static void sub_8147D6C(void) UpdatePaletteFade(); } -static void sub_8147D84(TaskFunc func) +static void SetPokeJumpTask(TaskFunc func) { - gUnknown_203F3D4->unk4 = CreateTask(func, 1); - gUnknown_203F3D4->unk8 = 0; + sPokemonJump->taskId = CreateTask(func, 1); + sPokemonJump->mainState = 0; } -static void sub_8147DA0(u8 taskId) +static void Task_StartPokemonJump(u8 taskId) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: SetVBlankCallback(NULL); ResetSpriteData(); FreeAllSpritePalettes(); - sub_8148F5C(sub_8148E80, 5); + SetTaskWithPokeJumpStruct(Task_CommunicateMonInfo, 5); FadeOutMapMusic(4); - gUnknown_203F3D4->unk8++; + sPokemonJump->mainState++; break; case 1: - if (!FuncIsActiveTask(sub_8148E80)) + if (!FuncIsActiveTask(Task_CommunicateMonInfo)) { - sub_8149CEC(&gUnknown_203F3D4->unkA4); + StartPokeJumpGfx(&sPokemonJump->jumpGfx); LoadWirelessStatusIndicatorSpriteGfx(); CreateWirelessStatusIndicatorSprite(0, 0); - gUnknown_203F3D4->unk8++; + sPokemonJump->mainState++; } break; case 2: - if (!sub_8149D68() && IsNotWaitingForBGMStop() == TRUE) + if (!IsPokeJumpGfxFuncFinished() && IsNotWaitingForBGMStop() == TRUE) { FadeOutAndPlayNewMapMusic(MUS_POKE_JUMP, 8); - gUnknown_203F3D4->unk8++; + sPokemonJump->mainState++; } break; case 3: if (IsLinkTaskFinished()) { - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); - SetVBlankCallback(sub_8147D58); - gUnknown_203F3D4->unk8++; + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); + SetVBlankCallback(VBlankCB_PokemonJump); + sPokemonJump->mainState++; } break; case 4: UpdatePaletteFade(); if (!gPaletteFade.active) { - gUnknown_203F3D4->unk7 = 0; - gUnknown_203F3D4->unk8++; + sPokemonJump->startDelayTimer = 0; + sPokemonJump->mainState++; } break; case 5: - gUnknown_203F3D4->unk7++; - if (gUnknown_203F3D4->unk7 >= 20) + sPokemonJump->startDelayTimer++; + if (sPokemonJump->startDelayTimer >= 20) { - if (gUnknown_203F3D4->isLeader) - sub_8147D84(sub_814807C); + if (sPokemonJump->isLeader) + SetPokeJumpTask(Task_PokemonJump_Leader); else - sub_8147D84(sub_8148290); + SetPokeJumpTask(Task_PokemonJump_Member); - sub_8148F7C(); + InitVineState(); DestroyTask(taskId); } break; } } -static void sub_8147F10(int arg0) +static void SetLinkTimeInterval(int intervalId) { - if (arg0 == 0) + if (intervalId == LINK_INTERVAL_NONE) { - gUnknown_203F3D4->unk30 = 0x1111; - gUnknown_203F3D4->unk2C = 1; + // Link data is sent when timer reaches 0. + // Set timer to 1 and set limit to special + // 'stopped' value so timer won't change + sPokemonJump->linkTimerLimit = LINK_TIMER_STOPPED; + sPokemonJump->linkTimer = 1; } else { - gUnknown_203F3D4->unk30 = (1 << (arg0 - 1)) - 1; - gUnknown_203F3D4->unk2C = 0; + sPokemonJump->linkTimerLimit = (1 << (intervalId - 1)) - 1; + sPokemonJump->linkTimer = 0; } } -static void sub_8147F4C(u8 arg0) +static void SetFunc_Leader(u8 funcId) { int i; - gUnknown_203F3D4->unk70.unk0 = arg0; - gUnknown_203F3D4->unk8 = 0; - gUnknown_203F3D4->unkA = 0; - gUnknown_203F3D4->unk48 = 1; - gUnknown_203F3D4->unk49 = 0; - for (i = 1; i < gUnknown_203F3D4->unk5; i++) - gUnknown_203F3D4->unk82E4[i].unk18 = 0; + sPokemonJump->comm.funcId = funcId; + sPokemonJump->mainState = 0; + sPokemonJump->helperState = 0; + sPokemonJump->funcActive = TRUE; + sPokemonJump->allPlayersReady = FALSE; + for (i = 1; i < sPokemonJump->numPlayers; i++) + sPokemonJump->players[i].funcFinished = FALSE; } -static void sub_8147FA0(void) +static void RecvLinkData_Leader(void) { int i; - int count; - u16 var0; - u8 var1; - u16 var2; + int numReady; + u16 monState; + u8 funcId; + u16 playAgainState; - for (i = 1, count = 0; i < gUnknown_203F3D4->unk5; i++) + for (i = 1, numReady = 0; i < sPokemonJump->numPlayers; i++) { - var0 = gUnknown_203F3D4->unk82E4[i].unk10; - if (sub_8149C24(&gUnknown_203F3D4->unk82E4[i], i, &var1, &var2)) + monState = sPokemonJump->players[i].monState; + if (RecvPacket_MemberStateToLeader(&sPokemonJump->players[i], i, &funcId, &playAgainState)) { - gUnknown_203F3D4->unk90[i] = var2; - gUnknown_203F3D4->unk8B[i] = var1; - gUnknown_203F3D4->unk82E4[i].unk12 = var0; + sPokemonJump->playAgainStates[i] = playAgainState; + sPokemonJump->memberFuncIds[i] = funcId; + sPokemonJump->players[i].prevMonState = monState; } - if (gUnknown_203F3D4->unk82E4[i].unk18 && gUnknown_203F3D4->unk8B[i] == gUnknown_203F3D4->unk70.unk0) - count++; + if (sPokemonJump->players[i].funcFinished && sPokemonJump->memberFuncIds[i] == sPokemonJump->comm.funcId) + numReady++; } - if (count == gUnknown_203F3D4->unk5 - 1) - gUnknown_203F3D4->unk49 = 1; + if (numReady == sPokemonJump->numPlayers - 1) + sPokemonJump->allPlayersReady = TRUE; } -static void sub_814807C(u8 taskId) +static bool32 (* const sPokeJumpLeaderFuncs[])(void) = { - sub_8147FA0(); - sub_8149534(); - if (!gUnknown_203F3D4->unk48 && gUnknown_203F3D4->unk49) + [FUNC_GAME_INTRO] = GameIntro_Leader, + [FUNC_WAIT_ROUND] = WaitRound_Leader, + [FUNC_GAME_ROUND] = GameRound_Leader, + [FUNC_GAME_OVER] = GameOver_Leader, + [FUNC_ASK_PLAY_AGAIN] = AskPlayAgain_Leader, + [FUNC_RESET_GAME] = ResetGame_Leader, + [FUNC_EXIT] = ExitGame, + [FUNC_GIVE_PRIZE] = GivePrize_Leader, + [FUNC_SAVE] = SavePokeJump, +}; + +static void Task_PokemonJump_Leader(u8 taskId) +{ + RecvLinkData_Leader(); + TryUpdateScore(); + if (!sPokemonJump->funcActive && sPokemonJump->allPlayersReady) { - sub_8147F4C(gUnknown_203F3D4->unk4C); - sub_8147F10(3); + SetFunc_Leader(sPokemonJump->nextFuncId); + SetLinkTimeInterval(LINK_INTERVAL_SHORT); } - if (gUnknown_203F3D4->unk48 == 1) + if (sPokemonJump->funcActive == TRUE) { - if (!gUnknown_846B64C[gUnknown_203F3D4->unk70.unk0]()) + if (!sPokeJumpLeaderFuncs[sPokemonJump->comm.funcId]()) { - gUnknown_203F3D4->unk48 = 0; - gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 = 1; + sPokemonJump->funcActive = FALSE; + sPokemonJump->players[sPokemonJump->multiplayerId].funcFinished = TRUE; } } - sub_81492D8(); - sub_8148104(); + UpdateGame(); + SendLinkData_Leader(); } -static void sub_8148104(void) +static void SendLinkData_Leader(void) { - if (!gUnknown_203F3D4->unk2C) - sub_8149AF8(gUnknown_203F3D4->unk82E4, &gUnknown_203F3D4->unk70); + if (!sPokemonJump->linkTimer) + SendPacket_LeaderState(sPokemonJump->players, &sPokemonJump->comm); - if (gUnknown_203F3D4->unk30 != 0x1111) + if (sPokemonJump->linkTimerLimit != LINK_TIMER_STOPPED) { - gUnknown_203F3D4->unk2C++; - gUnknown_203F3D4->unk2C &= gUnknown_203F3D4->unk30; + sPokemonJump->linkTimer++; + sPokemonJump->linkTimer &= sPokemonJump->linkTimerLimit; } } -static void sub_8148140(u8 arg0) +static void SetFunc_Member(u8 funcId) { - gUnknown_203F3D4->unk70.unk0 = arg0; - gUnknown_203F3D4->unk8 = 0; - gUnknown_203F3D4->unkA = 0; - gUnknown_203F3D4->unk48 = 1; - gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 = 0; + sPokemonJump->comm.funcId = funcId; + sPokemonJump->mainState = 0; + sPokemonJump->helperState = 0; + sPokemonJump->funcActive = TRUE; + sPokemonJump->players[sPokemonJump->multiplayerId].funcFinished = FALSE; } -static void sub_8148174(void) +static void RecvLinkData_Member(void) { int i; - u16 var0; - struct PokemonJump1Sub sp0; + u16 monState; + struct PokemonJump_CommData leaderData; - var0 = gUnknown_203F3D4->unk82E4[0].unk10; - if (sub_8149B7C(gUnknown_203F3D4->unk82E4, &sp0)) + monState = sPokemonJump->players[0].monState; + if (RecvPacket_LeaderState(sPokemonJump->players, &leaderData)) { - if (gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 == 1 - && sp0.unk0 != gUnknown_203F3D4->unk70.unk0) + if (sPokemonJump->players[sPokemonJump->multiplayerId].funcFinished == TRUE + && leaderData.funcId != sPokemonJump->comm.funcId) { - sub_8148140(sp0.unk0); + SetFunc_Member(leaderData.funcId); } - if (gUnknown_203F3D4->unk70.unk8 != sp0.unk8) + if (sPokemonJump->comm.jumpScore != leaderData.jumpScore) { - gUnknown_203F3D4->unk70.unk8 = sp0.unk8; - gUnknown_203F3D4->unk5C = 1; - gUnknown_203F3D4->unk70.unk1 = sp0.unk1; - if (gUnknown_203F3D4->unk70.unk1) - gUnknown_203F3D4->unk4D = 1; + sPokemonJump->comm.jumpScore = leaderData.jumpScore; + sPokemonJump->updateScore = TRUE; + sPokemonJump->comm.receivedBonusFlags = leaderData.receivedBonusFlags; + if (sPokemonJump->comm.receivedBonusFlags) + sPokemonJump->showBonus = TRUE; else - gUnknown_203F3D4->unk4D = 0; + sPokemonJump->showBonus = FALSE; } - gUnknown_203F3D4->unk70.unk2 = sp0.unk2; - gUnknown_203F3D4->unk70.unk4 = sp0.unk4; - gUnknown_203F3D4->unk82E4[0].unk12 = var0; + sPokemonJump->comm.data = leaderData.data; + sPokemonJump->comm.jumpsInRow = leaderData.jumpsInRow; + sPokemonJump->players[0].prevMonState = monState; } - for (i = 1; i < gUnknown_203F3D4->unk5; i++) + for (i = 1; i < sPokemonJump->numPlayers; i++) { - if (i != gUnknown_203F3D4->unk6) + if (i != sPokemonJump->multiplayerId) { - var0 = gUnknown_203F3D4->unk82E4[i].unk10; - if (sub_8149C90(&gUnknown_203F3D4->unk82E4[i], i)) - gUnknown_203F3D4->unk82E4[i].unk12 = var0; + monState = sPokemonJump->players[i].monState; + if (RecvPacket_MemberStateToMember(&sPokemonJump->players[i], i)) + sPokemonJump->players[i].prevMonState = monState; } } } -static void sub_8148290(u8 taskId) +static bool32 (* const sPokeJumpMemberFuncs[])(void) = { - sub_8148174(); - if (gUnknown_203F3D4->unk48) + [FUNC_GAME_INTRO] = GameIntro_Member, + [FUNC_WAIT_ROUND] = WaitRound_Member, + [FUNC_GAME_ROUND] = GameRound_Member, + [FUNC_GAME_OVER] = GameOver_Member, + [FUNC_ASK_PLAY_AGAIN] = AskPlayAgain_Member, + [FUNC_RESET_GAME] = ResetGame_Member, + [FUNC_EXIT] = ExitGame, + [FUNC_GIVE_PRIZE] = GivePrize_Member, + [FUNC_SAVE] = SavePokeJump, +}; + +static void Task_PokemonJump_Member(u8 taskId) +{ + RecvLinkData_Member(); + if (sPokemonJump->funcActive) { - if (!gUnknown_846B670[gUnknown_203F3D4->unk70.unk0]()) + if (!sPokeJumpMemberFuncs[sPokemonJump->comm.funcId]()) { - gUnknown_203F3D4->unk48 = 0; - gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk18 = 1; - sub_8147F10(3); + sPokemonJump->funcActive = FALSE; + sPokemonJump->players[sPokemonJump->multiplayerId].funcFinished = TRUE; + SetLinkTimeInterval(LINK_INTERVAL_SHORT); } } - sub_81492D8(); - sub_81482F8(); + UpdateGame(); + SendLinkData_Member(); } -static void sub_81482F8(void) +static void SendLinkData_Member(void) { - if (!gUnknown_203F3D4->unk2C) - sub_8149BF4(&gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6], gUnknown_203F3D4->unk70.unk0, gUnknown_203F3D4->unk42); + if (!sPokemonJump->linkTimer) + SendPacket_MemberState(&sPokemonJump->players[sPokemonJump->multiplayerId], sPokemonJump->comm.funcId, sPokemonJump->playAgainComm); - if (gUnknown_203F3D4->unk30 != 0x1111) + if (sPokemonJump->linkTimerLimit != LINK_TIMER_STOPPED) { - gUnknown_203F3D4->unk2C++; - gUnknown_203F3D4->unk2C &= gUnknown_203F3D4->unk30; + sPokemonJump->linkTimer++; + sPokemonJump->linkTimer &= sPokemonJump->linkTimerLimit; } } -static bool32 sub_8148344(void) +static bool32 GameIntro_Leader(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - sub_8147F10(3); - gUnknown_203F3D4->unk8++; + SetLinkTimeInterval(LINK_INTERVAL_SHORT); + sPokemonJump->mainState++; // fall through case 1: - if (!sub_81488DC()) + if (!DoGameIntro()) { - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unk4A; - gUnknown_203F3D4->unk4C = 1; + sPokemonJump->comm.data = sPokemonJump->vineTimer; + sPokemonJump->nextFuncId = FUNC_WAIT_ROUND; return FALSE; } break; @@ -1091,35 +1299,35 @@ static bool32 sub_8148344(void) return TRUE; } -static bool32 sub_8148398(void) +static bool32 GameIntro_Member(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - sub_8147F10(0); - gUnknown_203F3D4->unk24 = gUnknown_203F3D4->unk70.unk2; - gUnknown_203F3D4->unk8++; + SetLinkTimeInterval(LINK_INTERVAL_NONE); + sPokemonJump->rngSeed = sPokemonJump->comm.data; + sPokemonJump->mainState++; // fall through case 1: - return sub_81488DC(); + return DoGameIntro(); } return TRUE; } -static bool32 sub_81483D0(void) +static bool32 WaitRound_Leader(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - sub_81491E4(); - sub_8147F10(5); - gUnknown_203F3D4->unk8++; + ResetPlayersJumpStates(); + SetLinkTimeInterval(LINK_INTERVAL_LONG); + sPokemonJump->mainState++; break; case 1: - if (gUnknown_203F3D4->unk49) + if (sPokemonJump->allPlayersReady) { - gUnknown_203F3D4->unk4C = 2; + sPokemonJump->nextFuncId = FUNC_GAME_ROUND; return FALSE; } break; @@ -1128,18 +1336,18 @@ static bool32 sub_81483D0(void) return TRUE; } -static bool32 sub_8148418(void) +static bool32 WaitRound_Member(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - sub_81491E4(); - sub_8147F10(0); - gUnknown_203F3D4->unk4A = gUnknown_203F3D4->unk70.unk2; - gUnknown_203F3D4->unk8++; + ResetPlayersJumpStates(); + SetLinkTimeInterval(LINK_INTERVAL_NONE); + sPokemonJump->vineTimer = sPokemonJump->comm.data; + sPokemonJump->mainState++; // fall through case 1: - if (sub_8149804()) + if (AreLinkQueuesEmpty()) return FALSE; break; } @@ -1147,67 +1355,68 @@ static bool32 sub_8148418(void) return TRUE; } -static bool32 sub_8148464(void) +static bool32 GameRound_Leader(void) { - if (!sub_81489C8()) + if (!HandleSwingRound()) { - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unk4A; - gUnknown_203F3D4->unk4C = 1; + sPokemonJump->comm.data = sPokemonJump->vineTimer; + sPokemonJump->nextFuncId = FUNC_WAIT_ROUND; } - else if (sub_8149630()) + else if (UpdateVineHitStates()) { return TRUE; } else { - sub_81491B4(); - gUnknown_203F3D4->unk4C = 3; + // Someone hit the vine + ResetVineAfterHit(); + sPokemonJump->nextFuncId = FUNC_GAME_OVER; } return FALSE; } -static bool32 sub_81484B0(void) +static bool32 GameRound_Member(void) { - if (!sub_81489C8()) + if (!HandleSwingRound()) ; - else if (sub_8149630()) + else if (UpdateVineHitStates()) return TRUE; - else - sub_81491B4(); + else // Someone hit the vine + ResetVineAfterHit(); return FALSE; } -static bool32 sub_81484D0(void) +static bool32 GameOver_Leader(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - sub_8149630(); - if (sub_81496D4()) - gUnknown_203F3D4->unk8++; + UpdateVineHitStates(); + if (AllPlayersJumpedOrHit()) + sPokemonJump->mainState++; break; case 1: - if (!sub_8148A60()) + if (!DoVineHitEffect()) { - if (sub_81498B4()) + if (HasEnoughScoreForPrize()) { - gUnknown_203F3D4->unk70.unk2 = sub_81498D8(); - gUnknown_203F3D4->unk4C = 7; + sPokemonJump->comm.data = GetPrizeData(); + sPokemonJump->nextFuncId = FUNC_GIVE_PRIZE; } - else if (gUnknown_203F3D4->unk70.unk4 >= 200) + else if (sPokemonJump->comm.jumpsInRow >= 200) { - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unkE; - gUnknown_203F3D4->unk4C = 8; + sPokemonJump->comm.data = sPokemonJump->excellentsInRowRecord; + sPokemonJump->nextFuncId = FUNC_SAVE; } else { - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unkE; - gUnknown_203F3D4->unk4C = 4; + sPokemonJump->comm.data = sPokemonJump->excellentsInRowRecord; + sPokemonJump->nextFuncId = FUNC_ASK_PLAY_AGAIN; } - gUnknown_203F3D4->unk8++; + sPokemonJump->mainState++; return FALSE; } break; @@ -1218,20 +1427,20 @@ static bool32 sub_81484D0(void) return TRUE; } -static bool32 sub_814856C(void) +static bool32 GameOver_Member(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - if (!sub_8149630()) - sub_81491B4(); - if (sub_81496D4()) - gUnknown_203F3D4->unk8++; + if (!UpdateVineHitStates()) + ResetVineAfterHit(); + if (AllPlayersJumpedOrHit()) + sPokemonJump->mainState++; break; case 1: - if (!sub_8148A60()) + if (!DoVineHitEffect()) { - gUnknown_203F3D4->unk8++; + sPokemonJump->mainState++; return FALSE; } break; @@ -1242,30 +1451,30 @@ static bool32 sub_814856C(void) return TRUE; } -static bool32 sub_81485C8(void) +static bool32 AskPlayAgain_Leader(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - sub_8147F10(4); - gUnknown_203F3D4->unk8++; + SetLinkTimeInterval(LINK_INTERVAL_MEDIUM); + sPokemonJump->mainState++; // fall through case 1: - if (!sub_8148C80()) + if (!DoPlayAgainPrompt()) { - sub_814B494(gUnknown_203F3D4->unk70.unk8, gUnknown_203F3D4->unk70.unk4, gUnknown_203F3D4->unk70.unk2); - gUnknown_203F3D4->unk8++; + TryUpdateRecords(sPokemonJump->comm.jumpScore, sPokemonJump->comm.jumpsInRow, sPokemonJump->comm.data); + sPokemonJump->mainState++; } break; case 2: - if (gUnknown_203F3D4->unk49) + if (sPokemonJump->allPlayersReady) { - if (sub_8149748()) - gUnknown_203F3D4->unk4C = 5; + if (ShouldPlayAgain()) + sPokemonJump->nextFuncId = FUNC_RESET_GAME; else - gUnknown_203F3D4->unk4C = 6; + sPokemonJump->nextFuncId = FUNC_EXIT; - gUnknown_203F3D4->unk8++; + sPokemonJump->mainState++; return FALSE; } break; @@ -1276,19 +1485,19 @@ static bool32 sub_81485C8(void) return TRUE; } -static bool32 sub_8148664(void) +static bool32 AskPlayAgain_Member(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - sub_8147F10(0); - gUnknown_203F3D4->unk8++; + SetLinkTimeInterval(LINK_INTERVAL_NONE); + sPokemonJump->mainState++; // fall through case 1: - if (!sub_8148C80()) + if (!DoPlayAgainPrompt()) { - sub_814B494(gUnknown_203F3D4->unk70.unk8, gUnknown_203F3D4->unk70.unk4, gUnknown_203F3D4->unk70.unk2); - gUnknown_203F3D4->unk42 = gUnknown_203F3D4->unk45; + TryUpdateRecords(sPokemonJump->comm.jumpScore, sPokemonJump->comm.jumpsInRow, sPokemonJump->comm.data); + sPokemonJump->playAgainComm = sPokemonJump->playAgainState; return FALSE; } break; @@ -1297,21 +1506,21 @@ static bool32 sub_8148664(void) return TRUE; } -static bool32 sub_81486C4(void) +static bool32 ResetGame_Leader(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - if (!sub_8148E2C()) - gUnknown_203F3D4->unk8++; + if (!CloseMessageAndResetScore()) + sPokemonJump->mainState++; break; case 1: - if (gUnknown_203F3D4->unk49) + if (sPokemonJump->allPlayersReady) { - sub_8147B94(gUnknown_203F3D4); - gUnknown_203F3D4->unk24 = Random(); - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unk24; - gUnknown_203F3D4->unk4C = 0; + ResetForNewGame(sPokemonJump); + sPokemonJump->rngSeed = Random(); + sPokemonJump->comm.data = sPokemonJump->rngSeed; + sPokemonJump->nextFuncId = FUNC_GAME_INTRO; return FALSE; } break; @@ -1320,15 +1529,15 @@ static bool32 sub_81486C4(void) return TRUE; } -static bool32 sub_8148724(void) +static bool32 ResetGame_Member(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - if (!sub_8148E2C()) + if (!CloseMessageAndResetScore()) { - sub_8147B94(gUnknown_203F3D4); - gUnknown_203F3D4->unk8++; + ResetForNewGame(sPokemonJump); + sPokemonJump->mainState++; return FALSE; } break; @@ -1339,22 +1548,22 @@ static bool32 sub_8148724(void) return TRUE; } -static bool32 sub_8148760(void) +static bool32 ExitGame(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - gUnknown_203F3D4->unk8 = 1; + sPokemonJump->mainState = 1; break; case 1: - sub_8147F10(0); - gUnknown_203F3D4->unk8++; + SetLinkTimeInterval(LINK_INTERVAL_NONE); + sPokemonJump->mainState++; break; case 2: - if (!sub_8148D5C()) + if (!ClosePokeJumpLink()) { - SetMainCallback2(gUnknown_203F3D4->returnCallback); - sub_8147B48(); + SetMainCallback2(sPokemonJump->exitCallback); + FreePokemonJump(); } break; } @@ -1362,19 +1571,19 @@ static bool32 sub_8148760(void) return TRUE; } -static bool32 sub_81487B4(void) +static bool32 GivePrize_Leader(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - sub_8147F10(4); - gUnknown_203F3D4->unk8++; + SetLinkTimeInterval(LINK_INTERVAL_MEDIUM); + sPokemonJump->mainState++; break; case 1: - if (!sub_8148B54()) + if (!TryGivePrize()) { - gUnknown_203F3D4->unk70.unk2 = gUnknown_203F3D4->unkE; - gUnknown_203F3D4->unk4C = 8; + sPokemonJump->comm.data = sPokemonJump->excellentsInRowRecord; + sPokemonJump->nextFuncId = FUNC_SAVE; return FALSE; } break; @@ -1383,49 +1592,49 @@ static bool32 sub_81487B4(void) return TRUE; } -static bool32 sub_8148800(void) +static bool32 GivePrize_Member(void) { - sub_8147F10(0); - if (!sub_8148B54()) + SetLinkTimeInterval(LINK_INTERVAL_NONE); + if (!TryGivePrize()) return FALSE; else return TRUE; } -static bool32 sub_814881C(void) +static bool32 SavePokeJump(void) { - switch (gUnknown_203F3D4->unk8) + switch (sPokemonJump->mainState) { case 0: - sub_814B494(gUnknown_203F3D4->unk70.unk8, gUnknown_203F3D4->unk70.unk4, gUnknown_203F3D4->unk70.unk2); - sub_8149D40(5); - gUnknown_203F3D4->unk8++; + TryUpdateRecords(sPokemonJump->comm.jumpScore, sPokemonJump->comm.jumpsInRow, sPokemonJump->comm.data); + SetUpPokeJumpGfxFuncById(GFXFUNC_MSG_SAVING); + sPokemonJump->mainState++; break; case 1: - if (!sub_8149D68()) + if (!IsPokeJumpGfxFuncFinished()) { - sub_8147F10(0); - gUnknown_203F3D4->unk8++; + SetLinkTimeInterval(LINK_INTERVAL_NONE); + sPokemonJump->mainState++; } break; case 2: - if (sub_8149804()) + if (AreLinkQueuesEmpty()) { CreateTask(Task_LinkSave, 6); - gUnknown_203F3D4->unk8++; + sPokemonJump->mainState++; } break; case 3: if (!FuncIsActiveTask(Task_LinkSave)) { - sub_814A6CC(); - gUnknown_203F3D4->unk8++; + ClearMessageWindow(); + sPokemonJump->mainState++; } break; case 4: - if (!sub_814A6FC()) + if (!RemoveMessageWindow()) { - gUnknown_203F3D4->unk4C = 4; + sPokemonJump->nextFuncId = FUNC_ASK_PLAY_AGAIN; return FALSE; } break; @@ -1434,52 +1643,52 @@ static bool32 sub_814881C(void) return TRUE; } -static bool32 sub_81488DC(void) +static bool32 DoGameIntro(void) { - switch (gUnknown_203F3D4->unkA) + switch (sPokemonJump->helperState) { case 0: - sub_8149D40(2); - sub_814AAA0(); - gUnknown_203F3D4->unkA++; + SetUpPokeJumpGfxFuncById(GFXFUNC_SHOW_NAMES_HIGHLIGHT); + ResetMonSpriteSubpriorities(); + sPokemonJump->helperState++; break; case 1: - if (!sub_8149D68()) + if (!IsPokeJumpGfxFuncFinished()) { - sub_814AAB4(gUnknown_203F3D4->unk6); - gUnknown_203F3D4->unk3C = 0; - gUnknown_203F3D4->unkA++; + StartMonIntroBounce(sPokemonJump->multiplayerId); + sPokemonJump->timer = 0; + sPokemonJump->helperState++; } break; case 2: - if (++gUnknown_203F3D4->unk3C > 120) + if (++sPokemonJump->timer > 120) { - sub_8149D40(3); - gUnknown_203F3D4->unkA++; + SetUpPokeJumpGfxFuncById(GFXFUNC_ERASE_NAMES); + sPokemonJump->helperState++; } break; case 3: - if (sub_8149D68() != 1 && sub_814AAC8() != 1) - gUnknown_203F3D4->unkA++; + if (IsPokeJumpGfxFuncFinished() != TRUE && IsMonIntroBounceActive() != TRUE) + sPokemonJump->helperState++; break; case 4: - sub_8149D40(9); - gUnknown_203F3D4->unkA++; + SetUpPokeJumpGfxFuncById(GFXFUNC_COUNTDOWN); + sPokemonJump->helperState++; break; case 5: - if (!sub_8149D68()) + if (!IsPokeJumpGfxFuncFinished()) { - sub_814935C(); - sub_814A3E4(); - gUnknown_203F3D4->unkA++; + DisallowVineUpdates(); + SetUpResetVineGfx(); + sPokemonJump->helperState++; } break; case 6: - if (!sub_814A408()) + if (!ResetVineGfx()) { - sub_814936C(); - sub_8148F9C(); - gUnknown_203F3D4->unkA++; + AllowVineUpdates(); + ResetVineState(); + sPokemonJump->helperState++; return FALSE; } break; @@ -1490,85 +1699,88 @@ static bool32 sub_81488DC(void) return TRUE; } -static bool32 sub_81489C8(void) +// Update the vine and wait for player to input a jump +// Returns false when vine reaches the 'hit' point, after +// which input is ignored +static bool32 HandleSwingRound(void) { - sub_8148FE0(); - if (gUnknown_203F3D4->unk36) + UpdateVineState(); + if (sPokemonJump->ignoreJumpInput) { - gUnknown_203F3D4->unk36 = 0; + sPokemonJump->ignoreJumpInput = FALSE; return FALSE; } - switch (gUnknown_203F3D4->unkA) + switch (sPokemonJump->helperState) { case 0: - if (sub_814922C(0)) - gUnknown_203F3D4->unkA++; + if (IsPlayersMonState(MONSTATE_NORMAL)) + sPokemonJump->helperState++; else break; // fall through case 1: - if (gMain.newKeys & A_BUTTON) + if (JOY_NEW(A_BUTTON)) { - sub_8149260(); - sub_8147F10(3); - gUnknown_203F3D4->unkA++; + SetMonStateJump(); + SetLinkTimeInterval(LINK_INTERVAL_SHORT); + sPokemonJump->helperState++; } break; case 2: - if (sub_814922C(1) == TRUE) - gUnknown_203F3D4->unkA++; + if (IsPlayersMonState(MONSTATE_JUMP) == TRUE) + sPokemonJump->helperState++; break; case 3: - if (sub_814922C(0) == TRUE) - gUnknown_203F3D4->unkA = 0; + if (IsPlayersMonState(MONSTATE_NORMAL) == TRUE) + sPokemonJump->helperState = 0; break; } return TRUE; } -static bool32 sub_8148A60(void) +static bool32 DoVineHitEffect(void) { int i; - switch (gUnknown_203F3D4->unkA) + switch (sPokemonJump->helperState) { case 0: - for (i = 0; i < gUnknown_203F3D4->unk5; i++) + for (i = 0; i < sPokemonJump->numPlayers; i++) { - if (sub_814AA78(i) == 1) + if (IsMonHitShakeActive(i) == TRUE) return TRUE; } - gUnknown_203F3D4->unkA++; + sPokemonJump->helperState++; break; case 1: - for (i = 0; i < gUnknown_203F3D4->unk5; i++) + for (i = 0; i < sPokemonJump->numPlayers; i++) { - if (gUnknown_203F3D4->unk82E4[i].unk10 == 2) - sub_814AA60(i); + if (sPokemonJump->players[i].monState == MONSTATE_HIT) + StartMonHitFlash(i); } - sub_8149D40(1); - gUnknown_203F3D4->unk3C = 0; - gUnknown_203F3D4->unkA++; + SetUpPokeJumpGfxFuncById(GFXFUNC_SHOW_NAMES); + sPokemonJump->timer = 0; + sPokemonJump->helperState++; break; case 2: - if (++gUnknown_203F3D4->unk3C > 100) + if (++sPokemonJump->timer > 100) { - sub_8149D40(3); - gUnknown_203F3D4->unk3C = 0; - gUnknown_203F3D4->unkA++; + SetUpPokeJumpGfxFuncById(GFXFUNC_ERASE_NAMES); + sPokemonJump->timer = 0; + sPokemonJump->helperState++; } break; case 3: - if (!sub_8149D68()) + if (!IsPokeJumpGfxFuncFinished()) { - sub_814AA8C(); - gUnknown_203F3D4->unk70.unk1 = 0; - sub_8149210(); - gUnknown_203F3D4->unkA++; + StopMonHitFlash(); + sPokemonJump->comm.receivedBonusFlags = 0; + ResetPlayersMonState(); + sPokemonJump->helperState++; return FALSE; } break; @@ -1579,58 +1791,61 @@ static bool32 sub_8148A60(void) return TRUE; } -static bool32 sub_8148B54(void) +static bool32 TryGivePrize(void) { - switch (gUnknown_203F3D4->unkA) + switch (sPokemonJump->helperState) { case 0: - sub_8149900(gUnknown_203F3D4->unk70.unk2, &gUnknown_203F3D4->unk3E, &gUnknown_203F3D4->unk40); - sub_814A468(gUnknown_203F3D4->unk3E, gUnknown_203F3D4->unk40); - gUnknown_203F3D4->unkA++; + UnpackPrizeData(sPokemonJump->comm.data, &sPokemonJump->prizeItemId, &sPokemonJump->prizeItemQuantity); + PrintPrizeMessage(sPokemonJump->prizeItemId, sPokemonJump->prizeItemQuantity); + sPokemonJump->helperState++; break; case 1: case 4: - if (!sub_814A62C()) + if (!DoPrizeMessageAndFanfare()) { - gUnknown_203F3D4->unk3C = 0; - gUnknown_203F3D4->unkA++; + sPokemonJump->timer = 0; + sPokemonJump->helperState++; } break; case 2: case 5: - gUnknown_203F3D4->unk3C++; - if (gMain.newKeys & (A_BUTTON | B_BUTTON) || gUnknown_203F3D4->unk3C > 180) + // Wait to continue after message + sPokemonJump->timer++; + if (JOY_NEW(A_BUTTON | B_BUTTON) || sPokemonJump->timer > 180) { - sub_814A6CC(); - gUnknown_203F3D4->unkA++; + ClearMessageWindow(); + sPokemonJump->helperState++; } break; case 3: - if (!sub_814A6FC()) + if (!RemoveMessageWindow()) { - gUnknown_203F3D4->unk40 = sub_8149978(gUnknown_203F3D4->unk3E, gUnknown_203F3D4->unk40); - if (gUnknown_203F3D4->unk40 && AddBagItem(gUnknown_203F3D4->unk3E, gUnknown_203F3D4->unk40)) + sPokemonJump->prizeItemQuantity = GetQuantityLimitedByBag(sPokemonJump->prizeItemId, sPokemonJump->prizeItemQuantity); + if (sPokemonJump->prizeItemQuantity && AddBagItem(sPokemonJump->prizeItemId, sPokemonJump->prizeItemQuantity)) { - if (!CheckBagHasSpace(gUnknown_203F3D4->unk3E, 1)) + if (!CheckBagHasSpace(sPokemonJump->prizeItemId, 1)) { - sub_814A53C(gUnknown_203F3D4->unk3E); - gUnknown_203F3D4->unkA = 4; + // An item was given successfully, but no room for any more. + // It's possible the full prize quantity had to be limited + PrintPrizeFilledBagMessage(sPokemonJump->prizeItemId); + sPokemonJump->helperState = 4; // Do message } else { - gUnknown_203F3D4->unkA = 6; + sPokemonJump->helperState = 6; // Exit break; } } else { - sub_814A5B4(gUnknown_203F3D4->unk3E); - gUnknown_203F3D4->unkA = 4; + PrintNoRoomForPrizeMessage(sPokemonJump->prizeItemId); + sPokemonJump->helperState = 4; // Do message } } break; case 6: - if (!sub_814A6FC()) + if (!RemoveMessageWindow()) return FALSE; break; } @@ -1638,49 +1853,49 @@ static bool32 sub_8148B54(void) return TRUE; } -static bool32 sub_8148C80(void) +static bool32 DoPlayAgainPrompt(void) { s8 input; - switch (gUnknown_203F3D4->unkA) + switch (sPokemonJump->helperState) { case 0: - sub_8149D40(4); - gUnknown_203F3D4->unkA++; + SetUpPokeJumpGfxFuncById(GFXFUNC_MSG_PLAY_AGAIN); + sPokemonJump->helperState++; break; case 1: - if (!sub_8149D68()) - gUnknown_203F3D4->unkA++; + if (!IsPokeJumpGfxFuncFinished()) + sPokemonJump->helperState++; break; case 2: - input = sub_814A744(); + input = HandlePlayAgainInput(); switch (input) { case MENU_B_PRESSED: - case 1: - gUnknown_203F3D4->unk45 = 1; - sub_8149D40(6); - gUnknown_203F3D4->unkA++; + case 1: // No + sPokemonJump->playAgainState = PLAY_AGAIN_NO; + SetUpPokeJumpGfxFuncById(GFXFUNC_ERASE_MSG); + sPokemonJump->helperState++; break; - case 0: - gUnknown_203F3D4->unk45 = 2; - sub_8149D40(6); - gUnknown_203F3D4->unkA++; + case 0: // Yes + sPokemonJump->playAgainState = PLAY_AGAIN_YES; + SetUpPokeJumpGfxFuncById(GFXFUNC_ERASE_MSG); + sPokemonJump->helperState++; break; } break; case 3: - if (!sub_8149D68()) - gUnknown_203F3D4->unkA++; + if (!IsPokeJumpGfxFuncFinished()) + sPokemonJump->helperState++; break; case 4: - sub_8149D40(8); - gUnknown_203F3D4->unkA++; + SetUpPokeJumpGfxFuncById(GFXFUNC_MSG_COMM_STANDBY); + sPokemonJump->helperState++; break; case 5: - if (!sub_8149D68()) + if (!IsPokeJumpGfxFuncFinished()) { - gUnknown_203F3D4->unkA++; + sPokemonJump->helperState++; return FALSE; } break; @@ -1691,43 +1906,40 @@ static bool32 sub_8148C80(void) return TRUE; } -static bool32 sub_8148D5C(void) +static bool32 ClosePokeJumpLink(void) { - int var0; - - switch (gUnknown_203F3D4->unkA) + switch (sPokemonJump->helperState) { case 0: - sub_814A6CC(); - gUnknown_203F3D4->unkA++; + ClearMessageWindow(); + sPokemonJump->helperState++; break; case 1: - if (!sub_814A6FC()) + if (!RemoveMessageWindow()) { - sub_8149D40(7); - gUnknown_203F3D4->unkA++; + SetUpPokeJumpGfxFuncById(GFXFUNC_MSG_PLAYER_DROPPED); + sPokemonJump->helperState++; } break; case 2: - var0 = sub_8149D68(); - if (!var0) + if (!IsPokeJumpGfxFuncFinished()) { - gUnknown_203F3D4->unk3C = var0; - gUnknown_203F3D4->unkA++; + sPokemonJump->timer = 0; + sPokemonJump->helperState++; } break; case 3: - if (++gUnknown_203F3D4->unk3C > 120) + if (++sPokemonJump->timer > 120) { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); - gUnknown_203F3D4->unkA++; + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK); + sPokemonJump->helperState++; } break; case 4: if (!gPaletteFade.active) { SetCloseLinkCallback(); - gUnknown_203F3D4->unkA++; + sPokemonJump->helperState++; } break; case 5: @@ -1739,19 +1951,19 @@ static bool32 sub_8148D5C(void) return TRUE; } -static bool32 sub_8148E2C(void) +static bool32 CloseMessageAndResetScore(void) { - switch (gUnknown_203F3D4->unkA) + switch (sPokemonJump->helperState) { case 0: - sub_814A6CC(); - sub_814AA24(0); - gUnknown_203F3D4->unkA++; + ClearMessageWindow(); + PrintScore(0); + sPokemonJump->helperState++; break; case 1: - if (!sub_814A6FC()) + if (!RemoveMessageWindow()) { - gUnknown_203F3D4->unkA++; + sPokemonJump->helperState++; return FALSE; } break; @@ -1762,32 +1974,37 @@ static bool32 sub_8148E2C(void) return TRUE; } -static void sub_8148E80(u8 taskId) +#define tState data[0] +#define tNumReceived data[1] +#define tReceivedPacket(playerId) data[(playerId) + 2] +#define DATAIDX_GAME_STRUCT 14 + +static void Task_CommunicateMonInfo(u8 taskId) { int i; - s16 *taskData = gTasks[taskId].data; - struct PokemonJump1 *ptr = (struct PokemonJump1 *)GetWordTaskArg(taskId, 14); + s16 *data = gTasks[taskId].data; + struct PokemonJump *jump = (struct PokemonJump *)GetWordTaskArg(taskId, DATAIDX_GAME_STRUCT); - switch (taskData[0]) + switch (tState) { case 0: for (i = 0; i < MAX_RFU_PLAYERS; i++) - taskData[i + 2] = 0; + tReceivedPacket(i) = FALSE; - taskData[0]++; + tState++; // fall through case 1: - sub_8149A6C(&ptr->unk82A8[ptr->unk6]); + SendPacket_MonInfo(&jump->monInfo[jump->multiplayerId]); for (i = 0; i < MAX_RFU_PLAYERS; i++) { - if (!taskData[i + 2] && sub_8149A90(i, &ptr->unk82A8[i])) + if (!tReceivedPacket(i) && RecvPacket_MonInfo(i, &jump->monInfo[i])) { - StringCopy(ptr->unk82E4[i].unk1C, gLinkPlayers[i].name); - taskData[i + 2] = 1; - taskData[1]++; - if (taskData[1] == ptr->unk5) + StringCopy(jump->players[i].name, gLinkPlayers[i].name); + tReceivedPacket(i) = TRUE; + tNumReceived++; + if (tNumReceived == jump->numPlayers) { - sub_8147C20(); + InitPlayerAndJumpTypes(); DestroyTask(taskId); break; } @@ -1797,510 +2014,542 @@ static void sub_8148E80(u8 taskId) } } -static void sub_8148F5C(TaskFunc func, u8 taskPriority) +static void SetTaskWithPokeJumpStruct(TaskFunc func, u8 taskPriority) { u8 taskId = CreateTask(func, taskPriority); - SetWordTaskArg(taskId, 14, (uintptr_t)gUnknown_203F3D4); + SetWordTaskArg(taskId, DATAIDX_GAME_STRUCT, (uintptr_t)sPokemonJump); } -static void sub_8148F7C(void) +#undef tState +#undef tNumReceived +#undef tReceivedPacket +#undef DATAIDX_GAME_STRUCT + +static void InitVineState(void) { - gUnknown_203F3D4->unk4A = 0; - gUnknown_203F3D4->unk14 = 6; - gUnknown_203F3D4->unk34 = 0; - gUnknown_203F3D4->unk1C = 0; - gUnknown_203F3D4->unk36 = 0; - gUnknown_203F3D4->unk10 = 0; + sPokemonJump->vineTimer = 0; + sPokemonJump->vineState = VINE_UPSWING_LOWER; + sPokemonJump->vineStateTimer = 0; + sPokemonJump->vineSpeed = 0; + sPokemonJump->ignoreJumpInput = FALSE; + sPokemonJump->gameOver = FALSE; } -static void sub_8148F9C(void) +static void ResetVineState(void) { - gUnknown_203F3D4->unk4A = 0; - gUnknown_203F3D4->unk34 = 0x6FF; - gUnknown_203F3D4->unk14 = 7; - gUnknown_203F3D4->unk36 = 0; - gUnknown_203F3D4->unk10 = 0; - gUnknown_203F3D4->unk51 = 0; - gUnknown_203F3D4->unk50 = 0; - gUnknown_203F3D4->unk20 = 0; - gUnknown_203F3D4->unk4E = 0; - gUnknown_203F3D4->unk6C = 0; - sub_8149078(); + sPokemonJump->vineTimer = 0; + sPokemonJump->vineStateTimer = VINE_STATE_TIMER(VINE_UPSWING_LOWER); + sPokemonJump->vineState = VINE_UPSWING_LOW; + sPokemonJump->ignoreJumpInput = FALSE; + sPokemonJump->gameOver = FALSE; + sPokemonJump->vineSpeedStage = 0; + sPokemonJump->vineBaseSpeedIdx = 0; + sPokemonJump->vineSpeedAccel = 0; + sPokemonJump->vineSpeedDelay = 0; + sPokemonJump->atMaxSpeedStage = FALSE; + UpdateVineSpeed(); } -static void sub_8148FE0(void) +static void UpdateVineState(void) { - if (gUnknown_203F3D4->unk46) + if (sPokemonJump->allowVineUpdates) { - gUnknown_203F3D4->unk4A++; - gUnknown_203F3D4->unk34 += sub_8149044(); - if (gUnknown_203F3D4->unk34 >= 0x9FF) - gUnknown_203F3D4->unk34 -= 0x9FF; + sPokemonJump->vineTimer++; + sPokemonJump->vineStateTimer += GetVineSpeed(); + if (sPokemonJump->vineStateTimer >= VINE_STATE_TIMER(NUM_VINESTATES - 1)) + sPokemonJump->vineStateTimer -= VINE_STATE_TIMER(NUM_VINESTATES - 1); - gUnknown_203F3D4->unk18 = gUnknown_203F3D4->unk14; - gUnknown_203F3D4->unk14 = gUnknown_203F3D4->unk34 >> 8; - if (gUnknown_203F3D4->unk14 > 6 && gUnknown_203F3D4->unk18 < 7) + sPokemonJump->prevVineState = sPokemonJump->vineState; + sPokemonJump->vineState = sPokemonJump->vineStateTimer >> 8; + + // If beginning upswing + if (sPokemonJump->vineState > VINE_UPSWING_LOWER && sPokemonJump->prevVineState < VINE_UPSWING_LOW) { - gUnknown_203F3D4->unk36++; - sub_8149078(); + sPokemonJump->ignoreJumpInput++; + UpdateVineSpeed(); } } } -static int sub_8149044(void) +static int GetVineSpeed(void) { - int result; + int speed; - if (gUnknown_203F3D4->unk10) + if (sPokemonJump->gameOver) return 0; - result = gUnknown_203F3D4->unk1C; - if (gUnknown_203F3D4->unk34 <= 0x5FF) + speed = sPokemonJump->vineSpeed; + if (sPokemonJump->vineStateTimer <= VINE_STATE_TIMER(VINE_LOWEST)) { - gUnknown_203F3D4->unk20 += 80; - result += gUnknown_203F3D4->unk20 >> 8; + // If at or below lowest, then vine is in downswing + // Increase speed in downswing + sPokemonJump->vineSpeedAccel += 80; + speed += sPokemonJump->vineSpeedAccel / 256; } - return result; + return speed; } -static const u16 gUnknown_846B694[] = {0x1a, 0x1f, 0x24, 0x29, 0x2e, 0x33, 0x38, 0x3d}; -static const u16 gUnknown_846B6A4[] = {0, 1, 1, 2}; +static const u16 sVineBaseSpeeds[] = {26, 31, 36, 41, 46, 51, 56, 61}; +static const u16 sVineSpeedDelays[] = {0, 1, 1, 2}; -static void sub_8149078(void) +static void UpdateVineSpeed(void) { - int var0; + int baseSpeed; - gUnknown_203F3D4->unk20 = 0; - if (gUnknown_203F3D4->unk4E) + sPokemonJump->vineSpeedAccel = 0; + if (sPokemonJump->vineSpeedDelay) { - gUnknown_203F3D4->unk4E--; - if (gUnknown_203F3D4->unk6C) + sPokemonJump->vineSpeedDelay--; + if (sPokemonJump->atMaxSpeedStage) { - if (sub_8149194() % 4 != 0) + if (PokeJumpRandom() % 4) { - gUnknown_203F3D4->unk1C = gUnknown_203F3D4->unk28; + sPokemonJump->vineSpeed = sPokemonJump->nextVineSpeed; } else { - if (gUnknown_203F3D4->unk28 > 54) - gUnknown_203F3D4->unk1C = 30; + if (sPokemonJump->nextVineSpeed > 54) + sPokemonJump->vineSpeed = 30; else - gUnknown_203F3D4->unk1C = 82; + sPokemonJump->vineSpeed = 82; } } } else { - if (!(gUnknown_203F3D4->unk50 & 8)) + if (!(sPokemonJump->vineBaseSpeedIdx & ARRAY_COUNT(sVineBaseSpeeds))) { - gUnknown_203F3D4->unk28 = gUnknown_846B694[gUnknown_203F3D4->unk50] + (gUnknown_203F3D4->unk51 * 7); - gUnknown_203F3D4->unk4E = gUnknown_846B6A4[sub_8149194() % NELEMS(gUnknown_846B6A4)] + 2; - gUnknown_203F3D4->unk50++; + sPokemonJump->nextVineSpeed = sVineBaseSpeeds[sPokemonJump->vineBaseSpeedIdx] + (sPokemonJump->vineSpeedStage * 7); + sPokemonJump->vineSpeedDelay = sVineSpeedDelays[PokeJumpRandom() % ARRAY_COUNT(sVineSpeedDelays)] + 2; + sPokemonJump->vineBaseSpeedIdx++; } else { - if (gUnknown_203F3D4->unk50 == 8) + if (sPokemonJump->vineBaseSpeedIdx == ARRAY_COUNT(sVineBaseSpeeds)) { - if (gUnknown_203F3D4->unk51 < 3) - gUnknown_203F3D4->unk51++; + if (sPokemonJump->vineSpeedStage < 3) + sPokemonJump->vineSpeedStage++; else - gUnknown_203F3D4->unk6C = 1; + sPokemonJump->atMaxSpeedStage = TRUE; } - var0 = gUnknown_846B694[15 - gUnknown_203F3D4->unk50]; - gUnknown_203F3D4->unk28 = var0 + (gUnknown_203F3D4->unk51 * 7); - if (++gUnknown_203F3D4->unk50 > 15) + baseSpeed = sVineBaseSpeeds[15 - sPokemonJump->vineBaseSpeedIdx]; + sPokemonJump->nextVineSpeed = baseSpeed + (sPokemonJump->vineSpeedStage * 7); + if (++sPokemonJump->vineBaseSpeedIdx > 15) { - if (sub_8149194() % 4 == 0) - gUnknown_203F3D4->unk28 -= 5; + if (PokeJumpRandom() % 4 == 0) + sPokemonJump->nextVineSpeed -= 5; - gUnknown_203F3D4->unk50 = 0; + sPokemonJump->vineBaseSpeedIdx = 0; } } - gUnknown_203F3D4->unk1C = gUnknown_203F3D4->unk28; + sPokemonJump->vineSpeed = sPokemonJump->nextVineSpeed; } } -static int sub_8149194(void) +static int PokeJumpRandom(void) { - // The number 1103515245 comes from the example implementation of rand and srand - gUnknown_203F3D4->unk24 = gUnknown_203F3D4->unk24 * 1103515245 + 24691; - return gUnknown_203F3D4->unk24 >> 16; + sPokemonJump->rngSeed = ISO_RANDOMIZE1(sPokemonJump->rngSeed); + return sPokemonJump->rngSeed >> 16; } -static void sub_81491B4(void) +static void ResetVineAfterHit(void) { - gUnknown_203F3D4->unk10 = 1; - gUnknown_203F3D4->unk14 = 6; - gUnknown_203F3D4->unk34 = 0x5FF; - sub_814936C(); + sPokemonJump->gameOver = TRUE; + sPokemonJump->vineState = VINE_UPSWING_LOWER; + sPokemonJump->vineStateTimer = VINE_STATE_TIMER(VINE_LOWEST); + AllowVineUpdates(); } -static int sub_81491D8(void) +static int IsGameOver(void) { - return gUnknown_203F3D4->unk10; + return sPokemonJump->gameOver; } -static void sub_81491E4(void) +static void ResetPlayersJumpStates(void) { int i; for (i = 0; i < MAX_RFU_PLAYERS; i++) - gUnknown_203F3D4->unk82E4[i].unk14 = 0; + sPokemonJump->players[i].jumpState = JUMPSTATE_NONE; } -static void sub_8149210(void) +static void ResetPlayersMonState(void) { - gUnknown_203F3D4->unk83AC->unk10 = 0; - gUnknown_203F3D4->unk83AC->unk12 = 0; + sPokemonJump->player->monState = MONSTATE_NORMAL; + sPokemonJump->player->prevMonState = MONSTATE_NORMAL; } -static bool32 sub_814922C(u16 arg0) +static bool32 IsPlayersMonState(u16 monState) { - if (gUnknown_203F3D4->unk82E4[gUnknown_203F3D4->unk6].unk10 == arg0) + if (sPokemonJump->players[sPokemonJump->multiplayerId].monState == monState) return TRUE; else return FALSE; } -static void sub_8149260(void) +static void SetMonStateJump(void) { - gUnknown_203F3D4->unk83AC->unkE = gUnknown_203F3D4->unk4A; - gUnknown_203F3D4->unk83AC->unk12 = gUnknown_203F3D4->unk83AC->unk10; - gUnknown_203F3D4->unk83AC->unk10 = 1; + sPokemonJump->player->jumpTimeStart = sPokemonJump->vineTimer; + sPokemonJump->player->prevMonState = sPokemonJump->player->monState; + sPokemonJump->player->monState = MONSTATE_JUMP; } -static void sub_8149288(void) +static void SetMonStateHit(void) { - gUnknown_203F3D4->unk83AC->unk12 = gUnknown_203F3D4->unk83AC->unk10; - gUnknown_203F3D4->unk83AC->unk10 = 2; - gUnknown_203F3D4->unk83AC->unkE = gUnknown_203F3D4->unk4A; - gUnknown_203F3D4->unk83AC->unk14 = 2; + sPokemonJump->player->prevMonState = sPokemonJump->player->monState; + sPokemonJump->player->monState = MONSTATE_HIT; + sPokemonJump->player->jumpTimeStart = sPokemonJump->vineTimer; + sPokemonJump->player->jumpState = JUMPSTATE_FAILURE; } -static void sub_81492B8(void) +static void SetMonStateNormal(void) { - gUnknown_203F3D4->unk83AC->unk12 = gUnknown_203F3D4->unk83AC->unk10; - gUnknown_203F3D4->unk83AC->unk10 = 0; + sPokemonJump->player->prevMonState = sPokemonJump->player->monState; + sPokemonJump->player->monState = MONSTATE_NORMAL; } -static const u16 gUnknown_846B6AC[] = {SE_RS_SHOP, SE_SHINY, SE_M_MORNING_SUN, SE_POKE_JUMP_SUCCESS}; +static const u16 sSoundEffects[MAX_RFU_PLAYERS - 1] = {SE_RS_SHOP, SE_SHINY, SE_M_MORNING_SUN, SE_POKE_JUMP_SUCCESS}; -static void sub_81492D8(void) +static void UpdateGame(void) { - if (gUnknown_203F3D4->unk5C) + if (sPokemonJump->updateScore) { - sub_814AA24(gUnknown_203F3D4->unk70.unk8); - gUnknown_203F3D4->unk5C = 0; - if (gUnknown_203F3D4->unk4D) + PrintScore(sPokemonJump->comm.jumpScore); + sPokemonJump->updateScore = FALSE; + if (sPokemonJump->showBonus) { - int index = sub_814A98C(gUnknown_203F3D4->unk70.unk1); - PlaySE(gUnknown_846B6AC[index - 2]); - gUnknown_203F3D4->unk4D = 0; + int numPlayers = DoSameJumpTimeBonus(sPokemonJump->comm.receivedBonusFlags); + PlaySE(sSoundEffects[numPlayers - 2]); + sPokemonJump->showBonus = FALSE; } } - sub_814AA34(gUnknown_203F3D4->unk70.unk4); - sub_814937C(); - sub_814933C(); + PrintJumpsInRow(sPokemonJump->comm.jumpsInRow); + HandleMonState(); + TryUpdateVineSwing(); } -static void sub_814933C(void) +static void TryUpdateVineSwing(void) { - if (gUnknown_203F3D4->unk46) - sub_814A95C(gUnknown_203F3D4->unk14); + if (sPokemonJump->allowVineUpdates) + UpdateVineSwing(sPokemonJump->vineState); } -static void sub_814935C(void) +static void DisallowVineUpdates(void) { - gUnknown_203F3D4->unk46 = 0; + sPokemonJump->allowVineUpdates = FALSE; } -static void sub_814936C(void) +static void AllowVineUpdates(void) { - gUnknown_203F3D4->unk46 = 1; + sPokemonJump->allowVineUpdates = TRUE; } -static void sub_814937C(void) +#define F_SE_JUMP (1 << 0) +#define F_SE_FAIL (1 << 1) + +static void HandleMonState(void) { int i; - int whichSound = 0; - int numLinkPlayers = gUnknown_203F3D4->unk5; + int soundFlags = 0; + int numPlayers = sPokemonJump->numPlayers; - for (i = 0; i < numLinkPlayers; i++) + for (i = 0; i < numPlayers; i++) { - switch (gUnknown_203F3D4->unk82E4[i].unk10) + switch (sPokemonJump->players[i].monState) { - case 0: - sub_814A940(i, 0); + case MONSTATE_NORMAL: + SetMonSpriteY(i, 0); break; - case 1: - if (gUnknown_203F3D4->unk82E4[i].unk12 != 1 || gUnknown_203F3D4->unk82E4[i].unkE != gUnknown_203F3D4->unk9A[i]) + case MONSTATE_JUMP: + if (sPokemonJump->players[i].prevMonState != MONSTATE_JUMP || sPokemonJump->players[i].jumpTimeStart != sPokemonJump->jumpTimeStarts[i]) { - if (i == gUnknown_203F3D4->unk6) - gUnknown_203F3D4->unk82E4[i].unk12 = 1; + // This is a new jump, play SE and init fields for jump handling + if (i == sPokemonJump->multiplayerId) + sPokemonJump->players[i].prevMonState = MONSTATE_JUMP; - whichSound |= 0x1; - gUnknown_203F3D4->unk82E4[i].unk4 = 0x7FFFFFFF; - gUnknown_203F3D4->unk9A[i] = gUnknown_203F3D4->unk82E4[i].unkE; + soundFlags |= F_SE_JUMP; + sPokemonJump->players[i].jumpOffsetIdx = INT_MAX; + sPokemonJump->jumpTimeStarts[i] = sPokemonJump->players[i].jumpTimeStart; } - sub_8149490(i); + UpdateJump(i); break; - case 2: - if (gUnknown_203F3D4->unk82E4[i].unk12 != 2) + case MONSTATE_HIT: + if (sPokemonJump->players[i].prevMonState != MONSTATE_HIT) { - if (i == gUnknown_203F3D4->unk6) - gUnknown_203F3D4->unk82E4[i].unk12 = 2; + if (i == sPokemonJump->multiplayerId) + sPokemonJump->players[i].prevMonState = MONSTATE_HIT; - whichSound |= 0x2; - sub_814AA48(i); + soundFlags |= F_SE_FAIL; + StartMonHitShake(i); } break; } } - if (whichSound & 0x2) + if (soundFlags & F_SE_FAIL) PlaySE(SE_POKE_JUMP_FAILURE); - else if (whichSound & 0x1) + else if (soundFlags & F_SE_JUMP) PlaySE(SE_LEDGE); } -static const s8 gUnknown_846B6B4[][48] = +static const s8 sJumpOffsets[][48] = { - {-3, -6, -8, -10, -13, -15, -17, -19, -21, -23, -25, -27, -28, -29, -30, -30, -30, -28, -27, - -26, -25, -23, -22, -20, -18, -17, -15, -13, -11, -8, -6, -4, -1}, + [JUMP_TYPE_NORMAL] = { -3, -6, -8, -10, -13, -15, -17, -19, + -21, -23, -25, -27, -28, -29, + JUMP_PEAK, JUMP_PEAK, JUMP_PEAK, + -28, -27, -26, -25, -23, -22, -20, -18, + -17, -15, -13, -11, -8, -6, -4, -1}, - {-3, -6, -9, -11, -14, -16, -18, -20, -22, -24, -26, -28, -29, -30, -30, -28, -26, -24, -22, - -20, -18, -16, -14, -11, -9, -6, -4, -1}, + [JUMP_TYPE_FAST] = { -3, -6, -9, -11, -14, -16, -18, -20, + -22, -24, -26, -28, -29, + JUMP_PEAK, JUMP_PEAK, + -28, -26, -24, -22, -20, -18, -16, -14, + -11, -9, -6, -4, -1}, - {-3, -6, -9, -11, -13, -15, -17, -19, -21, -23, -25, -27, -28, -29, -30, -30, -30, -30, -29, - -29, -28, -28, -27, -27, -26, -25, -24, -22, -20, -18, -16, -14, - -12, -11, -9, -6, -4, -1}, + [JUMP_TYPE_SLOW] = { -3, -6, -9, -11, -13, -15, -17, -19, + -21, -23, -25, -27, -28, -29, + JUMP_PEAK, JUMP_PEAK, JUMP_PEAK, JUMP_PEAK, + -29, -29, -28, -28, -27, -27, -26, -25, + -24, -22, -20, -18, -16, -14, -12, -11, + -9, -6, -4, -1}, }; -static void sub_8149490(int multiplayerId) +static void UpdateJump(int multiplayerId) { - int var0; - int var1; - struct PokemonJump1_82E4 *player; + int jumpOffsetIdx; + int jumpOffset; + struct PokemonJump_Player *player; - if (gUnknown_203F3D4->unk68) + if (sPokemonJump->skipJumpUpdate) // Always false return; - player = &gUnknown_203F3D4->unk82E4[multiplayerId]; - if (player->unk4 != 0x7FFFFFFF) + player = &sPokemonJump->players[multiplayerId]; + if (player->jumpOffsetIdx != INT_MAX) { - player->unk4++; - var0 = player->unk4; + player->jumpOffsetIdx++; + jumpOffsetIdx = player->jumpOffsetIdx; } else { - var0 = gUnknown_203F3D4->unk4A - player->unkE; - if (var0 >= 65000) + jumpOffsetIdx = sPokemonJump->vineTimer - player->jumpTimeStart; + if (jumpOffsetIdx >= 65000) { - var0 -= 65000; - var0 += gUnknown_203F3D4->unk4A; + jumpOffsetIdx -= 65000; + jumpOffsetIdx += sPokemonJump->vineTimer; } - player->unk4 = var0; + player->jumpOffsetIdx = jumpOffsetIdx; } - if (var0 < 4) + if (jumpOffsetIdx < 4) return; - var0 -= 4; - if (var0 < 48) - var1 = gUnknown_846B6B4[player->unkC][var0]; + jumpOffsetIdx -= 4; + if (jumpOffsetIdx < (int)ARRAY_COUNT(sJumpOffsets[0])) + jumpOffset = sJumpOffsets[player->monJumpType][jumpOffsetIdx]; else - var1 = 0; + jumpOffset = 0; - sub_814A940(multiplayerId, var1); - if (!var1 && multiplayerId == gUnknown_203F3D4->unk6) - sub_81492B8(); + SetMonSpriteY(multiplayerId, jumpOffset); + if (jumpOffset == 0 && multiplayerId == sPokemonJump->multiplayerId) + SetMonStateNormal(); - player->unk0 = var1; + player->jumpOffset = jumpOffset; } -static void sub_8149534(void) +static void TryUpdateScore(void) { - if (gUnknown_203F3D4->unk14 == 8 && gUnknown_203F3D4->unk18 == 7) + if (sPokemonJump->vineState == VINE_UPSWING_HIGH && sPokemonJump->prevVineState == VINE_UPSWING_LOW) { - if (gUnknown_203F3D4->unk58 == 0) + // Vine has passed through the point where it + // would hit the players, allow score to update + + if (!sPokemonJump->initScoreUpdate) { - sub_8149878(); - gUnknown_203F3D4->unk54 = 0; - gUnknown_203F3D4->unk58 = 1; - gUnknown_203F3D4->unk70.unk1 = 0; + ClearUnreadField(); + sPokemonJump->numPlayersAtPeak = 0; + sPokemonJump->initScoreUpdate = TRUE; + sPokemonJump->comm.receivedBonusFlags = 0; } else { - if (gUnknown_203F3D4->unk54 == 5) + if (sPokemonJump->numPlayersAtPeak == MAX_RFU_PLAYERS) { - gUnknown_203F3D4->unkC++; - sub_8149898(gUnknown_203F3D4->unkC); + // An 'excellent' is the max 5 players all jumping synchronously + sPokemonJump->excellentsInRow++; + TryUpdateExcellentsRecord(sPokemonJump->excellentsInRow); } else { - gUnknown_203F3D4->unkC = 0; + sPokemonJump->excellentsInRow = 0; } - if (gUnknown_203F3D4->unk54 > 1) + if (sPokemonJump->numPlayersAtPeak > 1) { - gUnknown_203F3D4->unk64 = 1; - memcpy(gUnknown_203F3D4->unk86, gUnknown_203F3D4->unk81, sizeof(u8) * MAX_RFU_PLAYERS); + sPokemonJump->giveBonus = TRUE; + // Unclear why atJumpPeak needed to be copied over twice + memcpy(sPokemonJump->atJumpPeak3, sPokemonJump->atJumpPeak2, sizeof(u8) * MAX_RFU_PLAYERS); } - sub_8149878(); - gUnknown_203F3D4->unk54 = 0; - gUnknown_203F3D4->unk58 = 1; - gUnknown_203F3D4->unk70.unk1 = 0; - if (gUnknown_203F3D4->unk70.unk4 < 9999) - gUnknown_203F3D4->unk70.unk4++; + ClearUnreadField(); + sPokemonJump->numPlayersAtPeak = 0; + sPokemonJump->initScoreUpdate = TRUE; + sPokemonJump->comm.receivedBonusFlags = 0; + if (sPokemonJump->comm.jumpsInRow < MAX_JUMPS) + sPokemonJump->comm.jumpsInRow++; - sub_8149780(10); - sub_8147F10(3); + AddJumpScore(10); + SetLinkTimeInterval(LINK_INTERVAL_SHORT); } } - if (gUnknown_203F3D4->unk64 && (sub_8149710() == TRUE || !gUnknown_203F3D4->unk14)) + if (sPokemonJump->giveBonus && (DidAllPlayersClearVine() == TRUE || sPokemonJump->vineState == VINE_HIGHEST)) { - int var0 = sub_8149834(gUnknown_203F3D4->unk86); - sub_8149780(sub_8149888(var0)); - sub_8147F10(3); - gUnknown_203F3D4->unk64 = 0; + int numPlayers = GetNumPlayersForBonus(sPokemonJump->atJumpPeak3); + AddJumpScore(GetScoreBonus(numPlayers)); + SetLinkTimeInterval(LINK_INTERVAL_SHORT); + sPokemonJump->giveBonus = FALSE; } - if (gUnknown_203F3D4->unk58) + if (sPokemonJump->initScoreUpdate) { - int var1 = sub_81497A8(); - if (var1 > gUnknown_203F3D4->unk54) + int numAtPeak = GetPlayersAtJumpPeak(); + if (numAtPeak > sPokemonJump->numPlayersAtPeak) { - gUnknown_203F3D4->unk54 = var1; - memcpy(gUnknown_203F3D4->unk81, gUnknown_203F3D4->unk7C, sizeof(u8) * MAX_RFU_PLAYERS); + sPokemonJump->numPlayersAtPeak = numAtPeak; + memcpy(sPokemonJump->atJumpPeak2, sPokemonJump->atJumpPeak, sizeof(u8) * MAX_RFU_PLAYERS); } } } -static bool32 sub_8149630(void) +// Returns FALSE if any player was hit by vine +static bool32 UpdateVineHitStates(void) { int i; - if (gUnknown_203F3D4->unk14 == 6 && !gUnknown_203F3D4->unk83AC->unk0) + if (sPokemonJump->vineState == VINE_UPSWING_LOWER && sPokemonJump->player->jumpOffset == 0) { - if (gUnknown_203F3D4->unk83AC->unk12 == 1 && sub_81491D8() == 1) + // Vine is in position to hit the player and jump offset is 0. + // Unless the player had just jumped and has been forced to the ground + // by someone else getting hit, the player has been hit + if (sPokemonJump->player->prevMonState == MONSTATE_JUMP && IsGameOver() == TRUE) { - gUnknown_203F3D4->unk83AC->unk14 = 1; + sPokemonJump->player->jumpState = JUMPSTATE_SUCCESS; } else { - sub_8149288(); - sub_8147F10(3); + // Hit vine + SetMonStateHit(); + SetLinkTimeInterval(LINK_INTERVAL_SHORT); } } - if (gUnknown_203F3D4->unk14 == 7 - && gUnknown_203F3D4->unk18 == 6 - && gUnknown_203F3D4->unk83AC->unk10 != 2) + if (sPokemonJump->vineState == VINE_UPSWING_LOW + && sPokemonJump->prevVineState == VINE_UPSWING_LOWER + && sPokemonJump->player->monState != MONSTATE_HIT) { - gUnknown_203F3D4->unk83AC->unk14 = 1; - sub_8147F10(3); + sPokemonJump->player->jumpState = JUMPSTATE_SUCCESS; + SetLinkTimeInterval(LINK_INTERVAL_SHORT); } - for (i = 0; i < gUnknown_203F3D4->unk5; i++) + for (i = 0; i < sPokemonJump->numPlayers; i++) { - if (gUnknown_203F3D4->unk82E4[i].unk10 == 2) + if (sPokemonJump->players[i].monState == MONSTATE_HIT) return FALSE; } return TRUE; } -static bool32 sub_81496D4(void) +// Has everyone either jumped or been hit by the vine +static bool32 AllPlayersJumpedOrHit(void) { int i; - int numPlayers = gUnknown_203F3D4->unk5; - int count = 0; + int numPlayers = sPokemonJump->numPlayers; + int numJumpedOrHit = 0; for (i = 0; i < numPlayers; i++) { - if (gUnknown_203F3D4->unk82E4[i].unk14) - count++; + if (sPokemonJump->players[i].jumpState != JUMPSTATE_NONE) + numJumpedOrHit++; } - return count == numPlayers; + return numJumpedOrHit == numPlayers; } -static bool32 sub_8149710(void) +static bool32 DidAllPlayersClearVine(void) { int i; - for (i = 0; i < gUnknown_203F3D4->unk5; i++) + for (i = 0; i < sPokemonJump->numPlayers; i++) { - if (gUnknown_203F3D4->unk82E4[i].unk14 != 1) + if (sPokemonJump->players[i].jumpState != JUMPSTATE_SUCCESS) return FALSE; } return TRUE; } -static bool32 sub_8149748(void) +static bool32 ShouldPlayAgain(void) { int i; - if (gUnknown_203F3D4->unk45 == 1) + if (sPokemonJump->playAgainState == PLAY_AGAIN_NO) return FALSE; - for (i = 1; i < gUnknown_203F3D4->unk5; i++) + for (i = 1; i < sPokemonJump->numPlayers; i++) { - if (gUnknown_203F3D4->unk90[i] == 1) + if (sPokemonJump->playAgainStates[i] == PLAY_AGAIN_NO) return FALSE; } return TRUE; } -static void sub_8149780(int arg0) +static void AddJumpScore(int score) { - gUnknown_203F3D4->unk70.unk8 += arg0; - gUnknown_203F3D4->unk5C = 1; - if (gUnknown_203F3D4->unk70.unk8 >= 99990) - gUnknown_203F3D4->unk70.unk8 = 99990; + sPokemonJump->comm.jumpScore += score; + sPokemonJump->updateScore = TRUE; + if (sPokemonJump->comm.jumpScore >= MAX_JUMP_SCORE) + sPokemonJump->comm.jumpScore = MAX_JUMP_SCORE; } -static int sub_81497A8(void) +static int GetPlayersAtJumpPeak(void) { int i; - int count = 0; - int numPlayers = gUnknown_203F3D4->unk5; + int numAtPeak = 0; + int numPlayers = sPokemonJump->numPlayers; for (i = 0; i < numPlayers; i++) { - if (gUnknown_203F3D4->unk82E4[i].unk0 == -30) + if (sPokemonJump->players[i].jumpOffset == JUMP_PEAK) { - gUnknown_203F3D4->unk7C[i] = 1; - count++; + sPokemonJump->atJumpPeak[i] = TRUE; + numAtPeak++; } else { - gUnknown_203F3D4->unk7C[i] = 0; + sPokemonJump->atJumpPeak[i] = FALSE; } } - return count; + return numAtPeak; } -static bool32 sub_8149804(void) +static bool32 AreLinkQueuesEmpty(void) { return !Rfu.recvQueue.count && !Rfu.sendQueue.count; } -static int sub_8149834(u8 *arg0) +static int GetNumPlayersForBonus(u8 *arg0) { - int i; - int flags; - int count; + int i = 0; + int flags = 0; + int count = 0; - for (i = 0, flags = 0, count = 0; i < MAX_RFU_PLAYERS; i++) + for (; i < MAX_RFU_PLAYERS; i++) { if (arg0[i]) { @@ -2309,87 +2558,100 @@ static int sub_8149834(u8 *arg0) } } - gUnknown_203F3D4->unk70.unk1 = flags; + sPokemonJump->comm.receivedBonusFlags = flags; if (flags) - gUnknown_203F3D4->unk4D = 1; + sPokemonJump->showBonus = TRUE; return count; } -static void sub_8149878(void) +static void ClearUnreadField(void) { - gUnknown_203F3D4->unk44 = 0; + sPokemonJump->unused3 = 0; } -static const int gUnknown_846B74C[] = {0, 0, 50, 100, 200, 500}; +// Bonuses given depend on the number of +// players that jumped at the same time +static const int sScoreBonuses[MAX_RFU_PLAYERS + 1] = {0, 0, 50, 100, 200, 500}; -static int sub_8149888(int arg0) +static int GetScoreBonus(int numPlayers) { - return gUnknown_846B74C[arg0]; + return sScoreBonuses[numPlayers]; } -static void sub_8149898(u16 arg0) +static void TryUpdateExcellentsRecord(u16 excellentsInRow) { - if (arg0 > gUnknown_203F3D4->unkE) - gUnknown_203F3D4->unkE = arg0; + if (excellentsInRow > sPokemonJump->excellentsInRowRecord) + sPokemonJump->excellentsInRowRecord = excellentsInRow; } -static const u16 gUnknown_846B764[] = {0x8a, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93}; -static const u32 gUnknown_846B76C[][2] = -{ - {0x1388, 1}, - {0x1f40, 2}, - {0x2ee0, 3}, - {0x3e80, 4}, - {0x4e20, 5}, +static const u16 sPrizeItems[] = { + ITEM_LEPPA_BERRY, + ITEM_LUM_BERRY, + ITEM_SITRUS_BERRY, + ITEM_FIGY_BERRY, + ITEM_WIKI_BERRY, + ITEM_MAGO_BERRY, + ITEM_AGUAV_BERRY, + ITEM_IAPAPA_BERRY }; -static bool32 sub_81498B4(void) +struct { + u32 score; + u32 quantity; +} static const sPrizeQuantityData[] = { - if (gUnknown_203F3D4->unk70.unk8 >= gUnknown_846B76C[0][0]) + { .score = 5000, .quantity = 1}, + { .score = 8000, .quantity = 2}, + { .score = 12000, .quantity = 3}, + { .score = 16000, .quantity = 4}, + { .score = 20000, .quantity = 5}, +}; + +static bool32 HasEnoughScoreForPrize(void) +{ + if (sPokemonJump->comm.jumpScore >= sPrizeQuantityData[0].score) return TRUE; else return FALSE; } -static u16 sub_81498D8(void) +static u16 GetPrizeData(void) { - u16 lo = sub_8149910(); - u16 hi = sub_8149930(); - return (hi << 12) | (lo & 0xFFF); + u16 itemId = GetPrizeItemId(); + u16 quantity = GetPrizeQuantity(); + return (quantity << 12) | (itemId & 0xFFF); } -static void sub_8149900(u16 arg0, u16 *arg1, u16 *arg2) +static void UnpackPrizeData(u16 data, u16 *itemId, u16 *quantity) { - *arg2 = arg0 >> 12; - *arg1 = arg0 & 0xFFF; + *quantity = data >> 12; + *itemId = data & 0xFFF; } -static u16 sub_8149910(void) +static u16 GetPrizeItemId(void) { - u16 index = Random() % NELEMS(gUnknown_846B764); - return gUnknown_846B764[index]; + u16 index = Random() % ARRAY_COUNT(sPrizeItems); + return sPrizeItems[index]; } -static u16 sub_8149930(void) +static u16 GetPrizeQuantity(void) { - u32 val, i; + u32 quantity, i; - val = 0; - for (i = 0; i < 5; i++) + quantity = 0; + for (i = 0; i < ARRAY_COUNT(sPrizeQuantityData); i++) { - if (gUnknown_203F3D4->unk70.unk8 < gUnknown_846B76C[i][0]) - break; - else if (1) // required to match, see pret/pokeemerald#982 - val = gUnknown_846B76C[i][1]; + if (sPokemonJump->comm.jumpScore >= sPrizeQuantityData[i].score) + quantity = sPrizeQuantityData[i].quantity; else break; } - return val; + return quantity; } -static u16 sub_8149978(u16 item, u16 quantity) +static u16 GetQuantityLimitedByBag(u16 item, u16 quantity) { while (quantity && !CheckBagHasSpace(item, quantity)) quantity--; @@ -2397,24 +2659,24 @@ static u16 sub_8149978(u16 item, u16 quantity) return quantity; } -u16 sub_81499A4(void) +static u16 GetNumPokeJumpPlayers(void) { return GetLinkPlayerCount(); } -u16 sub_81499B4(void) +static u16 GetPokeJumpMultiplayerId(void) { - return gUnknown_203F3D4->unk6; + return sPokemonJump->multiplayerId; } -struct PokemonJump1_MonInfo *sub_81499C0(u8 multiplayerId) +static struct PokemonJump_MonInfo *GetMonInfoByMultiplayerId(u8 multiplayerId) { - return &gUnknown_203F3D4->unk82A8[multiplayerId]; + return &sPokemonJump->monInfo[multiplayerId]; } -u8 *sub_81499E0(u8 multiplayerId) +static u8 *GetPokeJumpPlayerName(u8 multiplayerId) { - return gUnknown_203F3D4->unk82E4[multiplayerId].unk1C; + return sPokemonJump->players[multiplayerId].name; } bool32 IsSpeciesAllowedInPokemonJump(u16 species) @@ -2442,206 +2704,218 @@ void IsPokemonJumpSpeciesInParty(void) gSpecialVar_Result = FALSE; } -void sub_8149A6C(struct PokemonJump1_MonInfo *arg0) +struct MonInfoPacket +{ + u8 id; + u16 species; + u32 personality; + u32 otId; +}; + +static void SendPacket_MonInfo(struct PokemonJump_MonInfo *monInfo) { struct MonInfoPacket packet; - packet.id = 1; - packet.species = arg0->species; - packet.otId = arg0->otId; - packet.personality = arg0->personality; + packet.id = PACKET_MON_INFO; + packet.species = monInfo->species; + packet.otId = monInfo->otId; + packet.personality = monInfo->personality; Rfu_SendPacket(&packet); } -bool32 sub_8149A90(int multiplayerId, struct PokemonJump1_MonInfo *arg0) +static bool32 RecvPacket_MonInfo(int multiplayerId, struct PokemonJump_MonInfo *monInfo) { struct MonInfoPacket packet; - if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[multiplayerId][0] & RFUCMD_MASK) != RFUCMD_SEND_PACKET) return FALSE; memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); - if (packet.id == 1) + if (packet.id == PACKET_MON_INFO) { - arg0->species = packet.species; - arg0->otId = packet.otId; - arg0->personality = packet.personality; + monInfo->species = packet.species; + monInfo->otId = packet.otId; + monInfo->personality = packet.personality; return TRUE; } return FALSE; } -struct UnkPacket2 +struct UnusedPacket { - u8 id; // packet id - u32 unk4; - u32 unk8; + u8 id; + u32 data; + u32 filler; }; -void sub_8149AE0(u32 arg0) +// Data packet that's never sent +// No function to read it either +static void SendPacket_Unused(u32 data) { - struct UnkPacket2 packet; - packet.id = 2; - packet.unk4 = arg0; + struct UnusedPacket packet; + packet.id = PACKET_UNUSED; + packet.data = data; Rfu_SendPacket(&packet); } -struct UnkPacket3 +struct LeaderStatePacket { - u8 id; // packet id - u8 unk1; - u8 unk2; - u8 unk3_0:5; - u8 unk3_1:3; - u16 unk4; - u16 unk6; - u32 unk8_0:15; - u32 unk8_1:17; + u8 id; + u8 funcId; + u8 monState; + u8 receivedBonusFlags:5; // 1 bit for each player (MAX_RFU_PLAYERS) + u8 jumpState:3; + u16 jumpTimeStart; + u16 vineTimer; + u32 jumpsInRow:15; + u32 jumpScore:17; }; -void sub_8149AF8(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1) +static void SendPacket_LeaderState(struct PokemonJump_Player *player, struct PokemonJump_CommData *comm) { - struct UnkPacket3 packet; - packet.id = 3; - packet.unk8_1 = arg1->unk8; - packet.unk3_0 = arg1->unk1; - packet.unk1 = arg1->unk0; - packet.unk6 = arg1->unk2; - packet.unk8_0 = arg1->unk4; - packet.unk2 = arg0->unk10; - packet.unk3_1 = arg0->unk14; - packet.unk4 = arg0->unkE; + struct LeaderStatePacket packet; + packet.id = PACKET_LEADER_STATE; + packet.jumpScore = comm->jumpScore; + packet.receivedBonusFlags = comm->receivedBonusFlags; + packet.funcId = comm->funcId; + packet.vineTimer = comm->data; + packet.jumpsInRow = comm->jumpsInRow; + packet.monState = player->monState; + packet.jumpState = player->jumpState; + packet.jumpTimeStart = player->jumpTimeStart; Rfu_SendPacket(&packet); } -bool32 sub_8149B7C(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1) +// Used by group members to read the state of the group leader +static bool32 RecvPacket_LeaderState(struct PokemonJump_Player *player, struct PokemonJump_CommData *comm) { - struct UnkPacket3 packet; + struct LeaderStatePacket packet; - if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[0][0] & RFUCMD_MASK) != RFUCMD_SEND_PACKET) return FALSE; memcpy(&packet, &gRecvCmds[0][1], sizeof(packet)); - if (packet.id != 3) + if (packet.id != PACKET_LEADER_STATE) return FALSE; - arg1->unk8 = packet.unk8_1; - arg1->unk1 = packet.unk3_0; - arg1->unk0 = packet.unk1; - arg1->unk2 = packet.unk6; - arg1->unk4 = packet.unk8_0; - arg0->unk10 = packet.unk2; - arg0->unk14 = packet.unk3_1; - arg0->unkE = packet.unk4; + comm->jumpScore = packet.jumpScore; + comm->receivedBonusFlags = packet.receivedBonusFlags; + comm->funcId = packet.funcId; + comm->data = packet.vineTimer; + comm->jumpsInRow = packet.jumpsInRow; + player->monState = packet.monState; + player->jumpState = packet.jumpState; + player->jumpTimeStart = packet.jumpTimeStart; return TRUE; } -struct UnkPacket4 +struct MemberStatePacket { - u8 id; // packet id - u8 unk1; - u8 unk2; - u8 unk3; - u16 unk4; - u8 unk6; - u16 unk8; + u8 id; + u8 monState; + u8 jumpState; + bool8 funcFinished; + u16 jumpTimeStart; + u8 funcId; + u16 playAgainState; }; -void sub_8149BF4(struct PokemonJump1_82E4 *arg0, u8 arg1, u16 arg2) +static void SendPacket_MemberState(struct PokemonJump_Player *player, u8 funcId, u16 playAgainState) { - struct UnkPacket4 packet; - packet.id = 4; - packet.unk1 = arg0->unk10; - packet.unk2 = arg0->unk14; - packet.unk3 = arg0->unk18; - packet.unk4 = arg0->unkE; - packet.unk6 = arg1; - packet.unk8 = arg2; + struct MemberStatePacket packet; + packet.id = PACKET_MEMBER_STATE; + packet.monState = player->monState; + packet.jumpState = player->jumpState; + packet.funcFinished = player->funcFinished; + packet.jumpTimeStart = player->jumpTimeStart; + packet.funcId = funcId; + packet.playAgainState = playAgainState; Rfu_SendPacket(&packet); } -bool32 sub_8149C24(struct PokemonJump1_82E4 *arg0, int multiplayerId, u8 *arg2, u16 *arg3) +// Used by the group leader to read the state of group members +static bool32 RecvPacket_MemberStateToLeader(struct PokemonJump_Player *player, int multiplayerId, u8 *funcId, u16 *playAgainState) { - struct UnkPacket4 packet; + struct MemberStatePacket packet; - if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[multiplayerId][0] & RFUCMD_MASK) != RFUCMD_SEND_PACKET) return FALSE; memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); - if (packet.id != 4) + if (packet.id != PACKET_MEMBER_STATE) return FALSE; - arg0->unk10 = packet.unk1; - arg0->unk14 = packet.unk2; - arg0->unk18 = packet.unk3; - arg0->unkE = packet.unk4; - *arg2 = packet.unk6; - *arg3 = packet.unk8; + player->monState = packet.monState; + player->jumpState = packet.jumpState; + player->funcFinished = packet.funcFinished; + player->jumpTimeStart = packet.jumpTimeStart; + *funcId = packet.funcId; + *playAgainState = packet.playAgainState; return TRUE; } -bool32 sub_8149C90(struct PokemonJump1_82E4 *arg0, int multiplayerId) +// Used by group members to read the state of other group members +static bool32 RecvPacket_MemberStateToMember(struct PokemonJump_Player *player, int multiplayerId) { - struct UnkPacket4 packet; + struct MemberStatePacket packet; - if ((gRecvCmds[multiplayerId][0] & 0xFF00) != 0x2F00) + if ((gRecvCmds[multiplayerId][0] & RFUCMD_MASK) != RFUCMD_SEND_PACKET) return FALSE; memcpy(&packet, &gRecvCmds[multiplayerId][1], sizeof(packet)); - if (packet.id != 4) + if (packet.id != PACKET_MEMBER_STATE) return FALSE; - arg0->unk10 = packet.unk1; - arg0->unk14 = packet.unk2; - arg0->unk18 = packet.unk3; - arg0->unkE = packet.unk4; + player->monState = packet.monState; + player->jumpState = packet.jumpState; + player->funcFinished = packet.funcFinished; + player->jumpTimeStart = packet.jumpTimeStart; return TRUE; } -void sub_8149CEC(struct PokemonJump2 *arg0) +static void StartPokeJumpGfx(struct PokemonJumpGfx *jumpGfx) { u8 taskId; - gUnknown_203F3D8 = arg0; - sub_8149D34(gUnknown_203F3D8); - taskId = CreateTask(sub_8149DA4, 3); - gUnknown_203F3D8->unk6 = taskId; - SetWordTaskArg(gUnknown_203F3D8->unk6, 2, (uintptr_t)gUnknown_203F3D8); - sub_8149D80(sub_8149DC8); + sPokemonJumpGfx = jumpGfx; + InitPokeJumpGfx(sPokemonJumpGfx); + taskId = CreateTask(Task_RunPokeJumpGfxFunc, 3); + sPokemonJumpGfx->taskId = taskId; + SetWordTaskArg(sPokemonJumpGfx->taskId, 2, (uintptr_t)sPokemonJumpGfx); + SetUpPokeJumpGfxFunc(LoadPokeJumpGfx); } -void sub_8149D24(void) +static void FreeWindowsAndDigitObj(void) { FreeAllWindowBuffers(); DigitObjUtil_Free(); } -static void sub_8149D34(struct PokemonJump2 *arg0) +static void InitPokeJumpGfx(struct PokemonJumpGfx *jumpGfx) { - arg0->unk4 = 0; - arg0->unk0 = 0; - arg0->unk12 = 0xFF; + jumpGfx->mainState = 0; + jumpGfx->funcFinished = FALSE; + jumpGfx->msgWindowId = WINDOW_NONE; } -// Gfx -static const u16 sPkmnJumpPal3[] = INCBIN_U16("graphics/link_games/pkmnjump_pal3.gbapal"); +static const u16 sInterface_Pal[] = INCBIN_U16("graphics/pokemon_jump/interface.gbapal"); -static const u16 sPkmnJumpBgPal[] = INCBIN_U16("graphics/link_games/pkmnjump_bg.gbapal"); -static const u32 sPkmnJumpBgGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_bg.4bpp.lz"); -static const u32 sPkmnJumpBgTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_bg.bin.lz"); +static const u16 sBg_Pal[] = INCBIN_U16("graphics/pokemon_jump/bg.gbapal"); +static const u32 sBg_Gfx[] = INCBIN_U32("graphics/pokemon_jump/bg.4bpp.lz"); +static const u32 sBg_Tilemap[] = INCBIN_U32("graphics/pokemon_jump/bg.bin.lz"); -static const u16 sPkmnJumpVenusaurPal[] = INCBIN_U16("graphics/link_games/pkmnjump_venusaur.gbapal"); -static const u32 sPkmnJumpVenusaurGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_venusaur.4bpp.lz"); -static const u32 sPkmnJumpVenusaurTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_venusaur.bin.lz"); +static const u16 sVenusaur_Pal[] = INCBIN_U16("graphics/pokemon_jump/venusaur.gbapal"); +static const u32 sVenusaur_Gfx[] = INCBIN_U32("graphics/pokemon_jump/venusaur.4bpp.lz"); +static const u32 sVenusaur_Tilemap[] = INCBIN_U32("graphics/pokemon_jump/venusaur.bin.lz"); -static const u16 sPkmnJumpResultsPal[] = INCBIN_U16("graphics/link_games/pkmnjump_results.gbapal"); -static const u32 sPkmnJumpResultsGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_results.4bpp.lz"); -static const u32 sPkmnJumpResultsTilemap[] = INCBIN_U32("graphics/link_games/pkmnjump_results.bin.lz"); +static const u16 sBonuses_Pal[] = INCBIN_U16("graphics/pokemon_jump/bonuses.gbapal"); +static const u32 sBonuses_Gfx[] = INCBIN_U32("graphics/pokemon_jump/bonuses.4bpp.lz"); +static const u32 sBonuses_Tilemap[] = INCBIN_U32("graphics/pokemon_jump/bonuses.bin.lz"); -static const struct BgTemplate gUnknown_846D8D4[] = +static const struct BgTemplate sBgTemplates[] = { { - .bg = 0, + .bg = BG_INTERFACE, .charBaseIndex = 0, .mapBaseIndex = 27, .screenSize = 0, @@ -2650,7 +2924,7 @@ static const struct BgTemplate gUnknown_846D8D4[] = .baseTile = 0 }, { - .bg = 2, + .bg = BG_VENUSAUR, .charBaseIndex = 1, .mapBaseIndex = 30, .screenSize = 2, @@ -2659,7 +2933,7 @@ static const struct BgTemplate gUnknown_846D8D4[] = .baseTile = 0 }, { - .bg = 1, + .bg = BG_BONUSES, .charBaseIndex = 2, .mapBaseIndex = 12, .screenSize = 3, @@ -2668,7 +2942,7 @@ static const struct BgTemplate gUnknown_846D8D4[] = .baseTile = 0 }, { - .bg = 3, + .bg = BG_SCENERY, .charBaseIndex = 3, .mapBaseIndex = 29, .screenSize = 0, @@ -2678,10 +2952,10 @@ static const struct BgTemplate gUnknown_846D8D4[] = }, }; -static const struct WindowTemplate gUnknown_846D8E4[] = +static const struct WindowTemplate sWindowTemplates[] = { - { - .bg = 0, + [WIN_POINTS] = { + .bg = BG_INTERFACE, .tilemapLeft = 19, .tilemapTop = 0, .width = 6, @@ -2689,8 +2963,8 @@ static const struct WindowTemplate gUnknown_846D8E4[] = .paletteNum = 2, .baseBlock = 0x13, }, - { - .bg = 0, + [WIN_TIMES] = { + .bg = BG_INTERFACE, .tilemapLeft = 8, .tilemapTop = 0, .width = 6, @@ -2705,352 +2979,353 @@ struct { int id; void (*func)(void); -} static const gUnknown_846D8FC[] = +} static const sPokeJumpGfxFuncs[] = { - {0x00, sub_8149DC8}, - {0x01, sub_8149F64}, - {0x02, sub_8149FD0}, - {0x03, sub_814A03C}, - {0x04, sub_814A0C8}, - {0x05, sub_814A174}, - {0x06, sub_814A218}, - {0x07, sub_814A264}, - {0x09, sub_814A3AC}, - {0x08, sub_814A308}, + {GFXFUNC_LOAD, LoadPokeJumpGfx}, // Element not used, LoadPokeJumpGfx is passed directly to SetUpPokeJumpGfxFunc + {GFXFUNC_SHOW_NAMES, PrintPlayerNamesNoHighlight}, + {GFXFUNC_SHOW_NAMES_HIGHLIGHT, PrintPlayerNamesWithHighlight}, + {GFXFUNC_ERASE_NAMES, ErasePlayerNames}, + {GFXFUNC_MSG_PLAY_AGAIN, Msg_WantToPlayAgain}, + {GFXFUNC_MSG_SAVING, Msg_SavingDontTurnOff}, + {GFXFUNC_ERASE_MSG, EraseMessage}, + {GFXFUNC_MSG_PLAYER_DROPPED, Msg_SomeoneDroppedOut}, + {GFXFUNC_COUNTDOWN, DoPokeJumpCountdown}, + {GFXFUNC_MSG_COMM_STANDBY, Msg_CommunicationStandby}, }; -void sub_8149D40(int arg0) +static void SetUpPokeJumpGfxFuncById(int id) { int i; - for (i = 0; i < NELEMS(gUnknown_846D8FC); i++) + for (i = 0; i < ARRAY_COUNT(sPokeJumpGfxFuncs); i++) { - if (gUnknown_846D8FC[i].id == arg0) - sub_8149D80(gUnknown_846D8FC[i].func); + if (sPokeJumpGfxFuncs[i].id == id) + SetUpPokeJumpGfxFunc(sPokeJumpGfxFuncs[i].func); } } -bool32 sub_8149D68(void) +static bool32 IsPokeJumpGfxFuncFinished(void) { - return (gUnknown_203F3D8->unk0 != 1); + return (sPokemonJumpGfx->funcFinished != TRUE); } -static void sub_8149D80(void (*func)(void)) +static void SetUpPokeJumpGfxFunc(void (*func)(void)) { - SetWordTaskArg(gUnknown_203F3D8->unk6, 0, (uintptr_t)func); - gUnknown_203F3D8->unk4 = 0; - gUnknown_203F3D8->unk0 = 0; + SetWordTaskArg(sPokemonJumpGfx->taskId, 0, (uintptr_t)func); + sPokemonJumpGfx->mainState = 0; + sPokemonJumpGfx->funcFinished = FALSE; } -static void sub_8149DA4(u8 taskId) +static void Task_RunPokeJumpGfxFunc(u8 taskId) { - if (!gUnknown_203F3D8->unk0) + if (!sPokemonJumpGfx->funcFinished) { + // Read the function set in the data by SetUpPokeJumpGfxFunc void (*func)(void) = (void *)(GetWordTaskArg(taskId, 0)); func(); } } -static void sub_8149DC8(void) +static void LoadPokeJumpGfx(void) { - switch (gUnknown_203F3D8->unk4) + switch (sPokemonJumpGfx->mainState) { case 0: ResetBgsAndClearDma3BusyFlags(FALSE); - InitBgsFromTemplates(0, gUnknown_846D8D4, NELEMS(gUnknown_846D8D4)); - InitWindows(gUnknown_846D8E4); + InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates)); + InitWindows(sWindowTemplates); ResetBgPositions(); ResetTempTileDataBuffers(); - sub_814AD6C(gUnknown_203F3D8); - sub_814A9C8(); - LoadPalette(sPkmnJumpBgPal, 0, 0x20); - DecompressAndCopyTileDataToVram(3, sPkmnJumpBgGfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(3, sPkmnJumpBgTilemap, 0, 0, 1); - LoadPalette(sPkmnJumpVenusaurPal, 0x30, 0x20); - DecompressAndCopyTileDataToVram(2, sPkmnJumpVenusaurGfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(2, sPkmnJumpVenusaurTilemap, 0, 0, 1); - LoadPalette(sPkmnJumpResultsPal, 0x10, 0x20); - DecompressAndCopyTileDataToVram(1, sPkmnJumpResultsGfx, 0, 0, 0); - DecompressAndCopyTileDataToVram(1, sPkmnJumpResultsTilemap, 0, 0, 1); - LoadPalette(sPkmnJumpPal3, 0x20, 0x20); - SetBgTilemapBuffer(0, gUnknown_203F3D8->tilemapBuffer); - FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); - sub_814A84C(); - sub_814AA24(0); + LoadSpriteSheetsAndPalettes(sPokemonJumpGfx); + InitDigitPrinters(); + LoadPalette(sBg_Pal, 0, 0x20); + DecompressAndCopyTileDataToVram(BG_SCENERY, sBg_Gfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(BG_SCENERY, sBg_Tilemap, 0, 0, 1); + LoadPalette(sVenusaur_Pal, 0x30, 0x20); + DecompressAndCopyTileDataToVram(BG_VENUSAUR, sVenusaur_Gfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(BG_VENUSAUR, sVenusaur_Tilemap, 0, 0, 1); + LoadPalette(sBonuses_Pal, 0x10, 0x20); + DecompressAndCopyTileDataToVram(BG_BONUSES, sBonuses_Gfx, 0, 0, 0); + DecompressAndCopyTileDataToVram(BG_BONUSES, sBonuses_Tilemap, 0, 0, 1); + LoadPalette(sInterface_Pal, 0x20, 0x20); + SetBgTilemapBuffer(BG_INTERFACE, sPokemonJumpGfx->tilemapBuffer); + FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, 0x20, 0x20); + PrintScoreSuffixes(); + PrintScore(0); DrawWindowBorderWithStdpal3(0, 1, 0xE0); LoadUserWindowBorderGfx(0, 0x00A, 0xD0); - CopyBgTilemapBufferToVram(0); - CopyBgTilemapBufferToVram(2); - CopyBgTilemapBufferToVram(1); - gUnknown_203F3D8->unk4++; + CopyBgTilemapBufferToVram(BG_INTERFACE); + CopyBgTilemapBufferToVram(BG_VENUSAUR); + CopyBgTilemapBufferToVram(BG_BONUSES); + sPokemonJumpGfx->mainState++; break; case 1: if (!FreeTempTileDataBuffersIfPossible()) { - sub_814A8B8(); - sub_814B294(gUnknown_203F3D8); - sub_814B348(gUnknown_203F3D8, 6); - ShowBg(3); - ShowBg(0); - ShowBg(2); - HideBg(1); - gUnknown_203F3D8->unk4++; + CreateJumpMonSprites(); + CreateVineSprites(sPokemonJumpGfx); + UpdateVineAnim(sPokemonJumpGfx, VINE_UPSWING_LOWER); + ShowBg(BG_SCENERY); + ShowBg(BG_INTERFACE); + ShowBg(BG_VENUSAUR); + HideBg(BG_BONUSES); + sPokemonJumpGfx->mainState++; } break; case 2: - gUnknown_203F3D8->unk0 = 1; + sPokemonJumpGfx->funcFinished = TRUE; break; } } -static void sub_8149F64(void) +static void PrintPlayerNamesNoHighlight(void) { - switch (gUnknown_203F3D8->unk4) + switch (sPokemonJumpGfx->mainState) { case 0: - sub_814AADC(); - gUnknown_203F3D8->unk4++; + AddPlayerNameWindows(); + sPokemonJumpGfx->mainState++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { - sub_814AC30(FALSE); - gUnknown_203F3D8->unk4++; + PrintPokeJumpPlayerNames(FALSE); + sPokemonJumpGfx->mainState++; } break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) { - sub_814AC94(); - gUnknown_203F3D8->unk4++; + DrawPlayerNameWindows(); + sPokemonJumpGfx->mainState++; } break; case 3: if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; + sPokemonJumpGfx->funcFinished = TRUE; break; } } -static void sub_8149FD0(void) +static void PrintPlayerNamesWithHighlight(void) { - switch (gUnknown_203F3D8->unk4) + switch (sPokemonJumpGfx->mainState) { case 0: - sub_814AADC(); - gUnknown_203F3D8->unk4++; + AddPlayerNameWindows(); + sPokemonJumpGfx->mainState++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { - sub_814AC30(TRUE); - gUnknown_203F3D8->unk4++; + PrintPokeJumpPlayerNames(TRUE); + sPokemonJumpGfx->mainState++; } break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) { - sub_814AC94(); - gUnknown_203F3D8->unk4++; + DrawPlayerNameWindows(); + sPokemonJumpGfx->mainState++; } break; case 3: if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; + sPokemonJumpGfx->funcFinished = TRUE; break; } } -static void sub_814A03C(void) +static void ErasePlayerNames(void) { int i, numPlayers; - numPlayers = sub_81499A4(); - switch (gUnknown_203F3D8->unk4) + numPlayers = GetNumPokeJumpPlayers(); + switch (sPokemonJumpGfx->mainState) { case 0: for (i = 0; i < numPlayers; i++) - ClearWindowTilemap(gUnknown_203F3D8->unk1C[i]); + ClearWindowTilemap(sPokemonJumpGfx->nameWindowIds[i]); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; + CopyBgTilemapBufferToVram(BG_INTERFACE); + sPokemonJumpGfx->mainState++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { for (i = 0; i < numPlayers; i++) - RemoveWindow(gUnknown_203F3D8->unk1C[i]); + RemoveWindow(sPokemonJumpGfx->nameWindowIds[i]); - gUnknown_203F3D8->unk0 = 1; + sPokemonJumpGfx->funcFinished = TRUE; } break; } } -static void sub_814A0C8(void) +static void Msg_WantToPlayAgain(void) { - switch (gUnknown_203F3D8->unk4) + switch (sPokemonJumpGfx->mainState) { case 0: - gUnknown_203F3D8->unk12 = sub_814A754(1, 8, 20, 2); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_WantToPlayAgain2, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk4++; + sPokemonJumpGfx->msgWindowId = AddMessageWindow(1, 8, 20, 2); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_WantToPlayAgain2, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); + sPokemonJumpGfx->mainState++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { - PutWindowTilemap(gUnknown_203F3D8->unk12); - DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); - sub_814A7D0(23, 7, 0); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; + PutWindowTilemap(sPokemonJumpGfx->msgWindowId); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); + CreatePokeJumpYesNoMenu(23, 7, 0); + CopyBgTilemapBufferToVram(BG_INTERFACE); + sPokemonJumpGfx->mainState++; } break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; + sPokemonJumpGfx->funcFinished = TRUE; break; } } -static void sub_814A174(void) +static void Msg_SavingDontTurnOff(void) { - switch (gUnknown_203F3D8->unk4) + switch (sPokemonJumpGfx->mainState) { case 0: - gUnknown_203F3D8->unk12 = sub_814A754(2, 7, 26, 4); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_SavingDontTurnOffPower, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk4++; + sPokemonJumpGfx->msgWindowId = AddMessageWindow(2, 7, 26, 4); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_SavingDontTurnOffPower, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); + sPokemonJumpGfx->mainState++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { - PutWindowTilemap(gUnknown_203F3D8->unk12); - DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; + PutWindowTilemap(sPokemonJumpGfx->msgWindowId); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); + CopyBgTilemapBufferToVram(BG_INTERFACE); + sPokemonJumpGfx->mainState++; } break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; + sPokemonJumpGfx->funcFinished = TRUE; break; } } -static void sub_814A218(void) +static void EraseMessage(void) { - switch (gUnknown_203F3D8->unk4) + switch (sPokemonJumpGfx->mainState) { case 0: - sub_814A6CC(); + ClearMessageWindow(); DestroyYesNoMenu(); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; + CopyBgTilemapBufferToVram(BG_INTERFACE); + sPokemonJumpGfx->mainState++; break; case 1: - if (!sub_814A6FC() && !IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; + if (!RemoveMessageWindow() && !IsDma3ManagerBusyWithBgCopy()) + sPokemonJumpGfx->funcFinished = TRUE; break; } } -static void sub_814A264(void) +static void Msg_SomeoneDroppedOut(void) { - switch (gUnknown_203F3D8->unk4) + switch (sPokemonJumpGfx->mainState) { case 0: - gUnknown_203F3D8->unk12 = sub_814A754(2, 8, 22, 4); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_SomeoneDroppedOut2, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk4++; + sPokemonJumpGfx->msgWindowId = AddMessageWindow(2, 8, 22, 4); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_SomeoneDroppedOut2, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); + sPokemonJumpGfx->mainState++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { - PutWindowTilemap(gUnknown_203F3D8->unk12); - DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; + PutWindowTilemap(sPokemonJumpGfx->msgWindowId); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); + CopyBgTilemapBufferToVram(BG_INTERFACE); + sPokemonJumpGfx->mainState++; } break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; + sPokemonJumpGfx->funcFinished = TRUE; break; } } -static void sub_814A308(void) +static void Msg_CommunicationStandby(void) { - switch (gUnknown_203F3D8->unk4) + switch (sPokemonJumpGfx->mainState) { case 0: - gUnknown_203F3D8->unk12 = sub_814A754(7, 10, 16, 2); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_CommunicationStandby4, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk4++; + sPokemonJumpGfx->msgWindowId = AddMessageWindow(7, 10, 16, 2); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_CommunicationStandby4, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); + sPokemonJumpGfx->mainState++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) { - PutWindowTilemap(gUnknown_203F3D8->unk12); - DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unk4++; + PutWindowTilemap(sPokemonJumpGfx->msgWindowId); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); + CopyBgTilemapBufferToVram(BG_INTERFACE); + sPokemonJumpGfx->mainState++; } break; case 2: if (!IsDma3ManagerBusyWithBgCopy()) - gUnknown_203F3D8->unk0 = 1; + sPokemonJumpGfx->funcFinished = TRUE; break; } } -static void sub_814A3AC(void) +static void DoPokeJumpCountdown(void) { - switch (gUnknown_203F3D8->unk4) + switch (sPokemonJumpGfx->mainState) { case 0: - sub_814B43C(gUnknown_203F3D8); - gUnknown_203F3D8->unk4++; + StartPokeJumpCountdown(sPokemonJumpGfx); + sPokemonJumpGfx->mainState++; break; case 1: - if (!sub_814B460()) - gUnknown_203F3D8->unk0 = 1; + if (!IsPokeJumpCountdownRunning()) + sPokemonJumpGfx->funcFinished = TRUE; break; } } -void sub_814A3E4(void) +static void SetUpResetVineGfx(void) { - gUnknown_203F3D8->unkA = 0; - gUnknown_203F3D8->unkB = 0; - gUnknown_203F3D8->unkC = 6; - sub_814A95C(gUnknown_203F3D8->unkC); + sPokemonJumpGfx->resetVineState = 0; + sPokemonJumpGfx->resetVineTimer = 0; + sPokemonJumpGfx->vineState = VINE_UPSWING_LOWER; + UpdateVineSwing(sPokemonJumpGfx->vineState); } -bool32 sub_814A408(void) +static bool32 ResetVineGfx(void) { - switch (gUnknown_203F3D8->unkA) + switch (sPokemonJumpGfx->resetVineState) { case 0: - gUnknown_203F3D8->unkB++; - if (gUnknown_203F3D8->unkB > 10) + sPokemonJumpGfx->resetVineTimer++; + if (sPokemonJumpGfx->resetVineTimer > 10) { - gUnknown_203F3D8->unkB = 0; - gUnknown_203F3D8->unkC++; - if (gUnknown_203F3D8->unkC >= 10) + sPokemonJumpGfx->resetVineTimer = 0; + sPokemonJumpGfx->vineState++; + if (sPokemonJumpGfx->vineState >= NUM_VINESTATES) { - gUnknown_203F3D8->unkC = 0; - gUnknown_203F3D8->unkA++; + sPokemonJumpGfx->vineState = VINE_HIGHEST; + sPokemonJumpGfx->resetVineState++; } } - sub_814A95C(gUnknown_203F3D8->unkC); - if (gUnknown_203F3D8->unkC != 7) + UpdateVineSwing(sPokemonJumpGfx->vineState); + if (sPokemonJumpGfx->vineState != VINE_UPSWING_LOW) break; case 1: return FALSE; @@ -3061,87 +3336,87 @@ bool32 sub_814A408(void) static const u8 sPluralTxt[] = _("IES"); -void sub_814A468(u16 itemId, u16 quantity) +static void PrintPrizeMessage(u16 itemId, u16 quantity) { - CopyItemName(itemId, gUnknown_203F3D8->txtBuff[0]); - ConvertIntToDecimalStringN(gUnknown_203F3D8->txtBuff[1], quantity, STR_CONV_MODE_LEFT_ALIGN, 1); + CopyItemName(itemId, sPokemonJumpGfx->itemName); + ConvertIntToDecimalStringN(sPokemonJumpGfx->itemQuantityStr, quantity, STR_CONV_MODE_LEFT_ALIGN, 1); if (itemId >= FIRST_BERRY_INDEX && itemId < LAST_BERRY_INDEX) { if (quantity > 1) { - int endi = StringLength(gUnknown_203F3D8->txtBuff[0]); + int endi = StringLength(sPokemonJumpGfx->itemName); if (endi != 0) { endi--; - endi[gUnknown_203F3D8->txtBuff[0]] = EOS; - StringAppend(gUnknown_203F3D8->txtBuff[0], sPluralTxt); + endi[sPokemonJumpGfx->itemName] = EOS; + StringAppend(sPokemonJumpGfx->itemName, sPluralTxt); } } } DynamicPlaceholderTextUtil_Reset(); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_203F3D8->txtBuff[0]); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, gUnknown_203F3D8->txtBuff[1]); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_AwesomeWonF701F700); - gUnknown_203F3D8->unk12 = sub_814A754(4, 8, 22, 4); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk14 = MUS_LEVEL_UP; - gUnknown_203F3D8->unkD = 0; + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sPokemonJumpGfx->itemQuantityStr); + DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_AwesomeWonF701F700); + sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 8, 22, 4); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); + sPokemonJumpGfx->fanfare = MUS_LEVEL_UP; + sPokemonJumpGfx->msgWindowState = 0; } -void sub_814A53C(u16 itemId) +static void PrintPrizeFilledBagMessage(u16 itemId) { - CopyItemName(itemId, gUnknown_203F3D8->txtBuff[0]); + CopyItemName(itemId, sPokemonJumpGfx->itemName); DynamicPlaceholderTextUtil_Reset(); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_203F3D8->txtBuff[0]); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_FilledStorageSpace2); - gUnknown_203F3D8->unk12 = sub_814A754(4, 8, 22, 4); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk14 = 0; - gUnknown_203F3D8->unkD = 0; + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName); + DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_FilledStorageSpace2); + sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 8, 22, 4); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); + sPokemonJumpGfx->fanfare = MUS_DUMMY; + sPokemonJumpGfx->msgWindowState = 0; } -void sub_814A5B4(u16 itemId) +static void PrintNoRoomForPrizeMessage(u16 itemId) { - CopyItemName(itemId, gUnknown_203F3D8->txtBuff[0]); + CopyItemName(itemId, sPokemonJumpGfx->itemName); DynamicPlaceholderTextUtil_Reset(); - DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gUnknown_203F3D8->txtBuff[0]); - DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_CantHoldMore); - gUnknown_203F3D8->unk12 = sub_814A754(4, 9, 22, 2); - AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX); - gUnknown_203F3D8->unk14 = 0; - gUnknown_203F3D8->unkD = 0; + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName); + DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_CantHoldMore); + sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 9, 22, 2); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SPEED_FF, NULL); + CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); + sPokemonJumpGfx->fanfare = MUS_DUMMY; + sPokemonJumpGfx->msgWindowState = 0; } -bool32 sub_814A62C(void) +static bool32 DoPrizeMessageAndFanfare(void) { - switch (gUnknown_203F3D8->unkD) + switch (sPokemonJumpGfx->msgWindowState) { case 0: if (!IsDma3ManagerBusyWithBgCopy()) { - PutWindowTilemap(gUnknown_203F3D8->unk12); - DrawTextBorderOuter(gUnknown_203F3D8->unk12, 1, 14); - CopyBgTilemapBufferToVram(0); - gUnknown_203F3D8->unkD++; + PutWindowTilemap(sPokemonJumpGfx->msgWindowId); + DrawTextBorderOuter(sPokemonJumpGfx->msgWindowId, 1, 14); + CopyBgTilemapBufferToVram(BG_INTERFACE); + sPokemonJumpGfx->msgWindowState++; } break; case 1: if (IsDma3ManagerBusyWithBgCopy()) break; - if (gUnknown_203F3D8->unk14 == 0) + if (sPokemonJumpGfx->fanfare == MUS_DUMMY) { - gUnknown_203F3D8->unkD += 2; + sPokemonJumpGfx->msgWindowState += 2; return FALSE; } - PlayFanfare(gUnknown_203F3D8->unk14); - gUnknown_203F3D8->unkD++; + PlayFanfare(sPokemonJumpGfx->fanfare); + sPokemonJumpGfx->msgWindowState++; case 2: if (!IsFanfareTaskInactive()) break; - gUnknown_203F3D8->unkD++; + sPokemonJumpGfx->msgWindowState++; case 3: return FALSE; } @@ -3149,52 +3424,50 @@ bool32 sub_814A62C(void) return TRUE; } -void sub_814A6CC(void) +static void ClearMessageWindow(void) { - if (gUnknown_203F3D8->unk12 != 0xFF) + if (sPokemonJumpGfx->msgWindowId != WINDOW_NONE) { - rbox_fill_rectangle(gUnknown_203F3D8->unk12); - CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_MAP); - gUnknown_203F3D8->unkD = 0; + rbox_fill_rectangle(sPokemonJumpGfx->msgWindowId); + CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_MAP); + sPokemonJumpGfx->msgWindowState = 0; } } -// Can't match this without the ugly GOTO, oh well. -bool32 sub_814A6FC(void) +static bool32 RemoveMessageWindow(void) { - if (gUnknown_203F3D8->unk12 == 0xFF) - { - RET_FALSE: + if (sPokemonJumpGfx->msgWindowId == WINDOW_NONE) return FALSE; - } - if (gUnknown_203F3D8->unkD == 0) + switch (sPokemonJumpGfx->msgWindowState) { + case 0: if (!IsDma3ManagerBusyWithBgCopy()) { - RemoveWindow(gUnknown_203F3D8->unk12); - gUnknown_203F3D8->unk12 = 0xFF; - gUnknown_203F3D8->unkD++; - goto RET_FALSE; + RemoveWindow(sPokemonJumpGfx->msgWindowId); + sPokemonJumpGfx->msgWindowId = WINDOW_NONE; + sPokemonJumpGfx->msgWindowState++; } + else + break; + case 1: + return FALSE; } - else if (gUnknown_203F3D8->unkD == 1) - goto RET_FALSE; return TRUE; } -s8 sub_814A744(void) +static s8 HandlePlayAgainInput(void) { return Menu_ProcessInputNoWrapClearOnChoose(); } -static u32 sub_814A754(u32 left, u32 top, u32 width, u32 height) +static u32 AddMessageWindow(u32 left, u32 top, u32 width, u32 height) { u32 windowId; struct WindowTemplate window; - window.bg = 0; + window.bg = BG_INTERFACE; window.tilemapLeft = left; window.tilemapTop = top; window.width = width; @@ -3207,12 +3480,12 @@ static u32 sub_814A754(u32 left, u32 top, u32 width, u32 height) return windowId; } -static void sub_814A7D0(u16 left, u16 top, u8 cursorPos) +static void CreatePokeJumpYesNoMenu(u16 left, u16 top, u8 cursorPos) { struct WindowTemplate window; u8 a = cursorPos; - window.bg = 0; + window.bg = BG_INTERFACE; window.tilemapLeft = left; window.tilemapTop = top; window.width = 6; @@ -3223,171 +3496,212 @@ static void sub_814A7D0(u16 left, u16 top, u8 cursorPos) CreateYesNoMenu(&window, 2, 0, 2, 0x00a, 0xD, a); } -static void sub_814A84C(void) +// "Points" for jump score and "times" for number of jumps in a row +static void PrintScoreSuffixes(void) { u8 color[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY}; - PutWindowTilemap(0); - PutWindowTilemap(1); - FillWindowPixelBuffer(0, PIXEL_FILL(0)); - FillWindowPixelBuffer(1, PIXEL_FILL(0)); - AddTextPrinterParameterized3(0, 0, 0, 2, color, 0, gText_SpacePoints2); - AddTextPrinterParameterized3(1, 0, 0, 2, color, 0, gText_SpaceTimes3); + PutWindowTilemap(WIN_POINTS); + PutWindowTilemap(WIN_TIMES); + FillWindowPixelBuffer(WIN_POINTS, PIXEL_FILL(0)); + FillWindowPixelBuffer(WIN_TIMES, PIXEL_FILL(0)); + AddTextPrinterParameterized3(WIN_POINTS, 0, 0, 2, color, 0, gText_SpacePoints2); + AddTextPrinterParameterized3(WIN_TIMES, 0, 0, 2, color, 0, gText_SpaceTimes3); } -static const u8 gUnknown_846D953[] = {2, 2, 0, 0, 1, 1, 1, 0, 0, 2, 0, 0, 0}; - -static const struct CompressedSpriteSheet gUnknown_846D960 = {gUnknown_8479688, 0, 0x320}; -static const struct SpritePalette gUnknown_846D968 = {gUnknown_8479668, 0x320}; - -static const u16 gUnknown_846D970[] = {0x06, 0x08, 0x10, 0x08}; -static const u16 gUnknown_846D978[] = {0x06, 0x08, 0x0b, 0x06, 0x10, 0x08}; -static const u16 gUnknown_846D984[] = {0x02, 0x06, 0x06, 0x08, 0x10, 0x08, 0x14, 0x06}; -static const u16 gUnknown_846D994[] = {0x02, 0x06, 0x06, 0x08, 0x0b, 0x06, 0x10, 0x08, 0x14, 0x06}; - -static const u16 *const gUnknown_846D9A8[] = -{ - gUnknown_846D970, - gUnknown_846D978, - gUnknown_846D984, - gUnknown_846D994, +// The venusaurs in the background are actually an empty 256x512 bg with 3 pairs of venusaurs on it. +// The below array is used to get values for where to set the bg Y to show the corresponding +// venusaur pair in their state of swinging the vine rope +// NEUTRAL/DOWN/UP refers to which direction the Venusaur is facing as it swings the vine +enum { + VENUSAUR_NEUTRAL, + VENUSAUR_DOWN, + VENUSAUR_UP, }; -static const s16 gUnknown_846D9B8[] = {0x0058, 0x0098}; -static const s16 gUnknown_846D9BC[] = {0x0058, 0x0078, 0x0098}; -static const s16 gUnknown_846D9C2[] = {0x0038, 0x0058, 0x0098, 0x00b8}; -static const s16 gUnknown_846D9CA[] = {0x0038, 0x0058, 0x0078, 0x0098, 0x00b8}; - -static const s16 *const gUnknown_846D9D4[] = -{ - gUnknown_846D9B8, - gUnknown_846D9BC, - gUnknown_846D9C2, - gUnknown_846D9CA, +static const u8 sVenusaurStates[] = { + [VINE_HIGHEST] = VENUSAUR_UP, + [VINE_DOWNSWING_HIGHER] = VENUSAUR_UP, + [VINE_DOWNSWING_HIGH] = VENUSAUR_NEUTRAL, + [VINE_DOWNSWING_LOW] = VENUSAUR_NEUTRAL, + [VINE_DOWNSWING_LOWER] = VENUSAUR_DOWN, + [VINE_LOWEST] = VENUSAUR_DOWN, + [VINE_UPSWING_LOWER] = VENUSAUR_DOWN, + [VINE_UPSWING_LOW] = VENUSAUR_NEUTRAL, + [VINE_UPSWING_HIGH] = VENUSAUR_NEUTRAL, + [VINE_UPSWING_HIGHER] = VENUSAUR_UP, }; -static void sub_814A8B8(void) +static const struct CompressedSpriteSheet sSpriteSheet_Digits = {gUnknown_8479688, 0, TAG_DIGITS}; +static const struct SpritePalette sSpritePalette_Digits = {gUnknown_8479668, TAG_DIGITS}; + +static const u16 sPlayerNameWindowCoords_2Players[] = { + 6, 8, + 16, 8 +}; +static const u16 sPlayerNameWindowCoords_3Players[] = { + 6, 8, + 11, 6, + 16, 8 +}; +static const u16 sPlayerNameWindowCoords_4Players[] = { + 2, 6, + 6, 8, + 16, 8, + 20, 6 +}; +static const u16 sPlayerNameWindowCoords_5Players[] = { + 2, 6, + 6, 8, + 11, 6, + 16, 8, + 20, 6 +}; + +static const u16 *const sPlayerNameWindowCoords[MAX_RFU_PLAYERS - 1] = { - int i, y, playersCount = sub_81499A4(); - const s16 *xCoords = gUnknown_846D9D4[playersCount - 2]; + sPlayerNameWindowCoords_2Players, + sPlayerNameWindowCoords_3Players, + sPlayerNameWindowCoords_4Players, + sPlayerNameWindowCoords_5Players, +}; + +static const s16 sMonXCoords_2Players[] = {88, 152}; +static const s16 sMonXCoords_3Players[] = {88, 120, 152}; +static const s16 sMonXCoords_4Players[] = {56, 88, 152, 184}; +static const s16 sMonXCoords_5Players[] = {56, 88, 120, 152, 184}; + +static const s16 *const sMonXCoords[MAX_RFU_PLAYERS - 1] = +{ + sMonXCoords_2Players, + sMonXCoords_3Players, + sMonXCoords_4Players, + sMonXCoords_5Players, +}; + +static void CreateJumpMonSprites(void) +{ + int i, y, playersCount = GetNumPokeJumpPlayers(); + const s16 *xCoords = sMonXCoords[playersCount - 2]; for (i = 0; i < playersCount; i++) { - struct PokemonJump1_MonInfo *info = sub_81499C0(i); + struct PokemonJump_MonInfo *info = GetMonInfoByMultiplayerId(i); y = gMonFrontPicCoords[info->species].y_offset; - sub_814ADCC(gUnknown_203F3D8, info, *xCoords, y + 112, i); - sub_814B240(gUnknown_203F3D8, *xCoords, 112, i); + CreateJumpMonSprite(sPokemonJumpGfx, info, *xCoords, y + 112, i); + CreateStarSprite(sPokemonJumpGfx, *xCoords, 112, i); xCoords++; } } -void sub_814A940(u32 id, s16 y) +static void SetMonSpriteY(u32 id, s16 y) { - gUnknown_203F3D8->unk81A8[id]->y2 = y; + sPokemonJumpGfx->monSprites[id]->y2 = y; } -void sub_814A95C(int id) +static void UpdateVineSwing(int vineState) { - sub_814B348(gUnknown_203F3D8, id); - ChangeBgY(2, (gUnknown_846D953[id] * 5) << 0xD, 0); + UpdateVineAnim(sPokemonJumpGfx, vineState); + ChangeBgY(BG_VENUSAUR, (sVenusaurStates[vineState] * 5) << 13, BG_COORD_SET); } -int sub_814A98C(u8 flags) +static int DoSameJumpTimeBonus(u8 flags) { - int i, count; + int i, numPlayers; - for (i = 0, count = 0; i < 5; i++) + for (i = 0, numPlayers = 0; i < MAX_RFU_PLAYERS; i++) { if (flags & 1) { - sub_814AF0C(gUnknown_203F3D8, i); - count++; + // Player was part of a synchronous jump + // Give a bonus to them + DoStarAnim(sPokemonJumpGfx, i); + numPlayers++; } flags >>= 1; } - sub_814ACCC(count - 2); - return count; + ShowBonus(numPlayers - 2); + return numPlayers; } -static void sub_814A9C8(void) +static void InitDigitPrinters(void) { - struct DigitObjUtilTemplate unkStruct; - struct DigitObjUtilTemplate *ptr = &unkStruct; // This temp variable is needed to match, don't ask me why. + struct DigitObjUtilTemplate template = { + .shape = SPRITE_SHAPE(8x8), + .size = SPRITE_SIZE(8x8), + .strConvMode = 0, + .priority = 1, + .oamCount = 5, + .xDelta = 8, + .x = 108, + .y = 6, + .spriteSheet = {.compressed = &sSpriteSheet_Digits}, + .spritePal = &sSpritePalette_Digits, + }; - ptr->shape = SPRITE_SHAPE(8x8); - ptr->size = SPRITE_SIZE(8x8); - ptr->strConvMode = 0; - ptr->priority = 1; - ptr->oamCount = 5; - ptr->xDelta = 8; - ptr->x = 108; - ptr->y = 6; - ptr->spriteSheet.compressed = &gUnknown_846D960; - ptr->spritePal = &gUnknown_846D968; + DigitObjUtil_Init(NUM_WINDOWS); + DigitObjUtil_CreatePrinter(WIN_POINTS, 0, &template); - DigitObjUtil_Init(2); - DigitObjUtil_CreatePrinter(0, 0, ptr); - - unkStruct.oamCount = 4; - unkStruct.x = 30; - unkStruct.y = 6; - DigitObjUtil_CreatePrinter(1, 0, &unkStruct); + template.oamCount = 4; + template.x = 30; + template.y = 6; + DigitObjUtil_CreatePrinter(WIN_TIMES, 0, &template); } -void sub_814AA24(int arg0) +static void PrintScore(int num) { - DigitObjUtil_PrintNumOn(0, arg0); + DigitObjUtil_PrintNumOn(WIN_POINTS, num); } -void sub_814AA34(u16 arg0) +static void PrintJumpsInRow(u16 num) { - DigitObjUtil_PrintNumOn(1, arg0); + DigitObjUtil_PrintNumOn(WIN_TIMES, num); } -void sub_814AA48(u8 multiplayerId) +static void StartMonHitShake(u8 multiplayerId) { - sub_814AFE8(gUnknown_203F3D8, multiplayerId); + Gfx_StartMonHitShake(sPokemonJumpGfx, multiplayerId); } -void sub_814AA60(u8 multiplayerId) +static void StartMonHitFlash(u8 multiplayerId) { - sub_814B080(gUnknown_203F3D8, multiplayerId); + Gfx_StartMonHitFlash(sPokemonJumpGfx, multiplayerId); } -int sub_814AA78(int multiplayerId) +static int IsMonHitShakeActive(int multiplayerId) { - return sub_814B010(gUnknown_203F3D8, multiplayerId); + return Gfx_IsMonHitShakeActive(sPokemonJumpGfx, multiplayerId); } -void sub_814AA8C(void) +static void StopMonHitFlash(void) { - sub_814B0A8(gUnknown_203F3D8); + Gfx_StopMonHitFlash(sPokemonJumpGfx); } -void sub_814AAA0(void) +static void ResetMonSpriteSubpriorities(void) { - sub_814B134(gUnknown_203F3D8); + Gfx_ResetMonSpriteSubpriorities(sPokemonJumpGfx); } -void sub_814AAB4(int multiplayerId) +static void StartMonIntroBounce(int multiplayerId) { - sub_814B168(gUnknown_203F3D8, multiplayerId); + Gfx_StartMonIntroBounce(sPokemonJumpGfx, multiplayerId); } -int sub_814AAC8(void) +static int IsMonIntroBounceActive(void) { - return sub_814B190(gUnknown_203F3D8); + return Gfx_IsMonIntroBounceActive(sPokemonJumpGfx); } -static void sub_814AADC(void) +static void AddPlayerNameWindows(void) { struct WindowTemplate window; - int i, playersCount = sub_81499A4(); - const u16 *winCoords = gUnknown_846D9A8[playersCount - 2]; + int i, playersCount = GetNumPokeJumpPlayers(); + const u16 *winCoords = sPlayerNameWindowCoords[playersCount - 2]; - window.bg = 0; + window.bg = BG_INTERFACE; window.width = 8; window.height = 2; window.paletteNum = 2; @@ -3397,150 +3711,150 @@ static void sub_814AADC(void) { window.tilemapLeft = winCoords[0]; window.tilemapTop = winCoords[1]; - gUnknown_203F3D8->unk1C[i] = AddWindow(&window); - ClearWindowTilemap(gUnknown_203F3D8->unk1C[i]); + sPokemonJumpGfx->nameWindowIds[i] = AddWindow(&window); + ClearWindowTilemap(sPokemonJumpGfx->nameWindowIds[i]); window.baseBlock += 0x10; winCoords += 2; } - CopyBgTilemapBufferToVram(0); + CopyBgTilemapBufferToVram(BG_INTERFACE); } -static void sub_814AB98(int multiplayerId, u8 clr1, u8 clr2, u8 clr3) +static void PrintPokeJumpPlayerName(int multiplayerId, u8 bgColor, u8 fgColor, u8 shadow) { u32 x; - u8 colors[3] = {clr1, clr2, clr3}; + u8 colors[3] = {bgColor, fgColor, shadow}; - FillWindowPixelBuffer(gUnknown_203F3D8->unk1C[multiplayerId], PIXEL_FILL(0)); - x = 64 - GetStringWidth(0, sub_81499E0(multiplayerId), -1); + FillWindowPixelBuffer(sPokemonJumpGfx->nameWindowIds[multiplayerId], PIXEL_FILL(0)); + x = 64 - GetStringWidth(0, GetPokeJumpPlayerName(multiplayerId), -1); x /= 2; - AddTextPrinterParameterized3(gUnknown_203F3D8->unk1C[multiplayerId], 0, x, 2, colors, -1, sub_81499E0(multiplayerId)); - CopyWindowToVram(gUnknown_203F3D8->unk1C[multiplayerId], COPYWIN_GFX); + AddTextPrinterParameterized3(sPokemonJumpGfx->nameWindowIds[multiplayerId], 0, x, 2, colors, TEXT_SPEED_FF, GetPokeJumpPlayerName(multiplayerId)); + CopyWindowToVram(sPokemonJumpGfx->nameWindowIds[multiplayerId], COPYWIN_GFX); } -static void sub_814AC30(bool32 arg0) +static void PrintPokeJumpPlayerNames(bool32 highlightSelf) { - int i, var, playersCount = sub_81499A4(); + int i, multiplayerId, playersCount = GetNumPokeJumpPlayers(); - if (!arg0) + if (!highlightSelf) { for (i = 0; i < playersCount; i++) - sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); + PrintPokeJumpPlayerName(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); } else { - var = sub_81499B4(); + // Highlight own name + multiplayerId = GetPokeJumpMultiplayerId(); for (i = 0; i < playersCount; i++) { - if (var != i) - sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); + if (multiplayerId != i) + PrintPokeJumpPlayerName(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); else - sub_814AB98(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED); + PrintPokeJumpPlayerName(i, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED); } } } -static void sub_814AC94(void) +static void DrawPlayerNameWindows(void) { - int i, playersCount = sub_81499A4(); + int i, playersCount = GetNumPokeJumpPlayers(); for (i = 0; i < playersCount; i++) - PutWindowTilemap(gUnknown_203F3D8->unk1C[i]); - CopyBgTilemapBufferToVram(0); + PutWindowTilemap(sPokemonJumpGfx->nameWindowIds[i]); + CopyBgTilemapBufferToVram(BG_INTERFACE); } -static void sub_814ACCC(u8 arg0) +static void ShowBonus(u8 bonusId) { - gUnknown_203F3D8->unk18 = 0; - ChangeBgX(1, (arg0 / 2) << 16, 0); - ChangeBgY(1, (((arg0 % 2) << 8) - 40) << 8, 0); - ShowBg(1); - CreateTask(sub_814AD50, 4); + sPokemonJumpGfx->bonusTimer = 0; + ChangeBgX(BG_BONUSES, (bonusId / 2) * 256 * 256, BG_COORD_SET); + ChangeBgY(BG_BONUSES, (((bonusId % 2) * 256) - 40) * 256, BG_COORD_SET); + ShowBg(BG_BONUSES); + CreateTask(Task_UpdateBonus, 4); } -static bool32 sub_814AD18(void) +static bool32 UpdateBonus(void) { - if (gUnknown_203F3D8->unk18 >= 32) + if (sPokemonJumpGfx->bonusTimer >= 32) { return FALSE; } else { - ChangeBgY(1, 128, 1); - if (++gUnknown_203F3D8->unk18 >= 32) - HideBg(1); + ChangeBgY(BG_BONUSES, 128, BG_COORD_ADD); + if (++sPokemonJumpGfx->bonusTimer >= 32) + HideBg(BG_BONUSES); return TRUE; } } -static void sub_814AD50(u8 taskId) +static void Task_UpdateBonus(u8 taskId) { - if (!sub_814AD18()) + if (!UpdateBonus()) DestroyTask(taskId); } -static const u16 sPkmnJumpPal1[] = INCBIN_U16("graphics/link_games/pkmnjump_pal1.gbapal"); -static const u16 sPkmnJumpPal2[] = INCBIN_U16("graphics/link_games/pkmnjump_pal2.gbapal"); +static const u16 sPokeJumpPal1[] = INCBIN_U16("graphics/pokemon_jump/pal1.gbapal"); +static const u16 sPokeJumpPal2[] = INCBIN_U16("graphics/pokemon_jump/pal2.gbapal"); -static const u32 sPkmnJumpRopeGfx1[] = INCBIN_U32("graphics/link_games/pkmnjump_rope1.4bpp.lz"); -static const u32 sPkmnJumpRopeGfx2[] = INCBIN_U32("graphics/link_games/pkmnjump_rope2.4bpp.lz"); -static const u32 sPkmnJumpRopeGfx3[] = INCBIN_U32("graphics/link_games/pkmnjump_rope3.4bpp.lz"); -static const u32 sPkmnJumpRopeGfx4[] = INCBIN_U32("graphics/link_games/pkmnjump_rope4.4bpp.lz"); +static const u32 sVine1_Gfx[] = INCBIN_U32("graphics/pokemon_jump/vine1.4bpp.lz"); +static const u32 sVine2_Gfx[] = INCBIN_U32("graphics/pokemon_jump/vine2.4bpp.lz"); +static const u32 sVine3_Gfx[] = INCBIN_U32("graphics/pokemon_jump/vine3.4bpp.lz"); +static const u32 sVine4_Gfx[] = INCBIN_U32("graphics/pokemon_jump/vine4.4bpp.lz"); -static const u32 sPkmnJumpStarGfx[] = INCBIN_U32("graphics/link_games/pkmnjump_star.4bpp.lz"); +static const u32 sStar_Gfx[] = INCBIN_U32("graphics/pokemon_jump/star.4bpp.lz"); -static const struct CompressedSpriteSheet gUnknown_846E0B0[] = +static const struct CompressedSpriteSheet sCompressedSpriteSheets[] = { - {sPkmnJumpRopeGfx1, 0x600, 5}, - {sPkmnJumpRopeGfx2, 0x0c00, 6}, - {sPkmnJumpRopeGfx3, 0x0600, 7}, - {sPkmnJumpRopeGfx4, 0x0600, 8}, - {sPkmnJumpStarGfx, 0x0200, 10}, + {sVine1_Gfx, 0x600, GFXTAG_VINE1}, + {sVine2_Gfx, 0xC00, GFXTAG_VINE2}, + {sVine3_Gfx, 0x600, GFXTAG_VINE3}, + {sVine4_Gfx, 0x600, GFXTAG_VINE4}, + {sStar_Gfx, 0x200, GFXTAG_STAR}, }; -static const struct SpritePalette gUnknown_846E0D8[] = +static const struct SpritePalette sSpritePalettes[] = { - {sPkmnJumpPal1, 5}, - {sPkmnJumpPal2, 6}, + {sPokeJumpPal1, PALTAG_1}, + {sPokeJumpPal2, PALTAG_2}, }; -// Forward declarations. -static const struct OamData sOamData_846E170; -static const struct SpriteTemplate gUnknown_846E220; -static const struct SpriteTemplate gUnknown_846E238; -static const struct SpriteTemplate gUnknown_846E250; -static const struct SpriteTemplate gUnknown_846E268; +static const struct OamData sOamData_JumpMon; +static const struct SpriteTemplate sSpriteTemplate_Vine1; +static const struct SpriteTemplate sSpriteTemplate_Vine2; +static const struct SpriteTemplate sSpriteTemplate_Vine3; +static const struct SpriteTemplate sSpriteTemplate_Vine4; -static const struct SpriteTemplate gUnknown_846E0E8 = +static const struct SpriteTemplate sSpriteTemplate_JumpMon = { - .tileTag = 0, - .paletteTag = 0, - .oam = &sOamData_846E170, + .tileTag = TAG_MON1, + .paletteTag = TAG_MON1, + .oam = &sOamData_JumpMon, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const s16 gUnknown_846E100[][10] = +static const s16 sVineYCoords[VINE_SPRITES_PER_SIDE][NUM_VINESTATES] = { - {0x60, 0x60, 0x60, 0x72, 0x78, 0x78, 0x78, 0x72, 0x60, 0x60}, - {0x46, 0x50, 0x60, 0x72, 0x78, 0x80, 0x78, 0x72, 0x60, 0x50}, - {0x32, 0x48, 0x60, 0x72, 0x80, 0x88, 0x80, 0x72, 0x60, 0x48}, - {0x2a, 0x48, 0x60, 0x72, 0x80, 0x88, 0x80, 0x72, 0x60, 0x48}, + {96, 96, 96, 114, 120, 120, 120, 114, 96, 96}, + {70, 80, 96, 114, 120, 128, 120, 114, 96, 80}, + {50, 72, 96, 114, 128, 136, 128, 114, 96, 72}, + {42, 72, 96, 114, 128, 136, 128, 114, 96, 72}, }; -static const s16 gUnknown_846E150[] = {0x10, 0x28, 0x48, 0x68, 0x88, 0xa8, 0xc8, 0xe0}; +static const s16 sVineXCoords[VINE_SPRITES_PER_SIDE * 2] = {16, 40, 72, 104, 136, 168, 200, 224}; -static const struct SpriteTemplate *const gUnknown_846E160[] = +static const struct SpriteTemplate *const sSpriteTemplates_Vine[VINE_SPRITES_PER_SIDE] = { - &gUnknown_846E220, - &gUnknown_846E238, - &gUnknown_846E250, - &gUnknown_846E268, + &sSpriteTemplate_Vine1, + &sSpriteTemplate_Vine2, + &sSpriteTemplate_Vine3, + &sSpriteTemplate_Vine4, }; -static const struct OamData sOamData_846E170 = +static const struct OamData sOamData_JumpMon = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -3557,7 +3871,7 @@ static const struct OamData sOamData_846E170 = .affineParam = 0 }; -static const struct OamData sOamData_846E178 = +static const struct OamData sOamData_Vine16x32 = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -3574,7 +3888,7 @@ static const struct OamData sOamData_846E178 = .affineParam = 0 }; -static const struct OamData sOamData_846E180 = +static const struct OamData sOamData_Vine32x32 = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -3591,7 +3905,7 @@ static const struct OamData sOamData_846E180 = .affineParam = 0 }; -static const struct OamData sOamData_846E188 = +static const struct OamData sOamData_Vine32x16 = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -3608,143 +3922,144 @@ static const struct OamData sOamData_846E188 = .affineParam = 0 }; -static const union AnimCmd sSpriteAnim_846E190[] = +static const union AnimCmd sAnims_Vine_Highest[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E198[] = +static const union AnimCmd sAnims_Vine_Higher[] = { ANIMCMD_FRAME(8, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E1A0[] = +static const union AnimCmd sAnims_Vine_High[] = { ANIMCMD_FRAME(16, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E1A8[] = +static const union AnimCmd sAnims_Vine_Low[] = { ANIMCMD_FRAME(24, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E1B0[] = +static const union AnimCmd sAnims_Vine_Lower[] = { ANIMCMD_FRAME(32, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E1B8[] = +static const union AnimCmd sAnims_Vine_Lowest[] = { ANIMCMD_FRAME(40, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E1C0[] = +static const union AnimCmd sAnims_VineTall_Highest[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E1C8[] = +static const union AnimCmd sAnims_VineTall_Higher[] = { ANIMCMD_FRAME(16, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E1D0[] = +static const union AnimCmd sAnims_VineTall_High[] = { ANIMCMD_FRAME(32, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E1D8[] = +static const union AnimCmd sAnims_VineTall_Low[] = { ANIMCMD_FRAME(48, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E1E0[] = +static const union AnimCmd sAnims_VineTall_Lower[] = { ANIMCMD_FRAME(64, 1), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E1E8[] = +static const union AnimCmd sAnims_VineTall_Lowest[] = { ANIMCMD_FRAME(80, 1), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_846E1F0[] = +static const union AnimCmd *const sAnims_Vine[] = { - sSpriteAnim_846E190, - sSpriteAnim_846E198, - sSpriteAnim_846E1A0, - sSpriteAnim_846E1A8, - sSpriteAnim_846E1B0, - sSpriteAnim_846E1B8 + sAnims_Vine_Highest, + sAnims_Vine_Higher, + sAnims_Vine_High, + sAnims_Vine_Low, + sAnims_Vine_Lower, + sAnims_Vine_Lowest }; -static const union AnimCmd *const sSpriteAnimTable_846E208[] = +// Vine 2 needs its own set of anims because the graphic is twice as large +static const union AnimCmd *const sAnims_VineTall[] = { - sSpriteAnim_846E1C0, - sSpriteAnim_846E1C8, - sSpriteAnim_846E1D0, - sSpriteAnim_846E1D8, - sSpriteAnim_846E1E0, - sSpriteAnim_846E1E8 + sAnims_VineTall_Highest, + sAnims_VineTall_Higher, + sAnims_VineTall_High, + sAnims_VineTall_Low, + sAnims_VineTall_Lower, + sAnims_VineTall_Lowest }; -static const struct SpriteTemplate gUnknown_846E220 = +static const struct SpriteTemplate sSpriteTemplate_Vine1 = { - .tileTag = 5, - .paletteTag = 5, - .oam = &sOamData_846E178, - .anims = sSpriteAnimTable_846E1F0, + .tileTag = GFXTAG_VINE1, + .paletteTag = PALTAG_1, + .oam = &sOamData_Vine16x32, + .anims = sAnims_Vine, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct SpriteTemplate gUnknown_846E238 = +static const struct SpriteTemplate sSpriteTemplate_Vine2 = { - .tileTag = 6, - .paletteTag = 5, - .oam = &sOamData_846E180, - .anims = sSpriteAnimTable_846E208, + .tileTag = GFXTAG_VINE2, + .paletteTag = PALTAG_1, + .oam = &sOamData_Vine32x32, + .anims = sAnims_VineTall, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct SpriteTemplate gUnknown_846E250 = +static const struct SpriteTemplate sSpriteTemplate_Vine3 = { - .tileTag = 7, - .paletteTag = 5, - .oam = &sOamData_846E188, - .anims = sSpriteAnimTable_846E1F0, + .tileTag = GFXTAG_VINE3, + .paletteTag = PALTAG_1, + .oam = &sOamData_Vine32x16, + .anims = sAnims_Vine, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct SpriteTemplate gUnknown_846E268 = +static const struct SpriteTemplate sSpriteTemplate_Vine4 = { - .tileTag = 8, - .paletteTag = 5, - .oam = &sOamData_846E188, - .anims = sSpriteAnimTable_846E1F0, + .tileTag = GFXTAG_VINE4, + .paletteTag = PALTAG_1, + .oam = &sOamData_Vine32x16, + .anims = sAnims_Vine, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -static const struct OamData sOamData_846E280 = +static const struct OamData sOamData_Star = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -3761,13 +4076,13 @@ static const struct OamData sOamData_846E280 = .affineParam = 0 }; -static const union AnimCmd sSpriteAnim_846E288[] = +static const union AnimCmd sAnim_Star_Still[] = { ANIMCMD_FRAME(0, 0), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_846E290[] = +static const union AnimCmd sAnim_Star_Spinning[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(4, 4), @@ -3778,45 +4093,45 @@ static const union AnimCmd sSpriteAnim_846E290[] = ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_846E2AC[] = +static const union AnimCmd *const sAnims_Star[] = { - sSpriteAnim_846E288, - sSpriteAnim_846E290 + sAnim_Star_Still, + sAnim_Star_Spinning }; -static const struct SpriteTemplate gUnknown_846E2B4 = +static const struct SpriteTemplate sSpriteTemplate_Star = { - .tileTag = 10, - .paletteTag = 5, - .oam = &sOamData_846E280, - .anims = sSpriteAnimTable_846E2AC, + .tileTag = GFXTAG_STAR, + .paletteTag = PALTAG_1, + .oam = &sOamData_Star, + .anims = sAnims_Star, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }; -void sub_814AD6C(struct PokemonJump2 *arg0) +static void LoadSpriteSheetsAndPalettes(struct PokemonJumpGfx *jumpGfx) { int i; - for (i = 0; i < NELEMS(gUnknown_846E0B0); i++) - LoadCompressedSpriteSheet(&gUnknown_846E0B0[i]); + for (i = 0; i < ARRAY_COUNT(sCompressedSpriteSheets); i++) + LoadCompressedSpriteSheet(&sCompressedSpriteSheets[i]); - for (i = 0; i < NELEMS(gUnknown_846E0D8); i++) - LoadSpritePalette(&gUnknown_846E0D8[i]); + for (i = 0; i < ARRAY_COUNT(sSpritePalettes); i++) + LoadSpritePalette(&sSpritePalettes[i]); - arg0->unkE = IndexOfSpritePaletteTag(5); - arg0->unkF = IndexOfSpritePaletteTag(6); + jumpGfx->vinePalNumDownswing = IndexOfSpritePaletteTag(PALTAG_1); + jumpGfx->vinePalNumUpswing = IndexOfSpritePaletteTag(PALTAG_2); } -static void sub_814ADB4(struct Sprite *sprite) +static void ResetPokeJumpSpriteData(struct Sprite *sprite) { int i; - for (i = 0; i < 8; i++) + for (i = 0; i < (int)ARRAY_COUNT(sprite->data); i++) sprite->data[i] = 0; } -void sub_814ADCC(struct PokemonJump2 *arg0, struct PokemonJump1_MonInfo *jumpMon, s16 x, s16 y, u8 multiplayerId) +static void CreateJumpMonSprite(struct PokemonJumpGfx *jumpGfx, struct PokemonJump_MonInfo *monInfo, s16 x, s16 y, u8 multiplayerId) { struct SpriteTemplate spriteTemplate; struct SpriteSheet spriteSheet; @@ -3826,10 +4141,10 @@ void sub_814ADCC(struct PokemonJump2 *arg0, struct PokemonJump1_MonInfo *jumpMon u8 subpriority; u8 spriteId; - spriteTemplate = gUnknown_846E0E8; + spriteTemplate = sSpriteTemplate_JumpMon; buffer = Alloc(0x2000); - unusedBuffer = Alloc(0x800); - if (multiplayerId == sub_81499B4()) + unusedBuffer = Alloc(MON_PIC_SIZE); + if (multiplayerId == GetPokeJumpMultiplayerId()) subpriority = 3; else subpriority = multiplayerId + 4; @@ -3837,17 +4152,17 @@ void sub_814ADCC(struct PokemonJump2 *arg0, struct PokemonJump1_MonInfo *jumpMon if (buffer && unusedBuffer) { HandleLoadSpecialPokePic( - &gMonFrontPicTable[jumpMon->species], + &gMonFrontPicTable[monInfo->species], buffer, - jumpMon->species, - jumpMon->personality); + monInfo->species, + monInfo->personality); spriteSheet.data = buffer; spriteSheet.tag = multiplayerId; - spriteSheet.size = 0x800; + spriteSheet.size = MON_PIC_SIZE; LoadSpriteSheet(&spriteSheet); - spritePalette.data = GetMonSpritePalFromSpeciesAndPersonality(jumpMon->species, jumpMon->otId, jumpMon->personality); + spritePalette.data = GetMonSpritePalFromSpeciesAndPersonality(monInfo->species, monInfo->otId, monInfo->personality); spritePalette.tag = multiplayerId; LoadCompressedSpritePalette(&spritePalette); @@ -3859,28 +4174,32 @@ void sub_814ADCC(struct PokemonJump2 *arg0, struct PokemonJump1_MonInfo *jumpMon spriteId = CreateSprite(&spriteTemplate, x, y, subpriority); if (spriteId != MAX_SPRITES) { - arg0->unk81A8[multiplayerId] = &gSprites[spriteId]; - arg0->unk81FC[multiplayerId] = subpriority; + jumpGfx->monSprites[multiplayerId] = &gSprites[spriteId]; + jumpGfx->monSpriteSubpriorities[multiplayerId] = subpriority; return; } } - arg0->unk81A8[multiplayerId] = NULL; + jumpGfx->monSprites[multiplayerId] = NULL; } -void sub_814AF0C(struct PokemonJump2 *arg0, int multiplayerId) +#define sState data[0] +#define sTimer data[1] +#define sOffset data[7] // Never read + +static void DoStarAnim(struct PokemonJumpGfx *jumpGfx, int multiplayerId) { - sub_814ADB4(arg0->unk81BC[multiplayerId]); - arg0->unk81BC[multiplayerId]->data[7] = arg0->unk81A8[multiplayerId] - gSprites; - arg0->unk81BC[multiplayerId]->invisible = FALSE; - arg0->unk81BC[multiplayerId]->y = 96; - arg0->unk81BC[multiplayerId]->callback = sub_814AF74; - StartSpriteAnim(arg0->unk81BC[multiplayerId], 1); + ResetPokeJumpSpriteData(jumpGfx->starSprites[multiplayerId]); + jumpGfx->starSprites[multiplayerId]->sOffset = jumpGfx->monSprites[multiplayerId] - gSprites; + jumpGfx->starSprites[multiplayerId]->invisible = FALSE; + jumpGfx->starSprites[multiplayerId]->y = 96; + jumpGfx->starSprites[multiplayerId]->callback = SpriteCB_Star; + StartSpriteAnim(jumpGfx->starSprites[multiplayerId], 1); } -static void sub_814AF74(struct Sprite *sprite) +static void SpriteCB_Star(struct Sprite *sprite) { - switch (sprite->data[0]) + switch (sprite->sState) { case 0: if (sprite->animEnded) @@ -3891,15 +4210,15 @@ static void sub_814AF74(struct Sprite *sprite) break; case 1: sprite->y--; - sprite->data[1]++; + sprite->sTimer++; if (sprite->y <= 72) { sprite->y = 72; - sprite->data[0]++; + sprite->sState++; } break; case 2: - if (++sprite->data[1] >= 48) + if (++sprite->sTimer >= 48) { sprite->invisible = TRUE; sprite->callback = SpriteCallbackDummy; @@ -3908,113 +4227,131 @@ static void sub_814AF74(struct Sprite *sprite) } } -void sub_814AFE8(struct PokemonJump2 *arg0, int multiplayerId) +#undef sState +#undef sTimer +#undef sOffset + +static void Gfx_StartMonHitShake(struct PokemonJumpGfx *jumpGfx, int multiplayerId) { - arg0->unk81A8[multiplayerId]->callback = sub_814B038; - arg0->unk81A8[multiplayerId]->y2 = 0; - sub_814ADB4(arg0->unk81A8[multiplayerId]); + jumpGfx->monSprites[multiplayerId]->callback = SpriteCB_MonHitShake; + jumpGfx->monSprites[multiplayerId]->y2 = 0; + ResetPokeJumpSpriteData(jumpGfx->monSprites[multiplayerId]); } -bool32 sub_814B010(struct PokemonJump2 *arg0, int multiplayerId) +static bool32 Gfx_IsMonHitShakeActive(struct PokemonJumpGfx *jumpGfx, int multiplayerId) { - return arg0->unk81A8[multiplayerId]->callback == sub_814B038; + return jumpGfx->monSprites[multiplayerId]->callback == SpriteCB_MonHitShake; } -static void sub_814B038(struct Sprite *sprite) +#define sTimer data[1] +#define sNumShakes data[2] + +static void SpriteCB_MonHitShake(struct Sprite *sprite) { - if (++sprite->data[1] > 1) + if (++sprite->sTimer > 1) { - if (++sprite->data[2] & 1) + if (++sprite->sNumShakes & 1) sprite->y2 = 2; else sprite->y2 = -2; - sprite->data[1] = 0; + sprite->sTimer = 0; } - if (sprite->data[2] > 12) + if (sprite->sNumShakes > 12) { sprite->y2 = 0; sprite->callback = SpriteCallbackDummy; } } -void sub_814B080(struct PokemonJump2 *arg0, int multiplayerId) +#undef sTimer +#undef sNumShakes + +static void Gfx_StartMonHitFlash(struct PokemonJumpGfx *jumpGfx, int multiplayerId) { - sub_814ADB4(arg0->unk81A8[multiplayerId]); - arg0->unk81A8[multiplayerId]->callback = sub_814B100; + ResetPokeJumpSpriteData(jumpGfx->monSprites[multiplayerId]); + jumpGfx->monSprites[multiplayerId]->callback = SpriteCB_MonHitFlash; } -void sub_814B0A8(struct PokemonJump2 *arg0) +static void Gfx_StopMonHitFlash(struct PokemonJumpGfx *jumpGfx) { int i; - u16 numPlayers = sub_81499A4(); + u16 numPlayers = GetNumPokeJumpPlayers(); for (i = 0; i < numPlayers; i++) { - if (arg0->unk81A8[i]->callback == sub_814B100) + if (jumpGfx->monSprites[i]->callback == SpriteCB_MonHitFlash) { - arg0->unk81A8[i]->invisible = FALSE; - arg0->unk81A8[i]->callback = SpriteCallbackDummy; - arg0->unk81A8[i]->subpriority = 10; + jumpGfx->monSprites[i]->invisible = FALSE; + jumpGfx->monSprites[i]->callback = SpriteCallbackDummy; + jumpGfx->monSprites[i]->subpriority = 10; } } } -static void sub_814B100(struct Sprite *sprite) +#define sTimer data[0] + +static void SpriteCB_MonHitFlash(struct Sprite *sprite) { - if (++sprite->data[0] > 3) + if (++sprite->sTimer > 3) { - sprite->data[0] = 0; + sprite->sTimer = 0; sprite->invisible ^= 1; } } -void sub_814B134(struct PokemonJump2 *arg0) +#undef sTimer + +static void Gfx_ResetMonSpriteSubpriorities(struct PokemonJumpGfx *jumpGfx) { int i; - u16 numPlayers = sub_81499A4(); + u16 numPlayers = GetNumPokeJumpPlayers(); for (i = 0; i < numPlayers; i++) - arg0->unk81A8[i]->subpriority = arg0->unk81FC[i]; + jumpGfx->monSprites[i]->subpriority = jumpGfx->monSpriteSubpriorities[i]; } -void sub_814B168(struct PokemonJump2 *arg0, int multiplayerId) +static void Gfx_StartMonIntroBounce(struct PokemonJumpGfx *jumpGfx, int multiplayerId) { - sub_814ADB4(arg0->unk81A8[multiplayerId]); - arg0->unk81A8[multiplayerId]->callback = sub_814B1CC; + ResetPokeJumpSpriteData(jumpGfx->monSprites[multiplayerId]); + jumpGfx->monSprites[multiplayerId]->callback = SpriteCB_MonIntroBounce; } -bool32 sub_814B190(struct PokemonJump2 *arg0) +static bool32 Gfx_IsMonIntroBounceActive(struct PokemonJumpGfx *jumpGfx) { int i; - u16 numPlayers = sub_81499A4(); + u16 numPlayers = GetNumPokeJumpPlayers(); for (i = 0; i < numPlayers; i++) { - if (arg0->unk81A8[i]->callback == sub_814B1CC) + if (jumpGfx->monSprites[i]->callback == SpriteCB_MonIntroBounce) return TRUE; } return FALSE; } -static void sub_814B1CC(struct Sprite *sprite) +#define sState data[0] +#define sHopPos data[1] +#define sNumHops data[2] + +static void SpriteCB_MonIntroBounce(struct Sprite *sprite) { - switch (sprite->data[0]) + switch (sprite->sState) { case 0: PlaySE(SE_BIKE_HOP); - sprite->data[1] = 0; - sprite->data[0]++; + sprite->sHopPos = 0; + sprite->sState++; // fall through case 1: - sprite->data[1] += 4; - if (sprite->data[1] > 0x7F) - sprite->data[1] = 0; + sprite->sHopPos += 4; + if (sprite->sHopPos > 127) + sprite->sHopPos = 0; - sprite->y2 = -(gSineTable[sprite->data[1]] >> 3); - if (sprite->data[1] == 0) + sprite->y2 = -(gSineTable[sprite->sHopPos] >> 3); + if (sprite->sHopPos == 0) { - if (++sprite->data[2] < 2) - sprite->data[0] = 0; + if (++sprite->sNumHops < 2) + sprite->sState = 0; else sprite->callback = SpriteCallbackDummy; } @@ -4022,123 +4359,129 @@ static void sub_814B1CC(struct Sprite *sprite) } } -void sub_814B240(struct PokemonJump2 *arg0, s16 x, s16 y, u8 multiplayerId) +#undef sState +#undef sHopPos +#undef sNumHops + +static void CreateStarSprite(struct PokemonJumpGfx *jumpGfx, s16 x, s16 y, u8 multiplayerId) { - u8 spriteId = CreateSprite(&gUnknown_846E2B4, x, y, 1); + u8 spriteId = CreateSprite(&sSpriteTemplate_Star, x, y, 1); if (spriteId != MAX_SPRITES) { gSprites[spriteId].invisible = TRUE; - arg0->unk81BC[multiplayerId] = &gSprites[spriteId]; + jumpGfx->starSprites[multiplayerId] = &gSprites[spriteId]; } } -void sub_814B294(struct PokemonJump2 *arg0) +static void CreateVineSprites(struct PokemonJumpGfx *jumpGfx) { int i; int count; u8 spriteId; count = 0; - for (i = 0; i < 4; i++) + for (i = 0; i < VINE_SPRITES_PER_SIDE; i++) { - spriteId = CreateSprite(gUnknown_846E160[i], gUnknown_846E150[count], gUnknown_846E100[i][0], 2); - arg0->unk81D0[count] = &gSprites[spriteId]; + spriteId = CreateSprite(sSpriteTemplates_Vine[i], sVineXCoords[count], sVineYCoords[i][0], 2); + jumpGfx->vineSprites[count] = &gSprites[spriteId]; count++; } - for (i = 3; i >= 0; i--) + for (i = VINE_SPRITES_PER_SIDE - 1; i >= 0; i--) { - spriteId = CreateSprite(gUnknown_846E160[i], gUnknown_846E150[count], gUnknown_846E100[i][0], 2); - arg0->unk81D0[count] = &gSprites[spriteId]; - arg0->unk81D0[count]->hFlip = 1; + spriteId = CreateSprite(sSpriteTemplates_Vine[i], sVineXCoords[count], sVineYCoords[i][0], 2); + jumpGfx->vineSprites[count] = &gSprites[spriteId]; + jumpGfx->vineSprites[count]->hFlip = TRUE; count++; } } -void sub_814B348(struct PokemonJump2 *arg0, int arg1) +static void UpdateVineAnim(struct PokemonJumpGfx *jumpGfx, int vineState) { int i, count, palNum; int priority; - if (arg1 > 5) + if (vineState > VINE_LOWEST) { - arg1 = 10 - arg1; - priority = 3; - palNum = arg0->unkF; + // animNums for vine on upswing are same as + // on downswing but in reverse + vineState = NUM_VINESTATES - vineState; + priority = 3; // Set vine behind Pokémon + palNum = jumpGfx->vinePalNumUpswing; } else { - priority = 2; - palNum = arg0->unkE; + priority = 2; // Set vine in front of Pokémon + palNum = jumpGfx->vinePalNumDownswing; } count = 0; - for (i = 0; i < 4; i++) + for (i = 0; i < VINE_SPRITES_PER_SIDE; i++) { - arg0->unk81D0[count]->y = gUnknown_846E100[i][arg1]; - arg0->unk81D0[count]->oam.priority = priority; - arg0->unk81D0[count]->oam.paletteNum = palNum; - StartSpriteAnim(arg0->unk81D0[count], arg1); + jumpGfx->vineSprites[count]->y = sVineYCoords[i][vineState]; + jumpGfx->vineSprites[count]->oam.priority = priority; + jumpGfx->vineSprites[count]->oam.paletteNum = palNum; + StartSpriteAnim(jumpGfx->vineSprites[count], vineState); count++; } - for (i = 3; i >= 0; i--) + for (i = VINE_SPRITES_PER_SIDE - 1; i >= 0; i--) { - arg0->unk81D0[count]->y = gUnknown_846E100[i][arg1]; - arg0->unk81D0[count]->oam.priority = priority; - arg0->unk81D0[count]->oam.paletteNum = palNum; - StartSpriteAnim(arg0->unk81D0[count], arg1); + jumpGfx->vineSprites[count]->y = sVineYCoords[i][vineState]; + jumpGfx->vineSprites[count]->oam.priority = priority; + jumpGfx->vineSprites[count]->oam.paletteNum = palNum; + StartSpriteAnim(jumpGfx->vineSprites[count], vineState); count++; } } -void sub_814B43C(struct PokemonJump2 *arg0) +static void StartPokeJumpCountdown(struct PokemonJumpGfx *jumpGfx) { - StartMinigameCountdown(9, 7, 120, 80, 0); - sub_814B134(arg0); + StartMinigameCountdown(GFXTAG_COUNTDOWN, PALTAG_COUNTDOWN, 120, 80, 0); + Gfx_ResetMonSpriteSubpriorities(jumpGfx); } -bool32 sub_814B460(void) +static bool32 IsPokeJumpCountdownRunning(void) { return IsMinigameCountdownRunning(); } -static struct PokemonJumpRecords *sub_814B46C(void) +static struct PokemonJumpRecords *GetPokeJumpRecords(void) { return &gSaveBlock2Ptr->pokeJump; } -void ResetPokeJumpResults(void) +void ResetPokemonJumpRecords(void) { - struct PokemonJumpRecords *pokeJump = sub_814B46C(); - pokeJump->jumpsInRow = 0; - pokeJump->bestJumpScore = 0; - pokeJump->excellentsInRow = 0; - pokeJump->gamesWithMaxPlayers = 0; - pokeJump->unused2 = 0; - pokeJump->unused1 = 0; + struct PokemonJumpRecords *records = GetPokeJumpRecords(); + records->jumpsInRow = 0; + records->bestJumpScore = 0; + records->excellentsInRow = 0; + records->gamesWithMaxPlayers = 0; + records->unused2 = 0; + records->unused1 = 0; } -bool32 sub_814B494(u32 jumpScore, u16 jumpsInRow, u16 excellentsInRow) +static bool32 TryUpdateRecords(u32 jumpScore, u16 jumpsInRow, u16 excellentsInRow) { - struct PokemonJumpRecords *pokeJump = sub_814B46C(); - bool32 ret = FALSE; + struct PokemonJumpRecords *records = GetPokeJumpRecords(); + bool32 newRecord = FALSE; - if (pokeJump->bestJumpScore < jumpScore && jumpScore <= 99990) - pokeJump->bestJumpScore = jumpScore, ret = TRUE; - if (pokeJump->jumpsInRow < jumpsInRow && jumpsInRow <= 9999) - pokeJump->jumpsInRow = jumpsInRow, ret = TRUE; - if (pokeJump->excellentsInRow < excellentsInRow && excellentsInRow <= 9999) - pokeJump->excellentsInRow = excellentsInRow, ret = TRUE; + if (records->bestJumpScore < jumpScore && jumpScore <= MAX_JUMP_SCORE) + records->bestJumpScore = jumpScore, newRecord = TRUE; + if (records->jumpsInRow < jumpsInRow && jumpsInRow <= MAX_JUMPS) + records->jumpsInRow = jumpsInRow, newRecord = TRUE; + if (records->excellentsInRow < excellentsInRow && excellentsInRow <= MAX_JUMPS) + records->excellentsInRow = excellentsInRow, newRecord = TRUE; - return ret; + return newRecord; } -void sub_814B4E8(void) +static void IncrementGamesWithMaxPlayers(void) { - struct PokemonJumpRecords *pokeJump = sub_814B46C(); - if (pokeJump->gamesWithMaxPlayers < 9999) - pokeJump->gamesWithMaxPlayers++; + struct PokemonJumpRecords *records = GetPokeJumpRecords(); + if (records->gamesWithMaxPlayers < 9999) + records->gamesWithMaxPlayers++; } void ShowPokemonJumpRecords(void) @@ -4147,7 +4490,7 @@ void ShowPokemonJumpRecords(void) Task_ShowPokemonJumpRecords(taskId); } -static const struct WindowTemplate gUnknown_846E2CC = +static const struct WindowTemplate sWindowTemplate_Records = { .bg = 0, .tilemapLeft = 1, @@ -4158,36 +4501,39 @@ static const struct WindowTemplate gUnknown_846E2CC = .baseBlock = 0x1, }; -static const u8 *const gUnknown_846E2D4[] = {gText_JumpsInARow, gText_BestScore2, gText_ExcellentsInARow}; +static const u8 *const sRecordsTexts[] = {gText_JumpsInARow, gText_BestScore2, gText_ExcellentsInARow}; + +#define tState data[0] +#define tWindowId data[1] static void Task_ShowPokemonJumpRecords(u8 taskId) { s16 *data = gTasks[taskId].data; - switch (data[0]) + switch (tState) { case 0: - data[1] = AddWindow(&gUnknown_846E2CC); - sub_814B5C4(data[1]); - CopyWindowToVram(data[1], COPYWIN_BOTH); - data[0]++; + tWindowId = AddWindow(&sWindowTemplate_Records); + PrintRecordsText(tWindowId); + CopyWindowToVram(tWindowId, COPYWIN_BOTH); + tState++; break; case 1: if (!IsDma3ManagerBusyWithBgCopy()) - data[0]++; + tState++; break; case 2: if (JOY_NEW(A_BUTTON | B_BUTTON)) { - rbox_fill_rectangle(data[1]); - CopyWindowToVram(data[1], COPYWIN_MAP); - data[0]++; + rbox_fill_rectangle(tWindowId); + CopyWindowToVram(tWindowId, COPYWIN_MAP); + tState++; } break; case 3: if (!IsDma3ManagerBusyWithBgCopy()) { - RemoveWindow(data[1]); + RemoveWindow(tWindowId); DestroyTask(taskId); EnableBothScriptContexts(); } @@ -4195,24 +4541,27 @@ static void Task_ShowPokemonJumpRecords(u8 taskId) } } -static void sub_814B5C4(u16 windowId) +#undef tState +#undef tWindowId + +static void PrintRecordsText(u16 windowId) { int i, x; - int results[3]; - struct PokemonJumpRecords *pokeJump = sub_814B46C(); + int recordNums[3]; + struct PokemonJumpRecords *records = GetPokeJumpRecords(); u8 strbuf[8]; - results[0] = pokeJump->jumpsInRow; - results[1] = pokeJump->bestJumpScore; - results[2] = pokeJump->excellentsInRow; + recordNums[0] = records->jumpsInRow; + recordNums[1] = records->bestJumpScore; + recordNums[2] = records->excellentsInRow; TextWindow_SetStdFrame0_WithPal(windowId, 0x21D, 0xD0); DrawTextBorderOuter(windowId, 0x21D, 0xD); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); AddTextPrinterParameterized5(windowId, 2, gText_PkmnJumpRecords, 0, 0, TEXT_SPEED_FF, NULL, 1, 0); - for (i = 0; i < NELEMS(gUnknown_846E2D4); i++) + for (i = 0; i < ARRAY_COUNT(sRecordsTexts); i++) { - AddTextPrinterParameterized5(windowId, 2, gUnknown_846E2D4[i], 0, 20 + (i * 14), TEXT_SPEED_FF, NULL, 1, 0); - ConvertIntToDecimalStringN(strbuf, results[i], STR_CONV_MODE_LEFT_ALIGN, 5); + AddTextPrinterParameterized5(windowId, 2, sRecordsTexts[i], 0, 20 + (i * 14), TEXT_SPEED_FF, NULL, 1, 0); + ConvertIntToDecimalStringN(strbuf, recordNums[i], STR_CONV_MODE_LEFT_ALIGN, 5); TruncateToFirstWordOnly(strbuf); x = 0xDE - GetStringWidth(2, strbuf, 0); AddTextPrinterParameterized5(windowId, 2, strbuf, x, 20 + (i * 14), TEXT_SPEED_FF, NULL, 0, 0); diff --git a/src/random.c b/src/random.c index cb12ec805..413a3e60d 100644 --- a/src/random.c +++ b/src/random.c @@ -1,4 +1,5 @@ #include "global.h" +#include "random.h" // The number 1103515245 comes from the example implementation // of rand and srand in the ISO C standard. @@ -7,7 +8,7 @@ u32 gRngValue; u16 Random(void) { - gRngValue = 1103515245 * gRngValue + 24691; + gRngValue = ISO_RANDOMIZE1(gRngValue); return gRngValue >> 16; } From ccd694f665ff93e869eb31e1418ba0bb00cba07d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 13 Mar 2022 16:04:56 -0400 Subject: [PATCH 07/64] Sync INSTALL.md with Emerald --- INSTALL.md | 554 +++++++++++++++++++++++++++++++++--- docs/bugs_and_glitches.md | 26 ++ docs/legacy_WSL1_INSTALL.md | 41 +++ src/crt0.s | 24 +- 4 files changed, 593 insertions(+), 52 deletions(-) create mode 100644 docs/bugs_and_glitches.md create mode 100644 docs/legacy_WSL1_INSTALL.md diff --git a/INSTALL.md b/INSTALL.md index 5f6b4f8ad..0ae7a2eae 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,77 +1,551 @@ -## Prerequisites +# Instructions -| Linux | macOS | Windows 10 (build 18917+) | Windows 10 (1709+) | Windows 8, 8.1, and 10 (1507, 1511, 1607, 1703) -| ----- | ----- | ------------------------- | ------------------ | --------------------------------------------------------- -| none | [Xcode Command Line Tools package][xcode] | [Windows Subsystem for Linux 2][wsl2] | [Windows Subsystem for Linux][wsl] | [Cygwin][cygwin] +These instructions explain how to set up the tools required to build **pokefirered**, which assembles the source files into a ROM. -[xcode]: https://developer.apple.com/library/archive/technotes/tn2339/_index.html#//apple_ref/doc/uid/DTS40014588-CH1-DOWNLOADING_COMMAND_LINE_TOOLS_IS_NOT_AVAILABLE_IN_XCODE_FOR_MACOS_10_9__HOW_CAN_I_INSTALL_THEM_ON_MY_MACHINE_ -[wsl2]: https://docs.microsoft.com/windows/wsl/wsl2-install -[wsl]: https://docs.microsoft.com/windows/wsl/install-win10 -[cygwin]: https://cygwin.com/install.html +These instructions come with notes which can be expanded by clicking the "Note..." text. +In general, you should not need to open these unless if you get an error or if you need additional clarification. -The [prerelease version of the Linux subsystem](https://docs.microsoft.com/windows/wsl/install-legacy) available in the 1607 and 1703 releases of Windows 10 is obsolete so consider uninstalling it. +If you run into trouble, ask for help on Discord or IRC (see [README.md](README.md)). -Make sure that the `build-essential`, `git`, and `libpng-dev` packages are installed. The `build-essential` package includes the `make`, `gcc-core`, and `g++` packages so they do not have to be obtained separately. +## Windows +Windows has instructions for building with three possible terminals, providing 3 different options in case the user stumbles upon unexpected errors. +- [Windows 10 (WSL1)](#windows-10-wsl1) (**Fastest, highly recommended**, Windows 10 only) +- [Windows (msys2)](#windows-msys2) (Second fastest) +- [Windows (Cygwin)](#windows-cygwin) (Slowest) -In the case of Cygwin, [include](https://cygwin.com/cygwin-ug-net/setup-net.html#setup-packages) the `make`, `git`, `gcc-core`, `gcc-g++`, and `libpng-devel` packages. +Unscientific benchmarks suggest **msys2 is 2x slower** than WSL1, and **Cygwin is 5-6x slower** than WSL1. +
+ Note for advanced users: WSL2... -Install the **devkitARM** toolchain of [devkitPro](https://devkitpro.org/wiki/Getting_Started) and add its environment variables. For Windows versions without the Linux subsystem, the devkitPro [graphical installer](https://github.com/devkitPro/installer/releases) includes a preconfigured MSYS2 environment, thus the steps below are not required. +> WSL2 is an option and is even faster than WSL1 if files are stored on the WSL2 file system, but some tools may have trouble interacting +> with the WSL2 file system over the network drive. For example, tools which use Qt versions before 5.15.2 such as porymap +> may have problems with parsing the \\wsl$ network drive path. +
- sudo (dkp-)pacman -S gba-dev +All of the Windows instructions assume that the default drive is C:\\. If this differs to your actual drive letter, then replace C with the correct drive letter when reading the instructions. + +**A note of caution**: As Windows 7 is officially unsupported by Microsoft and Windows 8 has very little usage, some maintainers are unwilling to maintain the Windows 7/8 instructions. Thus, these instructions may break in the future with fixes taking longer than fixes to the Windows 10 instructions. + +## Windows 10 (WSL1) +WSL1 is the preferred terminal to build **pokefirered**. The following instructions will explain how to install WSL1 (referred to interchangeably as WSL). +- If WSL (Debian or Ubuntu) is **not installed**, then go to [Installing WSL1](#Installing-WSL1). +- Otherwise, if WSL is installed, but it **hasn't previously been set up for another decompilation project**, then go to [Setting up WSL1](#Setting-up-WSL1). +- Otherwise, **open WSL** and go to [Choosing where to store pokefirered (WSL1)](#Choosing-where-to-store-pokefirered-WSL1). + +### Installing WSL1 +1. Open [Windows Powershell **as Administrator**](https://i.imgur.com/QKmVbP9.png), and run the following command (Right Click or Shift+Insert is paste in the Powershell). + + ```powershell + dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux /all /norestart + ``` + +2. Once the process finishes, restart your machine. + +3. The next step is to choose and install a Linux distribution from the Microsoft Store. The following instructions will assume Ubuntu as the Linux distribution of choice. +
+ Note for advanced users... + + > You can pick a preferred Linux distribution, but setup instructions may differ. Debian should work with the given instructions, but has not been tested. +
+ +4. Open the [Microsoft Store Linux Selection](https://aka.ms/wslstore), click Ubuntu, then click Get, which will install the Ubuntu distribution. +
+ Notes... + + > Note 1: If a dialog pops up asking for you to sign into a Microsoft Account, then just close the dialog. + > Note 2: If the link does not work, then open the Microsoft Store manually, and search for the Ubuntu app (choose the one with no version number). +
+ +### Setting up WSL1 +Some tips before proceeding: +- In WSL, Copy and Paste is either done via + - **right-click** (selection + right click to Copy, right click with no selection to Paste) + - **Ctrl+Shift+C/Ctrl+Shift+V** (enabled by right-clicking the title bar, going to Properties, then checking the checkbox next to "Use Ctrl+Shift+C/V as Copy/Paste"). +- Some of the commands that you'll run will ask for your WSL password and/or confirmation to perform the stated action. This is to be expected, just enter your WSL password and/or the yes action when necessary. + +1. Open **Ubuntu** (e.g. using Search). +2. WSL/Ubuntu will set up its own installation when it runs for the first time. Once WSL/Ubuntu finishes installing, it will ask for a username and password (to be input in). +
+ Note... + + > When typing in the password, there will be no visible response, but the terminal will still read in input. +
+ +3. Update WSL/Ubuntu before continuing. Do this by running the following command. These commands will likely take a long time to finish: + + ```bash + sudo apt update && sudo apt upgrade + ``` + +> Note: If the repository you plan to build has an **[older revision of the INSTALL.md](https://github.com/pret/pokefirered/blob/b7a6240/INSTALL.md)**, then follow the [legacy WSL1 instructions](docs/legacy_WSL1_INSTALL.md) from here. + +4. Certain packages are required to build pokefirered. Install these packages by running the following command: + + ```bash + sudo apt install build-essential binutils-arm-none-eabi git libpng-dev + ``` +
+ Note... + + > If the above command does not work, try the above command but replacing `apt` with `apt-get`. +
+ +### Choosing where to store pokefirered (WSL1) +WSL has its own file system that's not natively accessible from Windows, but Windows files *are* accessible from WSL. So you're going to want to store pokefirered within Windows. + +For example, say you want to store pokefirered (and agbcc) in **C:\Users\\_\_\Desktop\decomps**. First, ensure that the folder already exists. Then, enter this command to **change directory** to said folder, where *\* is your **Windows** username: + +```bash +cd /mnt/c/Users//Desktop/decomps +``` + +
+ Notes... + +> Note 1: The Windows C:\ drive is called /mnt/c/ in WSL. +> Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "/mnt/c/users//Desktop/decomp folder"`. +> Note 3: Windows path names are case-insensitive so adhering to capitalization isn't needed +
+ +If this works, then proceed to [Installation](#installation). + +Otherwise, ask for help on Discord or IRC (see [README.md](README.md)), or continue reading below for [Windows instructions using msys2](#windows-msys2). + +## Windows (msys2) + +- If devkitARM is **not installed**, then go to [Installing devkitARM](#installing-devkitarm). +- If devkitARM is installed, but msys2 **hasn't previously been set up for another decompilation project**, then go to [Setting up msys2](#setting-up-msys2). +- Otherwise, **open msys2** and go to [Choosing where to store pokefirered (msys2)](#choosing-where-to-store-pokefirered-msys2). + +### Installing devkitARM +1. Download the devkitPro installer [here](https://github.com/devkitPro/installer/releases). +2. Run the devkitPro installer. In the "Choose Components" screen, uncheck everything except GBA Development unless if you plan to install other devkitPro components for other purposes. Keep the install location as C:\devkitPro and leave the Start Menu option unchanged. + +### Setting up msys2 + +Note that in msys2, Copy is Ctrl+Insert and Paste is Shift+Insert. + +1. Open msys2 at C:\devkitPro\msys2\mingw64.exe or run `C:\devkitPro\msys2\msys2_shell.bat -mingw64`. + +2. Certain packages are required to build pokefirered. Install these by running the following command: + + ```bash + pacman -S make zlib-devel git mingw-w64-x86_64-gcc mingw-w64-x86_64-libpng + ``` +
+ Note... + + > This command will ask for confirmation, just enter the yes action when prompted. +
+ +### Choosing where to store pokefirered (msys2) +At this point, you can choose a folder to store pokefirered into. If you're okay with storing pokefirered in the user profile folder, then proceed to [Installation](#installation). Otherwise, you'll need to account for where pokefirered is stored when changing directory to the pokefirered folder. + +For example, if you want to store pokefirered (and agbcc) in **C:\Users\\_\_\Desktop\decomps** (where *\* is your **Windows** username), enter this command: + +```bash +cd Desktop/decomps +``` + +If this works, then proceed to [Installation](#installation). + +Otherwise, ask for help on Discord or IRC (see [README.md](README.md)), or continue reading below for [Windows instructions using Cygwin](#windows-cygwin). + +## Windows (Cygwin) +1. If devkitARM is **not installed**, then follow the instructions used to [install devkitARM](#installing-devkitarm) for the msys2 setup before continuing. *Remember to not continue following the msys2 instructions by mistake!* + +2. + - If Cygwin is **not installed**, or does not have all of the required packages installed, then go to [Installing Cygwin](#installing-cygwin). + - If Cygwin is installed, but **is not configured to work with devkitARM**, then go to [Configuring devkitARM for Cygwin](#configuring-devkitarm-for-cygwin). + - Otherwise, **open Cygwin** and go to [Choosing where to store pokefirered (Cygwin)](#choosing-where-to-store-pokefirered-cygwin) + +### Installing Cygwin +1. Download [Cygwin](https://cygwin.com/install.html): setup-x86_64.exe for 64-bit Windows, setup-x86.exe for 32-bit. + +2. Run the Cygwin setup. Within the Cygwin setup, leave the default settings until the "Choose A Download Site" screen. + +3. At "Choose a Download Site", select any mirror within the Available Download Sites. + +4. At "Select Packages", set the view to "Full" (top left) and search for the following packages: + - `make` + - `git` + - `gcc-core` + - `gcc-g++` + - `libpng-devel` + + To quickly find these, use the search bar and type the name of each package. Ensure that the selected package name is the **exact** same as the one you're trying to download, e.g. `cmake` is **NOT** the same as `make`. + +5. For each package, double click on the text that says "**Skip**" next to each package to select the most recent version to install. If the text says anything other than "**Skip**", (e.g. Keep or a version number), then the package is or will be installed and you don't need to do anything. + +6. Once all required packages have been selected, finish the installation. + +### Configuring devkitARM for Cygwin + +Note that in Cygwin, Copy is Ctrl+Insert and Paste is Shift+Insert. + +1. Open **Cygwin**. + +2. Run the following commands to configure devkitPro to work with Cygwin. + + ```bash + export DEVKITPRO=/cygdrive/c/devkitpro + echo export DEVKITPRO=$DEVKITPRO >> ~/.bashrc + export DEVKITARM=$DEVKITPRO/devkitARM + echo export DEVKITARM=$DEVKITARM >> ~/.bashrc + ``` + +
+ Note... + + > Replace the drive letter c with the actual drive letter if it is not c. +
+ +### Choosing where to store pokefirered (Cygwin) + +Cygwin has its own file system that's within Windows, at **C:\cygwin64\home\\_\_**. If you don't want to store pokefirered there, you'll need to account for where pokefirered is stored when **changing directory** to the pokefirered folder. + +For example, if you want to store pokefirered (and agbcc) in **C:\Users\\_\_\Desktop\decomps**, enter this command, where *\* is your **Windows** username: +```bash +cd c:/Users//Desktop/decomps +``` +Note that the directory **must exist** in Windows. If you want to store pokefirered in a dedicated folder that doesn't exist (e.g. the example provided above), then create the folder (e.g. using Windows Explorer) before executing the `cd` command. + +
+ Notes... + +> Note 1: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "c:/users//Desktop/decomp folder"`. +> Note 2: Windows path names are case-insensitive so adhering to capitalization isn't needed +
+ +If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)). + +## macOS +1. If the Xcode Command Line Tools are not installed, download the tools [here](https://developer.apple.com/xcode/resources/), open your Terminal, and run the following command: + + ```bash + xcode-select --install + ``` + +2. - If libpng is **not installed**, then go to [Installing libpng (macOS)](#installing-libpng-macos). +- If devkitARM is **not installed**, then go to [Installing devkitARM (macOS)](#installing-devkitarm-macos). +- Otherwise, **open the Terminal** and go to [Choosing where to store pokefirered (macOS)](#choosing-where-to-store-pokefirered-macos) + +### Installing libpng (macOS) +
+ Note for advanced users... + +> This guide installs libpng via Homebrew as it is the easiest method, however advanced users can install libpng through other means if they so desire. +
+ +1. Open the Terminal. +2. If Homebrew is not installed, then install [Homebrew](https://brew.sh/) by following the instructions on the website. +3. Run the following command to install libpng. + + ```bash + brew install libpng + ``` + libpng is now installed. + + Continue to [Installing devkitARM (macOS)](#installing-devkitarm-macos) if **devkitARM is not installed**, otherwise, go to [Choosing where to store pokefirered (macOS)](#choosing-where-to-store-pokefirered-macos). + +### Installing devkitARM (macOS) +1. Download the `devkitpro-pacman-installer.pkg` package from [here](https://github.com/devkitPro/pacman/releases). +2. Open the package to install devkitPro pacman. +3. In the Terminal, run the following commands to install devkitARM: + + ```bash + sudo dkp-pacman -Sy + sudo dkp-pacman -S gba-dev + sudo dkp-pacman -S devkitarm-rules + ``` + + The command with gba-dev will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation. + +4. After the tools are installed, devkitARM must now be made accessible from anywhere by the system. To do so, run the following commands: + + ```bash export DEVKITPRO=/opt/devkitpro echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc export DEVKITARM=$DEVKITPRO/devkitARM echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc + echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile + ``` + +### Choosing where to store pokefirered (macOS) +At this point, you can choose a folder to store pokefirered into. If you're okay with storing pokefirered in the user folder, then proceed to [Installation](#installation). Otherwise, you'll need to account for where pokefirered is stored when changing directory to the pokefirered folder. + +For example, if you want to store pokefirered (and agbcc) in **~/Desktop/decomps**, enter this command to **change directory** to the desired folder: +```bash +cd Desktop/decomps +``` +Note that the directory **must exist** in the folder system. If you want to store pokefirered in a dedicated folder that doesn't exist (e.g. the example provided above), then create the folder (e.g. using Finder) before executing the `cd` command. + +
+ Note... + +> Note: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Desktop/decomp folder"` +
+ +If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)). + +## Linux +Open Terminal and enter the following commands, depending on which distro you're using. + +### Debian/Ubuntu-based distributions +Run the following command to install the necessary packages: +```bash +sudo apt install build-essential binutils-arm-none-eabi git libpng-dev +``` +Then proceed to [Choosing where to store pokefirered (Linux)](#choosing-where-to-store-pokefirered-linux). +
+ Note for legacy repos... + +> If the repository you plan to build has an **[older revision of the INSTALL.md](https://github.com/pret/pokefirered/blob/571c598/INSTALL.md)**, +> then you will have to install devkitARM. Install all the above packages except binutils-arm-none-eabi, and follow the instructions to +> [install devkitARM on Debian/Ubuntu-based distributions](#installing-devkitarm-on-debianubuntu-based-distributions). +
+ +### Other distributions +_(Specific instructions for other distributions would be greatly appreciated!)_ + +1. Try to find the required software in its repositories: + - `gcc` + - `g++` + - `make` + - `git` + - `libpng-dev` + +2. Follow the instructions [here](https://devkitpro.org/wiki/devkitPro_pacman) to install devkitPro pacman. As a reminder, the goal is to configure an existing pacman installation to recognize devkitPro's repositories. +3. Once devkitPro pacman is configured, run the following commands: + + ```bash + sudo pacman -Sy + sudo pacman -S gba-dev + ``` + + The last command will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation. + +### Choosing where to store pokefirered (Linux) +At this point, you can choose a folder to store pokefirered (and agbcc) into. If so, you'll have to account for the modified folder path when changing directory to the pokefirered folder. + +If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)). ## Installation -To set up the repository: +
+ Note for Windows users... +> Consider adding an exception for the `pokefirered` and/or `decomps` folder in Windows Security using +> [these instructions](https://support.microsoft.com/help/4028485). This prevents Microsoft Defender from +> scanning them which might improve performance while building. +
+ +1. If pokefirered is not already downloaded (some users may prefer to download pokefirered via a git client like GitHub Desktop), run: + + ```bash git clone https://github.com/pret/pokefirered + ``` + +
+ Note for WSL1... + + > If you get an error stating `fatal: could not set 'core.filemode' to 'false'`, then run the following commands: + > ```bash + > cd + > sudo umount /mnt/c + > sudo mount -t drvfs C: /mnt/c -o metadata,noatime + > cd + > ``` + > Where *\* is the path of the folder [where you chose to store pokefirered](#Choosing-where-to-store-pokefirered-WSL1). Then run the `git clone` command again. +
+ +2. Install agbcc into pokefirered. The commands to run depend on certain conditions. **You should only follow one of the listed instructions**: +- If agbcc has **not been built before** in the folder where you chose to store pokefirered, run the following commands to build and install it into pokefirered: + + ```bash git clone https://github.com/pret/agbcc + cd agbcc + ./build.sh + ./install.sh ../pokefirered + ``` - cd ./agbcc - sh build.sh - sh install.sh ../pokefirered +- **Otherwise**, if agbcc has been built before (e.g. if the git clone above fails), but was **last built on a different terminal** than the one currently used (only relevant to Windows, e.g. switching from msys2 to WSL1), then run the following commands to build and install it into pokefirered: - cd ../pokefirered + ```bash + cd agbcc + git clean -fX + ./build.sh + ./install.sh ../pokefirered + ``` -To build **pokefirered.gba**: +- **Otherwise**, if agbcc has been built before on the same terminal, run the following commands to install agbcc into pokefirered: - make -j$(nproc) + ```bash + cd agbcc + ./install.sh ../pokefirered + ``` -To confirm it matches the official ROM image while building, do this instead: +
+ Note... - make compare -j$(nproc) + > If building agbcc or pokefirered results in an error, try deleting the agbcc folder and re-installing agbcc as if it has not been built before. +
-If only `.c` or `.s` files were changed, turn off the dependency scanning temporarily. Changes to any other files will be ignored and the build will either fail or not reflect those changes. +3. Once agbcc is installed, change directory back to the base directory where pokefirered and agbcc are stored: - make -j$(nproc) NODEP=1 + ```bash + cd .. + ``` -Convenient targets have been defined to build Pokémon LeafGreen and the 1.1 revisions of both games: +Now you're ready to [build **pokefirered**](#build-pokefirered) +## Build pokefirered +If you aren't in the pokefirered directory already, then **change directory** to the pokefirered folder: +```bash +cd pokefirered +``` +To build **pokefirered.gba** for the first time and confirm it matches the official ROM image (Note: to speed up builds, see [Parallel builds](#parallel-builds)): +```bash +make compare +``` +If an OK is returned, then the installation went smoothly. +
+Note for Windows... +> If you switched terminals since the last build (e.g. from msys2 to WSL1), you must run `make clean-tools` once before any subsequent `make` commands. +
- # LeafGreen 1.0 - make -j$(nproc) leafgreen - # FireRed 1.1 - make -j$(nproc) firered_rev1 - # LeafGreen 1.1 - make -j$(nproc) leafgreen_rev1 +To build **pokefirered.gba** with your changes: +```bash +make +``` -To confirm these match the respective official ROM images, prefix `compare_` to each target name. For example: +## Build pokeleafgreen and REV1 +Pokemon FireRed and LeafGreen were both released together. As such, this project is capable of building both ROMs. To do so, simply run +```bash +make leafgreen +``` - make -j$(nproc) compare_leafgreen +This project can also build the version 1.1 ROMs of both FireRed and LeafGreen. To build each, run +```bash +make firered_rev1 # for FireRed 1.1 +make leafgreen_rev1 # for LeafGreen 1.1 +``` -**Note:** If the build command is not recognized on Linux, including the Linux environment used within Windows, run `nproc` and replace `$(nproc)` with the returned value (e.g.: `make -j4`). Because `nproc` is not available on macOS, the alternative is `sysctl -n hw.ncpu`. +# Building guidance -### Note for Mac users +## Parallel builds -The BSD make that comes with Mac XCode can be buggy, so obtain GNU make and sed using [Homebrew](https://brew.sh): +See [the GNU docs](https://www.gnu.org/software/make/manual/html_node/Parallel.html) and [this Stack Exchange thread](https://unix.stackexchange.com/questions/208568) for more information. - brew install make gnu-sed +To speed up building, first get the value of `nproc` by running the following command: +```bash +nproc +``` +Builds can then be sped up by running the following command: +```bash +make -j +``` +Replace `` with the number that the `nproc` command returned. -When compiling agbcc, substitute the `build.sh` line for +`nproc` is not available on macOS. The alternative is `sysctl -n hw.ncpu` ([relevant Stack Overflow thread](https://stackoverflow.com/questions/1715580)). - gsed 's/^make/gmake/g' build.sh | sh +## Debug info -Finally, use `gmake` instead of `make` to compile the ROM(s). +To build **pokefirered.elf** with enhanced debug info: +```bash +make DINFO=1 +``` + +## devkitARM's C compiler + +This project supports the `arm-none-eabi-gcc` compiler included with devkitARM. If devkitARM (a.k.a. gba-dev) has already been installed as part of the platform-specific instructions, simply run: +```bash +make modern # or leafgreen_modern, firered_rev1_modern, leafgreen_rev1_modern +``` +Otherwise, follow the instructions below to install devkitARM. +### Installing devkitARM on WSL1 + +1. `gdebi-core` must be installed beforehand in order to install devkitPro pacman (which facilitates the installation of devkitARM). Install this with the following command: + + ```bash + sudo apt install gdebi-core + ``` +
+ Note... + + > If the above command does not work, try the above command but replacing `apt` with `apt-get`. +
+ +2. Once `gdebi-core` is done installing, download the devkitPro pacman package [here](https://github.com/devkitPro/pacman/releases). The file to download is `devkitpro-pacman.amd64.deb`. +3. Change directory to where the package was downloaded. For example, if the package file was saved to **C:\Users\\_\_\Downloads** (the Downloads location for most users), enter this command, where *\ is your **Windows** username: + + ```bash + cd /mnt/c/Users//Downloads + ``` + +4. Once the directory has been changed to the folder containing the devkitPro pacman package, run the following commands to install devkitARM. + + ```bash + sudo gdebi devkitpro-pacman.amd64.deb + sudo dkp-pacman -Sy + sudo dkp-pacman -S gba-dev + ``` + The last command will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation. + +
+ Note... + + > Note: `devkitpro-pacman.amd64.deb` is the expected filename of the devkitPro package downloaded (for the first command). If the downloaded package filename differs, then use that filename instead. +
+ +5. Run the following command to set devkitPro related environment variables (alternatively, close and re-open WSL): + + ```bash + source /etc/profile.d/devkit-env.sh + ``` + +devkitARM is now installed. + +### Installing devkitARM on Debian/Ubuntu-based distributions +1. If `gdebi-core` is not installed, run the following command: + + ```bash + sudo apt install gdebi-core + ``` +2. Download the devkitPro pacman package [here](https://github.com/devkitPro/pacman/releases). The file to download is `devkitpro-pacman.amd64.deb`. +3. Change directory to where the package was downloaded. Then, run the following commands to install devkitARM: + + ```bash + sudo gdebi devkitpro-pacman.amd64.deb + sudo dkp-pacman -Sy + sudo dkp-pacman -S gba-dev + ``` + The last command will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation. + + > Note: `devkitpro-pacman.amd64.deb` is the expected filename of the devkitPro package downloaded (for the first command). If the downloaded package filename differs, then use that filename instead. + +4. Run the following command to set devkitPro related environment variables (alternatively, close and re-open the Terminal): + + ```bash + source /etc/profile.d/devkit-env.sh + ``` + +devkitARM is now installed. + +## Other toolchains + +To build using a toolchain other than devkitARM, override the `TOOLCHAIN` environment variable with the path to your toolchain, which must contain the subdirectory `bin`. +```bash +make TOOLCHAIN="/path/to/toolchain/here" +``` +The following is an example: +```bash +make TOOLCHAIN="/usr/local/arm-none-eabi" +``` +To compile the `modern` target with this toolchain, the subdirectories `lib`, `include`, and `arm-none-eabi` must also be present. + +# Useful additional tools + +* [porymap](https://github.com/huderlem/porymap) for viewing and editing maps +* [poryscript](https://github.com/huderlem/poryscript) for scripting ([VS Code extension](https://marketplace.visualstudio.com/items?itemName=karathan.poryscript)) +* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps \ No newline at end of file diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md new file mode 100644 index 000000000..ed3f74318 --- /dev/null +++ b/docs/bugs_and_glitches.md @@ -0,0 +1,26 @@ + +# Bugs and Glitches + +These are known bugs and glitches in the original Pokémon FireRed game: code that clearly does not work as intended, or that only works in limited circumstances but has the possibility to fail or crash. Defining the `BUGFIX` and `UBFIX` preprocessor variables will fix some of these automatically. `UBFIX` will already be defined for MODERN builds. + +Fixes are written in the `diff` format. If you've used Git before, this should look familiar: + +```diff + this is some code +-delete red - lines ++add green + lines +``` + +## Contents + + +- [Bug 1](#bug-1) + + +## Bug 1 + +A brief description of the bug and how to reproduce it in the vanilla game + +**Fix:** + +Code to edit, in which routines, or data to edit, using the above mentioned diff syntax. diff --git a/docs/legacy_WSL1_INSTALL.md b/docs/legacy_WSL1_INSTALL.md new file mode 100644 index 000000000..b9840d1c8 --- /dev/null +++ b/docs/legacy_WSL1_INSTALL.md @@ -0,0 +1,41 @@ +### Setting up WSL1 (Legacy Portion) + +1. Certain packages are required to build pokeemerald. Install these packages by running the following command: + + ```bash + sudo apt install build-essential git libpng-dev gdebi-core + ``` + > Note: If the above command does not work, try the above command but replacing `apt` with `apt-get`. + +2. Once the packages have finished installing, download the devkitPro pacman package [here](https://github.com/devkitPro/pacman/releases). The file to download is `devkitpro-pacman.amd64.deb`. + +3. WSL has its own file system that's not accessible from Windows, but Windows files *are* accessible from WSL. To install the devkitPro package, you'll need to change to the **current working directory** where the package file was saved. + + For example, if the package file was saved to **C:\Users\\_\_\Downloads** (the Downloads location for most users), enter this command, where *\* is your **Windows** username: + + ```bash + cd /mnt/c/Users//Downloads + ``` + + > Note 1: The Windows C:\ drive is called /mnt/c/ in WSL. + > Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "/mnt/c/users//Downloads folder"`. + > Note 3: Windows path names are case-insensitive so adhering to capitalization isn't needed + +4. Once the directory has been changed to the folder containing the devkitPro pacman package, run the following commands to install devkitARM. + + ```bash + sudo gdebi devkitpro-pacman.amd64.deb + sudo dkp-pacman -Sy + sudo dkp-pacman -S gba-dev + ``` + + The last command will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation. + + > Note: `devkitpro-pacman.amd64.deb` is the expected filename of the devkitPro package downloaded (for the first command). If the downloaded package filename differs, then use that filename instead. + +5. Run the following command to set devkitPro related environment variables (alternatively, close and re-open WSL): + ```bash + source /etc/profile.d/devkit-env.sh + ``` + +Proceed to [Choosing where to store pokeemerald (WSL1) of the current INSTALL.md](/INSTALL.md#choosing-where-to-store-pokeemerald-WSL1). diff --git a/src/crt0.s b/src/crt0.s index 0d891141e..7402f69e9 100644 --- a/src/crt0.s +++ b/src/crt0.s @@ -80,12 +80,11 @@ CartIdent: .4byte 0x838 .4byte 0x839 .4byte 0x182 - .4byte 0xA0A0A07 - .4byte 0xC060C0C - .4byte 0xC121006 - .4byte 0x8010B0F - .4byte 0xC - .4byte 0xF24 @ sizeof(struct SaveBlock2) + .byte 7, 10, 10, 10, 12, 12, 6, 12 + .byte 6, 16, 18, 12, 15, 11, 1, 8 + .byte 12 + .align 2, 0 + .4byte 0xF24 @ sizeof(struct SaveBlock2) /* 88 */ .4byte 0x3D68 @ sizeof(struct SaveBlock1) .4byte 0x34 @ offsetof(struct SaveBlock1, playerPartyCount) .4byte 0x38 @ offsetof(struct SaveBlock1, playerParty) @@ -96,9 +95,10 @@ CartIdent: .4byte 0xAD @ offsetof(struct SaveBlock2, ?????? (0xAD)) .4byte 0xAD @ offsetof(struct SaveBlock2, ?????? (0xAD)) - .4byte 0x30BB - .4byte 0x30A7 - .4byte 0 + .4byte 0x30BB @ offsetof(struct SaveBlock1, externalEventFlags) + .4byte 0x30A7 @ offsetof(struct SaveBlock1, externalEventData) + .byte 0 + .align 2, 0 .4byte gBaseStats .4byte gAbilityNames .4byte gAbilityDescriptionPointers @@ -106,9 +106,9 @@ CartIdent: .4byte gBattleMoves .4byte gBallSpriteSheets .4byte gBallSpritePalettes - .4byte 0xA8 - .4byte 0x82C - .4byte 0x83B + .4byte 0xA8 @ offsetof(struct SaveBlock2,gcnLinkFlags) + .4byte 0x82C @ FLAG_SYS_GAME_CLEAR + .4byte 0x83B @ FLAG_SYS_RIBBON_GET .4byte 0x3A0D1E2A .4byte 0x1E2B .4byte 0x298 @ offsetof(struct SaveBlock1, pcItems) // maybe all items were in a struct together? From aea142ba03cfd93f16c2aa08098a513a7326320f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 14 Mar 2022 08:49:14 -0400 Subject: [PATCH 08/64] Fix two stale references to emerald in legacy_WSL1_INSTALL.md --- docs/legacy_WSL1_INSTALL.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/legacy_WSL1_INSTALL.md b/docs/legacy_WSL1_INSTALL.md index b9840d1c8..90096b022 100644 --- a/docs/legacy_WSL1_INSTALL.md +++ b/docs/legacy_WSL1_INSTALL.md @@ -1,6 +1,6 @@ ### Setting up WSL1 (Legacy Portion) -1. Certain packages are required to build pokeemerald. Install these packages by running the following command: +1. Certain packages are required to build pokefirered. Install these packages by running the following command: ```bash sudo apt install build-essential git libpng-dev gdebi-core @@ -38,4 +38,4 @@ source /etc/profile.d/devkit-env.sh ``` -Proceed to [Choosing where to store pokeemerald (WSL1) of the current INSTALL.md](/INSTALL.md#choosing-where-to-store-pokeemerald-WSL1). +Proceed to [Choosing where to store pokefirered (WSL1) of the current INSTALL.md](/INSTALL.md#choosing-where-to-store-pokefirered-WSL1). From f8aa4419fc633d7ae760bdd3f094fbccf1b2045b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 14 Mar 2022 15:16:50 -0400 Subject: [PATCH 09/64] Add line breaks around webhook output --- .github/calcrom/webhook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/calcrom/webhook.sh b/.github/calcrom/webhook.sh index 2a3015969..fd54b660b 100755 --- a/.github/calcrom/webhook.sh +++ b/.github/calcrom/webhook.sh @@ -8,4 +8,4 @@ if [ ! -f $map_file ]; then fi output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') -curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST "$CALCROM_DISCORD_WEBHOOK_URL" +curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`\\n$build_name progress:\\n$output\\n\`\`\`\"}" -H "Content-Type: application/json" -X POST "$CALCROM_DISCORD_WEBHOOK_URL" From 4643644d7f2e2f55c343942e907db9cc893f2149 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 15 Mar 2022 13:03:12 -0400 Subject: [PATCH 10/64] Update Makefile to not require gcc-arm-none-eabi --- Makefile | 64 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 73dd47f7c..785d95df7 100644 --- a/Makefile +++ b/Makefile @@ -1,30 +1,28 @@ TOOLCHAIN := $(DEVKITARM) COMPARE ?= 0 -ifeq ($(CC),) -HOSTCC := gcc -else -HOSTCC := $(CC) -endif +# don't use dkP's base_tools anymore +# because the redefinition of $(CC) conflicts +# with when we want to use $(CC) to preprocess files +# thus, manually create the variables for the bin +# files, or use arm-none-eabi binaries on the system +# if dkP is not installed on this system -ifeq ($(CXX),) -HOSTCXX := g++ -else -HOSTCXX := $(CXX) -endif - -ifneq (,$(wildcard $(TOOLCHAIN)/base_tools)) -include $(TOOLCHAIN)/base_tools -else +ifneq (,$(TOOLCHAIN)) +ifneq ($(wildcard $(TOOLCHAIN)/bin),) export PATH := $(TOOLCHAIN)/bin:$(PATH) +endif +endif + PREFIX := arm-none-eabi- OBJCOPY := $(PREFIX)objcopy -export CC := $(PREFIX)gcc -export AS := $(PREFIX)as -endif -export CPP := $(PREFIX)cpp -export LD := $(PREFIX)ld OBJDUMP := $(PREFIX)objdump +AS := $(PREFIX)as +LD := $(PREFIX)ld + +# note: the makefile must be set up so MODERNCC is never called +# if MODERN=0 +MODERNCC := $(PREFIX)gcc ifeq ($(OS),Windows_NT) EXE := .exe @@ -32,6 +30,23 @@ else EXE := endif +# use arm-none-eabi-cpp for macOS +# as macOS's default compiler is clang +# and clang's preprocessor will warn on \u +# when preprocessing asm files, expecting a unicode literal +# we can't unconditionally use arm-none-eabi-cpp +# as installations which install binutils-arm-none-eabi +# don't come with it +ifneq ($(MODERN),1) + ifeq ($(shell uname -s),Darwin) + CPP := $(PREFIX)cpp + else + CPP := $(CC) -E + endif +else + CPP := $(PREFIX)cpp +endif + include config.mk GCC_VER = $(shell $(CC) -dumpversion) @@ -41,9 +56,9 @@ CC1 := tools/agbcc/bin/agbcc$(EXE) override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm LIBPATH := -L ../../tools/agbcc/lib else -CC1 := $(shell $(CC) --print-prog-name=cc1) -quiet +CC1 := $(shell $(MODERNCC) --print-prog-name=cc1) -quiet override CFLAGS += -mthumb -mthumb-interwork -O2 -mcpu=arm7tdmi -mabi=apcs-gnu -fno-toplevel-reorder -fno-aggressive-loop-optimizations -Wno-pointer-to-int-cast -LIBPATH := -L $(shell dirname $(shell $(CC) --print-file-name=libgcc.a)) -L $(shell dirname $(shell $(CC) --print-file-name=libc.a)) +LIBPATH := -L $(shell dirname $(shell $(MODERNCC) --print-file-name=libgcc.a)) -L $(shell dirname $(shell $(MODERNCC) --print-file-name=libc.a)) endif CPPFLAGS := -iquote include -D$(GAME_VERSION) -DREVISION=$(GAME_REVISION) -D$(GAME_LANGUAGE) -DMODERN=$(MODERN) @@ -287,11 +302,11 @@ endif ifeq ($(NODEP),1) $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s - $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ + $(PREPROC) $< charmap.txt | $(CPP) -I include - | $(AS) $(ASFLAGS) -o $@ else define DATA_ASM_DEP $1: $2 $$(shell $(SCANINC) -I include -I "" $2) - $$(PREPROC) $$< charmap.txt | $$(CPP) -I include | $$(AS) $$(ASFLAGS) -o $$@ + $$(PREPROC) $$< charmap.txt | $$(CPP) -I include - | $$(AS) $$(ASFLAGS) -o $$@ endef $(foreach src, $(REGULAR_DATA_ASM_SRCS), $(eval $(call DATA_ASM_DEP,$(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o, $(src)),$(src)))) endif @@ -320,7 +335,8 @@ $(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS) cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) - cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB) + @echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ " + @cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB) $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(GAME_REVISION) --silent $(ROM): $(ELF) From 6cf06255c020337c07fca3524b12dbbc7b3c4476 Mon Sep 17 00:00:00 2001 From: lioniac <80606013+lioniac@users.noreply.github.com> Date: Tue, 10 May 2022 00:04:35 -0300 Subject: [PATCH 11/64] Added missing SHINY_ODDS replacements (#502) --- src/credits.c | 8 ++++---- src/pokedex_screen.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/credits.c b/src/credits.c index 4b6b05063..e3d2e1fdb 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1040,28 +1040,28 @@ static void LoadCreditsMonPic(u8 whichMon) case CREDITSMON_CHARIZARD: InitWindows(sWindowTemplates_Charizard); FillWindowPixelBuffer(0, PIXEL_FILL(0)); - LoadMonPicInWindow(SPECIES_CHARIZARD, 8, 0, TRUE, 10, 0); + LoadMonPicInWindow(SPECIES_CHARIZARD, SHINY_ODDS, 0, TRUE, 10, 0); CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Charizard, 0, 0); CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Charizard, 0, 0); break; case CREDITSMON_VENUSAUR: InitWindows(sWindowTemplates_Venusaur); FillWindowPixelBuffer(0, PIXEL_FILL(0)); - LoadMonPicInWindow(SPECIES_VENUSAUR, 8, 0, TRUE, 10, 0); + LoadMonPicInWindow(SPECIES_VENUSAUR, SHINY_ODDS, 0, TRUE, 10, 0); CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Venusaur, 0, 0); CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Venusaur, 0, 0); break; case CREDITSMON_BLASTOISE: InitWindows(sWindowTemplates_Blastoise); FillWindowPixelBuffer(0, PIXEL_FILL(0)); - LoadMonPicInWindow(SPECIES_BLASTOISE, 8, 0, TRUE, 10, 0); + LoadMonPicInWindow(SPECIES_BLASTOISE, SHINY_ODDS, 0, TRUE, 10, 0); CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Blastoise, 0, 0); CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Blastoise, 0, 0); break; case CREDITSMON_PIKACHU: InitWindows(sWindowTemplates_Pikachu); FillWindowPixelBuffer(0, PIXEL_FILL(0)); - LoadMonPicInWindow(SPECIES_PIKACHU, 8, 0, TRUE, 10, 0); + LoadMonPicInWindow(SPECIES_PIKACHU, SHINY_ODDS, 0, TRUE, 10, 0); CopyToWindowPixelBuffer(1, (const void *)sWindow1Map_Pikachu, 0, 0); CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Pikachu, 0, 0); break; diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index 19f1a03fb..fca338e03 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -2205,7 +2205,7 @@ static u32 DexScreen_GetDefaultPersonality(int species) static void DexScreen_LoadMonPicInWindow(u8 windowId, u16 species, u16 paletteOffset) { - LoadMonPicInWindow(species, 8, DexScreen_GetDefaultPersonality(species), TRUE, paletteOffset >> 4, windowId); + LoadMonPicInWindow(species, SHINY_ODDS, DexScreen_GetDefaultPersonality(species), TRUE, paletteOffset >> 4, windowId); } static void DexScreen_PrintMonDexNo(u8 windowId, u8 fontId, u16 species, u8 x, u8 y) From ed9dcb2fbedf8b13b3388a483c8dc53b1dff92da Mon Sep 17 00:00:00 2001 From: colonelsalt Date: Fri, 13 May 2022 08:24:02 +0100 Subject: [PATCH 12/64] Some documentation of transform types --- src/battle_gfx_sfx_util.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index a075958ce..5c6be1bbe 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -650,7 +650,7 @@ void CopyBattleSpriteInvisibility(u8 battlerId) gBattleSpritesDataPtr->battlerData[battlerId].invisible = gSprites[gBattlerSpriteIds[battlerId]].invisible; } -void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 notTransform) +void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 transformType) { u16 paletteOffset, targetSpecies; u32 personalityValue; @@ -659,8 +659,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 notTransform) const u32 *lzPaletteData; void *buffer; - //TODO: notTransform is bool8 in pokeem. Document it with a more reasonable name here. - if (notTransform == 255) + if (transformType == 255) // Ghost unveiled with Silph Scope { const void *src; void *dst; @@ -688,7 +687,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 notTransform) UpdateNickInHealthbox(gHealthboxSpriteIds[battlerAtk], &gEnemyParty[gBattlerPartyIndexes[battlerAtk]]); TryAddPokeballIconToHealthbox(gHealthboxSpriteIds[battlerAtk], 1); } - else if (notTransform) + else if (transformType) // Castform form change { StartSpriteAnim(&gSprites[gBattlerSpriteIds[battlerAtk]], gBattleSpritesDataPtr->animationData->animArg); paletteOffset = 0x100 + battlerAtk * 16; @@ -701,7 +700,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 notTransform) } gSprites[gBattlerSpriteIds[battlerAtk]].y = GetBattlerSpriteDefault_Y(battlerAtk); } - else + else // Transform move { const void *src; void *dst; From 1bca7cadc1cf133fdb1d8bfa09478ae4f91315ef Mon Sep 17 00:00:00 2001 From: colonelsalt Date: Fri, 13 May 2022 08:47:57 +0100 Subject: [PATCH 13/64] Rename transform arg in header as well --- include/battle_gfx_sfx_util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h index 4c5f230d7..c77686e17 100644 --- a/include/battle_gfx_sfx_util.h +++ b/include/battle_gfx_sfx_util.h @@ -23,7 +23,7 @@ bool8 BattleInitAllSprites(u8 *state, u8 *battlerId); void ClearSpritesHealthboxAnimData(void); void CopyAllBattleSpritesInvisibilities(void); void CopyBattleSpriteInvisibility(u8 battlerId); -void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 notTransform); +void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 transformType); void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite); void LoadBattleMonGfxAndAnimate(u8 battlerId, bool8 loadMonSprite, u8 spriteId); void TrySetBehindSubstituteSpriteBit(u8 battlerId, u16 move); From 4cd9615e995aaf385d01e9414d1818448cf44b77 Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Sun, 19 Jun 2022 21:39:24 -0400 Subject: [PATCH 14/64] fix constant usage --- src/battle_ai_switch_items.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index a77a4cf56..f459a9eb1 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -570,7 +570,7 @@ static bool8 ShouldUseItem(void) && GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) != SPECIES_NONE && GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2) != SPECIES_EGG) ++validMons; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_TRAINER_ITEMS; ++i) { u16 item; const u8 *itemEffects; From c40060498119b5644f39d925ba579f5a4af55a95 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Tue, 21 Jun 2022 21:31:35 +0800 Subject: [PATCH 15/64] Document src/field_fadetransition.c --- src/field_fadetransition.c | 215 ++++++++++++++++++------------------- 1 file changed, 106 insertions(+), 109 deletions(-) diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index 701449cc8..dff088b45 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -25,21 +25,21 @@ #include "constants/event_objects.h" #include "constants/field_weather.h" -static void sub_807DF4C(u8 a0); -static void sub_807DFBC(u8 taskId); -static void task_map_chg_seq_0807E20C(u8 taskId); -static void task_map_chg_seq_0807E2CC(u8 taskId); +static void ExitWarpFadeInScreen(u8 playerNotMoving); +static void Task_ExitDoor(u8 taskId); +static void Task_ExitNonAnimDoor(u8 taskId); +static void Task_ExitNonDoor(u8 taskId); static void Task_TeleportWarpIn(u8 taskId); static void Task_Teleport2Warp(u8 taskId); static void Task_TeleportWarp(u8 taskId); static void Task_DoorWarp(u8 taskId); static void Task_StairWarp(u8 taskId); -static void sub_807EB64(u16, s16*, s16*); -static void sub_807EBBC(u8 a0, s16 *a1, s16 *a2); -static void sub_807EAC4(s16, s16, s16*, s16*, s16*); -static void sub_807EC34(u8 taskId); -static void sub_807ECBC(s16 *, s16 *, s16 *, s16 *, s16 *); -static bool8 sub_807EDA0(s16 *, s16 *, s16 *, s16 *, s16 *); +static void ForceStairsMovement(u16 metatileBehavior, s16 *x, s16 *y); +static void GetStairsMovementDirection(u8 metatileBehavior, s16 *x, s16 *y); +static void UpdateStairsMovement(s16 speedX, s16 speedY, s16 *offsetX, s16 *offsetY, s16 *timer); +static void Task_ExitStairs(u8 taskId); +static void ExitStairsMovement(s16 *speedX, s16 *speedY, s16 *offsetX, s16 *offsetY, s16 *timer); +static bool8 WaitStairExitMovementFinished(s16 *speedX, s16 *speedY, s16 *offsetX, s16 *offsetY, s16 *timer); void palette_bg_faded_fill_white(void) { @@ -55,12 +55,12 @@ void WarpFadeInScreen(void) { switch (MapTransitionIsExit(GetLastUsedWarpMapType(), GetCurrentMapType())) { - case 0: + case FALSE: palette_bg_faded_fill_black(); FadeScreen(FADE_FROM_BLACK, 0); palette_bg_faded_fill_black(); break; - case 1: + case TRUE: palette_bg_faded_fill_white(); FadeScreen(FADE_FROM_WHITE, 0); palette_bg_faded_fill_white(); @@ -72,12 +72,12 @@ static void WarpFadeInScreenWithDelay(void) { switch (MapTransitionIsExit(GetLastUsedWarpMapType(), GetCurrentMapType())) { - case 0: + case FALSE: palette_bg_faded_fill_black(); FadeScreen(FADE_FROM_BLACK, 3); palette_bg_faded_fill_black(); break; - case 1: + case TRUE: palette_bg_faded_fill_white(); FadeScreen(FADE_FROM_WHITE, 3); palette_bg_faded_fill_white(); @@ -111,7 +111,7 @@ void WarpFadeOutScreen(void) } } -static void sub_807DC70(void) // Unused +static void WarpFadeOutScreenWithDelay(void) // Unused { switch (MapTransitionIsEnter(GetCurrentMapType(), GetDestinationWarpMapHeader()->mapType)) { @@ -129,7 +129,7 @@ static void SetPlayerVisibility(bool8 visible) SetPlayerInvisibility(!visible); } -static void task0A_nop_for_a_while(u8 taskId) +static void Task_ContinueScriptUnionRoom(u8 taskId) { if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE) DestroyTask(taskId); @@ -140,10 +140,10 @@ void FieldCB_ContinueScriptUnionRoom(void) ScriptContext2_Enable(); Overworld_PlaySpecialMapMusic(); FadeInFromBlack(); - CreateTask(task0A_nop_for_a_while, 10); + CreateTask(Task_ContinueScriptUnionRoom, 10); } -static void task0A_asap_script_env_2_enable_and_set_ctx_running(u8 taskId) +static void Task_ContinueScript(u8 taskId) { if (FieldFadeTransitionBackgroundEffectIsFinished() == TRUE) { @@ -157,17 +157,17 @@ void FieldCB_ContinueScriptHandleMusic(void) ScriptContext2_Enable(); Overworld_PlaySpecialMapMusic(); FadeInFromBlack(); - CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); + CreateTask(Task_ContinueScript, 10); } void FieldCB_ContinueScript(void) { ScriptContext2_Enable(); FadeInFromBlack(); - CreateTask(task0A_asap_script_env_2_enable_and_set_ctx_running, 10); + CreateTask(Task_ContinueScript, 10); } -static void task_mpl_807DD60(u8 taskId) +static void Task_ReturnToFieldCableLink(u8 taskId) { struct Task *task = &gTasks[taskId]; switch (task->data[0]) @@ -198,7 +198,7 @@ void FieldCB_ReturnToFieldCableLink(void) ScriptContext2_Enable(); Overworld_PlaySpecialMapMusic(); palette_bg_faded_fill_black(); - CreateTask(task_mpl_807DD60, 10); + CreateTask(Task_ReturnToFieldCableLink, 10); } static void Task_ReturnToFieldRecordMixing(u8 taskId) @@ -236,49 +236,50 @@ void FieldCB_ReturnToFieldWirelessLink(void) CreateTask(Task_ReturnToFieldRecordMixing, 10); } -static void sub_807DE78(bool8 a0) +static void SetUpWarpExitTask(bool8 playerNotMoving) { s16 x, y; - u32 behavior; + u32 metatileBehavior; TaskFunc func; PlayerGetDestCoords(&x, &y); - behavior = MapGridGetMetatileBehaviorAt(x, y); - if (MetatileBehavior_IsWarpDoor_2(behavior) == TRUE) + metatileBehavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsWarpDoor_2(metatileBehavior) == TRUE) { - func = sub_807DFBC; + func = Task_ExitDoor; switch (MapTransitionIsExit(GetLastUsedWarpMapType(), GetCurrentMapType())) { - case 0: + case FALSE: palette_bg_faded_fill_black(); break; - case 1: + case TRUE: palette_bg_faded_fill_white(); break; } } else { - sub_807DF4C(a0); - if (MetatileBehavior_IsNonAnimDoor(behavior) == TRUE) - func = task_map_chg_seq_0807E20C; - else if (MetatileBehavior_IsDirectionalStairWarp(behavior) == TRUE) + ExitWarpFadeInScreen(playerNotMoving); + if (MetatileBehavior_IsNonAnimDoor(metatileBehavior) == TRUE) + func = Task_ExitNonAnimDoor; + else if (MetatileBehavior_IsDirectionalStairWarp(metatileBehavior) == TRUE) { u8 tmp = gUnknown_2031DE0; - func = task_map_chg_seq_0807E2CC; + func = Task_ExitNonDoor; if (!tmp) - func = sub_807EC34; + func = Task_ExitStairs; } else - func = task_map_chg_seq_0807E2CC; + func = Task_ExitNonDoor; } gUnknown_2031DE0 = FALSE; CreateTask(func, 10); } -static void sub_807DF4C(bool8 a0) +static void ExitWarpFadeInScreen(bool8 playerNotMoving) + { - if (!a0) + if (!playerNotMoving) WarpFadeInScreen(); else FadeInFromBlack(); @@ -288,7 +289,7 @@ void FieldCB_DefaultWarpExit(void) { Overworld_PlaySpecialMapMusic(); QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode(); - sub_807DE78(FALSE); + SetUpWarpExitTask(FALSE); ScriptContext2_Enable(); } @@ -296,7 +297,7 @@ void FieldCB_WarpExitFadeFromBlack(void) { Overworld_PlaySpecialMapMusic(); QuestLog_DrawPreviouslyOnQuestHeaderIfInPlaybackMode(); - sub_807DE78(TRUE); + SetUpWarpExitTask(TRUE); ScriptContext2_Enable(); } @@ -310,9 +311,9 @@ static void FieldCB_TeleportWarpIn(void) ScriptContext2_Enable(); } -static void sub_807DFBC(u8 taskId) +static void Task_ExitDoor(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; s16 *x = &task->data[2]; s16 *y = &task->data[3]; @@ -398,9 +399,9 @@ static void sub_807DFBC(u8 taskId) } } -static void task_map_chg_seq_0807E20C(u8 taskId) +static void Task_ExitNonAnimDoor(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; s16 *x = &task->data[2]; s16 *y = &task->data[3]; @@ -434,7 +435,7 @@ static void task_map_chg_seq_0807E20C(u8 taskId) } } -static void task_map_chg_seq_0807E2CC(u8 taskId) +static void Task_ExitNonDoor(u8 taskId) { switch (gTasks[taskId].data[0]) { @@ -610,7 +611,7 @@ void DoTeleportWarp(void) gFieldCallback = FieldCB_TeleportWarpIn; } -void sub_807E5C4(void) +static void DoTeleport2WarpWithoutCallback(void) // Unused { ScriptContext2_Enable(); WarpFadeOutScreen(); @@ -620,7 +621,7 @@ void sub_807E5C4(void) static void Task_CableClubWarp(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; switch (task->data[0]) { case 0: @@ -650,7 +651,7 @@ void DoCableClubWarp(void) static void Task_ReturnFromLinkRoomWarp(u8 taskId) { - s16 * data = gTasks[taskId].data; + s16 *data = gTasks[taskId].data; switch (data[0]) { case 0: @@ -739,8 +740,8 @@ static void Task_TeleportWarp(u8 taskId) static void Task_DoorWarp(u8 taskId) { struct Task *task = &gTasks[taskId]; - s16 * xp = &task->data[2]; - s16 * yp = &task->data[3]; + s16 *xp = &task->data[2]; + s16 *yp = &task->data[3]; switch (task->data[0]) { case 0: @@ -769,9 +770,7 @@ static void Task_DoorWarp(u8 taskId) break; case 3: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) - { task->data[0] = 4; - } break; case 4: TryFadeOutOldMapMusic(); @@ -791,7 +790,7 @@ static void Task_DoorWarp(u8 taskId) static void Task_StairWarp(u8 taskId) { - s16 * data = gTasks[taskId].data; + s16 *data = gTasks[taskId].data; struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *playerSpr = &gSprites[gPlayerAvatar.spriteId]; switch (data[0]) @@ -812,14 +811,14 @@ static void Task_StairWarp(u8 taskId) TryFadeOutOldMapMusic(); PlayRainStoppingSoundEffect(); playerSpr->oam.priority = 1; - sub_807EB64(data[1], &data[2], &data[3]); + ForceStairsMovement(data[1], &data[2], &data[3]); PlaySE(SE_EXIT); data[0]++; } } break; case 2: - sub_807EAC4(data[2], data[3], &data[4], &data[5], &data[6]); + UpdateStairsMovement(data[2], data[3], &data[4], &data[5], &data[6]); data[15]++; if (data[15] >= 12) { @@ -828,7 +827,7 @@ static void Task_StairWarp(u8 taskId) } break; case 3: - sub_807EAC4(data[2], data[3], &data[4], &data[5], &data[6]); + UpdateStairsMovement(data[2], data[3], &data[4], &data[5], &data[6]); if (!WaitWarpFadeOutScreen() && BGMusicStopped()) data[0]++; break; @@ -841,60 +840,58 @@ static void Task_StairWarp(u8 taskId) } } -static void sub_807EAC4(s16 a0, s16 a1, s16 *a2, s16 *a3, s16 *a4) +static void UpdateStairsMovement(s16 speedX, s16 speedY, s16 *offsetX, s16 *offsetY, s16 *timer) { struct Sprite *playerSpr = &gSprites[gPlayerAvatar.spriteId]; struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (a1 > 0 || *a4 > 6) - *a3 += a1; - *a2 += a0; - (*a4)++; - playerSpr->x2 = *a2 >> 5; - playerSpr->y2 = *a3 >> 5; + if (speedY > 0 || *timer > 6) + *offsetY += speedY; + *offsetX += speedX; + (*timer)++; + playerSpr->x2 = *offsetX >> 5; + playerSpr->y2 = *offsetY >> 5; if (playerObj->heldMovementFinished) - { ObjectEventForceSetHeldMovement(playerObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); - } } -static void sub_807EB64(u16 a0, s16 *a1, s16 *a2) +static void ForceStairsMovement(u16 metatileBehavior, s16 *x, s16 *y) { ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection())); - sub_807EBBC(a0, a1, a2); + GetStairsMovementDirection(metatileBehavior, x, y); } -static void sub_807EBBC(u8 a0, s16 *a1, s16 *a2) +static void GetStairsMovementDirection(u8 metatileBehavior, s16 *x, s16 *y) { - if (MetatileBehavior_IsDirectionalUpRightStairWarp(a0)) + if (MetatileBehavior_IsDirectionalUpRightStairWarp(metatileBehavior)) { - *a1 = 16; - *a2 = -10; + *x = 16; + *y = -10; } - else if (MetatileBehavior_IsDirectionalUpLeftStairWarp(a0)) + else if (MetatileBehavior_IsDirectionalUpLeftStairWarp(metatileBehavior)) { - *a1 = -17; - *a2 = -10; + *x = -17; + *y = -10; } - else if (MetatileBehavior_IsDirectionalDownRightStairWarp(a0)) + else if (MetatileBehavior_IsDirectionalDownRightStairWarp(metatileBehavior)) { - *a1 = 17; - *a2 = 3; + *x = 17; + *y = 3; } - else if (MetatileBehavior_IsDirectionalDownLeftStairWarp(a0)) + else if (MetatileBehavior_IsDirectionalDownLeftStairWarp(metatileBehavior)) { - *a1 = -17; - *a2 = 3; + *x = -17; + *y = 3; } else { - *a1 = 0; - *a2 = 0; + *x = 0; + *y = 0; } } -static void sub_807EC34(u8 taskId) +static void Task_ExitStairs(u8 taskId) { - s16 * data = gTasks[taskId].data; + s16 *data = gTasks[taskId].data; switch (data[0]) { default: @@ -909,51 +906,51 @@ static void sub_807EC34(u8 taskId) Overworld_PlaySpecialMapMusic(); WarpFadeInScreen(); ScriptContext2_Enable(); - sub_807ECBC(&data[1], &data[2], &data[3], &data[4], &data[5]); + ExitStairsMovement(&data[1], &data[2], &data[3], &data[4], &data[5]); data[0]++; break; case 1: - if (!sub_807EDA0(&data[1], &data[2], &data[3], &data[4], &data[5])) + if (!WaitStairExitMovementFinished(&data[1], &data[2], &data[3], &data[4], &data[5])) data[0]++; break; } } -static void sub_807ECBC(s16 *a0, s16 *a1, s16 *a2, s16 *a3, s16 *a4) +static void ExitStairsMovement(s16 *speedX, s16 *speedY, s16 *offsetX, s16 *offsetY, s16 *timer) { s16 x, y; - u8 behavior; - s32 r1; + u8 metatileBehavior; + s32 direction; struct Sprite *sprite; PlayerGetDestCoords(&x, &y); - behavior = MapGridGetMetatileBehaviorAt(x, y); - if (MetatileBehavior_IsDirectionalDownRightStairWarp(behavior) || MetatileBehavior_IsDirectionalUpRightStairWarp(behavior)) - r1 = 3; + metatileBehavior = MapGridGetMetatileBehaviorAt(x, y); + if (MetatileBehavior_IsDirectionalDownRightStairWarp(metatileBehavior) || MetatileBehavior_IsDirectionalUpRightStairWarp(metatileBehavior)) + direction = DIR_WEST; else - r1 = 4; - ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetWalkInPlaceSlowMovementAction(r1)); - sub_807EBBC(behavior, a0, a1); - *a2 = *a0 * 16; - *a3 = *a1 * 16; - *a4 = 16; + direction = DIR_EAST; + ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetWalkInPlaceSlowMovementAction(direction)); + GetStairsMovementDirection(metatileBehavior, speedX, speedY); + *offsetX = *speedX * 16; + *offsetY = *speedY * 16; + *timer = 16; sprite = &gSprites[gPlayerAvatar.spriteId]; - sprite->x2 = *a2 >> 5; - sprite->y2 = *a3 >> 5; - *a0 *= -1; - *a1 *= -1; + sprite->x2 = *offsetX >> 5; + sprite->y2 = *offsetY >> 5; + *speedX *= -1; + *speedY *= -1; } -static bool8 sub_807EDA0(s16 *a0, s16 *a1, s16 *a2, s16 *a3, s16 *a4) +static bool8 WaitStairExitMovementFinished(s16 *speedX, s16 *speedY, s16 *offsetX, s16 *offsetY, s16 *timer) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; - if (*a4 != 0) + if (*timer != 0) { - *a2 += *a0; - *a3 += *a1; - sprite->x2 = *a2 >> 5; - sprite->y2 = *a3 >> 5; - (*a4)--; + *offsetX += *speedX; + *offsetY += *speedY; + sprite->x2 = *offsetX >> 5; + sprite->y2 = *offsetY >> 5; + (*timer)--; return TRUE; } else From b2146283e605a3997f3db5f5d6383b0b91a7a8ce Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Wed, 22 Jun 2022 00:04:39 +0800 Subject: [PATCH 16/64] Rename as DoPortholeWarp --- src/field_fadetransition.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index dff088b45..dc941e936 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -611,7 +611,7 @@ void DoTeleportWarp(void) gFieldCallback = FieldCB_TeleportWarpIn; } -static void DoTeleport2WarpWithoutCallback(void) // Unused +static void DoPortholeWarp(void) // Unused { ScriptContext2_Enable(); WarpFadeOutScreen(); From 2eb1c9664e222dedafcef9b4c9ad4cf2ef1d21b9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 21 Jun 2022 20:10:07 -0400 Subject: [PATCH 17/64] Separate crt0, rom_header, and rom_header_gf --- asm/rom_header.inc | 35 --------- include/decoration.h | 2 + include/item.h | 1 + include/pokeball.h | 2 + include/pokemon_icon.h | 2 + ld_script.txt | 4 +- src/crt0.s | 114 --------------------------- src/rom_header.s | 72 +++++++++++++++++ src/rom_header_gf.c | 171 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 253 insertions(+), 150 deletions(-) delete mode 100644 asm/rom_header.inc create mode 100644 src/rom_header.s create mode 100644 src/rom_header_gf.c diff --git a/asm/rom_header.inc b/asm/rom_header.inc deleted file mode 100644 index 6730efae2..000000000 --- a/asm/rom_header.inc +++ /dev/null @@ -1,35 +0,0 @@ - .global RomHeaderNintendoLogo -RomHeaderNintendoLogo: - .space 156 - -RomHeaderGameTitle: - .space 12 - - .global RomHeaderGameCode -RomHeaderGameCode: - .space 4 - -RomHeaderMakerCode: - .space 2 - -RomHeaderMagic: - .byte 0 - -RomHeaderMainUnitCode: - .byte 0 - -RomHeaderDeviceType: - .byte 0 - -RomHeaderReserved1: - .space 7 - - .global RomHeaderSoftwareVersion -RomHeaderSoftwareVersion: - .byte 0 - -RomHeaderChecksum: - .byte 0 - -RomHeaderReserved2: - .space 2 diff --git a/include/decoration.h b/include/decoration.h index fadb2a3c8..d53cb5091 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -52,4 +52,6 @@ struct Decoration const u16 *tiles; }; +extern const struct Decoration gDecorations[]; + #endif //GUARD_DECORATION_H diff --git a/include/item.h b/include/item.h index 92a057f7e..1050752dd 100644 --- a/include/item.h +++ b/include/item.h @@ -29,6 +29,7 @@ struct BagPocket u8 capacity; }; +extern const struct Item gItems[]; extern struct BagPocket gBagPockets[]; void GetBerryCountString(u8* dst, const u8* berryName, u32 quantity); diff --git a/include/pokeball.h b/include/pokeball.h index 8ce25929a..19467e7a7 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -20,6 +20,8 @@ enum POKEBALL_COUNT }; +extern const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT]; +extern const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT]; extern const struct SpriteTemplate gBallSpriteTemplates[]; #define POKEBALL_PLAYER_SENDOUT 0xFF diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 32dd49545..76b787137 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -3,6 +3,8 @@ #include "global.h" +extern const u8 *const gMonIconTable[]; +extern const struct SpritePalette gMonIconPaletteTable[]; extern const u16 gMonIconPalettes[][16]; extern const u8 gMonIconPaletteIndices[]; diff --git a/ld_script.txt b/ld_script.txt index aa4e7906d..ab1ba9d61 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -44,7 +44,9 @@ SECTIONS { .text : ALIGN(4) { - src/crt0.o(.text); + src/rom_header.o(.text); + src/rom_header_gf.o(.text*); + src/crt0.o(.text); src/main.o(.text); src/gpu_regs.o(.text); src/dma3_manager.o(.text); diff --git a/src/crt0.s b/src/crt0.s index 7402f69e9..a0d8a4b55 100644 --- a/src/crt0.s +++ b/src/crt0.s @@ -4,120 +4,6 @@ .syntax unified - .global Start - - .text - - .arm - -_start: @ 8000000 - b start_vector - - .include "asm/rom_header.inc" - -@ 80000C0 - .word 0 - - .global GPIOPortData -GPIOPortData: @ 80000C4 - .hword 0 - - .global GPIOPortDirection -GPIOPortDirection: @ 80000C6 - .hword 0 - - .global GPIOPortReadEnable -GPIOPortReadEnable: @ 80000C8 - .hword 0 - - .space 6 - -@ 80000D0 - - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - -@ 8000100 - .global CartIdent -CartIdent: - .4byte GAME_VERSION - .4byte GAME_LANGUAGE -.game_name: - .ifdef FIRERED - .ascii "pokemon red version" - .else - .ifdef LEAFGREEN - .ascii "pokemon green version" - .endif - .endif - .space .game_name+0x20-. - .4byte gMonFrontPicTable - .4byte gMonBackPicTable - .4byte gMonPaletteTable - .4byte gMonShinyPaletteTable - .4byte gMonIconTable - .4byte gMonIconPaletteIndices - .4byte gMonIconPaletteTable - .4byte gSpeciesNames - .4byte gMoveNames - .4byte gDecorations - .4byte 0xEE0 @ offsetof(struct SaveBlock1, flags) - .4byte 0x1000 @ offsetof(struct SaveBlock1, vars) - .4byte 0x18 @ offsetof(struct SaveBlock2, pokedex) - .4byte 0x5F8 @ offsetof(struct SaveBlock1, seen1) - .4byte 0x3A18 @ offsetof(struct SaveBlock1, seen2) - .4byte 0x3C - .4byte 0x838 - .4byte 0x839 - .4byte 0x182 - .byte 7, 10, 10, 10, 12, 12, 6, 12 - .byte 6, 16, 18, 12, 15, 11, 1, 8 - .byte 12 - .align 2, 0 - .4byte 0xF24 @ sizeof(struct SaveBlock2) /* 88 */ - .4byte 0x3D68 @ sizeof(struct SaveBlock1) - .4byte 0x34 @ offsetof(struct SaveBlock1, playerPartyCount) - .4byte 0x38 @ offsetof(struct SaveBlock1, playerParty) - .4byte 9 @ offsetof(struct SaveBlock2, specialSaveWarp) - .4byte 0xA @ offsetof(struct SaveBlock2, playerTrainerId) - .4byte 0 @ offsetof(struct SaveBlock2, playerName) - .4byte 8 @ offsetof(struct SaveBlock2, playerGender) - - .4byte 0xAD @ offsetof(struct SaveBlock2, ?????? (0xAD)) - .4byte 0xAD @ offsetof(struct SaveBlock2, ?????? (0xAD)) - .4byte 0x30BB @ offsetof(struct SaveBlock1, externalEventFlags) - .4byte 0x30A7 @ offsetof(struct SaveBlock1, externalEventData) - .byte 0 - .align 2, 0 - .4byte gBaseStats - .4byte gAbilityNames - .4byte gAbilityDescriptionPointers - .4byte gItems - .4byte gBattleMoves - .4byte gBallSpriteSheets - .4byte gBallSpritePalettes - .4byte 0xA8 @ offsetof(struct SaveBlock2,gcnLinkFlags) - .4byte 0x82C @ FLAG_SYS_GAME_CLEAR - .4byte 0x83B @ FLAG_SYS_RIBBON_GET - .4byte 0x3A0D1E2A - .4byte 0x1E2B - .4byte 0x298 @ offsetof(struct SaveBlock1, pcItems) // maybe all items were in a struct together? - .4byte 0x309C @ offsetof(struct SaveBlock1, giftRibbons) - .4byte 0x30EC @ offsetof(struct SaveBlock1, enigmaBerry) - .4byte 0x34 @ size of SaveBlock1 map header reconstruction data? - .4byte 0 - .4byte 0xFFFFFFFF - .arm .align 2, 0 .global start_vector diff --git a/src/rom_header.s b/src/rom_header.s new file mode 100644 index 000000000..67091a649 --- /dev/null +++ b/src/rom_header.s @@ -0,0 +1,72 @@ +@ Note: ROM header data is empty space here. +@ It's populated by gbafix using data provided in the Makefile. + + .global Start +Start: @ 8000000 + b start_vector + + .global RomHeaderNintendoLogo +RomHeaderNintendoLogo: + .space 156 + +RomHeaderGameTitle: + .space 12 + + .global RomHeaderGameCode +RomHeaderGameCode: + .space 4 + +RomHeaderMakerCode: + .space 2 + +RomHeaderMagic: + .byte 0 + +RomHeaderMainUnitCode: + .byte 0 + +RomHeaderDeviceType: + .byte 0 + +RomHeaderReserved1: + .space 7 + + .global RomHeaderSoftwareVersion +RomHeaderSoftwareVersion: + .byte 0 + +RomHeaderChecksum: + .byte 0 + +RomHeaderReserved2: + .space 2 + +@ 80000C0 + .word 0 + + .global GPIOPortData +GPIOPortData: @ 80000C4 + .hword 0 + + .global GPIOPortDirection +GPIOPortDirection: @ 80000C6 + .hword 0 + + .global GPIOPortReadEnable +GPIOPortReadEnable: @ 80000C8 + .hword 0 + + .space 6 + + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF diff --git a/src/rom_header_gf.c b/src/rom_header_gf.c new file mode 100644 index 000000000..9b7975c72 --- /dev/null +++ b/src/rom_header_gf.c @@ -0,0 +1,171 @@ +#include "global.h" +#include "data.h" +#include "pokemon_icon.h" +#include "decoration.h" +#include "battle_main.h" +#include "item.h" +#include "pokeball.h" +#include "pokedex.h" + +struct GFRomHeader +{ + u32 version; + u32 language; + u8 gameName[32]; + const struct CompressedSpriteSheet * monFrontPics; + const struct CompressedSpriteSheet * monBackPics; + const struct CompressedSpritePalette * monNormalPalettes; + const struct CompressedSpritePalette * monShinyPalettes; + const u8 * const * monIcons; + const u8 * monIconPaletteIds; + const struct SpritePalette * monIconPalettes; + const u8 (* monSpeciesNames)[]; + const u8 (* moveNames)[]; + const struct Decoration * decorations; + u32 flagsOffset; + u32 varsOffset; + u32 pokedexOffset; + u32 seen1Offset; + u32 seen2Offset; + u32 pokedexVar; + u32 pokedexFlag; + u32 mysteryGiftFlag; + u32 pokedexCount; + u8 playerNameLength; + u8 unk2; + u8 pokemonNameLength1; + u8 pokemonNameLength2; + u8 unk5; + u8 unk6; + u8 unk7; + u8 unk8; + u8 unk9; + u8 unk10; + u8 unk11; + u8 unk12; + u8 unk13; + u8 unk14; + u8 unk15; + u8 unk16; + u8 unk17; + u32 saveBlock2Size; + u32 saveBlock1Size; + u32 partyCountOffset; + u32 partyOffset; + u32 warpFlagsOffset; + u32 trainerIdOffset; + u32 playerNameOffset; + u32 playerGenderOffset; + u32 unkFlagOffset; + u32 unkFlagOffset2; + u32 externalEventFlagsOffset; + u32 externalEventDataOffset; + u32 unk18; + const struct BaseStats * baseStats; + const u8 (* abilityNames)[]; + const u8 * const * abilityDescriptions; + const struct Item * items; + const struct BattleMove * moves; + const struct CompressedSpriteSheet * ballGfx; + const struct CompressedSpritePalette * ballPalettes; + u32 gcnLinkFlagsOffset; + u32 gameClearFlag; + u32 ribbonFlag; + u8 bagCountItems; + u8 bagCountKeyItems; + u8 bagCountPokeballs; + u8 bagCountTMHMs; + u8 bagCountBerries; + u8 pcItemsCount; + u32 pcItemsOffset; + u32 giftRibbonsOffset; + u32 enigmaBerryOffset; + u32 enigmaBerrySize; + const u8 * moveDescriptions; + u32 unk20; +}; + +// This seems to need to be in the text section for some reason. +// To avoid a changed section attributes warning it's put in a special .text.consts section. +__attribute__((section(".text.consts"))) +static const struct GFRomHeader sGFRomHeader = { + .version = GAME_VERSION, + .language = GAME_LANGUAGE, +#ifdef FIRERED + .gameName = "pokemon red version", +#else + .gameName = "pokemon green version", +#endif + .monFrontPics = gMonFrontPicTable, + .monBackPics = gMonBackPicTable, + .monNormalPalettes = gMonPaletteTable, + .monShinyPalettes = gMonShinyPaletteTable, + .monIcons = gMonIconTable, + .monIconPaletteIds = gMonIconPaletteIndices, + .monIconPalettes = gMonIconPaletteTable, + .monSpeciesNames = gSpeciesNames, + .moveNames = gMoveNames, + .decorations = gDecorations, + .flagsOffset = offsetof(struct SaveBlock1, flags), + .varsOffset = offsetof(struct SaveBlock1, vars), + .pokedexOffset = offsetof(struct SaveBlock2, pokedex), + .seen1Offset = offsetof(struct SaveBlock1, seen1), + .seen2Offset = offsetof(struct SaveBlock1, seen2), + .pokedexVar = VAR_0x403C - VARS_START, + .pokedexFlag = FLAG_0x838, + .mysteryGiftFlag = FLAG_SYS_MYSTERY_GIFT_ENABLED, + .pokedexCount = NATIONAL_DEX_COUNT, + .playerNameLength = PLAYER_NAME_LENGTH, + .unk2 = 10, + .pokemonNameLength1 = POKEMON_NAME_LENGTH, + .pokemonNameLength2 = POKEMON_NAME_LENGTH, + // Two of the below 12s are likely move/ability name length, given their presence in this header + .unk5 = 12, + .unk6 = 12, + .unk7 = 6, + .unk8 = 12, + .unk9 = 6, + .unk10 = 16, + .unk11 = 18, + .unk12 = 12, + .unk13 = 15, + .unk14 = 11, + .unk15 = 1, + .unk16 = 8, + .unk17 = 12, + .saveBlock2Size = sizeof(struct SaveBlock2), + .saveBlock1Size = sizeof(struct SaveBlock1), + .partyCountOffset = offsetof(struct SaveBlock1, playerPartyCount), + .partyOffset = offsetof(struct SaveBlock1, playerParty), + .warpFlagsOffset = offsetof(struct SaveBlock2, specialSaveWarpFlags), + .trainerIdOffset = offsetof(struct SaveBlock2, playerTrainerId), + .playerNameOffset = offsetof(struct SaveBlock2, playerName), + .playerGenderOffset = offsetof(struct SaveBlock2, playerGender), + .unkFlagOffset = offsetof(struct SaveBlock2, unkFlag2), + .unkFlagOffset2 = offsetof(struct SaveBlock2, unkFlag2), + .externalEventFlagsOffset = offsetof(struct SaveBlock1, externalEventFlags), + .externalEventDataOffset = offsetof(struct SaveBlock1, externalEventData), + .unk18 = 0x00000000, + .baseStats = gBaseStats, + .abilityNames = gAbilityNames, + .abilityDescriptions = gAbilityDescriptionPointers, + .items = gItems, + .moves = gBattleMoves, + .ballGfx = gBallSpriteSheets, + .ballPalettes = gBallSpritePalettes, + .gcnLinkFlagsOffset = offsetof(struct SaveBlock2, gcnLinkFlags), + .gameClearFlag = FLAG_SYS_GAME_CLEAR, + .ribbonFlag = FLAG_SYS_RIBBON_GET, + .bagCountItems = BAG_ITEMS_COUNT, + .bagCountKeyItems = BAG_KEYITEMS_COUNT, + .bagCountPokeballs = BAG_POKEBALLS_COUNT, + .bagCountTMHMs = BAG_TMHM_COUNT, + .bagCountBerries = BAG_BERRIES_COUNT, + .pcItemsCount = PC_ITEMS_COUNT, + .pcItemsOffset = offsetof(struct SaveBlock1, pcItems), + .giftRibbonsOffset = offsetof(struct SaveBlock1, giftRibbons), + .enigmaBerryOffset = offsetof(struct SaveBlock1, enigmaBerry), + .enigmaBerrySize = sizeof(struct EnigmaBerry), + .moveDescriptions = NULL, + .unk20 = 0xFFFFFFFF, // 0x00000000 in Emerald +}; From 440eb970f1e4d3fb9baf9d4578101407ab950c65 Mon Sep 17 00:00:00 2001 From: "Colton G. Rushton" Date: Thu, 23 Jun 2022 09:48:12 -0300 Subject: [PATCH 18/64] Remove dead prototypes See https://github.com/pret/pokeemerald/pull/1656 --- include/sprite.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/sprite.h b/include/sprite.h index 50f5013d2..228e186e6 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -292,8 +292,6 @@ u16 LoadSpriteSheet(const struct SpriteSheet *sheet); void LoadSpriteSheets(const struct SpriteSheet *sheets); u16 AllocTilesForSpriteSheet(struct SpriteSheet *sheet); void AllocTilesForSpriteSheets(struct SpriteSheet *sheets); -void LoadTilesForSpriteSheet(const struct SpriteSheet *sheet); -void LoadTilesForSpriteSheets(struct SpriteSheet *sheets); void FreeSpriteTilesByTag(u16 tag); void FreeSpriteTileRanges(void); u16 GetSpriteTileStartByTag(u16 tag); From 75c7e67f00465b99550cd9bc69dec29d2166fe92 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 24 Jun 2022 19:02:11 -0400 Subject: [PATCH 19/64] Fix Museum_1F -> PokemonCenter_1F text --- data/maps/PewterCity_PokemonCenter_1F/scripts.inc | 10 +++++----- data/maps/PewterCity_PokemonCenter_1F/text.inc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index 8cd8c3415..967257e90 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -15,7 +15,7 @@ PewterCity_PokemonCenter_1F_EventScript_Nurse:: @ 816A76F end PewterCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816A778 - msgbox PewterCity_Museum_1F_Text_TeamRocketMtMoonImOnPhone, MSGBOX_NPC + msgbox PewterCity_PokemonCenter_1F_Text_TeamRocketMtMoonImOnPhone, MSGBOX_NPC end PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 @@ -23,7 +23,7 @@ PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 faceplayer fadeoutbgm 0 playbgm MUS_JIGGLYPUFF, 0 - message PewterCity_Museum_1F_Text_Jigglypuff + message PewterCity_PokemonCenter_1F_Text_Jigglypuff waitmessage delay 455 playbgm MUS_POKE_CENTER, 1 @@ -31,15 +31,15 @@ PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 end PewterCity_PokemonCenter_1F_EventScript_Youngster:: @ 816A798 - msgbox PewterCity_Museum_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy, MSGBOX_NPC + msgbox PewterCity_PokemonCenter_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy, MSGBOX_NPC end PewterCity_PokemonCenter_1F_EventScript_GBAKid1:: @ 816A7A1 lock - msgbox PewterCity_Museum_1F_Text_TradingMyClefairyForPikachu + msgbox PewterCity_PokemonCenter_1F_Text_TradingMyClefairyForPikachu release end PewterCity_PokemonCenter_1F_EventScript_GBAKid2:: @ 816A7AC - msgbox PewterCity_Museum_1F_Text_TradingPikachuWithKid, MSGBOX_NPC + msgbox PewterCity_PokemonCenter_1F_Text_TradingPikachuWithKid, MSGBOX_NPC end diff --git a/data/maps/PewterCity_PokemonCenter_1F/text.inc b/data/maps/PewterCity_PokemonCenter_1F/text.inc index ebcfae41f..05c38cca1 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/text.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/text.inc @@ -1,25 +1,25 @@ -PewterCity_Museum_1F_Text_TeamRocketMtMoonImOnPhone:: @ 81916A9 +PewterCity_PokemonCenter_1F_Text_TeamRocketMtMoonImOnPhone:: @ 81916A9 .string "What!?\p" .string "TEAM ROCKET is at MT. MOON?\n" .string "Huh?\p" .string "I'm on the phone!\n" .string "Scram!$" -PewterCity_Museum_1F_Text_Jigglypuff:: @ 81916EA +PewterCity_PokemonCenter_1F_Text_Jigglypuff:: @ 81916EA .string "JIGGLYPUFF: Puu pupuu!$" -PewterCity_Museum_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy:: @ 8191701 +PewterCity_PokemonCenter_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy:: @ 8191701 .string "Yawn!\p" .string "When JIGGLYPUFF sings, POKéMON get\n" .string "drowsy…\p" .string "…Me, too…\n" .string "Snore…$" -PewterCity_Museum_1F_Text_TradingMyClefairyForPikachu:: @ 8191743 +PewterCity_PokemonCenter_1F_Text_TradingMyClefairyForPikachu:: @ 8191743 .string "I really want a PIKACHU, so I'm\n" .string "trading my CLEFAIRY for one.$" -PewterCity_Museum_1F_Text_TradingPikachuWithKid:: @ 8191780 +PewterCity_PokemonCenter_1F_Text_TradingPikachuWithKid:: @ 8191780 .string "I'm trading POKéMON with that kid\n" .string "there.\p" .string "I had two PIKACHU, so I figured\n" From 04a57bb7917c08f63afbce403e664145a1e9c69f Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Fri, 24 Jun 2022 21:35:22 -0300 Subject: [PATCH 20/64] Update pokemon.c --- src/pokemon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pokemon.c b/src/pokemon.c index 168ccd318..92e9cb851 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3612,7 +3612,7 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg) break; case MON_DATA_IVS: { -#ifdef BUGFIX_SETMONIVS +#ifdef BUGFIX u32 ivs = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); #else u32 ivs = *data; // Bug: Only the HP IV and the lower 3 bits of the Attack IV are read. The rest become 0. From 9cde4e0f741c923a75acbe9e5bd89d2c532692ff Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 24 Jun 2022 21:10:48 -0400 Subject: [PATCH 21/64] Remove address comments --- data/battle_ai_scripts.s | 1010 +- data/battle_anim_scripts.s | 1320 +- data/event_scripts.s | 166 +- data/field_effect_scripts.s | 142 +- data/maps/BattleColosseum_2P/scripts.inc | 2 +- data/maps/BattleColosseum_4P/scripts.inc | 2 +- data/maps/BirthIsland_Exterior/scripts.inc | 30 +- data/maps/BirthIsland_Harbor/scripts.inc | 4 +- data/maps/CeladonCity/scripts.inc | 42 +- data/maps/CeladonCity/text.inc | 44 +- .../CeladonCity_Condominiums_1F/scripts.inc | 16 +- .../maps/CeladonCity_Condominiums_1F/text.inc | 16 +- .../CeladonCity_Condominiums_2F/scripts.inc | 4 +- .../maps/CeladonCity_Condominiums_2F/text.inc | 2 +- .../CeladonCity_Condominiums_3F/scripts.inc | 22 +- .../maps/CeladonCity_Condominiums_3F/text.inc | 18 +- .../CeladonCity_Condominiums_Roof/scripts.inc | 4 +- .../CeladonCity_Condominiums_Roof/text.inc | 2 +- .../scripts.inc | 28 +- .../text.inc | 18 +- .../scripts.inc | 8 +- .../CeladonCity_DepartmentStore_1F/text.inc | 6 +- .../scripts.inc | 16 +- .../CeladonCity_DepartmentStore_2F/text.inc | 8 +- .../scripts.inc | 26 +- .../CeladonCity_DepartmentStore_3F/text.inc | 30 +- .../scripts.inc | 12 +- .../CeladonCity_DepartmentStore_4F/text.inc | 6 +- .../scripts.inc | 16 +- .../CeladonCity_DepartmentStore_5F/text.inc | 6 +- .../scripts.inc | 30 +- .../scripts.inc | 80 +- .../CeladonCity_DepartmentStore_Roof/text.inc | 38 +- data/maps/CeladonCity_GameCorner/scripts.inc | 134 +- data/maps/CeladonCity_GameCorner/text.inc | 70 +- .../scripts.inc | 88 +- .../CeladonCity_GameCorner_PrizeRoom/text.inc | 22 +- data/maps/CeladonCity_Gym/scripts.inc | 28 +- data/maps/CeladonCity_Gym/text.inc | 60 +- data/maps/CeladonCity_Hotel/scripts.inc | 10 +- data/maps/CeladonCity_Hotel/text.inc | 8 +- data/maps/CeladonCity_House1/scripts.inc | 8 +- data/maps/CeladonCity_House1/text.inc | 8 +- .../CeladonCity_PokemonCenter_1F/scripts.inc | 12 +- .../CeladonCity_PokemonCenter_1F/text.inc | 6 +- .../CeladonCity_PokemonCenter_2F/scripts.inc | 8 +- data/maps/CeladonCity_Restaurant/scripts.inc | 16 +- data/maps/CeladonCity_Restaurant/text.inc | 16 +- data/maps/CeruleanCave_1F/scripts.inc | 4 +- data/maps/CeruleanCave_2F/scripts.inc | 2 +- data/maps/CeruleanCave_B1F/scripts.inc | 16 +- data/maps/CeruleanCave_B1F/text.inc | 2 +- data/maps/CeruleanCity/scripts.inc | 94 +- data/maps/CeruleanCity/text.inc | 66 +- data/maps/CeruleanCity_BikeShop/scripts.inc | 22 +- data/maps/CeruleanCity_BikeShop/text.inc | 24 +- data/maps/CeruleanCity_Gym/scripts.inc | 22 +- data/maps/CeruleanCity_Gym/text.inc | 32 +- data/maps/CeruleanCity_House1/scripts.inc | 24 +- data/maps/CeruleanCity_House1/text.inc | 22 +- data/maps/CeruleanCity_House2/scripts.inc | 10 +- data/maps/CeruleanCity_House2/text.inc | 8 +- data/maps/CeruleanCity_House3/scripts.inc | 12 +- data/maps/CeruleanCity_House3/text.inc | 2 +- data/maps/CeruleanCity_House4/scripts.inc | 22 +- data/maps/CeruleanCity_House4/text.inc | 16 +- data/maps/CeruleanCity_House5/scripts.inc | 44 +- data/maps/CeruleanCity_House5/text.inc | 24 +- data/maps/CeruleanCity_Mart/scripts.inc | 10 +- data/maps/CeruleanCity_Mart/text.inc | 4 +- .../CeruleanCity_PokemonCenter_1F/scripts.inc | 14 +- .../CeruleanCity_PokemonCenter_1F/text.inc | 8 +- .../CeruleanCity_PokemonCenter_2F/scripts.inc | 8 +- data/maps/CinnabarIsland/scripts.inc | 94 +- data/maps/CinnabarIsland/text.inc | 24 +- data/maps/CinnabarIsland_Gym/scripts.inc | 224 +- data/maps/CinnabarIsland_Gym/text.inc | 82 +- data/maps/CinnabarIsland_Mart/scripts.inc | 10 +- data/maps/CinnabarIsland_Mart/text.inc | 4 +- .../scripts.inc | 32 +- .../CinnabarIsland_PokemonCenter_1F/text.inc | 12 +- .../scripts.inc | 8 +- .../scripts.inc | 16 +- .../text.inc | 12 +- .../scripts.inc | 66 +- .../text.inc | 28 +- .../scripts.inc | 20 +- .../CinnabarIsland_PokemonLab_Lounge/text.inc | 2 +- .../scripts.inc | 10 +- .../text.inc | 6 +- data/maps/DiglettsCave_B1F/scripts.inc | 4 +- .../DiglettsCave_NorthEntrance/scripts.inc | 4 +- data/maps/DiglettsCave_NorthEntrance/text.inc | 2 +- .../DiglettsCave_SouthEntrance/scripts.inc | 4 +- data/maps/DiglettsCave_SouthEntrance/text.inc | 2 +- data/maps/FiveIsland/scripts.inc | 10 +- data/maps/FiveIsland/text.inc | 6 +- data/maps/FiveIsland_Harbor/scripts.inc | 4 +- data/maps/FiveIsland_House1/scripts.inc | 4 +- data/maps/FiveIsland_House1/text.inc | 4 +- data/maps/FiveIsland_House2/scripts.inc | 4 +- data/maps/FiveIsland_House2/text.inc | 2 +- .../FiveIsland_LostCave_Entrance/scripts.inc | 4 +- .../FiveIsland_LostCave_Room1/scripts.inc | 4 +- data/maps/FiveIsland_LostCave_Room1/text.inc | 6 +- .../FiveIsland_LostCave_Room10/scripts.inc | 18 +- data/maps/FiveIsland_LostCave_Room10/text.inc | 6 +- .../FiveIsland_LostCave_Room11/scripts.inc | 2 +- .../FiveIsland_LostCave_Room12/scripts.inc | 2 +- .../FiveIsland_LostCave_Room13/scripts.inc | 2 +- .../FiveIsland_LostCave_Room14/scripts.inc | 2 +- .../FiveIsland_LostCave_Room2/scripts.inc | 2 +- .../FiveIsland_LostCave_Room3/scripts.inc | 2 +- .../FiveIsland_LostCave_Room4/scripts.inc | 4 +- data/maps/FiveIsland_LostCave_Room4/text.inc | 6 +- .../FiveIsland_LostCave_Room5/scripts.inc | 2 +- .../FiveIsland_LostCave_Room6/scripts.inc | 2 +- .../FiveIsland_LostCave_Room7/scripts.inc | 2 +- .../FiveIsland_LostCave_Room8/scripts.inc | 2 +- .../FiveIsland_LostCave_Room9/scripts.inc | 2 +- data/maps/FiveIsland_Meadow/scripts.inc | 18 +- data/maps/FiveIsland_Meadow/text.inc | 26 +- .../FiveIsland_MemorialPillar/scripts.inc | 20 +- data/maps/FiveIsland_MemorialPillar/text.inc | 42 +- .../FiveIsland_PokemonCenter_1F/scripts.inc | 10 +- .../maps/FiveIsland_PokemonCenter_1F/text.inc | 4 +- .../FiveIsland_PokemonCenter_2F/scripts.inc | 8 +- .../FiveIsland_ResortGorgeous/scripts.inc | 14 +- data/maps/FiveIsland_ResortGorgeous/text.inc | 46 +- .../scripts.inc | 36 +- .../FiveIsland_ResortGorgeous_House/text.inc | 24 +- .../FiveIsland_RocketWarehouse/scripts.inc | 54 +- data/maps/FiveIsland_RocketWarehouse/text.inc | 48 +- .../FiveIsland_WaterLabyrinth/scripts.inc | 16 +- data/maps/FiveIsland_WaterLabyrinth/text.inc | 22 +- data/maps/FourIsland/scripts.inc | 44 +- data/maps/FourIsland/text.inc | 14 +- data/maps/FourIsland_Harbor/scripts.inc | 4 +- data/maps/FourIsland_House1/scripts.inc | 4 +- data/maps/FourIsland_House1/text.inc | 10 +- data/maps/FourIsland_House2/scripts.inc | 2 +- .../FourIsland_IcefallCave_1F/scripts.inc | 12 +- .../FourIsland_IcefallCave_B1F/scripts.inc | 2 +- .../FourIsland_IcefallCave_Back/scripts.inc | 38 +- .../maps/FourIsland_IcefallCave_Back/text.inc | 20 +- .../scripts.inc | 4 +- .../maps/FourIsland_LoreleisHouse/scripts.inc | 12 +- data/maps/FourIsland_LoreleisHouse/text.inc | 8 +- data/maps/FourIsland_Mart/scripts.inc | 8 +- data/maps/FourIsland_Mart/text.inc | 4 +- .../FourIsland_PokemonCenter_1F/scripts.inc | 12 +- .../maps/FourIsland_PokemonCenter_1F/text.inc | 16 +- .../FourIsland_PokemonCenter_2F/scripts.inc | 8 +- .../FourIsland_PokemonDayCare/scripts.inc | 42 +- data/maps/FuchsiaCity/scripts.inc | 44 +- data/maps/FuchsiaCity/text.inc | 46 +- data/maps/FuchsiaCity_Gym/scripts.inc | 30 +- data/maps/FuchsiaCity_Gym/text.inc | 58 +- data/maps/FuchsiaCity_House1/scripts.inc | 8 +- data/maps/FuchsiaCity_House1/text.inc | 6 +- data/maps/FuchsiaCity_House2/scripts.inc | 10 +- data/maps/FuchsiaCity_House2/text.inc | 14 +- data/maps/FuchsiaCity_House3/scripts.inc | 14 +- data/maps/FuchsiaCity_House3/text.inc | 16 +- data/maps/FuchsiaCity_Mart/scripts.inc | 10 +- data/maps/FuchsiaCity_Mart/text.inc | 4 +- .../FuchsiaCity_PokemonCenter_1F/scripts.inc | 12 +- .../FuchsiaCity_PokemonCenter_1F/text.inc | 6 +- .../FuchsiaCity_PokemonCenter_2F/scripts.inc | 8 +- .../scripts.inc | 54 +- .../FuchsiaCity_SafariZone_Entrance/text.inc | 28 +- .../FuchsiaCity_SafariZone_Office/scripts.inc | 10 +- .../FuchsiaCity_SafariZone_Office/text.inc | 8 +- .../maps/FuchsiaCity_WardensHouse/scripts.inc | 20 +- data/maps/FuchsiaCity_WardensHouse/text.inc | 24 +- data/maps/IndigoPlateau_Exterior/scripts.inc | 34 +- .../scripts.inc | 20 +- .../IndigoPlateau_PokemonCenter_1F/text.inc | 10 +- .../scripts.inc | 8 +- data/maps/LavenderTown/scripts.inc | 20 +- data/maps/LavenderTown/text.inc | 18 +- data/maps/LavenderTown_House1/scripts.inc | 8 +- data/maps/LavenderTown_House1/text.inc | 6 +- data/maps/LavenderTown_House2/scripts.inc | 18 +- data/maps/LavenderTown_House2/text.inc | 18 +- data/maps/LavenderTown_Mart/scripts.inc | 12 +- data/maps/LavenderTown_Mart/text.inc | 8 +- .../LavenderTown_PokemonCenter_1F/scripts.inc | 12 +- .../LavenderTown_PokemonCenter_1F/text.inc | 6 +- .../LavenderTown_PokemonCenter_2F/scripts.inc | 8 +- .../scripts.inc | 24 +- .../text.inc | 28 +- data/maps/MtEmber_Exterior/scripts.inc | 32 +- data/maps/MtEmber_Exterior/text.inc | 60 +- data/maps/MtEmber_RubyPath_1F/scripts.inc | 2 +- data/maps/MtEmber_RubyPath_B1F/scripts.inc | 2 +- .../MtEmber_RubyPath_B1F_Stairs/scripts.inc | 2 +- data/maps/MtEmber_RubyPath_B2F/scripts.inc | 2 +- .../MtEmber_RubyPath_B2F_Stairs/scripts.inc | 2 +- data/maps/MtEmber_RubyPath_B3F/scripts.inc | 4 +- data/maps/MtEmber_RubyPath_B3F/text.inc | 2 +- data/maps/MtEmber_RubyPath_B4F/scripts.inc | 22 +- data/maps/MtEmber_RubyPath_B5F/scripts.inc | 4 +- data/maps/MtEmber_Summit/scripts.inc | 16 +- data/maps/MtEmber_SummitPath_1F/scripts.inc | 2 +- data/maps/MtEmber_SummitPath_2F/scripts.inc | 2 +- data/maps/MtEmber_SummitPath_3F/scripts.inc | 2 +- data/maps/MtMoon_1F/scripts.inc | 20 +- data/maps/MtMoon_1F/text.inc | 46 +- data/maps/MtMoon_B1F/scripts.inc | 2 +- data/maps/MtMoon_B2F/scripts.inc | 34 +- data/maps/MtMoon_B2F/text.inc | 42 +- data/maps/NavelRock_1F/scripts.inc | 2 +- data/maps/NavelRock_B1F/scripts.inc | 2 +- data/maps/NavelRock_Base/scripts.inc | 18 +- data/maps/NavelRock_BasePath_B10F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B11F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B1F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B2F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B3F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B4F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B5F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B6F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B7F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B8F/scripts.inc | 2 +- data/maps/NavelRock_BasePath_B9F/scripts.inc | 2 +- data/maps/NavelRock_Exterior/scripts.inc | 4 +- data/maps/NavelRock_Fork/scripts.inc | 2 +- data/maps/NavelRock_Harbor/scripts.inc | 4 +- data/maps/NavelRock_Summit/scripts.inc | 26 +- data/maps/NavelRock_SummitPath_2F/scripts.inc | 2 +- data/maps/NavelRock_SummitPath_3F/scripts.inc | 2 +- data/maps/NavelRock_SummitPath_4F/scripts.inc | 2 +- data/maps/NavelRock_SummitPath_5F/scripts.inc | 2 +- data/maps/OneIsland/scripts.inc | 30 +- data/maps/OneIsland/text.inc | 18 +- data/maps/OneIsland_Harbor/scripts.inc | 14 +- data/maps/OneIsland_House1/scripts.inc | 6 +- data/maps/OneIsland_House1/text.inc | 4 +- data/maps/OneIsland_House2/scripts.inc | 4 +- data/maps/OneIsland_House2/text.inc | 2 +- data/maps/OneIsland_KindleRoad/scripts.inc | 6 +- data/maps/OneIsland_KindleRoad/text.inc | 86 +- .../OneIsland_KindleRoad_EmberSpa/scripts.inc | 18 +- .../OneIsland_KindleRoad_EmberSpa/text.inc | 16 +- .../OneIsland_PokemonCenter_1F/scripts.inc | 122 +- data/maps/OneIsland_PokemonCenter_1F/text.inc | 118 +- .../OneIsland_PokemonCenter_2F/scripts.inc | 8 +- data/maps/OneIsland_TreasureBeach/scripts.inc | 4 +- data/maps/OneIsland_TreasureBeach/text.inc | 8 +- data/maps/PalletTown/scripts.inc | 94 +- data/maps/PalletTown/text.inc | 24 +- .../PalletTown_PlayersHouse_1F/scripts.inc | 18 +- data/maps/PalletTown_PlayersHouse_1F/text.inc | 14 +- .../PalletTown_PlayersHouse_2F/scripts.inc | 18 +- data/maps/PalletTown_PlayersHouse_2F/text.inc | 4 +- .../PalletTown_ProfessorOaksLab/scripts.inc | 304 +- .../maps/PalletTown_ProfessorOaksLab/text.inc | 120 +- data/maps/PalletTown_RivalsHouse/scripts.inc | 48 +- data/maps/PalletTown_RivalsHouse/text.inc | 48 +- data/maps/PewterCity/scripts.inc | 170 +- data/maps/PewterCity/text.inc | 60 +- data/maps/PewterCity_Gym/scripts.inc | 26 +- data/maps/PewterCity_Gym/text.inc | 34 +- data/maps/PewterCity_House1/scripts.inc | 10 +- data/maps/PewterCity_House1/text.inc | 6 +- data/maps/PewterCity_House2/scripts.inc | 6 +- data/maps/PewterCity_House2/text.inc | 4 +- data/maps/PewterCity_Mart/scripts.inc | 10 +- data/maps/PewterCity_Mart/text.inc | 4 +- data/maps/PewterCity_Museum_1F/scripts.inc | 52 +- data/maps/PewterCity_Museum_1F/text.inc | 36 +- data/maps/PewterCity_Museum_2F/scripts.inc | 16 +- data/maps/PewterCity_Museum_2F/text.inc | 22 +- .../PewterCity_PokemonCenter_1F/scripts.inc | 16 +- .../maps/PewterCity_PokemonCenter_1F/text.inc | 10 +- .../PewterCity_PokemonCenter_2F/scripts.inc | 8 +- .../PokemonLeague_AgathasRoom/scripts.inc | 32 +- data/maps/PokemonLeague_AgathasRoom/text.inc | 8 +- .../maps/PokemonLeague_BrunosRoom/scripts.inc | 38 +- data/maps/PokemonLeague_BrunosRoom/text.inc | 8 +- .../PokemonLeague_ChampionsRoom/scripts.inc | 54 +- .../maps/PokemonLeague_ChampionsRoom/text.inc | 18 +- .../maps/PokemonLeague_HallOfFame/scripts.inc | 12 +- data/maps/PokemonLeague_HallOfFame/text.inc | 2 +- .../maps/PokemonLeague_LancesRoom/scripts.inc | 44 +- data/maps/PokemonLeague_LancesRoom/text.inc | 8 +- .../PokemonLeague_LoreleisRoom/scripts.inc | 34 +- data/maps/PokemonLeague_LoreleisRoom/text.inc | 8 +- data/maps/PokemonMansion_1F/scripts.inc | 12 +- data/maps/PokemonMansion_1F/text.inc | 12 +- data/maps/PokemonMansion_2F/scripts.inc | 12 +- data/maps/PokemonMansion_2F/text.inc | 16 +- data/maps/PokemonMansion_3F/scripts.inc | 12 +- data/maps/PokemonMansion_3F/text.inc | 20 +- data/maps/PokemonMansion_B1F/scripts.inc | 12 +- data/maps/PokemonMansion_B1F/text.inc | 14 +- data/maps/PokemonTower_1F/scripts.inc | 16 +- data/maps/PokemonTower_1F/text.inc | 12 +- data/maps/PokemonTower_2F/scripts.inc | 28 +- data/maps/PokemonTower_2F/text.inc | 10 +- data/maps/PokemonTower_3F/scripts.inc | 8 +- data/maps/PokemonTower_3F/text.inc | 18 +- data/maps/PokemonTower_4F/scripts.inc | 8 +- data/maps/PokemonTower_4F/text.inc | 18 +- data/maps/PokemonTower_5F/scripts.inc | 16 +- data/maps/PokemonTower_5F/text.inc | 28 +- data/maps/PokemonTower_6F/scripts.inc | 14 +- data/maps/PokemonTower_6F/text.inc | 24 +- data/maps/PokemonTower_7F/scripts.inc | 58 +- data/maps/PokemonTower_7F/text.inc | 20 +- data/maps/PowerPlant/scripts.inc | 28 +- data/maps/Prototype_SeviiIsle_6/scripts.inc | 2 +- data/maps/Prototype_SeviiIsle_7/scripts.inc | 2 +- data/maps/Prototype_SeviiIsle_8/scripts.inc | 2 +- data/maps/Prototype_SeviiIsle_9/scripts.inc | 2 +- data/maps/RecordCorner/scripts.inc | 2 +- data/maps/RockTunnel_1F/scripts.inc | 20 +- data/maps/RockTunnel_1F/text.inc | 44 +- data/maps/RockTunnel_B1F/scripts.inc | 18 +- data/maps/RockTunnel_B1F/text.inc | 48 +- data/maps/RocketHideout_B1F/scripts.inc | 22 +- data/maps/RocketHideout_B1F/text.inc | 30 +- data/maps/RocketHideout_B2F/scripts.inc | 4 +- data/maps/RocketHideout_B2F/text.inc | 6 +- data/maps/RocketHideout_B3F/scripts.inc | 6 +- data/maps/RocketHideout_B3F/text.inc | 12 +- data/maps/RocketHideout_B4F/scripts.inc | 30 +- data/maps/RocketHideout_B4F/text.inc | 24 +- data/maps/RocketHideout_Elevator/scripts.inc | 24 +- data/maps/RocketHideout_Elevator/text.inc | 2 +- data/maps/Route1/scripts.inc | 10 +- data/maps/Route1/text.inc | 10 +- data/maps/Route10/scripts.inc | 10 +- data/maps/Route10/text.inc | 42 +- .../maps/Route10_PokemonCenter_1F/scripts.inc | 18 +- data/maps/Route10_PokemonCenter_1F/text.inc | 14 +- .../maps/Route10_PokemonCenter_2F/scripts.inc | 8 +- data/maps/Route11/scripts.inc | 4 +- data/maps/Route11/text.inc | 62 +- data/maps/Route11_EastEntrance_1F/scripts.inc | 6 +- data/maps/Route11_EastEntrance_1F/text.inc | 6 +- data/maps/Route11_EastEntrance_2F/scripts.inc | 22 +- data/maps/Route11_EastEntrance_2F/text.inc | 14 +- data/maps/Route12/scripts.inc | 18 +- data/maps/Route12/text.inc | 72 +- data/maps/Route12_FishingHouse/scripts.inc | 28 +- data/maps/Route12_FishingHouse/text.inc | 30 +- .../maps/Route12_NorthEntrance_1F/scripts.inc | 4 +- data/maps/Route12_NorthEntrance_1F/text.inc | 2 +- .../maps/Route12_NorthEntrance_2F/scripts.inc | 16 +- data/maps/Route12_NorthEntrance_2F/text.inc | 14 +- data/maps/Route13/scripts.inc | 8 +- data/maps/Route13/text.inc | 66 +- data/maps/Route14/scripts.inc | 4 +- data/maps/Route14/text.inc | 78 +- data/maps/Route15/scripts.inc | 4 +- data/maps/Route15/text.inc | 78 +- data/maps/Route15_WestEntrance_1F/scripts.inc | 4 +- data/maps/Route15_WestEntrance_1F/text.inc | 2 +- data/maps/Route15_WestEntrance_2F/scripts.inc | 12 +- data/maps/Route15_WestEntrance_2F/text.inc | 12 +- data/maps/Route16/scripts.inc | 26 +- data/maps/Route16/text.inc | 58 +- data/maps/Route16_House/scripts.inc | 10 +- data/maps/Route16_House/text.inc | 10 +- .../maps/Route16_NorthEntrance_1F/scripts.inc | 40 +- data/maps/Route16_NorthEntrance_1F/text.inc | 8 +- .../maps/Route16_NorthEntrance_2F/scripts.inc | 16 +- data/maps/Route16_NorthEntrance_2F/text.inc | 16 +- data/maps/Route17/scripts.inc | 14 +- data/maps/Route17/text.inc | 72 +- data/maps/Route18/scripts.inc | 14 +- data/maps/Route18/text.inc | 22 +- data/maps/Route18_EastEntrance_1F/scripts.inc | 38 +- data/maps/Route18_EastEntrance_1F/text.inc | 6 +- data/maps/Route18_EastEntrance_2F/scripts.inc | 14 +- data/maps/Route18_EastEntrance_2F/text.inc | 4 +- data/maps/Route19/scripts.inc | 4 +- data/maps/Route19/text.inc | 78 +- data/maps/Route19_UnusedHouse/scripts.inc | 2 +- data/maps/Route2/scripts.inc | 6 +- data/maps/Route2/text.inc | 4 +- data/maps/Route20/scripts.inc | 10 +- data/maps/Route20/text.inc | 64 +- data/maps/Route21_North/scripts.inc | 2 +- data/maps/Route21_North/text.inc | 24 +- data/maps/Route21_South/scripts.inc | 2 +- data/maps/Route21_South/text.inc | 46 +- data/maps/Route22/scripts.inc | 56 +- data/maps/Route22/text.inc | 18 +- data/maps/Route22_NorthEntrance/scripts.inc | 6 +- data/maps/Route23/scripts.inc | 34 +- data/maps/Route23/text.inc | 2 +- data/maps/Route23_UnusedHouse/scripts.inc | 2 +- data/maps/Route24/scripts.inc | 30 +- data/maps/Route24/text.inc | 48 +- data/maps/Route25/scripts.inc | 6 +- data/maps/Route25/text.inc | 60 +- data/maps/Route25_SeaCottage/scripts.inc | 72 +- data/maps/Route25_SeaCottage/text.inc | 30 +- data/maps/Route2_EastBuilding/scripts.inc | 10 +- data/maps/Route2_EastBuilding/text.inc | 10 +- data/maps/Route2_House/scripts.inc | 12 +- data/maps/Route2_House/text.inc | 2 +- .../scripts.inc | 8 +- .../text.inc | 6 +- .../scripts.inc | 6 +- .../text.inc | 4 +- data/maps/Route3/scripts.inc | 6 +- data/maps/Route3/text.inc | 52 +- data/maps/Route4/scripts.inc | 10 +- data/maps/Route4/text.inc | 30 +- data/maps/Route4_PokemonCenter_1F/scripts.inc | 44 +- data/maps/Route4_PokemonCenter_1F/text.inc | 22 +- data/maps/Route4_PokemonCenter_2F/scripts.inc | 8 +- data/maps/Route5/scripts.inc | 4 +- data/maps/Route5/text.inc | 2 +- data/maps/Route5_PokemonDayCare/scripts.inc | 2 +- data/maps/Route5_PokemonDayCare/text.inc | 34 +- data/maps/Route5_SouthEntrance/scripts.inc | 30 +- data/maps/Route5_SouthEntrance/text.inc | 8 +- data/maps/Route6/scripts.inc | 4 +- data/maps/Route6/text.inc | 38 +- data/maps/Route6_NorthEntrance/scripts.inc | 30 +- data/maps/Route6_NorthEntrance/text.inc | 8 +- data/maps/Route6_UnusedHouse/scripts.inc | 2 +- data/maps/Route7/scripts.inc | 4 +- data/maps/Route7/text.inc | 2 +- data/maps/Route7_EastEntrance/scripts.inc | 30 +- data/maps/Route7_EastEntrance/text.inc | 8 +- data/maps/Route8/scripts.inc | 4 +- data/maps/Route8/text.inc | 84 +- data/maps/Route8_WestEntrance/scripts.inc | 34 +- data/maps/Route8_WestEntrance/text.inc | 8 +- data/maps/Route9/scripts.inc | 4 +- data/maps/Route9/text.inc | 56 +- data/maps/SSAnne_1F_Corridor/scripts.inc | 6 +- data/maps/SSAnne_1F_Corridor/text.inc | 4 +- data/maps/SSAnne_1F_Room1/scripts.inc | 4 +- data/maps/SSAnne_1F_Room1/text.inc | 2 +- data/maps/SSAnne_1F_Room2/scripts.inc | 8 +- data/maps/SSAnne_1F_Room2/text.inc | 14 +- data/maps/SSAnne_1F_Room3/scripts.inc | 8 +- data/maps/SSAnne_1F_Room3/text.inc | 6 +- data/maps/SSAnne_1F_Room4/scripts.inc | 6 +- data/maps/SSAnne_1F_Room4/text.inc | 4 +- data/maps/SSAnne_1F_Room5/scripts.inc | 4 +- data/maps/SSAnne_1F_Room5/text.inc | 6 +- data/maps/SSAnne_1F_Room6/scripts.inc | 8 +- data/maps/SSAnne_1F_Room6/text.inc | 8 +- data/maps/SSAnne_1F_Room7/scripts.inc | 4 +- data/maps/SSAnne_1F_Room7/text.inc | 6 +- data/maps/SSAnne_2F_Corridor/scripts.inc | 46 +- data/maps/SSAnne_2F_Corridor/text.inc | 10 +- data/maps/SSAnne_2F_Room1/scripts.inc | 4 +- data/maps/SSAnne_2F_Room1/text.inc | 2 +- data/maps/SSAnne_2F_Room2/scripts.inc | 6 +- data/maps/SSAnne_2F_Room2/text.inc | 12 +- data/maps/SSAnne_2F_Room3/scripts.inc | 6 +- data/maps/SSAnne_2F_Room3/text.inc | 4 +- data/maps/SSAnne_2F_Room4/scripts.inc | 6 +- data/maps/SSAnne_2F_Room4/text.inc | 12 +- data/maps/SSAnne_2F_Room5/scripts.inc | 6 +- data/maps/SSAnne_2F_Room5/text.inc | 4 +- data/maps/SSAnne_2F_Room6/scripts.inc | 6 +- data/maps/SSAnne_2F_Room6/text.inc | 4 +- data/maps/SSAnne_3F_Corridor/scripts.inc | 4 +- data/maps/SSAnne_3F_Corridor/text.inc | 2 +- data/maps/SSAnne_B1F_Corridor/scripts.inc | 2 +- data/maps/SSAnne_B1F_Room1/scripts.inc | 6 +- data/maps/SSAnne_B1F_Room1/text.inc | 12 +- data/maps/SSAnne_B1F_Room2/scripts.inc | 4 +- data/maps/SSAnne_B1F_Room2/text.inc | 6 +- data/maps/SSAnne_B1F_Room3/scripts.inc | 4 +- data/maps/SSAnne_B1F_Room3/text.inc | 6 +- data/maps/SSAnne_B1F_Room4/scripts.inc | 6 +- data/maps/SSAnne_B1F_Room4/text.inc | 12 +- data/maps/SSAnne_B1F_Room5/scripts.inc | 6 +- data/maps/SSAnne_B1F_Room5/text.inc | 4 +- data/maps/SSAnne_CaptainsOffice/scripts.inc | 12 +- data/maps/SSAnne_CaptainsOffice/text.inc | 18 +- data/maps/SSAnne_Deck/scripts.inc | 12 +- data/maps/SSAnne_Deck/text.inc | 18 +- data/maps/SSAnne_Exterior/scripts.inc | 16 +- data/maps/SSAnne_Kitchen/scripts.inc | 22 +- data/maps/SSAnne_Kitchen/text.inc | 20 +- data/maps/SafariZone_Center/scripts.inc | 10 +- data/maps/SafariZone_Center/text.inc | 6 +- .../SafariZone_Center_RestHouse/scripts.inc | 6 +- .../maps/SafariZone_Center_RestHouse/text.inc | 4 +- data/maps/SafariZone_East/scripts.inc | 8 +- data/maps/SafariZone_East/text.inc | 6 +- .../SafariZone_East_RestHouse/scripts.inc | 8 +- data/maps/SafariZone_East_RestHouse/text.inc | 6 +- data/maps/SafariZone_North/scripts.inc | 12 +- data/maps/SafariZone_North/text.inc | 10 +- .../SafariZone_North_RestHouse/scripts.inc | 8 +- data/maps/SafariZone_North_RestHouse/text.inc | 6 +- data/maps/SafariZone_SecretHouse/scripts.inc | 8 +- data/maps/SafariZone_SecretHouse/text.inc | 8 +- data/maps/SafariZone_West/scripts.inc | 10 +- data/maps/SafariZone_West/text.inc | 8 +- .../SafariZone_West_RestHouse/scripts.inc | 8 +- data/maps/SafariZone_West_RestHouse/text.inc | 8 +- data/maps/SaffronCity/scripts.inc | 54 +- data/maps/SaffronCity/text.inc | 50 +- data/maps/SaffronCity_Connection/scripts.inc | 2 +- .../SaffronCity_CopycatsHouse_1F/scripts.inc | 8 +- .../SaffronCity_CopycatsHouse_1F/text.inc | 6 +- .../SaffronCity_CopycatsHouse_2F/scripts.inc | 16 +- .../SaffronCity_CopycatsHouse_2F/text.inc | 30 +- data/maps/SaffronCity_Dojo/scripts.inc | 42 +- data/maps/SaffronCity_Dojo/text.inc | 48 +- data/maps/SaffronCity_Gym/scripts.inc | 32 +- data/maps/SaffronCity_Gym/text.inc | 64 +- data/maps/SaffronCity_House/scripts.inc | 10 +- data/maps/SaffronCity_House/text.inc | 8 +- data/maps/SaffronCity_Mart/scripts.inc | 10 +- data/maps/SaffronCity_Mart/text.inc | 4 +- .../SaffronCity_MrPsychicsHouse/scripts.inc | 8 +- .../maps/SaffronCity_MrPsychicsHouse/text.inc | 8 +- .../SaffronCity_PokemonCenter_1F/scripts.inc | 14 +- .../SaffronCity_PokemonCenter_1F/text.inc | 8 +- .../SaffronCity_PokemonCenter_2F/scripts.inc | 8 +- .../scripts.inc | 110 +- .../text.inc | 76 +- data/maps/SeafoamIslands_1F/scripts.inc | 4 +- data/maps/SeafoamIslands_B1F/scripts.inc | 2 +- data/maps/SeafoamIslands_B2F/scripts.inc | 2 +- data/maps/SeafoamIslands_B3F/scripts.inc | 26 +- data/maps/SeafoamIslands_B4F/scripts.inc | 58 +- data/maps/SeafoamIslands_B4F/text.inc | 12 +- data/maps/SevenIsland/scripts.inc | 10 +- data/maps/SevenIsland/text.inc | 14 +- data/maps/SevenIsland_Harbor/scripts.inc | 4 +- data/maps/SevenIsland_House_Room1/scripts.inc | 50 +- data/maps/SevenIsland_House_Room1/text.inc | 28 +- data/maps/SevenIsland_House_Room2/scripts.inc | 18 +- data/maps/SevenIsland_Mart/scripts.inc | 12 +- data/maps/SevenIsland_Mart/text.inc | 6 +- .../SevenIsland_PokemonCenter_1F/scripts.inc | 12 +- .../SevenIsland_PokemonCenter_1F/text.inc | 6 +- .../SevenIsland_PokemonCenter_2F/scripts.inc | 8 +- .../SevenIsland_SevaultCanyon/scripts.inc | 4 +- data/maps/SevenIsland_SevaultCanyon/text.inc | 56 +- .../scripts.inc | 4 +- .../text.inc | 42 +- .../scripts.inc | 14 +- .../SevenIsland_SevaultCanyon_House/text.inc | 12 +- .../scripts.inc | 28 +- .../text.inc | 2 +- data/maps/SevenIsland_TanobyRuins/scripts.inc | 2 +- data/maps/SevenIsland_TanobyRuins/text.inc | 24 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- .../scripts.inc | 4 +- .../maps/SevenIsland_TrainerTower/scripts.inc | 8 +- data/maps/SevenIsland_TrainerTower/text.inc | 20 +- data/maps/SevenIsland_UnusedHouse/scripts.inc | 2 +- data/maps/SilphCo_10F/scripts.inc | 14 +- data/maps/SilphCo_10F/text.inc | 18 +- data/maps/SilphCo_11F/scripts.inc | 40 +- data/maps/SilphCo_11F/text.inc | 34 +- data/maps/SilphCo_1F/scripts.inc | 8 +- data/maps/SilphCo_1F/text.inc | 6 +- data/maps/SilphCo_2F/scripts.inc | 16 +- data/maps/SilphCo_2F/text.inc | 34 +- data/maps/SilphCo_3F/scripts.inc | 14 +- data/maps/SilphCo_3F/text.inc | 18 +- data/maps/SilphCo_4F/scripts.inc | 16 +- data/maps/SilphCo_4F/text.inc | 24 +- data/maps/SilphCo_5F/scripts.inc | 24 +- data/maps/SilphCo_5F/text.inc | 38 +- data/maps/SilphCo_6F/scripts.inc | 32 +- data/maps/SilphCo_6F/text.inc | 40 +- data/maps/SilphCo_7F/scripts.inc | 68 +- data/maps/SilphCo_7F/text.inc | 60 +- data/maps/SilphCo_8F/scripts.inc | 16 +- data/maps/SilphCo_8F/text.inc | 26 +- data/maps/SilphCo_9F/scripts.inc | 16 +- data/maps/SilphCo_9F/text.inc | 26 +- data/maps/SilphCo_Elevator/scripts.inc | 30 +- data/maps/SixIsland/scripts.inc | 10 +- data/maps/SixIsland/text.inc | 6 +- data/maps/SixIsland_AlteringCave/scripts.inc | 4 +- data/maps/SixIsland_DottedHole_1F/scripts.inc | 12 +- .../maps/SixIsland_DottedHole_B1F/scripts.inc | 2 +- .../maps/SixIsland_DottedHole_B2F/scripts.inc | 2 +- .../maps/SixIsland_DottedHole_B3F/scripts.inc | 2 +- .../maps/SixIsland_DottedHole_B4F/scripts.inc | 2 +- .../scripts.inc | 56 +- .../text.inc | 6 +- data/maps/SixIsland_GreenPath/scripts.inc | 6 +- data/maps/SixIsland_GreenPath/text.inc | 10 +- data/maps/SixIsland_Harbor/scripts.inc | 4 +- data/maps/SixIsland_House/scripts.inc | 4 +- data/maps/SixIsland_House/text.inc | 2 +- data/maps/SixIsland_Mart/scripts.inc | 8 +- data/maps/SixIsland_Mart/text.inc | 4 +- data/maps/SixIsland_OutcastIsland/scripts.inc | 4 +- data/maps/SixIsland_OutcastIsland/text.inc | 40 +- data/maps/SixIsland_PatternBush/scripts.inc | 32 +- data/maps/SixIsland_PatternBush/text.inc | 72 +- .../SixIsland_PokemonCenter_1F/scripts.inc | 22 +- data/maps/SixIsland_PokemonCenter_1F/text.inc | 6 +- .../SixIsland_PokemonCenter_2F/scripts.inc | 8 +- data/maps/SixIsland_RuinValley/scripts.inc | 14 +- data/maps/SixIsland_RuinValley/text.inc | 42 +- data/maps/SixIsland_WaterPath/scripts.inc | 6 +- data/maps/SixIsland_WaterPath/text.inc | 50 +- .../SixIsland_WaterPath_House1/scripts.inc | 22 +- data/maps/SixIsland_WaterPath_House1/text.inc | 20 +- .../SixIsland_WaterPath_House2/scripts.inc | 4 +- data/maps/SixIsland_WaterPath_House2/text.inc | 2 +- data/maps/ThreeIsland/scripts.inc | 96 +- data/maps/ThreeIsland/text.inc | 66 +- data/maps/ThreeIsland_BerryForest/scripts.inc | 14 +- data/maps/ThreeIsland_BerryForest/text.inc | 14 +- data/maps/ThreeIsland_BondBridge/scripts.inc | 6 +- data/maps/ThreeIsland_BondBridge/text.inc | 50 +- .../ThreeIsland_DunsparceTunnel/scripts.inc | 16 +- .../maps/ThreeIsland_DunsparceTunnel/text.inc | 8 +- data/maps/ThreeIsland_Harbor/scripts.inc | 4 +- data/maps/ThreeIsland_House1/scripts.inc | 6 +- data/maps/ThreeIsland_House1/text.inc | 4 +- data/maps/ThreeIsland_House2/scripts.inc | 6 +- data/maps/ThreeIsland_House2/text.inc | 4 +- data/maps/ThreeIsland_House3/scripts.inc | 4 +- data/maps/ThreeIsland_House3/text.inc | 2 +- data/maps/ThreeIsland_House4/scripts.inc | 6 +- data/maps/ThreeIsland_House4/text.inc | 4 +- data/maps/ThreeIsland_House5/scripts.inc | 6 +- data/maps/ThreeIsland_House5/text.inc | 4 +- data/maps/ThreeIsland_Mart/scripts.inc | 12 +- data/maps/ThreeIsland_Mart/text.inc | 6 +- .../ThreeIsland_PokemonCenter_1F/scripts.inc | 12 +- .../ThreeIsland_PokemonCenter_1F/text.inc | 6 +- .../ThreeIsland_PokemonCenter_2F/scripts.inc | 8 +- data/maps/ThreeIsland_Port/scripts.inc | 14 +- data/maps/ThreeIsland_Port/text.inc | 10 +- data/maps/TradeCenter/scripts.inc | 2 +- data/maps/TrainerTower_1F/scripts.inc | 12 +- data/maps/TrainerTower_2F/scripts.inc | 12 +- data/maps/TrainerTower_3F/scripts.inc | 12 +- data/maps/TrainerTower_4F/scripts.inc | 12 +- data/maps/TrainerTower_5F/scripts.inc | 12 +- data/maps/TrainerTower_6F/scripts.inc | 12 +- data/maps/TrainerTower_7F/scripts.inc | 12 +- data/maps/TrainerTower_8F/scripts.inc | 12 +- data/maps/TrainerTower_Elevator/scripts.inc | 20 +- data/maps/TrainerTower_Lobby/scripts.inc | 66 +- data/maps/TrainerTower_Lobby/text.inc | 42 +- data/maps/TrainerTower_Roof/scripts.inc | 4 +- data/maps/TwoIsland/scripts.inc | 68 +- data/maps/TwoIsland/text.inc | 26 +- data/maps/TwoIsland_CapeBrink/scripts.inc | 2 +- .../TwoIsland_CapeBrink_House/scripts.inc | 2 +- data/maps/TwoIsland_CapeBrink_House/text.inc | 18 +- data/maps/TwoIsland_Harbor/scripts.inc | 4 +- data/maps/TwoIsland_House/scripts.inc | 34 +- data/maps/TwoIsland_House/text.inc | 20 +- .../TwoIsland_JoyfulGameCorner/scripts.inc | 40 +- data/maps/TwoIsland_JoyfulGameCorner/text.inc | 36 +- .../TwoIsland_PokemonCenter_1F/scripts.inc | 10 +- data/maps/TwoIsland_PokemonCenter_1F/text.inc | 4 +- .../TwoIsland_PokemonCenter_2F/scripts.inc | 8 +- .../UndergroundPath_EastEntrance/scripts.inc | 4 +- .../UndergroundPath_EastEntrance/text.inc | 2 +- .../scripts.inc | 4 +- .../UndergroundPath_NorthEntrance/scripts.inc | 10 +- .../scripts.inc | 4 +- .../UndergroundPath_SouthEntrance/scripts.inc | 4 +- .../UndergroundPath_SouthEntrance/text.inc | 2 +- .../UndergroundPath_WestEntrance/scripts.inc | 4 +- .../UndergroundPath_WestEntrance/text.inc | 2 +- data/maps/UnionRoom/scripts.inc | 26 +- data/maps/VermilionCity/scripts.inc | 76 +- data/maps/VermilionCity/text.inc | 52 +- data/maps/VermilionCity_Gym/scripts.inc | 80 +- data/maps/VermilionCity_Gym/text.inc | 50 +- data/maps/VermilionCity_House1/scripts.inc | 10 +- data/maps/VermilionCity_House1/text.inc | 14 +- data/maps/VermilionCity_House2/scripts.inc | 10 +- data/maps/VermilionCity_House2/text.inc | 10 +- data/maps/VermilionCity_House3/scripts.inc | 10 +- data/maps/VermilionCity_House3/text.inc | 8 +- data/maps/VermilionCity_Mart/scripts.inc | 10 +- data/maps/VermilionCity_Mart/text.inc | 4 +- .../scripts.inc | 12 +- .../VermilionCity_PokemonCenter_1F/text.inc | 12 +- .../scripts.inc | 8 +- .../VermilionCity_PokemonFanClub/scripts.inc | 30 +- .../VermilionCity_PokemonFanClub/text.inc | 34 +- data/maps/VictoryRoad_1F/scripts.inc | 16 +- data/maps/VictoryRoad_1F/text.inc | 12 +- data/maps/VictoryRoad_2F/scripts.inc | 26 +- data/maps/VictoryRoad_2F/text.inc | 32 +- data/maps/VictoryRoad_3F/scripts.inc | 22 +- data/maps/VictoryRoad_3F/text.inc | 48 +- data/maps/ViridianCity/scripts.inc | 70 +- data/maps/ViridianCity/text.inc | 42 +- data/maps/ViridianCity_Gym/scripts.inc | 34 +- data/maps/ViridianCity_Gym/text.inc | 70 +- data/maps/ViridianCity_House1/scripts.inc | 10 +- data/maps/ViridianCity_House1/text.inc | 8 +- data/maps/ViridianCity_House2/scripts.inc | 26 +- data/maps/ViridianCity_House2/text.inc | 30 +- data/maps/ViridianCity_Mart/scripts.inc | 24 +- data/maps/ViridianCity_Mart/text.inc | 12 +- .../ViridianCity_PokemonCenter_1F/scripts.inc | 12 +- .../ViridianCity_PokemonCenter_1F/text.inc | 6 +- .../ViridianCity_PokemonCenter_2F/scripts.inc | 8 +- data/maps/ViridianForest/scripts.inc | 30 +- data/maps/ViridianForest/text.inc | 46 +- data/multiboot_berry_glitch_fix.s | 2 +- data/multiboot_ereader.s | 2 +- data/multiboot_pokemon_colosseum.s | 2 +- data/mystery_event_msg.s | 76 +- data/mystery_event_script_cmd_table.s | 4 +- data/script_cmd_table.inc | 4 +- data/scripts/aide.inc | 6 +- data/scripts/bag_full.inc | 8 +- data/scripts/cable_club.inc | 486 +- data/scripts/cave_of_origin.inc | 10 +- data/scripts/day_care.inc | 26 +- data/scripts/fame_checker.inc | 68 +- data/scripts/field_moves.inc | 92 +- data/scripts/flash.inc | 2 +- data/scripts/flavor_text.inc | 56 +- data/scripts/hall_of_fame.inc | 10 +- data/scripts/hole.inc | 8 +- data/scripts/item_ball_scripts.inc | 336 +- data/scripts/itemfinder.inc | 2 +- data/scripts/move_tutors.inc | 132 +- data/scripts/movement.inc | 34 +- data/scripts/mystery_event_club.inc | 56 +- data/scripts/obtain_item.inc | 48 +- data/scripts/pc.inc | 24 +- data/scripts/pc_transfer.inc | 14 +- data/scripts/pkmn_center_nurse.inc | 16 +- data/scripts/pokedex_rating.inc | 22 +- data/scripts/pokemon_league.inc | 18 +- data/scripts/pokemon_mansion.inc | 22 +- data/scripts/questionnaire.inc | 8 +- data/scripts/repel.inc | 4 +- data/scripts/route23.inc | 60 +- data/scripts/safari_zone.inc | 12 +- data/scripts/seagallop.inc | 54 +- data/scripts/set_gym_trainers.inc | 18 +- data/scripts/silphco_doors.inc | 126 +- data/scripts/static_pokemon.inc | 6 +- data/scripts/std_msgbox.inc | 20 +- data/scripts/surf.inc | 8 +- data/scripts/test.inc | 14 +- data/scripts/trainer_battle.inc | 40 +- data/scripts/trainer_card.inc | 92 +- data/scripts/trainer_tower.inc | 74 +- data/scripts/trainers.inc | 936 +- data/scripts/white_out.inc | 18 +- data/smokescreen.s | 10 +- data/specials.inc | 2 +- data/text/aide.inc | 6 +- data/text/berries.inc | 82 +- data/text/braille.inc | 78 +- data/text/competitive_brothers.inc | 16 +- data/text/day_care.inc | 60 +- data/text/eon_ticket.inc | 18 +- data/text/fame_checker.inc | 410 +- data/text/flavor_text.inc | 60 +- data/text/help_system.inc | 736 +- data/text/ingame_trade.inc | 30 +- data/text/itemfinder.inc | 4 +- data/text/move_descriptions.inc | 706 +- data/text/new_game_intro.inc | 124 +- data/text/obtain_item.inc | 26 +- data/text/pc.inc | 12 +- data/text/pc_transfer.inc | 14 +- data/text/poke_mart.inc | 12 +- data/text/pokedex_rating.inc | 50 +- data/text/route23.inc | 10 +- data/text/safari_zone.inc | 64 +- data/text/save.inc | 10 +- data/text/seagallop.inc | 4 +- data/text/sign_lady.inc | 14 +- data/text/surf.inc | 6 +- data/text/trainer_card.inc | 60 +- data/text/trainers.inc | 476 +- data/text/white_out.inc | 14 +- data/tilesets/graphics.inc | 252 +- data/tilesets/metatiles.inc | 268 +- sound/music_player_table.inc | 2 +- sound/programmable_wave_data.inc | 22 +- sound/song_table.inc | 4 +- sound/voice_groups.inc | 17392 ++++++++-------- src/crt0.s | 14 +- src/libagbsyscall.s | 26 +- src/libgcnmultiboot.s | 30 +- 802 files changed, 20272 insertions(+), 20272 deletions(-) diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 34b7aeaad..7dcc2f7ed 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -15,7 +15,7 @@ @ Emerald also adds a few entirely new AI commands (mostly to expand Double Battle AI), which are not included .align 2 -gBattleAI_ScriptsTable:: @ 81D9BF4 +gBattleAI_ScriptsTable:: .4byte AI_CheckBadMove .4byte AI_CheckViability .4byte AI_TryToFaint @@ -49,7 +49,7 @@ gBattleAI_ScriptsTable:: @ 81D9BF4 .4byte AI_Safari .4byte AI_FirstBattle -AI_CheckBadMove:: @ 81D9C74 +AI_CheckBadMove:: @ if_move MOVE_FISSURE, AI_CBM_CheckIfNegatesType @ Improvement in Emerald @ if_move MOVE_HORN_DRILL, AI_CBM_CheckIfNegatesType get_how_powerful_move_is @@ -65,30 +65,30 @@ AI_CBM_CheckIfNegatesType:: if_equal ABILITY_LEVITATE, CheckIfLevitateCancelsGroundMove goto AI_CheckBadMove_CheckSoundproof -CheckIfVoltAbsorbCancelsElectric:: @ 81D9CA6 +CheckIfVoltAbsorbCancelsElectric:: get_curr_move_type if_equal_ TYPE_ELECTRIC, Score_Minus12 goto AI_CheckBadMove_CheckSoundproof -CheckIfWaterAbsorbCancelsWater:: @ 81D9CB3 +CheckIfWaterAbsorbCancelsWater:: get_curr_move_type if_equal_ TYPE_WATER, Score_Minus12 goto AI_CheckBadMove_CheckSoundproof -CheckIfFlashFireCancelsFire:: @ 81D9CC0 +CheckIfFlashFireCancelsFire:: get_curr_move_type if_equal_ TYPE_FIRE, Score_Minus12 goto AI_CheckBadMove_CheckSoundproof -CheckIfWonderGuardCancelsMove:: @ 81D9CCD +CheckIfWonderGuardCancelsMove:: if_type_effectiveness AI_EFFECTIVENESS_x2, AI_CheckBadMove_CheckSoundproof goto Score_Minus10 -CheckIfLevitateCancelsGroundMove:: @ 81D9CD8 +CheckIfLevitateCancelsGroundMove:: get_curr_move_type if_equal_ TYPE_GROUND, Score_Minus10 -AI_CheckBadMove_CheckSoundproof:: @ 81D9CE0 +AI_CheckBadMove_CheckSoundproof:: get_ability AI_TARGET if_not_equal ABILITY_SOUNDPROOF, AI_CheckBadMove_CheckEffect if_move MOVE_GROWL, Score_Minus10 @@ -101,7 +101,7 @@ AI_CheckBadMove_CheckSoundproof:: @ 81D9CE0 if_move MOVE_METAL_SOUND, Score_Minus10 if_move MOVE_GRASS_WHISTLE, Score_Minus10 -AI_CheckBadMove_CheckEffect:: @ 81D9D27 +AI_CheckBadMove_CheckEffect:: if_effect EFFECT_SLEEP, AI_CBM_Sleep if_effect EFFECT_EXPLOSION, AI_CBM_Explosion if_effect EFFECT_DREAM_EATER, AI_CBM_DreamEater @@ -213,7 +213,7 @@ AI_CheckBadMove_CheckEffect:: @ 81D9D27 if_effect EFFECT_DRAGON_DANCE, AI_CBM_DragonDance end -AI_CBM_Sleep:: @ 81D9FB6 +AI_CBM_Sleep:: get_ability AI_TARGET if_equal ABILITY_INSOMNIA, Score_Minus10 if_equal ABILITY_VITAL_SPIRIT, Score_Minus10 @@ -221,7 +221,7 @@ AI_CBM_Sleep:: @ 81D9FB6 @ if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10 @ Improvement in Emerald end -AI_CBM_Explosion:: @ 81D9FCF +AI_CBM_Explosion:: if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10 get_ability AI_TARGET if_equal ABILITY_DAMP, Score_Minus10 @@ -231,90 +231,90 @@ AI_CBM_Explosion:: @ 81D9FCF if_not_equal 0, Score_Minus10 goto Score_Minus1 -AI_CBM_Explosion_End:: @ 81D9FF2 +AI_CBM_Explosion_End:: end -AI_CBM_Nightmare:: @ 81D9FF3 +AI_CBM_Nightmare:: if_status2 AI_TARGET, STATUS2_NIGHTMARE, Score_Minus10 if_not_status AI_TARGET, STATUS1_SLEEP, Score_Minus8 end -AI_CBM_DreamEater:: @ 81DA008 +AI_CBM_DreamEater:: if_not_status AI_TARGET, STATUS1_SLEEP, Score_Minus8 if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10 end -AI_CBM_BellyDrum:: @ 81DA019 +AI_CBM_BellyDrum:: if_hp_less_than AI_USER, 51, Score_Minus10 -AI_CBM_AttackUp:: @ 81DA020 +AI_CBM_AttackUp:: if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10 end -AI_CBM_DefenseUp:: @ 81DA029 +AI_CBM_DefenseUp:: if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10 end -AI_CBM_SpeedUp:: @ 81DA032 +AI_CBM_SpeedUp:: if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus10 end -AI_CBM_SpAtkUp:: @ 81DA03B +AI_CBM_SpAtkUp:: if_stat_level_equal AI_USER, STAT_SPATK, 12, Score_Minus10 end -AI_CBM_SpDefUp:: @ 81DA044 +AI_CBM_SpDefUp:: if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus10 end -AI_CBM_AccUp:: @ 81DA04D +AI_CBM_AccUp:: if_stat_level_equal AI_USER, STAT_ACC, 12, Score_Minus10 end -AI_CBM_EvasionUp:: @ 81DA056 +AI_CBM_EvasionUp:: if_stat_level_equal AI_USER, STAT_EVASION, 12, Score_Minus10 end -AI_CBM_AttackDown:: @ 81DA05F +AI_CBM_AttackDown:: if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10 get_ability AI_TARGET if_equal ABILITY_HYPER_CUTTER, Score_Minus10 goto CheckIfAbilityBlocksStatChange -AI_CBM_DefenseDown:: @ 81DA074 +AI_CBM_DefenseDown:: if_stat_level_equal AI_TARGET, STAT_DEF, 0, Score_Minus10 goto CheckIfAbilityBlocksStatChange -AI_CBM_SpeedDown:: @ 81DA081 +AI_CBM_SpeedDown:: if_stat_level_equal AI_TARGET, STAT_SPEED, 0, Score_Minus10 @ get_ability AI_TARGET @ Improvement in Emerald @ if_equal ABILITY_SPEED_BOOST, Score_Minus10 goto CheckIfAbilityBlocksStatChange -AI_CBM_SpAtkDown:: @ 81DA08E +AI_CBM_SpAtkDown:: if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus10 goto CheckIfAbilityBlocksStatChange -AI_CBM_SpDefDown:: @ 81DA09B +AI_CBM_SpDefDown:: if_stat_level_equal AI_TARGET, STAT_SPDEF, 0, Score_Minus10 goto CheckIfAbilityBlocksStatChange -AI_CBM_AccDown:: @ 81DA0A8 +AI_CBM_AccDown:: if_stat_level_equal AI_TARGET, STAT_ACC, 0, Score_Minus10 get_ability AI_TARGET if_equal ABILITY_KEEN_EYE, Score_Minus10 goto CheckIfAbilityBlocksStatChange -AI_CBM_EvasionDown:: @ 81DA0BD +AI_CBM_EvasionDown:: if_stat_level_equal AI_TARGET, STAT_EVASION, 0, Score_Minus10 -CheckIfAbilityBlocksStatChange:: @ 81DA0C5 +CheckIfAbilityBlocksStatChange:: get_ability AI_TARGET if_equal ABILITY_CLEAR_BODY, Score_Minus10 if_equal ABILITY_WHITE_SMOKE, Score_Minus10 end -AI_CBM_Haze:: @ 81DA0D4 +AI_CBM_Haze:: if_stat_level_less_than AI_USER, STAT_ATK, 6, AI_CBM_Haze_End if_stat_level_less_than AI_USER, STAT_DEF, 6, AI_CBM_Haze_End if_stat_level_less_than AI_USER, STAT_SPEED, 6, AI_CBM_Haze_End @@ -331,17 +331,17 @@ AI_CBM_Haze:: @ 81DA0D4 if_stat_level_more_than AI_TARGET, STAT_EVASION, 6, AI_CBM_Haze_End goto Score_Minus10 -AI_CBM_Haze_End:: @ 81DA149 +AI_CBM_Haze_End:: end -AI_CBM_Roar:: @ 81DA14A +AI_CBM_Roar:: count_alive_pokemon AI_TARGET if_equal 0, Score_Minus10 get_ability AI_TARGET if_equal ABILITY_SUCTION_CUPS, Score_Minus10 end -AI_CBM_Poison:: @ 81DA15B +AI_CBM_Poison:: get_target_type1 if_equal TYPE_STEEL, Score_Minus10 if_equal TYPE_POISON, Score_Minus10 @@ -354,51 +354,51 @@ AI_CBM_Poison:: @ 81DA15B @ if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10 @ Improvement in Emerald end -AI_CBM_LightScreen:: @ 81DA18A +AI_CBM_LightScreen:: if_side_affecting AI_USER, SIDE_STATUS_LIGHTSCREEN, Score_Minus8 end -AI_CBM_OneHitKO:: @ 81DA195 +AI_CBM_OneHitKO:: if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10 get_ability AI_TARGET if_equal ABILITY_STURDY, Score_Minus10 if_level_cond 1, Score_Minus10 end -AI_CBM_Magnitude:: @ 81DA1AA +AI_CBM_Magnitude:: get_ability AI_TARGET if_equal ABILITY_LEVITATE, Score_Minus10 -AI_CBM_HighRiskForDamage:: @ 81DA1B2 +AI_CBM_HighRiskForDamage:: if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10 get_ability AI_TARGET if_not_equal ABILITY_WONDER_GUARD, AI_CBM_HighRiskForDamage_End if_type_effectiveness AI_EFFECTIVENESS_x2, AI_CBM_HighRiskForDamage_End goto Score_Minus10 -AI_CBM_HighRiskForDamage_End:: @ 81DA1CB +AI_CBM_HighRiskForDamage_End:: end -AI_CBM_Mist:: @ 81DA1CC +AI_CBM_Mist:: if_side_affecting AI_USER, SIDE_STATUS_MIST, Score_Minus8 end -AI_CBM_FocusEnergy:: @ 81DA1D7 +AI_CBM_FocusEnergy:: if_status2 AI_USER, STATUS2_FOCUS_ENERGY, Score_Minus10 end -AI_CBM_Confuse:: @ 81DA1E2 +AI_CBM_Confuse:: if_status2 AI_TARGET, STATUS2_CONFUSION, Score_Minus5 get_ability AI_TARGET if_equal ABILITY_OWN_TEMPO, Score_Minus10 @ if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10 @ Improvement in Emerald end -AI_CBM_Reflect:: @ 81DA1F5 +AI_CBM_Reflect:: if_side_affecting AI_USER, SIDE_STATUS_REFLECT, Score_Minus8 end -AI_CBM_Paralyze:: @ 81DA200 +AI_CBM_Paralyze:: if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10 get_ability AI_TARGET if_equal ABILITY_LIMBER, Score_Minus10 @@ -406,12 +406,12 @@ AI_CBM_Paralyze:: @ 81DA200 @ if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10 @ Improvement in Emerald end -AI_CBM_Substitute:: @ 81DA219 +AI_CBM_Substitute:: if_status2 AI_USER, STATUS2_SUBSTITUTE, Score_Minus8 if_hp_less_than AI_USER, 26, Score_Minus10 end -AI_CBM_LeechSeed:: @ 81DA22B +AI_CBM_LeechSeed:: if_status3 AI_TARGET, STATUS3_LEECHSEED, Score_Minus10 get_target_type1 if_equal TYPE_GRASS, Score_Minus10 @@ -419,45 +419,45 @@ AI_CBM_LeechSeed:: @ 81DA22B if_equal TYPE_GRASS, Score_Minus10 end -AI_CBM_Disable:: @ 81DA246 +AI_CBM_Disable:: if_any_move_disabled AI_TARGET, Score_Minus8 end -AI_CBM_Encore:: @ 81DA24E +AI_CBM_Encore:: if_any_move_encored AI_TARGET, Score_Minus8 end -AI_CBM_DamageDuringSleep:: @ 81DA256 +AI_CBM_DamageDuringSleep:: if_not_status AI_USER, STATUS1_SLEEP, Score_Minus8 end -AI_CBM_CantEscape:: @ 81DA261 +AI_CBM_CantEscape:: if_status2 AI_TARGET, STATUS2_ESCAPE_PREVENTION, Score_Minus10 end -AI_CBM_Curse:: @ 81DA26C +AI_CBM_Curse:: if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10 if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8 end -AI_CBM_Spikes:: @ 81DA27D +AI_CBM_Spikes:: if_side_affecting AI_TARGET, SIDE_STATUS_SPIKES, Score_Minus10 end -AI_CBM_Foresight:: @ 81DA288 +AI_CBM_Foresight:: if_status2 AI_TARGET, STATUS2_FORESIGHT, Score_Minus10 end -AI_CBM_PerishSong:: @ 81DA293 +AI_CBM_PerishSong:: if_status3 AI_TARGET, STATUS3_PERISH_SONG, Score_Minus10 end -AI_CBM_Sandstorm:: @ 81DA29E +AI_CBM_Sandstorm:: get_weather if_equal AI_WEATHER_SANDSTORM, Score_Minus8 end -AI_CBM_Attract:: @ 81DA2A6 +AI_CBM_Attract:: if_status2 AI_TARGET, STATUS2_INFATUATION, Score_Minus10 get_ability AI_TARGET if_equal ABILITY_OBLIVIOUS, Score_Minus10 @@ -466,73 +466,73 @@ AI_CBM_Attract:: @ 81DA2A6 if_equal MON_FEMALE, AI_CBM_Attract_CheckIfTargetIsMale goto Score_Minus10 -AI_CBM_Attract_CheckIfTargetIsFemale:: @ 81DA2CB +AI_CBM_Attract_CheckIfTargetIsFemale:: get_gender AI_TARGET if_equal MON_FEMALE, AI_CBM_Attract_End goto Score_Minus10 -AI_CBM_Attract_CheckIfTargetIsMale:: @ 81DA2D8 +AI_CBM_Attract_CheckIfTargetIsMale:: get_gender AI_TARGET if_equal MON_MALE, AI_CBM_Attract_End goto Score_Minus10 -AI_CBM_Attract_End:: @ 81DA2E5 +AI_CBM_Attract_End:: end -AI_CBM_Safeguard:: @ 81DA2E6 +AI_CBM_Safeguard:: if_side_affecting AI_USER, SIDE_STATUS_SAFEGUARD, Score_Minus8 end -AI_CBM_Memento:: @ 81DA2F1 +AI_CBM_Memento:: if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10 if_stat_level_equal AI_TARGET, STAT_SPATK, 0, Score_Minus8 -AI_CBM_BatonPass:: @ 81DA301 +AI_CBM_BatonPass:: count_alive_pokemon AI_USER if_equal 0, Score_Minus10 end -AI_CBM_RainDance:: @ 81DA30A +AI_CBM_RainDance:: get_weather if_equal AI_WEATHER_RAIN, Score_Minus8 end -AI_CBM_SunnyDay:: @ 81DA312 +AI_CBM_SunnyDay:: get_weather if_equal AI_WEATHER_SUN, Score_Minus8 end -AI_CBM_FutureSight:: @ 81DA31A +AI_CBM_FutureSight:: if_side_affecting AI_TARGET, SIDE_STATUS_FUTUREATTACK, Score_Minus10 @ if_side_affecting AI_USER, SIDE_STATUS_FUTUREATTACK, Score_Minus12 @ Improvement in Emerald end -AI_CBM_FakeOut:: @ 81DA325 +AI_CBM_FakeOut:: is_first_turn_for AI_USER if_equal 0, Score_Minus10 end -AI_CBM_Stockpile:: @ 81DA32E +AI_CBM_Stockpile:: get_stockpile_count AI_USER if_equal 3, Score_Minus10 end -AI_CBM_SpitUpAndSwallow:: @ 81DA337 +AI_CBM_SpitUpAndSwallow:: if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10 get_stockpile_count AI_USER if_equal 0, Score_Minus10 end -AI_CBM_Hail:: @ 81DA346 +AI_CBM_Hail:: get_weather if_equal AI_WEATHER_HAIL, Score_Minus8 end -AI_CBM_Torment:: @ 81DA34E +AI_CBM_Torment:: if_status2 AI_TARGET, STATUS2_TORMENT, Score_Minus10 end -AI_CBM_WillOWisp:: @ 81DA359 +AI_CBM_WillOWisp:: get_ability AI_TARGET if_equal ABILITY_WATER_VEIL, Score_Minus10 if_status AI_TARGET, STATUS1_ANY, Score_Minus10 @@ -542,90 +542,90 @@ AI_CBM_WillOWisp:: @ 81DA359 @ if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10 @ Improvement in Emerald end -AI_CBM_HelpingHand:: @ 81DA37E +AI_CBM_HelpingHand:: if_not_double_battle Score_Minus10 end -AI_CBM_TrickAndKnockOff:: @ 81DA386 +AI_CBM_TrickAndKnockOff:: get_ability AI_TARGET if_equal ABILITY_STICKY_HOLD, Score_Minus10 end -AI_CBM_Ingrain:: @ 81DA38F +AI_CBM_Ingrain:: if_status3 AI_USER, STATUS3_ROOTED, Score_Minus10 end -AI_CBM_Recycle:: @ 81DA39A +AI_CBM_Recycle:: get_used_held_item AI_USER if_equal ITEM_NONE, Score_Minus10 end -AI_CBM_Imprison:: @ 81DA3A3 +AI_CBM_Imprison:: if_status3 AI_USER, STATUS3_IMPRISONED_OTHERS, Score_Minus10 end -AI_CBM_Refresh:: @ 81DA3AE +AI_CBM_Refresh:: if_not_status AI_USER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, Score_Minus10 end -AI_CBM_MudSport:: @ 81DA3B9 +AI_CBM_MudSport:: if_status3 AI_USER, STATUS3_MUDSPORT, Score_Minus10 end -AI_CBM_Tickle:: @ 81DA3C4 +AI_CBM_Tickle:: if_stat_level_equal AI_TARGET, STAT_ATK, 0, Score_Minus10 if_stat_level_equal AI_TARGET, STAT_DEF, 0, Score_Minus8 end -AI_CBM_CosmicPower:: @ 81DA3D5 +AI_CBM_CosmicPower:: if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus10 if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8 end -AI_CBM_BulkUp:: @ 81DA3E6 +AI_CBM_BulkUp:: if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10 if_stat_level_equal AI_USER, STAT_DEF, 12, Score_Minus8 end -AI_CBM_WaterSport:: @ 81DA3F7 +AI_CBM_WaterSport:: if_status3 AI_USER, STATUS3_WATERSPORT, Score_Minus10 end -AI_CBM_CalmMind:: @ 81DA402 +AI_CBM_CalmMind:: if_stat_level_equal AI_USER, STAT_SPATK, 12, Score_Minus10 if_stat_level_equal AI_USER, STAT_SPDEF, 12, Score_Minus8 end -AI_CBM_DragonDance:: @ 81DA413 +AI_CBM_DragonDance:: if_stat_level_equal AI_USER, STAT_ATK, 12, Score_Minus10 if_stat_level_equal AI_USER, STAT_SPEED, 12, Score_Minus8 end -Score_Minus1:: @ 81DA424 +Score_Minus1:: score -1 end -Score_Minus2:: @ 81DA427 +Score_Minus2:: score -2 end -Score_Minus3:: @ 81DA42A +Score_Minus3:: score -3 end -Score_Minus5:: @ 81DA42D +Score_Minus5:: score -5 end -Score_Minus8:: @ 81DA430 +Score_Minus8:: score -8 end -Score_Minus10:: @ 81DA433 +Score_Minus10:: score -10 end -Score_Minus12:: @ 81DA436 +Score_Minus12:: score -12 end @@ -650,7 +650,7 @@ Score_Plus5:: @ score +10 @ end -AI_CheckViability:: @ 81DA445 +AI_CheckViability:: if_effect EFFECT_SLEEP, AI_CV_Sleep if_effect EFFECT_ABSORB, AI_CV_Absorb if_effect EFFECT_EXPLOSION, AI_CV_SelfKO @@ -775,73 +775,73 @@ AI_CheckViability:: @ 81DA445 if_effect EFFECT_DRAGON_DANCE, AI_CV_DragonDance end -AI_CV_Sleep:: @ 81DA71C +AI_CV_Sleep:: if_has_move_with_effect AI_TARGET, EFFECT_DREAM_EATER, AI_CV_SleepEncourageSlpDamage if_has_move_with_effect AI_TARGET, EFFECT_NIGHTMARE, AI_CV_SleepEncourageSlpDamage goto AI_CV_Sleep_End -AI_CV_SleepEncourageSlpDamage:: @ 81DA72F +AI_CV_SleepEncourageSlpDamage:: if_random_less_than 128, AI_CV_Sleep_End score +1 -AI_CV_Sleep_End:: @ 81DA737 +AI_CV_Sleep_End:: end -AI_CV_Absorb:: @ 81DA738 +AI_CV_Absorb:: if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_AbsorbEncourageMaybe if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_AbsorbEncourageMaybe goto AI_CV_Absorb_End -AI_CV_AbsorbEncourageMaybe:: @ 81DA749 +AI_CV_AbsorbEncourageMaybe:: if_random_less_than 50, AI_CV_Absorb_End score -3 -AI_CV_Absorb_End:: @ 81DA751 +AI_CV_Absorb_End:: end -AI_CV_SelfKO:: @ 81DA752 +AI_CV_SelfKO:: if_stat_level_less_than AI_TARGET, STAT_EVASION, 7, AI_CV_SelfKO_Encourage1 score -1 if_stat_level_less_than AI_TARGET, STAT_EVASION, 10, AI_CV_SelfKO_Encourage1 if_random_less_than 128, AI_CV_SelfKO_Encourage1 score -1 -AI_CV_SelfKO_Encourage1:: @ 81DA76C +AI_CV_SelfKO_Encourage1:: if_hp_less_than AI_USER, 80, AI_CV_SelfKO_Encourage2 if_target_faster AI_CV_SelfKO_Encourage2 if_random_less_than 50, AI_CV_SelfKO_End goto Score_Minus3 -AI_CV_SelfKO_Encourage2:: @ 81DA784 +AI_CV_SelfKO_Encourage2:: if_hp_more_than AI_USER, 50, AI_CV_SelfKO_Encourage4 if_random_less_than 128, AI_CV_SelfKO_Encourage3 score +1 -AI_CV_SelfKO_Encourage3:: @ 81DA793 +AI_CV_SelfKO_Encourage3:: if_hp_more_than AI_USER, 30, AI_CV_SelfKO_End if_random_less_than 50, AI_CV_SelfKO_End score +1 goto AI_CV_SelfKO_End -AI_CV_SelfKO_Encourage4:: @ 81DA7A7 +AI_CV_SelfKO_Encourage4:: if_random_less_than 50, AI_CV_SelfKO_End score -1 -AI_CV_SelfKO_End:: @ 81DA7AF +AI_CV_SelfKO_End:: end -AI_CV_DreamEater:: @ 81DA7B0 +AI_CV_DreamEater:: if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_DreamEater_ScoreDown1 if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_DreamEater_ScoreDown1 goto AI_CV_DreamEater_End -AI_CV_DreamEater_ScoreDown1:: @ 81DA7C1 +AI_CV_DreamEater_ScoreDown1:: score -1 -AI_CV_DreamEater_End:: @ 81DA7C3 +AI_CV_DreamEater_End:: end -AI_CV_MirrorMove:: @ 81DA7C4 +AI_CV_MirrorMove:: if_target_faster AI_CV_MirrorMove2 get_last_used_move AI_TARGET if_not_in_hwords AI_CV_MirrorMove_EncouragedMovesToMirror, AI_CV_MirrorMove2 @@ -849,17 +849,17 @@ AI_CV_MirrorMove:: @ 81DA7C4 score +2 goto AI_CV_MirrorMove_End -AI_CV_MirrorMove2:: @ 81DA7E2 +AI_CV_MirrorMove2:: get_last_used_move AI_TARGET if_in_hwords AI_CV_MirrorMove_EncouragedMovesToMirror, AI_CV_MirrorMove_End if_random_less_than 80, AI_CV_MirrorMove_End score -1 -AI_CV_MirrorMove_End:: @ 81DA7F5 +AI_CV_MirrorMove_End:: end .space 2 -AI_CV_MirrorMove_EncouragedMovesToMirror:: @ 81DA7F8 +AI_CV_MirrorMove_EncouragedMovesToMirror:: .align 1 .2byte MOVE_SLEEP_POWDER .2byte MOVE_LOVELY_KISS @@ -902,44 +902,44 @@ AI_CV_MirrorMove_EncouragedMovesToMirror:: @ 81DA7F8 .2byte MOVE_SKILL_SWAP .2byte -1 -AI_CV_AttackUp:: @ 81DA848 +AI_CV_AttackUp:: if_stat_level_less_than AI_USER, STAT_ATK, 9, AI_CV_AttackUp2 if_random_less_than 100, AI_CV_AttackUp3 score -1 goto AI_CV_AttackUp3 -AI_CV_AttackUp2:: @ 81DA85D +AI_CV_AttackUp2:: if_hp_not_equal AI_USER, 100, AI_CV_AttackUp3 if_random_less_than 128, AI_CV_AttackUp3 score +2 -AI_CV_AttackUp3:: @ 81DA86C +AI_CV_AttackUp3:: if_hp_more_than AI_USER, 70, AI_CV_AttackUp_End if_hp_less_than AI_USER, 40, AI_CV_AttackUp_ScoreDown2 if_random_less_than 40, AI_CV_AttackUp_End -AI_CV_AttackUp_ScoreDown2:: @ 81DA880 +AI_CV_AttackUp_ScoreDown2:: score -2 -AI_CV_AttackUp_End:: @ 81DA882 +AI_CV_AttackUp_End:: end -AI_CV_DefenseUp:: @ 81DA883 +AI_CV_DefenseUp:: if_stat_level_less_than AI_USER, STAT_DEF, 9, AI_CV_DefenseUp2 if_random_less_than 100, AI_CV_DefenseUp3 score -1 goto AI_CV_DefenseUp3 -AI_CV_DefenseUp2:: @ 81DA898 +AI_CV_DefenseUp2:: if_hp_not_equal AI_USER, 100, AI_CV_DefenseUp3 if_random_less_than 128, AI_CV_DefenseUp3 score +2 -AI_CV_DefenseUp3:: @ 81DA8A7 +AI_CV_DefenseUp3:: if_hp_less_than AI_USER, 70, AI_CV_DefenseUp4 if_random_less_than 200, AI_CV_DefenseUp_End -AI_CV_DefenseUp4:: @ 81DA8B4 +AI_CV_DefenseUp4:: if_hp_less_than AI_USER, 40, AI_CV_DefenseUp_ScoreDown2 get_last_used_move AI_TARGET get_move_power_from_result @@ -949,16 +949,16 @@ AI_CV_DefenseUp4:: @ 81DA8B4 if_not_in_bytes AI_CV_DefenseUp_PhysicalTypes, AI_CV_DefenseUp_ScoreDown2 if_random_less_than 60, AI_CV_DefenseUp_End -AI_CV_DefenseUp5:: @ 81DA8D6 +AI_CV_DefenseUp5:: if_random_less_than 60, AI_CV_DefenseUp_End -AI_CV_DefenseUp_ScoreDown2:: @ 81DA8DC +AI_CV_DefenseUp_ScoreDown2:: score -2 -AI_CV_DefenseUp_End:: @ 81DA8DE +AI_CV_DefenseUp_End:: end -AI_CV_DefenseUp_PhysicalTypes:: @ 81DA8DF +AI_CV_DefenseUp_PhysicalTypes:: .byte TYPE_NORMAL .byte TYPE_FIGHTING .byte TYPE_POISON @@ -970,56 +970,56 @@ AI_CV_DefenseUp_PhysicalTypes:: @ 81DA8DF .byte TYPE_STEEL .byte -1 -AI_CV_SpeedUp:: @ 81DA8E9 +AI_CV_SpeedUp:: if_target_faster AI_CV_SpeedUp2 score -3 goto AI_CV_SpeedUp_End -AI_CV_SpeedUp2:: @ 81DA8F6 +AI_CV_SpeedUp2:: if_random_less_than 70, AI_CV_SpeedUp_End score +3 -AI_CV_SpeedUp_End:: @ 81DA8FE +AI_CV_SpeedUp_End:: end -AI_CV_SpAtkUp:: @ 81DA8FF +AI_CV_SpAtkUp:: if_stat_level_less_than AI_USER, STAT_SPATK, 9, AI_CV_SpAtkUp2 if_random_less_than 100, AI_CV_SpAtkUp3 score -1 goto AI_CV_SpAtkUp3 -AI_CV_SpAtkUp2:: @ 81DA914 +AI_CV_SpAtkUp2:: if_hp_not_equal AI_USER, 100, AI_CV_SpAtkUp3 if_random_less_than 128, AI_CV_SpAtkUp3 score +2 -AI_CV_SpAtkUp3:: @ 81DA923 +AI_CV_SpAtkUp3:: if_hp_more_than AI_USER, 70, AI_CV_SpAtkUp_End if_hp_less_than AI_USER, 40, AI_CV_SpAtkUp_ScoreDown2 if_random_less_than 70, AI_CV_SpAtkUp_End -AI_CV_SpAtkUp_ScoreDown2:: @ 81DA937 +AI_CV_SpAtkUp_ScoreDown2:: score -2 -AI_CV_SpAtkUp_End:: @ 81DA939 +AI_CV_SpAtkUp_End:: end -AI_CV_SpDefUp:: @ 81DA93A +AI_CV_SpDefUp:: if_stat_level_less_than AI_USER, STAT_SPDEF, 9, AI_CV_SpDefUp2 if_random_less_than 100, AI_CV_SpDefUp3 score -1 goto AI_CV_SpDefUp3 -AI_CV_SpDefUp2:: @ 81DA94F +AI_CV_SpDefUp2:: if_hp_not_equal AI_USER, 100, AI_CV_SpDefUp3 if_random_less_than 128, AI_CV_SpDefUp3 score +2 -AI_CV_SpDefUp3:: @ 81DA95E +AI_CV_SpDefUp3:: if_hp_less_than AI_USER, 70, AI_CV_SpDefUp4 if_random_less_than 200, AI_CV_SpDefUp_End -AI_CV_SpDefUp4:: @ 81DA96B +AI_CV_SpDefUp4:: if_hp_less_than AI_USER, 40, AI_CV_SpDefUp_ScoreDown2 get_last_used_move AI_TARGET get_move_power_from_result @@ -1029,16 +1029,16 @@ AI_CV_SpDefUp4:: @ 81DA96B if_in_bytes AI_CV_SpDefUp_PhysicalTypes, AI_CV_SpDefUp_ScoreDown2 if_random_less_than 60, AI_CV_SpDefUp_End -AI_CV_SpDefUp5:: @ 81DA98D +AI_CV_SpDefUp5:: if_random_less_than 60, AI_CV_SpDefUp_End -AI_CV_SpDefUp_ScoreDown2:: @ 81DA993 +AI_CV_SpDefUp_ScoreDown2:: score -2 -AI_CV_SpDefUp_End:: @ 81DA995 +AI_CV_SpDefUp_End:: end -AI_CV_SpDefUp_PhysicalTypes:: @ 81DA996 +AI_CV_SpDefUp_PhysicalTypes:: .byte TYPE_NORMAL .byte TYPE_FIGHTING .byte TYPE_POISON @@ -1050,98 +1050,98 @@ AI_CV_SpDefUp_PhysicalTypes:: @ 81DA996 .byte TYPE_STEEL .byte -1 -AI_CV_AccuracyUp:: @ 81DA9A0 +AI_CV_AccuracyUp:: if_stat_level_less_than AI_USER, STAT_ACC, 9, AI_CV_AccuracyUp2 if_random_less_than 50, AI_CV_AccuracyUp2 score -2 -AI_CV_AccuracyUp2:: @ 81DA9B0 +AI_CV_AccuracyUp2:: if_hp_more_than AI_USER, 70, AI_CV_AccuracyUp_End score -2 -AI_CV_AccuracyUp_End:: @ 81DA9B9 +AI_CV_AccuracyUp_End:: end -AI_CV_EvasionUp:: @ 81DA9BA +AI_CV_EvasionUp:: if_hp_less_than AI_USER, 90, AI_CV_EvasionUp2 if_random_less_than 100, AI_CV_EvasionUp2 score +3 -AI_CV_EvasionUp2:: @ 81DA9C9 +AI_CV_EvasionUp2:: if_stat_level_less_than AI_USER, STAT_EVASION, 9, AI_CV_EvasionUp3 if_random_less_than 128, AI_CV_EvasionUp3 score -1 -AI_CV_EvasionUp3:: @ 81DA9D9 +AI_CV_EvasionUp3:: if_not_status AI_TARGET, STATUS1_TOXIC_POISON, AI_CV_EvasionUp5 if_hp_more_than AI_USER, 50, AI_CV_EvasionUp4 if_random_less_than 80, AI_CV_EvasionUp5 -AI_CV_EvasionUp4:: @ 81DA9F0 +AI_CV_EvasionUp4:: if_random_less_than 50, AI_CV_EvasionUp5 score +3 -AI_CV_EvasionUp5:: @ 81DA9F8 +AI_CV_EvasionUp5:: if_not_status3 AI_TARGET, STATUS3_LEECHSEED, AI_CV_EvasionUp6 if_random_less_than 70, AI_CV_EvasionUp6 score +3 -AI_CV_EvasionUp6:: @ 81DAA0A +AI_CV_EvasionUp6:: if_not_status3 AI_USER, STATUS3_ROOTED, AI_CV_EvasionUp7 if_random_less_than 128, AI_CV_EvasionUp7 score +2 -AI_CV_EvasionUp7:: @ 81DAA1C +AI_CV_EvasionUp7:: if_not_status2 AI_TARGET, STATUS2_CURSED, AI_CV_EvasionUp8 if_random_less_than 70, AI_CV_EvasionUp8 score +3 -AI_CV_EvasionUp8:: @ 81DAA2E +AI_CV_EvasionUp8:: if_hp_more_than AI_USER, 70, AI_CV_EvasionUp_End if_stat_level_equal AI_USER, STAT_EVASION, 6, AI_CV_EvasionUp_End if_hp_less_than AI_USER, 40, AI_CV_EvasionUp_ScoreDown2 if_hp_less_than AI_TARGET, 40, AI_CV_EvasionUp_ScoreDown2 if_random_less_than 70, AI_CV_EvasionUp_End -AI_CV_EvasionUp_ScoreDown2:: @ 81DAA51 +AI_CV_EvasionUp_ScoreDown2:: score -2 -AI_CV_EvasionUp_End:: @ 81DAA53 +AI_CV_EvasionUp_End:: end -AI_CV_AlwaysHit:: @ 81DAA54 +AI_CV_AlwaysHit:: if_stat_level_more_than AI_TARGET, STAT_EVASION, 10, AI_CV_AlwaysHit_ScoreUp1 if_stat_level_less_than AI_USER, STAT_ACC, 2, AI_CV_AlwaysHit_ScoreUp1 if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, AI_CV_AlwaysHit2 if_stat_level_less_than AI_USER, STAT_ACC, 4, AI_CV_AlwaysHit2 goto AI_CV_AlwaysHit_End -AI_CV_AlwaysHit_ScoreUp1:: @ 81DAA79 +AI_CV_AlwaysHit_ScoreUp1:: score +1 -AI_CV_AlwaysHit2:: @ 81DAA7B +AI_CV_AlwaysHit2:: if_random_less_than 100, AI_CV_AlwaysHit_End score +1 -AI_CV_AlwaysHit_End:: @ 81DAA83 +AI_CV_AlwaysHit_End:: end -AI_CV_AttackDown:: @ 81DAA84 +AI_CV_AttackDown:: if_stat_level_equal AI_TARGET, STAT_ATK, 6, AI_CV_AttackDown3 score -1 if_hp_more_than AI_USER, 90, AI_CV_AttackDown2 score -1 -AI_CV_AttackDown2:: @ 81DAA97 +AI_CV_AttackDown2:: if_stat_level_more_than AI_TARGET, STAT_ATK, 3, AI_CV_AttackDown3 if_random_less_than 50, AI_CV_AttackDown3 score -2 -AI_CV_AttackDown3:: @ 81DAAA7 +AI_CV_AttackDown3:: if_hp_more_than AI_TARGET, 70, AI_CV_AttackDown4 score -2 -AI_CV_AttackDown4:: @ 81DAAB0 +AI_CV_AttackDown4:: get_target_type1 if_in_bytes AI_CV_AttackDown_PhysicalTypeList, AI_CV_AttackDown_End get_target_type2 @@ -1149,11 +1149,11 @@ AI_CV_AttackDown4:: @ 81DAAB0 if_random_less_than 50, AI_CV_AttackDown_End score -2 -AI_CV_AttackDown_End:: @ 81DAACE +AI_CV_AttackDown_End:: end @ Missing Poison, Flying, and Ghost for unknown reason -AI_CV_AttackDown_PhysicalTypeList:: @ 81DAACF +AI_CV_AttackDown_PhysicalTypeList:: .byte TYPE_NORMAL .byte TYPE_FIGHTING .byte TYPE_GROUND @@ -1162,55 +1162,55 @@ AI_CV_AttackDown_PhysicalTypeList:: @ 81DAACF .byte TYPE_STEEL .byte -1 -AI_CV_DefenseDown:: @ 81DAAD6 +AI_CV_DefenseDown:: if_hp_less_than AI_USER, 70, AI_CV_DefenseDown2 if_stat_level_more_than AI_TARGET, STAT_DEF, 3, AI_CV_DefenseDown3 -AI_CV_DefenseDown2:: @ 81DAAE5 +AI_CV_DefenseDown2:: if_random_less_than 50, AI_CV_DefenseDown3 score -2 -AI_CV_DefenseDown3:: @ 81DAAED +AI_CV_DefenseDown3:: if_hp_more_than AI_TARGET, 70, AI_CV_DefenseDown_End score -2 -AI_CV_DefenseDown_End:: @ 81DAAF6 +AI_CV_DefenseDown_End:: end -AI_CV_SpeedDownFromChance:: @ 81DAAF7 +AI_CV_SpeedDownFromChance:: if_move MOVE_ICY_WIND, AI_CV_SpeedDown if_move MOVE_ROCK_TOMB, AI_CV_SpeedDown if_move MOVE_MUD_SHOT, AI_CV_SpeedDown end -AI_CV_SpeedDown:: @ 81DAB0D +AI_CV_SpeedDown:: if_target_faster AI_CV_SpeedDown2 score -3 goto AI_CV_SpeedDown_End -AI_CV_SpeedDown2:: @ 81DAB1A +AI_CV_SpeedDown2:: if_random_less_than 70, AI_CV_SpeedDown_End score +2 -AI_CV_SpeedDown_End:: @ 81DAB22 +AI_CV_SpeedDown_End:: end -AI_CV_SpAtkDown:: @ 81DAB23 +AI_CV_SpAtkDown:: if_stat_level_equal AI_TARGET, STAT_ATK, 6, AI_CV_SpAtkDown3 score -1 if_hp_more_than AI_USER, 90, AI_CV_SpAtkDown2 score -1 -AI_CV_SpAtkDown2:: @ 81DAB36 +AI_CV_SpAtkDown2:: if_stat_level_more_than AI_TARGET, STAT_SPATK, 3, AI_CV_SpAtkDown3 if_random_less_than 50, AI_CV_SpAtkDown3 score -2 -AI_CV_SpAtkDown3:: @ 81DAB46 +AI_CV_SpAtkDown3:: if_hp_more_than AI_TARGET, 70, AI_CV_SpAtkDown4 score -2 -AI_CV_SpAtkDown4:: @ 81DAB4F +AI_CV_SpAtkDown4:: get_target_type1 if_in_bytes AI_CV_SpAtkDown_SpecialTypeList, AI_CV_SpAtkDown_End get_target_type2 @@ -1218,10 +1218,10 @@ AI_CV_SpAtkDown4:: @ 81DAB4F if_random_less_than 50, AI_CV_SpAtkDown_End score -2 -AI_CV_SpAtkDown_End:: @ 81DAB6D +AI_CV_SpAtkDown_End:: end -AI_CV_SpAtkDown_SpecialTypeList:: @ 81DAB6E +AI_CV_SpAtkDown_SpecialTypeList:: .byte TYPE_FIRE .byte TYPE_WATER .byte TYPE_GRASS @@ -1232,83 +1232,83 @@ AI_CV_SpAtkDown_SpecialTypeList:: @ 81DAB6E .byte TYPE_DARK .byte -1 -AI_CV_SpDefDown:: @ 81DAB77 +AI_CV_SpDefDown:: if_hp_less_than AI_USER, 70, AI_CV_SpDefDown2 if_stat_level_more_than AI_TARGET, STAT_SPDEF, 3, AI_CV_SpDefDown3 -AI_CV_SpDefDown2:: @ 81DAB86 +AI_CV_SpDefDown2:: if_random_less_than 50, AI_CV_SpDefDown3 score -2 -AI_CV_SpDefDown3:: @ 81DAB8E +AI_CV_SpDefDown3:: if_hp_more_than AI_TARGET, 70, AI_CV_SpDefDown_End score -2 -AI_CV_SpDefDown_End:: @ 81DAB97 +AI_CV_SpDefDown_End:: end -AI_CV_AccuracyDown:: @ 81DAB98 +AI_CV_AccuracyDown:: if_hp_less_than AI_USER, 70, AI_CV_AccuracyDown2 if_hp_more_than AI_TARGET, 70, AI_CV_AccuracyDown3 -AI_CV_AccuracyDown2:: @ 81DABA6 +AI_CV_AccuracyDown2:: if_random_less_than 100, AI_CV_AccuracyDown3 score -1 -AI_CV_AccuracyDown3:: @ 81DABAE +AI_CV_AccuracyDown3:: if_stat_level_more_than AI_USER, STAT_ACC, 4, AI_CV_AccuracyDown4 if_random_less_than 80, AI_CV_AccuracyDown4 score -2 -AI_CV_AccuracyDown4:: @ 81DABBE +AI_CV_AccuracyDown4:: if_not_status AI_TARGET, STATUS1_TOXIC_POISON, AI_CV_AccuracyDown5 if_random_less_than 70, AI_CV_AccuracyDown5 score +2 -AI_CV_AccuracyDown5:: @ 81DABD0 +AI_CV_AccuracyDown5:: if_not_status3 AI_TARGET, STATUS3_LEECHSEED, AI_CV_AccuracyDown6 if_random_less_than 70, AI_CV_AccuracyDown6 score +2 -AI_CV_AccuracyDown6:: @ 81DABE2 +AI_CV_AccuracyDown6:: if_not_status3 AI_USER, STATUS3_ROOTED, AI_CV_AccuracyDown7 if_random_less_than 128, AI_CV_AccuracyDown7 score +1 -AI_CV_AccuracyDown7:: @ 81DABF4 +AI_CV_AccuracyDown7:: if_not_status2 AI_TARGET, STATUS2_CURSED, AI_CV_AccuracyDown8 if_random_less_than 70, AI_CV_AccuracyDown8 score +2 -AI_CV_AccuracyDown8:: @ 81DAC06 +AI_CV_AccuracyDown8:: if_hp_more_than AI_USER, 70, AI_CV_AccuracyDown_End if_stat_level_equal AI_TARGET, STAT_ACC, 6, AI_CV_AccuracyDown_End if_hp_less_than AI_USER, 40, AI_CV_AccuracyDown_ScoreDown2 if_hp_less_than AI_TARGET, 40, AI_CV_AccuracyDown_ScoreDown2 if_random_less_than 70, AI_CV_AccuracyDown_End -AI_CV_AccuracyDown_ScoreDown2:: @ 81DAC29 +AI_CV_AccuracyDown_ScoreDown2:: score -2 -AI_CV_AccuracyDown_End:: @ 81DAC2B +AI_CV_AccuracyDown_End:: end -AI_CV_EvasionDown:: @ 81DAC2C +AI_CV_EvasionDown:: if_hp_less_than AI_USER, 70, AI_CV_EvasionDown2 if_stat_level_more_than AI_TARGET, STAT_EVASION, 3, AI_CV_EvasionDown3 -AI_CV_EvasionDown2:: @ 81DAC3B +AI_CV_EvasionDown2:: if_random_less_than 50, AI_CV_EvasionDown3 score -2 -AI_CV_EvasionDown3:: @ 81DAC43 +AI_CV_EvasionDown3:: if_hp_more_than AI_TARGET, 70, AI_CV_EvasionDown_End score -2 -AI_CV_EvasionDown_End:: @ 81DAC4C +AI_CV_EvasionDown_End:: end -AI_CV_Haze:: @ 81DAC4D +AI_CV_Haze:: if_stat_level_more_than AI_USER, STAT_ATK, 8, AI_CV_Haze2 if_stat_level_more_than AI_USER, STAT_DEF, 8, AI_CV_Haze2 if_stat_level_more_than AI_USER, STAT_SPATK, 8, AI_CV_Haze2 @@ -1321,11 +1321,11 @@ AI_CV_Haze:: @ 81DAC4D if_stat_level_less_than AI_TARGET, STAT_ACC, 4, AI_CV_Haze2 goto AI_CV_Haze3 -AI_CV_Haze2:: @ 81DACA2 +AI_CV_Haze2:: if_random_less_than 50, AI_CV_Haze3 score -3 -AI_CV_Haze3:: @ 81DACAA +AI_CV_Haze3:: if_stat_level_more_than AI_TARGET, STAT_ATK, 8, AI_CV_Haze4 if_stat_level_more_than AI_TARGET, STAT_DEF, 8, AI_CV_Haze4 if_stat_level_more_than AI_TARGET, STAT_SPATK, 8, AI_CV_Haze4 @@ -1340,21 +1340,21 @@ AI_CV_Haze3:: @ 81DACAA score -1 goto AI_CV_Haze_End -AI_CV_Haze4:: @ 81DAD07 +AI_CV_Haze4:: if_random_less_than 50, AI_CV_Haze_End score +3 -AI_CV_Haze_End:: @ 81DAD0F +AI_CV_Haze_End:: end -AI_CV_Bide:: @ 81DAD10 +AI_CV_Bide:: if_hp_more_than AI_USER, 90, AI_CV_Bide_End score -2 -AI_CV_Bide_End:: @ 81DAD19 +AI_CV_Bide_End:: end -AI_CV_Roar:: @ 81DAD1A +AI_CV_Roar:: if_stat_level_more_than AI_TARGET, STAT_ATK, 8, AI_CV_Roar2 if_stat_level_more_than AI_TARGET, STAT_DEF, 8, AI_CV_Roar2 if_stat_level_more_than AI_TARGET, STAT_SPATK, 8, AI_CV_Roar2 @@ -1363,36 +1363,36 @@ AI_CV_Roar:: @ 81DAD1A score -3 goto AI_CV_Roar_End -AI_CV_Roar2:: @ 81DAD49 +AI_CV_Roar2:: if_random_less_than 128, AI_CV_Roar_End score +2 -AI_CV_Roar_End:: @ 81DAD51 +AI_CV_Roar_End:: end -AI_CV_Conversion:: @ 81DAD52 +AI_CV_Conversion:: if_hp_more_than AI_USER, 90, AI_CV_Conversion2 score -2 -AI_CV_Conversion2:: @ 81DAD5B +AI_CV_Conversion2:: get_turn_count if_equal 0, AI_CV_Conversion_End if_random_less_than 200, Score_Minus2 -AI_CV_Conversion_End:: @ 81DAD68 +AI_CV_Conversion_End:: end -AI_CV_HealWeather:: @ 81DAD69 +AI_CV_HealWeather:: get_weather if_equal AI_WEATHER_HAIL, AI_CV_HealWeather_ScoreDown2 if_equal AI_WEATHER_RAIN, AI_CV_HealWeather_ScoreDown2 if_equal AI_WEATHER_SANDSTORM, AI_CV_HealWeather_ScoreDown2 goto AI_CV_Heal -AI_CV_HealWeather_ScoreDown2:: @ 81DAD81 +AI_CV_HealWeather_ScoreDown2:: score -2 -AI_CV_Heal:: @ 81DAD83 +AI_CV_Heal:: if_hp_equal AI_USER, 100, AI_CV_Heal3 if_target_faster AI_CV_Heal4 score -8 @@ -1404,51 +1404,51 @@ AI_CV_Heal2: if_hp_more_than AI_USER, 80, AI_CV_Heal3 if_random_less_than 70, AI_CV_Heal5 -AI_CV_Heal3:: @ 81DADAB +AI_CV_Heal3:: score -3 goto AI_CV_Heal_End -AI_CV_Heal4:: @ 81DADB2 +AI_CV_Heal4:: if_hp_less_than AI_USER, 70, AI_CV_Heal5 if_random_less_than 30, AI_CV_Heal5 score -3 goto AI_CV_Heal_End -AI_CV_Heal5:: @ 81DADC6 +AI_CV_Heal5:: if_doesnt_have_move_with_effect AI_TARGET, EFFECT_SNATCH, AI_CV_Heal6 if_random_less_than 100, AI_CV_Heal_End -AI_CV_Heal6:: @ 81DADD3 +AI_CV_Heal6:: if_random_less_than 20, AI_CV_Heal_End score +2 -AI_CV_Heal_End:: @ 81DADDB +AI_CV_Heal_End:: end -AI_CV_Toxic:: @ 81DADDC +AI_CV_Toxic:: if_user_has_no_attacking_moves AI_CV_Toxic3 if_hp_more_than AI_USER, 50, AI_CV_Toxic2 if_random_less_than 50, AI_CV_Toxic2 score -3 -AI_CV_Toxic2:: @ 81DADF0 +AI_CV_Toxic2:: if_hp_more_than AI_TARGET, 50, AI_CV_Toxic3 if_random_less_than 50, AI_CV_Toxic3 score -3 -AI_CV_Toxic3:: @ 81DADFF +AI_CV_Toxic3:: if_has_move_with_effect AI_USER, EFFECT_SPECIAL_DEFENSE_UP, AI_CV_Toxic4 if_has_move_with_effect AI_USER, EFFECT_PROTECT, AI_CV_Toxic4 goto AI_CV_Toxic_End -AI_CV_Toxic4:: @ 81DAE12 +AI_CV_Toxic4:: if_random_less_than 60, AI_CV_Toxic_End score +2 -AI_CV_Toxic_End:: @ 81DAE1A +AI_CV_Toxic_End:: end -AI_CV_LightScreen:: @ 81DAE1B +AI_CV_LightScreen:: if_hp_less_than AI_USER, 50, AI_CV_LightScreen_ScoreDown2 get_target_type1 if_in_bytes AI_CV_LightScreen_SpecialTypeList, AI_CV_LightScreen_End @@ -1456,13 +1456,13 @@ AI_CV_LightScreen:: @ 81DAE1B if_in_bytes AI_CV_LightScreen_SpecialTypeList, AI_CV_LightScreen_End if_random_less_than 50, AI_CV_LightScreen_End -AI_CV_LightScreen_ScoreDown2:: @ 81DAE3E +AI_CV_LightScreen_ScoreDown2:: score -2 -AI_CV_LightScreen_End:: @ 81DAE40 +AI_CV_LightScreen_End:: end -AI_CV_LightScreen_SpecialTypeList:: @ 81DAE41 +AI_CV_LightScreen_SpecialTypeList:: .byte TYPE_FIRE .byte TYPE_WATER .byte TYPE_GRASS @@ -1473,99 +1473,99 @@ AI_CV_LightScreen_SpecialTypeList:: @ 81DAE41 .byte TYPE_DARK .byte -1 -AI_CV_Rest:: @ 81DAE4A +AI_CV_Rest:: if_target_faster AI_CV_Rest4 if_hp_not_equal AI_USER, 100, AI_CV_Rest2 score -8 goto AI_CV_Rest_End -AI_CV_Rest2:: @ 81DAE5E +AI_CV_Rest2:: if_hp_less_than AI_USER, 40, AI_CV_Rest6 if_hp_more_than AI_USER, 50, AI_CV_Rest3 if_random_less_than 70, AI_CV_Rest6 -AI_CV_Rest3:: @ 81DAE72 +AI_CV_Rest3:: score -3 goto AI_CV_Rest_End -AI_CV_Rest4:: @ 81DAE79 +AI_CV_Rest4:: if_hp_less_than AI_USER, 60, AI_CV_Rest6 if_hp_more_than AI_USER, 70, AI_CV_Rest5 if_random_less_than 50, AI_CV_Rest6 -AI_CV_Rest5:: @ 81DAE8D +AI_CV_Rest5:: score -3 goto AI_CV_Rest_End -AI_CV_Rest6:: @ 81DAE94 +AI_CV_Rest6:: if_doesnt_have_move_with_effect AI_TARGET, EFFECT_SNATCH, AI_CV_Rest7 if_random_less_than 50, AI_CV_Rest_End -AI_CV_Rest7:: @ 81DAEA1 +AI_CV_Rest7:: if_random_less_than 10, AI_CV_Rest_End score +3 -AI_CV_Rest_End:: @ 81DAEA9 +AI_CV_Rest_End:: end -AI_CV_OneHitKO:: @ 81DAEAA +AI_CV_OneHitKO:: end -AI_CV_SuperFang:: @ 81DAEAB +AI_CV_SuperFang:: if_hp_more_than AI_TARGET, 50, AI_CV_SuperFang_End score -1 -AI_CV_SuperFang_End:: @ 81DAEB4 +AI_CV_SuperFang_End:: end -AI_CV_Trap:: @ 81DAEB5 +AI_CV_Trap:: if_status AI_TARGET, STATUS1_TOXIC_POISON, AI_CV_Trap2 if_status2 AI_TARGET, STATUS2_CURSED, AI_CV_Trap2 if_status3 AI_TARGET, STATUS3_PERISH_SONG, AI_CV_Trap2 if_status2 AI_TARGET, STATUS2_INFATUATION, AI_CV_Trap2 goto AI_CV_Trap_End -AI_CV_Trap2:: @ 81DAEE2 +AI_CV_Trap2:: if_random_less_than 128, AI_CV_Trap_End score +1 -AI_CV_Trap_End:: @ 81DAEEA +AI_CV_Trap_End:: end -AI_CV_HighCrit:: @ 81DAEEB +AI_CV_HighCrit:: if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_HighCrit_End if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_HighCrit_End if_type_effectiveness AI_EFFECTIVENESS_x2, AI_CV_HighCrit2 if_type_effectiveness AI_EFFECTIVENESS_x4, AI_CV_HighCrit2 if_random_less_than 128, AI_CV_HighCrit_End -AI_CV_HighCrit2:: @ 81DAF09 +AI_CV_HighCrit2:: if_random_less_than 128, AI_CV_HighCrit_End score +1 -AI_CV_HighCrit_End:: @ 81DAF11 +AI_CV_HighCrit_End:: end @ Improvement in Emerald @AI_CV_Swagger: @ if_has_move AI_USER, MOVE_PSYCH_UP, AI_CV_SwaggerHasPsychUp -AI_CV_Flatter:: @ 81DAF12 +AI_CV_Flatter:: if_random_less_than 128, AI_CV_Confuse score +1 -AI_CV_Confuse:: @ 81DAF1A +AI_CV_Confuse:: if_hp_more_than AI_TARGET, 70, AI_CV_Confuse_End if_random_less_than 128, AI_CV_Confuse2 score -1 -AI_CV_Confuse2:: @ 81DAF29 +AI_CV_Confuse2:: if_hp_more_than AI_TARGET, 50, AI_CV_Confuse_End score -1 if_hp_more_than AI_TARGET, 30, AI_CV_Confuse_End score -1 -AI_CV_Confuse_End:: @ 81DAF3B +AI_CV_Confuse_End:: end @ Improvement in Emerald @@ -1583,7 +1583,7 @@ AI_CV_Confuse_End:: @ 81DAF3B @AI_CV_SwaggerHasPsychUp_End: @ end -AI_CV_Reflect:: @ 81DAF3C +AI_CV_Reflect:: if_hp_less_than AI_USER, 50, AI_CV_Reflect_ScoreDown2 get_target_type1 if_in_bytes AI_CV_Reflect_PhysicalTypeList, AI_CV_Reflect_End @@ -1591,13 +1591,13 @@ AI_CV_Reflect:: @ 81DAF3C if_in_bytes AI_CV_Reflect_PhysicalTypeList, AI_CV_Reflect_End if_random_less_than 50, AI_CV_Reflect_End -AI_CV_Reflect_ScoreDown2:: @ 81DAF5F +AI_CV_Reflect_ScoreDown2:: score -2 -AI_CV_Reflect_End:: @ 81DAF61 +AI_CV_Reflect_End:: end -AI_CV_Reflect_PhysicalTypeList:: @ 81DAF62 +AI_CV_Reflect_PhysicalTypeList:: .byte TYPE_NORMAL .byte TYPE_FIGHTING .byte TYPE_FLYING @@ -1609,58 +1609,58 @@ AI_CV_Reflect_PhysicalTypeList:: @ 81DAF62 .byte TYPE_STEEL .byte -1 -AI_CV_Poison:: @ 81DAF6C +AI_CV_Poison:: if_hp_less_than AI_USER, 50, AI_CV_Poison_ScoreDown1 if_hp_more_than AI_TARGET, 50, AI_CV_Poison_End -AI_CV_Poison_ScoreDown1:: @ 81DAF7A +AI_CV_Poison_ScoreDown1:: score -1 -AI_CV_Poison_End:: @ 81DAF7C +AI_CV_Poison_End:: end -AI_CV_Paralyze:: @ 81DAF7D +AI_CV_Paralyze:: if_target_faster AI_CV_Paralyze2 if_hp_more_than AI_USER, 70, AI_CV_Paralyze_End score -1 goto AI_CV_Paralyze_End -AI_CV_Paralyze2:: @ 81DAF91 +AI_CV_Paralyze2:: if_random_less_than 20, AI_CV_Paralyze_End score +3 -AI_CV_Paralyze_End:: @ 81DAF99 +AI_CV_Paralyze_End:: end -AI_CV_VitalThrow:: @ 81DAF9A +AI_CV_VitalThrow:: if_target_faster AI_CV_VitalThrow_End if_hp_more_than AI_USER, 60, AI_CV_VitalThrow_End if_hp_less_than AI_USER, 40, AI_CV_VitalThrow2 if_random_less_than 180, AI_CV_VitalThrow_End -AI_CV_VitalThrow2:: @ 81DAFB4 +AI_CV_VitalThrow2:: if_random_less_than 50, AI_CV_VitalThrow_End score -1 -AI_CV_VitalThrow_End:: @ 81DAFBC +AI_CV_VitalThrow_End:: end -AI_CV_Substitute:: @ 81DAFBD +AI_CV_Substitute:: if_hp_more_than AI_USER, 90, AI_CV_Substitute4 if_hp_more_than AI_USER, 70, AI_CV_Substitute3 if_hp_more_than AI_USER, 50, AI_CV_Substitute2 if_random_less_than 100, AI_CV_Substitute2 score -1 -AI_CV_Substitute2:: @ 81DAFDA +AI_CV_Substitute2:: if_random_less_than 100, AI_CV_Substitute3 score -1 -AI_CV_Substitute3:: @ 81DAFE2 +AI_CV_Substitute3:: if_random_less_than 100, AI_CV_Substitute4 score -1 -AI_CV_Substitute4:: @ 81DAFEA +AI_CV_Substitute4:: if_target_faster AI_CV_Substitute_End get_last_used_move AI_TARGET get_move_effect_from_result @@ -1673,41 +1673,41 @@ AI_CV_Substitute4:: @ 81DAFEA if_equal EFFECT_LEECH_SEED, AI_CV_Substitute7 goto AI_CV_Substitute_End -AI_CV_Substitute5:: @ 81DB022 +AI_CV_Substitute5:: if_not_status AI_TARGET, STATUS1_ANY, AI_CV_Substitute8 goto AI_CV_Substitute_End -AI_CV_Substitute6:: @ 81DB031 +AI_CV_Substitute6:: if_not_status2 AI_TARGET, STATUS2_CONFUSION, AI_CV_Substitute8 goto AI_CV_Substitute_End -AI_CV_Substitute7:: @ 81DB040 +AI_CV_Substitute7:: if_status3 AI_TARGET, STATUS3_LEECHSEED, AI_CV_Substitute_End -AI_CV_Substitute8:: @ 81DB04A +AI_CV_Substitute8:: if_random_less_than 100, AI_CV_Substitute_End score +1 -AI_CV_Substitute_End:: @ 81DB052 +AI_CV_Substitute_End:: end -AI_CV_Recharge:: @ 81DB053 +AI_CV_Recharge:: if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_Recharge_ScoreDown1 if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_Recharge_ScoreDown1 if_target_faster AI_CV_Recharge2 if_hp_more_than AI_USER, 40, AI_CV_Recharge_ScoreDown1 goto AI_CV_Recharge_End -AI_CV_Recharge2:: @ 81DB071 +AI_CV_Recharge2:: if_hp_less_than AI_USER, 60, AI_CV_Recharge_End -AI_CV_Recharge_ScoreDown1:: @ 81DB078 +AI_CV_Recharge_ScoreDown1:: score -1 -AI_CV_Recharge_End:: @ 81DB07A +AI_CV_Recharge_End:: end -AI_CV_Disable:: @ 81DB07B +AI_CV_Disable:: if_target_faster AI_CV_Disable_End get_last_used_move AI_TARGET get_move_power_from_result @@ -1715,14 +1715,14 @@ AI_CV_Disable:: @ 81DB07B score +1 goto AI_CV_Disable_End -AI_CV_Disable2:: @ 81DB091 +AI_CV_Disable2:: if_random_less_than 100, AI_CV_Disable_End score -1 -AI_CV_Disable_End:: @ 81DB099 +AI_CV_Disable_End:: end -AI_CV_Counter:: @ 81DB09A +AI_CV_Counter:: if_status AI_TARGET, STATUS1_SLEEP, AI_CV_Counter_ScoreDown1 if_status2 AI_TARGET, STATUS2_INFATUATION, AI_CV_Counter_ScoreDown1 if_status2 AI_TARGET, STATUS2_CONFUSION, AI_CV_Counter_ScoreDown1 @@ -1730,12 +1730,12 @@ AI_CV_Counter:: @ 81DB09A if_random_less_than 10, AI_CV_Counter2 score -1 -AI_CV_Counter2:: @ 81DB0C7 +AI_CV_Counter2:: if_hp_more_than AI_USER, 50, AI_CV_Counter3 if_random_less_than 100, AI_CV_Counter3 score -1 -AI_CV_Counter3:: @ 81DB0D6 +AI_CV_Counter3:: @ if_has_move AI_USER, MOVE_MIRROR_COAT, AI_CV_Counter7 @ Improvement in Emerald get_last_used_move AI_TARGET get_move_power_from_result @@ -1744,7 +1744,7 @@ AI_CV_Counter3:: @ 81DB0D6 if_random_less_than 100, AI_CV_Counter4 score +1 -AI_CV_Counter4:: @ 81DB0EC +AI_CV_Counter4:: get_last_used_move AI_TARGET get_move_type_from_result if_not_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_ScoreDown1 @@ -1752,12 +1752,12 @@ AI_CV_Counter4:: @ 81DB0EC score +1 goto AI_CV_Counter_End -AI_CV_Counter5:: @ 81DB105 +AI_CV_Counter5:: if_target_not_taunted AI_CV_Counter6 if_random_less_than 100, AI_CV_Counter6 score +1 -AI_CV_Counter6:: @ 81DB112 +AI_CV_Counter6:: get_target_type1 if_in_bytes AI_CV_Counter_PhysicalTypeList, AI_CV_Counter_End get_target_type2 @@ -1772,13 +1772,13 @@ AI_CV_Counter6:: @ 81DB112 @AI_CV_Counter8: @ end -AI_CV_Counter_ScoreDown1:: @ 81DB12E +AI_CV_Counter_ScoreDown1:: score -1 -AI_CV_Counter_End:: @ 81DB130 +AI_CV_Counter_End:: end -AI_CV_Counter_PhysicalTypeList:: @ 81DB131 +AI_CV_Counter_PhysicalTypeList:: .byte TYPE_NORMAL .byte TYPE_FIGHTING .byte TYPE_FLYING @@ -1790,25 +1790,25 @@ AI_CV_Counter_PhysicalTypeList:: @ 81DB131 .byte TYPE_STEEL .byte -1 -AI_CV_Encore:: @ 81DB13B +AI_CV_Encore:: if_any_move_disabled AI_TARGET, AI_CV_Encore2 if_target_faster AI_CV_Encore_ScoreDown2 get_last_used_move AI_TARGET get_move_effect_from_result if_not_in_bytes AI_CV_Encore_EncouragedMovesToEncore, AI_CV_Encore_ScoreDown2 -AI_CV_Encore2:: @ 81DB154 +AI_CV_Encore2:: if_random_less_than 30, AI_CV_Encore_End score +3 goto AI_CV_Encore_End -AI_CV_Encore_ScoreDown2:: @ 81DB161 +AI_CV_Encore_ScoreDown2:: score -2 -AI_CV_Encore_End:: @ 81DB163 +AI_CV_Encore_End:: end -AI_CV_Encore_EncouragedMovesToEncore:: @ 81DB164 +AI_CV_Encore_EncouragedMovesToEncore:: .byte EFFECT_DREAM_EATER .byte EFFECT_ATTACK_UP .byte EFFECT_DEFENSE_UP @@ -1873,108 +1873,108 @@ AI_CV_Encore_EncouragedMovesToEncore:: @ 81DB164 .byte EFFECT_CAMOUFLAGE .byte -1 -AI_CV_PainSplit:: @ 81DB1A3 +AI_CV_PainSplit:: if_hp_less_than AI_TARGET, 80, AI_CV_PainSplit_ScoreDown1 if_target_faster AI_CV_PainSplit2 if_hp_more_than AI_USER, 40, AI_CV_PainSplit_ScoreDown1 score +1 goto AI_CV_PainSplit_End -AI_CV_PainSplit2:: @ 81DB1BE +AI_CV_PainSplit2:: if_hp_more_than AI_USER, 60, AI_CV_PainSplit_ScoreDown1 score +1 goto AI_CV_PainSplit_End -AI_CV_PainSplit_ScoreDown1:: @ 81DB1CC +AI_CV_PainSplit_ScoreDown1:: score -1 -AI_CV_PainSplit_End:: @ 81DB1CE +AI_CV_PainSplit_End:: end -AI_CV_Snore:: @ 81DB1CF +AI_CV_Snore:: score +2 end -AI_CV_LockOn:: @ 81DB1D2 +AI_CV_LockOn:: if_random_less_than 128, AI_CV_LockOn_End score +2 -AI_CV_LockOn_End:: @ 81DB1DA +AI_CV_LockOn_End:: end -AI_CV_SleepTalk:: @ 81DB1DB +AI_CV_SleepTalk:: @ if_status AI_USER, STATUS1_SLEEP, Score_Plus10 @ Improvement in Emerald score +2 @ Change to -5 end -AI_CV_DestinyBond:: @ 81DB1DE +AI_CV_DestinyBond:: score -1 if_target_faster AI_CV_DestinyBond_End if_hp_more_than AI_USER, 70, AI_CV_DestinyBond_End if_random_less_than 128, AI_CV_DestinyBond2 score +1 -AI_CV_DestinyBond2:: @ 81DB1F5 +AI_CV_DestinyBond2:: if_hp_more_than AI_USER, 50, AI_CV_DestinyBond_End if_random_less_than 128, AI_CV_DestinyBond3 score +1 -AI_CV_DestinyBond3:: @ 81DB204 +AI_CV_DestinyBond3:: if_hp_more_than AI_USER, 30, AI_CV_DestinyBond_End if_random_less_than 100, AI_CV_DestinyBond_End score +2 -AI_CV_DestinyBond_End:: @ 81DB213 +AI_CV_DestinyBond_End:: end -AI_CV_Flail:: @ 81DB214 +AI_CV_Flail:: if_target_faster AI_CV_Flail2 if_hp_more_than AI_USER, 33, AI_CV_Flail_ScoreDown1 if_hp_more_than AI_USER, 20, AI_CV_Flail_End if_hp_less_than AI_USER, 8, AI_CV_Flail_ScoreUp1 goto AI_CV_Flail3 -AI_CV_Flail2:: @ 81DB234 +AI_CV_Flail2:: if_hp_more_than AI_USER, 60, AI_CV_Flail_ScoreDown1 if_hp_more_than AI_USER, 40, AI_CV_Flail_End goto AI_CV_Flail3 -AI_CV_Flail_ScoreUp1:: @ 81DB247 +AI_CV_Flail_ScoreUp1:: score +1 -AI_CV_Flail3:: @ 81DB249 +AI_CV_Flail3:: if_random_less_than 100, AI_CV_Flail_End score +1 goto AI_CV_Flail_End -AI_CV_Flail_ScoreDown1:: @ 81DB256 +AI_CV_Flail_ScoreDown1:: score -1 -AI_CV_Flail_End:: @ 81DB258 +AI_CV_Flail_End:: end -AI_CV_HealBell:: @ 81DB259 +AI_CV_HealBell:: if_status AI_TARGET, STATUS1_ANY, AI_CV_HealBell_End if_status_in_party AI_TARGET, STATUS1_ANY, AI_CV_HealBell_End score -5 -AI_CV_HealBell_End:: @ 81DB26F +AI_CV_HealBell_End:: end -AI_CV_Thief:: @ 81DB270 +AI_CV_Thief:: get_hold_effect AI_TARGET if_not_in_bytes AI_CV_Thief_EncourageItemsToSteal, AI_CV_Thief_ScoreDown2 if_random_less_than 50, AI_CV_Thief_End score +1 goto AI_CV_Thief_End -AI_CV_Thief_ScoreDown2:: @ 81DB288 +AI_CV_Thief_ScoreDown2:: score -2 -AI_CV_Thief_End:: @ 81DB28A +AI_CV_Thief_End:: end -AI_CV_Thief_EncourageItemsToSteal:: @ 81DB28B +AI_CV_Thief_EncourageItemsToSteal:: .byte HOLD_EFFECT_CURE_SLP .byte HOLD_EFFECT_CURE_STATUS .byte HOLD_EFFECT_RESTORE_HP @@ -1984,7 +1984,7 @@ AI_CV_Thief_EncourageItemsToSteal:: @ 81DB28B .byte HOLD_EFFECT_THICK_CLUB .byte -1 -AI_CV_Curse:: @ 81DB293 +AI_CV_Curse:: get_user_type1 if_equal TYPE_GHOST, AI_CV_Curse4 get_user_type2 @@ -1993,25 +1993,25 @@ AI_CV_Curse:: @ 81DB293 if_random_less_than 128, AI_CV_Curse2 score +1 -AI_CV_Curse2:: @ 81DB2B3 +AI_CV_Curse2:: if_stat_level_more_than AI_USER, STAT_DEF, 7, AI_CV_Curse_End if_random_less_than 128, AI_CV_Curse3 score +1 -AI_CV_Curse3:: @ 81DB2C3 +AI_CV_Curse3:: if_stat_level_more_than AI_USER, STAT_DEF, 6, AI_CV_Curse_End if_random_less_than 128, AI_CV_Curse_End score +1 goto AI_CV_Curse_End -AI_CV_Curse4:: @ 81DB2D8 +AI_CV_Curse4:: if_hp_more_than AI_USER, 80, AI_CV_Curse_End score -1 -AI_CV_Curse_End:: @ 81DB2E1 +AI_CV_Curse_End:: end -AI_CV_Protect:: @ 81DB2E2 +AI_CV_Protect:: get_protect_count AI_USER if_more_than 1, AI_CV_Protect_ScoreDown2 if_status AI_USER, STATUS1_TOXIC_POISON, AI_CV_Protect3 @@ -2033,10 +2033,10 @@ AI_CV_Protect:: @ 81DB2E2 if_not_equal EFFECT_LOCK_ON, AI_CV_Protect_ScoreUp2 goto AI_CV_Protect2 -AI_CV_Protect_ScoreUp2:: @ 81DB37E +AI_CV_Protect_ScoreUp2:: score +2 -AI_CV_Protect2:: @ 81DB380 +AI_CV_Protect2:: @ if_random_less_than 128, AI_CV_Protect4 @ Improvement in Emerald @ score -1 @@ -2048,18 +2048,18 @@ AI_CV_Protect4:: score -1 goto AI_CV_Protect_End -AI_CV_Protect3:: @ 81DB397 +AI_CV_Protect3:: get_last_used_move AI_TARGET get_move_effect_from_result if_not_equal EFFECT_LOCK_ON, AI_CV_Protect_End -AI_CV_Protect_ScoreDown2:: @ 81DB3A0 +AI_CV_Protect_ScoreDown2:: score -2 -AI_CV_Protect_End:: @ 81DB3A2 +AI_CV_Protect_End:: end -AI_CV_Foresight:: @ 81DB3A3 +AI_CV_Foresight:: get_user_type1 if_equal TYPE_GHOST, AI_CV_Foresight2 get_user_type2 @@ -2068,32 +2068,32 @@ AI_CV_Foresight:: @ 81DB3A3 score -2 goto AI_CV_Foresight_End -AI_CV_Foresight2:: @ 81DB3C2 +AI_CV_Foresight2:: if_random_less_than 80, AI_CV_Foresight_End -AI_CV_Foresight3:: @ 81DB3C8 +AI_CV_Foresight3:: if_random_less_than 80, AI_CV_Foresight_End score +2 -AI_CV_Foresight_End:: @ 81DB3D0 +AI_CV_Foresight_End:: end -AI_CV_Endure:: @ 81DB3D1 +AI_CV_Endure:: if_hp_less_than AI_USER, 4, AI_CV_Endure2 if_hp_less_than AI_USER, 35, AI_CV_Endure3 -AI_CV_Endure2:: @ 81DB3DF +AI_CV_Endure2:: score -1 goto AI_CV_Endure_End -AI_CV_Endure3:: @ 81DB3E6 +AI_CV_Endure3:: if_random_less_than 70, AI_CV_Endure_End score +1 -AI_CV_Endure_End:: @ 81DB3EE +AI_CV_Endure_End:: end -AI_CV_BatonPass:: @ 81DB3EF +AI_CV_BatonPass:: if_stat_level_more_than AI_USER, STAT_ATK, 8, AI_CV_BatonPass2 if_stat_level_more_than AI_USER, STAT_DEF, 8, AI_CV_BatonPass2 if_stat_level_more_than AI_USER, STAT_SPATK, 8, AI_CV_BatonPass2 @@ -2101,20 +2101,20 @@ AI_CV_BatonPass:: @ 81DB3EF if_stat_level_more_than AI_USER, STAT_EVASION, 8, AI_CV_BatonPass2 goto AI_CV_BatonPass5 -AI_CV_BatonPass2:: @ 81DB41C +AI_CV_BatonPass2:: if_target_faster AI_CV_BatonPass3 if_hp_more_than AI_USER, 60, AI_CV_BatonPass_End goto AI_CV_BatonPass4 -AI_CV_BatonPass3:: @ 81DB42E +AI_CV_BatonPass3:: if_hp_more_than AI_USER, 70, AI_CV_BatonPass_End -AI_CV_BatonPass4:: @ 81DB435 +AI_CV_BatonPass4:: if_random_less_than 80, AI_CV_BatonPass_End score +2 goto AI_CV_BatonPass_End -AI_CV_BatonPass5:: @ 81DB442 +AI_CV_BatonPass5:: if_stat_level_more_than AI_USER, STAT_ATK, 7, AI_CV_BatonPass7 if_stat_level_more_than AI_USER, STAT_DEF, 7, AI_CV_BatonPass7 if_stat_level_more_than AI_USER, STAT_SPATK, 7, AI_CV_BatonPass7 @@ -2122,21 +2122,21 @@ AI_CV_BatonPass5:: @ 81DB442 if_stat_level_more_than AI_USER, STAT_EVASION, 7, AI_CV_BatonPass7 goto AI_CV_BatonPass_ScoreDown2 -AI_CV_BatonPass7:: @ 81DB46F +AI_CV_BatonPass7:: if_target_faster AI_CV_BatonPass8 if_hp_more_than AI_USER, 60, AI_CV_BatonPass_ScoreDown2 goto AI_CV_BatonPass_End -AI_CV_BatonPass8:: @ 81DB481 +AI_CV_BatonPass8:: if_hp_less_than AI_USER, 70, AI_CV_BatonPass_End -AI_CV_BatonPass_ScoreDown2:: @ 81DB488 +AI_CV_BatonPass_ScoreDown2:: score -2 -AI_CV_BatonPass_End:: @ 81DB48A +AI_CV_BatonPass_End:: end -AI_CV_Pursuit:: @ 81DB48B +AI_CV_Pursuit:: is_first_turn_for AI_USER if_not_equal 0, AI_CV_Pursuit_End get_target_type1 @@ -2149,19 +2149,19 @@ AI_CV_Pursuit:: @ 81DB48B if_equal TYPE_PSYCHIC, AI_CV_Pursuit2 goto AI_CV_Pursuit_End -AI_CV_Pursuit2:: @ 81DB4B8 +AI_CV_Pursuit2:: if_random_less_than 128, AI_CV_Pursuit_End score +1 -AI_CV_Pursuit_End:: @ 81DB4C0 +AI_CV_Pursuit_End:: end -AI_CV_RainDance:: @ 81DB4C1 +AI_CV_RainDance:: if_user_faster AI_CV_RainDance2 get_ability AI_USER if_equal ABILITY_SWIFT_SWIM, AI_CV_RainDance3 -AI_CV_RainDance2:: @ 81DB4CF +AI_CV_RainDance2:: if_hp_less_than AI_USER, 40, AI_CV_RainDance_ScoreDown1 get_weather if_equal AI_WEATHER_HAIL, AI_CV_RainDance3 @@ -2171,17 +2171,17 @@ AI_CV_RainDance2:: @ 81DB4CF if_equal ABILITY_RAIN_DISH, AI_CV_RainDance3 goto AI_CV_RainDance_End -AI_CV_RainDance3:: @ 81DB4F6 +AI_CV_RainDance3:: score +1 goto AI_CV_RainDance_End -AI_CV_RainDance_ScoreDown1:: @ 81DB4FD +AI_CV_RainDance_ScoreDown1:: score -1 -AI_CV_RainDance_End:: @ 81DB4FF +AI_CV_RainDance_End:: end -AI_CV_SunnyDay:: @ 81DB500 +AI_CV_SunnyDay:: if_hp_less_than AI_USER, 40, AI_CV_SunnyDay_ScoreDown1 get_weather if_equal AI_WEATHER_HAIL, AI_CV_SunnyDay2 @@ -2189,27 +2189,27 @@ AI_CV_SunnyDay:: @ 81DB500 if_equal AI_WEATHER_SANDSTORM, AI_CV_SunnyDay2 goto AI_CV_SunnyDay_End -AI_CV_SunnyDay2:: @ 81DB51F +AI_CV_SunnyDay2:: score +1 goto AI_CV_SunnyDay_End -AI_CV_SunnyDay_ScoreDown1:: @ 81DB526 +AI_CV_SunnyDay_ScoreDown1:: score -1 -AI_CV_SunnyDay_End:: @ 81DB528 +AI_CV_SunnyDay_End:: end -AI_CV_BellyDrum:: @ 81DB529 +AI_CV_BellyDrum:: if_hp_less_than AI_USER, 90, AI_CV_BellyDrum_ScoreDown2 goto AI_CV_BellyDrum_End -AI_CV_BellyDrum_ScoreDown2:: @ 81DB535 +AI_CV_BellyDrum_ScoreDown2:: score -2 -AI_CV_BellyDrum_End:: @ 81DB537 +AI_CV_BellyDrum_End:: end -AI_CV_PsychUp:: @ 81DB538 +AI_CV_PsychUp:: if_stat_level_more_than AI_TARGET, STAT_ATK, 8, AI_CV_PsychUp2 if_stat_level_more_than AI_TARGET, STAT_DEF, 8, AI_CV_PsychUp2 if_stat_level_more_than AI_TARGET, STAT_SPATK, 8, AI_CV_PsychUp2 @@ -2217,7 +2217,7 @@ AI_CV_PsychUp:: @ 81DB538 if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, AI_CV_PsychUp2 goto AI_CV_PsychUp_ScoreDown2 -AI_CV_PsychUp2:: @ 81DB565 +AI_CV_PsychUp2:: if_stat_level_less_than AI_USER, STAT_ATK, 7, AI_CV_PsychUp3 if_stat_level_less_than AI_USER, STAT_DEF, 7, AI_CV_PsychUp3 if_stat_level_less_than AI_USER, STAT_SPATK, 7, AI_CV_PsychUp3 @@ -2226,21 +2226,21 @@ AI_CV_PsychUp2:: @ 81DB565 if_random_less_than 50, AI_CV_PsychUp_End goto AI_CV_PsychUp_ScoreDown2 -AI_CV_PsychUp_ScoreUp1:: @ 81DB598 +AI_CV_PsychUp_ScoreUp1:: score +1 -AI_CV_PsychUp3:: @ 81DB59A +AI_CV_PsychUp3:: if_random_less_than 128, AI_CV_PsychUp_End @ Remove this line score +1 @ end @ Improvement in Emerald -AI_CV_PsychUp_ScoreDown2:: @ 81DB5A2 +AI_CV_PsychUp_ScoreDown2:: score -2 -AI_CV_PsychUp_End:: @ 81DB5A4 +AI_CV_PsychUp_End:: end -AI_CV_MirrorCoat:: @ 81DB5A5 +AI_CV_MirrorCoat:: if_status AI_TARGET, STATUS1_SLEEP, AI_CV_MirrorCoat_ScoreDown1 if_status2 AI_TARGET, STATUS2_INFATUATION, AI_CV_MirrorCoat_ScoreDown1 if_status2 AI_TARGET, STATUS2_CONFUSION, AI_CV_MirrorCoat_ScoreDown1 @@ -2248,12 +2248,12 @@ AI_CV_MirrorCoat:: @ 81DB5A5 if_random_less_than 10, AI_CV_MirrorCoat2 score -1 -AI_CV_MirrorCoat2:: @ 81DB5D2 +AI_CV_MirrorCoat2:: if_hp_more_than AI_USER, 50, AI_CV_MirrorCoat3 if_random_less_than 100, AI_CV_MirrorCoat3 score -1 -AI_CV_MirrorCoat3:: @ 81DB5E1 +AI_CV_MirrorCoat3:: @ if_has_move AI_USER, MOVE_COUNTER, AI_CV_MirrorCoat_ScoreUp4 @ Improvement in Emerald get_last_used_move AI_TARGET get_move_power_from_result @@ -2262,7 +2262,7 @@ AI_CV_MirrorCoat3:: @ 81DB5E1 if_random_less_than 100, AI_CV_MirrorCoat4 score +1 -AI_CV_MirrorCoat4:: @ 81DB5F7 +AI_CV_MirrorCoat4:: get_last_used_move AI_TARGET get_move_type_from_result if_not_in_bytes AI_CV_MirrorCoat_SpecialTypeList, AI_CV_MirrorCoat_ScoreDown1 @@ -2270,12 +2270,12 @@ AI_CV_MirrorCoat4:: @ 81DB5F7 score +1 goto AI_CV_MirrorCoat_End -AI_CV_MirrorCoat5:: @ 81DB610 +AI_CV_MirrorCoat5:: if_target_not_taunted AI_CV_MirrorCoat6 if_random_less_than 100, AI_CV_MirrorCoat6 score +1 -AI_CV_MirrorCoat6:: @ 81DB61D +AI_CV_MirrorCoat6:: get_target_type1 if_in_bytes AI_CV_MirrorCoat_SpecialTypeList, AI_CV_MirrorCoat_End get_target_type2 @@ -2290,13 +2290,13 @@ AI_CV_MirrorCoat6:: @ 81DB61D @AI_CV_MirrorCoat_ScoreUp4_End: @ end -AI_CV_MirrorCoat_ScoreDown1:: @ 81DB639 +AI_CV_MirrorCoat_ScoreDown1:: score -1 -AI_CV_MirrorCoat_End:: @ 81DB63B +AI_CV_MirrorCoat_End:: end -AI_CV_MirrorCoat_SpecialTypeList:: @ 81DB63C +AI_CV_MirrorCoat_SpecialTypeList:: .byte TYPE_FIRE .byte TYPE_WATER .byte TYPE_GRASS @@ -2307,7 +2307,7 @@ AI_CV_MirrorCoat_SpecialTypeList:: @ 81DB63C .byte TYPE_DARK .byte -1 -AI_CV_ChargeUpMove:: @ 81DB645 +AI_CV_ChargeUpMove:: if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_ChargeUpMove_ScoreDown2 if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_ChargeUpMove_ScoreDown2 if_has_move_with_effect AI_TARGET, EFFECT_PROTECT, AI_CV_ChargeUpMove_ScoreDown2 @@ -2315,13 +2315,13 @@ AI_CV_ChargeUpMove:: @ 81DB645 score -1 goto AI_CV_ChargeUpMove_End -AI_CV_ChargeUpMove_ScoreDown2:: @ 81DB666 +AI_CV_ChargeUpMove_ScoreDown2:: score -2 -AI_CV_ChargeUpMove_End:: @ 81DB668 +AI_CV_ChargeUpMove_End:: end -AI_CV_SemiInvulnerable:: @ 81DB669 +AI_CV_SemiInvulnerable:: if_doesnt_have_move_with_effect AI_TARGET, EFFECT_PROTECT, AI_CV_SemiInvulnerable2 score -1 goto AI_CV_SemiInvulnerable_End @@ -2329,7 +2329,7 @@ AI_CV_SemiInvulnerable:: @ 81DB669 @ BUG: The scripts for checking type-resistance to weather for semi-invulnerable moves are swapped @ The result is that the AI is encouraged to stall while taking damage from weather @ To fix, swap _CheckSandstormTypes/_CheckIceType in the below script -AI_CV_SemiInvulnerable2:: @ 81DB677 +AI_CV_SemiInvulnerable2:: if_status AI_TARGET, STATUS1_TOXIC_POISON, AI_CV_SemiInvulnerable_TryEncourage if_status2 AI_TARGET, STATUS2_CURSED, AI_CV_SemiInvulnerable_TryEncourage if_status3 AI_TARGET, STATUS3_LEECHSEED, AI_CV_SemiInvulnerable_TryEncourage @@ -2338,53 +2338,53 @@ AI_CV_SemiInvulnerable2:: @ 81DB677 if_equal AI_WEATHER_SANDSTORM, AI_CV_SemiInvulnerable_CheckIceType goto AI_CV_SemiInvulnerable5 -AI_CV_SemiInvulnerable_CheckSandstormTypes:: @ 81DB6A7 +AI_CV_SemiInvulnerable_CheckSandstormTypes:: get_user_type1 if_in_bytes AI_CV_SandstormResistantTypes, AI_CV_SemiInvulnerable_TryEncourage get_user_type2 if_in_bytes AI_CV_SandstormResistantTypes, AI_CV_SemiInvulnerable_TryEncourage goto AI_CV_SemiInvulnerable5 -AI_CV_SemiInvulnerable_CheckIceType:: @ 81DB6C2 +AI_CV_SemiInvulnerable_CheckIceType:: get_user_type1 if_equal TYPE_ICE, AI_CV_SemiInvulnerable_TryEncourage get_user_type2 if_equal TYPE_ICE, AI_CV_SemiInvulnerable_TryEncourage -AI_CV_SemiInvulnerable5:: @ 81DB6D2 +AI_CV_SemiInvulnerable5:: if_target_faster AI_CV_SemiInvulnerable_End get_last_used_move AI_TARGET get_move_effect_from_result if_not_equal EFFECT_LOCK_ON, AI_CV_SemiInvulnerable_TryEncourage goto AI_CV_SemiInvulnerable_End -AI_CV_SemiInvulnerable_TryEncourage:: @ 81DB6E6 +AI_CV_SemiInvulnerable_TryEncourage:: if_random_less_than 80, AI_CV_SemiInvulnerable_End score +1 -AI_CV_SemiInvulnerable_End:: @ 81DB6EE +AI_CV_SemiInvulnerable_End:: end -AI_CV_SandstormResistantTypes:: @ 81DB6EF +AI_CV_SandstormResistantTypes:: .byte TYPE_GROUND .byte TYPE_ROCK .byte TYPE_STEEL .byte -1 -AI_CV_FakeOut:: @ 81DB6F3 +AI_CV_FakeOut:: score +2 end -AI_CV_SpitUp:: @ 81DB6F6 +AI_CV_SpitUp:: get_stockpile_count AI_USER if_less_than 2, AI_CV_SpitUp_End if_random_less_than 80, AI_CV_SpitUp_End score +2 -AI_CV_SpitUp_End:: @ 81DB706 +AI_CV_SpitUp_End:: end -AI_CV_Hail:: @ 81DB707 +AI_CV_Hail:: if_hp_less_than AI_USER, 40, AI_CV_Hail_ScoreDown1 get_weather if_equal AI_WEATHER_SUN, AI_CV_Hail2 @@ -2392,25 +2392,25 @@ AI_CV_Hail:: @ 81DB707 if_equal AI_WEATHER_SANDSTORM, AI_CV_Hail2 goto AI_CV_Hail_End -AI_CV_Hail2:: @ 81DB726 +AI_CV_Hail2:: score +1 goto AI_CV_Hail_End -AI_CV_Hail_ScoreDown1:: @ 81DB72D +AI_CV_Hail_ScoreDown1:: score -1 -AI_CV_Hail_End:: @ 81DB72F +AI_CV_Hail_End:: end @ BUG: Facade score is increased if the target is statused, but should be if the user is. Replace AI_TARGET with AI_USER -AI_CV_Facade:: @ 81DB730 +AI_CV_Facade:: if_not_status AI_TARGET, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End score +1 -AI_CV_Facade_End:: @ 81DB73C +AI_CV_Facade_End:: end -AI_CV_FocusPunch:: @ 81DB73D +AI_CV_FocusPunch:: if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_FocusPunch2 if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_FocusPunch2 if_status AI_TARGET, STATUS1_SLEEP, AI_CV_FocusPunch_ScoreUp1 @@ -2422,54 +2422,54 @@ AI_CV_FocusPunch:: @ 81DB73D score +1 goto AI_CV_FocusPunch_End -AI_CV_FocusPunch2:: @ 81DB77C +AI_CV_FocusPunch2:: score -1 goto AI_CV_FocusPunch_End -AI_CV_FocusPunch3:: @ 81DB783 +AI_CV_FocusPunch3:: if_random_less_than 100, AI_CV_FocusPunch_End -AI_CV_FocusPunch_ScoreUp1:: @ 81DB789 +AI_CV_FocusPunch_ScoreUp1:: score +1 -AI_CV_FocusPunch_End:: @ 81DB78B +AI_CV_FocusPunch_End:: end -AI_CV_SmellingSalt:: @ 81DB78C +AI_CV_SmellingSalt:: if_status AI_TARGET, STATUS1_PARALYSIS, AI_CV_SmellingSalt_ScoreUp1 goto AI_CV_SmellingSalt_End -AI_CV_SmellingSalt_ScoreUp1:: @ 81DB79B +AI_CV_SmellingSalt_ScoreUp1:: score +1 -AI_CV_SmellingSalt_End:: @ 81DB79D +AI_CV_SmellingSalt_End:: end -AI_CV_Trick:: @ 81DB79E +AI_CV_Trick:: get_hold_effect AI_USER if_in_bytes AI_CV_Trick_ChoiceEffects, AI_CV_Trick3 if_in_bytes AI_CV_Trick_EffectsToEncourage, AI_CV_Trick4 -AI_CV_Trick2:: @ 81DB7B2 +AI_CV_Trick2:: score -3 goto AI_CV_Trick_End -AI_CV_Trick3:: @ 81DB7B9 +AI_CV_Trick3:: get_hold_effect AI_TARGET if_in_bytes AI_CV_Trick_ChoiceEffects, AI_CV_Trick2 score +5 goto AI_CV_Trick_End -AI_CV_Trick4:: @ 81DB7CB +AI_CV_Trick4:: get_hold_effect AI_TARGET if_in_bytes AI_CV_Trick_EffectsToEncourage, AI_CV_Trick2 if_random_less_than 50, AI_CV_Trick_End score +2 -AI_CV_Trick_End:: @ 81DB7DE +AI_CV_Trick_End:: end -AI_CV_Trick_EffectsToEncourage:: @ 81DB7DF +AI_CV_Trick_EffectsToEncourage:: .byte HOLD_EFFECT_CONFUSE_SPICY .byte HOLD_EFFECT_CONFUSE_DRY .byte HOLD_EFFECT_CONFUSE_SWEET @@ -2479,28 +2479,28 @@ AI_CV_Trick_EffectsToEncourage:: @ 81DB7DF .byte HOLD_EFFECT_CHOICE_BAND .byte -1 -AI_CV_Trick_ChoiceEffects:: @ 81DB7E7 +AI_CV_Trick_ChoiceEffects:: .byte HOLD_EFFECT_CHOICE_BAND .byte -1 -AI_CV_ChangeSelfAbility:: @ 81DB7E9 +AI_CV_ChangeSelfAbility:: get_ability AI_USER if_in_bytes AI_CV_ChangeSelfAbility_AbilitiesToEncourage, AI_CV_ChangeSelfAbility2 get_ability AI_TARGET if_in_bytes AI_CV_ChangeSelfAbility_AbilitiesToEncourage, AI_CV_ChangeSelfAbility3 -AI_CV_ChangeSelfAbility2:: @ 81DB7FF +AI_CV_ChangeSelfAbility2:: score -1 goto AI_CV_ChangeSelfAbility_End -AI_CV_ChangeSelfAbility3:: @ 81DB806 +AI_CV_ChangeSelfAbility3:: if_random_less_than 50, AI_CV_ChangeSelfAbility_End score +2 -AI_CV_ChangeSelfAbility_End:: @ 81DB80E +AI_CV_ChangeSelfAbility_End:: end -AI_CV_ChangeSelfAbility_AbilitiesToEncourage:: @ 81DB80F +AI_CV_ChangeSelfAbility_AbilitiesToEncourage:: .byte ABILITY_SPEED_BOOST .byte ABILITY_BATTLE_ARMOR .byte ABILITY_SAND_VEIL @@ -2519,7 +2519,7 @@ AI_CV_ChangeSelfAbility_AbilitiesToEncourage:: @ 81DB80F .byte ABILITY_SHIELD_DUST .byte -1 -AI_CV_Superpower:: @ 81DB820 +AI_CV_Superpower:: if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_Superpower_ScoreDown1 if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_Superpower_ScoreDown1 if_stat_level_less_than AI_USER, STAT_ATK, 6, AI_CV_Superpower_ScoreDown1 @@ -2527,16 +2527,16 @@ AI_CV_Superpower:: @ 81DB820 if_hp_more_than AI_USER, 40, AI_CV_Superpower_ScoreDown1 goto AI_CV_Superpower_End -AI_CV_Superpower2:: @ 81DB846 +AI_CV_Superpower2:: if_hp_less_than AI_USER, 60, AI_CV_Superpower_End -AI_CV_Superpower_ScoreDown1:: @ 81DB84D +AI_CV_Superpower_ScoreDown1:: score -1 -AI_CV_Superpower_End:: @ 81DB84F +AI_CV_Superpower_End:: end -AI_CV_MagicCoat:: @ 81DB850 +AI_CV_MagicCoat:: if_hp_more_than AI_TARGET, 30, AI_CV_MagicCoat2 if_random_less_than 100, AI_CV_MagicCoat2 score -1 @@ -2552,33 +2552,33 @@ AI_CV_MagicCoat2:: AI_CV_MagicCoat3:: @ if_random_less_than 50, AI_CV_MagicCoat_End @ Improvement in Emerald -AI_CV_MagicCoat4:: @ 81DB87A +AI_CV_MagicCoat4:: if_random_less_than 30, AI_CV_MagicCoat_End score -1 -AI_CV_MagicCoat_End:: @ 81DB882 +AI_CV_MagicCoat_End:: end -AI_CV_Recycle:: @ 81DB883 +AI_CV_Recycle:: get_used_held_item AI_USER if_not_in_bytes AI_CV_Recycle_ItemsToEncourage, AI_CV_Recycle_ScoreDown2 if_random_less_than 50, AI_CV_Recycle_End score +1 goto AI_CV_Recycle_End -AI_CV_Recycle_ScoreDown2:: @ 81DB89B +AI_CV_Recycle_ScoreDown2:: score -2 -AI_CV_Recycle_End:: @ 81DB89D +AI_CV_Recycle_End:: end -AI_CV_Recycle_ItemsToEncourage:: @ 81DB89E +AI_CV_Recycle_ItemsToEncourage:: .byte ITEM_CHESTO_BERRY .byte ITEM_LUM_BERRY .byte ITEM_STARF_BERRY .byte -1 -AI_CV_Revenge:: @ 81DB8A2 +AI_CV_Revenge:: if_status AI_TARGET, STATUS1_SLEEP, AI_CV_Revenge_ScoreDown2 if_status2 AI_TARGET, STATUS2_INFATUATION, AI_CV_Revenge_ScoreDown2 if_status2 AI_TARGET, STATUS2_CONFUSION, AI_CV_Revenge_ScoreDown2 @@ -2586,86 +2586,86 @@ AI_CV_Revenge:: @ 81DB8A2 score +2 goto AI_CV_Revenge_End -AI_CV_Revenge_ScoreDown2:: @ 81DB8CD +AI_CV_Revenge_ScoreDown2:: score -2 -AI_CV_Revenge_End:: @ 81DB8CF +AI_CV_Revenge_End:: end -AI_CV_BrickBreak:: @ 81DB8D0 +AI_CV_BrickBreak:: if_side_affecting AI_TARGET, SIDE_STATUS_REFLECT, AI_CV_BrickBreak_ScoreUp1 goto AI_CV_BrickBreak_End -AI_CV_BrickBreak_ScoreUp1:: @ 81DB8DF +AI_CV_BrickBreak_ScoreUp1:: score +1 -AI_CV_BrickBreak_End:: @ 81DB8E1 +AI_CV_BrickBreak_End:: end -AI_CV_KnockOff:: @ 81DB8E2 +AI_CV_KnockOff:: if_hp_less_than AI_TARGET, 30, AI_CV_KnockOff_End is_first_turn_for AI_USER if_more_than 0, AI_CV_KnockOff_End if_random_less_than 180, AI_CV_KnockOff_End score +1 -AI_CV_KnockOff_End:: @ 81DB8F9 +AI_CV_KnockOff_End:: end -AI_CV_Endeavor:: @ 81DB8FA +AI_CV_Endeavor:: if_hp_less_than AI_TARGET, 70, AI_CV_Endeavor_ScoreDown1 if_target_faster AI_CV_Endeavor2 if_hp_more_than AI_USER, 40, AI_CV_Endeavor_ScoreDown1 score +1 goto AI_CV_Endeavor_End -AI_CV_Endeavor2:: @ 81DB915 +AI_CV_Endeavor2:: if_hp_more_than AI_USER, 50, AI_CV_Endeavor_ScoreDown1 score +1 goto AI_CV_Endeavor_End -AI_CV_Endeavor_ScoreDown1:: @ 81DB923 +AI_CV_Endeavor_ScoreDown1:: score -1 -AI_CV_Endeavor_End:: @ 81DB925 +AI_CV_Endeavor_End:: end -AI_CV_Eruption:: @ 81DB926 +AI_CV_Eruption:: if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_Eruption_ScoreDown1 if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_Eruption_ScoreDown1 if_target_faster AI_CV_Eruption2 if_hp_more_than AI_TARGET, 50, AI_CV_Eruption_End goto AI_CV_Eruption_ScoreDown1 -AI_CV_Eruption2:: @ 81DB944 +AI_CV_Eruption2:: if_hp_more_than AI_TARGET, 70, AI_CV_Eruption_End -AI_CV_Eruption_ScoreDown1:: @ 81DB94B +AI_CV_Eruption_ScoreDown1:: score -1 -AI_CV_Eruption_End:: @ 81DB94D +AI_CV_Eruption_End:: end -AI_CV_Imprison:: @ 81DB94E +AI_CV_Imprison:: is_first_turn_for AI_USER if_more_than 0, AI_CV_Imprison_End if_random_less_than 100, AI_CV_Imprison_End score +2 -AI_CV_Imprison_End:: @ 81DB95E +AI_CV_Imprison_End:: end -AI_CV_Refresh:: @ 81DB95F +AI_CV_Refresh:: if_hp_less_than AI_TARGET, 50, AI_CV_Refresh_ScoreDown1 goto AI_CV_Refresh_End -AI_CV_Refresh_ScoreDown1:: @ 81DB96B +AI_CV_Refresh_ScoreDown1:: score -1 -AI_CV_Refresh_End:: @ 81DB96D +AI_CV_Refresh_End:: end -AI_CV_Snatch:: @ 81DB96E +AI_CV_Snatch:: is_first_turn_for AI_USER if_equal 1, AI_CV_Snatch3 if_random_less_than 30, AI_CV_Snatch_End @@ -2675,30 +2675,30 @@ AI_CV_Snatch:: @ 81DB96E if_random_less_than 60, AI_CV_Snatch_End goto AI_CV_Snatch5 -AI_CV_Snatch2:: @ 81DB99B +AI_CV_Snatch2:: if_hp_more_than AI_TARGET, 25, AI_CV_Snatch5 if_has_move_with_effect AI_TARGET, EFFECT_RESTORE_HP, AI_CV_Snatch3 if_has_move_with_effect AI_TARGET, EFFECT_DEFENSE_CURL, AI_CV_Snatch3 goto AI_CV_Snatch4 -AI_CV_Snatch3:: @ 81DB9B5 +AI_CV_Snatch3:: if_random_less_than 150, AI_CV_Snatch_End score +2 goto AI_CV_Snatch_End -AI_CV_Snatch4:: @ 81DB9C2 +AI_CV_Snatch4:: if_random_less_than 230, AI_CV_Snatch5 score +1 goto AI_CV_Snatch_End -AI_CV_Snatch5:: @ 81DB9CF +AI_CV_Snatch5:: if_random_less_than 30, AI_CV_Snatch_End score -2 -AI_CV_Snatch_End:: @ 81DB9D7 +AI_CV_Snatch_End:: end -AI_CV_MudSport:: @ 81DB9D8 +AI_CV_MudSport:: if_hp_less_than AI_USER, 50, AI_CV_MudSport_ScoreDown1 get_target_type1 if_equal TYPE_ELECTRIC, AI_CV_MudSport2 @@ -2706,33 +2706,33 @@ AI_CV_MudSport:: @ 81DB9D8 if_equal TYPE_ELECTRIC, AI_CV_MudSport2 goto AI_CV_MudSport_ScoreDown1 -AI_CV_MudSport2:: @ 81DB9F4 +AI_CV_MudSport2:: score +1 goto AI_CV_MudSport_End -AI_CV_MudSport_ScoreDown1:: @ 81DB9FB +AI_CV_MudSport_ScoreDown1:: score -1 -AI_CV_MudSport_End:: @ 81DB9FD +AI_CV_MudSport_End:: end -AI_CV_Overheat:: @ 81DB9FE +AI_CV_Overheat:: if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_Overheat_ScoreDown1 if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_Overheat_ScoreDown1 if_target_faster AI_CV_Overheat2 if_hp_more_than AI_USER, 60, AI_CV_Overheat_End goto AI_CV_Overheat_ScoreDown1 -AI_CV_Overheat2:: @ 81DBA1C +AI_CV_Overheat2:: if_hp_more_than AI_USER, 80, AI_CV_Overheat_End -AI_CV_Overheat_ScoreDown1:: @ 81DBA23 +AI_CV_Overheat_ScoreDown1:: score -1 -AI_CV_Overheat_End:: @ 81DBA25 +AI_CV_Overheat_End:: end -AI_CV_WaterSport:: @ 81DBA26 +AI_CV_WaterSport:: if_hp_less_than AI_USER, 50, AI_CV_WaterSport_ScoreDown1 get_target_type1 if_equal TYPE_FIRE, AI_CV_WaterSport2 @@ -2740,31 +2740,31 @@ AI_CV_WaterSport:: @ 81DBA26 if_equal TYPE_FIRE, AI_CV_WaterSport2 goto AI_CV_WaterSport_ScoreDown1 -AI_CV_WaterSport2:: @ 81DBA42 +AI_CV_WaterSport2:: score +1 goto AI_CV_WaterSport_End -AI_CV_WaterSport_ScoreDown1:: @ 81DBA49 +AI_CV_WaterSport_ScoreDown1:: score -1 -AI_CV_WaterSport_End:: @ 81DBA4B +AI_CV_WaterSport_End:: end -AI_CV_DragonDance:: @ 81DBA4C +AI_CV_DragonDance:: if_target_faster AI_CV_DragonDance2 if_hp_more_than AI_USER, 50, AI_CV_DragonDance_End if_random_less_than 70, AI_CV_DragonDance_End score -1 goto AI_CV_DragonDance_End -AI_CV_DragonDance2:: @ 81DBA66 +AI_CV_DragonDance2:: if_random_less_than 128, AI_CV_DragonDance_End score +1 -AI_CV_DragonDance_End:: @ 81DBA6E +AI_CV_DragonDance_End:: end -AI_TryToFaint:: @ 81DBA6F +AI_TryToFaint:: if_can_faint AI_TryToFaint_TryToEncourageQuickAttack get_how_powerful_move_is if_equal MOVE_NOT_MOST_POWERFUL, Score_Minus1 @@ -2777,18 +2777,18 @@ AI_TryToFaint:: @ 81DBA6F @ score +2 @ end -AI_TryToFaint_TryToEncourageQuickAttack:: @ 81DBA7C +AI_TryToFaint_TryToEncourageQuickAttack:: if_effect EFFECT_EXPLOSION, AI_TryToFaint_End if_not_effect EFFECT_QUICK_ATTACK, AI_TryToFaint_ScoreUp4 score +2 -AI_TryToFaint_ScoreUp4:: @ 81DBA8A +AI_TryToFaint_ScoreUp4:: score +4 -AI_TryToFaint_End:: @ 81DBA8C +AI_TryToFaint_End:: end -AI_SetupFirstTurn:: @ 81DBA8D +AI_SetupFirstTurn:: get_turn_count if_not_equal 0, AI_SetupFirstTurn_End get_considered_move_effect @@ -2796,10 +2796,10 @@ AI_SetupFirstTurn:: @ 81DBA8D if_random_less_than 80, AI_SetupFirstTurn_End score +2 -AI_SetupFirstTurn_End:: @ 81DBAA6 +AI_SetupFirstTurn_End:: end -AI_SetupFirstTurn_SetupEffectsToEncourage:: @ 81DBAA7 +AI_SetupFirstTurn_SetupEffectsToEncourage:: .byte EFFECT_ATTACK_UP .byte EFFECT_DEFENSE_UP .byte EFFECT_SPEED_UP @@ -2857,25 +2857,25 @@ AI_SetupFirstTurn_SetupEffectsToEncourage:: @ 81DBAA7 .byte EFFECT_CAMOUFLAGE .byte -1 -AI_PreferStrongestMove:: @ 81DBADF +AI_PreferStrongestMove:: get_how_powerful_move_is if_not_equal MOVE_POWER_DISCOURAGED, AI_PreferStrongestMove_End if_random_less_than 100, AI_PreferStrongestMove_End score +2 -AI_PreferStrongestMove_End:: @ 81DBAEE +AI_PreferStrongestMove_End:: end -AI_Risky:: @ 81DBAEF +AI_Risky:: get_considered_move_effect if_not_in_bytes AI_Risky_EffectsToEncourage, AI_Risky_End if_random_less_than 128, AI_Risky_End score +2 -AI_Risky_End:: @ 81DBB01 +AI_Risky_End:: end -AI_Risky_EffectsToEncourage:: @ 81DBB02 +AI_Risky_EffectsToEncourage:: .byte EFFECT_SLEEP .byte EFFECT_EXPLOSION .byte EFFECT_MIRROR_MOVE @@ -2897,7 +2897,7 @@ AI_Risky_EffectsToEncourage:: @ 81DBB02 .byte EFFECT_TEETER_DANCE .byte -1 -AI_PreferBatonPass:: @ 81DBB16 +AI_PreferBatonPass:: count_alive_pokemon AI_USER if_equal 0, AI_PreferBatonPass_End get_how_powerful_move_is @@ -2906,7 +2906,7 @@ AI_PreferBatonPass:: @ 81DBB16 if_random_less_than 80, AI_Risky_End @ Improvement in Emerald (several below) -AI_PreferBatonPass_GoForBatonPass:: @ 81DBB32 +AI_PreferBatonPass_GoForBatonPass:: @ if_move MOVE_SWORDS_DANCE, AI_PreferBatonPass2 @ if_move MOVE_DRAGON_DANCE, AI_PreferBatonPass2 @ if_move MOVE_CALM_MIND, AI_PreferBatonPass2 @@ -2943,59 +2943,59 @@ AI_PreferBatonPass_GoForBatonPass:: @ 81DBB32 @ if_stat_level_more_than AI_USER, STAT_SPATK, 6, Score_Plus1 @ end -AI_PreferBatonPass_End:: @ 81DBB3A +AI_PreferBatonPass_End:: end @ Empty. Expanded in Emerald -AI_DoubleBattle:: @ 81DBB3B +AI_DoubleBattle:: end -AI_HPAware:: @ 81DBB3C +AI_HPAware:: if_hp_more_than AI_USER, 70, AI_HPAware_UserHasHighHP if_hp_more_than AI_USER, 30, AI_HPAware_UserHasMediumHP get_considered_move_effect if_in_bytes AI_HPAware_DiscouragedEffectsWhenLowHP, AI_HPAware_TryToDiscourage goto AI_HPAware_ConsiderTarget -AI_HPAware_UserHasHighHP:: @ 81DBB59 +AI_HPAware_UserHasHighHP:: get_considered_move_effect if_in_bytes AI_HPAware_DiscouragedEffectsWhenHighHP, AI_HPAware_TryToDiscourage goto AI_HPAware_ConsiderTarget -AI_HPAware_UserHasMediumHP:: @ 81DBB68 +AI_HPAware_UserHasMediumHP:: get_considered_move_effect if_in_bytes AI_HPAware_DiscouragedEffectsWhenMediumHP, AI_HPAware_TryToDiscourage goto AI_HPAware_ConsiderTarget -AI_HPAware_TryToDiscourage:: @ 81DBB77 +AI_HPAware_TryToDiscourage:: if_random_less_than 50, AI_HPAware_ConsiderTarget score -2 -AI_HPAware_ConsiderTarget:: @ 81DBB7F +AI_HPAware_ConsiderTarget:: if_hp_more_than AI_TARGET, 70, AI_HPAware_TargetHasHighHP if_hp_more_than AI_TARGET, 30, AI_HPAware_TargetHasMediumHP get_considered_move_effect if_in_bytes AI_HPAware_DiscouragedEffectsWhenTargetLowHP, AI_HPAware_TargetTryToDiscourage goto AI_HPAware_End -AI_HPAware_TargetHasHighHP:: @ 81DBB9C +AI_HPAware_TargetHasHighHP:: get_considered_move_effect if_in_bytes AI_HPAware_DiscouragedEffectsWhenTargetHighHP, AI_HPAware_TargetTryToDiscourage goto AI_HPAware_End -AI_HPAware_TargetHasMediumHP:: @ 81DBBAB +AI_HPAware_TargetHasMediumHP:: get_considered_move_effect if_in_bytes AI_HPAware_DiscouragedEffectsWhenTargetMediumHP, AI_HPAware_TargetTryToDiscourage goto AI_HPAware_End -AI_HPAware_TargetTryToDiscourage:: @ 81DBBBA +AI_HPAware_TargetTryToDiscourage:: if_random_less_than 50, AI_HPAware_End score -2 -AI_HPAware_End:: @ 81DBBC2 +AI_HPAware_End:: end -AI_HPAware_DiscouragedEffectsWhenHighHP:: @ 81DBBC3 +AI_HPAware_DiscouragedEffectsWhenHighHP:: .byte EFFECT_EXPLOSION .byte EFFECT_RESTORE_HP .byte EFFECT_REST @@ -3011,7 +3011,7 @@ AI_HPAware_DiscouragedEffectsWhenHighHP:: @ 81DBBC3 .byte EFFECT_OVERHEAT .byte -1 -AI_HPAware_DiscouragedEffectsWhenMediumHP:: @ 81DBBD1 +AI_HPAware_DiscouragedEffectsWhenMediumHP:: .byte EFFECT_EXPLOSION .byte EFFECT_ATTACK_UP .byte EFFECT_DEFENSE_UP @@ -3056,7 +3056,7 @@ AI_HPAware_DiscouragedEffectsWhenMediumHP:: @ 81DBBD1 .byte EFFECT_DRAGON_DANCE .byte -1 -AI_HPAware_DiscouragedEffectsWhenLowHP:: @ 81DBBFC +AI_HPAware_DiscouragedEffectsWhenLowHP:: .byte EFFECT_ATTACK_UP .byte EFFECT_DEFENSE_UP .byte EFFECT_SPEED_UP @@ -3106,10 +3106,10 @@ AI_HPAware_DiscouragedEffectsWhenLowHP:: @ 81DBBFC .byte EFFECT_DRAGON_DANCE .byte -1 -AI_HPAware_DiscouragedEffectsWhenTargetHighHP:: @ 81DBC2C +AI_HPAware_DiscouragedEffectsWhenTargetHighHP:: .byte -1 -AI_HPAware_DiscouragedEffectsWhenTargetMediumHP:: @ 81DBC2D +AI_HPAware_DiscouragedEffectsWhenTargetMediumHP:: .byte EFFECT_ATTACK_UP .byte EFFECT_DEFENSE_UP .byte EFFECT_SPEED_UP @@ -3151,7 +3151,7 @@ AI_HPAware_DiscouragedEffectsWhenTargetMediumHP:: @ 81DBC2D .byte EFFECT_DRAGON_DANCE .byte -1 -AI_HPAware_DiscouragedEffectsWhenTargetLowHP:: @ 81DBC55 +AI_HPAware_DiscouragedEffectsWhenTargetLowHP:: .byte EFFECT_SLEEP .byte EFFECT_EXPLOSION .byte EFFECT_ATTACK_UP @@ -3213,17 +3213,17 @@ AI_HPAware_DiscouragedEffectsWhenTargetLowHP:: @ 81DBC55 .byte EFFECT_DRAGON_DANCE .byte -1 -AI_Unknown:: @ 81DBC91 +AI_Unknown:: if_not_effect EFFECT_SUNNY_DAY, AI_Unknown_End if_equal 0, AI_Unknown_End is_first_turn_for AI_USER if_equal 0, AI_Unknown_End score +5 -AI_Unknown_End:: @ 81DBCA7 +AI_Unknown_End:: end -AI_Roaming:: @ 81DBCA8 +AI_Roaming:: if_status2 AI_USER, STATUS2_WRAPPED, AI_Roaming_End if_status2 AI_USER, STATUS2_ESCAPE_PREVENTION, AI_Roaming_End get_ability AI_TARGET @@ -3233,27 +3233,27 @@ AI_Roaming:: @ 81DBCA8 get_ability AI_TARGET if_equal ABILITY_ARENA_TRAP, AI_Roaming_End -AI_Roaming_Flee:: @ 81DBCD4 +AI_Roaming_Flee:: flee -AI_Roaming_End:: @ 81DBCD5 +AI_Roaming_End:: end -AI_Safari:: @ 81DBCD6 +AI_Safari:: if_random_safari_flee AI_Safari_Flee watch -AI_Safari_Flee:: @ 81DBCDC +AI_Safari_Flee:: flee @ From Hoenns Poochyena fight (Zigzagoon in Emerald) -AI_FirstBattle:: @ 81DBCDD +AI_FirstBattle:: if_hp_equal AI_TARGET, 20, AI_FirstBattle_Flee if_hp_less_than AI_TARGET, 20, AI_FirstBattle_Flee end -AI_FirstBattle_Flee:: @ 81DBCEC +AI_FirstBattle_Flee:: flee -AI_Ret:: @ 81DBCED +AI_Ret:: end diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 91b49ca87..c9afc9b02 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -38,7 +38,7 @@ .section script_data, "aw", %progbits .align 2 -gMovesWithQuietBGM:: @ 81C68EC +gMovesWithQuietBGM:: .2byte MOVE_SING .2byte MOVE_PERISH_SONG .2byte MOVE_GRASS_WHISTLE @@ -453,9 +453,9 @@ gBattleAnims_Special:: .4byte Special_SubstituteToMon .4byte Special_MonToSubstitute -Move_NONE:: @ 81C6F34 -Move_POUND:: @ 81C6F34 -Move_MIRROR_MOVE:: @ 81C6F34 +Move_NONE:: +Move_POUND:: +Move_MIRROR_MOVE:: loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 @@ -467,12 +467,12 @@ Move_MIRROR_MOVE:: @ 81C6F34 blendoff end -Move_DOUBLE_SLAP:: @ 81C6F65 +Move_DOUBLE_SLAP:: loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 choosetwoturnanim DoubleSlapLeft, DoubleSlapRight -DoubleSlapContinue:: @ 81C6F76 +DoubleSlapContinue:: createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 playsewithpan SE_M_DOUBLE_SLAP, 63 waitforvisualfinish @@ -480,15 +480,15 @@ DoubleSlapContinue:: @ 81C6F76 blendoff end -DoubleSlapLeft:: @ 81C6F90 +DoubleSlapLeft:: createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, 1, 2 goto DoubleSlapContinue -DoubleSlapRight:: @ 81C6FA4 +DoubleSlapRight:: createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, 0, 1, 2 goto DoubleSlapContinue -Move_POISON_POWDER:: @ 81C6FB8 +Move_POISON_POWDER:: loadspritegfx ANIM_TAG_POISON_POWDER loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_M_POISON_POWDER, 63, 10, 6 @@ -513,7 +513,7 @@ Move_POISON_POWDER:: @ 81C6FB8 waitforvisualfinish end -Move_STUN_SPORE:: @ 81C70E9 +Move_STUN_SPORE:: loadspritegfx ANIM_TAG_STUN_SPORE loopsewithpan SE_M_POISON_POWDER, 63, 10, 6 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 @@ -537,7 +537,7 @@ Move_STUN_SPORE:: @ 81C70E9 waitforvisualfinish end -Move_SLEEP_POWDER:: @ 81C7217 +Move_SLEEP_POWDER:: loadspritegfx ANIM_TAG_SLEEP_POWDER loopsewithpan SE_M_POISON_POWDER, 63, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 @@ -561,7 +561,7 @@ Move_SLEEP_POWDER:: @ 81C7217 waitforvisualfinish end -Move_SWIFT:: @ 81C7345 +Move_SWIFT:: loadspritegfx ANIM_TAG_YELLOW_STAR loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -588,7 +588,7 @@ Move_SWIFT:: @ 81C7345 blendoff end -Move_STRENGTH:: @ 81C73FE +Move_STRENGTH:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -614,7 +614,7 @@ Move_STRENGTH:: @ 81C73FE blendoff end -Move_TACKLE:: @ 81C7492 +Move_TACKLE:: loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 @@ -628,7 +628,7 @@ Move_TACKLE:: @ 81C7492 blendoff end -Move_BODY_SLAM:: @ 81C74D0 +Move_BODY_SLAM:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -654,7 +654,7 @@ Move_BODY_SLAM:: @ 81C74D0 blendoff end -Move_SUPERSONIC:: @ 81C755D +Move_SUPERSONIC:: loadspritegfx ANIM_TAG_GOLD_RING monbg ANIM_ATK_PARTNER monbgprio_2A 0 @@ -671,13 +671,13 @@ Move_SUPERSONIC:: @ 81C755D blendoff end -SupersonicRing:: @ 81C759B +SupersonicRing:: playsewithpan SE_M_SUPERSONIC, 192 createsprite gSupersonicWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return -Move_SCREECH:: @ 81C75B5 +Move_SCREECH:: loadspritegfx ANIM_TAG_PURPLE_RING createvisualtask AnimTask_ShakeMon2, 2, 0, 3, 0, 2, 1 call ScreechRing @@ -687,13 +687,13 @@ Move_SCREECH:: @ 81C75B5 waitforvisualfinish end -ScreechRing:: @ 81C75E8 +ScreechRing:: playsewithpan SE_M_SCREECH, 192 createsprite gScreechWaveSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return -Move_FLAME_WHEEL:: @ 81C7602 +Move_FLAME_WHEEL:: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_2A 1 @@ -733,7 +733,7 @@ Move_FLAME_WHEEL:: @ 81C7602 delay 4 return -Move_PIN_MISSILE:: @ 81C76FC +Move_PIN_MISSILE:: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -762,7 +762,7 @@ Move_PIN_MISSILE:: @ 81C76FC blendoff end -Move_ICICLE_SPEAR:: @ 81C77C1 +Move_ICICLE_SPEAR:: loadspritegfx ANIM_TAG_ICICLE_SPEAR loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -791,7 +791,7 @@ Move_ICICLE_SPEAR:: @ 81C77C1 blendoff end -Move_TAKE_DOWN:: @ 81C7886 +Move_TAKE_DOWN:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -815,7 +815,7 @@ Move_TAKE_DOWN:: @ 81C7886 blendoff end -Move_DOUBLE_EDGE:: @ 81C791A +Move_DOUBLE_EDGE:: loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_M_SWIFT, 192 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 @@ -848,7 +848,7 @@ Move_DOUBLE_EDGE:: @ 81C791A waitforvisualfinish end -Move_POISON_STING:: @ 81C7A2D +Move_POISON_STING:: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE @@ -868,7 +868,7 @@ Move_POISON_STING:: @ 81C7A2D blendoff end -Move_TWINEEDLE:: @ 81C7A82 +Move_TWINEEDLE:: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -888,7 +888,7 @@ Move_TWINEEDLE:: @ 81C7A82 blendoff end -Move_FIRE_BLAST:: @ 81C7AF5 +Move_FIRE_BLAST:: loadspritegfx ANIM_TAG_SMALL_EMBER createsoundtask sub_80DCE10, SE_M_FLAME_WHEEL, SE_M_FLAME_WHEEL2 call FireBlastRing @@ -921,7 +921,7 @@ Move_FIRE_BLAST:: @ 81C7AF5 waitforvisualfinish end -FireBlastRing:: @ 81C7B89 +FireBlastRing:: createsprite gFireBlastRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 0 createsprite gFireBlastRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 51 createsprite gFireBlastRingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 102 @@ -930,7 +930,7 @@ FireBlastRing:: @ 81C7B89 delay 5 return -FireBlastCross:: @ 81C7BCD +FireBlastCross:: createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0, 0, 10, 0, -2 createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0, 0, 13, -2, 0 createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0, 0, 13, 2, 0 @@ -938,7 +938,7 @@ FireBlastCross:: @ 81C7BCD createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0, 0, 15, 2, 2 return -Move_LEECH_SEED:: @ 81C7C23 +Move_LEECH_SEED:: loadspritegfx ANIM_TAG_SEED playsewithpan SE_M_POISON_POWDER, 192 createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 @@ -953,7 +953,7 @@ Move_LEECH_SEED:: @ 81C7C23 waitforvisualfinish end -Move_EMBER:: @ 81C7C79 +Move_EMBER:: loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_M_EMBER, 192, 5, 2 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1 @@ -968,12 +968,12 @@ Move_EMBER:: @ 81C7C79 call EmberFireHit end -EmberFireHit:: @ 81C7CD5 +EmberFireHit:: createsprite gEmberFlareSpriteTemplate, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1 delay 4 return -Move_MEGA_PUNCH:: @ 81C7CED +Move_MEGA_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 @@ -998,29 +998,29 @@ Move_MEGA_PUNCH:: @ 81C7CED waitbgfadein end -SetImpactBackground:: @ 81C7D89 +SetImpactBackground:: delay 2 createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, SetImpactContestsBG createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, SetImpactOpponentBG jumpargeq 7, 1, SetImpactPlayerBG -SetImpactBackgroundRet:: @ 81C7DB1 +SetImpactBackgroundRet:: return -SetImpactOpponentBG:: @ 81C7DB2 +SetImpactOpponentBG:: changebg 4 goto SetImpactBackgroundRet -SetImpactPlayerBG:: @ 81C7DB9 +SetImpactPlayerBG:: changebg 5 goto SetImpactBackgroundRet -SetImpactContestsBG:: @ 81C7DC0 +SetImpactContestsBG:: changebg 6 goto SetImpactBackgroundRet -Move_MEGA_KICK:: @ 81C7DC7 +Move_MEGA_KICK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 @@ -1045,14 +1045,14 @@ Move_MEGA_KICK:: @ 81C7DC7 waitbgfadein end -Move_COMET_PUNCH:: @ 81C7E63 +Move_COMET_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 setalpha 12, 8 choosetwoturnanim CometPunchLeft, CometPunchRight -CometPunchContinue:: @ 81C7E77 +CometPunchContinue:: createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 playsewithpan SE_M_COMET_PUNCH, 63 waitforvisualfinish @@ -1060,17 +1060,17 @@ CometPunchContinue:: @ 81C7E77 blendoff end -CometPunchLeft:: @ 81C7E91 +CometPunchLeft:: createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, -8, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, -8, 0, 8, 1, 0 goto CometPunchContinue -CometPunchRight:: @ 81C7EB6 +CometPunchRight:: createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, -8, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 8, 0, 8, 1, 0 goto CometPunchContinue -Move_SONIC_BOOM:: @ 81C7EDB +Move_SONIC_BOOM:: loadspritegfx ANIM_TAG_AIR_WAVE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -1086,18 +1086,18 @@ Move_SONIC_BOOM:: @ 81C7EDB blendoff end -SonicBoomProjectile:: @ 81C7F12 +SonicBoomProjectile:: playsewithpan SE_M_RAZOR_WIND2, 192 createsprite gSonicBoomSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 15 delay 4 return -SonicBoomHit:: @ 81C7F2A +SonicBoomHit:: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2 delay 4 return -Move_THUNDER_SHOCK:: @ 81C7F3C +Move_THUNDER_SHOCK:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SPARK_2 createvisualtask AnimTask_BlendSelected, 10, 1, 0, 0, 6, RGB_BLACK @@ -1118,7 +1118,7 @@ Move_THUNDER_SHOCK:: @ 81C7F3C waitforvisualfinish end -Move_THUNDERBOLT:: @ 81C7FAA +Move_THUNDERBOLT:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SHOCK_3 loadspritegfx ANIM_TAG_SPARK_2 @@ -1167,7 +1167,7 @@ Move_THUNDERBOLT:: @ 81C7FAA waitforvisualfinish end -Move_THUNDER_WAVE:: @ 81C8160 +Move_THUNDER_WAVE:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_SPARK_2 loadspritegfx ANIM_TAG_SPARK_H @@ -1188,19 +1188,19 @@ Move_THUNDER_WAVE:: @ 81C8160 waitforvisualfinish end -Move_BEAT_UP:: @ 81C81CF +Move_BEAT_UP:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 setalpha 12, 8 choosetwoturnanim BeatUpLeft, BeatUpRight -BeatUpContinue:: @ 81C81E3 +BeatUpContinue:: waitforvisualfinish clearmonbg 1 blendoff end -BeatUpLeft:: @ 81C81E8 +BeatUpLeft:: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -20, -20, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, -20, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 @@ -1212,7 +1212,7 @@ BeatUpLeft:: @ 81C81E8 playsewithpan SE_M_VITAL_THROW2, 63 goto BeatUpContinue -BeatUpRight:: @ 81C8259 +BeatUpRight:: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 12, -20, 1, 2 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 3, 12, -12, 8, 1, 0 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 @@ -1224,7 +1224,7 @@ BeatUpRight:: @ 81C8259 playsewithpan SE_M_VITAL_THROW2, 63 goto BeatUpContinue -Move_STOMP:: @ 81C82CA +Move_STOMP:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -1240,13 +1240,13 @@ Move_STOMP:: @ 81C82CA blendoff end -Move_TAIL_WHIP:: @ 81C8311 +Move_TAIL_WHIP:: loopsewithpan SE_M_TAIL_WHIP, 192, 24, 3 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 4, 2, 3 waitforvisualfinish end -Move_CUT:: @ 81C832A +Move_CUT:: loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 @@ -1260,7 +1260,7 @@ Move_CUT:: @ 81C832A waitforvisualfinish end -Move_HIDDEN_POWER:: @ 81C835C +Move_HIDDEN_POWER:: loadspritegfx ANIM_TAG_RED_ORB playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, 0, 0 @@ -1290,7 +1290,7 @@ Move_HIDDEN_POWER:: @ 81C835C createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 224 end -Move_REVERSAL:: @ 81C8445 +Move_REVERSAL:: loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT @@ -1318,7 +1318,7 @@ Move_REVERSAL:: @ 81C8445 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, 0, 1, 8, 1, 0 end -Move_PURSUIT:: @ 81C8520 +Move_PURSUIT:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_TARGET fadetobg BG_DARK @@ -1326,7 +1326,7 @@ Move_PURSUIT:: @ 81C8520 delay 0 setalpha 12, 8 choosetwoturnanim PursuitNormal, PursuitOnSwitchout -PursuitContinue:: @ 81C8536 +PursuitContinue:: waitforvisualfinish clearmonbg ANIM_TARGET blendoff @@ -1335,19 +1335,19 @@ PursuitContinue:: @ 81C8536 waitbgfadein end -PursuitNormal:: @ 81C853F +PursuitNormal:: playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 2 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, 0, 1, 6, 1, 0 goto PursuitContinue -PursuitOnSwitchout:: @ 81C8568 +PursuitOnSwitchout:: playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 5, 0, 1, 6, 1, 0 goto PursuitContinue -Move_SPIKE_CANNON:: @ 81C8591 +Move_SPIKE_CANNON:: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -1371,7 +1371,7 @@ Move_SPIKE_CANNON:: @ 81C8591 blendoff end -Move_SWORDS_DANCE:: @ 81C8644 +Move_SWORDS_DANCE:: loadspritegfx ANIM_TAG_SWORD monbg ANIM_ATTACKER setalpha 12, 8 @@ -1386,7 +1386,7 @@ Move_SWORDS_DANCE:: @ 81C8644 delay 1 end -Move_PSYCH_UP:: @ 81C868A +Move_PSYCH_UP:: loadspritegfx ANIM_TAG_SPIRAL monbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendColorCycleExclude, 2, 1, 2, 6, 1, 11, 0 @@ -1405,7 +1405,7 @@ Move_PSYCH_UP:: @ 81C868A waitforvisualfinish end -Move_DIZZY_PUNCH:: @ 81C86FC +Move_DIZZY_PUNCH:: loadspritegfx ANIM_TAG_DUCK loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT @@ -1437,13 +1437,13 @@ Move_DIZZY_PUNCH:: @ 81C86FC blendoff end -DizzyPunchLunge:: @ 81C8817 +DizzyPunchLunge:: createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 6 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 7, 1 return -Move_FIRE_SPIN:: @ 81C8836 +Move_FIRE_SPIN:: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_M_SACRED_FIRE2, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 47, 1 @@ -1453,7 +1453,7 @@ Move_FIRE_SPIN:: @ 81C8836 waitforvisualfinish end -FireSpinEffect:: @ 81C885F +FireSpinEffect:: createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0, 28, 528, 30, 13, 50, 1 delay 2 createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0, 32, 480, 20, 16, -46, 1 @@ -1468,7 +1468,7 @@ FireSpinEffect:: @ 81C885F delay 2 return -Move_FURY_CUTTER:: @ 81C88EA +Move_FURY_CUTTER:: loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 @@ -1477,14 +1477,14 @@ Move_FURY_CUTTER:: @ 81C88EA jumpargeq 7, 0, FuryCutterLeft goto FuryCutterRight -FuryCutterContinue:: @ 81C890A +FuryCutterContinue:: createvisualtask AnimTask_GetFuryCutterHitCount, 2, jumpargeq 7, 1, FuryCutterContinue2 jumpargeq 7, 2, FuryCutterMedium jumpargeq 7, 3, FuryCutterStrong goto FuryCutterStrongest -FuryCutterContinue2:: @ 81C892E +FuryCutterContinue2:: delay 5 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 10, 1 waitforvisualfinish @@ -1493,27 +1493,27 @@ FuryCutterContinue2:: @ 81C892E waitforvisualfinish end -FuryCutterLeft:: @ 81C8947 +FuryCutterLeft:: createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 goto FuryCutterContinue -FuryCutterRight:: @ 81C8959 +FuryCutterRight:: createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 1 goto FuryCutterContinue -FuryCutterMedium:: @ 81C896B +FuryCutterMedium:: createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 10505, 4, 0, 0 goto FuryCutterContinue2 -FuryCutterStrong:: @ 81C8985 +FuryCutterStrong:: createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, 10505, 4, 0, 0 goto FuryCutterContinue2 -FuryCutterStrongest:: @ 81C899F +FuryCutterStrongest:: createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, 10505, 4, 0, 0 goto FuryCutterContinue2 -Move_SELF_DESTRUCT:: @ 81C89B9 +Move_SELF_DESTRUCT:: loadspritegfx ANIM_TAG_EXPLOSION createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 9, RGB(31, 0, 0) createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 @@ -1527,7 +1527,7 @@ Move_SELF_DESTRUCT:: @ 81C89B9 createvisualtask AnimTask_BlendSelected, 10, 2, 1, 9, 0, RGB(31, 0, 0) end -SelfDestructExplode:: @ 81C8A3F +SelfDestructExplode:: playsewithpan SE_M_SELF_DESTRUCT, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 @@ -1545,7 +1545,7 @@ SelfDestructExplode:: @ 81C8A3F delay 6 return -Move_SLAM:: @ 81C8AA9 +Move_SLAM:: loadspritegfx ANIM_TAG_SLAM_HIT loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -1569,7 +1569,7 @@ Move_SLAM:: @ 81C8AA9 blendoff end -Move_VINE_WHIP:: @ 81C8B31 +Move_VINE_WHIP:: loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_M_JUMP_KICK, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 @@ -1580,7 +1580,7 @@ Move_VINE_WHIP:: @ 81C8B31 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 6, 1 end -Move_DRILL_PECK:: @ 81C8B68 +Move_DRILL_PECK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 @@ -1599,7 +1599,7 @@ Move_DRILL_PECK:: @ 81C8B68 waitforvisualfinish end -Move_WATERFALL:: @ 81C8BC1 +Move_WATERFALL:: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_ICE_CRYSTALS @@ -1640,7 +1640,7 @@ Move_WATERFALL:: @ 81C8BC1 blendoff end -RisingWaterHitEffect:: @ 81C8CA2 +RisingWaterHitEffect:: playsewithpan SE_M_WATERFALL, 63 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 17, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 20, 1, 1 @@ -1680,7 +1680,7 @@ RisingWaterHitEffect:: @ 81C8CA2 createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0, -20 return -Move_EXPLOSION:: @ 81C8E15 +Move_EXPLOSION:: loadspritegfx ANIM_TAG_EXPLOSION createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 9, 8474, 8, 0, 8 createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 @@ -1696,7 +1696,7 @@ Move_EXPLOSION:: @ 81C8E15 createvisualtask AnimTask_BlendSelected, 10, 1, 3, 16, 0, RGB_WHITE end -Explosion1:: @ 81C8EB2 +Explosion1:: playsewithpan SE_M_EXPLOSION, 192 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 1 delay 6 @@ -1714,7 +1714,7 @@ Explosion1:: @ 81C8EB2 delay 6 return -Move_DEFENSE_CURL:: @ 81C8F1C +Move_DEFENSE_CURL:: loadspritegfx ANIM_TAG_ECLIPSING_ORB loopsewithpan SE_M_TRI_ATTACK, 192, 18, 3 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 0 @@ -1726,7 +1726,7 @@ Move_DEFENSE_CURL:: @ 81C8F1C waitforvisualfinish end -Move_PROTECT:: @ 81C8F55 +Move_PROTECT:: loadspritegfx ANIM_TAG_PROTECT monbg ANIM_ATK_PARTNER monbgprio_28 0 @@ -1736,7 +1736,7 @@ Move_PROTECT:: @ 81C8F55 clearmonbg ANIM_ATK_PARTNER end -Move_DETECT:: @ 81C8F72 +Move_DETECT:: loadspritegfx ANIM_TAG_SPARKLE_4 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 9, 0 waitforvisualfinish @@ -1751,7 +1751,7 @@ Move_DETECT:: @ 81C8F72 waitforvisualfinish end -Move_FRUSTRATION:: @ 81C8FD0 +Move_FRUSTRATION:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg ANIM_DEF_PARTNER @@ -1761,13 +1761,13 @@ Move_FRUSTRATION:: @ 81C8FD0 jumpargeq 7, 1, Frustration_Strong jumpargeq 7, 2, Frustration_Medium goto Frustration_Weak -Frustration_Continue:: @ 81C8FFF +Frustration_Continue:: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -Frustration_Strongest:: @ 81C9004 +Frustration_Strongest:: playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask AnimTask_BlendSelected, 10, 2, 3, 0, 9, RGB(31, 0, 0) @@ -1804,7 +1804,7 @@ Frustration_Strongest:: @ 81C9004 createvisualtask AnimTask_BlendSelected, 10, 2, 3, 9, 0, RGB(31, 0, 0) goto Frustration_Continue -Frustration_Strong:: @ 81C910A +Frustration_Strong:: playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 createvisualtask AnimTask_BlendSelected, 10, 2, 3, 0, 9, RGB(31, 0, 0) @@ -1831,7 +1831,7 @@ Frustration_Strong:: @ 81C910A createvisualtask AnimTask_BlendSelected, 10, 2, 3, 9, 0, RGB(31, 0, 0) goto Frustration_Continue -Frustration_Medium:: @ 81C91D7 +Frustration_Medium:: playsewithpan SE_M_SWAGGER2, 192 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish @@ -1849,7 +1849,7 @@ Frustration_Medium:: @ 81C91D7 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 6, 1 goto Frustration_Continue -Frustration_Weak:: @ 81C9253 +Frustration_Weak:: createsprite gWeakFrustrationAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 20, -28 waitforvisualfinish delay 10 @@ -1860,7 +1860,7 @@ Frustration_Weak:: @ 81C9253 createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 6, 1 goto Frustration_Continue -Move_SAFEGUARD:: @ 81C9297 +Move_SAFEGUARD:: loadspritegfx ANIM_TAG_GUARD_RING monbg ANIM_ATK_PARTNER setalpha 8, 8 @@ -1878,7 +1878,7 @@ Move_SAFEGUARD:: @ 81C9297 blendoff end -Move_PAIN_SPLIT:: @ 81C92D9 +Move_PAIN_SPLIT:: loadspritegfx ANIM_TAG_PAIN_SPLIT createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, 1 @@ -1902,7 +1902,7 @@ Move_PAIN_SPLIT:: @ 81C92D9 createvisualtask AnimTask_PainSplitMovement, 2, 1, 2 end -Move_VICE_GRIP:: @ 81C9381 +Move_VICE_GRIP:: loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -1918,7 +1918,7 @@ Move_VICE_GRIP:: @ 81C9381 blendoff end -Move_GUILLOTINE:: @ 81C93C9 +Move_GUILLOTINE:: loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -1943,7 +1943,7 @@ Move_GUILLOTINE:: @ 81C93C9 waitbgfadein end -Move_PAY_DAY:: @ 81C9455 +Move_PAY_DAY:: loadspritegfx ANIM_TAG_COIN loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -1961,7 +1961,7 @@ Move_PAY_DAY:: @ 81C9455 blendoff end -Move_OUTRAGE:: @ 81C94A8 +Move_OUTRAGE:: loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_M_DRAGON_RAGE, 192, 8, 3 createvisualtask AnimTask_CurseBlendEffect, 2, 7, 2, 5, 3, 8, 430 @@ -1990,7 +1990,7 @@ Move_OUTRAGE:: @ 81C94A8 waitforvisualfinish end -OutrageFlames:: @ 81C95AF +OutrageFlames:: delay 3 createsprite gOutrageFlameSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, -1280, 0, 3 delay 0 @@ -2007,7 +2007,7 @@ OutrageFlames:: @ 81C95AF createsprite gOutrageFlameSpriteTemplate, ANIM_TARGET, 2, 0, 0, 30, -1280, -768, 3 return -Move_SPARK:: @ 81C9643 +Move_SPARK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_SPARK_2 delay 0 @@ -2053,7 +2053,7 @@ Move_SPARK:: @ 81C9643 waitforvisualfinish end -Move_ATTRACT:: @ 81C985A +Move_ATTRACT:: loadspritegfx ANIM_TAG_RED_HEART loopsewithpan SE_M_CHARM, 192, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, 0 @@ -2082,20 +2082,20 @@ Move_ATTRACT:: @ 81C985A createvisualtask AnimTask_CurseBlendEffect, 2, 4, 4, 4, 0, 10, 28479 end -Move_GROWTH:: @ 81C9953 +Move_GROWTH:: call GrowthEffect waitforvisualfinish call GrowthEffect waitforvisualfinish end -GrowthEffect:: @ 81C9960 +GrowthEffect:: createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, 0, 0 return -Move_WHIRLWIND:: @ 81C9989 +Move_WHIRLWIND:: loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, 1, 60, 0 createsprite gWhirlwindLineSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 60, 1 @@ -2114,7 +2114,7 @@ Move_WHIRLWIND:: @ 81C9989 waitforvisualfinish end -Move_CONFUSE_RAY:: @ 81C9A31 +Move_CONFUSE_RAY:: loadspritegfx ANIM_TAG_YELLOW_BALL monbg ANIM_DEF_PARTNER fadetobg 2 @@ -2134,7 +2134,7 @@ Move_CONFUSE_RAY:: @ 81C9A31 waitbgfadein end -Move_LOCK_ON:: @ 81C9A84 +Move_LOCK_ON:: loadspritegfx ANIM_TAG_LOCK_ON createsprite gLockOnTargetSpriteTemplate, ANIM_ATTACKER, 40, createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 1 @@ -2146,7 +2146,7 @@ Move_LOCK_ON:: @ 81C9A84 waitforvisualfinish end -Move_MEAN_LOOK:: @ 81C9ABA +Move_MEAN_LOOK:: loadspritegfx ANIM_TAG_EYE monbg ANIM_DEF_PARTNER playsewithpan SE_M_PSYBEAM, 192 @@ -2161,7 +2161,7 @@ Move_MEAN_LOOK:: @ 81C9ABA waitforvisualfinish end -Move_ROCK_THROW:: @ 81C9AFF +Move_ROCK_THROW:: loadspritegfx ANIM_TAG_ROCKS createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_TARGET, 2, 6, 1, 15, 1 createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, 0, 1, 0, 0 @@ -2182,7 +2182,7 @@ Move_ROCK_THROW:: @ 81C9AFF waitforvisualfinish end -Move_ROCK_SLIDE:: @ 81C9B8B +Move_ROCK_SLIDE:: loadspritegfx ANIM_TAG_ROCKS monbg ANIM_DEF_PARTNER createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 7, 1, 11, 1 @@ -2206,7 +2206,7 @@ Move_ROCK_SLIDE:: @ 81C9B8B clearmonbg ANIM_DEF_PARTNER end -RockSlideRocks:: @ 81C9C23 +RockSlideRocks:: createsprite gFallingRockSpriteTemplate, ANIM_TARGET, 2, -20, 0, -10, 1 playsewithpan SE_M_ROCK_THROW, 63 delay 2 @@ -2233,7 +2233,7 @@ RockSlideRocks:: @ 81C9C23 delay 2 return -Move_THIEF:: @ 81C9CCC +Move_THIEF:: loadspritegfx ANIM_TAG_IMPACT monbg 1 delay 1 @@ -2253,7 +2253,7 @@ Move_THIEF:: @ 81C9CCC waitbgfadein end -Move_BUBBLE_BEAM:: @ 81C9D13 +Move_BUBBLE_BEAM:: loadspritegfx ANIM_TAG_BUBBLE loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg 1 @@ -2271,7 +2271,7 @@ Move_BUBBLE_BEAM:: @ 81C9D13 blendoff end -BulbblebeamCreateBubbles:: @ 81C9D4D +BulbblebeamCreateBubbles:: createsprite gWaterBubbleProjectileSpriteTemplate, ANIM_ATTACKER, 2, 18, 0, 35, 70, 0, 256, 50 playsewithpan SE_M_BUBBLE, 192 delay 3 @@ -2292,7 +2292,7 @@ BulbblebeamCreateBubbles:: @ 81C9D4D delay 3 return -Move_ICY_WIND:: @ 81C9DF0 +Move_ICY_WIND:: loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_ICE_SPIKES monbg ANIM_DEF_PARTNER @@ -2317,7 +2317,7 @@ Move_ICY_WIND:: @ 81C9DF0 waitbgfadein end -IcyWindSwirlingSnowballs:: @ 81C9E48 +IcyWindSwirlingSnowballs:: createsprite gSwirlingSnowballSpriteTemplate, ANIM_TARGET, 40, 0, 0, 0, 0, 72, 1 delay 5 createsprite gSwirlingSnowballSpriteTemplate, ANIM_TARGET, 40, 0, 10, 0, 10, 72, 1 @@ -2329,7 +2329,7 @@ IcyWindSwirlingSnowballs:: @ 81C9E48 createsprite gSwirlingSnowballSpriteTemplate, ANIM_TARGET, 40, 0, -5, 0, -5, 72, 1 return -Move_SMOKESCREEN:: @ 81C9EB0 +Move_SMOKESCREEN:: loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_M_DOUBLE_TEAM, 192 @@ -2353,7 +2353,7 @@ Move_SMOKESCREEN:: @ 81C9EB0 waitforvisualfinish end -Move_CONVERSION:: @ 81C9FA9 +Move_CONVERSION:: loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_ATK_PARTNER monbgprio_28 0 @@ -2405,7 +2405,7 @@ Move_CONVERSION:: @ 81C9FA9 blendoff end -Move_CONVERSION_2:: @ 81CA0BE +Move_CONVERSION_2:: loadspritegfx ANIM_TAG_CONVERSION monbg ANIM_DEF_PARTNER monbgprio_2A 1 @@ -2450,7 +2450,7 @@ Move_CONVERSION_2:: @ 81CA0BE blendoff end -Move_ROLLING_KICK:: @ 81CA1DA +Move_ROLLING_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -2472,7 +2472,7 @@ Move_ROLLING_KICK:: @ 81CA1DA blendoff end -Move_HEADBUTT:: @ 81CA25D +Move_HEADBUTT:: loadspritegfx ANIM_TAG_IMPACT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_M_HEADBUTT, 192 @@ -2488,7 +2488,7 @@ Move_HEADBUTT:: @ 81CA25D waitforvisualfinish end -Move_HORN_ATTACK:: @ 81CA2BA +Move_HORN_ATTACK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 @@ -2506,38 +2506,38 @@ Move_HORN_ATTACK:: @ 81CA2BA waitforvisualfinish end -Move_FURY_ATTACK:: @ 81CA327 +Move_FURY_ATTACK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT createvisualtask AnimTask_RotateMonSpriteToSide, 2, 4, 256, 0, 2 choosetwoturnanim FuryAttackRight, FuryAttackLeft -FuryAttackContinue:: @ 81CA345 +FuryAttackContinue:: createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 waitforvisualfinish end -FuryAttackRight:: @ 81CA358 +FuryAttackRight:: createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 8, 8, 10 waitforvisualfinish createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_M_HORN_ATTACK, 63 goto FuryAttackContinue -FuryAttackLeft:: @ 81CA37E +FuryAttackLeft:: createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, -8, -8, 10 waitforvisualfinish createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 playsewithpan SE_M_HORN_ATTACK, 63 goto FuryAttackContinue -Move_HORN_DRILL:: @ 81CA3A4 +Move_HORN_DRILL:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HORN_HIT jumpifcontest HornDrillInContest fadetobg 7 waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, -2304, 768, 1, -1 -HornDrillContinue:: @ 81CA3C1 +HornDrillContinue:: waitbgfadein setalpha 12, 8 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 @@ -2591,13 +2591,13 @@ HornDrillContinue:: @ 81CA3C1 waitbgfadein end -HornDrillInContest:: @ 81CA50A +HornDrillInContest:: fadetobg 8 waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, 2304, 768, 0, -1 goto HornDrillContinue -Move_THRASH:: @ 81CA521 +Move_THRASH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET createvisualtask AnimTask_ThrashMoveMonHorizontal, 2, @@ -2615,7 +2615,7 @@ Move_THRASH:: @ 81CA521 playsewithpan SE_M_MEGA_KICK2, 63 end -Move_SING:: @ 81CA5A0 +Move_SING:: loadspritegfx ANIM_TAG_MUSIC_NOTES monbg ANIM_DEF_PARTNER createvisualtask AnimTask_MusicNotesRainbowBlend, 2, @@ -2651,7 +2651,7 @@ Move_SING:: @ 81CA5A0 waitforvisualfinish end -Move_LOW_KICK:: @ 81CA674 +Move_LOW_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 @@ -2664,7 +2664,7 @@ Move_LOW_KICK:: @ 81CA674 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 end -Move_EARTHQUAKE:: @ 81CA6D1 +Move_EARTHQUAKE:: createvisualtask AnimTask_HorizontalShake, 5, 5, 10, 50 createvisualtask AnimTask_HorizontalShake, 5, 4, 10, 50 playsewithpan SE_M_EARTHQUAKE, 0 @@ -2674,7 +2674,7 @@ Move_EARTHQUAKE:: @ 81CA6D1 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 end -Move_FISSURE:: @ 81CA71E +Move_FISSURE:: loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_HorizontalShake, 3, 5, 10, 50 createvisualtask AnimTask_HorizontalShake, 3, 1, 10, 50 @@ -2701,7 +2701,7 @@ Move_FISSURE:: @ 81CA71E waitbgfadein end -FissureDirtPlumeFar:: @ 81CA79F +FissureDirtPlumeFar:: createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 12, -48, -16, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, -16, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 14, -52, -18, 24 @@ -2709,7 +2709,7 @@ FissureDirtPlumeFar:: @ 81CA79F playsewithpan SE_M_DIG, 63 return -FissureDirtPlumeClose:: @ 81CA7F0 +FissureDirtPlumeClose:: createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 12, -24, -16, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 16, -38, -10, 24 createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, 1, 1, 14, -20, -18, 24 @@ -2717,12 +2717,12 @@ FissureDirtPlumeClose:: @ 81CA7F0 playsewithpan SE_M_DIG, 63 return -Move_DIG:: @ 81CA841 +Move_DIG:: choosetwoturnanim DigSetUp, DigUnleash -DigEnd:: @ 81CA84A +DigEnd:: end -DigSetUp:: @ 81CA84B +DigSetUp:: loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_DIRT_MOUND createsprite gDirtMoundSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 180 @@ -2742,7 +2742,7 @@ DigSetUp:: @ 81CA84B createvisualtask AnimTask_DigDownMovement, 2, 1 goto DigEnd -DigUnleash:: @ 81CA8A6 +DigUnleash:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_DIRT_MOUND createvisualtask AnimTask_DigUpMovement, 2, 0 @@ -2759,7 +2759,7 @@ DigUnleash:: @ 81CA8A6 clearmonbg ANIM_ATTACKER goto DigEnd -DigThrowDirt:: @ 81CA90A +DigThrowDirt:: createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 12, 4, -16, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 16, 4, -10, 18 createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 14, 4, -18, 18 @@ -2768,7 +2768,7 @@ DigThrowDirt:: @ 81CA90A delay 32 return -Move_MEDITATE:: @ 81CA95D +Move_MEDITATE:: call SetPsychicBackground createvisualtask AnimTask_MeditateStretchAttacker, 2 playsewithpan SE_M_HEADBUTT, 192 @@ -2778,7 +2778,7 @@ Move_MEDITATE:: @ 81CA95D call UnsetPsychicBg end -Move_AGILITY:: @ 81CA97A +Move_AGILITY:: monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 4, 4 @@ -2799,7 +2799,7 @@ Move_AGILITY:: @ 81CA97A delay 1 end -Move_QUICK_ATTACK:: @ 81CA9C4 +Move_QUICK_ATTACK:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_ATK_PARTNER setalpha 12, 8 @@ -2816,7 +2816,7 @@ Move_QUICK_ATTACK:: @ 81CA9C4 waitforvisualfinish end -Move_RAGE:: @ 81CAA1C +Move_RAGE:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ANGER monbg 1 @@ -2837,7 +2837,7 @@ Move_RAGE:: @ 81CAA1C clearmonbg 1 end -Move_TELEPORT:: @ 81CAA92 +Move_TELEPORT:: call SetPsychicBackground createvisualtask AnimTask_Teleport, 2 playsewithpan SE_M_TELEPORT, 192 @@ -2846,7 +2846,7 @@ Move_TELEPORT:: @ 81CAA92 waitforvisualfinish end -Move_DOUBLE_TEAM:: @ 81CAAAB +Move_DOUBLE_TEAM:: monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_DoubleTeam, 2, @@ -2873,7 +2873,7 @@ Move_DOUBLE_TEAM:: @ 81CAAAB delay 1 end -Move_MINIMIZE:: @ 81CAAF2 +Move_MINIMIZE:: setalpha 10, 8 createvisualtask AnimTask_Minimize, 2, loopsewithpan SE_M_MINIMIZE, 192, 34, 3 @@ -2881,7 +2881,7 @@ Move_MINIMIZE:: @ 81CAAF2 blendoff end -Move_METRONOME:: @ 81CAB05 +Move_METRONOME:: loadspritegfx ANIM_TAG_FINGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100 @@ -2893,18 +2893,18 @@ Move_METRONOME:: @ 81CAB05 waitforvisualfinish end -Move_SKULL_BASH:: @ 81CAB2F +Move_SKULL_BASH:: choosetwoturnanim SkullBashSetUp, SkullBashAttack -SkullBashEnd:: @ 81CAB38 +SkullBashEnd:: end -SkullBashSetUp:: @ 81CAB39 +SkullBashSetUp:: call SkullBashSetUpHeadDown call SkullBashSetUpHeadDown waitforvisualfinish goto SkullBashEnd -SkullBashSetUpHeadDown:: @ 81CAB49 +SkullBashSetUpHeadDown:: createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 0, 10, 0 playsewithpan SE_M_TAKE_DOWN, 192 waitforvisualfinish @@ -2914,7 +2914,7 @@ SkullBashSetUpHeadDown:: @ 81CAB49 waitforvisualfinish return -SkullBashAttack:: @ 81CAB86 +SkullBashAttack:: loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SkullBashPosition, 2, 0 playsewithpan SE_M_TAKE_DOWN, 192 @@ -2929,7 +2929,7 @@ SkullBashAttack:: @ 81CAB86 createvisualtask AnimTask_SkullBashPosition, 2, 1 goto SkullBashEnd -Move_AMNESIA:: @ 81CABF5 +Move_AMNESIA:: loadspritegfx ANIM_TAG_AMNESIA call SetPsychicBackground delay 8 @@ -2941,7 +2941,7 @@ Move_AMNESIA:: @ 81CABF5 call UnsetPsychicBg end -Move_KINESIS:: @ 81CAC19 +Move_KINESIS:: loadspritegfx ANIM_TAG_ALERT loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_M_PSYBEAM, 192 @@ -2960,7 +2960,7 @@ Move_KINESIS:: @ 81CAC19 call UnsetPsychicBg end -Move_GLARE:: @ 81CAC6A +Move_GLARE:: loadspritegfx ANIM_TAG_SMALL_RED_EYE loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask AnimTask_GlareEyeDots, 5, 0 @@ -2978,7 +2978,7 @@ Move_GLARE:: @ 81CAC6A createvisualtask AnimTask_BlendSelected, 5, 1, 0, 16, 0, RGB_BLACK end -Move_BARRAGE:: @ 81CACD3 +Move_BARRAGE:: loadspritegfx ANIM_TAG_RED_BALL createvisualtask AnimTask_BarrageBall, 3, playsewithpan SE_M_SWAGGER, 192 @@ -2989,19 +2989,19 @@ Move_BARRAGE:: @ 81CACD3 loopsewithpan SE_M_STRENGTH, 63, 8, 2 end -Move_SKY_ATTACK:: @ 81CAD1B +Move_SKY_ATTACK:: choosetwoturnanim SkyAttackSetUp, SkyAttackUnleash -SkyAttackEnd:: @ 81CAD24 +SkyAttackEnd:: end -SkyAttackSetUp:: @ 81CAD25 +SkyAttackSetUp:: monbg ANIM_DEF_PARTNER setalpha 12, 11 createvisualtask AnimTask_GetTargetIsAttackerPartner, 5, 7 jumpargeq 7, 0, SkyAttackSetUpAgainstOpponent goto SkyAttackSetUpAgainstPartner -SkyAttackSetUpAgainstOpponent:: @ 81CAD40 +SkyAttackSetUpAgainstOpponent:: createvisualtask AnimTask_BlendSelected, 10, 27, 1, 0, 12, RGB_BLACK waitforvisualfinish delay 12 @@ -3018,7 +3018,7 @@ SkyAttackSetUpAgainstOpponent:: @ 81CAD40 blendoff goto SkyAttackEnd -SkyAttackSetUpAgainstPartner:: @ 81CADB7 +SkyAttackSetUpAgainstPartner:: createvisualtask AnimTask_BlendExcept, 10, 1, 1, 0, 12, 0 waitforvisualfinish delay 12 @@ -3036,7 +3036,7 @@ SkyAttackSetUpAgainstPartner:: @ 81CADB7 blendoff goto SkyAttackEnd -SkyAttackUnleash:: @ 81CAE2E +SkyAttackUnleash:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_BIRD call SetSkyBg @@ -3059,20 +3059,20 @@ SkyAttackUnleash:: @ 81CAE2E call UnsetSkyBg goto SkyAttackEnd -Move_FLASH:: @ 81CAEB3 +Move_FLASH:: playsewithpan SE_M_LEER, 192 createvisualtask AnimTask_Flash, 2 waitforvisualfinish end -Move_SPLASH:: @ 81CAEC0 +Move_SPLASH:: createvisualtask AnimTask_Splash, 2, 0, 3 delay 8 loopsewithpan SE_M_TAIL_WHIP, 192, 38, 3 waitforvisualfinish end -Move_ACID_ARMOR:: @ 81CAED5 +Move_ACID_ARMOR:: monbg ANIM_ATTACKER setalpha 15, 0 createvisualtask AnimTask_AcidArmor, 2, 0 @@ -3083,13 +3083,13 @@ Move_ACID_ARMOR:: @ 81CAED5 delay 1 end -Move_SHARPEN:: @ 81CAEEE +Move_SHARPEN:: loadspritegfx ANIM_TAG_SPHERE_TO_CUBE createsprite gSharpenSphereSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish end -Move_SUPER_FANG:: @ 81CAEFA +Move_SUPER_FANG:: loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 1, 0, 20, 1 playsewithpan SE_M_DRAGON_RAGE, 192 @@ -3109,7 +3109,7 @@ Move_SUPER_FANG:: @ 81CAEFA blendoff end -Move_SLASH:: @ 81CAF7B +Move_SLASH:: loadspritegfx ANIM_TAG_SLASH createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0 playsewithpan SE_M_RAZOR_WIND, 63 @@ -3120,7 +3120,7 @@ Move_SLASH:: @ 81CAF7B waitforvisualfinish end -Move_STRUGGLE:: @ 81CAFB5 +Move_STRUGGLE:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_MOVEMENT_WAVES monbg 1 @@ -3138,7 +3138,7 @@ Move_STRUGGLE:: @ 81CAFB5 blendoff end -Move_SKETCH:: @ 81CB01B +Move_SKETCH:: loadspritegfx ANIM_TAG_PENCIL monbg 1 createvisualtask AnimTask_SketchDrawMon, 2 @@ -3149,7 +3149,7 @@ Move_SKETCH:: @ 81CB01B loopsewithpan SE_M_TAIL_WHIP, 192, 38, 2 end -Move_NIGHTMARE:: @ 81CB043 +Move_NIGHTMARE:: fadetobg 2 waitbgfadein jumpifcontest NightmareInContest @@ -3163,7 +3163,7 @@ Move_NIGHTMARE:: @ 81CB043 waitbgfadein end -NightmareInContest:: @ 81CB06F +NightmareInContest:: createvisualtask AnimTask_BlendMonInAndOut, 2, 0, RGB_WHITE, 10, 2, 1 createvisualtask AnimTask_ShakeMon, 2, 0, 3, 0, 32, 1 playsewithpan SE_M_NIGHTMARE, 63 @@ -3172,7 +3172,7 @@ NightmareInContest:: @ 81CB06F waitbgfadein end -Move_FLAIL:: @ 81CB099 +Move_FLAIL:: loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 @@ -3187,7 +3187,7 @@ Move_FLAIL:: @ 81CB099 blendoff end -Move_SPITE:: @ 81CB0D6 +Move_SPITE:: fadetobg 2 playsewithpan SE_M_PSYBEAM, 192 waitbgfadein @@ -3201,7 +3201,7 @@ Move_SPITE:: @ 81CB0D6 clearmonbg 1 end -Move_MACH_PUNCH:: @ 81CB105 +Move_MACH_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_ATK_PARTNER @@ -3209,7 +3209,7 @@ Move_MACH_PUNCH:: @ 81CB105 jumpargeq 7, 1, MachPunchOnPlayer fadetobg BG_HIGHSPEED_OPPONENT -MachPunchContinue:: @ 81CB11E +MachPunchContinue:: waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein @@ -3231,11 +3231,11 @@ MachPunchContinue:: @ 81CB11E waitbgfadein end -MachPunchOnPlayer:: @ 81CB186 +MachPunchOnPlayer:: fadetobg BG_HIGHSPEED_PLAYER goto MachPunchContinue -Move_FORESIGHT:: @ 81CB18D +Move_FORESIGHT:: loadspritegfx ANIM_TAG_MAGNIFYING_GLASS monbg ANIM_DEF_PARTNER monbgprio_28 1 @@ -3254,7 +3254,7 @@ Move_FORESIGHT:: @ 81CB18D clearmonbg ANIM_DEF_PARTNER end -Move_DESTINY_BOND:: @ 81CB1CC +Move_DESTINY_BOND:: loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg 2 playsewithpan SE_M_PSYBEAM, 192 @@ -3274,7 +3274,7 @@ Move_DESTINY_BOND:: @ 81CB1CC clearmonbg 5 end -Move_ENDURE:: @ 81CB227 +Move_ENDURE:: loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_M_DRAGON_RAGE, 192 call EndureEffect @@ -3287,7 +3287,7 @@ Move_ENDURE:: @ 81CB227 waitforvisualfinish end -EndureEffect:: @ 81CB267 +EndureEffect:: createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 26, 2 delay 4 createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, 14, 28, 1 @@ -3299,7 +3299,7 @@ EndureEffect:: @ 81CB267 createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0, -12, 0, 1 return -Move_CHARM:: @ 81CB2BB +Move_CHARM:: loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 @@ -3313,7 +3313,7 @@ Move_CHARM:: @ 81CB2BB waitforvisualfinish end -Move_ROLLOUT:: @ 81CB2FE +Move_ROLLOUT:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_MUD_SAND loadspritegfx ANIM_TAG_ROCKS @@ -3330,7 +3330,7 @@ Move_ROLLOUT:: @ 81CB2FE blendoff end -Move_FALSE_SWIPE:: @ 81CB33F +Move_FALSE_SWIPE:: loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2, @@ -3357,7 +3357,7 @@ Move_FALSE_SWIPE:: @ 81CB33F playsewithpan SE_M_COMET_PUNCH, 63 end -Move_SWAGGER:: @ 81CB3C6 +Move_SWAGGER:: loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER createvisualtask AnimTask_GrowAndShrink, 2, @@ -3375,7 +3375,7 @@ Move_SWAGGER:: @ 81CB3C6 waitforvisualfinish end -Move_MILK_DRINK:: @ 81CB40E +Move_MILK_DRINK:: loadspritegfx ANIM_TAG_MILK_BOTTLE loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR @@ -3396,21 +3396,21 @@ Move_MILK_DRINK:: @ 81CB40E waitforvisualfinish end -Move_MAGNITUDE:: @ 81CB450 +Move_MAGNITUDE:: createvisualtask AnimTask_IsPowerOver99, 2, waitforvisualfinish jumpargeq 15, 0, MagnitudeRegular jumpargeq 15, 1, MagnitudeIntense -MagnitudeEnd:: @ 81CB468 +MagnitudeEnd:: end -MagnitudeRegular:: @ 81CB469 +MagnitudeRegular:: createvisualtask AnimTask_HorizontalShake, 5, 5, 0, 50 createvisualtask AnimTask_HorizontalShake, 5, 4, 0, 50 loopsewithpan SE_M_STRENGTH, 63, 8, 10 goto MagnitudeEnd -MagnitudeIntense:: @ 81CB48E +MagnitudeIntense:: createvisualtask AnimTask_HorizontalShake, 5, 5, 0, 50 createvisualtask AnimTask_HorizontalShake, 5, 4, 0, 50 loopsewithpan SE_M_STRENGTH, 63, 8, 10 @@ -3420,7 +3420,7 @@ MagnitudeIntense:: @ 81CB48E createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 goto MagnitudeEnd -Move_RAPID_SPIN:: @ 81CB4E1 +Move_RAPID_SPIN:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_RAPID_SPIN monbg ANIM_ATTACKER @@ -3439,7 +3439,7 @@ Move_RAPID_SPIN:: @ 81CB4E1 clearmonbg ANIM_ATTACKER end -Move_MOONLIGHT:: @ 81CB54E +Move_MOONLIGHT:: loadspritegfx ANIM_TAG_MOON loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR @@ -3466,14 +3466,14 @@ Move_MOONLIGHT:: @ 81CB54E waitforvisualfinish end -Move_EXTREME_SPEED:: @ 81CB5DE +Move_EXTREME_SPEED:: loadspritegfx ANIM_TAG_SPEED_DUST loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_GetAttackerSide, 2, jumpargeq 7, 1, ExtremeSpeedOnPlayer fadetobg BG_HIGHSPEED_OPPONENT -ExtremeSpeedContinue:: @ 81CB5F5 +ExtremeSpeedContinue:: waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein @@ -3512,11 +3512,11 @@ ExtremeSpeedContinue:: @ 81CB5F5 delay 1 end -ExtremeSpeedOnPlayer:: @ 81CB695 +ExtremeSpeedOnPlayer:: fadetobg BG_HIGHSPEED_PLAYER goto ExtremeSpeedContinue -Move_UPROAR:: @ 81CB69C +Move_UPROAR:: loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_DEF_PARTNER @@ -3541,7 +3541,7 @@ Move_UPROAR:: @ 81CB69C clearmonbg ANIM_DEF_PARTNER end -Move_HEAT_WAVE:: @ 81CB766 +Move_HEAT_WAVE:: loadspritegfx ANIM_TAG_FLYING_DIRT createvisualtask AnimTask_BlendParticle, 5, 10261, 0, 6, 6, 31 createvisualtask AnimTask_LoadSandstormBackground, 5, 1 @@ -3565,7 +3565,7 @@ Move_HEAT_WAVE:: @ 81CB766 createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 60, 2560, 96, 1 end -Move_HAIL:: @ 81CB816 +Move_HAIL:: loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_BlendSelected, 10, 1, 3, 0, 6, RGB_BLACK @@ -3576,7 +3576,7 @@ Move_HAIL:: @ 81CB816 createvisualtask AnimTask_BlendSelected, 10, 1, 3, 6, 0, RGB_BLACK end -Move_TORMENT:: @ 81CB84E +Move_TORMENT:: loadspritegfx ANIM_TAG_ANGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createvisualtask AnimTask_TormentAttacker, 2, @@ -3589,7 +3589,7 @@ Move_TORMENT:: @ 81CB84E playsewithpan SE_M_SWAGGER2, 63 end -Move_MEMENTO:: @ 81CB892 +Move_MEMENTO:: setalpha 0, 16 delay 1 createvisualtask AnimTask_InitMementoShadow, 2 @@ -3613,14 +3613,14 @@ Move_MEMENTO:: @ 81CB892 delay 1 end -Move_FACADE:: @ 81CB8D6 +Move_FACADE:: loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 3 createvisualtask AnimTask_FacadeColorBlend, 2, 0, 72 loopsewithpan SE_M_SWAGGER, 192, 24, 3 end -Move_SMELLING_SALT:: @ 81CB8F6 +Move_SMELLING_SALT:: loadspritegfx ANIM_TAG_TAG_HAND loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, 1, 0, 2 @@ -3635,7 +3635,7 @@ Move_SMELLING_SALT:: @ 81CB8F6 loopsewithpan SE_M_SWAGGER2, 63, 16, 3 end -Move_FOLLOW_ME:: @ 81CB951 +Move_FOLLOW_ME:: loadspritegfx ANIM_TAG_FINGER createsprite gFollowMeFingerSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_M_TAIL_WHIP, 192 @@ -3645,7 +3645,7 @@ Move_FOLLOW_ME:: @ 81CB951 loopsewithpan SE_M_TAIL_WHIP, 192, 22, 3 end -Move_CHARGE:: @ 81CB970 +Move_CHARGE:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_ELECTRICITY @@ -3680,7 +3680,7 @@ Move_CHARGE:: @ 81CB970 blendoff end -Move_TAUNT:: @ 81CBA0B +Move_TAUNT:: loadspritegfx ANIM_TAG_FINGER_2 loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_ANGER @@ -3700,7 +3700,7 @@ Move_TAUNT:: @ 81CBA0B playsewithpan SE_M_SWAGGER2, 63 end -Move_HELPING_HAND:: @ 81CBA5F +Move_HELPING_HAND:: loadspritegfx ANIM_TAG_TAG_HAND createvisualtask AnimTask_HelpingHandAttackerMovement, 5, createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0 @@ -3717,7 +3717,7 @@ Move_HELPING_HAND:: @ 81CBA5F createvisualtask AnimTask_BlendMonInAndOut, 2, 2, 1023, 12, 1, 1 end -Move_ASSIST:: @ 81CBAD2 +Move_ASSIST:: loadspritegfx ANIM_TAG_PAW_PRINT createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 @@ -3734,7 +3734,7 @@ Move_ASSIST:: @ 81CBAD2 playsewithpan SE_M_SCRATCH, 0 end -Move_SUPERPOWER:: @ 81CBB43 +Move_SUPERPOWER:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_METEOR loadspritegfx ANIM_TAG_FLAT_ROCK @@ -3768,7 +3768,7 @@ Move_SUPERPOWER:: @ 81CBB43 delay 1 end -Move_RECYCLE:: @ 81CBBFE +Move_RECYCLE:: loadspritegfx ANIM_TAG_RECYCLE monbg ANIM_ATTACKER setalpha 0, 16 @@ -3784,14 +3784,14 @@ Move_RECYCLE:: @ 81CBBFE delay 1 end -Move_BRICK_BREAK:: @ 81CBC32 +Move_BRICK_BREAK:: loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_TORN_METAL choosetwoturnanim BrickBreakNormal, BrickBreakShatteredWall -BrickBreakNormal:: @ 81CBC47 +BrickBreakNormal:: monbg 1 setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 @@ -3819,7 +3819,7 @@ BrickBreakNormal:: @ 81CBC47 clearmonbg 1 end -BrickBreakShatteredWall:: @ 81CBD16 +BrickBreakShatteredWall:: monbg 1 setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 8 @@ -3854,7 +3854,7 @@ BrickBreakShatteredWall:: @ 81CBD16 clearmonbg 1 end -Move_YAWN:: @ 81CBE37 +Move_YAWN:: loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask AnimTask_DeepInhale, 2, 0 playsewithpan SE_M_YAWN, 192 @@ -3870,7 +3870,7 @@ Move_YAWN:: @ 81CBE37 playsewithpan SE_M_YAWN, 63 end -Move_ENDEAVOR:: @ 81CBE7A +Move_ENDEAVOR:: loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 2 @@ -3886,7 +3886,7 @@ Move_ENDEAVOR:: @ 81CBE7A playsewithpan SE_M_COMET_PUNCH, 63 end -Move_ERUPTION:: @ 81CBEEF +Move_ERUPTION:: loadspritegfx ANIM_TAG_WARM_ROCK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 2, 0, 4, 31 waitforvisualfinish @@ -3911,7 +3911,7 @@ Move_ERUPTION:: @ 81CBEEF createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 40, 31, 4, 4, 0, 31 end -Move_SKILL_SWAP:: @ 81CBFBC +Move_SKILL_SWAP:: loadspritegfx ANIM_TAG_BLUEGREEN_ORB call SetPsychicBackground createvisualtask AnimTask_SkillSwap, 3, 1 @@ -3924,7 +3924,7 @@ Move_SKILL_SWAP:: @ 81CBFBC call UnsetPsychicBg end -Move_IMPRISON:: @ 81CC007 +Move_IMPRISON:: loadspritegfx ANIM_TAG_HOLLOW_ORB loadspritegfx ANIM_TAG_X_SIGN call SetPsychicBackground @@ -3941,7 +3941,7 @@ Move_IMPRISON:: @ 81CC007 call UnsetPsychicBg end -Move_GRUDGE:: @ 81CC04A +Move_GRUDGE:: loadspritegfx ANIM_TAG_PURPLE_FLAME monbg ANIM_ATTACKER monbgprio_29 @@ -3959,7 +3959,7 @@ Move_GRUDGE:: @ 81CC04A clearmonbg ANIM_ATTACKER end -Move_CAMOUFLAGE:: @ 81CC072 +Move_CAMOUFLAGE:: monbg ANIM_ATK_PARTNER monbgprio_28 0 setalpha 16, 0 @@ -3977,7 +3977,7 @@ Move_CAMOUFLAGE:: @ 81CC072 clearmonbg ANIM_ATK_PARTNER end -Move_TAIL_GLOW:: @ 81CC0B8 +Move_TAIL_GLOW:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATTACKER setalpha 12, 8 @@ -3993,7 +3993,7 @@ Move_TAIL_GLOW:: @ 81CC0B8 delay 1 end -Move_LUSTER_PURGE:: @ 81CC0FB +Move_LUSTER_PURGE:: loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_IMPACT fadetobg 3 @@ -4036,7 +4036,7 @@ Move_LUSTER_PURGE:: @ 81CC0FB call UnsetPsychicBg end -Move_MIST_BALL:: @ 81CC212 +Move_MIST_BALL:: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 @@ -4056,7 +4056,7 @@ Move_MIST_BALL:: @ 81CC212 createvisualtask AnimTask_BlendSelected, 10, 4, 2, 16, 0, RGB_WHITE end -Move_FEATHER_DANCE:: @ 81CC2A1 +Move_FEATHER_DANCE:: loadspritegfx ANIM_TAG_WHITE_FEATHER monbg ANIM_DEF_PARTNER monbgprio_29 @@ -4078,7 +4078,7 @@ Move_FEATHER_DANCE:: @ 81CC2A1 clearmonbg ANIM_DEF_PARTNER end -Move_TEETER_DANCE:: @ 81CC371 +Move_TEETER_DANCE:: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_TeeterDanceMovement, 5, @@ -4098,7 +4098,7 @@ Move_TEETER_DANCE:: @ 81CC371 playsewithpan SE_M_TEETER_DANCE, 192 end -Move_MUD_SPORT:: @ 81CC3DC +Move_MUD_SPORT:: loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_Splash, 2, 0, 6 delay 24 @@ -4145,7 +4145,7 @@ Move_MUD_SPORT:: @ 81CC3DC waitplaysewithpan SE_M_BUBBLE2, 0, 10 end -Move_NEEDLE_ARM:: @ 81CC513 +Move_NEEDLE_ARM:: loadspritegfx ANIM_TAG_GREEN_SPIKE loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -4188,7 +4188,7 @@ Move_NEEDLE_ARM:: @ 81CC513 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 1, -17, -17, 10 end -Move_SLACK_OFF:: @ 81CC6C3 +Move_SLACK_OFF:: loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_SlackOffSquish, 2, 0 playsewithpan SE_M_YAWN, 192 @@ -4197,7 +4197,7 @@ Move_SLACK_OFF:: @ 81CC6C3 waitforvisualfinish end -Move_CRUSH_CLAW:: @ 81CC6DB +Move_CRUSH_CLAW:: loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_TORN_METAL @@ -4219,7 +4219,7 @@ Move_CRUSH_CLAW:: @ 81CC6DB clearmonbg 1 end -Move_AROMATHERAPY:: @ 81CC74B +Move_AROMATHERAPY:: playsewithpan SE_M_PETAL_DANCE, 0 loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_THIN_RING @@ -4258,7 +4258,7 @@ Move_AROMATHERAPY:: @ 81CC74B waitforvisualfinish end -Move_FAKE_TEARS:: @ 81CC8AD +Move_FAKE_TEARS:: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_MUSIC_NOTES @@ -4281,7 +4281,7 @@ Move_FAKE_TEARS:: @ 81CC8AD waitforvisualfinish end -Move_AIR_CUTTER:: @ 81CC93D +Move_AIR_CUTTER:: loadspritegfx ANIM_TAG_AIR_WAVE loadspritegfx ANIM_TAG_CUT loadspritegfx ANIM_TAG_IMPACT @@ -4302,7 +4302,7 @@ Move_AIR_CUTTER:: @ 81CC93D delay 0 end -Move_ODOR_SLEUTH:: @ 81CC99F +Move_ODOR_SLEUTH:: monbg 1 createvisualtask AnimTask_OdorSleuthMovement, 5, delay 24 @@ -4318,7 +4318,7 @@ Move_ODOR_SLEUTH:: @ 81CC99F playsewithpan SE_M_LEER, 192 end -Move_GRASS_WHISTLE:: @ 81CC9E9 +Move_GRASS_WHISTLE:: loadspritegfx ANIM_TAG_MUSIC_NOTES createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 13298 waitforvisualfinish @@ -4355,7 +4355,7 @@ Move_GRASS_WHISTLE:: @ 81CC9E9 waitforvisualfinish end -Move_TICKLE:: @ 81CCADC +Move_TICKLE:: loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 0, 16, 0 waitforvisualfinish @@ -4373,7 +4373,7 @@ Move_TICKLE:: @ 81CCADC waitforvisualfinish end -Move_WATER_SPOUT:: @ 81CCB48 +Move_WATER_SPOUT:: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -4390,7 +4390,7 @@ Move_WATER_SPOUT:: @ 81CCB48 blendoff end -Move_SHADOW_PUNCH:: @ 81CCB76 +Move_SHADOW_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET fadetobg 2 @@ -4411,7 +4411,7 @@ Move_SHADOW_PUNCH:: @ 81CCB76 waitbgfadein end -Move_EXTRASENSORY:: @ 81CCBD1 +Move_EXTRASENSORY:: call SetPsychicBackground monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -4432,7 +4432,7 @@ Move_EXTRASENSORY:: @ 81CCBD1 call UnsetPsychicBg end -Move_AERIAL_ACE:: @ 81CCC39 +Move_AERIAL_ACE:: loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 @@ -4449,20 +4449,20 @@ Move_AERIAL_ACE:: @ 81CCC39 blendoff end -Move_IRON_DEFENSE:: @ 81CCCA3 +Move_IRON_DEFENSE:: loopsewithpan SE_SHINY, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 2, -1, 14, -1, 0 waitforvisualfinish end -Move_BLOCK:: @ 81CCCCD +Move_BLOCK:: loadspritegfx ANIM_TAG_X_SIGN createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66, playsewithpan SE_M_SWAGGER, 63 end -Move_HOWL:: @ 81CCCDC +Move_HOWL:: loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask AnimTask_DeepInhale, 2, 0 delay 12 @@ -4472,7 +4472,7 @@ Move_HOWL:: @ 81CCCDC delay 30 end -Move_BULK_UP:: @ 81CCCFE +Move_BULK_UP:: loadspritegfx ANIM_TAG_BREATH createvisualtask AnimTask_GrowAndShrink, 2, playsewithpan SE_M_SWAGGER, 192 @@ -4482,7 +4482,7 @@ Move_BULK_UP:: @ 81CCCFE waitforvisualfinish end -Move_COVET:: @ 81CCD1C +Move_COVET:: loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 @@ -4499,7 +4499,7 @@ Move_COVET:: @ 81CCD1C loopsewithpan SE_M_DIZZY_PUNCH, 63, 4, 3 end -Move_VOLT_TACKLE:: @ 81CCD79 +Move_VOLT_TACKLE:: loadspritegfx ANIM_TAG_SPARK loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_ELECTRICITY @@ -4546,7 +4546,7 @@ Move_VOLT_TACKLE:: @ 81CCD79 waitforvisualfinish end -Move_WATER_SPORT:: @ 81CCE71 +Move_WATER_SPORT:: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask AnimTask_WaterSport, 5, delay 8 @@ -4559,7 +4559,7 @@ Move_WATER_SPORT:: @ 81CCE71 panse_1B SE_M_SURF, 192, 63, 2, 0 end -Move_CALM_MIND:: @ 81CCE97 +Move_CALM_MIND:: loadspritegfx ANIM_TAG_THIN_RING monbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendExcept, 5, 0, 0, 0, 16, 0 @@ -4583,7 +4583,7 @@ Move_CALM_MIND:: @ 81CCE97 clearmonbg ANIM_ATK_PARTNER end -Move_LEAF_BLADE:: @ 81CCF17 +Move_LEAF_BLADE:: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_CROSS_IMPACT createvisualtask AnimTask_LeafBlade, 5, @@ -4608,7 +4608,7 @@ Move_LEAF_BLADE:: @ 81CCF17 blendoff end -Move_DRAGON_DANCE:: @ 81CCF9A +Move_DRAGON_DANCE:: loadspritegfx ANIM_TAG_HOLLOW_ORB monbg ANIM_ATTACKER monbgprio_28 0 @@ -4632,7 +4632,7 @@ Move_DRAGON_DANCE:: @ 81CCF9A delay 1 end -Move_SHOCK_WAVE:: @ 81CD009 +Move_SHOCK_WAVE:: loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_SPARK @@ -4662,13 +4662,13 @@ Move_SHOCK_WAVE:: @ 81CD009 blendoff end -Move_HARDEN:: @ 81CD0AB +Move_HARDEN:: loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish end -Move_BELLY_DRUM:: @ 81CD0C0 +Move_BELLY_DRUM:: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE createvisualtask AnimTask_MusicNotesRainbowBlend, 2, @@ -4701,17 +4701,17 @@ Move_BELLY_DRUM:: @ 81CD0C0 waitforvisualfinish end -BellyDrumLeft:: @ 81CD172 +BellyDrumLeft:: createsprite gBellyDrumHandSpriteTemplate, ANIM_ATTACKER, 3, 0 createvisualtask AnimTask_ShakeMon, 2, 0, 0, 8, 2, 1 return -BellyDrumRight:: @ 81CD18D +BellyDrumRight:: createsprite gBellyDrumHandSpriteTemplate, ANIM_ATTACKER, 3, 1 createvisualtask AnimTask_ShakeMon, 2, 0, 0, 8, 2, 1 return -Move_MIND_READER:: @ 81CD1A8 +Move_MIND_READER:: loadspritegfx ANIM_TAG_TEAL_ALERT loadspritegfx ANIM_TAG_OPENING_EYE loadspritegfx ANIM_TAG_ROUND_WHITE_HALO @@ -4727,7 +4727,7 @@ Move_MIND_READER:: @ 81CD1A8 clearmonbg 4 end -MindReaderEyeSpikeEffect:: @ 81CD1EF +MindReaderEyeSpikeEffect:: createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 70, 0, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 40, 40, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 10, -60, 6 @@ -4751,7 +4751,7 @@ MindReaderEyeSpikeEffect:: @ 81CD1EF delay 2 return -Move_ICE_PUNCH:: @ 81CD2E0 +Move_ICE_PUNCH:: monbg ANIM_DEF_PARTNER setalpha 12, 8 loadspritegfx ANIM_TAG_ICE_CRYSTALS @@ -4788,7 +4788,7 @@ Move_ICE_PUNCH:: @ 81CD2E0 blendoff end -Move_REST:: @ 81CD3CB +Move_REST:: playsewithpan SE_M_SNORE, 192 loadspritegfx ANIM_TAG_LETTER_Z createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 @@ -4799,7 +4799,7 @@ Move_REST:: @ 81CD3CB waitforvisualfinish end -Move_CONFUSION:: @ 81CD40B +Move_CONFUSION:: monbg ANIM_DEF_PARTNER call SetPsychicBackground setalpha 8, 8 @@ -4816,7 +4816,7 @@ Move_CONFUSION:: @ 81CD40B call UnsetPsychicBg end -Move_PSYCHIC:: @ 81CD46C +Move_PSYCHIC:: monbg ANIM_DEF_PARTNER call SetPsychicBackground setalpha 8, 8 @@ -4833,15 +4833,15 @@ Move_PSYCHIC:: @ 81CD46C call UnsetPsychicBg end -Move_FUTURE_SIGHT:: @ 81CD4CF +Move_FUTURE_SIGHT:: goto FutureSight -FutureSightContinue:: @ 81CD4D4 +FutureSightContinue:: waitforvisualfinish delay 1 call UnsetPsychicBg end -FutureSight:: @ 81CD4DD +FutureSight:: monbg ANIM_ATK_PARTNER playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground @@ -4868,7 +4868,7 @@ FutureSight:: @ 81CD4DD blendoff goto FutureSightContinue -Move_THUNDER:: @ 81CD570 +Move_THUNDER:: loadspritegfx ANIM_TAG_LIGHTNING fadetobg 11 waitbgfadeout @@ -4926,7 +4926,7 @@ Move_THUNDER:: @ 81CD570 waitbgfadein end -Move_THUNDER_PUNCH:: @ 81CD6CA +Move_THUNDER_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_LIGHTNING @@ -4959,7 +4959,7 @@ Move_THUNDER_PUNCH:: @ 81CD6CA blendoff end -Move_SACRED_FIRE:: @ 81CD793 +Move_SACRED_FIRE:: loadspritegfx ANIM_TAG_FIRE loadspritegfx ANIM_TAG_FIRE_PLUME loopsewithpan SE_M_SACRED_FIRE, 192, 7, 5 @@ -5016,7 +5016,7 @@ Move_SACRED_FIRE:: @ 81CD793 waitforvisualfinish end -Move_SCRATCH:: @ 81CD97A +Move_SCRATCH:: loadspritegfx ANIM_TAG_SCRATCH monbg 1 setalpha 12, 8 @@ -5029,7 +5029,7 @@ Move_SCRATCH:: @ 81CD97A waitforvisualfinish end -Move_DRAGON_BREATH:: @ 81CD9AC +Move_DRAGON_BREATH:: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_28 1 @@ -5063,7 +5063,7 @@ Move_DRAGON_BREATH:: @ 81CD9AC clearmonbg ANIM_DEF_PARTNER end -Move_ROAR:: @ 81CDAC0 +Move_ROAR:: loadspritegfx ANIM_TAG_NOISE_LINE monbg ANIM_ATTACKER monbgprio_28 0 @@ -5081,7 +5081,7 @@ Move_ROAR:: @ 81CDAC0 waitforvisualfinish end -RoarEffect:: @ 81CDB06 +RoarEffect:: createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1 @@ -5091,7 +5091,7 @@ RoarEffect:: @ 81CDB06 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1 return -Move_GROWL:: @ 81CDB57 +Move_GROWL:: loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask SoundTask_PlayDoubleCry, 2, 0, 255 call RoarEffect @@ -5103,7 +5103,7 @@ Move_GROWL:: @ 81CDB57 waitforvisualfinish end -Move_SNORE:: @ 81CDB98 +Move_SNORE:: loadspritegfx ANIM_TAG_SNORE_Z monbg ANIM_ATK_PARTNER setalpha 8, 8 @@ -5115,7 +5115,7 @@ Move_SNORE:: @ 81CDB98 blendoff end -SnoreEffect:: @ 81CDBB1 +SnoreEffect:: playsewithpan SE_M_SNORE, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 7, 0, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 7, 1 @@ -5125,7 +5125,7 @@ SnoreEffect:: @ 81CDBB1 createsprite gSnoreZSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 42, -38, 24, 0, 0 return -Move_LIGHT_SCREEN:: @ 81CDC28 +Move_LIGHT_SCREEN:: loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 @@ -5138,7 +5138,7 @@ Move_LIGHT_SCREEN:: @ 81CDC28 blendoff end -SpecialScreenSparkle:: @ 81CDC4F +SpecialScreenSparkle:: createsprite gSpecialScreenSparkleSpriteTemplate, ANIM_ATTACKER, 2, 23, 0, 0, 1 delay 6 createsprite gSpecialScreenSparkleSpriteTemplate, ANIM_ATTACKER, 2, 31, -8, 0, 1 @@ -5152,7 +5152,7 @@ SpecialScreenSparkle:: @ 81CDC4F createsprite gSpecialScreenSparkleSpriteTemplate, ANIM_ATTACKER, 2, 10, 18, 0, 1 return -Move_MIRROR_COAT:: @ 81CDCB4 +Move_MIRROR_COAT:: loadspritegfx ANIM_TAG_SPARKLE_3 loadspritegfx ANIM_TAG_RED_LIGHT_WALL setalpha 0, 16 @@ -5165,7 +5165,7 @@ Move_MIRROR_COAT:: @ 81CDCB4 blendoff end -Move_REFLECT:: @ 81CDCDA +Move_REFLECT:: loadspritegfx ANIM_TAG_SPARKLE_4 loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 @@ -5182,7 +5182,7 @@ Move_REFLECT:: @ 81CDCDA blendoff end -Move_BARRIER:: @ 81CDD2D +Move_BARRIER:: loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_M_BARRIER, 192, 15 @@ -5192,7 +5192,7 @@ Move_BARRIER:: @ 81CDD2D blendoff end -Move_BUBBLE:: @ 81CDD4A +Move_BUBBLE:: loadspritegfx ANIM_TAG_BUBBLE loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg 1 @@ -5228,7 +5228,7 @@ Move_BUBBLE:: @ 81CDD4A blendoff end -Move_SMOG:: @ 81CDE20 +Move_SMOG:: loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD monbg ANIM_DEF_PARTNER monbgprio_29 @@ -5251,12 +5251,12 @@ Move_SMOG:: @ 81CDE20 blendoff end -SmogCloud:: @ 81CDE85 +SmogCloud:: createsprite gSmogCloudSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 48, 240, 1, 0 delay 7 return -Move_FAINT_ATTACK:: @ 81CDE9B +Move_FAINT_ATTACK:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_ATTACKER fadetobg 1 @@ -5292,7 +5292,7 @@ Move_FAINT_ATTACK:: @ 81CDE9B waitbgfadein end -Move_SAND_ATTACK:: @ 81CDF22 +Move_SAND_ATTACK:: loadspritegfx ANIM_TAG_MUD_SAND monbg ANIM_ATK_PARTNER monbgprio_28 0 @@ -5312,7 +5312,7 @@ Move_SAND_ATTACK:: @ 81CDF22 blendoff end -SandAttackDirt:: @ 81CDF72 +SandAttackDirt:: createsprite gSandAttackDirtSpriteTemplate, ANIM_TARGET, 2, 15, 15, 20, 0, 0 createsprite gSandAttackDirtSpriteTemplate, ANIM_TARGET, 2, 15, 15, 20, 10, 10 createsprite gSandAttackDirtSpriteTemplate, ANIM_TARGET, 2, 15, 15, 20, -10, -10 @@ -5321,7 +5321,7 @@ SandAttackDirt:: @ 81CDF72 delay 2 return -Move_MUD_SLAP:: @ 81CDFCA +Move_MUD_SLAP:: loadspritegfx ANIM_TAG_MUD_SAND playsewithpan SE_M_SAND_ATTACK, 192 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 @@ -5336,7 +5336,7 @@ Move_MUD_SLAP:: @ 81CDFCA waitforvisualfinish end -MudSlapMud:: @ 81CE010 +MudSlapMud:: createsprite gMudSlapMudSpriteTemplate, ANIM_TARGET, 2, 15, 15, 20, 0, 0 createsprite gMudSlapMudSpriteTemplate, ANIM_TARGET, 2, 15, 15, 20, 10, 5 createsprite gMudSlapMudSpriteTemplate, ANIM_TARGET, 2, 15, 15, 20, -10, -5 @@ -5345,7 +5345,7 @@ MudSlapMud:: @ 81CE010 delay 2 return -Move_DRAGON_RAGE:: @ 81CE068 +Move_DRAGON_RAGE:: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_FIRE_PLUME playsewithpan SE_M_DRAGON_RAGE, 192 @@ -5377,7 +5377,7 @@ Move_DRAGON_RAGE:: @ 81CE068 waitforvisualfinish end -Move_RAIN_DANCE:: @ 81CE145 +Move_RAIN_DANCE:: loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_M_RAIN_DANCE, 192 createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK @@ -5391,7 +5391,7 @@ Move_RAIN_DANCE:: @ 81CE145 waitforvisualfinish end -Move_BITE:: @ 81CE190 +Move_BITE:: loadspritegfx ANIM_TAG_SHARP_TEETH loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -5408,7 +5408,7 @@ Move_BITE:: @ 81CE190 delay 1 end -Move_CRUNCH:: @ 81CE1EE +Move_CRUNCH:: loadspritegfx ANIM_TAG_SHARP_TEETH loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -5436,7 +5436,7 @@ Move_CRUNCH:: @ 81CE1EE waitbgfadein end -Move_CLAMP:: @ 81CE29E +Move_CLAMP:: loadspritegfx ANIM_TAG_CLAMP loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -5453,7 +5453,7 @@ Move_CLAMP:: @ 81CE29E waitforvisualfinish end -Move_ICE_BEAM:: @ 81CE2FB +Move_ICE_BEAM:: monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -5491,20 +5491,20 @@ Move_ICE_BEAM:: @ 81CE2FB blendoff end -IceBeamCreateCrystals:: @ 81CE3FC +IceBeamCreateCrystals:: createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 20, 12, 0, 12, 20 createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 20, -12, 0, -12, 20 createsprite gIceBeamInnerCrystalSpriteTemplate, ANIM_ATTACKER, 2, 20, 0, 0, 0, 11 delay 1 return -Move_WITHDRAW:: @ 81CE432 +Move_WITHDRAW:: playsewithpan SE_M_HEADBUTT, 192 createvisualtask AnimTask_Withdraw, 5, waitforvisualfinish end -Move_AURORA_BEAM:: @ 81CE43F +Move_AURORA_BEAM:: loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg 20 waitbgfadein @@ -5530,7 +5530,7 @@ Move_AURORA_BEAM:: @ 81CE43F waitbgfadein end -AuroraBeamCreateRings:: @ 81CE4C6 +AuroraBeamCreateRings:: createsprite gAuroraBeamRingSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 17 delay 1 createsprite gAuroraBeamRingSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 17 @@ -5541,14 +5541,14 @@ AuroraBeamCreateRings:: @ 81CE4C6 delay 1 return -Move_SOLAR_BEAM:: @ 81CE513 +Move_SOLAR_BEAM:: loadspritegfx ANIM_TAG_ORBS choosetwoturnanim SolarBeamSetUp, SolarBeamUnleash -SolarBeamEnd:: @ 81CE51F +SolarBeamEnd:: waitforvisualfinish end -SolarBeamSetUp:: @ 81CE521 +SolarBeamSetUp:: monbg ANIM_ATK_PARTNER setalpha 12, 8 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 1, 4, 0, 11, 12287 @@ -5559,7 +5559,7 @@ SolarBeamSetUp:: @ 81CE521 blendoff goto SolarBeamEnd -SolarBeamAbsorbEffect:: @ 81CE54B +SolarBeamAbsorbEffect:: createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 40, 16 delay 2 createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -40, -40, 16 @@ -5590,7 +5590,7 @@ SolarBeamAbsorbEffect:: @ 81CE54B delay 2 return -SolarBeamUnleash:: @ 81CE61E +SolarBeamUnleash:: call SetSolarbeamBg panse_1B SE_M_SOLAR_BEAM, 192, 63, 2, 0 createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5, @@ -5617,7 +5617,7 @@ SolarBeamUnleash:: @ 81CE61E call UnsetSolarbeamBg goto SolarBeamEnd -SolarBeamUnleash1:: @ 81CE6F0 +SolarBeamUnleash1:: createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 @@ -5634,14 +5634,14 @@ SolarBeamUnleash1:: @ 81CE6F0 delay 4 return -Move_BLIZZARD:: @ 81CE768 +Move_BLIZZARD:: loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER createvisualtask AnimTask_GetAttackerSide, 2, jumpargeq 7, 1, BlizzardOnPlayer fadetobg BG_HIGHSPEED_OPPONENT -BlizzardContinue:: @ 81CE77E +BlizzardContinue:: waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, -2304, 0, 1, -1 waitbgfadein @@ -5661,7 +5661,7 @@ BlizzardContinue:: @ 81CE77E waitbgfadein end -BlizzardIceCrystals:: @ 81CE7B8 +BlizzardIceCrystals:: createsprite gSwirlingSnowballSpriteTemplate, ANIM_ATTACKER, 40, 0, -10, 0, -10, 72, 1 createsprite gBlizzardIceCrystalSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0, 80, 0, 0, 1 delay 3 @@ -5685,11 +5685,11 @@ BlizzardIceCrystals:: @ 81CE7B8 delay 3 return -BlizzardOnPlayer:: @ 81CE8ED +BlizzardOnPlayer:: fadetobg BG_HIGHSPEED_PLAYER goto BlizzardContinue -Move_POWDER_SNOW:: @ 81CE8F4 +Move_POWDER_SNOW:: loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 0, 3, 0 @@ -5707,7 +5707,7 @@ Move_POWDER_SNOW:: @ 81CE8F4 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 3, 0, 0 end -PowderSnowSnowballs:: @ 81CE93E +PowderSnowSnowballs:: createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 0, 0, 0, 0, 56, 4, 4, 1 delay 3 createsprite gPowderSnowSnowballSpriteTemplate, ANIM_ATTACKER, 40, 0, -10, 0, -10, 56, 4, 4, 1 @@ -5724,7 +5724,7 @@ PowderSnowSnowballs:: @ 81CE93E delay 3 return -Move_HYDRO_PUMP:: @ 81CE9EE +Move_HYDRO_PUMP:: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -5759,7 +5759,7 @@ Move_HYDRO_PUMP:: @ 81CE9EE blendoff end -HydroPumpBeams:: @ 81CEA8D +HydroPumpBeams:: createsprite gHydroPumpOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, 10, 0, 16 createsprite gHydroPumpOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, 10, 0, -16 delay 1 @@ -5768,12 +5768,12 @@ HydroPumpBeams:: @ 81CEA8D delay 1 return -HydroPumpHitSplats:: @ 81CEACE +HydroPumpHitSplats:: createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 15, 1, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, -15, 1, 1 return -Move_SIGNAL_BEAM:: @ 81CEAED +Move_SIGNAL_BEAM:: loadspritegfx ANIM_TAG_GLOWY_RED_ORB loadspritegfx ANIM_TAG_GLOWY_GREEN_ORB loadspritegfx ANIM_TAG_DUCK @@ -5809,13 +5809,13 @@ Move_SIGNAL_BEAM:: @ 81CEAED waitforvisualfinish end -SignalBeamOrbs:: @ 81CEBB4 +SignalBeamOrbs:: createsprite gSignalBeamRedOrbSpriteTemplate, ANIM_TARGET, 3, 10, 10, 0, 16 createsprite gSignalBeamGreenOrbSpriteTemplate, ANIM_TARGET, 3, 10, 10, 0, -16 delay 1 return -Move_ABSORB:: @ 81CEBD5 +Move_ABSORB:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT @@ -5841,7 +5841,7 @@ Move_ABSORB:: @ 81CEBD5 blendoff end -AbsorbEffect:: @ 81CEC44 +AbsorbEffect:: playsewithpan SE_M_CRABHAMMER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 delay 4 @@ -5868,7 +5868,7 @@ AbsorbEffect:: @ 81CEC44 delay 4 return -Move_MEGA_DRAIN:: @ 81CECED +Move_MEGA_DRAIN:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT @@ -5894,7 +5894,7 @@ Move_MEGA_DRAIN:: @ 81CECED blendoff end -MegaDrainAbsorbEffect:: @ 81CED5C +MegaDrainAbsorbEffect:: playsewithpan SE_M_BUBBLE3, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -20, 35 @@ -5929,7 +5929,7 @@ MegaDrainAbsorbEffect:: @ 81CED5C delay 4 return -Move_GIGA_DRAIN:: @ 81CEE7D +Move_GIGA_DRAIN:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_IMPACT @@ -5955,7 +5955,7 @@ Move_GIGA_DRAIN:: @ 81CEE7D blendoff end -GigaDrainAbsorbEffect:: @ 81CEEEC +GigaDrainAbsorbEffect:: playsewithpan SE_M_GIGA_DRAIN, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 @@ -5998,7 +5998,7 @@ GigaDrainAbsorbEffect:: @ 81CEEEC delay 4 return -Move_LEECH_LIFE:: @ 81CF085 +Move_LEECH_LIFE:: loadspritegfx ANIM_TAG_NEEDLE loadspritegfx ANIM_TAG_ORBS delay 1 @@ -6028,7 +6028,7 @@ Move_LEECH_LIFE:: @ 81CF085 blendoff end -Move_SYNTHESIS:: @ 81CF107 +Move_SYNTHESIS:: loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 16, 19451 @@ -6039,7 +6039,7 @@ Move_SYNTHESIS:: @ 81CF107 waitforvisualfinish end -Move_TOXIC:: @ 81CF131 +Move_TOXIC:: loadspritegfx ANIM_TAG_TOXIC_BUBBLE loadspritegfx ANIM_TAG_POISON_BUBBLE call ToxicBubbles @@ -6050,7 +6050,7 @@ Move_TOXIC:: @ 81CF131 waitforvisualfinish end -ToxicBubbles:: @ 81CF14B +ToxicBubbles:: createsprite gToxicBubbleSpriteTemplate, ANIM_TARGET, 2, -24, 16, 1, 1 playsewithpan SE_M_TOXIC, 63 delay 15 @@ -6065,7 +6065,7 @@ ToxicBubbles:: @ 81CF14B delay 15 return -Move_SLUDGE:: @ 81CF1A0 +Move_SLUDGE:: loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_M_BUBBLE3, 192 createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 @@ -6076,7 +6076,7 @@ Move_SLUDGE:: @ 81CF1A0 waitforvisualfinish end -Move_SLUDGE_BOMB:: @ 81CF1E2 +Move_SLUDGE_BOMB:: loadspritegfx ANIM_TAG_POISON_BUBBLE call SludgeBombProjectile call SludgeBombProjectile @@ -6114,13 +6114,13 @@ Move_SLUDGE_BOMB:: @ 81CF1E2 waitforvisualfinish end -SludgeBombProjectile:: @ 81CF2F2 +SludgeBombProjectile:: playsewithpan SE_M_BUBBLE3, 192 createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0 delay 3 return -Move_ACID:: @ 81CF308 +Move_ACID:: loadspritegfx ANIM_TAG_POISON_BUBBLE monbg ANIM_DEF_PARTNER createsprite gAcidPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0 @@ -6153,7 +6153,7 @@ Move_ACID:: @ 81CF308 clearmonbg ANIM_DEF_PARTNER end -Move_BONEMERANG:: @ 81CF402 +Move_BONEMERANG:: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6173,7 +6173,7 @@ Move_BONEMERANG:: @ 81CF402 blendoff end -Move_BONE_CLUB:: @ 81CF456 +Move_BONE_CLUB:: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6191,7 +6191,7 @@ Move_BONE_CLUB:: @ 81CF456 blendoff end -Move_BONE_RUSH:: @ 81CF4B8 +Move_BONE_RUSH:: loadspritegfx ANIM_TAG_BONE loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6207,7 +6207,7 @@ Move_BONE_RUSH:: @ 81CF4B8 blendoff end -Move_SPIKES:: @ 81CF503 +Move_SPIKES:: loadspritegfx ANIM_TAG_SPIKES monbg ANIM_DEF_PARTNER playsewithpan SE_M_JUMP_KICK, 192 @@ -6224,7 +6224,7 @@ Move_SPIKES:: @ 81CF503 clearmonbg ANIM_DEF_PARTNER end -Move_MEGAHORN:: @ 81CF55A +Move_MEGAHORN:: loadspritegfx ANIM_TAG_HORN_HIT_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6233,7 +6233,7 @@ Move_MEGAHORN:: @ 81CF55A fadetobg 7 waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, -2304, 768, 1, -1 -MegahornContinue:: @ 81CF57D +MegahornContinue:: waitbgfadein setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 2, 0, 15, 1 @@ -6263,13 +6263,13 @@ MegahornContinue:: @ 81CF57D waitbgfadein end -MegahornInContest:: @ 81CF631 +MegahornInContest:: fadetobg 8 waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, 2304, 768, 0, -1 goto MegahornContinue -Move_GUST:: @ 81CF648 +Move_GUST:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6287,7 +6287,7 @@ Move_GUST:: @ 81CF648 blendoff end -Move_WING_ATTACK:: @ 81CF699 +Move_WING_ATTACK:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6311,7 +6311,7 @@ Move_WING_ATTACK:: @ 81CF699 blendoff end -Move_PECK:: @ 81CF736 +Move_PECK:: loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_M_HORN_ATTACK, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 3, -768, 1, 2 @@ -6319,7 +6319,7 @@ Move_PECK:: @ 81CF736 waitforvisualfinish end -Move_AEROBLAST:: @ 81CF75D +Move_AEROBLAST:: loadspritegfx ANIM_TAG_AIR_WAVE_2 loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6342,7 +6342,7 @@ Move_AEROBLAST:: @ 81CF75D call UnsetSkyBg end -AeroblastBeam:: @ 81CF7B9 +AeroblastBeam:: playsewithpan SE_M_JUMP_KICK, 192 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 14, -12, 0, -12, 15, 0, 0 createsprite gAirWaveCrescentSpriteTemplate, ANIM_ATTACKER, 2, 26, 8, 12, 8, 15, 0, 0 @@ -6361,7 +6361,7 @@ AeroblastBeam:: @ 81CF7B9 delay 3 return -Move_WATER_GUN:: @ 81CF87A +Move_WATER_GUN:: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -6385,7 +6385,7 @@ Move_WATER_GUN:: @ 81CF87A blendoff end -Move_CRABHAMMER:: @ 81CF907 +Move_CRABHAMMER:: loadspritegfx ANIM_TAG_ICE_CRYSTALS loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -6422,14 +6422,14 @@ Move_CRABHAMMER:: @ 81CF907 blendoff end -Move_SURF:: @ 81CFA01 +Move_SURF:: createvisualtask AnimTask_CreateSurfWave, 2, 0 delay 24 panse_1B SE_M_SURF, 192, 63, 2, 0 waitforvisualfinish end -Move_FLAMETHROWER:: @ 81CFA15 +Move_FLAMETHROWER:: loadspritegfx ANIM_TAG_SMALL_EMBER monbg ANIM_DEF_PARTNER monbgprio_28 1 @@ -6455,14 +6455,14 @@ Move_FLAMETHROWER:: @ 81CFA15 blendoff end -FlamethrowerCreateFlames:: @ 81CFA8F +FlamethrowerCreateFlames:: createsprite gFlamethrowerFlameSpriteTemplate, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 createsprite gFlamethrowerFlameSpriteTemplate, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 return -Move_SANDSTORM:: @ 81CFAB2 +Move_SANDSTORM:: loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_M_SANDSTORM, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, 0 @@ -6482,7 +6482,7 @@ Move_SANDSTORM:: @ 81CFAB2 createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 60, 2560, 96, 0 end -Move_WHIRLPOOL:: @ 81CFB3A +Move_WHIRLPOOL:: loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_DEF_PARTNER monbgprio_28 1 @@ -6500,7 +6500,7 @@ Move_WHIRLPOOL:: @ 81CFB3A clearmonbg ANIM_DEF_PARTNER end -WhirlpoolEffect:: @ 81CFB92 +WhirlpoolEffect:: createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0, 28, 384, 50, 8, 50, 1 delay 2 createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0, 32, 240, 40, 11, -46, 1 @@ -6515,20 +6515,20 @@ WhirlpoolEffect:: @ 81CFB92 delay 2 return -Move_FLY:: @ 81CFC1D +Move_FLY:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim FlySetUp, FlyUnleash -FlyEnd:: @ 81CFC2C +FlyEnd:: waitforvisualfinish end -FlySetUp:: @ 81CFC2E +FlySetUp:: playsewithpan SE_M_FLY, 192 createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336 goto FlyEnd -FlyUnleash:: @ 81CFC46 +FlyUnleash:: monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_M_DOUBLE_TEAM, 192 @@ -6542,19 +6542,19 @@ FlyUnleash:: @ 81CFC46 blendoff goto FlyEnd -Move_BOUNCE:: @ 81CFC87 +Move_BOUNCE:: loadspritegfx ANIM_TAG_ROUND_SHADOW loadspritegfx ANIM_TAG_IMPACT choosetwoturnanim BounceSetUp, BounceUnleash -BounceEnd:: @ 81CFC96 +BounceEnd:: end -BounceSetUp:: @ 81CFC97 +BounceSetUp:: playsewithpan SE_M_TELEPORT, 192 createsprite gBounceBallShrinkSpriteTemplate, ANIM_ATTACKER, 2, 0, 0 goto BounceEnd -BounceUnleash:: @ 81CFCAB +BounceUnleash:: monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_M_SWAGGER, 63 @@ -6568,7 +6568,7 @@ BounceUnleash:: @ 81CFCAB blendoff goto BounceEnd -Move_KARATE_CHOP:: @ 81CFCEA +Move_KARATE_CHOP:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6585,7 +6585,7 @@ Move_KARATE_CHOP:: @ 81CFCEA blendoff end -Move_CROSS_CHOP:: @ 81CFD3C +Move_CROSS_CHOP:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_CROSS_IMPACT monbg ANIM_DEF_PARTNER @@ -6603,7 +6603,7 @@ Move_CROSS_CHOP:: @ 81CFD3C blendoff end -Move_JUMP_KICK:: @ 81CFDA5 +Move_JUMP_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6621,7 +6621,7 @@ Move_JUMP_KICK:: @ 81CFDA5 blendoff end -Move_HI_JUMP_KICK:: @ 81CFE02 +Move_HI_JUMP_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6647,7 +6647,7 @@ Move_HI_JUMP_KICK:: @ 81CFE02 blendoff end -Move_DOUBLE_KICK:: @ 81CFE98 +Move_DOUBLE_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6661,7 +6661,7 @@ Move_DOUBLE_KICK:: @ 81CFE98 blendoff end -Move_TRIPLE_KICK:: @ 81CFECB +Move_TRIPLE_KICK:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6670,31 +6670,31 @@ Move_TRIPLE_KICK:: @ 81CFECB jumpifmoveturn 0, TripleKickLeft jumpifmoveturn 1, TripleKickRight goto TripleKickCenter -TripleKickContinue:: @ 81CFEEB +TripleKickContinue:: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -TripleKickLeft:: @ 81CFEF0 +TripleKickLeft:: createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, -16, -8, 20, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -16, -16, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 goto TripleKickContinue -TripleKickRight:: @ 81CFF26 +TripleKickRight:: createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 8, 8, 20, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 goto TripleKickContinue -TripleKickCenter:: @ 81CFF5C +TripleKickCenter:: createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 20, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -8, 1, 1 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 goto TripleKickContinue -Move_DYNAMIC_PUNCH:: @ 81CFF92 +Move_DYNAMIC_PUNCH:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_EXPLOSION @@ -6728,7 +6728,7 @@ Move_DYNAMIC_PUNCH:: @ 81CFF92 blendoff end -Move_COUNTER:: @ 81D005A +Move_COUNTER:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_DEF_PARTNER @@ -6760,7 +6760,7 @@ Move_COUNTER:: @ 81D005A blendoff end -Move_VITAL_THROW:: @ 81D0129 +Move_VITAL_THROW:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -6783,7 +6783,7 @@ Move_VITAL_THROW:: @ 81D0129 blendoff end -Move_ROCK_SMASH:: @ 81D01A4 +Move_ROCK_SMASH:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -6810,7 +6810,7 @@ Move_ROCK_SMASH:: @ 81D01A4 blendoff end -Move_SUBMISSION:: @ 81D029C +Move_SUBMISSION:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -6834,7 +6834,7 @@ Move_SUBMISSION:: @ 81D029C blendoff end -SubmissionHit:: @ 81D030B +SubmissionHit:: createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, -12, 1, 1 delay 8 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, 8, 1, 1 @@ -6843,7 +6843,7 @@ SubmissionHit:: @ 81D030B delay 8 return -Move_SUNNY_DAY:: @ 81D033F +Move_SUNNY_DAY:: loadspritegfx ANIM_TAG_SUNLIGHT monbg ANIM_ATK_PARTNER setalpha 13, 3 @@ -6861,12 +6861,12 @@ Move_SUNNY_DAY:: @ 81D033F blendoff end -SunnyDayLightRay:: @ 81D038B +SunnyDayLightRay:: createsprite gSunlightRaySpriteTemplate, ANIM_ATTACKER, 40 delay 6 return -Move_COTTON_SPORE:: @ 81D0395 +Move_COTTON_SPORE:: loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER monbgprio_28 1 @@ -6878,7 +6878,7 @@ Move_COTTON_SPORE:: @ 81D0395 clearmonbg ANIM_DEF_PARTNER end -CreateCottonSpores:: @ 81D03B5 +CreateCottonSpores:: createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, 85, 80, 0 delay 12 createsprite gSporeParticleSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 170, 80, 0 @@ -6887,7 +6887,7 @@ CreateCottonSpores:: @ 81D03B5 delay 12 return -Move_SPORE:: @ 81D03EF +Move_SPORE:: loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -6902,7 +6902,7 @@ Move_SPORE:: @ 81D03EF blendoff end -CreateSpore:: @ 81D041A +CreateSpore:: createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -20, 85, 80, 1 delay 12 createsprite gSporeParticleSpriteTemplate, ANIM_TARGET, 2, 0, -10, 170, 80, 1 @@ -6911,7 +6911,7 @@ CreateSpore:: @ 81D041A delay 12 return -Move_PETAL_DANCE:: @ 81D0454 +Move_PETAL_DANCE:: loadspritegfx ANIM_TAG_FLOWER loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -6949,7 +6949,7 @@ Move_PETAL_DANCE:: @ 81D0454 blendoff end -Move_RAZOR_LEAF:: @ 81D058C +Move_RAZOR_LEAF:: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT @@ -6989,7 +6989,7 @@ Move_RAZOR_LEAF:: @ 81D058C blendoff end -Move_ANCIENT_POWER:: @ 81D0693 +Move_ANCIENT_POWER:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -7022,7 +7022,7 @@ Move_ANCIENT_POWER:: @ 81D0693 blendoff end -Move_OCTAZOOKA:: @ 81D07BB +Move_OCTAZOOKA:: loadspritegfx ANIM_TAG_GRAY_SMOKE loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_M_MEGA_KICK2, 192 @@ -7039,7 +7039,7 @@ Move_OCTAZOOKA:: @ 81D07BB waitforvisualfinish end -Move_MIST:: @ 81D0821 +Move_MIST:: loadspritegfx ANIM_TAG_MIST_CLOUD monbg ANIM_ATK_PARTNER setalpha 12, 8 @@ -7058,12 +7058,12 @@ Move_MIST:: @ 81D0821 blendoff end -MistCloud:: @ 81D086C +MistCloud:: createsprite gMistCloudSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 48, 240, 0, 1 delay 7 return -Move_HAZE:: @ 81D0882 +Move_HAZE:: waitforvisualfinish playsewithpan SE_M_HAZE, 0 createvisualtask AnimTask_Haze1, 5, @@ -7073,7 +7073,7 @@ Move_HAZE:: @ 81D0882 createvisualtask AnimTask_BlendSelected, 10, 0 | (0xF << 7), 1, 16, 0, RGB_BLACK end -Move_FIRE_PUNCH:: @ 81D08B5 +Move_FIRE_PUNCH:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_IMPACT @@ -7099,7 +7099,7 @@ Move_FIRE_PUNCH:: @ 81D08B5 blendoff end -FireSpreadEffect:: @ 81D0950 +FireSpreadEffect:: createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, 192, 176, 40 createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, -192, 240, 40 createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, 192, -160, 40 @@ -7109,7 +7109,7 @@ FireSpreadEffect:: @ 81D0950 createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, 112, -128, 40 return -Move_LEER:: @ 81D09C8 +Move_LEER:: loadspritegfx ANIM_TAG_LEER monbg ANIM_ATTACKER monbgprio_28 0 @@ -7128,7 +7128,7 @@ Move_LEER:: @ 81D09C8 waitforvisualfinish end -Move_DREAM_EATER:: @ 81D0A1F +Move_DREAM_EATER:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER @@ -7153,7 +7153,7 @@ Move_DREAM_EATER:: @ 81D0A1F call UnsetPsychicBg end -DreamEaterAbsorb:: @ 81D0A89 +DreamEaterAbsorb:: playsewithpan SE_M_SWAGGER, 63 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 0, 5, 8, 26 createsprite gAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 3, 5, -18, -40, 35 @@ -7196,7 +7196,7 @@ DreamEaterAbsorb:: @ 81D0A89 delay 4 return -Move_POISON_GAS:: @ 81D0C22 +Move_POISON_GAS:: loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 @@ -7230,27 +7230,27 @@ Move_POISON_GAS:: @ 81D0C22 delay 0 end -Move_BIND:: @ 81D0D00 +Move_BIND:: createvisualtask AnimTask_SwayMon, 5, 0, 6, 3328, 4, 0 goto BindWrap -BindWrap:: @ 81D0D16 +BindWrap:: playsewithpan SE_M_BIND, 63 call BindWrapSqueezeTarget call BindWrapSqueezeTarget waitforvisualfinish end -BindWrapSqueezeTarget:: @ 81D0D26 +BindWrapSqueezeTarget:: createvisualtask AnimTask_ScaleMonAndRestore, 5, 10, -5, 5, 1, 0 delay 16 return -Move_WRAP:: @ 81D0D3A +Move_WRAP:: createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 6, 4, 2, 4 goto BindWrap -Move_PSYBEAM:: @ 81D0D50 +Move_PSYBEAM:: loadspritegfx ANIM_TAG_GOLD_RING playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground @@ -7273,12 +7273,12 @@ Move_PSYBEAM:: @ 81D0D50 call UnsetPsychicBg end -PsybeamRings:: @ 81D0DD4 +PsybeamRings:: createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 13, 0 delay 4 return -Move_HYPNOSIS:: @ 81D0DEA +Move_HYPNOSIS:: loadspritegfx ANIM_TAG_GOLD_RING call SetPsychicBackground call HypnosisRings @@ -7290,14 +7290,14 @@ Move_HYPNOSIS:: @ 81D0DEA call UnsetPsychicBg end -HypnosisRings:: @ 81D0E1D +HypnosisRings:: playsewithpan SE_M_SUPERSONIC, 192 createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 0, 8, 27, 0 createsprite gGoldRingSpriteTemplate, ANIM_TARGET, 2, 16, -8, 0, -8, 27, 0 delay 6 return -Move_PSYWAVE:: @ 81D0E4A +Move_PSYWAVE:: loadspritegfx ANIM_TAG_BLUE_RING playsewithpan SE_M_PSYBEAM, 192 call SetPsychicBackground @@ -7315,14 +7315,14 @@ Move_PSYWAVE:: @ 81D0E4A call UnsetPsychicBg end -PsywaveRings:: @ 81D0EAD +PsywaveRings:: createsprite gPsywaveRingSpriteTemplate, ANIM_TARGET, 3, 10, 10, 0, 16 delay 4 createsprite gPsywaveRingSpriteTemplate, ANIM_TARGET, 3, 10, 10, 0, 16 delay 4 return -Move_ZAP_CANNON:: @ 81D0ED0 +Move_ZAP_CANNON:: loadspritegfx ANIM_TAG_BLACK_BALL_2 loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_M_THUNDER_WAVE, 192 @@ -7343,7 +7343,7 @@ Move_ZAP_CANNON:: @ 81D0ED0 waitforvisualfinish end -Move_STEEL_WING:: @ 81D0FB5 +Move_STEEL_WING:: loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_M_HARDEN, 192, 28, 2 @@ -7370,7 +7370,7 @@ Move_STEEL_WING:: @ 81D0FB5 blendoff end -Move_IRON_TAIL:: @ 81D1064 +Move_IRON_TAIL:: loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 @@ -7389,7 +7389,7 @@ Move_IRON_TAIL:: @ 81D1064 waitforvisualfinish end -Move_POISON_TAIL:: @ 81D10C2 +Move_POISON_TAIL:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_M_HARDEN, 192, 28, 2 @@ -7410,7 +7410,7 @@ Move_POISON_TAIL:: @ 81D10C2 waitforvisualfinish end -Move_METAL_CLAW:: @ 81D1128 +Move_METAL_CLAW:: loadspritegfx ANIM_TAG_CLAW_SLASH loopsewithpan SE_M_HARDEN, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 @@ -7431,7 +7431,7 @@ Move_METAL_CLAW:: @ 81D1128 waitforvisualfinish end -Move_NIGHT_SHADE:: @ 81D11BB +Move_NIGHT_SHADE:: monbg ANIM_ATTACKER monbgprio_28 0 playsewithpan SE_M_PSYBEAM, 192 @@ -7450,7 +7450,7 @@ Move_NIGHT_SHADE:: @ 81D11BB waitbgfadein end -Move_EGG_BOMB:: @ 81D1203 +Move_EGG_BOMB:: loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_LARGE_FRESH_EGG playsewithpan SE_M_TAIL_WHIP, 192 @@ -7475,7 +7475,7 @@ Move_EGG_BOMB:: @ 81D1203 waitforvisualfinish end -Move_SHADOW_BALL:: @ 81D129D +Move_SHADOW_BALL:: loadspritegfx ANIM_TAG_SHADOW_BALL fadetobg 2 waitbgfadein @@ -7490,7 +7490,7 @@ Move_SHADOW_BALL:: @ 81D129D waitbgfadein end -Move_LICK:: @ 81D12E0 +Move_LICK:: loadspritegfx ANIM_TAG_LICK delay 15 playsewithpan SE_M_LICK, 63 @@ -7499,7 +7499,7 @@ Move_LICK:: @ 81D12E0 waitforvisualfinish end -Move_FOCUS_ENERGY:: @ 81D1307 +Move_FOCUS_ENERGY:: loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_M_DRAGON_RAGE, 192 call EndureEffect @@ -7512,18 +7512,18 @@ Move_FOCUS_ENERGY:: @ 81D1307 waitforvisualfinish end -Move_BIDE:: @ 81D1347 +Move_BIDE:: choosetwoturnanim BattleAnimScript_Bide_Setup, BattleAnimScript_Bide_Release end -BattleAnimScript_Bide_Setup:: @ 81D1351 +BattleAnimScript_Bide_Setup:: loopsewithpan SE_M_TAKE_DOWN, 192, 9, 2 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 waitforvisualfinish end -BattleAnimScript_Bide_Release:: @ 81D137D +BattleAnimScript_Bide_Release:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -7553,7 +7553,7 @@ BattleAnimScript_Bide_Release:: @ 81D137D blendoff end -Move_STRING_SHOT:: @ 81D1446 +Move_STRING_SHOT:: loadspritegfx ANIM_TAG_STRING loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER @@ -7593,12 +7593,12 @@ Move_STRING_SHOT:: @ 81D1446 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, 0 end -StringShotThread:: @ 81D1504 +StringShotThread:: createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 1 delay 1 return -Move_SPIDER_WEB:: @ 81D1518 +Move_SPIDER_WEB:: loadspritegfx ANIM_TAG_SPIDER_WEB loadspritegfx ANIM_TAG_WEB_THREAD monbg ANIM_DEF_PARTNER @@ -7630,19 +7630,19 @@ Move_SPIDER_WEB:: @ 81D1518 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, 0 end -SpiderWebThread:: @ 81D15A5 +SpiderWebThread:: createsprite gWebThreadSpriteTemplate, ANIM_TARGET, 2, 20, 0, 512, 20, 0 delay 1 return -Move_RAZOR_WIND:: @ 81D15B9 +Move_RAZOR_WIND:: choosetwoturnanim RazorWindSetUp, RazorWindUnleash -RazorWindEnd:: @ 81D15C2 +RazorWindEnd:: waitforvisualfinish end -RazorWindSetUp:: @ 81D15C4 +RazorWindSetUp:: loadspritegfx ANIM_TAG_GUST playsewithpan SE_M_GUST, 192 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 @@ -7652,7 +7652,7 @@ RazorWindSetUp:: @ 81D15C4 playsewithpan SE_M_GUST2, 192 goto RazorWindEnd -RazorWindUnleash:: @ 81D1614 +RazorWindUnleash:: loadspritegfx ANIM_TAG_AIR_WAVE_2 loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -7674,7 +7674,7 @@ RazorWindUnleash:: @ 81D1614 blendoff goto RazorWindEnd -Move_DISABLE:: @ 81D169F +Move_DISABLE:: loadspritegfx ANIM_TAG_SPARKLE_4 monbg 1 monbgprio_28 1 @@ -7690,7 +7690,7 @@ Move_DISABLE:: @ 81D169F blendoff end -Move_RECOVER:: @ 81D16CD +Move_RECOVER:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_ATK_PARTNER @@ -7708,7 +7708,7 @@ Move_RECOVER:: @ 81D16CD waitforvisualfinish end -RecoverAbsorbEffect:: @ 81D170D +RecoverAbsorbEffect:: createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, -10, 13 delay 3 createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -35, -10, 13 @@ -7725,7 +7725,7 @@ RecoverAbsorbEffect:: @ 81D170D delay 3 return -Move_MIMIC:: @ 81D1777 +Move_MIMIC:: loadspritegfx ANIM_TAG_ORBS monbg_22 3 setalpha 11, 5 @@ -7743,7 +7743,7 @@ Move_MIMIC:: @ 81D1777 blendoff end -Move_CONSTRICT:: @ 81D17C1 +Move_CONSTRICT:: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_M_SCRATCH, 63, 6, 4 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2 @@ -7760,10 +7760,10 @@ Move_CONSTRICT:: @ 81D17C1 waitforvisualfinish end -Move_CURSE:: @ 81D1829 +Move_CURSE:: choosetwoturnanim CurseGhost, CurseStats -CurseGhost:: @ 81D1832 +CurseGhost:: loadspritegfx ANIM_TAG_NAIL loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_ATK_PARTNER @@ -7790,12 +7790,12 @@ CurseGhost:: @ 81D1832 clearmonbg ANIM_DEF_PARTNER end -CurseGhostShakeFromNail:: @ 81D1899 +CurseGhostShakeFromNail:: createvisualtask AnimTask_ShakeMon2, 2, 0, 4, 0, 10, 0 playsewithpan SE_M_BIND, 192 return -CurseStats:: @ 81D18AF +CurseStats:: createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, 0 waitforvisualfinish delay 10 @@ -7803,13 +7803,13 @@ CurseStats:: @ 81D18AF waitforvisualfinish end -CurseStats1:: @ 81D18CA +CurseStats1:: playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_SetUpCurseBackground, 5, createvisualtask AnimTask_CurseBlendEffect, 5, 2, 4, 2, 0, 10, 31 return -Move_SOFT_BOILED:: @ 81D18E9 +Move_SOFT_BOILED:: loadspritegfx ANIM_TAG_BREAKING_EGG loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR @@ -7832,7 +7832,7 @@ Move_SOFT_BOILED:: @ 81D18E9 call HealingEffect2 end -Move_HEAL_BELL:: @ 81D196B +Move_HEAL_BELL:: loadspritegfx ANIM_TAG_BELL loadspritegfx ANIM_TAG_MUSIC_NOTES_2 loadspritegfx ANIM_TAG_THIN_RING @@ -7878,14 +7878,14 @@ Move_HEAL_BELL:: @ 81D196B createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 end -HealBellRing:: @ 81D1B2F +HealBellRing:: createvisualtask AnimTask_BlendExcept, 10, 4, 3, 8, 0, 31500 createvisualtask AnimTask_BlendSelected, 10, 10, 3, 2, 10, RGB_WHITE createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 playsewithpan SE_M_HEAL_BELL, 192 return -Move_FAKE_OUT:: @ 81D1B65 +Move_FAKE_OUT:: playsewithpan SE_M_FLATTER, 0 createvisualtask AnimTask_FakeOut, 5, waitforvisualfinish @@ -7896,7 +7896,7 @@ Move_FAKE_OUT:: @ 81D1B65 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE end -Move_SCARY_FACE:: @ 81D1BA0 +Move_SCARY_FACE:: loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 0, 16, 0 playsewithpan SE_M_PSYBEAM, 192 @@ -7914,7 +7914,7 @@ Move_SCARY_FACE:: @ 81D1BA0 waitforvisualfinish end -Move_SWEET_KISS:: @ 81D1C03 +Move_SWEET_KISS:: loadspritegfx ANIM_TAG_RED_HEART loadspritegfx ANIM_TAG_ANGEL createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48 @@ -7933,7 +7933,7 @@ Move_SWEET_KISS:: @ 81D1C03 createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31 end -Move_LOVELY_KISS:: @ 81D1C6C +Move_LOVELY_KISS:: loadspritegfx ANIM_TAG_PINK_HEART loadspritegfx ANIM_TAG_DEVIL createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24 @@ -7946,7 +7946,7 @@ Move_LOVELY_KISS:: @ 81D1C6C createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, -128, -22 end -Move_FURY_SWIPES:: @ 81D1CB3 +Move_FURY_SWIPES:: loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 @@ -7961,7 +7961,7 @@ Move_FURY_SWIPES:: @ 81D1CB3 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 7, 1 end -Move_INGRAIN:: @ 81D1D17 +Move_INGRAIN:: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_ORBS createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 @@ -7991,7 +7991,7 @@ Move_INGRAIN:: @ 81D1D17 waitforvisualfinish end -Move_PRESENT:: @ 81D1DC8 +Move_PRESENT:: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2, createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 @@ -8007,7 +8007,7 @@ Move_PRESENT:: @ 81D1DC8 jumpargeq 7, 1, PresentHeal end -PresentDamage:: @ 81D1E0B +PresentDamage:: loadspritegfx ANIM_TAG_EXPLOSION playsewithpan SE_M_SELF_DESTRUCT, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 @@ -8025,7 +8025,7 @@ PresentDamage:: @ 81D1E0B createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1 end -PresentHeal:: @ 81D1E76 +PresentHeal:: loadspritegfx ANIM_TAG_GREEN_SPARKLE loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_M_MORNING_SUN, 63 @@ -8051,14 +8051,14 @@ PresentHeal:: @ 81D1E76 call HealingEffect2 end -Move_BATON_PASS:: @ 81D1F1F +Move_BATON_PASS:: loadspritegfx ANIM_TAG_POKEBALL playsewithpan SE_M_BATON_PASS, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 31, 1, 2, 0, 11, 31455 createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2, end -Move_PERISH_SONG:: @ 81D1F41 +Move_PERISH_SONG:: loadspritegfx ANIM_TAG_MUSIC_NOTES_2 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 0 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 1, 1, 16 @@ -8094,7 +8094,7 @@ Move_PERISH_SONG:: @ 81D1F41 waitforvisualfinish end -Move_SLEEP_TALK:: @ 81D20AA +Move_SLEEP_TALK:: loadspritegfx ANIM_TAG_LETTER_Z createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, 0 delay 20 @@ -8121,7 +8121,7 @@ Move_SLEEP_TALK:: @ 81D20AA waitforvisualfinish end -Move_HYPER_FANG:: @ 81D2165 +Move_HYPER_FANG:: loadspritegfx ANIM_TAG_FANG_ATTACK playsewithpan SE_M_BITE, 63 delay 1 @@ -8131,7 +8131,7 @@ Move_HYPER_FANG:: @ 81D2165 createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, HyperFangOnOpponent goto HyperFangOnPlayer -HyperFangContinue:: @ 81D2193 +HyperFangContinue:: waitbgfadeout createsprite gFangSpriteTemplate, ANIM_TARGET, 2, waitbgfadein @@ -8143,19 +8143,19 @@ HyperFangContinue:: @ 81D2193 waitforvisualfinish end -HyperFangOnOpponent:: @ 81D21B7 +HyperFangOnOpponent:: fadetobg 4 goto HyperFangContinue -HyperFangOnPlayer:: @ 81D21BE +HyperFangOnPlayer:: fadetobg 5 goto HyperFangContinue -HyperFangInContest:: @ 81D21C5 +HyperFangInContest:: fadetobg 6 goto HyperFangContinue -Move_TRI_ATTACK:: @ 81D21CC +Move_TRI_ATTACK:: loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE createsprite gTriAttackTriangleSpriteTemplate, ANIM_TARGET, 2, 16, 0 playsewithpan SE_M_TRI_ATTACK, 192 @@ -8204,7 +8204,7 @@ Move_TRI_ATTACK:: @ 81D21CC waitforvisualfinish end -Move_WILL_O_WISP:: @ 81D2340 +Move_WILL_O_WISP:: loadspritegfx ANIM_TAG_WISP_FIRE loadspritegfx ANIM_TAG_WISP_ORB monbg ANIM_DEF_PARTNER @@ -8235,7 +8235,7 @@ Move_WILL_O_WISP:: @ 81D2340 clearmonbg ANIM_DEF_PARTNER end -Move_ENCORE:: @ 81D23FE +Move_ENCORE:: loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_TAG_HAND createvisualtask AnimTask_CreateSpotlight, 2, @@ -8255,7 +8255,7 @@ Move_ENCORE:: @ 81D23FE createvisualtask AnimTask_RemoveSpotlight, 2, end -Move_TRICK:: @ 81D24A5 +Move_TRICK:: loadspritegfx ANIM_TAG_ITEM_BAG loadspritegfx ANIM_TAG_SPEED_DUST createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80 @@ -8283,7 +8283,7 @@ Move_TRICK:: @ 81D24A5 waitforvisualfinish end -Move_WISH:: @ 81D2523 +Move_WISH:: loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 @@ -8299,7 +8299,7 @@ Move_WISH:: @ 81D2523 waitforvisualfinish end -Move_STOCKPILE:: @ 81D256B +Move_STOCKPILE:: loadspritegfx ANIM_TAG_GRAY_ORB playsewithpan SE_M_MEGA_KICK, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 8, 1, 0, 12, RGB_WHITE @@ -8310,7 +8310,7 @@ Move_STOCKPILE:: @ 81D256B createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 12, 0, RGB_WHITE end -StockpileAbsorb:: @ 81D25A9 +StockpileAbsorb:: createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 55, 55, 13 delay 1 createsprite gStockpileAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, -55, -55, 13 @@ -8329,7 +8329,7 @@ StockpileAbsorb:: @ 81D25A9 delay 1 return -Move_SPIT_UP:: @ 81D2622 +Move_SPIT_UP:: loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_M_TAKE_DOWN, 192 @@ -8349,7 +8349,7 @@ Move_SPIT_UP:: @ 81D2622 delay 5 jumpifmoveturn 2, SpitUpStrong jumpifmoveturn 3, SpitUpStrongest -SpitUpContinue:: @ 81D26B2 +SpitUpContinue:: delay 5 createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 8, 1, 0 playsewithpan SE_M_DOUBLE_SLAP, 63 @@ -8360,14 +8360,14 @@ SpitUpContinue:: @ 81D26B2 waitforvisualfinish end -SpitUpStrong:: @ 81D26EF +SpitUpStrong:: createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 16 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 80 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 144 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 208 goto SpitUpContinue -SpitUpStrongest:: @ 81D2718 +SpitUpStrongest:: createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 16 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 48 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 80 @@ -8378,7 +8378,7 @@ SpitUpStrongest:: @ 81D2718 createsprite gSpitUpOrbSpriteTemplate, ANIM_ATTACKER, 2, 240 goto SpitUpContinue -Move_SWALLOW:: @ 81D2765 +Move_SWALLOW:: loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_M_TAKE_DOWN, 192 @@ -8390,12 +8390,12 @@ Move_SWALLOW:: @ 81D2765 call SwallowEffect jumpifmoveturn 2, SwallowGood jumpifmoveturn 3, SwallowBest -SwallowContinue:: @ 81D27AF +SwallowContinue:: waitforvisualfinish call HealingEffect end -SwallowEffect:: @ 81D27B6 +SwallowEffect:: createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -8 delay 1 createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, -24, -8 @@ -8408,16 +8408,16 @@ SwallowEffect:: @ 81D27B6 delay 1 return -SwallowGood:: @ 81D27F8 +SwallowGood:: call SwallowEffect goto SwallowContinue -SwallowBest:: @ 81D2802 +SwallowBest:: call SwallowEffect call SwallowEffect goto SwallowContinue -Move_TRANSFORM:: @ 81D2811 +Move_TRANSFORM:: monbg ANIM_ATTACKER playsewithpan SE_M_TELEPORT, 192 waitplaysewithpan SE_M_MINIMIZE, 192, 48 @@ -8426,7 +8426,7 @@ Move_TRANSFORM:: @ 81D2811 clearmonbg ANIM_ATTACKER end -Move_MORNING_SUN:: @ 81D2829 +Move_MORNING_SUN:: loadspritegfx ANIM_TAG_GREEN_STAR loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_MorningSunLightBeam, 5, @@ -8454,12 +8454,12 @@ Move_MORNING_SUN:: @ 81D2829 call HealingEffect end -MorningSunStar:: @ 81D28AF +MorningSunStar:: createsprite gGreenStarSpriteTemplate, ANIM_ATTACKER, 2, 30, 640 delay 5 return -Move_SWEET_SCENT:: @ 81D28BD +Move_SWEET_SCENT:: loadspritegfx ANIM_TAG_PINK_PETAL playsewithpan SE_M_SWEET_SCENT, 192 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100 @@ -8473,7 +8473,7 @@ Move_SWEET_SCENT:: @ 81D28BD waitforvisualfinish end -SweetScentEffect:: @ 81D2901 +SweetScentEffect:: createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 70, 1, 64 delay 2 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 60, 0, 64 @@ -8498,7 +8498,7 @@ SweetScentEffect:: @ 81D2901 delay 2 return -Move_HYPER_BEAM:: @ 81D29A7 +Move_HYPER_BEAM:: loadspritegfx ANIM_TAG_ORBS createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 0, 16, 0 waitforvisualfinish @@ -8543,13 +8543,13 @@ Move_HYPER_BEAM:: @ 81D29A7 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 16, 0, 0 end -HyperBeamOrbs:: @ 81D2AD8 +HyperBeamOrbs:: createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2, createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2, delay 1 return -Move_FLATTER:: @ 81D2AE9 +Move_FLATTER:: loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_CONFETTI createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, 63 @@ -8590,12 +8590,12 @@ Move_FLATTER:: @ 81D2AE9 createvisualtask AnimTask_RemoveSpotlight, 2, end -CreateFlatterConfetti:: @ 81D2BD2 +CreateFlatterConfetti:: createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, 0 createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, 1 return -Move_ROLE_PLAY:: @ 81D2BE5 +Move_ROLE_PLAY:: monbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 16, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 10, 0 @@ -8610,7 +8610,7 @@ Move_ROLE_PLAY:: @ 81D2BE5 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 10, 0, 0 end -Move_REFRESH:: @ 81D2C42 +Move_REFRESH:: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_M_STAT_INCREASE, 192 @@ -8624,7 +8624,7 @@ Move_REFRESH:: @ 81D2C42 createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0 end -Move_BLAZE_KICK:: @ 81D2C85 +Move_BLAZE_KICK:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_SMALL_EMBER @@ -8645,7 +8645,7 @@ Move_BLAZE_KICK:: @ 81D2C85 blendoff end -Move_HYPER_VOICE:: @ 81D2D0D +Move_HYPER_VOICE:: loadspritegfx ANIM_TAG_THIN_RING call HyperVoiceEffect waitforvisualfinish @@ -8654,7 +8654,7 @@ Move_HYPER_VOICE:: @ 81D2D0D waitforvisualfinish end -HyperVoiceEffect:: @ 81D2D1F +HyperVoiceEffect:: createvisualtask sub_80DD334, 5 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 8, 0, 1023 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 5, 0, 0 @@ -8665,7 +8665,7 @@ HyperVoiceEffect:: @ 81D2D1F createvisualtask SoundTask_WaitForCry, 5, return -Move_SAND_TOMB:: @ 81D2D96 +Move_SAND_TOMB:: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 563 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 43, 1 @@ -8678,7 +8678,7 @@ Move_SAND_TOMB:: @ 81D2D96 waitforvisualfinish end -SandTombSwirlingDirt:: @ 81D2DE3 +SandTombSwirlingDirt:: createsprite gSwirlingDirtSpriteTemplate, ANIM_TARGET, 2, 0, 32, 528, 30, 10, 50, 1 delay 2 createsprite gSwirlingDirtSpriteTemplate, ANIM_TARGET, 2, 0, 36, 480, 20, 13, -46, 1 @@ -8693,7 +8693,7 @@ SandTombSwirlingDirt:: @ 81D2DE3 delay 2 return -Move_SHEER_COLD:: @ 81D2E6E +Move_SHEER_COLD:: fadetobg 15 waitbgfadeout playsewithpan SE_M_ICY_WIND, 0 @@ -8711,7 +8711,7 @@ Move_SHEER_COLD:: @ 81D2E6E waitbgfadein end -Move_ARM_THRUST:: @ 81D2E93 +Move_ARM_THRUST:: loadspritegfx ANIM_TAG_HANDS_AND_FEET loadspritegfx ANIM_TAG_IMPACT monbgprio_28 1 @@ -8726,27 +8726,27 @@ Move_ARM_THRUST:: @ 81D2E93 createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 1 playsewithpan SE_M_DOUBLE_SLAP, 63 choosetwoturnanim ArmThrustRight, ArmThrustLeft -ArmThrustContinue:: @ 81D2EEC +ArmThrustContinue:: createvisualtask AnimTask_ShakeMon, 5, 1, 4, 0, 6, 1 waitforvisualfinish blendoff end -ArmThrustRight:: @ 81D2F00 +ArmThrustRight:: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 8, 0, 1, 2 goto ArmThrustContinue -ArmThrustLeft:: @ 81D2F14 +ArmThrustLeft:: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 0, 1, 2 goto ArmThrustContinue -Move_MUDDY_WATER:: @ 81D2F28 +Move_MUDDY_WATER:: panse_1B SE_M_WHIRLPOOL, 192, 63, 2, 0 createvisualtask AnimTask_CreateSurfWave, 2, 1 waitforvisualfinish end -Move_BULLET_SEED:: @ 81D2F3A +Move_BULLET_SEED:: loadspritegfx ANIM_TAG_SEED createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 @@ -8771,7 +8771,7 @@ Move_BULLET_SEED:: @ 81D2F3A waitforvisualfinish end -Move_DRAGON_CLAW:: @ 81D2FD0 +Move_DRAGON_CLAW:: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_CLAW_SLASH playsewithpan SE_M_SACRED_FIRE2, 192 @@ -8816,7 +8816,7 @@ Move_DRAGON_CLAW:: @ 81D2FD0 waitforvisualfinish end -DragonClawFireSpiral:: @ 81D31AD +DragonClawFireSpiral:: createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, 0 delay 2 createsprite gFireSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 480, 20, 16, -46, 0 @@ -8832,7 +8832,7 @@ DragonClawFireSpiral:: @ 81D31AD return end -Move_MUD_SHOT:: @ 81D3239 +Move_MUD_SHOT:: loadspritegfx ANIM_TAG_BROWN_ORB monbg ANIM_DEF_PARTNER monbgprio_28 1 @@ -8858,14 +8858,14 @@ Move_MUD_SHOT:: @ 81D3239 blendoff end -MudShotOrbs:: @ 81D32B3 +MudShotOrbs:: createsprite gMudShotOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 createsprite gMudShotOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, 10, 0, 16 delay 2 return -Move_METEOR_MASH:: @ 81D32D6 +Move_METEOR_MASH:: loadspritegfx ANIM_TAG_GOLD_STARS loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET @@ -8890,7 +8890,7 @@ Move_METEOR_MASH:: @ 81D32D6 waitforvisualfinish end -Move_REVENGE:: @ 81D335D +Move_REVENGE:: loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg 1 setalpha 12, 8 @@ -8919,7 +8919,7 @@ Move_REVENGE:: @ 81D335D blendoff end -Move_POISON_FANG:: @ 81D33F4 +Move_POISON_FANG:: loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_M_BITE, 63 @@ -8932,12 +8932,12 @@ Move_POISON_FANG:: @ 81D33F4 waitforvisualfinish end -Move_SUBSTITUTE:: @ 81D3433 +Move_SUBSTITUTE:: playsewithpan SE_M_ATTRACT, 192 createvisualtask AnimTask_MonToSubstitute, 2, end -Move_FRENZY_PLANT:: @ 81D343F +Move_FRENZY_PLANT:: loadspritegfx ANIM_TAG_ROOTS loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -8997,7 +8997,7 @@ Move_FRENZY_PLANT:: @ 81D343F blendoff end -Move_METAL_SOUND:: @ 81D35E3 +Move_METAL_SOUND:: loadspritegfx ANIM_TAG_METAL_SOUND_WAVES monbg ANIM_DEF_PARTNER monbgprio_2A 1 @@ -9012,19 +9012,19 @@ Move_METAL_SOUND:: @ 81D35E3 waitforvisualfinish end -MetalSoundRings:: @ 81D3616 +MetalSoundRings:: panse_1B SE_M_SCREECH, 192, 63, 2, 0 createsprite gMetalSoundSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 30, 0 delay 2 return -Move_FOCUS_PUNCH:: @ 81D3633 +Move_FOCUS_PUNCH:: goto FocusPunch -FocusPunchEnd:: @ 81D3638 +FocusPunchEnd:: waitforvisualfinish end -FocusPunch:: @ 81D363A +FocusPunch:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET delay 1 @@ -9033,7 +9033,7 @@ FocusPunch:: @ 81D363A createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, FocusPunchOnOpponent jumpargeq 7, 1, FocusPunchOnPlayer -FocusPunchContinue:: @ 81D3668 +FocusPunchContinue:: waitbgfadein monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -9058,19 +9058,19 @@ FocusPunchContinue:: @ 81D3668 blendoff goto FocusPunchEnd -FocusPunchOnOpponent:: @ 81D36E5 +FocusPunchOnOpponent:: fadetobg 4 goto FocusPunchContinue -FocusPunchOnPlayer:: @ 81D36EC +FocusPunchOnPlayer:: fadetobg 5 goto FocusPunchContinue -FocusPunchInContest:: @ 81D36F3 +FocusPunchInContest:: fadetobg 6 goto FocusPunchContinue -Move_RETURN:: @ 81D36FA +Move_RETURN:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 @@ -9080,13 +9080,13 @@ Move_RETURN:: @ 81D36FA jumpargeq 7, 1, ReturnMedium jumpargeq 7, 2, ReturnStrong jumpargeq 7, 3, ReturnStrongest -ReturnContinue:: @ 81D372B +ReturnContinue:: waitforvisualfinish clearmonbg ANIM_DEF_PARTNER blendoff end -ReturnWeak:: @ 81D3730 +ReturnWeak:: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, 0 createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, -64 waitforvisualfinish @@ -9097,7 +9097,7 @@ ReturnWeak:: @ 81D3730 createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_COMET_PUNCH, 63 goto ReturnContinue -ReturnMedium:: @ 81D3782 +ReturnMedium:: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, 0 createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, -64 waitforvisualfinish @@ -9111,7 +9111,7 @@ ReturnMedium:: @ 81D3782 createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_MEGA_KICK2, 63 goto ReturnContinue -ReturnStrong:: @ 81D37E2 +ReturnStrong:: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, 0 createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, -64 waitforvisualfinish @@ -9141,7 +9141,7 @@ ReturnStrong:: @ 81D37E2 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 goto ReturnContinue -ReturnStrongest:: @ 81D38FD +ReturnStrongest:: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 6, 0 waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 16, 1, 0 @@ -9202,7 +9202,7 @@ ReturnStrongest:: @ 81D38FD createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6, 0, 0 goto ReturnContinue -ReturnStrongestHit:: @ 81D3B35 +ReturnStrongestHit:: createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 3, 0 createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_TAIL_WHIP, -64 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 @@ -9212,7 +9212,7 @@ ReturnStrongestHit:: @ 81D3B35 waitforvisualfinish return -Move_COSMIC_POWER:: @ 81D3B89 +Move_COSMIC_POWER:: loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_COSMIC_POWER, 0 playsewithpan SE_M_COSMIC_POWER, 0 @@ -9237,7 +9237,7 @@ Move_COSMIC_POWER:: @ 81D3B89 waitforvisualfinish end -Move_BLAST_BURN:: @ 81D3C0E +Move_BLAST_BURN:: loadspritegfx ANIM_TAG_FIRE_PLUME loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -9282,7 +9282,7 @@ Move_BLAST_BURN:: @ 81D3C0E blendoff end -Move_ROCK_TOMB:: @ 81D3E50 +Move_ROCK_TOMB:: loadspritegfx ANIM_TAG_X_SIGN loadspritegfx ANIM_TAG_ROCKS createvisualtask AnimTask_ShakeBattleTerrain, 2, 2, 0, 10, 1 @@ -9314,7 +9314,7 @@ Move_ROCK_TOMB:: @ 81D3E50 waitforvisualfinish end -Move_SILVER_WIND:: @ 81D3F37 +Move_SILVER_WIND:: loadspritegfx ANIM_TAG_SPARKLE_6 panse_1B SE_M_GUST, 192, 63, 2, 0 playsewithpan SE_M_MORNING_SUN, 0 @@ -9328,7 +9328,7 @@ Move_SILVER_WIND:: @ 81D3F37 fadetobg BG_BUG_OPPONENT waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, 1536, 0, 0, -1 -SilverWindContinue:: @ 81D3F7E +SilverWindContinue:: delay 0 createvisualtask AnimTask_BlendSelected, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein @@ -9366,23 +9366,23 @@ SilverWindContinue:: @ 81D3F7E waitbgfadein end -SilverWindOnPlayer:: @ 81D4138 +SilverWindOnPlayer:: fadetobg BG_BUG_PLAYER waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, -1536, 0, 0, -1 goto SilverWindContinue -Move_SNATCH:: @ 81D414F +Move_SNATCH:: playsewithpan SE_M_TAKE_DOWN, 192 createvisualtask AnimTask_WindUpLunge, 5, 0, -12, 4, 10, 10, 12, 6 end -Move_DIVE:: @ 81D4169 +Move_DIVE:: loadspritegfx ANIM_TAG_SPLASH loadspritegfx ANIM_TAG_SWEAT_BEAD choosetwoturnanim DiveSetUp, DiveAttack -DiveSetUp:: @ 81D4178 +DiveSetUp:: loadspritegfx ANIM_TAG_ROUND_SHADOW playsewithpan SE_M_HEADBUTT, 192 createsprite gDiveBallSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336 @@ -9396,12 +9396,12 @@ DiveSetUp:: @ 81D4178 call DiveSetUpWaterDroplets end -DiveSetUpWaterDroplets:: @ 81D41B6 +DiveSetUpWaterDroplets:: createsprite gSprayWaterDropletSpriteTemplate, ANIM_ATTACKER, 5, 0, 0 createsprite gSprayWaterDropletSpriteTemplate, ANIM_ATTACKER, 5, 1, 0 return -DiveAttack:: @ 81D41CD +DiveAttack:: loadspritegfx ANIM_TAG_WATER_IMPACT loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg ANIM_DEF_PARTNER @@ -9421,12 +9421,12 @@ DiveAttack:: @ 81D41CD blendoff end -DiveAttackWaterDroplets:: @ 81D420C +DiveAttackWaterDroplets:: createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 return -Move_ROCK_BLAST:: @ 81D4223 +Move_ROCK_BLAST:: loadspritegfx ANIM_TAG_ROCKS loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 @@ -9444,7 +9444,7 @@ Move_ROCK_BLAST:: @ 81D4223 waitforvisualfinish end -Move_OVERHEAT:: @ 81D42C0 +Move_OVERHEAT:: loadspritegfx ANIM_TAG_SMALL_EMBER loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER @@ -9525,7 +9525,7 @@ Move_OVERHEAT:: @ 81D42C0 waitforvisualfinish end -Move_HYDRO_CANNON:: @ 81D45B2 +Move_HYDRO_CANNON:: loadspritegfx ANIM_TAG_WATER_ORB loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER @@ -9556,7 +9556,7 @@ Move_HYDRO_CANNON:: @ 81D45B2 blendoff end -HydroCannonBeam:: @ 81D467C +HydroCannonBeam:: createsprite gHydroCannonBeamSpriteTemplate, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 delay 1 createsprite gHydroCannonBeamSpriteTemplate, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 @@ -9568,7 +9568,7 @@ HydroCannonBeam:: @ 81D467C createsprite gHydroCannonBeamSpriteTemplate, ANIM_TARGET, 2, 10, -10, 0, 0, 15, 257 return -Move_ASTONISH:: @ 81D46E4 +Move_ASTONISH:: loadspritegfx ANIM_TAG_SWEAT_BEAD playsewithpan SE_M_ENCORE, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 @@ -9581,7 +9581,7 @@ Move_ASTONISH:: @ 81D46E4 waitforvisualfinish end -Move_SEISMIC_TOSS:: @ 81D472C +Move_SEISMIC_TOSS:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS setarg 7, 0 @@ -9600,7 +9600,7 @@ Move_SEISMIC_TOSS:: @ 81D472C jumpargeq 7, 0, SeismicTossWeak jumpargeq 7, 1, SeismicTossMedium jumpargeq 7, 2, SeismicTossStrong -SeismicTossContinue:: @ 81D4774 +SeismicTossContinue:: restorebg waitbgfadeout setarg 7, 4095 @@ -9609,13 +9609,13 @@ SeismicTossContinue:: @ 81D4774 blendoff end -SeismicTossWeak:: @ 81D477F +SeismicTossWeak:: call SeismicTossRockScatter1 delay 16 call SeismicTossRockScatter2 goto SeismicTossContinue -SeismicTossMedium:: @ 81D4790 +SeismicTossMedium:: call SeismicTossRockScatter1 delay 14 call SeismicTossRockScatter2 @@ -9623,7 +9623,7 @@ SeismicTossMedium:: @ 81D4790 call SeismicTossRockScatter1 goto SeismicTossContinue -SeismicTossStrong:: @ 81D47A8 +SeismicTossStrong:: call SeismicTossRockScatter2 delay 10 call SeismicTossRockScatter1 @@ -9633,7 +9633,7 @@ SeismicTossStrong:: @ 81D47A8 call SeismicTossRockScatter1 goto SeismicTossContinue -SeismicTossRockScatter1:: @ 81D47C7 +SeismicTossRockScatter1:: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -10, -8, 1, 1 playsewithpan SE_M_STRENGTH, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 5, 1 @@ -9643,7 +9643,7 @@ SeismicTossRockScatter1:: @ 81D47C7 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 12, 25, 4, 4 return -SeismicTossRockScatter2:: @ 81D4828 +SeismicTossRockScatter2:: createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, -8, 1, 1 playsewithpan SE_M_ROCK_THROW, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 3, 5, 1 @@ -9653,7 +9653,7 @@ SeismicTossRockScatter2:: @ 81D4828 createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 12, 30, 4, 3 return -Move_MAGIC_COAT:: @ 81D4889 +Move_MAGIC_COAT:: loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_M_BARRIER, 192, 15 @@ -9663,7 +9663,7 @@ Move_MAGIC_COAT:: @ 81D4889 blendoff end -Move_WATER_PULSE:: @ 81D48A6 +Move_WATER_PULSE:: loadspritegfx ANIM_TAG_SMALL_BUBBLES loadspritegfx ANIM_TAG_BLUE_RING_2 monbg 1 @@ -9694,7 +9694,7 @@ Move_WATER_PULSE:: @ 81D48A6 clearmonbg ANIM_DEF_PARTNER end -Move_PSYCHO_BOOST:: @ 81D499B +Move_PSYCHO_BOOST:: loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg ANIM_ATK_PARTNER fadetobg 3 @@ -9721,7 +9721,7 @@ Move_PSYCHO_BOOST:: @ 81D499B call UnsetPsychicBg end -Move_KNOCK_OFF:: @ 81D4A0F +Move_KNOCK_OFF:: loadspritegfx ANIM_TAG_SLAM_HIT_2 loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 @@ -9742,7 +9742,7 @@ Move_KNOCK_OFF:: @ 81D4A0F waitforvisualfinish end -Move_DOOM_DESIRE:: @ 81D4A9F +Move_DOOM_DESIRE:: createvisualtask GetIsDoomDesireHitTurn, 2 delay 1 monbg ANIM_ATK_PARTNER @@ -9792,7 +9792,7 @@ Move_DOOM_DESIRE:: @ 81D4A9F waitforvisualfinish end -Move_SKY_UPPERCUT:: @ 81D4BC1 +Move_SKY_UPPERCUT:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER monbgprio_28 1 @@ -9836,7 +9836,7 @@ Move_SKY_UPPERCUT:: @ 81D4BC1 waitbgfadein end -Move_SECRET_POWER:: @ 81D4CBA +Move_SECRET_POWER:: createvisualtask AnimTask_GetBattleTerrain, 5, jumpargeq 0, 0, Move_NEEDLE_ARM jumpargeq 0, 1, Move_MAGICAL_LEAF @@ -9849,7 +9849,7 @@ Move_SECRET_POWER:: @ 81D4CBA jumpargeq 0, 8, Move_STRENGTH goto Move_SLAM -Move_TWISTER:: @ 81D4D0E +Move_TWISTER:: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_ROCKS @@ -9895,7 +9895,7 @@ Move_TWISTER:: @ 81D4D0E blendoff end -Move_MAGICAL_LEAF:: @ 81D4E6D +Move_MAGICAL_LEAF:: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_RAZOR_LEAF loadspritegfx ANIM_TAG_IMPACT @@ -9939,12 +9939,12 @@ Move_MAGICAL_LEAF:: @ 81D4E6D blendoff end -Move_ICE_BALL:: @ 81D4F8E +Move_ICE_BALL:: loadspritegfx ANIM_TAG_ICE_CHUNK loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 4, IceBallSetIceBg -IceBallContinue:: @ 81D4FA5 +IceBallContinue:: playsewithpan SE_M_ICY_WIND, 192 createsprite gIceBallChunkSpriteTemplate, ANIM_TARGET, 2, 15, 0, -12, -16, 30, -40 delay 28 @@ -9955,24 +9955,24 @@ IceBallContinue:: @ 81D4FA5 jumpargeq 0, 2, IceBallMediun jumpargeq 0, 3, IceBallStrong jumpargeq 0, 4, IceBallStrongest -IceBallContinue2:: @ 81D4FF3 +IceBallContinue2:: createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 4, IceBallUnsetIceBg -IceBallEnd:: @ 81D5004 +IceBallEnd:: end -IceBallSetIceBg:: @ 81D5005 +IceBallSetIceBg:: fadetobg 15 goto IceBallContinue -IceBallUnsetIceBg:: @ 81D500C +IceBallUnsetIceBg:: waitbgfadein delay 45 restorebg waitbgfadein goto IceBallEnd -IceBallWeakest:: @ 81D5016 +IceBallWeakest:: createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 8, 1, 0 call IceBallImpactShard call IceBallImpactShard @@ -9981,7 +9981,7 @@ IceBallWeakest:: @ 81D5016 call IceBallImpactShard goto IceBallContinue2 -IceBallWeak:: @ 81D5045 +IceBallWeak:: createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 10, 1, 0 call IceBallImpactShard call IceBallImpactShard @@ -9992,7 +9992,7 @@ IceBallWeak:: @ 81D5045 call IceBallImpactShard goto IceBallContinue2 -IceBallMediun:: @ 81D507E +IceBallMediun:: createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 14, 1, 0 call IceBallImpactShard call IceBallImpactShard @@ -10005,7 +10005,7 @@ IceBallMediun:: @ 81D507E call IceBallImpactShard goto IceBallContinue2 -IceBallStrong:: @ 81D50C1 +IceBallStrong:: createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 18, 1, 0 call IceBallImpactShard call IceBallImpactShard @@ -10019,7 +10019,7 @@ IceBallStrong:: @ 81D50C1 call IceBallImpactShard goto IceBallContinue2 -IceBallStrongest:: @ 81D5109 +IceBallStrongest:: createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, 0, 1, 30, 1, 0 call IceBallImpactShard call IceBallImpactShard @@ -10033,11 +10033,11 @@ IceBallStrongest:: @ 81D5109 call IceBallImpactShard goto IceBallContinue2 -IceBallImpactShard:: @ 81D5151 +IceBallImpactShard:: createsprite gIceBallImpactShardSpriteTemplate, ANIM_TARGET, 4, -12, -16 return -Move_WEATHER_BALL:: @ 81D515D +Move_WEATHER_BALL:: loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 0 delay 8 @@ -10056,7 +10056,7 @@ Move_WEATHER_BALL:: @ 81D515D jumpargeq 7, 3, WeatherBallSandstorm jumpargeq 7, 4, WeatherBallIce -WeatherBallNormal:: @ 81D51C8 +WeatherBallNormal:: loadspritegfx ANIM_TAG_IMPACT createsprite gWeatherBallNormalDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish @@ -10066,7 +10066,7 @@ WeatherBallNormal:: @ 81D51C8 waitforvisualfinish end -WeatherBallFire:: @ 81D5205 +WeatherBallFire:: loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gWeatherBallFireDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10 playsewithpan SE_M_FLAME_WHEEL, 63 @@ -10082,7 +10082,7 @@ WeatherBallFire:: @ 81D5205 waitforvisualfinish end -WeatherBallWater:: @ 81D5269 +WeatherBallWater:: loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gWeatherBallWaterDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10 playsewithpan SE_M_CRABHAMMER, 63 @@ -10098,7 +10098,7 @@ WeatherBallWater:: @ 81D5269 waitforvisualfinish end -WeatherBallSandstorm:: @ 81D52CD +WeatherBallSandstorm:: loadspritegfx ANIM_TAG_ROCKS createsprite gWeatherBallRockDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0 playsewithpan SE_M_ROCK_THROW, 63 @@ -10118,7 +10118,7 @@ WeatherBallSandstorm:: @ 81D52CD waitforvisualfinish end -WeatherBallIce:: @ 81D536D +WeatherBallIce:: loadspritegfx ANIM_TAG_HAIL loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gWeatherBallIceDownSpriteTemplate, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20 @@ -10136,7 +10136,7 @@ WeatherBallIce:: @ 81D536D waitforvisualfinish end -Move_COUNT:: @ 81D53D9 +Move_COUNT:: loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 @@ -10148,7 +10148,7 @@ Move_COUNT:: @ 81D53D9 blendoff end -IceCrystalEffectShort:: @ 81D540A +IceCrystalEffectShort:: createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 0 playsewithpan SE_M_ICY_WIND, 63 delay 4 @@ -10171,7 +10171,7 @@ IceCrystalEffectShort:: @ 81D540A playsewithpan SE_M_ICY_WIND, 63 return -IceCrystalEffectLong:: @ 81D548E +IceCrystalEffectLong:: createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, -10, -10, 1 playsewithpan SE_M_ICY_WIND, 63 delay 4 @@ -10223,7 +10223,7 @@ IceSpikesEffectShort: @ Unused createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, -32, 24, 0 return -IceSpikesEffectLong:: @ 81D55E2 +IceSpikesEffectLong:: loopsewithpan SE_M_ICY_WIND, 63, 6, 4 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, 0, 24, 1 delay 4 @@ -10246,14 +10246,14 @@ IceSpikesEffectLong:: @ 81D55E2 createsprite gIceGroundSpikeSpriteTemplate, ANIM_TARGET, 2, -48, 24, 1 return -GrantingStarsEffect:: @ 81D569E +GrantingStarsEffect:: createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, -15, 0, 0, 0, 32, 60 delay 8 createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60 delay 8 return -HealingEffect:: @ 81D56C9 +HealingEffect:: playsewithpan SE_M_ABSORB_2, 192 createsprite gHealingBlueStarSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 0, 0 delay 7 @@ -10265,7 +10265,7 @@ HealingEffect:: @ 81D56C9 delay 7 return -HealingEffect2:: @ 81D5712 +HealingEffect2:: playsewithpan SE_M_ABSORB_2, 63 createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 0, -5, 1, 0 delay 7 @@ -10277,7 +10277,7 @@ HealingEffect2:: @ 81D5712 delay 7 return -PoisonBubblesEffect:: @ 81D575B +PoisonBubblesEffect:: createsprite gPoisonBubbleSpriteTemplate, ANIM_TARGET, 2, 10, 10, 0 playsewithpan SE_M_TOXIC, 63 delay 6 @@ -10297,7 +10297,7 @@ PoisonBubblesEffect:: @ 81D575B playsewithpan SE_M_TOXIC, 63 return -WaterBubblesEffectShort:: @ 81D57CC +WaterBubblesEffectShort:: createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 0 playsewithpan SE_M_BUBBLE3, 63 delay 6 @@ -10317,7 +10317,7 @@ WaterBubblesEffectShort:: @ 81D57CC playsewithpan SE_M_BUBBLE3, 63 return -WaterBubblesEffectLong:: @ 81D583D +WaterBubblesEffectLong:: createsprite gWaterBubbleSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 1 playsewithpan SE_M_BUBBLE3, 63 delay 6 @@ -10343,7 +10343,7 @@ WaterBubblesEffectLong:: @ 81D583D playsewithpan SE_M_BUBBLE3, 63 return -ElectricityEffect:: @ 81D58D4 +ElectricityEffect:: playsewithpan SE_M_THUNDERBOLT2, 63 createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0 delay 2 @@ -10362,7 +10362,7 @@ ElectricityEffect:: @ 81D58D4 createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1 return -ConfusionEffect:: @ 81D595F +ConfusionEffect:: loopsewithpan SE_M_DIZZY_PUNCH, 63, 13, 6 createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 0, 3, 90 createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 51, 3, 90 @@ -10371,81 +10371,81 @@ ConfusionEffect:: @ 81D595F createsprite gConfusionDuckSpriteTemplate, ANIM_TARGET, 2, 0, -15, 204, 3, 90 return -SetPsychicBackground:: @ 81D59BB +SetPsychicBackground:: fadetobg 3 waitbgfadeout createvisualtask AnimTask_SetPsychicBackground, 5, waitbgfadein return -UnsetPsychicBg:: @ 81D59C7 +UnsetPsychicBg:: restorebg waitbgfadeout setarg 7, 65535 waitbgfadein return -SetSkyBg:: @ 81D59CF +SetSkyBg:: jumpifcontest SetSkyBgContest fadetobg 18 waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, -2304, 768, 1, -1 -SetSkyBgContinue:: @ 81D59E6 +SetSkyBgContinue:: waitbgfadein return -SetSkyBgContest:: @ 81D59E8 +SetSkyBgContest:: fadetobg 19 waitbgfadeout createvisualtask AnimTask_StartSlidingBg, 5, 2304, 768, 0, -1 goto SetSkyBgContinue -UnsetSkyBg:: @ 81D59FF +UnsetSkyBg:: restorebg waitbgfadeout setarg 7, 65535 waitbgfadein return -SetSolarbeamBg:: @ 81D5A07 +SetSolarbeamBg:: createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, SetSolarbeamBgContest createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, SetSolarbeamBgOpponent goto SetSolarbeamBgPlayer -SetSolarbeamBgContinue:: @ 81D5A2A +SetSolarbeamBgContinue:: waitbgfadein return -SetSolarbeamBgContest:: @ 81D5A2C +SetSolarbeamBgContest:: fadetobg BG_SOLARBEAM_CONTESTS goto SetSolarbeamBgContinue -SetSolarbeamBgPlayer:: @ 81D5A33 +SetSolarbeamBgPlayer:: fadetobg BG_SOLARBEAM_PLAYER goto SetSolarbeamBgContinue -SetSolarbeamBgOpponent:: @ 81D5A3A +SetSolarbeamBgOpponent:: fadetobg BG_SOLARBEAM_OPPONENT goto SetSolarbeamBgContinue -UnsetSolarbeamBg:: @ 81D5A41 +UnsetSolarbeamBg:: restorebg waitbgfadein return -Status_Poison:: @ 81D5A44 +Status_Poison:: loopsewithpan SE_M_TOXIC, 63, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 18, 2 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 12, 31774 end -Status_Confusion:: @ 81D5A6F +Status_Confusion:: loadspritegfx ANIM_TAG_DUCK call ConfusionEffect end -Status_Burn:: @ 81D5A78 +Status_Burn:: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_M_FLAME_WHEEL, 63 call BurnFlame @@ -10454,12 +10454,12 @@ Status_Burn:: @ 81D5A78 waitforvisualfinish end -BurnFlame:: @ 81D5A90 +BurnFlame:: createsprite gBurnFlameSpriteTemplate, ANIM_TARGET, 2, -24, 24, 24, 24, 20, 1, 1 delay 4 return -Status_Infatuation:: @ 81D5AA8 +Status_Infatuation:: loadspritegfx ANIM_TAG_MAGENTA_HEART playsewithpan SE_M_CHARM, 192 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 @@ -10471,7 +10471,7 @@ Status_Infatuation:: @ 81D5AA8 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 20, 20 end -Status_Sleep:: @ 81D5ADD +Status_Sleep:: loadspritegfx ANIM_TAG_LETTER_Z playsewithpan SE_M_SNORE, 192 createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 @@ -10479,13 +10479,13 @@ Status_Sleep:: @ 81D5ADD createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 end -Status_Paralysis:: @ 81D5B09 +Status_Paralysis:: loadspritegfx ANIM_TAG_SPARK_2 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 10, 1 call ElectricityEffect end -Status_Freeze:: @ 81D5B23 +Status_Freeze:: playsewithpan SE_M_ICY_WIND, 0 loadspritegfx ANIM_TAG_ICE_CUBE monbg ANIM_DEF_PARTNER @@ -10496,7 +10496,7 @@ Status_Freeze:: @ 81D5B23 clearmonbg ANIM_DEF_PARTNER end -Status_Curse:: @ 81D5B3E +Status_Curse:: loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_DEF_PARTNER playsewithpan SE_M_NIGHTMARE, 63 @@ -10506,7 +10506,7 @@ Status_Curse:: @ 81D5B3E clearmonbg ANIM_DEF_PARTNER end -Status_Nightmare:: @ 81D5B63 +Status_Nightmare:: loadspritegfx ANIM_TAG_DEVIL monbg ANIM_DEF_PARTNER playsewithpan SE_M_NIGHTMARE, 63 @@ -10516,12 +10516,12 @@ Status_Nightmare:: @ 81D5B63 clearmonbg ANIM_DEF_PARTNER end -General_CastformChange:: @ 81D5B88 +General_CastformChange:: createvisualtask AnimTask_IsMonInvisible, 2, jumpargeq 7, 1, CastformChangeSkipAnim goto CastformChangeContinue -CastformChangeContinue:: @ 81D5B9C +CastformChangeContinue:: monbg ANIM_ATTACKER playsewithpan SE_M_TELEPORT, 192 waitplaysewithpan SE_M_MINIMIZE, 192, 48 @@ -10530,16 +10530,16 @@ CastformChangeContinue:: @ 81D5B9C clearmonbg ANIM_ATTACKER end -CastformChangeSkipAnim:: @ 81D5BB4 +CastformChangeSkipAnim:: createvisualtask AnimTask_CastformGfxChange, 2, 1 end -General_StatsChange:: @ 81D5BBE +General_StatsChange:: createvisualtask AnimTask_StatsChange, 5, waitforvisualfinish end -General_SubstituteFade:: @ 81D5BC7 +General_SubstituteFade:: monbg ANIM_ATTACKER createvisualtask AnimTask_SubstituteFadeToInvisible, 5 createvisualtask AnimTask_BlendSelected, 10, 2, 0, 0, 16, RGB_WHITE @@ -10552,11 +10552,11 @@ General_SubstituteFade:: @ 81D5BC7 createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, 1 end -General_SubstituteAppear:: @ 81D5C04 +General_SubstituteAppear:: createvisualtask AnimTask_MonToSubstitute, 2, end -General_BaitThrow:: @ 81D5C0C +General_BaitThrow:: createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 0 createvisualtask AnimTask_LoadBaitGfx, 2, delay 0 @@ -10569,12 +10569,12 @@ General_BaitThrow:: @ 81D5C0C createvisualtask AnimTask_FreeBaitGfx, 2, end -General_ItemKnockoff:: @ 81D5C54 +General_ItemKnockoff:: loadspritegfx ANIM_TAG_ITEM_BAG createsprite gKnockOffItemSpriteTemplate, ANIM_TARGET, 2, end -General_TurnTrap:: @ 81D5C5F +General_TurnTrap:: createvisualtask AnimTask_GetTrappedMoveAnimId, 5, jumpargeq 0, 1, Status_FireSpin jumpargeq 0, 2, Status_Whirlpool @@ -10582,7 +10582,7 @@ General_TurnTrap:: @ 81D5C5F jumpargeq 0, 4, Status_SandTomb goto Status_BindWrap -Status_BindWrap:: @ 81D5C8B +Status_BindWrap:: loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_M_SCRATCH, 63, 6, 2 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1 @@ -10596,7 +10596,7 @@ Status_BindWrap:: @ 81D5C8B waitforvisualfinish end -Status_FireSpin:: @ 81D5CD3 +Status_FireSpin:: loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_M_SACRED_FIRE2, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 @@ -10606,7 +10606,7 @@ Status_FireSpin:: @ 81D5CD3 stopsound end -Status_Whirlpool:: @ 81D5CF8 +Status_Whirlpool:: loadspritegfx ANIM_TAG_WATER_ORB monbg ANIM_DEF_PARTNER monbgprio_28 1 @@ -10624,7 +10624,7 @@ Status_Whirlpool:: @ 81D5CF8 clearmonbg ANIM_DEF_PARTNER end -Status_Clamp:: @ 81D5D4C +Status_Clamp:: loadspritegfx ANIM_TAG_CLAMP loadspritegfx ANIM_TAG_IMPACT monbg 1 @@ -10641,7 +10641,7 @@ Status_Clamp:: @ 81D5D4C waitforvisualfinish end -Status_SandTomb:: @ 81D5DA9 +Status_SandTomb:: loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 563 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 @@ -10654,7 +10654,7 @@ Status_SandTomb:: @ 81D5DA9 stopsound end -General_ItemEffect:: @ 81D5DF2 +General_ItemEffect:: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 @@ -10676,7 +10676,7 @@ General_ItemEffect:: @ 81D5DF2 waitforvisualfinish end -General_SmokeballEscape:: @ 81D5E66 +General_SmokeballEscape:: loadspritegfx ANIM_TAG_PINK_CLOUD monbg ANIM_ATTACKER setalpha 12, 4 @@ -10714,7 +10714,7 @@ General_SmokeballEscape:: @ 81D5E66 blendoff end -General_HangedOn:: @ 81D5F42 +General_HangedOn:: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 2, 7, 0, 9, 31 playsewithpan SE_M_DRAGON_RAGE, 192 createvisualtask AnimTask_SlideMonForFocusBand, 5, 30, 128, 0, 1, 2, 0, 1 @@ -10725,7 +10725,7 @@ General_HangedOn:: @ 81D5F42 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 0, 0, 0, 15 end -General_Rain:: @ 81D5F8F +General_Rain:: loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_M_RAIN_DANCE, 192 createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK @@ -10738,21 +10738,21 @@ General_Rain:: @ 81D5F8F waitforvisualfinish end -General_Sun:: @ 81D5FD8 +General_Sun:: goto Move_SUNNY_DAY -General_Sandstorm:: @ 81D5FDD +General_Sandstorm:: goto Move_SANDSTORM -General_Hail:: @ 81D5FE2 +General_Hail:: goto Move_HAIL -General_LeechSeedDrain:: @ 81D5FE7 +General_LeechSeedDrain:: createvisualtask AnimTask_GetBattlersFromArg, 5, delay 0 goto Move_ABSORB -General_MonHit:: @ 81D5FF5 +General_MonHit:: loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 @@ -10764,7 +10764,7 @@ General_MonHit:: @ 81D5FF5 blendoff end -General_ItemSteal:: @ 81D6026 +General_ItemSteal:: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_SetAnimAttackerAndTargetForEffectAtk, 2 createvisualtask AnimTask_TargetToEffectBattler, 2, @@ -10772,7 +10772,7 @@ General_ItemSteal:: @ 81D6026 createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 end -General_SnatchMove:: @ 81D604B +General_SnatchMove:: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_SetAnimAttackerAndTargetForEffectTgt, 2 call SnatchMoveTrySwapFromSubstitute @@ -10783,22 +10783,22 @@ General_SnatchMove:: @ 81D604B jumpargeq 7, 0, SnatchOpposingMonMove goto SnatchPartnerMonMove -SnatchMoveContinue:: @ 81D6082 +SnatchMoveContinue:: waitforvisualfinish call SnatchMoveTrySwapToSubstitute end -SnatchOpposingMonMove:: @ 81D6089 +SnatchOpposingMonMove:: playsewithpan SE_M_DOUBLE_TEAM, 192 createvisualtask AnimTask_SnatchOpposingMonMove, 2, goto SnatchMoveContinue -SnatchPartnerMonMove:: @ 81D6099 +SnatchPartnerMonMove:: playsewithpan SE_M_DOUBLE_TEAM, 192 createvisualtask AnimTask_SnatchPartnerMove, 2, goto SnatchMoveContinue -General_FutureSightHit:: @ 81D60A9 +General_FutureSightHit:: createvisualtask AnimTask_SetAnimTargetToBattlerTarget, 2 monbg ANIM_DEF_PARTNER playsewithpan SE_M_PSYBEAM, 192 @@ -10818,7 +10818,7 @@ General_FutureSightHit:: @ 81D60A9 call UnsetPsychicBg end -General_DoomDesireHit:: @ 81D6108 +General_DoomDesireHit:: createvisualtask AnimTask_SetAnimTargetToBattlerTarget, 2, loadspritegfx ANIM_TAG_EXPLOSION createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE @@ -10852,7 +10852,7 @@ General_DoomDesireHit:: @ 81D6108 waitforvisualfinish end -General_FocusPunchSetUp:: @ 81D61CD +General_FocusPunchSetUp:: loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_M_DRAGON_RAGE, 192 call EndureEffect @@ -10865,7 +10865,7 @@ General_FocusPunchSetUp:: @ 81D61CD waitforvisualfinish end -General_IngrainHeal:: @ 81D620D +General_IngrainHeal:: loadspritegfx ANIM_TAG_ORBS loadspritegfx ANIM_TAG_BLUE_STAR monbg ANIM_DEF_PARTNER @@ -10884,7 +10884,7 @@ General_IngrainHeal:: @ 81D620D blendoff end -General_WishHeal:: @ 81D6250 +General_WishHeal:: loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 @@ -10897,7 +10897,7 @@ General_WishHeal:: @ 81D6250 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, 0 end -General_MonScared:: @ 81D628A +General_MonScared:: createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 1 waitforvisualfinish loadspritegfx ANIM_TAG_SWEAT_BEAD @@ -10914,7 +10914,7 @@ General_MonScared:: @ 81D628A waitforvisualfinish end -General_GhostGetOut:: @ 81D6301 +General_GhostGetOut:: createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 1 waitforvisualfinish fadetobg 2 @@ -10939,7 +10939,7 @@ General_GhostGetOut:: @ 81D6301 waitbgfadein end -General_SilphScoped:: @ 81D637B +General_SilphScoped:: monbg ANIM_ATTACKER playsewithpan SE_M_TELEPORT, 192 waitplaysewithpan SE_M_MINIMIZE, 192, 48 @@ -10949,7 +10949,7 @@ General_SilphScoped:: @ 81D637B clearmonbg ANIM_ATTACKER end -General_SafariRockThrow:: @ 81D6394 +General_SafariRockThrow:: createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 0 waitforvisualfinish loadspritegfx ANIM_TAG_ROCKS @@ -10969,7 +10969,7 @@ General_SafariRockThrow:: @ 81D6394 waitforvisualfinish end -General_SafariReaction:: @ 81D63DC +General_SafariReaction:: createvisualtask AnimTask_SafariGetReaction, 2, waitforvisualfinish jumpargeq 7, 0, SafariReaction_WatchingCarefully @@ -10977,7 +10977,7 @@ General_SafariReaction:: @ 81D63DC jumpargeq 7, 2, SafariReaction_Eating end -SafariReaction_WatchingCarefully:: @ 81D63FD +SafariReaction_WatchingCarefully:: playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, 96, 0, 2 waitforvisualfinish @@ -10985,7 +10985,7 @@ SafariReaction_WatchingCarefully:: @ 81D63FD createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 16, -96, 0, 2 end -SafariReaction_Angry:: @ 81D6425 +SafariReaction_Angry:: loadspritegfx ANIM_TAG_ANGER createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -20 playsewithpan SE_M_SWAGGER2, 63 @@ -10995,7 +10995,7 @@ SafariReaction_Angry:: @ 81D6425 playsewithpan SE_M_SWAGGER2, 63 end -SafariReaction_Eating:: @ 81D644E +SafariReaction_Eating:: playsewithpan SE_M_TAKE_DOWN, 63 createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 8, 136, 0, 2 waitforvisualfinish @@ -11003,33 +11003,33 @@ SafariReaction_Eating:: @ 81D644E createvisualtask AnimTask_RotateMonToSideAndRestore, 2, 8, 136, 0, 2 end -SnatchMoveTrySwapFromSubstitute:: @ 81D6476 +SnatchMoveTrySwapFromSubstitute:: createvisualtask AnimTask_IsAttackerBehindSubstitute, 2, jumpargeq 7, 1, SnatchMoveSwapSubstituteForMon -SnatchMoveTrySwapFromSubstituteEnd:: @ 81D6485 +SnatchMoveTrySwapFromSubstituteEnd:: waitforvisualfinish return -SnatchMoveSwapSubstituteForMon:: @ 81D6487 +SnatchMoveSwapSubstituteForMon:: createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, 1 waitforvisualfinish goto SnatchMoveTrySwapFromSubstituteEnd -SnatchMoveTrySwapToSubstitute:: @ 81D6496 +SnatchMoveTrySwapToSubstitute:: createvisualtask AnimTask_IsAttackerBehindSubstitute, 2, jumpargeq 7, 1, SnatchMoveSwapMonForSubstitute -SnatchMoveTrySwapToSubstituteEnd:: @ 81D64A5 +SnatchMoveTrySwapToSubstituteEnd:: waitforvisualfinish return -SnatchMoveSwapMonForSubstitute:: @ 81D64A7 +SnatchMoveSwapMonForSubstitute:: createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, 0 waitforvisualfinish goto SnatchMoveTrySwapToSubstituteEnd -Special_LevelUp:: @ 81D64B6 +Special_LevelUp:: playsewithpan SE_EXP_MAX, 0 createvisualtask AnimTask_LoadHealthboxPalsForLevelUp, 2 delay 0 @@ -11038,19 +11038,19 @@ Special_LevelUp:: @ 81D64B6 createvisualtask AnimTask_FreeHealthboxPalsForLevelUp, 2 end -Special_SwitchOutPlayerMon:: @ 81D64D7 +Special_SwitchOutPlayerMon:: createvisualtask AnimTask_SwitchOutBallEffect, 2 delay 10 createvisualtask AnimTask_SwitchOutShrinkMon, 2 end -Special_SwitchOutOpponentMon:: @ 81D64E8 +Special_SwitchOutOpponentMon:: createvisualtask AnimTask_SwitchOutBallEffect, 2, delay 10 createvisualtask AnimTask_SwitchOutShrinkMon, 2, end -Special_BallThrow:: @ 81D64F9 +Special_BallThrow:: createvisualtask AnimTask_LoadBallGfx, 2 delay 0 playsewithpan SE_BALL_THROW, 0 @@ -11058,12 +11058,12 @@ Special_BallThrow:: @ 81D64F9 createvisualtask AnimTask_IsBallBlockedByTrainerOrDodged, 2, jumpargeq 7, -1, BallThrowTrainerBlock jumpargeq 7, -2, BallThrowGhostDodged -BallThrowEnd:: @ 81D6524 +BallThrowEnd:: waitforvisualfinish createvisualtask AnimTask_FreeBallGfx, 2 end -BallThrowTrainerBlock:: @ 81D652D +BallThrowTrainerBlock:: loadspritegfx ANIM_TAG_IMPACT delay 25 monbg ANIM_DEF_PARTNER @@ -11076,7 +11076,7 @@ BallThrowTrainerBlock:: @ 81D652D blendoff goto BallThrowEnd -BallThrowGhostDodged:: @ 81D6555 +BallThrowGhostDodged:: delay 16 createvisualtask AnimTask_WindUpLunge, 2, 1, 48, 6, 16, 48, -48, 16 playsewithpan SE_M_TAKE_DOWN, 63 @@ -11084,7 +11084,7 @@ BallThrowGhostDodged:: @ 81D6555 waitforvisualfinish goto BallThrowEnd -Special_SafariBallThrow:: @ 81D657B +Special_SafariBallThrow:: createvisualtask AnimTask_LoadBallGfx, 2, delay 0 createvisualtask AnimTask_ThrowBallSpecial, 2 @@ -11092,10 +11092,10 @@ Special_SafariBallThrow:: @ 81D657B createvisualtask AnimTask_FreeBallGfx, 2, end -Special_SubstituteToMon:: @ 81D6594 +Special_SubstituteToMon:: createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, 1 end -Special_MonToSubstitute:: @ 81D659E +Special_MonToSubstitute:: createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, 0 end diff --git a/data/event_scripts.s b/data/event_scripts.s index 949af06ed..e14eb7465 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -45,7 +45,7 @@ .include "data/script_cmd_table.inc" .align 2 -gSpecialVars:: @ 815FD0C +gSpecialVars:: .4byte gSpecialVar_0x8000 .4byte gSpecialVar_0x8001 .4byte gSpecialVar_0x8002 @@ -71,7 +71,7 @@ gSpecialVars:: @ 815FD0C .include "data/specials.inc" .align 2 -gStdScripts:: @ 8160450 +gStdScripts:: .4byte Std_ObtainItem .4byte Std_FindItem .4byte Std_MsgboxNPC @@ -805,58 +805,58 @@ gStdScriptsEnd:: .include "data/scripts/trainer_battle.inc" @ Unused -Text_WouldYouLikeToMixRecords:: @ 81A5028 +Text_WouldYouLikeToMixRecords:: .string "Would you like to mix records with\n" .string "other TRAINERS?$" @ Unused -Text_WeHopeToSeeYouAgain2:: @ 81A505B +Text_WeHopeToSeeYouAgain2:: .string "We hope to see you again!$" .include "data/text/pc.inc" @ Unused -Text_WelcomeTradeCenter:: @ 81A5103 +Text_WelcomeTradeCenter:: .string "Welcome to the POKéMON CABLE CLUB\n" .string "TRADE CENTER.$" @ Unused -Text_WelcomeColosseum:: @ 81A5133 +Text_WelcomeColosseum:: .string "Welcome to the POKéMON CABLE CLUB\n" .string "COLOSSEUM.$" @ Unused -Text_WelcomeTimeCapsule:: @ 81A5160 +Text_WelcomeTimeCapsule:: .string "Welcome to the POKéMON CABLE CLUB\n" .string "TIME CAPSULE.$" -Text_PleaseComeAgain:: @ 81A5190 +Text_PleaseComeAgain:: .string "Please come again!$" @ Unused -Text_HavingDiscountSaleToday:: @ 81A51A3 +Text_HavingDiscountSaleToday:: .string "Welcome!\p" .string "We're having a discount sale today!$" @ Unused -Text_PlayerWhatCanIDoForYou:: @ 81A51D0 +Text_PlayerWhatCanIDoForYou:: .string "{PLAYER}{KUN}, welcome!\p" .string "What can I do for you?$" .include "data/text/obtain_item.inc" -Text_MakingPreparations:: @ 81A5351 +Text_MakingPreparations:: .string "じゅんびちゅうです！$" -Text_WantWhichFloor:: @ 81A535C +Text_WantWhichFloor:: .string "Which floor do you want?$" -Text_BagItemCanBeRegistered:: @ 81A5375 +Text_BagItemCanBeRegistered:: .string "An item in the BAG can be\n" .string "registered to SELECT for easy use.$" @ Unused (email from R/S Rivals computer) -Text_TrainerSchoolEmail:: @ 81A53B2 +Text_TrainerSchoolEmail:: .string "パソコンに\n" .string "ポケモン　トレーナー　こうざの\l" .string "メールが　きている！\p" @@ -866,35 +866,35 @@ Text_TrainerSchoolEmail:: @ 81A53B2 .string "トレーナーの　じつりょくが　とわれます！\p" .string "‥‥　‥‥　‥‥$" -Text_PlayerBootedUpPC:: @ 81A5420 +Text_PlayerBootedUpPC:: .string "{PLAYER} booted up the PC.$" @ Unused -Text_LinkWasCanceled:: @ 81A5435 +Text_LinkWasCanceled:: .string "つうしんは　キャンセルされました$" @ Unused -Text_GiveNicknameToReceivedMon:: @ 81A5446 +Text_GiveNicknameToReceivedMon:: .string "Want to give a nickname to the\n" .string "{STR_VAR_2} you received?$" -gText_PkmnFainted3:: @ 81A5476 +gText_PkmnFainted3:: .string "{STR_VAR_1} fainted…\p" .string "$" -Text_WelcomeWantToHealPkmn:: @ 81A5483 +Text_WelcomeWantToHealPkmn:: .string "Welcome to our POKéMON CENTER!\p" .string "Would you like me to heal your\n" .string "POKéMON back to perfect health?$" -Text_TakeYourPkmnForFewSeconds:: @ 81A54E1 +Text_TakeYourPkmnForFewSeconds:: .string "Okay, I'll take your POKéMON for a\n" .string "few seconds.$" -Text_WeHopeToSeeYouAgain:: @ 81A5511 +Text_WeHopeToSeeYouAgain:: .string "We hope to see you again!$" -Text_RestoredPkmnToFullHealth:: @ 81A552B +Text_RestoredPkmnToFullHealth:: .string "Thank you for waiting.\n" .string "We've restored your POKéMON to\l" .string "full health.$" @@ -902,29 +902,29 @@ Text_RestoredPkmnToFullHealth:: @ 81A552B .include "data/text/surf.inc" @ Unused, from R/S -Text_DoorOpenedFarAway:: @ 81A55EA +Text_DoorOpenedFarAway:: .string "どこか　とおくの　とびらが\n" .string "ひらいたような　おとだ‥‥$" @ Unused, from R/S -Text_BigHoleInTheWall:: @ 81A5606 +Text_BigHoleInTheWall:: .string "かべに\n" .string "おおきな　あなが　あいている！$" -Text_WirelessClubUndergoingAdjustments:: @ 81A561A +Text_WirelessClubUndergoingAdjustments:: .string "I'm terribly sorry.\n" .string "The POKéMON WIRELESS CLUB is\l" .string "undergoing adjustments now.$" -Text_AppearsToBeUndergoingAdjustments:: @ 81A5667 +Text_AppearsToBeUndergoingAdjustments:: .string "It appears to be undergoing\n" .string "adjustments…$" -Text_HandedOverItem:: @ 81A5690 +Text_HandedOverItem:: .string "{PLAYER} handed over the\n" .string "{STR_VAR_1}.$" -Text_GiveNicknameToThisMon:: @ 81A56A7 +Text_GiveNicknameToThisMon:: .string "Do you want to give a nickname to\n" .string "this {STR_VAR_1}?$" @@ -933,81 +933,81 @@ Text_GiveNicknameToThisMon:: @ 81A56A7 .include "data/text/aide.inc" .include "data/text/ingame_trade.inc" -Text_CardKeyOpenedDoor:: @ 81A5B88 +Text_CardKeyOpenedDoor:: .string "Bingo!\n" .string "The CARD KEY opened the door!$" -Text_ItNeedsCardKey:: @ 81A5BAD +Text_ItNeedsCardKey:: .string "No!\n" .string "It needs a CARD KEY!$" -Text_AccessedProfOaksPC:: @ 81A5BC6 +Text_AccessedProfOaksPC:: .string "Accessed PROF. OAK's PC…\p" .string "Accessed the POKéDEX Rating\n" .string "System…$" -Text_HavePokedexRated:: @ 81A5C03 +Text_HavePokedexRated:: .string "Would you like to have your\n" .string "POKéDEX rated?$" -Text_ClosedLinkToProfOaksPC:: @ 81A5C2E +Text_ClosedLinkToProfOaksPC:: .string "Closed link to PROF. OAK's PC.$" -Text_VoiceRangOutDontRunAway:: @ 81A5C4D +Text_VoiceRangOutDontRunAway:: .string "Someone's voice rang out,\n" .string "“Don't run away!”$" @ Uncear what the below unused JP texts were for -Text_IdLikeToSeeRequest:: @ 81A5C79 +Text_IdLikeToSeeRequest:: .string "えっとー\n" .string "{STR_VAR_2}が　みてみたいなー\p" .string "それも　{STR_VAR_1}{STR_VAR_3}\n" .string "{STR_VAR_2}が　みてみたいなー$" -Text_ThankYouForShowingMe:: @ 81A5C9F +Text_ThankYouForShowingMe:: .string "わぁー　すごい！\n" .string "{STR_VAR_1}{STR_VAR_3}{STR_VAR_2}だー！\p" .string "ありがとー\n" .string "また　よろしくねー！$" -Text_ThatsNotRight:: @ 81A5CC3 +Text_ThatsNotRight:: .string "それっ　ちがうよー！$" -Text_ISee:: @ 81A5CCE +Text_ISee:: .string "そっか‥$" -Text_TheDoorIsClosed:: @ 81A5CD3 +Text_TheDoorIsClosed:: .string "ドアは　しまっている‥$" -Text_TheDoorIsOpen:: @ 81A5CDF +Text_TheDoorIsOpen:: .string "The door is open…$" .include "data/text/pc_transfer.inc" .include "data/text/white_out.inc" .include "data/text/poke_mart.inc" -Text_MonFlewAway:: @ 81A63C4 +Text_MonFlewAway:: .string "The {STR_VAR_1} flew away!$" -Text_TheresBedLetsRest:: @ 81A63D6 +Text_TheresBedLetsRest:: .string "ベッドが　ある‥‥\n" .string "やすんでいこう$" -Text_FoundTMHMContainsMove:: @ 81A63E8 +Text_FoundTMHMContainsMove:: .string "{PLAYER} found a {STR_VAR_2}!\n" .string "It contains {STR_VAR_1}.$" .include "data/text/seagallop.inc" @ Call for legendary bird trio -Text_Gyaoo:: @ 81A6448 +Text_Gyaoo:: .string "Gyaoo!$" -Text_MoveCanOnlyBeLearnedOnce:: @ 81A644F +Text_MoveCanOnlyBeLearnedOnce:: .string "This move can be learned only\n" .string "once. Is that okay?$" -EventScript_ResetAllMapFlags:: @ 81A6481 +EventScript_ResetAllMapFlags:: setflag FLAG_HIDE_OAK_IN_HIS_LAB setflag FLAG_HIDE_OAK_IN_PALLET_TOWN setflag FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE @@ -1065,7 +1065,7 @@ EventScript_ResetAllMapFlags:: @ 81A6481 .include "data/scripts/obtain_item.inc" .include "data/scripts/pc.inc" -Common_ShowEasyChatScreen:: @ 81A6AC0 +Common_ShowEasyChatScreen:: fadescreen FADE_TO_BLACK special ShowEasyChatScreen fadescreen FADE_FROM_BLACK @@ -1076,12 +1076,12 @@ Common_ShowEasyChatScreen:: @ 81A6AC0 .include "data/scripts/bag_full.inc" @ Unused -EventScript_GymBadgeFanfare:: @ 81A6C21 +EventScript_GymBadgeFanfare:: playfanfare MUS_OBTAIN_BADGE waitfanfare return -EventScript_OutOfCenterPartyHeal:: @ 81A6C26 +EventScript_OutOfCenterPartyHeal:: fadescreen FADE_TO_BLACK playfanfare MUS_HEAL waitfanfare @@ -1089,7 +1089,7 @@ EventScript_OutOfCenterPartyHeal:: @ 81A6C26 fadescreen FADE_FROM_BLACK return -EventScript_WallTownMap:: @ 81A6C32 +EventScript_WallTownMap:: lockall msgbox Text_ATownMap goto_if_questlog EventScript_ReleaseEnd @@ -1103,14 +1103,14 @@ EventScript_WallTownMap:: @ 81A6C32 .include "data/scripts/pokedex_rating.inc" .include "data/scripts/cave_of_origin.inc" -EventScript_ChangePokemonNickname:: @ 81A74EB +EventScript_ChangePokemonNickname:: fadescreen FADE_TO_BLACK special ChangePokemonNickname waitstate return @ Unused -EventScript_HandOverItem:: @ 81A74F2 +EventScript_HandOverItem:: getitemname 0, VAR_0x8004 playfanfare MUS_OBTAIN_TMHM message Text_HandedOverItem @@ -1124,29 +1124,29 @@ EventScript_HandOverItem:: @ 81A74F2 .include "data/scripts/flavor_text.inc" .include "data/scripts/questionnaire.inc" -EventScript_BagItemCanBeRegistered:: @ 81A77A0 +EventScript_BagItemCanBeRegistered:: msgbox Text_BagItemCanBeRegistered, MSGBOX_SIGN end -EventScript_Return:: @ 81A77A9 +EventScript_Return:: return -EventScript_SetResultTrue:: @ 81A77AA +EventScript_SetResultTrue:: setvar VAR_RESULT, TRUE return -EventScript_SetResultFalse:: @ 81A77B0 +EventScript_SetResultFalse:: setvar VAR_RESULT, FALSE return -EventScript_SetExitingCyclingRoad:: @ 81A77B6 +EventScript_SetExitingCyclingRoad:: lockall clearflag FLAG_SYS_ON_CYCLING_ROAD setvar VAR_MAP_SCENE_ROUTE16, 0 releaseall end -EventScript_SetEnteringCyclingRoad:: @ 81A77C1 +EventScript_SetEnteringCyclingRoad:: lockall setvar VAR_MAP_SCENE_ROUTE16, 1 releaseall @@ -1154,25 +1154,25 @@ EventScript_SetEnteringCyclingRoad:: @ 81A77C1 .include "data/scripts/route23.inc" -EventScript_GetElevatorFloor:: @ 81A7AB9 +EventScript_GetElevatorFloor:: special GetElevatorFloor return .include "data/scripts/aide.inc" -EventScript_CancelMessageBox:: @ 81A7ADB +EventScript_CancelMessageBox:: special DoPicboxCancel release end -EventScript_ReleaseEnd:: @ 81A7AE0 +EventScript_ReleaseEnd:: release end .include "data/scripts/pokemon_mansion.inc" @ Unused -EventScript_DelayedLookAround:: @ 81A80FE +EventScript_DelayedLookAround:: lockall applymovement VAR_0x8004, Movement_WalkInPlaceFastestLeft waitmovement 0 @@ -1192,13 +1192,13 @@ EventScript_DelayedLookAround:: @ 81A80FE .include "data/scripts/silphco_doors.inc" .include "data/scripts/pc_transfer.inc" -EventScript_GetInGameTradeSpeciesInfo:: @ 81A8CAD +EventScript_GetInGameTradeSpeciesInfo:: copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, GetInGameTradeSpeciesInfo copyvar VAR_0x8009, VAR_RESULT return -EventScript_ChooseMonForInGameTrade:: @ 81A8CBD +EventScript_ChooseMonForInGameTrade:: special ChoosePartyMon waitstate lock @@ -1206,13 +1206,13 @@ EventScript_ChooseMonForInGameTrade:: @ 81A8CBD copyvar VAR_0x800A, VAR_0x8004 return -EventScript_GetInGameTradeSpecies:: @ 81A8CC9 +EventScript_GetInGameTradeSpecies:: copyvar VAR_0x8005, VAR_0x800A specialvar VAR_RESULT, GetTradeSpecies copyvar VAR_0x800B, VAR_RESULT return -EventScript_DoInGameTrade:: @ 81A8CD9 +EventScript_DoInGameTrade:: copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon @@ -1222,26 +1222,26 @@ EventScript_DoInGameTrade:: @ 81A8CD9 faceplayer return -EventScript_VsSeekerChargingDone:: @ 81A8CED +EventScript_VsSeekerChargingDone:: special VsSeekerFreezeObjectsAfterChargeComplete waitstate special VsSeekerResetObjectMovementAfterChargeComplete releaseall end -Common_EventScript_UnionRoomAttendant:: @ 81A8CF6 +Common_EventScript_UnionRoomAttendant:: call CableClub_EventScript_UnionRoomAttendant end -Common_EventScript_WirelessClubAttendant:: @ 81A8CFC +Common_EventScript_WirelessClubAttendant:: call CableClub_EventScript_WirelessClubAttendant end -Common_EventScript_DirectCornerAttendant:: @ 81A8D02 +Common_EventScript_DirectCornerAttendant:: call CableClub_EventScript_DirectCornerAttendant end -VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman:: @ 81A8D08 +VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman:: lock faceplayer goto_if_set FLAG_GOT_VS_SEEKER, VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker @@ -1254,7 +1254,7 @@ VermilionCity_PokemonCenter_1F_EventScript_VSSeekerWoman:: @ 81A8D08 release end -VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker:: @ 81A8D3F +VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker:: msgbox VermilionCity_PokemonCenter_1F_Text_ExplainVSSeeker release end @@ -1262,14 +1262,14 @@ VermilionCity_PokemonCenter_1F_EventScript_ExplainVSSeeker:: @ 81A8D3F .include "data/scripts/itemfinder.inc" .include "data/scripts/white_out.inc" -Std_PutItemAway:: @ 81A8E58 +Std_PutItemAway:: bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 checkitemtype VAR_0x8000 call EventScript_BufferPutAwayPocketName msgbox Text_PutItemAway return -EventScript_BufferPutAwayPocketName:: @ 81A8E6F +EventScript_BufferPutAwayPocketName:: switch VAR_RESULT case POCKET_ITEMS, EventScript_BufferPutAwayPocketItems case POCKET_KEY_ITEMS, EventScript_BufferPutAwayPocketKeyItems @@ -1278,36 +1278,36 @@ EventScript_BufferPutAwayPocketName:: @ 81A8E6F case POCKET_BERRY_POUCH, EventScript_BufferPutAwayPocketBerryPouch end -EventScript_BufferPutAwayPocketItems:: @ 81A8EAC +EventScript_BufferPutAwayPocketItems:: getstdstring 2, STDSTRING_ITEMS_POCKET return -EventScript_BufferPutAwayPocketKeyItems:: @ 81A8EB1 +EventScript_BufferPutAwayPocketKeyItems:: getstdstring 2, STDSTRING_KEY_ITEMS_POCKET return -EventScript_BufferPutAwayPocketPokeBalls:: @ 81A8EB6 +EventScript_BufferPutAwayPocketPokeBalls:: getstdstring 2, STDSTRING_POKEBALLS_POCKET return -EventScript_BufferPutAwayPocketTMCase:: @ 81A8EBB +EventScript_BufferPutAwayPocketTMCase:: getstdstring 2, STDSTRING_TM_CASE return -EventScript_BufferPutAwayPocketBerryPouch:: @ 81A8EC0 +EventScript_BufferPutAwayPocketBerryPouch:: getstdstring 2, STDSTRING_BERRY_POUCH return .include "data/scripts/seagallop.inc" .include "data/scripts/static_pokemon.inc" -EventScript_TryDarkenRuins:: @ 81A925E +EventScript_TryDarkenRuins:: goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_Return setweather WEATHER_SHADE doweather return -EventScript_BrailleCursorWaitButton:: @ 81A926C +EventScript_BrailleCursorWaitButton:: special BrailleCursorToggle waitbuttonpress playse SE_SELECT @@ -1315,7 +1315,7 @@ EventScript_BrailleCursorWaitButton:: @ 81A926C special BrailleCursorToggle return -EventScript_NoMoreRoomForPokemon:: @ 81A927C +EventScript_NoMoreRoomForPokemon:: textcolor 3 msgbox Text_NoMoreRoomForPokemon release @@ -1326,7 +1326,7 @@ EventScript_NoMoreRoomForPokemon:: @ 81A927C @ Test message! @ Welcome to the world of Pokémon! -Text_TestMsg:: @ 81ACD45 +Text_TestMsg:: .string "テストよう　メッセージです！\n" .string "ポケモンの　せかいへ　ようこそ！$" diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 98201382c..05fe03ce6 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -1,7 +1,7 @@ .include "asm/macros/field_effect_script.inc" .section script_data, "aw", %progbits .align 2 -gFieldEffectScriptPointers:: @ 81D96AC +gFieldEffectScriptPointers:: .4byte gFldEffScript_ExclamationMarkIcon .4byte gFldEffScript_UseCutOnGrass .4byte gFldEffScript_UseCutOnTree @@ -73,274 +73,274 @@ gFieldEffectScriptPointers:: @ 81D96AC .4byte gFldEffScript_Unk44 .4byte gFldEffScript_Unk45 -gFldEffScript_ExclamationMarkIcon:: @ 81D97C4 +gFldEffScript_ExclamationMarkIcon:: callnative FldEff_ExclamationMarkIcon1 end -gFldEffScript_UseCutOnGrass:: @ 81D97CA +gFldEffScript_UseCutOnGrass:: callnative FldEff_UseCutOnGrass end -gFldEffScript_UseCutOnTree:: @ 81D97D0 +gFldEffScript_UseCutOnTree:: callnative FldEff_UseCutOnTree end -gFldEffScript_Shadow:: @ 81D97D6 +gFldEffScript_Shadow:: callnative FldEff_Shadow end -gFldEffScript_TallGrass:: @ 81D97DC +gFldEffScript_TallGrass:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_TallGrass end -gFldEffScript_Ripple:: @ 81D97E6 +gFldEffScript_Ripple:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ripple end -gFldEffScript_FieldMoveShowMon:: @ 81D97F0 +gFldEffScript_FieldMoveShowMon:: callnative FldEff_FieldMoveShowMon end -gFldEffScript_Ash:: @ 81D97F6 +gFldEffScript_Ash:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ash end -gFldEffScript_SurfBlob:: @ 81D9800 +gFldEffScript_SurfBlob:: callnative FldEff_SurfBlob end -gFldEffScript_UseSurf:: @ 81D9806 +gFldEffScript_UseSurf:: callnative FldEff_UseSurf end -gFldEffScript_Dust:: @ 81D980C +gFldEffScript_Dust:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Dust end -gFldEffScript_UseSecretPowerCave:: @ 81D9816 +gFldEffScript_UseSecretPowerCave:: end -gFldEffScript_JumpTallGrass:: @ 81D9817 +gFldEffScript_JumpTallGrass:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpTallGrass end -gFldEffScript_SandFootprints:: @ 81D9821 +gFldEffScript_SandFootprints:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints end -gFldEffScript_JumpBigSplash:: @ 81D982B +gFldEffScript_JumpBigSplash:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash end -gFldEffScript_Splash:: @ 81D9835 +gFldEffScript_Splash:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Splash end -gFldEffScript_JumpSmallSplash:: @ 81D983F +gFldEffScript_JumpSmallSplash:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpSmallSplash end -gFldEffScript_LongGrass:: @ 81D9849 +gFldEffScript_LongGrass:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_LongGrass end -gFldEffScript_JumpLongGrass:: @ 81D9853 +gFldEffScript_JumpLongGrass:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass end -gFldEffScript_Unknown19:: @ 81D985D +gFldEffScript_Unknown19:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Unknown19 end -gFldEffScript_Unknown20:: @ 81D9867 +gFldEffScript_Unknown20:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Unknown20 end -gFldEffScript_Unknown21:: @ 81D9871 +gFldEffScript_Unknown21:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Unknown21 end -gFldEffScript_Unknown22:: @ 81D987B +gFldEffScript_Unknown22:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Unknown22 end -gFldEffScript_BerryTreeGrowthSparkle:: @ 81D9885 +gFldEffScript_BerryTreeGrowthSparkle:: callnative FldEff_BerryTreeGrowthSparkle end -gFldEffScript_DeepSandFootprints:: @ 81D988B +gFldEffScript_DeepSandFootprints:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_DeepSandFootprints end -gFldEffScript_PokecenterHeal:: @ 81D9895 +gFldEffScript_PokecenterHeal:: loadfadedpal gUnknown_83CBE9C loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_PokecenterHeal end -gFldEffScript_UseSecretPowerTree:: @ 81D98A4 +gFldEffScript_UseSecretPowerTree:: end -gFldEffScript_UseSecretPowerShrub:: @ 81D98A5 +gFldEffScript_UseSecretPowerShrub:: end -gFldEffScript_TreeDisguise:: @ 81D98A6 +gFldEffScript_TreeDisguise:: callnative ShowTreeDisguiseFieldEffect end -gFldEffScript_MountainDisguise:: @ 81D98AC +gFldEffScript_MountainDisguise:: callnative ShowMountainDisguiseFieldEffect end -gFldEffScript_NpcflyOut:: @ 81D98B2 +gFldEffScript_NpcflyOut:: callnative FldEff_NpcFlyOut end -gFldEffScript_UseFly:: @ 81D98B8 +gFldEffScript_UseFly:: callnative FldEff_UseFly end -gFldEffScript_FlyIn:: @ 81D98BE +gFldEffScript_FlyIn:: callnative FldEff_FlyIn end -gFldEffScript_QuestionMarkIcon:: @ 81D98C4 +gFldEffScript_QuestionMarkIcon:: callnative FldEff_QuestionMarkIcon end -gFldEffScript_FeetInFlowingWater:: @ 81D98CA +gFldEffScript_FeetInFlowingWater:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_FeetInFlowingWater end -gFldEffScript_BikeTireTracks:: @ 81D98D4 +gFldEffScript_BikeTireTracks:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks end -gFldEffScript_SandDisguise:: @ 81D98DE +gFldEffScript_SandDisguise:: callnative ShowSandDisguiseFieldEffect end -gFldEffScript_UseRockSmash:: @ 81D98E4 +gFldEffScript_UseRockSmash:: callnative FldEff_UseRockSmash end -gFldEffScript_UseStrength:: @ 81D98EA +gFldEffScript_UseStrength:: callnative FldEff_UseStrength end -gFldEffScript_UseDig:: @ 81D98F0 +gFldEffScript_UseDig:: callnative FldEff_UseDig end -gFldEffScript_SandPile:: @ 81D98F6 +gFldEffScript_SandPile:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandPile end -gFldEffScript_ShortGrass:: @ 81D9900 +gFldEffScript_ShortGrass:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShortGrass end -gFldEffScript_HotSpringsWater:: @ 81D990A +gFldEffScript_HotSpringsWater:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_HotSpringsWater end -gFldEffScript_UseWaterfall:: @ 81D9914 +gFldEffScript_UseWaterfall:: callnative FldEff_UseWaterfall end -gFldEffScript_UseDive:: @ 81D991A +gFldEffScript_UseDive:: callnative FldEff_UseDive end -gFldEffScript_Pokeball:: @ 81D9920 +gFldEffScript_Pokeball:: loadpal sSpritePalette_SlidingPokeball callnative FldEff_Pokeball end -gFldEffScript_HeartIcon:: @ 81D992B +gFldEffScript_HeartIcon:: callnative FldEff_XIcon end -gFldEffScript_Nop47:: @ 81D9931 +gFldEffScript_Nop47:: end -gFldEffScript_Nop48:: @ 81D9932 +gFldEffScript_Nop48:: end -gFldEffScript_PopOutOfAsh:: @ 81D9933 +gFldEffScript_PopOutOfAsh:: loadfadedpal_callnative gSpritePalette_Ash, FldEff_PopOutOfAsh end -gFldEffScript_LavaridgeGymWarp:: @ 81D993D +gFldEffScript_LavaridgeGymWarp:: loadfadedpal_callnative gSpritePalette_Ash, FldEff_LavaridgeGymWarp end -gFldEffScript_SweetScent:: @ 81D9947 +gFldEffScript_SweetScent:: callnative FldEff_SweetScent end -gFldEffScript_SandPillar:: @ 81D994D +gFldEffScript_SandPillar:: end -gFldEffScript_Bubbles:: @ 81D994E +gFldEffScript_Bubbles:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Bubbles end -gFldEffScript_Sparkle:: @ 81D9958 +gFldEffScript_Sparkle:: loadfadedpal_callnative gSpritePalette_SmallSparkle, FldEff_Sparkle end -gFldEffScript_SecretPowerCave:: @ 81D9962 +gFldEffScript_SecretPowerCave:: end -gFldEffScript_SecretPowerTree:: @ 81D9963 +gFldEffScript_SecretPowerTree:: end -gFldEffScript_SecretPowerShrub:: @ 81D9964 +gFldEffScript_SecretPowerShrub:: end -gFldEffScript_CutGrass:: @ 81D9965 +gFldEffScript_CutGrass:: loadfadedpal_callnative gFldEffPalette_CutGrass, FldEff_CutGrass end -gFldEffScript_FieldMoveShowMonInit:: @ 81D996F +gFldEffScript_FieldMoveShowMonInit:: callnative FldEff_FieldMoveShowMonInit end -gFldEffScript_UseFlyAncientTomb:: @ 81D9975 +gFldEffScript_UseFlyAncientTomb:: end -gFldEffScript_PcturnOn:: @ 81D9976 +gFldEffScript_PcturnOn:: end -gFldEffScript_HallOfFameRecord:: @ 81D9977 +gFldEffScript_HallOfFameRecord:: loadfadedpal gUnknown_83CBE9C loadfadedpal_callnative gUnknown_83CBEA4, FldEff_HallOfFameRecord end -gFldEffScript_UseTeleport:: @ 81D9986 +gFldEffScript_UseTeleport:: callnative FldEff_UseTeleport end -gFldEffScript_SmileyFaceIcon:: @ 81D998C +gFldEffScript_SmileyFaceIcon:: callnative FldEff_SmileyFaceIcon end -gFldEffScript_UseVsSeeker:: @ 81D9992 +gFldEffScript_UseVsSeeker:: callnative FldEff_UseVsSeeker end -gFldEffScript_DoubleExclMarkIcon:: @ 81D9998 +gFldEffScript_DoubleExclMarkIcon:: callnative FldEff_DoubleExclMarkIcon end -gFldEffScript_MoveDeoxysRock:: @ 81D999E +gFldEffScript_MoveDeoxysRock:: callnative FldEff_MoveDeoxysRock end -gFldEffScript_Unk44:: @ 81D99A4 +gFldEffScript_Unk44:: callnative FldEff_Unk44 end -gFldEffScript_Unk45:: @ 81D99AA +gFldEffScript_Unk45:: callnative FldEff_Unk45 end diff --git a/data/maps/BattleColosseum_2P/scripts.inc b/data/maps/BattleColosseum_2P/scripts.inc index 52eb16728..44092463d 100644 --- a/data/maps/BattleColosseum_2P/scripts.inc +++ b/data/maps/BattleColosseum_2P/scripts.inc @@ -1,2 +1,2 @@ -BattleColosseum_2P_MapScripts:: @ 8160478 +BattleColosseum_2P_MapScripts:: .byte 0 diff --git a/data/maps/BattleColosseum_4P/scripts.inc b/data/maps/BattleColosseum_4P/scripts.inc index 94053d6bf..f10540138 100644 --- a/data/maps/BattleColosseum_4P/scripts.inc +++ b/data/maps/BattleColosseum_4P/scripts.inc @@ -1,2 +1,2 @@ -BattleColosseum_4P_MapScripts:: @ 816047B +BattleColosseum_4P_MapScripts:: .byte 0 diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 452a32aa9..7577fda82 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -1,17 +1,17 @@ .set LOCALID_DEOXYS_ROCK, 1 .set LOCALID_DEOXYS, 2 -BirthIsland_Exterior_MapScripts:: @ 8165203 +BirthIsland_Exterior_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_OnReturnToField .byte 0 -BirthIsland_Exterior_OnReturnToField:: @ 8165213 +BirthIsland_Exterior_OnReturnToField:: special SetDeoxysTrianglePalette end -BirthIsland_Exterior_OnTransition:: @ 8165217 +BirthIsland_Exterior_OnTransition:: setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_DEOXYS_N setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 @@ -20,29 +20,29 @@ BirthIsland_Exterior_OnTransition:: @ 8165217 call_if_unset FLAG_FOUGHT_DEOXYS, BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle end -BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle:: @ 816523C +BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle:: setflag FLAG_HIDE_DEOXYS setflag FLAG_HIDE_BIRTH_ISLAND_METEORITE return -BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle:: @ 8165243 +BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle:: goto_if_set FLAG_DEOXYS_FLEW_AWAY, EventScript_Return clearflag FLAG_HIDE_BIRTH_ISLAND_METEORITE clearflag FLAG_SYS_DEOXYS_AWAKENED return -BirthIsland_Exterior_OnResume:: @ 8165253 +BirthIsland_Exterior_OnResume:: call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, BirthIsland_Exterior_EventScript_TryRemoveDeoxys end -BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 816525D +BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject LOCALID_DEOXYS return -BirthIsland_Exterior_EventScript_Triangle:: @ 8165271 +BirthIsland_Exterior_EventScript_Triangle:: lock faceplayer goto_if_questlog EventScript_ReleaseEnd @@ -56,19 +56,19 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8165271 case 3, BirthIsland_Exterior_EventScript_NotSolved3 end -BirthIsland_Exterior_EventScript_NotSolved1:: @ 81652BA +BirthIsland_Exterior_EventScript_NotSolved1:: release end -BirthIsland_Exterior_EventScript_NotSolved2:: @ 81652BC +BirthIsland_Exterior_EventScript_NotSolved2:: release end -BirthIsland_Exterior_EventScript_NotSolved3:: @ 81652BE +BirthIsland_Exterior_EventScript_NotSolved3:: release end -BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0 +BirthIsland_Exterior_EventScript_Deoxys:: addobject LOCALID_DEOXYS waitse setfieldeffectarg 0, LOCALID_DEOXYS_ROCK @@ -103,18 +103,18 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 81652C0 release end -BirthIsland_Exterior_EventScript_DefeatedDeoxys:: @ 816533A +BirthIsland_Exterior_EventScript_DefeatedDeoxys:: setflag FLAG_DEOXYS_FLEW_AWAY setvar VAR_0x8004, SPECIES_DEOXYS goto EventScript_MonFlewAway end -BirthIsland_Exterior_EventScript_RanFromDeoxys:: @ 8165348 +BirthIsland_Exterior_EventScript_RanFromDeoxys:: setvar VAR_0x8004, SPECIES_DEOXYS goto EventScript_MonFlewAway end -Movement_DeoxysApproach: @ 8165353 +Movement_DeoxysApproach: walk_slower_down walk_slower_down walk_slower_down diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc index 0d7cdf80b..0d51e3e06 100644 --- a/data/maps/BirthIsland_Harbor/scripts.inc +++ b/data/maps/BirthIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ -BirthIsland_Harbor_MapScripts:: @ 81653E6 +BirthIsland_Harbor_MapScripts:: .byte 0 -BirthIsland_Harbor_EventScript_Sailor:: @ 81653E7 +BirthIsland_Harbor_EventScript_Sailor:: lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index a7bb1c2de..f69192788 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -1,37 +1,37 @@ .set LOCALID_FAT_MAN, 2 .set LOCALID_POLIWRATH, 3 -CeladonCity_MapScripts:: @ 8166C8F +CeladonCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_OnTransition .byte 0 -CeladonCity_OnTransition:: @ 8166C95 +CeladonCity_OnTransition:: setworldmapflag FLAG_WORLD_MAP_CELADON_CITY end -CeladonCity_EventScript_LittleGirl:: @ 8166C99 +CeladonCity_EventScript_LittleGirl:: msgbox CeladonCity_Text_GotMyKoffingInCinnabar, MSGBOX_NPC end -CeladonCity_EventScript_OldMan1:: @ 8166CA2 +CeladonCity_EventScript_OldMan1:: lock msgbox CeladonCity_Text_GymIsGreatFullOfWomen release end -CeladonCity_EventScript_Woman:: @ 8166CAD +CeladonCity_EventScript_Woman:: msgbox CeladonCity_Text_GameCornerIsBadForCitysImage, MSGBOX_NPC end -CeladonCity_EventScript_OldMan2:: @ 8166CB6 +CeladonCity_EventScript_OldMan2:: msgbox CeladonCity_Text_BlewItAllAtSlots, MSGBOX_NPC end -CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF +CeladonCity_EventScript_SoftboiledTutor:: goto EventScript_SoftboiledTutor end -CeladonCity_EventScript_FatMan:: @ 8166CC5 +CeladonCity_EventScript_FatMan:: lock faceplayer msgbox CeladonCity_Text_MyTrustedPalPoliwrath @@ -41,7 +41,7 @@ CeladonCity_EventScript_FatMan:: @ 8166CC5 release end -CeladonCity_EventScript_Poliwrath:: @ 8166CDC +CeladonCity_EventScript_Poliwrath:: lock faceplayer waitse @@ -54,53 +54,53 @@ CeladonCity_EventScript_Poliwrath:: @ 8166CDC release end -CeladonCity_EventScript_RocketGrunt1:: @ 8166CFA +CeladonCity_EventScript_RocketGrunt1:: msgbox CeladonCity_Text_KeepOutOfTeamRocketsWay, MSGBOX_NPC end -CeladonCity_EventScript_RocketGrunt2:: @ 8166D03 +CeladonCity_EventScript_RocketGrunt2:: msgbox CeladonCity_Text_GetLostOrIllPunchYou, MSGBOX_NPC end -CeladonCity_EventScript_Boy:: @ 8166D0C +CeladonCity_EventScript_Boy:: msgbox CeladonCity_Text_ScaldedTongueOnTea, MSGBOX_NPC end -CeladonCity_EventScript_SilphCoScientist:: @ 8166D15 +CeladonCity_EventScript_SilphCoScientist:: msgbox CeladonCity_Text_SomeoneStoleSilphScope, MSGBOX_NPC end -CeladonCity_EventScript_TrainerTips1:: @ 8166D1E +CeladonCity_EventScript_TrainerTips1:: msgbox CeladonCity_Text_ExplainXAccuracyDireHit, MSGBOX_SIGN end -CeladonCity_EventScript_CitySign:: @ 8166D27 +CeladonCity_EventScript_CitySign:: msgbox CeladonCity_Text_CitySign, MSGBOX_SIGN end -CeladonCity_EventScript_GymSign:: @ 8166D30 +CeladonCity_EventScript_GymSign:: lockall famechecker FAMECHECKER_ERIKA, 0 msgbox CeladonCity_Text_GymSign releaseall end -CeladonCity_EventScript_MansionSign:: @ 8166D48 +CeladonCity_EventScript_MansionSign:: msgbox CeladonCity_Text_MansionSign, MSGBOX_SIGN end -CeladonCity_EventScript_DeptStoreSign:: @ 8166D51 +CeladonCity_EventScript_DeptStoreSign:: msgbox CeladonCity_Text_DeptStoreSign, MSGBOX_SIGN end -CeladonCity_EventScript_TrainerTips2:: @ 8166D5A +CeladonCity_EventScript_TrainerTips2:: msgbox CeladonCity_Text_GuardSpecProtectsFromStatus, MSGBOX_SIGN end -CeladonCity_EventScript_PrizeExchangeSign:: @ 8166D63 +CeladonCity_EventScript_PrizeExchangeSign:: msgbox CeladonCity_Text_PrizeExchangeSign, MSGBOX_SIGN end -CeladonCity_EventScript_GameCornerSign:: @ 8166D6C +CeladonCity_EventScript_GameCornerSign:: msgbox CeladonCity_Text_GameCornerSign, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity/text.inc b/data/maps/CeladonCity/text.inc index a61cdba6d..dcdb015eb 100644 --- a/data/maps/CeladonCity/text.inc +++ b/data/maps/CeladonCity/text.inc @@ -1,40 +1,40 @@ -CeladonCity_Text_GotMyKoffingInCinnabar:: @ 817FEC3 +CeladonCity_Text_GotMyKoffingInCinnabar:: .string "I got my KOFFING in CINNABAR.\p" .string "It's usually nice, but it breathes\n" .string "poison when it's angry.$" -CeladonCity_Text_GymIsGreatFullOfWomen:: @ 817FF1C +CeladonCity_Text_GymIsGreatFullOfWomen:: .string "Heheh! This GYM is great!\n" .string "It's full of women!$" -CeladonCity_Text_GameCornerIsBadForCitysImage:: @ 817FF4A +CeladonCity_Text_GameCornerIsBadForCitysImage:: .string "CELADON takes pride in its efforts\n" .string "to keep the city beautiful.\p" .string "That's why the new GAME CORNER is\n" .string "bad for our city's image.$" -CeladonCity_Text_BlewItAllAtSlots:: @ 817FFC5 +CeladonCity_Text_BlewItAllAtSlots:: .string "Moan…\n" .string "I blew it all at the slots!\p" .string "I knew I should have cashed in my\n" .string "COINS for prizes!$" -CeladonCity_Text_MyTrustedPalPoliwrath:: @ 818001B +CeladonCity_Text_MyTrustedPalPoliwrath:: .string "This is my trusted pal, POLIWRATH.\p" .string "It evolved from a POLIWHIRL when\n" .string "I used a WATER STONE.$" -CeladonCity_Text_Poliwrath:: @ 8180075 +CeladonCity_Text_Poliwrath:: .string "POLIWRATH: Ribi ribit!$" -CeladonCity_Text_GetLostOrIllPunchYou:: @ 818008C +CeladonCity_Text_GetLostOrIllPunchYou:: .string "What are you staring at?\n" .string "Get lost, or I'll punch you.$" -CeladonCity_Text_KeepOutOfTeamRocketsWay:: @ 81800C2 +CeladonCity_Text_KeepOutOfTeamRocketsWay:: .string "Keep out of TEAM ROCKET's way!$" -CeladonCity_Text_ExplainXAccuracyDireHit:: @ 81800E1 +CeladonCity_Text_ExplainXAccuracyDireHit:: .string "TRAINER TIPS\p" .string "X ACCURACY boosts the accuracy of\n" .string "techniques.\p" @@ -43,23 +43,23 @@ CeladonCity_Text_ExplainXAccuracyDireHit:: @ 81800E1 .string "Get your items at the CELADON\n" .string "DEPT. STORE!$" -CeladonCity_Text_CitySign:: @ 818017A +CeladonCity_Text_CitySign:: .string "CELADON CITY\n" .string "The City of Rainbow Dreams$" -CeladonCity_Text_GymSign:: @ 81801A2 +CeladonCity_Text_GymSign:: .string "CELADON CITY POKéMON GYM\n" .string "LEADER: ERIKA\l" .string "The Nature-Loving Princess!$" -CeladonCity_Text_MansionSign:: @ 81801E5 +CeladonCity_Text_MansionSign:: .string "CELADON MANSION$" -CeladonCity_Text_DeptStoreSign:: @ 81801F5 +CeladonCity_Text_DeptStoreSign:: .string "Find what you need at the\n" .string "CELADON DEPT. STORE!$" -CeladonCity_Text_GuardSpecProtectsFromStatus:: @ 8180224 +CeladonCity_Text_GuardSpecProtectsFromStatus:: .string "TRAINER TIPS\p" .string "GUARD SPEC. protects POKéMON\n" .string "from status-reduction moves during\l" @@ -67,15 +67,15 @@ CeladonCity_Text_GuardSpecProtectsFromStatus:: @ 8180224 .string "Get your items at the\n" .string "CELADON DEPT. STORE!$" -CeladonCity_Text_PrizeExchangeSign:: @ 81802A4 +CeladonCity_Text_PrizeExchangeSign:: .string "COINS exchanged for prizes!\n" .string "PRIZE EXCHANGE$" -CeladonCity_Text_GameCornerSign:: @ 81802CF +CeladonCity_Text_GameCornerSign:: .string "ROCKET GAME CORNER\n" .string "The playground for grown-ups!$" -CeladonCity_Text_ScaldedTongueOnTea:: @ 8180300 +CeladonCity_Text_ScaldedTongueOnTea:: .string "Aaaagh, ow…\n" .string "I scalded my tongue!\p" .string "This nice old lady in the MANSION\n" @@ -83,7 +83,7 @@ CeladonCity_Text_ScaldedTongueOnTea:: @ 8180300 .string "But it was boiling hot!\n" .string "Gotta cool it to drink it.$" -Text_SoftboiledTeach:: @ 8180388 +Text_SoftboiledTeach:: .string "Hello, there!\p" .string "I've seen you about, but I never\n" .string "had a chance to chat.\p" @@ -92,19 +92,19 @@ Text_SoftboiledTeach:: @ 8180388 .string "I'd like to celebrate by teaching\n" .string "you the move SOFTBOILED.$" -Text_SoftboiledDeclined:: @ 818043F +Text_SoftboiledDeclined:: .string "I'll always be keeping an eye out\n" .string "for you.\p" .string "I hope we can chat again.$" -Text_SoftboiledWhichMon:: @ 8180484 +Text_SoftboiledWhichMon:: .string "So, who's the POKéMON that gets\n" .string "the chance to learn SOFTBOILED?$" -Text_SoftboiledTaught:: @ 81804C4 +Text_SoftboiledTaught:: .string "I wish you the best of luck!$" -CeladonCity_Text_SomeoneStoleSilphScope:: @ 81804E1 +CeladonCity_Text_SomeoneStoleSilphScope:: .string "Oh, what am I to do…\p" .string "Someone stole our SILPH SCOPE.\p" .string "The thief came running this way,\n" diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 0703d8cc4..39731ff8d 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -1,7 +1,7 @@ -CeladonCity_Condominiums_1F_MapScripts:: @ 816C320 +CeladonCity_Condominiums_1F_MapScripts:: .byte 0 -CeladonCity_Condominiums_1F_EventScript_TeaWoman:: @ 816C321 +CeladonCity_Condominiums_1F_EventScript_TeaWoman:: lock faceplayer goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea @@ -16,19 +16,19 @@ CeladonCity_Condominiums_1F_EventScript_TeaWoman:: @ 816C321 release end -CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea:: @ 816C36A +CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea:: msgbox CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany release end -CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy:: @ 816C374 +CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy:: famechecker FAMECHECKER_DAISY, 4 setflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF msgbox CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea release end -CeladonCity_Condominiums_1F_EventScript_Meowth:: @ 816C38E +CeladonCity_Condominiums_1F_EventScript_Meowth:: lock faceplayer waitse @@ -38,7 +38,7 @@ CeladonCity_Condominiums_1F_EventScript_Meowth:: @ 816C38E release end -CeladonCity_Condominiums_1F_EventScript_Clefairy:: @ 816C3A1 +CeladonCity_Condominiums_1F_EventScript_Clefairy:: lock faceplayer waitse @@ -48,7 +48,7 @@ CeladonCity_Condominiums_1F_EventScript_Clefairy:: @ 816C3A1 release end -CeladonCity_Condominiums_1F_EventScript_Nidoran:: @ 816C3B4 +CeladonCity_Condominiums_1F_EventScript_Nidoran:: lock faceplayer waitse @@ -58,6 +58,6 @@ CeladonCity_Condominiums_1F_EventScript_Nidoran:: @ 816C3B4 release end -CeladonCity_Condominiums_1F_EventScript_SuiteSign:: @ 816C3C7 +CeladonCity_Condominiums_1F_EventScript_SuiteSign:: msgbox CeladonCity_Condominiums_1F_Text_ManagersSuite, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_1F/text.inc b/data/maps/CeladonCity_Condominiums_1F/text.inc index fa0512f76..7689db1b1 100644 --- a/data/maps/CeladonCity_Condominiums_1F/text.inc +++ b/data/maps/CeladonCity_Condominiums_1F/text.inc @@ -1,21 +1,21 @@ -CeladonCity_Condominiums_1F_Text_Meowth:: @ 81960BB +CeladonCity_Condominiums_1F_Text_Meowth:: .string "MEOWTH: Meow!$" -CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead:: @ 81960C9 +CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead:: .string "You shouldn't spend all your money\n" .string "on drinks.\p" .string "Try this instead.$" -CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea:: @ 8196109 +CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea:: .string "Nothing beats thirst like some hot\n" .string "TEA.\p" .string "It really is the best.$" -CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany:: @ 8196148 +CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany:: .string "My dear POKéMON keep me company.\n" .string "MEOWTH even brings money home!$" -CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea:: @ 8196188 +CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea:: .string "Oh, hello, dearie.\n" .string "Did you enjoy my TEA?\p" .string "By the way, dear. Are you, by any\n" @@ -25,13 +25,13 @@ CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea:: @ 8196188 .string "She visits the CELADON DEPT. STORE\n" .string "to buy some TEA.$" -CeladonCity_Condominiums_1F_Text_Clefairy:: @ 819625B +CeladonCity_Condominiums_1F_Text_Clefairy:: .string "CLEFAIRY: Pi pippippi!$" -CeladonCity_Condominiums_1F_Text_Nidoran:: @ 8196272 +CeladonCity_Condominiums_1F_Text_Nidoran:: .string "NIDORAN♀: Kya kyaoo!$" -CeladonCity_Condominiums_1F_Text_ManagersSuite:: @ 8196287 +CeladonCity_Condominiums_1F_Text_ManagersSuite:: .string "CELADON MANSION\n" .string "Manager's Suite$" diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc index 9d952f2d7..1de451e90 100644 --- a/data/maps/CeladonCity_Condominiums_2F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc @@ -1,6 +1,6 @@ -CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0 +CeladonCity_Condominiums_2F_MapScripts:: .byte 0 -CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign:: @ 816C3D1 +CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign:: msgbox CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_2F/text.inc b/data/maps/CeladonCity_Condominiums_2F/text.inc index 30ab60a1d..9766df759 100644 --- a/data/maps/CeladonCity_Condominiums_2F/text.inc +++ b/data/maps/CeladonCity_Condominiums_2F/text.inc @@ -1,3 +1,3 @@ -CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom:: @ 81962A7 +CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom:: .string "GAME FREAK Meeting Room$" diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc index 655993ac9..c4c7f1099 100644 --- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc @@ -1,19 +1,19 @@ -CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA +CeladonCity_Condominiums_3F_MapScripts:: .byte 0 -CeladonCity_Condominiums_3F_EventScript_Programmer:: @ 816C3DB +CeladonCity_Condominiums_3F_EventScript_Programmer:: msgbox CeladonCity_Condominiums_3F_Text_ImTheProgrammer, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_GraphicArtist:: @ 816C3E4 +CeladonCity_Condominiums_3F_EventScript_GraphicArtist:: msgbox CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_Writer:: @ 816C3ED +CeladonCity_Condominiums_3F_EventScript_Writer:: msgbox CeladonCity_Condominiums_3F_Text_IWroteTheStory, MSGBOX_NPC end -CeladonCity_Condominiums_3F_EventScript_Designer:: @ 816C3F6 +CeladonCity_Condominiums_3F_EventScript_Designer:: lock faceplayer specialvar VAR_RESULT, HasAllKantoMons @@ -23,11 +23,11 @@ CeladonCity_Condominiums_3F_EventScript_Designer:: @ 816C3F6 release end -CeladonCity_Condominiums_3F_EventScript_CompletedPokedex:: @ 816C412 +CeladonCity_Condominiums_3F_EventScript_CompletedPokedex:: goto CeladonCity_Condominiums_3F_EventScript_ShowDiploma end -CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: @ 816C418 +CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: message CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations waitmessage delay 60 @@ -37,18 +37,18 @@ CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: @ 816C418 release end -CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign:: @ 816C435 +CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign:: msgbox CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_Computer1:: @ 816C43E +CeladonCity_Condominiums_3F_EventScript_Computer1:: msgbox CeladonCity_Condominiums_3F_Text_ItsTheGameProgram, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_Computer2:: @ 816C447 +CeladonCity_Condominiums_3F_EventScript_Computer2:: msgbox CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame, MSGBOX_SIGN end -CeladonCity_Condominiums_3F_EventScript_Computer3:: @ 816C450 +CeladonCity_Condominiums_3F_EventScript_Computer3:: msgbox CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_3F/text.inc b/data/maps/CeladonCity_Condominiums_3F/text.inc index d4f91594a..752bdf3ff 100644 --- a/data/maps/CeladonCity_Condominiums_3F/text.inc +++ b/data/maps/CeladonCity_Condominiums_3F/text.inc @@ -1,42 +1,42 @@ -CeladonCity_Condominiums_3F_Text_ImTheProgrammer:: @ 81962BF +CeladonCity_Condominiums_3F_Text_ImTheProgrammer:: .string "Me?\n" .string "I'm the programmer!$" -CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist:: @ 81962D7 +CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist:: .string "I'm the graphic artist!\n" .string "I drew you!$" -CeladonCity_Condominiums_3F_Text_IWroteTheStory:: @ 81962FB +CeladonCity_Condominiums_3F_Text_IWroteTheStory:: .string "I wrote the story!\n" .string "Isn't ERIKA cute?\p" .string "I like MISTY a lot, too!\n" .string "Oh, and SABRINA, I like her!$" -CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex:: @ 8196356 +CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex:: .string "Is that right?\p" .string "I'm the game designer!\p" .string "Filling up your POKéDEX is tough,\n" .string "but don't quit!\p" .string "When you finish, come tell me!$" -CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations:: @ 81963CD +CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations:: .string "Wow! Excellent!\n" .string "You completed your POKéDEX!\l" .string "Congratulations!\l" .string "…$" -CeladonCity_Condominiums_3F_Text_ItsTheGameProgram:: @ 819640C +CeladonCity_Condominiums_3F_Text_ItsTheGameProgram:: .string "It's the game program! Messing with\n" .string "it could bug out the game!$" -CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame:: @ 819644B +CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame:: .string "Someone's playing a game instead of\n" .string "working!$" -CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding:: @ 8196478 +CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding:: .string "It's the script!\n" .string "Better not look at the ending!$" -CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom:: @ 81964A8 +CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom:: .string "GAME FREAK Development Room$" diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc index 98013e38f..cef0cf24c 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc @@ -1,6 +1,6 @@ -CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459 +CeladonCity_Condominiums_Roof_MapScripts:: .byte 0 -CeladonCity_Condominiums_Roof_EventScript_Sign:: @ 816C45A +CeladonCity_Condominiums_Roof_EventScript_Sign:: msgbox CeladonCity_Condominiums_Roof_Text_IKnowEverything, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_Condominiums_Roof/text.inc b/data/maps/CeladonCity_Condominiums_Roof/text.inc index f3012fd31..fd3aff4e5 100644 --- a/data/maps/CeladonCity_Condominiums_Roof/text.inc +++ b/data/maps/CeladonCity_Condominiums_Roof/text.inc @@ -1,3 +1,3 @@ -CeladonCity_Condominiums_Roof_Text_IKnowEverything:: @ 81964C4 +CeladonCity_Condominiums_Roof_Text_IKnowEverything:: .string "I KNOW EVERYTHING!$" diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc index 54d791f77..079e461af 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc @@ -1,13 +1,13 @@ .set LOCALID_EEVEE_POKEBALL, 2 -CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463 +CeladonCity_Condominiums_RoofRoom_MapScripts:: .byte 0 -CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt:: @ 816C464 +CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt:: msgbox CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow, MSGBOX_NPC end -CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D +CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: lock faceplayer setvar VAR_TEMP_1, SPECIES_EEVEE @@ -21,7 +21,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D release end -CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty:: @ 816C4A6 +CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty:: removeobject LOCALID_EEVEE_POKEBALL playfanfare MUS_LEVEL_UP message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee @@ -36,7 +36,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveeParty:: @ 816C4A6 goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee end -CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveePC:: @ 816C4DA +CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveePC:: removeobject LOCALID_EEVEE_POKEBALL playfanfare MUS_LEVEL_UP message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee @@ -50,21 +50,21 @@ CeladonCity_Condominiums_RoofRoom_EventScript_GetEeveePC:: @ 816C4DA goto CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC end -CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC:: @ 816C509 +CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC:: call EventScript_TransferredToPC goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee end -CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee:: @ 816C514 +CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee:: setflag FLAG_GOT_EEVEE release end -CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet:: @ 816C519 +CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet:: msgbox CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs, MSGBOX_SIGN end -CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard:: @ 816C522 +CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard:: lockall msgbox CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading @@ -79,7 +79,7 @@ CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard:: @ 816C522 case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard end -CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading:: @ 816C578 +CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading:: message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading waitmessage multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE @@ -91,21 +91,21 @@ CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading:: @ 816C578 case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard end -CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub:: @ 816C5C0 +CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub:: msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner:: @ 816C5CE +CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner:: msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom:: @ 816C5DC +CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom:: msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading end -CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard:: @ 816C5EA +CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard:: releaseall end diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc index 9e43f06ce..74112952e 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc @@ -1,4 +1,4 @@ -CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow:: @ 81964D7 +CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow:: .string "There is nothing that I don't know,\n" .string "like I wrote on the blackboard.\p" .string "I know about the world of POKéMON\n" @@ -6,27 +6,27 @@ CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow:: @ 81964D7 .string "Get together with your friends and\n" .string "enjoy trading POKéMON!$" -CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee:: @ 8196591 +CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee:: .string "{PLAYER} obtained an EEVEE!$" -CeladonCity_Condominiums_RoofRoom_Text_BoxIsFull:: @ 81965A7 +CeladonCity_Condominiums_RoofRoom_Text_BoxIsFull:: .string "ポケモンが　いっぱいだ\n" .string "ボックスを　かえて　きなさい$" -CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture:: @ 81965C2 +CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture:: .string "POKéMON Lecture\p" .string "Playing with the Wireless Adapter$" -CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading:: @ 81965F4 +CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading:: .string "Which heading do you want to read?$" -CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub:: @ 8196617 +CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub:: .string "The POKéMON WIRELESS CLUB is\n" .string "upstairs at any POKéMON CENTER.\p" .string "Visit one to link up with friend(s)\n" .string "using your Wireless Adapter.$" -CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner:: @ 8196695 +CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner:: .string "To link only with a friend, go to\n" .string "the DIRECT CORNER.\p" .string "It is the right counter at the\n" @@ -34,7 +34,7 @@ CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner:: @ 8196695 .string "Go into the TRADE CORNER or the\n" .string "COLOSSEUM with your friend.$" -CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom:: @ 819673C +CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom:: .string "To link and communicate with\n" .string "anyone, go to the UNION ROOM.\p" .string "It is the left counter at the\n" @@ -42,7 +42,7 @@ CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom:: @ 819673C .string "Go to the UNION ROOM and enjoy\n" .string "meeting other TRAINERS.$" -CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs:: @ 81967E3 +CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs:: .string "It's a pamphlet on TMs.\p" .string "… …\p" .string "There are fifty TMs in all.\p" diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc index 08aa687f8..9ea342333 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc @@ -1,14 +1,14 @@ -CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8 +CeladonCity_DepartmentStore_1F_MapScripts:: .byte 0 -CeladonCity_DepartmentStore_1F_EventScript_Receptionist:: @ 816BAD9 +CeladonCity_DepartmentStore_1F_EventScript_Receptionist:: msgbox CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore, MSGBOX_NPC end -CeladonCity_DepartmentStore_1F_EventScript_LayoutSign:: @ 816BAE2 +CeladonCity_DepartmentStore_1F_EventScript_LayoutSign:: msgbox CeladonCity_DepartmentStore_1F_Text_FloorDescriptions, MSGBOX_SIGN end -CeladonCity_DepartmentStore_1F_EventScript_FloorSign:: @ 816BAEB +CeladonCity_DepartmentStore_1F_EventScript_FloorSign:: msgbox CeladonCity_DepartmentStore_1F_Text_ServiceCounter, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_1F/text.inc b/data/maps/CeladonCity_DepartmentStore_1F/text.inc index f1d1877e4..09be234a4 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_1F/text.inc @@ -1,10 +1,10 @@ -CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore:: @ 81954DD +CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore:: .string "Hello!\n" .string "Welcome to CELADON DEPT. STORE.\p" .string "The board on the right describes\n" .string "the store layout.$" -CeladonCity_DepartmentStore_1F_Text_FloorDescriptions:: @ 8195537 +CeladonCity_DepartmentStore_1F_Text_FloorDescriptions:: .string "1F: SERVICE COUNTER\p" .string "2F: TRAINER'S MARKET\p" .string "3F: TV GAME SHOP\p" @@ -12,6 +12,6 @@ CeladonCity_DepartmentStore_1F_Text_FloorDescriptions:: @ 8195537 .string "5F: DRUGSTORE\p" .string "ROOFTOP SQUARE: VENDING MACHINES$" -CeladonCity_DepartmentStore_1F_Text_ServiceCounter:: @ 81955B3 +CeladonCity_DepartmentStore_1F_Text_ServiceCounter:: .string "1F: SERVICE COUNTER$" diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc index f7e89886d..c15e291c1 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc @@ -1,19 +1,19 @@ -CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4 +CeladonCity_DepartmentStore_2F_MapScripts:: .byte 0 -CeladonCity_DepartmentStore_2F_EventScript_UnusedNPC:: @ 816BAF5 +CeladonCity_DepartmentStore_2F_EventScript_UnusedNPC:: msgbox CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel, MSGBOX_NPC end -CeladonCity_DepartmentStore_2F_EventScript_Lass:: @ 816BAFE +CeladonCity_DepartmentStore_2F_EventScript_Lass:: msgbox CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings, MSGBOX_NPC end -CeladonCity_DepartmentStore_2F_EventScript_FloorSign:: @ 816BB07 +CeladonCity_DepartmentStore_2F_EventScript_FloorSign:: msgbox CeladonCity_DepartmentStore_2F_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_2F_EventScript_ClerkItems:: @ 816BB10 +CeladonCity_DepartmentStore_2F_EventScript_ClerkItems:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -25,7 +25,7 @@ CeladonCity_DepartmentStore_2F_EventScript_ClerkItems:: @ 816BB10 end .align 2 -CeladonCity_DepartmentStore_2F_Items:: @ 816BB38 +CeladonCity_DepartmentStore_2F_Items:: .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_REVIVE @@ -39,7 +39,7 @@ CeladonCity_DepartmentStore_2F_Items:: @ 816BB38 release end -CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs:: @ 816BB4E +CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -51,7 +51,7 @@ CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs:: @ 816BB4E end .align 2 -CeladonCity_DepartmentStore_2F_TMs:: @ 816BB74 +CeladonCity_DepartmentStore_2F_TMs:: .2byte ITEM_TM05 .2byte ITEM_TM15 .2byte ITEM_TM28 diff --git a/data/maps/CeladonCity_DepartmentStore_2F/text.inc b/data/maps/CeladonCity_DepartmentStore_2F/text.inc index 77466521a..7cfb9f9df 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_2F/text.inc @@ -1,17 +1,17 @@ -CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel:: @ 81955C7 +CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel:: .string "SUPER REPEL keeps weak POKéMON at\n" .string "bay…\p" .string "Hmm, it's a more powerful REPEL.$" -CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings:: @ 819560F +CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings:: .string "For long outings, you should buy\n" .string "REVIVE.$" -CeladonCity_DepartmentStore_2F_Text_FloorSign:: @ 8195638 +CeladonCity_DepartmentStore_2F_Text_FloorSign:: .string "Top-Grade Items for TRAINERS!\p" .string "2F: TRAINER'S MARKET$" -CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes:: @ 819566B +CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes:: .string "We have a customer, LANCE, who\n" .string "occasionally comes.\p" .string "He always buys capes.\p" diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc index e7af53078..d85eb3fea 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc @@ -1,50 +1,50 @@ -CeladonCity_DepartmentStore_3F_MapScripts:: @ 816BB84 +CeladonCity_DepartmentStore_3F_MapScripts:: .byte 0 -CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: @ 816BB85 +CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: goto EventScript_CounterTutor end -CeladonCity_DepartmentStore_3F_EventScript_GBAKid1:: @ 816BB8B +CeladonCity_DepartmentStore_3F_EventScript_GBAKid1:: msgbox CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_GBAKid2:: @ 816BB94 +CeladonCity_DepartmentStore_3F_EventScript_GBAKid2:: msgbox CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_GBAKid3:: @ 816BB9D +CeladonCity_DepartmentStore_3F_EventScript_GBAKid3:: msgbox CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_LittleGirl:: @ 816BBA6 +CeladonCity_DepartmentStore_3F_EventScript_LittleGirl:: msgbox CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID, MSGBOX_NPC end -CeladonCity_DepartmentStore_3F_EventScript_SuperNES:: @ 816BBAF +CeladonCity_DepartmentStore_3F_EventScript_SuperNES:: msgbox CeladonCity_DepartmentStore_3F_Text_ItsSuperNES, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_TV1:: @ 816BBB8 +CeladonCity_DepartmentStore_3F_EventScript_TV1:: msgbox CeladonCity_DepartmentStore_3F_Text_AnRPG, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_TV2:: @ 816BBC1 +CeladonCity_DepartmentStore_3F_EventScript_TV2:: msgbox CeladonCity_DepartmentStore_3F_Text_SportsGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_TV3:: @ 816BBCA +CeladonCity_DepartmentStore_3F_EventScript_TV3:: msgbox CeladonCity_DepartmentStore_3F_Text_PuzzleGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_TV4:: @ 816BBD3 +CeladonCity_DepartmentStore_3F_EventScript_TV4:: msgbox CeladonCity_DepartmentStore_3F_Text_FightingGame, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_FloorSign:: @ 816BBDC +CeladonCity_DepartmentStore_3F_EventScript_FloorSign:: msgbox CeladonCity_DepartmentStore_3F_Text_TVGameShop, MSGBOX_SIGN end -CeladonCity_DepartmentStore_3F_EventScript_Poster:: @ 816BBE5 +CeladonCity_DepartmentStore_3F_EventScript_Poster:: msgbox CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_DepartmentStore_3F/text.inc b/data/maps/CeladonCity_DepartmentStore_3F/text.inc index 3533884a5..1ae4b60a3 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_3F/text.inc @@ -1,15 +1,15 @@ -CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer:: @ 81956E9 +CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer:: .string "Captured POKéMON are registered\n" .string "with an ID No. and the OT.\p" .string "OT stands for “Original TRAINER” -\n" .string "the TRAINER that caught it first.$" -CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter:: @ 8195769 +CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter:: .string "All right!\p" .string "My buddy's going to trade me his\n" .string "KANGASKHAN for my HAUNTER!$" -CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade:: @ 81957B0 +CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade:: .string "Come on, HAUNTER!\p" .string "I love HAUNTER!\n" .string "I collect them!\p" @@ -17,37 +17,37 @@ CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade:: @ 81957B0 .string "HAUNTER turned into a different\n" .string "POKéMON while being traded!$" -CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID:: @ 8195823 +CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID:: .string "You can identify POKéMON you get\n" .string "in trades by their ID Numbers.$" -CeladonCity_DepartmentStore_3F_Text_ItsSuperNES:: @ 8195863 +CeladonCity_DepartmentStore_3F_Text_ItsSuperNES:: .string "It's a Super NES.$" -CeladonCity_DepartmentStore_3F_Text_AnRPG:: @ 8195875 +CeladonCity_DepartmentStore_3F_Text_AnRPG:: .string "An RPG!\n" .string "There's no time for that!$" -CeladonCity_DepartmentStore_3F_Text_SportsGame:: @ 8195897 +CeladonCity_DepartmentStore_3F_Text_SportsGame:: .string "A sports game!\n" .string "Dad'll like that!$" -CeladonCity_DepartmentStore_3F_Text_PuzzleGame:: @ 81958B8 +CeladonCity_DepartmentStore_3F_Text_PuzzleGame:: .string "A puzzle game!\n" .string "Looks addictive!$" -CeladonCity_DepartmentStore_3F_Text_FightingGame:: @ 81958D8 +CeladonCity_DepartmentStore_3F_Text_FightingGame:: .string "A fighting game!\n" .string "Looks tough!$" -CeladonCity_DepartmentStore_3F_Text_TVGameShop:: @ 81958F6 +CeladonCity_DepartmentStore_3F_Text_TVGameShop:: .string "3F: TV GAME SHOP$" -CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon:: @ 8195907 +CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon:: .string "Red and Green!\n" .string "Both are POKéMON!$" -Text_CounterTeach:: @ 8195928 +Text_CounterTeach:: .string "Oh, hi!\n" .string "I finally finished POKéMON.\p" .string "Not done yet? How about I teach\n" @@ -57,14 +57,14 @@ Text_CounterTeach:: @ 8195928 .string "Not like the one I'm leaning on,\n" .string "mind you!$" -Text_CounterDeclined:: @ 81959CC +Text_CounterDeclined:: .string "You're not interested? Come see\n" .string "me if you change your mind.$" -Text_CounterWhichMon:: @ 8195A08 +Text_CounterWhichMon:: .string "Which POKéMON should I teach\n" .string "COUNTER to?$" -Text_CounterTaught:: @ 8195A31 +Text_CounterTaught:: .string "Are you using that COUNTER move\n" .string "I taught your POKéMON?$" diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc index e9aba025a..98069ca2e 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc @@ -1,19 +1,19 @@ -CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE +CeladonCity_DepartmentStore_4F_MapScripts:: .byte 0 -CeladonCity_DepartmentStore_4F_EventScript_Man:: @ 816BBEF +CeladonCity_DepartmentStore_4F_EventScript_Man:: msgbox CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent, MSGBOX_NPC end -CeladonCity_DepartmentStore_4F_EventScript_Youngster:: @ 816BBF8 +CeladonCity_DepartmentStore_4F_EventScript_Youngster:: msgbox CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll, MSGBOX_NPC end -CeladonCity_DepartmentStore_4F_EventScript_FloorSign:: @ 816BC01 +CeladonCity_DepartmentStore_4F_EventScript_FloorSign:: msgbox CeladonCity_DepartmentStore_4F_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_4F_EventScript_Clerk:: @ 816BC0A +CeladonCity_DepartmentStore_4F_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -25,7 +25,7 @@ CeladonCity_DepartmentStore_4F_EventScript_Clerk:: @ 816BC0A end .align 2 -CeladonCity_DepartmentStore_4F_Items:: @ 816BC30 +CeladonCity_DepartmentStore_4F_Items:: .2byte ITEM_POKE_DOLL .2byte ITEM_RETRO_MAIL .2byte ITEM_FIRE_STONE diff --git a/data/maps/CeladonCity_DepartmentStore_4F/text.inc b/data/maps/CeladonCity_DepartmentStore_4F/text.inc index 80121023e..5b5061429 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_4F/text.inc @@ -1,17 +1,17 @@ -CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent:: @ 8195A68 +CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent:: .string "I'm getting a present for my\n" .string "girlfriend.\p" .string "I guess a POKé DOLL will be it.\n" .string "It's the popular thing.$" -CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll:: @ 8195AC9 +CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll:: .string "I heard something useful.\p" .string "If a wild POKéMON appears, you can\n" .string "distract it with a POKé DOLL.\p" .string "You can run away while the wild\n" .string "POKéMON is distracted.$" -CeladonCity_DepartmentStore_4F_Text_FloorSign:: @ 8195B5B +CeladonCity_DepartmentStore_4F_Text_FloorSign:: .string "Express yourself with gifts!\n" .string "4F: WISE MAN GIFTS\p" .string "Evolution Special!\n" diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc index e854a6a65..8625e2244 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc @@ -1,19 +1,19 @@ -CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40 +CeladonCity_DepartmentStore_5F_MapScripts:: .byte 0 -CeladonCity_DepartmentStore_5F_EventScript_Gentleman:: @ 816BC41 +CeladonCity_DepartmentStore_5F_EventScript_Gentleman:: msgbox CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers, MSGBOX_NPC end -CeladonCity_DepartmentStore_5F_EventScript_Sailor:: @ 816BC4A +CeladonCity_DepartmentStore_5F_EventScript_Sailor:: msgbox CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers, MSGBOX_NPC end -CeladonCity_DepartmentStore_5F_EventScript_FloorSign:: @ 816BC53 +CeladonCity_DepartmentStore_5F_EventScript_FloorSign:: msgbox CeladonCity_DepartmentStore_5F_Text_Drugstore, MSGBOX_SIGN end -CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems:: @ 816BC5C +CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -25,7 +25,7 @@ CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems:: @ 816BC5C end .align 2 -CeladonCity_DepartmentStore_5F_XItems:: @ 816BC84 +CeladonCity_DepartmentStore_5F_XItems:: .2byte ITEM_X_ATTACK .2byte ITEM_X_DEFEND .2byte ITEM_X_SPEED @@ -37,7 +37,7 @@ CeladonCity_DepartmentStore_5F_XItems:: @ 816BC84 release end -CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins:: @ 816BC96 +CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -49,7 +49,7 @@ CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins:: @ 816BC96 end .align 2 -CeladonCity_DepartmentStore_5F_Vitamins:: @ 816BCBC +CeladonCity_DepartmentStore_5F_Vitamins:: .2byte ITEM_HP_UP .2byte ITEM_PROTEIN .2byte ITEM_IRON diff --git a/data/maps/CeladonCity_DepartmentStore_5F/text.inc b/data/maps/CeladonCity_DepartmentStore_5F/text.inc index 638f07320..9ee8cb2b3 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_5F/text.inc @@ -1,4 +1,4 @@ -CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers:: @ 8195BBA +CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers:: .string "POKéMON stat enhancers can be\n" .string "bought only here.\p" .string "HP UP increases the base HP of a\n" @@ -10,7 +10,7 @@ CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers:: @ 8195BBA .string "CARBOS enhances the base SPEED\n" .string "stat.$" -CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers:: @ 8195CA0 +CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers:: .string "I'm here for POKéMON stat\n" .string "enhancers.\p" .string "PROTEIN increases the base ATTACK\n" @@ -18,6 +18,6 @@ CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers:: @ 8195CA0 .string "IRON increases the base DEFENSE\n" .string "stat.$" -CeladonCity_DepartmentStore_5F_Text_Drugstore:: @ 8195D14 +CeladonCity_DepartmentStore_5F_Text_Drugstore:: .string "5F: DRUGSTORE$" diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc index b5f5ed682..6c01bd9f8 100644 --- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc @@ -1,7 +1,7 @@ -CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152 +CeladonCity_DepartmentStore_Elevator_MapScripts:: .byte 0 -CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: @ 816C153 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: lockall setvar VAR_0x8004, 3 call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor @@ -19,32 +19,32 @@ CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: @ 816C153 case 4, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F end -CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F:: @ 816C1B7 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F:: multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 0, FALSE goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F:: @ 816C1C3 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F:: multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 1, FALSE goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F:: @ 816C1CF +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F:: multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 2, FALSE goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F:: @ 816C1DB +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F:: multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 3, FALSE goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F:: @ 816C1E7 +CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F:: multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 4, FALSE goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor end -CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor:: @ 816C1F3 +CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor:: switch VAR_RESULT case 0, CeladonCity_DepartmentStore_Elevator_EventScript_To5F case 1, CeladonCity_DepartmentStore_Elevator_EventScript_To4F @@ -55,7 +55,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor:: @ 816C1F3 case 127, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -CeladonCity_DepartmentStore_Elevator_EventScript_To1F:: @ 816C246 +CeladonCity_DepartmentStore_Elevator_EventScript_To1F:: setvar VAR_0x8006, 4 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 4 @@ -65,7 +65,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To1F:: @ 816C246 goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -CeladonCity_DepartmentStore_Elevator_EventScript_To2F:: @ 816C26E +CeladonCity_DepartmentStore_Elevator_EventScript_To2F:: setvar VAR_0x8006, 5 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 5 @@ -75,7 +75,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To2F:: @ 816C26E goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -CeladonCity_DepartmentStore_Elevator_EventScript_To3F:: @ 816C296 +CeladonCity_DepartmentStore_Elevator_EventScript_To3F:: setvar VAR_0x8006, 6 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 6 @@ -85,7 +85,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To3F:: @ 816C296 goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -CeladonCity_DepartmentStore_Elevator_EventScript_To4F:: @ 816C2BE +CeladonCity_DepartmentStore_Elevator_EventScript_To4F:: setvar VAR_0x8006, 7 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 7 @@ -95,7 +95,7 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To4F:: @ 816C2BE goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: @ 816C2E6 +CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: setvar VAR_0x8006, 8 setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1 compare VAR_ELEVATOR_FLOOR, 8 @@ -105,12 +105,12 @@ CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: @ 816C2E6 goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect end -CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect:: @ 816C30E +CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect:: special CloseElevatorCurrentFloorWindow releaseall end -CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator:: @ 816C313 +CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator:: special CloseElevatorCurrentFloorWindow closemessage waitse diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index 32aed768c..14d250852 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -1,7 +1,7 @@ -CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC +CeladonCity_DepartmentStore_Roof_MapScripts:: .byte 0 -CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD +CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -12,7 +12,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD goto CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink end -CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks:: @ 816BCF6 +CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks:: setvar VAR_TEMP_1, 0 checkitem ITEM_FRESH_WATER, 1 compare VAR_RESULT, TRUE @@ -25,19 +25,19 @@ CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks:: @ 816BCF6 call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade return -CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater:: @ 816BD2C +CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater:: addvar VAR_TEMP_1, 1 return -CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop:: @ 816BD32 +CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop:: addvar VAR_TEMP_1, 2 return -CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade:: @ 816BD38 +CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade:: addvar VAR_TEMP_1, 4 return -CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink:: @ 816BD3E +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink:: msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink @@ -55,7 +55,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink:: @ 816BD3E case 7, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks end -CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater:: @ 816BDAE +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater:: multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER, FALSE switch VAR_RESULT case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater @@ -63,7 +63,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater:: @ 816BDAE case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop:: @ 816BDDA +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop:: multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP, FALSE switch VAR_RESULT case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop @@ -71,7 +71,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop:: @ 816BDDA case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop:: @ 816BE06 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop:: multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP, FALSE switch VAR_RESULT case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater @@ -80,7 +80,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop:: @ 816BE0 case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade:: @ 816BE3D +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade:: multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_LEMONADE, FALSE switch VAR_RESULT case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade @@ -88,7 +88,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade:: @ 816BE3D case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade:: @ 816BE69 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade:: multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE, FALSE switch VAR_RESULT case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater @@ -97,7 +97,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade:: @ 816BE case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade:: @ 816BEA0 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade:: multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE, FALSE switch VAR_RESULT case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop @@ -106,7 +106,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade:: @ 816BEA0 case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks:: @ 816BED7 +CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks:: multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE, FALSE switch VAR_RESULT case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater @@ -116,7 +116,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks:: @ 816BED7 case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink end -CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater:: @ 816BF19 +CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater:: setvar VAR_0x8008, ITEM_FRESH_WATER setvar VAR_0x8009, ITEM_TM16 goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll @@ -124,7 +124,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater:: @ 816BF19 goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop:: @ 816BF3A +CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop:: setvar VAR_0x8008, ITEM_SODA_POP setvar VAR_0x8009, ITEM_TM20 goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll @@ -132,7 +132,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop:: @ 816BF3A goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade:: @ 816BF5B +CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade:: setvar VAR_0x8008, ITEM_LEMONADE setvar VAR_0x8009, ITEM_TM33 goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll @@ -140,7 +140,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade:: @ 816BF5B goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink end -CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C +CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: getitemname 0, VAR_0x8008 getitemname 1, VAR_0x8009 removeitem VAR_0x8008, 1 @@ -164,49 +164,49 @@ CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C release end -CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16:: @ 816BFDE +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16:: setflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM16 return -CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20:: @ 816BFEA +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20:: setflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM20 return -CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33:: @ 816BFF6 +CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33:: setflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM33 return -CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward:: @ 816C002 +CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward:: msgbox CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis release end -CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink:: @ 816C00C +CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink:: release end -CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink:: @ 816C00E +CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink:: msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink release end -CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll:: @ 816C018 +CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll:: msgbox CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll release end -CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM:: @ 816C022 +CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM:: msgbox CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature, MSGBOX_NPC end -CeladonCity_DepartmentStore_Roof_EventScript_FloorSign:: @ 816C02B +CeladonCity_DepartmentStore_Roof_EventScript_FloorSign:: msgbox CeladonCity_DepartmentStore_Roof_Text_FloorSign, MSGBOX_SIGN end -CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine:: @ 816C034 +CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine:: lockall message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave waitmessage @@ -214,7 +214,7 @@ CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine:: @ 816C034 goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink end -CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink:: @ 816C045 +CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink:: multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE copyvar VAR_TEMP_1, VAR_RESULT switch VAR_TEMP_1 @@ -225,37 +225,37 @@ CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink:: @ 816C045 goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater:: @ 816C083 +CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater:: setvar VAR_TEMP_0, ITEM_FRESH_WATER checkmoney 200, 0 goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop:: @ 816C094 +CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop:: setvar VAR_TEMP_0, ITEM_SODA_POP checkmoney 300, 0 goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade:: @ 816C0A5 +CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade:: setvar VAR_TEMP_0, ITEM_LEMONADE checkmoney 350, 0 goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink end -CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater:: @ 816C0B6 +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater:: removemoney 200, 0 return -CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop:: @ 816C0BD +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop:: removemoney 300, 0 return -CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade:: @ 816C0C4 +CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade:: removemoney 350, 0 return -CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB +CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: compare VAR_RESULT, FALSE goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney checkitemspace VAR_TEMP_0, 1 @@ -275,23 +275,23 @@ CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink end -CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink:: @ 816C125 +CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink:: message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave waitmessage goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink end -CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney:: @ 816C131 +CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney:: msgbox CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink:: @ 816C13F +CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink:: msgbox CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine end -CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine:: @ 816C14D +CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine:: hidemoneybox 0, 0 releaseall end diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc index 2c6944373..23243f721 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc @@ -1,82 +1,82 @@ -CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink:: @ 8195D22 +CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink:: .string "I'm thirsty!\n" .string "I want something to drink!\p" .string "{SIZE}ÁGive her a drink?$" -CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink:: @ 8195D5F +CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink:: .string "Give her which drink?$" -CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis:: @ 8195D75 +CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis:: .string "Yay!\p" .string "FRESH WATER!\p" .string "Thank you!\n" .string "You can have this from me!$" -Text_ReceivedItemFromLittleGirl:: @ 8195DAD +Text_ReceivedItemFromLittleGirl:: .string "{PLAYER} received a {STR_VAR_2}\n" .string "from the little girl.$" -CeladonCity_DepartmentStore_Roof_Text_ExplainTM16:: @ 8195DD4 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM16:: .string "TM16 contains LIGHT SCREEN.\p" .string "It's a move that weakens the power\n" .string "of special attacks by your foe.$" -CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis:: @ 8195E33 +CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis:: .string "Yay!\p" .string "SODA POP!\p" .string "Thank you!\n" .string "You can have this from me!$" -CeladonCity_DepartmentStore_Roof_Text_ExplainTM20:: @ 8195E68 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM20:: .string "TM20 contains SAFEGUARD.\p" .string "It's a move that prevents status\n" .string "problems among your POKéMON.$" -CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis:: @ 8195EBF +CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis:: .string "Yay!\p" .string "LEMONADE!\p" .string "Thank you!\n" .string "You can have this from me!$" -CeladonCity_DepartmentStore_Roof_Text_ExplainTM33:: @ 8195EF4 +CeladonCity_DepartmentStore_Roof_Text_ExplainTM33:: .string "TM33 contains REFLECT.\p" .string "It's a move that weakens the power\n" .string "of physical attacks by your foe.$" -CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis:: @ 8195F4F +CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis:: .string "You don't have space for this!$" -CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll:: @ 8195F6E +CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll:: .string "No, thank you!\n" .string "I'm not thirsty after all!$" -CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature:: @ 8195F98 +CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature:: .string "My sister is a TRAINER, believe it\n" .string "or not.\p" .string "But, she's so immature, she drives\n" .string "me nuts!$" -CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink:: @ 8195FEF +CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink:: .string "I'm thirsty!\n" .string "I want something to drink!$" -CeladonCity_DepartmentStore_Roof_Text_FloorSign:: @ 8196017 +CeladonCity_DepartmentStore_Roof_Text_FloorSign:: .string "ROOFTOP SQUARE:\n" .string "VENDING MACHINES$" -CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave:: @ 8196038 +CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave:: .string "A vending machine!\n" .string "What does it have?$" -CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney:: @ 819605E +CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney:: .string "Oops, not enough money!$" -CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut:: @ 8196076 +CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut:: .string "A can of {STR_VAR_1} popped out!$" -CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff:: @ 819608E +CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff:: .string "There's no more room for stuff!$" -CeladonCity_DepartmentStore_Roof_Text_NotThirsty:: @ 81960AE +CeladonCity_DepartmentStore_Roof_Text_NotThirsty:: .string "Not thirsty!$" diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index 25b50d373..60c541af3 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -1,14 +1,14 @@ .set LOCALID_GRUNT, 11 -CeladonCity_GameCorner_MapScripts:: @ 816C646 +CeladonCity_GameCorner_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, CeladonCity_GameCorner_OnLoad .byte 0 -CeladonCity_GameCorner_OnLoad:: @ 816C64C +CeladonCity_GameCorner_OnLoad:: call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_HideRocketHideout end -CeladonCity_GameCorner_EventScript_HideRocketHideout:: @ 816C656 +CeladonCity_GameCorner_EventScript_HideRocketHideout:: setmetatile 15, 2, METATILE_GameCorner_Floor_ShadeFull, 0 setmetatile 16, 2, METATILE_GameCorner_Floor_ShadeFull, 0 setmetatile 17, 2, METATILE_GameCorner_Floor_ShadeFull, 0 @@ -16,11 +16,11 @@ CeladonCity_GameCorner_EventScript_HideRocketHideout:: @ 816C656 setmetatile 17, 3, METATILE_GameCorner_PurpleWall_Floor, 1 return -CeladonCity_GameCorner_EventScript_InfoClerk:: @ 816C684 +CeladonCity_GameCorner_EventScript_InfoClerk:: msgbox CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor, MSGBOX_NPC end -CeladonCity_GameCorner_EventScript_CoinsClerk:: @ 816C68D +CeladonCity_GameCorner_EventScript_CoinsClerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -37,7 +37,7 @@ CeladonCity_GameCorner_EventScript_CoinsClerk:: @ 816C68D case 127, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy end -CeladonCity_GameCorner_EventScript_BuyCoins:: @ 816C6E6 +CeladonCity_GameCorner_EventScript_BuyCoins:: goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_ClerkNoCoinCase compare VAR_0x8009, 0 goto_if_eq CeladonCity_GameCorner_EventScript_Buy50Coins @@ -45,7 +45,7 @@ CeladonCity_GameCorner_EventScript_BuyCoins:: @ 816C6E6 goto_if_eq CeladonCity_GameCorner_EventScript_Buy500Coins end -CeladonCity_GameCorner_EventScript_Buy500Coins:: @ 816C706 +CeladonCity_GameCorner_EventScript_Buy500Coins:: checkcoins VAR_TEMP_1 compare VAR_TEMP_1, (MAX_COINS + 1) - 500 goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins @@ -57,7 +57,7 @@ CeladonCity_GameCorner_EventScript_Buy500Coins:: @ 816C706 goto CeladonCity_GameCorner_EventScript_BoughtCoins end -CeladonCity_GameCorner_EventScript_Buy50Coins:: @ 816C734 +CeladonCity_GameCorner_EventScript_Buy50Coins:: checkcoins VAR_TEMP_1 compare VAR_TEMP_1, (MAX_COINS + 1) - 50 goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins @@ -69,7 +69,7 @@ CeladonCity_GameCorner_EventScript_Buy50Coins:: @ 816C734 goto CeladonCity_GameCorner_EventScript_BoughtCoins end -CeladonCity_GameCorner_EventScript_BoughtCoins:: @ 816C762 +CeladonCity_GameCorner_EventScript_BoughtCoins:: updatemoneybox 0, 0, 0 updatecoinsbox 0, 5 playse SE_SHOP @@ -77,54 +77,54 @@ CeladonCity_GameCorner_EventScript_BoughtCoins:: @ 816C762 goto CeladonCity_GameCorner_EventScript_ClerkEnd end -CeladonCity_GameCorner_EventScript_ClerkEnd:: @ 816C77A +CeladonCity_GameCorner_EventScript_ClerkEnd:: hidemoneybox 0, 0 hidecoinsbox 0, 5 release end -CeladonCity_GameCorner_EventScript_ClerkDeclineBuy:: @ 816C782 +CeladonCity_GameCorner_EventScript_ClerkDeclineBuy:: msgbox CeladonCity_GameCorner_Text_ComePlaySometime goto CeladonCity_GameCorner_EventScript_ClerkEnd end -CeladonCity_GameCorner_EventScript_ClerkNoCoinCase:: @ 816C790 +CeladonCity_GameCorner_EventScript_ClerkNoCoinCase:: msgbox CeladonCity_GameCorner_Text_SorryDontHaveCoinCase goto CeladonCity_GameCorner_EventScript_ClerkEnd end -CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins:: @ 816C79E +CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins:: msgbox CeladonCity_GameCorner_Text_CoinCaseIsFull goto CeladonCity_GameCorner_EventScript_ClerkEnd end -CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney:: @ 816C7AC +CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney:: msgbox CeladonCity_GameCorner_Text_CantAffordCoins goto CeladonCity_GameCorner_EventScript_ClerkEnd end -CeladonCity_GameCorner_EventScript_BaldingMan:: @ 816C7BA +CeladonCity_GameCorner_EventScript_BaldingMan:: lock faceplayer msgbox CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_FaceSlotMachine:: @ 816C7CA +CeladonCity_GameCorner_EventScript_FaceSlotMachine:: closemessage applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection waitmovement 0 release end -CeladonCity_GameCorner_EventScript_Woman1:: @ 816C7D7 +CeladonCity_GameCorner_EventScript_Woman1:: lock faceplayer msgbox CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_Fisher:: @ 816C7E7 +CeladonCity_GameCorner_EventScript_Fisher:: lock faceplayer goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins @@ -142,23 +142,23 @@ CeladonCity_GameCorner_EventScript_Fisher:: @ 816C7E7 goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins:: @ 816C82B +CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins:: msgbox CeladonCity_GameCorner_Text_DontNeedMyCoins goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_GamblerNoCoinCase:: @ 816C839 +CeladonCity_GameCorner_EventScript_GamblerNoCoinCase:: textcolor 3 msgbox CeladonCity_GameCorner_Text_DontHaveCoinCase goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins:: @ 816C849 +CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins:: msgbox CeladonCity_GameCorner_Text_WinsComeAndGo goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_GymGuy:: @ 816C857 +CeladonCity_GameCorner_EventScript_GymGuy:: lock faceplayer goto_if_set FLAG_DEFEATED_ERIKA, CeladonCity_GameCorner_EventScript_GymGuyPostVictory @@ -166,26 +166,26 @@ CeladonCity_GameCorner_EventScript_GymGuy:: @ 816C857 goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_GymGuyPostVictory:: @ 816C870 +CeladonCity_GameCorner_EventScript_GymGuyPostVictory:: msgbox CeladonCity_GameCorner_Text_RareMonsForCoins goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_Woman2:: @ 816C87E +CeladonCity_GameCorner_EventScript_Woman2:: lock faceplayer msgbox CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_OldMan:: @ 816C88E +CeladonCity_GameCorner_EventScript_OldMan:: lock faceplayer msgbox CeladonCity_GameCorner_Text_SoEasyToGetHooked goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_Scientist:: @ 816C89E +CeladonCity_GameCorner_EventScript_Scientist:: lock faceplayer goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins @@ -203,17 +203,17 @@ CeladonCity_GameCorner_EventScript_Scientist:: @ 816C89E goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins:: @ 816C8E2 +CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins:: msgbox CeladonCity_GameCorner_Text_YouHaveLotsOfCoins goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins:: @ 816C8F0 +CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins:: msgbox CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_Gentleman:: @ 816C8FE +CeladonCity_GameCorner_EventScript_Gentleman:: lock faceplayer goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins @@ -231,27 +231,27 @@ CeladonCity_GameCorner_EventScript_Gentleman:: @ 816C8FE goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins:: @ 816C942 +CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins:: msgbox CeladonCity_GameCorner_Text_YouveGotPlentyCoins goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins:: @ 816C950 +CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins:: msgbox CeladonCity_GameCorner_Text_WatchReelsClosely goto CeladonCity_GameCorner_EventScript_FaceSlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine0:: @ 816C95E +CeladonCity_GameCorner_EventScript_SlotMachine0:: lockall setvar VAR_0x8004, 0 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_DontPlaySlotMachine:: @ 816C96A +CeladonCity_GameCorner_EventScript_DontPlaySlotMachine:: releaseall end -CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C +CeladonCity_GameCorner_EventScript_SlotMachine:: goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO compare VAR_RESULT, NO @@ -266,145 +266,145 @@ CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C releaseall end -CeladonCity_GameCorner_EventScript_SlotMachine1:: @ 816C9A4 +CeladonCity_GameCorner_EventScript_SlotMachine1:: lockall setvar VAR_0x8004, 1 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine2:: @ 816C9B0 +CeladonCity_GameCorner_EventScript_SlotMachine2:: lockall setvar VAR_0x8004, 2 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine3:: @ 816C9BC +CeladonCity_GameCorner_EventScript_SlotMachine3:: lockall setvar VAR_0x8004, 3 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine4:: @ 816C9C8 +CeladonCity_GameCorner_EventScript_SlotMachine4:: lockall setvar VAR_0x8004, 4 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine5:: @ 816C9D4 +CeladonCity_GameCorner_EventScript_SlotMachine5:: lockall setvar VAR_0x8004, 5 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine6:: @ 816C9E0 +CeladonCity_GameCorner_EventScript_SlotMachine6:: lockall setvar VAR_0x8004, 6 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine7:: @ 816C9EC +CeladonCity_GameCorner_EventScript_SlotMachine7:: lockall setvar VAR_0x8004, 7 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine8:: @ 816C9F8 +CeladonCity_GameCorner_EventScript_SlotMachine8:: lockall setvar VAR_0x8004, 8 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine9:: @ 816CA04 +CeladonCity_GameCorner_EventScript_SlotMachine9:: lockall setvar VAR_0x8004, 9 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine10:: @ 816CA10 +CeladonCity_GameCorner_EventScript_SlotMachine10:: lockall setvar VAR_0x8004, 10 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine11:: @ 816CA1C +CeladonCity_GameCorner_EventScript_SlotMachine11:: lockall setvar VAR_0x8004, 11 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine12:: @ 816CA28 +CeladonCity_GameCorner_EventScript_SlotMachine12:: lockall setvar VAR_0x8004, 12 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine13:: @ 816CA34 +CeladonCity_GameCorner_EventScript_SlotMachine13:: lockall setvar VAR_0x8004, 13 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine14:: @ 816CA40 +CeladonCity_GameCorner_EventScript_SlotMachine14:: lockall setvar VAR_0x8004, 14 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine15:: @ 816CA4C +CeladonCity_GameCorner_EventScript_SlotMachine15:: lockall setvar VAR_0x8004, 15 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine16:: @ 816CA58 +CeladonCity_GameCorner_EventScript_SlotMachine16:: lockall setvar VAR_0x8004, 16 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine17:: @ 816CA64 +CeladonCity_GameCorner_EventScript_SlotMachine17:: lockall setvar VAR_0x8004, 17 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine18:: @ 816CA70 +CeladonCity_GameCorner_EventScript_SlotMachine18:: lockall setvar VAR_0x8004, 18 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine19:: @ 816CA7C +CeladonCity_GameCorner_EventScript_SlotMachine19:: lockall setvar VAR_0x8004, 19 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine20:: @ 816CA88 +CeladonCity_GameCorner_EventScript_SlotMachine20:: lockall setvar VAR_0x8004, 20 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachine21:: @ 816CA94 +CeladonCity_GameCorner_EventScript_SlotMachine21:: lockall setvar VAR_0x8004, 21 goto CeladonCity_GameCorner_EventScript_SlotMachine end -CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase:: @ 816CAA0 +CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase:: msgbox CeladonCity_GameCorner_Text_CoinCaseIsRequired releaseall end -CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA +CeladonCity_GameCorner_EventScript_Poster:: lockall msgbox CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_OpenRocketHideout releaseall end -CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE +CeladonCity_GameCorner_EventScript_OpenRocketHideout:: playse SE_UNLOCK setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0 setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1 @@ -415,12 +415,12 @@ CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE setflag FLAG_OPENED_ROCKET_HIDEOUT return -CeladonCity_GameCorner_EventScript_RocketGrunt:: @ 816CAF5 +CeladonCity_GameCorner_EventScript_RocketGrunt:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, CeladonCity_GameCorner_Text_GruntIntro, CeladonCity_GameCorner_Text_GruntDefeat, CeladonCity_GameCorner_Text_DefeatedGrunt msgbox CeladonCity_GameCorner_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_GameCorner_Text_DefeatedGrunt:: @ 816CB10 +CeladonCity_GameCorner_Text_DefeatedGrunt:: msgbox CeladonCity_GameCorner_Text_GruntPostBattle closemessage compare VAR_FACING, DIR_WEST @@ -431,17 +431,17 @@ CeladonCity_GameCorner_Text_DefeatedGrunt:: @ 816CB10 release end -CeladonCity_GameCorner_Text_GruntExitWest:: @ 816CB34 +CeladonCity_GameCorner_Text_GruntExitWest:: applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExitWest waitmovement 0 return -CeladonCity_GameCorner_Text_GruntExit:: @ 816CB3F +CeladonCity_GameCorner_Text_GruntExit:: applymovement LOCALID_GRUNT, CeladonCity_GameCorner_Movement_GruntExit waitmovement 0 return -CeladonCity_GameCorner_Movement_GruntExitWest:: @ 816CB4A +CeladonCity_GameCorner_Movement_GruntExitWest:: walk_down walk_right walk_right @@ -452,7 +452,7 @@ CeladonCity_GameCorner_Movement_GruntExitWest:: @ 816CB4A walk_right step_end -CeladonCity_GameCorner_Movement_GruntExit:: @ 816CB53 +CeladonCity_GameCorner_Movement_GruntExit:: walk_right walk_right walk_right @@ -461,14 +461,14 @@ CeladonCity_GameCorner_Movement_GruntExit:: @ 816CB53 walk_right step_end -CeladonCity_GameCorner_EventScript_UnusableSlotMachine1:: @ 816CB5A +CeladonCity_GameCorner_EventScript_UnusableSlotMachine1:: msgbox CeladonCity_GameCorner_Text_OutOfOrder, MSGBOX_SIGN end -CeladonCity_GameCorner_EventScript_UnusableSlotMachine2:: @ 816CB63 +CeladonCity_GameCorner_EventScript_UnusableSlotMachine2:: msgbox CeladonCity_GameCorner_Text_OutToLunch, MSGBOX_SIGN end -CeladonCity_GameCorner_EventScript_UnusableSlotMachine3:: @ 816CB6C +CeladonCity_GameCorner_EventScript_UnusableSlotMachine3:: msgbox CeladonCity_GameCorner_Text_SomeonesKeys, MSGBOX_SIGN end diff --git a/data/maps/CeladonCity_GameCorner/text.inc b/data/maps/CeladonCity_GameCorner/text.inc index 6813330ab..acccb150a 100644 --- a/data/maps/CeladonCity_GameCorner/text.inc +++ b/data/maps/CeladonCity_GameCorner/text.inc @@ -1,60 +1,60 @@ -CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor:: @ 8196940 +CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor:: .string "Welcome!\p" .string "You can exchange your COINS for\n" .string "fabulous prizes next door.$" -CeladonCity_GameCorner_Text_WelcomeBuySomeCoins:: @ 8196984 +CeladonCity_GameCorner_Text_WelcomeBuySomeCoins:: .string "Welcome to ROCKET GAME CORNER!\p" .string "Do you need some game COINS?\n" .string "Would you like to buy some?$" -CeladonCity_GameCorner_Text_ComePlaySometime:: @ 81969DC +CeladonCity_GameCorner_Text_ComePlaySometime:: .string "No?\n" .string "Please come play sometime!$" -CeladonCity_GameCorner_Text_SorryDontHaveCoinCase:: @ 81969FB +CeladonCity_GameCorner_Text_SorryDontHaveCoinCase:: .string "Oh, I'm sorry.\n" .string "You don't have a COIN CASE.$" -CeladonCity_GameCorner_Text_CoinCaseIsFull:: @ 8196A26 +CeladonCity_GameCorner_Text_CoinCaseIsFull:: .string "Whoops!\n" .string "Your COIN CASE is full.$" -CeladonCity_GameCorner_Text_CantAffordCoins:: @ 8196A46 +CeladonCity_GameCorner_Text_CantAffordCoins:: .string "You can't afford the COINS.$" -CeladonCity_GameCorner_Text_HereAreYourCoins:: @ 8196A62 +CeladonCity_GameCorner_Text_HereAreYourCoins:: .string "Thank you.\n" .string "Here are your COINS!$" -CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace:: @ 8196A82 +CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace:: .string "Keep this quiet.\p" .string "It's rumored that this place is run\n" .string "by TEAM ROCKET.$" -CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds:: @ 8196AC7 +CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds:: .string "I think these machines have\n" .string "different odds.$" -CeladonCity_GameCorner_Text_DoYouWantToPlay:: @ 8196AF3 +CeladonCity_GameCorner_Text_DoYouWantToPlay:: .string "Kid, do you want to play?$" -CeladonCity_GameCorner_Text_Received10CoinsFromMan:: @ 8196B0D +CeladonCity_GameCorner_Text_Received10CoinsFromMan:: .string "{PLAYER} received 10 COINS\n" .string "from the man.$" -CeladonCity_GameCorner_Text_DontNeedMyCoins:: @ 8196B30 +CeladonCity_GameCorner_Text_DontNeedMyCoins:: .string "You don't need my COINS!$" -CeladonCity_GameCorner_Text_WinsComeAndGo:: @ 8196B49 +CeladonCity_GameCorner_Text_WinsComeAndGo:: .string "Wins seem to come and go.\n" .string "Nothing's a sure thing.$" -CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck:: @ 8196B7B +CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck:: .string "These slot games…\n" .string "Win or lose, it's only by luck.$" -CeladonCity_GameCorner_Text_GymGuyAdvice:: @ 8196BAD +CeladonCity_GameCorner_Text_GymGuyAdvice:: .string "Hey!\p" .string "You have better things to do,\n" .string "champ in the making!\p" @@ -66,83 +66,83 @@ CeladonCity_GameCorner_Text_GymGuyAdvice:: @ 8196BAD .string "But she's not one to be taken\n" .string "lightly!$" -CeladonCity_GameCorner_Text_RareMonsForCoins:: @ 8196CA1 +CeladonCity_GameCorner_Text_RareMonsForCoins:: .string "They offer rare POKéMON that can\n" .string "be exchanged for your COINS.\p" .string "But, I just can't seem to win!$" -CeladonCity_GameCorner_Text_SoEasyToGetHooked:: @ 8196CFE +CeladonCity_GameCorner_Text_SoEasyToGetHooked:: .string "Games are scary!\n" .string "It's so easy to get hooked!$" -CeladonCity_GameCorner_Text_WantSomeCoins:: @ 8196D2B +CeladonCity_GameCorner_Text_WantSomeCoins:: .string "What's up?\n" .string "Want some COINS?$" -CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy:: @ 8196D47 +CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy:: .string "{PLAYER} received 20 COINS\n" .string "from the nice guy.$" -CeladonCity_GameCorner_Text_YouHaveLotsOfCoins:: @ 8196D6F +CeladonCity_GameCorner_Text_YouHaveLotsOfCoins:: .string "You have lots of COINS!$" -CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant:: @ 8196D87 +CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant:: .string "Darn! I need more COINS for the\n" .string "POKéMON I want!$" -CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo:: @ 8196DB7 +CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo:: .string "Hey, what? You're throwing me off!\n" .string "Here are some COINS, so shoo!$" -CeladonCity_GameCorner_Text_Received20CoinsFromMan:: @ 8196DF8 +CeladonCity_GameCorner_Text_Received20CoinsFromMan:: .string "{PLAYER} received 20 COINS\n" .string "from the man.$" -CeladonCity_GameCorner_Text_YouveGotPlentyCoins:: @ 8196E1B +CeladonCity_GameCorner_Text_YouveGotPlentyCoins:: .string "You've got plenty of your own\n" .string "COINS!$" -CeladonCity_GameCorner_Text_WatchReelsClosely:: @ 8196E40 +CeladonCity_GameCorner_Text_WatchReelsClosely:: .string "The trick is to watch the reels\n" .string "closely.$" -CeladonCity_GameCorner_Text_GruntIntro:: @ 8196E69 +CeladonCity_GameCorner_Text_GruntIntro:: .string "I'm guarding this poster!\n" .string "Go away, or else!$" -CeladonCity_GameCorner_Text_GruntDefeat:: @ 8196E95 +CeladonCity_GameCorner_Text_GruntDefeat:: .string "Dang!$" -CeladonCity_GameCorner_Text_GruntPostBattle:: @ 8196E9B +CeladonCity_GameCorner_Text_GruntPostBattle:: .string "The TEAM ROCKET HIDEOUT might\n" .string "be discovered!\p" .string "I better tell BOSS!$" -CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt:: @ 8196EDC +CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt:: .string "Hey!\p" .string "A switch behind the poster!?\n" .string "Let's push it!$" -CeladonCity_GameCorner_Text_CoinCaseIsRequired:: @ 8196F0D +CeladonCity_GameCorner_Text_CoinCaseIsRequired:: .string "A COIN CASE is required…$" -CeladonCity_GameCorner_Text_DontHaveCoinCase:: @ 8196F26 +CeladonCity_GameCorner_Text_DontHaveCoinCase:: .string "Oops!\n" .string "Don't have the COIN CASE!$" -CeladonCity_GameCorner_Text_SlotMachineWantToPlay:: @ 8196F46 +CeladonCity_GameCorner_Text_SlotMachineWantToPlay:: .string "A slot machine!\n" .string "Want to play?$" -CeladonCity_GameCorner_Text_OutOfOrder:: @ 8196F64 +CeladonCity_GameCorner_Text_OutOfOrder:: .string "OUT OF ORDER\n" .string "This is broken.$" -CeladonCity_GameCorner_Text_OutToLunch:: @ 8196F81 +CeladonCity_GameCorner_Text_OutToLunch:: .string "OUT TO LUNCH\n" .string "This is reserved.$" -CeladonCity_GameCorner_Text_SomeonesKeys:: @ 8196FA0 +CeladonCity_GameCorner_Text_SomeonesKeys:: .string "Someone's keys!\n" .string "They'll be back.$" diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc index 09fcd2da5..8070c752c 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc @@ -1,15 +1,15 @@ -CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75 +CeladonCity_GameCorner_PrizeRoom_MapScripts:: .byte 0 -CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan:: @ 816CB76 +CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan:: msgbox CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon, MSGBOX_NPC end -CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan:: @ 816CB7F +CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan:: msgbox CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday, MSGBOX_NPC end -CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons:: @ 816CB88 +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons:: lock faceplayer goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase @@ -19,7 +19,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons:: @ 816CB88 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon:: @ 816CBB2 +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon:: message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 11, 0, MULTICHOICE_GAME_CORNER_POKEMON_PRIZES, FALSE @@ -33,12 +33,12 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon:: @ 816CBB2 case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange:: @ 816CC10 +CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange:: hidecoinsbox 0, 0 release end -CeladonCity_GameCorner_PrizeRoom_EventScript_Abra:: @ 816CC15 +CeladonCity_GameCorner_PrizeRoom_EventScript_Abra:: .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_ABRA setvar VAR_TEMP_2, 180 @@ -51,7 +51,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_Abra:: @ 816CC15 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy:: @ 816CC25 +CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy:: .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_CLEFAIRY setvar VAR_TEMP_2, 500 @@ -64,7 +64,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy:: @ 816CC25 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir:: @ 816CC35 +CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir:: .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_DRATINI setvar VAR_TEMP_2, 2800 @@ -77,7 +77,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir:: @ 816CC35 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini:: @ 816CC45 +CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini:: .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_SCYTHER setvar VAR_TEMP_2, 5500 @@ -90,7 +90,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini:: @ 816CC45 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon:: @ 816CC55 +CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon:: .ifdef FIRERED setvar VAR_TEMP_1, SPECIES_PORYGON setvar VAR_TEMP_2, 9999 @@ -103,7 +103,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon:: @ 816CC55 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon:: @ 816CC65 +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon:: getspeciesname 0, VAR_TEMP_1 msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO compare VAR_RESULT, NO @@ -121,7 +121,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon:: @ 816CC65 case SPECIES_PINSIR, CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir end -CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra:: @ 816CCD4 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra:: .ifdef FIRERED givemon VAR_TEMP_1, 9, ITEM_NONE .else @@ -132,7 +132,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra:: @ 816CCD4 goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy:: @ 816CCE9 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy:: .ifdef FIRERED givemon VAR_TEMP_1, 8, ITEM_NONE .else @@ -143,7 +143,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy:: @ 816CCE9 goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini:: @ 816CCFE +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini:: .ifdef FIRERED givemon VAR_TEMP_1, 18, ITEM_NONE .else @@ -154,12 +154,12 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini:: @ 816CCFE goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther:: @ 816CD13 +CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther:: givemon VAR_TEMP_1, 25, ITEM_NONE goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon:: @ 816CD28 +CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon:: .ifdef FIRERED givemon VAR_TEMP_1, 26, ITEM_NONE .else @@ -170,12 +170,12 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon:: @ 816CD28 goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir:: @ 816CD3D +CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir:: givemon VAR_TEMP_1, 18, ITEM_NONE goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon end -CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon:: @ 816CD52 +CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon:: compare VAR_RESULT, 0 goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty compare VAR_RESULT, 1 @@ -184,14 +184,14 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon:: @ 816CD52 goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull end -CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull:: @ 816CD74 +CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull:: textcolor 3 msgbox Text_NoMoreRoomForPokemon hidecoinsbox 0, 0 release end -CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon:: @ 816CD83 +CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon:: getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT @@ -199,18 +199,18 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon:: @ 816CD83 goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase:: @ 816CD99 +CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase:: textcolor 3 msgbox CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired release end -CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins:: @ 816CDA5 +CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins:: msgbox CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3 +CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 @@ -224,7 +224,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3 goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0 +CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: removecoins VAR_TEMP_2 updatecoinsbox 0, 5 getspeciesname 0, VAR_TEMP_1 @@ -239,12 +239,12 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0 goto CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC end -CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC:: @ 816CE12 +CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC:: call EventScript_TransferredToPC goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs:: @ 816CE1D +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs:: lock faceplayer goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase @@ -254,7 +254,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs:: @ 816CE1D goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM end -CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM:: @ 816CE47 +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM:: message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 11, 0, MULTICHOICE_GAME_CORNER_TMPRIZES, FALSE @@ -268,49 +268,49 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM:: @ 816CE47 case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -CeladonCity_GameCorner_PrizeRoom_EventScript_TM13:: @ 816CEA5 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM13:: setvar VAR_TEMP_1, ITEM_TM13 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_ICE_BEAM goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -CeladonCity_GameCorner_PrizeRoom_EventScript_TM23:: @ 816CEB9 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM23:: setvar VAR_TEMP_1, ITEM_TM23 setvar VAR_TEMP_2, 3500 getmovename 1, MOVE_IRON_TAIL goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -CeladonCity_GameCorner_PrizeRoom_EventScript_TM24:: @ 816CECD +CeladonCity_GameCorner_PrizeRoom_EventScript_TM24:: setvar VAR_TEMP_1, ITEM_TM24 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_THUNDERBOLT goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -CeladonCity_GameCorner_PrizeRoom_EventScript_TM30:: @ 816CEE1 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM30:: setvar VAR_TEMP_1, ITEM_TM30 setvar VAR_TEMP_2, 4500 getmovename 1, MOVE_SHADOW_BALL goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -CeladonCity_GameCorner_PrizeRoom_EventScript_TM35:: @ 816CEF5 +CeladonCity_GameCorner_PrizeRoom_EventScript_TM35:: setvar VAR_TEMP_1, ITEM_TM35 setvar VAR_TEMP_2, 4000 getmovename 1, MOVE_FLAMETHROWER goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM end -CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM:: @ 816CF09 +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM:: msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize end -CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem:: @ 816CF22 +CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem:: getitemname 0, VAR_TEMP_1 msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO compare VAR_RESULT, NO @@ -318,7 +318,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem:: @ 816CF22 goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize end -CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize:: @ 816CF3F +CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize:: getitemname 0, VAR_TEMP_1 checkcoins VAR_RESULT compare VAR_RESULT, VAR_TEMP_2 @@ -332,14 +332,14 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize:: @ 816CF3F goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull:: @ 816CF79 +CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull:: textcolor 3 msgbox Text_TooBadBagFull hidecoinsbox 0, 0 release end -CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems:: @ 816CF88 +CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems:: lock faceplayer goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase @@ -349,7 +349,7 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems:: @ 816CF88 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem end -CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem:: @ 816CFB2 +CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem:: message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize waitmessage multichoice 10, 0, MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES, FALSE @@ -363,31 +363,31 @@ CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem:: @ 816CFB2 case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange end -CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall:: @ 816D010 +CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall:: setvar VAR_TEMP_1, ITEM_SMOKE_BALL setvar VAR_TEMP_2, 800 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed:: @ 816D020 +CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed:: setvar VAR_TEMP_1, ITEM_MIRACLE_SEED setvar VAR_TEMP_2, 1000 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal:: @ 816D030 +CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal:: setvar VAR_TEMP_1, ITEM_CHARCOAL setvar VAR_TEMP_2, 1000 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater:: @ 816D040 +CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater:: setvar VAR_TEMP_1, ITEM_MYSTIC_WATER setvar VAR_TEMP_2, 1000 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem end -CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute:: @ 816D050 +CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute:: setvar VAR_TEMP_1, ITEM_YELLOW_FLUTE setvar VAR_TEMP_2, 1600 goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc index f2b950607..9f688bc11 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc @@ -1,37 +1,37 @@ -CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon:: @ 8196FC1 +CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon:: .string "I sure do fancy that PORYGON!\n" .string "But, it's hard to win at slots!$" -CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday:: @ 8196FFF +CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday:: .string "Gahaha! I raked it in today!\n" .string "If only every day were like this…$" -CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired:: @ 819703E +CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired:: .string "A COIN CASE is required…$" -CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes:: @ 8197057 +CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes:: .string "We exchange your COINS for prizes.$" -CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize:: @ 819707A +CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize:: .string "Which prize would you like?$" -CeladonCity_GameCorner_PrizeRoom_Text_HereYouGo:: @ 8197096 +CeladonCity_GameCorner_PrizeRoom_Text_HereYouGo:: .string "はい どうぞ$" -CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize:: @ 819709D +CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize:: .string "So, you want the {STR_VAR_1}?$" -CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM:: @ 81970B2 +CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM:: .string "Okay, a TM of {STR_VAR_2}\n" .string "is what you want?$" -CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins:: @ 81970D5 +CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins:: .string "Sorry, you'll need more COINS\n" .string "than that.$" -CeladonCity_GameCorner_PrizeRoom_Text_OopsNotEnoughRoom:: @ 81970FE +CeladonCity_GameCorner_PrizeRoom_Text_OopsNotEnoughRoom:: .string "おきゃくさん もう もてないよ$" -CeladonCity_GameCorner_PrizeRoom_Text_OhFineThen:: @ 819710E +CeladonCity_GameCorner_PrizeRoom_Text_OhFineThen:: .string "あっ そう$" diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc index 8291ad757..9795156b1 100644 --- a/data/maps/CeladonCity_Gym/scripts.inc +++ b/data/maps/CeladonCity_Gym/scripts.inc @@ -1,7 +1,7 @@ -CeladonCity_Gym_MapScripts:: @ 816D060 +CeladonCity_Gym_MapScripts:: .byte 0 -CeladonCity_Gym_EventScript_Erika:: @ 816D061 +CeladonCity_Gym_EventScript_Erika:: famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle_single TRAINER_LEADER_ERIKA, CeladonCity_Gym_Text_ErikaIntro, CeladonCity_Gym_Text_ErikaDefeat, CeladonCity_Gym_EventScript_DefeatedErika, NO_MUSIC goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, CeladonCity_Gym_EventScript_GiveTM19 @@ -10,7 +10,7 @@ CeladonCity_Gym_EventScript_Erika:: @ 816D061 release end -CeladonCity_Gym_EventScript_DefeatedErika:: @ 816D0A0 +CeladonCity_Gym_EventScript_DefeatedErika:: famechecker FAMECHECKER_ERIKA, 1 clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS setflag FLAG_DEFEATED_ERIKA @@ -19,7 +19,7 @@ CeladonCity_Gym_EventScript_DefeatedErika:: @ 816D0A0 goto CeladonCity_Gym_EventScript_GiveTM19 end -CeladonCity_Gym_EventScript_GiveTM19:: @ 816D0C6 +CeladonCity_Gym_EventScript_GiveTM19:: msgbox CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis checkitemspace ITEM_TM19, 1 compare VAR_RESULT, FALSE @@ -30,56 +30,56 @@ CeladonCity_Gym_EventScript_GiveTM19:: @ 816D0C6 release end -CeladonCity_Gym_EventScript_NoRoomForTM19:: @ 816D107 +CeladonCity_Gym_EventScript_NoRoomForTM19:: msgbox CeladonCity_Gym_Text_ShouldMakeRoomForThis release end -CeladonCity_Gym_EventScript_Kay:: @ 816D111 +CeladonCity_Gym_EventScript_Kay:: trainerbattle_single TRAINER_LASS_KAY, CeladonCity_Gym_Text_KayIntro, CeladonCity_Gym_Text_KayDefeat msgbox CeladonCity_Gym_Text_KayPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_Lisa:: @ 816D128 +CeladonCity_Gym_EventScript_Lisa:: trainerbattle_single TRAINER_LASS_LISA, CeladonCity_Gym_Text_LisaIntro, CeladonCity_Gym_Text_LisaDefeat famechecker FAMECHECKER_ERIKA, 2 msgbox CeladonCity_Gym_Text_LisaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_Tina:: @ 816D14C +CeladonCity_Gym_EventScript_Tina:: trainerbattle_single TRAINER_PICNICKER_TINA, CeladonCity_Gym_Text_TinaIntro, CeladonCity_Gym_Text_TinaDefeat msgbox CeladonCity_Gym_Text_TinaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_Bridget:: @ 816D163 +CeladonCity_Gym_EventScript_Bridget:: trainerbattle_single TRAINER_BEAUTY_BRIDGET, CeladonCity_Gym_Text_BridgetIntro, CeladonCity_Gym_Text_BridgetDefeat msgbox CeladonCity_Gym_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_Tamia:: @ 816D17A +CeladonCity_Gym_EventScript_Tamia:: trainerbattle_single TRAINER_BEAUTY_TAMIA, CeladonCity_Gym_Text_TamiaIntro, CeladonCity_Gym_Text_TamiaDefeat famechecker FAMECHECKER_ERIKA, 3 msgbox CeladonCity_Gym_Text_TamiaPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_Lori:: @ 816D19E +CeladonCity_Gym_EventScript_Lori:: trainerbattle_single TRAINER_BEAUTY_LORI, CeladonCity_Gym_Text_LoriIntro, CeladonCity_Gym_Text_LoriDefeat msgbox CeladonCity_Gym_Text_LoriPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_Mary:: @ 816D1B5 +CeladonCity_Gym_EventScript_Mary:: trainerbattle_single TRAINER_COOLTRAINER_MARY, CeladonCity_Gym_Text_MaryIntro, CeladonCity_Gym_Text_MaryDefeat msgbox CeladonCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE end -CeladonCity_Gym_EventScript_GymStatue:: @ 816D1CC +CeladonCity_Gym_EventScript_GymStatue:: lockall goto_if_set FLAG_BADGE04_GET, CeladonCity_Gym_EventScript_GymStatuePostVictory msgbox CeladonCity_Gym_Text_GymStatue releaseall end -CeladonCity_Gym_EventScript_GymStatuePostVictory:: @ 816D1E0 +CeladonCity_Gym_EventScript_GymStatuePostVictory:: msgbox CeladonCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc index 4cd29a4e9..7a46fc39d 100644 --- a/data/maps/CeladonCity_Gym/text.inc +++ b/data/maps/CeladonCity_Gym/text.inc @@ -1,4 +1,4 @@ -CeladonCity_Gym_Text_ErikaIntro:: @ 8197114 +CeladonCity_Gym_Text_ErikaIntro:: .string "Hello…\n" .string "Lovely weather, isn't it?\l" .string "It's so pleasant…\p" @@ -14,137 +14,137 @@ CeladonCity_Gym_Text_ErikaIntro:: @ 8197114 .string "you wished to challenge me.\p" .string "Very well, but I shall not lose.{PLAY_BGM MUS_ENCOUNTER_GYM_LEADER}$" -CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260 +CeladonCity_Gym_Text_ErikaDefeat:: .string "Oh!\n" .string "I concede defeat.\l" .string "You are remarkably strong.\p" .string "I must confer on you the\n" .string "RAINBOWBADGE.$" -CeladonCity_Gym_Text_ErikaPostBattle:: @ 81972B8 +CeladonCity_Gym_Text_ErikaPostBattle:: .string "You are cataloging POKéMON?\n" .string "I must say I'm impressed.\p" .string "I would never collect POKéMON if\n" .string "they were unattractive.$" -CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis:: @ 8197327 +CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis:: .string "The RAINBOWBADGE will make\n" .string "POKéMON up to Lv. 50 obey.\p" .string "It also allows POKéMON to use\n" .string "STRENGTH in and out of battle.\p" .string "Please also take this with you.$" -CeladonCity_Gym_Text_ReceivedTM19FromErika:: @ 81973BA +CeladonCity_Gym_Text_ReceivedTM19FromErika:: .string "{PLAYER} received TM19\n" .string "from ERIKA.$" -CeladonCity_Gym_Text_ExplainTM19:: @ 81973D7 +CeladonCity_Gym_Text_ExplainTM19:: .string "TM19 contains GIGA DRAIN.\p" .string "Half the damage it inflicts is\n" .string "drained to heal your POKéMON.\p" .string "Wouldn't you agree that it's a\n" .string "wonderful move?$" -CeladonCity_Gym_Text_ShouldMakeRoomForThis:: @ 819745D +CeladonCity_Gym_Text_ShouldMakeRoomForThis:: .string "You should make room for this.$" -CeladonCity_Gym_Text_KayIntro:: @ 819747C +CeladonCity_Gym_Text_KayIntro:: .string "I should tell you about this GYM.\p" .string "Only real ladies are allowed in\n" .string "here!$" -CeladonCity_Gym_Text_KayDefeat:: @ 81974C4 +CeladonCity_Gym_Text_KayDefeat:: .string "You're too rough!$" -CeladonCity_Gym_Text_KayPostBattle:: @ 81974D6 +CeladonCity_Gym_Text_KayPostBattle:: .string "Bleaah!\n" .string "I hope ERIKA wipes you out!$" -CeladonCity_Gym_Text_BridgetIntro:: @ 81974FA +CeladonCity_Gym_Text_BridgetIntro:: .string "Oh, welcome.\n" .string "I was getting bored.$" -CeladonCity_Gym_Text_BridgetDefeat:: @ 819751C +CeladonCity_Gym_Text_BridgetDefeat:: .string "My makeup!$" -CeladonCity_Gym_Text_BridgetPostBattle:: @ 8197527 +CeladonCity_Gym_Text_BridgetPostBattle:: .string "GRASS-type POKéMON are tough\n" .string "against the WATER type.\p" .string "They also have an edge on ROCK-\n" .string "and GROUND-type POKéMON.$" -CeladonCity_Gym_Text_TinaIntro:: @ 8197595 +CeladonCity_Gym_Text_TinaIntro:: .string "…Weren't you peeking in here\n" .string "earlier?$" -CeladonCity_Gym_Text_TinaDefeat:: @ 81975BB +CeladonCity_Gym_Text_TinaDefeat:: .string "You're an eye-opener!$" -CeladonCity_Gym_Text_TinaPostBattle:: @ 81975D1 +CeladonCity_Gym_Text_TinaPostBattle:: .string "Oh, you were looking at ERIKA…\n" .string "You weren't looking at me…$" -CeladonCity_Gym_Text_TamiaIntro:: @ 819760B +CeladonCity_Gym_Text_TamiaIntro:: .string "Look, look!\n" .string "See my POKéMON!\p" .string "I like the GRASS type.\n" .string "I like how they're easy to raise.$" -CeladonCity_Gym_Text_TamiaDefeat:: @ 8197660 +CeladonCity_Gym_Text_TamiaDefeat:: .string "No!$" -CeladonCity_Gym_Text_TamiaPostBattle:: @ 8197664 +CeladonCity_Gym_Text_TamiaPostBattle:: .string "We only use GRASS-type POKéMON at\n" .string "our GYM.\p" .string "Why? We also use them for making\n" .string "flower arrangements!$" -CeladonCity_Gym_Text_LisaIntro:: @ 81976C5 +CeladonCity_Gym_Text_LisaIntro:: .string "Oh, hey!\p" .string "We don't like BUG- or FIRE-type\n" .string "POKéMON in here!$" -CeladonCity_Gym_Text_LisaDefeat:: @ 81976FF +CeladonCity_Gym_Text_LisaDefeat:: .string "Oh!\n" .string "You!$" -CeladonCity_Gym_Text_LisaPostBattle:: @ 8197708 +CeladonCity_Gym_Text_LisaPostBattle:: .string "Our LEADER ERIKA might be quiet,\n" .string "but she's famous around here.$" -CeladonCity_Gym_Text_LoriIntro:: @ 8197747 +CeladonCity_Gym_Text_LoriIntro:: .string "Pleased to meet you.\n" .string "My hobby is POKéMON training.$" -CeladonCity_Gym_Text_LoriDefeat:: @ 819777A +CeladonCity_Gym_Text_LoriDefeat:: .string "Oh!\n" .string "Splendid!$" -CeladonCity_Gym_Text_LoriPostBattle:: @ 8197788 +CeladonCity_Gym_Text_LoriPostBattle:: .string "I have a blind date coming up.\n" .string "I have to learn to be polite,\l" .string "especially if I have to battle.$" -CeladonCity_Gym_Text_MaryIntro:: @ 81977E5 +CeladonCity_Gym_Text_MaryIntro:: .string "Welcome to CELADON GYM!\p" .string "You'd better not underestimate\n" .string "the nice ladies here.$" -CeladonCity_Gym_Text_MaryDefeat:: @ 8197832 +CeladonCity_Gym_Text_MaryDefeat:: .string "Oh!\n" .string "Beaten!$" -CeladonCity_Gym_Text_MaryPostBattle:: @ 819783E +CeladonCity_Gym_Text_MaryPostBattle:: .string "I didn't bring my best POKéMON.\n" .string "Wait until next time!$" -CeladonCity_Gym_Text_GymStatue:: @ 8197874 +CeladonCity_Gym_Text_GymStatue:: .string "CELADON POKéMON GYM\n" .string "LEADER: ERIKA\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -CeladonCity_Gym_Text_GymStatuePlayerWon:: @ 81978AB +CeladonCity_Gym_Text_GymStatuePlayerWon:: .string "CELADON POKéMON GYM\n" .string "LEADER: ERIKA\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc index be366a705..a8015deae 100644 --- a/data/maps/CeladonCity_Hotel/scripts.inc +++ b/data/maps/CeladonCity_Hotel/scripts.inc @@ -1,18 +1,18 @@ -CeladonCity_Hotel_MapScripts:: @ 816D283 +CeladonCity_Hotel_MapScripts:: .byte 0 -CeladonCity_Hotel_EventScript_Receptionist:: @ 816D284 +CeladonCity_Hotel_EventScript_Receptionist:: msgbox CeladonCity_Hotel_Text_ThisHotelIsForPeople, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_Beauty:: @ 816D28D +CeladonCity_Hotel_EventScript_Beauty:: msgbox CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_BeautyBoyfriend:: @ 816D296 +CeladonCity_Hotel_EventScript_BeautyBoyfriend:: msgbox CeladonCity_Hotel_Text_WhyDidSheBringBrother, MSGBOX_NPC end -CeladonCity_Hotel_EventScript_BeautyBrother:: @ 816D29F +CeladonCity_Hotel_EventScript_BeautyBrother:: msgbox CeladonCity_Hotel_Text_SisBroughtMeOnVacation, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_Hotel/text.inc b/data/maps/CeladonCity_Hotel/text.inc index 5ac6ac99c..ecbe4968f 100644 --- a/data/maps/CeladonCity_Hotel/text.inc +++ b/data/maps/CeladonCity_Hotel/text.inc @@ -1,18 +1,18 @@ -CeladonCity_Hotel_Text_ThisHotelIsForPeople:: @ 8197B77 +CeladonCity_Hotel_Text_ThisHotelIsForPeople:: .string "POKéMON?\n" .string "No, this is a hotel for people.\p" .string "We're full up, unfortunately.$" -CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend:: @ 8197BBE +CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend:: .string "I'm on vacation with my brother and\n" .string "boyfriend.\p" .string "CELADON is such a pretty city!$" -CeladonCity_Hotel_Text_WhyDidSheBringBrother:: @ 8197C0C +CeladonCity_Hotel_Text_WhyDidSheBringBrother:: .string "Why?\n" .string "Why did she bring her brother?$" -CeladonCity_Hotel_Text_SisBroughtMeOnVacation:: @ 8197C30 +CeladonCity_Hotel_Text_SisBroughtMeOnVacation:: .string "Yippee! I'm on vacation!\n" .string "My sis brought me along! Awesome!$" diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc index 4a05ae97d..a72a10cee 100644 --- a/data/maps/CeladonCity_House1/scripts.inc +++ b/data/maps/CeladonCity_House1/scripts.inc @@ -1,14 +1,14 @@ -CeladonCity_House1_MapScripts:: @ 816D267 +CeladonCity_House1_MapScripts:: .byte 0 -CeladonCity_House1_EventScript_RocketChief:: @ 816D268 +CeladonCity_House1_EventScript_RocketChief:: msgbox CeladonCity_House1_Text_SlotsReelInTheDough, MSGBOX_NPC end -CeladonCity_House1_EventScript_Rocket1:: @ 816D271 +CeladonCity_House1_EventScript_Rocket1:: msgbox CeladonCity_House1_Text_ShippedMonsAsSlotPrizes, MSGBOX_NPC end -CeladonCity_House1_EventScript_Rocket2:: @ 816D27A +CeladonCity_House1_EventScript_Rocket2:: msgbox CeladonCity_House1_Text_DontTouchGameCornerPoster, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_House1/text.inc b/data/maps/CeladonCity_House1/text.inc index d07d4a0e4..ac9af2b5b 100644 --- a/data/maps/CeladonCity_House1/text.inc +++ b/data/maps/CeladonCity_House1/text.inc @@ -1,20 +1,20 @@ -CeladonCity_House1_Text_SlotsReelInTheDough:: @ 8197A9F +CeladonCity_House1_Text_SlotsReelInTheDough:: .string "Hehehe!\p" .string "The slots just reel in the dough,\n" .string "big-time!$" -CeladonCity_House1_Text_ShippedMonsAsSlotPrizes:: @ 8197AD3 +CeladonCity_House1_Text_ShippedMonsAsSlotPrizes:: .string "CHIEF!\p" .string "We just shipped two thousand\n" .string "more POKéMON as slot prizes\l" .string "again today!$" -CeladonCity_House1_Text_DontTouchGameCornerPoster:: @ 8197B20 +CeladonCity_House1_Text_DontTouchGameCornerPoster:: .string "Don't touch the poster at the GAME\n" .string "CORNER!\p" .string "There's no secret switch behind it!$" @ Text for the replaced altars in the rocket chiefs house / celadon mansion @ In English RB, this is westernized as "It's a sculpture of DIGLETT.", and is removed altogether in FRLG -Text_ItsABuddhistAltar:: @ 8197B6F +Text_ItsABuddhistAltar:: .string "ぶつだん　だ‥$" diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc index b98b49824..cebda4e35 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ -CeladonCity_PokemonCenter_1F_MapScripts:: @ 816C5EC +CeladonCity_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, CeladonCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7 +CeladonCity_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_CELADON_CITY end -CeladonCity_PokemonCenter_1F_EventScript_Nurse:: @ 816C5FB +CeladonCity_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -CeladonCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816C604 +CeladonCity_PokemonCenter_1F_EventScript_Gentleman:: msgbox CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons, MSGBOX_NPC end -CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816C60D +CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF:: msgbox CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia, MSGBOX_NPC end -CeladonCity_PokemonCenter_1F_EventScript_Youngster:: @ 816C616 +CeladonCity_PokemonCenter_1F_EventScript_Youngster:: msgbox CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_PokemonCenter_1F/text.inc b/data/maps/CeladonCity_PokemonCenter_1F/text.inc index 6aa628f39..0f37b1431 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/text.inc +++ b/data/maps/CeladonCity_PokemonCenter_1F/text.inc @@ -1,15 +1,15 @@ -CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons:: @ 819685B +CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons:: .string "A POKé FLUTE awakens sleeping\n" .string "POKéMON. You know that.\p" .string "It does so with a sound that only\n" .string "they can hear.$" -CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia:: @ 81968C2 +CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia:: .string "I rode here from FUCHSIA.\p" .string "It's an uphill ride on CYCLING\n" .string "ROAD, so I'm exhausted.$" -CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike:: @ 8196913 +CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike:: .string "If I had a BIKE, I would go to\n" .string "CYCLING ROAD!$" diff --git a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc index 19975f531..531f8ac3e 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeladonCity_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F +CeladonCity_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ CeladonCity_PokemonCenter_2F_MapScripts:: @ 816C61F .byte 0 @ The below 3 are unused and leftover from RS -CeladonCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816C634 +CeladonCity_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -CeladonCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816C63A +CeladonCity_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -CeladonCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816C640 +CeladonCity_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc index 9613406e4..65a625c7c 100644 --- a/data/maps/CeladonCity_Restaurant/scripts.inc +++ b/data/maps/CeladonCity_Restaurant/scripts.inc @@ -1,15 +1,15 @@ -CeladonCity_Restaurant_MapScripts:: @ 816D1EA +CeladonCity_Restaurant_MapScripts:: .byte 0 -CeladonCity_Restaurant_EventScript_Chef:: @ 816D1EB +CeladonCity_Restaurant_EventScript_Chef:: msgbox CeladonCity_Restaurant_Text_TakingBreakRightNow, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_Woman:: @ 816D1F4 +CeladonCity_Restaurant_EventScript_Woman:: msgbox CeladonCity_Restaurant_Text_OftenGoToDrugstore, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_CoinCaseMan:: @ 816D1FD +CeladonCity_Restaurant_EventScript_CoinCaseMan:: lock faceplayer goto_if_set FLAG_GOT_COIN_CASE, CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase @@ -22,20 +22,20 @@ CeladonCity_Restaurant_EventScript_CoinCaseMan:: @ 816D1FD release end -CeladonCity_Restaurant_EventScript_NoRoomForCoinCase:: @ 816D241 +CeladonCity_Restaurant_EventScript_NoRoomForCoinCase:: msgbox CeladonCity_Restaurant_Text_MakeRoomForThis release end -CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase:: @ 816D24B +CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase:: msgbox CeladonCity_Restaurant_Text_ThoughtIdWinItBack release end -CeladonCity_Restaurant_EventScript_WorkerM:: @ 816D255 +CeladonCity_Restaurant_EventScript_WorkerM:: msgbox CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner, MSGBOX_NPC end -CeladonCity_Restaurant_EventScript_FatMan:: @ 816D25E +CeladonCity_Restaurant_EventScript_FatMan:: msgbox CeladonCity_Restaurant_Text_ManLostItAllAtSlots, MSGBOX_NPC end diff --git a/data/maps/CeladonCity_Restaurant/text.inc b/data/maps/CeladonCity_Restaurant/text.inc index e6c27c2bd..2941ff0cc 100644 --- a/data/maps/CeladonCity_Restaurant/text.inc +++ b/data/maps/CeladonCity_Restaurant/text.inc @@ -1,22 +1,22 @@ -CeladonCity_Restaurant_Text_TakingBreakRightNow:: @ 81978E6 +CeladonCity_Restaurant_Text_TakingBreakRightNow:: .string "Hi!\p" .string "Sorry, but we're taking a break\n" .string "right now.$" -CeladonCity_Restaurant_Text_OftenGoToDrugstore:: @ 8197915 +CeladonCity_Restaurant_Text_OftenGoToDrugstore:: .string "My POKéMON are weak, so I often\n" .string "have to go to the DRUGSTORE.$" -CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner:: @ 8197952 +CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner:: .string "Psst! There's a basement under the\n" .string "GAME CORNER, I hear.$" -CeladonCity_Restaurant_Text_ManLostItAllAtSlots:: @ 819798A +CeladonCity_Restaurant_Text_ManLostItAllAtSlots:: .string "Munch…\p" .string "The man at that table lost it all\n" .string "at the slots.$" -CeladonCity_Restaurant_Text_TakeThisImBusted:: @ 81979C1 +CeladonCity_Restaurant_Text_TakeThisImBusted:: .string "Go ahead! Laugh!\n" .string "I'm flat-out busted!\p" .string "No more slots for me!\n" @@ -24,14 +24,14 @@ CeladonCity_Restaurant_Text_TakeThisImBusted:: @ 81979C1 .string "Here!\n" .string "I won't be needing this anymore!$" -CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan:: @ 8197A38 +CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan:: .string "{PLAYER} received a COIN CASE\n" .string "from the man.$" -CeladonCity_Restaurant_Text_MakeRoomForThis:: @ 8197A5E +CeladonCity_Restaurant_Text_MakeRoomForThis:: .string "Make room for this!$" -CeladonCity_Restaurant_Text_ThoughtIdWinItBack:: @ 8197A72 +CeladonCity_Restaurant_Text_ThoughtIdWinItBack:: .string "I always thought I was going to\n" .string "win it back…$" diff --git a/data/maps/CeruleanCave_1F/scripts.inc b/data/maps/CeruleanCave_1F/scripts.inc index 2113716e2..f3de0a8ff 100644 --- a/data/maps/CeruleanCave_1F/scripts.inc +++ b/data/maps/CeruleanCave_1F/scripts.inc @@ -1,7 +1,7 @@ -CeruleanCave_1F_MapScripts:: @ 81624B3 +CeruleanCave_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCave_1F_OnTransition .byte 0 -CeruleanCave_1F_OnTransition:: @ 81624B9 +CeruleanCave_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_CERULEAN_CAVE_1F end diff --git a/data/maps/CeruleanCave_2F/scripts.inc b/data/maps/CeruleanCave_2F/scripts.inc index d80aaeca5..e83448190 100644 --- a/data/maps/CeruleanCave_2F/scripts.inc +++ b/data/maps/CeruleanCave_2F/scripts.inc @@ -1,2 +1,2 @@ -CeruleanCave_2F_MapScripts:: @ 81624BD +CeruleanCave_2F_MapScripts:: .byte 0 diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 5dd7aabf0..29ec277e8 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -1,28 +1,28 @@ -CeruleanCave_B1F_MapScripts:: @ 81624BE +CeruleanCave_B1F_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, CeruleanCave_B1F_OnResume map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCave_B1F_OnTransition .byte 0 -CeruleanCave_B1F_OnResume:: @ 81624C9 +CeruleanCave_B1F_OnResume:: call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, CeruleanCave_B1F_EventScript_TryRemoveMewtwo end -CeruleanCave_B1F_EventScript_TryRemoveMewtwo:: @ 81624D3 +CeruleanCave_B1F_EventScript_TryRemoveMewtwo:: specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return -CeruleanCave_B1F_OnTransition:: @ 81624E7 +CeruleanCave_B1F_OnTransition:: call_if_unset FLAG_FOUGHT_MEWTWO, CeruleanCave_B1F_EventScript_ShowMewtwo end -CeruleanCave_B1F_EventScript_ShowMewtwo:: @ 81624F1 +CeruleanCave_B1F_EventScript_ShowMewtwo:: clearflag FLAG_HIDE_MEWTWO return -CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5 +CeruleanCave_B1F_EventScript_Mewtwo:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -51,12 +51,12 @@ CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5 release end -CeruleanCave_B1F_EventScript_DefeatedMewtwo:: @ 8162558 +CeruleanCave_B1F_EventScript_DefeatedMewtwo:: setflag FLAG_FOUGHT_MEWTWO goto EventScript_RemoveStaticMon end -CeruleanCave_B1F_EventScript_RanFromMewtwo:: @ 8162561 +CeruleanCave_B1F_EventScript_RanFromMewtwo:: setvar VAR_0x8004, SPECIES_MEWTWO goto EventScript_MonFlewAway end diff --git a/data/maps/CeruleanCave_B1F/text.inc b/data/maps/CeruleanCave_B1F/text.inc index a743238cb..518c83b95 100644 --- a/data/maps/CeruleanCave_B1F/text.inc +++ b/data/maps/CeruleanCave_B1F/text.inc @@ -1,3 +1,3 @@ -CeruleanCave_B1F_Text_Mew:: @ 8177F9F +CeruleanCave_B1F_Text_Mew:: .string "Mew!$" diff --git a/data/maps/CeruleanCity/scripts.inc b/data/maps/CeruleanCity/scripts.inc index a40786e45..110a2de4c 100644 --- a/data/maps/CeruleanCity/scripts.inc +++ b/data/maps/CeruleanCity/scripts.inc @@ -5,42 +5,42 @@ .set LOCALID_RIVAL, 8 .set LOCALID_WOMAN, 11 -CeruleanCity_MapScripts:: @ 8166471 +CeruleanCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_OnTransition .byte 0 -CeruleanCity_OnTransition:: @ 8166477 +CeruleanCity_OnTransition:: setworldmapflag FLAG_WORLD_MAP_CERULEAN_CITY call_if_unset FLAG_GOT_SS_TICKET, CeruleanCity_EventScript_BlockExits end -CeruleanCity_EventScript_BlockExits:: @ 8166484 +CeruleanCity_EventScript_BlockExits:: setobjectxyperm LOCALID_POLICEMAN, 30, 12 setobjectxyperm LOCALID_SLOWBRO, 26, 31 setobjectxyperm LOCALID_LASS, 27, 31 return -CeruleanCity_EventScript_RivalTriggerLeft:: @ 816649A +CeruleanCity_EventScript_RivalTriggerLeft:: lockall setvar VAR_TEMP_1, 0 goto CeruleanCity_EventScript_Rival end -CeruleanCity_EventScript_RivalTriggerMid:: @ 81664A6 +CeruleanCity_EventScript_RivalTriggerMid:: lockall setvar VAR_TEMP_1, 1 setobjectxyperm LOCALID_RIVAL, 23, 0 goto CeruleanCity_EventScript_Rival end -CeruleanCity_EventScript_RivalTriggerRight:: @ 81664B9 +CeruleanCity_EventScript_RivalTriggerRight:: lockall setvar VAR_TEMP_1, 2 setobjectxyperm LOCALID_RIVAL, 24, 0 goto CeruleanCity_EventScript_Rival end -CeruleanCity_EventScript_Rival:: @ 81664CC +CeruleanCity_EventScript_Rival:: textcolor 0 setvar VAR_MAP_SCENE_ROUTE22, 2 playbgm MUS_ENCOUNTER_RIVAL, 0 @@ -78,31 +78,31 @@ CeruleanCity_EventScript_Rival:: @ 81664CC releaseall end -CeruleanCity_EventScript_RivalSquirtle:: @ 8166582 +CeruleanCity_EventScript_RivalSquirtle:: trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_SQUIRTLE, CeruleanCity_Text_RivalDefeat return -CeruleanCity_EventScript_RivalBulbasaur:: @ 816658D +CeruleanCity_EventScript_RivalBulbasaur:: trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_BULBASAUR, CeruleanCity_Text_RivalDefeat return -CeruleanCity_EventScript_RivalCharmander:: @ 8166598 +CeruleanCity_EventScript_RivalCharmander:: trainerbattle_no_intro TRAINER_RIVAL_CERULEAN_CHARMANDER, CeruleanCity_Text_RivalDefeat return -CeruleanCity_EventScript_RivalStartExit:: @ 81665A3 +CeruleanCity_EventScript_RivalStartExit:: applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExit applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExit waitmovement 0 return -CeruleanCity_EventScript_RivalStartExitRight:: @ 81665B5 +CeruleanCity_EventScript_RivalStartExitRight:: applymovement OBJ_EVENT_ID_PLAYER, CeruleanCity_Movement_PlayerWatchRivalExitRight applymovement LOCALID_RIVAL, CeruleanCity_Movement_RivalStartExitRight waitmovement 0 return -CeruleanCity_Movement_PlayerWatchRivalExit:: @ 81665C7 +CeruleanCity_Movement_PlayerWatchRivalExit:: delay_16 delay_8 walk_in_place_fastest_right @@ -110,7 +110,7 @@ CeruleanCity_Movement_PlayerWatchRivalExit:: @ 81665C7 walk_in_place_fastest_down step_end -CeruleanCity_Movement_PlayerWatchRivalExitRight:: @ 81665CD +CeruleanCity_Movement_PlayerWatchRivalExitRight:: delay_16 delay_8 walk_in_place_fastest_left @@ -118,7 +118,7 @@ CeruleanCity_Movement_PlayerWatchRivalExitRight:: @ 81665CD walk_in_place_fastest_down step_end -CeruleanCity_Movement_RivalEnter:: @ 81665D3 +CeruleanCity_Movement_RivalEnter:: walk_down walk_down walk_down @@ -126,7 +126,7 @@ CeruleanCity_Movement_RivalEnter:: @ 81665D3 walk_down step_end -CeruleanCity_Movement_RivalStartExit:: @ 81665D9 +CeruleanCity_Movement_RivalStartExit:: walk_right walk_down walk_down @@ -145,7 +145,7 @@ CeruleanCity_Movement_RivalStartExit:: @ 81665D9 walk_up step_end -CeruleanCity_Movement_RivalStartExitRight:: @ 81665EA +CeruleanCity_Movement_RivalStartExitRight:: walk_left walk_down walk_down @@ -164,7 +164,7 @@ CeruleanCity_Movement_RivalStartExitRight:: @ 81665EA walk_up step_end -CeruleanCity_Movement_RivalExit:: @ 81665FB +CeruleanCity_Movement_RivalExit:: walk_down walk_down walk_down @@ -174,7 +174,7 @@ CeruleanCity_Movement_RivalExit:: @ 81665FB walk_down step_end -CeruleanCity_EventScript_Grunt:: @ 8166603 +CeruleanCity_EventScript_Grunt:: lock faceplayer goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_5, CeruleanCity_EventScript_GruntDefeated @@ -187,7 +187,7 @@ CeruleanCity_EventScript_Grunt:: @ 8166603 goto CeruleanCity_EventScript_GruntDefeated end -CeruleanCity_EventScript_GruntDefeated:: @ 816662E +CeruleanCity_EventScript_GruntDefeated:: msgbox CeruleanCity_Text_OkayIllReturnStolenTM checkitemspace ITEM_TM28, 1 compare VAR_RESULT, FALSE @@ -202,13 +202,13 @@ CeruleanCity_EventScript_GruntDefeated:: @ 816662E release end -CeruleanCity_EventScript_NoRoomForTM28:: @ 8166677 +CeruleanCity_EventScript_NoRoomForTM28:: textcolor 0 msgbox CeruleanCity_Text_MakeRoomForThisCantRun release end -CeruleanCity_EventScript_GruntTriggerTop:: @ 8166683 +CeruleanCity_EventScript_GruntTriggerTop:: lockall setvar VAR_TEMP_1, 0 applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestUp @@ -218,7 +218,7 @@ CeruleanCity_EventScript_GruntTriggerTop:: @ 8166683 goto CeruleanCity_EventScript_GruntTrigger end -CeruleanCity_EventScript_GruntTriggerBottom:: @ 81666A3 +CeruleanCity_EventScript_GruntTriggerBottom:: lockall setvar VAR_TEMP_1, 1 applymovement LOCALID_GRUNT, Movement_WalkInPlaceFastestDown @@ -228,7 +228,7 @@ CeruleanCity_EventScript_GruntTriggerBottom:: @ 81666A3 goto CeruleanCity_EventScript_GruntTrigger end -CeruleanCity_EventScript_GruntTrigger:: @ 81666C3 +CeruleanCity_EventScript_GruntTrigger:: textcolor 0 msgbox CeruleanCity_Text_GruntIntro setvar VAR_LAST_TALKED, LOCALID_GRUNT @@ -237,7 +237,7 @@ CeruleanCity_EventScript_GruntTrigger:: @ 81666C3 goto CeruleanCity_EventScript_GruntDefeated end -CeruleanCity_EventScript_Policeman:: @ 81666E7 +CeruleanCity_EventScript_Policeman:: lock faceplayer msgbox CeruleanCity_Text_PeopleHereWereRobbed @@ -247,7 +247,7 @@ CeruleanCity_EventScript_Policeman:: @ 81666E7 release end -CeruleanCity_EventScript_LittleBoy:: @ 81666FE +CeruleanCity_EventScript_LittleBoy:: lock faceplayer goto_if_set FLAG_GOT_SS_TICKET, CeruleanCity_EventScript_LittleBoySlowbroMoved @@ -255,24 +255,24 @@ CeruleanCity_EventScript_LittleBoy:: @ 81666FE release end -CeruleanCity_EventScript_LittleBoySlowbroMoved:: @ 8166713 +CeruleanCity_EventScript_LittleBoySlowbroMoved:: msgbox CeruleanCity_Text_YouCanCutDownSmallTrees release end -CeruleanCity_EventScript_BaldingMan:: @ 816671D +CeruleanCity_EventScript_BaldingMan:: msgbox CeruleanCity_Text_PokemonEncyclopediaAmusing, MSGBOX_NPC end -CeruleanCity_EventScript_Youngster:: @ 8166726 +CeruleanCity_EventScript_Youngster:: msgbox CeruleanCity_Text_TrainerLifeIsToughIsntIt, MSGBOX_NPC end -CeruleanCity_EventScript_CeruleanCaveGuard:: @ 816672F +CeruleanCity_EventScript_CeruleanCaveGuard:: msgbox CeruleanCity_Text_ThisIsCeruleanCave, MSGBOX_NPC end -CeruleanCity_EventScript_Woman:: @ 8166738 +CeruleanCity_EventScript_Woman:: lock faceplayer msgbox CeruleanCity_Text_WantBrightRedBicycle @@ -282,7 +282,7 @@ CeruleanCity_EventScript_Woman:: @ 8166738 release end -CeruleanCity_EventScript_Lass:: @ 816674F +CeruleanCity_EventScript_Lass:: lock random 3 copyvar VAR_0x8008, VAR_RESULT @@ -307,31 +307,31 @@ CeruleanCity_EventScript_Lass:: @ 816674F release end -CeruleanCity_EventScript_SlowbroCommand1:: @ 81667B0 +CeruleanCity_EventScript_SlowbroCommand1:: message CeruleanCity_Text_SlowbroUseSonicboom return -CeruleanCity_EventScript_SlowbroCommand2:: @ 81667B6 +CeruleanCity_EventScript_SlowbroCommand2:: message CeruleanCity_Text_SlowbroPunch return -CeruleanCity_EventScript_SlowbroCommand3:: @ 81667BC +CeruleanCity_EventScript_SlowbroCommand3:: message CeruleanCity_Text_SlowbroWithdraw return -CeruleanCity_EventScript_SlowbroFailed1:: @ 81667C2 +CeruleanCity_EventScript_SlowbroFailed1:: msgbox CeruleanCity_Text_SlowbroPayAttention return -CeruleanCity_EventScript_SlowbroFailed2:: @ 81667CB +CeruleanCity_EventScript_SlowbroFailed2:: msgbox CeruleanCity_Text_NoYouBlewItAgain return -CeruleanCity_EventScript_SlowbroFailed3:: @ 81667D4 +CeruleanCity_EventScript_SlowbroFailed3:: msgbox CeruleanCity_Text_HardToControlMonsObedience return -CeruleanCity_EventScript_Slowbro:: @ 81667DD +CeruleanCity_EventScript_Slowbro:: lock random 4 copyvar VAR_0x8008, VAR_RESULT @@ -346,35 +346,35 @@ CeruleanCity_EventScript_Slowbro:: @ 81667DD release end -CeruleanCity_EventScript_SlowbroText1:: @ 8166814 +CeruleanCity_EventScript_SlowbroText1:: msgbox CeruleanCity_Text_SlowbroTookSnooze return -CeruleanCity_EventScript_SlowbroText2:: @ 816681D +CeruleanCity_EventScript_SlowbroText2:: msgbox CeruleanCity_Text_SlowbroLoafingAround return -CeruleanCity_EventScript_SlowbroText3:: @ 8166826 +CeruleanCity_EventScript_SlowbroText3:: msgbox CeruleanCity_Text_SlowbroTurnedAway return -CeruleanCity_EventScript_SlowbroText4:: @ 816682F +CeruleanCity_EventScript_SlowbroText4:: msgbox CeruleanCity_Text_SlowbroIgnoredOrders return -CeruleanCity_EventScript_CitySign:: @ 8166838 +CeruleanCity_EventScript_CitySign:: msgbox CeruleanCity_Text_CitySign, MSGBOX_SIGN end -CeruleanCity_EventScript_TrainerTips:: @ 8166841 +CeruleanCity_EventScript_TrainerTips:: msgbox CeruleanCity_Text_TrainerTipsHeldItems, MSGBOX_SIGN end -CeruleanCity_EventScript_BikeShopSign:: @ 816684A +CeruleanCity_EventScript_BikeShopSign:: msgbox CeruleanCity_Text_BikeShopSign, MSGBOX_SIGN end -CeruleanCity_EventScript_GymSign:: @ 8166853 +CeruleanCity_EventScript_GymSign:: lockall famechecker FAMECHECKER_MISTY, 0 msgbox CeruleanCity_Text_GymSign diff --git a/data/maps/CeruleanCity/text.inc b/data/maps/CeruleanCity/text.inc index 0ae618008..e7540e78d 100644 --- a/data/maps/CeruleanCity/text.inc +++ b/data/maps/CeruleanCity/text.inc @@ -1,4 +1,4 @@ -CeruleanCity_Text_RivalIntro:: @ 817EAD7 +CeruleanCity_Text_RivalIntro:: .string "{RIVAL}: Yo! {PLAYER}!\p" .string "You're still struggling along back\n" .string "here?\p" @@ -7,12 +7,12 @@ CeruleanCity_Text_RivalIntro:: @ 817EAD7 .string "Here, let me see what you caught,\n" .string "{PLAYER}!$" -CeruleanCity_Text_RivalDefeat:: @ 817EB71 +CeruleanCity_Text_RivalDefeat:: .string "Hey!\n" .string "Take it easy!\l" .string "You won already!$" -CeruleanCity_Text_RivalPostBattle:: @ 817EB95 +CeruleanCity_Text_RivalPostBattle:: .string "{RIVAL}: Hey, guess what?\p" .string "I went to BILL's and got him to\n" .string "show me his rare POKéMON.\p" @@ -27,14 +27,14 @@ CeruleanCity_Text_RivalPostBattle:: @ 817EB95 .string "Well, I better get rolling!\n" .string "Smell ya later!$" -CeruleanCity_Text_OhRightLittlePresentAsFavor:: @ 817ECD4 +CeruleanCity_Text_OhRightLittlePresentAsFavor:: .string "Oh, yeah, right.\p" .string "I feel sorry for you. No, really.\n" .string "You're always plodding behind me.\p" .string "So here, I'll give you a little\n" .string "present as a favor.$" -CeruleanCity_Text_ExplainFameCheckerSmellYa:: @ 817ED5D +CeruleanCity_Text_ExplainFameCheckerSmellYa:: .string "A chatty gossip like you…\n" .string "That thing's perfect.\p" .string "I don't need it because I don't\n" @@ -43,11 +43,11 @@ CeruleanCity_Text_ExplainFameCheckerSmellYa:: @ 817ED5D .string "gone. Smell ya!$" @ RB translation: "Heh! You're no match for my genius!" -CeruleanCity_Text_RivalVictory:: @ 817EDF8 +CeruleanCity_Text_RivalVictory:: .string "なんたって！\n" .string "おれは　てんさい　だからよ！$" -CeruleanCity_Text_GruntIntro:: @ 817EE0E +CeruleanCity_Text_GruntIntro:: .string "Hey! Stay out!\n" .string "It's not your yard!\p" .string "…Huh?\n" @@ -55,32 +55,32 @@ CeruleanCity_Text_GruntIntro:: @ 817EE0E .string "I'm an innocent bystander!\n" .string "Don't you believe me?{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$" -CeruleanCity_Text_GruntDefeat:: @ 817EE70 +CeruleanCity_Text_GruntDefeat:: .string "GRUNT: Stop! I give up!\n" .string "I'll leave quietly!$" -CeruleanCity_Text_OkayIllReturnStolenTM:: @ 817EE9C +CeruleanCity_Text_OkayIllReturnStolenTM:: .string "…Okay.\n" .string "I'll return the TM I stole.$" -CeruleanCity_Text_RecoveredTM28FromGrunt:: @ 817EEBF +CeruleanCity_Text_RecoveredTM28FromGrunt:: .string "{PLAYER} recovered TM28 from\n" .string "the TEAM ROCKET GRUNT.$" -CeruleanCity_Text_BetterGetMovingBye:: @ 817EEED +CeruleanCity_Text_BetterGetMovingBye:: .string "I better get moving!\n" .string "Bye!$" -CeruleanCity_Text_MakeRoomForThisCantRun:: @ 817EF07 +CeruleanCity_Text_MakeRoomForThisCantRun:: .string "Make room for this!\n" .string "I can't run until I give it to you!$" -CeruleanCity_Text_TrainerLifeIsToughIsntIt:: @ 817EF3F +CeruleanCity_Text_TrainerLifeIsToughIsntIt:: .string "You're a TRAINER, too?\p" .string "Collecting, battling…\n" .string "It's a tough life, isn't it?$" -CeruleanCity_Text_YouCanCutDownSmallTrees:: @ 817EF89 +CeruleanCity_Text_YouCanCutDownSmallTrees:: .string "Did you know that you can CUT down\n" .string "small trees?\p" .string "Even that small tree in front of\n" @@ -88,7 +88,7 @@ CeruleanCity_Text_YouCanCutDownSmallTrees:: @ 817EF89 .string "I think there's a way around it,\n" .string "though.$" -CeruleanCity_Text_IfSlowbroWasntThereCouldCutTree:: @ 817F01D +CeruleanCity_Text_IfSlowbroWasntThereCouldCutTree:: .string "If that SLOWBRO wasn't there, you\n" .string "could CUT down the small tree.\p" .string "That way, you could get to the\n" @@ -96,58 +96,58 @@ CeruleanCity_Text_IfSlowbroWasntThereCouldCutTree:: @ 817F01D .string "I think there's a way around it,\n" .string "though.$" -CeruleanCity_Text_PokemonEncyclopediaAmusing:: @ 817F0B2 +CeruleanCity_Text_PokemonEncyclopediaAmusing:: .string "You're making an encyclopedia on\n" .string "POKéMON? That sounds amusing.$" -CeruleanCity_Text_PeopleHereWereRobbed:: @ 817F0F1 +CeruleanCity_Text_PeopleHereWereRobbed:: .string "The people here were robbed.\p" .string "It's obvious that TEAM ROCKET is\n" .string "behind this most heinous crime!\p" .string "Even our POLICE FORCE has\n" .string "trouble with the ROCKETS!$" -CeruleanCity_Text_SlowbroUseSonicboom:: @ 817F183 +CeruleanCity_Text_SlowbroUseSonicboom:: .string "Okay! SLOWBRO!\n" .string "Use SONICBOOM!$" -CeruleanCity_Text_SlowbroPayAttention:: @ 817F1A1 +CeruleanCity_Text_SlowbroPayAttention:: .string "Come on, SLOWBRO, pay attention!$" -CeruleanCity_Text_SlowbroPunch:: @ 817F1C2 +CeruleanCity_Text_SlowbroPunch:: .string "SLOWBRO, punch!$" -CeruleanCity_Text_NoYouBlewItAgain:: @ 817F1D2 +CeruleanCity_Text_NoYouBlewItAgain:: .string "No!\n" .string "You blew it again!$" -CeruleanCity_Text_SlowbroWithdraw:: @ 817F1E9 +CeruleanCity_Text_SlowbroWithdraw:: .string "SLOWBRO, WITHDRAW!$" -CeruleanCity_Text_HardToControlMonsObedience:: @ 817F1FC +CeruleanCity_Text_HardToControlMonsObedience:: .string "No! That's wrong!\n" .string "It's so hard to control POKéMON!\p" .string "Your POKéMON's obedience depends\n" .string "on your abilities as a TRAINER.$" -CeruleanCity_Text_SlowbroTookSnooze:: @ 817F270 +CeruleanCity_Text_SlowbroTookSnooze:: .string "SLOWBRO took a snooze…$" -CeruleanCity_Text_SlowbroLoafingAround:: @ 817F287 +CeruleanCity_Text_SlowbroLoafingAround:: .string "SLOWBRO is loafing around…$" -CeruleanCity_Text_SlowbroTurnedAway:: @ 817F2A2 +CeruleanCity_Text_SlowbroTurnedAway:: .string "SLOWBRO turned away…$" -CeruleanCity_Text_SlowbroIgnoredOrders:: @ 817F2B7 +CeruleanCity_Text_SlowbroIgnoredOrders:: .string "SLOWBRO ignored orders…$" -CeruleanCity_Text_WantBrightRedBicycle:: @ 817F2CF +CeruleanCity_Text_WantBrightRedBicycle:: .string "I want a bright red bicycle.\p" .string "I'll keep it at home, so it won't\n" .string "get dirty.$" -CeruleanCity_Text_ThisIsCeruleanCave:: @ 817F319 +CeruleanCity_Text_ThisIsCeruleanCave:: .string "This is CERULEAN CAVE.\p" .string "Horribly strong POKéMON live inside\n" .string "there.\p" @@ -159,23 +159,23 @@ CeruleanCity_Text_ThisIsCeruleanCave:: @ 817F319 .string "And, you would have to have\n" .string "made a great achievement.$" -CeruleanCity_Text_CitySign:: @ 817F420 +CeruleanCity_Text_CitySign:: .string "CERULEAN CITY\n" .string "A Mysterious, Blue Aura Surrounds\l" .string "It$" -CeruleanCity_Text_TrainerTipsHeldItems:: @ 817F453 +CeruleanCity_Text_TrainerTipsHeldItems:: .string "TRAINER TIPS\p" .string "A POKéMON can be made to hold\n" .string "an item.\p" .string "Some items can even be used by\n" .string "the holding POKéMON in battle.$" -CeruleanCity_Text_BikeShopSign:: @ 817F4C5 +CeruleanCity_Text_BikeShopSign:: .string "Grass and caves handled easily!\n" .string "BIKE SHOP$" -CeruleanCity_Text_GymSign:: @ 817F4EF +CeruleanCity_Text_GymSign:: .string "CERULEAN CITY POKéMON GYM\n" .string "LEADER: MISTY\l" .string "The Tomboyish Mermaid!$" diff --git a/data/maps/CeruleanCity_BikeShop/scripts.inc b/data/maps/CeruleanCity_BikeShop/scripts.inc index 45a1c2a6a..d20038d1f 100644 --- a/data/maps/CeruleanCity_BikeShop/scripts.inc +++ b/data/maps/CeruleanCity_BikeShop/scripts.inc @@ -1,7 +1,7 @@ -CeruleanCity_BikeShop_MapScripts:: @ 816ABBC +CeruleanCity_BikeShop_MapScripts:: .byte 0 -CeruleanCity_BikeShop_EventScript_Clerk:: @ 816ABBD +CeruleanCity_BikeShop_EventScript_Clerk:: lock faceplayer goto_if_set FLAG_GOT_BICYCLE, CeruleanCity_BikeShop_EventScript_AlreadyGotBicycle @@ -17,18 +17,18 @@ CeruleanCity_BikeShop_EventScript_Clerk:: @ 816ABBD end @ The Bicycle price / players money is never actually checked -CeruleanCity_BikeShop_EventScript_TryPurchaseBicycle:: @ 816AC07 +CeruleanCity_BikeShop_EventScript_TryPurchaseBicycle:: msgbox CeruleanCity_BikeShop_Text_SorryYouCantAffordIt goto CeruleanCity_BikeShop_EventScript_ClerkGoodbye end -CeruleanCity_BikeShop_EventScript_ClerkGoodbye:: @ 816AC15 +CeruleanCity_BikeShop_EventScript_ClerkGoodbye:: msgbox CeruleanCity_BikeShop_Text_ThankYouComeAgain hidemoneybox 0, 0 release end -CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher:: @ 816AC22 +CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher:: msgbox CeruleanCity_BikeShop_Text_OhBikeVoucherHereYouGo msgreceiveditem CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle, ITEM_BICYCLE, 1, MUS_OBTAIN_KEY_ITEM setflag FLAG_GOT_BICYCLE @@ -38,22 +38,22 @@ CeruleanCity_BikeShop_EventScript_ExchangeBikeVoucher:: @ 816AC22 release end -CeruleanCity_BikeShop_EventScript_AlreadyGotBicycle:: @ 816AC58 +CeruleanCity_BikeShop_EventScript_AlreadyGotBicycle:: msgbox CeruleanCity_BikeShop_Text_HowDoYouLikeNewBicycle release end @ Unused -CeruleanCity_BikeShop_EventScript_NoRoomForBicycle:: @ 816AC62 +CeruleanCity_BikeShop_EventScript_NoRoomForBicycle:: msgbox CeruleanCity_BikeShop_Text_MakeRoomForBicycle release end -CeruleanCity_BikeShop_EventScript_Woman:: @ 816AC6C +CeruleanCity_BikeShop_EventScript_Woman:: msgbox CeruleanCity_BikeShop_Text_CityBikeGoodEnoughForMe, MSGBOX_NPC end -CeruleanCity_BikeShop_EventScript_Youngster:: @ 816AC75 +CeruleanCity_BikeShop_EventScript_Youngster:: lock faceplayer goto_if_set FLAG_GOT_BICYCLE, CeruleanCity_BikeShop_EventScript_YoungsterHaveBike @@ -61,11 +61,11 @@ CeruleanCity_BikeShop_EventScript_Youngster:: @ 816AC75 release end -CeruleanCity_BikeShop_EventScript_YoungsterHaveBike:: @ 816AC8A +CeruleanCity_BikeShop_EventScript_YoungsterHaveBike:: msgbox CeruleanCity_BikeShop_Text_WowYourBikeIsCool release end -CeruleanCity_BikeShop_EventScript_Bicycle:: @ 816AC94 +CeruleanCity_BikeShop_EventScript_Bicycle:: msgbox CeruleanCity_BikeShop_Text_ShinyNewBicycle, MSGBOX_SIGN end diff --git a/data/maps/CeruleanCity_BikeShop/text.inc b/data/maps/CeruleanCity_BikeShop/text.inc index 5227f61d5..ab6b1467e 100644 --- a/data/maps/CeruleanCity_BikeShop/text.inc +++ b/data/maps/CeruleanCity_BikeShop/text.inc @@ -1,57 +1,57 @@ -CeruleanCity_BikeShop_Text_WelcomeToBikeShop:: @ 8192755 +CeruleanCity_BikeShop_Text_WelcomeToBikeShop:: .string "Hi!\n" .string "Welcome to our BIKE SHOP.\p" .string "Have we got just the BIKE for\n" .string "you!$" -CeruleanCity_BikeShop_Text_SorryYouCantAffordIt:: @ 8192796 +CeruleanCity_BikeShop_Text_SorryYouCantAffordIt:: .string "Sorry!\n" .string "You can't afford it!$" -CeruleanCity_BikeShop_Text_OhBikeVoucherHereYouGo:: @ 81927B2 +CeruleanCity_BikeShop_Text_OhBikeVoucherHereYouGo:: .string "Oh, that's…\p" .string "A BIKE VOUCHER!\p" .string "Okay!\n" .string "Here you go!$" -CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle:: @ 81927E1 +CeruleanCity_BikeShop_Text_ExchangedVoucherForBicycle:: .string "{PLAYER} exchanged the\n" .string "BIKE VOUCHER for a BICYCLE.$" -CeruleanCity_BikeShop_Text_ThankYouComeAgain:: @ 819280E +CeruleanCity_BikeShop_Text_ThankYouComeAgain:: .string "Thank you!\n" .string "Come back again sometime!$" -CeruleanCity_BikeShop_Text_HowDoYouLikeNewBicycle:: @ 8192833 +CeruleanCity_BikeShop_Text_HowDoYouLikeNewBicycle:: .string "How do you like your new BICYCLE?\n" .string "Do you like how it rides?\p" .string "You can take it out on CYCLING\n" .string "ROAD and even into caves!$" -CeruleanCity_BikeShop_Text_MakeRoomForBicycle:: @ 81928A8 +CeruleanCity_BikeShop_Text_MakeRoomForBicycle:: .string "You better make room for your\n" .string "BICYCLE!$" -CeruleanCity_BikeShop_Text_CityBikeGoodEnoughForMe:: @ 81928CF +CeruleanCity_BikeShop_Text_CityBikeGoodEnoughForMe:: .string "A plain city bike is good enough\n" .string "for me.\p" .string "After all, you can't put a shopping\n" .string "basket on a mountain bike.$" -CeruleanCity_BikeShop_Text_BikesCoolButExpensive:: @ 8192937 +CeruleanCity_BikeShop_Text_BikesCoolButExpensive:: .string "These bikes are cool, but they're\n" .string "way expensive!$" -CeruleanCity_BikeShop_Text_WowYourBikeIsCool:: @ 8192968 +CeruleanCity_BikeShop_Text_WowYourBikeIsCool:: .string "Wow.\n" .string "Your BIKE is really cool!$" @ Unused -CeruleanCity_BikeShop_Text_GermanFoldableBicyleFinallyOnMarket:: @ 8192987 +CeruleanCity_BikeShop_Text_GermanFoldableBicyleFinallyOnMarket:: .string "ついに　はつばい！\p" .string "ドイツ　せい　さいこうきゅう\n" .string "おりたたみ　じてんしゃ！$" -CeruleanCity_BikeShop_Text_ShinyNewBicycle:: @ 81929AD +CeruleanCity_BikeShop_Text_ShinyNewBicycle:: .string "A shiny new BICYCLE!$" diff --git a/data/maps/CeruleanCity_Gym/scripts.inc b/data/maps/CeruleanCity_Gym/scripts.inc index 976c1d05a..1a1a02476 100644 --- a/data/maps/CeruleanCity_Gym/scripts.inc +++ b/data/maps/CeruleanCity_Gym/scripts.inc @@ -1,7 +1,7 @@ -CeruleanCity_Gym_MapScripts:: @ 816AAA0 +CeruleanCity_Gym_MapScripts:: .byte 0 -CeruleanCity_Gym_EventScript_Misty:: @ 816AAA1 +CeruleanCity_Gym_EventScript_Misty:: famechecker FAMECHECKER_MISTY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle_single TRAINER_LEADER_MISTY, CeruleanCity_Gym_Text_MistyIntro, CeruleanCity_Gym_Text_MistyDefeat, CeruleanCity_Gym_EventScript_MistyDefeated, NO_MUSIC goto_if_unset FLAG_GOT_TM03_FROM_MISTY, CeruleanCity_Gym_EventScript_GiveTM03 @@ -9,7 +9,7 @@ CeruleanCity_Gym_EventScript_Misty:: @ 816AAA1 release end -CeruleanCity_Gym_EventScript_MistyDefeated:: @ 816AAD3 +CeruleanCity_Gym_EventScript_MistyDefeated:: famechecker FAMECHECKER_MISTY, 1 setflag FLAG_DEFEATED_MISTY setflag FLAG_BADGE02_GET @@ -18,7 +18,7 @@ CeruleanCity_Gym_EventScript_MistyDefeated:: @ 816AAD3 goto CeruleanCity_Gym_EventScript_GiveTM03 end -CeruleanCity_Gym_EventScript_GiveTM03:: @ 816AAF9 +CeruleanCity_Gym_EventScript_GiveTM03:: msgbox CeruleanCity_Gym_Text_ExplainCascadeBadge checkitemspace ITEM_TM03, 1 compare VAR_RESULT, FALSE @@ -29,23 +29,23 @@ CeruleanCity_Gym_EventScript_GiveTM03:: @ 816AAF9 release end -CeruleanCity_Gym_EventScript_NoRoomForTM03:: @ 816AB3A +CeruleanCity_Gym_EventScript_NoRoomForTM03:: msgbox CeruleanCity_Gym_Text_BetterMakeRoomForThis release end -CeruleanCity_Gym_EventScript_Diana:: @ 816AB44 +CeruleanCity_Gym_EventScript_Diana:: trainerbattle_single TRAINER_PICNICKER_DIANA, CeruleanCity_Gym_Text_DianaIntro, CeruleanCity_Gym_Text_DianaDefeat msgbox CeruleanCity_Gym_Text_DianaPostBattle, MSGBOX_AUTOCLOSE end -CeruleanCity_Gym_EventScript_Luis:: @ 816AB5B +CeruleanCity_Gym_EventScript_Luis:: trainerbattle_single TRAINER_SWIMMER_MALE_LUIS, CeruleanCity_Gym_Text_LuisIntro, CeruleanCity_Gym_Text_LuisDefeat famechecker FAMECHECKER_MISTY, 2 msgbox CeruleanCity_Gym_Text_LuisPostBattle, MSGBOX_AUTOCLOSE end -CeruleanCity_Gym_EventScript_GymGuy:: @ 816AB7F +CeruleanCity_Gym_EventScript_GymGuy:: lock faceplayer goto_if_set FLAG_DEFEATED_MISTY, CeruleanCity_Gym_EventScript_GymGuyPostVictory @@ -53,19 +53,19 @@ CeruleanCity_Gym_EventScript_GymGuy:: @ 816AB7F release end -CeruleanCity_Gym_EventScript_GymGuyPostVictory:: @ 816AB94 +CeruleanCity_Gym_EventScript_GymGuyPostVictory:: msgbox CeruleanCity_Gym_Text_WeMakePrettyGoodTeam release end -CeruleanCity_Gym_EventScript_GymStatue:: @ 816AB9E +CeruleanCity_Gym_EventScript_GymStatue:: lockall goto_if_set FLAG_BADGE02_GET, CeruleanCity_Gym_EventScript_GymStatuePostVictory msgbox CeruleanCity_Gym_Text_GymStatue releaseall end -CeruleanCity_Gym_EventScript_GymStatuePostVictory:: @ 816ABB2 +CeruleanCity_Gym_EventScript_GymStatuePostVictory:: msgbox CeruleanCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/CeruleanCity_Gym/text.inc b/data/maps/CeruleanCity_Gym/text.inc index 231f33c94..f10bcae77 100644 --- a/data/maps/CeruleanCity_Gym/text.inc +++ b/data/maps/CeruleanCity_Gym/text.inc @@ -1,4 +1,4 @@ -CeruleanCity_Gym_Text_MistyIntro:: @ 81921EF +CeruleanCity_Gym_Text_MistyIntro:: .string "Hi, you're a new face!\p" .string "Only those TRAINERS who have a\n" .string "policy about POKéMON can turn pro.\p" @@ -7,11 +7,11 @@ CeruleanCity_Gym_Text_MistyIntro:: @ 81921EF .string "My policy is an all-out offensive\n" .string "with WATER-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -CeruleanCity_Gym_Text_ExplainTM03:: @ 81922BF +CeruleanCity_Gym_Text_ExplainTM03:: .string "TM03 teaches WATER PULSE.\p" .string "Use it on an aquatic POKéMON!$" -CeruleanCity_Gym_Text_ExplainCascadeBadge:: @ 81922F7 +CeruleanCity_Gym_Text_ExplainCascadeBadge:: .string "The CASCADEBADGE makes all\n" .string "POKéMON up to Lv. 30 obey.\p" .string "That includes even outsiders you\n" @@ -22,46 +22,46 @@ CeruleanCity_Gym_Text_ExplainCascadeBadge:: @ 81922F7 .string "open new pathways.\p" .string "You can also have my favorite TM.$" -CeruleanCity_Gym_Text_ReceivedTM03FromMisty:: @ 81923F1 +CeruleanCity_Gym_Text_ReceivedTM03FromMisty:: .string "{PLAYER} received TM03\n" .string "from MISTY.$" -CeruleanCity_Gym_Text_BetterMakeRoomForThis:: @ 819240E +CeruleanCity_Gym_Text_BetterMakeRoomForThis:: .string "You better make room for this!$" -CeruleanCity_Gym_Text_MistyDefeat:: @ 819242D +CeruleanCity_Gym_Text_MistyDefeat:: .string "Wow!\n" .string "You're too much!\p" .string "All right!\p" .string "You can have the CASCADEBADGE to\n" .string "show you beat me.$" -CeruleanCity_Gym_Text_DianaIntro:: @ 8192481 +CeruleanCity_Gym_Text_DianaIntro:: .string "What? You?\n" .string "I'm more than good enough for you!\p" .string "MISTY won't have to be bothered.$" -CeruleanCity_Gym_Text_DianaDefeat:: @ 81924D0 +CeruleanCity_Gym_Text_DianaDefeat:: .string "You overwhelmed me!$" -CeruleanCity_Gym_Text_DianaPostBattle:: @ 81924E4 +CeruleanCity_Gym_Text_DianaPostBattle:: .string "You have to face other TRAINERS\n" .string "to see how good you really are.$" -CeruleanCity_Gym_Text_LuisIntro:: @ 8192524 +CeruleanCity_Gym_Text_LuisIntro:: .string "Splash!\p" .string "I'm first up!\n" .string "Let's do it!$" -CeruleanCity_Gym_Text_LuisDefeat:: @ 8192547 +CeruleanCity_Gym_Text_LuisDefeat:: .string "That can't be!$" -CeruleanCity_Gym_Text_LuisPostBattle:: @ 8192556 +CeruleanCity_Gym_Text_LuisPostBattle:: .string "MISTY is a TRAINER who's going to\n" .string "keep improving.\p" .string "She won't lose to someone like you!$" -CeruleanCity_Gym_Text_GymGuyAdvice:: @ 81925AC +CeruleanCity_Gym_Text_GymGuyAdvice:: .string "Yo!\n" .string "Champ in the making!\p" .string "Let me give you some advice!\p" @@ -72,19 +72,19 @@ CeruleanCity_Gym_Text_GymGuyAdvice:: @ 81925AC .string "Or, you might use ELECTRIC-type\n" .string "POKéMON and zap them!$" -CeruleanCity_Gym_Text_WeMakePrettyGoodTeam:: @ 8192688 +CeruleanCity_Gym_Text_WeMakePrettyGoodTeam:: .string "You beat MISTY!\n" .string "See, what'd I tell ya?\p" .string "You and me, kid, we make a pretty\n" .string "darn-good team!$" -CeruleanCity_Gym_Text_GymStatue:: @ 81926E1 +CeruleanCity_Gym_Text_GymStatue:: .string "CERULEAN POKéMON GYM\n" .string "LEADER: MISTY\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -CeruleanCity_Gym_Text_GymStatuePlayerWon:: @ 8192719 +CeruleanCity_Gym_Text_GymStatuePlayerWon:: .string "CERULEAN POKéMON GYM\n" .string "LEADER: MISTY\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/CeruleanCity_House1/scripts.inc b/data/maps/CeruleanCity_House1/scripts.inc index 4f83fe24b..c08e218eb 100644 --- a/data/maps/CeruleanCity_House1/scripts.inc +++ b/data/maps/CeruleanCity_House1/scripts.inc @@ -1,7 +1,7 @@ -CeruleanCity_House1_MapScripts:: @ 816A7EF +CeruleanCity_House1_MapScripts:: .byte 0 -CeruleanCity_House1_EventScript_BadgeGuy:: @ 816A7F0 +CeruleanCity_House1_EventScript_BadgeGuy:: lock faceplayer msgbox CeruleanCity_House1_Text_BadgesHaveAmazingSecrets @@ -23,7 +23,7 @@ CeruleanCity_House1_EventScript_BadgeGuy:: @ 816A7F0 case 127, CeruleanCity_House1_EventScript_StopDescribingBadges end -CeruleanCity_House1_EventScript_DescribeAnotherBadge:: @ 816A87D +CeruleanCity_House1_EventScript_DescribeAnotherBadge:: message CeruleanCity_House1_Text_DescribeWhichBadge waitmessage special ReturnToListMenu @@ -41,47 +41,47 @@ CeruleanCity_House1_EventScript_DescribeAnotherBadge:: @ 816A87D case 127, CeruleanCity_House1_EventScript_StopDescribingBadges end -CeruleanCity_House1_EventScript_DescribeBoulderBadge:: @ 816A8FB +CeruleanCity_House1_EventScript_DescribeBoulderBadge:: msgbox CeruleanCity_House1_Text_AttackStatFlash goto CeruleanCity_House1_EventScript_DescribeAnotherBadge end -CeruleanCity_House1_EventScript_DescribeCascadeBadge:: @ 816A909 +CeruleanCity_House1_EventScript_DescribeCascadeBadge:: msgbox CeruleanCity_House1_Text_ObeyLv30Cut goto CeruleanCity_House1_EventScript_DescribeAnotherBadge end -CeruleanCity_House1_EventScript_DescribeThunderBadge:: @ 816A917 +CeruleanCity_House1_EventScript_DescribeThunderBadge:: msgbox CeruleanCity_House1_Text_SpeedStatFly goto CeruleanCity_House1_EventScript_DescribeAnotherBadge end -CeruleanCity_House1_EventScript_DescribeRainbowBadge:: @ 816A925 +CeruleanCity_House1_EventScript_DescribeRainbowBadge:: msgbox CeruleanCity_House1_Text_ObeyLv50Strength goto CeruleanCity_House1_EventScript_DescribeAnotherBadge end -CeruleanCity_House1_EventScript_DescribeSoulBadge:: @ 816A933 +CeruleanCity_House1_EventScript_DescribeSoulBadge:: msgbox CeruleanCity_House1_Text_DefenseStatSurf goto CeruleanCity_House1_EventScript_DescribeAnotherBadge end -CeruleanCity_House1_EventScript_DescribeMarshBadge:: @ 816A941 +CeruleanCity_House1_EventScript_DescribeMarshBadge:: msgbox CeruleanCity_House1_Text_ObeyLv70RockSmash goto CeruleanCity_House1_EventScript_DescribeAnotherBadge end -CeruleanCity_House1_EventScript_DescribeVolcanoBadge:: @ 816A94F +CeruleanCity_House1_EventScript_DescribeVolcanoBadge:: msgbox CeruleanCity_House1_Text_SpStatsWaterfall goto CeruleanCity_House1_EventScript_DescribeAnotherBadge end -CeruleanCity_House1_EventScript_DescribeEarthBadge:: @ 816A95D +CeruleanCity_House1_EventScript_DescribeEarthBadge:: msgbox CeruleanCity_House1_Text_AllMonsWillObeyYou goto CeruleanCity_House1_EventScript_DescribeAnotherBadge end -CeruleanCity_House1_EventScript_StopDescribingBadges:: @ 816A96B +CeruleanCity_House1_EventScript_StopDescribingBadges:: msgbox CeruleanCity_House1_Text_ComeVisitAnytime release end diff --git a/data/maps/CeruleanCity_House1/text.inc b/data/maps/CeruleanCity_House1/text.inc index 473956847..bb1535ed1 100644 --- a/data/maps/CeruleanCity_House1/text.inc +++ b/data/maps/CeruleanCity_House1/text.inc @@ -1,25 +1,25 @@ -CeruleanCity_House1_Text_BadgesHaveAmazingSecrets:: @ 81918E7 +CeruleanCity_House1_Text_BadgesHaveAmazingSecrets:: .string "Only skilled TRAINERS can collect\n" .string "POKéMON BADGES.\p" .string "I see you have at least one.\p" .string "Those BADGES have amazing secrets,\n" .string "did you know?$" -CeruleanCity_House1_Text_DescribeWhichBadge:: @ 8191967 +CeruleanCity_House1_Text_DescribeWhichBadge:: .string "Now then…\p" .string "Which of the eight BADGES should\n" .string "I describe?$" -CeruleanCity_House1_Text_ComeVisitAnytime:: @ 819199E +CeruleanCity_House1_Text_ComeVisitAnytime:: .string "Come visit me anytime you wish.$" -CeruleanCity_House1_Text_AttackStatFlash:: @ 81919BE +CeruleanCity_House1_Text_AttackStatFlash:: .string "The ATTACK stat of all your\n" .string "POKéMON increases a little bit.\p" .string "It also lets you use the move\n" .string "FLASH outside of battle.$" -CeruleanCity_House1_Text_ObeyLv30Cut:: @ 8191A31 +CeruleanCity_House1_Text_ObeyLv30Cut:: .string "POKéMON up to Lv. 30 will obey\n" .string "you.\p" .string "That includes even outsiders you\n" @@ -29,13 +29,13 @@ CeruleanCity_House1_Text_ObeyLv30Cut:: @ 8191A31 .string "It also lets you use the move\n" .string "CUT outside of battle.$" -CeruleanCity_House1_Text_SpeedStatFly:: @ 8191AF9 +CeruleanCity_House1_Text_SpeedStatFly:: .string "The SPEED stat of all your\n" .string "POKéMON increases a little bit.\p" .string "It also lets you use the move\n" .string "FLY outside of battle.$" -CeruleanCity_House1_Text_ObeyLv50Strength:: @ 8191B69 +CeruleanCity_House1_Text_ObeyLv50Strength:: .string "POKéMON up to Lv. 50 will obey\n" .string "you.\p" .string "That includes even outsiders you\n" @@ -45,13 +45,13 @@ CeruleanCity_House1_Text_ObeyLv50Strength:: @ 8191B69 .string "It also lets you use the move\n" .string "STRENGTH outside of battle.$" -CeruleanCity_House1_Text_DefenseStatSurf:: @ 8191C36 +CeruleanCity_House1_Text_DefenseStatSurf:: .string "The DEFENSE stat of all your\n" .string "POKéMON increases a little bit.\p" .string "It also lets you use the move\n" .string "SURF outside of battle.$" -CeruleanCity_House1_Text_ObeyLv70RockSmash:: @ 8191CA9 +CeruleanCity_House1_Text_ObeyLv70RockSmash:: .string "POKéMON up to Lv. 70 will obey\n" .string "you.\p" .string "That includes even outsiders you\n" @@ -61,12 +61,12 @@ CeruleanCity_House1_Text_ObeyLv70RockSmash:: @ 8191CA9 .string "It also lets you use the move\n" .string "ROCK SMASH outside of battle.$" -CeruleanCity_House1_Text_SpStatsWaterfall:: @ 8191D78 +CeruleanCity_House1_Text_SpStatsWaterfall:: .string "The SP. ATK and SP. DEF stats of\n" .string "all your POKéMON rise a little bit.\p" .string "It also lets you use the move\n" .string "WATERFALL outside of battle.$" -CeruleanCity_House1_Text_AllMonsWillObeyYou:: @ 8191DF8 +CeruleanCity_House1_Text_AllMonsWillObeyYou:: .string "All POKéMON will obey you!$" diff --git a/data/maps/CeruleanCity_House2/scripts.inc b/data/maps/CeruleanCity_House2/scripts.inc index 04063b3ff..5f7dd56cf 100644 --- a/data/maps/CeruleanCity_House2/scripts.inc +++ b/data/maps/CeruleanCity_House2/scripts.inc @@ -1,7 +1,7 @@ -CeruleanCity_House2_MapScripts:: @ 816A975 +CeruleanCity_House2_MapScripts:: .byte 0 -CeruleanCity_House2_EventScript_Hiker:: @ 816A976 +CeruleanCity_House2_EventScript_Hiker:: lock faceplayer goto_if_set FLAG_GOT_TM28_FROM_ROCKET, CeruleanCity_House2_EventScript_HikerGotTM28 @@ -9,15 +9,15 @@ CeruleanCity_House2_EventScript_Hiker:: @ 816A976 release end -CeruleanCity_House2_EventScript_HikerGotTM28:: @ 816A98B +CeruleanCity_House2_EventScript_HikerGotTM28:: msgbox CeruleanCity_House2_Text_TeachDiglettDigWithoutTM release end -CeruleanCity_House2_EventScript_Lass:: @ 816A995 +CeruleanCity_House2_EventScript_Lass:: msgbox CeruleanCity_House2_Text_TeamRocketTryingToDigIntoNoGood, MSGBOX_NPC end -CeruleanCity_House2_EventScript_WallHole:: @ 816A99E +CeruleanCity_House2_EventScript_WallHole:: msgbox CeruleanCity_House2_Text_TeamRocketLeftWayOut, MSGBOX_SIGN end diff --git a/data/maps/CeruleanCity_House2/text.inc b/data/maps/CeruleanCity_House2/text.inc index f2dad010d..2c5551f2e 100644 --- a/data/maps/CeruleanCity_House2/text.inc +++ b/data/maps/CeruleanCity_House2/text.inc @@ -1,4 +1,4 @@ -CeruleanCity_House2_Text_RocketsStoleTMForDig:: @ 8191E13 +CeruleanCity_House2_Text_RocketsStoleTMForDig:: .string "Those miserable ROCKETS!\p" .string "Look what they've done to my\n" .string "house!\p" @@ -8,15 +8,15 @@ CeruleanCity_House2_Text_RocketsStoleTMForDig:: @ 8191E13 .string "MANKEY or a SANDSHREW…\p" .string "That cost me a bundle, it did!$" -CeruleanCity_House2_Text_TeachDiglettDigWithoutTM:: @ 8191ED8 +CeruleanCity_House2_Text_TeachDiglettDigWithoutTM:: .string "I figure what's lost is lost.\p" .string "I decided to teach DIGLETT how to\n" .string "DIG without a TM.$" -CeruleanCity_House2_Text_TeamRocketTryingToDigIntoNoGood:: @ 8191F2A +CeruleanCity_House2_Text_TeamRocketTryingToDigIntoNoGood:: .string "TEAM ROCKET must be trying to DIG\n" .string "their way into no good!$" -CeruleanCity_House2_Text_TeamRocketLeftWayOut:: @ 8191F64 +CeruleanCity_House2_Text_TeamRocketLeftWayOut:: .string "TEAM ROCKET left a way out!$" diff --git a/data/maps/CeruleanCity_House3/scripts.inc b/data/maps/CeruleanCity_House3/scripts.inc index 27af0cc14..d0e4fda5e 100644 --- a/data/maps/CeruleanCity_House3/scripts.inc +++ b/data/maps/CeruleanCity_House3/scripts.inc @@ -1,11 +1,11 @@ -CeruleanCity_House3_MapScripts:: @ 816A9A7 +CeruleanCity_House3_MapScripts:: .byte 0 -CeruleanCity_House3_EventScript_OldWoman:: @ 816A9A8 +CeruleanCity_House3_EventScript_OldWoman:: msgbox CeruleanCity_House3_Text_PleaseTradeWithMyHusband, MSGBOX_NPC end -CeruleanCity_House3_EventScript_Dontae:: @ 816A9B1 +CeruleanCity_House3_EventScript_Dontae:: lock faceplayer setvar VAR_0x8008, INGAME_TRADE_JYNX @@ -26,18 +26,18 @@ CeruleanCity_House3_EventScript_Dontae:: @ 816A9B1 release end -CeruleanCity_House3_EventScript_DeclineTrade:: @ 816AA0B +CeruleanCity_House3_EventScript_DeclineTrade:: msgbox Trade_Text_WellIfYouDontWantTo release end -CeruleanCity_House3_EventScript_NotRequestedMon:: @ 816AA15 +CeruleanCity_House3_EventScript_NotRequestedMon:: getspeciesname 0, VAR_0x8009 msgbox Trade_Text_ThisIsntMon release end -CeruleanCity_House3_EventScript_AlreadyTraded:: @ 816AA23 +CeruleanCity_House3_EventScript_AlreadyTraded:: msgbox Trade_Text_HasTradedMonGrownStronger release end diff --git a/data/maps/CeruleanCity_House3/text.inc b/data/maps/CeruleanCity_House3/text.inc index 082c8a8ad..502551bfb 100644 --- a/data/maps/CeruleanCity_House3/text.inc +++ b/data/maps/CeruleanCity_House3/text.inc @@ -1,4 +1,4 @@ -CeruleanCity_House3_Text_PleaseTradeWithMyHusband:: @ 8191F80 +CeruleanCity_House3_Text_PleaseTradeWithMyHusband:: .string "My husband likes trading POKéMON.\p" .string "You're collecting POKéMON for your\n" .string "POKéDEX, aren't you?\p" diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index d5ae8aec3..f338f5173 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -1,9 +1,9 @@ .set LOCALID_WONDER_NEWS_BERRY_MAN, 1 -CeruleanCity_House4_MapScripts:: @ 816ACEE +CeruleanCity_House4_MapScripts:: .byte 0 -CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF +CeruleanCity_House4_EventScript_WonderNewsBerryMan:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -25,12 +25,12 @@ CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF goto_if_eq CeruleanCity_House4_EventScript_NewsDone end -CeruleanCity_House4_EventScript_NoNews:: @ 816AD59 +CeruleanCity_House4_EventScript_NoNews:: msgbox CeruleanCity_House4_Text_NothingEntertaining release end -CeruleanCity_House4_EventScript_News1:: @ 816AD63 +CeruleanCity_House4_EventScript_News1:: call CeruleanCity_House4_EventScript_MovementReactionToNews msgbox CeruleanCity_House4_Text_NewNewsInformativeHaveThis giveitem VAR_0x8008 @@ -39,7 +39,7 @@ CeruleanCity_House4_EventScript_News1:: @ 816AD63 release end -CeruleanCity_House4_EventScript_News2:: @ 816AD89 +CeruleanCity_House4_EventScript_News2:: call CeruleanCity_House4_EventScript_MovementReactionToNews msgbox CeruleanCity_House4_Text_IncredibleNewsHaveBerries giveitem VAR_0x8008, 4 @@ -48,14 +48,14 @@ CeruleanCity_House4_EventScript_News2:: @ 816AD89 release end -CeruleanCity_House4_EventScript_NewsNotSpread:: @ 816ADAF +CeruleanCity_House4_EventScript_NewsNotSpread:: applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_FacePlayer waitmovement 0 msgbox CeruleanCity_House4_Text_WishCouldShareNewsWithOthers release end -CeruleanCity_House4_EventScript_NewsSpread1:: @ 816ADC3 +CeruleanCity_House4_EventScript_NewsSpread1:: call CeruleanCity_House4_EventScript_MovementReactionToNews msgbox CeruleanCity_House4_Text_ThanksForSpreadingNewsTakeThis giveitem VAR_0x8008 @@ -64,7 +64,7 @@ CeruleanCity_House4_EventScript_NewsSpread1:: @ 816ADC3 release end -CeruleanCity_House4_EventScript_NewsSpread2:: @ 816ADE9 +CeruleanCity_House4_EventScript_NewsSpread2:: call CeruleanCity_House4_EventScript_MovementReactionToNews msgbox CeruleanCity_House4_Text_MagnificentNewsSpreadHaveBerries giveitem VAR_0x8008, 4 @@ -73,14 +73,14 @@ CeruleanCity_House4_EventScript_NewsSpread2:: @ 816ADE9 release end -CeruleanCity_House4_EventScript_NewsDone:: @ 816AE0F +CeruleanCity_House4_EventScript_NewsDone:: applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_FacePlayer waitmovement 0 msgbox CeruleanCity_House4_Text_EnjoyingMyselfWithAllSortsOfNews release end -CeruleanCity_House4_EventScript_MovementReactionToNews:: @ 816AE23 +CeruleanCity_House4_EventScript_MovementReactionToNews:: playse SE_PIN applymovement LOCALID_WONDER_NEWS_BERRY_MAN, Movement_ExclamationMark waitmovement 0 @@ -90,7 +90,7 @@ CeruleanCity_House4_EventScript_MovementReactionToNews:: @ 816AE23 waitmovement 0 return -CeruleanCity_House4_EventScript_NoRoomForBerries:: @ 816AE45 +CeruleanCity_House4_EventScript_NoRoomForBerries:: msgbox CeruleanCity_House4_Text_YourBerryPouchIsFull release end diff --git a/data/maps/CeruleanCity_House4/text.inc b/data/maps/CeruleanCity_House4/text.inc index c056819b9..27a132f49 100644 --- a/data/maps/CeruleanCity_House4/text.inc +++ b/data/maps/CeruleanCity_House4/text.inc @@ -1,10 +1,10 @@ -CeruleanCity_House4_Text_NothingEntertaining:: @ 8192AF0 +CeruleanCity_House4_Text_NothingEntertaining:: .string "Sigh…\n" .string "Too much time, too little to do…\p" .string "Is nothing entertaining happening\n" .string "anywhere?$" -CeruleanCity_House4_Text_NewNewsInformativeHaveThis:: @ 8192B43 +CeruleanCity_House4_Text_NewNewsInformativeHaveThis:: .string "Ah!\n" .string "A new news report!\p" .string "Hmm…\p" @@ -15,7 +15,7 @@ CeruleanCity_House4_Text_NewNewsInformativeHaveThis:: @ 8192B43 .string "As my thanks for sharing the news\n" .string "with me, I want you to have this.$" -CeruleanCity_House4_Text_IncredibleNewsHaveBerries:: @ 8192C07 +CeruleanCity_House4_Text_IncredibleNewsHaveBerries:: .string "Oh, oh!\n" .string "Th-this news report!\p" .string "Hmm…\p" @@ -26,20 +26,20 @@ CeruleanCity_House4_Text_IncredibleNewsHaveBerries:: @ 8192C07 .string "Thanks for sharing this fantastic\n" .string "news. Have a bunch of BERRIES!$" -CeruleanCity_House4_Text_WishCouldShareNewsWithOthers:: @ 8192CD5 +CeruleanCity_House4_Text_WishCouldShareNewsWithOthers:: .string "It seems such a shame to not share\n" .string "this news with other folks…\p" .string "I wish I could tell someone…\n" .string "Let others know the news…$" -CeruleanCity_House4_Text_ThanksForSpreadingNewsTakeThis:: @ 8192D4B +CeruleanCity_House4_Text_ThanksForSpreadingNewsTakeThis:: .string "Ah, you've spread the news for me?\p" .string "Good news becomes worthwhile when\n" .string "all sorts of people share it.\p" .string "As my thanks for your spreading\n" .string "the news, take this!$" -CeruleanCity_House4_Text_MagnificentNewsSpreadHaveBerries:: @ 8192DE3 +CeruleanCity_House4_Text_MagnificentNewsSpreadHaveBerries:: .string "You've spread the news some more?\n" .string "Magnificent!\p" .string "That piece of news must be\n" @@ -50,13 +50,13 @@ CeruleanCity_House4_Text_MagnificentNewsSpreadHaveBerries:: @ 8192DE3 .string "I'll give you more BERRIES than\n" .string "I usually do.$" -CeruleanCity_House4_Text_EnjoyingMyselfWithAllSortsOfNews:: @ 8192EC5 +CeruleanCity_House4_Text_EnjoyingMyselfWithAllSortsOfNews:: .string "I'm quite enjoying myself with all\n" .string "sorts of news.\p" .string "Yes, I am satisfied!\n" .string "I won't be bored for a while.$" -CeruleanCity_House4_Text_YourBerryPouchIsFull:: @ 8192F2A +CeruleanCity_House4_Text_YourBerryPouchIsFull:: .string "Hm? Your BERRY POUCH is full.\n" .string "My gift remains ungiven, then.$" diff --git a/data/maps/CeruleanCity_House5/scripts.inc b/data/maps/CeruleanCity_House5/scripts.inc index dc5e2c2ff..bebc51077 100644 --- a/data/maps/CeruleanCity_House5/scripts.inc +++ b/data/maps/CeruleanCity_House5/scripts.inc @@ -1,7 +1,7 @@ -CeruleanCity_House5_MapScripts:: @ 816AE4F +CeruleanCity_House5_MapScripts:: .byte 0 -CeruleanCity_House5_EventScript_BerryPowderMan:: @ 816AE50 +CeruleanCity_House5_EventScript_BerryPowderMan:: lock faceplayer goto_if_set FLAG_GOT_POWDER_JAR, CeruleanCity_House5_EventScript_AskToExchangePowder @@ -18,23 +18,23 @@ CeruleanCity_House5_EventScript_BerryPowderMan:: @ 816AE50 release end -CeruleanCity_House5_EventScript_NoBerries:: @ 816AEA3 +CeruleanCity_House5_EventScript_NoBerries:: msgbox CeruleanCity_House1_Text_WhyMustYouLieNoBerries release end -CeruleanCity_House5_EventScript_NoInterestInBerries:: @ 816AEAD +CeruleanCity_House5_EventScript_NoInterestInBerries:: msgbox CeruleanCity_House1_Text_TakeInterestInAllSortsOfThings release end -CeruleanCity_House5_EventScript_AskToExchangePowder:: @ 816AEB7 +CeruleanCity_House5_EventScript_AskToExchangePowder:: special DisplayBerryPowderVendorMenu msgbox CeruleanCity_House1_Text_HaveYouBroughtBerryPowder goto CeruleanCity_House5_EventScript_ChooseExchangeItem end -CeruleanCity_House5_EventScript_ChooseExchangeItem:: @ 816AEC8 +CeruleanCity_House5_EventScript_ChooseExchangeItem:: message CeruleanCity_House5_Text_ExchangeWithWhat waitmessage setvar VAR_0x8004, LISTMENU_BERRY_POWDER @@ -56,90 +56,90 @@ CeruleanCity_House5_EventScript_ChooseExchangeItem:: @ 816AEC8 case 127, CeruleanCity_House5_EventScript_ExitMenu end -CeruleanCity_House5_EventScript_EnergyPowder:: @ 816AF6C +CeruleanCity_House5_EventScript_EnergyPowder:: getitemname 0, ITEM_ENERGY_POWDER setvar VAR_0x8008, ITEM_ENERGY_POWDER setvar VAR_0x8009, 50 goto CeruleanCity_House5_EventScript_ExchangePowderForItem end -CeruleanCity_House5_EventScript_EnergyRoot:: @ 816AF80 +CeruleanCity_House5_EventScript_EnergyRoot:: getitemname 0, ITEM_ENERGY_ROOT setvar VAR_0x8008, ITEM_ENERGY_ROOT setvar VAR_0x8009, 80 goto CeruleanCity_House5_EventScript_ExchangePowderForItem end -CeruleanCity_House5_EventScript_HealPowder:: @ 816AF94 +CeruleanCity_House5_EventScript_HealPowder:: getitemname 0, ITEM_HEAL_POWDER setvar VAR_0x8008, ITEM_HEAL_POWDER setvar VAR_0x8009, 50 goto CeruleanCity_House5_EventScript_ExchangePowderForItem end -CeruleanCity_House5_EventScript_RevivalHerb:: @ 816AFA8 +CeruleanCity_House5_EventScript_RevivalHerb:: getitemname 0, ITEM_REVIVAL_HERB setvar VAR_0x8008, ITEM_REVIVAL_HERB setvar VAR_0x8009, 300 goto CeruleanCity_House5_EventScript_ExchangePowderForItem end -CeruleanCity_House5_EventScript_Protein:: @ 816AFBC +CeruleanCity_House5_EventScript_Protein:: getitemname 0, ITEM_PROTEIN setvar VAR_0x8008, ITEM_PROTEIN setvar VAR_0x8009, 1000 goto CeruleanCity_House5_EventScript_ExchangePowderForItem end -CeruleanCity_House5_EventScript_Iron:: @ 816AFD0 +CeruleanCity_House5_EventScript_Iron:: getitemname 0, ITEM_IRON setvar VAR_0x8008, ITEM_IRON setvar VAR_0x8009, 1000 goto CeruleanCity_House5_EventScript_ExchangePowderForItem end -CeruleanCity_House5_EventScript_Carbos:: @ 816AFE4 +CeruleanCity_House5_EventScript_Carbos:: getitemname 0, ITEM_CARBOS setvar VAR_0x8008, ITEM_CARBOS setvar VAR_0x8009, 1000 goto CeruleanCity_House5_EventScript_ExchangePowderForItem end -CeruleanCity_House5_EventScript_Calcium:: @ 816AFF8 +CeruleanCity_House5_EventScript_Calcium:: getitemname 0, ITEM_CALCIUM setvar VAR_0x8008, ITEM_CALCIUM setvar VAR_0x8009, 1000 goto CeruleanCity_House5_EventScript_ExchangePowderForItem end -CeruleanCity_House5_EventScript_Zinc:: @ 816B00C +CeruleanCity_House5_EventScript_Zinc:: getitemname 0, ITEM_ZINC setvar VAR_0x8008, ITEM_ZINC setvar VAR_0x8009, 1000 goto CeruleanCity_House5_EventScript_ExchangePowderForItem end -CeruleanCity_House5_EventScript_HPUp:: @ 816B020 +CeruleanCity_House5_EventScript_HPUp:: getitemname 0, ITEM_HP_UP setvar VAR_0x8008, ITEM_HP_UP setvar VAR_0x8009, 1000 goto CeruleanCity_House5_EventScript_ExchangePowderForItem end -CeruleanCity_House5_EventScript_PPUp:: @ 816B034 +CeruleanCity_House5_EventScript_PPUp:: getitemname 0, ITEM_PP_UP setvar VAR_0x8008, ITEM_PP_UP setvar VAR_0x8009, 3000 goto CeruleanCity_House5_EventScript_ExchangePowderForItem end -CeruleanCity_House5_EventScript_ExitMenu:: @ 816B048 +CeruleanCity_House5_EventScript_ExitMenu:: msgbox CeruleanCity_House1_Text_SeeMeIfYoudLikeToTradePowder special RemoveBerryPowderVendorMenu release end -CeruleanCity_House5_EventScript_ExchangePowderForItem:: @ 816B055 +CeruleanCity_House5_EventScript_ExchangePowderForItem:: msgbox CeruleanCity_House1_Text_YoullExchangeBerryPowderForItem, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq CeruleanCity_House5_EventScript_ChooseExchangeItem @@ -161,18 +161,18 @@ CeruleanCity_House5_EventScript_ExchangePowderForItem:: @ 816B055 release end -CeruleanCity_House5_EventScript_BagIsFull:: @ 816B0BF +CeruleanCity_House5_EventScript_BagIsFull:: msgbox Text_BagIsFull special RemoveBerryPowderVendorMenu release end -CeruleanCity_House5_EventScript_NotEnoughBerryPowder:: @ 816B0CC +CeruleanCity_House5_EventScript_NotEnoughBerryPowder:: msgbox CeruleanCity_House1_Text_DontHaveEnoughBerryPowder goto CeruleanCity_House5_EventScript_ChooseExchangeItem end -CeruleanCity_House5_EventScript_BerryCrushRankings:: @ 816B0DA +CeruleanCity_House5_EventScript_BerryCrushRankings:: lockall goto_if_questlog EventScript_ReleaseEnd special ShowBerryCrushRankings diff --git a/data/maps/CeruleanCity_House5/text.inc b/data/maps/CeruleanCity_House5/text.inc index cccb89af3..b8b981be0 100644 --- a/data/maps/CeruleanCity_House5/text.inc +++ b/data/maps/CeruleanCity_House5/text.inc @@ -1,4 +1,4 @@ -CeruleanCity_House1_Text_AnyInterestInBerries:: @ 8192F67 +CeruleanCity_House1_Text_AnyInterestInBerries:: .string "I concoct a variety of medicine\n" .string "from BERRY POWDER.\p" .string "Using good BERRY POWDER, I can\n" @@ -6,11 +6,11 @@ CeruleanCity_House1_Text_AnyInterestInBerries:: @ 8192F67 .string "Now tell me, have you any interest\n" .string "in BERRIES?$" -CeruleanCity_House1_Text_HaveJustTheThing:: @ 8193003 +CeruleanCity_House1_Text_HaveJustTheThing:: .string "Ah, good! For you, then, I have\n" .string "just the thing.$" -CeruleanCity_House1_Text_GoCrushBerriesAtDirectCorner:: @ 8193033 +CeruleanCity_House1_Text_GoCrushBerriesAtDirectCorner:: .string "There's something new on the second\n" .string "floor of POKéMON CENTERS, at the\l" .string "DIRECT CORNER.\p" @@ -28,43 +28,43 @@ CeruleanCity_House1_Text_GoCrushBerriesAtDirectCorner:: @ 8193033 .string "Don't forget, crush BERRIES into\n" .string "BERRY POWDER and bring it to me.$" -CeruleanCity_House1_Text_WhyMustYouLieNoBerries:: @ 819321D +CeruleanCity_House1_Text_WhyMustYouLieNoBerries:: .string "Why must you lie to me?\p" .string "How many BERRIES do you have?\n" .string "Not a one!$" -CeruleanCity_House1_Text_TakeInterestInAllSortsOfThings:: @ 819325E +CeruleanCity_House1_Text_TakeInterestInAllSortsOfThings:: .string "You have no interest in BERRIES?\p" .string "Young one, it's important to take an\n" .string "interest in all sorts of things.$" -CeruleanCity_House1_Text_HaveYouBroughtBerryPowder:: @ 81932C5 +CeruleanCity_House1_Text_HaveYouBroughtBerryPowder:: .string "Er-hem! Have you brought me some\n" .string "BERRY POWDER?$" -CeruleanCity_House5_Text_ExchangeWithWhat:: @ 81932F4 +CeruleanCity_House5_Text_ExchangeWithWhat:: .string "With what would you like to \n" .string "exchange it?$" -CeruleanCity_House1_Text_YoullExchangeBerryPowderForItem:: @ 819331E +CeruleanCity_House1_Text_YoullExchangeBerryPowderForItem:: .string "Fine, you'll exchange your BERRY\n" .string "POWDER for one {STR_VAR_1}?$" -CeruleanCity_House1_Text_DontHaveEnoughBerryPowder:: @ 8193352 +CeruleanCity_House1_Text_DontHaveEnoughBerryPowder:: .string "Hm? You don't have enough\n" .string "BERRY POWDER.$" -CeruleanCity_House1_Text_TradeMoreBerryPowder:: @ 819337A +CeruleanCity_House1_Text_TradeMoreBerryPowder:: .string "This is fine BERRY POWDER indeed.\n" .string "It will make excellent medicine.\p" .string "Would you like to trade more BERRY\n" .string "POWDER for something else?$" -CeruleanCity_House1_Text_HopeToSeeYouAgain:: @ 81933FB +CeruleanCity_House1_Text_HopeToSeeYouAgain:: .string "That's fine, then.\n" .string "I'll hope to see you back again.$" -CeruleanCity_House1_Text_SeeMeIfYoudLikeToTradePowder:: @ 819342F +CeruleanCity_House1_Text_SeeMeIfYoudLikeToTradePowder:: .string "Come see me if you'd like to trade\n" .string "your BERRY POWDER.$" diff --git a/data/maps/CeruleanCity_Mart/scripts.inc b/data/maps/CeruleanCity_Mart/scripts.inc index 1ff7b2c47..3a8088a41 100644 --- a/data/maps/CeruleanCity_Mart/scripts.inc +++ b/data/maps/CeruleanCity_Mart/scripts.inc @@ -1,15 +1,15 @@ -CeruleanCity_Mart_MapScripts:: @ 816AC9D +CeruleanCity_Mart_MapScripts:: .byte 0 -CeruleanCity_Mart_EventScript_Youngster:: @ 816AC9E +CeruleanCity_Mart_EventScript_Youngster:: msgbox CeruleanCity_Mart_Text_RepelWorksOnWeakMons, MSGBOX_NPC end -CeruleanCity_Mart_EventScript_Woman:: @ 816ACA7 +CeruleanCity_Mart_EventScript_Woman:: msgbox CeruleanCity_Mart_Text_DoYouKnowAboutRareCandy, MSGBOX_NPC end -CeruleanCity_Mart_EventScript_Clerk:: @ 816ACB0 +CeruleanCity_Mart_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -21,7 +21,7 @@ CeruleanCity_Mart_EventScript_Clerk:: @ 816ACB0 end .align 2 -CeruleanCity_Mart_Items:: @ 816ACD8 +CeruleanCity_Mart_Items:: .2byte ITEM_POKE_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_POTION diff --git a/data/maps/CeruleanCity_Mart/text.inc b/data/maps/CeruleanCity_Mart/text.inc index 9080c53ab..f37813c78 100644 --- a/data/maps/CeruleanCity_Mart/text.inc +++ b/data/maps/CeruleanCity_Mart/text.inc @@ -1,4 +1,4 @@ -CeruleanCity_Mart_Text_RepelWorksOnWeakMons:: @ 81929C2 +CeruleanCity_Mart_Text_RepelWorksOnWeakMons:: .string "REPEL not only keeps bugs away,\n" .string "it also works on weak POKéMON.\p" .string "Put your strongest POKéMON at the\n" @@ -6,7 +6,7 @@ CeruleanCity_Mart_Text_RepelWorksOnWeakMons:: @ 81929C2 .string "If your first POKéMON is strong,\n" .string "REPEL's effect is boosted.$" -CeruleanCity_Mart_Text_DoYouKnowAboutRareCandy:: @ 8192A79 +CeruleanCity_Mart_Text_DoYouKnowAboutRareCandy:: .string "Do you know about RARE CANDY?\n" .string "They don't sell it in shops.\p" .string "I think it makes POKéMON grow\n" diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc index bb647e0fb..43325e929 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/scripts.inc @@ -1,28 +1,28 @@ -CeruleanCity_PokemonCenter_1F_MapScripts:: @ 816AA2D +CeruleanCity_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, CeruleanCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -CeruleanCity_PokemonCenter_1F_OnTransition:: @ 816AA38 +CeruleanCity_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_CERULEAN_CITY end -CeruleanCity_PokemonCenter_1F_EventScript_Nurse:: @ 816AA3C +CeruleanCity_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -CeruleanCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816AA45 +CeruleanCity_PokemonCenter_1F_EventScript_Gentleman:: msgbox CeruleanCity_PokemonCenter_1F_Text_EveryoneCallsBillPokemaniac, MSGBOX_NPC end -CeruleanCity_PokemonCenter_1F_EventScript_Rocker:: @ 816AA4E +CeruleanCity_PokemonCenter_1F_EventScript_Rocker:: msgbox CeruleanCity_PokemonCenter_1F_Text_BillDoesWhateverForRareMons, MSGBOX_NPC end -CeruleanCity_PokemonCenter_1F_EventScript_Youngster:: @ 816AA57 +CeruleanCity_PokemonCenter_1F_EventScript_Youngster:: lock faceplayer famechecker FAMECHECKER_BILL, 1 @@ -30,6 +30,6 @@ CeruleanCity_PokemonCenter_1F_EventScript_Youngster:: @ 816AA57 release end -CeruleanCity_PokemonCenter_1F_EventScript_Lass:: @ 816AA70 +CeruleanCity_PokemonCenter_1F_EventScript_Lass:: msgbox CeruleanCity_PokemonCenter_1F_Text_TryTradingUpstairs, MSGBOX_NPC end diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/text.inc b/data/maps/CeruleanCity_PokemonCenter_1F/text.inc index e443c2848..3247bd5b8 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/text.inc +++ b/data/maps/CeruleanCity_PokemonCenter_1F/text.inc @@ -1,11 +1,11 @@ -CeruleanCity_PokemonCenter_1F_Text_BillDoesWhateverForRareMons:: @ 8191FFB +CeruleanCity_PokemonCenter_1F_Text_BillDoesWhateverForRareMons:: .string "That BILL!\p" .string "I heard that he'll do whatever it\n" .string "takes to get rare POKéMON.\p" .string "He's not above doing all sorts\n" .string "of things, I've heard.$" -CeruleanCity_PokemonCenter_1F_Text_EveryoneCallsBillPokemaniac:: @ 8192079 +CeruleanCity_PokemonCenter_1F_Text_EveryoneCallsBillPokemaniac:: .string "Have you heard about BILL?\p" .string "Everyone calls him a POKéMANIAC!\p" .string "I think people are just jealous of\n" @@ -13,11 +13,11 @@ CeruleanCity_PokemonCenter_1F_Text_EveryoneCallsBillPokemaniac:: @ 8192079 .string "Who wouldn't want to boast about\n" .string "their POKéMON?$" -CeruleanCity_PokemonCenter_1F_Text_BillCollectsRareMons:: @ 8192116 +CeruleanCity_PokemonCenter_1F_Text_BillCollectsRareMons:: .string "BILL has lots of POKéMON!\n" .string "He collects rare ones, too!$" -CeruleanCity_PokemonCenter_1F_Text_TryTradingUpstairs:: @ 819214C +CeruleanCity_PokemonCenter_1F_Text_TryTradingUpstairs:: .string "Why don't you go upstairs and try\n" .string "trading POKéMON with your friends?\p" .string "You could get a lot more variety\n" diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc index f6f83f0da..48f6412f7 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/CeruleanCity_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 +CeruleanCity_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ CeruleanCity_PokemonCenter_2F_MapScripts:: @ 816AA79 .byte 0 @ The below 3 are unused and leftover from RS -CeruleanCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816AA8E +CeruleanCity_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -CeruleanCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816AA94 +CeruleanCity_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -CeruleanCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816AA9A +CeruleanCity_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CinnabarIsland/scripts.inc b/data/maps/CinnabarIsland/scripts.inc index 073fc6c94..f4e2dc6af 100644 --- a/data/maps/CinnabarIsland/scripts.inc +++ b/data/maps/CinnabarIsland/scripts.inc @@ -1,12 +1,12 @@ .equ LOCALID_BILL, 3 .equ LOCALID_SEAGALLOP, 4 -CinnabarIsland_MapScripts:: @ 8166ED6 +CinnabarIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, CinnabarIsland_OnFrame .byte 0 -CinnabarIsland_OnTransition:: @ 8166EE1 +CinnabarIsland_OnTransition:: setworldmapflag FLAG_WORLD_MAP_CINNABAR_ISLAND call CinnabarIsland_EventScript_CheckUnlockGym compare VAR_MAP_SCENE_CINNABAR_ISLAND, 1 @@ -17,7 +17,7 @@ CinnabarIsland_OnTransition:: @ 8166EE1 call_if_eq CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter end -CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: @ 8166F0B +CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: savebgm MUS_FOLLOW_ME setflag FLAG_TEMP_2 setobjectxyperm LOCALID_BILL, 15, 12 @@ -25,7 +25,7 @@ CinnabarIsland_EventScript_ReadyObjectsSailToOneIslandFromPokeCenter:: @ 8166F0B setobjectxyperm LOCALID_SEAGALLOP, 30, 12 return -CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland:: @ 8166F24 +CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland:: getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 18 goto_if_ge CinnabarIsland_EventScript_MoveSeagallopDown @@ -35,30 +35,30 @@ CinnabarIsland_EventScript_ReadyObjectsSailToOneIsland:: @ 8166F24 setobjectxyperm LOCALID_SEAGALLOP, 30, 12 return -CinnabarIsland_EventScript_MoveSeagallopDown:: @ 8166F4A +CinnabarIsland_EventScript_MoveSeagallopDown:: setobjectxyperm LOCALID_SEAGALLOP, 30, 8 return -CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands:: @ 8166F52 +CinnabarIsland_EventScript_ReadyObjectsReturnFromSeviiIslands:: setobjectxyperm LOCALID_BILL, 21, 8 setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP return -CinnabarIsland_EventScript_CheckUnlockGym:: @ 8166F5E +CinnabarIsland_EventScript_CheckUnlockGym:: goto_if_set FLAG_HIDE_POKEMON_MANSION_B1F_SECRET_KEY, CinnabarIsland_EventScript_UnlockGym return -CinnabarIsland_EventScript_UnlockGym:: @ 8166F68 +CinnabarIsland_EventScript_UnlockGym:: setvar VAR_TEMP_1, 1 return -CinnabarIsland_OnFrame:: @ 8166F6E +CinnabarIsland_OnFrame:: map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1, CinnabarIsland_EventScript_ExitPokeCenterForOneIsland map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 1, CinnabarIsland_EventScript_BillScene map_script_2 VAR_MAP_SCENE_CINNABAR_ISLAND, 3, CinnabarIsland_EventScript_ReturnFromSeviiIslands .2byte 0 -CinnabarIsland_EventScript_ExitPokeCenterForOneIsland:: @ 8166F88 +CinnabarIsland_EventScript_ExitPokeCenterForOneIsland:: lockall clearflag FLAG_DONT_TRANSITION_MUSIC savebgm MUS_DUMMY @@ -69,7 +69,7 @@ CinnabarIsland_EventScript_ExitPokeCenterForOneIsland:: @ 8166F88 releaseall end -CinnabarIsland_EventScript_ReturnFromSeviiIslands:: @ 8166FA0 +CinnabarIsland_EventScript_ReturnFromSeviiIslands:: lockall textcolor 0 msgbox CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain @@ -83,7 +83,7 @@ CinnabarIsland_EventScript_ReturnFromSeviiIslands:: @ 8166FA0 releaseall end -CinnabarIsland_Movement_BillExit:: @ 8166FC6 +CinnabarIsland_Movement_BillExit:: walk_down walk_down walk_down @@ -92,7 +92,7 @@ CinnabarIsland_Movement_BillExit:: @ 8166FC6 walk_down step_end -CinnabarIsland_EventScript_BillScene:: @ 8166FCD +CinnabarIsland_EventScript_BillScene:: lockall textcolor 0 call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillFacePlayer1 @@ -112,36 +112,36 @@ CinnabarIsland_EventScript_BillScene:: @ 8166FCD goto_if_eq CinnabarIsland_EventScript_DeclineSailToOneIsland end -CinnabarIsland_EventScript_BillFacePlayer1:: @ 8167032 +CinnabarIsland_EventScript_BillFacePlayer1:: applymovement LOCALID_BILL, Movement_WalkInPlaceFastestUp waitmovement 0 return -CinnabarIsland_EventScript_BillFacePlayer2:: @ 816703D +CinnabarIsland_EventScript_BillFacePlayer2:: applymovement LOCALID_BILL, Movement_WalkInPlaceFastestLeft waitmovement 0 return -CinnabarIsland_EventScript_BillApproachPlayer1:: @ 8167048 +CinnabarIsland_EventScript_BillApproachPlayer1:: applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer1 waitmovement 0 return -CinnabarIsland_EventScript_BillApproachPlayer2:: @ 8167053 +CinnabarIsland_EventScript_BillApproachPlayer2:: applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachPlayer2 waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -CinnabarIsland_EventScript_AgreeSailToOneIsland:: @ 8167068 +CinnabarIsland_EventScript_AgreeSailToOneIsland:: msgbox CinnabarIsland_Text_AllRightLetsGo closemessage call CinnabarIsland_EventScript_SailToOneIsland releaseall end -CinnabarIsland_EventScript_DeclineSailToOneIsland:: @ 8167078 +CinnabarIsland_EventScript_DeclineSailToOneIsland:: msgbox CinnabarIsland_Text_IllBeWaitingInPokeCenter closemessage call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BillExitToPokeCenter @@ -152,12 +152,12 @@ CinnabarIsland_EventScript_DeclineSailToOneIsland:: @ 8167078 releaseall end -CinnabarIsland_EventScript_BillExitToPokeCenter:: @ 81670A0 +CinnabarIsland_EventScript_BillExitToPokeCenter:: applymovement LOCALID_BILL, CinnabarIsland_Movement_BillExitToPokeCenter waitmovement 0 return -CinnabarIsland_Movement_BillExitToPokeCenter:: @ 81670AB +CinnabarIsland_Movement_BillExitToPokeCenter:: walk_right walk_down walk_down @@ -167,7 +167,7 @@ CinnabarIsland_Movement_BillExitToPokeCenter:: @ 81670AB walk_down step_end -CinnabarIsland_EventScript_BillReturnToPokeCenter:: @ 81670B3 +CinnabarIsland_EventScript_BillReturnToPokeCenter:: applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerWatchBillExit applymovement LOCALID_BILL, CinnabarIsland_Movement_BillApproachDoor waitmovement 0 @@ -179,25 +179,25 @@ CinnabarIsland_EventScript_BillReturnToPokeCenter:: @ 81670B3 waitdooranim return -CinnabarIsland_Movement_PlayerWatchBillExit:: @ 81670DB +CinnabarIsland_Movement_PlayerWatchBillExit:: walk_left walk_in_place_fastest_right step_end -CinnabarIsland_Movement_BillApproachDoor:: @ 81670DE +CinnabarIsland_Movement_BillApproachDoor:: delay_16 walk_left walk_in_place_fastest_up step_end -CinnabarIsland_Movement_BillReEnterPokeCenter:: @ 81670E2 +CinnabarIsland_Movement_BillReEnterPokeCenter:: walk_up delay_4 set_invisible step_end @ Can be triggered outside, or after talking to Bill in the poke center -CinnabarIsland_EventScript_SailToOneIsland:: @ 81670E6 +CinnabarIsland_EventScript_SailToOneIsland:: call_if_set FLAG_TEMP_2, CinnabarIsland_EventScript_ApproachShore addobject LOCALID_SEAGALLOP call_if_unset FLAG_TEMP_2, CinnabarIsland_EventScript_BoatArrive @@ -216,36 +216,36 @@ CinnabarIsland_EventScript_SailToOneIsland:: @ 81670E6 goto EventScript_SetSail end -CinnabarIsland_EventScript_ApproachShore:: @ 8167142 +CinnabarIsland_EventScript_ApproachShore:: applymovement LOCALID_BILL, CinnabarIsland_Movement_ApproachShore applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_ApproachShore waitmovement 0 return -CinnabarIsland_EventScript_BoatArrive:: @ 8167154 +CinnabarIsland_EventScript_BoatArrive:: applymovement LOCALID_BILL, CinnabarIsland_Movement_BillFaceBoat applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive waitmovement 0 return -CinnabarIsland_EventScript_BoatArriveExitedPokeCenter:: @ 8167166 +CinnabarIsland_EventScript_BoatArriveExitedPokeCenter:: applymovement LOCALID_SEAGALLOP, CinnabarIsland_Movement_BoatArrive waitmovement 0 return -CinnabarIsland_EventScript_BoardBoat:: @ 8167171 +CinnabarIsland_EventScript_BoardBoat:: applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoat applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoat waitmovement 0 return -CinnabarIsland_EventScript_BoardBoatExitedPokeCenter:: @ 8167183 +CinnabarIsland_EventScript_BoardBoatExitedPokeCenter:: applymovement LOCALID_BILL, CinnabarIsland_Movement_BillBoardBoatFromShore applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Movement_PlayerBoardBoatFromShore waitmovement 0 return -CinnabarIsland_Movement_BoatArrive:: @ 8167195 +CinnabarIsland_Movement_BoatArrive:: delay_16 delay_16 walk_fast_left @@ -255,7 +255,7 @@ CinnabarIsland_Movement_BoatArrive:: @ 8167195 walk_slower_left step_end -CinnabarIsland_Movement_BillBoardBoat:: @ 816719D +CinnabarIsland_Movement_BillBoardBoat:: walk_right walk_down walk_down @@ -264,24 +264,24 @@ CinnabarIsland_Movement_BillBoardBoat:: @ 816719D set_invisible step_end -CinnabarIsland_Movement_BillApproachPlayer1:: @ 81671A4 +CinnabarIsland_Movement_BillApproachPlayer1:: walk_up step_end -CinnabarIsland_Movement_BillApproachPlayer2:: @ 81671A6 +CinnabarIsland_Movement_BillApproachPlayer2:: walk_left walk_left walk_left step_end -CinnabarIsland_Movement_BillFaceBoat:: @ 81671AA +CinnabarIsland_Movement_BillFaceBoat:: delay_16 delay_16 delay_8 walk_in_place_fastest_right step_end -CinnabarIsland_Movement_ApproachShore:: @ 81671AF +CinnabarIsland_Movement_ApproachShore:: walk_right walk_right walk_right @@ -290,13 +290,13 @@ CinnabarIsland_Movement_ApproachShore:: @ 81671AF walk_right step_end -CinnabarIsland_Movement_BillBoardBoatFromShore:: @ 81671B6 +CinnabarIsland_Movement_BillBoardBoatFromShore:: walk_right delay_4 set_invisible step_end -CinnabarIsland_Movement_PlayerBoardBoat:: @ 81671BA +CinnabarIsland_Movement_PlayerBoardBoat:: walk_down walk_right walk_down @@ -308,7 +308,7 @@ CinnabarIsland_Movement_PlayerBoardBoat:: @ 81671BA set_invisible step_end -CinnabarIsland_Movement_PlayerBoardBoatFromShore:: @ 81671C4 +CinnabarIsland_Movement_PlayerBoardBoatFromShore:: walk_right delay_4 walk_right @@ -317,7 +317,7 @@ CinnabarIsland_Movement_PlayerBoardBoatFromShore:: @ 81671C4 step_end @ Triggered when VAR_TEMP_1 is 0 -CinnabarIsland_EventScript_GymDoorLocked:: @ 81671CA +CinnabarIsland_EventScript_GymDoorLocked:: lockall applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 @@ -329,11 +329,11 @@ CinnabarIsland_EventScript_GymDoorLocked:: @ 81671CA releaseall end -CinnabarIsland_Movement_ForcePlayerFromDoor:: @ 81671ED +CinnabarIsland_Movement_ForcePlayerFromDoor:: walk_down step_end -CinnabarIsland_EventScript_Woman:: @ 81671EF +CinnabarIsland_EventScript_Woman:: lock faceplayer famechecker FAMECHECKER_BLAINE, 3 @@ -341,19 +341,19 @@ CinnabarIsland_EventScript_Woman:: @ 81671EF release end -CinnabarIsland_EventScript_OldMan:: @ 8167208 +CinnabarIsland_EventScript_OldMan:: msgbox CinnabarIsland_Text_ScientistsExperimentInMansion, MSGBOX_NPC end -CinnabarIsland_EventScript_IslandSign:: @ 8167211 +CinnabarIsland_EventScript_IslandSign:: msgbox CinnabarIsland_Text_IslandSign, MSGBOX_SIGN end -CinnabarIsland_EventScript_PokemonLabSign:: @ 816721A +CinnabarIsland_EventScript_PokemonLabSign:: msgbox CinnabarIsland_Text_PokemonLab, MSGBOX_SIGN end -CinnabarIsland_EventScript_GymSign:: @ 8167223 +CinnabarIsland_EventScript_GymSign:: lockall famechecker FAMECHECKER_BLAINE, 0 msgbox CinnabarIsland_Text_GymSign diff --git a/data/maps/CinnabarIsland/text.inc b/data/maps/CinnabarIsland/text.inc index 08ea3e44b..379c7d0ab 100644 --- a/data/maps/CinnabarIsland/text.inc +++ b/data/maps/CinnabarIsland/text.inc @@ -1,35 +1,35 @@ -CinnabarIsland_Text_DoorIsLocked:: @ 8180B20 +CinnabarIsland_Text_DoorIsLocked:: .string "The door is locked…$" -CinnabarIsland_Text_BlaineLivedHereSinceBeforeLab:: @ 8180B34 +CinnabarIsland_Text_BlaineLivedHereSinceBeforeLab:: .string "CINNABAR GYM's BLAINE is quite the\n" .string "odd fellow.\p" .string "He's lived on the island since way\n" .string "before the LAB was built.$" -CinnabarIsland_Text_ScientistsExperimentInMansion:: @ 8180BA0 +CinnabarIsland_Text_ScientistsExperimentInMansion:: .string "Scientists conduct experiments \n" .string "in the burned-out building.\p" .string "You know, the one they call the\n" .string "POKéMON MANSION.$" -CinnabarIsland_Text_IslandSign:: @ 8180C0D +CinnabarIsland_Text_IslandSign:: .string "CINNABAR ISLAND\n" .string "The Fiery Town of Burning Desire$" -CinnabarIsland_Text_PokemonLab:: @ 8180C3E +CinnabarIsland_Text_PokemonLab:: .string "POKéMON LAB$" -CinnabarIsland_Text_GymSign:: @ 8180C4A +CinnabarIsland_Text_GymSign:: .string "CINNABAR ISLAND POKéMON GYM\n" .string "LEADER: BLAINE\l" .string "The Hotheaded Quiz Master!$" -CinnabarIsland_Text_HeyIfItIsntPlayer:: @ 8180C90 +CinnabarIsland_Text_HeyIfItIsntPlayer:: .string "Huh?\n" .string "Hey, if it isn't {PLAYER}!$" -CinnabarIsland_Text_ComeWithMeToOneIsland:: @ 8180CAA +CinnabarIsland_Text_ComeWithMeToOneIsland:: .string "Look, it's me, BILL.\n" .string "Long time no see!\p" .string "I hope you're still using my\n" @@ -43,11 +43,11 @@ CinnabarIsland_Text_ComeWithMeToOneIsland:: @ 8180CAA .string "How about it?\n" .string "Do you feel like coming with me?$" -CinnabarIsland_Text_AllRightLetsGo:: @ 8180DDD +CinnabarIsland_Text_AllRightLetsGo:: .string "All right, then.\n" .string "Let's go!$" -CinnabarIsland_Text_IllBeWaitingInPokeCenter:: @ 8180DF8 +CinnabarIsland_Text_IllBeWaitingInPokeCenter:: .string "What, are you too busy?\p" .string "Well, all right.\n" .string "The boat hasn't arrived yet anyway.\p" @@ -56,13 +56,13 @@ CinnabarIsland_Text_IllBeWaitingInPokeCenter:: @ 8180DF8 .string "Come see me when you're done with\n" .string "your business here.$" -CinnabarIsland_Text_MyPalsBoatArrived:: @ 8180EAD +CinnabarIsland_Text_MyPalsBoatArrived:: .string "Looks like my pal's boat arrived,\n" .string "too.\p" .string "He sent it specially here to\n" .string "CINNABAR to pick me up.$" -CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain:: @ 8180F09 +CinnabarIsland_Text_IfYouHaveTriPassYouCanGoAgain:: .string "Hey, wasn't that a long cruise?\p" .string "My buddy CELIO seemed to enjoy\n" .string "your company.\p" diff --git a/data/maps/CinnabarIsland_Gym/scripts.inc b/data/maps/CinnabarIsland_Gym/scripts.inc index 444f0b810..0d9a1ff0a 100644 --- a/data/maps/CinnabarIsland_Gym/scripts.inc +++ b/data/maps/CinnabarIsland_Gym/scripts.inc @@ -5,11 +5,11 @@ .set LOCALID_DUSTY, 6 .set LOCALID_ZAC, 7 -CinnabarIsland_Gym_MapScripts:: @ 816D94B +CinnabarIsland_Gym_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, CinnabarIsland_Gym_OnLoad .byte 0 -CinnabarIsland_Gym_OnLoad:: @ 816D951 +CinnabarIsland_Gym_OnLoad:: goto_if_set FLAG_DEFEATED_BLAINE, CinnabarIsland_Gym_OnLoadOpenAllDoors call_if_set FLAG_CINNABAR_GYM_QUIZ_1, CinnabarIsland_Gym_OnLoadOpenDoor1 call_if_set FLAG_CINNABAR_GYM_QUIZ_2, CinnabarIsland_Gym_OnLoadOpenDoor2 @@ -19,7 +19,7 @@ CinnabarIsland_Gym_OnLoad:: @ 816D951 call_if_set FLAG_CINNABAR_GYM_QUIZ_6, CinnabarIsland_Gym_OnLoadOpenDoor6 end -CinnabarIsland_Gym_OnLoadOpenAllDoors:: @ 816D991 +CinnabarIsland_Gym_OnLoadOpenAllDoors:: call CinnabarIsland_Gym_EventScript_OpenDoor1 call CinnabarIsland_Gym_EventScript_OpenDoor2 call CinnabarIsland_Gym_EventScript_OpenDoor3 @@ -28,31 +28,31 @@ CinnabarIsland_Gym_OnLoadOpenAllDoors:: @ 816D991 call CinnabarIsland_Gym_EventScript_OpenDoor6 end -CinnabarIsland_Gym_OnLoadOpenDoor1:: @ 816D9B0 +CinnabarIsland_Gym_OnLoadOpenDoor1:: call CinnabarIsland_Gym_EventScript_OpenDoor1 return -CinnabarIsland_Gym_OnLoadOpenDoor2:: @ 816D9B6 +CinnabarIsland_Gym_OnLoadOpenDoor2:: call CinnabarIsland_Gym_EventScript_OpenDoor2 return -CinnabarIsland_Gym_OnLoadOpenDoor3:: @ 816D9BC +CinnabarIsland_Gym_OnLoadOpenDoor3:: call CinnabarIsland_Gym_EventScript_OpenDoor3 return -CinnabarIsland_Gym_OnLoadOpenDoor4:: @ 816D9C2 +CinnabarIsland_Gym_OnLoadOpenDoor4:: call CinnabarIsland_Gym_EventScript_OpenDoor4 return -CinnabarIsland_Gym_OnLoadOpenDoor5:: @ 816D9C8 +CinnabarIsland_Gym_OnLoadOpenDoor5:: call CinnabarIsland_Gym_EventScript_OpenDoor5 return -CinnabarIsland_Gym_OnLoadOpenDoor6:: @ 816D9CE +CinnabarIsland_Gym_OnLoadOpenDoor6:: call CinnabarIsland_Gym_EventScript_OpenDoor6 return -CinnabarIsland_Gym_EventScript_Blaine:: @ 816D9D4 +CinnabarIsland_Gym_EventScript_Blaine:: famechecker FAMECHECKER_BLAINE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle_single TRAINER_LEADER_BLAINE, CinnabarIsland_Gym_Text_BlaineIntro, CinnabarIsland_Gym_Text_BlaineDefeat, CinnabarIsland_Gym_EventScript_DefeatedBlaine, NO_MUSIC goto_if_unset FLAG_GOT_TM38_FROM_BLAINE, CinnabarIsland_Gym_EventScript_GiveTM38 @@ -60,7 +60,7 @@ CinnabarIsland_Gym_EventScript_Blaine:: @ 816D9D4 release end -CinnabarIsland_Gym_EventScript_DefeatedBlaine:: @ 816DA06 +CinnabarIsland_Gym_EventScript_DefeatedBlaine:: famechecker FAMECHECKER_BLAINE, 1 setflag FLAG_DEFEATED_BLAINE setflag FLAG_BADGE07_GET @@ -71,7 +71,7 @@ CinnabarIsland_Gym_EventScript_DefeatedBlaine:: @ 816DA06 goto CinnabarIsland_Gym_EventScript_GiveTM38 end -CinnabarIsland_Gym_EventScript_GiveTM38:: @ 816DA34 +CinnabarIsland_Gym_EventScript_GiveTM38:: msgbox CinnabarIsland_Gym_Text_ExplainVolcanoBadge checkitemspace ITEM_TM38, 1 compare VAR_RESULT, FALSE @@ -82,102 +82,102 @@ CinnabarIsland_Gym_EventScript_GiveTM38:: @ 816DA34 release end -CinnabarIsland_Gym_EventScript_NoRoomForTM38:: @ 816DA75 +CinnabarIsland_Gym_EventScript_NoRoomForTM38:: msgbox CinnabarIsland_Gym_Text_MakeSpaceForThis release end -CinnabarIsland_Gym_EventScript_Erik:: @ 816DA7F +CinnabarIsland_Gym_EventScript_Erik:: trainerbattle_single TRAINER_SUPER_NERD_ERIK, CinnabarIsland_Gym_Text_ErikIntro, CinnabarIsland_Gym_Text_ErikDefeat msgbox CinnabarIsland_Gym_Text_ErikPostBattle, MSGBOX_AUTOCLOSE end -CinnabarIsland_Gym_EventScript_Avery:: @ 816DA96 +CinnabarIsland_Gym_EventScript_Avery:: trainerbattle_single TRAINER_SUPER_NERD_AVERY, CinnabarIsland_Gym_Text_AveryIntro, CinnabarIsland_Gym_Text_AveryDefeat, CinnabarIsland_Gym_EventScript_DefeatedAvery msgbox CinnabarIsland_Gym_Text_AveryPostBattle, MSGBOX_AUTOCLOSE end -CinnabarIsland_Gym_EventScript_DefeatedAvery:: @ 816DAB1 +CinnabarIsland_Gym_EventScript_DefeatedAvery:: call_if_unset FLAG_CINNABAR_GYM_QUIZ_2, CinnabarIsland_Gym_EventScript_Quiz2CompleteTrainer release end -CinnabarIsland_Gym_EventScript_Quiz2CompleteTrainer:: @ 816DABC +CinnabarIsland_Gym_EventScript_Quiz2CompleteTrainer:: call CinnabarIsland_Gym_EventScript_Quiz2Complete return -CinnabarIsland_Gym_EventScript_Derek:: @ 816DAC2 +CinnabarIsland_Gym_EventScript_Derek:: trainerbattle_single TRAINER_SUPER_NERD_DEREK, CinnabarIsland_Gym_Text_DerekIntro, CinnabarIsland_Gym_Text_DerekDefeat, CinnabarIsland_Gym_EventScript_DefeatedDerek famechecker FAMECHECKER_BLAINE, 2 msgbox CinnabarIsland_Gym_Text_DerekPostBattle, MSGBOX_AUTOCLOSE end -CinnabarIsland_Gym_EventScript_DefeatedDerek:: @ 816DAEA +CinnabarIsland_Gym_EventScript_DefeatedDerek:: call_if_unset FLAG_CINNABAR_GYM_QUIZ_4, CinnabarIsland_Gym_EventScript_Quiz4CompleteTrainer release end -CinnabarIsland_Gym_EventScript_Quiz4CompleteTrainer:: @ 816DAF5 +CinnabarIsland_Gym_EventScript_Quiz4CompleteTrainer:: call CinnabarIsland_Gym_EventScript_Quiz4Complete return -CinnabarIsland_Gym_EventScript_Zac:: @ 816DAFB +CinnabarIsland_Gym_EventScript_Zac:: trainerbattle_single TRAINER_SUPER_NERD_ZAC, CinnabarIsland_Gym_Text_ZacIntro, CinnabarIsland_Gym_Text_ZacDefeat, CinnabarIsland_Gym_EventScript_DefeatedZac msgbox CinnabarIsland_Gym_Text_ZacPostBattle, MSGBOX_AUTOCLOSE end -CinnabarIsland_Gym_EventScript_DefeatedZac:: @ 816DB16 +CinnabarIsland_Gym_EventScript_DefeatedZac:: call_if_unset FLAG_CINNABAR_GYM_QUIZ_6, CinnabarIsland_Gym_EventScript_Quiz6CompleteTrainer release end -CinnabarIsland_Gym_EventScript_Quiz6CompleteTrainer:: @ 816DB21 +CinnabarIsland_Gym_EventScript_Quiz6CompleteTrainer:: call CinnabarIsland_Gym_EventScript_Quiz6Complete return -CinnabarIsland_Gym_EventScript_Quinn:: @ 816DB27 +CinnabarIsland_Gym_EventScript_Quinn:: trainerbattle_single TRAINER_BURGLAR_QUINN, CinnabarIsland_Gym_Text_QuinnIntro, CinnabarIsland_Gym_Text_QuinnDefeat, CinnabarIsland_Gym_EventScript_DefeatedQuinn msgbox CinnabarIsland_Gym_Text_QuinnPostBattle, MSGBOX_AUTOCLOSE end -CinnabarIsland_Gym_EventScript_DefeatedQuinn:: @ 816DB42 +CinnabarIsland_Gym_EventScript_DefeatedQuinn:: call_if_unset FLAG_CINNABAR_GYM_QUIZ_1, CinnabarIsland_Gym_EventScript_Quiz1CompleteTrainer release end -CinnabarIsland_Gym_EventScript_Quiz1CompleteTrainer:: @ 816DB4D +CinnabarIsland_Gym_EventScript_Quiz1CompleteTrainer:: call CinnabarIsland_Gym_EventScript_Quiz1Complete return -CinnabarIsland_Gym_EventScript_Ramon:: @ 816DB53 +CinnabarIsland_Gym_EventScript_Ramon:: trainerbattle_single TRAINER_BURGLAR_RAMON, CinnabarIsland_Gym_Text_RamonIntro, CinnabarIsland_Gym_Text_RamonDefeat, CinnabarIsland_Gym_EventScript_DefeatedRamon msgbox CinnabarIsland_Gym_Text_RamonPostBattle, MSGBOX_AUTOCLOSE end -CinnabarIsland_Gym_EventScript_DefeatedRamon:: @ 816DB6E +CinnabarIsland_Gym_EventScript_DefeatedRamon:: call_if_unset FLAG_CINNABAR_GYM_QUIZ_3, CinnabarIsland_Gym_EventScript_Quiz3CompleteTrainer release end -CinnabarIsland_Gym_EventScript_Quiz3CompleteTrainer:: @ 816DB79 +CinnabarIsland_Gym_EventScript_Quiz3CompleteTrainer:: call CinnabarIsland_Gym_EventScript_Quiz3Complete return -CinnabarIsland_Gym_EventScript_Dusty:: @ 816DB7F +CinnabarIsland_Gym_EventScript_Dusty:: trainerbattle_single TRAINER_BURGLAR_DUSTY, CinnabarIsland_Gym_Text_DustyIntro, CinnabarIsland_Gym_Text_DustyDefeat, CinnabarIsland_Gym_EventScript_DefeatedDusty msgbox CinnabarIsland_Gym_Text_DustyPostBattle, MSGBOX_AUTOCLOSE end -CinnabarIsland_Gym_EventScript_DefeatedDusty:: @ 816DB9A +CinnabarIsland_Gym_EventScript_DefeatedDusty:: call_if_unset FLAG_CINNABAR_GYM_QUIZ_5, CinnabarIsland_Gym_EventScript_Quiz5CompleteTrainer release end -CinnabarIsland_Gym_EventScript_Quiz5CompleteTrainer:: @ 816DBA5 +CinnabarIsland_Gym_EventScript_Quiz5CompleteTrainer:: call CinnabarIsland_Gym_EventScript_Quiz5Complete return -CinnabarIsland_Gym_EventScript_GymGuy:: @ 816DBAB +CinnabarIsland_Gym_EventScript_GymGuy:: lock faceplayer goto_if_set FLAG_DEFEATED_BLAINE, CinnabarIsland_Gym_EventScript_GymGuyPostVictory @@ -185,36 +185,36 @@ CinnabarIsland_Gym_EventScript_GymGuy:: @ 816DBAB release end -CinnabarIsland_Gym_EventScript_GymGuyPostVictory:: @ 816DBC0 +CinnabarIsland_Gym_EventScript_GymGuyPostVictory:: msgbox CinnabarIsland_Gym_Text_GymGuyPostVictory release end -CinnabarIsland_Gym_EventScript_GymStatue:: @ 816DBCA +CinnabarIsland_Gym_EventScript_GymStatue:: lockall goto_if_set FLAG_BADGE07_GET, CinnabarIsland_Gym_EventScript_GymStatuePostVictory msgbox CinnabarIsland_Gym_Text_GymStatue releaseall end -CinnabarIsland_Gym_EventScript_GymStatuePostVictory:: @ 816DBDE +CinnabarIsland_Gym_EventScript_GymStatuePostVictory:: msgbox CinnabarIsland_Gym_Text_GymStatuePlayerWon releaseall end -CinnabarIsland_Gym_EventScript_Quz1Left:: @ 816DBE8 +CinnabarIsland_Gym_EventScript_Quz1Left:: lockall setvar VAR_TEMP_1, 0 goto CinnabarIsland_Gym_EventScript_Quiz1 end -CinnabarIsland_Gym_EventScript_Quz1Right:: @ 816DBF4 +CinnabarIsland_Gym_EventScript_Quz1Right:: lockall setvar VAR_TEMP_1, 1 goto CinnabarIsland_Gym_EventScript_Quiz1 end -CinnabarIsland_Gym_EventScript_Quiz1:: @ 816DC00 +CinnabarIsland_Gym_EventScript_Quiz1:: msgbox CinnabarIsland_Gym_Text_PokemonQuizRules msgbox CinnabarIsland_Gym_Text_QuizQuestion1, MSGBOX_YESNO compare VAR_RESULT, YES @@ -223,13 +223,13 @@ CinnabarIsland_Gym_EventScript_Quiz1:: @ 816DC00 goto_if_eq CinnabarIsland_Gym_EventScript_Quiz1Incorrect end -CinnabarIsland_Gym_EventScript_CorrectAnswer:: @ 816DC27 +CinnabarIsland_Gym_EventScript_CorrectAnswer:: playfanfare MUS_LEVEL_UP waitfanfare msgbox CinnabarIsland_Gym_Text_CorrectGoOnThrough return -CinnabarIsland_Gym_EventScript_IncorrectAnswer:: @ 816DC34 +CinnabarIsland_Gym_EventScript_IncorrectAnswer:: waitse playse SE_BOO waitse @@ -237,14 +237,14 @@ CinnabarIsland_Gym_EventScript_IncorrectAnswer:: @ 816DC34 closemessage return -CinnabarIsland_Gym_EventScript_Quiz1Correct:: @ 816DC43 +CinnabarIsland_Gym_EventScript_Quiz1Correct:: call CinnabarIsland_Gym_EventScript_CorrectAnswer goto_if_set FLAG_CINNABAR_GYM_QUIZ_1, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen call CinnabarIsland_Gym_EventScript_Quiz1Complete releaseall end -CinnabarIsland_Gym_EventScript_Quiz1Complete:: @ 816DC58 +CinnabarIsland_Gym_EventScript_Quiz1Complete:: playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor1 @@ -252,17 +252,17 @@ CinnabarIsland_Gym_EventScript_Quiz1Complete:: @ 816DC58 setflag FLAG_CINNABAR_GYM_QUIZ_1 return -CinnabarIsland_Gym_EventScript_DoorAlreadyOpen:: @ 816DC68 +CinnabarIsland_Gym_EventScript_DoorAlreadyOpen:: releaseall end -CinnabarIsland_Gym_EventScript_Quiz1Incorrect:: @ 816DC6A +CinnabarIsland_Gym_EventScript_Quiz1Incorrect:: call CinnabarIsland_Gym_EventScript_IncorrectAnswer goto_if_not_defeated TRAINER_BURGLAR_QUINN, CinnabarIsland_Gym_EventScript_BattleQuinn releaseall end -CinnabarIsland_Gym_EventScript_BattleQuinn:: @ 816DC7A +CinnabarIsland_Gym_EventScript_BattleQuinn:: compare VAR_TEMP_1, 0 call_if_eq CinnabarIsland_Gym_EventScript_QuinnApproachLeft compare VAR_TEMP_1, 1 @@ -275,40 +275,40 @@ CinnabarIsland_Gym_EventScript_BattleQuinn:: @ 816DC7A releaseall end -CinnabarIsland_Gym_EventScript_QuinnApproachLeft:: @ 816DCB4 +CinnabarIsland_Gym_EventScript_QuinnApproachLeft:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachLeft waitmovement 0 return -CinnabarIsland_Gym_EventScript_QuinnApproachRight:: @ 816DCC6 +CinnabarIsland_Gym_EventScript_QuinnApproachRight:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement LOCALID_QUINN, CinnabarIsland_Gym_Movement_QuinnApproachRight waitmovement 0 return -CinnabarIsland_Gym_Movement_QuinnApproachLeft:: @ 816DCD8 +CinnabarIsland_Gym_Movement_QuinnApproachLeft:: walk_left walk_left step_end -CinnabarIsland_Gym_Movement_QuinnApproachRight:: @ 816DCDB +CinnabarIsland_Gym_Movement_QuinnApproachRight:: walk_left step_end -CinnabarIsland_Gym_EventScript_Quiz2Left:: @ 816DCDD +CinnabarIsland_Gym_EventScript_Quiz2Left:: lockall setvar VAR_TEMP_1, 0 goto CinnabarIsland_Gym_EventScript_Quiz2 end -CinnabarIsland_Gym_EventScript_Quiz2Right:: @ 816DCE9 +CinnabarIsland_Gym_EventScript_Quiz2Right:: lockall setvar VAR_TEMP_1, 1 goto CinnabarIsland_Gym_EventScript_Quiz2 end -CinnabarIsland_Gym_EventScript_Quiz2:: @ 816DCF5 +CinnabarIsland_Gym_EventScript_Quiz2:: msgbox CinnabarIsland_Gym_Text_PokemonQuizRules msgbox CinnabarIsland_Gym_Text_QuizQuestion2, MSGBOX_YESNO compare VAR_RESULT, YES @@ -317,14 +317,14 @@ CinnabarIsland_Gym_EventScript_Quiz2:: @ 816DCF5 goto_if_eq CinnabarIsland_Gym_EventScript_Quiz2Correct end -CinnabarIsland_Gym_EventScript_Quiz2Correct:: @ 816DD1C +CinnabarIsland_Gym_EventScript_Quiz2Correct:: call CinnabarIsland_Gym_EventScript_CorrectAnswer goto_if_set FLAG_CINNABAR_GYM_QUIZ_2, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen call CinnabarIsland_Gym_EventScript_Quiz2Complete releaseall end -CinnabarIsland_Gym_EventScript_Quiz2Complete:: @ 816DD31 +CinnabarIsland_Gym_EventScript_Quiz2Complete:: playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor2 @@ -332,13 +332,13 @@ CinnabarIsland_Gym_EventScript_Quiz2Complete:: @ 816DD31 setflag FLAG_CINNABAR_GYM_QUIZ_2 return -CinnabarIsland_Gym_EventScript_Quiz2Incorrect:: @ 816DD41 +CinnabarIsland_Gym_EventScript_Quiz2Incorrect:: call CinnabarIsland_Gym_EventScript_IncorrectAnswer goto_if_not_defeated TRAINER_SUPER_NERD_AVERY, CinnabarIsland_Gym_EventScript_BattleAvery releaseall end -CinnabarIsland_Gym_EventScript_BattleAvery:: @ 816DD51 +CinnabarIsland_Gym_EventScript_BattleAvery:: compare VAR_TEMP_1, 0 call_if_eq CinnabarIsland_Gym_EventScript_AveryApproachLeft compare VAR_TEMP_1, 1 @@ -351,49 +351,49 @@ CinnabarIsland_Gym_EventScript_BattleAvery:: @ 816DD51 releaseall end -CinnabarIsland_Gym_EventScript_AveryApproachLeft:: @ 816DD8B +CinnabarIsland_Gym_EventScript_AveryApproachLeft:: applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery applymovement LOCALID_AVERY, CinnabarIsland_Gym_Movement_AveryApproachLeft waitmovement 0 return -CinnabarIsland_Gym_EventScript_AveryApproachRight:: @ 816DD9D +CinnabarIsland_Gym_EventScript_AveryApproachRight:: applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_Gym_Movement_PlayerFaceAvery applymovement LOCALID_AVERY, CinnabarIsland_Gym_Movement_AveryApproachRight waitmovement 0 return -CinnabarIsland_Gym_Movement_AveryApproachLeft:: @ 816DDAF +CinnabarIsland_Gym_Movement_AveryApproachLeft:: walk_up walk_up walk_left step_end -CinnabarIsland_Gym_Movement_AveryApproachRight:: @ 816DDB3 +CinnabarIsland_Gym_Movement_AveryApproachRight:: walk_up walk_up walk_in_place_fastest_left step_end -CinnabarIsland_Gym_Movement_PlayerFaceAvery:: @ 816DDB7 +CinnabarIsland_Gym_Movement_PlayerFaceAvery:: delay_16 delay_16 walk_in_place_fastest_right step_end -CinnabarIsland_Gym_EventScript_Quiz3Left:: @ 816DDBB +CinnabarIsland_Gym_EventScript_Quiz3Left:: lockall setvar VAR_TEMP_1, 0 goto CinnabarIsland_Gym_EventScript_Quiz3 end -CinnabarIsland_Gym_EventScript_Quiz3Right:: @ 816DDC7 +CinnabarIsland_Gym_EventScript_Quiz3Right:: lockall setvar VAR_TEMP_1, 1 goto CinnabarIsland_Gym_EventScript_Quiz3 end -CinnabarIsland_Gym_EventScript_Quiz3:: @ 816DDD3 +CinnabarIsland_Gym_EventScript_Quiz3:: msgbox CinnabarIsland_Gym_Text_PokemonQuizRules msgbox CinnabarIsland_Gym_Text_QuizQuestion3, MSGBOX_YESNO compare VAR_RESULT, YES @@ -402,14 +402,14 @@ CinnabarIsland_Gym_EventScript_Quiz3:: @ 816DDD3 goto_if_eq CinnabarIsland_Gym_EventScript_Quiz3Correct end -CinnabarIsland_Gym_EventScript_Quiz3Correct:: @ 816DDFA +CinnabarIsland_Gym_EventScript_Quiz3Correct:: call CinnabarIsland_Gym_EventScript_CorrectAnswer goto_if_set FLAG_CINNABAR_GYM_QUIZ_3, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen call CinnabarIsland_Gym_EventScript_Quiz3Complete releaseall end -CinnabarIsland_Gym_EventScript_Quiz3Complete:: @ 816DE0F +CinnabarIsland_Gym_EventScript_Quiz3Complete:: playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor3 @@ -417,13 +417,13 @@ CinnabarIsland_Gym_EventScript_Quiz3Complete:: @ 816DE0F setflag FLAG_CINNABAR_GYM_QUIZ_3 return -CinnabarIsland_Gym_EventScript_Quiz3Incorrect:: @ 816DE1F +CinnabarIsland_Gym_EventScript_Quiz3Incorrect:: call CinnabarIsland_Gym_EventScript_IncorrectAnswer goto_if_not_defeated TRAINER_BURGLAR_RAMON, CinnabarIsland_Gym_EventScript_BattleRamon releaseall end -CinnabarIsland_Gym_EventScript_BattleRamon:: @ 816DE2F +CinnabarIsland_Gym_EventScript_BattleRamon:: compare VAR_TEMP_1, 0 call_if_eq CinnabarIsland_Gym_EventScript_RamonApproachLeft compare VAR_TEMP_1, 1 @@ -436,40 +436,40 @@ CinnabarIsland_Gym_EventScript_BattleRamon:: @ 816DE2F releaseall end -CinnabarIsland_Gym_EventScript_RamonApproachLeft:: @ 816DE69 +CinnabarIsland_Gym_EventScript_RamonApproachLeft:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachLeft waitmovement 0 return -CinnabarIsland_Gym_EventScript_RamonApproachRight:: @ 816DE7B +CinnabarIsland_Gym_EventScript_RamonApproachRight:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement LOCALID_RAMON, CinnabarIsland_Gym_Movement_RamonApproachRight waitmovement 0 return -CinnabarIsland_Gym_Movement_RamonApproachLeft:: @ 816DE8D +CinnabarIsland_Gym_Movement_RamonApproachLeft:: walk_left walk_left step_end -CinnabarIsland_Gym_Movement_RamonApproachRight:: @ 816DE90 +CinnabarIsland_Gym_Movement_RamonApproachRight:: walk_left step_end -CinnabarIsland_Gym_EventScript_Quiz4Left:: @ 816DE92 +CinnabarIsland_Gym_EventScript_Quiz4Left:: lockall setvar VAR_TEMP_1, 0 goto CinnabarIsland_Gym_EventScript_Quiz4 end -CinnabarIsland_Gym_EventScript_Quiz4Right:: @ 816DE9E +CinnabarIsland_Gym_EventScript_Quiz4Right:: lockall setvar VAR_TEMP_1, 1 goto CinnabarIsland_Gym_EventScript_Quiz4 end -CinnabarIsland_Gym_EventScript_Quiz4:: @ 816DEAA +CinnabarIsland_Gym_EventScript_Quiz4:: msgbox CinnabarIsland_Gym_Text_PokemonQuizRules msgbox CinnabarIsland_Gym_Text_QuizQuestion4, MSGBOX_YESNO compare VAR_RESULT, YES @@ -478,14 +478,14 @@ CinnabarIsland_Gym_EventScript_Quiz4:: @ 816DEAA goto_if_eq CinnabarIsland_Gym_EventScript_Quiz4Correct end -CinnabarIsland_Gym_EventScript_Quiz4Correct:: @ 816DED1 +CinnabarIsland_Gym_EventScript_Quiz4Correct:: call CinnabarIsland_Gym_EventScript_CorrectAnswer goto_if_set FLAG_CINNABAR_GYM_QUIZ_4, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen call CinnabarIsland_Gym_EventScript_Quiz4Complete releaseall end -CinnabarIsland_Gym_EventScript_Quiz4Complete:: @ 816DEE6 +CinnabarIsland_Gym_EventScript_Quiz4Complete:: playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor4 @@ -493,13 +493,13 @@ CinnabarIsland_Gym_EventScript_Quiz4Complete:: @ 816DEE6 setflag FLAG_CINNABAR_GYM_QUIZ_4 return -CinnabarIsland_Gym_EventScript_Quiz4Incorrect:: @ 816DEF6 +CinnabarIsland_Gym_EventScript_Quiz4Incorrect:: call CinnabarIsland_Gym_EventScript_IncorrectAnswer goto_if_not_defeated TRAINER_SUPER_NERD_DEREK, CinnabarIsland_Gym_EventScript_BattleDerek releaseall end -CinnabarIsland_Gym_EventScript_BattleDerek:: @ 816DF06 +CinnabarIsland_Gym_EventScript_BattleDerek:: compare VAR_TEMP_1, 0 call_if_eq CinnabarIsland_Gym_EventScript_DerekApproachLeft compare VAR_TEMP_1, 1 @@ -512,40 +512,40 @@ CinnabarIsland_Gym_EventScript_BattleDerek:: @ 816DF06 releaseall end -CinnabarIsland_Gym_EventScript_DerekApproachLeft:: @ 816DF40 +CinnabarIsland_Gym_EventScript_DerekApproachLeft:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachLeft waitmovement 0 return -CinnabarIsland_Gym_EventScript_DerekApproachRight:: @ 816DF52 +CinnabarIsland_Gym_EventScript_DerekApproachRight:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement LOCALID_DEREK, CinnabarIsland_Gym_Movement_DerekApproachRight waitmovement 0 return -CinnabarIsland_Gym_Movement_DerekApproachLeft:: @ 816DF64 +CinnabarIsland_Gym_Movement_DerekApproachLeft:: walk_left walk_left step_end -CinnabarIsland_Gym_Movement_DerekApproachRight:: @ 816DF67 +CinnabarIsland_Gym_Movement_DerekApproachRight:: walk_left step_end -CinnabarIsland_Gym_EventScript_Quiz5Left:: @ 816DF69 +CinnabarIsland_Gym_EventScript_Quiz5Left:: lockall setvar VAR_TEMP_1, 0 goto CinnabarIsland_Gym_EventScript_Quiz5 end -CinnabarIsland_Gym_EventScript_Quiz5Right:: @ 816DF75 +CinnabarIsland_Gym_EventScript_Quiz5Right:: lockall setvar VAR_TEMP_1, 1 goto CinnabarIsland_Gym_EventScript_Quiz5 end -CinnabarIsland_Gym_EventScript_Quiz5:: @ 816DF81 +CinnabarIsland_Gym_EventScript_Quiz5:: msgbox CinnabarIsland_Gym_Text_PokemonQuizRules msgbox CinnabarIsland_Gym_Text_QuizQuestion5, MSGBOX_YESNO compare VAR_RESULT, YES @@ -554,14 +554,14 @@ CinnabarIsland_Gym_EventScript_Quiz5:: @ 816DF81 goto_if_eq CinnabarIsland_Gym_EventScript_Quiz5Incorrect end -CinnabarIsland_Gym_EventScript_Quiz5Correct:: @ 816DFA8 +CinnabarIsland_Gym_EventScript_Quiz5Correct:: call CinnabarIsland_Gym_EventScript_CorrectAnswer goto_if_set FLAG_CINNABAR_GYM_QUIZ_5, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen call CinnabarIsland_Gym_EventScript_Quiz5Complete releaseall end -CinnabarIsland_Gym_EventScript_Quiz5Complete:: @ 816DFBD +CinnabarIsland_Gym_EventScript_Quiz5Complete:: playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor5 @@ -569,13 +569,13 @@ CinnabarIsland_Gym_EventScript_Quiz5Complete:: @ 816DFBD setflag FLAG_CINNABAR_GYM_QUIZ_5 return -CinnabarIsland_Gym_EventScript_Quiz5Incorrect:: @ 816DFCD +CinnabarIsland_Gym_EventScript_Quiz5Incorrect:: call CinnabarIsland_Gym_EventScript_IncorrectAnswer goto_if_not_defeated TRAINER_BURGLAR_DUSTY, CinnabarIsland_Gym_EventScript_BattleDusty releaseall end -CinnabarIsland_Gym_EventScript_BattleDusty:: @ 816DFDD +CinnabarIsland_Gym_EventScript_BattleDusty:: compare VAR_TEMP_1, 0 call_if_eq CinnabarIsland_Gym_EventScript_DustyApproachLeft compare VAR_TEMP_1, 1 @@ -588,40 +588,40 @@ CinnabarIsland_Gym_EventScript_BattleDusty:: @ 816DFDD releaseall end -CinnabarIsland_Gym_EventScript_DustyApproachLeft:: @ 816E017 +CinnabarIsland_Gym_EventScript_DustyApproachLeft:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachLeft waitmovement 0 return -CinnabarIsland_Gym_EventScript_DustyApproachRight:: @ 816E029 +CinnabarIsland_Gym_EventScript_DustyApproachRight:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement LOCALID_DUSTY, CinnabarIsland_Gym_Movement_DustyApproachRight waitmovement 0 return -CinnabarIsland_Gym_Movement_DustyApproachLeft:: @ 816E03B +CinnabarIsland_Gym_Movement_DustyApproachLeft:: walk_left walk_left step_end -CinnabarIsland_Gym_Movement_DustyApproachRight:: @ 816E03E +CinnabarIsland_Gym_Movement_DustyApproachRight:: walk_left step_end -CinnabarIsland_Gym_EventScript_Quiz6Left:: @ 816E040 +CinnabarIsland_Gym_EventScript_Quiz6Left:: lockall setvar VAR_TEMP_1, 0 goto CinnabarIsland_Gym_EventScript_Quiz6 end -CinnabarIsland_Gym_EventScript_Quiz6Right:: @ 816E04C +CinnabarIsland_Gym_EventScript_Quiz6Right:: lockall setvar VAR_TEMP_1, 1 goto CinnabarIsland_Gym_EventScript_Quiz6 end -CinnabarIsland_Gym_EventScript_Quiz6:: @ 816E058 +CinnabarIsland_Gym_EventScript_Quiz6:: msgbox CinnabarIsland_Gym_Text_PokemonQuizRules msgbox CinnabarIsland_Gym_Text_QuizQuestion6, MSGBOX_YESNO compare VAR_RESULT, YES @@ -630,14 +630,14 @@ CinnabarIsland_Gym_EventScript_Quiz6:: @ 816E058 goto_if_eq CinnabarIsland_Gym_EventScript_Quiz6Correct end -CinnabarIsland_Gym_EventScript_Quiz6Correct:: @ 816E07F +CinnabarIsland_Gym_EventScript_Quiz6Correct:: call CinnabarIsland_Gym_EventScript_CorrectAnswer goto_if_set FLAG_CINNABAR_GYM_QUIZ_6, CinnabarIsland_Gym_EventScript_DoorAlreadyOpen call CinnabarIsland_Gym_EventScript_Quiz6Complete releaseall end -CinnabarIsland_Gym_EventScript_Quiz6Complete:: @ 816E094 +CinnabarIsland_Gym_EventScript_Quiz6Complete:: playse SE_UNLOCK waitse call CinnabarIsland_Gym_EventScript_OpenDoor6 @@ -645,13 +645,13 @@ CinnabarIsland_Gym_EventScript_Quiz6Complete:: @ 816E094 setflag FLAG_CINNABAR_GYM_QUIZ_6 return -CinnabarIsland_Gym_EventScript_Quiz6Incorrect:: @ 816E0A4 +CinnabarIsland_Gym_EventScript_Quiz6Incorrect:: call CinnabarIsland_Gym_EventScript_IncorrectAnswer goto_if_not_defeated TRAINER_SUPER_NERD_ZAC, CinnabarIsland_Gym_EventScript_BattleZac releaseall end -CinnabarIsland_Gym_EventScript_BattleZac:: @ 816E0B4 +CinnabarIsland_Gym_EventScript_BattleZac:: compare VAR_TEMP_1, 0 call_if_eq CinnabarIsland_Gym_EventScript_ZacApproachLeft compare VAR_TEMP_1, 1 @@ -664,28 +664,28 @@ CinnabarIsland_Gym_EventScript_BattleZac:: @ 816E0B4 releaseall end -CinnabarIsland_Gym_EventScript_ZacApproachLeft:: @ 816E0EE +CinnabarIsland_Gym_EventScript_ZacApproachLeft:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachLeft waitmovement 0 return -CinnabarIsland_Gym_EventScript_ZacApproachRight:: @ 816E100 +CinnabarIsland_Gym_EventScript_ZacApproachRight:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight applymovement LOCALID_ZAC, CinnabarIsland_Gym_Movement_ZacApproachRight waitmovement 0 return -CinnabarIsland_Gym_Movement_ZacApproachLeft:: @ 816E112 +CinnabarIsland_Gym_Movement_ZacApproachLeft:: walk_left walk_left step_end -CinnabarIsland_Gym_Movement_ZacApproachRight:: @ 816E115 +CinnabarIsland_Gym_Movement_ZacApproachRight:: walk_left step_end -CinnabarIsland_Gym_EventScript_OpenDoor1:: @ 816E117 +CinnabarIsland_Gym_EventScript_OpenDoor1:: setmetatile 26, 8, METATILE_CinnabarGym_Floor_WallLeftCorner, 0 setmetatile 27, 8, METATILE_CinnabarGym_Floor_WallRightCorner, 0 setmetatile 26, 9, METATILE_CinnabarGym_Floor_WallLeftEdge, 0 @@ -695,7 +695,7 @@ CinnabarIsland_Gym_EventScript_OpenDoor1:: @ 816E117 setmetatile 28, 10, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0 return -CinnabarIsland_Gym_EventScript_OpenDoor2:: @ 816E157 +CinnabarIsland_Gym_EventScript_OpenDoor2:: setmetatile 17, 8, METATILE_CinnabarGym_Floor_WallLeftCorner, 0 setmetatile 18, 8, METATILE_CinnabarGym_Floor_WallRightCorner, 0 setmetatile 17, 9, METATILE_CinnabarGym_Floor_WallLeftEdge, 0 @@ -705,7 +705,7 @@ CinnabarIsland_Gym_EventScript_OpenDoor2:: @ 816E157 setmetatile 19, 10, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0 return -CinnabarIsland_Gym_EventScript_OpenDoor3:: @ 816E197 +CinnabarIsland_Gym_EventScript_OpenDoor3:: setmetatile 17, 15, METATILE_CinnabarGym_Floor_WallLeftCorner, 0 setmetatile 18, 15, METATILE_CinnabarGym_Floor_WallRightCorner, 0 setmetatile 17, 16, METATILE_CinnabarGym_Floor_WallLeftEdge, 0 @@ -715,13 +715,13 @@ CinnabarIsland_Gym_EventScript_OpenDoor3:: @ 816E197 setmetatile 19, 17, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0 return -CinnabarIsland_Gym_EventScript_OpenDoor4:: @ 816E1D7 +CinnabarIsland_Gym_EventScript_OpenDoor4:: setmetatile 11, 21, METATILE_CinnabarGym_Wall_RetractedBarrier, 1 setmetatile 11, 22, METATILE_CinnabarGym_Floor_ShadeFull, 0 setmetatile 11, 23, METATILE_CinnabarGym_Floor, 0 return -CinnabarIsland_Gym_EventScript_OpenDoor5:: @ 816E1F3 +CinnabarIsland_Gym_EventScript_OpenDoor5:: setmetatile 5, 16, METATILE_CinnabarGym_Floor_WallLeftCorner, 0 setmetatile 6, 16, METATILE_CinnabarGym_Floor_WallRightCorner, 0 setmetatile 5, 17, METATILE_CinnabarGym_Floor_WallLeftEdge, 0 @@ -731,7 +731,7 @@ CinnabarIsland_Gym_EventScript_OpenDoor5:: @ 816E1F3 setmetatile 7, 18, METATILE_CinnabarGym_Floor_ShadeDiagonal, 0 return -CinnabarIsland_Gym_EventScript_OpenDoor6:: @ 816E233 +CinnabarIsland_Gym_EventScript_OpenDoor6:: setmetatile 5, 8, METATILE_CinnabarGym_Floor_WallLeftCorner, 0 setmetatile 6, 8, METATILE_CinnabarGym_Floor_WallRightCorner, 0 setmetatile 5, 9, METATILE_CinnabarGym_Floor_WallLeftEdge, 0 diff --git a/data/maps/CinnabarIsland_Gym/text.inc b/data/maps/CinnabarIsland_Gym/text.inc index 781238ccb..27f1405a6 100644 --- a/data/maps/CinnabarIsland_Gym/text.inc +++ b/data/maps/CinnabarIsland_Gym/text.inc @@ -1,4 +1,4 @@ -CinnabarIsland_Gym_Text_BlaineIntro:: @ 8199543 +CinnabarIsland_Gym_Text_BlaineIntro:: .string "Hah!\p" .string "I am BLAINE, the red-hot LEADER\n" .string "of CINNABAR GYM!\p" @@ -8,91 +8,91 @@ CinnabarIsland_Gym_Text_BlaineIntro:: @ 8199543 .string "Hah!\n" .string "You better have BURN HEAL!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -CinnabarIsland_Gym_Text_BlaineDefeat:: @ 81995FA +CinnabarIsland_Gym_Text_BlaineDefeat:: .string "I have burned down to nothing!\n" .string "Not even ashes remain!\p" .string "You have earned the VOLCANOBADGE.$" -CinnabarIsland_Gym_Text_FireBlastIsUltimateFireMove:: @ 8199652 +CinnabarIsland_Gym_Text_FireBlastIsUltimateFireMove:: .string "FIRE BLAST is the ultimate fire\n" .string "technique.\p" .string "Don't waste it on WATER POKéMON.$" -CinnabarIsland_Gym_Text_ExplainVolcanoBadge:: @ 819969E +CinnabarIsland_Gym_Text_ExplainVolcanoBadge:: .string "Hah!\p" .string "The VOLCANOBADGE heightens the\n" .string "SPECIAL stats of your POKéMON.\p" .string "Here, you can have this, too!$" -CinnabarIsland_Gym_Text_ReceivedTM38FromBlaine:: @ 81996FF +CinnabarIsland_Gym_Text_ReceivedTM38FromBlaine:: .string "{PLAYER} received TM38\n" .string "from BLAINE.$" -CinnabarIsland_Gym_Text_BlainePostBattle:: @ 819971D +CinnabarIsland_Gym_Text_BlainePostBattle:: .string "TM38 contains FIRE BLAST.\n" .string "Teach it to FIRE-type POKéMON.\p" .string "VULPIX or CHARMELEON would be\n" .string "ideal for that move.$" -CinnabarIsland_Gym_Text_MakeSpaceForThis:: @ 8199789 +CinnabarIsland_Gym_Text_MakeSpaceForThis:: .string "Make space for this, child!$" -CinnabarIsland_Gym_Text_ErikIntro:: @ 81997A5 +CinnabarIsland_Gym_Text_ErikIntro:: .string "Do you know how hot POKéMON fire\n" .string "breath can get?$" -CinnabarIsland_Gym_Text_ErikDefeat:: @ 81997D6 +CinnabarIsland_Gym_Text_ErikDefeat:: .string "Yow!\n" .string "Hot, hot, hot!$" -CinnabarIsland_Gym_Text_ErikPostBattle:: @ 81997EA +CinnabarIsland_Gym_Text_ErikPostBattle:: .string "Fire, or to be more precise,\n" .string "combustion…\p" .string "…Oxygen in the air…\n" .string "Blah, blah, blah, blah…$" -CinnabarIsland_Gym_Text_QuinnIntro:: @ 819983F +CinnabarIsland_Gym_Text_QuinnIntro:: .string "I was a thief, but I went straight\n" .string "as a TRAINER.$" -CinnabarIsland_Gym_Text_QuinnDefeat:: @ 8199870 +CinnabarIsland_Gym_Text_QuinnDefeat:: .string "I surrender!$" -CinnabarIsland_Gym_Text_QuinnPostBattle:: @ 819987D +CinnabarIsland_Gym_Text_QuinnPostBattle:: .string "I get this uncontrollable urge to\n" .string "steal other people's POKéMON.$" -CinnabarIsland_Gym_Text_AveryIntro:: @ 81998BD +CinnabarIsland_Gym_Text_AveryIntro:: .string "I've studied POKéMON thoroughly.\n" .string "You can't win!$" -CinnabarIsland_Gym_Text_AveryDefeat:: @ 81998ED +CinnabarIsland_Gym_Text_AveryDefeat:: .string "Waah!\n" .string "My studies were insufficient!$" -CinnabarIsland_Gym_Text_AveryPostBattle:: @ 8199911 +CinnabarIsland_Gym_Text_AveryPostBattle:: .string "My theories are too complicated\n" .string "for you to understand.$" -CinnabarIsland_Gym_Text_RamonIntro:: @ 8199948 +CinnabarIsland_Gym_Text_RamonIntro:: .string "I like using FIRE-type POKéMON.\n" .string "I just do.$" -CinnabarIsland_Gym_Text_RamonDefeat:: @ 8199973 +CinnabarIsland_Gym_Text_RamonDefeat:: .string "Too hot to handle!$" -CinnabarIsland_Gym_Text_RamonPostBattle:: @ 8199986 +CinnabarIsland_Gym_Text_RamonPostBattle:: .string "I wish there were a thief POKéMON.\n" .string "I'd use that!$" -CinnabarIsland_Gym_Text_DerekIntro:: @ 81999B7 +CinnabarIsland_Gym_Text_DerekIntro:: .string "I know why BLAINE became a\n" .string "TRAINER.$" -CinnabarIsland_Gym_Text_DerekDefeat:: @ 81999DB +CinnabarIsland_Gym_Text_DerekDefeat:: .string "Ow!$" -CinnabarIsland_Gym_Text_DerekPostBattle:: @ 81999DF +CinnabarIsland_Gym_Text_DerekPostBattle:: .string "Our LEADER, BLAINE, became lost\n" .string "in the mountains but good.\p" .string "Night fell when a fiery bird\n" @@ -100,31 +100,31 @@ CinnabarIsland_Gym_Text_DerekPostBattle:: @ 81999DF .string "Its light allowed BLAINE to find\n" .string "his way down safely.$" -CinnabarIsland_Gym_Text_DustyIntro:: @ 8199A7F +CinnabarIsland_Gym_Text_DustyIntro:: .string "I've been to many GYMS, but this\n" .string "one best suits my style.$" -CinnabarIsland_Gym_Text_DustyDefeat:: @ 8199AB9 +CinnabarIsland_Gym_Text_DustyDefeat:: .string "Yowza!\n" .string "Too hot!$" -CinnabarIsland_Gym_Text_DustyPostBattle:: @ 8199AC9 +CinnabarIsland_Gym_Text_DustyPostBattle:: .string "PONYTA, NINETALES…\n" .string "Those are popular FIRE POKéMON.$" -CinnabarIsland_Gym_Text_ZacIntro:: @ 8199AFC +CinnabarIsland_Gym_Text_ZacIntro:: .string "Fire is weak against H2O.$" -CinnabarIsland_Gym_Text_ZacDefeat:: @ 8199B16 +CinnabarIsland_Gym_Text_ZacDefeat:: .string "Oh!\n" .string "Snuffed out!$" -CinnabarIsland_Gym_Text_ZacPostBattle:: @ 8199B27 +CinnabarIsland_Gym_Text_ZacPostBattle:: .string "Water beats fire, of course.\p" .string "But fire melts ice, so the FIRE\n" .string "type beats ICE-type POKéMON.$" -CinnabarIsland_Gym_Text_GymGuyAdvice:: @ 8199B81 +CinnabarIsland_Gym_Text_GymGuyAdvice:: .string "Yo!\n" .string "Champ in the making!\p" .string "The hotheaded BLAINE is a FIRE\n" @@ -133,23 +133,23 @@ CinnabarIsland_Gym_Text_GymGuyAdvice:: @ 8199B81 .string "You'd better take some\n" .string "BURN HEALS, too.$" -CinnabarIsland_Gym_Text_GymGuyPostVictory:: @ 8199C0C +CinnabarIsland_Gym_Text_GymGuyPostVictory:: .string "{PLAYER}!\n" .string "You beat that firebrand!$" -CinnabarIsland_Gym_Text_GymStatue:: @ 8199C29 +CinnabarIsland_Gym_Text_GymStatue:: .string "CINNABAR POKéMON GYM\n" .string "LEADER: BLAINE\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -CinnabarIsland_Gym_Text_GymStatuePlayerWon:: @ 8199C62 +CinnabarIsland_Gym_Text_GymStatuePlayerWon:: .string "CINNABAR POKéMON GYM\n" .string "LEADER: BLAINE\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}, {PLAYER}$" -CinnabarIsland_Gym_Text_PokemonQuizRules:: @ 8199C9F +CinnabarIsland_Gym_Text_PokemonQuizRules:: .string "POKéMON Quiz!\p" .string "Get it right, and the door opens to\n" .string "the next room.\p" @@ -159,32 +159,32 @@ CinnabarIsland_Gym_Text_PokemonQuizRules:: @ 8199C9F .string "Then get it right!\n" .string "Here we go!$" -CinnabarIsland_Gym_Text_QuizQuestion1:: @ 8199D5A +CinnabarIsland_Gym_Text_QuizQuestion1:: .string "CATERPIE evolves into METAPOD?$" -CinnabarIsland_Gym_Text_QuizQuestion2:: @ 8199D79 +CinnabarIsland_Gym_Text_QuizQuestion2:: .string "There are nine certified POKéMON\n" .string "LEAGUE BADGES?$" -CinnabarIsland_Gym_Text_QuizQuestion3:: @ 8199DA9 +CinnabarIsland_Gym_Text_QuizQuestion3:: .string "POLIWAG evolves three times?$" -CinnabarIsland_Gym_Text_QuizQuestion4:: @ 8199DC6 +CinnabarIsland_Gym_Text_QuizQuestion4:: .string "Are electric moves effective\n" .string "against GROUND-type POKéMON?$" -CinnabarIsland_Gym_Text_QuizQuestion5:: @ 8199E00 +CinnabarIsland_Gym_Text_QuizQuestion5:: .string "POKéMON of the same kind and level\n" .string "are not identical?$" -CinnabarIsland_Gym_Text_QuizQuestion6:: @ 8199E36 +CinnabarIsland_Gym_Text_QuizQuestion6:: .string "TM28 contains TOMBSTONY?$" -CinnabarIsland_Gym_Text_CorrectGoOnThrough:: @ 8199E4F +CinnabarIsland_Gym_Text_CorrectGoOnThrough:: .string "You're absolutely correct!\p" .string "Go on through!$" -CinnabarIsland_Gym_Text_SorryBadCall:: @ 8199E79 +CinnabarIsland_Gym_Text_SorryBadCall:: .string "Sorry!\n" .string "Bad call!$" diff --git a/data/maps/CinnabarIsland_Mart/scripts.inc b/data/maps/CinnabarIsland_Mart/scripts.inc index 29b52627b..616978243 100644 --- a/data/maps/CinnabarIsland_Mart/scripts.inc +++ b/data/maps/CinnabarIsland_Mart/scripts.inc @@ -1,15 +1,15 @@ -CinnabarIsland_Mart_MapScripts:: @ 816EA0F +CinnabarIsland_Mart_MapScripts:: .byte 0 -CinnabarIsland_Mart_EventScript_Woman:: @ 816EA10 +CinnabarIsland_Mart_EventScript_Woman:: msgbox CinnabarIsland_Mart_Text_DontTheyHaveXAttack, MSGBOX_NPC end -CinnabarIsland_Mart_EventScript_Scientist:: @ 816EA19 +CinnabarIsland_Mart_EventScript_Scientist:: msgbox CinnabarIsland_Mart_Text_ExtraItemsNeverHurt, MSGBOX_NPC end -CinnabarIsland_Mart_EventScript_Clerk:: @ 816EA22 +CinnabarIsland_Mart_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -21,7 +21,7 @@ CinnabarIsland_Mart_EventScript_Clerk:: @ 816EA22 end .align 2 -CinnabarIsland_Mart_Items:: @ 816EA48 +CinnabarIsland_Mart_Items:: .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_HYPER_POTION diff --git a/data/maps/CinnabarIsland_Mart/text.inc b/data/maps/CinnabarIsland_Mart/text.inc index 30c36bf08..47569a552 100644 --- a/data/maps/CinnabarIsland_Mart/text.inc +++ b/data/maps/CinnabarIsland_Mart/text.inc @@ -1,9 +1,9 @@ -CinnabarIsland_Mart_Text_DontTheyHaveXAttack:: @ 819A7A0 +CinnabarIsland_Mart_Text_DontTheyHaveXAttack:: .string "Don't they have X ATTACK?\p" .string "I like it because it raises the\n" .string "ATTACK stat in battle.$" -CinnabarIsland_Mart_Text_ExtraItemsNeverHurt:: @ 819A7F1 +CinnabarIsland_Mart_Text_ExtraItemsNeverHurt:: .string "It never hurts to have extra items.\n" .string "You never know what might happen.$" diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index 76cc85424..5644b408b 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -1,34 +1,34 @@ .set LOCALID_BILL, 7 -CinnabarIsland_PokemonCenter_1F_MapScripts:: @ 816E8D7 +CinnabarIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -CinnabarIsland_PokemonCenter_1F_OnTransition:: @ 816E8E2 +CinnabarIsland_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_CINNABAR_ISLAND end -CinnabarIsland_PokemonCenter_1F_EventScript_Nurse:: @ 816E8E6 +CinnabarIsland_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -CinnabarIsland_PokemonCenter_1F_EventScript_Gentleman:: @ 816E8EF +CinnabarIsland_PokemonCenter_1F_EventScript_Gentleman:: msgbox CinnabarIsland_PokemonCenter_1F_Text_VisitUnionRoom, MSGBOX_NPC end -CinnabarIsland_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816E8F8 +CinnabarIsland_PokemonCenter_1F_EventScript_CooltrainerF:: msgbox CinnabarIsland_PokemonCenter_1F_Text_CinnabarGymLocked, MSGBOX_NPC end -CinnabarIsland_PokemonCenter_1F_EventScript_Youngster:: @ 816E901 +CinnabarIsland_PokemonCenter_1F_EventScript_Youngster:: msgbox CinnabarIsland_PokemonCenter_1F_Text_EvolutionCanWaitForNewMoves, MSGBOX_NPC end -CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A +CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: lock faceplayer msgbox CinnabarIsland_PokemonCenter_1F_Text_ReadyToSailToOneIsland, MSGBOX_YESNO @@ -55,30 +55,30 @@ CinnabarIsland_PokemonCenter_1F_EventScript_Bill:: @ 816E90A release end -CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth:: @ 816E96F +CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillSouth:: applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth waitmovement 0 return -CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast:: @ 816E981 +CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillEast:: applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast waitmovement 0 return -CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest:: @ 816E993 +CinnabarIsland_PokemonCenter_1F_EventScript_ExitWithBillWest:: applymovement LOCALID_BILL, CinnabarIsland_PokemonCenter_1F_Movement_BillExit applymovement OBJ_EVENT_ID_PLAYER, CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest waitmovement 0 return -CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail:: @ 816E9A5 +CinnabarIsland_PokemonCenter_1F_EventScript_NotReadyToSail:: msgbox CinnabarIsland_PokemonCenter_1F_Text_OhNotDoneYet release end -CinnabarIsland_PokemonCenter_1F_Movement_BillExit:: @ 816E9AF +CinnabarIsland_PokemonCenter_1F_Movement_BillExit:: walk_left walk_left walk_left @@ -90,7 +90,7 @@ CinnabarIsland_PokemonCenter_1F_Movement_BillExit:: @ 816E9AF set_invisible step_end -CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth:: @ 816E9B9 +CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth:: walk_down walk_left walk_left @@ -102,7 +102,7 @@ CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitSouth:: @ 816E9B9 walk_down step_end -CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast:: @ 816E9C3 +CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast:: walk_up walk_left walk_left @@ -116,7 +116,7 @@ CinnabarIsland_PokemonCenter_1F_Movement_BillExitEast:: @ 816E9C3 set_invisible step_end -CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast:: @ 816E9CF +CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast:: delay_16 delay_16 delay_16 @@ -133,7 +133,7 @@ CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitEast:: @ 816E9CF set_invisible step_end -CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest:: @ 816E9DE +CinnabarIsland_PokemonCenter_1F_Movement_PlayerExitWest:: walk_left walk_left walk_left diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc index 74d2f1bc1..8a937bbed 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -CinnabarIsland_PokemonCenter_1F_Text_CinnabarGymLocked:: @ 819A4F8 +CinnabarIsland_PokemonCenter_1F_Text_CinnabarGymLocked:: .string "I came to visit the CINNABAR GYM,\n" .string "but the door is locked tight.\p" .string "There should be a key for it\n" @@ -8,7 +8,7 @@ CinnabarIsland_PokemonCenter_1F_Text_CinnabarGymLocked:: @ 819A4F8 .string "The GYM LEADER's friend used to\n" .string "live there, they say.$" -CinnabarIsland_PokemonCenter_1F_Text_VisitUnionRoom:: @ 819A5BE +CinnabarIsland_PokemonCenter_1F_Text_VisitUnionRoom:: .string "Do you have lots of friends?\p" .string "Linking up with the usual friends\n" .string "is fun, of course.\p" @@ -19,20 +19,20 @@ CinnabarIsland_PokemonCenter_1F_Text_VisitUnionRoom:: @ 819A5BE .string "I think it would be worth your time\n" .string "to check the UNION ROOM.$" -CinnabarIsland_PokemonCenter_1F_Text_EvolutionCanWaitForNewMoves:: @ 819A6B1 +CinnabarIsland_PokemonCenter_1F_Text_EvolutionCanWaitForNewMoves:: .string "POKéMON can still learn techniques\n" .string "after canceling evolution.\p" .string "Evolution can wait until new moves\n" .string "have been learned.$" -CinnabarIsland_PokemonCenter_1F_Text_ReadyToSailToOneIsland:: @ 819A725 +CinnabarIsland_PokemonCenter_1F_Text_ReadyToSailToOneIsland:: .string "BILL: Hey, you kept me waiting!\n" .string "Ready to set sail to ONE ISLAND?$" -CinnabarIsland_PokemonCenter_1F_Text_OhNotDoneYet:: @ 819A766 +CinnabarIsland_PokemonCenter_1F_Text_OhNotDoneYet:: .string "Oh, you're still not done yet?$" -CinnabarIsland_PokemonCenter_1F_Text_LetsGo:: @ 819A785 +CinnabarIsland_PokemonCenter_1F_Text_LetsGo:: .string "Well, that's it.\n" .string "Let's go!$" diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc index 9cec10be2..68721f82b 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 +CinnabarIsland_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ CinnabarIsland_PokemonCenter_2F_MapScripts:: @ 816E9E8 .byte 0 @ The below 3 are unused and leftover from RS -CinnabarIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 816E9FD +CinnabarIsland_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -CinnabarIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EA03 +CinnabarIsland_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -CinnabarIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EA09 +CinnabarIsland_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc index 8aea98ace..d06864639 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/scripts.inc @@ -1,32 +1,32 @@ -CinnabarIsland_PokemonLab_Entrance_MapScripts:: @ 816E273 +CinnabarIsland_PokemonLab_Entrance_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, CinnabarIsland_PokemonLab_Entrance_OnTransition .byte 0 -CinnabarIsland_PokemonLab_Entrance_OnTransition:: @ 816E279 +CinnabarIsland_PokemonLab_Entrance_OnTransition:: compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 1 call_if_eq CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil end -CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil:: @ 816E285 +CinnabarIsland_PokemonLab_Entrance_EventScript_ReadyFossil:: setvar VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_REVIVE_STATE, 2 return -CinnabarIsland_PokemonLab_Entrance_EventScript_Scientist:: @ 816E28B +CinnabarIsland_PokemonLab_Entrance_EventScript_Scientist:: msgbox CinnabarIsland_PokemonLab_Entrance_Text_StudyMonsExtensively, MSGBOX_NPC end -CinnabarIsland_PokemonLab_Entrance_EventScript_DrFujiPhoto:: @ 816E294 +CinnabarIsland_PokemonLab_Entrance_EventScript_DrFujiPhoto:: msgbox CinnabarIsland_PokemonLab_Entrance_Text_PhotoOfLabFounderDrFuji, MSGBOX_SIGN end -CinnabarIsland_PokemonLab_Entrance_EventScript_MeetingRoomSign:: @ 816E29D +CinnabarIsland_PokemonLab_Entrance_EventScript_MeetingRoomSign:: msgbox CinnabarIsland_PokemonLab_Entrance_Text_MeetingRoomSign, MSGBOX_SIGN end -CinnabarIsland_PokemonLab_Entrance_EventScript_RAndDRoomSign:: @ 816E2A6 +CinnabarIsland_PokemonLab_Entrance_EventScript_RAndDRoomSign:: msgbox CinnabarIsland_PokemonLab_Entrance_Text_RAndDRoomSign, MSGBOX_SIGN end -CinnabarIsland_PokemonLab_Entrance_EventScript_TestingRoomSign:: @ 816E2AF +CinnabarIsland_PokemonLab_Entrance_EventScript_TestingRoomSign:: msgbox CinnabarIsland_PokemonLab_Entrance_Text_TestingRoomSign, MSGBOX_SIGN end diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc b/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc index 2c51769bc..f146180d6 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/text.inc @@ -1,28 +1,28 @@ -CinnabarIsland_Gym_Text_PhotoOfBlaineAndFuji:: @ 8199E8A +CinnabarIsland_Gym_Text_PhotoOfBlaineAndFuji:: .string "It's a photo of BLAINE and\n" .string "MR. FUJI.\p" .string "They're standing shoulder to\n" .string "shoulder with big grins.$" -CinnabarIsland_PokemonLab_Entrance_Text_StudyMonsExtensively:: @ 8199EE5 +CinnabarIsland_PokemonLab_Entrance_Text_StudyMonsExtensively:: .string "We study POKéMON extensively\n" .string "every day.\p" .string "People often bring us rare POKéMON\n" .string "for examination.$" -CinnabarIsland_PokemonLab_Entrance_Text_PhotoOfLabFounderDrFuji:: @ 8199F41 +CinnabarIsland_PokemonLab_Entrance_Text_PhotoOfLabFounderDrFuji:: .string "A photo of the LAB's founder…\n" .string "DR. FUJI?!$" -CinnabarIsland_PokemonLab_Entrance_Text_MeetingRoomSign:: @ 8199F6A +CinnabarIsland_PokemonLab_Entrance_Text_MeetingRoomSign:: .string "POKéMON LAB\n" .string "Meeting Room$" -CinnabarIsland_PokemonLab_Entrance_Text_RAndDRoomSign:: @ 8199F83 +CinnabarIsland_PokemonLab_Entrance_Text_RAndDRoomSign:: .string "POKéMON LAB\n" .string "R & D Room$" -CinnabarIsland_PokemonLab_Entrance_Text_TestingRoomSign:: @ 8199F9A +CinnabarIsland_PokemonLab_Entrance_Text_TestingRoomSign:: .string "POKéMON LAB\n" .string "Testing Room$" diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc index 3232c824a..6f81a5407 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/scripts.inc @@ -2,10 +2,10 @@ .equ DOME_FOSSIL, 2 .equ OLD_AMBER, 3 -CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts:: @ 816E400 +CinnabarIsland_PokemonLab_ExperimentRoom_MapScripts:: .byte 0 -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_Garett:: @ 816E401 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_Garett:: lock faceplayer setvar VAR_0x8008, INGAME_TRADE_SEEL @@ -26,23 +26,23 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_Garett:: @ 816E401 release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade:: @ 816E45B +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineTrade:: msgbox Trade_Text_AwwOhWell release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NotRequestedMon:: @ 816E465 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NotRequestedMon:: getspeciesname 0, VAR_0x8009 msgbox Trade_Text_WhatThatsNoMon release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_AlreadyTraded:: @ 816E473 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_AlreadyTraded:: msgbox Trade_Text_IsntMyOldMonGreat release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilScientist:: @ 816E47D +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilScientist:: lock faceplayer setvar VAR_RESULT, FALSE @@ -66,34 +66,34 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilScientist:: @ 816E47D goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddHelixFossilToList:: @ 816E4EC +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddHelixFossilToList:: goto_if_unset FLAG_GOT_HELIX_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse goto_if_set FLAG_REVIVED_HELIX, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse setvar VAR_RESULT, TRUE return -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddDomeFossilToList:: @ 816E504 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddDomeFossilToList:: goto_if_unset FLAG_GOT_DOME_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse goto_if_set FLAG_REVIVED_DOME, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse setvar VAR_RESULT, TRUE return -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList:: @ 816E51C +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList:: goto_if_unset FLAG_GOT_OLD_AMBER, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse goto_if_set FLAG_REVIVED_AMBER, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse setvar VAR_RESULT, TRUE return -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse:: @ 816E534 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse:: setvar VAR_RESULT, FALSE return -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil:: @ 816E53A +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil:: msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoIsTooBad release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelix:: @ 816E544 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelix:: message CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe waitmessage call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList @@ -106,7 +106,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelix:: @ 816E5 case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDome:: @ 816E586 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDome:: message CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe waitmessage call CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckAddOldAmberToList @@ -119,7 +119,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDome:: @ 816E58 case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilAmber:: @ 816E5C8 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilAmber:: message CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe waitmessage multichoice 0, 0, MULTICHOICE_AMBER, FALSE @@ -129,7 +129,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilAmber:: @ 816E5 case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelixAmber:: @ 816E5FA +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelixAmber:: multichoice 0, 0, MULTICHOICE_HELIX_AMBER, FALSE switch VAR_RESULT case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil @@ -138,7 +138,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilHelixAmber:: @ case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDomeAmber:: @ 816E631 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDomeAmber:: multichoice 0, 0, MULTICHOICE_DOME_AMBER, FALSE switch VAR_RESULT case 0, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil @@ -147,7 +147,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ChooseFossilDomeAmber:: @ 8 case 127, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DontShowFossil end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil:: @ 816E668 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil:: getspeciesname 0, SPECIES_OMANYTE getitemname 1, ITEM_HELIX_FOSSIL msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO @@ -162,7 +162,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowHelixFossil:: @ 816E668 release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil:: @ 816E6A6 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil:: getspeciesname 0, SPECIES_KABUTO getitemname 1, ITEM_DOME_FOSSIL msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO @@ -177,7 +177,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowDomeFossil:: @ 816E6A6 release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber:: @ 816E6E4 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber:: getspeciesname 0, SPECIES_AERODACTYL getitemname 1, ITEM_OLD_AMBER msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain, MSGBOX_YESNO @@ -192,17 +192,17 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_ShowOldAmber:: @ 816E6E4 release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil:: @ 816E722 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_DeclineReviveFossil:: msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_YouComeAgain release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilStillReviving:: @ 816E72C +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_FossilStillReviving:: msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveRevivedMon:: @ 816E736 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveRevivedMon:: compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, HELIX_FOSSIL goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte compare VAR_MAP_SCENE_CINNABAR_ISLAND_POKEMON_LAB_EXPERIMENT_ROOM_WHICH_FOSSIL, DOME_FOSSIL @@ -211,7 +211,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveRevivedMon:: @ 816E736 goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte:: @ 816E758 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte:: setvar VAR_TEMP_1, SPECIES_OMANYTE getspeciesname 0, SPECIES_OMANYTE msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife @@ -225,7 +225,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveOmanyte:: @ 816E758 goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto:: @ 816E79D +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto:: setvar VAR_TEMP_1, SPECIES_KABUTO getspeciesname 0, SPECIES_KABUTO msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife @@ -239,7 +239,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveKabuto:: @ 816E79D goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: @ 816E7E2 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: setvar VAR_TEMP_1, SPECIES_AERODACTYL getspeciesname 0, SPECIES_AERODACTYL msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife @@ -253,7 +253,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_GiveAerodactyl:: @ 816E7E2 goto_if_eq CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E827 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: textcolor 3 playfanfare MUS_LEVEL_UP message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor @@ -268,7 +268,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonParty:: @ 816E82 goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC:: @ 816E85B +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC:: textcolor 3 playfanfare MUS_LEVEL_UP message CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor @@ -282,32 +282,32 @@ CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_NicknameMonPC:: @ 816E85B goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC:: @ 816E88A +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_MonSentToPC:: call EventScript_TransferredToPC goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon:: @ 816E895 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_EndGiveMon:: release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_RevivedAllFossils:: @ 816E897 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_RevivedAllFossils:: msgbox CinnabarIsland_PokemonLab_ExperimentRoom_Text_YouComeAgain release end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedMtMoonFossil:: @ 816E8A1 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedMtMoonFossil:: goto_if_set FLAG_GOT_HELIX_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedHelix goto_if_set FLAG_GOT_DOME_FOSSIL, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedDome goto CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse end -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedHelix:: @ 816E8B9 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedHelix:: goto_if_unset FLAG_REVIVED_HELIX, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse setvar VAR_RESULT, TRUE return -CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedDome:: @ 816E8C8 +CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_CheckRevivedDome:: goto_if_unset FLAG_REVIVED_DOME, CinnabarIsland_PokemonLab_ExperimentRoom_EventScript_SetResultFalse setvar VAR_RESULT, TRUE return diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc index 9a19c16f7..9cb7e1691 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc @@ -1,4 +1,4 @@ -Text_MetronomeTeach:: @ 819A137 +Text_MetronomeTeach:: .string "Tch-tch-tch!\n" .string "I'll teach you a nifty move.\p" .string "Teach it to a POKéMON, and watch\n" @@ -6,20 +6,20 @@ Text_MetronomeTeach:: @ 819A137 .string "It's a move called METRONOME.\n" .string "Does it strike your fancy?$" -Text_MetronomeDeclined:: @ 819A1CB +Text_MetronomeDeclined:: .string "I tell you, it's a lot of fun!$" -Text_MetronomeWhichMon:: @ 819A1EA +Text_MetronomeWhichMon:: .string "Okay!\n" .string "Which POKéMON should I teach?$" -Text_MetronomeTaught:: @ 819A20E +Text_MetronomeTaught:: .string "Tch-tch-tch!\n" .string "That's the sound of a METRONOME.\p" .string "It tweaks your POKéMON's brain into\n" .string "using moves it doesn't even know.$" -CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe:: @ 819A282 +CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe:: .string "Hiya!\p" .string "I am important doctor.\n" .string "Yes, very much so, indeed.\p" @@ -28,31 +28,31 @@ CinnabarIsland_PokemonLab_ExperimentRoom_Text_HaveYouAFossilForMe:: @ 819A282 .string "You!\n" .string "Have you a fossil for me?$" -CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoIsTooBad:: @ 819A314 +CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoIsTooBad:: .string "No!\n" .string "Is too bad!$" @ Unused -CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalkJP:: @ 819A324 +CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalkJP:: .string "ちょっと　じかん　かかるよ！\p" .string "そこらへんを　すこし\n" .string "ブラブラ　してくると　よろしー！$" -CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife:: @ 819A34F +CinnabarIsland_PokemonLab_ExperimentRoom_Text_FossilMonBackToLife:: .string "You late.\n" .string "Where were you?\p" .string "Your fossil is back to life!\n" .string "It was {STR_VAR_1} like I think!$" -CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor:: @ 819A39E +CinnabarIsland_PokemonLab_ExperimentRoom_Text_ReceivedMonFromDoctor:: .string "{PLAYER} received the {STR_VAR_1}\n" .string "from the doctor.$" @ Unused -CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoRoomForPokemon:: @ 819A3C2 +CinnabarIsland_PokemonLab_ExperimentRoom_Text_NoRoomForPokemon:: .string "ポケモン　いっぱいで　もてないね！$" -CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain:: @ 819A3D4 +CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain:: .string "Oh!\n" .string "That is {STR_VAR_2}, it is!\p" .string "It is fossil of {STR_VAR_1},\n" @@ -61,17 +61,17 @@ CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain:: .string "that POKéMON live again!$" @ TODO: Resolve text dump error below? -CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor:: @ 819A45D +CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor:: .string "So!\n" .string "You hurry and give me that!\p" .string "{SIZE}Á{PLAYER} handed over the\n" .string "{STR_VAR_2} to the weird doctor.$" -CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk:: @ 819A4AB +CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk:: .string "I take a little time!\n" .string "You go for walk a little while!$" -CinnabarIsland_PokemonLab_ExperimentRoom_Text_YouComeAgain:: @ 819A4E1 +CinnabarIsland_PokemonLab_ExperimentRoom_Text_YouComeAgain:: .string "Aiyah!\n" .string "You come again!$" diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc index 5d9f99dd3..45d2a11c0 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/scripts.inc @@ -1,11 +1,11 @@ -CinnabarIsland_PokemonLab_Lounge_MapScripts:: @ 816E2B8 +CinnabarIsland_PokemonLab_Lounge_MapScripts:: .byte 0 -CinnabarIsland_PokemonLab_Lounge_EventScript_Scientist:: @ 816E2B9 +CinnabarIsland_PokemonLab_Lounge_EventScript_Scientist:: msgbox CinnabarIsland_PokemonLab_Lounge_Text_FoundFossilInMtMoon, MSGBOX_NPC end -CinnabarIsland_PokemonLab_Lounge_EventScript_Clifton:: @ 816E2C2 +CinnabarIsland_PokemonLab_Lounge_EventScript_Clifton:: lock faceplayer setvar VAR_0x8008, INGAME_TRADE_ELECTRODE @@ -26,23 +26,23 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_Clifton:: @ 816E2C2 release end -CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade:: @ 816E31C +CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonDeclineTrade:: msgbox Trade_Text_WellIfYouDontWantTo release end -CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonNotRequestedMon:: @ 816E326 +CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonNotRequestedMon:: getspeciesname 0, VAR_0x8009 msgbox Trade_Text_ThisIsntMon release end -CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonAlreadyTraded:: @ 816E334 +CinnabarIsland_PokemonLab_Lounge_EventScript_CliftonAlreadyTraded:: msgbox Trade_Text_HasTradedMonGrownStronger release end -CinnabarIsland_PokemonLab_Lounge_EventScript_Norma:: @ 816E33E +CinnabarIsland_PokemonLab_Lounge_EventScript_Norma:: lock faceplayer setvar VAR_0x8008, INGAME_TRADE_TANGELA @@ -73,18 +73,18 @@ CinnabarIsland_PokemonLab_Lounge_EventScript_Norma:: @ 816E33E release end -CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade:: @ 816E3BC +CinnabarIsland_PokemonLab_Lounge_EventScript_NormaDeclineTrade:: msgbox Trade_Text_ThatsTooBad release end -CinnabarIsland_PokemonLab_Lounge_EventScript_NormaNotRequestedMon:: @ 816E3C6 +CinnabarIsland_PokemonLab_Lounge_EventScript_NormaNotRequestedMon:: getspeciesname 0, VAR_0x8009 msgbox Trade_Text_ThisIsNoMon release end -CinnabarIsland_PokemonLab_Lounge_EventScript_NormaAlreadyTraded:: @ 816E3D4 +CinnabarIsland_PokemonLab_Lounge_EventScript_NormaAlreadyTraded:: msgbox Trade_Text_HowIsMyOldMon release end diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc b/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc index 7ea854e1f..52b56ac72 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/text.inc @@ -1,4 +1,4 @@ -CinnabarIsland_PokemonLab_Lounge_Text_FoundFossilInMtMoon:: @ 8199FB3 +CinnabarIsland_PokemonLab_Lounge_Text_FoundFossilInMtMoon:: .string "I found this most remarkable fossil\n" .string "inside MT. MOON.\p" .string "I think it's of a rare, prehistoric\n" diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc index 1619d9df3..4a9f19550 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/scripts.inc @@ -1,18 +1,18 @@ -CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: @ 816E3DE +CinnabarIsland_PokemonLab_ResearchRoom_MapScripts:: .byte 0 -CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor:: @ 816E3DF +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_MetronomeTutor:: goto EventScript_MetronomeTutor end -CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Scientist:: @ 816E3E5 +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Scientist:: msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_EeveeCanEvolveIntroThreeMons, MSGBOX_NPC end -CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Computer:: @ 816E3EE +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_Computer:: msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail, MSGBOX_SIGN end -CinnabarIsland_PokemonLab_ResearchRoom_EventScript_AmberPipe:: @ 816E3F7 +CinnabarIsland_PokemonLab_ResearchRoom_EventScript_AmberPipe:: msgbox CinnabarIsland_PokemonLab_ResearchRoom_Text_AnAmberPipe, MSGBOX_SIGN end diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc index bdfd1f95c..ee95c9624 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/text.inc @@ -1,8 +1,8 @@ -CinnabarIsland_PokemonLab_ResearchRoom_Text_EeveeCanEvolveIntroThreeMons:: @ 819A015 +CinnabarIsland_PokemonLab_ResearchRoom_Text_EeveeCanEvolveIntroThreeMons:: .string "EEVEE can evolve into one of three\n" .string "kinds of POKéMON.$" -CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail:: @ 819A04A +CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail:: .string "There's an e-mail message.\p" .string "… … …\p" .string "There are three legendary bird\n" @@ -14,6 +14,6 @@ CinnabarIsland_PokemonLab_ResearchRoom_Text_LegendaryBirdEmail:: @ 819A04A .string "close to CERULEAN.\p" .string "From: POKéMON RESEARCH TEAM…$" -CinnabarIsland_PokemonLab_ResearchRoom_Text_AnAmberPipe:: @ 819A128 +CinnabarIsland_PokemonLab_ResearchRoom_Text_AnAmberPipe:: .string "An amber pipe!$" diff --git a/data/maps/DiglettsCave_B1F/scripts.inc b/data/maps/DiglettsCave_B1F/scripts.inc index 9cf544838..093f48598 100644 --- a/data/maps/DiglettsCave_B1F/scripts.inc +++ b/data/maps/DiglettsCave_B1F/scripts.inc @@ -1,7 +1,7 @@ -DiglettsCave_B1F_MapScripts:: @ 8160EF1 +DiglettsCave_B1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, DiglettsCave_B1F_OnTransition .byte 0 -DiglettsCave_B1F_OnTransition:: @ 8160EF7 +DiglettsCave_B1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_DIGLETTS_CAVE_B1F end diff --git a/data/maps/DiglettsCave_NorthEntrance/scripts.inc b/data/maps/DiglettsCave_NorthEntrance/scripts.inc index 3bd05f5fd..d3620d3f9 100644 --- a/data/maps/DiglettsCave_NorthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_NorthEntrance/scripts.inc @@ -1,6 +1,6 @@ -DiglettsCave_NorthEntrance_MapScripts:: @ 8160EE7 +DiglettsCave_NorthEntrance_MapScripts:: .byte 0 -DiglettsCave_NorthEntrance_EventScript_Hiker:: @ 8160EE8 +DiglettsCave_NorthEntrance_EventScript_Hiker:: msgbox DiglettsCave_NorthEntrance_RockTunnelPitchBlack, MSGBOX_NPC end diff --git a/data/maps/DiglettsCave_NorthEntrance/text.inc b/data/maps/DiglettsCave_NorthEntrance/text.inc index ac9c80755..5a079a8ee 100644 --- a/data/maps/DiglettsCave_NorthEntrance/text.inc +++ b/data/maps/DiglettsCave_NorthEntrance/text.inc @@ -1,4 +1,4 @@ -DiglettsCave_NorthEntrance_RockTunnelPitchBlack:: @ 817462C +DiglettsCave_NorthEntrance_RockTunnelPitchBlack:: .string "I went inside ROCK TUNNEL, but it's\n" .string "pitch-black and scary in there.\p" .string "If I could get a POKéMON to use\n" diff --git a/data/maps/DiglettsCave_SouthEntrance/scripts.inc b/data/maps/DiglettsCave_SouthEntrance/scripts.inc index 5851336cc..6178a5774 100644 --- a/data/maps/DiglettsCave_SouthEntrance/scripts.inc +++ b/data/maps/DiglettsCave_SouthEntrance/scripts.inc @@ -1,6 +1,6 @@ -DiglettsCave_SouthEntrance_MapScripts:: @ 8160EFB +DiglettsCave_SouthEntrance_MapScripts:: .byte 0 -DiglettsCave_SouthEntrance_EventScript_OldMan:: @ 8160EFC +DiglettsCave_SouthEntrance_EventScript_OldMan:: msgbox DiglettsCave_SouthEntrance_Text_DiglettDugThisTunnel, MSGBOX_NPC end diff --git a/data/maps/DiglettsCave_SouthEntrance/text.inc b/data/maps/DiglettsCave_SouthEntrance/text.inc index c0e8a86c0..0dbd3b584 100644 --- a/data/maps/DiglettsCave_SouthEntrance/text.inc +++ b/data/maps/DiglettsCave_SouthEntrance/text.inc @@ -1,4 +1,4 @@ -DiglettsCave_SouthEntrance_Text_DiglettDugThisTunnel:: @ 81746A7 +DiglettsCave_SouthEntrance_Text_DiglettDugThisTunnel:: .string "Well, isn't this a surprise!\n" .string "DIGLETT dug this long tunnel!\p" .string "It goes right to VIRIDIAN CITY,\n" diff --git a/data/maps/FiveIsland/scripts.inc b/data/maps/FiveIsland/scripts.inc index ca47c7db4..117dd4ee3 100644 --- a/data/maps/FiveIsland/scripts.inc +++ b/data/maps/FiveIsland/scripts.inc @@ -1,19 +1,19 @@ -FiveIsland_MapScripts:: @ 8167E8E +FiveIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_OnTransition .byte 0 -FiveIsland_OnTransition:: @ 8167E94 +FiveIsland_OnTransition:: setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND end -FiveIsland_EventScript_IslandSign:: @ 8167E98 +FiveIsland_EventScript_IslandSign:: msgbox FiveIsland_Text_IslandSign, MSGBOX_SIGN end -FiveIsland_EventScript_BugCatcher:: @ 8167EA1 +FiveIsland_EventScript_BugCatcher:: msgbox FiveIsland_Text_WeirdBuildingInMeadow, MSGBOX_NPC end -FiveIsland_EventScript_Fisher:: @ 8167EAA +FiveIsland_EventScript_Fisher:: msgbox FiveIsland_Text_BeenGettingBusierAroundHere, MSGBOX_NPC end diff --git a/data/maps/FiveIsland/text.inc b/data/maps/FiveIsland/text.inc index 045f8c09f..429d4602e 100644 --- a/data/maps/FiveIsland/text.inc +++ b/data/maps/FiveIsland/text.inc @@ -1,14 +1,14 @@ -FiveIsland_Text_IslandSign:: @ 8182DFB +FiveIsland_Text_IslandSign:: .string "FIVE ISLAND\n" .string "Chrono Island: Where Time Goes$" -FiveIsland_Text_WeirdBuildingInMeadow:: @ 8182E26 +FiveIsland_Text_WeirdBuildingInMeadow:: .string "Oh, this stinks. I wanted to play in\n" .string "the MEADOW.\p" .string "But they put up a weird building\n" .string "on it, so I can't play there.$" -FiveIsland_Text_BeenGettingBusierAroundHere:: @ 8182E96 +FiveIsland_Text_BeenGettingBusierAroundHere:: .string "It's been getting busier around\n" .string "these parts lately.\p" .string "I haven't been catching many good\n" diff --git a/data/maps/FiveIsland_Harbor/scripts.inc b/data/maps/FiveIsland_Harbor/scripts.inc index 6cb97fd8e..9d4f39c7d 100644 --- a/data/maps/FiveIsland_Harbor/scripts.inc +++ b/data/maps/FiveIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ -FiveIsland_Harbor_MapScripts:: @ 8171D42 +FiveIsland_Harbor_MapScripts:: .byte 0 -FiveIsland_Harbor_EventScript_Sailor:: @ 8171D43 +FiveIsland_Harbor_EventScript_Sailor:: lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/FiveIsland_House1/scripts.inc b/data/maps/FiveIsland_House1/scripts.inc index b3ea78ecb..23c37d812 100644 --- a/data/maps/FiveIsland_House1/scripts.inc +++ b/data/maps/FiveIsland_House1/scripts.inc @@ -1,6 +1,6 @@ -FiveIsland_House1_MapScripts:: @ 8171D56 +FiveIsland_House1_MapScripts:: .byte 0 -FiveIsland_House1_EventScript_Woman:: @ 8171D57 +FiveIsland_House1_EventScript_Woman:: msgbox FiveIsland_House1_Text_HusbandWentOffFishing, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_House1/text.inc b/data/maps/FiveIsland_House1/text.inc index 1724cf678..71e5f8cb2 100644 --- a/data/maps/FiveIsland_House1/text.inc +++ b/data/maps/FiveIsland_House1/text.inc @@ -1,11 +1,11 @@ -FiveIsland_House1_JPText_HusbandWentOffFishing:: @ 81A3C71 +FiveIsland_House1_JPText_HusbandWentOffFishing:: .string "こんばんの　おかずは\n" .string "ようい　しなくて　いいぞ！\p" .string "って　だんなが\n" .string "つりに　いったん　だけど‥\l" .string "しんじて　いいのかねえ$" -FiveIsland_House1_Text_HusbandWentOffFishing:: @ 81A3CAC +FiveIsland_House1_Text_HusbandWentOffFishing:: .string "Don't worry about buying anything\n" .string "for dinner tonight!\p" .string "…That's what my husband said when\n" diff --git a/data/maps/FiveIsland_House2/scripts.inc b/data/maps/FiveIsland_House2/scripts.inc index 938571eb0..a1ac110ff 100644 --- a/data/maps/FiveIsland_House2/scripts.inc +++ b/data/maps/FiveIsland_House2/scripts.inc @@ -1,6 +1,6 @@ -FiveIsland_House2_MapScripts:: @ 8171D60 +FiveIsland_House2_MapScripts:: .byte 0 -FiveIsland_House2_EventScript_OldMan:: @ 8171D61 +FiveIsland_House2_EventScript_OldMan:: msgbox FiveIsland_House2_Text_MeadowBelongedToFamily, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_House2/text.inc b/data/maps/FiveIsland_House2/text.inc index dd794b4e3..331bb545c 100644 --- a/data/maps/FiveIsland_House2/text.inc +++ b/data/maps/FiveIsland_House2/text.inc @@ -1,4 +1,4 @@ -FiveIsland_House2_Text_MeadowBelongedToFamily:: @ 81A3D5E +FiveIsland_House2_Text_MeadowBelongedToFamily:: .string "That MEADOW has belonged to our\n" .string "family for generations.\p" .string "I should have had a giant mansion\n" diff --git a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc index 9292c9e5e..3aba609f3 100644 --- a/data/maps/FiveIsland_LostCave_Entrance/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Entrance/scripts.inc @@ -1,7 +1,7 @@ -FiveIsland_LostCave_Entrance_MapScripts:: @ 8164BEC +FiveIsland_LostCave_Entrance_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_LostCave_Entrance_OnTransition .byte 0 -FiveIsland_LostCave_Entrance_OnTransition:: @ 8164BF2 +FiveIsland_LostCave_Entrance_OnTransition:: setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_LOST_CAVE_ENTRANCE end diff --git a/data/maps/FiveIsland_LostCave_Room1/scripts.inc b/data/maps/FiveIsland_LostCave_Room1/scripts.inc index 07e1df046..471f0cb07 100644 --- a/data/maps/FiveIsland_LostCave_Room1/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room1/scripts.inc @@ -1,7 +1,7 @@ -FiveIsland_LostCave_Room1_MapScripts:: @ 8164BF6 +FiveIsland_LostCave_Room1_MapScripts:: .byte 0 -FiveIsland_LostCave_Room1_EventScript_Lawson:: @ 8164BF7 +FiveIsland_LostCave_Room1_EventScript_Lawson:: trainerbattle_single TRAINER_RUIN_MANIAC_LAWSON, FiveIsland_LostCave_Room1_Text_LawsonIntro, FiveIsland_LostCave_Room1_Text_LawsonDefeat msgbox FiveIsland_LostCave_Room1_Text_LawsonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_LostCave_Room1/text.inc b/data/maps/FiveIsland_LostCave_Room1/text.inc index d57eb39cf..2b6e9c6df 100644 --- a/data/maps/FiveIsland_LostCave_Room1/text.inc +++ b/data/maps/FiveIsland_LostCave_Room1/text.inc @@ -1,13 +1,13 @@ -FiveIsland_LostCave_Room1_Text_LawsonIntro:: @ 817CEF5 +FiveIsland_LostCave_Room1_Text_LawsonIntro:: .string "Aiyeeeeeh!\p" .string "I thought this was an ancient ruin.\n" .string "But it's teeming with ghosts!$" -FiveIsland_LostCave_Room1_Text_LawsonDefeat:: @ 817CF42 +FiveIsland_LostCave_Room1_Text_LawsonDefeat:: .string "Aiyeeeeeh!\n" .string "Mercy!$" -FiveIsland_LostCave_Room1_Text_LawsonPostBattle:: @ 817CF54 +FiveIsland_LostCave_Room1_Text_LawsonPostBattle:: .string "I'm trying to get out of here, but\n" .string "I always end up at the same spot.\p" .string "Maybe the number of boulders is\n" diff --git a/data/maps/FiveIsland_LostCave_Room10/scripts.inc b/data/maps/FiveIsland_LostCave_Room10/scripts.inc index 6b602538b..d442b9b40 100644 --- a/data/maps/FiveIsland_LostCave_Room10/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room10/scripts.inc @@ -1,23 +1,23 @@ .set LOCALID_SELPHY, 1 -FiveIsland_LostCave_Room10_MapScripts:: @ 8164C2D +FiveIsland_LostCave_Room10_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, FiveIsland_LostCave_Room10_OnResume map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_LostCave_Room10_OnFrame .byte 0 -FiveIsland_LostCave_Room10_OnResume:: @ 8164C38 +FiveIsland_LostCave_Room10_OnResume:: call_if_defeated TRAINER_LADY_SELPHY, FiveIsland_LostCave_Room10_EventScript_StopSelphySceneTrigger end -FiveIsland_LostCave_Room10_EventScript_StopSelphySceneTrigger:: @ 8164C42 +FiveIsland_LostCave_Room10_EventScript_StopSelphySceneTrigger:: setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 return -FiveIsland_LostCave_Room10_OnFrame:: @ 8164C48 +FiveIsland_LostCave_Room10_OnFrame:: map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 0, FiveIsland_LostCave_Room10_EventScript_FindSelphyScene .2byte 0 -FiveIsland_LostCave_Room10_EventScript_FindSelphyScene:: @ 8164C52 +FiveIsland_LostCave_Room10_EventScript_FindSelphyScene:: lockall textcolor 1 applymovement LOCALID_SELPHY, FiveIsland_LostCave_Room10_Movement_SelphyWander @@ -36,20 +36,20 @@ FiveIsland_LostCave_Room10_EventScript_FindSelphyScene:: @ 8164C52 releaseall end -FiveIsland_LostCave_Room10_EventScript_SetSelphyFound:: @ 8164CA5 +FiveIsland_LostCave_Room10_EventScript_SetSelphyFound:: setflag FLAG_HIDE_LOST_CAVE_SELPHY clearflag FLAG_HIDE_RESORT_GORGEOUS_SELPHY setvar VAR_MAP_SCENE_FIVE_ISLAND_LOST_CAVE_ROOM10, 1 setvar VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1 return -FiveIsland_LostCave_Room10_EventScript_SelphyQuestLog:: @ 8164CB6 +FiveIsland_LostCave_Room10_EventScript_SelphyQuestLog:: settrainerflag TRAINER_LADY_SELPHY call FiveIsland_LostCave_Room10_EventScript_SetSelphyFound releaseall end -FiveIsland_LostCave_Room10_Movement_SelphyWander:: @ 8164CC0 +FiveIsland_LostCave_Room10_Movement_SelphyWander:: walk_left delay_16 walk_right @@ -59,7 +59,7 @@ FiveIsland_LostCave_Room10_Movement_SelphyWander:: @ 8164CC0 walk_in_place_fastest_down step_end -FiveIsland_LostCave_Room10_Movement_SelphyApproach:: @ 8164CC8 +FiveIsland_LostCave_Room10_Movement_SelphyApproach:: walk_down walk_down step_end diff --git a/data/maps/FiveIsland_LostCave_Room10/text.inc b/data/maps/FiveIsland_LostCave_Room10/text.inc index 57542fe1f..7c9689cb4 100644 --- a/data/maps/FiveIsland_LostCave_Room10/text.inc +++ b/data/maps/FiveIsland_LostCave_Room10/text.inc @@ -1,12 +1,12 @@ -FiveIsland_LostCave_Room10_Text_SelphyIntro:: @ 817D062 +FiveIsland_LostCave_Room10_Text_SelphyIntro:: .string "W-what do you intend to do with\n" .string "me?$" -FiveIsland_LostCave_Room10_Text_SelphyDefeat:: @ 817D086 +FiveIsland_LostCave_Room10_Text_SelphyDefeat:: .string "Oh… I was afraid that you meant to\n" .string "harm me.$" -FiveIsland_LostCave_Room10_Text_MayIAskYouToTakeMeHome:: @ 817D0B2 +FiveIsland_LostCave_Room10_Text_MayIAskYouToTakeMeHome:: .string "I am so glad that you happened\n" .string "here.\p" .string "I grew rather bored of walking,\n" diff --git a/data/maps/FiveIsland_LostCave_Room11/scripts.inc b/data/maps/FiveIsland_LostCave_Room11/scripts.inc index abc87678f..30c3f3670 100644 --- a/data/maps/FiveIsland_LostCave_Room11/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room11/scripts.inc @@ -1,2 +1,2 @@ -FiveIsland_LostCave_Room11_MapScripts:: @ 8164CCB +FiveIsland_LostCave_Room11_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room12/scripts.inc b/data/maps/FiveIsland_LostCave_Room12/scripts.inc index 2a8500927..c67df0594 100644 --- a/data/maps/FiveIsland_LostCave_Room12/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room12/scripts.inc @@ -1,2 +1,2 @@ -FiveIsland_LostCave_Room12_MapScripts:: @ 8164CCC +FiveIsland_LostCave_Room12_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room13/scripts.inc b/data/maps/FiveIsland_LostCave_Room13/scripts.inc index 23ef2d129..fdd7296a7 100644 --- a/data/maps/FiveIsland_LostCave_Room13/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room13/scripts.inc @@ -1,2 +1,2 @@ -FiveIsland_LostCave_Room13_MapScripts:: @ 8164CCD +FiveIsland_LostCave_Room13_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room14/scripts.inc b/data/maps/FiveIsland_LostCave_Room14/scripts.inc index ec2260f6e..53b2f20f6 100644 --- a/data/maps/FiveIsland_LostCave_Room14/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room14/scripts.inc @@ -1,2 +1,2 @@ -FiveIsland_LostCave_Room14_MapScripts:: @ 8164CCE +FiveIsland_LostCave_Room14_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room2/scripts.inc b/data/maps/FiveIsland_LostCave_Room2/scripts.inc index 98e4cae7f..cf3e137b3 100644 --- a/data/maps/FiveIsland_LostCave_Room2/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room2/scripts.inc @@ -1,2 +1,2 @@ -FiveIsland_LostCave_Room2_MapScripts:: @ 8164C0E +FiveIsland_LostCave_Room2_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room3/scripts.inc b/data/maps/FiveIsland_LostCave_Room3/scripts.inc index c77557a4a..cc4f546ea 100644 --- a/data/maps/FiveIsland_LostCave_Room3/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room3/scripts.inc @@ -1,2 +1,2 @@ -FiveIsland_LostCave_Room3_MapScripts:: @ 8164C0F +FiveIsland_LostCave_Room3_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room4/scripts.inc b/data/maps/FiveIsland_LostCave_Room4/scripts.inc index 936e488e8..15978c382 100644 --- a/data/maps/FiveIsland_LostCave_Room4/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room4/scripts.inc @@ -1,7 +1,7 @@ -FiveIsland_LostCave_Room4_MapScripts:: @ 8164C10 +FiveIsland_LostCave_Room4_MapScripts:: .byte 0 -FiveIsland_LostCave_Room4_EventScript_Laura:: @ 8164C11 +FiveIsland_LostCave_Room4_EventScript_Laura:: trainerbattle_single TRAINER_PSYCHIC_LAURA, FiveIsland_LostCave_Room4_Text_LauraIntro, FiveIsland_LostCave_Room4_Text_LauraDefeat msgbox FiveIsland_LostCave_Room4_Text_LauraPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_LostCave_Room4/text.inc b/data/maps/FiveIsland_LostCave_Room4/text.inc index 7244fcccb..64a0ae5f8 100644 --- a/data/maps/FiveIsland_LostCave_Room4/text.inc +++ b/data/maps/FiveIsland_LostCave_Room4/text.inc @@ -1,12 +1,12 @@ -FiveIsland_LostCave_Room4_Text_LauraIntro:: @ 817CFC1 +FiveIsland_LostCave_Room4_Text_LauraIntro:: .string "I think there is a mysterious power\n" .string "at work in this cave.$" -FiveIsland_LostCave_Room4_Text_LauraDefeat:: @ 817CFFB +FiveIsland_LostCave_Room4_Text_LauraDefeat:: .string "If you don't go into the right\n" .string "tunnel, you won't get ahead.$" -FiveIsland_LostCave_Room4_Text_LauraPostBattle:: @ 817D037 +FiveIsland_LostCave_Room4_Text_LauraPostBattle:: .string "Earlier, a lady went into the caves\n" .string "ahead.$" diff --git a/data/maps/FiveIsland_LostCave_Room5/scripts.inc b/data/maps/FiveIsland_LostCave_Room5/scripts.inc index 47e9771de..a2de1157e 100644 --- a/data/maps/FiveIsland_LostCave_Room5/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room5/scripts.inc @@ -1,2 +1,2 @@ -FiveIsland_LostCave_Room5_MapScripts:: @ 8164C28 +FiveIsland_LostCave_Room5_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room6/scripts.inc b/data/maps/FiveIsland_LostCave_Room6/scripts.inc index 1956ee70b..802cd2c9f 100644 --- a/data/maps/FiveIsland_LostCave_Room6/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room6/scripts.inc @@ -1,2 +1,2 @@ -FiveIsland_LostCave_Room6_MapScripts:: @ 8164C29 +FiveIsland_LostCave_Room6_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room7/scripts.inc b/data/maps/FiveIsland_LostCave_Room7/scripts.inc index f8a8afc5f..6006af79e 100644 --- a/data/maps/FiveIsland_LostCave_Room7/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room7/scripts.inc @@ -1,2 +1,2 @@ -FiveIsland_LostCave_Room7_MapScripts:: @ 8164C2A +FiveIsland_LostCave_Room7_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room8/scripts.inc b/data/maps/FiveIsland_LostCave_Room8/scripts.inc index 89fc85c34..16c5a85a0 100644 --- a/data/maps/FiveIsland_LostCave_Room8/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room8/scripts.inc @@ -1,2 +1,2 @@ -FiveIsland_LostCave_Room8_MapScripts:: @ 8164C2B +FiveIsland_LostCave_Room8_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_LostCave_Room9/scripts.inc b/data/maps/FiveIsland_LostCave_Room9/scripts.inc index 771427153..1f1901ad6 100644 --- a/data/maps/FiveIsland_LostCave_Room9/scripts.inc +++ b/data/maps/FiveIsland_LostCave_Room9/scripts.inc @@ -1,2 +1,2 @@ -FiveIsland_LostCave_Room9_MapScripts:: @ 8164C2C +FiveIsland_LostCave_Room9_MapScripts:: .byte 0 diff --git a/data/maps/FiveIsland_Meadow/scripts.inc b/data/maps/FiveIsland_Meadow/scripts.inc index e0e94022f..2b9951634 100644 --- a/data/maps/FiveIsland_Meadow/scripts.inc +++ b/data/maps/FiveIsland_Meadow/scripts.inc @@ -1,12 +1,12 @@ -FiveIsland_Meadow_MapScripts:: @ 8168932 +FiveIsland_Meadow_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, FiveIsland_Meadow_OnLoad .byte 0 -FiveIsland_Meadow_OnLoad:: @ 8168938 +FiveIsland_Meadow_OnLoad:: call_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, FiveIsland_Meadow_EventScript_SetWarehouseDoorUnlocked end -FiveIsland_Meadow_EventScript_WarehouseDoor:: @ 8168942 +FiveIsland_Meadow_EventScript_WarehouseDoor:: lockall goto_if_set FLAG_UNLOCKED_ROCKET_WAREHOUSE, FiveIsland_Meadow_EventScript_WarehouseDoorAlreadyOpen goto_if_set FLAG_LEARNED_YES_NAH_CHANSEY, FiveIsland_Meadow_EventScript_OpenWarehouseDoor @@ -14,7 +14,7 @@ FiveIsland_Meadow_EventScript_WarehouseDoor:: @ 8168942 releaseall end -FiveIsland_Meadow_EventScript_OpenWarehouseDoor:: @ 816895F +FiveIsland_Meadow_EventScript_OpenWarehouseDoor:: setflag FLAG_UNLOCKED_ROCKET_WAREHOUSE message FiveIsland_Meadow_Text_EnteredPasswordDoorOpened waitmessage @@ -26,26 +26,26 @@ FiveIsland_Meadow_EventScript_OpenWarehouseDoor:: @ 816895F releaseall end -FiveIsland_Meadow_EventScript_WarehouseDoorAlreadyOpen:: @ 8168979 +FiveIsland_Meadow_EventScript_WarehouseDoorAlreadyOpen:: msgbox FiveIsland_Meadow_Text_WarehouseDoorAlreadyOpen releaseall end -FiveIsland_Meadow_EventScript_SetWarehouseDoorUnlocked:: @ 8168983 +FiveIsland_Meadow_EventScript_SetWarehouseDoorUnlocked:: setmetatile 12, 21, METATILE_SeviiIslands45_RocketWarehouseDoor_Unlocked, 1 return -FiveIsland_Meadow_EventScript_Rocket1:: @ 816898D +FiveIsland_Meadow_EventScript_Rocket1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_49, FiveIsland_Meadow_Text_Rocket1Intro, FiveIsland_Meadow_Text_Rocket1Defeat msgbox FiveIsland_Meadow_Text_Rocket1PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_Meadow_EventScript_Rocket2:: @ 81689A4 +FiveIsland_Meadow_EventScript_Rocket2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_50, FiveIsland_Meadow_Text_Rocket2Intro, FiveIsland_Meadow_Text_Rocket2Defeat msgbox FiveIsland_Meadow_Text_Rocket2PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_Meadow_EventScript_Rocket3:: @ 81689BB +FiveIsland_Meadow_EventScript_Rocket3:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_51, FiveIsland_Meadow_Text_Rocket3Intro, FiveIsland_Meadow_Text_Rocket3Defeat msgbox FiveIsland_Meadow_Text_Rocket3PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/FiveIsland_Meadow/text.inc b/data/maps/FiveIsland_Meadow/text.inc index 7d1ef844c..e366fd371 100644 --- a/data/maps/FiveIsland_Meadow/text.inc +++ b/data/maps/FiveIsland_Meadow/text.inc @@ -1,59 +1,59 @@ @ Unused -FiveIsland_Meadow_Text_DoorNeedsTwoPasswords:: @ 818AB73 +FiveIsland_Meadow_Text_DoorNeedsTwoPasswords:: .string "とびらを　あけるには\n" .string "パスワードが　2つ　いるようだ$" -FiveIsland_Meadow_Text_EnteredPasswordAnotherNeeded:: @ 818AB8E +FiveIsland_Meadow_Text_EnteredPasswordAnotherNeeded:: .string "{PLAYER} entered a password.\p" .string "“GOLDEEN need log.”\p" .string "… … … … … …\p" .string "Another password is needed to\n" .string "open the door…$" -FiveIsland_Meadow_Text_EnteredPasswordDoorOpened:: @ 818ABF4 +FiveIsland_Meadow_Text_EnteredPasswordDoorOpened:: .string "{PLAYER} entered two passwords.\p" .string "“GOLDEEN need log.”\n" .string "“Yes, nah, CHANSEY.”\p" .string "… … … … … …\p" .string "The WAREHOUSE's door opened!$" -FiveIsland_Meadow_Text_WarehouseDoorAlreadyOpen:: @ 818AC62 +FiveIsland_Meadow_Text_WarehouseDoorAlreadyOpen:: .string "The WAREHOUSE's door is already\n" .string "open.$" -FiveIsland_Meadow_Text_Rocket1Intro:: @ 818AC88 +FiveIsland_Meadow_Text_Rocket1Intro:: .string "This area's strictly off-limits!\n" .string "Out, out!$" -FiveIsland_Meadow_Text_Rocket1Defeat:: @ 818ACB3 +FiveIsland_Meadow_Text_Rocket1Defeat:: .string "Is this for real?$" -FiveIsland_Meadow_Text_Rocket1PostBattle:: @ 818ACC5 +FiveIsland_Meadow_Text_Rocket1PostBattle:: .string "You don't have any business here!\n" .string "Go home!$" -FiveIsland_Meadow_Text_Rocket2Intro:: @ 818ACF0 +FiveIsland_Meadow_Text_Rocket2Intro:: .string "There's nothing past here except\n" .string "our WAREHOUSE.\p" .string "So what brings you here?$" -FiveIsland_Meadow_Text_Rocket2Defeat:: @ 818AD39 +FiveIsland_Meadow_Text_Rocket2Defeat:: .string "That wasn't supposed to happen…$" -FiveIsland_Meadow_Text_Rocket2PostBattle:: @ 818AD59 +FiveIsland_Meadow_Text_Rocket2PostBattle:: .string "You're wanting to know what's inside\n" .string "this WAREHOUSE?\p" .string "It's better you didn't know.\n" .string "For your own sake, I mean.$" -FiveIsland_Meadow_Text_Rocket3Intro:: @ 818ADC6 +FiveIsland_Meadow_Text_Rocket3Intro:: .string "You'd be wasting time even if you\n" .string "were to get by me.$" -FiveIsland_Meadow_Text_Rocket3Defeat:: @ 818ADFB +FiveIsland_Meadow_Text_Rocket3Defeat:: .string "Oh, that makes me furious!$" -FiveIsland_Meadow_Text_Rocket3PostBattle:: @ 818AE16 +FiveIsland_Meadow_Text_Rocket3PostBattle:: .string "You won't be able to get in without\n" .string "the passwords anyway.$" diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index ffd3d05a7..c240bdbba 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -1,9 +1,9 @@ .set LOCALID_MEMORIAL_MAN, 1 -FiveIsland_MemorialPillar_MapScripts:: @ 81689D2 +FiveIsland_MemorialPillar_MapScripts:: .byte 0 -FiveIsland_MemorialPillar_EventScript_MemorialMan:: @ 81689D3 +FiveIsland_MemorialPillar_EventScript_MemorialMan:: lock goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_AlreadyGotTM42 goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_ReturnedForTM42 @@ -19,12 +19,12 @@ FiveIsland_MemorialPillar_EventScript_MemorialMan:: @ 81689D3 release end -FiveIsland_MemorialPillar_EventScript_AlreadyGotTM42:: @ 8168A18 +FiveIsland_MemorialPillar_EventScript_AlreadyGotTM42:: msgbox FiveIsland_MemorialPillar_Text_ScrubScrubTectonix release end -FiveIsland_MemorialPillar_EventScript_ReturnedForTM42:: @ 8168A22 +FiveIsland_MemorialPillar_EventScript_ReturnedForTM42:: msgbox FiveIsland_MemorialPillar_Text_StillHaveThingAsMyThanks giveitem ITEM_TM42 compare VAR_RESULT, FALSE @@ -33,7 +33,7 @@ FiveIsland_MemorialPillar_EventScript_ReturnedForTM42:: @ 8168A22 release end -FiveIsland_MemorialPillar_EventScript_Memorial:: @ 8168A48 +FiveIsland_MemorialPillar_EventScript_Memorial:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lockall @@ -46,14 +46,14 @@ FiveIsland_MemorialPillar_EventScript_Memorial:: @ 8168A48 releaseall end -FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade:: @ 8168A86 +FiveIsland_MemorialPillar_EventScript_AskPlaceLemonade:: msgbox FiveIsland_MemorialPillar_Text_LeaveAnotherLemonadeOffering, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq FiveIsland_MemorialPillar_EventScript_PlaceLemonade releaseall end -FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: @ 8168A9B +FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: removeitem ITEM_LEMONADE, 1 msgbox FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade closemessage @@ -71,20 +71,20 @@ FiveIsland_MemorialPillar_EventScript_PlaceLemonade:: @ 8168A9B releaseall end -FiveIsland_MemorialPillar_EventScript_ReceivedTM42:: @ 8168AE8 +FiveIsland_MemorialPillar_EventScript_ReceivedTM42:: msgbox FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo applymovement LOCALID_MEMORIAL_MAN, Movement_WalkInPlaceFastestUp waitmovement 0 setflag FLAG_GOT_TM42_AT_MEMORIAL_PILLAR return -FiveIsland_MemorialPillar_EventScript_NoRoomForTM42:: @ 8168AFE +FiveIsland_MemorialPillar_EventScript_NoRoomForTM42:: setflag FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR msgbox FiveIsland_MemorialPillar_Text_DontHaveRoomForIt releaseall end -FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced:: @ 8168B0B +FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced:: msgbox FiveIsland_MemorialPillar_Text_HereLiesTectonix releaseall end diff --git a/data/maps/FiveIsland_MemorialPillar/text.inc b/data/maps/FiveIsland_MemorialPillar/text.inc index 9ba8625e5..b051c0b68 100644 --- a/data/maps/FiveIsland_MemorialPillar/text.inc +++ b/data/maps/FiveIsland_MemorialPillar/text.inc @@ -1,69 +1,69 @@ -FiveIsland_MemorialPillar_Text_MiloIntro:: @ 818AE50 +FiveIsland_MemorialPillar_Text_MiloIntro:: .string "I'm the eldest of the BIRD\n" .string "BROTHERS.\p" .string "The best thing about birds…\n" .string "It has to be the beak.$" -FiveIsland_MemorialPillar_Text_MiloDefeat:: @ 818AEA8 +FiveIsland_MemorialPillar_Text_MiloDefeat:: .string "Oh, so sharp!$" -FiveIsland_MemorialPillar_Text_MiloPostBattle:: @ 818AEB6 +FiveIsland_MemorialPillar_Text_MiloPostBattle:: .string "You can fly to FOUR ISLAND from\n" .string "here.$" -FiveIsland_MemorialPillar_Text_ChazIntro:: @ 818AEDC +FiveIsland_MemorialPillar_Text_ChazIntro:: .string "I'm the middle kid of the BIRD\n" .string "BROTHERS.\p" .string "The best thing about birds…\n" .string "It has to be the wings.$" -FiveIsland_MemorialPillar_Text_ChazDefeat:: @ 818AF39 +FiveIsland_MemorialPillar_Text_ChazDefeat:: .string "Flap, flap!$" -FiveIsland_MemorialPillar_Text_ChazPostBattle:: @ 818AF45 +FiveIsland_MemorialPillar_Text_ChazPostBattle:: .string "There was a really somber guy\n" .string "over that way.$" -FiveIsland_MemorialPillar_Text_HaroldIntro:: @ 818AF72 +FiveIsland_MemorialPillar_Text_HaroldIntro:: .string "I'm the youngest of the BIRD\n" .string "BROTHERS.\p" .string "The best thing about birds…\n" .string "It has to be the down.$" -FiveIsland_MemorialPillar_Text_HaroldDefeat:: @ 818AFCC +FiveIsland_MemorialPillar_Text_HaroldDefeat:: .string "Down is so comfy…\n" .string "It makes me drowsy…$" -FiveIsland_MemorialPillar_Text_HaroldPostBattle:: @ 818AFF2 +FiveIsland_MemorialPillar_Text_HaroldPostBattle:: .string "It fills me with happiness when\n" .string "bird POKéMON beg playfully…$" -FiveIsland_MemorialPillar_Text_ScrubScrub:: @ 818B02E +FiveIsland_MemorialPillar_Text_ScrubScrub:: .string "Scrub, scrub…$" -FiveIsland_MemorialPillar_Text_YourMonsLookHealthy:: @ 818B03C +FiveIsland_MemorialPillar_Text_YourMonsLookHealthy:: .string "Hello…\n" .string "Your POKéMON look healthy…$" -FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix:: @ 818B05E +FiveIsland_MemorialPillar_Text_ThisIsWhereIBuriedMyOnix:: .string "This is where I buried my ONIX…\n" .string "It was named TECTONIX…$" -FiveIsland_MemorialPillar_Text_HereLiesTectonixLemonadeOffering:: @ 818B095 +FiveIsland_MemorialPillar_Text_HereLiesTectonixLemonadeOffering:: .string "“Here lies TECTONIX” is engraved\n" .string "on a boulder.\p" .string "There is a LEMONADE placed as an\n" .string "offering in front of the grave.$" -FiveIsland_MemorialPillar_Text_LeaveAnotherLemonadeOffering:: @ 818B105 +FiveIsland_MemorialPillar_Text_LeaveAnotherLemonadeOffering:: .string "Would you like to leave another\n" .string "LEMONADE as an offering?$" -FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade:: @ 818B13E +FiveIsland_MemorialPillar_Text_PlacedCanOfLemonade:: .string "{PLAYER} placed a can of LEMONADE\n" .string "in front of the grave.$" -FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis:: @ 818B171 +FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis:: .string "Th-thank you…\p" .string "That was my TECTONIX's favorite\n" .string "drink…\p" @@ -73,25 +73,25 @@ FiveIsland_MemorialPillar_Text_ThankYouPleaseTakeThis:: @ 818B171 .string "Can you please take this as my\n" .string "thanks?$" -FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo:: @ 818B219 +FiveIsland_MemorialPillar_Text_BeGoodToYourMonsToo:: .string "Please be good to your POKéMON,\n" .string "too.$" -FiveIsland_MemorialPillar_Text_DontHaveRoomForIt:: @ 818B23E +FiveIsland_MemorialPillar_Text_DontHaveRoomForIt:: .string "If you don't have room for it,\n" .string "I'll hold it for you till next time.$" -FiveIsland_MemorialPillar_Text_StillHaveThingAsMyThanks:: @ 818B282 +FiveIsland_MemorialPillar_Text_StillHaveThingAsMyThanks:: .string "Oh, it's you from that time…\p" .string "I still have that thing I wanted\n" .string "you to have as my thanks.$" -FiveIsland_MemorialPillar_Text_ScrubScrubTectonix:: @ 818B2DA +FiveIsland_MemorialPillar_Text_ScrubScrubTectonix:: .string "Scrub, scrub…\p" .string "… … …\n" .string "TECTONIX…$" -FiveIsland_MemorialPillar_Text_HereLiesTectonix:: @ 818B2F8 +FiveIsland_MemorialPillar_Text_HereLiesTectonix:: .string "Boulders and rocks are neatly piled\n" .string "up as a cairn.\p" .string "“Here lies TECTONIX” is engraved\n" diff --git a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc index c66871fea..ac8c5328e 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/scripts.inc @@ -1,23 +1,23 @@ -FiveIsland_PokemonCenter_1F_MapScripts:: @ 8171CF1 +FiveIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -FiveIsland_PokemonCenter_1F_OnTransition:: @ 8171CFC +FiveIsland_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_FIVE_ISLAND end -FiveIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171D00 +FiveIsland_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -FiveIsland_PokemonCenter_1F_EventScript_Chef:: @ 8171D09 +FiveIsland_PokemonCenter_1F_EventScript_Chef:: msgbox FiveIsland_PokemonCenter_1F_Text_OnMyWayToPrepareMeal, MSGBOX_NPC end -FiveIsland_PokemonCenter_1F_EventScript_CooltrainerF:: @ 8171D12 +FiveIsland_PokemonCenter_1F_EventScript_CooltrainerF:: msgbox FiveIsland_PokemonCenter_1F_Text_YoureOnQuestToCatchEveryMon, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_PokemonCenter_1F/text.inc b/data/maps/FiveIsland_PokemonCenter_1F/text.inc index 3d1be0df1..10b9261f7 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/text.inc +++ b/data/maps/FiveIsland_PokemonCenter_1F/text.inc @@ -1,8 +1,8 @@ -FiveIsland_PokemonCenter_1F_Text_OnMyWayToPrepareMeal:: @ 81A3BBA +FiveIsland_PokemonCenter_1F_Text_OnMyWayToPrepareMeal:: .string "I'm on my way to prepare a meal\n" .string "for a certain high-society person.$" -FiveIsland_PokemonCenter_1F_Text_YoureOnQuestToCatchEveryMon:: @ 81A3BFD +FiveIsland_PokemonCenter_1F_Text_YoureOnQuestToCatchEveryMon:: .string "You're on a quest to catch every\n" .string "single kind of POKéMON?\p" .string "…How incredible. Please tell me if\n" diff --git a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc index 67f84b9bc..f008eb3ac 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FiveIsland_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B +FiveIsland_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ FiveIsland_PokemonCenter_2F_MapScripts:: @ 8171D1B .byte 0 @ The below 3 are unused and leftover from RS -FiveIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171D30 +FiveIsland_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -FiveIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171D36 +FiveIsland_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -FiveIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171D3C +FiveIsland_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index c4ef75ed7..2e6cf1777 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -1,23 +1,23 @@ .equ LOCALID_SELPHY, 8 -FiveIsland_ResortGorgeous_MapScripts:: @ 81687E4 +FiveIsland_ResortGorgeous_MapScripts:: map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FiveIsland_ResortGorgeous_OnWarp map_script MAP_SCRIPT_ON_FRAME_TABLE, FiveIsland_ResortGorgeous_OnFrame .byte 0 -FiveIsland_ResortGorgeous_OnWarp:: @ 81687EF +FiveIsland_ResortGorgeous_OnWarp:: map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, FiveIsland_ResortGorgeous_EventScript_TurnPlayerNorth .2byte 0 -FiveIsland_ResortGorgeous_EventScript_TurnPlayerNorth:: @ 81687F9 +FiveIsland_ResortGorgeous_EventScript_TurnPlayerNorth:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE +FiveIsland_ResortGorgeous_OnFrame:: map_script_2 VAR_MAP_SCENE_FIVE_ISLAND_RESORT_GORGEOUS, 1, FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene .2byte 0 -FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene:: @ 8168808 +FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene:: lockall textcolor 1 msgbox FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow @@ -36,11 +36,11 @@ FiveIsland_ResortGorgeous_EventScript_SelphyReturnHomeScene:: @ 8168808 releaseall end -FiveIsland_ResortGorgeous_Movement_SelphyEnterHome:: @ 8168841 +FiveIsland_ResortGorgeous_Movement_SelphyEnterHome:: walk_up set_invisible step_end -FiveIsland_ResortGorgeous_EventScript_SelphysHouseSign:: @ 8168844 +FiveIsland_ResortGorgeous_EventScript_SelphysHouseSign:: msgbox FiveIsland_ResortGorgeous_Text_SelphysHouse, MSGBOX_SIGN end diff --git a/data/maps/FiveIsland_ResortGorgeous/text.inc b/data/maps/FiveIsland_ResortGorgeous/text.inc index 7e5ee195f..93eeb6878 100644 --- a/data/maps/FiveIsland_ResortGorgeous/text.inc +++ b/data/maps/FiveIsland_ResortGorgeous/text.inc @@ -1,93 +1,93 @@ -FiveIsland_ResortGorgeous_Text_DaisyIntro:: @ 818A3E2 +FiveIsland_ResortGorgeous_Text_DaisyIntro:: .string "With these hands, I will create\n" .string "my victory!$" -FiveIsland_ResortGorgeous_Text_DaisyDefeat:: @ 818A40E +FiveIsland_ResortGorgeous_Text_DaisyDefeat:: .string "The shame of this…\n" .string "I'm red-faced…$" -FiveIsland_ResortGorgeous_Text_DaisyPostBattle:: @ 818A430 +FiveIsland_ResortGorgeous_Text_DaisyPostBattle:: .string "Uh-oh, my paint tubes have\n" .string "scattered everywhere!$" -FiveIsland_ResortGorgeous_Text_CelinaIntro:: @ 818A461 +FiveIsland_ResortGorgeous_Text_CelinaIntro:: .string "Excuse me!\n" .string "I'm trying to paint.\l" .string "Please keep out of my sight!$" -FiveIsland_ResortGorgeous_Text_CelinaDefeat:: @ 818A49E +FiveIsland_ResortGorgeous_Text_CelinaDefeat:: .string "This loss…\n" .string "I feel like I'm whiting out…$" -FiveIsland_ResortGorgeous_Text_CelinaPostBattle:: @ 818A4C6 +FiveIsland_ResortGorgeous_Text_CelinaPostBattle:: .string "GILLIAN?\n" .string "Please tilt your head slightly…\l" .string "There! That's the look I want!$" -FiveIsland_ResortGorgeous_Text_RaynaIntro:: @ 818A50E +FiveIsland_ResortGorgeous_Text_RaynaIntro:: .string "Hmm…\n" .string "The angle, it is not quite there…$" -FiveIsland_ResortGorgeous_Text_RaynaDefeat:: @ 818A535 +FiveIsland_ResortGorgeous_Text_RaynaDefeat:: .string "Oh…\n" .string "My feelings, they are blue…$" -FiveIsland_ResortGorgeous_Text_RaynaPostBattle:: @ 818A555 +FiveIsland_ResortGorgeous_Text_RaynaPostBattle:: .string "The sky and the sea…\n" .string "They are so fickle.\p" .string "Their changing expressions make\n" .string "them difficult to capture.$" -FiveIsland_ResortGorgeous_Text_JackiIntro:: @ 818A5B9 +FiveIsland_ResortGorgeous_Text_JackiIntro:: .string "I am visiting my friend's retreat,\n" .string "if you must know.$" -FiveIsland_ResortGorgeous_Text_JackiDefeat:: @ 818A5EE +FiveIsland_ResortGorgeous_Text_JackiDefeat:: .string "Oh, my, so strong.$" -FiveIsland_ResortGorgeous_Text_JackiPostBattle:: @ 818A601 +FiveIsland_ResortGorgeous_Text_JackiPostBattle:: .string "I find it pleasurable to leisurely\n" .string "battle in the gentle sea breeze.$" -FiveIsland_ResortGorgeous_Text_GillianIntro:: @ 818A645 +FiveIsland_ResortGorgeous_Text_GillianIntro:: .string "I'm thinking of having a pool\n" .string "made specially for POKéMON.$" -FiveIsland_ResortGorgeous_Text_GillianDefeat:: @ 818A67F +FiveIsland_ResortGorgeous_Text_GillianDefeat:: .string "Oh, my goodness gracious!$" -FiveIsland_ResortGorgeous_Text_GillianPostBattle:: @ 818A699 +FiveIsland_ResortGorgeous_Text_GillianPostBattle:: .string "A pool would be nice, but I must\n" .string "say, a sun-room may be sublime.$" -FiveIsland_ResortGorgeous_Text_DestinIntro:: @ 818A6DA +FiveIsland_ResortGorgeous_Text_DestinIntro:: .string "I'm a good runner.\n" .string "I'm really fast!$" -FiveIsland_ResortGorgeous_Text_DestinDefeat:: @ 818A6FE +FiveIsland_ResortGorgeous_Text_DestinDefeat:: .string "Oops!\n" .string "I rushed things!$" -FiveIsland_ResortGorgeous_Text_DestinPostBattle:: @ 818A715 +FiveIsland_ResortGorgeous_Text_DestinPostBattle:: .string "When I run with the wind, it feels\n" .string "like I could fly!$" -FiveIsland_ResortGorgeous_Text_TobyIntro:: @ 818A74A +FiveIsland_ResortGorgeous_Text_TobyIntro:: .string "I say, this marine life here at\n" .string "this resort agrees with me.$" -FiveIsland_ResortGorgeous_Text_TobyDefeat:: @ 818A786 +FiveIsland_ResortGorgeous_Text_TobyDefeat:: .string "That's a shocker!\n" .string "You must be joking.$" -FiveIsland_ResortGorgeous_Text_TobyPostBattle:: @ 818A7AC +FiveIsland_ResortGorgeous_Text_TobyPostBattle:: .string "Getting so serious over this…\n" .string "How nonsensical.$" -FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow:: @ 818A7DB +FiveIsland_ResortGorgeous_Text_SelphyThanksYouMayGoNow:: .string "SELPHY: Thank you.\p" .string "You may go now.$" -FiveIsland_ResortGorgeous_Text_SelphysHouse:: @ 818A7FE +FiveIsland_ResortGorgeous_Text_SelphysHouse:: .string "SELPHY'S HOUSE$" diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 9610f62e1..9b42f9966 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -3,10 +3,10 @@ .equ SHOWN_REQUESTED_MON, FLAG_TEMP_2 -FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD +FiveIsland_ResortGorgeous_House_MapScripts:: .byte 0 -FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE +FiveIsland_ResortGorgeous_House_EventScript_Selphy:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -20,18 +20,18 @@ FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon end -FiveIsland_ResortGorgeous_House_EventScript_RequestMon:: @ 8171EFE +FiveIsland_ResortGorgeous_House_EventScript_RequestMon:: special SampleResortGorgeousMonAndReward msgbox FiveIsland_ResortGorgeous_House_Text_WishToSeeMonPlease release end -FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong:: @ 8171F0B +FiveIsland_ResortGorgeous_House_EventScript_RequestTookTooLong:: msgbox FiveIsland_ResortGorgeous_House_Text_OhImTiredOfWaiting goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon end -FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: @ 8171F19 +FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: copyvar VAR_0x8004, VAR_RESORT_GORGEOUS_REQUESTED_MON specialvar VAR_RESULT, DoesPlayerPartyContainSpecies compare VAR_RESULT, TRUE @@ -39,7 +39,7 @@ FiveIsland_ResortGorgeous_House_EventScript_CheckForRequestedMon:: @ 8171F19 goto FiveIsland_ResortGorgeous_House_EventScript_RequestMon end -FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: @ 8171F34 +FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: special SampleResortGorgeousMonAndReward msgbox FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou addobject LOCALID_BUTLER @@ -72,7 +72,7 @@ FiveIsland_ResortGorgeous_House_EventScript_ShowRequestedMon:: @ 8171F34 release end -FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth:: @ 8171FCD +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth:: applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestDown applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth waitmovement 0 @@ -80,14 +80,14 @@ FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerNorth:: @ 8171FC waitmovement 0 return -FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth:: @ 8171FE9 +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerSouth:: applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast:: @ 8171FFE +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast:: applymovement LOCALID_SELPHY, Movement_WalkInPlaceFastestLeft applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast waitmovement 0 @@ -95,12 +95,12 @@ FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerEast:: @ 8171FFE waitmovement 0 return -FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest:: @ 817201A +FiveIsland_ResortGorgeous_House_EventScript_ButlerApproachPlayerWest:: applymovement LOCALID_BUTLER, FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest waitmovement 0 return -FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward:: @ 8172025 +FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward:: textcolor 0 msgbox FiveIsland_ResortGorgeous_House_Text_ButlerBagAppearsToBeFull textcolor 1 @@ -110,12 +110,12 @@ FiveIsland_ResortGorgeous_House_EventScript_NoRoomForReward:: @ 8172025 release end -FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest:: @ 8172043 +FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest:: msgbox FiveIsland_ResortGorgeous_House_Text_SelphyWishYouBestOfLuck release end -FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth:: @ 817204D +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth:: walk_left walk_left walk_left @@ -125,13 +125,13 @@ FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerNorth:: @ 817204D walk_in_place_fastest_right step_end -FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth:: @ 8172055 +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerSouth:: walk_left walk_left walk_in_place_fastest_down step_end -FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast:: @ 8172059 +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast:: walk_left walk_left walk_left @@ -140,15 +140,15 @@ FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerEast:: @ 8172059 @ Very odd. If the player is talking to Selphy facing West, then the player has clipped through the table @ In this case rather than approach the player the Butler walks up, which clips the Butler into a wall -FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest:: @ 817205E +FiveIsland_ResortGorgeous_House_Movement_ButlerApproachPlayerWest:: walk_up step_end -FiveIsland_ResortGorgeous_House_Movement_ButlerEnter:: @ 8172060 +FiveIsland_ResortGorgeous_House_Movement_ButlerEnter:: walk_in_place_down step_end @ Addressed as "Sebastian" but speaks only as "Butler" -FiveIsland_ResortGorgeous_House_EventScript_Butler:: @ 8172062 +FiveIsland_ResortGorgeous_House_EventScript_Butler:: msgbox FiveIsland_ResortGorgeous_House_Text_LadySelphySmileHasBrillianceOfSun, MSGBOX_NPC end diff --git a/data/maps/FiveIsland_ResortGorgeous_House/text.inc b/data/maps/FiveIsland_ResortGorgeous_House/text.inc index cd01000ba..0a7a130d8 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/text.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/text.inc @@ -1,23 +1,23 @@ -FiveIsland_ResortGorgeous_House_Text_PleaseHearMyWish:: @ 81A42A0 +FiveIsland_ResortGorgeous_House_Text_PleaseHearMyWish:: .string "SELPHY: Oh?\n" .string "Do I know you from somewhere?\p" .string "Oh, but that doesn't matter.\p" .string "I am exquisitely bored.\n" .string "Please, hear my wish.$" -FiveIsland_ResortGorgeous_House_Text_WishToSeeMonPlease:: @ 81A4315 +FiveIsland_ResortGorgeous_House_Text_WishToSeeMonPlease:: .string "I wish to see a POKéMON.\n" .string "A darling {STR_VAR_1}.\p" .string "I want to see one right away.\n" .string "Please, make my wish come true.$" -FiveIsland_ResortGorgeous_House_Text_OhImTiredOfWaiting:: @ 81A437A +FiveIsland_ResortGorgeous_House_Text_OhImTiredOfWaiting:: .string "SELPHY: Oh, I'm tired of this.\n" .string "I'm tired of waiting for you.\p" .string "I'll forgive you this time, but\n" .string "please don't fail me next time.$" -FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou:: @ 81A43F7 +FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou:: .string "SELPHY: Oh, hello, there.\p" .string "Oh, my gracious. That must be the\n" .string "{STR_VAR_1} you caught for me.\p" @@ -32,35 +32,35 @@ FiveIsland_ResortGorgeous_House_Text_MonYouCaughtForMeThankYou:: @ 81A43F7 .string "SEBASTIAN!\n" .string "I need you here this instant!$" -FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady:: @ 81A450B +FiveIsland_ResortGorgeous_House_Text_ButlerYesMyLady:: .string "Butler: Yes, my lady.$" -FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation:: @ 81A4521 +FiveIsland_ResortGorgeous_House_Text_SelphyGiveTokenOfAppreciation:: .string "SELPHY: See to it that this person\n" .string "is given a token of appreciation.$" -FiveIsland_ResortGorgeous_House_Text_ButlerIShallDoAsYouBid:: @ 81A4566 +FiveIsland_ResortGorgeous_House_Text_ButlerIShallDoAsYouBid:: .string "Butler: I shall do as you bid,\n" .string "my lady.$" -FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks:: @ 81A458E +FiveIsland_ResortGorgeous_House_Text_ButlerPleaseAcceptThisAsHerThanks:: .string "Butler: I sincerely thank you for\n" .string "pleasing Lady SELPHY.\p" .string "Please accept this as her thanks…$" -FiveIsland_ResortGorgeous_House_Text_ButlerBagAppearsToBeFull:: @ 81A45E8 +FiveIsland_ResortGorgeous_House_Text_ButlerBagAppearsToBeFull:: .string "Butler: Your BAG appears to be\n" .string "unfortunately full.$" -FiveIsland_ResortGorgeous_House_Text_OhHowDisappointing:: @ 81A461B +FiveIsland_ResortGorgeous_House_Text_OhHowDisappointing:: .string "Oh…\n" .string "How disappointing.$" -FiveIsland_ResortGorgeous_House_Text_SelphyWishYouBestOfLuck:: @ 81A4632 +FiveIsland_ResortGorgeous_House_Text_SelphyWishYouBestOfLuck:: .string "SELPHY: I wish you the best of\n" .string "luck.$" -FiveIsland_ResortGorgeous_House_Text_LadySelphySmileHasBrillianceOfSun:: @ 81A4657 +FiveIsland_ResortGorgeous_House_Text_LadySelphySmileHasBrillianceOfSun:: .string "Butler: The smile of Lady SELPHY\n" .string "has the brilliance of the sun.\p" .string "Please, I beg you to bring joy\n" diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index fec6e0262..28ad89a8e 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -7,41 +7,41 @@ .equ PLAYER_X_POS, VAR_0x8004 .equ PLAYER_Y_POS, VAR_0x8005 -FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E +FiveIsland_RocketWarehouse_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, FiveIsland_RocketWarehouse_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_RocketWarehouse_OnTransition .byte 0 -FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39 +FiveIsland_RocketWarehouse_OnTransition:: setworldmapflag FLAG_WORLD_MAP_FIVE_ISLAND_ROCKET_WAREHOUSE end -FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D +FiveIsland_RocketWarehouse_OnLoad:: call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry end -FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry:: @ 8163F47 +FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry:: setmetatile 26, 20, METATILE_SilphCo_Arrow_Up, 0 setmetatile 27, 20, METATILE_SilphCo_Arrow_Up, 0 return -FiveIsland_RocketWarehouse_EventScript_Cage:: @ 8163F5A +FiveIsland_RocketWarehouse_EventScript_Cage:: lockall goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, FiveIsland_RocketWarehouse_EventScript_CageUnlocked msgbox FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen releaseall end -FiveIsland_RocketWarehouse_EventScript_CageUnlocked:: @ 8163F6E +FiveIsland_RocketWarehouse_EventScript_CageUnlocked:: msgbox FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled releaseall end -FiveIsland_RocketWarehouse_EventScript_Computer:: @ 8163F78 +FiveIsland_RocketWarehouse_EventScript_Computer:: msgbox FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText, MSGBOX_SIGN end -FiveIsland_RocketWarehouse_EventScript_Admin2Trigger:: @ 8163F81 +FiveIsland_RocketWarehouse_EventScript_Admin2Trigger:: lockall applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFastestLeft waitmovement 0 @@ -49,40 +49,40 @@ FiveIsland_RocketWarehouse_EventScript_Admin2Trigger:: @ 8163F81 releaseall end -FiveIsland_RocketWarehouse_EventScript_Gideon:: @ 8163F93 +FiveIsland_RocketWarehouse_EventScript_Gideon:: trainerbattle_single TRAINER_SCIENTIST_GIDEON, FiveIsland_RocketWarehouse_Text_GideonIntro, FiveIsland_RocketWarehouse_Text_GideonDefeat, FiveIsland_RocketWarehouse_EventScript_DefeatedGideon goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid msgbox FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid:: @ 8163FB7 +FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid:: famechecker FAMECHECKER_GIOVANNI, 5 msgbox FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_DefeatedGideon:: @ 8163FCD +FiveIsland_RocketWarehouse_EventScript_DefeatedGideon:: msgbox FiveIsland_RocketWarehouse_Text_GideonPostBattle setflag FLAG_RECOVERED_SAPPHIRE giveitem ITEM_SAPPHIRE release end -FiveIsland_RocketWarehouse_EventScript_Grunt2:: @ 8163FE6 +FiveIsland_RocketWarehouse_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, FiveIsland_RocketWarehouse_Text_Grunt2Intro, FiveIsland_RocketWarehouse_Text_Grunt2Defeat msgbox FiveIsland_RocketWarehouse_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_Grunt3:: @ 8163FFD +FiveIsland_RocketWarehouse_EventScript_Grunt3:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, FiveIsland_RocketWarehouse_Text_Grunt3Intro, FiveIsland_RocketWarehouse_Text_Grunt3Defeat msgbox FiveIsland_RocketWarehouse_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_Admin2:: @ 8164014 +FiveIsland_RocketWarehouse_EventScript_Admin2:: trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, FiveIsland_RocketWarehouse_Text_Admin2Intro, FiveIsland_RocketWarehouse_Text_Admin2Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2 msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: @ 816402F +FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: getplayerxy PLAYER_X_POS, PLAYER_Y_POS compare PLAYER_X_POS, 24 call_if_le FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2 @@ -100,22 +100,22 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: @ 816402F release end -FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2:: @ 8164065 +FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -FiveIsland_RocketWarehouse_EventScript_Grunt1:: @ 8164070 +FiveIsland_RocketWarehouse_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, FiveIsland_RocketWarehouse_Text_Grunt1Intro, FiveIsland_RocketWarehouse_Text_Grunt1Defeat msgbox FiveIsland_RocketWarehouse_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_Admin1:: @ 8164087 +FiveIsland_RocketWarehouse_EventScript_Admin1:: trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_Text_Admin1Intro, FiveIsland_RocketWarehouse_Text_Admin1Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1 msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough, MSGBOX_AUTOCLOSE end -FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1:: @ 81640A2 +FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1:: getplayerxy PLAYER_X_POS, PLAYER_Y_POS specialvar VAR_RESULT, GetPlayerFacingDirection compare VAR_RESULT, DIR_NORTH @@ -146,45 +146,45 @@ FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1:: @ 81640A2 release end -FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1:: @ 816412E +FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1:: compare PLAYER_X_POS, 27 goto_if_eq EventScript_Return applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar:: @ 8164144 +FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar:: applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar waitmovement 0 return -FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch:: @ 816414F +FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch:: applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch waitmovement 0 return -FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch:: @ 816415A +FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch:: applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestUp waitmovement 0 return -FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft:: @ 8164165 +FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft:: applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestLeft waitmovement 0 return -FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown:: @ 8164170 +FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown:: applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestDown waitmovement 0 return -FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar:: @ 816417B +FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar:: walk_right walk_right walk_in_place_fastest_up step_end -FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch:: @ 816417F +FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch:: walk_right walk_in_place_fastest_up step_end diff --git a/data/maps/FiveIsland_RocketWarehouse/text.inc b/data/maps/FiveIsland_RocketWarehouse/text.inc index de74a7e67..3c7a65acd 100644 --- a/data/maps/FiveIsland_RocketWarehouse/text.inc +++ b/data/maps/FiveIsland_RocketWarehouse/text.inc @@ -1,65 +1,65 @@ -FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen:: @ 817B4E3 +FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen:: .string "There are many POKéMON locked\n" .string "away in the pen…$" -FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled:: @ 817B512 +FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled:: .string "The pen door is unlocked.\n" .string "The POKéMON appear to have fled.$" -FiveIsland_RocketWarehouse_Text_Grunt2Intro:: @ 817B54D +FiveIsland_RocketWarehouse_Text_Grunt2Intro:: .string "Did you come here knowing it's\n" .string "TEAM ROCKET's WAREHOUSE?$" -FiveIsland_RocketWarehouse_Text_Grunt2Defeat:: @ 817B585 +FiveIsland_RocketWarehouse_Text_Grunt2Defeat:: .string "What do you think you're doing?!$" -FiveIsland_RocketWarehouse_Text_Grunt2PostBattle:: @ 817B5A6 +FiveIsland_RocketWarehouse_Text_Grunt2PostBattle:: .string "TEAM ROCKET broke up?\n" .string "What planet are you from?$" -FiveIsland_RocketWarehouse_Text_Grunt1Intro:: @ 817B5D6 +FiveIsland_RocketWarehouse_Text_Grunt1Intro:: .string "Oh, now your POKéMON look strong.\n" .string "You're willing to sell them?\p" .string "Oh?\n" .string "You wanted to battle?$" -FiveIsland_RocketWarehouse_Text_Grunt1Defeat:: @ 817B62F +FiveIsland_RocketWarehouse_Text_Grunt1Defeat:: .string "Oh, but…\n" .string "Too much!$" -FiveIsland_RocketWarehouse_Text_Grunt1PostBattle:: @ 817B642 +FiveIsland_RocketWarehouse_Text_Grunt1PostBattle:: .string "We can give you a great price.\n" .string "Sell us your POKéMON!$" -FiveIsland_RocketWarehouse_Text_Grunt3Intro:: @ 817B677 +FiveIsland_RocketWarehouse_Text_Grunt3Intro:: .string "I got word about you from the\n" .string "others.\p" .string "But there's no way a kid like you'd\n" .string "know our BOSS GIOVANNI!$" -FiveIsland_RocketWarehouse_Text_Grunt3Defeat:: @ 817B6D9 +FiveIsland_RocketWarehouse_Text_Grunt3Defeat:: .string "Don't…you…dare…laugh…$" -FiveIsland_RocketWarehouse_Text_Grunt3PostBattle:: @ 817B6EF +FiveIsland_RocketWarehouse_Text_Grunt3PostBattle:: .string "Don't mess in the doings of adults,\n" .string "you jumped-up pip-squeak!$" -FiveIsland_RocketWarehouse_Text_Admin1Intro:: @ 817B72D +FiveIsland_RocketWarehouse_Text_Admin1Intro:: .string "I don't know or care if what I'm\n" .string "doing is right or wrong…\p" .string "I just put my faith in GIOVANNI\n" .string "and do as I am told.$" -FiveIsland_RocketWarehouse_Text_Admin1Defeat:: @ 817B79C +FiveIsland_RocketWarehouse_Text_Admin1Defeat:: .string "I…\n" .string "I'm shattered…$" -FiveIsland_RocketWarehouse_Text_Admin1PostBattle:: @ 817B7AE +FiveIsland_RocketWarehouse_Text_Admin1PostBattle:: .string "You're doing things according to\n" .string "your beliefs and morals.\p" .string "I understand now…$" -FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough:: @ 817B7FA +FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough:: .string "I've made it so you can come back\n" .string "in through there.\p" .string "Why don't you go get rested and\n" @@ -69,7 +69,7 @@ FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough:: @ 817B7FA .string "You'd better steel yourself for one\n" .string "harsh challenge.$" -FiveIsland_RocketWarehouse_Text_Admin2Intro:: @ 817B8DA +FiveIsland_RocketWarehouse_Text_Admin2Intro:: .string "That's quite enough of you \n" .string "playing the hero, kid.\p" .string "Spreading lies about how TEAM\n" @@ -81,7 +81,7 @@ FiveIsland_RocketWarehouse_Text_Admin2Intro:: @ 817B8DA .string "And now, I'll show you how scary\n" .string "an angry adult can be!$" -FiveIsland_RocketWarehouse_Text_Admin2Defeat:: @ 817B9FB +FiveIsland_RocketWarehouse_Text_Admin2Defeat:: .string "Urgh…\n" .string "You were too strong…\p" .string "…\n" @@ -89,7 +89,7 @@ FiveIsland_RocketWarehouse_Text_Admin2Defeat:: @ 817B9FB .string "So it's true?\n" .string "TEAM ROCKET really has disbanded?$" -FiveIsland_RocketWarehouse_Text_Admin2PostBattle:: @ 817BA64 +FiveIsland_RocketWarehouse_Text_Admin2PostBattle:: .string "We will abandon this WAREHOUSE…\p" .string "But don't think this is over.\n" .string "I won't let this be the end.\p" @@ -98,7 +98,7 @@ FiveIsland_RocketWarehouse_Text_Admin2PostBattle:: @ 817BA64 .string "I will…\p" .string "Until then, farewell!$" -FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText:: @ 817BB15 +FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText:: .string "A report with graphs and text is on\n" .string "the PC monitor.\p" .string "“The Influence of Magnetic Waves\n" @@ -106,7 +106,7 @@ FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText:: @ 817BB15 .string "… … … … … …\p" .string "It's too difficult to understand…$" -FiveIsland_RocketWarehouse_Text_GideonIntro:: @ 817BBAF +FiveIsland_RocketWarehouse_Text_GideonIntro:: .string "I almost managed to sell the\n" .string "SAPPHIRE for huge money…\p" .string "Then, you just had to come along\n" @@ -114,19 +114,19 @@ FiveIsland_RocketWarehouse_Text_GideonIntro:: @ 817BBAF .string "Fufu… Fufufufu…\n" .string "There's no forgiveness for you!$" -FiveIsland_RocketWarehouse_Text_GideonDefeat:: @ 817BC55 +FiveIsland_RocketWarehouse_Text_GideonDefeat:: .string "Gah! Darn!\n" .string "Darn! Darn!$" -FiveIsland_RocketWarehouse_Text_GideonPostBattle:: @ 817BC6C +FiveIsland_RocketWarehouse_Text_GideonPostBattle:: .string "If I can't sell it, it's worthless!\n" .string "Go ahead, take it!$" -FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe:: @ 817BCA3 +FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe:: .string "What do you want now?\n" .string "Go on, get lost, leave me be.$" -FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair:: @ 817BCD7 +FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair:: .string "What, you again?\p" .string "You… You're not GIOVANNI's kid,\n" .string "are you?\p" diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index d7815af0c..eb5febc8c 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -1,7 +1,7 @@ -FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D +FiveIsland_WaterLabyrinth_MapScripts:: .byte 0 -FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: @ 816884E +FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -16,18 +16,18 @@ FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: @ 816884E release end -FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment:: @ 8168895 +FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment:: famechecker FAMECHECKER_DAISY, 2 msgbox FiveIsland_WaterLabyrinth_Text_CuteMonRemindsMeOfDaisy release end -FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship:: @ 81688AC +FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship:: msgbox FiveIsland_WaterLabyrinth_Text_TreatMonRightHaveThis goto FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg end -FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA +FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: getpartysize compare VAR_RESULT, PARTY_SIZE goto_if_eq FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg @@ -44,7 +44,7 @@ FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg:: @ 81688BA @ If the player has a Togepi/Togetic from this game (assumed to be the one the man gave you) then comment on it @ Otherwise make normal comment -FiveIsland_WaterLabyrinth_EventScript_PostEggComment:: @ 81688E3 +FiveIsland_WaterLabyrinth_EventScript_PostEggComment:: getspeciesname 1, SPECIES_TOGEPI setvar VAR_0x8004, SPECIES_TOGEPI specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID @@ -59,12 +59,12 @@ FiveIsland_WaterLabyrinth_EventScript_PostEggComment:: @ 81688E3 release end -FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg:: @ 816891F +FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg:: setflag FLAG_NO_ROOM_FOR_TOGEPI_EGG msgbox FiveIsland_WaterLabyrinth_Text_DontHaveSpaceInYourParty release end -FiveIsland_WaterLabyrinth_EventScript_ReturnForEgg:: @ 816892C +FiveIsland_WaterLabyrinth_EventScript_ReturnForEgg:: goto FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg end diff --git a/data/maps/FiveIsland_WaterLabyrinth/text.inc b/data/maps/FiveIsland_WaterLabyrinth/text.inc index c4a5542d3..07ede1ea3 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/text.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/text.inc @@ -1,4 +1,4 @@ -FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons:: @ 818A80D +FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons:: .string "You travel all over the place,\n" .string "don't you?\p" .string "You're not driving your POKéMON\n" @@ -6,39 +6,39 @@ FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons:: @ 818A80D .string "Let me take a look.\n" .string "… … … … … …$" -FiveIsland_WaterLabyrinth_Text_HmmISeeIsee:: @ 818A88F +FiveIsland_WaterLabyrinth_Text_HmmISeeIsee:: .string "Ah, hmm…\n" .string "I see, I see…$" -FiveIsland_WaterLabyrinth_Text_TreatMonRightHaveThis:: @ 818A8A6 +FiveIsland_WaterLabyrinth_Text_TreatMonRightHaveThis:: .string "Oh, impressive.\n" .string "You treat your POKéMON right.\p" .string "I think you can be entrusted with\n" .string "this.\p" .string "Please, I'd like you to have this.$" -FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan:: @ 818A91F +FiveIsland_WaterLabyrinth_Text_ReceivedEggFromMan:: .string "{PLAYER} received an EGG\n" .string "from the man!$" -FiveIsland_WaterLabyrinth_Text_DontHaveSpaceInYourParty:: @ 818A940 +FiveIsland_WaterLabyrinth_Text_DontHaveSpaceInYourParty:: .string "…Unfortunately, you don't have\n" .string "space for this in your party.\p" .string "You'd better come back for it\n" .string "another time.$" @ Unused -FiveIsland_WaterLabyrinth_Text_YouveComeBackForTheEgg:: @ 818A9A9 +FiveIsland_WaterLabyrinth_Text_YouveComeBackForTheEgg:: .string "やあ\n" .string "タマゴを　もらいに\l" .string "きて　くれたんだね$" -FiveIsland_WaterLabyrinth_Text_GladIMetSomeoneLikeYou:: @ 818A9C0 +FiveIsland_WaterLabyrinth_Text_GladIMetSomeoneLikeYou:: .string "I received that EGG while I was\n" .string "traveling.\p" .string "I'm glad I met someone like you.$" -FiveIsland_WaterLabyrinth_Text_CuteMonRemindsMeOfDaisy:: @ 818AA0C +FiveIsland_WaterLabyrinth_Text_CuteMonRemindsMeOfDaisy:: .string "Oh, hello.\n" .string "That's a cute {STR_VAR_2}.\p" .string "Seeing it reminds me of a sweet \n" @@ -48,14 +48,14 @@ FiveIsland_WaterLabyrinth_Text_CuteMonRemindsMeOfDaisy:: @ 818AA0C .string "That little girl's name…\n" .string "I think it was DAISY.$" -FiveIsland_WaterLabyrinth_Text_AlizeIntro:: @ 818AAD5 +FiveIsland_WaterLabyrinth_Text_AlizeIntro:: .string "This is an excellent environment\n" .string "for raising POKéMON.$" -FiveIsland_WaterLabyrinth_Text_AlizeDefeat:: @ 818AB0B +FiveIsland_WaterLabyrinth_Text_AlizeDefeat:: .string "Your POKéMON are growing up\n" .string "admirably well!$" -FiveIsland_WaterLabyrinth_Text_AlizePostBattle:: @ 818AB37 +FiveIsland_WaterLabyrinth_Text_AlizePostBattle:: .string "You know, I think you have the\n" .string "talent to be a good BREEDER.$" diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index 8fbf028fc..024171e8f 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -1,33 +1,33 @@ .equ LOCALID_DAYCARE_MAN, 1 .equ LOCALID_RIVAL, 10 -FourIsland_MapScripts:: @ 8167CAE +FourIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame .byte 0 -FourIsland_OnTransition:: @ 8167CB9 +FourIsland_OnTransition:: setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND compare VAR_MAP_SCENE_FOUR_ISLAND, 0 call_if_eq FourIsland_EventScript_ShowRival call FourIsland_EventScript_TrySetDayCareManPos end -FourIsland_EventScript_ShowRival:: @ 8167CCD +FourIsland_EventScript_ShowRival:: clearflag FLAG_HIDE_FOUR_ISLAND_RIVAL return -FourIsland_EventScript_TrySetDayCareManPos:: @ 8167CD1 +FourIsland_EventScript_TrySetDayCareManPos:: goto_if_unset FLAG_PENDING_DAYCARE_EGG, FourIsland_EventScript_EndSetDayCareManPos setobjectxyperm LOCALID_DAYCARE_MAN, 16, 14 -FourIsland_EventScript_EndSetDayCareManPos:: @ 8167CE1 +FourIsland_EventScript_EndSetDayCareManPos:: return -FourIsland_OnFrame:: @ 8167CE2 +FourIsland_OnFrame:: map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, FourIsland_EventScript_RivalScene .2byte 0 -FourIsland_EventScript_RivalScene:: @ 8167CEC +FourIsland_EventScript_RivalScene:: lockall textcolor 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown @@ -53,25 +53,25 @@ FourIsland_EventScript_RivalScene:: @ 8167CEC releaseall end -FourIsland_Movement_RivalApproach:: @ 8167D49 +FourIsland_Movement_RivalApproach:: walk_right walk_right walk_down walk_down step_end -FourIsland_Movement_RivalExit:: @ 8167D4E +FourIsland_Movement_RivalExit:: delay_16 delay_4 walk_down step_end -FourIsland_Movement_PlayerWatchRivalExit:: @ 8167D52 +FourIsland_Movement_PlayerWatchRivalExit:: walk_left walk_in_place_fastest_right step_end -FourIsland_EventScript_DaycareMan:: @ 8167D55 +FourIsland_EventScript_DaycareMan:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -88,7 +88,7 @@ FourIsland_EventScript_DaycareMan:: @ 8167D55 release end -FourIsland_EventScript_DaycareEggWaiting:: @ 8167D9B +FourIsland_EventScript_DaycareEggWaiting:: msgbox DayCare_Text_DoYouWantEgg, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq FourIsland_EventScript_DaycareAcceptEgg @@ -101,7 +101,7 @@ FourIsland_EventScript_DaycareEggWaiting:: @ 8167D9B release end -FourIsland_EventScript_DaycareAcceptEgg:: @ 8167DD1 +FourIsland_EventScript_DaycareAcceptEgg:: specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, PARTY_SIZE goto_if_ne FourIsland_EventScript_DaycareReceivedEgg @@ -109,7 +109,7 @@ FourIsland_EventScript_DaycareAcceptEgg:: @ 8167DD1 release end -FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB +FourIsland_EventScript_DaycareReceivedEgg:: textcolor 3 message DayCare_Text_ReceivedEgg call EventScript_RestorePrevTextColor @@ -122,13 +122,13 @@ FourIsland_EventScript_DaycareReceivedEgg:: @ 8167DEB release end -FourIsland_EventScript_CheckOnOneMon:: @ 8167E0C +FourIsland_EventScript_CheckOnOneMon:: special GetDaycareMonNicknames msgbox DayCare_Text_YourMonIsDoingFine release end -FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19 +FourIsland_EventScript_CheckOnTwoMons:: special GetDaycareMonNicknames msgbox DayCare_Text_YourMonsAreDoingFine special SetDaycareCompatibilityString @@ -138,7 +138,7 @@ FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19 release end -FourIsland_EventScript_OldWoman:: @ 8167E2E +FourIsland_EventScript_OldWoman:: lock faceplayer goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FourIsland_EventScript_OldWomanLoreleiLeft @@ -146,13 +146,13 @@ FourIsland_EventScript_OldWoman:: @ 8167E2E release end -FourIsland_EventScript_OldWomanLoreleiLeft:: @ 8167E43 +FourIsland_EventScript_OldWomanLoreleiLeft:: famechecker FAMECHECKER_LORELEI, 5 msgbox FourIsland_Text_LoreleiMetLaprasAsChild release end -FourIsland_EventScript_LittleGirl:: @ 8167E5A +FourIsland_EventScript_LittleGirl:: lock faceplayer famechecker FAMECHECKER_LORELEI, 4 @@ -160,14 +160,14 @@ FourIsland_EventScript_LittleGirl:: @ 8167E5A release end -FourIsland_EventScript_FatMan:: @ 8167E73 +FourIsland_EventScript_FatMan:: msgbox FourIsland_Text_MadeSlushieUsingIcefallCaveIce, MSGBOX_NPC end -FourIsland_EventScript_IslandSign:: @ 8167E7C +FourIsland_EventScript_IslandSign:: msgbox FourIsland_Text_IslandSign, MSGBOX_SIGN end -FourIsland_EventScript_LoreleisHouseSign:: @ 8167E85 +FourIsland_EventScript_LoreleisHouseSign:: msgbox FourIsland_Text_LoreleisHouse, MSGBOX_SIGN end diff --git a/data/maps/FourIsland/text.inc b/data/maps/FourIsland/text.inc index e54650761..a07d96a5c 100644 --- a/data/maps/FourIsland/text.inc +++ b/data/maps/FourIsland/text.inc @@ -1,13 +1,13 @@ -FourIsland_Text_IslandSign:: @ 8182A03 +FourIsland_Text_IslandSign:: .string "FOUR ISLAND\n" .string "The Warm, Blue, Floe Island$" -FourIsland_Text_LoreleiHasReturned:: @ 8182A2B +FourIsland_Text_LoreleiHasReturned:: .string "LORELEI has returned.\p" .string "Did she find the city life too\n" .string "stressful, I wonder?$" -FourIsland_Text_LoreleiMetLaprasAsChild:: @ 8182A75 +FourIsland_Text_LoreleiMetLaprasAsChild:: .string "LORELEI has gone back.\p" .string "The LAPRAS she has, I imagine it\n" .string "to be the one she met as a child.\p" @@ -16,7 +16,7 @@ FourIsland_Text_LoreleiMetLaprasAsChild:: @ 8182A75 .string "Perhaps that POKéMON has been with\n" .string "her ever since.$" -FourIsland_Text_RivalAlreadyGotEggBeSmellingYa:: @ 8182B37 +FourIsland_Text_RivalAlreadyGotEggBeSmellingYa:: .string "{RIVAL}: Hey!\n" .string "{PLAYER}!\p" .string "What are you doing here in the\n" @@ -37,7 +37,7 @@ FourIsland_Text_RivalAlreadyGotEggBeSmellingYa:: @ 8182B37 .string "waste.\p" .string "Be smelling ya!$" -FourIsland_Text_LoreleiHasLotsOfStuffedDolls:: @ 8182CE3 +FourIsland_Text_LoreleiHasLotsOfStuffedDolls:: .string "Oh, you found me!\n" .string "Please don't tell LORELEI.\p" .string "Did you know that LORELEI has lots\n" @@ -45,12 +45,12 @@ FourIsland_Text_LoreleiHasLotsOfStuffedDolls:: @ 8182CE3 .string "Every time she comes back to\n" .string "FOUR ISLAND, her collection grows!$" -FourIsland_Text_MadeSlushieUsingIcefallCaveIce:: @ 8182D8E +FourIsland_Text_MadeSlushieUsingIcefallCaveIce:: .string "Ooh, chilly!\p" .string "I made a slushie using ice I\n" .string "shaved inside ICEFALL CAVE.\p" .string "It's chilly and tasty!$" -FourIsland_Text_LoreleisHouse:: @ 8182DEB +FourIsland_Text_LoreleisHouse:: .string "LORELEI'S HOUSE$" diff --git a/data/maps/FourIsland_Harbor/scripts.inc b/data/maps/FourIsland_Harbor/scripts.inc index 3a16cd3e3..ad85a3bce 100644 --- a/data/maps/FourIsland_Harbor/scripts.inc +++ b/data/maps/FourIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ -FourIsland_Harbor_MapScripts:: @ 8171C98 +FourIsland_Harbor_MapScripts:: .byte 0 -FourIsland_Harbor_EventScript_Sailor:: @ 8171C99 +FourIsland_Harbor_EventScript_Sailor:: lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/FourIsland_House1/scripts.inc b/data/maps/FourIsland_House1/scripts.inc index e8e6322f5..dfecddd8d 100644 --- a/data/maps/FourIsland_House1/scripts.inc +++ b/data/maps/FourIsland_House1/scripts.inc @@ -1,6 +1,6 @@ -FourIsland_House1_MapScripts:: @ 8171C44 +FourIsland_House1_MapScripts:: .byte 0 -FourIsland_House1_EventScript_FatMan:: @ 8171C45 +FourIsland_House1_EventScript_FatMan:: msgbox FourIsland_House1_Text_YoureAwfullyHeavy, MSGBOX_NPC end diff --git a/data/maps/FourIsland_House1/text.inc b/data/maps/FourIsland_House1/text.inc index 255b3c028..382fe2ccc 100644 --- a/data/maps/FourIsland_House1/text.inc +++ b/data/maps/FourIsland_House1/text.inc @@ -1,7 +1,7 @@ @ Text for this file was split weirdly, and is instead in FourIsland_PokemonCenter_1F/text.inc @ Theres also an unused JP version of that text in this file instead -JPText_BodySlamTeach:: @ 81A3778 +JPText_BodySlamTeach:: .string "そーれ　ぼよーん！\n" .string "どっちが　さきに　へたばるか？\l" .string "のしかかり　しょうぶ　してるんだ\p" @@ -10,17 +10,17 @@ JPText_BodySlamTeach:: @ 81A3778 .string "かわりに　きみの　ポケモンに\l" .string "のしかかり　おしえて　やろっか？$" -JPText_BodySlamDeclined:: @ 81A37DB +JPText_BodySlamDeclined:: .string "また　おいで　ぼよーん！$" -JPText_BodySlamWhichMon:: @ 81A37E8 +JPText_BodySlamWhichMon:: .string "どの　ポケモンに\n" .string "おしえたい　かい？$" -JPText_BodySlamTaught:: @ 81A37FB +JPText_BodySlamTaught:: .string "ぼよよーん！$" -FourIsland_House1_Text_YoureAwfullyHeavy:: @ 81A3802 +FourIsland_House1_Text_YoureAwfullyHeavy:: .string "There! Boing!\n" .string "You're awfully heavy!$" diff --git a/data/maps/FourIsland_House2/scripts.inc b/data/maps/FourIsland_House2/scripts.inc index e74407be5..13f6ec526 100644 --- a/data/maps/FourIsland_House2/scripts.inc +++ b/data/maps/FourIsland_House2/scripts.inc @@ -1,2 +1,2 @@ -FourIsland_House2_MapScripts:: @ 8171CAC +FourIsland_House2_MapScripts:: .byte 0 diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc index 797c05d6b..d4d06e357 100644 --- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc @@ -1,22 +1,22 @@ -FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44 +FourIsland_IcefallCave_1F_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, FourIsland_IcefallCave_1F_OnResume map_script MAP_SCRIPT_ON_LOAD, FourIsland_IcefallCave_1F_OnLoad map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_IcefallCave_1F_OnFrame .byte 0 -FourIsland_IcefallCave_1F_OnResume:: @ 8163D54 +FourIsland_IcefallCave_1F_OnResume:: setstepcallback STEP_CB_ICE end -FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57 +FourIsland_IcefallCave_1F_OnLoad:: special SetIcefallCaveCrackedIceMetatiles end -FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B +FourIsland_IcefallCave_1F_OnFrame:: map_script_2 VAR_TEMP_1, 1, FourIsland_IcefallCave_1F_EventScript_FallDownHole .2byte 0 -FourIsland_IcefallCave_1F_EventScript_FallDownHole:: @ 8163D65 +FourIsland_IcefallCave_1F_EventScript_FallDownHole:: lockall delay 20 applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible @@ -28,6 +28,6 @@ FourIsland_IcefallCave_1F_EventScript_FallDownHole:: @ 8163D65 releaseall end -FourIsland_IcefallCave_1F_Movement_SetInvisible:: @ 8163D7F +FourIsland_IcefallCave_1F_Movement_SetInvisible:: set_invisible step_end diff --git a/data/maps/FourIsland_IcefallCave_B1F/scripts.inc b/data/maps/FourIsland_IcefallCave_B1F/scripts.inc index a3ec3cf54..1d60dd739 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_B1F/scripts.inc @@ -1,2 +1,2 @@ -FourIsland_IcefallCave_B1F_MapScripts:: @ 8163D81 +FourIsland_IcefallCave_B1F_MapScripts:: .byte 0 diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index 3edbc3886..e7fb4e9ee 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -3,20 +3,20 @@ .equ LOCALID_LORELEI, 3 .equ LOCALID_ROCKET3, 4 -FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82 +FourIsland_IcefallCave_Back_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition .byte 0 -FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88 +FourIsland_IcefallCave_Back_OnTransition:: compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1 call_if_eq FourIsland_IcefallCave_Back_EventScript_HideLorelei end -FourIsland_IcefallCave_Back_EventScript_HideLorelei:: @ 8163D94 +FourIsland_IcefallCave_Back_EventScript_HideLorelei:: setflag FLAG_HIDE_ICEFALL_CAVE_LORELEI return -FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98 +FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: lockall textcolor 1 msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons @@ -92,14 +92,14 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98 releaseall end -FourIsland_IcefallCave_Back_Movement_PlayerToRockets:: @ 8163EDD +FourIsland_IcefallCave_Back_Movement_PlayerToRockets:: walk_up walk_up walk_right walk_up step_end -FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: @ 8163EE2 +FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: delay_16 walk_in_place_fastest_left delay_16 @@ -107,21 +107,21 @@ FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: @ 8163EE2 walk_in_place_fastest_down step_end -FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown:: @ 8163EE8 +FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown:: walk_in_place_down step_end -FourIsland_IcefallCave_Back_Movement_UnusedPushRight:: @ 8163EEA +FourIsland_IcefallCave_Back_Movement_UnusedPushRight:: lock_facing_direction walk_right unlock_facing_direction step_end -FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat:: @ 8163EEE +FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat:: walk_in_place_fast_down step_end -FourIsland_IcefallCave_Back_Movement_Rocket1Exit:: @ 8163EF0 +FourIsland_IcefallCave_Back_Movement_Rocket1Exit:: walk_right walk_down walk_fast_down @@ -133,7 +133,7 @@ FourIsland_IcefallCave_Back_Movement_Rocket1Exit:: @ 8163EF0 walk_fast_down step_end -FourIsland_IcefallCave_Back_Movement_Rocket2Exit:: @ 8163EFA +FourIsland_IcefallCave_Back_Movement_Rocket2Exit:: delay_16 walk_left walk_down @@ -146,7 +146,7 @@ FourIsland_IcefallCave_Back_Movement_Rocket2Exit:: @ 8163EFA walk_fast_down step_end -FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: @ 8163F05 +FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: delay_16 walk_down delay_16 @@ -160,27 +160,27 @@ FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: @ 8163F05 walk_fast_down step_end -FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei:: @ 8163F11 +FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei:: delay_16 delay_8 walk_in_place_fastest_right step_end -FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft:: @ 8163F15 +FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft:: walk_left walk_left step_end -FourIsland_IcefallCave_Back_Movement_LoreleiToRockets:: @ 8163F18 +FourIsland_IcefallCave_Back_Movement_LoreleiToRockets:: walk_left walk_up step_end -FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp:: @ 8163F1B +FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp:: walk_in_place_up step_end -FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: @ 8163F1D +FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: delay_8 walk_in_place_fastest_right delay_16 @@ -188,10 +188,10 @@ FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: @ 8163F1D walk_in_place_fastest_down step_end -FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer:: @ 8163F23 +FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer:: walk_right step_end -FourIsland_IcefallCave_Back_EventScript_Lorelei:: @ 8163F25 +FourIsland_IcefallCave_Back_EventScript_Lorelei:: msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful, MSGBOX_NPC end diff --git a/data/maps/FourIsland_IcefallCave_Back/text.inc b/data/maps/FourIsland_IcefallCave_Back/text.inc index 981041777..adc958c5f 100644 --- a/data/maps/FourIsland_IcefallCave_Back/text.inc +++ b/data/maps/FourIsland_IcefallCave_Back/text.inc @@ -1,16 +1,16 @@ -FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons:: @ 817B04F +FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons:: .string "LORELEI: Keep your filthy hands\n" .string "off the POKéMON in the cave!\p" .string "Do as I say, or you'll have me to\n" .string "answer to!$" -FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe:: @ 817B0B9 +FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe:: .string "Aww, shut it, lady, and leave\n" .string "us be.\p" .string "Don't let your glasses get all\n" .string "steamed up!$" -FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut:: @ 817B109 +FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut:: .string "LORELEI: {PLAYER}?!\n" .string "What are you doing here?\p" .string "No, we can catch up later.\n" @@ -22,15 +22,15 @@ FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut:: @ 817B109 .string "Are you ready?\n" .string "You take that one, please!$" -FourIsland_IcefallCave_Back_Text_GruntIntro:: @ 817B20B +FourIsland_IcefallCave_Back_Text_GruntIntro:: .string "W-what?!\p" .string "Who says we can't do what we want\n" .string "with the POKéMON we catch?$" -FourIsland_IcefallCave_Back_Text_GruntDefeat:: @ 817B251 +FourIsland_IcefallCave_Back_Text_GruntDefeat:: .string "We didn't plan on this!$" -FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons:: @ 817B269 +FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons:: .string "LORELEI: Humph.\n" .string "So despicably weak.\p" .string "You!\n" @@ -40,11 +40,11 @@ FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons:: @ 817B269 .string "I'm smashing your ring once and\n" .string "for all!$" -FourIsland_IcefallCave_Back_Text_NotTellingYouThat:: @ 817B2EF +FourIsland_IcefallCave_Back_Text_NotTellingYouThat:: .string "N-no way!\n" .string "I'm not telling you that!$" -FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou:: @ 817B313 +FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou:: .string "LORELEI: If you won't confess,\n" .string "we'll deep-freeze you.\p" .string "My LAPRAS is furious for what\n" @@ -52,7 +52,7 @@ FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou:: @ 817B313 .string "Go, LAPRAS!\n" .string "ICE BEAM…$" -FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland:: @ 817B399 +FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland:: .string "Wawaah! Okay!\n" .string "I'll talk!\p" .string "The POKéMON are in the ROCKET\n" @@ -63,7 +63,7 @@ FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland:: @ 817B399 .string "into the ROCKET WAREHOUSE!\p" .string "Heheheheh!$" -FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful:: @ 817B457 +FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful:: .string "{PLAYER}, thank you.\n" .string "But this is awful…\p" .string "I was born and raised here on\n" diff --git a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc index b8bbd1102..c0051b9b9 100644 --- a/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Entrance/scripts.inc @@ -1,7 +1,7 @@ -FourIsland_IcefallCave_Entrance_MapScripts:: @ 8163D3A +FourIsland_IcefallCave_Entrance_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Entrance_OnTransition .byte 0 -FourIsland_IcefallCave_Entrance_OnTransition:: @ 8163D40 +FourIsland_IcefallCave_Entrance_OnTransition:: setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND_ICEFALL_CAVE_ENTRANCE end diff --git a/data/maps/FourIsland_LoreleisHouse/scripts.inc b/data/maps/FourIsland_LoreleisHouse/scripts.inc index 8c1f9e2fa..df5d79bfb 100644 --- a/data/maps/FourIsland_LoreleisHouse/scripts.inc +++ b/data/maps/FourIsland_LoreleisHouse/scripts.inc @@ -1,12 +1,12 @@ -FourIsland_LoreleisHouse_MapScripts:: @ 8171C4E +FourIsland_LoreleisHouse_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_LoreleisHouse_OnTransition .byte 0 -FourIsland_LoreleisHouse_OnTransition:: @ 8171C54 +FourIsland_LoreleisHouse_OnTransition:: special UpdateLoreleiDollCollection end -FourIsland_LoreleisHouse_EventScript_Lorelei:: @ 8171C58 +FourIsland_LoreleisHouse_EventScript_Lorelei:: lock faceplayer goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, FourIsland_LoreleisHouse_EventScript_Lorelei3 @@ -15,18 +15,18 @@ FourIsland_LoreleisHouse_EventScript_Lorelei:: @ 8171C58 release end -FourIsland_LoreleisHouse_EventScript_Lorelei2:: @ 8171C76 +FourIsland_LoreleisHouse_EventScript_Lorelei2:: setflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE msgbox FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile release end -FourIsland_LoreleisHouse_EventScript_Lorelei3:: @ 8171C83 +FourIsland_LoreleisHouse_EventScript_Lorelei3:: msgbox FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow release end -FourIsland_LoreleisHouse_EventScript_Doll:: @ 8171C8D +FourIsland_LoreleisHouse_EventScript_Doll:: lock msgbox FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore release diff --git a/data/maps/FourIsland_LoreleisHouse/text.inc b/data/maps/FourIsland_LoreleisHouse/text.inc index b332cd50e..7bb81f4da 100644 --- a/data/maps/FourIsland_LoreleisHouse/text.inc +++ b/data/maps/FourIsland_LoreleisHouse/text.inc @@ -1,4 +1,4 @@ -FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland:: @ 81A3826 +FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland:: .string "LORELEI: There's something weighing\n" .string "heavily on my mind.\p" .string "If anything were to happen on\n" @@ -8,7 +8,7 @@ FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland:: @ 81A3826 .string "I wonder if that would make me\n" .string "irresponsible to my home…$" -FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile:: @ 81A390C +FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile:: .string "LORELEI: So, you managed to solve\n" .string "all the problems here?\p" .string "That's wonderful.\p" @@ -18,12 +18,12 @@ FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile:: @ 81A390C .string "I'll return to the POKéMON LEAGUE\n" .string "in a short while.$" -FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow:: @ 81A39D8 +FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow:: .string "I don't know what will happen in\n" .string "the future, but…\p" .string "I will do what I can here and now.\n" .string "That's all I can do.$" -FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore:: @ 81A3A42 +FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore:: .string "Stuffed POKéMON dolls galore!$" diff --git a/data/maps/FourIsland_Mart/scripts.inc b/data/maps/FourIsland_Mart/scripts.inc index 36b3a0914..27908c25c 100644 --- a/data/maps/FourIsland_Mart/scripts.inc +++ b/data/maps/FourIsland_Mart/scripts.inc @@ -1,7 +1,7 @@ -FourIsland_Mart_MapScripts:: @ 8171CAD +FourIsland_Mart_MapScripts:: .byte 0 -FourIsland_Mart_EventScript_Clerk:: @ 8171CAE +FourIsland_Mart_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -13,7 +13,7 @@ FourIsland_Mart_EventScript_Clerk:: @ 8171CAE end .align 2 -FourIsland_Mart_Items:: @ 8171CD4 +FourIsland_Mart_Items:: .2byte ITEM_ULTRA_BALL .2byte ITEM_FULL_RESTORE .2byte ITEM_MAX_POTION @@ -26,6 +26,6 @@ FourIsland_Mart_Items:: @ 8171CD4 release end -FourIsland_Mart_EventScript_Camper:: @ 8171CE8 +FourIsland_Mart_EventScript_Camper:: msgbox FourIsland_Mart_Text_IcefallCaveIsFrigid, MSGBOX_NPC end diff --git a/data/maps/FourIsland_Mart/text.inc b/data/maps/FourIsland_Mart/text.inc index afde0e79c..242567dd7 100644 --- a/data/maps/FourIsland_Mart/text.inc +++ b/data/maps/FourIsland_Mart/text.inc @@ -1,4 +1,4 @@ -FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland:: @ 81A3A60 +FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland:: .string "We've had a great and powerful\n" .string "TRAINER grow up on this island.\p" .string "I bet even you'd know her.\n" @@ -6,7 +6,7 @@ FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland:: @ 81A3A60 .string "When LORELEI was just a tyke,\n" .string "I taught her about POKéMON.$" -FourIsland_Mart_Text_IcefallCaveIsFrigid:: @ 81A3B14 +FourIsland_Mart_Text_IcefallCaveIsFrigid:: .string "The SEVII ISLANDS are in a warm\n" .string "region overall.\p" .string "But there is one exception you\n" diff --git a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc index afb0c7582..630ad96b3 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ -FourIsland_PokemonCenter_1F_MapScripts:: @ 8171BEA +FourIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5 +FourIsland_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_FOUR_ISLAND end -FourIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171BF9 +FourIsland_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -FourIsland_PokemonCenter_1F_EventScript_Man:: @ 8171C02 +FourIsland_PokemonCenter_1F_EventScript_Man:: msgbox FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave, MSGBOX_NPC end -FourIsland_PokemonCenter_1F_EventScript_Woman:: @ 8171C0B +FourIsland_PokemonCenter_1F_EventScript_Woman:: msgbox FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore, MSGBOX_NPC end -FourIsland_PokemonCenter_1F_EventScript_Gentleman:: @ 8171C14 +FourIsland_PokemonCenter_1F_EventScript_Gentleman:: msgbox FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived, MSGBOX_NPC end diff --git a/data/maps/FourIsland_PokemonCenter_1F/text.inc b/data/maps/FourIsland_PokemonCenter_1F/text.inc index 43e6cacf6..1673b0833 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/text.inc +++ b/data/maps/FourIsland_PokemonCenter_1F/text.inc @@ -1,5 +1,5 @@ @ The 5 texts below are supposed to be in FourIsland_House1 -Text_BodySlamTeach:: @ 81A3505 +Text_BodySlamTeach:: .string "Ready?\n" .string "Boing!\p" .string "We're having a BODY SLAM match\n" @@ -9,28 +9,28 @@ Text_BodySlamTeach:: @ 81A3505 .string "How about I teach BODY SLAM to\n" .string "a POKéMON of yours instead?$" -Text_BodySlamDeclined:: @ 81A35C7 +Text_BodySlamDeclined:: .string "Come again!\n" .string "Boing!$" -Text_BodySlamWhichMon:: @ 81A35DA +Text_BodySlamWhichMon:: .string "Which POKéMON wants to learn how\n" .string "to BODY SLAM?$" -Text_BodySlamTaught:: @ 81A3609 +Text_BodySlamTaught:: .string "Boioing!$" -FourIsland_House1_Text_FatMan:: @ 81A3612 +FourIsland_House1_Text_FatMan:: .string "それ　ぼよーん！\n" .string "おまえ　おもいなあー！$" -FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave:: @ 81A3627 +FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave:: .string "There's a rare kind of ICE POKéMON\n" .string "that lives in the cave.\p" .string "We get a lot of visitors hoping to\n" .string "see that POKéMON.$" -FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore:: @ 81A3697 +FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore:: .string "Oh? A POKéMON EGG?\n" .string "…I have no idea.\p" .string "…Oh, wait. The DAY-CARE people\n" @@ -38,7 +38,7 @@ FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore:: @ 81A3697 .string "They said that they'd found EGGS\n" .string "before on their property.$" -FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived:: @ 81A3734 +FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived:: .string "What's this?\p" .string "The new POKéMON JOURNAL hasn't\n" .string "arrived on this island?$" diff --git a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc index a8cc194aa..c02811b7f 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/FourIsland_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D +FourIsland_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ FourIsland_PokemonCenter_2F_MapScripts:: @ 8171C1D .byte 0 @ The below 3 are unused and leftover from RS -FourIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171C32 +FourIsland_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -FourIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171C38 +FourIsland_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -FourIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171C3E +FourIsland_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 0beeafb08..89a384a2f 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -1,9 +1,9 @@ .set LOCALID_DAYCARE_WOMAN, 1 -FourIsland_PokemonDayCare_MapScripts:: @ 817193F +FourIsland_PokemonDayCare_MapScripts:: .byte 0 -FourIsland_PokemonDayCare_EventScript_DaycareWoman:: @ 8171940 +FourIsland_PokemonDayCare_EventScript_DaycareWoman:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -21,7 +21,7 @@ FourIsland_PokemonDayCare_EventScript_DaycareWoman:: @ 8171940 release end -FourIsland_PokemonDayCare_GiveMonToRaise:: @ 8171993 +FourIsland_PokemonDayCare_GiveMonToRaise:: specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 1 goto_if_eq FourIsland_PokemonDayCare_OnlyOneMonInParty @@ -47,44 +47,44 @@ FourIsland_PokemonDayCare_GiveMonToRaise:: @ 8171993 release end -FourIsland_PokemonDayCare_ComeAgain:: @ 81719F7 +FourIsland_PokemonDayCare_ComeAgain:: msgbox DayCare_Text_ComeAgain release end -FourIsland_PokemonDayCare_CanRaiseOneMore:: @ 8171A01 +FourIsland_PokemonDayCare_CanRaiseOneMore:: msgbox DayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq FourIsland_PokemonDayCare_GiveMonToRaise goto FourIsland_PokemonDayCare_ComeAgain end -FourIsland_PokemonDayCare_OnlyOneMonInParty:: @ 8171A1A +FourIsland_PokemonDayCare_OnlyOneMonInParty:: msgbox DayCare_Text_YouHaveJustOneMon release end -FourIsland_PokemonDayCare_OnlyOneAliveMonInParty:: @ 8171A24 +FourIsland_PokemonDayCare_OnlyOneAliveMonInParty:: msgbox DayCare_Text_WhatWillYouBattleWith release end -FourIsland_PokemonDayCare_EggWaiting:: @ 8171A2E +FourIsland_PokemonDayCare_EggWaiting:: msgbox DayCare_Text_HusbandWasLookingForYou release end -FourIsland_PokemonDayCare_MonHasGrownXLevels:: @ 8171A38 +FourIsland_PokemonDayCare_MonHasGrownXLevels:: msgbox DayCare_Text_YourMonHasGrownXLevels return -FourIsland_PokemonDayCare_DisplayLevelsGained:: @ 8171A41 +FourIsland_PokemonDayCare_DisplayLevelsGained:: specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare compare VAR_RESULT, 0 call_if_ne FourIsland_PokemonDayCare_MonHasGrownXLevels return -FourIsland_PokemonDayCare_OneMonInDaycare:: @ 8171A52 +FourIsland_PokemonDayCare_OneMonInDaycare:: msgbox DayCare_Text_GoodToSeeYou setvar VAR_0x8004, 0 call FourIsland_PokemonDayCare_DisplayLevelsGained @@ -97,7 +97,7 @@ FourIsland_PokemonDayCare_OneMonInDaycare:: @ 8171A52 goto FourIsland_PokemonDayCare_ComeAgain end -FourIsland_PokemonDayCare_TryRetrieveMon:: @ 8171A90 +FourIsland_PokemonDayCare_TryRetrieveMon:: specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, PARTY_SIZE goto_if_eq FourIsland_PokemonDayCare_NoRoomInParty @@ -113,7 +113,7 @@ FourIsland_PokemonDayCare_TryRetrieveMon:: @ 8171A90 goto FourIsland_PokemonDayCare_CostPrompt end -FourIsland_PokemonDayCare_CostPrompt:: @ 8171ACF +FourIsland_PokemonDayCare_CostPrompt:: special GetDaycareCost msgbox DayCare_Text_ItWillCostX, MSGBOX_YESNO compare VAR_RESULT, YES @@ -121,7 +121,7 @@ FourIsland_PokemonDayCare_CostPrompt:: @ 8171ACF goto FourIsland_PokemonDayCare_ComeAgain end -FourIsland_PokemonDayCare_CheckEnoughMoney:: @ 8171AEB +FourIsland_PokemonDayCare_CheckEnoughMoney:: specialvar VAR_RESULT, IsEnoughForCostInVar0x8005 compare VAR_RESULT, TRUE goto_if_eq FourIsland_PokemonDayCare_RetrieveMon @@ -129,7 +129,7 @@ FourIsland_PokemonDayCare_CheckEnoughMoney:: @ 8171AEB release end -FourIsland_PokemonDayCare_RetrieveMon:: @ 8171B05 +FourIsland_PokemonDayCare_RetrieveMon:: applymovement LOCALID_DAYCARE_WOMAN, FourIsland_PokemonDayCare_Movement_RetrieveMon waitmovement 0 specialvar VAR_RESULT, TakePokemonFromDaycare @@ -148,19 +148,19 @@ FourIsland_PokemonDayCare_RetrieveMon:: @ 8171B05 goto FourIsland_PokemonDayCare_ComeAgain end -FourIsland_PokemonDayCare_AskRetrieveOtherMon:: @ 8171B4E +FourIsland_PokemonDayCare_AskRetrieveOtherMon:: msgbox DayCare_Text_TakeOtherOneBackToo, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq FourIsland_PokemonDayCare_TryRetrieveMon goto FourIsland_PokemonDayCare_ComeAgain end -FourIsland_PokemonDayCare_NoRoomInParty:: @ 8171B67 +FourIsland_PokemonDayCare_NoRoomInParty:: msgbox DayCare_Text_YourPartyIsFull release end -FourIsland_PokemonDayCare_Movement_RetrieveMon:: @ 8171B71 +FourIsland_PokemonDayCare_Movement_RetrieveMon:: delay_16 delay_16 face_right @@ -183,10 +183,10 @@ FourIsland_PokemonDayCare_Movement_RetrieveMon:: @ 8171B71 step_end @ Unused. Possibly a commented script, or a typo end added to the above Movement script -FourIsland_PokemonDayCare_EventScript_UnusedEnd:: @ 8171B85 +FourIsland_PokemonDayCare_EventScript_UnusedEnd:: end -FourIsland_PokemonDayCare_TwoMonsInDaycare:: @ 8171B86 +FourIsland_PokemonDayCare_TwoMonsInDaycare:: msgbox DayCare_Text_GoodToSeeYou setvar VAR_0x8004, 0 call FourIsland_PokemonDayCare_DisplayLevelsGained @@ -200,7 +200,7 @@ FourIsland_PokemonDayCare_TwoMonsInDaycare:: @ 8171B86 end @ Unused -FourIsland_PokemonDayCare_EventScript_UnusedRetrieveMon:: @ 8171BBF +FourIsland_PokemonDayCare_EventScript_UnusedRetrieveMon:: special ShowDaycareLevelMenu waitstate compare VAR_RESULT, 2 diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index f33b2eb5a..67192553e 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -1,38 +1,38 @@ -FuchsiaCity_MapScripts:: @ 8166D75 +FuchsiaCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_OnTransition .byte 0 -FuchsiaCity_OnTransition:: @ 8166D7B +FuchsiaCity_OnTransition:: setworldmapflag FLAG_WORLD_MAP_FUCHSIA_CITY call_if_set FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_SetOmanyteGfx call_if_unset FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_SetKabutoGfx end -FuchsiaCity_EventScript_SetOmanyteGfx:: @ 8166D91 +FuchsiaCity_EventScript_SetOmanyteGfx:: setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OMANYTE return -FuchsiaCity_EventScript_SetKabutoGfx:: @ 8166D97 +FuchsiaCity_EventScript_SetKabutoGfx:: setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_KABUTO return -FuchsiaCity_EventScript_LittleBoy:: @ 8166D9D +FuchsiaCity_EventScript_LittleBoy:: msgbox FuchsiaCity_Text_DidYouTrySafariGame, MSGBOX_NPC end -FuchsiaCity_EventScript_OldMan:: @ 8166DA6 +FuchsiaCity_EventScript_OldMan:: msgbox FuchsiaCity_Text_SafariZoneZooInFront, MSGBOX_NPC end -FuchsiaCity_EventScript_Erik:: @ 8166DAF +FuchsiaCity_EventScript_Erik:: msgbox FuchsiaCity_Text_WheresSara, MSGBOX_NPC end -FuchsiaCity_EventScript_Youngster:: @ 8166DB8 +FuchsiaCity_EventScript_Youngster:: msgbox FuchsiaCity_Text_ItemBallInThere, MSGBOX_NPC end -FuchsiaCity_EventScript_Lass:: @ 8166DC1 +FuchsiaCity_EventScript_Lass:: lock faceplayer famechecker FAMECHECKER_KOGA, 3 @@ -40,35 +40,35 @@ FuchsiaCity_EventScript_Lass:: @ 8166DC1 release end -FuchsiaCity_EventScript_CitySign:: @ 8166DDA +FuchsiaCity_EventScript_CitySign:: msgbox FuchsiaCity_Text_CitySign, MSGBOX_SIGN end -FuchsiaCity_EventScript_SafariZoneSign:: @ 8166DE3 +FuchsiaCity_EventScript_SafariZoneSign:: msgbox FuchsiaCity_Text_SafariZoneSign, MSGBOX_SIGN end -FuchsiaCity_EventScript_SafariGameSign:: @ 8166DEC +FuchsiaCity_EventScript_SafariGameSign:: msgbox FuchsiaCity_Text_SafariGameSign, MSGBOX_SIGN end -FuchsiaCity_EventScript_WardensHomeSign:: @ 8166DF5 +FuchsiaCity_EventScript_WardensHomeSign:: msgbox FuchsiaCity_Text_WardensHomeSign, MSGBOX_SIGN end @ Unused -FuchsiaCity_EventScript_SafariZoneOfficeSign:: @ 8166DFE +FuchsiaCity_EventScript_SafariZoneOfficeSign:: msgbox FuchsiaCity_Text_SafariZoneOfficeSign, MSGBOX_SIGN end -FuchsiaCity_EventScript_GymSign:: @ 8166E07 +FuchsiaCity_EventScript_GymSign:: lockall famechecker FAMECHECKER_KOGA, 0 msgbox FuchsiaCity_Text_GymSign releaseall end -FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F +FuchsiaCity_EventScript_ChanseySign:: lockall setvar VAR_0x8004, SPECIES_CHANSEY special SetSeenMon @@ -78,7 +78,7 @@ FuchsiaCity_EventScript_ChanseySign:: @ 8166E1F releaseall end -FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38 +FuchsiaCity_EventScript_VoltorbSign:: lockall setvar VAR_0x8004, SPECIES_VOLTORB special SetSeenMon @@ -88,7 +88,7 @@ FuchsiaCity_EventScript_VoltorbSign:: @ 8166E38 releaseall end -FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51 +FuchsiaCity_EventScript_KangaskhanSign:: lockall setvar VAR_0x8004, SPECIES_KANGASKHAN special SetSeenMon @@ -98,7 +98,7 @@ FuchsiaCity_EventScript_KangaskhanSign:: @ 8166E51 releaseall end -FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A +FuchsiaCity_EventScript_SlowpokeSign:: lockall setvar VAR_0x8004, SPECIES_SLOWPOKE special SetSeenMon @@ -108,7 +108,7 @@ FuchsiaCity_EventScript_SlowpokeSign:: @ 8166E6A releaseall end -FuchsiaCity_EventScript_LaprasSign:: @ 8166E83 +FuchsiaCity_EventScript_LaprasSign:: lockall setvar VAR_0x8004, SPECIES_LAPRAS special SetSeenMon @@ -118,7 +118,7 @@ FuchsiaCity_EventScript_LaprasSign:: @ 8166E83 releaseall end -FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C +FuchsiaCity_EventScript_FossilMonSign:: lockall goto_if_set FLAG_GOT_DOME_FOSSIL, FuchsiaCity_EventScript_OmanyteSign setvar VAR_0x8004, SPECIES_KABUTO @@ -129,7 +129,7 @@ FuchsiaCity_EventScript_FossilMonSign:: @ 8166E9C releaseall end -FuchsiaCity_EventScript_OmanyteSign:: @ 8166EBE +FuchsiaCity_EventScript_OmanyteSign:: setvar VAR_0x8004, SPECIES_OMANYTE special SetSeenMon drawmonpic SPECIES_OMANYTE, 10, 3 diff --git a/data/maps/FuchsiaCity/text.inc b/data/maps/FuchsiaCity/text.inc index 84b49f63c..f3a2c00e0 100644 --- a/data/maps/FuchsiaCity/text.inc +++ b/data/maps/FuchsiaCity/text.inc @@ -1,86 +1,86 @@ -FuchsiaCity_Text_DidYouTrySafariGame:: @ 818056E +FuchsiaCity_Text_DidYouTrySafariGame:: .string "Did you try the SAFARI GAME?\p" .string "There are some rare POKéMON that\n" .string "can only be caught there.$" -FuchsiaCity_Text_SafariZoneZooInFront:: @ 81805C6 +FuchsiaCity_Text_SafariZoneZooInFront:: .string "The SAFARI ZONE has a zoo in front\n" .string "of the entrance.\p" .string "Out back is the SAFARI GAME for\n" .string "catching POKéMON.$" -FuchsiaCity_Text_WheresSara:: @ 818062C +FuchsiaCity_Text_WheresSara:: .string "ERIK: Where's SARA?\n" .string "I said I'd meet her here.$" -FuchsiaCity_Text_ItemBallInThere:: @ 818065A +FuchsiaCity_Text_ItemBallInThere:: .string "That item ball in there…\n" .string "Were you wanting that?\p" .string "Me, too!\n" .string "…Huh? That's a POKéMON?$" -FuchsiaCity_Text_CitySign:: @ 81806AB +FuchsiaCity_Text_CitySign:: .string "FUCHSIA CITY\n" .string "Behold! It's Passion Pink!$" -FuchsiaCity_Text_SafariZoneSign:: @ 81806D3 +FuchsiaCity_Text_SafariZoneSign:: .string "POKéMON PARADISE\n" .string "SAFARI ZONE$" -FuchsiaCity_Text_SafariGameSign:: @ 81806F0 +FuchsiaCity_Text_SafariGameSign:: .string "SAFARI GAME\n" .string "POKéMON-U-CATCH!$" -FuchsiaCity_Text_WardensHomeSign:: @ 818070D +FuchsiaCity_Text_WardensHomeSign:: .string "SAFARI ZONE\n" .string "WARDEN'S HOME$" -FuchsiaCity_Text_SafariZoneOfficeSign:: @ 8180727 +FuchsiaCity_Text_SafariZoneOfficeSign:: .string "POKéMON PARADISE!\n" .string "Welcome to the SAFARI ZONE!\l" .string "SAFARI ZONE OFFICE$" -FuchsiaCity_Text_GymSign:: @ 8180768 +FuchsiaCity_Text_GymSign:: .string "FUCHSIA CITY POKéMON GYM\n" .string "LEADER: KOGA\l" .string "The Poisonous Ninja Master$" -FuchsiaCity_Text_ChanseySign:: @ 81807A9 +FuchsiaCity_Text_ChanseySign:: .string "Name: CHANSEY\n" .string "Catching one is all up to chance.$" -FuchsiaCity_Text_VoltorbSign:: @ 81807D9 +FuchsiaCity_Text_VoltorbSign:: .string "Name: VOLTORB\n" .string "The very image of a POKé BALL.$" -FuchsiaCity_Text_KangaskhanSign:: @ 8180806 +FuchsiaCity_Text_KangaskhanSign:: .string "Name: KANGASKHAN\p" .string "A maternal POKéMON that raises its\n" .string "young in a pouch on its belly.$" -FuchsiaCity_Text_SlowpokeSign:: @ 8180859 +FuchsiaCity_Text_SlowpokeSign:: .string "Name: SLOWPOKE\n" .string "Friendly and very slow moving.$" -FuchsiaCity_Text_LaprasSign:: @ 8180887 +FuchsiaCity_Text_LaprasSign:: .string "Name: LAPRAS\n" .string "AKA the king of the seas.$" -FuchsiaCity_Text_OmanyteSign:: @ 81808AE +FuchsiaCity_Text_OmanyteSign:: .string "Name: OMANYTE\n" .string "An extremely rare POKéMON that was\l" .string "regenerated from a fossil.$" -FuchsiaCity_Text_KabutoSign:: @ 81808FA +FuchsiaCity_Text_KabutoSign:: .string "Name: KABUTO\n" .string "An extremely rare POKéMON that was\l" .string "regenerated from a fossil.$" @ Unused. May have been meant to be the placeholder text for the zoo mons, similar to RB's "!" text -FuchsiaCity_Text_Ellipsis:: @ 8180945 +FuchsiaCity_Text_Ellipsis:: .string "……$" -Text_SubstituteTeach:: @ 8180948 +Text_SubstituteTeach:: .string "Aww, I wish I was a KANGASKHAN\n" .string "baby.\p" .string "I'd love to be a substitute for the\n" @@ -92,19 +92,19 @@ Text_SubstituteTeach:: @ 8180948 .string "Want me to teach SUBSTITUTE to\n" .string "one of your POKéMON?$" -Text_SubstituteDeclined:: @ 8180A32 +Text_SubstituteDeclined:: .string "Oh, really?\n" .string "SUBSTITUTE seems so fun…$" -Text_SubstituteWhichMon:: @ 8180A57 +Text_SubstituteWhichMon:: .string "Which POKéMON wants to learn\n" .string "SUBSTITUTE?$" -Text_SubstituteTaught:: @ 8180A80 +Text_SubstituteTaught:: .string "Boy, what I'd give to crawl inside\n" .string "a KANGASKHAN belly pouch…$" -FuchsiaCity_Text_MyFatherIsGymLeader:: @ 8180ABD +FuchsiaCity_Text_MyFatherIsGymLeader:: .string "My father is the GYM LEADER of\n" .string "this town.\p" .string "I'm training to use POISON POKéMON\n" diff --git a/data/maps/FuchsiaCity_Gym/scripts.inc b/data/maps/FuchsiaCity_Gym/scripts.inc index 6486c36eb..5b915f855 100644 --- a/data/maps/FuchsiaCity_Gym/scripts.inc +++ b/data/maps/FuchsiaCity_Gym/scripts.inc @@ -1,7 +1,7 @@ -FuchsiaCity_Gym_MapScripts:: @ 816D54D +FuchsiaCity_Gym_MapScripts:: .byte 0 -FuchsiaCity_Gym_EventScript_Koga:: @ 816D54E +FuchsiaCity_Gym_EventScript_Koga:: famechecker FAMECHECKER_KOGA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle_single TRAINER_LEADER_KOGA, FuchsiaCity_Gym_Text_KogaIntro, FuchsiaCity_Gym_Text_KogaDefeat, FuchsiaCity_Gym_EventScript_DefeatedKoga, NO_MUSIC goto_if_unset FLAG_GOT_TM06_FROM_KOGA, FuchsiaCity_Gym_EventScript_GiveTM06 @@ -9,7 +9,7 @@ FuchsiaCity_Gym_EventScript_Koga:: @ 816D54E release end -FuchsiaCity_Gym_EventScript_DefeatedKoga:: @ 816D580 +FuchsiaCity_Gym_EventScript_DefeatedKoga:: famechecker FAMECHECKER_KOGA, 1 clearflag FLAG_HIDE_FAME_CHECKER_KOGA_JOURNAL setflag FLAG_DEFEATED_KOGA @@ -18,7 +18,7 @@ FuchsiaCity_Gym_EventScript_DefeatedKoga:: @ 816D580 goto FuchsiaCity_Gym_EventScript_GiveTM06 end -FuchsiaCity_Gym_EventScript_GiveTM06:: @ 816D5A6 +FuchsiaCity_Gym_EventScript_GiveTM06:: msgbox FuchsiaCity_Gym_Text_KogaExplainSoulBadge checkitemspace ITEM_TM06, 1 compare VAR_RESULT, FALSE @@ -29,43 +29,43 @@ FuchsiaCity_Gym_EventScript_GiveTM06:: @ 816D5A6 release end -FuchsiaCity_Gym_EventScript_NoRoomForTM06:: @ 816D5E7 +FuchsiaCity_Gym_EventScript_NoRoomForTM06:: msgbox FuchsiaCity_Gym_Text_MakeSpaceForThis release end -FuchsiaCity_Gym_EventScript_Phil:: @ 816D5F1 +FuchsiaCity_Gym_EventScript_Phil:: trainerbattle_single TRAINER_TAMER_PHIL, FuchsiaCity_Gym_Text_PhilIntro, FuchsiaCity_Gym_Text_PhilDefeat msgbox FuchsiaCity_Gym_Text_PhilPostBattle, MSGBOX_AUTOCLOSE end -FuchsiaCity_Gym_EventScript_Edgar:: @ 816D608 +FuchsiaCity_Gym_EventScript_Edgar:: trainerbattle_single TRAINER_TAMER_EDGAR, FuchsiaCity_Gym_Text_EdgarIntro, FuchsiaCity_Gym_Text_EdgarDefeat msgbox FuchsiaCity_Gym_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE end -FuchsiaCity_Gym_EventScript_Kirk:: @ 816D61F +FuchsiaCity_Gym_EventScript_Kirk:: trainerbattle_single TRAINER_JUGGLER_KIRK, FuchsiaCity_Gym_Text_KirkIntro, FuchsiaCity_Gym_Text_KirkDefeat famechecker FAMECHECKER_KOGA, 2 msgbox FuchsiaCity_Gym_Text_KirkPostBattle, MSGBOX_AUTOCLOSE end -FuchsiaCity_Gym_EventScript_Shawn:: @ 816D643 +FuchsiaCity_Gym_EventScript_Shawn:: trainerbattle_single TRAINER_JUGGLER_SHAWN, FuchsiaCity_Gym_Text_ShawnIntro, FuchsiaCity_Gym_Text_ShawnDefeat msgbox FuchsiaCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE end -FuchsiaCity_Gym_EventScript_Kayden:: @ 816D65A +FuchsiaCity_Gym_EventScript_Kayden:: trainerbattle_single TRAINER_JUGGLER_KAYDEN, FuchsiaCity_Gym_Text_KaydenIntro, FuchsiaCity_Gym_Text_KaydenDefeat msgbox FuchsiaCity_Gym_Text_KaydenPostBattle, MSGBOX_AUTOCLOSE end -FuchsiaCity_Gym_EventScript_Nate:: @ 816D671 +FuchsiaCity_Gym_EventScript_Nate:: trainerbattle_single TRAINER_JUGGLER_NATE, FuchsiaCity_Gym_Text_NateIntro, FuchsiaCity_Gym_Text_NateDefeat msgbox FuchsiaCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE end -FuchsiaCity_Gym_EventScript_GymGuy:: @ 816D688 +FuchsiaCity_Gym_EventScript_GymGuy:: lock faceplayer goto_if_set FLAG_DEFEATED_KOGA, FuchsiaCity_Gym_EventScript_GymGuyPostVictory @@ -73,19 +73,19 @@ FuchsiaCity_Gym_EventScript_GymGuy:: @ 816D688 release end -FuchsiaCity_Gym_EventScript_GymGuyPostVictory:: @ 816D69D +FuchsiaCity_Gym_EventScript_GymGuyPostVictory:: msgbox FuchsiaCity_Gym_Text_GymGuyPostVictory release end -FuchsiaCity_Gym_EventScript_GymStatue:: @ 816D6A7 +FuchsiaCity_Gym_EventScript_GymStatue:: lockall goto_if_set FLAG_BADGE05_GET, FuchsiaCity_Gym_EventScript_GymStatuePostVictory msgbox FuchsiaCity_Gym_Text_GymStatue releaseall end -FuchsiaCity_Gym_EventScript_GymStatuePostVictory:: @ 816D6BB +FuchsiaCity_Gym_EventScript_GymStatuePostVictory:: msgbox FuchsiaCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/FuchsiaCity_Gym/text.inc b/data/maps/FuchsiaCity_Gym/text.inc index 4b3314e0e..4d71e9f45 100644 --- a/data/maps/FuchsiaCity_Gym/text.inc +++ b/data/maps/FuchsiaCity_Gym/text.inc @@ -1,4 +1,4 @@ -FuchsiaCity_Gym_Text_KogaIntro:: @ 819832E +FuchsiaCity_Gym_Text_KogaIntro:: .string "KOGA: Fwahahaha!\p" .string "A mere child like you dares to\n" .string "challenge me?\p" @@ -11,20 +11,20 @@ FuchsiaCity_Gym_Text_KogaIntro:: @ 819832E .string "Despair to the creeping horror of\n" .string "POISON-type POKéMON!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -FuchsiaCity_Gym_Text_KogaDefeat:: @ 8198444 +FuchsiaCity_Gym_Text_KogaDefeat:: .string "Humph!\n" .string "You have proven your worth!\p" .string "Here!\n" .string "Take the SOULBADGE!$" -FuchsiaCity_Gym_Text_KogaPostBattle:: @ 8198481 +FuchsiaCity_Gym_Text_KogaPostBattle:: .string "When afflicted by TOXIC, a POKéMON\n" .string "suffers more and more.\p" .string "It suffers worsening damage as the\n" .string "battle wears on!\p" .string "It will surely terrorize foes!$" -FuchsiaCity_Gym_Text_KogaExplainSoulBadge:: @ 819850E +FuchsiaCity_Gym_Text_KogaExplainSoulBadge:: .string "Now that you have the SOULBADGE,\n" .string "the DEFENSE of your POKéMON rises.\p" .string "It also lets you SURF outside of\n" @@ -32,103 +32,103 @@ FuchsiaCity_Gym_Text_KogaExplainSoulBadge:: @ 819850E .string "Ah!\n" .string "Take this, too!$" -FuchsiaCity_Gym_Text_ReceivedTM06FromKoga:: @ 819858F +FuchsiaCity_Gym_Text_ReceivedTM06FromKoga:: .string "{PLAYER} received TM06\n" .string "from KOGA.$" -FuchsiaCity_Gym_Text_KogaExplainTM06:: @ 81985AB +FuchsiaCity_Gym_Text_KogaExplainTM06:: .string "Sealed within that TM06 lies\n" .string "TOXIC!\p" .string "It is a secret technique dating\n" .string "back some four hundred years.$" -FuchsiaCity_Gym_Text_MakeSpaceForThis:: @ 819860D +FuchsiaCity_Gym_Text_MakeSpaceForThis:: .string "Make space for this, child!$" -FuchsiaCity_Gym_Text_KaydenIntro:: @ 8198629 +FuchsiaCity_Gym_Text_KaydenIntro:: .string "Strength isn't the key for POKéMON.\n" .string "Do you understand this?\p" .string "POKéMON is about strategy!\p" .string "I'll show you how strategy can\n" .string "beat brute strength.$" -FuchsiaCity_Gym_Text_KaydenDefeat:: @ 81986B4 +FuchsiaCity_Gym_Text_KaydenDefeat:: .string "What?\n" .string "Extraordinary!$" -FuchsiaCity_Gym_Text_KaydenPostBattle:: @ 81986C9 +FuchsiaCity_Gym_Text_KaydenPostBattle:: .string "So, you mix brawn with brains?\n" .string "Good strategy!\p" .string "That's remarkable for a child\n" .string "TRAINER.$" -FuchsiaCity_Gym_Text_KirkIntro:: @ 819871E +FuchsiaCity_Gym_Text_KirkIntro:: .string "I was a magician once upon a time.\p" .string "But I dreamt of becoming a ninja,\n" .string "so I joined this GYM.$" -FuchsiaCity_Gym_Text_KirkDefeat:: @ 8198779 +FuchsiaCity_Gym_Text_KirkDefeat:: .string "I'm done for!$" -FuchsiaCity_Gym_Text_KirkPostBattle:: @ 8198787 +FuchsiaCity_Gym_Text_KirkPostBattle:: .string "Even though I've lost, I will keep\n" .string "training according to the teachings\l" .string "of KOGA, my ninja master.$" -FuchsiaCity_Gym_Text_NateIntro:: @ 81987E8 +FuchsiaCity_Gym_Text_NateIntro:: .string "Let's see you beat my special\n" .string "techniques!$" -FuchsiaCity_Gym_Text_NateDefeat:: @ 8198812 +FuchsiaCity_Gym_Text_NateDefeat:: .string "You had me fooled!$" -FuchsiaCity_Gym_Text_NatePostBattle:: @ 8198825 +FuchsiaCity_Gym_Text_NatePostBattle:: .string "I like poison and sleep techniques,\n" .string "as they linger after battle!$" -FuchsiaCity_Gym_Text_PhilIntro:: @ 8198866 +FuchsiaCity_Gym_Text_PhilIntro:: .string "Stop right there!\p" .string "The famed invisible walls of\n" .string "FUCHSIA GYM have you frustrated?$" -FuchsiaCity_Gym_Text_PhilDefeat:: @ 81988B6 +FuchsiaCity_Gym_Text_PhilDefeat:: .string "Whoa!\n" .string "You've got it!$" -FuchsiaCity_Gym_Text_PhilPostBattle:: @ 81988CB +FuchsiaCity_Gym_Text_PhilPostBattle:: .string "You impressed me!\n" .string "Here's a hint!\p" .string "Look very closely for gaps in the\n" .string "invisible walls!$" -FuchsiaCity_Gym_Text_EdgarIntro:: @ 819891F +FuchsiaCity_Gym_Text_EdgarIntro:: .string "I also study the way of the ninja\n" .string "with Master KOGA!\p" .string "Ninja have a long history of using\n" .string "animals!$" -FuchsiaCity_Gym_Text_EdgarDefeat:: @ 819897F +FuchsiaCity_Gym_Text_EdgarDefeat:: .string "Awoo!$" -FuchsiaCity_Gym_Text_EdgarPostBattle:: @ 8198985 +FuchsiaCity_Gym_Text_EdgarPostBattle:: .string "I still have much to learn.$" -FuchsiaCity_Gym_Text_ShawnIntro:: @ 81989A1 +FuchsiaCity_Gym_Text_ShawnIntro:: .string "Master KOGA comes from a long line\n" .string "of ninjas.\p" .string "What did you descend from?$" -FuchsiaCity_Gym_Text_ShawnDefeat:: @ 81989EA +FuchsiaCity_Gym_Text_ShawnDefeat:: .string "You're more skilled than I'd\n" .string "thought!$" -FuchsiaCity_Gym_Text_ShawnPostBattle:: @ 8198A10 +FuchsiaCity_Gym_Text_ShawnPostBattle:: .string "Where there is light, there is\n" .string "shadow!\p" .string "Light and shadow!\n" .string "Which do you choose?$" -FuchsiaCity_Gym_Text_GymGuyAdvice:: @ 8198A5E +FuchsiaCity_Gym_Text_GymGuyAdvice:: .string "Yo!\n" .string "Champ in the making!\p" .string "FUCHSIA GYM is a tricked-up place.\n" @@ -138,17 +138,17 @@ FuchsiaCity_Gym_Text_GymGuyAdvice:: @ 8198A5E .string "You have to find gaps in the walls\n" .string "to reach him.$" -FuchsiaCity_Gym_Text_GymGuyPostVictory:: @ 8198B1D +FuchsiaCity_Gym_Text_GymGuyPostVictory:: .string "It's amazing how ninja can terrify,\n" .string "even now!$" -FuchsiaCity_Gym_Text_GymStatue:: @ 8198B4B +FuchsiaCity_Gym_Text_GymStatue:: .string "FUCHSIA POKéMON GYM\n" .string "LEADER: KOGA\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -FuchsiaCity_Gym_Text_GymStatuePlayerWon:: @ 8198B81 +FuchsiaCity_Gym_Text_GymStatuePlayerWon:: .string "FUCHSIA POKéMON GYM\n" .string "LEADER: KOGA\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/FuchsiaCity_House1/scripts.inc b/data/maps/FuchsiaCity_House1/scripts.inc index 2aa53b9fe..155cc0761 100644 --- a/data/maps/FuchsiaCity_House1/scripts.inc +++ b/data/maps/FuchsiaCity_House1/scripts.inc @@ -1,11 +1,11 @@ -FuchsiaCity_House1_MapScripts:: @ 816D6C5 +FuchsiaCity_House1_MapScripts:: .byte 0 -FuchsiaCity_House1_EventScript_Woman:: @ 816D6C6 +FuchsiaCity_House1_EventScript_Woman:: msgbox FuchsiaCity_House1_Text_WardenIsOldHasFalseTeeth, MSGBOX_NPC end -FuchsiaCity_House1_EventScript_OldMan:: @ 816D6CF +FuchsiaCity_House1_EventScript_OldMan:: lock faceplayer famechecker FAMECHECKER_BILL, 2 @@ -13,6 +13,6 @@ FuchsiaCity_House1_EventScript_OldMan:: @ 816D6CF release end -FuchsiaCity_House1_EventScript_LittleBoy:: @ 816D6E8 +FuchsiaCity_House1_EventScript_LittleBoy:: msgbox FuchsiaCity_House1_Text_BillFilesHisOwnMonData, MSGBOX_NPC end diff --git a/data/maps/FuchsiaCity_House1/text.inc b/data/maps/FuchsiaCity_House1/text.inc index 6d1b399aa..4c10ff235 100644 --- a/data/maps/FuchsiaCity_House1/text.inc +++ b/data/maps/FuchsiaCity_House1/text.inc @@ -1,16 +1,16 @@ -FuchsiaCity_House1_Text_WardenIsOldHasFalseTeeth:: @ 8198BBB +FuchsiaCity_House1_Text_WardenIsOldHasFalseTeeth:: .string "The SAFARI ZONE's WARDEN is old, \n" .string "but he's still very much active.\p" .string "All his teeth are false, though.$" -FuchsiaCity_House1_Text_BillIsMyGrandson:: @ 8198C1F +FuchsiaCity_House1_Text_BillIsMyGrandson:: .string "Hmm?\n" .string "You've met BILL?\p" .string "He's my grandson!\p" .string "He always liked collecting things,\n" .string "even as a child!$" -FuchsiaCity_House1_Text_BillFilesHisOwnMonData:: @ 8198C7B +FuchsiaCity_House1_Text_BillFilesHisOwnMonData:: .string "BILL files his own POKéMON data on\n" .string "his PC.\p" .string "Did he show you?$" diff --git a/data/maps/FuchsiaCity_House2/scripts.inc b/data/maps/FuchsiaCity_House2/scripts.inc index 0e624d5d4..1d5df4cec 100644 --- a/data/maps/FuchsiaCity_House2/scripts.inc +++ b/data/maps/FuchsiaCity_House2/scripts.inc @@ -1,7 +1,7 @@ -FuchsiaCity_House2_MapScripts:: @ 816D816 +FuchsiaCity_House2_MapScripts:: .byte 0 -FuchsiaCity_House2_EventScript_FishingGurusBrother:: @ 816D817 +FuchsiaCity_House2_EventScript_FishingGurusBrother:: lock faceplayer goto_if_set FLAG_GOT_GOOD_ROD, FuchsiaCity_House2_EventScript_AlreadyGotGoodRod @@ -12,12 +12,12 @@ FuchsiaCity_House2_EventScript_FishingGurusBrother:: @ 816D817 release end -FuchsiaCity_House2_EventScript_AlreadyGotGoodRod:: @ 816D83F +FuchsiaCity_House2_EventScript_AlreadyGotGoodRod:: msgbox FuchsiaCity_House2_Text_HowAreTheFishBiting release end -FuchsiaCity_House2_EventScript_GiveGoodRod:: @ 816D849 +FuchsiaCity_House2_EventScript_GiveGoodRod:: msgbox FuchsiaCity_House2_Text_LikeYourStyleTakeThis checkitemspace ITEM_GOOD_ROD, 1 compare VAR_RESULT, FALSE @@ -28,7 +28,7 @@ FuchsiaCity_House2_EventScript_GiveGoodRod:: @ 816D849 release end -FuchsiaCity_House2_EventScript_NoRoomForGoodRod:: @ 816D88A +FuchsiaCity_House2_EventScript_NoRoomForGoodRod:: msgbox FuchsiaCity_House2_Text_YouHaveNoRoomForGift release end diff --git a/data/maps/FuchsiaCity_House2/text.inc b/data/maps/FuchsiaCity_House2/text.inc index b4cfbd13c..be6aa3930 100644 --- a/data/maps/FuchsiaCity_House2/text.inc +++ b/data/maps/FuchsiaCity_House2/text.inc @@ -1,20 +1,20 @@ -FuchsiaCity_House2_Text_DoYouLikeToFish:: @ 819918E +FuchsiaCity_House2_Text_DoYouLikeToFish:: .string "I'm the FISHING GURU's older\n" .string "brother.\p" .string "I simply looove fishing!\n" .string "I can't bear to go without.\p" .string "Tell me, do you like to fish?$" -FuchsiaCity_House2_Text_LikeYourStyleTakeThis:: @ 8199207 +FuchsiaCity_House2_Text_LikeYourStyleTakeThis:: .string "Grand! I like your style.\n" .string "I think we can be friends.\p" .string "Take this and fish, young friend!$" -FuchsiaCity_House2_Text_ReceivedGoodRod:: @ 819925E +FuchsiaCity_House2_Text_ReceivedGoodRod:: .string "{PLAYER} received a GOOD ROD from\n" .string "the FISHING GURU's brother.$" -FuchsiaCity_House2_Text_GoodRodCanCatchBetterMons:: @ 8199296 +FuchsiaCity_House2_Text_GoodRodCanCatchBetterMons:: .string "Fishing is a way of life!\n" .string "It is like the finest poetry.\p" .string "A crummy OLD ROD could only catch\n" @@ -22,15 +22,15 @@ FuchsiaCity_House2_Text_GoodRodCanCatchBetterMons:: @ 8199296 .string "But with a GOOD ROD, you can\n" .string "catch much better POKéMON.$" -FuchsiaCity_House2_Text_OhThatsDisappointing:: @ 8199337 +FuchsiaCity_House2_Text_OhThatsDisappointing:: .string "Oh…\n" .string "That's so disappointing…$" -FuchsiaCity_House2_Text_HowAreTheFishBiting:: @ 8199354 +FuchsiaCity_House2_Text_HowAreTheFishBiting:: .string "Hello there, {PLAYER}!\p" .string "How are the fish biting?$" -FuchsiaCity_House2_Text_YouHaveNoRoomForGift:: @ 819937E +FuchsiaCity_House2_Text_YouHaveNoRoomForGift:: .string "Oh, no!\p" .string "I had a gift for you, but you have\n" .string "no room for it!$" diff --git a/data/maps/FuchsiaCity_House3/scripts.inc b/data/maps/FuchsiaCity_House3/scripts.inc index d3d027c2c..c22477162 100644 --- a/data/maps/FuchsiaCity_House3/scripts.inc +++ b/data/maps/FuchsiaCity_House3/scripts.inc @@ -1,7 +1,7 @@ -FuchsiaCity_House3_MapScripts:: @ 816D894 +FuchsiaCity_House3_MapScripts:: .byte 0 -FuchsiaCity_House3_EventScript_MoveDeleter:: @ 816D895 +FuchsiaCity_House3_EventScript_MoveDeleter:: lock faceplayer msgbox FuchsiaCity_House3_Text_WouldYouLikeToForgetMove, MSGBOX_YESNO @@ -10,7 +10,7 @@ FuchsiaCity_House3_EventScript_MoveDeleter:: @ 816D895 goto FuchsiaCity_House3_EventScript_CancelForgetMove end -FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0 +FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: msgbox FuchsiaCity_House3_Text_WhichMonShouldForgetMove special ChoosePartyMon waitstate @@ -35,7 +35,7 @@ FuchsiaCity_House3_EventScript_ChooseMonForMoveDeleter:: @ 816D8B0 goto FuchsiaCity_House3_EventScript_CancelForgetMove end -FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919 +FuchsiaCity_House3_EventScript_ForgetMove:: special MoveDeleterForgetMove playfanfare MUS_MOVE_DELETED waitfanfare @@ -43,18 +43,18 @@ FuchsiaCity_House3_EventScript_ForgetMove:: @ 816D919 release end -FuchsiaCity_House3_EventScript_CantForgetOnlyMove:: @ 816D92A +FuchsiaCity_House3_EventScript_CantForgetOnlyMove:: special BufferMoveDeleterNicknameAndMove msgbox FuchsiaCity_House3_Text_MonOnlyKnowsOneMove release end -FuchsiaCity_House3_EventScript_CantForgetMoveEgg:: @ 816D937 +FuchsiaCity_House3_EventScript_CantForgetMoveEgg:: msgbox FuchsiaCity_House3_Text_NoEggShouldKnowMoves release end -FuchsiaCity_House3_EventScript_CancelForgetMove:: @ 816D941 +FuchsiaCity_House3_EventScript_CancelForgetMove:: msgbox FuchsiaCity_House3_Text_ComeAgainToForgetOtherMoves release end diff --git a/data/maps/FuchsiaCity_House3/text.inc b/data/maps/FuchsiaCity_House3/text.inc index 9748c7a3d..0967e17e6 100644 --- a/data/maps/FuchsiaCity_House3/text.inc +++ b/data/maps/FuchsiaCity_House3/text.inc @@ -1,35 +1,35 @@ -FuchsiaCity_House3_Text_WouldYouLikeToForgetMove:: @ 81993B9 +FuchsiaCity_House3_Text_WouldYouLikeToForgetMove:: .string "Uh…\n" .string "Oh, yes, I'm the MOVE DELETER.\p" .string "I can make POKéMON forget their\n" .string "moves.\p" .string "Would you like me to do that?$" -FuchsiaCity_House3_Text_WhichMonShouldForgetMove:: @ 8199421 +FuchsiaCity_House3_Text_WhichMonShouldForgetMove:: .string "Which POKéMON should forget a\n" .string "move?$" -FuchsiaCity_House3_Text_WhichMoveShouldBeForgotten:: @ 8199445 +FuchsiaCity_House3_Text_WhichMoveShouldBeForgotten:: .string "Which move should be forgotten?$" -FuchsiaCity_House3_Text_MonOnlyKnowsOneMove:: @ 8199465 +FuchsiaCity_House3_Text_MonOnlyKnowsOneMove:: .string "{STR_VAR_1} seems to know only one\n" .string "move…$" -FuchsiaCity_House3_Text_MonsMoveShouldBeForgotten:: @ 8199485 +FuchsiaCity_House3_Text_MonsMoveShouldBeForgotten:: .string "Hm! {STR_VAR_1}'s {STR_VAR_2}?\n" .string "That move should be forgotten?$" -FuchsiaCity_House3_Text_MonHasForgottenMoveCompletely:: @ 81994B1 +FuchsiaCity_House3_Text_MonHasForgottenMoveCompletely:: .string "It worked to perfection!\p" .string "{STR_VAR_1} has forgotten\n" .string "{STR_VAR_2} completely.$" -FuchsiaCity_House3_Text_ComeAgainToForgetOtherMoves:: @ 81994EA +FuchsiaCity_House3_Text_ComeAgainToForgetOtherMoves:: .string "Come again if there are other\n" .string "moves to be forgotten.$" -FuchsiaCity_House3_Text_NoEggShouldKnowMoves:: @ 819951F +FuchsiaCity_House3_Text_NoEggShouldKnowMoves:: .string "What?\n" .string "No EGG should know any moves.$" diff --git a/data/maps/FuchsiaCity_Mart/scripts.inc b/data/maps/FuchsiaCity_Mart/scripts.inc index 4a62ef9db..2ce4db8d0 100644 --- a/data/maps/FuchsiaCity_Mart/scripts.inc +++ b/data/maps/FuchsiaCity_Mart/scripts.inc @@ -1,15 +1,15 @@ -FuchsiaCity_Mart_MapScripts:: @ 816D4E0 +FuchsiaCity_Mart_MapScripts:: .byte 0 -FuchsiaCity_Mart_EventScript_CooltrainerF:: @ 816D4E1 +FuchsiaCity_Mart_EventScript_CooltrainerF:: msgbox FuchsiaCity_Mart_Text_DidYouTryXSpeed, MSGBOX_NPC end -FuchsiaCity_Mart_EventScript_Gentleman:: @ 816D4EA +FuchsiaCity_Mart_EventScript_Gentleman:: msgbox FuchsiaCity_Mart_Text_DontTheyHaveSafariZonePennants, MSGBOX_NPC end -FuchsiaCity_Mart_EventScript_Clerk:: @ 816D4F3 +FuchsiaCity_Mart_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -21,7 +21,7 @@ FuchsiaCity_Mart_EventScript_Clerk:: @ 816D4F3 end .align 2 -FuchsiaCity_Mart_Items:: @ 816D518 +FuchsiaCity_Mart_Items:: .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION diff --git a/data/maps/FuchsiaCity_Mart/text.inc b/data/maps/FuchsiaCity_Mart/text.inc index 6bac5b484..3491294be 100644 --- a/data/maps/FuchsiaCity_Mart/text.inc +++ b/data/maps/FuchsiaCity_Mart/text.inc @@ -1,10 +1,10 @@ -FuchsiaCity_Mart_Text_DontTheyHaveSafariZonePennants:: @ 81980BC +FuchsiaCity_Mart_Text_DontTheyHaveSafariZonePennants:: .string "Don't they have any pennants\n" .string "promoting the SAFARI ZONE?\p" .string "How about some paper lanterns?\n" .string "Aren't there even any calendars?$" -FuchsiaCity_Mart_Text_DidYouTryXSpeed:: @ 8198134 +FuchsiaCity_Mart_Text_DidYouTryXSpeed:: .string "Did you try X SPEED?\n" .string "It speeds up a POKéMON in battle.$" diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc index abcd80e57..4aad5d24d 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ -FuchsiaCity_PokemonCenter_1F_MapScripts:: @ 816D6F1 +FuchsiaCity_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, FuchsiaCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC +FuchsiaCity_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_FUCHSIA_CITY end -FuchsiaCity_PokemonCenter_1F_EventScript_Nurse:: @ 816D700 +FuchsiaCity_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -FuchsiaCity_PokemonCenter_1F_EventScript_Man:: @ 816D709 +FuchsiaCity_PokemonCenter_1F_EventScript_Man:: msgbox FuchsiaCity_PokemonCenter_1F_Text_CantBecomeGoodTrainerWithOneMon, MSGBOX_NPC end -FuchsiaCity_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816D712 +FuchsiaCity_PokemonCenter_1F_EventScript_CooltrainerF:: msgbox FuchsiaCity_PokemonCenter_1F_Text_PokemonLeagueWestOfViridian, MSGBOX_NPC end -FuchsiaCity_PokemonCenter_1F_EventScript_Youngster:: @ 816D71B +FuchsiaCity_PokemonCenter_1F_EventScript_Youngster:: msgbox FuchsiaCity_PokemonCenter_1F_Text_VisitSafariZoneForPokedex, MSGBOX_NPC end diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc index 4d5deb734..59b1f35f1 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc @@ -1,16 +1,16 @@ -FuchsiaCity_PokemonCenter_1F_Text_CantBecomeGoodTrainerWithOneMon:: @ 8198CB7 +FuchsiaCity_PokemonCenter_1F_Text_CantBecomeGoodTrainerWithOneMon:: .string "You can't become a good TRAINER\n" .string "with just one strong POKéMON.\p" .string "But raising many POKéMON evenly\n" .string "is no easy task, either.$" -FuchsiaCity_PokemonCenter_1F_Text_PokemonLeagueWestOfViridian:: @ 8198D2E +FuchsiaCity_PokemonCenter_1F_Text_PokemonLeagueWestOfViridian:: .string "There's a narrow trail west of\n" .string "VIRIDIAN CITY.\p" .string "It goes to the POKéMON LEAGUE HQ.\n" .string "The HQ governs all TRAINERS.$" -FuchsiaCity_PokemonCenter_1F_Text_VisitSafariZoneForPokedex:: @ 8198D9B +FuchsiaCity_PokemonCenter_1F_Text_VisitSafariZoneForPokedex:: .string "If you're working on a POKéDEX,\n" .string "visit the SAFARI ZONE.\p" .string "All sorts of rare POKéMON breed\n" diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc index 2be67866e..01cc55b84 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 +FuchsiaCity_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ FuchsiaCity_PokemonCenter_2F_MapScripts:: @ 816D724 .byte 0 @ The below 3 are unused and leftover from RS -FuchsiaCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816D739 +FuchsiaCity_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -FuchsiaCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816D73F +FuchsiaCity_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -FuchsiaCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816D745 +FuchsiaCity_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc index 459c9c76b..e58fc0c65 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc @@ -1,15 +1,15 @@ -FuchsiaCity_SafariZone_Entrance_MapScripts:: @ 816D2A8 +FuchsiaCity_SafariZone_Entrance_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, FuchsiaCity_SafariZone_Entrance_OnFrame .byte 0 -FuchsiaCity_SafariZone_Entrance_OnFrame:: @ 816D2AE +FuchsiaCity_SafariZone_Entrance_OnFrame:: map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1, FuchsiaCity_SafariZone_Entrance_EventScript_ExitWarpIn map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2, FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly map_script_2 VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3, FuchsiaCity_SafariZone_Entrance_EventScript_ExitWalkIn .2byte 0 @ When player runs out of balls mid-battle -FuchsiaCity_SafariZone_Entrance_EventScript_ExitWalkIn:: @ 816D2C8 +FuchsiaCity_SafariZone_Entrance_EventScript_ExitWalkIn:: lockall textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter @@ -24,7 +24,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitWalkIn:: @ 816D2C8 end @ When player runs of out balls after catching a pokemon, or runs out of steps -FuchsiaCity_SafariZone_Entrance_EventScript_ExitWarpIn:: @ 816D2F2 +FuchsiaCity_SafariZone_Entrance_EventScript_ExitWarpIn:: lockall textcolor 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain @@ -37,7 +37,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitWarpIn:: @ 816D2F2 end @ When player re-enters the entrance building with balls/steps remaining -FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly:: @ 816D312 +FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly:: lockall textcolor 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_GoingToLeaveSafariZoneEarly, MSGBOX_YESNO @@ -52,7 +52,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ExitEarly:: @ 816D312 releaseall end -FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone:: @ 816D345 +FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone:: msgbox FuchsiaCity_SafariZone_Entrance_Text_GoodLuck closemessage applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ReEnter @@ -61,44 +61,44 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ReturnToSafariZone:: @ 816D345 waitstate end -FuchsiaCity_SafariZone_Entrance_Movement_Exit:: @ 816D362 +FuchsiaCity_SafariZone_Entrance_Movement_Exit:: walk_down walk_down step_end -FuchsiaCity_SafariZone_Entrance_Movement_ReEnter:: @ 816D365 +FuchsiaCity_SafariZone_Entrance_Movement_ReEnter:: walk_up step_end -FuchsiaCity_SafariZone_Entrance_Movement_Exit2:: @ 816D367 +FuchsiaCity_SafariZone_Entrance_Movement_Exit2:: walk_down walk_down step_end -FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter:: @ 816D36A +FuchsiaCity_SafariZone_Entrance_Movement_ApproachCounter:: walk_down delay_8 step_end -FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerMid:: @ 816D36D +FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerMid:: lockall setvar VAR_TEMP_2, 0 goto FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone end -FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerRight:: @ 816D379 +FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerRight:: lockall setvar VAR_TEMP_2, 1 goto FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone end -FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft:: @ 816D385 +FuchsiaCity_SafariZone_Entrance_EventScript_EntryTriggerLeft:: lockall setvar VAR_TEMP_2, 2 goto FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone end -FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone:: @ 816D391 +FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone:: textcolor 0 msgbox FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight @@ -111,7 +111,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_AskEnterSafariZone:: @ 816D391 goto FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack end -FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: @ 816D3CA +FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: call FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons checkmoney 500, 0 compare VAR_RESULT, FALSE @@ -139,22 +139,22 @@ FuchsiaCity_SafariZone_Entrance_EventScript_TryEnterSafariZone:: @ 816D3CA waitstate end -FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneRight:: @ 816D441 +FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneRight:: applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneRight waitmovement 0 return -FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneMid:: @ 816D44C +FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneMid:: applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneMid waitmovement 0 return -FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneLeft:: @ 816D457 +FuchsiaCity_SafariZone_Entrance_EventScript_EnterSafariZoneLeft:: applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneLeft waitmovement 0 return -FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons:: @ 816D462 +FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons:: getpartysize compare VAR_RESULT, PARTY_SIZE goto_if_ne EventScript_Return @@ -165,12 +165,12 @@ FuchsiaCity_SafariZone_Entrance_EventScript_CheckSpaceForMons:: @ 816D462 goto FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack end -FuchsiaCity_SafariZone_Entrance_EventScript_NotEnoughMoney:: @ 816D48C +FuchsiaCity_SafariZone_Entrance_EventScript_NotEnoughMoney:: msgbox FuchsiaCity_SafariZone_Entrance_Text_OopsNotEnoughMoney goto FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack end -FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack:: @ 816D49A +FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack:: closemessage hidemoneybox 0, 0 applymovement OBJ_EVENT_ID_PLAYER, FuchsiaCity_SafariZone_Entrance_Movement_ForceBack @@ -178,28 +178,28 @@ FuchsiaCity_SafariZone_Entrance_EventScript_ForcePlayerBack:: @ 816D49A releaseall end -FuchsiaCity_SafariZone_Entrance_Movement_ForceBack:: @ 816D4AA +FuchsiaCity_SafariZone_Entrance_Movement_ForceBack:: walk_down step_end -FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneMid:: @ 816D4AC +FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneMid:: walk_up walk_up step_end -FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneRight:: @ 816D4AF +FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneRight:: walk_up walk_left walk_up step_end -FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneLeft:: @ 816D4B3 +FuchsiaCity_SafariZone_Entrance_Movement_EnterSafariZoneLeft:: walk_up walk_right walk_up step_end -FuchsiaCity_SafariZone_Entrance_EventScript_InfoAttendant:: @ 816D4B7 +FuchsiaCity_SafariZone_Entrance_EventScript_InfoAttendant:: lock faceplayer msgbox FuchsiaCity_SafariZone_Entrance_Text_FirstTimeAtSafariZone, MSGBOX_YESNO @@ -209,7 +209,7 @@ FuchsiaCity_SafariZone_Entrance_EventScript_InfoAttendant:: @ 816D4B7 release end -FuchsiaCity_SafariZone_Entrance_EventScript_ExplainSafariZone:: @ 816D4D6 +FuchsiaCity_SafariZone_Entrance_EventScript_ExplainSafariZone:: msgbox FuchsiaCity_SafariZone_Entrance_Text_ExplainSafariZone release end diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/text.inc b/data/maps/FuchsiaCity_SafariZone_Entrance/text.inc index 58f784422..18e412ffe 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/text.inc +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/text.inc @@ -1,56 +1,56 @@ -FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone:: @ 8197C6B +FuchsiaCity_SafariZone_Entrance_Text_WelcomeToSafariZone:: .string "Welcome to the SAFARI ZONE!$" -FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500:: @ 8197C87 +FuchsiaCity_SafariZone_Entrance_Text_PlaySafariGameFor500:: .string "For just ¥500, you can play the\n" .string "SAFARI GAME.\p" .string "You can roam the wide-open safari\n" .string "and catch what you like.\p" .string "Would you like to play?$" -FuchsiaCity_SafariZone_Entrance_Text_ThatllBe500WeOnlyUseSpecialBalls:: @ 8197D07 +FuchsiaCity_SafariZone_Entrance_Text_ThatllBe500WeOnlyUseSpecialBalls:: .string "That'll be ¥500, please!\p" .string "We only use a special kind of \n" .string "POKé BALLS here.$" -FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls:: @ 8197D50 +FuchsiaCity_SafariZone_Entrance_Text_PlayerReceived30SafariBalls:: .string "{PLAYER} received 30 SAFARI BALLS\n" .string "from the attendant.$" -FuchsiaCity_SafariZone_Entrance_Text_CallYouOnPAWhenYouRunOut:: @ 8197D80 +FuchsiaCity_SafariZone_Entrance_Text_CallYouOnPAWhenYouRunOut:: .string "We'll call you on the PA when you\n" .string "run out of time or SAFARI BALLS.\p" .string "Well, I'll wish you the best of\n" .string "luck!$" -FuchsiaCity_SafariZone_Entrance_Text_OkayPleaseComeAgain:: @ 8197DE9 +FuchsiaCity_SafariZone_Entrance_Text_OkayPleaseComeAgain:: .string "Okay.\n" .string "Please come again!$" -FuchsiaCity_SafariZone_Entrance_Text_OopsNotEnoughMoney:: @ 8197E02 +FuchsiaCity_SafariZone_Entrance_Text_OopsNotEnoughMoney:: .string "Oops!\n" .string "Not enough money!$" -FuchsiaCity_SafariZone_Entrance_Text_GoingToLeaveSafariZoneEarly:: @ 8197E1A +FuchsiaCity_SafariZone_Entrance_Text_GoingToLeaveSafariZoneEarly:: .string "Are you going to leave the\n" .string "SAFARI ZONE early?$" -FuchsiaCity_SafariZone_Entrance_Text_PleaseReturnSafariBalls:: @ 8197E48 +FuchsiaCity_SafariZone_Entrance_Text_PleaseReturnSafariBalls:: .string "Please return any SAFARI BALLS\n" .string "you may have left.$" -FuchsiaCity_SafariZone_Entrance_Text_GoodLuck:: @ 8197E7A +FuchsiaCity_SafariZone_Entrance_Text_GoodLuck:: .string "Good luck!$" -FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain:: @ 8197E85 +FuchsiaCity_SafariZone_Entrance_Text_CatchFairShareComeAgain:: .string "Did you catch your fair share?\n" .string "Come again!$" -FuchsiaCity_SafariZone_Entrance_Text_FirstTimeAtSafariZone:: @ 8197EB0 +FuchsiaCity_SafariZone_Entrance_Text_FirstTimeAtSafariZone:: .string "Hi! Is it your first time here at\n" .string "the SAFARI ZONE?$" -FuchsiaCity_SafariZone_Entrance_Text_ExplainSafariZone:: @ 8197EE3 +FuchsiaCity_SafariZone_Entrance_Text_ExplainSafariZone:: .string "The SAFARI ZONE actually has\n" .string "four zones in it.\p" .string "Each zone has different kinds of\n" @@ -68,6 +68,6 @@ FuchsiaCity_SafariZone_Entrance_Text_ExplainSafariZone:: @ 8197EE3 .string "When you run out of time or SAFARI\n" .string "BALLS, it's game over for you!$" -FuchsiaCity_SafariZone_Entrance_Text_SorryYoureARegularHere:: @ 819809E +FuchsiaCity_SafariZone_Entrance_Text_SorryYoureARegularHere:: .string "Sorry, you're a regular here!$" diff --git a/data/maps/FuchsiaCity_SafariZone_Office/scripts.inc b/data/maps/FuchsiaCity_SafariZone_Office/scripts.inc index 88832c1b0..ee1a15ec4 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/scripts.inc +++ b/data/maps/FuchsiaCity_SafariZone_Office/scripts.inc @@ -1,18 +1,18 @@ -FuchsiaCity_SafariZone_Office_MapScripts:: @ 816D528 +FuchsiaCity_SafariZone_Office_MapScripts:: .byte 0 -FuchsiaCity_SafariZone_Office_EventScript_Worker1:: @ 816D529 +FuchsiaCity_SafariZone_Office_EventScript_Worker1:: msgbox FuchsiaCity_SafariZone_Office_Text_NicknamedWardenSlowpoke, MSGBOX_NPC end -FuchsiaCity_SafariZone_Office_EventScript_Worker2:: @ 816D532 +FuchsiaCity_SafariZone_Office_EventScript_Worker2:: msgbox FuchsiaCity_SafariZone_Office_Text_WardenIsVeryKnowledgeable, MSGBOX_NPC end -FuchsiaCity_SafariZone_Office_EventScript_Worker3:: @ 816D53B +FuchsiaCity_SafariZone_Office_EventScript_Worker3:: msgbox FuchsiaCity_SafariZone_Office_Text_CouldntUnderstandWarden, MSGBOX_NPC end -FuchsiaCity_SafariZone_Office_EventScript_Worker4:: @ 816D544 +FuchsiaCity_SafariZone_Office_EventScript_Worker4:: msgbox FuchsiaCity_SafariZone_Office_Text_PrizeInSafariZone, MSGBOX_NPC end diff --git a/data/maps/FuchsiaCity_SafariZone_Office/text.inc b/data/maps/FuchsiaCity_SafariZone_Office/text.inc index 0fedd07d6..46584d464 100644 --- a/data/maps/FuchsiaCity_SafariZone_Office/text.inc +++ b/data/maps/FuchsiaCity_SafariZone_Office/text.inc @@ -1,21 +1,21 @@ -FuchsiaCity_SafariZone_Office_Text_NicknamedWardenSlowpoke:: @ 819816B +FuchsiaCity_SafariZone_Office_Text_NicknamedWardenSlowpoke:: .string "We nicknamed the WARDEN\n" .string "“SLOWPOKE.”\p" .string "You know, he has that vacant look\n" .string "like a SLOWPOKE.$" -FuchsiaCity_SafariZone_Office_Text_WardenIsVeryKnowledgeable:: @ 81981C2 +FuchsiaCity_SafariZone_Office_Text_WardenIsVeryKnowledgeable:: .string "WARDEN SLOWPOKE is very\n" .string "knowledgeable about POKéMON.\p" .string "He even has some fossils of rare,\n" .string "extinct POKéMON.$" -FuchsiaCity_SafariZone_Office_Text_CouldntUnderstandWarden:: @ 819822A +FuchsiaCity_SafariZone_Office_Text_CouldntUnderstandWarden:: .string "WARDEN SLOWPOKE came in, but\n" .string "I couldn't understand him.\p" .string "I think he's got a speech problem!$" -FuchsiaCity_SafariZone_Office_Text_PrizeInSafariZone:: @ 8198285 +FuchsiaCity_SafariZone_Office_Text_PrizeInSafariZone:: .string "WARDEN SLOWPOKE is running a\n" .string "promotion campaign right now.\p" .string "Try to get to the farthest corner\n" diff --git a/data/maps/FuchsiaCity_WardensHouse/scripts.inc b/data/maps/FuchsiaCity_WardensHouse/scripts.inc index 7f1df4e44..77ae03d2c 100644 --- a/data/maps/FuchsiaCity_WardensHouse/scripts.inc +++ b/data/maps/FuchsiaCity_WardensHouse/scripts.inc @@ -1,7 +1,7 @@ -FuchsiaCity_WardensHouse_MapScripts:: @ 816D74B +FuchsiaCity_WardensHouse_MapScripts:: .byte 0 -FuchsiaCity_WardensHouse_EventScript_Warden:: @ 816D74C +FuchsiaCity_WardensHouse_EventScript_Warden:: lock faceplayer goto_if_set FLAG_GOT_HM04, FuchsiaCity_WardensHouse_EventScript_ExplainStrength @@ -14,7 +14,7 @@ FuchsiaCity_WardensHouse_EventScript_Warden:: @ 816D74C release end -FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth:: @ 816D780 +FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth:: textcolor 3 playfanfare MUS_OBTAIN_TMHM message FuchsiaCity_WardensHouse_Text_GaveGoldTeethToWarden @@ -33,31 +33,31 @@ FuchsiaCity_WardensHouse_EventScript_GiveGoldTeeth:: @ 816D780 release end -FuchsiaCity_WardensHouse_EventScript_WardenThanksMale:: @ 816D7D6 +FuchsiaCity_WardensHouse_EventScript_WardenThanksMale:: msgbox FuchsiaCity_WardensHouse_Text_ThanksSonGiveYouSomething return -FuchsiaCity_WardensHouse_EventScript_WardenThanksFemale:: @ 816D7DF +FuchsiaCity_WardensHouse_EventScript_WardenThanksFemale:: msgbox FuchsiaCity_WardensHouse_Text_ThanksLassieGiveYouSomething return -FuchsiaCity_WardensHouse_EventScript_WardenYes:: @ 816D7E8 +FuchsiaCity_WardensHouse_EventScript_WardenYes:: msgbox FuchsiaCity_WardensHouse_Text_AhHowheeHoHoo return -FuchsiaCity_WardensHouse_EventScript_WardenNo:: @ 816D7F1 +FuchsiaCity_WardensHouse_EventScript_WardenNo:: msgbox FuchsiaCity_WardensHouse_Text_HeOhayHeHaHoo return -FuchsiaCity_WardensHouse_EventScript_ExplainStrength:: @ 816D7FA +FuchsiaCity_WardensHouse_EventScript_ExplainStrength:: msgbox FuchsiaCity_WardensHouse_Text_ExplainStrength release end -FuchsiaCity_WardensHouse_EventScript_DisplaySign1:: @ 816D804 +FuchsiaCity_WardensHouse_EventScript_DisplaySign1:: msgbox FuchsiaCity_WardensHouse_Text_MonPhotosFossilsOnDisplay, MSGBOX_SIGN end -FuchsiaCity_WardensHouse_EventScript_DisplaySign2:: @ 816D80D +FuchsiaCity_WardensHouse_EventScript_DisplaySign2:: msgbox FuchsiaCity_WardensHouse_Text_OldMonMerchandiseOnDisplay, MSGBOX_SIGN end diff --git a/data/maps/FuchsiaCity_WardensHouse/text.inc b/data/maps/FuchsiaCity_WardensHouse/text.inc index b3f4b7b35..2cdccb1e7 100644 --- a/data/maps/FuchsiaCity_WardensHouse/text.inc +++ b/data/maps/FuchsiaCity_WardensHouse/text.inc @@ -1,24 +1,24 @@ -FuchsiaCity_WardensHouse_Text_HifFuffHefifoo:: @ 8198DF9 +FuchsiaCity_WardensHouse_Text_HifFuffHefifoo:: .string "WARDEN: Hif fuff hefifoo!\p" .string "Ha lof ha feef ee hafahi ho.\n" .string "Heff hee fwee!$" -FuchsiaCity_WardensHouse_Text_AhHowheeHoHoo:: @ 8198E3F +FuchsiaCity_WardensHouse_Text_AhHowheeHoHoo:: .string "Ah howhee ho hoo!\n" .string "Eef ee hafahi ho!$" -FuchsiaCity_WardensHouse_Text_HeOhayHeHaHoo:: @ 8198E63 +FuchsiaCity_WardensHouse_Text_HeOhayHeHaHoo:: .string "Ha?\n" .string "He ohay heh ha hoo ee haheh!$" -FuchsiaCity_WardensHouse_Text_GaveGoldTeethToWarden:: @ 8198E84 +FuchsiaCity_WardensHouse_Text_GaveGoldTeethToWarden:: .string "{PLAYER} gave the GOLD TEETH\n" .string "to the WARDEN.$" -FuchsiaCity_WardensHouse_Text_WardenPoppedInHisTeeth:: @ 8198EAA +FuchsiaCity_WardensHouse_Text_WardenPoppedInHisTeeth:: .string "The WARDEN popped in his teeth!$" -FuchsiaCity_WardensHouse_Text_ThanksSonGiveYouSomething:: @ 8198ECA +FuchsiaCity_WardensHouse_Text_ThanksSonGiveYouSomething:: .string "WARDEN: Thanks, son!\n" .string "You're a real lifesaver!\p" .string "No one could understand a word\n" @@ -28,7 +28,7 @@ FuchsiaCity_WardensHouse_Text_ThanksSonGiveYouSomething:: @ 8198ECA .string "Let me give you something for your\n" .string "trouble.$" -FuchsiaCity_WardensHouse_Text_ThanksLassieGiveYouSomething:: @ 8198F96 +FuchsiaCity_WardensHouse_Text_ThanksLassieGiveYouSomething:: .string "WARDEN: Thank you, lassie!\n" .string "You're a real lifesaver!\p" .string "No one could understand a word\n" @@ -38,11 +38,11 @@ FuchsiaCity_WardensHouse_Text_ThanksLassieGiveYouSomething:: @ 8198F96 .string "Let me give you something for your\n" .string "trouble.$" -FuchsiaCity_WardensHouse_Text_ReceivedHM04FromWarden:: @ 8199068 +FuchsiaCity_WardensHouse_Text_ReceivedHM04FromWarden:: .string "{PLAYER} received HM04\n" .string "from the WARDEN.$" -FuchsiaCity_WardensHouse_Text_ExplainStrength:: @ 819908A +FuchsiaCity_WardensHouse_Text_ExplainStrength:: .string "WARDEN: Inside HM04 you'll find\n" .string "STRENGTH.\p" .string "It lets POKéMON move boulders when\n" @@ -51,15 +51,15 @@ FuchsiaCity_WardensHouse_Text_ExplainStrength:: @ 819908A .string "HOUSE in the SAFARI ZONE?$" @ Unused -FuchsiaCity_WardensHouse_Text_YouHaveTooMuchStuff:: @ 819912B +FuchsiaCity_WardensHouse_Text_YouHaveTooMuchStuff:: .string "なんや　にもつ\n" .string "いっぱいやんけ！$" -FuchsiaCity_WardensHouse_Text_MonPhotosFossilsOnDisplay:: @ 819913C +FuchsiaCity_WardensHouse_Text_MonPhotosFossilsOnDisplay:: .string "POKéMON photos and fossils are on\n" .string "display.$" -FuchsiaCity_WardensHouse_Text_OldMonMerchandiseOnDisplay:: @ 8199167 +FuchsiaCity_WardensHouse_Text_OldMonMerchandiseOnDisplay:: .string "Old POKéMON merchandise is on\n" .string "display.$" diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc index e54d60e0d..9f64c22a5 100644 --- a/data/maps/IndigoPlateau_Exterior/scripts.inc +++ b/data/maps/IndigoPlateau_Exterior/scripts.inc @@ -1,22 +1,22 @@ .equ LOCALID_RIVAL, 1 .equ LOCALID_PROF_OAK, 2 -IndigoPlateau_Exterior_MapScripts:: @ 816723B +IndigoPlateau_Exterior_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_Exterior_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_Exterior_OnFrame .byte 0 -IndigoPlateau_Exterior_OnTransition:: @ 8167246 +IndigoPlateau_Exterior_OnTransition:: setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1 call_if_eq IndigoPlateau_Exterior_EventScript_PlayCreditsMusic end -IndigoPlateau_Exterior_EventScript_PlayCreditsMusic:: @ 8167255 +IndigoPlateau_Exterior_EventScript_PlayCreditsMusic:: playbgm MUS_CREDITS, 0 return -IndigoPlateau_Exterior_OnFrame:: @ 816725A +IndigoPlateau_Exterior_OnFrame:: map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, IndigoPlateau_Exterior_EventScript_Credits .2byte 0 @@ -25,7 +25,7 @@ IndigoPlateau_Exterior_OnFrame:: @ 816725A @ entrance of Indigo Plateau. This script starts running @ immediately after your walking animation. @ The script is timed to the music. -IndigoPlateau_Exterior_EventScript_Credits:: @ 8167264 +IndigoPlateau_Exterior_EventScript_Credits:: lockall delay 105 @@ -86,7 +86,7 @@ IndigoPlateau_Exterior_EventScript_Credits:: @ 8167264 releaseall end -IndigoPlateau_Exterior_Movement_PlayerLeave:: @ 8167311 +IndigoPlateau_Exterior_Movement_PlayerLeave:: player_run_down player_run_down player_run_down @@ -96,18 +96,18 @@ IndigoPlateau_Exterior_Movement_PlayerLeave:: @ 8167311 step_end @ Unused -IndigoPlateau_Exterior_Movement_PlayerExitBuilding:: @ 8167318 +IndigoPlateau_Exterior_Movement_PlayerExitBuilding:: walk_down walk_down step_end -IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave:: @ 816731B +IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave:: delay_16 delay_4 walk_in_place_fastest_down step_end -IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave:: @ 816731F +IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave:: delay_8 walk_in_place_fastest_right delay_16 @@ -124,7 +124,7 @@ IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave:: @ 816731F walk_in_place_fastest_down step_end -IndigoPlateau_Exterior_Movement_PlayerBeginLeave:: @ 816732E +IndigoPlateau_Exterior_Movement_PlayerBeginLeave:: walk_right delay_16 walk_down @@ -133,22 +133,22 @@ IndigoPlateau_Exterior_Movement_PlayerBeginLeave:: @ 816732E delay_16 step_end -IndigoPlateau_Exterior_Movement_PlayerTurnAround:: @ 8167335 +IndigoPlateau_Exterior_Movement_PlayerTurnAround:: walk_in_place_fastest_down step_end -IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay:: @ 8167337 +IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay:: face_right lock_facing_direction walk_left unlock_facing_direction step_end -IndigoPlateau_Exterior_Movement_PlayerFaceLeague:: @ 816733C +IndigoPlateau_Exterior_Movement_PlayerFaceLeague:: walk_in_place_fastest_up step_end -IndigoPlateau_Exterior_Movement_RivalLeave:: @ 816733E +IndigoPlateau_Exterior_Movement_RivalLeave:: walk_fast_down walk_fast_down walk_fast_down @@ -158,11 +158,11 @@ IndigoPlateau_Exterior_Movement_RivalLeave:: @ 816733E walk_fast_down step_end -IndigoPlateau_Exterior_Movement_RivalExitBuilding:: @ 8167346 +IndigoPlateau_Exterior_Movement_RivalExitBuilding:: walk_fast_down step_end -IndigoPlateau_Exterior_Movement_OakLeave:: @ 8167348 +IndigoPlateau_Exterior_Movement_OakLeave:: walk_in_place_fastest_left delay_16 delay_16 @@ -185,6 +185,6 @@ IndigoPlateau_Exterior_Movement_OakLeave:: @ 8167348 walk_down step_end -IndigoPlateau_Exterior_Movement_OakExitBuilding:: @ 816735D +IndigoPlateau_Exterior_Movement_OakExitBuilding:: walk_down step_end diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc index 989450066..71f06da2d 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc @@ -1,23 +1,23 @@ .set LOCALID_DOOR_GUARD, 4 -IndigoPlateau_PokemonCenter_1F_MapScripts:: @ 816EA5A +IndigoPlateau_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65 +IndigoPlateau_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_INDIGO_PLATEAU specialvar VAR_RESULT, IsNationalPokedexEnabled compare VAR_RESULT, TRUE call_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor end -IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor:: @ 816EA79 +IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor:: goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return setobjectxyperm LOCALID_DOOR_GUARD, 4, 2 return -IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard:: @ 816EA8A +IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard:: lock faceplayer specialvar VAR_RESULT, IsNationalPokedexEnabled @@ -27,22 +27,22 @@ IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard:: @ 816EA8A release end -IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete:: @ 816EAA6 +IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete:: goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete msgbox IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing release end -IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete:: @ 816EAB9 +IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete:: msgbox IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck release end -IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy:: @ 816EAC3 +IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy:: msgbox IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice, MSGBOX_NPC end -IndigoPlateau_PokemonCenter_1F_EventScript_Clerk:: @ 816EACC +IndigoPlateau_PokemonCenter_1F_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -54,7 +54,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_Clerk:: @ 816EACC end .align 2 -IndigoPlateau_PokemonCenter_1F_Items:: @ 816EAF4 +IndigoPlateau_PokemonCenter_1F_Items:: .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_FULL_RESTORE @@ -66,7 +66,7 @@ IndigoPlateau_PokemonCenter_1F_Items:: @ 816EAF4 release end -IndigoPlateau_PokemonCenter_1F_EventScript_Nurse:: @ 816EB06 +IndigoPlateau_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc index 192831d64..857fc1357 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc @@ -1,4 +1,4 @@ -IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice:: @ 819A837 +IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice:: .string "Yo!\n" .string "Champ in the making!\p" .string "At the POKéMON LEAGUE, you will\n" @@ -8,13 +8,13 @@ IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice:: @ 819A837 .string "This is it!\n" .string "Go for it!$" -IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck:: @ 819A8D8 +IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck:: .string "From here on, you face the\n" .string "ELITE FOUR one by one.\p" .string "If you win, a door opens to the\n" .string "next TRAINER. Good luck!$" -IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing:: @ 819A943 +IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing:: .string "I am so sorry, but you've wasted\n" .string "your time coming here.\p" .string "LORELEI of the ELITE FOUR is\n" @@ -22,7 +22,7 @@ IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing:: @ 819A94 .string "As a result, the POKéMON LEAGUE is\n" .string "closed for the time being.$" -IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs:: @ 819A9E7 +IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs:: .string "AGATHA's GHOST-type POKéMON are\n" .string "horrifically terrifying in toughness.\p" .string "I took my FIGHTING-type POKéMON\n" @@ -34,7 +34,7 @@ IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs:: @ 819A9E7 .string "It doesn't take anything to get\n" .string "that scary lady hollering.$" -IndigoPlateau_PokemonCenter_1F_Text_LancesCousinGymLeaderFarAway:: @ 819AB16 +IndigoPlateau_PokemonCenter_1F_Text_LancesCousinGymLeaderFarAway:: .string "Maybe becoming an ELITE FOUR\n" .string "member is in the blood.\p" .string "From what I've heard, LANCE has\n" diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc index b2b3bd00d..841712a89 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F +IndigoPlateau_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ IndigoPlateau_PokemonCenter_2F_MapScripts:: @ 816EB0F .byte 0 @ The below 3 are unused and leftover from RS -IndigoPlateau_PokemonCenter_2F_EventScript_Colosseum:: @ 816EB24 +IndigoPlateau_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -IndigoPlateau_PokemonCenter_2F_EventScript_TradeCenter:: @ 816EB2A +IndigoPlateau_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -IndigoPlateau_PokemonCenter_2F_EventScript_RecordCorner:: @ 816EB30 +IndigoPlateau_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/LavenderTown/scripts.inc b/data/maps/LavenderTown/scripts.inc index 8eae06b49..40f3b2146 100644 --- a/data/maps/LavenderTown/scripts.inc +++ b/data/maps/LavenderTown/scripts.inc @@ -1,14 +1,14 @@ -LavenderTown_MapScripts:: @ 816686B +LavenderTown_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_OnTransition .byte 0 -LavenderTown_OnTransition:: @ 8166871 +LavenderTown_OnTransition:: setworldmapflag FLAG_WORLD_MAP_LAVENDER_TOWN setvar VAR_MAP_SCENE_S_S_ANNE_2F_CORRIDOR, 1 setflag FLAG_HIDE_SS_ANNE_RIVAL end -LavenderTown_EventScript_LittleGirl:: @ 816687D +LavenderTown_EventScript_LittleGirl:: lock faceplayer msgbox LavenderTown_Text_DoYouBelieveInGhosts, MSGBOX_YESNO @@ -18,31 +18,31 @@ LavenderTown_EventScript_LittleGirl:: @ 816687D release end -LavenderTown_EventScript_LittleGirlBelieve:: @ 816689C +LavenderTown_EventScript_LittleGirlBelieve:: msgbox LavenderTown_Text_SoThereAreBelievers release end -LavenderTown_EventScript_WorkerM:: @ 81668A6 +LavenderTown_EventScript_WorkerM:: msgbox LavenderTown_Text_TownKnownAsMonGraveSite, MSGBOX_NPC end -LavenderTown_EventScript_Boy:: @ 81668AF +LavenderTown_EventScript_Boy:: msgbox LavenderTown_Text_GhostsAppearedInTower, MSGBOX_NPC end -LavenderTown_EventScript_TownSign:: @ 81668B8 +LavenderTown_EventScript_TownSign:: msgbox LavenderTown_Text_TownSign, MSGBOX_SIGN end -LavenderTown_EventScript_SilphScopeNotice:: @ 81668C1 +LavenderTown_EventScript_SilphScopeNotice:: msgbox LavenderTown_Text_SilphScopeNotice, MSGBOX_SIGN end -LavenderTown_EventScript_VolunteerHouseSign:: @ 81668CA +LavenderTown_EventScript_VolunteerHouseSign:: msgbox LavenderTown_Text_VolunteerPokemonHouse, MSGBOX_SIGN end -LavenderTown_EventScript_PokemonTowerSign:: @ 81668D3 +LavenderTown_EventScript_PokemonTowerSign:: msgbox LavenderTown_Text_PokemonTowerSign, MSGBOX_SIGN end diff --git a/data/maps/LavenderTown/text.inc b/data/maps/LavenderTown/text.inc index decb32a4a..b7e6035b3 100644 --- a/data/maps/LavenderTown/text.inc +++ b/data/maps/LavenderTown/text.inc @@ -1,40 +1,40 @@ -LavenderTown_Text_DoYouBelieveInGhosts:: @ 817F52E +LavenderTown_Text_DoYouBelieveInGhosts:: .string "Do you believe in ghosts?$" -LavenderTown_Text_SoThereAreBelievers:: @ 817F548 +LavenderTown_Text_SoThereAreBelievers:: .string "Really?\n" .string "So there are believers…$" -LavenderTown_Text_JustImaginingWhiteHand:: @ 817F568 +LavenderTown_Text_JustImaginingWhiteHand:: .string "Hahaha, I guess not.\p" .string "That white hand on your shoulder…\n" .string "I'm just imagining it.$" -LavenderTown_Text_TownKnownAsMonGraveSite:: @ 817F5B6 +LavenderTown_Text_TownKnownAsMonGraveSite:: .string "This town is known as the grave\n" .string "site of POKéMON.\p" .string "Memorial services are held in\n" .string "POKéMON TOWER.$" -LavenderTown_Text_GhostsAppearedInTower:: @ 817F614 +LavenderTown_Text_GhostsAppearedInTower:: .string "Ghosts appeared in POKéMON TOWER.\p" .string "I think they're the spirits of\n" .string "POKéMON that the ROCKETS killed.$" -LavenderTown_Text_TownSign:: @ 817F676 +LavenderTown_Text_TownSign:: .string "LAVENDER TOWN\n" .string "The Noble Purple Town$" -LavenderTown_Text_SilphScopeNotice:: @ 817F69A +LavenderTown_Text_SilphScopeNotice:: .string "New SILPH SCOPE!\n" .string "Make the Invisible Plain to See!\p" .string "SILPH CO.$" -LavenderTown_Text_VolunteerPokemonHouse:: @ 817F6D6 +LavenderTown_Text_VolunteerPokemonHouse:: .string "LAVENDER VOLUNTEER\n" .string "POKéMON HOUSE$" -LavenderTown_Text_PokemonTowerSign:: @ 817F6F7 +LavenderTown_Text_PokemonTowerSign:: .string "POKéMON TOWER\n" .string "Becalm the Spirits of POKéMON$" diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc index dd331a208..9c15c485a 100644 --- a/data/maps/LavenderTown_House1/scripts.inc +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -1,7 +1,7 @@ -LavenderTown_House1_MapScripts:: @ 816B232 +LavenderTown_House1_MapScripts:: .byte 0 -LavenderTown_House1_EventScript_CooltrainerF:: @ 816B233 +LavenderTown_House1_EventScript_CooltrainerF:: lock faceplayer goto_if_set FLAG_RESCUED_MR_FUJI, LavenderTown_House1_EventScript_CooltrainerFGhostGone @@ -9,12 +9,12 @@ LavenderTown_House1_EventScript_CooltrainerF:: @ 816B233 release end -LavenderTown_House1_EventScript_CooltrainerFGhostGone:: @ 816B248 +LavenderTown_House1_EventScript_CooltrainerFGhostGone:: msgbox LavenderTown_House1_Text_GhostOfPokemonTowerIsGone release end -LavenderTown_House1_EventScript_Cubone:: @ 816B252 +LavenderTown_House1_EventScript_Cubone:: lock faceplayer waitse diff --git a/data/maps/LavenderTown_House1/text.inc b/data/maps/LavenderTown_House1/text.inc index ab6d722e0..caf898cf1 100644 --- a/data/maps/LavenderTown_House1/text.inc +++ b/data/maps/LavenderTown_House1/text.inc @@ -1,14 +1,14 @@ -LavenderTown_House1_Text_Cubone:: @ 819396B +LavenderTown_House1_Text_Cubone:: .string "CUBONE: Kyarugoo!$" -LavenderTown_House1_Text_RocketsKilledCubonesMother:: @ 819397D +LavenderTown_House1_Text_RocketsKilledCubonesMother:: .string "Those horrible ROCKETS!\n" .string "They deserve no mercy!\p" .string "That poor CUBONE's mother…\p" .string "It was killed trying to escape from\n" .string "TEAM ROCKET.$" -LavenderTown_House1_Text_GhostOfPokemonTowerIsGone:: @ 81939F8 +LavenderTown_House1_Text_GhostOfPokemonTowerIsGone:: .string "The ghost of POKéMON TOWER is\n" .string "gone!\p" .string "Someone must have soothed its\n" diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc index 0f69c84f8..6f8f7d350 100644 --- a/data/maps/LavenderTown_House2/scripts.inc +++ b/data/maps/LavenderTown_House2/scripts.inc @@ -1,7 +1,7 @@ -LavenderTown_House2_MapScripts:: @ 816B265 +LavenderTown_House2_MapScripts:: .byte 0 -LavenderTown_House2_EventScript_NameRater:: @ 816B266 +LavenderTown_House2_EventScript_NameRater:: lock faceplayer msgbox LavenderTown_House2_Text_WantMeToRateNicknames, MSGBOX_YESNO @@ -11,7 +11,7 @@ LavenderTown_House2_EventScript_NameRater:: @ 816B266 goto_if_eq LavenderTown_House2_EventScript_DontRateNickname end -LavenderTown_House2_EventScript_ChooseMon:: @ 816B287 +LavenderTown_House2_EventScript_ChooseMon:: msgbox LavenderTown_House2_Text_CritiqueWhichMonsNickname special ChoosePartyMon waitstate @@ -21,12 +21,12 @@ LavenderTown_House2_EventScript_ChooseMon:: @ 816B287 goto_if_ge LavenderTown_House2_EventScript_DontRateNickname end -LavenderTown_House2_EventScript_DontRateNickname:: @ 816B2AA +LavenderTown_House2_EventScript_DontRateNickname:: msgbox LavenderTown_House2_Text_ISeeComeVisitAgain release end -LavenderTown_House2_EventScript_CheckCanRateMon:: @ 816B2B4 +LavenderTown_House2_EventScript_CheckCanRateMon:: specialvar VAR_RESULT, GetPartyMonSpecies compare VAR_RESULT, SPECIES_EGG goto_if_eq LavenderTown_House2_EventScript_CantNicknameEgg @@ -45,17 +45,17 @@ LavenderTown_House2_EventScript_CheckCanRateMon:: @ 816B2B4 goto_if_eq LavenderTown_House2_EventScript_DontRateNickname end -LavenderTown_House2_EventScript_CantNicknameEgg:: @ 816B307 +LavenderTown_House2_EventScript_CantNicknameEgg:: msgbox LavenderTown_House2_Text_ThatIsMerelyAnEgg release end -LavenderTown_House2_EventScript_CantNicknameTradeMon:: @ 816B311 +LavenderTown_House2_EventScript_CantNicknameTradeMon:: msgbox LavenderTown_House2_Text_TrulyImpeccableName release end -LavenderTown_House2_EventScript_ChooseNewNickname:: @ 816B31B +LavenderTown_House2_EventScript_ChooseNewNickname:: msgbox LavenderTown_House2_Text_WhatShallNewNicknameBe call EventScript_ChangePokemonNickname specialvar VAR_RESULT, NameRaterWasNicknameChanged @@ -66,7 +66,7 @@ LavenderTown_House2_EventScript_ChooseNewNickname:: @ 816B31B release end -LavenderTown_House2_EventScript_ChoseNewNickname:: @ 816B345 +LavenderTown_House2_EventScript_ChoseNewNickname:: msgbox LavenderTown_House2_Text_FromNowOnShallBeKnownAsName release end diff --git a/data/maps/LavenderTown_House2/text.inc b/data/maps/LavenderTown_House2/text.inc index f43bb7e5f..8ec6f8dde 100644 --- a/data/maps/LavenderTown_House2/text.inc +++ b/data/maps/LavenderTown_House2/text.inc @@ -1,47 +1,47 @@ -LavenderTown_House2_Text_WantMeToRateNicknames:: @ 8193A4B +LavenderTown_House2_Text_WantMeToRateNicknames:: .string "Hello, hello!\n" .string "I am the official NAME RATER!\p" .string "Want me to rate the nicknames of\n" .string "your POKéMON?$" -LavenderTown_House2_Text_CritiqueWhichMonsNickname:: @ 8193AA6 +LavenderTown_House2_Text_CritiqueWhichMonsNickname:: .string "Which POKéMON's nickname should\n" .string "I critique?$" -LavenderTown_House2_Text_GiveItANicerName:: @ 8193AD2 +LavenderTown_House2_Text_GiveItANicerName:: .string "{STR_VAR_1}, is it?\n" .string "That is a decent nickname!\p" .string "But, would you like me to give it\n" .string "a nicer name?\p" .string "How about it?$" -LavenderTown_House2_Text_WhatShallNewNicknameBe:: @ 8193B36 +LavenderTown_House2_Text_WhatShallNewNicknameBe:: .string "Ah, good. Then, what shall the new\n" .string "nickname be?$" -LavenderTown_House2_Text_FromNowOnShallBeKnownAsName:: @ 8193B66 +LavenderTown_House2_Text_FromNowOnShallBeKnownAsName:: .string "Done! From now on, this POKéMON\n" .string "shall be known as {STR_VAR_1}!\p" .string "It is a better name than before!\n" .string "How fortunate for you!$" -LavenderTown_House2_Text_ISeeComeVisitAgain:: @ 8193BD4 +LavenderTown_House2_Text_ISeeComeVisitAgain:: .string "I see.\n" .string "Do come visit again.$" -LavenderTown_House2_Text_FromNowOnShallBeKnownAsSameName:: @ 8193BF0 +LavenderTown_House2_Text_FromNowOnShallBeKnownAsSameName:: .string "Done! From now on, this POKéMON\n" .string "shall be known as {STR_VAR_1}!\p" .string "It looks no different from before,\n" .string "and yet, this is vastly superior!\p" .string "How fortunate for you!$" -LavenderTown_House2_Text_TrulyImpeccableName:: @ 8193C82 +LavenderTown_House2_Text_TrulyImpeccableName:: .string "{STR_VAR_1}, is it?\n" .string "That is a truly impeccable name!\p" .string "Take good care of {STR_VAR_1}!$" -LavenderTown_House2_Text_ThatIsMerelyAnEgg:: @ 8193CC4 +LavenderTown_House2_Text_ThatIsMerelyAnEgg:: .string "Now, now.\n" .string "That is merely an EGG!$" diff --git a/data/maps/LavenderTown_Mart/scripts.inc b/data/maps/LavenderTown_Mart/scripts.inc index 4e3d8fa62..6425e5917 100644 --- a/data/maps/LavenderTown_Mart/scripts.inc +++ b/data/maps/LavenderTown_Mart/scripts.inc @@ -1,19 +1,19 @@ -LavenderTown_Mart_MapScripts:: @ 816B34F +LavenderTown_Mart_MapScripts:: .byte 0 -LavenderTown_Mart_EventScript_BaldingMan:: @ 816B350 +LavenderTown_Mart_EventScript_BaldingMan:: msgbox LavenderTown_Mart_Text_SearchingForStatRaiseItems, MSGBOX_NPC end -LavenderTown_Mart_EventScript_Rocker:: @ 816B359 +LavenderTown_Mart_EventScript_Rocker:: msgbox LavenderTown_Mart_Text_DidYouBuyRevives, MSGBOX_NPC end -LavenderTown_Mart_EventScript_Youngster:: @ 816B362 +LavenderTown_Mart_EventScript_Youngster:: msgbox LavenderTown_Mart_Text_TrainerDuosCanChallengeYou, MSGBOX_NPC end -LavenderTown_Mart_EventScript_Clerk:: @ 816B36B +LavenderTown_Mart_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -25,7 +25,7 @@ LavenderTown_Mart_EventScript_Clerk:: @ 816B36B end .align 2 -LavenderTown_Mart_Items:: @ 816B390 +LavenderTown_Mart_Items:: .2byte ITEM_GREAT_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_REVIVE diff --git a/data/maps/LavenderTown_Mart/text.inc b/data/maps/LavenderTown_Mart/text.inc index cdf25450e..bc5dc25bc 100644 --- a/data/maps/LavenderTown_Mart/text.inc +++ b/data/maps/LavenderTown_Mart/text.inc @@ -1,4 +1,4 @@ -LavenderTown_Mart_Text_SearchingForStatRaiseItems:: @ 8193CE5 +LavenderTown_Mart_Text_SearchingForStatRaiseItems:: .string "I'm searching for items that raise\n" .string "the stats of POKéMON.\p" .string "They're effective over the course\n" @@ -7,18 +7,18 @@ LavenderTown_Mart_Text_SearchingForStatRaiseItems:: @ 8193CE5 .string "and X SPECIAL are what I'm after.\p" .string "Do you know where I can get them?$" -LavenderTown_Mart_Text_DidYouBuyRevives:: @ 8193DB6 +LavenderTown_Mart_Text_DidYouBuyRevives:: .string "Did you buy some REVIVES?\n" .string "They revive any fainted POKéMON!$" -LavenderTown_Mart_Text_TrainerDuosCanChallengeYou:: @ 8193DF1 +LavenderTown_Mart_Text_TrainerDuosCanChallengeYou:: .string "Sometimes, a TRAINER duo will\n" .string "challenge you with two POKéMON\l" .string "at the same time.\p" .string "If that happens, you have to send\n" .string "out two POKéMON to battle, too.$" -LavenderTown_Mart_Text_SoldNuggetFromMountainsFor5000:: @ 8193E82 +LavenderTown_Mart_Text_SoldNuggetFromMountainsFor5000:: .string "この　あいだ　やまおくで\n" .string "きんのたまを　ひろい　ましてね！\p" .string "つかえない　しなもの　ですが\n" diff --git a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc index 2337bdc7a..a9ce2ec30 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ -LavenderTown_PokemonCenter_1F_MapScripts:: @ 816B0EF +LavenderTown_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, LavenderTown_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -LavenderTown_PokemonCenter_1F_OnTransition:: @ 816B0FA +LavenderTown_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_LAVENDER_TOWN end -LavenderTown_PokemonCenter_1F_EventScript_Nurse:: @ 816B0FE +LavenderTown_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -LavenderTown_PokemonCenter_1F_EventScript_Gentleman:: @ 816B107 +LavenderTown_PokemonCenter_1F_EventScript_Gentleman:: msgbox LavenderTown_PokemonCenter_1F_Text_RocketsDoAnythingForMoney, MSGBOX_NPC end -LavenderTown_PokemonCenter_1F_EventScript_Lass:: @ 816B110 +LavenderTown_PokemonCenter_1F_EventScript_Lass:: msgbox LavenderTown_PokemonCenter_1F_Text_CubonesMotherKilledByRockets, MSGBOX_NPC end -LavenderTown_PokemonCenter_1F_EventScript_Youngster:: @ 816B119 +LavenderTown_PokemonCenter_1F_EventScript_Youngster:: msgbox LavenderTown_PokemonCenter_1F_Text_PeoplePayForCuboneSkulls, MSGBOX_NPC end diff --git a/data/maps/LavenderTown_PokemonCenter_1F/text.inc b/data/maps/LavenderTown_PokemonCenter_1F/text.inc index 66b8e5d83..8c39e13d4 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/text.inc +++ b/data/maps/LavenderTown_PokemonCenter_1F/text.inc @@ -1,15 +1,15 @@ -LavenderTown_PokemonCenter_1F_Text_RocketsDoAnythingForMoney:: @ 8193465 +LavenderTown_PokemonCenter_1F_Text_RocketsDoAnythingForMoney:: .string "TEAM ROCKET will do anything for\n" .string "the sake of money!\p" .string "There is no job too dirty, no deed\n" .string "too heinous, no crime too wicked!$" -LavenderTown_PokemonCenter_1F_Text_CubonesMotherKilledByRockets:: @ 81934DE +LavenderTown_PokemonCenter_1F_Text_CubonesMotherKilledByRockets:: .string "I saw CUBONE's mother trying to\n" .string "escape from TEAM ROCKET.\p" .string "She was killed trying to get away…$" -LavenderTown_PokemonCenter_1F_Text_PeoplePayForCuboneSkulls:: @ 819353A +LavenderTown_PokemonCenter_1F_Text_PeoplePayForCuboneSkulls:: .string "You know how the CUBONE species\n" .string "wears skulls, right?\p" .string "People will pay a lot for one.$" diff --git a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc index 2ef3c6643..08a3478d3 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc +++ b/data/maps/LavenderTown_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 +LavenderTown_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ LavenderTown_PokemonCenter_2F_MapScripts:: @ 816B122 .byte 0 @ The below 3 are unused and leftover from RS -LavenderTown_PokemonCenter_2F_EventScript_Colosseum:: @ 816B137 +LavenderTown_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -LavenderTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B13D +LavenderTown_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -LavenderTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B143 +LavenderTown_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index 29972d993..e55c045b8 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -1,7 +1,7 @@ -LavenderTown_VolunteerPokemonHouse_MapScripts:: @ 816B149 +LavenderTown_VolunteerPokemonHouse_MapScripts:: .byte 0 -LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji:: @ 816B14A +LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji:: lock faceplayer goto_if_set FLAG_GOT_POKE_FLUTE, LavenderTown_VolunteerPokemonHouse_EventScript_AlreadyHavePokeFlute @@ -15,17 +15,17 @@ LavenderTown_VolunteerPokemonHouse_EventScript_MrFuji:: @ 816B14A release end -LavenderTown_VolunteerPokemonHouse_EventScript_AlreadyHavePokeFlute:: @ 816B196 +LavenderTown_VolunteerPokemonHouse_EventScript_AlreadyHavePokeFlute:: msgbox LavenderTown_VolunteerPokemonHouse_Text_HasPokeFluteHelpedYou release end -LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute:: @ 816B1A0 +LavenderTown_VolunteerPokemonHouse_EventScript_NoRoomForPokeFlute:: msgbox LavenderTown_VolunteerPokemonHouse_Text_MustMakeRoomForThis release end -LavenderTown_VolunteerPokemonHouse_EventScript_LittleGirl:: @ 816B1AA +LavenderTown_VolunteerPokemonHouse_EventScript_LittleGirl:: lock faceplayer famechecker FAMECHECKER_MRFUJI, 0 @@ -33,11 +33,11 @@ LavenderTown_VolunteerPokemonHouse_EventScript_LittleGirl:: @ 816B1AA release end -LavenderTown_VolunteerPokemonHouse_EventScript_LittleBoy:: @ 816B1C3 +LavenderTown_VolunteerPokemonHouse_EventScript_LittleBoy:: msgbox LavenderTown_VolunteerPokemonHouse_Text_MonsNiceToHug, MSGBOX_NPC end -LavenderTown_VolunteerPokemonHouse_EventScript_Youngster:: @ 816B1CC +LavenderTown_VolunteerPokemonHouse_EventScript_Youngster:: lock faceplayer goto_if_set FLAG_RESCUED_MR_FUJI, LavenderTown_VolunteerPokemonHouse_EventScript_YoungsterFujiBack @@ -45,12 +45,12 @@ LavenderTown_VolunteerPokemonHouse_EventScript_Youngster:: @ 816B1CC release end -LavenderTown_VolunteerPokemonHouse_EventScript_YoungsterFujiBack:: @ 816B1E1 +LavenderTown_VolunteerPokemonHouse_EventScript_YoungsterFujiBack:: msgbox LavenderTown_VolunteerPokemonHouse_Text_MrFujiWasPrayingForCubonesMother release end -LavenderTown_VolunteerPokemonHouse_EventScript_Nidorino:: @ 816B1EB +LavenderTown_VolunteerPokemonHouse_EventScript_Nidorino:: lock faceplayer waitse @@ -60,7 +60,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_Nidorino:: @ 816B1EB release end -LavenderTown_VolunteerPokemonHouse_EventScript_Psyduck:: @ 816B1FE +LavenderTown_VolunteerPokemonHouse_EventScript_Psyduck:: lock faceplayer waitse @@ -70,13 +70,13 @@ LavenderTown_VolunteerPokemonHouse_EventScript_Psyduck:: @ 816B1FE release end -LavenderTown_VolunteerPokemonHouse_EventScript_PokemonFanMagazine:: @ 816B211 +LavenderTown_VolunteerPokemonHouse_EventScript_PokemonFanMagazine:: lockall famechecker FAMECHECKER_MRFUJI, 2 msgbox LavenderTown_VolunteerPokemonHouse_Text_GrandPrizeDrawingClipped releaseall end -LavenderTown_VolunteerPokemonHouse_EventScript_Bookshelf:: @ 816B229 +LavenderTown_VolunteerPokemonHouse_EventScript_Bookshelf:: msgbox LavenderTown_VolunteerPokemonHouse_Text_PokemonMagazinesLineShelf, MSGBOX_SIGN end diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc index 864a213bd..7ce87cd39 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/text.inc @@ -1,33 +1,33 @@ -LavenderTown_PokemonCenter_1F_Text_HearMrFujiNotFromAroundHere:: @ 819358E +LavenderTown_PokemonCenter_1F_Text_HearMrFujiNotFromAroundHere:: .string "I recently moved to this town.\p" .string "I hear that MR. FUJI's not from\n" .string "these parts originally, either.$" -LavenderTown_VolunteerPokemonHouse_Text_WhereDidMrFujiGo:: @ 81935ED +LavenderTown_VolunteerPokemonHouse_Text_WhereDidMrFujiGo:: .string "That's odd, MR. FUJI isn't here.\n" .string "Where'd he go?$" -LavenderTown_VolunteerPokemonHouse_Text_MrFujiWasPrayingForCubonesMother:: @ 819361D +LavenderTown_VolunteerPokemonHouse_Text_MrFujiWasPrayingForCubonesMother:: .string "MR. FUJI had been praying alone\n" .string "for CUBONE's mother.$" -LavenderTown_VolunteerPokemonHouse_Text_MrFujiLooksAfterOrphanedMons:: @ 8193652 +LavenderTown_VolunteerPokemonHouse_Text_MrFujiLooksAfterOrphanedMons:: .string "This is really MR. FUJI's house.\p" .string "He's really kind.\p" .string "He looks after abandoned and\n" .string "orphaned POKéMON.$" -LavenderTown_VolunteerPokemonHouse_Text_MonsNiceToHug:: @ 81936B4 +LavenderTown_VolunteerPokemonHouse_Text_MonsNiceToHug:: .string "It's so warm!\n" .string "POKéMON are so nice to hug.$" -LavenderTown_VolunteerPokemonHouse_Text_Nidorino:: @ 81936DE +LavenderTown_VolunteerPokemonHouse_Text_Nidorino:: .string "NIDORINO: Gaoo!$" -LavenderTown_VolunteerPokemonHouse_Text_Psyduck:: @ 81936EE +LavenderTown_VolunteerPokemonHouse_Text_Psyduck:: .string "PSYDUCK: Gwappa!$" -LavenderTown_VolunteerPokemonHouse_Text_IdLikeYouToHaveThis:: @ 81936FF +LavenderTown_VolunteerPokemonHouse_Text_IdLikeYouToHaveThis:: .string "MR. FUJI: {PLAYER}…\p" .string "Your POKéDEX quest is one that\n" .string "requires strong dedication.\p" @@ -36,31 +36,31 @@ LavenderTown_VolunteerPokemonHouse_Text_IdLikeYouToHaveThis:: @ 81936FF .string "I'm not sure if this will help you,\n" .string "but I'd like you to have it.$" -LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji:: @ 81937BD +LavenderTown_VolunteerPokemonHouse_Text_ReceivedPokeFluteFromMrFuji:: .string "{PLAYER} received a POKé FLUTE\n" .string "from MR. FUJI.$" -LavenderTown_VolunteerPokemonHouse_Text_ExplainPokeFlute:: @ 81937E5 +LavenderTown_VolunteerPokemonHouse_Text_ExplainPokeFlute:: .string "Upon hearing the POKé FLUTE,\n" .string "sleeping POKéMON will spring awake.\p" .string "Try using it on POKéMON that are\n" .string "sleeping obstacles.$" -LavenderTown_VolunteerPokemonHouse_Text_MustMakeRoomForThis:: @ 819385B +LavenderTown_VolunteerPokemonHouse_Text_MustMakeRoomForThis:: .string "You must make room for this!$" -LavenderTown_VolunteerPokemonHouse_Text_HasPokeFluteHelpedYou:: @ 8193878 +LavenderTown_VolunteerPokemonHouse_Text_HasPokeFluteHelpedYou:: .string "MR. FUJI: Has my POKé FLUTE\n" .string "helped you?$" -LavenderTown_VolunteerPokemonHouse_Text_GrandPrizeDrawingClipped:: @ 81938A0 +LavenderTown_VolunteerPokemonHouse_Text_GrandPrizeDrawingClipped:: .string "POKéMON FAN MAGAZINE\n" .string "Monthly Grand Prize Drawing!\p" .string "The application form is…\p" .string "Gone! It's been clipped out.\n" .string "Someone must have applied already.$" -LavenderTown_VolunteerPokemonHouse_Text_PokemonMagazinesLineShelf:: @ 819392B +LavenderTown_VolunteerPokemonHouse_Text_PokemonMagazinesLineShelf:: .string "POKéMON magazines line the shelf.\p" .string "POKéMON INSIDER…\p" .string "POKéMON FAN…$" diff --git a/data/maps/MtEmber_Exterior/scripts.inc b/data/maps/MtEmber_Exterior/scripts.inc index 83d5c7e6c..770deab35 100644 --- a/data/maps/MtEmber_Exterior/scripts.inc +++ b/data/maps/MtEmber_Exterior/scripts.inc @@ -1,32 +1,32 @@ .set LOCALID_GRUNT1, 2 .set LOCALID_GRUNT2, 3 -MtEmber_Exterior_MapScripts:: @ 8163946 +MtEmber_Exterior_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Exterior_OnTransition map_script MAP_SCRIPT_ON_LOAD, MtEmber_Exterior_OnLoad .byte 0 -MtEmber_Exterior_OnTransition:: @ 8163951 +MtEmber_Exterior_OnTransition:: setworldmapflag FLAG_WORLD_MAP_MT_EMBER_EXTERIOR compare VAR_MAP_SCENE_MT_EMBER_EXTERIOR, 2 call_if_eq MtEmber_Exterior_EventScript_RocketsFaceDown end -MtEmber_Exterior_EventScript_RocketsFaceDown:: @ 8163960 +MtEmber_Exterior_EventScript_RocketsFaceDown:: setobjectmovementtype LOCALID_GRUNT1, MOVEMENT_TYPE_FACE_DOWN setobjectmovementtype LOCALID_GRUNT2, MOVEMENT_TYPE_FACE_DOWN return -MtEmber_Exterior_OnLoad:: @ 8163969 +MtEmber_Exterior_OnLoad:: compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 call_if_ge MtEmber_Exterior_EventScript_OpenCave end -MtEmber_Exterior_EventScript_OpenCave:: @ 8163975 +MtEmber_Exterior_EventScript_OpenCave:: setmetatile 42, 39, METATILE_MtEmber_CaveEntrance, 0 return -MtEmber_Exterior_EventScript_Grunt1:: @ 816397F +MtEmber_Exterior_EventScript_Grunt1:: lock goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_43, MtEmber_Exterior_EventScript_Grunt1Defeated compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 4 @@ -35,12 +35,12 @@ MtEmber_Exterior_EventScript_Grunt1:: @ 816397F release end -MtEmber_Exterior_EventScript_Grunt1Defeated:: @ 816399E +MtEmber_Exterior_EventScript_Grunt1Defeated:: msgbox MtEmber_Exterior_Text_Grunt1PostBattle release end -MtEmber_Exterior_EventScript_BattleGrunt1:: @ 81639A8 +MtEmber_Exterior_EventScript_BattleGrunt1:: applymovement LOCALID_GRUNT1, Movement_FacePlayer waitmovement 0 playbgm MUS_ENCOUNTER_ROCKET, 0 @@ -51,7 +51,7 @@ MtEmber_Exterior_EventScript_BattleGrunt1:: @ 81639A8 release end -MtEmber_Exterior_EventScript_DefeatedBothGrunts:: @ 81639DB +MtEmber_Exterior_EventScript_DefeatedBothGrunts:: msgbox MtEmber_Exterior_Text_WellRegroupDontStepInsideThere closemessage fadescreen FADE_TO_BLACK @@ -61,7 +61,7 @@ MtEmber_Exterior_EventScript_DefeatedBothGrunts:: @ 81639DB release end -MtEmber_Exterior_EventScript_Grunt2:: @ 81639F0 +MtEmber_Exterior_EventScript_Grunt2:: lock faceplayer goto_if_defeated TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_EventScript_DefeatedGrunt2 @@ -74,12 +74,12 @@ MtEmber_Exterior_EventScript_Grunt2:: @ 81639F0 release end -MtEmber_Exterior_EventScript_DefeatedGrunt2:: @ 8163A1B +MtEmber_Exterior_EventScript_DefeatedGrunt2:: msgbox MtEmber_Exterior_Text_Grunt2PostBattle release end -MtEmber_Exterior_EventScript_BattleGrunt2:: @ 8163A25 +MtEmber_Exterior_EventScript_BattleGrunt2:: playbgm MUS_ENCOUNTER_ROCKET, 0 msgbox MtEmber_Exterior_Text_Grunt2Intro trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_44, MtEmber_Exterior_Text_Grunt2Defeat @@ -88,7 +88,7 @@ MtEmber_Exterior_EventScript_BattleGrunt2:: @ 8163A25 release end -MtEmber_Exterior_EventScript_RocketPasswordScene:: @ 8163A4E +MtEmber_Exterior_EventScript_RocketPasswordScene:: lockall textcolor 0 msgbox MtEmber_Exterior_Text_PunchedThroughAtLast @@ -114,17 +114,17 @@ MtEmber_Exterior_EventScript_RocketPasswordScene:: @ 8163A4E releaseall end -MtEmber_Exterior_EventScript_Logan:: @ 8163AB4 +MtEmber_Exterior_EventScript_Logan:: trainerbattle_single TRAINER_PKMN_RANGER_LOGAN, MtEmber_Exterior_Text_LoganIntro, MtEmber_Exterior_Text_LoganDefeat msgbox MtEmber_Exterior_Text_LoganPostBattle, MSGBOX_AUTOCLOSE end -MtEmber_Exterior_EventScript_Beth:: @ 8163ACB +MtEmber_Exterior_EventScript_Beth:: trainerbattle_single TRAINER_PKMN_RANGER_BETH, MtEmber_Exterior_Text_BethIntro, MtEmber_Exterior_Text_BethDefeat msgbox MtEmber_Exterior_Text_BethPostBattle, MSGBOX_AUTOCLOSE end -MtEmber_Exterior_EventScript_Jocelyn:: @ 8163AE2 +MtEmber_Exterior_EventScript_Jocelyn:: trainerbattle_single TRAINER_CRUSH_GIRL_JOCELYN, MtEmber_Exterior_Text_JocelynIntro, MtEmber_Exterior_Text_JocelynDefeat msgbox MtEmber_Exterior_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtEmber_Exterior/text.inc b/data/maps/MtEmber_Exterior/text.inc index 34d7d2139..25fad17bf 100644 --- a/data/maps/MtEmber_Exterior/text.inc +++ b/data/maps/MtEmber_Exterior/text.inc @@ -1,4 +1,4 @@ -Text_ExplosionTeach:: @ 817A642 +Text_ExplosionTeach:: .string "Can you imagine?\n" .string "If this volcano were to erupt?\p" .string "The explosion would be the end of\n" @@ -6,22 +6,22 @@ Text_ExplosionTeach:: @ 817A642 .string "While we're terrified, would you\n" .string "like me to teach EXPLOSION?$" -Text_ExplosionDeclined:: @ 817A6ED +Text_ExplosionDeclined:: .string "Yeah, you're right.\n" .string "It is too terrifying.$" -Text_ExplosionWhichMon:: @ 817A717 +Text_ExplosionWhichMon:: .string "You're terribly brave!\p" .string "Which POKéMON should I teach\n" .string "EXPLOSION?$" -Text_ExplosionTaught:: @ 817A756 +Text_ExplosionTaught:: .string "Using EXPLOSION while on this\n" .string "volcano…\p" .string "What a terrifying thrill!$" @ Below 4 are unused JP versions of the above texts -Text_ExplosionTeachJP:: @ 817A797 +Text_ExplosionTeachJP:: .string "こ　この　かざんが\n" .string "もし　だいばくはつ　したら\l" .string "お　おれら　ひとたまりも\l" @@ -29,72 +29,72 @@ Text_ExplosionTeachJP:: @ 817A797 .string "こ　こわい　ついでに\n" .string "だいばくはつ　でも　おぼえてみる？$" -Text_ExplosionDeclinedJP:: @ 817A7E5 +Text_ExplosionDeclinedJP:: .string "や　やっぱ　こわいもんな\n" .string "ブルブル$" -Text_ExplosionWhichMonJP:: @ 817A7F7 +Text_ExplosionWhichMonJP:: .string "つ　つよきだね！\n" .string "じゃあ　どの　ポケモンに　する？$" -Text_ExplosionTaughtJP:: @ 817A811 +Text_ExplosionTaughtJP:: .string "かざんで　だいばくはつを‥\n" .string "す　すごい　スリル！$" -MtEmber_Exterior_Text_WellTryDiggingHere:: @ 817A82A +MtEmber_Exterior_Text_WellTryDiggingHere:: .string "Over here.\n" .string "We'll try digging here.\p" .string "That treasure the ADMINS've been\n" .string "talking about should be here.$" -MtEmber_Exterior_Text_YoureInTheWayGetLost:: @ 817A88C +MtEmber_Exterior_Text_YoureInTheWayGetLost:: .string "What the…?\n" .string "You're in the way. Get lost.$" -MtEmber_Exterior_Text_PunchedThroughAtLast:: @ 817A8B4 +MtEmber_Exterior_Text_PunchedThroughAtLast:: .string "Whew, punched through at last.\n" .string "Let's go treasure hunting!$" -MtEmber_Exterior_Text_WhatsPasswordAgain:: @ 817A8EE +MtEmber_Exterior_Text_WhatsPasswordAgain:: .string "Any treasure we find, we haul back\n" .string "to the WAREHOUSE, understood?\p" .string "…Oh, and what're the passwords?\n" .string "At the ROCKET WAREHOUSE, I mean.$" -MtEmber_Exterior_Text_FirstPasswordGoldeen:: @ 817A970 +MtEmber_Exterior_Text_FirstPasswordGoldeen:: .string "What, you forgot the password?\n" .string "There're actually two.\p" .string "The first one's “GOLDEEN need\n" .string "log.”\p" .string "And the second one is…$" -MtEmber_Exterior_Text_SnoopsBeenListeningIn:: @ 817A9E1 +MtEmber_Exterior_Text_SnoopsBeenListeningIn:: .string "Hey!\n" .string "This snoop's been listening in!$" -MtEmber_Exterior_Text_Grunt1Intro:: @ 817AA06 +MtEmber_Exterior_Text_Grunt1Intro:: .string "You've been eavesdropping on us,\n" .string "haven't you?$" -MtEmber_Exterior_Text_Grunt1Defeat:: @ 817AA34 +MtEmber_Exterior_Text_Grunt1Defeat:: .string "Huh, what?$" -MtEmber_Exterior_Text_Grunt1PostBattle:: @ 817AA3F +MtEmber_Exterior_Text_Grunt1PostBattle:: .string "Why'd you have to win?$" -MtEmber_Exterior_Text_Grunt2Intro:: @ 817AA56 +MtEmber_Exterior_Text_Grunt2Intro:: .string "Trying to horn in on our treasure?\n" .string "Don't bet on it!$" -MtEmber_Exterior_Text_Grunt2Defeat:: @ 817AA8A +MtEmber_Exterior_Text_Grunt2Defeat:: .string "Wait!\n" .string "But how?$" -MtEmber_Exterior_Text_Grunt2PostBattle:: @ 817AA99 +MtEmber_Exterior_Text_Grunt2PostBattle:: .string "Develop amnesia conveniently and\n" .string "forget everything you heard!$" -MtEmber_Exterior_Text_WellRegroupDontStepInsideThere:: @ 817AAD7 +MtEmber_Exterior_Text_WellRegroupDontStepInsideThere:: .string "What a setback…\n" .string "We'll have to regroup.\p" .string "You! Don't even think about taking\n" @@ -102,43 +102,43 @@ MtEmber_Exterior_Text_WellRegroupDontStepInsideThere:: @ 817AAD7 .string "If you know what's good for you,\n" .string "don't even think about this!$" -MtEmber_Exterior_Text_LoganIntro:: @ 817AB73 +MtEmber_Exterior_Text_LoganIntro:: .string "An active volcano is one that's\n" .string "erupting, or about to.$" -MtEmber_Exterior_Text_LoganDefeat:: @ 817ABAA +MtEmber_Exterior_Text_LoganDefeat:: .string "Whew… That was hot!\n" .string "Sweat's erupting from me!$" -MtEmber_Exterior_Text_LoganPostBattle:: @ 817ABD8 +MtEmber_Exterior_Text_LoganPostBattle:: .string "They say there're over 1,500\n" .string "active volcanoes in the world.\p" .string "Just thinking about them makes me\n" .string "feel all hot and gooey inside!$" -MtEmber_Exterior_Text_BethIntro:: @ 817AC55 +MtEmber_Exterior_Text_BethIntro:: .string "Do you know how caves form inside\n" .string "volcanoes?$" -MtEmber_Exterior_Text_BethDefeat:: @ 817AC82 +MtEmber_Exterior_Text_BethDefeat:: .string "Atchah!\n" .string "You're shockingly good!$" -MtEmber_Exterior_Text_BethPostBattle:: @ 817ACA2 +MtEmber_Exterior_Text_BethPostBattle:: .string "When lava at the surface of magma\n" .string "hardens, and the magma inside flows\l" .string "out, caverns are left behind.$" -MtEmber_Exterior_Text_JocelynIntro:: @ 817AD06 +MtEmber_Exterior_Text_JocelynIntro:: .string "I've been in training so I can mend\n" .string "my broken heart…\p" .string "It toughened me up physically at\n" .string "least! Hi-yah!$" -MtEmber_Exterior_Text_JocelynDefeat:: @ 817AD6B +MtEmber_Exterior_Text_JocelynDefeat:: .string "I think I tried to overdo it…$" -MtEmber_Exterior_Text_JocelynPostBattle:: @ 817AD89 +MtEmber_Exterior_Text_JocelynPostBattle:: .string "The way you battle, it reminds me\n" .string "of the guy who dumped me…$" diff --git a/data/maps/MtEmber_RubyPath_1F/scripts.inc b/data/maps/MtEmber_RubyPath_1F/scripts.inc index 46d4be447..44f94434f 100644 --- a/data/maps/MtEmber_RubyPath_1F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_1F/scripts.inc @@ -1,2 +1,2 @@ -MtEmber_RubyPath_1F_MapScripts:: @ 8163C45 +MtEmber_RubyPath_1F_MapScripts:: .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B1F/scripts.inc b/data/maps/MtEmber_RubyPath_B1F/scripts.inc index 6a5f9cefb..808d6d275 100644 --- a/data/maps/MtEmber_RubyPath_B1F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B1F/scripts.inc @@ -1,2 +1,2 @@ -MtEmber_RubyPath_B1F_MapScripts:: @ 8163C46 +MtEmber_RubyPath_B1F_MapScripts:: .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc b/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc index 204b555a1..032117296 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/scripts.inc @@ -1,2 +1,2 @@ -MtEmber_RubyPath_B1F_Stairs_MapScripts:: @ 8163C6F +MtEmber_RubyPath_B1F_Stairs_MapScripts:: .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B2F/scripts.inc b/data/maps/MtEmber_RubyPath_B2F/scripts.inc index dc4d85ab6..ef87dbfc8 100644 --- a/data/maps/MtEmber_RubyPath_B2F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B2F/scripts.inc @@ -1,2 +1,2 @@ -MtEmber_RubyPath_B2F_MapScripts:: @ 8163C47 +MtEmber_RubyPath_B2F_MapScripts:: .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc b/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc index 3646547b1..2bee45391 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/scripts.inc @@ -1,2 +1,2 @@ -MtEmber_RubyPath_B2F_Stairs_MapScripts:: @ 8163C70 +MtEmber_RubyPath_B2F_Stairs_MapScripts:: .byte 0 diff --git a/data/maps/MtEmber_RubyPath_B3F/scripts.inc b/data/maps/MtEmber_RubyPath_B3F/scripts.inc index 43026392d..5a1751eb9 100644 --- a/data/maps/MtEmber_RubyPath_B3F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B3F/scripts.inc @@ -1,10 +1,10 @@ .set LOCALID_RUBY, 1 -MtEmber_RubyPath_B3F_MapScripts:: @ 8163C48 +MtEmber_RubyPath_B3F_MapScripts:: .byte 0 @ Odd that this is here and not in MtEmber_RubyPath_B5F/scripts.inc -MtEmber_RubyPath_B5F_EventScript_Ruby:: @ 8163C49 +MtEmber_RubyPath_B5F_EventScript_Ruby:: lock faceplayer setflag FLAG_GOT_RUBY diff --git a/data/maps/MtEmber_RubyPath_B3F/text.inc b/data/maps/MtEmber_RubyPath_B3F/text.inc index ddee8c872..71eff0d0d 100644 --- a/data/maps/MtEmber_RubyPath_B3F/text.inc +++ b/data/maps/MtEmber_RubyPath_B3F/text.inc @@ -1,3 +1,3 @@ -MtEmber_RubyPath_B3F_Text_FoundARuby:: @ 817ADC5 +MtEmber_RubyPath_B3F_Text_FoundARuby:: .string "{PLAYER} found a RUBY!$" diff --git a/data/maps/MtEmber_RubyPath_B4F/scripts.inc b/data/maps/MtEmber_RubyPath_B4F/scripts.inc index b66185733..36497c512 100644 --- a/data/maps/MtEmber_RubyPath_B4F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B4F/scripts.inc @@ -1,70 +1,70 @@ -MtEmber_RubyPath_B4F_MapScripts:: @ 81638EB +MtEmber_RubyPath_B4F_MapScripts:: .byte 0 -MtEmber_RubyPath_B4F_EventScript_BrailleABC:: @ 81638EC +MtEmber_RubyPath_B4F_EventScript_BrailleABC:: lockall braillemessage Braille_Text_ABC waitbuttonpress releaseall end -MtEmber_RubyPath_B4F_EventScript_BrailleGHI:: @ 81638F5 +MtEmber_RubyPath_B4F_EventScript_BrailleGHI:: lockall braillemessage Braille_Text_GHI waitbuttonpress releaseall end -MtEmber_RubyPath_B4F_EventScript_BrailleMNO:: @ 81638FE +MtEmber_RubyPath_B4F_EventScript_BrailleMNO:: lockall braillemessage Braille_Text_MNO waitbuttonpress releaseall end -MtEmber_RubyPath_B4F_EventScript_BrailleTUV:: @ 8163907 +MtEmber_RubyPath_B4F_EventScript_BrailleTUV:: lockall braillemessage Braille_Text_TUV waitbuttonpress releaseall end -MtEmber_RubyPath_B4F_EventScript_BrailleDEF:: @ 8163910 +MtEmber_RubyPath_B4F_EventScript_BrailleDEF:: lockall braillemessage Braille_Text_DEF waitbuttonpress releaseall end -MtEmber_RubyPath_B4F_EventScript_BrailleJKL:: @ 8163919 +MtEmber_RubyPath_B4F_EventScript_BrailleJKL:: lockall braillemessage Braille_Text_JKL waitbuttonpress releaseall end -MtEmber_RubyPath_B4F_EventScript_BraillePQRS:: @ 8163922 +MtEmber_RubyPath_B4F_EventScript_BraillePQRS:: lockall braillemessage Braille_Text_PQRS waitbuttonpress releaseall end -MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ:: @ 816392B +MtEmber_RubyPath_B4F_EventScript_BrailleWXYZ:: lockall braillemessage Braille_Text_WXYZ waitbuttonpress releaseall end -MtEmber_RubyPath_B4F_EventScript_BraillePeriod:: @ 8163934 +MtEmber_RubyPath_B4F_EventScript_BraillePeriod:: lockall braillemessage Braille_Text_Period waitbuttonpress releaseall end -MtEmber_RubyPath_B4F_EventScript_BrailleComma:: @ 816393D +MtEmber_RubyPath_B4F_EventScript_BrailleComma:: lockall braillemessage Braille_Text_Comma waitbuttonpress diff --git a/data/maps/MtEmber_RubyPath_B5F/scripts.inc b/data/maps/MtEmber_RubyPath_B5F/scripts.inc index b86cbd653..52b35326c 100644 --- a/data/maps/MtEmber_RubyPath_B5F/scripts.inc +++ b/data/maps/MtEmber_RubyPath_B5F/scripts.inc @@ -1,7 +1,7 @@ -MtEmber_RubyPath_B5F_MapScripts:: @ 8163BAA +MtEmber_RubyPath_B5F_MapScripts:: .byte 0 -MtEmber_RubyPath_B5F_EventScript_BrailleMessage:: @ 8163BAB +MtEmber_RubyPath_B5F_EventScript_BrailleMessage:: lockall setvar VAR_0x8005, 130 braillemessage_wait Braille_Text_Everything diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index f0dc178bb..174ceff80 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -1,28 +1,28 @@ -MtEmber_Summit_MapScripts:: @ 8163AFC +MtEmber_Summit_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, MtEmber_Summit_OnTransition map_script MAP_SCRIPT_ON_RESUME, MtEmber_Summit_OnResume .byte 0 -MtEmber_Summit_OnResume:: @ 8163B07 +MtEmber_Summit_OnResume:: call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, MtEmber_Summit_EventScript_TryRemoveMoltres end -MtEmber_Summit_EventScript_TryRemoveMoltres:: @ 8163B11 +MtEmber_Summit_EventScript_TryRemoveMoltres:: specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return -MtEmber_Summit_OnTransition:: @ 8163B25 +MtEmber_Summit_OnTransition:: call_if_unset FLAG_FOUGHT_MOLTRES, MtEmber_Summit_EventScript_ShowMoltres end -MtEmber_Summit_EventScript_ShowMoltres:: @ 8163B2F +MtEmber_Summit_EventScript_ShowMoltres:: clearflag FLAG_HIDE_MOLTRES return -MtEmber_Summit_EventScript_Moltres:: @ 8163B33 +MtEmber_Summit_EventScript_Moltres:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -51,12 +51,12 @@ MtEmber_Summit_EventScript_Moltres:: @ 8163B33 release end -MtEmber_Summit_EventScript_DefeatedMoltres:: @ 8163B96 +MtEmber_Summit_EventScript_DefeatedMoltres:: setflag FLAG_FOUGHT_MOLTRES goto EventScript_RemoveStaticMon end -MtEmber_Summit_EventScript_RanFromMoltres:: @ 8163B9F +MtEmber_Summit_EventScript_RanFromMoltres:: setvar VAR_0x8004, SPECIES_MOLTRES goto EventScript_MonFlewAway end diff --git a/data/maps/MtEmber_SummitPath_1F/scripts.inc b/data/maps/MtEmber_SummitPath_1F/scripts.inc index 22143d713..3d18a162b 100644 --- a/data/maps/MtEmber_SummitPath_1F/scripts.inc +++ b/data/maps/MtEmber_SummitPath_1F/scripts.inc @@ -1,2 +1,2 @@ -MtEmber_SummitPath_1F_MapScripts:: @ 8163AF9 +MtEmber_SummitPath_1F_MapScripts:: .byte 0 diff --git a/data/maps/MtEmber_SummitPath_2F/scripts.inc b/data/maps/MtEmber_SummitPath_2F/scripts.inc index d8b43df39..422f5512a 100644 --- a/data/maps/MtEmber_SummitPath_2F/scripts.inc +++ b/data/maps/MtEmber_SummitPath_2F/scripts.inc @@ -1,2 +1,2 @@ -MtEmber_SummitPath_2F_MapScripts:: @ 8163AFA +MtEmber_SummitPath_2F_MapScripts:: .byte 0 diff --git a/data/maps/MtEmber_SummitPath_3F/scripts.inc b/data/maps/MtEmber_SummitPath_3F/scripts.inc index e576b321c..50fe397f6 100644 --- a/data/maps/MtEmber_SummitPath_3F/scripts.inc +++ b/data/maps/MtEmber_SummitPath_3F/scripts.inc @@ -1,2 +1,2 @@ -MtEmber_SummitPath_3F_MapScripts:: @ 8163AFB +MtEmber_SummitPath_3F_MapScripts:: .byte 0 diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc index 2ddfef089..f7bb66db1 100644 --- a/data/maps/MtMoon_1F/scripts.inc +++ b/data/maps/MtMoon_1F/scripts.inc @@ -1,46 +1,46 @@ -MtMoon_1F_MapScripts:: @ 81605E4 +MtMoon_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_1F_OnTransition .byte 0 -MtMoon_1F_OnTransition:: @ 81605EA +MtMoon_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F end -MtMoon_1F_EventScript_ZubatSign:: @ 81605EE +MtMoon_1F_EventScript_ZubatSign:: msgbox MtMoon_1F_Text_ZubatIsABloodsucker, MSGBOX_SIGN end -MtMoon_1F_EventScript_Macros:: @ 81605F7 +MtMoon_1F_EventScript_Macros:: trainerbattle_single TRAINER_HIKER_MARCOS, MtMoon_1F_Text_MarcosIntro, MtMoon_1F_Text_MarcosDefeat msgbox MtMoon_1F_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_Josh:: @ 816060E +MtMoon_1F_EventScript_Josh:: trainerbattle_single TRAINER_YOUNGSTER_JOSH, MtMoon_1F_Text_JoshIntro, MtMoon_1F_Text_JoshDefeat msgbox MtMoon_1F_Text_JoshPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_Miriam:: @ 8160625 +MtMoon_1F_EventScript_Miriam:: trainerbattle_single TRAINER_LASS_MIRIAM, MtMoon_1F_Text_MiriamIntro, MtMoon_1F_Text_MiriamDefeat msgbox MtMoon_1F_Text_MiriamPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_Iris:: @ 816063C +MtMoon_1F_EventScript_Iris:: trainerbattle_single TRAINER_LASS_IRIS, MtMoon_1F_Text_IrisIntro, MtMoon_1F_Text_IrisDefeat msgbox MtMoon_1F_Text_IrisPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_Jovan:: @ 8160653 +MtMoon_1F_EventScript_Jovan:: trainerbattle_single TRAINER_SUPER_NERD_JOVAN, MtMoon_1F_Text_JovanIntro, MtMoon_1F_Text_JovanDefeat msgbox MtMoon_1F_Text_JovanPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_Kent:: @ 816066A +MtMoon_1F_EventScript_Kent:: trainerbattle_single TRAINER_BUG_CATCHER_KENT, MtMoon_1F_Text_KentIntro, MtMoon_1F_Text_KentDefeat msgbox MtMoon_1F_Text_KentPostBattle, MSGBOX_AUTOCLOSE end -MtMoon_1F_EventScript_Robby:: @ 8160681 +MtMoon_1F_EventScript_Robby:: trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, MtMoon_1F_Text_RobbyIntro, MtMoon_1F_Text_RobbyDefeat msgbox MtMoon_1F_Text_RobbyPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_1F/text.inc b/data/maps/MtMoon_1F/text.inc index 249c9dd50..328e4f7b9 100644 --- a/data/maps/MtMoon_1F/text.inc +++ b/data/maps/MtMoon_1F/text.inc @@ -1,91 +1,91 @@ -MtMoon_1F_Text_MarcosIntro:: @ 817279D +MtMoon_1F_Text_MarcosIntro:: .string "WHOA!\n" .string "You shocked me!\l" .string "…Oh, you're just a kid!$" -MtMoon_1F_Text_MarcosDefeat:: @ 81727CB +MtMoon_1F_Text_MarcosDefeat:: .string "Wow!\n" .string "Shocked again!$" -MtMoon_1F_Text_MarcosPostBattle:: @ 81727DF +MtMoon_1F_Text_MarcosPostBattle:: .string "Kids like you shouldn't be\n" .string "wandering around here in the dark.$" -MtMoon_1F_Text_JoshIntro:: @ 817281D +MtMoon_1F_Text_JoshIntro:: .string "Did you come to explore the cave,\n" .string "too?$" -MtMoon_1F_Text_JoshDefeat:: @ 8172844 +MtMoon_1F_Text_JoshDefeat:: .string "Losing stinks!\n" .string "It's so uncool.$" -MtMoon_1F_Text_JoshPostBattle:: @ 8172863 +MtMoon_1F_Text_JoshPostBattle:: .string "I came all the way down here to\n" .string "show off to girls.$" -MtMoon_1F_Text_MiriamIntro:: @ 8172896 +MtMoon_1F_Text_MiriamIntro:: .string "Wow! It's way bigger in here than\n" .string "I thought!$" -MtMoon_1F_Text_MiriamDefeat:: @ 81728C3 +MtMoon_1F_Text_MiriamDefeat:: .string "Oh!\n" .string "I lost it!$" -MtMoon_1F_Text_MiriamPostBattle:: @ 81728D2 +MtMoon_1F_Text_MiriamPostBattle:: .string "How do you get out of here?\n" .string "It's so big, I may get lost.$" -MtMoon_1F_Text_JovanIntro:: @ 817290B +MtMoon_1F_Text_JovanIntro:: .string "What!\n" .string "Don't sneak up on me!$" -MtMoon_1F_Text_JovanDefeat:: @ 8172927 +MtMoon_1F_Text_JovanDefeat:: .string "My POKéMON won't do!$" -MtMoon_1F_Text_JovanPostBattle:: @ 817293C +MtMoon_1F_Text_JovanPostBattle:: .string "I have to find stronger POKéMON.\n" .string "Where might they be?$" -MtMoon_1F_Text_IrisIntro:: @ 8172972 +MtMoon_1F_Text_IrisIntro:: .string "What?\n" .string "I'm waiting for my friends to find\l" .string "me here.$" -MtMoon_1F_Text_IrisDefeat:: @ 81729A4 +MtMoon_1F_Text_IrisDefeat:: .string "I lost?$" -MtMoon_1F_Text_IrisPostBattle:: @ 81729AC +MtMoon_1F_Text_IrisPostBattle:: .string "I came because I heard there are\n" .string "some very rare fossils here.$" -MtMoon_1F_Text_KentIntro:: @ 81729EA +MtMoon_1F_Text_KentIntro:: .string "Suspicious men are in the cave.\n" .string "What about you?$" -MtMoon_1F_Text_KentDefeat:: @ 8172A1A +MtMoon_1F_Text_KentDefeat:: .string "You got me!$" -MtMoon_1F_Text_KentPostBattle:: @ 8172A26 +MtMoon_1F_Text_KentPostBattle:: .string "I saw them!\n" .string "I'm sure they're from TEAM ROCKET!$" -MtMoon_1F_Text_RobbyIntro:: @ 8172A55 +MtMoon_1F_Text_RobbyIntro:: .string "You need to go through this cave\n" .string "to get to CERULEAN CITY.$" -MtMoon_1F_Text_RobbyDefeat:: @ 8172A8F +MtMoon_1F_Text_RobbyDefeat:: .string "I lost.$" -MtMoon_1F_Text_RobbyPostBattle:: @ 8172A97 +MtMoon_1F_Text_RobbyPostBattle:: .string "ZUBAT is tough!\n" .string "But if you can catch one, you'll\l" .string "be able to count on it.$" -MtMoon_1F_Text_ZubatIsABloodsucker:: @ 8172AE0 +MtMoon_1F_Text_ZubatIsABloodsucker:: .string "Beware!\n" .string "ZUBAT is a bloodsucker!$" -MtMoon_1F_Text_BrockHelpsExcavateFossils:: @ 8172B00 +MtMoon_1F_Text_BrockHelpsExcavateFossils:: .string "Hi, I'm excavating for fossils here\n" .string "under MT. MOON.\p" .string "Sometimes, BROCK of PEWTER GYM\n" diff --git a/data/maps/MtMoon_B1F/scripts.inc b/data/maps/MtMoon_B1F/scripts.inc index ecc7676e0..ef138459a 100644 --- a/data/maps/MtMoon_B1F/scripts.inc +++ b/data/maps/MtMoon_B1F/scripts.inc @@ -1,2 +1,2 @@ -MtMoon_B1F_MapScripts:: @ 8160698 +MtMoon_B1F_MapScripts:: .byte 0 diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 4ea99eb24..7b2ca76ae 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -2,20 +2,20 @@ .equ LOCALID_HELIX_FOSSIL, 2 .equ LOCALID_MIGUEL, 3 -MtMoon_B2F_MapScripts:: @ 8160699 +MtMoon_B2F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition .byte 0 -MtMoon_B2F_OnTransition:: @ 816069F +MtMoon_B2F_OnTransition:: call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_ShowFossils end -MtMoon_B2F_EventScript_ShowFossils:: @ 81606A9 +MtMoon_B2F_EventScript_ShowFossils:: clearflag FLAG_HIDE_DOME_FOSSIL clearflag FLAG_HIDE_HELIX_FOSSIL return -MtMoon_B2F_EventScript_MiguelTrigger:: @ 81606B0 +MtMoon_B2F_EventScript_MiguelTrigger:: lockall applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFastestRight waitmovement 0 @@ -23,7 +23,7 @@ MtMoon_B2F_EventScript_MiguelTrigger:: @ 81606B0 releaseall end -MtMoon_B2F_EventScript_Miguel:: @ 81606C2 +MtMoon_B2F_EventScript_Miguel:: lock faceplayer goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_MiguelFossilPicked @@ -32,7 +32,7 @@ MtMoon_B2F_EventScript_Miguel:: @ 81606C2 release end -MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD +MtMoon_B2F_EventScript_BattleMiguel:: textcolor 0 message MtMoon_B2F_Text_MiguelIntro waitmessage @@ -44,17 +44,17 @@ MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD msgbox MtMoon_B2F_Text_WellEachTakeAFossil return -MtMoon_B2F_EventScript_MiguelFossilPicked:: @ 8160707 +MtMoon_B2F_EventScript_MiguelFossilPicked:: msgbox MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils release end -MtMoon_B2F_EventScript_MiguelGoPickFossil:: @ 8160711 +MtMoon_B2F_EventScript_MiguelGoPickFossil:: msgbox MtMoon_B2F_Text_WellEachTakeAFossil release end -MtMoon_B2F_EventScript_DomeFossil:: @ 816071B +MtMoon_B2F_EventScript_DomeFossil:: lock faceplayer msgbox MtMoon_B2F_Text_YouWantDomeFossil, MSGBOX_YESNO @@ -79,14 +79,14 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B release end -MtMoon_B2F_Movement_MiguelToHelixFossil:: @ 816077A +MtMoon_B2F_Movement_MiguelToHelixFossil:: walk_right walk_up walk_up walk_up step_end -MtMoon_B2F_EventScript_HelixFossil:: @ 816077F +MtMoon_B2F_EventScript_HelixFossil:: lock faceplayer msgbox MtMoon_B2F_Text_YouWantHelixFossil, MSGBOX_YESNO @@ -111,32 +111,32 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F release end -MtMoon_B2F_EventScript_DontTakeFossil:: @ 81607DE +MtMoon_B2F_EventScript_DontTakeFossil:: release end -MtMoon_B2F_Movement_MiguelToDomeFossil:: @ 81607E0 +MtMoon_B2F_Movement_MiguelToDomeFossil:: walk_up walk_up walk_up step_end -MtMoon_B2F_EventScript_Grunt1:: @ 81607E4 +MtMoon_B2F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, MtMoon_B2F_Text_Grunt1Intro, MtMoon_B2F_Text_Grunt1Defeat msgbox MtMoon_B2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_Grunt2:: @ 81607FB +MtMoon_B2F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, MtMoon_B2F_Text_Grunt2Intro, MtMoon_B2F_Text_Grunt2Defeat msgbox MtMoon_B2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_Grunt3:: @ 8160812 +MtMoon_B2F_EventScript_Grunt3:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, MtMoon_B2F_Text_Grunt3Intro, MtMoon_B2F_Text_Grunt3Defeat msgbox MtMoon_B2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -MtMoon_B2F_EventScript_Grunt4:: @ 8160829 +MtMoon_B2F_EventScript_Grunt4:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, MtMoon_B2F_Text_Grunt4Intro, MtMoon_B2F_Text_Grunt4Defeat msgbox MtMoon_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/MtMoon_B2F/text.inc b/data/maps/MtMoon_B2F/text.inc index fd4b564f0..07accdcd4 100644 --- a/data/maps/MtMoon_B2F/text.inc +++ b/data/maps/MtMoon_B2F/text.inc @@ -1,84 +1,84 @@ -MtMoon_B2F_Text_MiguelIntro:: @ 8172B64 +MtMoon_B2F_Text_MiguelIntro:: .string "Hey, stop!\p" .string "I found these fossils!\n" .string "They're both mine!$" -MtMoon_B2F_Text_MiguelDefeat:: @ 8172B99 +MtMoon_B2F_Text_MiguelDefeat:: .string "Okay!\n" .string "I'll share!$" -MtMoon_B2F_Text_WellEachTakeAFossil:: @ 8172BAB +MtMoon_B2F_Text_WellEachTakeAFossil:: .string "We'll each take a fossil!\n" .string "No being greedy!$" -MtMoon_B2F_Text_ThenThisFossilIsMine:: @ 8172BD6 +MtMoon_B2F_Text_ThenThisFossilIsMine:: .string "All right.\n" .string "Then this fossil is mine!$" -MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils:: @ 8172BFB +MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils:: .string "Far away, on CINNABAR ISLAND,\n" .string "there's a POKéMON LAB.\p" .string "They do research on regenerating\n" .string "fossils.$" -MtMoon_B2F_Text_Grunt1Intro:: @ 8172C5A +MtMoon_B2F_Text_Grunt1Intro:: .string "We, TEAM ROCKET, shall find the\n" .string "fossils!\p" .string "Reviving POKéMON from them will\n" .string "earn us huge riches!$" -MtMoon_B2F_Text_Grunt1Defeat:: @ 8172CB8 +MtMoon_B2F_Text_Grunt1Defeat:: .string "Urgh!\n" .string "Now I'm mad!$" -MtMoon_B2F_Text_Grunt1PostBattle:: @ 8172CCB +MtMoon_B2F_Text_Grunt1PostBattle:: .string "You made me mad!\n" .string "TEAM ROCKET will blacklist you!$" -MtMoon_B2F_Text_Grunt2Intro:: @ 8172CFC +MtMoon_B2F_Text_Grunt2Intro:: .string "We, TEAM ROCKET, are POKéMON\n" .string "gangsters!\l" .string "We strike fear with our strength!$" -MtMoon_B2F_Text_Grunt2Defeat:: @ 8172D46 +MtMoon_B2F_Text_Grunt2Defeat:: .string "I blew it!$" -MtMoon_B2F_Text_Grunt2PostBattle:: @ 8172D51 +MtMoon_B2F_Text_Grunt2PostBattle:: .string "Darn it all!\n" .string "My associates won't stand for this!$" -MtMoon_B2F_Text_Grunt3Intro:: @ 8172D82 +MtMoon_B2F_Text_Grunt3Intro:: .string "We're pulling a big job here!\n" .string "Get lost, kid!$" -MtMoon_B2F_Text_Grunt3Defeat:: @ 8172DAF +MtMoon_B2F_Text_Grunt3Defeat:: .string "So, you are good…$" -MtMoon_B2F_Text_Grunt3PostBattle:: @ 8172DC1 +MtMoon_B2F_Text_Grunt3PostBattle:: .string "If you find a fossil, give it to me\n" .string "and scram!$" -MtMoon_B2F_Text_Grunt4Intro:: @ 8172DF0 +MtMoon_B2F_Text_Grunt4Intro:: .string "Little kids shouldn't be messing\n" .string "around with grown-ups!\p" .string "It could be bad news!$" -MtMoon_B2F_Text_Grunt4Defeat:: @ 8172E3E +MtMoon_B2F_Text_Grunt4Defeat:: .string "I'm steamed!$" -MtMoon_B2F_Text_Grunt4PostBattle:: @ 8172E4B +MtMoon_B2F_Text_Grunt4PostBattle:: .string "POKéMON lived here long before\n" .string "people came.$" -MtMoon_B2F_Text_YouWantDomeFossil:: @ 8172E77 +MtMoon_B2F_Text_YouWantDomeFossil:: .string "Do you want the DOME FOSSIL?$" -MtMoon_B2F_Text_YouWantHelixFossil:: @ 8172E94 +MtMoon_B2F_Text_YouWantHelixFossil:: .string "Do you want the HELIX FOSSIL?$" -MtMoon_B2F_Text_ObtainedHelixFossil:: @ 8172EB2 +MtMoon_B2F_Text_ObtainedHelixFossil:: .string "Obtained the HELIX FOSSIL!$" -MtMoon_B2F_Text_ObtainedDomeFossil:: @ 8172ECD +MtMoon_B2F_Text_ObtainedDomeFossil:: .string "Obtained the DOME FOSSIL!$" diff --git a/data/maps/NavelRock_1F/scripts.inc b/data/maps/NavelRock_1F/scripts.inc index 2cf06ab2e..3ac8564b3 100644 --- a/data/maps/NavelRock_1F/scripts.inc +++ b/data/maps/NavelRock_1F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_1F_MapScripts:: @ 8164F9E +NavelRock_1F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_B1F/scripts.inc b/data/maps/NavelRock_B1F/scripts.inc index b25c20c1e..7403be0e2 100644 --- a/data/maps/NavelRock_B1F/scripts.inc +++ b/data/maps/NavelRock_B1F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_B1F_MapScripts:: @ 8165201 +NavelRock_B1F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index f4dcdc8c8..6271ad61c 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -1,36 +1,36 @@ .set LOCALID_LUGIA, 1 -NavelRock_Base_MapScripts:: @ 81650E7 +NavelRock_Base_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Base_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Base_OnResume .byte 0 -NavelRock_Base_OnTransition:: @ 81650F2 +NavelRock_Base_OnTransition:: call_if_set FLAG_FOUGHT_LUGIA, NavelRock_Base_EventScript_HideLugia call_if_unset FLAG_FOUGHT_LUGIA, NavelRock_Base_EventScript_TryShowLugia end -NavelRock_Base_EventScript_HideLugia:: @ 8165105 +NavelRock_Base_EventScript_HideLugia:: setflag FLAG_HIDE_LUGIA return -NavelRock_Base_EventScript_TryShowLugia:: @ 8165109 +NavelRock_Base_EventScript_TryShowLugia:: goto_if_set FLAG_LUGIA_FLEW_AWAY, EventScript_Return clearflag FLAG_HIDE_LUGIA return -NavelRock_Base_OnResume:: @ 8165116 +NavelRock_Base_OnResume:: call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, NavelRock_Base_EventScript_TryRemoveLugia end -NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120 +NavelRock_Base_EventScript_TryRemoveLugia:: specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject LOCALID_LUGIA return -NavelRock_Base_EventScript_Lugia:: @ 8165134 +NavelRock_Base_EventScript_Lugia:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -75,13 +75,13 @@ NavelRock_Base_EventScript_Lugia:: @ 8165134 release end -NavelRock_Base_EventScript_DefeatedLugia:: @ 81651D9 +NavelRock_Base_EventScript_DefeatedLugia:: setflag FLAG_LUGIA_FLEW_AWAY setvar VAR_0x8004, SPECIES_LUGIA goto EventScript_MonFlewAway end -NavelRock_Base_EventScript_RanFromLugia:: @ 81651E7 +NavelRock_Base_EventScript_RanFromLugia:: setvar VAR_0x8004, SPECIES_LUGIA goto EventScript_MonFlewAway end diff --git a/data/maps/NavelRock_BasePath_B10F/scripts.inc b/data/maps/NavelRock_BasePath_B10F/scripts.inc index 472814198..9c6026902 100644 --- a/data/maps/NavelRock_BasePath_B10F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B10F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_BasePath_B10F_MapScripts:: @ 81651FF +NavelRock_BasePath_B10F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_BasePath_B11F/scripts.inc b/data/maps/NavelRock_BasePath_B11F/scripts.inc index 9157991d1..5801573da 100644 --- a/data/maps/NavelRock_BasePath_B11F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B11F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_BasePath_B11F_MapScripts:: @ 8165200 +NavelRock_BasePath_B11F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_BasePath_B1F/scripts.inc b/data/maps/NavelRock_BasePath_B1F/scripts.inc index 141ec01a0..6c3f10edd 100644 --- a/data/maps/NavelRock_BasePath_B1F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B1F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_BasePath_B1F_MapScripts:: @ 81651F6 +NavelRock_BasePath_B1F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_BasePath_B2F/scripts.inc b/data/maps/NavelRock_BasePath_B2F/scripts.inc index 75d2fa066..d2768eecb 100644 --- a/data/maps/NavelRock_BasePath_B2F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B2F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_BasePath_B2F_MapScripts:: @ 81651F7 +NavelRock_BasePath_B2F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_BasePath_B3F/scripts.inc b/data/maps/NavelRock_BasePath_B3F/scripts.inc index 4cf947ebc..24bb30341 100644 --- a/data/maps/NavelRock_BasePath_B3F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B3F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_BasePath_B3F_MapScripts:: @ 81651F8 +NavelRock_BasePath_B3F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_BasePath_B4F/scripts.inc b/data/maps/NavelRock_BasePath_B4F/scripts.inc index 9e7f60f9d..3503abe2d 100644 --- a/data/maps/NavelRock_BasePath_B4F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B4F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_BasePath_B4F_MapScripts:: @ 81651F9 +NavelRock_BasePath_B4F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_BasePath_B5F/scripts.inc b/data/maps/NavelRock_BasePath_B5F/scripts.inc index 43a17fabe..98b21a02b 100644 --- a/data/maps/NavelRock_BasePath_B5F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B5F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_BasePath_B5F_MapScripts:: @ 81651FA +NavelRock_BasePath_B5F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_BasePath_B6F/scripts.inc b/data/maps/NavelRock_BasePath_B6F/scripts.inc index 9711ad6a4..a9cc1794b 100644 --- a/data/maps/NavelRock_BasePath_B6F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B6F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_BasePath_B6F_MapScripts:: @ 81651FB +NavelRock_BasePath_B6F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_BasePath_B7F/scripts.inc b/data/maps/NavelRock_BasePath_B7F/scripts.inc index 276556621..c5cca101b 100644 --- a/data/maps/NavelRock_BasePath_B7F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B7F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_BasePath_B7F_MapScripts:: @ 81651FC +NavelRock_BasePath_B7F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_BasePath_B8F/scripts.inc b/data/maps/NavelRock_BasePath_B8F/scripts.inc index 03458eabf..a24f0bf32 100644 --- a/data/maps/NavelRock_BasePath_B8F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B8F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_BasePath_B8F_MapScripts:: @ 81651FD +NavelRock_BasePath_B8F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_BasePath_B9F/scripts.inc b/data/maps/NavelRock_BasePath_B9F/scripts.inc index b1039fa40..0342ebd10 100644 --- a/data/maps/NavelRock_BasePath_B9F/scripts.inc +++ b/data/maps/NavelRock_BasePath_B9F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_BasePath_B9F_MapScripts:: @ 81651FE +NavelRock_BasePath_B9F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index 20e7fdcbe..58b2ad2dc 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -1,7 +1,7 @@ -NavelRock_Exterior_MapScripts:: @ 81646AE +NavelRock_Exterior_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_OnTransition .byte 0 -NavelRock_Exterior_OnTransition:: @ 81646B4 +NavelRock_Exterior_OnTransition:: setworldmapflag FLAG_WORLD_MAP_NAVEL_ROCK_EXTERIOR end diff --git a/data/maps/NavelRock_Fork/scripts.inc b/data/maps/NavelRock_Fork/scripts.inc index 5a98404f8..af1287ae4 100644 --- a/data/maps/NavelRock_Fork/scripts.inc +++ b/data/maps/NavelRock_Fork/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_Fork_MapScripts:: @ 8165202 +NavelRock_Fork_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc index facc302f1..305f0556e 100644 --- a/data/maps/NavelRock_Harbor/scripts.inc +++ b/data/maps/NavelRock_Harbor/scripts.inc @@ -1,7 +1,7 @@ -NavelRock_Harbor_MapScripts:: @ 8165420 +NavelRock_Harbor_MapScripts:: .byte 0 -NavelRock_Harbor_EventScript_Sailor:: @ 8165421 +NavelRock_Harbor_EventScript_Sailor:: lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 56a6c467c..88abd253e 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -1,39 +1,39 @@ .set LOCALID_HO_OH, 1 -NavelRock_Summit_MapScripts:: @ 8164F9F +NavelRock_Summit_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Summit_OnTransition map_script MAP_SCRIPT_ON_RESUME, NavelRock_Summit_OnResume .byte 0 -NavelRock_Summit_OnTransition:: @ 8164FAA +NavelRock_Summit_OnTransition:: call_if_set FLAG_FOUGHT_HO_OH, NavelRock_Summit_EventScript_HideHoOh call_if_unset FLAG_FOUGHT_HO_OH, NavelRock_Summit_EventScript_TryShowHoOh end -NavelRock_Summit_EventScript_HideHoOh:: @ 8164FBD +NavelRock_Summit_EventScript_HideHoOh:: setvar VAR_TEMP_1, 1 setflag FLAG_HIDE_HO_OH return -NavelRock_Summit_EventScript_TryShowHoOh:: @ 8164FC6 +NavelRock_Summit_EventScript_TryShowHoOh:: setvar VAR_TEMP_1, 1 goto_if_set FLAG_HO_OH_FLEW_AWAY, EventScript_Return setvar VAR_TEMP_1, 0 clearflag FLAG_HIDE_HO_OH return -NavelRock_Summit_OnResume:: @ 8164FDD +NavelRock_Summit_OnResume:: call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, NavelRock_Summit_EventScript_TryRemoveHoOh end -NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7 +NavelRock_Summit_EventScript_TryRemoveHoOh:: specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject LOCALID_HO_OH return -NavelRock_Summit_EventScript_HoOh:: @ 8164FFB +NavelRock_Summit_EventScript_HoOh:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lockall @@ -80,24 +80,24 @@ NavelRock_Summit_EventScript_HoOh:: @ 8164FFB releaseall end -NavelRock_Summit_EventScript_DefeatedHoOh:: @ 81650B4 +NavelRock_Summit_EventScript_DefeatedHoOh:: setflag FLAG_HO_OH_FLEW_AWAY setvar VAR_0x8004, SPECIES_HO_OH goto EventScript_MonFlewAway end -NavelRock_Summit_EventScript_RanFromHoOh:: @ 81650C2 +NavelRock_Summit_EventScript_RanFromHoOh:: setvar VAR_0x8004, SPECIES_HO_OH goto EventScript_MonFlewAway end -Movement_CameraPanUp: @ 81650CD +Movement_CameraPanUp: walk_up walk_up walk_up step_end -Movement_CameraPanDown: @ 81650D1 +Movement_CameraPanDown: delay_16 delay_16 walk_down @@ -105,7 +105,7 @@ Movement_CameraPanDown: @ 81650D1 walk_down step_end -Movement_HoOhApproach: @ 81650D7 +Movement_HoOhApproach: walk_down walk_down walk_down @@ -116,7 +116,7 @@ Movement_HoOhApproach: @ 81650D7 delay_16 step_end -Movement_HoOhAppear: @ 81650E0 +Movement_HoOhAppear: delay_16 delay_16 walk_in_place_down diff --git a/data/maps/NavelRock_SummitPath_2F/scripts.inc b/data/maps/NavelRock_SummitPath_2F/scripts.inc index c37b5a750..c91a45c76 100644 --- a/data/maps/NavelRock_SummitPath_2F/scripts.inc +++ b/data/maps/NavelRock_SummitPath_2F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_SummitPath_2F_MapScripts:: @ 81651F2 +NavelRock_SummitPath_2F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_SummitPath_3F/scripts.inc b/data/maps/NavelRock_SummitPath_3F/scripts.inc index f98f50cb3..5ab8b4c88 100644 --- a/data/maps/NavelRock_SummitPath_3F/scripts.inc +++ b/data/maps/NavelRock_SummitPath_3F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_SummitPath_3F_MapScripts:: @ 81651F3 +NavelRock_SummitPath_3F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_SummitPath_4F/scripts.inc b/data/maps/NavelRock_SummitPath_4F/scripts.inc index 8cc10b870..ee746e499 100644 --- a/data/maps/NavelRock_SummitPath_4F/scripts.inc +++ b/data/maps/NavelRock_SummitPath_4F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_SummitPath_4F_MapScripts:: @ 81651F4 +NavelRock_SummitPath_4F_MapScripts:: .byte 0 diff --git a/data/maps/NavelRock_SummitPath_5F/scripts.inc b/data/maps/NavelRock_SummitPath_5F/scripts.inc index e159cf2e6..910a13e3c 100644 --- a/data/maps/NavelRock_SummitPath_5F/scripts.inc +++ b/data/maps/NavelRock_SummitPath_5F/scripts.inc @@ -1,2 +1,2 @@ -NavelRock_SummitPath_5F_MapScripts:: @ 81651F5 +NavelRock_SummitPath_5F_MapScripts:: .byte 0 diff --git a/data/maps/OneIsland/scripts.inc b/data/maps/OneIsland/scripts.inc index a474b19a8..a8943e17a 100644 --- a/data/maps/OneIsland/scripts.inc +++ b/data/maps/OneIsland/scripts.inc @@ -1,19 +1,19 @@ .equ LOCALID_BILL, 1 -OneIsland_MapScripts:: @ 8167484 +OneIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_OnFrame .byte 0 -OneIsland_OnTransition:: @ 816748F +OneIsland_OnTransition:: setworldmapflag FLAG_WORLD_MAP_ONE_ISLAND end -OneIsland_OnFrame:: @ 8167493 +OneIsland_OnFrame:: map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 2, OneIsland_EventScript_EnterOneIslandFirstTime .2byte 0 -OneIsland_EventScript_EnterOneIslandFirstTime:: @ 816749D +OneIsland_EventScript_EnterOneIslandFirstTime:: lockall textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Movement_PlayerExitHarbor @@ -51,32 +51,32 @@ OneIsland_EventScript_EnterOneIslandFirstTime:: @ 816749D walk_up .endm -OneIsland_Movement_PlayerWalkToPokeCenter:: @ 81674F4 +OneIsland_Movement_PlayerWalkToPokeCenter:: walk_up walk_to_pokecenter step_end -OneIsland_Movement_PlayerEnterPokeCenter:: @ 8167501 +OneIsland_Movement_PlayerEnterPokeCenter:: walk_up walk_up set_invisible step_end -OneIsland_Movement_PlayerExitHarbor:: @ 8167505 +OneIsland_Movement_PlayerExitHarbor:: walk_up step_end -OneIsland_Movement_BillWalkToPokeCenter:: @ 8167507 +OneIsland_Movement_BillWalkToPokeCenter:: walk_to_pokecenter walk_up step_end -OneIsland_Movement_BillEnterPokeCenter:: @ 8167514 +OneIsland_Movement_BillEnterPokeCenter:: walk_up set_invisible step_end -OneIsland_EventScript_OldMan:: @ 8167517 +OneIsland_EventScript_OldMan:: lock faceplayer goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_EventScript_OldManLinkHoenn @@ -85,24 +85,24 @@ OneIsland_EventScript_OldMan:: @ 8167517 release end -OneIsland_EventScript_OldManLinkKanto:: @ 8167535 +OneIsland_EventScript_OldManLinkKanto:: msgbox OneIsland_Text_HavePCLinkageWithKanto release end -OneIsland_EventScript_OldManLinkHoenn:: @ 816753F +OneIsland_EventScript_OldManLinkHoenn:: msgbox OneIsland_Text_HavePCLinkageWithHoenn release end -OneIsland_EventScript_BaldingMan:: @ 8167549 +OneIsland_EventScript_BaldingMan:: msgbox OneIsland_Text_IsntWarmClimateHereGreat, MSGBOX_NPC end -OneIsland_EventScript_IslandSign:: @ 8167552 +OneIsland_EventScript_IslandSign:: msgbox OneIsland_Text_IslandSign, MSGBOX_SIGN end -OneIsland_EventScript_PokemonNetCenterSign:: @ 816755B +OneIsland_EventScript_PokemonNetCenterSign:: msgbox OneIsland_Text_PokemonNetCenterSign, MSGBOX_SIGN end diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc index 5f49a4a5c..d75e92669 100644 --- a/data/maps/OneIsland/text.inc +++ b/data/maps/OneIsland/text.inc @@ -1,4 +1,4 @@ -OneIsland_Text_BillLetsGoSeeCelio:: @ 818161B +OneIsland_Text_BillLetsGoSeeCelio:: .string "BILL: Here we are!\n" .string "This is ONE ISLAND.\p" .string "There are several islands around\n" @@ -10,11 +10,11 @@ OneIsland_Text_BillLetsGoSeeCelio:: @ 818161B .string "…Why am I telling you this now?\n" .string "Let's just go see CELIO!$" -Text_WhereDoYouWantToSail:: @ 8181726 +Text_WhereDoYouWantToSail:: .string "Ahoy, there!\n" .string "Where do you want to sail?$" -OneIsland_Text_LuckyToHaveCelioHere:: @ 818174E +OneIsland_Text_LuckyToHaveCelioHere:: .string "Here we are on an island smack in\n" .string "the middle of nowhere.\p" .string "We're lucky to have an upstanding\n" @@ -26,7 +26,7 @@ OneIsland_Text_LuckyToHaveCelioHere:: @ 818174E .string "I'm not sure what that means, but\n" .string "CELIO is quite the man!$" -OneIsland_Text_HavePCLinkageWithKanto:: @ 8181858 +OneIsland_Text_HavePCLinkageWithKanto:: .string "My granddaughter was in a tizzy\n" .string "over a new breakthrough.\p" .string "She said we now have PC linkage\n" @@ -34,7 +34,7 @@ OneIsland_Text_HavePCLinkageWithKanto:: @ 8181858 .string "I'm not sure what that means, but\n" .string "CELIO is quite the man!$" -OneIsland_Text_HavePCLinkageWithHoenn:: @ 8181901 +OneIsland_Text_HavePCLinkageWithHoenn:: .string "My granddaughter was in a tizzy\n" .string "over a new breakthrough.\p" .string "She said we finally have PC linkage\n" @@ -44,19 +44,19 @@ OneIsland_Text_HavePCLinkageWithHoenn:: @ 8181901 .string "He would make a fine husband for\n" .string "my granddaughter!$" -OneIsland_Text_IslandSign:: @ 81819E1 +OneIsland_Text_IslandSign:: .string "ONE ISLAND\n" .string "Friends Gather at Knot Island$" -OneIsland_Text_PokemonNetCenterSign:: @ 8181A0A +OneIsland_Text_PokemonNetCenterSign:: .string "Expanding the POKéMON World!\n" .string "POKéMON NET CENTER$" @ Unused -OneIsland_Text_ReturnToCinnabar:: @ 8181A3A +OneIsland_Text_ReturnToCinnabar:: .string "グレンタウンに　もどりますか？$" -OneIsland_Text_IsntWarmClimateHereGreat:: @ 8181A4A +OneIsland_Text_IsntWarmClimateHereGreat:: .string "Hi, sight-seeing, are you?\n" .string "Isn't the warm climate here great?$" diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index af6fe7ca5..359730fe5 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -1,21 +1,21 @@ -OneIsland_Harbor_MapScripts:: @ 8171378 +OneIsland_Harbor_MapScripts:: map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OneIsland_Harbor_OnWarp map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_Harbor_OnFrame .byte 0 -OneIsland_Harbor_OnWarp:: @ 8171383 +OneIsland_Harbor_OnWarp:: map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, OneIsland_Harbor_EventScript_TurnPlayerNorth .2byte 0 -OneIsland_Harbor_EventScript_TurnPlayerNorth:: @ 817138D +OneIsland_Harbor_EventScript_TurnPlayerNorth:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -OneIsland_Harbor_OnFrame:: @ 8171392 +OneIsland_Harbor_OnFrame:: map_script_2 VAR_MAP_SCENE_ONE_ISLAND_HARBOR, 1, OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime .2byte 0 -OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime:: @ 817139C +OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime:: lockall textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, OneIsland_Harbor_Movement_PlayerExitHarbor @@ -26,13 +26,13 @@ OneIsland_Harbor_EventScript_PlayerEnterHarborFirstTime:: @ 817139C releaseall end -OneIsland_Harbor_Movement_PlayerExitHarbor:: @ 81713B9 +OneIsland_Harbor_Movement_PlayerExitHarbor:: walk_up walk_up walk_up step_end -OneIsland_Harbor_EventScript_Sailor:: @ 81713BD +OneIsland_Harbor_EventScript_Sailor:: lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/OneIsland_House1/scripts.inc b/data/maps/OneIsland_House1/scripts.inc index 7a11eaa72..eed68cdfd 100644 --- a/data/maps/OneIsland_House1/scripts.inc +++ b/data/maps/OneIsland_House1/scripts.inc @@ -1,10 +1,10 @@ -OneIsland_House1_MapScripts:: @ 817135B +OneIsland_House1_MapScripts:: .byte 0 -OneIsland_House1_EventScript_OldMan:: @ 817135C +OneIsland_House1_EventScript_OldMan:: msgbox OneIsland_House1_Text_GazeUponVolcanoOnSunnyDays, MSGBOX_NPC end -OneIsland_House1_EventScript_OldWoman:: @ 8171365 +OneIsland_House1_EventScript_OldWoman:: msgbox OneIsland_House1_Text_LastTimeMtEmberErupted, MSGBOX_NPC end diff --git a/data/maps/OneIsland_House1/text.inc b/data/maps/OneIsland_House1/text.inc index 09734127c..b77291fcd 100644 --- a/data/maps/OneIsland_House1/text.inc +++ b/data/maps/OneIsland_House1/text.inc @@ -1,9 +1,9 @@ -OneIsland_House1_Text_GazeUponVolcanoOnSunnyDays:: @ 81A2332 +OneIsland_House1_Text_GazeUponVolcanoOnSunnyDays:: .string "On sunny days, I step out and gaze\n" .string "upon the volcano.\p" .string "That's my daily routine.$" -OneIsland_House1_Text_LastTimeMtEmberErupted:: @ 81A2380 +OneIsland_House1_Text_LastTimeMtEmberErupted:: .string "Let me think… When was the last\n" .string "time MT. EMBER erupted?$" diff --git a/data/maps/OneIsland_House2/scripts.inc b/data/maps/OneIsland_House2/scripts.inc index e69c5b41e..10b99b3f3 100644 --- a/data/maps/OneIsland_House2/scripts.inc +++ b/data/maps/OneIsland_House2/scripts.inc @@ -1,6 +1,6 @@ -OneIsland_House2_MapScripts:: @ 817136E +OneIsland_House2_MapScripts:: .byte 0 -OneIsland_House2_EventScript_Lass:: @ 817136F +OneIsland_House2_EventScript_Lass:: msgbox OneIsland_House2_Text_IWantToStayHereForever, MSGBOX_NPC end diff --git a/data/maps/OneIsland_House2/text.inc b/data/maps/OneIsland_House2/text.inc index fe1a6ba91..1d9da944f 100644 --- a/data/maps/OneIsland_House2/text.inc +++ b/data/maps/OneIsland_House2/text.inc @@ -1,4 +1,4 @@ -OneIsland_House2_Text_IWantToStayHereForever:: @ 81A23B8 +OneIsland_House2_Text_IWantToStayHereForever:: .string "Young people all want to go off to\n" .string "big cities.\p" .string "But I want to stay here forever!$" diff --git a/data/maps/OneIsland_KindleRoad/scripts.inc b/data/maps/OneIsland_KindleRoad/scripts.inc index bcc33708a..51348ba1f 100644 --- a/data/maps/OneIsland_KindleRoad/scripts.inc +++ b/data/maps/OneIsland_KindleRoad/scripts.inc @@ -1,10 +1,10 @@ -OneIsland_KindleRoad_MapScripts:: @ 8168758 +OneIsland_KindleRoad_MapScripts:: .byte 0 -OneIsland_KindleRoad_EventScript_RouteSign:: @ 8168759 +OneIsland_KindleRoad_EventScript_RouteSign:: msgbox OneIsland_KindleRoad_Text_RouteSign, MSGBOX_SIGN end -OneIsland_KindleRoad_EventScript_EmberSpaSign:: @ 8168762 +OneIsland_KindleRoad_EventScript_EmberSpaSign:: msgbox OneIsland_KindleRoad_Text_EmberSpaSign, MSGBOX_SIGN end diff --git a/data/maps/OneIsland_KindleRoad/text.inc b/data/maps/OneIsland_KindleRoad/text.inc index 8a65dd3ac..fce4506f6 100644 --- a/data/maps/OneIsland_KindleRoad/text.inc +++ b/data/maps/OneIsland_KindleRoad/text.inc @@ -1,164 +1,164 @@ -OneIsland_KindleRoad_Text_MariaIntro:: @ 818961F +OneIsland_KindleRoad_Text_MariaIntro:: .string "The weather's gorgeous!\n" .string "Perfect for a battle!$" -OneIsland_KindleRoad_Text_MariaDefeat:: @ 818964D +OneIsland_KindleRoad_Text_MariaDefeat:: .string "Aiyeeeeh!$" -OneIsland_KindleRoad_Text_MariaPostBattle:: @ 8189657 +OneIsland_KindleRoad_Text_MariaPostBattle:: .string "Please don't splash my face!\n" .string "You'll ruin the makeup.$" -OneIsland_KindleRoad_Text_AbigailIntro:: @ 818968C +OneIsland_KindleRoad_Text_AbigailIntro:: .string "I'm beginning to get a sunburn…$" -OneIsland_KindleRoad_Text_AbigailDefeat:: @ 81896AC +OneIsland_KindleRoad_Text_AbigailDefeat:: .string "Oh, you're so awful.$" -OneIsland_KindleRoad_Text_AbigailPostBattle:: @ 81896C1 +OneIsland_KindleRoad_Text_AbigailPostBattle:: .string "I like that cap you have.\n" .string "Maybe I should wear one, too…$" -OneIsland_KindleRoad_Text_FinnIntro:: @ 81896F9 +OneIsland_KindleRoad_Text_FinnIntro:: .string "Seen from here, MT. EMBER towers\n" .string "into the sky.$" -OneIsland_KindleRoad_Text_FinnDefeat:: @ 8189728 +OneIsland_KindleRoad_Text_FinnDefeat:: .string "Well, aren't you tough?$" -OneIsland_KindleRoad_Text_FinnPostBattle:: @ 8189740 +OneIsland_KindleRoad_Text_FinnPostBattle:: .string "The sky is immense around these\n" .string "parts.$" -OneIsland_KindleRoad_Text_GarrettIntro:: @ 8189767 +OneIsland_KindleRoad_Text_GarrettIntro:: .string "I took a break from swimming,\n" .string "only to have you challenge me?$" -OneIsland_KindleRoad_Text_GarrettDefeat:: @ 81897A4 +OneIsland_KindleRoad_Text_GarrettDefeat:: .string "Hey, what the…\n" .string "You're good, you!$" -OneIsland_KindleRoad_Text_GarrettPostBattle:: @ 81897C5 +OneIsland_KindleRoad_Text_GarrettPostBattle:: .string "Instead of using SURF all the time,\n" .string "you should swim some.$" -OneIsland_KindleRoad_Text_TommyIntro:: @ 81897FF +OneIsland_KindleRoad_Text_TommyIntro:: .string "Wait! Wait a second!\n" .string "I think I've hooked a big one!$" -OneIsland_KindleRoad_Text_TommyDefeat:: @ 8189833 +OneIsland_KindleRoad_Text_TommyDefeat:: .string "I've lost it all again…$" -OneIsland_KindleRoad_Text_TommyPostBattle:: @ 818984B +OneIsland_KindleRoad_Text_TommyPostBattle:: .string "Not only did I lose, the big one\n" .string "got away from me, too!$" -OneIsland_KindleRoad_Text_SharonIntro:: @ 8189883 +OneIsland_KindleRoad_Text_SharonIntro:: .string "Could you help me out with my\n" .string "training?$" -OneIsland_KindleRoad_Text_SharonDefeat:: @ 81898AB +OneIsland_KindleRoad_Text_SharonDefeat:: .string "You were a cut above me.$" -OneIsland_KindleRoad_Text_SharonPostBattle:: @ 81898C4 +OneIsland_KindleRoad_Text_SharonPostBattle:: .string "It's clear that you're skilled.\n" .string "I like you!$" -OneIsland_KindleRoad_Text_TanyaIntro:: @ 81898F0 +OneIsland_KindleRoad_Text_TanyaIntro:: .string "There isn't a day in which we don't\n" .string "train!$" -OneIsland_KindleRoad_Text_TanyaDefeat:: @ 818991B +OneIsland_KindleRoad_Text_TanyaDefeat:: .string "I'm such a fool!$" -OneIsland_KindleRoad_Text_TanyaPostBattle:: @ 818992C +OneIsland_KindleRoad_Text_TanyaPostBattle:: .string "I'll train even harder from now on!$" -OneIsland_KindleRoad_Text_SheaIntro:: @ 8189950 +OneIsland_KindleRoad_Text_SheaIntro:: .string "Every morning, before breakfast,\n" .string "I swim around this island.$" -OneIsland_KindleRoad_Text_SheaDefeat:: @ 818998C +OneIsland_KindleRoad_Text_SheaDefeat:: .string "Gasp…\n" .string "Gasp…$" -OneIsland_KindleRoad_Text_SheaPostBattle:: @ 8189998 +OneIsland_KindleRoad_Text_SheaPostBattle:: .string "I lost because I'm pooped from all\n" .string "the running I did…$" -OneIsland_KindleRoad_Text_HughIntro:: @ 81899CE +OneIsland_KindleRoad_Text_HughIntro:: .string "Dress appropriately for battle!\n" .string "Lose that frivolous outfit!$" -OneIsland_KindleRoad_Text_HughDefeat:: @ 8189A0A +OneIsland_KindleRoad_Text_HughDefeat:: .string "Why me?!$" -OneIsland_KindleRoad_Text_HughPostBattle:: @ 8189A13 +OneIsland_KindleRoad_Text_HughPostBattle:: .string "Even martial artists are becoming\n" .string "fashion conscious these days…$" -OneIsland_KindleRoad_Text_BryceIntro:: @ 8189A53 +OneIsland_KindleRoad_Text_BryceIntro:: .string "You know, everything tastes great\n" .string "when you're out in the wild.$" -OneIsland_KindleRoad_Text_BryceDefeat:: @ 8189A92 +OneIsland_KindleRoad_Text_BryceDefeat:: .string "Awww, blown!$" -OneIsland_KindleRoad_Text_BrycePostBattle:: @ 8189A9F +OneIsland_KindleRoad_Text_BrycePostBattle:: .string "The water in volcanic regions is\n" .string "delicious.$" -OneIsland_KindleRoad_Text_ClaireIntro:: @ 8189ACB +OneIsland_KindleRoad_Text_ClaireIntro:: .string "My lunch filled us up, so will you\n" .string "battle us for some exercise?$" -OneIsland_KindleRoad_Text_ClaireDefeat:: @ 8189B0B +OneIsland_KindleRoad_Text_ClaireDefeat:: .string "That made me all sweaty.$" -OneIsland_KindleRoad_Text_ClairePostBattle:: @ 8189B24 +OneIsland_KindleRoad_Text_ClairePostBattle:: .string "What should I do?\n" .string "I feel famished again.$" -OneIsland_KindleRoad_Text_KiaIntro:: @ 8189B4D +OneIsland_KindleRoad_Text_KiaIntro:: .string "KIA: My big brother and I make\n" .string "an awesome combination!$" -OneIsland_KindleRoad_Text_KiaDefeat:: @ 8189B84 +OneIsland_KindleRoad_Text_KiaDefeat:: .string "KIA: Huh?!\n" .string "I can't believe it!$" -OneIsland_KindleRoad_Text_KiaPostBattle:: @ 8189BA3 +OneIsland_KindleRoad_Text_KiaPostBattle:: .string "KIA: How could there be anyone\n" .string "better than my big brother?$" -OneIsland_KindleRoad_Text_KiaNotEnoughMons:: @ 8189BDE +OneIsland_KindleRoad_Text_KiaNotEnoughMons:: .string "KIA: If you want to battle with\n" .string "us, you have to bring at least two\l" .string "POKéMON with you.$" -OneIsland_KindleRoad_Text_MikIntro:: @ 8189C33 +OneIsland_KindleRoad_Text_MikIntro:: .string "MIK: Together with KIA, I'm afraid\n" .string "of nothing!$" -OneIsland_KindleRoad_Text_MikDefeat:: @ 8189C62 +OneIsland_KindleRoad_Text_MikDefeat:: .string "MIK: Whoa!\n" .string "That's too much!$" -OneIsland_KindleRoad_Text_MikPostBattle:: @ 8189C7E +OneIsland_KindleRoad_Text_MikPostBattle:: .string "MIK: How could my combination\n" .string "with KIA fail?$" -OneIsland_KindleRoad_Text_MikNotEnoughMons:: @ 8189CAB +OneIsland_KindleRoad_Text_MikNotEnoughMons:: .string "MIK: Hey, do you want to battle\n" .string "with us two?\p" .string "Bring two or more POKéMON with\n" .string "you, then.$" -OneIsland_KindleRoad_Text_RouteSign:: @ 8189D02 +OneIsland_KindleRoad_Text_RouteSign:: .string "This is KINDLE ROAD.\p" .string "Go straight for MT. EMBER.$" -OneIsland_KindleRoad_Text_EmberSpaSign:: @ 8189D32 +OneIsland_KindleRoad_Text_EmberSpaSign:: .string "Light the Fire in Your Heart!\n" .string "EMBER SPA$" diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc index becd846c8..07defbeec 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc @@ -1,23 +1,23 @@ -OneIsland_KindleRoad_EmberSpa_MapScripts:: @ 816535B +OneIsland_KindleRoad_EmberSpa_MapScripts:: .byte 0 -OneIsland_KindleRoad_EmberSpa_EventScript_OldMan:: @ 816535C +OneIsland_KindleRoad_EmberSpa_EventScript_OldMan:: msgbox OneIsland_KindleRoad_EmberSpa_Text_WaterWarmsMeToCore, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan1:: @ 8165365 +OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan1:: msgbox OneIsland_KindleRoad_EmberSpa_Text_EnjoyBowlOfChowder, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan2:: @ 816536E +OneIsland_KindleRoad_EmberSpa_EventScript_BaldingMan2:: msgbox OneIsland_KindleRoad_EmberSpa_Text_HotSpringIsTherapeutic, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_OldWoman:: @ 8165377 +OneIsland_KindleRoad_EmberSpa_EventScript_OldWoman:: msgbox OneIsland_KindleRoad_EmberSpa_Text_SeeHowSmoothMySkinIs, MSGBOX_NPC end -OneIsland_KindleRoad_EmberSpa_EventScript_BlackBelt:: @ 8165380 +OneIsland_KindleRoad_EmberSpa_EventScript_BlackBelt:: lock faceplayer famechecker FAMECHECKER_BRUNO, 3 @@ -25,7 +25,7 @@ OneIsland_KindleRoad_EmberSpa_EventScript_BlackBelt:: @ 8165380 release end -OneIsland_KindleRoad_EmberSpa_EventScript_RockSmashMan:: @ 8165399 +OneIsland_KindleRoad_EmberSpa_EventScript_RockSmashMan:: lock faceplayer goto_if_set FLAG_GOT_HM06, OneIsland_KindleRoad_EmberSpa_EventScript_AlreadyGotHM06 @@ -36,12 +36,12 @@ OneIsland_KindleRoad_EmberSpa_EventScript_RockSmashMan:: @ 8165399 release end -OneIsland_KindleRoad_EmberSpa_EventScript_AlreadyGotHM06:: @ 81653C5 +OneIsland_KindleRoad_EmberSpa_EventScript_AlreadyGotHM06:: msgbox OneIsland_KindleRoad_EmberSpa_Text_ExplainHM06 release end -OneIsland_KindleRoad_EmberSpa_EventScript_SpaHeal:: @ 81653CF +OneIsland_KindleRoad_EmberSpa_EventScript_SpaHeal:: lockall fadescreen FADE_TO_WHITE special HealPlayerParty diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc index 64c2ee64c..8db6bd463 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/text.inc @@ -1,4 +1,4 @@ -OneIsland_KindleRoad_EmberSpa_Text_WaterWarmsMeToCore:: @ 817D34A +OneIsland_KindleRoad_EmberSpa_Text_WaterWarmsMeToCore:: .string "Hm!\n" .string "Haaaaaaaaaaah!\p" .string "Aaaah! This is heavenly!\n" @@ -7,29 +7,29 @@ OneIsland_KindleRoad_EmberSpa_Text_WaterWarmsMeToCore:: @ 817D34A .string "Go to the middle, relax, and get\n" .string "good and warm!$" -OneIsland_KindleRoad_EmberSpa_Text_EnjoyBowlOfChowder:: @ 817D3DE +OneIsland_KindleRoad_EmberSpa_Text_EnjoyBowlOfChowder:: .string "My favorite part of bathing comes\n" .string "up right after this.\p" .string "I enjoy a bowl of chowder to\n" .string "warm me from the inside, too!$" -OneIsland_KindleRoad_EmberSpa_Text_WaterExquisiteFullyRefreshed:: @ 817D450 +OneIsland_KindleRoad_EmberSpa_Text_WaterExquisiteFullyRefreshed:: .string "The water is perfectly warm.\n" .string "It feels exquisite…\p" .string "{PLAYER} and the POKéMON were\n" .string "fully refreshed!$" -OneIsland_KindleRoad_EmberSpa_Text_HotSpringIsTherapeutic:: @ 817D4AA +OneIsland_KindleRoad_EmberSpa_Text_HotSpringIsTherapeutic:: .string "Soaking in a hot spring pool is\n" .string "therapeutic, people say.$" -OneIsland_KindleRoad_EmberSpa_Text_SeeHowSmoothMySkinIs:: @ 817D4E3 +OneIsland_KindleRoad_EmberSpa_Text_SeeHowSmoothMySkinIs:: .string "Have a look at my face.\n" .string "See how smooth my skin is?\p" .string "The hot spring's water keeps my\n" .string "skin younger than my age.$" -OneIsland_KindleRoad_EmberSpa_Text_BrunoVisitsSpaOnOccasion:: @ 817D550 +OneIsland_KindleRoad_EmberSpa_Text_BrunoVisitsSpaOnOccasion:: .string "After an honest day of training,\n" .string "nothing beats a relaxing soak in\l" .string "the hot spring pool.\p" @@ -38,7 +38,7 @@ OneIsland_KindleRoad_EmberSpa_Text_BrunoVisitsSpaOnOccasion:: @ 817D550 .string "He comes to rehab injuries, both\n" .string "his own and his POKéMON's.$" -OneIsland_KindleRoad_EmberSpa_Text_UsedThisToMakeEmberSpa:: @ 817D622 +OneIsland_KindleRoad_EmberSpa_Text_UsedThisToMakeEmberSpa:: .string "Hot springs go hand-in-hand with\n" .string "volcanoes.\p" .string "The EMBER SPA here, well,\n" @@ -48,7 +48,7 @@ OneIsland_KindleRoad_EmberSpa_Text_UsedThisToMakeEmberSpa:: @ 817D622 .string "I was using this at the time.\n" .string "I suppose I can part with it.$" -OneIsland_KindleRoad_EmberSpa_Text_ExplainHM06:: @ 817D6F3 +OneIsland_KindleRoad_EmberSpa_Text_ExplainHM06:: .string "That shatters boulders as if they\n" .string "were made of crackers.$" diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 1bcb8aa24..7219df19e 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -1,34 +1,34 @@ .equ LOCALID_BILL, 2 .equ LOCALID_CELIO, 3 -OneIsland_PokemonCenter_1F_MapScripts:: @ 8170BF8 +OneIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, OneIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume map_script MAP_SCRIPT_ON_LOAD, OneIsland_PokemonCenter_1F_OnLoad map_script MAP_SCRIPT_ON_FRAME_TABLE, OneIsland_PokemonCenter_1F_OnFrame .byte 0 -OneIsland_PokemonCenter_1F_OnLoad:: @ 8170C0D +OneIsland_PokemonCenter_1F_OnLoad:: compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 call_if_ge OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile call_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn end -OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile:: @ 8170C22 +OneIsland_PokemonCenter_1F_EventScript_SetRubyMetatile:: setmetatile 13, 4, METATILE_PokemonCenter_NetworkMachine_Ruby, 1 return -OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile:: @ 8170C2C +OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile:: setmetatile 16, 4, METATILE_PokemonCenter_NetworkMachine_Sapphire, 1 return -OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn:: @ 8170C36 +OneIsland_PokemonCenter_1F_EventScript_SetNetworkMachineOn:: call OneIsland_PokemonCenter_1F_EventScript_SetSapphireMetatile setmetatile 14, 4, METATILE_PokemonCenter_NetworkMachine_ScreenLeft_On, 1 setmetatile 15, 4, METATILE_PokemonCenter_NetworkMachine_ScreenRight_On, 1 return -OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E +OneIsland_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_ONE_ISLAND compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 6 call_if_eq OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone @@ -38,29 +38,29 @@ OneIsland_PokemonCenter_1F_OnTransition:: @ 8170C4E call_if_eq OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos end -OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone:: @ 8170C73 +OneIsland_PokemonCenter_1F_EventScript_SetCelioQuestDone:: setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 return -OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos:: @ 8170C79 +OneIsland_PokemonCenter_1F_EventScript_SetBillCelioFirstMeetingPos:: setobjectxyperm LOCALID_BILL, 9, 8 setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_UP setobjectxyperm LOCALID_CELIO, 15, 6 setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_UP return -OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos:: @ 8170C90 +OneIsland_PokemonCenter_1F_EventScript_SetBillCelioReadyToLeavePos:: setobjectxyperm LOCALID_BILL, 14, 7 setobjectmovementtype LOCALID_BILL, MOVEMENT_TYPE_FACE_LEFT setobjectxyperm LOCALID_CELIO, 14, 8 setobjectmovementtype LOCALID_CELIO, MOVEMENT_TYPE_FACE_LEFT return -OneIsland_PokemonCenter_1F_OnFrame:: @ 8170CA7 +OneIsland_PokemonCenter_1F_OnFrame:: map_script_2 VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 0, OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene .2byte 0 -OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: @ 8170CB1 +OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: lockall textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio @@ -127,15 +127,15 @@ OneIsland_PokemonCenter_1F_EventScript_MeetCelioScene:: @ 8170CB1 releaseall end -OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp:: @ 8170E34 +OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerChamp:: msgbox OneIsland_PokemonCenter_1F_Text_PlayerIsReigningPokemonChamp return -OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp:: @ 8170E3D +OneIsland_PokemonCenter_1F_EventScript_IntroducePlayerNotChamp:: msgbox OneIsland_PokemonCenter_1F_Text_PlayerIsRisingPokemonChamp return -OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 +OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: textcolor 3 playfanfare MUS_OBTAIN_KEY_ITEM message OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap @@ -144,13 +144,13 @@ OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMapPage:: @ 8170E46 call EventScript_RestorePrevTextColor return -OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: @ 8170E58 +OneIsland_PokemonCenter_1F_EventScript_ReceiveTownMap:: setflag FLAG_HIDE_TOWN_MAP setvar VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 giveitem_msg OneIsland_PokemonCenter_1F_Text_ReceivedTownMap, ITEM_TOWN_MAP, 1, MUS_OBTAIN_KEY_ITEM return -OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio:: @ 8170E7D +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio:: walk_up walk_up walk_right @@ -161,7 +161,7 @@ OneIsland_PokemonCenter_1F_Movement_PlayerWalkToCelio:: @ 8170E7D walk_in_place_fastest_up step_end -OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio:: @ 8170E86 +OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio:: walk_up walk_right walk_right @@ -173,38 +173,38 @@ OneIsland_PokemonCenter_1F_Movement_BillWalkToCelio:: @ 8170E86 step_end @ Unused -Movement_170E8F:: @ 8170E8F +Movement_170E8F:: walk_up step_end @ Unused -Movement_170E91:: @ 8170E91 +Movement_170E91:: walk_left walk_in_place_fastest_right step_end -OneIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8170E94 +OneIsland_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -OneIsland_PokemonCenter_1F_EventScript_Bill:: @ 8170E9D +OneIsland_PokemonCenter_1F_EventScript_Bill:: lock goto_if_set FLAG_SEVII_DETOUR_FINISHED, OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll msgbox OneIsland_PokemonCenter_1F_Text_HmmHowAboutLikeThis release end -OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll:: @ 8170EB1 +OneIsland_PokemonCenter_1F_EventScript_BillGoTakeStroll:: applymovement LOCALID_BILL, Movement_FacePlayer waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore release end -OneIsland_PokemonCenter_1F_EventScript_Celio:: @ 8170EC5 +OneIsland_PokemonCenter_1F_EventScript_Celio:: lock faceplayer compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 7 @@ -229,7 +229,7 @@ OneIsland_PokemonCenter_1F_EventScript_Celio:: @ 8170EC5 release end -OneIsland_PokemonCenter_1F_EventScript_CelioGiveBillFact:: @ 8170F35 +OneIsland_PokemonCenter_1F_EventScript_CelioGiveBillFact:: msgbox OneIsland_PokemonCenter_1F_Text_CelioHearingRumorsAboutYou random 3 compare VAR_RESULT, 0 @@ -241,24 +241,24 @@ OneIsland_PokemonCenter_1F_EventScript_CelioGiveBillFact:: @ 8170F35 release end -OneIsland_PokemonCenter_1F_EventScript_BillFact1:: @ 8170F6D +OneIsland_PokemonCenter_1F_EventScript_BillFact1:: famechecker FAMECHECKER_BILL, 3 msgbox OneIsland_PokemonCenter_1F_Text_BillsFirstMonWasAbra release end -OneIsland_PokemonCenter_1F_EventScript_BillFact2:: @ 8170F84 +OneIsland_PokemonCenter_1F_EventScript_BillFact2:: famechecker FAMECHECKER_BILL, 4 msgbox OneIsland_PokemonCenter_1F_Text_BillsHometownInGoldenrod release end -OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire:: @ 8170F9B +OneIsland_PokemonCenter_1F_EventScript_CelioJustGivenSapphire:: msgbox OneIsland_PokemonCenter_1F_Text_WishYouBestOfLuck release end -OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 +OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: textcolor 3 playfanfare MUS_OBTAIN_TMHM message OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio @@ -298,12 +298,12 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 release end -OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass:: @ 817103A +OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass:: msgbox OneIsland_PokemonCenter_1F_Text_PassLetYouGetToAllIslands release end -OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044 +OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: msgbox OneIsland_PokemonCenter_1F_Text_OhThats textcolor 3 playfanfare MUS_OBTAIN_TMHM @@ -326,14 +326,14 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioRuby:: @ 8171044 goto OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass end -OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio:: @ 8171099 +OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio:: msgbox OneIsland_PokemonCenter_1F_Text_PleaseINeedYourHelp, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq OneIsland_PokemonCenter_1F_EventScript_DeclineHelpCelio goto OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass end -OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: @ 81710B2 +OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: msgbox OneIsland_PokemonCenter_1F_Text_AnotherGemstoneInSeviiIslands removeitem ITEM_RUBY, 1 removeitem ITEM_TRI_PASS, 1 @@ -353,12 +353,12 @@ OneIsland_PokemonCenter_1F_EventScript_GiveRainbowPass:: @ 81710B2 goto OneIsland_PokemonCenter_1F_EventScript_ExplainRainbowPass end -OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby:: @ 81710F2 +OneIsland_PokemonCenter_1F_EventScript_CelioWaitingForRuby:: msgbox OneIsland_PokemonCenter_1F_Text_TryingToFindGem release end -OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby:: @ 81710FC +OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby:: msgbox OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful applymovement LOCALID_CELIO, Movement_WalkInPlaceFastestUp waitmovement 0 @@ -371,18 +371,18 @@ OneIsland_PokemonCenter_1F_EventScript_CelioRequestRuby:: @ 81710FC release end -OneIsland_PokemonCenter_1F_EventScript_CelioPlayerMissingNationalDex:: @ 8171134 +OneIsland_PokemonCenter_1F_EventScript_CelioPlayerMissingNationalDex:: msgbox OneIsland_PokemonCenter_1F_Text_CelioImModifyingMyNetworkMachine release end -OneIsland_PokemonCenter_1F_Movement_CelioCheckMachine:: @ 817113E +OneIsland_PokemonCenter_1F_Movement_CelioCheckMachine:: walk_in_place_up delay_8 walk_in_place_up step_end -OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine:: @ 8171142 +OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine:: walk_in_place_fastest_up walk_in_place_up delay_16 @@ -390,15 +390,15 @@ OneIsland_PokemonCenter_1F_Movement_CelioPutGemInMachine:: @ 8171142 walk_in_place_up step_end -OneIsland_PokemonCenter_1F_EventScript_LittleBoy:: @ 8171148 +OneIsland_PokemonCenter_1F_EventScript_LittleBoy:: msgbox OneIsland_PokemonCenter_1F_Text_CameFromPalletDontKnowIt, MSGBOX_NPC end -OneIsland_PokemonCenter_1F_EventScript_Hiker:: @ 8171151 +OneIsland_PokemonCenter_1F_EventScript_Hiker:: msgbox OneIsland_PokemonCenter_1F_Text_EnormousVolcanoOnIsland, MSGBOX_NPC end -OneIsland_PokemonCenter_1F_EventScript_BattleGirl:: @ 817115A +OneIsland_PokemonCenter_1F_EventScript_BattleGirl:: lock faceplayer goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked @@ -406,12 +406,12 @@ OneIsland_PokemonCenter_1F_EventScript_BattleGirl:: @ 817115A release end -OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked:: @ 817116F +OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked:: msgbox OneIsland_PokemonCenter_1F_Text_TradedWithFarAwayBoyfriend release end -OneIsland_PokemonCenter_1F_EventScript_NetworkMachine:: @ 8171179 +OneIsland_PokemonCenter_1F_EventScript_NetworkMachine:: lockall goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithHoenn goto_if_set FLAG_SEVII_DETOUR_FINISHED, OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithKanto @@ -419,41 +419,41 @@ OneIsland_PokemonCenter_1F_EventScript_NetworkMachine:: @ 8171179 releaseall end -OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithKanto:: @ 8171196 +OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithKanto:: msgbox OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKanto releaseall end -OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithHoenn:: @ 81711A0 +OneIsland_PokemonCenter_1F_EventScript_NetworkMachineLinkedWithHoenn:: msgbox OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKantoAndHoenn releaseall end -OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerTop:: @ 81711AA +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerTop:: lockall setvar VAR_TEMP_1, 1 goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidTop:: @ 81711B6 +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidTop:: lockall setvar VAR_TEMP_1, 2 goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidBottom:: @ 81711C2 +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerMidBottom:: lockall setvar VAR_TEMP_1, 3 goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom:: @ 81711CE +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandTriggerBottom:: lockall setvar VAR_TEMP_1, 4 goto OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene end -OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: @ 81711DA +OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: textcolor 0 playse SE_PIN applymovement LOCALID_BILL, Movement_ExclamationMark @@ -511,43 +511,43 @@ OneIsland_PokemonCenter_1F_EventScript_LeaveOneIslandScene:: @ 81711DA goto EventScript_SetSail end -OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillTop:: @ 81712E4 +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillTop:: applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop waitmovement 0 return -OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidTop:: @ 81712EF +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidTop:: applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop waitmovement 0 return -OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidBottom:: @ 81712FA +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillMidBottom:: applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom waitmovement 0 return -OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom:: @ 8171305 +OneIsland_PokemonCenter_1F_EventScript_PlayerWalkToBillBottom:: applymovement OBJ_EVENT_ID_PLAYER, OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom waitmovement 0 return -OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop:: @ 8171310 +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillTop:: walk_right walk_down walk_in_place_fastest_right step_end -OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop:: @ 8171314 +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidTop:: walk_right step_end -OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom:: @ 8171316 +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillMidBottom:: walk_right walk_up walk_in_place_fastest_right step_end -OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom:: @ 817131A +OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom:: walk_right walk_up walk_up @@ -555,7 +555,7 @@ OneIsland_PokemonCenter_1F_Movement_PlayerWalkToBillBottom:: @ 817131A step_end @ Unused -Movement_17131F:: @ 817131F +Movement_17131F:: delay_16 delay_16 delay_4 @@ -563,11 +563,11 @@ Movement_17131F:: @ 817131F step_end @ Unused -Movement_171324:: @ 8171324 +Movement_171324:: walk_in_place_fast_down step_end -OneIsland_PokemonCenter_1F_Movement_PlayerExit:: @ 8171326 +OneIsland_PokemonCenter_1F_Movement_PlayerExit:: walk_left walk_left walk_left @@ -576,7 +576,7 @@ OneIsland_PokemonCenter_1F_Movement_PlayerExit:: @ 8171326 walk_down step_end -OneIsland_PokemonCenter_1F_Movement_BillExit:: @ 817132D +OneIsland_PokemonCenter_1F_Movement_BillExit:: walk_left walk_left walk_left diff --git a/data/maps/OneIsland_PokemonCenter_1F/text.inc b/data/maps/OneIsland_PokemonCenter_1F/text.inc index 278a1cc44..8e8a4ee1a 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/text.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/text.inc @@ -1,52 +1,52 @@ -OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio:: @ 81A0CDE +OneIsland_PokemonCenter_1F_Text_BillHeyThereCelio:: .string "BILL: Hey, there!\n" .string "CELIO!$" -OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut:: @ 81A0CF7 +OneIsland_PokemonCenter_1F_Text_CelioCantBelieveYouCameOut:: .string "CELIO: BILL!\n" .string "I can't believe you came out here.$" -OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing:: @ 81A0D27 +OneIsland_PokemonCenter_1F_Text_BillHowsYourResearchComing:: .string "BILL: Well, absolutely!\n" .string "How's your research coming along?\p" .string "…Oh, wait a sec.$" -OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio:: @ 81A0D72 +OneIsland_PokemonCenter_1F_Text_ThisIsMyBuddyCelio:: .string "{PLAYER}, this is my buddy CELIO.\n" .string "He's one dedicated PC MANIAC!$" -OneIsland_PokemonCenter_1F_Text_PlayerIsRisingPokemonChamp:: @ 81A0DAC +OneIsland_PokemonCenter_1F_Text_PlayerIsRisingPokemonChamp:: .string "CELIO, this is {PLAYER}, a rising\n" .string "contender as the POKéMON CHAMP!$" -OneIsland_PokemonCenter_1F_Text_PlayerIsReigningPokemonChamp:: @ 81A0DE8 +OneIsland_PokemonCenter_1F_Text_PlayerIsReigningPokemonChamp:: .string "CELIO, this is {PLAYER}, the\n" .string "reigning POKéMON CHAMP!$" -OneIsland_PokemonCenter_1F_Text_CelioThatsReallyImpressive:: @ 81A0E17 +OneIsland_PokemonCenter_1F_Text_CelioThatsReallyImpressive:: .string "CELIO: That's really impressive.\p" .string "I hate to say it, but I have zero\n" .string "aptitude for battling.\p" .string "Anyways, I'm glad to meet you.$" -OneIsland_PokemonCenter_1F_Text_BillBringMeUpToSpeed:: @ 81A0E90 +OneIsland_PokemonCenter_1F_Text_BillBringMeUpToSpeed:: .string "BILL: So, bring me up to speed.\n" .string "How's your machine running?$" -OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours:: @ 81A0ECC +OneIsland_PokemonCenter_1F_Text_CelioPCsCantLinkWithYours:: .string "CELIO: It's running fine, but we're\n" .string "too remote out here.\p" .string "The PCs on this island just can't\n" .string "link with your PC, BILL.$" -OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou:: @ 81A0F40 +OneIsland_PokemonCenter_1F_Text_BillLetMeHelpYou:: .string "BILL: Oh, yeah?\n" .string "Okay, let me take a look-see.\p" .string "…Hang on here…\n" .string "I think we can make it work.\l" .string "Let me help you, okay?$" -OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer:: @ 81A0FB1 +OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer:: .string "{PLAYER}, can I get you to wait for\n" .string "me just a bit?\p" .string "…Actually, can I get you to do\n" @@ -62,38 +62,38 @@ OneIsland_PokemonCenter_1F_Text_CanYouDeliverThisMeteoritePlayer:: @ 81A0FB1 .string "So, can I get you to deliver this\n" .string "METEORITE to him?$" -OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill:: @ 81A10EE +OneIsland_PokemonCenter_1F_Text_AcceptedMeteoriteFromBill:: .string "{PLAYER} accepted the METEORITE\n" .string "from BILL.$" -OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis:: @ 81A1113 +OneIsland_PokemonCenter_1F_Text_CelioPleaseTakeThis:: .string "CELIO: {PLAYER}, if you are going\n" .string "to TWO ISLAND, please take this.$" -OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands:: @ 81A1150 +OneIsland_PokemonCenter_1F_Text_PassLetsYouTravelBetweenIslands:: .string "It's a PASS for the ferry service\n" .string "serving the local islands.\p" .string "It will let you travel between the\n" .string "ISLANDS ONE, TWO, and THREE.\p" .string "Oh, you should have this, too.$" -OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap:: @ 81A11EC +OneIsland_PokemonCenter_1F_Text_ReceivedExtraPageForTownMap:: .string "{PLAYER} received an extra page\n" .string "for the TOWN MAP!$" -OneIsland_PokemonCenter_1F_Text_ReceivedTownMap:: @ 81A1218 +OneIsland_PokemonCenter_1F_Text_ReceivedTownMap:: .string "{PLAYER} received\n" .string "a TOWN MAP!$" -OneIsland_PokemonCenter_1F_Text_BillCatchYouLater:: @ 81A1230 +OneIsland_PokemonCenter_1F_Text_BillCatchYouLater:: .string "BILL: I'll catch you later!\n" .string "Say hi to the guy for me!$" -OneIsland_PokemonCenter_1F_Text_HmmHowAboutLikeThis:: @ 81A1266 +OneIsland_PokemonCenter_1F_Text_HmmHowAboutLikeThis:: .string "Hmm…\p" .string "How about we try this like this…$" -OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore:: @ 81A128C +OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore:: .string "Oh, hey, {PLAYER}!\p" .string "Did you see?\n" .string "We got the PC working!\p" @@ -102,54 +102,54 @@ OneIsland_PokemonCenter_1F_Text_GotPCWorkingStrollAWhileMore:: @ 81A128C .string "Can you go out on a stroll or\n" .string "something for a while more?$" -OneIsland_PokemonCenter_1F_Text_SorryForBeingPoorHost:: @ 81A1321 +OneIsland_PokemonCenter_1F_Text_SorryForBeingPoorHost:: .string "I'm sorry for taking up so much of\n" .string "BILL's time.\p" .string "I'm also sorry for being such a \n" .string "poor host on your visit here.$" -OneIsland_PokemonCenter_1F_Text_UsualPCServicesUnavailable:: @ 81A1390 +OneIsland_PokemonCenter_1F_Text_UsualPCServicesUnavailable:: .string "The usual PC services aren't\n" .string "available…$" -OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer:: @ 81A13B8 +OneIsland_PokemonCenter_1F_Text_BillOhHeyPlayer:: .string "BILL: Oh, hey!\n" .string "{PLAYER}!$" -OneIsland_PokemonCenter_1F_Text_BillWeGotItDone:: @ 81A13CB +OneIsland_PokemonCenter_1F_Text_BillWeGotItDone:: .string "BILL: What kept you so long?\n" .string "Been out having a good time?\p" .string "We got it done.\n" .string "The PCs are up and running!$" -OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick:: @ 81A1431 +OneIsland_PokemonCenter_1F_Text_CelioJobWentQuick:: .string "CELIO: The job went incredibly\n" .string "quick.\p" .string "BILL is one amazing guy…$" -OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot:: @ 81A1470 +OneIsland_PokemonCenter_1F_Text_BillYouveLearnedALot:: .string "BILL: No, no! There was almost\n" .string "nothing left for me to do.\p" .string "CELIO, I have to hand it to you.\n" .string "You've learned a lot.$" -OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe:: @ 81A14E1 +OneIsland_PokemonCenter_1F_Text_CelioOhReallyEhehe:: .string "CELIO: Oh, really?\n" .string "Ehehe…$" -OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto:: @ 81A14FB +OneIsland_PokemonCenter_1F_Text_BillWeShouldHeadBackToKanto:: .string "BILL: Well, there you have it.\n" .string "I'm finished with the job.\l" .string "We should head back to KANTO.\p" .string "CELIO, I'll be seeing you again.$" -OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime:: @ 81A1574 +OneIsland_PokemonCenter_1F_Text_CelioPromiseIllShowYouAroundSometime:: .string "CELIO: {PLAYER}, I'm really sorry\n" .string "that we sent you off alone today.\p" .string "I promise, I will show you around\n" .string "these islands sometime.$" -OneIsland_PokemonCenter_1F_Text_CelioImModifyingMyNetworkMachine:: @ 81A15EC +OneIsland_PokemonCenter_1F_Text_CelioImModifyingMyNetworkMachine:: .string "CELIO: Hello!\n" .string "You look awfully busy as always.\p" .string "How am I doing?\p" @@ -159,7 +159,7 @@ OneIsland_PokemonCenter_1F_Text_CelioImModifyingMyNetworkMachine:: @ 81A15EC .string "I hope you'll be first to use it,\l" .string "{PLAYER}.$" -OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful:: @ 81A169B +OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful:: .string "CELIO: {PLAYER}, how have things\n" .string "been for you?\p" .string "Oh, is that right?\n" @@ -167,7 +167,7 @@ OneIsland_PokemonCenter_1F_Text_CelioCaughtMoreMonMaybeICanBeUseful:: @ 81A169B .string "Do you know what?\n" .string "Maybe I can be useful to you.$" -OneIsland_PokemonCenter_1F_Text_YoullBeTradingFromTrainersFarAway:: @ 81A1723 +OneIsland_PokemonCenter_1F_Text_YoullBeTradingFromTrainersFarAway:: .string "I'm modifying the Network Machine\n" .string "right now.\p" .string "I'm changing it so it can handle\n" @@ -176,7 +176,7 @@ OneIsland_PokemonCenter_1F_Text_YoullBeTradingFromTrainersFarAway:: @ 81A1723 .string "trading for exotic POKéMON from\l" .string "TRAINERS far away.$" -OneIsland_PokemonCenter_1F_Text_NeedsSpecialGemstone:: @ 81A17DF +OneIsland_PokemonCenter_1F_Text_NeedsSpecialGemstone:: .string "But, there is a slight catch.\p" .string "For the link to work, the Machine\n" .string "needs a special gemstone.\p" @@ -184,7 +184,7 @@ OneIsland_PokemonCenter_1F_Text_NeedsSpecialGemstone:: @ 81A17DF .string "but I haven't found one yet.\p" .string "Who knows where it could be.$" -OneIsland_PokemonCenter_1F_Text_TryingToFindGem:: @ 81A1896 +OneIsland_PokemonCenter_1F_Text_TryingToFindGem:: .string "I was trying to find the gem\n" .string "even while I was studying.\p" .string "As a result, I've made no headway\n" @@ -194,26 +194,26 @@ OneIsland_PokemonCenter_1F_Text_TryingToFindGem:: @ 81A1896 .string "But this time, I want to try to do\n" .string "things by myself.$" -OneIsland_PokemonCenter_1F_Text_OhThats:: @ 81A197E +OneIsland_PokemonCenter_1F_Text_OhThats:: .string "Oh!\n" .string "Th-that's…$" -OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio:: @ 81A198D +OneIsland_PokemonCenter_1F_Text_HandedRubyToCelio:: .string "{PLAYER} handed the RUBY\n" .string "to CELIO.$" -OneIsland_PokemonCenter_1F_Text_MayIAskOneMoreFavor:: @ 81A19AA +OneIsland_PokemonCenter_1F_Text_MayIAskOneMoreFavor:: .string "Thank you!\n" .string "{PLAYER}, you're simply amazing.\p" .string "… … … … … …\p" .string "Um… May I ask one more giant favor\n" .string "of you?$" -OneIsland_PokemonCenter_1F_Text_PleaseINeedYourHelp:: @ 81A1A08 +OneIsland_PokemonCenter_1F_Text_PleaseINeedYourHelp:: .string "It… It's not anything weird.\n" .string "Please, I need your help.$" -OneIsland_PokemonCenter_1F_Text_AnotherGemstoneInSeviiIslands:: @ 81A1A3F +OneIsland_PokemonCenter_1F_Text_AnotherGemstoneInSeviiIslands:: .string "While I was studying gemstones,\n" .string "I discovered something important.\p" .string "There is another gem that forms\n" @@ -225,26 +225,26 @@ OneIsland_PokemonCenter_1F_Text_AnotherGemstoneInSeviiIslands:: @ 81A1A3F .string "{PLAYER}, may I have your ferry\n" .string "PASS and the TOWN MAP?$" -OneIsland_PokemonCenter_1F_Text_ReturnedTriPassForRainbowPass:: @ 81A1B56 +OneIsland_PokemonCenter_1F_Text_ReturnedTriPassForRainbowPass:: .string "{PLAYER} returned the TRI-PASS and\n" .string "received the RAINBOW PASS.$" -OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage:: @ 81A1B8E +OneIsland_PokemonCenter_1F_Text_ObtainedExtraMapPage:: .string "Obtained an extra page for the\n" .string "TOWN MAP!$" -OneIsland_PokemonCenter_1F_Text_PassLetYouGetToAllIslands:: @ 81A1BB7 +OneIsland_PokemonCenter_1F_Text_PassLetYouGetToAllIslands:: .string "This is my own ferry PASS.\p" .string "It will let you get to all the\n" .string "SEVII ISLANDS.\p" .string "{PLAYER}, please, I can't do\n" .string "it without your help.$" -OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio:: @ 81A1C2D +OneIsland_PokemonCenter_1F_Text_HandedSapphireToCelio:: .string "{PLAYER} handed the SAPPHIRE\n" .string "to CELIO.$" -OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime:: @ 81A1C4E +OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime:: .string "CELIO: So this is the gem that\n" .string "forms a pair with the RUBY…\p" .string "{PLAYER}, you've gone through a lot\n" @@ -255,14 +255,14 @@ OneIsland_PokemonCenter_1F_Text_ThankYouGiveMeTime:: @ 81A1C4E .string "Now it's my turn to work for you!\n" .string "Please give me a little time.$" -OneIsland_PokemonCenter_1F_Text_OkayThisIsGood:: @ 81A1D45 +OneIsland_PokemonCenter_1F_Text_OkayThisIsGood:: .string "Okay, this is good…$" -OneIsland_PokemonCenter_1F_Text_LinkedUpWithLanette:: @ 81A1D59 +OneIsland_PokemonCenter_1F_Text_LinkedUpWithLanette:: .string "I did it!\n" .string "I linked up with LANETTE!$" -OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou:: @ 81A1D7D +OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou:: .string "{PLAYER}…\n" .string "{PLAYER}, I did it!\p" .string "I've managed to link up with\n" @@ -273,7 +273,7 @@ OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou:: @ 81A1D7D .string "Thanks to you, my dream came\n" .string "true…$" -OneIsland_PokemonCenter_1F_Text_WishYouBestOfLuck:: @ 81A1E39 +OneIsland_PokemonCenter_1F_Text_WishYouBestOfLuck:: .string "I…\n" .string "I'm not crying.\p" .string "That's enough about me!\p" @@ -281,12 +281,12 @@ OneIsland_PokemonCenter_1F_Text_WishYouBestOfLuck:: @ 81A1E39 .string "looking for exotic POKéMON, right?\p" .string "I wish you the best of luck!$" -OneIsland_PokemonCenter_1F_Text_CelioHearingRumorsAboutYou:: @ 81A1EBD +OneIsland_PokemonCenter_1F_Text_CelioHearingRumorsAboutYou:: .string "CELIO: Hello!\p" .string "{PLAYER}, I've been hearing rumors\n" .string "about you.$" -OneIsland_PokemonCenter_1F_Text_BillsFirstMonWasAbra:: @ 81A1EF3 +OneIsland_PokemonCenter_1F_Text_BillsFirstMonWasAbra:: .string "{PLAYER}, what's your favorite kind\n" .string "of POKéMON?\p" .string "BILL is a POKéMANIAC, so he loves\n" @@ -294,7 +294,7 @@ OneIsland_PokemonCenter_1F_Text_BillsFirstMonWasAbra:: @ 81A1EF3 .string "Apparently, the first one he caught\n" .string "was an ABRA.$" -OneIsland_PokemonCenter_1F_Text_BillsHometownInGoldenrod:: @ 81A1F7C +OneIsland_PokemonCenter_1F_Text_BillsHometownInGoldenrod:: .string "By the way, {PLAYER}, you're from\n" .string "PALLET TOWN, aren't you?\p" .string "I've heard that it's a quiet and\n" @@ -305,53 +305,53 @@ OneIsland_PokemonCenter_1F_Text_BillsHometownInGoldenrod:: @ 81A1F7C .string "festive, bustling city.\p" .string "I'd like to go there one day.$" -OneIsland_PokemonCenter_1F_Text_BillCantStomachMilk:: @ 81A2076 +OneIsland_PokemonCenter_1F_Text_BillCantStomachMilk:: .string "{PLAYER}, is there anything that\n" .string "you can't stand?\p" .string "Apparently, BILL simply can't\n" .string "stomach milk at all.$" -OneIsland_PokemonCenter_1F_Text_CameFromPalletDontKnowIt:: @ 81A20D5 +OneIsland_PokemonCenter_1F_Text_CameFromPalletDontKnowIt:: .string "Oh, you're a stranger here!\n" .string "Hi! Where did you come from?\p" .string "…PALLET TOWN?\n" .string "I don't know it!$" -OneIsland_PokemonCenter_1F_Text_EnormousVolcanoOnIsland:: @ 81A212D +OneIsland_PokemonCenter_1F_Text_EnormousVolcanoOnIsland:: .string "On this island, there's an enormous\n" .string "volcano.\p" .string "It hasn't erupted lately, so why\n" .string "not enjoy a hike?$" -OneIsland_PokemonCenter_1F_Text_WishICouldTradeWithBoyfriend:: @ 81A218D +OneIsland_PokemonCenter_1F_Text_WishICouldTradeWithBoyfriend:: .string "I wish I could trade POKéMON with\n" .string "my boyfriend who lives far away…$" -OneIsland_PokemonCenter_1F_Text_TradedWithFarAwayBoyfriend:: @ 81A21D0 +OneIsland_PokemonCenter_1F_Text_TradedWithFarAwayBoyfriend:: .string "I traded POKéMON with my boyfriend\n" .string "far away!\p" .string "Everyone's saying that we can\n" .string "thank you and CELIO.\p" .string "So, thank you!$" -OneIsland_PokemonCenter_1F_Text_MachineUnderAdjustment:: @ 81A223F +OneIsland_PokemonCenter_1F_Text_MachineUnderAdjustment:: .string "Network Machine\n" .string "Link Level 0\p" .string "…POKéMON Storage System under\n" .string "adjustment…$" -OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKanto:: @ 81A2286 +OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKanto:: .string "Network Machine\n" .string "Link Level 1\p" .string "Link established with the KANTO\n" .string "region.$" -OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKantoAndHoenn:: @ 81A22CB +OneIsland_PokemonCenter_1F_Text_MachineLinkedWithKantoAndHoenn:: .string "Network Machine\n" .string "Link Level 2\p" .string "Link established with the KANTO\n" .string "and HOENN regions.$" -OneIsland_PokemonCenter_1F_Text_ObtainedTriPass:: @ 81A231B +OneIsland_PokemonCenter_1F_Text_ObtainedTriPass:: .string "Obtained the TRI-PASS!$" diff --git a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc index 8adbf8907..1d1df0312 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 +OneIsland_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ OneIsland_PokemonCenter_2F_MapScripts:: @ 8171334 .byte 0 @ The below 3 are unused and leftover from RS -OneIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171349 +OneIsland_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -OneIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 817134F +OneIsland_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -OneIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171355 +OneIsland_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/OneIsland_TreasureBeach/scripts.inc b/data/maps/OneIsland_TreasureBeach/scripts.inc index 137c8103e..b9f405b89 100644 --- a/data/maps/OneIsland_TreasureBeach/scripts.inc +++ b/data/maps/OneIsland_TreasureBeach/scripts.inc @@ -1,6 +1,6 @@ -OneIsland_TreasureBeach_MapScripts:: @ 816876B +OneIsland_TreasureBeach_MapScripts:: .byte 0 -OneIsland_TreasureBeach_EventScript_Boy:: @ 816876C +OneIsland_TreasureBeach_EventScript_Boy:: msgbox OneIsland_TreasureBeach_Text_GoodThingsWashUpOnBeach, MSGBOX_NPC end diff --git a/data/maps/OneIsland_TreasureBeach/text.inc b/data/maps/OneIsland_TreasureBeach/text.inc index 30ed2b0bb..ffde81afa 100644 --- a/data/maps/OneIsland_TreasureBeach/text.inc +++ b/data/maps/OneIsland_TreasureBeach/text.inc @@ -1,16 +1,16 @@ -OneIsland_TreasureBeach_Text_AmaraIntro:: @ 8189D5A +OneIsland_TreasureBeach_Text_AmaraIntro:: .string "Lying back, rocked by the waves…\n" .string "It's exquisite.$" -OneIsland_TreasureBeach_Text_AmaraDefeat:: @ 8189D8B +OneIsland_TreasureBeach_Text_AmaraDefeat:: .string "I lost…\n" .string "It feels awful.$" -OneIsland_TreasureBeach_Text_AmaraPostBattle:: @ 8189DA3 +OneIsland_TreasureBeach_Text_AmaraPostBattle:: .string "The sea is pleasantly warm in these\n" .string "parts.$" -OneIsland_TreasureBeach_Text_GoodThingsWashUpOnBeach:: @ 8189DCE +OneIsland_TreasureBeach_Text_GoodThingsWashUpOnBeach:: .string "Good things get washed up by the\n" .string "ocean current onto this beach.\p" .string "That's why I often come here for\n" diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index bed477a5c..f6a1777ab 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -3,12 +3,12 @@ .equ SIGN_LADY_READY, VAR_TEMP_2 -PalletTown_MapScripts:: @ 816545A +PalletTown_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_OnFrame .byte 0 -PalletTown_OnTransition:: @ 8165465 +PalletTown_OnTransition:: setworldmapflag FLAG_WORLD_MAP_PALLET_TOWN call_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_TryReadySignLady compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 0 @@ -17,35 +17,35 @@ PalletTown_OnTransition:: @ 8165465 call_if_eq PalletTown_EventScript_SetSignLadyDone end -PalletTown_EventScript_TryReadySignLady:: @ 8165488 +PalletTown_EventScript_TryReadySignLady:: goto_if_unset FLAG_OPENED_START_MENU, EventScript_Return compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if_ge EventScript_Return setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return -PalletTown_EventScript_SetSignLadyDone:: @ 81654A2 +PalletTown_EventScript_SetSignLadyDone:: setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 return -PalletTown_EventScript_SetSignLadyPos:: @ 81654A8 +PalletTown_EventScript_SetSignLadyPos:: goto_if_set FLAG_PALLET_LADY_NOT_BLOCKING_SIGN, PalletTown_EventScript_MoveSignLadyToRouteEntrance setobjectxyperm LOCALID_SIGN_LADY, 5, 15 setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_UP return -PalletTown_EventScript_MoveSignLadyToRouteEntrance:: @ 81654BD +PalletTown_EventScript_MoveSignLadyToRouteEntrance:: setobjectxyperm LOCALID_SIGN_LADY, 12, 2 setobjectmovementtype LOCALID_SIGN_LADY, MOVEMENT_TYPE_FACE_DOWN setvar SIGN_LADY_READY, TRUE return -PalletTown_OnFrame:: @ 81654CE +PalletTown_OnFrame:: map_script_2 VAR_MAP_SCENE_PALLET_TOWN_OAK, 2, PalletTown_EventScript_OakRatingScene .2byte 0 @ Oak approaches player after exiting their house post Elite Four to check if they should receieve the National Dex -PalletTown_EventScript_OakRatingScene:: @ 81654D8 +PalletTown_EventScript_OakRatingScene:: lockall textcolor 0 setobjectxyperm LOCALID_PROF_OAK, 14, 14 @@ -84,7 +84,7 @@ PalletTown_EventScript_OakRatingScene:: @ 81654D8 releaseall end -PalletTown_EventScript_EndOakRatingScene:: @ 816557E +PalletTown_EventScript_EndOakRatingScene:: closemessage applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakExit waitmovement 0 @@ -93,17 +93,17 @@ PalletTown_EventScript_EndOakRatingScene:: @ 816557E releaseall end -PalletTown_EventScript_NotEnoughMonsForNationalDex:: @ 8165593 +PalletTown_EventScript_NotEnoughMonsForNationalDex:: msgbox PalletTown_Text_CaughtXPuttingInHonestEffort goto PalletTown_EventScript_EndOakRatingScene end -PalletTown_EventScript_NotBeenToOneIslandYet:: @ 81655A1 +PalletTown_EventScript_NotBeenToOneIslandYet:: msgbox PalletTown_Text_OakYouEnjoyingTraveling goto PalletTown_EventScript_EndOakRatingScene end -PalletTown_Movement_OakWalkToPlayersDoor:: @ 81655AF +PalletTown_Movement_OakWalkToPlayersDoor:: walk_left walk_left walk_left @@ -120,7 +120,7 @@ PalletTown_Movement_OakWalkToPlayersDoor:: @ 81655AF walk_in_place_fastest_up step_end -PalletTown_Movement_OakExit:: @ 81655BE +PalletTown_Movement_OakExit:: walk_right walk_right walk_right @@ -136,7 +136,7 @@ PalletTown_Movement_OakExit:: @ 81655BE walk_right step_end -PalletTown_Movement_OakWalkToLabFromHouse:: @ 81655CC +PalletTown_Movement_OakWalkToLabFromHouse:: walk_right walk_right walk_right @@ -155,7 +155,7 @@ PalletTown_Movement_OakWalkToLabFromHouse:: @ 81655CC walk_in_place_fastest_up step_end -PalletTown_Movement_PlayerWalkToLabFromHouse:: @ 81655DD +PalletTown_Movement_PlayerWalkToLabFromHouse:: walk_down walk_right walk_right @@ -173,19 +173,19 @@ PalletTown_Movement_PlayerWalkToLabFromHouse:: @ 81655DD walk_right step_end -PalletTown_EventScript_OakTriggerLeft:: @ 81655ED +PalletTown_EventScript_OakTriggerLeft:: lockall setvar VAR_TEMP_1, 0 goto PalletTown_EventScript_OakTrigger end -PalletTown_EventScript_OakTriggerRight:: @ 81655F9 +PalletTown_EventScript_OakTriggerRight:: lockall setvar VAR_TEMP_1, 1 goto PalletTown_EventScript_OakTrigger end -PalletTown_EventScript_OakTrigger:: @ 8165605 +PalletTown_EventScript_OakTrigger:: famechecker FAMECHECKER_OAK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 textcolor 0 delay 30 @@ -230,29 +230,29 @@ PalletTown_EventScript_OakTrigger:: @ 8165605 releaseall end -PalletTown_EventScript_OakEnterLeft:: @ 81656B8 +PalletTown_EventScript_OakEnterLeft:: applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterLeft waitmovement 0 return -PalletTown_EventScript_OakEnterRight:: @ 81656C3 +PalletTown_EventScript_OakEnterRight:: applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakEnterRight waitmovement 0 return -PalletTown_EventScript_OakLeadPlayerToLabLeft:: @ 81656CE +PalletTown_EventScript_OakLeadPlayerToLabLeft:: applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabLeft applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabLeft waitmovement 0 return -PalletTown_EventScript_OakLeadPlayerToLabRight:: @ 81656E0 +PalletTown_EventScript_OakLeadPlayerToLabRight:: applymovement LOCALID_PROF_OAK, PalletTown_Movement_OakWalkToLabRight applymovement OBJ_EVENT_ID_PLAYER, PalletTown_Movement_PlayerWalkToLabRight waitmovement 0 return -PalletTown_Movement_OakEnterLeft:: @ 81656F2 +PalletTown_Movement_OakEnterLeft:: walk_up walk_up walk_right @@ -263,7 +263,7 @@ PalletTown_Movement_OakEnterLeft:: @ 81656F2 walk_up step_end -PalletTown_Movement_OakEnterRight:: @ 81656FB +PalletTown_Movement_OakEnterRight:: walk_right walk_up walk_up @@ -294,14 +294,14 @@ PalletTown_Movement_OakEnterRight:: @ 81656FB walk_right .endm -PalletTown_Movement_OakWalkToLabLeft:: @ 8165705 +PalletTown_Movement_OakWalkToLabLeft:: walk_down walk_to_lab walk_right walk_in_place_fastest_up step_end -PalletTown_Movement_OakWalkToLabRight:: @ 8165719 +PalletTown_Movement_OakWalkToLabRight:: walk_down walk_left walk_to_lab @@ -309,31 +309,31 @@ PalletTown_Movement_OakWalkToLabRight:: @ 8165719 walk_in_place_fastest_up step_end -PalletTown_Movement_OakEnterLab:: @ 816572E +PalletTown_Movement_OakEnterLab:: walk_up set_invisible step_end -PalletTown_Movement_PlayerWalkToLabLeft:: @ 8165731 +PalletTown_Movement_PlayerWalkToLabLeft:: walk_down walk_down walk_to_lab step_end -PalletTown_Movement_PlayerWalkToLabRight:: @ 8165744 +PalletTown_Movement_PlayerWalkToLabRight:: walk_down walk_down walk_left walk_to_lab step_end -PalletTown_Movement_PlayerEnterLab:: @ 8165758 +PalletTown_Movement_PlayerEnterLab:: walk_right walk_up set_invisible step_end -PalletTown_EventScript_SignLady:: @ 816575C +PalletTown_EventScript_SignLady:: lock compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 2 goto_if_eq PalletTown_EventScript_SignLadyDone @@ -361,78 +361,78 @@ PalletTown_EventScript_SignLady:: @ 816575C release end -PalletTown_EventScript_SignLadyMoveOutOfWayRight:: @ 81657D7 +PalletTown_EventScript_SignLadyMoveOutOfWayRight:: applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayRight waitmovement 0 return -PalletTown_EventScript_SignLadyMoveOutOfWayLeft:: @ 81657E2 +PalletTown_EventScript_SignLadyMoveOutOfWayLeft:: applymovement LOCALID_SIGN_LADY, PalletTown_Movement_SignLadyMoveOutOfWayLeft waitmovement 0 return -PalletTown_EventScript_SignLadyDone:: @ 81657ED +PalletTown_EventScript_SignLadyDone:: applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 msgbox PalletTown_Text_RaisingMonsToo release end -PalletTown_EventScript_SignLadyGoReadSign:: @ 8165801 +PalletTown_EventScript_SignLadyGoReadSign:: applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 msgbox PalletTown_Text_ReadItReadIt release end -PalletTown_EventScript_SignLadyJustShowedSign:: @ 8165815 +PalletTown_EventScript_SignLadyJustShowedSign:: applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 msgbox PalletTown_Text_SignsAreUsefulArentThey release end -PalletTown_Movement_SignLadyMoveOutOfWayRight:: @ 8165829 +PalletTown_Movement_SignLadyMoveOutOfWayRight:: walk_right walk_in_place_fastest_left step_end -PalletTown_Movement_SignLadyMoveOutOfWayLeft:: @ 816582C +PalletTown_Movement_SignLadyMoveOutOfWayLeft:: walk_left walk_in_place_fastest_right step_end -PalletTown_EventScript_FatMan:: @ 816582F +PalletTown_EventScript_FatMan:: msgbox PalletTown_Text_CanStoreItemsAndMonsInPC, MSGBOX_NPC end -PalletTown_EventScript_OaksLabSign:: @ 8165838 +PalletTown_EventScript_OaksLabSign:: lockall famechecker FAMECHECKER_OAK, 0 msgbox PalletTown_Text_OakPokemonResearchLab releaseall end -PalletTown_EventScript_PlayersHouseSign:: @ 8165850 +PalletTown_EventScript_PlayersHouseSign:: msgbox PalletTown_Text_PlayersHouse, MSGBOX_SIGN end -PalletTown_EventScript_RivalsHouseSign:: @ 8165859 +PalletTown_EventScript_RivalsHouseSign:: msgbox PalletTown_Text_RivalsHouse, MSGBOX_SIGN end -PalletTown_EventScript_TownSign:: @ 8165862 +PalletTown_EventScript_TownSign:: msgbox PalletTown_Text_TownSign, MSGBOX_SIGN end -PalletTown_EventScript_TrainerTips:: @ 816586B +PalletTown_EventScript_TrainerTips:: lockall msgbox PalletTown_Text_PressStartToOpenMenu setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 releaseall end -PalletTown_EventScript_SignLadyTrigger:: @ 816587B +PalletTown_EventScript_SignLadyTrigger:: lockall applymovement LOCALID_SIGN_LADY, Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft @@ -441,7 +441,7 @@ PalletTown_EventScript_SignLadyTrigger:: @ 816587B releaseall end -PalletTown_EventScript_SignLadyShowSign:: @ 8165894 +PalletTown_EventScript_SignLadyShowSign:: textcolor 1 msgbox PalletTown_Text_LookCopiedTrainerTipsSign closemessage @@ -457,7 +457,7 @@ PalletTown_EventScript_SignLadyShowSign:: @ 8165894 normalmsg return -PalletTown_EventScript_SignLadyStartShowSign:: @ 81658C2 +PalletTown_EventScript_SignLadyStartShowSign:: applymovement LOCALID_SIGN_LADY, Movement_FacePlayer waitmovement 0 call PalletTown_EventScript_SignLadyShowSign diff --git a/data/maps/PalletTown/text.inc b/data/maps/PalletTown/text.inc index 5ed553ce2..726aea8c6 100644 --- a/data/maps/PalletTown/text.inc +++ b/data/maps/PalletTown/text.inc @@ -1,8 +1,8 @@ -PalletTown_Text_OakDontGoOut:: @ 817D72C +PalletTown_Text_OakDontGoOut:: .string "OAK: Hey! Wait!\n" .string "Don't go out!$" -PalletTown_Text_OakGrassUnsafeNeedMon:: @ 817D74A +PalletTown_Text_OakGrassUnsafeNeedMon:: .string "OAK: It's unsafe!\n" .string "Wild POKéMON live in tall grass!\p" .string "You need your own POKéMON for\n" @@ -10,30 +10,30 @@ PalletTown_Text_OakGrassUnsafeNeedMon:: @ 817D74A .string "I know!\n" .string "Here, come with me!$" -PalletTown_Text_RaisingMonsToo:: @ 817D7C8 +PalletTown_Text_RaisingMonsToo:: .string "I'm raising POKéMON, too.\p" .string "When they get strong, they can\n" .string "protect me.$" -PalletTown_Text_CanStoreItemsAndMonsInPC:: @ 817D80D +PalletTown_Text_CanStoreItemsAndMonsInPC:: .string "Technology is incredible!\p" .string "You can now store and recall items\n" .string "and POKéMON as data via PC.$" -PalletTown_Text_OakPokemonResearchLab:: @ 817D866 +PalletTown_Text_OakPokemonResearchLab:: .string "OAK POKéMON RESEARCH LAB$" -PalletTown_Text_PlayersHouse:: @ 817D87F +PalletTown_Text_PlayersHouse:: .string "{PLAYER}'s house$" -PalletTown_Text_RivalsHouse:: @ 817D88A +PalletTown_Text_RivalsHouse:: .string "{RIVAL}'s house$" -PalletTown_Text_TownSign:: @ 817D895 +PalletTown_Text_TownSign:: .string "PALLET TOWN\n" .string "Shades of your journey await!$" -PalletTown_Text_OakLetMeSeePokedex:: @ 817D8BF +PalletTown_Text_OakLetMeSeePokedex:: .string "OAK: Ah, {PLAYER}!\n" .string "You're back, are you?\p" .string "How much have you filled in your\n" @@ -41,14 +41,14 @@ PalletTown_Text_OakLetMeSeePokedex:: @ 817D8BF .string "May I see it?\p" .string "Let's see…$" -PalletTown_Text_CaughtXPuttingInHonestEffort:: @ 817D925 +PalletTown_Text_CaughtXPuttingInHonestEffort:: .string "You've caught {STR_VAR_2}…\p" .string "Hm, it looks as if you're putting\n" .string "in an honest effort.\p" .string "When you manage to fill it some\n" .string "more, come show me, please.$" -PalletTown_Text_CaughtXImpressiveFollowMe:: @ 817D9AA +PalletTown_Text_CaughtXImpressiveFollowMe:: .string "You've caught… {STR_VAR_2}!?\n" .string "Now, this is impressive!\p" .string "There's something I wanted to ask\n" @@ -56,7 +56,7 @@ PalletTown_Text_CaughtXImpressiveFollowMe:: @ 817D9AA .string "Come.\n" .string "Follow me.$" -PalletTown_Text_OakYouEnjoyingTraveling:: @ 817DA16 +PalletTown_Text_OakYouEnjoyingTraveling:: .string "OAK: Ah, {PLAYER}!\n" .string "You seem to be enjoying traveling.\p" .string "Knowing you, {PLAYER}, I can easily\n" diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 04d2b11f0..00a622d3a 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -1,9 +1,9 @@ .equ LOCALID_MOM, 1 -PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 +PalletTown_PlayersHouse_1F_MapScripts:: .byte 0 -PalletTown_PlayersHouse_1F_EventScript_Mom:: @ 8168C09 +PalletTown_PlayersHouse_1F_EventScript_Mom:: lock faceplayer goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, PalletTown_PlayersHouse_1F_EventScript_MomHeal @@ -18,15 +18,15 @@ PalletTown_PlayersHouse_1F_EventScript_Mom:: @ 8168C09 release end -PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale:: @ 8168C38 +PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouMale:: msgbox PalletTown_PlayersHouse_1F_Text_AllBoysLeaveOakLookingForYou return -PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale:: @ 8168C41 +PalletTown_PlayersHouse_1F_EventScript_MomOakLookingForYouFemale:: msgbox PalletTown_PlayersHouse_1F_Text_AllGirlsLeaveOakLookingForYou return -PalletTown_PlayersHouse_1F_EventScript_MomHeal:: @ 8168C4A +PalletTown_PlayersHouse_1F_EventScript_MomHeal:: msgbox PalletTown_PlayersHouse_1F_Text_YouShouldTakeQuickRest closemessage call EventScript_OutOfCenterPartyHeal @@ -35,7 +35,7 @@ PalletTown_PlayersHouse_1F_EventScript_MomHeal:: @ 8168C4A end @ Displays special text if interacted with from side or back (which are normally inaccessible) -PalletTown_PlayersHouse_1F_EventScript_TV:: @ 8168C62 +PalletTown_PlayersHouse_1F_EventScript_TV:: lockall compare VAR_FACING, DIR_NORTH goto_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreen @@ -43,7 +43,7 @@ PalletTown_PlayersHouse_1F_EventScript_TV:: @ 8168C62 releaseall end -PalletTown_PlayersHouse_1F_EventScript_TVScreen:: @ 8168C78 +PalletTown_PlayersHouse_1F_EventScript_TVScreen:: checkplayergender compare VAR_RESULT, MALE call_if_eq PalletTown_PlayersHouse_1F_EventScript_TVScreenMale @@ -52,10 +52,10 @@ PalletTown_PlayersHouse_1F_EventScript_TVScreen:: @ 8168C78 releaseall end -PalletTown_PlayersHouse_1F_EventScript_TVScreenMale:: @ 8168C91 +PalletTown_PlayersHouse_1F_EventScript_TVScreenMale:: msgbox PalletTown_PlayersHouse_1F_Text_MovieOnTVFourBoysOnRailroad return -PalletTown_PlayersHouse_1F_EventScript_TVScreenFemale:: @ 8168C9A +PalletTown_PlayersHouse_1F_EventScript_TVScreenFemale:: msgbox PalletTown_PlayersHouse_1F_Text_MovieOnTVGirlOnBrickRoad return diff --git a/data/maps/PalletTown_PlayersHouse_1F/text.inc b/data/maps/PalletTown_PlayersHouse_1F/text.inc index baa31b38d..6b339b46c 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/text.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/text.inc @@ -1,38 +1,38 @@ -PalletTown_PlayersHouse_1F_Text_AllBoysLeaveOakLookingForYou:: @ 818D2F0 +PalletTown_PlayersHouse_1F_Text_AllBoysLeaveOakLookingForYou:: .string "MOM: …Right.\n" .string "All boys leave home someday.\l" .string "It said so on TV.\p" .string "Oh, yes. PROF. OAK, next door, was\n" .string "looking for you.$" -PalletTown_PlayersHouse_1F_Text_AllGirlsLeaveOakLookingForYou:: @ 818D360 +PalletTown_PlayersHouse_1F_Text_AllGirlsLeaveOakLookingForYou:: .string "MOM: …Right.\n" .string "All girls dream of traveling.\l" .string "It said so on TV.\p" .string "Oh, yes. PROF. OAK, next door, was\n" .string "looking for you.$" -PalletTown_PlayersHouse_1F_Text_YouShouldTakeQuickRest:: @ 818D3D1 +PalletTown_PlayersHouse_1F_Text_YouShouldTakeQuickRest:: .string "MOM: {PLAYER}!\n" .string "You should take a quick rest.$" -PalletTown_PlayersHouse_1F_Text_LookingGreatTakeCare:: @ 818D3F8 +PalletTown_PlayersHouse_1F_Text_LookingGreatTakeCare:: .string "MOM: Oh, good! You and your\n" .string "POKéMON are looking great.\l" .string "Take care now!$" -PalletTown_PlayersHouse_1F_Text_MovieOnTVFourBoysOnRailroad:: @ 818D43E +PalletTown_PlayersHouse_1F_Text_MovieOnTVFourBoysOnRailroad:: .string "There's a movie on TV.\n" .string "Four boys are walking on railroad\l" .string "tracks.\p" .string "…I better go, too.$" -PalletTown_PlayersHouse_1F_Text_MovieOnTVGirlOnBrickRoad:: @ 818D492 +PalletTown_PlayersHouse_1F_Text_MovieOnTVGirlOnBrickRoad:: .string "There's a movie on TV.\n" .string "A girl with her hair in pigtails is\l" .string "walking up a brick road.\p" .string "…I better go, too.$" -PalletTown_PlayersHouse_1F_Text_OopsWrongSide:: @ 818D4F9 +PalletTown_PlayersHouse_1F_Text_OopsWrongSide:: .string "Oops, wrong side…$" diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 943056ea3..2bfdc0654 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -1,35 +1,35 @@ -PalletTown_PlayersHouse_2F_MapScripts:: @ 8168CA3 +PalletTown_PlayersHouse_2F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_PlayersHouse_2F_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PalletTown_PlayersHouse_2F_OnWarp .byte 0 -PalletTown_PlayersHouse_2F_OnTransition:: @ 8168CAE +PalletTown_PlayersHouse_2F_OnTransition:: compare VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0 call_if_eq PalletTown_PlayersHouse_2F_EventScript_SetRespawn end -PalletTown_PlayersHouse_2F_EventScript_SetRespawn:: @ 8168CBA +PalletTown_PlayersHouse_2F_EventScript_SetRespawn:: setrespawn SPAWN_PALLET_TOWN return -PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE +PalletTown_PlayersHouse_2F_OnWarp:: map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 0, PalletTown_PlayersHouse_2F_FirstWarpIn .2byte 0 -PalletTown_PlayersHouse_2F_FirstWarpIn:: @ 8168CC8 +PalletTown_PlayersHouse_2F_FirstWarpIn:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1 end -PalletTown_PlayersHouse_2F_EventScript_NES:: @ 8168CD2 +PalletTown_PlayersHouse_2F_EventScript_NES:: msgbox PalletTown_PlayersHouse_2F_Text_PlayedWithNES, MSGBOX_SIGN end -PalletTown_PlayersHouse_2F_EventScript_Sign:: @ 8168CDB +PalletTown_PlayersHouse_2F_EventScript_Sign:: msgbox PalletTown_PlayersHouse_2F_Text_PressLRForHelp, MSGBOX_SIGN end -PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4 +PalletTown_PlayersHouse_2F_EventScript_PC:: goto_if_questlog EventScript_ReleaseEnd lockall setvar VAR_0x8004, HELPCONTEXT_BEDROOM_PC @@ -44,7 +44,7 @@ PalletTown_PlayersHouse_2F_EventScript_PC:: @ 8168CE4 releaseall end -EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17 +EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: setvar VAR_0x8004, 1 playse SE_PC_OFF special AnimatePcTurnOff diff --git a/data/maps/PalletTown_PlayersHouse_2F/text.inc b/data/maps/PalletTown_PlayersHouse_2F/text.inc index cb7a68dce..cf981a03a 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/text.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/text.inc @@ -1,9 +1,9 @@ -PalletTown_PlayersHouse_2F_Text_PlayedWithNES:: @ 818D50B +PalletTown_PlayersHouse_2F_Text_PlayedWithNES:: .string "{PLAYER} played with the NES.\p" .string "…Okay!\n" .string "It's time to go!$" -PalletTown_PlayersHouse_2F_Text_PressLRForHelp:: @ 818D53B +PalletTown_PlayersHouse_2F_Text_PressLRForHelp:: .string "It's a posted notice…\p" .string "If you're confused, ask for HELP!\n" .string "Press the L or R Button!$" diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 56227a452..1d6fbfbeb 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -13,13 +13,13 @@ .equ SHOWED_OAK_COMPLETE_DEX, FLAG_TEMP_2 -PalletTown_ProfessorOaksLab_MapScripts:: @ 8168F7E +PalletTown_ProfessorOaksLab_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_ProfessorOaksLab_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PalletTown_ProfessorOaksLab_OnWarp map_script MAP_SCRIPT_ON_FRAME_TABLE, PalletTown_ProfessorOaksLab_OnFrame .byte 0 -PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E +PalletTown_ProfessorOaksLab_OnTransition:: setflag FLAG_VISITED_OAKS_LAB compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1 call_if_eq PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene @@ -30,34 +30,34 @@ PalletTown_ProfessorOaksLab_OnTransition:: @ 8168F8E call_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_SetSkipPokeBallCheck end -PalletTown_ProfessorOaksLab_EventScript_SetSkipPokeBallCheck:: @ 8168FBC +PalletTown_ProfessorOaksLab_EventScript_SetSkipPokeBallCheck:: setflag FLAG_OAK_SKIP_22_RIVAL_CHECK return -PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished:: @ 8168FC0 +PalletTown_ProfessorOaksLab_EventScript_SetNationalDexSceneFinished:: setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 9 return -PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene:: @ 8168FC6 +PalletTown_ProfessorOaksLab_EventScript_ReadyOakForStarterScene:: setobjectxyperm LOCALID_PROF_OAK, 6, 11 setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP savebgm MUS_OAK return -PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene:: @ 8168FD5 +PalletTown_ProfessorOaksLab_EventScript_ReadyOakForNationalDexScene:: setobjectxyperm LOCALID_PROF_OAK, 6, 11 setobjectmovementtype LOCALID_PROF_OAK, MOVEMENT_TYPE_FACE_UP return -PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1 +PalletTown_ProfessorOaksLab_OnWarp:: map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene .2byte 0 -PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene:: @ 8168FEB +PalletTown_ProfessorOaksLab_EventScript_ReadyPlayerForStarterScene:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 +PalletTown_ProfessorOaksLab_OnFrame:: map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 1, PalletTown_ProfessorOaksLab_ChooseStarterScene map_script_2 VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 7, PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene .2byte 0 @@ -77,7 +77,7 @@ PalletTown_ProfessorOaksLab_EventScript_EnterForNationalDexScene:: @ 8169002 goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene end -PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 +PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: msgbox PalletTown_ProfessorOaksLab_Text_OakSightingsOfRareMons closemessage compare VAR_FACING, DIR_NORTH @@ -148,7 +148,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexScene:: @ 8169035 releaseall end -PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: @ 8169174 +PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: setobjectxyperm LOCALID_RIVAL, 5, 10 addobject LOCALID_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 @@ -157,7 +157,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterNorth:: @ 8169 waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: @ 8169194 +PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 @@ -167,7 +167,7 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterEastWest:: @ 8 waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: @ 81691BB +PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL playbgm MUS_ENCOUNTER_RIVAL, 0 @@ -176,40 +176,40 @@ PalletTown_ProfessorOaksLab_EventScript_NationalDexSceneRivalEnterSouth:: @ 8169 waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth:: @ 81691DB +PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakNorth:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest:: @ 81691E6 +PalletTown_ProfessorOaksLab_EventScript_PlayerFaceOakWest:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth:: @ 81691F1 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskNorth:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth:: @ 81691FC +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskSouth:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk waitmovement LOCALID_PROF_OAK return -PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast:: @ 8169215 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskEast:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast waitmovement LOCALID_PROF_OAK return -PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest:: @ 8169227 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesToDeskWest:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk waitmovement 0 return -PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk:: @ 8169232 +PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk:: walk_up walk_left walk_in_place_fastest_up @@ -217,7 +217,7 @@ PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDesk:: @ 8169232 delay_4 step_end -PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth:: @ 8169238 +PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth:: walk_left walk_left walk_up @@ -225,7 +225,7 @@ PalletTown_ProfessorOaksLab_Movement_OakBringDexesToDeskSouth:: @ 8169238 delay_4 step_end -PalletTown_ProfessorOaksLab_ChooseStarterScene:: @ 816923E +PalletTown_ProfessorOaksLab_ChooseStarterScene:: lockall textcolor 0 applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakEnter @@ -255,7 +255,7 @@ PalletTown_ProfessorOaksLab_ChooseStarterScene:: @ 816923E releaseall end -PalletTown_ProfessorOaksLab_Movement_OakEnter:: @ 81692B0 +PalletTown_ProfessorOaksLab_Movement_OakEnter:: walk_up walk_up walk_up @@ -264,7 +264,7 @@ PalletTown_ProfessorOaksLab_Movement_OakEnter:: @ 81692B0 walk_up step_end -PalletTown_ProfessorOaksLab_Movement_PlayerEnter:: @ 81692B7 +PalletTown_ProfessorOaksLab_Movement_PlayerEnter:: walk_up walk_up walk_up @@ -275,12 +275,12 @@ PalletTown_ProfessorOaksLab_Movement_PlayerEnter:: @ 81692B7 walk_up step_end -PalletTown_ProfessorOaksLab_Movement_RivalReact:: @ 81692C0 +PalletTown_ProfessorOaksLab_Movement_RivalReact:: walk_in_place_up walk_in_place_up step_end -PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger:: @ 81692C3 +PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger:: lockall textcolor 0 applymovement LOCALID_PROF_OAK, Movement_FaceDown @@ -292,29 +292,29 @@ PalletTown_ProfessorOaksLab_EventScript_LeaveStarterSceneTrigger:: @ 81692C3 releaseall end -PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp:: @ 81692E5 +PalletTown_ProfessorOaksLab_Movement_PlayerWalkUp:: walk_up step_end -PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerLeft:: @ 81692E7 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerLeft:: lockall setvar VAR_TEMP_2, 1 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle end -PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerMid:: @ 81692F3 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerMid:: lockall setvar VAR_TEMP_2, 2 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle end -PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight:: @ 81692FF +PalletTown_ProfessorOaksLab_EventScript_RivalBattleTriggerRight:: lockall setvar VAR_TEMP_2, 3 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattle end -PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: @ 816930B +PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: textcolor 0 playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown @@ -337,7 +337,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalBattle:: @ 816930B @ both the player and rival can be in 3 different positions, so theres 9 different approaches @ NOTE: Names below refer to the Rival's mon (e.g. for RivalBattleSquirtle, player has Charmander) -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle:: @ 816935A +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle:: compare VAR_TEMP_2, 1 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft compare VAR_TEMP_2, 2 @@ -346,30 +346,30 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtle:: @ 81693 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight end -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft:: @ 816937C +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleLeft:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid:: @ 816938C +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleMid:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight:: @ 816939C +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleSquirtleRight:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle end -PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle:: @ 81693AC +PalletTown_ProfessorOaksLab_EventScript_RivalBattleSquirtle:: trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle end -PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft:: @ 81693C0 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft:: walk_left walk_left walk_left @@ -378,7 +378,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleLeft:: @ 8169 walk_down step_end -PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid:: @ 81693C7 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid:: walk_left walk_left walk_left @@ -386,14 +386,14 @@ PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleMid:: @ 81693 walk_down step_end -PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight:: @ 81693CD +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleSquirtleRight:: walk_left walk_left walk_down walk_down step_end -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander:: @ 81693D2 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander:: compare VAR_TEMP_2, 1 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft compare VAR_TEMP_2, 2 @@ -402,30 +402,30 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmander:: @ 816 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight end -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft:: @ 81693F4 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderLeft:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid:: @ 8169404 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderMid:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight:: @ 8169414 +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleCharmanderRight:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander end -PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander:: @ 8169424 +PalletTown_ProfessorOaksLab_EventScript_RivalBattleCharmander:: trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle end -PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft:: @ 8169438 +PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft:: walk_left walk_left walk_left @@ -435,7 +435,7 @@ PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderLeft:: @ 8169438 walk_down step_end -PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid:: @ 8169440 +PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid:: walk_left walk_left walk_left @@ -444,7 +444,7 @@ PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderMid:: @ 8169440 walk_down step_end -PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight:: @ 8169447 +PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight:: walk_left walk_left walk_left @@ -452,7 +452,7 @@ PalletTown_ProfessorOaksLab_Movement_ApproachForBattleCharmanderRight:: @ 816944 walk_down step_end -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur:: @ 816944D +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur:: compare VAR_TEMP_2, 1 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft compare VAR_TEMP_2, 2 @@ -461,30 +461,30 @@ PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaur:: @ 8169 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight end -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft:: @ 816946F +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurLeft:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid:: @ 816947F +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurMid:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end -PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight:: @ 816948F +PalletTown_ProfessorOaksLab_EventScript_RivalApproachForBattleBulbasaurRight:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur end -PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur:: @ 816949F +PalletTown_ProfessorOaksLab_EventScript_RivalBattleBulbasaur:: trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, PalletTown_ProfessorOaksLab_Text_RivalDefeat, Text_RivalVictory goto PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle end -PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft:: @ 81694B3 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft:: walk_left walk_left walk_left @@ -492,20 +492,20 @@ PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurLeft:: @ 816 walk_down step_end -PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid:: @ 81694B9 +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurMid:: walk_left walk_left walk_down walk_down step_end -PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight:: @ 81694BE +PalletTown_ProfessorOaksLab_Movement_RivalApproachForBattleBulbasaurRight:: walk_left walk_down walk_down step_end -PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: @ 81694C2 +PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: special HealPlayerParty msgbox PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon closemessage @@ -524,25 +524,25 @@ PalletTown_ProfessorOaksLab_EventScript_EndRivalBattle:: @ 81694C2 releaseall end -PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft:: @ 8169504 +PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleLeft:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle waitmovement LOCALID_RIVAL return -PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid:: @ 8169516 +PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleMid:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle waitmovement LOCALID_RIVAL return -PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight:: @ 8169528 +PalletTown_ProfessorOaksLab_EventScript_RivalExitAfterBattleRight:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight waitmovement LOCALID_RIVAL return -PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft:: @ 816953A +PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft:: walk_right walk_down walk_down @@ -552,7 +552,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleLeft:: @ 816953A delay_8 step_end -PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight:: @ 8169542 +PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight:: walk_left walk_down walk_down @@ -562,7 +562,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleRight:: @ 8169542 delay_8 step_end -PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid:: @ 816954A +PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid:: walk_right walk_down walk_down @@ -573,7 +573,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalExitAfterBattleMid:: @ 816954A delay_8 step_end -PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle:: @ 8169553 +PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle:: delay_16 delay_8 walk_in_place_fastest_right @@ -581,7 +581,7 @@ PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattle:: @ 8169553 walk_in_place_fastest_down step_end -PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight:: @ 8169559 +PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight:: delay_16 delay_8 walk_in_place_fastest_left @@ -589,7 +589,7 @@ PalletTown_ProfessorOaksLab_Movement_PlayerWatchRivalExitAfterBattleRight:: @ 81 walk_in_place_fastest_down step_end -PalletTown_ProfessorOaksLab_EventScript_Rival:: @ 816955F +PalletTown_ProfessorOaksLab_EventScript_Rival:: lock faceplayer compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 @@ -600,17 +600,17 @@ PalletTown_ProfessorOaksLab_EventScript_Rival:: @ 816955F release end -PalletTown_ProfessorOaksLab_EventScript_RivalWaitingForStarter:: @ 8169581 +PalletTown_ProfessorOaksLab_EventScript_RivalWaitingForStarter:: msgbox PalletTown_ProfessorOaksLab_Text_RivalGoChoosePlayer release end -PalletTown_ProfessorOaksLab_EventScript_RivalChoseStarter:: @ 816958B +PalletTown_ProfessorOaksLab_EventScript_RivalChoseStarter:: msgbox PalletTown_ProfessorOaksLab_Text_RivalMyMonLooksTougher release end -PalletTown_ProfessorOaksLab_EventScript_ProfOak:: @ 8169595 +PalletTown_ProfessorOaksLab_EventScript_ProfOak:: lock faceplayer goto_if_set SHOWED_OAK_COMPLETE_DEX, PalletTown_ProfessorOaksLab_EventScript_OakJustShownCompleteDex @@ -633,22 +633,22 @@ PalletTown_ProfessorOaksLab_EventScript_ProfOak:: @ 8169595 release end -PalletTown_ProfessorOaksLab_EventScript_OakJustShownCompleteDex:: @ 8169600 +PalletTown_ProfessorOaksLab_EventScript_OakJustShownCompleteDex:: msgbox PokedexRating_Text_ThankYouMadeDreamReality release end -PalletTown_ProfessorOaksLab_EventScript_OakCanReachNextTownWithMon:: @ 816960A +PalletTown_ProfessorOaksLab_EventScript_OakCanReachNextTownWithMon:: msgbox PalletTown_ProfessorOaksLab_Text_OakCanReachNextTownWithMon release end -PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow:: @ 8169614 +PalletTown_ProfessorOaksLab_EventScript_OakBattleMonForItToGrow:: msgbox PalletTown_ProfessorOaksLab_Text_OakBattleMonForItToGrow release end -PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E +PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: msgbox PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe textcolor 3 playfanfare MUS_OBTAIN_TMHM @@ -760,86 +760,86 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E release end -PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth:: @ 8169845 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverNorth:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth:: @ 8169850 +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverSouth:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast:: @ 816985B +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverEast:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest:: @ 816986D +PalletTown_ProfessorOaksLab_EventScript_OakBringDexesOverWest:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver waitmovement 0 return -PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast:: @ 8169878 +PalletTown_ProfessorOaksLab_Movement_PlayerFaceOakForDexEast:: delay_16 delay_8 walk_in_place_fastest_right step_end -PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver:: @ 816987C +PalletTown_ProfessorOaksLab_Movement_OakBringDexesOver:: walk_right walk_down step_end -PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth:: @ 816987F +PalletTown_ProfessorOaksLab_Movement_OakBringDexesOverSouth:: walk_down walk_right step_end -PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth:: @ 8169882 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskNorth:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth:: @ 816988D +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskSouth:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk waitmovement LOCALID_PROF_OAK return -PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast:: @ 81698A6 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskEast:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast waitmovement LOCALID_PROF_OAK return -PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest:: @ 81698B8 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakWalkToDeskWest:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk waitmovement 0 return -PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast:: @ 81698C3 +PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDeskEast:: delay_16 delay_8 walk_in_place_fastest_up step_end -PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk:: @ 81698C7 +PalletTown_ProfessorOaksLab_Movement_WatchOakWalkToDesk:: delay_16 delay_8 walk_in_place_fastest_left step_end -PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk:: @ 81698CB +PalletTown_ProfessorOaksLab_Movement_OakWalkToDesk:: walk_up walk_left delay_16 walk_in_place_fastest_down step_end -PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: @ 81698D0 +PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: walk_left walk_left walk_up @@ -847,7 +847,7 @@ PalletTown_ProfessorOaksLab_Movement_OakWalkToDeskSouth:: @ 81698D0 walk_in_place_fastest_right step_end -PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: @ 81698D6 +PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetPokedexCount copyvar VAR_0x8008, VAR_0x8005 @@ -859,13 +859,13 @@ PalletTown_ProfessorOaksLab_EventScript_RatePokedexOrTryGiveBalls:: @ 81698D6 goto PalletTown_ProfessorOaksLab_EventScript_RatePokedex end -PalletTown_ProfessorOaksLab_EventScript_RatePokedex:: @ 8169903 +PalletTown_ProfessorOaksLab_EventScript_RatePokedex:: call PokedexRating_EventScript_RateInPerson goto_if_set FLAG_OAK_SAW_DEX_COMPLETION, PalletTown_ProfessorOaksLab_EventScript_DexCompleted release end -PalletTown_ProfessorOaksLab_EventScript_DexCompleted:: @ 8169913 +PalletTown_ProfessorOaksLab_EventScript_DexCompleted:: closemessage delay 40 message PokedexRating_Text_Wroooaaarrr @@ -887,27 +887,27 @@ PalletTown_ProfessorOaksLab_EventScript_DexCompleted:: @ 8169913 release end -PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth:: @ 8169964 +PalletTown_ProfessorOaksLab_EventScript_OakExcitedNorth:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth:: @ 816996F +PalletTown_ProfessorOaksLab_EventScript_OakExcitedSouth:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast:: @ 816997A +PalletTown_ProfessorOaksLab_EventScript_OakExcitedEast:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedEast waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest:: @ 8169985 +PalletTown_ProfessorOaksLab_EventScript_OakExcitedWest:: applymovement LOCALID_PROF_OAK, PalletTown_ProfessorOaksLab_Movement_OakExcitedWest waitmovement 0 return -PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth:: @ 8169990 +PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth:: walk_in_place_down walk_in_place_fast_down walk_in_place_down @@ -916,7 +916,7 @@ PalletTown_ProfessorOaksLab_Movement_OakExcitedNorth:: @ 8169990 walk_in_place_down step_end -PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth:: @ 8169997 +PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth:: walk_in_place_up walk_in_place_fast_up walk_in_place_up @@ -925,7 +925,7 @@ PalletTown_ProfessorOaksLab_Movement_OakExcitedSouth:: @ 8169997 walk_in_place_up step_end -PalletTown_ProfessorOaksLab_Movement_OakExcitedEast:: @ 816999E +PalletTown_ProfessorOaksLab_Movement_OakExcitedEast:: walk_in_place_left walk_in_place_fast_left walk_in_place_left @@ -934,7 +934,7 @@ PalletTown_ProfessorOaksLab_Movement_OakExcitedEast:: @ 816999E walk_in_place_left step_end -PalletTown_ProfessorOaksLab_Movement_OakExcitedWest:: @ 81699A5 +PalletTown_ProfessorOaksLab_Movement_OakExcitedWest:: walk_in_place_right walk_in_place_fast_right walk_in_place_right @@ -944,7 +944,7 @@ PalletTown_ProfessorOaksLab_Movement_OakExcitedWest:: @ 81699A5 step_end @ Unused -Movement_1699AC:: @ 81699AC +Movement_1699AC:: walk_left walk_in_place_fastest_down delay_8 @@ -983,7 +983,7 @@ Movement_1699C5: delay_16 step_end -PalletTown_ProfessorOaksLab_EventScript_TryStartNationalDexScene:: @ 81699CE +PalletTown_ProfessorOaksLab_EventScript_TryStartNationalDexScene:: call PokedexRating_EventScript_RateInPerson closemessage compare VAR_0x8009, 60 @@ -994,11 +994,11 @@ PalletTown_ProfessorOaksLab_EventScript_TryStartNationalDexScene:: @ 81699CE goto PalletTown_ProfessorOaksLab_EventScript_NationalDexScene end -PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: @ 81699F9 +PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: release end -PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB +PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait @@ -1009,30 +1009,30 @@ PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB goto PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait end -PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls:: @ 8169A34 +PalletTown_ProfessorOaksLab_EventScript_PlayerOutOfBalls:: compare VAR_MAP_SCENE_ROUTE22, 2 goto_if_ge PalletTown_ProfessorOaksLab_EventScript_GivePlayerMoreBalls goto PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait end -PalletTown_ProfessorOaksLab_EventScript_GivePlayerMoreBalls:: @ 8169A45 +PalletTown_ProfessorOaksLab_EventScript_GivePlayerMoreBalls:: msgbox PalletTown_ProfessorOaksLab_Text_OakAddedNothingToPokedex giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5 setflag FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL release end -PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait:: @ 8169A6E +PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait:: msgbox PalletTown_ProfessorOaksLab_Text_OakMonsAroundWorldWait release end -PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls:: @ 8169A78 +PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls:: msgbox PalletTown_ProfessorOaksLab_Text_OakComeSeeMeSometime release end -PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth:: @ 8169A82 +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth:: setobjectxyperm LOCALID_RIVAL, 5, 10 addobject LOCALID_RIVAL applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth @@ -1040,7 +1040,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterNorth:: @ 8169A82 waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest:: @ 8169A9E +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown @@ -1049,7 +1049,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterEastWest:: @ 8169A9E waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth:: @ 8169AC1 +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth:: setobjectxyperm LOCALID_RIVAL, 6, 10 addobject LOCALID_RIVAL applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown @@ -1057,7 +1057,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalEnterSouth:: @ 8169AC1 waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth:: @ 8169ADD +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth:: applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 @@ -1065,7 +1065,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalSouth:: @ 8 waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest:: @ 8169AF5 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest:: applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 @@ -1074,7 +1074,7 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalWest:: @ 81 waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast:: @ 8169B14 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast:: applymovement LOCALID_PROF_OAK, Movement_FacePlayer waitmovement 0 delay 15 @@ -1083,46 +1083,46 @@ PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalEast:: @ 81 waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth:: @ 8169B33 +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerNorth:: applymovement LOCALID_RIVAL, Movement_FacePlayer applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth:: @ 8169B45 +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerSouth:: applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest:: @ 8169B57 +PalletTown_ProfessorOaksLab_EventScript_DexSceneRivalFacePlayerEastWest:: applymovement LOCALID_RIVAL, Movement_FacePlayer applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth:: @ 8169B69 +PalletTown_ProfessorOaksLab_EventScript_RivalExitNorth:: applymovement OBJ_EVENT_ID_PLAYER, PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_RivalExit:: @ 8169B7B +PalletTown_ProfessorOaksLab_EventScript_RivalExit:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalExit waitmovement 0 return -PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth:: @ 8169B86 +PalletTown_ProfessorOaksLab_EventScript_DexSceneOakFacePlayerAndRivalNorth:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest:: @ 8169B91 +PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterEastWest:: delay_4 walk_in_place_fastest_down step_end -PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth:: @ 8169B94 +PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth:: walk_in_place_fastest_down delay_16 delay_16 @@ -1133,7 +1133,7 @@ PalletTown_ProfessorOaksLab_Movement_WatchRivalEnterNorth:: @ 8169B94 walk_in_place_fastest_left step_end -PalletTown_ProfessorOaksLab_Movement_RivalEnter:: @ 8169B9D +PalletTown_ProfessorOaksLab_Movement_RivalEnter:: walk_up walk_up walk_up @@ -1142,7 +1142,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalEnter:: @ 8169B9D walk_up step_end -PalletTown_ProfessorOaksLab_Movement_RivalExit:: @ 8169BA4 +PalletTown_ProfessorOaksLab_Movement_RivalExit:: walk_down walk_down walk_down @@ -1151,7 +1151,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalExit:: @ 8169BA4 walk_down step_end -PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall:: @ 8169BAB +PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall:: lock faceplayer setvar PLAYER_STARTER_NUM, 0 @@ -1166,7 +1166,7 @@ PalletTown_ProfessorOaksLab_EventScript_BulbasaurBall:: @ 8169BAB release end -PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice:: @ 8169BE1 +PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice:: applymovement LOCALID_PROF_OAK, Movement_FaceRight waitmovement 0 drawmonpic PLAYER_STARTER_SPECIES, 10, 3 @@ -1179,7 +1179,7 @@ PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice:: @ 8169BE1 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander end -PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur:: @ 8169C14 +PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur:: msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingBulbasaur, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter @@ -1187,7 +1187,7 @@ PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur:: @ 8169C14 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter end -PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle:: @ 8169C33 +PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle:: msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter @@ -1195,7 +1195,7 @@ PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle:: @ 8169C33 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter end -PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: @ 8169C52 +PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter @@ -1203,12 +1203,12 @@ PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: @ 8169C52 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter end -PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter:: @ 8169C71 +PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter:: erasemonpic release end -PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: @ 8169C74 +PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: erasemonpic removeobject VAR_LAST_TALKED msgbox PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic @@ -1229,13 +1229,13 @@ PalletTown_ProfessorOaksLab_EventScript_ChoseStarter:: @ 8169C74 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter end -EventScript_GiveNicknameToStarter:: @ 8169CCC +EventScript_GiveNicknameToStarter:: setvar VAR_0x8004, 0 call EventScript_ChangePokemonNickname goto PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter end -PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter:: @ 8169CDC +PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter:: closemessage compare PLAYER_STARTER_NUM, 0 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander @@ -1245,25 +1245,25 @@ PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter:: @ 8169CDC goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle end -PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander:: @ 8169CFF +PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end -PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle:: @ 8169D0F +PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end -PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur:: @ 8169D1F +PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur:: applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end -PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter:: @ 8169D2F +PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter:: textcolor 0 msgbox PalletTown_ProfessorOaksLab_Text_RivalIllTakeThisOneThen removeobject RIVAL_STARTER_ID @@ -1278,11 +1278,11 @@ PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter:: @ 8169D2F release end -PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene:: @ 8169D5C +PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene:: setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 return -PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander:: @ 8169D62 +PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander:: walk_down walk_down walk_right @@ -1293,7 +1293,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander:: @ 8169D62 walk_up step_end -PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: @ 8169D6B +PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: walk_down walk_right walk_right @@ -1302,7 +1302,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: @ 8169D6B walk_in_place_fastest_up step_end -PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @ 8169D72 +PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: walk_down walk_right walk_right @@ -1310,7 +1310,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @ 8169D72 walk_in_place_fastest_up step_end -PalletTown_ProfessorOaksLab_EventScript_SquirtleBall:: @ 8169D78 +PalletTown_ProfessorOaksLab_EventScript_SquirtleBall:: lock faceplayer setvar PLAYER_STARTER_NUM, 1 @@ -1325,7 +1325,7 @@ PalletTown_ProfessorOaksLab_EventScript_SquirtleBall:: @ 8169D78 release end -PalletTown_ProfessorOaksLab_EventScript_CharmanderBall:: @ 8169DAE +PalletTown_ProfessorOaksLab_EventScript_CharmanderBall:: lock faceplayer setvar PLAYER_STARTER_NUM, 2 @@ -1340,12 +1340,12 @@ PalletTown_ProfessorOaksLab_EventScript_CharmanderBall:: @ 8169DAE release end -PalletTown_ProfessorOaksLab_EventScript_LastPokeBall:: @ 8169DE4 +PalletTown_ProfessorOaksLab_EventScript_LastPokeBall:: msgbox PalletTown_ProfessorOaksLab_Text_OaksLastMon release end -PalletTown_ProfessorOaksLab_EventScript_Aide1:: @ 8169DEE +PalletTown_ProfessorOaksLab_EventScript_Aide1:: lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_Aide1GameClear @@ -1353,13 +1353,13 @@ PalletTown_ProfessorOaksLab_EventScript_Aide1:: @ 8169DEE release end -PalletTown_ProfessorOaksLab_EventScript_Aide1GameClear:: @ 8169E03 +PalletTown_ProfessorOaksLab_EventScript_Aide1GameClear:: famechecker FAMECHECKER_OAK, 5 msgbox PalletTown_ProfessorOaksLab_Text_OakIsGoingToHaveRadioShow release end -PalletTown_ProfessorOaksLab_EventScript_Aide2:: @ 8169E1A +PalletTown_ProfessorOaksLab_EventScript_Aide2:: lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, PalletTown_ProfessorOaksLab_EventScript_Aide2GameClear @@ -1367,13 +1367,13 @@ PalletTown_ProfessorOaksLab_EventScript_Aide2:: @ 8169E1A release end -PalletTown_ProfessorOaksLab_EventScript_Aide2GameClear:: @ 8169E2F +PalletTown_ProfessorOaksLab_EventScript_Aide2GameClear:: famechecker FAMECHECKER_DAISY, 0 msgbox PalletTown_ProfessorOaksLab_Text_DaisyWillGroomMons release end -PalletTown_ProfessorOaksLab_EventScript_Aide3:: @ 8169E46 +PalletTown_ProfessorOaksLab_EventScript_Aide3:: lock faceplayer famechecker FAMECHECKER_OAK, 2 @@ -1381,19 +1381,19 @@ PalletTown_ProfessorOaksLab_EventScript_Aide3:: @ 8169E46 release end -PalletTown_ProfessorOaksLab_EventScript_Pokedex:: @ 8169E5F +PalletTown_ProfessorOaksLab_EventScript_Pokedex:: msgbox PalletTown_ProfessorOaksLab_Text_BlankEncyclopedia, MSGBOX_NPC end -PalletTown_ProfessorOaksLab_EventScript_Computer:: @ 8169E68 +PalletTown_ProfessorOaksLab_EventScript_Computer:: msgbox PalletTown_ProfessorOaksLab_Text_EmailMessage, MSGBOX_SIGN end -PalletTown_ProfessorOaksLab_EventScript_LeftSign:: @ 8169E71 +PalletTown_ProfessorOaksLab_EventScript_LeftSign:: msgbox PalletTown_ProfessorOaksLab_Text_PressStartToOpenMenu, MSGBOX_SIGN end -PalletTown_ProfessorOaksLab_EventScript_RightSign:: @ 8169E7A +PalletTown_ProfessorOaksLab_EventScript_RightSign:: lockall compare VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 6 goto_if_ge PalletTown_ProfessorOaksLab_EventScript_RightSignAlt @@ -1401,7 +1401,7 @@ PalletTown_ProfessorOaksLab_EventScript_RightSign:: @ 8169E7A releaseall end -PalletTown_ProfessorOaksLab_EventScript_RightSignAlt:: @ 8169E90 +PalletTown_ProfessorOaksLab_EventScript_RightSignAlt:: msgbox PalletTown_ProfessorOaksLab_Text_AllMonTypesHaveStrongAndWeakPoints releaseall end diff --git a/data/maps/PalletTown_ProfessorOaksLab/text.inc b/data/maps/PalletTown_ProfessorOaksLab/text.inc index ad7e8b7a1..849a643c3 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/text.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/text.inc @@ -1,64 +1,64 @@ -PalletTown_ProfessorOaksLab_Text_RivalGrampsIsntAround:: @ 818DC67 +PalletTown_ProfessorOaksLab_Text_RivalGrampsIsntAround:: .string "{RIVAL}: What, it's only {PLAYER}?\n" .string "Gramps isn't around.$" -PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting:: @ 818DC94 +PalletTown_ProfessorOaksLab_Text_RivalFedUpWithWaiting:: .string "{RIVAL}: Gramps!\n" .string "I'm fed up with waiting!$" -PalletTown_ProfessorOaksLab_Text_RivalNoFairWhatAboutMe:: @ 818DCB9 +PalletTown_ProfessorOaksLab_Text_RivalNoFairWhatAboutMe:: .string "{RIVAL}: Hey! Gramps! No fair!\n" .string "What about me?$" -PalletTown_ProfessorOaksLab_Text_RivalGoChoosePlayer:: @ 818DCE2 +PalletTown_ProfessorOaksLab_Text_RivalGoChoosePlayer:: .string "{RIVAL}: Heh, I don't need to be\n" .string "greedy like you. I'm mature!\p" .string "Go ahead and choose, {PLAYER}!$" -PalletTown_ProfessorOaksLab_Text_RivalIllTakeThisOneThen:: @ 818DD34 +PalletTown_ProfessorOaksLab_Text_RivalIllTakeThisOneThen:: .string "{RIVAL}: I'll take this one, then!$" -PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak:: @ 818DD52 +PalletTown_ProfessorOaksLab_Text_RivalReceivedMonFromOak:: .string "{RIVAL} received the {STR_VAR_1}\n" .string "from PROF. OAK!$" -PalletTown_ProfessorOaksLab_Text_RivalMyMonLooksTougher:: @ 818DD75 +PalletTown_ProfessorOaksLab_Text_RivalMyMonLooksTougher:: .string "{RIVAL}: My POKéMON looks a lot\n" .string "tougher than yours.$" -PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons:: @ 818DDA4 +PalletTown_ProfessorOaksLab_Text_RivalLetsCheckOutMons:: .string "{RIVAL}: Wait, {PLAYER}!\n" .string "Let's check out our POKéMON!\p" .string "Come on, I'll take you on!$" -PalletTown_ProfessorOaksLab_Text_RivalDefeat:: @ 818DDEA +PalletTown_ProfessorOaksLab_Text_RivalDefeat:: .string "WHAT?\n" .string "Unbelievable!\l" .string "I picked the wrong POKéMON!$" @ Also used for early Route 22 battle -Text_RivalVictory:: @ 818DE1A +Text_RivalVictory:: .string "{RIVAL}: Yeah!\n" .string "Am I great or what?$" -PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon:: @ 818DE38 +PalletTown_ProfessorOaksLab_Text_RivalGoToughenMyMon:: .string "{RIVAL}: Okay! I'll make my\n" .string "POKéMON battle to toughen it up!\p" .string "{PLAYER}! Gramps!\n" .string "Smell you later!$" -PalletTown_ProfessorOaksLab_Text_RivalGramps:: @ 818DE8D +PalletTown_ProfessorOaksLab_Text_RivalGramps:: .string "{RIVAL}: Gramps!$" -PalletTown_ProfessorOaksLab_Text_RivalWhatDidYouCallMeFor:: @ 818DE99 +PalletTown_ProfessorOaksLab_Text_RivalWhatDidYouCallMeFor:: .string "{RIVAL}: I almost forgot!\n" .string "What did you call me for?$" -PalletTown_ProfessorOaksLab_Text_RivalLeaveItToMeGramps:: @ 818DEC8 +PalletTown_ProfessorOaksLab_Text_RivalLeaveItToMeGramps:: .string "{RIVAL}: All right, Gramps!\n" .string "Leave it all to me!$" -PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap:: @ 818DEF3 +PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap:: .string "{PLAYER}, I hate to say it, but you\n" .string "won't be necessary for this.\p" .string "I know! I'll borrow a TOWN MAP\n" @@ -68,7 +68,7 @@ PalletTown_ProfessorOaksLab_Text_RivalTellSisNotToGiveYouMap:: @ 818DEF3 .string "Don't bother coming around to\n" .string "my place after this!$" -PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne:: @ 818DFBC +PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne:: .string "OAK: {RIVAL}?\n" .string "Let me think…\p" .string "Oh, that's right, I told you to\n" @@ -85,59 +85,59 @@ PalletTown_ProfessorOaksLab_Text_OakThreeMonsChooseOne:: @ 818DFBC .string "You can have one.\n" .string "Go on, choose!$" -PalletTown_ProfessorOaksLab_Text_OakBePatientRival:: @ 818E0EA +PalletTown_ProfessorOaksLab_Text_OakBePatientRival:: .string "OAK: Be patient, {RIVAL}.\n" .string "You can have one, too!$" -PalletTown_ProfessorOaksLab_Text_OakWhichOneWillYouChoose:: @ 818E116 +PalletTown_ProfessorOaksLab_Text_OakWhichOneWillYouChoose:: .string "OAK: Now, {PLAYER}.\p" .string "Inside those three POKé BALLS are\n" .string "POKéMON.\p" .string "Which one will you choose for\n" .string "yourself?$" -PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet:: @ 818E177 +PalletTown_ProfessorOaksLab_Text_OakHeyDontGoAwayYet:: .string "OAK: Hey!\n" .string "Don't go away yet!$" -PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander:: @ 818E194 +PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander:: .string "Ah! CHARMANDER is your choice.\n" .string "You should raise it patiently.\p" .string "So, {PLAYER}, you're claiming the\n" .string "FIRE POKéMON CHARMANDER?$" -PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle:: @ 818E207 +PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle:: .string "Hm! SQUIRTLE is your choice.\n" .string "It's one worth raising.\p" .string "So, {PLAYER}, you've decided on the\n" .string "WATER POKéMON SQUIRTLE?$" -PalletTown_ProfessorOaksLab_Text_OakChoosingBulbasaur:: @ 818E272 +PalletTown_ProfessorOaksLab_Text_OakChoosingBulbasaur:: .string "I see! BULBASAUR is your choice.\n" .string "It's very easy to raise.\p" .string "So, {PLAYER}, you want to go with\n" .string "the GRASS POKéMON BULBASAUR?$" -PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic:: @ 818E2E5 +PalletTown_ProfessorOaksLab_Text_OakThisMonIsEnergetic:: .string "This POKéMON is really quite\n" .string "energetic!$" -PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak:: @ 818E30D +PalletTown_ProfessorOaksLab_Text_ReceivedMonFromOak:: .string "{PLAYER} received the {STR_VAR_1}\n" .string "from PROF. OAK!$" -PalletTown_ProfessorOaksLab_Text_OakCanReachNextTownWithMon:: @ 818E330 +PalletTown_ProfessorOaksLab_Text_OakCanReachNextTownWithMon:: .string "OAK: If a wild POKéMON appears,\n" .string "your POKéMON can battle it.\p" .string "With it at your side, you should be\n" .string "able to reach the next town.$" -PalletTown_ProfessorOaksLab_Text_OakBattleMonForItToGrow:: @ 818E3AD +PalletTown_ProfessorOaksLab_Text_OakBattleMonForItToGrow:: .string "OAK: {PLAYER}, raise your young\n" .string "POKéMON by making it battle.\p" .string "It has to battle for it to grow.$" -PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe:: @ 818E405 +PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe:: .string "OAK: Oh, {PLAYER}!\n" .string "How is my old POKéMON?\p" .string "Well, it seems to be growing more\n" @@ -147,35 +147,35 @@ PalletTown_ProfessorOaksLab_Text_OakHaveSomethingForMe:: @ 818E405 .string "What's that?\n" .string "You have something for me?$" -PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel:: @ 818E4AF +PalletTown_ProfessorOaksLab_Text_DeliveredOaksParcel:: .string "{PLAYER} delivered OAK'S PARCEL.$" -PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered:: @ 818E4CA +PalletTown_ProfessorOaksLab_Text_OakCustomBallIOrdered:: .string "Ah! \n" .string "It's the custom POKé BALL!\p" .string "I had it on order.\n" .string "Thank you!$" -PalletTown_ProfessorOaksLab_Text_OakHaveRequestForYouTwo:: @ 818E508 +PalletTown_ProfessorOaksLab_Text_OakHaveRequestForYouTwo:: .string "OAK: Oh, right!\n" .string "I have a request for you two.$" -PalletTown_ProfessorOaksLab_Text_OakPokedexOnDesk:: @ 818E536 +PalletTown_ProfessorOaksLab_Text_OakPokedexOnDesk:: .string "On the desk there is my invention,\n" .string "the POKéDEX!\p" .string "It automatically records data on\n" .string "POKéMON you've seen or caught.\p" .string "It's a high-tech encyclopedia!$" -PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou:: @ 818E5C5 +PalletTown_ProfessorOaksLab_Text_OakTakeTheseWithYou:: .string "OAK: {PLAYER} and {RIVAL}.\n" .string "Take these with you.$" -PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak:: @ 818E5EA +PalletTown_ProfessorOaksLab_Text_ReceivedPokedexFromOak:: .string "{PLAYER} received the POKéDEX\n" .string "from PROF. OAK.$" -PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese:: @ 818E612 +PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese:: .string "OAK: You can't get detailed data\n" .string "on POKéMON by just seeing them.\p" .string "You must catch them to obtain\n" @@ -183,10 +183,10 @@ PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese:: @ 818E612 .string "So, here are some tools for\n" .string "catching wild POKéMON.$" -PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls:: @ 818E6B3 +PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls:: .string "{PLAYER} received five POKé BALLS.$" -PalletTown_ProfessorOaksLab_Text_OakExplainCatching:: @ 818E6D0 +PalletTown_ProfessorOaksLab_Text_OakExplainCatching:: .string "When a wild POKéMON appears,\n" .string "it's fair game.\p" .string "Just throw a POKé BALL at it and\n" @@ -195,7 +195,7 @@ PalletTown_ProfessorOaksLab_Text_OakExplainCatching:: @ 818E6D0 .string "A healthy POKéMON can escape.\n" .string "You have to be lucky!$" -PalletTown_ProfessorOaksLab_Text_OakCompleteMonGuideWasMyDream:: @ 818E784 +PalletTown_ProfessorOaksLab_Text_OakCompleteMonGuideWasMyDream:: .string "To make a complete guide on all\n" .string "the POKéMON in the world…\p" .string "That was my dream!\p" @@ -207,11 +207,11 @@ PalletTown_ProfessorOaksLab_Text_OakCompleteMonGuideWasMyDream:: @ 818E784 .string "This is a great undertaking in\n" .string "POKéMON history!$" -PalletTown_ProfessorOaksLab_Text_OakMonsAroundWorldWait:: @ 818E871 +PalletTown_ProfessorOaksLab_Text_OakMonsAroundWorldWait:: .string "POKéMON around the world wait for\n" .string "you, {PLAYER}!$" -PalletTown_ProfessorOaksLab_Text_OakAddedNothingToPokedex:: @ 818E89C +PalletTown_ProfessorOaksLab_Text_OakAddedNothingToPokedex:: .string "Ah, {PLAYER}!\n" .string "How is your POKéDEX shaping up?\p" .string "{RIVAL} has already caught some\n" @@ -223,34 +223,34 @@ PalletTown_ProfessorOaksLab_Text_OakAddedNothingToPokedex:: @ 818E89C .string "I'll give you these, so do try a\n" .string "little harder.$" -PalletTown_ProfessorOaksLab_Text_OakComeSeeMeSometime:: @ 818E98E +PalletTown_ProfessorOaksLab_Text_OakComeSeeMeSometime:: .string "OAK: Come see me sometime.\p" .string "After all, I want to know how your\n" .string "POKéDEX is coming along.$" -PalletTown_ProfessorOaksLab_Text_BlankEncyclopedia:: @ 818E9E5 +PalletTown_ProfessorOaksLab_Text_BlankEncyclopedia:: .string "It's like an encyclopedia, but the\n" .string "pages are blank.$" -PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls:: @ 818EA19 +PalletTown_ProfessorOaksLab_Text_ThoseArePokeBalls:: .string "Those are POKé BALLS.\n" .string "They contain POKéMON!$" -PalletTown_ProfessorOaksLab_Text_OaksLastMon:: @ 818EA45 +PalletTown_ProfessorOaksLab_Text_OaksLastMon:: .string "That's PROF. OAK's last POKéMON.$" -PalletTown_ProfessorOaksLab_Text_PressStartToOpenMenu:: @ 818EA66 +PalletTown_ProfessorOaksLab_Text_PressStartToOpenMenu:: .string "Press START to open the MENU!$" -PalletTown_ProfessorOaksLab_Text_SaveOptionInMenu:: @ 818EA84 +PalletTown_ProfessorOaksLab_Text_SaveOptionInMenu:: .string "The SAVE option is on the MENU.\n" .string "Use it regularly.$" -PalletTown_ProfessorOaksLab_Text_AllMonTypesHaveStrongAndWeakPoints:: @ 818EAB6 +PalletTown_ProfessorOaksLab_Text_AllMonTypesHaveStrongAndWeakPoints:: .string "All POKéMON types have strong and\n" .string "weak points against others.$" -PalletTown_ProfessorOaksLab_Text_EmailMessage:: @ 818EAF4 +PalletTown_ProfessorOaksLab_Text_EmailMessage:: .string "There's an e-mail message here.\p" .string "…\p" .string "Finally!\n" @@ -264,11 +264,11 @@ PalletTown_ProfessorOaksLab_Text_EmailMessage:: @ 818EAF4 .string "PROF. OAK, please visit us!\n" .string "…$" -PalletTown_ProfessorOaksLab_Text_StudyAsOaksAide:: @ 818EBE6 +PalletTown_ProfessorOaksLab_Text_StudyAsOaksAide:: .string "I study POKéMON as PROF. OAK's\n" .string "AIDE.$" -PalletTown_ProfessorOaksLab_Text_DaisyWillGroomMons:: @ 818EC0B +PalletTown_ProfessorOaksLab_Text_DaisyWillGroomMons:: .string "Hi, {PLAYER}. I bet you've become\n" .string "good friends with your POKéMON.\p" .string "By the way, did you know about\n" @@ -280,25 +280,25 @@ PalletTown_ProfessorOaksLab_Text_DaisyWillGroomMons:: @ 818EC0B .string "This is a secret, so please don't\n" .string "tell anyone.$" -PalletTown_ProfessorOaksLab_Text_OakIsGoingToHaveRadioShow:: @ 818ED15 +PalletTown_ProfessorOaksLab_Text_OakIsGoingToHaveRadioShow:: .string "PROF. OAK is going to have his own\n" .string "radio show soon.\p" .string "The program will be called PROF.\n" .string "OAK's POKéMON SEMINAR.$" -PalletTown_ProfessorOaksLab_Text_OakIsAuthorityOnMons:: @ 818ED81 +PalletTown_ProfessorOaksLab_Text_OakIsAuthorityOnMons:: .string "PROF. OAK may not look like much,\n" .string "but he's the authority on POKéMON.\p" .string "Many POKéMON TRAINERS hold him in\n" .string "high regard.$" -PalletTown_ProfessorOaksLab_Text_OakFavorToAskYouPlayer:: @ 818EDF5 +PalletTown_ProfessorOaksLab_Text_OakFavorToAskYouPlayer:: .string "Ah, now this is excellent!\p" .string "{PLAYER}, I have another important\n" .string "favor to ask of you.\p" .string "I need you to listen closely.$" -PalletTown_ProfessorOaksLab_Text_OakSightingsOfRareMons:: @ 818EE60 +PalletTown_ProfessorOaksLab_Text_OakSightingsOfRareMons:: .string "Recently, there have been sightings\n" .string "of many rare POKéMON species.\p" .string "I'm talking about POKéMON that\n" @@ -308,7 +308,7 @@ PalletTown_ProfessorOaksLab_Text_OakSightingsOfRareMons:: @ 818EE60 .string "Since I can't do it, {PLAYER}, I'd\n" .string "like you to go in my place.$" -PalletTown_ProfessorOaksLab_Text_RivalJustLetMeHandleEverything:: @ 818EF59 +PalletTown_ProfessorOaksLab_Text_RivalJustLetMeHandleEverything:: .string "{RIVAL}: Hey, I heard that!\p" .string "Gramps, what's with favoring\n" .string "{PLAYER} over me all the time?\p" @@ -317,27 +317,27 @@ PalletTown_ProfessorOaksLab_Text_RivalJustLetMeHandleEverything:: @ 818EF59 .string "You should just let me handle\n" .string "everything.$" -PalletTown_ProfessorOaksLab_Text_OakNeedYourHelpTooNeedToSeePokedexes:: @ 818F004 +PalletTown_ProfessorOaksLab_Text_OakNeedYourHelpTooNeedToSeePokedexes:: .string "OAK: I know, I know.\n" .string "Of course I need your help, too.\p" .string "Now, I need to see both your\n" .string "POKéDEXES.$" -PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits:: @ 818F062 +PalletTown_ProfessorOaksLab_Text_OakTookBothPokedexUnits:: .string "PROF. OAK took both POKéDEX\n" .string "units.$" -PalletTown_ProfessorOaksLab_Text_OakNowTheseUnitsCanRecordMoreData:: @ 818F085 +PalletTown_ProfessorOaksLab_Text_OakNowTheseUnitsCanRecordMoreData:: .string "… … … … … …\p" .string "… … … … … …\p" .string "…And that's done!\p" .string "Now these units can record data on\n" .string "a lot more POKéMON.$" -PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded:: @ 818F0E8 +PalletTown_ProfessorOaksLab_Text_PlayersPokedexWasUpgraded:: .string "{PLAYER}'s POKéDEX was upgraded!$" -PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex:: @ 818F103 +PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex:: .string "Now, {PLAYER} and {RIVAL}!\p" .string "This time, you really must work\n" .string "towards filling your POKéDEXES.\p" @@ -346,7 +346,7 @@ PalletTown_ProfessorOaksLab_Text_OakMustReallyWorkToFillPokedex:: @ 818F103 .string "Truly, this is a monumentally great\n" .string "undertaking in POKéMON history!$" -PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex:: @ 818F1DB +PalletTown_ProfessorOaksLab_Text_RivalIllCompleteThePokedex:: .string "{RIVAL}: Gramps, calm down.\n" .string "Don't get so excited.\p" .string "I'll get the POKéDEX completed,\n" diff --git a/data/maps/PalletTown_RivalsHouse/scripts.inc b/data/maps/PalletTown_RivalsHouse/scripts.inc index 208cd2030..119ccba49 100644 --- a/data/maps/PalletTown_RivalsHouse/scripts.inc +++ b/data/maps/PalletTown_RivalsHouse/scripts.inc @@ -3,27 +3,27 @@ .equ RECEIVED_TOWN_MAP, VAR_TEMP_1 -PalletTown_RivalsHouse_MapScripts:: @ 8168D27 +PalletTown_RivalsHouse_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PalletTown_RivalsHouse_OnTransition .byte 0 -PalletTown_RivalsHouse_OnTransition:: @ 8168D2D +PalletTown_RivalsHouse_OnTransition:: compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 call_if_lt PalletTown_RivalsHouse_EventScript_MoveDaisyToTable compare VAR_MAP_SCENE_PALLET_TOWN_RIVALS_HOUSE, 2 call_if_ge PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap end -PalletTown_RivalsHouse_EventScript_MoveDaisyToTable:: @ 8168D44 +PalletTown_RivalsHouse_EventScript_MoveDaisyToTable:: setobjectmovementtype LOCALID_DAISY, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm LOCALID_DAISY, 5, 4 return -PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap:: @ 8168D50 +PalletTown_RivalsHouse_EventScript_AlreadyReceivedTownMap:: setvar RECEIVED_TOWN_MAP, TRUE return -PalletTown_RivalsHouse_EventScript_Daisy:: @ 8168D56 +PalletTown_RivalsHouse_EventScript_Daisy:: lock faceplayer famechecker FAMECHECKER_DAISY, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 @@ -43,12 +43,12 @@ PalletTown_RivalsHouse_EventScript_Daisy:: @ 8168D56 release end -PalletTown_RivalsHouse_EventScript_HeardBattledRival:: @ 8168DAF +PalletTown_RivalsHouse_EventScript_HeardBattledRival:: msgbox PalletTown_RivalsHouse_Text_HeardYouBattledRival release end -PalletTown_RivalsHouse_EventScript_GroomMon:: @ 8168DB9 +PalletTown_RivalsHouse_EventScript_GroomMon:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 @@ -78,17 +78,17 @@ PalletTown_RivalsHouse_EventScript_GroomMon:: @ 8168DB9 release end -PalletTown_RivalsHouse_EventScript_CantGroomEgg:: @ 8168E32 +PalletTown_RivalsHouse_EventScript_CantGroomEgg:: msgbox PalletTown_RivalsHouse_Text_CantGroomAnEgg release end -PalletTown_RivalsHouse_EventScript_DeclineGrooming:: @ 8168E3C +PalletTown_RivalsHouse_EventScript_DeclineGrooming:: msgbox PalletTown_RivalsHouse_Text_DontNeedAnyGrooming release end -PalletTown_RivalsHouse_EventScript_RateMonFriendship:: @ 8168E46 +PalletTown_RivalsHouse_EventScript_RateMonFriendship:: msgbox PalletTown_RivalsHouse_Text_MayISeeFirstMon specialvar VAR_RESULT, GetLeadMonFriendship switch VAR_RESULT @@ -101,47 +101,47 @@ PalletTown_RivalsHouse_EventScript_RateMonFriendship:: @ 8168E46 case 6, PalletTown_RivalsHouse_EventScript_MonFriendshipHighest end -PalletTown_RivalsHouse_EventScript_MonFriendshipLowest:: @ 8168EA6 +PalletTown_RivalsHouse_EventScript_MonFriendshipLowest:: msgbox PalletTown_RivalsHouse_Text_WhyWouldMonHateYouSoMuch release end -PalletTown_RivalsHouse_EventScript_MonFriendshipLower:: @ 8168EB0 +PalletTown_RivalsHouse_EventScript_MonFriendshipLower:: msgbox PalletTown_RivalsHouse_Text_DontLikeWayItGlaresAtYou release end -PalletTown_RivalsHouse_EventScript_MonFriendshipLow:: @ 8168EBA +PalletTown_RivalsHouse_EventScript_MonFriendshipLow:: msgbox PalletTown_RivalsHouse_Text_NotFamiliarWithYouYet release end -PalletTown_RivalsHouse_EventScript_MonFriendshipMid:: @ 8168EC4 +PalletTown_RivalsHouse_EventScript_MonFriendshipMid:: msgbox PalletTown_RivalsHouse_Text_ItsWarmingUpToYou release end -PalletTown_RivalsHouse_EventScript_MonFriendshipHigh:: @ 8168ECE +PalletTown_RivalsHouse_EventScript_MonFriendshipHigh:: msgbox PalletTown_RivalsHouse_Text_ItsQuiteFriendly release end -PalletTown_RivalsHouse_EventScript_MonFriendshipHigher:: @ 8168ED8 +PalletTown_RivalsHouse_EventScript_MonFriendshipHigher:: msgbox PalletTown_RivalsHouse_Text_ItLooksVeryHappy release end -PalletTown_RivalsHouse_EventScript_MonFriendshipHighest:: @ 8168EE2 +PalletTown_RivalsHouse_EventScript_MonFriendshipHighest:: msgbox PalletTown_RivalsHouse_Text_CouldntLoveYouMore release end -PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest:: @ 8168EEC +PalletTown_RivalsHouse_EventScript_PleaseGiveMonsRest:: msgbox PalletTown_RivalsHouse_Text_PleaseGiveMonsRest release end -PalletTown_RivalsHouse_EventScript_GiveTownMap:: @ 8168EF6 +PalletTown_RivalsHouse_EventScript_GiveTownMap:: msgbox PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp closemessage checkitemspace ITEM_TOWN_MAP, 1 @@ -159,24 +159,24 @@ PalletTown_RivalsHouse_EventScript_GiveTownMap:: @ 8168EF6 release end -PalletTown_RivalsHouse_EventScript_NoRoomForTownMap:: @ 8168F4F +PalletTown_RivalsHouse_EventScript_NoRoomForTownMap:: msgbox PalletTown_RivalsHouse_Text_DontHaveSpaceForThis release end -PalletTown_RivalsHouse_EventScript_ExplainTownMap:: @ 8168F59 +PalletTown_RivalsHouse_EventScript_ExplainTownMap:: msgbox PalletTown_RivalsHouse_Text_ExplainTownMap release end -PalletTown_RivalsHouse_EventScript_TownMap:: @ 8168F63 +PalletTown_RivalsHouse_EventScript_TownMap:: msgbox PalletTown_RivalsHouse_Text_ItsBigMapOfKanto, MSGBOX_NPC end -PalletTown_RivalsHouse_EventScript_Bookshelf:: @ 8168F6C +PalletTown_RivalsHouse_EventScript_Bookshelf:: msgbox PalletTown_RivalsHouse_Text_ShelvesCrammedFullOfBooks, MSGBOX_SIGN end -PalletTown_RivalsHouse_EventScript_Picture:: @ 8168F75 +PalletTown_RivalsHouse_EventScript_Picture:: msgbox PalletTown_RivalsHouse_Text_LovelyAndSweetClefairy, MSGBOX_SIGN end diff --git a/data/maps/PalletTown_RivalsHouse/text.inc b/data/maps/PalletTown_RivalsHouse/text.inc index 319ba6e90..95ba3c061 100644 --- a/data/maps/PalletTown_RivalsHouse/text.inc +++ b/data/maps/PalletTown_RivalsHouse/text.inc @@ -1,47 +1,47 @@ -PalletTown_RivalsHouse_Text_HiBrothersAtLab:: @ 818D58C +PalletTown_RivalsHouse_Text_HiBrothersAtLab:: .string "DAISY: Hi, {PLAYER}!\p" .string "My brother, {RIVAL}, is out at\n" .string "Grandpa's LAB.$" -PalletTown_RivalsHouse_Text_HeardYouBattledRival:: @ 818D5C4 +PalletTown_RivalsHouse_Text_HeardYouBattledRival:: .string "DAISY: {PLAYER}, I heard you had\n" .string "a battle against {RIVAL}.\p" .string "I wish I'd seen that!$" -PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp:: @ 818D60A +PalletTown_RivalsHouse_Text_ErrandForGrandpaThisWillHelp:: .string "Grandpa asked you to run an\n" .string "errand?\p" .string "Gee, that's lazy of him.\n" .string "Here, this will help you.$" -PalletTown_RivalsHouse_Text_ReceivedTownMapFromDaisy:: @ 818D661 +PalletTown_RivalsHouse_Text_ReceivedTownMapFromDaisy:: .string "{PLAYER} received a TOWN MAP\n" .string "from DAISY.$" -PalletTown_RivalsHouse_Text_DontHaveSpaceForThis:: @ 818D684 +PalletTown_RivalsHouse_Text_DontHaveSpaceForThis:: .string "You don't have space for this in\n" .string "your BAG.$" -PalletTown_RivalsHouse_Text_ExplainTownMap:: @ 818D6AF +PalletTown_RivalsHouse_Text_ExplainTownMap:: .string "You can use the TOWN MAP to find\n" .string "out where you are, or check the\l" .string "names of places.$" -PalletTown_RivalsHouse_Text_PleaseGiveMonsRest:: @ 818D701 +PalletTown_RivalsHouse_Text_PleaseGiveMonsRest:: .string "DAISY: Just like people, POKéMON\n" .string "are living things.\p" .string "When they get tired, please give\n" .string "them a rest.$" -PalletTown_RivalsHouse_Text_ItsBigMapOfKanto:: @ 818D763 +PalletTown_RivalsHouse_Text_ItsBigMapOfKanto:: .string "It's a big map of the KANTO region.\n" .string "Now this would be useful!$" -PalletTown_RivalsHouse_Text_ShelvesCrammedFullOfBooks:: @ 818D7A1 +PalletTown_RivalsHouse_Text_ShelvesCrammedFullOfBooks:: .string "The shelves are crammed full of\n" .string "books on POKéMON.$" -PalletTown_RivalsHouse_Text_LikeMeToGroomMon:: @ 818D7D3 +PalletTown_RivalsHouse_Text_LikeMeToGroomMon:: .string "DAISY: Hi, {PLAYER}!\n" .string "Good timing.\p" .string "I'm about to have some tea.\n" @@ -50,72 +50,72 @@ PalletTown_RivalsHouse_Text_LikeMeToGroomMon:: @ 818D7D3 .string "Your POKéMON are a little dirty.\p" .string "Would you like me to groom one?$" -PalletTown_RivalsHouse_Text_DontNeedAnyGrooming:: @ 818D875 +PalletTown_RivalsHouse_Text_DontNeedAnyGrooming:: .string "You don't need any grooming done?\n" .string "Okay, we'll just have tea.$" -PalletTown_RivalsHouse_Text_GroomWhichOne:: @ 818D8B2 +PalletTown_RivalsHouse_Text_GroomWhichOne:: .string "Which one should I groom?$" -PalletTown_RivalsHouse_Text_LookingNiceInNoTime:: @ 818D8CC +PalletTown_RivalsHouse_Text_LookingNiceInNoTime:: .string "DAISY: Okay, I'll get it looking\n" .string "nice in no time.$" -PalletTown_RivalsHouse_Text_ThereYouGoAllDone:: @ 818D8FE +PalletTown_RivalsHouse_Text_ThereYouGoAllDone:: .string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p" .string "{SIZE}ÈDAISY: There you go! All done.\n" .string "See? Doesn't it look nice?\p" .string "Giggle…\n" .string "It's such a cute POKéMON.$" -PalletTown_RivalsHouse_Text_CantGroomAnEgg:: @ 818D97B +PalletTown_RivalsHouse_Text_CantGroomAnEgg:: .string "Oh, sorry. I honestly can't\n" .string "groom an EGG.$" -PalletTown_RivalsHouse_Text_MayISeeFirstMon:: @ 818D9A5 +PalletTown_RivalsHouse_Text_MayISeeFirstMon:: .string "DAISY: Your POKéMON grow to love\n" .string "you if you raise them with love.\p" .string "For example, {PLAYER}, may I see\n" .string "your first POKéMON?$" -PalletTown_RivalsHouse_Text_CouldntLoveYouMore:: @ 818DA16 +PalletTown_RivalsHouse_Text_CouldntLoveYouMore:: .string "It couldn't possibly love you\n" .string "any more than it does now.\p" .string "Your POKéMON is happy beyond\n" .string "words.$" -PalletTown_RivalsHouse_Text_ItLooksVeryHappy:: @ 818DA73 +PalletTown_RivalsHouse_Text_ItLooksVeryHappy:: .string "It looks very happy.\p" .string "I wish {RIVAL} could see this and\n" .string "learn something from it.$" -PalletTown_RivalsHouse_Text_ItsQuiteFriendly:: @ 818DABE +PalletTown_RivalsHouse_Text_ItsQuiteFriendly:: .string "It's quite friendly with you.\n" .string "Keep being good to it!$" -PalletTown_RivalsHouse_Text_ItsWarmingUpToYou:: @ 818DAF3 +PalletTown_RivalsHouse_Text_ItsWarmingUpToYou:: .string "It's warming up to you.\n" .string "Trust must be growing between you.$" -PalletTown_RivalsHouse_Text_NotFamiliarWithYouYet:: @ 818DB2E +PalletTown_RivalsHouse_Text_NotFamiliarWithYouYet:: .string "It's not quite familiar with you\n" .string "yet.\p" .string "POKéMON are all quite wary when\n" .string "you first get them.$" -PalletTown_RivalsHouse_Text_DontLikeWayItGlaresAtYou:: @ 818DB88 +PalletTown_RivalsHouse_Text_DontLikeWayItGlaresAtYou:: .string "{PLAYER}, I don't like the way it\n" .string "glares at you.\p" .string "Could you try being a little nicer\n" .string "to it?$" -PalletTown_RivalsHouse_Text_WhyWouldMonHateYouSoMuch:: @ 818DBDD +PalletTown_RivalsHouse_Text_WhyWouldMonHateYouSoMuch:: .string "…Um, it's not easy for me to say\n" .string "this, but…\p" .string "Is there some reason why your\n" .string "POKéMON would hate you so much?$" -PalletTown_RivalsHouse_Text_LovelyAndSweetClefairy:: @ 818DC47 +PalletTown_RivalsHouse_Text_LovelyAndSweetClefairy:: .string "“The lovely and sweet\n" .string "CLEFAIRY”$" diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 2d0320b10..42cfcbca2 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -2,18 +2,18 @@ .equ LOCALID_GYM_GUIDE, 5 .equ LOCALID_AIDE, 7 -PewterCity_MapScripts:: @ 8165B8E +PewterCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_OnTransition .byte 0 -PewterCity_OnTransition:: @ 8165B94 +PewterCity_OnTransition:: setworldmapflag FLAG_WORLD_MAP_PEWTER_CITY setvar VAR_MAP_SCENE_PEWTER_CITY_MUSEUM_1F, 0 end @ Impossible to speak to this NPC from a facing dir != DIR_EAST normally, so they arent checked @ Additionally, no movement script exists for facing DIR_SOUTH, which would necessitate walking out of bounds -PewterCity_EventScript_GymGuide:: @ 8165B9D +PewterCity_EventScript_GymGuide:: lock faceplayer msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe @@ -31,7 +31,7 @@ PewterCity_EventScript_GymGuide:: @ 8165B9D release end -PewterCity_EventScript_WalkToGymEast:: @ 8165BD3 +PewterCity_EventScript_WalkToGymEast:: applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideEast applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadEast waitmovement 0 @@ -41,7 +41,7 @@ PewterCity_EventScript_WalkToGymEast:: @ 8165BD3 return @ Unused -PewterCity_EventScript_WalkToGymWest:: @ 8165BF6 +PewterCity_EventScript_WalkToGymWest:: applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideWest applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadWest waitmovement 0 @@ -51,7 +51,7 @@ PewterCity_EventScript_WalkToGymWest:: @ 8165BF6 return @ Unused -PewterCity_EventScript_WalkToGymNorth:: @ 8165C19 +PewterCity_EventScript_WalkToGymNorth:: applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWaitForGuideNorth applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadNorth waitmovement 0 @@ -166,23 +166,23 @@ PewterCity_EventScript_WalkToGymNorth:: @ 8165C19 walk_right .endm -PewterCity_Movement_PlayerWaitForGuideEast:: @ 8165C3C +PewterCity_Movement_PlayerWaitForGuideEast:: delay_16 delay_16 delay_4 walk_in_place_fastest_down step_end -PewterCity_Movement_PlayerWalkToGymEast:: @ 8165C41 +PewterCity_Movement_PlayerWalkToGymEast:: walk_down walk_to_gym step_end -PewterCity_Movement_PlayerWaitForGuideWest:: @ 8165C80 +PewterCity_Movement_PlayerWaitForGuideWest:: delay_16 step_end -PewterCity_Movement_PlayerWalkToGymWest:: @ 8165C82 +PewterCity_Movement_PlayerWalkToGymWest:: walk_left walk_left walk_left @@ -191,11 +191,11 @@ PewterCity_Movement_PlayerWalkToGymWest:: @ 8165C82 walk_to_gym_alt step_end -PewterCity_Movement_PlayerWaitForGuideNorth:: @ 8165CAF +PewterCity_Movement_PlayerWaitForGuideNorth:: delay_16 step_end -PewterCity_Movement_PlayerWalkToGymNorth:: @ 8165CB1 +PewterCity_Movement_PlayerWalkToGymNorth:: walk_up walk_left walk_left @@ -204,24 +204,24 @@ PewterCity_Movement_PlayerWalkToGymNorth:: @ 8165CB1 walk_to_gym_alt step_end -PewterCity_Movement_GuideMoveToLeadEast:: @ 8165CDE +PewterCity_Movement_GuideMoveToLeadEast:: walk_down walk_left walk_in_place_fastest_up walk_in_place_up step_end -PewterCity_Movement_GuideWalkToGymEast:: @ 8165CE3 +PewterCity_Movement_GuideWalkToGymEast:: walk_to_gym walk_right walk_in_place_fastest_left step_end -PewterCity_Movement_GuideMoveToLeadWest:: @ 8165D23 +PewterCity_Movement_GuideMoveToLeadWest:: walk_in_place_right step_end -PewterCity_Movement_GuideWalkToGymWest:: @ 8165D25 +PewterCity_Movement_GuideWalkToGymWest:: walk_left walk_left walk_left @@ -231,11 +231,11 @@ PewterCity_Movement_GuideWalkToGymWest:: @ 8165D25 walk_in_place_fastest_left step_end -PewterCity_Movement_GuideMoveToLeadNorth:: @ 8165D53 +PewterCity_Movement_GuideMoveToLeadNorth:: walk_in_place_down step_end -PewterCity_Movement_GuideWalkToGymNorth:: @ 8165D55 +PewterCity_Movement_GuideWalkToGymNorth:: walk_left walk_left walk_left @@ -245,7 +245,7 @@ PewterCity_Movement_GuideWalkToGymNorth:: @ 8165D55 walk_in_place_fastest_left step_end -PewterCity_Movement_GymGuideExit:: @ 8165D83 +PewterCity_Movement_GymGuideExit:: walk_down walk_left walk_left @@ -258,32 +258,32 @@ PewterCity_Movement_GymGuideExit:: @ 8165D83 walk_left step_end -PewterCity_EventScript_GymGuideTriggerTop:: @ 8165D8E +PewterCity_EventScript_GymGuideTriggerTop:: lockall setvar VAR_TEMP_1, 0 goto PewterCity_EventScript_GymGuideTrigger end -PewterCity_EventScript_GymGuideTriggerMid:: @ 8165D9A +PewterCity_EventScript_GymGuideTriggerMid:: lockall setvar VAR_TEMP_1, 1 goto PewterCity_EventScript_GymGuideTrigger end -PewterCity_EventScript_GymGuideTriggerBottom:: @ 8165DA6 +PewterCity_EventScript_GymGuideTriggerBottom:: lockall setvar VAR_TEMP_1, 2 goto PewterCity_EventScript_GymGuideTrigger end @ This trigger is inaccessible and its corresponding movement script isnt linked -PewterCity_EventScript_GymGuideTriggerRight:: @ 8165DB2 +PewterCity_EventScript_GymGuideTriggerRight:: lockall setvar VAR_TEMP_1, 3 goto PewterCity_EventScript_GymGuideTrigger end -PewterCity_EventScript_GymGuideTrigger:: @ 8165DBE +PewterCity_EventScript_GymGuideTrigger:: textcolor 0 msgbox PewterCity_Text_BrocksLookingForChallengersFollowMe closemessage @@ -304,7 +304,7 @@ PewterCity_EventScript_GymGuideTrigger:: @ 8165DBE releaseall end -PewterCity_EventScript_WalkToGymTop:: @ 8165E0A +PewterCity_EventScript_WalkToGymTop:: applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadTop waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymTop @@ -312,7 +312,7 @@ PewterCity_EventScript_WalkToGymTop:: @ 8165E0A waitmovement 0 return -PewterCity_EventScript_WalkToGymMid:: @ 8165E26 +PewterCity_EventScript_WalkToGymMid:: applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadMid waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymMid @@ -320,7 +320,7 @@ PewterCity_EventScript_WalkToGymMid:: @ 8165E26 waitmovement 0 return -PewterCity_EventScript_WalkToGymBottom:: @ 8165E42 +PewterCity_EventScript_WalkToGymBottom:: applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideMoveToLeadBottom waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymBottom @@ -329,7 +329,7 @@ PewterCity_EventScript_WalkToGymBottom:: @ 8165E42 return @ Unused -PewterCity_EventScript_WalkToGymRight:: @ 8165E5E +PewterCity_EventScript_WalkToGymRight:: applymovement LOCALID_GYM_GUIDE, PewterCity_Movement_GuideApproachPlayerRight waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToGymRight @@ -337,25 +337,25 @@ PewterCity_EventScript_WalkToGymRight:: @ 8165E5E waitmovement 0 return -PewterCity_Movement_PlayerWalkToGymTop:: @ 8165E7A +PewterCity_Movement_PlayerWalkToGymTop:: walk_left walk_to_gym step_end -PewterCity_Movement_PlayerWalkToGymMid:: @ 8165EB9 +PewterCity_Movement_PlayerWalkToGymMid:: walk_up walk_left walk_to_gym step_end -PewterCity_Movement_PlayerWalkToGymBottom:: @ 8165EF9 +PewterCity_Movement_PlayerWalkToGymBottom:: walk_up walk_up walk_left walk_to_gym step_end -PewterCity_Movement_PlayerWalkToGymRight:: @ 8165F3A +PewterCity_Movement_PlayerWalkToGymRight:: walk_left walk_left walk_left @@ -369,25 +369,25 @@ PewterCity_Movement_PlayerWalkToGymRight:: @ 8165F3A walk_to_gym_alt step_end -PewterCity_Movement_GuideMoveToLeadTop:: @ 8165F6C +PewterCity_Movement_GuideMoveToLeadTop:: walk_left walk_down walk_in_place_fastest_right walk_in_place_right step_end -PewterCity_Movement_GuideMoveToLeadMid:: @ 8165F71 +PewterCity_Movement_GuideMoveToLeadMid:: walk_down walk_in_place_down step_end -PewterCity_Movement_GuideMoveToLeadBottom:: @ 8165F74 +PewterCity_Movement_GuideMoveToLeadBottom:: walk_down walk_down walk_in_place_down step_end -PewterCity_Movement_GuideApproachPlayerRight:: @ 8165F78 +PewterCity_Movement_GuideApproachPlayerRight:: walk_down walk_down walk_right @@ -396,20 +396,20 @@ PewterCity_Movement_GuideApproachPlayerRight:: @ 8165F78 walk_in_place_right step_end -PewterCity_Movement_GuideWalkToGymTop:: @ 8165F7F +PewterCity_Movement_GuideWalkToGymTop:: walk_to_gym walk_right walk_in_place_fastest_left step_end -PewterCity_Movement_GuideWalkToGymMid:: @ 8165FBF +PewterCity_Movement_GuideWalkToGymMid:: walk_left walk_to_gym walk_right walk_in_place_fastest_left step_end -PewterCity_Movement_GuideWalkToGymBottom:: @ 8166000 +PewterCity_Movement_GuideWalkToGymBottom:: walk_up walk_left walk_to_gym @@ -417,7 +417,7 @@ PewterCity_Movement_GuideWalkToGymBottom:: @ 8166000 walk_in_place_fastest_left step_end -PewterCity_Movement_GuideWalkToGymRight:: @ 8166042 +PewterCity_Movement_GuideWalkToGymRight:: walk_left walk_left walk_left @@ -432,11 +432,11 @@ PewterCity_Movement_GuideWalkToGymRight:: @ 8166042 walk_in_place_fastest_left step_end -PewterCity_EventScript_Lass:: @ 8166075 +PewterCity_EventScript_Lass:: msgbox PewterCity_Text_ClefairyCameFromMoon, MSGBOX_NPC end -PewterCity_EventScript_MuseumGuide:: @ 816607E +PewterCity_EventScript_MuseumGuide:: lock faceplayer msgbox PewterCity_Text_DidYouCheckOutMuseum, MSGBOX_YESNO @@ -465,31 +465,31 @@ PewterCity_EventScript_MuseumGuide:: @ 816607E release end -PewterCity_EventScript_LeadToMuseumNorth:: @ 81660EE +PewterCity_EventScript_LeadToMuseumNorth:: applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumNorth applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumNorth waitmovement 0 return -PewterCity_EventScript_LeadToMuseumSouth:: @ 8166100 +PewterCity_EventScript_LeadToMuseumSouth:: applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumSouth applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumSouth waitmovement 0 return -PewterCity_EventScript_LeadToMuseumWest:: @ 8166112 +PewterCity_EventScript_LeadToMuseumWest:: applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumWest applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumWest waitmovement 0 return -PewterCity_EventScript_LeadToMuseumEast:: @ 8166124 +PewterCity_EventScript_LeadToMuseumEast:: applymovement LOCALID_MUSEUM_GUIDE, PewterCity_Movement_GuideWalkToMuseumEast applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Movement_PlayerWalkToMuseumEast waitmovement 0 return -PewterCity_EventScript_CheckedOutMuseum:: @ 8166136 +PewterCity_EventScript_CheckedOutMuseum:: msgbox PewterCity_Text_WerentThoseFossilsAmazing release end @@ -546,20 +546,20 @@ PewterCity_EventScript_CheckedOutMuseum:: @ 8166136 walk_left .endm -PewterCity_Movement_PlayerWalkToMuseumNorth:: @ 8166140 +PewterCity_Movement_PlayerWalkToMuseumNorth:: walk_up walk_to_museum delay_8 walk_in_place_fastest_up step_end -PewterCity_Movement_GuideWalkToMuseumNorth:: @ 816615C +PewterCity_Movement_GuideWalkToMuseumNorth:: walk_to_museum walk_left walk_in_place_fastest_up step_end -PewterCity_Movement_PlayerWalkToMuseumSouth:: @ 8166177 +PewterCity_Movement_PlayerWalkToMuseumSouth:: delay_16 delay_16 walk_left @@ -568,7 +568,7 @@ PewterCity_Movement_PlayerWalkToMuseumSouth:: @ 8166177 walk_in_place_fastest_up step_end -PewterCity_Movement_GuideWalkToMuseumSouth:: @ 8166193 +PewterCity_Movement_GuideWalkToMuseumSouth:: walk_left walk_up walk_to_museum_south @@ -576,33 +576,33 @@ PewterCity_Movement_GuideWalkToMuseumSouth:: @ 8166193 walk_in_place_fastest_up step_end -PewterCity_Movement_PlayerWalkToMuseumWest:: @ 81661AE +PewterCity_Movement_PlayerWalkToMuseumWest:: walk_left walk_to_museum delay_8 walk_in_place_fastest_up step_end -PewterCity_Movement_GuideWalkToMuseumWest:: @ 81661CA +PewterCity_Movement_GuideWalkToMuseumWest:: walk_to_museum walk_left walk_in_place_fastest_up step_end -PewterCity_Movement_PlayerWalkToMuseumEast:: @ 81661E5 +PewterCity_Movement_PlayerWalkToMuseumEast:: walk_right walk_to_museum delay_8 walk_in_place_fastest_up step_end -PewterCity_Movement_GuideWalkToMuseumEast:: @ 8166201 +PewterCity_Movement_GuideWalkToMuseumEast:: walk_to_museum walk_left walk_in_place_fastest_up step_end -PewterCity_Movement_MuseumGuideExit:: @ 816621C +PewterCity_Movement_MuseumGuideExit:: walk_down walk_right walk_right @@ -619,7 +619,7 @@ PewterCity_Movement_MuseumGuideExit:: @ 816621C walk_right step_end -PewterCity_EventScript_FatMan:: @ 816622B +PewterCity_EventScript_FatMan:: lock faceplayer famechecker FAMECHECKER_BROCK, 2 @@ -627,7 +627,7 @@ PewterCity_EventScript_FatMan:: @ 816622B release end -PewterCity_EventScript_BugCatcher:: @ 8166244 +PewterCity_EventScript_BugCatcher:: lock faceplayer msgbox PewterCity_Text_DoYouKnowWhatImDoing, MSGBOX_YESNO @@ -637,35 +637,35 @@ PewterCity_EventScript_BugCatcher:: @ 8166244 release end -PewterCity_EventScript_KnowWhatTheyreDoing:: @ 8166263 +PewterCity_EventScript_KnowWhatTheyreDoing:: msgbox PewterCity_Text_ThatsRightItsHardWork release end -PewterCity_EventScript_TrainerTips:: @ 816626D +PewterCity_EventScript_TrainerTips:: msgbox PewterCity_Text_TrainerTipsEarningEXP, MSGBOX_SIGN end -PewterCity_EventScript_PoliceNotice:: @ 8166276 +PewterCity_EventScript_PoliceNotice:: msgbox PewterCity_Text_CallPoliceIfInfoOnThieves, MSGBOX_SIGN end -PewterCity_EventScript_MuseumSign:: @ 816627F +PewterCity_EventScript_MuseumSign:: msgbox PewterCity_Text_MuseumOfScience, MSGBOX_SIGN end -PewterCity_EventScript_GymSign:: @ 8166288 +PewterCity_EventScript_GymSign:: lockall famechecker FAMECHECKER_BROCK, 0 msgbox PewterCity_Text_GymSign releaseall end -PewterCity_EventScript_CitySign:: @ 81662A0 +PewterCity_EventScript_CitySign:: msgbox PewterCity_Text_CitySign, MSGBOX_SIGN end -PewterCity_EventScript_RunningShoesAide:: @ 81662A9 +PewterCity_EventScript_RunningShoesAide:: lock faceplayer setvar VAR_TEMP_1, 0 @@ -673,28 +673,28 @@ PewterCity_EventScript_RunningShoesAide:: @ 81662A9 release end -PewterCity_EventScript_RunningShoesAideTriggerTop:: @ 81662B7 +PewterCity_EventScript_RunningShoesAideTriggerTop:: lockall setvar VAR_TEMP_1, 1 call PewterCity_EventScript_AideGiveRunningShoes releaseall end -PewterCity_EventScript_RunningShoesAideTriggerMid:: @ 81662C4 +PewterCity_EventScript_RunningShoesAideTriggerMid:: lockall setvar VAR_TEMP_1, 2 call PewterCity_EventScript_AideGiveRunningShoes releaseall end -PewterCity_EventScript_RunningShoesAideTriggerBottom:: @ 81662D1 +PewterCity_EventScript_RunningShoesAideTriggerBottom:: lockall setvar VAR_TEMP_1, 3 call PewterCity_EventScript_AideGiveRunningShoes releaseall end -PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE +PewterCity_EventScript_AideGiveRunningShoes:: textcolor 0 compare VAR_TEMP_1, 1 call_if_eq PewterCity_EventScript_AideNoticePlayer @@ -748,24 +748,24 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE setvar VAR_MAP_SCENE_PEWTER_CITY, 2 return -PewterCity_EventScript_AideNoticePlayer:: @ 81663CA +PewterCity_EventScript_AideNoticePlayer:: applymovement LOCALID_AIDE, Movement_WalkInPlaceFastestDown waitmovement 0 return @ Aide already at player -PewterCity_EventScript_AideApproachPlayer0:: @ 81663D5 +PewterCity_EventScript_AideApproachPlayer0:: closemessage delay 20 return -PewterCity_EventScript_AideApproachPlayer1:: @ 81663DA +PewterCity_EventScript_AideApproachPlayer1:: closemessage applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -PewterCity_EventScript_AideApproachPlayer2:: @ 81663E6 +PewterCity_EventScript_AideApproachPlayer2:: closemessage applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerMid waitmovement 0 @@ -773,7 +773,7 @@ PewterCity_EventScript_AideApproachPlayer2:: @ 81663E6 waitmovement 0 return -PewterCity_EventScript_AideApproachPlayer3:: @ 81663FC +PewterCity_EventScript_AideApproachPlayer3:: closemessage applymovement LOCALID_AIDE, PewterCity_Movement_AideApproachPlayerBottom waitmovement 0 @@ -781,38 +781,38 @@ PewterCity_EventScript_AideApproachPlayer3:: @ 81663FC waitmovement 0 return -PewterCity_EventScript_AideExit0:: @ 8166412 +PewterCity_EventScript_AideExit0:: applymovement LOCALID_AIDE, PewterCity_Movement_AideExit0 waitmovement 0 return -PewterCity_EventScript_AideExit1:: @ 816641D +PewterCity_EventScript_AideExit1:: applymovement LOCALID_AIDE, PewterCity_Movement_AideExit1 waitmovement 0 return -PewterCity_EventScript_AideExit2:: @ 8166428 +PewterCity_EventScript_AideExit2:: applymovement LOCALID_AIDE, PewterCity_Movement_AideExit2 waitmovement 0 return -PewterCity_EventScript_AideExit3:: @ 8166433 +PewterCity_EventScript_AideExit3:: applymovement LOCALID_AIDE, PewterCity_Movement_AideExit3 waitmovement 0 return -PewterCity_Movement_AideApproachPlayerMid:: @ 816643E +PewterCity_Movement_AideApproachPlayerMid:: delay_4 walk_down step_end -PewterCity_Movement_AideApproachPlayerBottom:: @ 8166441 +PewterCity_Movement_AideApproachPlayerBottom:: delay_4 walk_down walk_down step_end -PewterCity_Movement_AideExit0:: @ 8166445 +PewterCity_Movement_AideExit0:: walk_down walk_left walk_left @@ -825,7 +825,7 @@ PewterCity_Movement_AideExit0:: @ 8166445 walk_left step_end -PewterCity_Movement_AideExit1:: @ 8166450 +PewterCity_Movement_AideExit1:: walk_left walk_down walk_left @@ -838,7 +838,7 @@ PewterCity_Movement_AideExit1:: @ 8166450 walk_left step_end -PewterCity_Movement_AideExit2:: @ 816645B +PewterCity_Movement_AideExit2:: walk_left walk_left walk_left @@ -850,7 +850,7 @@ PewterCity_Movement_AideExit2:: @ 816645B walk_left step_end -PewterCity_Movement_AideExit3:: @ 8166465 +PewterCity_Movement_AideExit3:: walk_left walk_left walk_left @@ -863,6 +863,6 @@ PewterCity_Movement_AideExit3:: @ 8166465 step_end @ Unused -PewterCity_Movement_WalkInPlaceLeft:: @ 816646F +PewterCity_Movement_WalkInPlaceLeft:: walk_in_place_left step_end diff --git a/data/maps/PewterCity/text.inc b/data/maps/PewterCity/text.inc index fbd6f40f4..2adeb55d6 100644 --- a/data/maps/PewterCity/text.inc +++ b/data/maps/PewterCity/text.inc @@ -1,4 +1,4 @@ -Text_DreamEaterTeach:: @ 817E316 +Text_DreamEaterTeach:: .string "Yawn!\n" .string "I must have dozed off in the sun.\p" .string "I had this weird dream about\n" @@ -9,24 +9,24 @@ Text_DreamEaterTeach:: @ 817E316 .string "Let me teach it to a POKéMON so\n" .string "I can forget about it!$" -Text_DreamEaterDeclined:: @ 817E3E9 +Text_DreamEaterDeclined:: .string "…Snore…$" -Text_DreamEaterWhichMon:: @ 817E3F1 +Text_DreamEaterWhichMon:: .string "Which POKéMON wants to learn\n" .string "DREAM EATER?$" -Text_DreamEaterTaught:: @ 817E41B +Text_DreamEaterTaught:: .string "…ZZZ…\n" .string "I…can't eat…anymore…$" -PewterCity_Text_ClefairyCameFromMoon:: @ 817E436 +PewterCity_Text_ClefairyCameFromMoon:: .string "CLEFAIRY came from the moon.\n" .string "That's what the rumor is.\p" .string "They appeared after MOON STONES\n" .string "fell on MT. MOON.$" -PewterCity_Text_BrockOnlySeriousTrainerHere:: @ 817E49F +PewterCity_Text_BrockOnlySeriousTrainerHere:: .string "There aren't many serious POKéMON\n" .string "TRAINERS here.\p" .string "They're all like BUG CATCHERS,\n" @@ -34,82 +34,82 @@ PewterCity_Text_BrockOnlySeriousTrainerHere:: @ 817E49F .string "But PEWTER GYM's BROCK isn't like\n" .string "that, not one bit.$" -PewterCity_Text_DidYouCheckOutMuseum:: @ 817E53E +PewterCity_Text_DidYouCheckOutMuseum:: .string "Did you check out the MUSEUM?$" -PewterCity_Text_WerentThoseFossilsAmazing:: @ 817E55C +PewterCity_Text_WerentThoseFossilsAmazing:: .string "Weren't those fossils from MT. MOON\n" .string "amazing?$" -PewterCity_Text_ReallyYouHaveToGo:: @ 817E589 +PewterCity_Text_ReallyYouHaveToGo:: .string "Really?\n" .string "You absolutely have to go!$" -PewterCity_Text_ThisIsTheMuseum:: @ 817E5AC +PewterCity_Text_ThisIsTheMuseum:: .string "This is it, the MUSEUM.\p" .string "You have to pay to get in, but it's\n" .string "worth it. See you around!$" -PewterCity_Text_DoYouKnowWhatImDoing:: @ 817E602 +PewterCity_Text_DoYouKnowWhatImDoing:: .string "Psssst!\n" .string "Do you know what I'm doing?$" -PewterCity_Text_ThatsRightItsHardWork:: @ 817E626 +PewterCity_Text_ThatsRightItsHardWork:: .string "That's right!\n" .string "It's hard work!$" -PewterCity_Text_SprayingRepelToKeepWildMonsOut:: @ 817E644 +PewterCity_Text_SprayingRepelToKeepWildMonsOut:: .string "I'm spraying REPEL to keep wild\n" .string "POKéMON out of my garden!$" -PewterCity_Text_BrocksLookingForChallengersFollowMe:: @ 817E67E +PewterCity_Text_BrocksLookingForChallengersFollowMe:: .string "You're a TRAINER, right?\p" .string "BROCK's looking for new\n" .string "challengers. Follow me!$" -PewterCity_Text_GoTakeOnBrock:: @ 817E6C7 +PewterCity_Text_GoTakeOnBrock:: .string "If you have the right stuff,\n" .string "go take on BROCK!$" -PewterCity_Text_TrainerTipsEarningEXP:: @ 817E6F6 +PewterCity_Text_TrainerTipsEarningEXP:: .string "TRAINER TIPS\p" .string "All POKéMON that appear in battle,\n" .string "however briefly, earn EXP Points.$" -PewterCity_Text_CallPoliceIfInfoOnThieves:: @ 817E748 +PewterCity_Text_CallPoliceIfInfoOnThieves:: .string "NOTICE!\p" .string "Thieves have been stealing POKéMON\n" .string "fossils from MT. MOON.\p" .string "Please call the PEWTER POLICE if\n" .string "you have any information.$" -PewterCity_Text_MuseumOfScience:: @ 817E7C5 +PewterCity_Text_MuseumOfScience:: .string "PEWTER MUSEUM OF SCIENCE$" -PewterCity_Text_GymSign:: @ 817E7DE +PewterCity_Text_GymSign:: .string "PEWTER CITY POKéMON GYM\n" .string "LEADER: BROCK\l" .string "The Rock-Solid POKéMON TRAINER!$" -PewterCity_Text_CitySign:: @ 817E824 +PewterCity_Text_CitySign:: .string "PEWTER CITY\n" .string "A Stone Gray City$" @ The below 3 JP texts are unused. Possibly a cut NPC meant to give the player the Berry Pouch -PewterCity_Text_DefeatedBrockYouCanHaveTreasure:: @ 817E842 +PewterCity_Text_DefeatedBrockYouCanHaveTreasure:: .string "あッれー！\n" .string "その　ジムバッジ‥‥\l" .string "すげえな　タケシに　かったのかよ！\p" .string "かんどう　したから\n" .string "おれの　たからもの　やるよ！$" -PewterCity_Text_BerriesInsideUseCarefully:: @ 817E87E +PewterCity_Text_BerriesInsideUseCarefully:: .string "なかには　きのみが　はいってるぜ\p" .string "やくに　たつ　きのみも\n" .string "はいって　いるから\l" .string "だいじに　つかって　くれよ！$" -PewterCity_Text_MonsWillUseHeldBerriesOnTheirOwn:: @ 817E8B4 +PewterCity_Text_MonsWillUseHeldBerriesOnTheirOwn:: .string "ポケモンに　きのみを\n" .string "もたせて　おけば\l" .string "たたかっている　ときに\l" @@ -117,33 +117,33 @@ PewterCity_Text_MonsWillUseHeldBerriesOnTheirOwn:: @ 817E8B4 .string "キズぐすり　とか　どくけし　より\n" .string "てがるで　べんり　だろ？$" -PewterCity_Text_OhPlayer:: @ 817E902 +PewterCity_Text_OhPlayer:: .string "Oh, {PLAYER}{KUN}!$" -PewterCity_Text_AskedToDeliverThis:: @ 817E90C +PewterCity_Text_AskedToDeliverThis:: .string "I'm glad I caught up to you.\n" .string "I'm PROF. OAK's AIDE.\p" .string "I've been asked to deliver this,\n" .string "so here you go.$" -PewterCity_Text_ReceivedRunningShoesFromAide:: @ 817E970 +PewterCity_Text_ReceivedRunningShoesFromAide:: .string "{PLAYER} received the\n" .string "RUNNING SHOES from the AIDE.$" -PewterCity_Text_SwitchedShoesWithRunningShoes:: @ 817E99D +PewterCity_Text_SwitchedShoesWithRunningShoes:: .string "{PLAYER} switched shoes with the\n" .string "RUNNING SHOES.$" -PewterCity_Text_ExplainRunningShoes:: @ 817E9C7 +PewterCity_Text_ExplainRunningShoes:: .string "Press the B Button to run.\n" .string "But only where there's room to run!$" -PewterCity_Text_MustBeGoingBackToLab:: @ 817EA06 +PewterCity_Text_MustBeGoingBackToLab:: .string "Well, I must be going back to\n" .string "the LAB.\p" .string "Bye-bye!$" -PewterCity_Text_RunningShoesLetterFromMom:: @ 817EA36 +PewterCity_Text_RunningShoesLetterFromMom:: .string "There's a letter attached…\p" .string "Dear {PLAYER},\p" .string "Here is a pair of RUNNING SHOES\n" diff --git a/data/maps/PewterCity_Gym/scripts.inc b/data/maps/PewterCity_Gym/scripts.inc index 341fee207..0ab615946 100644 --- a/data/maps/PewterCity_Gym/scripts.inc +++ b/data/maps/PewterCity_Gym/scripts.inc @@ -1,7 +1,7 @@ -PewterCity_Gym_MapScripts:: @ 816A592 +PewterCity_Gym_MapScripts:: .byte 0 -PewterCity_Gym_EventScript_Brock:: @ 816A593 +PewterCity_Gym_EventScript_Brock:: famechecker FAMECHECKER_BROCK, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle_single TRAINER_LEADER_BROCK, PewterCity_Gym_Text_BrockIntro, PewterCity_Gym_Text_BrockDefeat, PewterCity_Gym_EventScript_DefeatedBrock, NO_MUSIC goto_if_unset FLAG_GOT_TM39_FROM_BROCK, PewterCity_Gym_EventScript_GiveTM39 @@ -9,7 +9,7 @@ PewterCity_Gym_EventScript_Brock:: @ 816A593 release end -PewterCity_Gym_EventScript_DefeatedBrock:: @ 816A5C5 +PewterCity_Gym_EventScript_DefeatedBrock:: famechecker FAMECHECKER_BROCK, 1 setflag FLAG_DEFEATED_BROCK setflag FLAG_BADGE01_GET @@ -20,7 +20,7 @@ PewterCity_Gym_EventScript_DefeatedBrock:: @ 816A5C5 goto PewterCity_Gym_EventScript_GiveTM39 end -PewterCity_Gym_EventScript_GiveTM39:: @ 816A5F3 +PewterCity_Gym_EventScript_GiveTM39:: msgbox PewterCity_Gym_Text_TakeThisWithYou checkitemspace ITEM_TM39, 1 compare VAR_RESULT, FALSE @@ -31,17 +31,17 @@ PewterCity_Gym_EventScript_GiveTM39:: @ 816A5F3 release end -PewterCity_Gym_EventScript_NoRoomForTM39:: @ 816A634 +PewterCity_Gym_EventScript_NoRoomForTM39:: msgbox PewterCity_Gym_Text_DontHaveRoomForThis release end -PewterCity_Gym_EventScript_Liam:: @ 816A63E +PewterCity_Gym_EventScript_Liam:: trainerbattle_single TRAINER_CAMPER_LIAM, PewterCity_Gym_Text_LiamIntro, PewterCity_Gym_Text_LiamDefeat msgbox PewterCity_Gym_Text_LiamPostBattle, MSGBOX_AUTOCLOSE end -PewterCity_Gym_EventScript_GymGuy:: @ 816A655 +PewterCity_Gym_EventScript_GymGuy:: lock faceplayer goto_if_set FLAG_DEFEATED_BROCK, PewterCity_Gym_EventScript_GymGuyPostVictory @@ -52,34 +52,34 @@ PewterCity_Gym_EventScript_GymGuy:: @ 816A655 goto_if_eq PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop end -PewterCity_Gym_EventScript_GymGuyPostVictory:: @ 816A67F +PewterCity_Gym_EventScript_GymGuyPostVictory:: msgbox PewterCity_Gym_Text_YoureChampMaterial release end -PewterCity_Gym_EventScript_GymGuyTakeMeToTop:: @ 816A689 +PewterCity_Gym_EventScript_GymGuyTakeMeToTop:: msgbox PewterCity_Gym_Text_LetsGetHappening goto PewterCity_Gym_EventScript_GymGuyAdvice end -PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop:: @ 816A697 +PewterCity_Gym_EventScript_GymGuyDontTakeMeToTop:: msgbox PewterCity_Gym_Text_ItsFreeLetsGetHappening goto PewterCity_Gym_EventScript_GymGuyAdvice end -PewterCity_Gym_EventScript_GymGuyAdvice:: @ 816A6A5 +PewterCity_Gym_EventScript_GymGuyAdvice:: msgbox PewterCity_Gym_Text_TryDifferentPartyOrders release end -PewterCity_Gym_EventScript_GymStatue:: @ 816A6AF +PewterCity_Gym_EventScript_GymStatue:: lockall goto_if_set FLAG_BADGE01_GET, PewterCity_Gym_EventScript_GymStatuePostVictory msgbox PewterCity_Gym_Text_GymStatue releaseall end -PewterCity_Gym_EventScript_GymStatuePostVictory:: @ 816A6C3 +PewterCity_Gym_EventScript_GymStatuePostVictory:: msgbox PewterCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/PewterCity_Gym/text.inc b/data/maps/PewterCity_Gym/text.inc index 4ba144beb..c93a8600c 100644 --- a/data/maps/PewterCity_Gym/text.inc +++ b/data/maps/PewterCity_Gym/text.inc @@ -1,4 +1,4 @@ -PewterCity_Gym_Text_BrockIntro:: @ 8190CD4 +PewterCity_Gym_Text_BrockIntro:: .string "So, you're here. I'm BROCK.\n" .string "I'm PEWTER's GYM LEADER.\p" .string "My rock-hard willpower is evident\n" @@ -17,7 +17,7 @@ PewterCity_Gym_Text_BrockIntro:: @ 8190CD4 @ NOTE: This defeat text actually causes a buffer overflow. It's too long for the gDisplayedStringBattle @ buffer that it's put into, and it stomps all over the gBattleTextBuffs after, as well as the otherwise @ unused array after that, gUnknown_2022AE8. Perhaps that's the reason why said array exists. -PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F +PewterCity_Gym_Text_BrockDefeat:: .string "I took you for granted, and so\n" .string "I lost.\p" .string "As proof of your victory, I confer\n" @@ -32,15 +32,15 @@ PewterCity_Gym_Text_BrockDefeat:: @ 8190E4F .string "Of course, a POKéMON must know the\n" .string "move FLASH to use it.$" -PewterCity_Gym_Text_TakeThisWithYou:: @ 8190FC1 +PewterCity_Gym_Text_TakeThisWithYou:: .string "Wait!\n" .string "Take this with you.$" -PewterCity_Gym_Text_ReceivedTM39FromBrock:: @ 8190FDB +PewterCity_Gym_Text_ReceivedTM39FromBrock:: .string "{PLAYER} received TM39\n" .string "from BROCK.$" -PewterCity_Gym_Text_ExplainTM39:: @ 8190FF8 +PewterCity_Gym_Text_ExplainTM39:: .string "A TM, Technical Machine, contains a\n" .string "technique for POKéMON.\p" .string "Using a TM teaches the move it\n" @@ -53,7 +53,7 @@ PewterCity_Gym_Text_ExplainTM39:: @ 8190FF8 .string "It hurls boulders at the foe and\n" .string "lowers its SPEED.$" -PewterCity_Gym_Text_BrockPostBattle:: @ 819110F +PewterCity_Gym_Text_BrockPostBattle:: .string "There are all kinds of TRAINERS in\n" .string "this huge world of ours.\p" .string "You appear to be very gifted as a\n" @@ -62,24 +62,24 @@ PewterCity_Gym_Text_BrockPostBattle:: @ 819110F .string "Go to the GYM in CERULEAN and test\n" .string "your abilities.$" -PewterCity_Gym_Text_DontHaveRoomForThis:: @ 81911CE +PewterCity_Gym_Text_DontHaveRoomForThis:: .string "You don't have room for this.$" -PewterCity_Gym_Text_LiamIntro:: @ 81911EC +PewterCity_Gym_Text_LiamIntro:: .string "Stop right there, kid!\p" .string "You're ten thousand light-years \n" .string "from facing BROCK!$" -PewterCity_Gym_Text_LiamDefeat:: @ 8191237 +PewterCity_Gym_Text_LiamDefeat:: .string "Darn!\p" .string "Light-years isn't time…\n" .string "It measures distance!$" -PewterCity_Gym_Text_LiamPostBattle:: @ 819126B +PewterCity_Gym_Text_LiamPostBattle:: .string "You're pretty hot.\n" .string "…But not as hot as BROCK!$" -PewterCity_Gym_Text_LetMeTakeYouToTheTop:: @ 8191298 +PewterCity_Gym_Text_LetMeTakeYouToTheTop:: .string "Hiya!\n" .string "Do you want to dream big?\p" .string "Do you dare to dream of becoming\n" @@ -88,11 +88,11 @@ PewterCity_Gym_Text_LetMeTakeYouToTheTop:: @ 8191298 .string "you on how to win.\p" .string "Let me take you to the top!$" -PewterCity_Gym_Text_LetsGetHappening:: @ 819133C +PewterCity_Gym_Text_LetsGetHappening:: .string "All right!\n" .string "Let's get happening!$" -PewterCity_Gym_Text_TryDifferentPartyOrders:: @ 819135C +PewterCity_Gym_Text_TryDifferentPartyOrders:: .string "The first POKéMON out in a match is\n" .string "at the left of the POKéMON LIST.\p" .string "By changing the order of POKéMON,\n" @@ -100,21 +100,21 @@ PewterCity_Gym_Text_TryDifferentPartyOrders:: @ 819135C .string "Try different orders to suit your\n" .string "opponent's party.$" -PewterCity_Gym_Text_ItsFreeLetsGetHappening:: @ 8191412 +PewterCity_Gym_Text_ItsFreeLetsGetHappening:: .string "It's a free service!\n" .string "Let's get happening!$" -PewterCity_Gym_Text_YoureChampMaterial:: @ 819143C +PewterCity_Gym_Text_YoureChampMaterial:: .string "Just as I thought!\n" .string "You're POKéMON champ material!$" -PewterCity_Gym_Text_GymStatue:: @ 819146E +PewterCity_Gym_Text_GymStatue:: .string "PEWTER POKéMON GYM\n" .string "LEADER: BROCK\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -PewterCity_Gym_Text_GymStatuePlayerWon:: @ 81914A4 +PewterCity_Gym_Text_GymStatuePlayerWon:: .string "PEWTER POKéMON GYM\n" .string "LEADER: BROCK\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index d2f94072c..a76180f29 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -1,20 +1,20 @@ .set LOCALID_NIDORAN, 3 -PewterCity_House1_MapScripts:: @ 816A71C +PewterCity_House1_MapScripts:: .byte 0 -PewterCity_House1_EventScript_BaldingMan:: @ 816A71D +PewterCity_House1_EventScript_BaldingMan:: msgbox PewterCity_House1_Text_TradeMonsAreFinicky, MSGBOX_NPC end -PewterCity_House1_EventScript_LittleBoy:: @ 816A726 +PewterCity_House1_EventScript_LittleBoy:: lock msgbox PewterCity_House1_Text_NidoranSit call PewterCity_House1_EventScript_DoNidoranCry release end -PewterCity_House1_EventScript_Nidoran:: @ 816A736 +PewterCity_House1_EventScript_Nidoran:: lock faceplayer call PewterCity_House1_EventScript_DoNidoranCry @@ -23,7 +23,7 @@ PewterCity_House1_EventScript_Nidoran:: @ 816A736 release end -PewterCity_House1_EventScript_DoNidoranCry:: @ 816A749 +PewterCity_House1_EventScript_DoNidoranCry:: textcolor 3 waitse playmoncry SPECIES_NIDORAN_M, 0 diff --git a/data/maps/PewterCity_House1/text.inc b/data/maps/PewterCity_House1/text.inc index 8365dc580..d3ac02f43 100644 --- a/data/maps/PewterCity_House1/text.inc +++ b/data/maps/PewterCity_House1/text.inc @@ -1,10 +1,10 @@ -PewterCity_House1_Text_Nidoran:: @ 81915BB +PewterCity_House1_Text_Nidoran:: .string "NIDORAN♂: Bowbow!$" -PewterCity_House1_Text_NidoranSit:: @ 81915CD +PewterCity_House1_Text_NidoranSit:: .string "NIDORAN, sit!$" -PewterCity_House1_Text_TradeMonsAreFinicky:: @ 81915DB +PewterCity_House1_Text_TradeMonsAreFinicky:: .string "Our POKéMON's an outsider, so it's\n" .string "finicky and hard to handle.\p" .string "An outsider is a POKéMON that you\n" diff --git a/data/maps/PewterCity_House2/scripts.inc b/data/maps/PewterCity_House2/scripts.inc index bb4fc2c72..06c8f1a6e 100644 --- a/data/maps/PewterCity_House2/scripts.inc +++ b/data/maps/PewterCity_House2/scripts.inc @@ -1,10 +1,10 @@ -PewterCity_House2_MapScripts:: @ 816A7DC +PewterCity_House2_MapScripts:: .byte 0 -PewterCity_House2_EventScript_OldMan:: @ 816A7DD +PewterCity_House2_EventScript_OldMan:: msgbox PewterCity_House2_Text_MonsLearnTechniquesAsTheyGrow, MSGBOX_NPC end -PewterCity_House2_EventScript_LittleBoy:: @ 816A7E6 +PewterCity_House2_EventScript_LittleBoy:: msgbox PewterCity_House2_Text_MonsEasierCatchIfStatused, MSGBOX_NPC end diff --git a/data/maps/PewterCity_House2/text.inc b/data/maps/PewterCity_House2/text.inc index 3f0898fc3..34240905e 100644 --- a/data/maps/PewterCity_House2/text.inc +++ b/data/maps/PewterCity_House2/text.inc @@ -1,10 +1,10 @@ -PewterCity_House2_Text_MonsLearnTechniquesAsTheyGrow:: @ 81917E4 +PewterCity_House2_Text_MonsLearnTechniquesAsTheyGrow:: .string "POKéMON learn new techniques as\n" .string "they grow.\p" .string "But some moves must be taught to\n" .string "them by people.$" -PewterCity_House2_Text_MonsEasierCatchIfStatused:: @ 8191840 +PewterCity_House2_Text_MonsEasierCatchIfStatused:: .string "A POKéMON becomes easier to \n" .string "catch if it has a status problem.\p" .string "Sleep, poison, burn, or paralysis…\n" diff --git a/data/maps/PewterCity_Mart/scripts.inc b/data/maps/PewterCity_Mart/scripts.inc index 963417631..02740165f 100644 --- a/data/maps/PewterCity_Mart/scripts.inc +++ b/data/maps/PewterCity_Mart/scripts.inc @@ -1,15 +1,15 @@ -PewterCity_Mart_MapScripts:: @ 816A6CD +PewterCity_Mart_MapScripts:: .byte 0 -PewterCity_Mart_EventScript_Youngster:: @ 816A6CE +PewterCity_Mart_EventScript_Youngster:: msgbox PewterCity_Mart_Text_BoughtWeirdFishFromShadyGuy, MSGBOX_NPC end -PewterCity_Mart_EventScript_Boy:: @ 816A6D7 +PewterCity_Mart_EventScript_Boy:: msgbox PewterCity_Mart_Text_GoodThingsIfRaiseMonsDiligently, MSGBOX_NPC end -PewterCity_Mart_EventScript_Clerk:: @ 816A6E0 +PewterCity_Mart_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -21,7 +21,7 @@ PewterCity_Mart_EventScript_Clerk:: @ 816A6E0 end .align 2 -PewterCity_Mart_Items:: @ 816A708 +PewterCity_Mart_Items:: .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_ANTIDOTE diff --git a/data/maps/PewterCity_Mart/text.inc b/data/maps/PewterCity_Mart/text.inc index 336baa4e6..3a45940c9 100644 --- a/data/maps/PewterCity_Mart/text.inc +++ b/data/maps/PewterCity_Mart/text.inc @@ -1,9 +1,9 @@ -PewterCity_Mart_Text_BoughtWeirdFishFromShadyGuy:: @ 81914DE +PewterCity_Mart_Text_BoughtWeirdFishFromShadyGuy:: .string "A shady old guy sucked me into\n" .string "buying this weird fish POKéMON!\p" .string "It's totally weak and it cost ¥500!$" -PewterCity_Mart_Text_GoodThingsIfRaiseMonsDiligently:: @ 8191541 +PewterCity_Mart_Text_GoodThingsIfRaiseMonsDiligently:: .string "Good things can happen if you raise\n" .string "POKéMON diligently.\p" .string "Even the weak ones can surprise\n" diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index e8bf7705a..d73ae856c 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -1,10 +1,10 @@ .set LOCALID_SCIENTIST1, 1 .set LOCALID_OLD_AMBER, 4 -PewterCity_Museum_1F_MapScripts:: @ 816A31A +PewterCity_Museum_1F_MapScripts:: .byte 0 -PewterCity_Museum_1F_EventScript_Scientist1:: @ 816A31B +PewterCity_Museum_1F_EventScript_Scientist1:: lock faceplayer compare VAR_FACING, DIR_WEST @@ -17,7 +17,7 @@ PewterCity_Museum_1F_EventScript_Scientist1:: @ 816A31B release end -PewterCity_Museum_1F_EventScript_Scientist1BehindCounter:: @ 816A348 +PewterCity_Museum_1F_EventScript_Scientist1BehindCounter:: msgbox PewterCity_Museum_1F_Text_DoYouKnowWhatAmberIs, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter @@ -25,21 +25,21 @@ PewterCity_Museum_1F_EventScript_Scientist1BehindCounter:: @ 816A348 goto_if_eq PewterCity_Museum_1F_EventScript_ExplainAmber end -PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter:: @ 816A367 +PewterCity_Museum_1F_EventScript_AmberHasGeneticMatter:: msgbox PewterCity_Museum_1F_Text_AmberContainsGeneticMatter applymovement LOCALID_SCIENTIST1, Movement_FaceOriginalDirection waitmovement 0 release end -PewterCity_Museum_1F_EventScript_ExplainAmber:: @ 816A37B +PewterCity_Museum_1F_EventScript_ExplainAmber:: msgbox PewterCity_Museum_1F_Text_AmberIsFossilizedSap applymovement LOCALID_SCIENTIST1, Movement_FaceOriginalDirection waitmovement 0 release end -PewterCity_Museum_1F_EventScript_EntranceTriggerLeft:: @ 816A38F +PewterCity_Museum_1F_EventScript_EntranceTriggerLeft:: lockall setvar VAR_TEMP_1, 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight @@ -47,7 +47,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerLeft:: @ 816A38F goto PewterCity_Museum_1F_EventScript_EntranceTrigger end -PewterCity_Museum_1F_EventScript_EntranceTriggerMid:: @ 816A3A5 +PewterCity_Museum_1F_EventScript_EntranceTriggerMid:: lockall setvar VAR_TEMP_1, 1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight @@ -55,7 +55,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerMid:: @ 816A3A5 goto PewterCity_Museum_1F_EventScript_EntranceTrigger end -PewterCity_Museum_1F_EventScript_EntranceTriggerRight:: @ 816A3BB +PewterCity_Museum_1F_EventScript_EntranceTriggerRight:: lockall setvar VAR_TEMP_1, 2 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight @@ -63,7 +63,7 @@ PewterCity_Museum_1F_EventScript_EntranceTriggerRight:: @ 816A3BB goto PewterCity_Museum_1F_EventScript_EntranceTrigger end -PewterCity_Museum_1F_EventScript_EntranceTrigger:: @ 816A3D1 +PewterCity_Museum_1F_EventScript_EntranceTrigger:: textcolor 0 showmoneybox 0, 0, 0 msgbox PewterCity_Museum_1F_Text_Its50YForChildsTicket, MSGBOX_YESNO @@ -77,7 +77,7 @@ PewterCity_Museum_1F_EventScript_EntranceTrigger:: @ 816A3D1 releaseall end -PewterCity_Museum_1F_EventScript_TryPayForTicket:: @ 816A402 +PewterCity_Museum_1F_EventScript_TryPayForTicket:: checkmoney 50, 0 compare VAR_RESULT, FALSE goto_if_eq PewterCity_Museum_1F_EventScript_NotEnoughMoney @@ -98,22 +98,22 @@ PewterCity_Museum_1F_EventScript_TryPayForTicket:: @ 816A402 releaseall end -PewterCity_Museum_1F_EventScript_PlayerApproachCounterLeft:: @ 816A455 +PewterCity_Museum_1F_EventScript_PlayerApproachCounterLeft:: applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterLeft waitmovement 0 return -PewterCity_Museum_1F_EventScript_PlayerApproachCounterMid:: @ 816A460 +PewterCity_Museum_1F_EventScript_PlayerApproachCounterMid:: applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterMid waitmovement 0 return -PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight:: @ 816A46B +PewterCity_Museum_1F_EventScript_PlayerApproachCounterRight:: applymovement OBJ_EVENT_ID_PLAYER, PewterCity_Museum_1F_Movement_ApproachCounterRight waitmovement 0 return -PewterCity_Museum_1F_EventScript_NotEnoughMoney:: @ 816A476 +PewterCity_Museum_1F_EventScript_NotEnoughMoney:: msgbox PewterCity_Museum_1F_Text_DontHaveEnoughMoney closemessage hidemoneybox 0, 0 @@ -122,37 +122,37 @@ PewterCity_Museum_1F_EventScript_NotEnoughMoney:: @ 816A476 releaseall end -PewterCity_Museum_1F_Movement_ForcePlayerExit:: @ 816A48E +PewterCity_Museum_1F_Movement_ForcePlayerExit:: walk_down step_end -PewterCity_Museum_1F_Movement_ApproachCounterLeft:: @ 816A490 +PewterCity_Museum_1F_Movement_ApproachCounterLeft:: walk_right walk_right delay_8 walk_in_place_right step_end -PewterCity_Museum_1F_Movement_ApproachCounterMid:: @ 816A495 +PewterCity_Museum_1F_Movement_ApproachCounterMid:: walk_right delay_8 walk_in_place_right step_end -PewterCity_Museum_1F_Movement_ApproachCounterRight:: @ 816A499 +PewterCity_Museum_1F_Movement_ApproachCounterRight:: delay_8 walk_in_place_right step_end -PewterCity_Museum_1F_EventScript_Scientist2:: @ 816A49C +PewterCity_Museum_1F_EventScript_Scientist2:: msgbox PewterCity_Museum_1F_Text_WeHaveTwoFossilsOnExhibit, MSGBOX_NPC end -PewterCity_Museum_1F_EventScript_OldMan:: @ 816A4A5 +PewterCity_Museum_1F_EventScript_OldMan:: msgbox PewterCity_Museum_1F_Text_ShouldBeGratefulForLongLife, MSGBOX_NPC end -PewterCity_Museum_1F_EventScript_OldAmberScientist:: @ 816A4AE +PewterCity_Museum_1F_EventScript_OldAmberScientist:: lock faceplayer goto_if_set FLAG_GOT_OLD_AMBER, PewterCity_Museum_1F_EventScript_AlreadyGotOldAmber @@ -166,21 +166,21 @@ PewterCity_Museum_1F_EventScript_OldAmberScientist:: @ 816A4AE release end -PewterCity_Museum_1F_EventScript_NoRoomForOldAmber:: @ 816A4F5 +PewterCity_Museum_1F_EventScript_NoRoomForOldAmber:: msgbox PewterCity_Museum_1F_Text_DontHaveSpaceForThis release end -PewterCity_Museum_1F_EventScript_AlreadyGotOldAmber:: @ 816A4FF +PewterCity_Museum_1F_EventScript_AlreadyGotOldAmber:: msgbox PewterCity_Museum_1F_Text_GetOldAmberChecked release end -PewterCity_Museum_1F_EventScript_OldAmber:: @ 816A509 +PewterCity_Museum_1F_EventScript_OldAmber:: msgbox PewterCity_Museum_1F_Text_BeautifulPieceOfAmber, MSGBOX_NPC end -PewterCity_Museum_1F_EventScript_AerodactylFossil:: @ 816A512 +PewterCity_Museum_1F_EventScript_AerodactylFossil:: lockall setvar VAR_0x8004, SPECIES_AERODACTYL setvar VAR_0x8005, 10 @@ -191,7 +191,7 @@ PewterCity_Museum_1F_EventScript_AerodactylFossil:: @ 816A512 releaseall end -PewterCity_Museum_1F_EventScript_KabutopsFossil:: @ 816A532 +PewterCity_Museum_1F_EventScript_KabutopsFossil:: lockall setvar VAR_0x8004, SPECIES_KABUTOPS setvar VAR_0x8005, 10 diff --git a/data/maps/PewterCity_Museum_1F/text.inc b/data/maps/PewterCity_Museum_1F/text.inc index ea1e55dec..014060389 100644 --- a/data/maps/PewterCity_Museum_1F/text.inc +++ b/data/maps/PewterCity_Museum_1F/text.inc @@ -1,50 +1,50 @@ -PewterCity_Museum_1F_Text_Its50YForChildsTicket:: @ 81904B5 +PewterCity_Museum_1F_Text_Its50YForChildsTicket:: .string "Yes, yes.\n" .string "It's ¥50 for a child's ticket.\p" .string "Would you like to come in?$" -PewterCity_Museum_1F_Text_ComeAgain:: @ 81904F9 +PewterCity_Museum_1F_Text_ComeAgain:: .string "Come again!$" -PewterCity_Museum_1F_Text_Right50YThankYou:: @ 8190505 +PewterCity_Museum_1F_Text_Right50YThankYou:: .string "Right, ¥50!\n" .string "Thank you!$" -PewterCity_Museum_1F_Text_DontHaveEnoughMoney:: @ 819051C +PewterCity_Museum_1F_Text_DontHaveEnoughMoney:: .string "You don't have enough money.$" -PewterCity_Museum_1F_Text_PleaseEnjoyYourself:: @ 8190539 +PewterCity_Museum_1F_Text_PleaseEnjoyYourself:: .string "Please enjoy yourself.$" -PewterCity_Museum_1F_Text_DoYouKnowWhatAmberIs:: @ 8190550 +PewterCity_Museum_1F_Text_DoYouKnowWhatAmberIs:: .string "You can't sneak in the back way!\n" .string "Nice try, kid, but no.\p" .string "Oh, whatever!\n" .string "Do you know what AMBER is?$" -PewterCity_Museum_1F_Text_AmberContainsGeneticMatter:: @ 81905B1 +PewterCity_Museum_1F_Text_AmberContainsGeneticMatter:: .string "AMBER contains the genetic matter\n" .string "of ancient POKéMON.\p" .string "There's a LAB somewhere trying to\n" .string "resurrect POKéMON from AMBER.$" -PewterCity_Museum_1F_Text_AmberIsFossilizedSap:: @ 8190627 +PewterCity_Museum_1F_Text_AmberIsFossilizedSap:: .string "AMBER is actually sap, that gooey\n" .string "stuff that oozes from trees.\p" .string "The ancient sap fossilized over\n" .string "time to become rock-hard AMBER.$" @ Unused -PewterCity_Museum_1F_Text_PleaseGoAround:: @ 81906A6 +PewterCity_Museum_1F_Text_PleaseGoAround:: .string "あちらへ　おまわりください$" -PewterCity_Museum_1F_Text_ShouldBeGratefulForLongLife:: @ 81906B4 +PewterCity_Museum_1F_Text_ShouldBeGratefulForLongLife:: .string "I should be grateful for my long\n" .string "life.\p" .string "Never did I think I would get to\n" .string "see the bones of a dragon!$" -PewterCity_Museum_1F_Text_WantYouToGetAmberExamined:: @ 8190717 +PewterCity_Museum_1F_Text_WantYouToGetAmberExamined:: .string "Ssh! Listen, I need to share a\n" .string "secret with someone.\p" .string "I think that this chunk of AMBER\n" @@ -58,30 +58,30 @@ PewterCity_Museum_1F_Text_WantYouToGetAmberExamined:: @ 8190717 .string "I want you to get this examined at\n" .string "a POKéMON LAB somewhere.$" -PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan:: @ 8190866 +PewterCity_Museum_1F_Text_ReceivedOldAmberFromMan:: .string "{PLAYER} received the OLD AMBER\n" .string "from the man.$" -PewterCity_Museum_1F_Text_GetOldAmberChecked:: @ 819088E +PewterCity_Museum_1F_Text_GetOldAmberChecked:: .string "Ssh!\n" .string "Get the OLD AMBER checked!$" -PewterCity_Museum_1F_Text_DontHaveSpaceForThis:: @ 81908AE +PewterCity_Museum_1F_Text_DontHaveSpaceForThis:: .string "You don't have space for this.$" -PewterCity_Museum_1F_Text_WeHaveTwoFossilsOnExhibit:: @ 81908CD +PewterCity_Museum_1F_Text_WeHaveTwoFossilsOnExhibit:: .string "We have two fossils of rare,\n" .string "prehistoric POKéMON on exhibit.$" -PewterCity_Museum_1F_Text_BeautifulPieceOfAmber:: @ 819090A +PewterCity_Museum_1F_Text_BeautifulPieceOfAmber:: .string "There is a beautiful piece of\n" .string "AMBER in a clear gold color.$" -PewterCity_Museum_1F_Text_AerodactylFossil:: @ 8190945 +PewterCity_Museum_1F_Text_AerodactylFossil:: .string "AERODACTYL Fossil\n" .string "A primitive and rare POKéMON.$" -PewterCity_Museum_1F_Text_KabutopsFossil:: @ 8190975 +PewterCity_Museum_1F_Text_KabutopsFossil:: .string "KABUTOPS Fossil\n" .string "A primitive and rare POKéMON.$" diff --git a/data/maps/PewterCity_Museum_2F/scripts.inc b/data/maps/PewterCity_Museum_2F/scripts.inc index 67f92f0ec..dfecac47b 100644 --- a/data/maps/PewterCity_Museum_2F/scripts.inc +++ b/data/maps/PewterCity_Museum_2F/scripts.inc @@ -1,30 +1,30 @@ -PewterCity_Museum_2F_MapScripts:: @ 816A552 +PewterCity_Museum_2F_MapScripts:: .byte 0 -PewterCity_Museum_2F_EventScript_Man:: @ 816A553 +PewterCity_Museum_2F_EventScript_Man:: msgbox PewterCity_Museum_1F_Text_WhatsSpecialAboutMoonStone, MSGBOX_NPC end -PewterCity_Museum_2F_EventScript_OldMan:: @ 816A55C +PewterCity_Museum_2F_EventScript_OldMan:: msgbox PewterCity_Museum_1F_Text_BoughtColorTVForMoonLanding, MSGBOX_NPC end -PewterCity_Museum_2F_EventScript_Scientist:: @ 816A565 +PewterCity_Museum_2F_EventScript_Scientist:: msgbox PewterCity_Museum_1F_Text_RunningSpaceExhibitThisMonth, MSGBOX_NPC end -PewterCity_Museum_2F_EventScript_LittleGirl:: @ 816A56E +PewterCity_Museum_2F_EventScript_LittleGirl:: msgbox PewterCity_Museum_1F_Text_AskedDaddyToCatchPikachu, MSGBOX_NPC end -PewterCity_Museum_2F_EventScript_BaldingMan:: @ 816A577 +PewterCity_Museum_2F_EventScript_BaldingMan:: msgbox PewterCity_Museum_1F_Text_PikachuSoonIPromise, MSGBOX_NPC end -PewterCity_Museum_2F_EventScript_SpaceShuttle:: @ 816A580 +PewterCity_Museum_2F_EventScript_SpaceShuttle:: msgbox PewterCity_Museum_1F_Text_SpaceShuttle, MSGBOX_SIGN end -PewterCity_Museum_2F_EventScript_MoonStone:: @ 816A589 +PewterCity_Museum_2F_EventScript_MoonStone:: msgbox PewterCity_Museum_1F_Text_MeteoriteThatFellOnMtMoon, MSGBOX_SIGN end diff --git a/data/maps/PewterCity_Museum_2F/text.inc b/data/maps/PewterCity_Museum_2F/text.inc index f1d5a95a4..74097ffd0 100644 --- a/data/maps/PewterCity_Museum_2F/text.inc +++ b/data/maps/PewterCity_Museum_2F/text.inc @@ -1,4 +1,4 @@ -Text_SeismicTossTeach:: @ 81909A3 +Text_SeismicTossTeach:: .string "The secrets of space…\n" .string "The mysteries of earth…\p" .string "There are so many things about\n" @@ -9,46 +9,46 @@ Text_SeismicTossTeach:: @ 81909A3 .string "Well, how about SEISMIC TOSS?\n" .string "Should I teach that to a POKéMON?$" -Text_SeismicTossDeclined:: @ 8190AA9 +Text_SeismicTossDeclined:: .string "Is that so?\n" .string "I'm sure you'll be back for it.$" -Text_SeismicTossWhichMon:: @ 8190AD5 +Text_SeismicTossWhichMon:: .string "Which POKéMON wants to learn\n" .string "SEISMIC TOSS?$" -Text_SeismicTossTaught:: @ 8190B00 +Text_SeismicTossTaught:: .string "I hope you won't toss in the towel.\n" .string "Keep it up.$" -PewterCity_Museum_1F_Text_WhatsSpecialAboutMoonStone:: @ 8190B30 +PewterCity_Museum_1F_Text_WhatsSpecialAboutMoonStone:: .string "MOON STONE, huh?\p" .string "What's so special about it?\n" .string "Looks like an ordinary rock to me.$" -PewterCity_Museum_1F_Text_BoughtColorTVForMoonLanding:: @ 8190B80 +PewterCity_Museum_1F_Text_BoughtColorTVForMoonLanding:: .string "July 20, 1969!\p" .string "Humankind first set foot on the\n" .string "moon that day.\p" .string "I bought a color TV just so I\n" .string "could watch that news.$" -PewterCity_Museum_1F_Text_RunningSpaceExhibitThisMonth:: @ 8190BF3 +PewterCity_Museum_1F_Text_RunningSpaceExhibitThisMonth:: .string "This month, we're running a space\n" .string "exhibit.$" -PewterCity_Museum_1F_Text_AskedDaddyToCatchPikachu:: @ 8190C1E +PewterCity_Museum_1F_Text_AskedDaddyToCatchPikachu:: .string "I want a PIKACHU!\n" .string "It's so cute!\p" .string "I asked my daddy to catch me one!$" -PewterCity_Museum_1F_Text_PikachuSoonIPromise:: @ 8190C60 +PewterCity_Museum_1F_Text_PikachuSoonIPromise:: .string "Yeah, a PIKACHU soon, I promise!$" -PewterCity_Museum_1F_Text_SpaceShuttle:: @ 8190C81 +PewterCity_Museum_1F_Text_SpaceShuttle:: .string "Space Shuttle$" -PewterCity_Museum_1F_Text_MeteoriteThatFellOnMtMoon:: @ 8190C8F +PewterCity_Museum_1F_Text_MeteoriteThatFellOnMtMoon:: .string "A meteorite that fell on MT. MOON.\n" .string "It is thought to be a MOON STONE.$" diff --git a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc index 967257e90..80b45defb 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/scripts.inc @@ -1,24 +1,24 @@ -PewterCity_PokemonCenter_1F_MapScripts:: @ 816A760 +PewterCity_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PewterCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -PewterCity_PokemonCenter_1F_OnTransition:: @ 816A76B +PewterCity_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_PEWTER_CITY end -PewterCity_PokemonCenter_1F_EventScript_Nurse:: @ 816A76F +PewterCity_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -PewterCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816A778 +PewterCity_PokemonCenter_1F_EventScript_Gentleman:: msgbox PewterCity_PokemonCenter_1F_Text_TeamRocketMtMoonImOnPhone, MSGBOX_NPC end -PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 +PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: lock faceplayer fadeoutbgm 0 @@ -30,16 +30,16 @@ PewterCity_PokemonCenter_1F_EventScript_Jigglypuff:: @ 816A781 release end -PewterCity_PokemonCenter_1F_EventScript_Youngster:: @ 816A798 +PewterCity_PokemonCenter_1F_EventScript_Youngster:: msgbox PewterCity_PokemonCenter_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy, MSGBOX_NPC end -PewterCity_PokemonCenter_1F_EventScript_GBAKid1:: @ 816A7A1 +PewterCity_PokemonCenter_1F_EventScript_GBAKid1:: lock msgbox PewterCity_PokemonCenter_1F_Text_TradingMyClefairyForPikachu release end -PewterCity_PokemonCenter_1F_EventScript_GBAKid2:: @ 816A7AC +PewterCity_PokemonCenter_1F_EventScript_GBAKid2:: msgbox PewterCity_PokemonCenter_1F_Text_TradingPikachuWithKid, MSGBOX_NPC end diff --git a/data/maps/PewterCity_PokemonCenter_1F/text.inc b/data/maps/PewterCity_PokemonCenter_1F/text.inc index 05c38cca1..063ad5d99 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/text.inc +++ b/data/maps/PewterCity_PokemonCenter_1F/text.inc @@ -1,25 +1,25 @@ -PewterCity_PokemonCenter_1F_Text_TeamRocketMtMoonImOnPhone:: @ 81916A9 +PewterCity_PokemonCenter_1F_Text_TeamRocketMtMoonImOnPhone:: .string "What!?\p" .string "TEAM ROCKET is at MT. MOON?\n" .string "Huh?\p" .string "I'm on the phone!\n" .string "Scram!$" -PewterCity_PokemonCenter_1F_Text_Jigglypuff:: @ 81916EA +PewterCity_PokemonCenter_1F_Text_Jigglypuff:: .string "JIGGLYPUFF: Puu pupuu!$" -PewterCity_PokemonCenter_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy:: @ 8191701 +PewterCity_PokemonCenter_1F_Text_WhenJiggylypuffSingsMonsGetDrowsy:: .string "Yawn!\p" .string "When JIGGLYPUFF sings, POKéMON get\n" .string "drowsy…\p" .string "…Me, too…\n" .string "Snore…$" -PewterCity_PokemonCenter_1F_Text_TradingMyClefairyForPikachu:: @ 8191743 +PewterCity_PokemonCenter_1F_Text_TradingMyClefairyForPikachu:: .string "I really want a PIKACHU, so I'm\n" .string "trading my CLEFAIRY for one.$" -PewterCity_PokemonCenter_1F_Text_TradingPikachuWithKid:: @ 8191780 +PewterCity_PokemonCenter_1F_Text_TradingPikachuWithKid:: .string "I'm trading POKéMON with that kid\n" .string "there.\p" .string "I had two PIKACHU, so I figured\n" diff --git a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc index 1bcf9728b..1d4e7e7d7 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/PewterCity_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 +PewterCity_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ PewterCity_PokemonCenter_2F_MapScripts:: @ 816A7B5 .byte 0 @ The below 3 are unused and leftover from RS -PewterCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A7CA +PewterCity_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -PewterCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A7D0 +PewterCity_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -PewterCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A7D6 +PewterCity_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 202b9fda4..34b1a8062 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -1,49 +1,49 @@ -PokemonLeague_AgathasRoom_MapScripts:: @ 8162810 +PokemonLeague_AgathasRoom_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_AgathasRoom_OnResume map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_AgathasRoom_OnLoad map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_AgathasRoom_OnWarp map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_AgathasRoom_OnFrame .byte 0 -PokemonLeague_AgathasRoom_OnResume:: @ 8162825 +PokemonLeague_AgathasRoom_OnResume:: setvar VAR_0x8004, 2 call PokemonLeague_EventScript_DoLightingEffect end -PokemonLeague_AgathasRoom_OnLoad:: @ 8162830 +PokemonLeague_AgathasRoom_OnLoad:: call_if_set FLAG_DEFEATED_AGATHA, PokemonLeague_AgathasRoom_EventScript_SetDoorOpen compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3 call_if_eq PokemonLeague_AgathasRoom_EventScript_CloseEntry end -PokemonLeague_AgathasRoom_EventScript_CloseEntry:: @ 8162845 +PokemonLeague_AgathasRoom_EventScript_CloseEntry:: call PokemonLeague_EventScript_CloseEntry return -PokemonLeague_AgathasRoom_EventScript_SetDoorOpen:: @ 816284B +PokemonLeague_AgathasRoom_EventScript_SetDoorOpen:: call PokemonLeague_EventScript_SetDoorOpen return -PokemonLeague_AgathasRoom_OnWarp:: @ 8162851 +PokemonLeague_AgathasRoom_OnWarp:: map_script_2 VAR_TEMP_1, 0, PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth .2byte 0 -PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth:: @ 816285B +PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_AgathasRoom_OnFrame:: @ 8162860 +PokemonLeague_AgathasRoom_OnFrame:: map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, PokemonLeague_AgathasRoom_EventScript_EnterRoom .2byte 0 -PokemonLeague_AgathasRoom_EventScript_EnterRoom:: @ 816286A +PokemonLeague_AgathasRoom_EventScript_EnterRoom:: lockall call PokemonLeague_EventScript_EnterRoom setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 3 releaseall end -PokemonLeague_AgathasRoom_EventScript_Agatha:: @ 8162877 +PokemonLeague_AgathasRoom_EventScript_Agatha:: lock faceplayer famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 @@ -61,28 +61,28 @@ PokemonLeague_AgathasRoom_EventScript_Agatha:: @ 8162877 goto PokemonLeague_AgathasRoom_EventScript_DefeatedAgatha end -PokemonLeague_AgathasRoom_EventScript_Intro:: @ 81628E9 +PokemonLeague_AgathasRoom_EventScript_Intro:: msgbox PokemonLeague_AgathasRoom_Text_Intro return -PokemonLeague_AgathasRoom_EventScript_RematchIntro:: @ 81628F2 +PokemonLeague_AgathasRoom_EventScript_RematchIntro:: msgbox PokemonLeague_AgathasRoom_Text_RematchIntro return -PokemonLeague_AgathasRoom_EventScript_Battle:: @ 81628FB +PokemonLeague_AgathasRoom_EventScript_Battle:: trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, PokemonLeague_AgathasRoom_Text_Defeat return -PokemonLeague_AgathasRoom_EventScript_Rematch:: @ 8162906 +PokemonLeague_AgathasRoom_EventScript_Rematch:: trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, PokemonLeague_AgathasRoom_Text_Defeat return -PokemonLeague_AgathasRoom_EventScript_PostBattle:: @ 8162911 +PokemonLeague_AgathasRoom_EventScript_PostBattle:: msgbox PokemonLeague_AgathasRoom_Text_PostBattle release end -PokemonLeague_AgathasRoom_EventScript_DefeatedAgatha:: @ 816291B +PokemonLeague_AgathasRoom_EventScript_DefeatedAgatha:: setflag FLAG_DEFEATED_AGATHA call PokemonLeague_EventScript_OpenDoor msgbox PokemonLeague_AgathasRoom_Text_PostBattle diff --git a/data/maps/PokemonLeague_AgathasRoom/text.inc b/data/maps/PokemonLeague_AgathasRoom/text.inc index dc1923238..bc87275d9 100644 --- a/data/maps/PokemonLeague_AgathasRoom/text.inc +++ b/data/maps/PokemonLeague_AgathasRoom/text.inc @@ -1,4 +1,4 @@ -PokemonLeague_AgathasRoom_Text_Intro:: @ 817844D +PokemonLeague_AgathasRoom_Text_Intro:: .string "I am AGATHA of the ELITE FOUR.\p" .string "I hear OAK's taken a lot of\n" .string "interest in you, child.\p" @@ -13,7 +13,7 @@ PokemonLeague_AgathasRoom_Text_Intro:: @ 817844D .string "{PLAYER}! I'll show you how a real\n" .string "TRAINER battles!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -PokemonLeague_AgathasRoom_Text_RematchIntro:: @ 817858D +PokemonLeague_AgathasRoom_Text_RematchIntro:: .string "I am AGATHA of the ELITE FOUR.\p" .string "You're the child that OAK's taken\n" .string "under his wing, aren't you?\p" @@ -28,11 +28,11 @@ PokemonLeague_AgathasRoom_Text_RematchIntro:: @ 817858D .string "{PLAYER}! I'll show you how a real\n" .string "TRAINER battles!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -PokemonLeague_AgathasRoom_Text_Defeat:: @ 81786D7 +PokemonLeague_AgathasRoom_Text_Defeat:: .string "Oh, my!\n" .string "You're something special, child!$" -PokemonLeague_AgathasRoom_Text_PostBattle:: @ 8178700 +PokemonLeague_AgathasRoom_Text_PostBattle:: .string "You win!\p" .string "I see what the old duff sees in\n" .string "you now.\p" diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index 04085b5bb..3d87c4520 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -1,51 +1,51 @@ .set LOCALID_BRUNO, 1 -PokemonLeague_BrunosRoom_MapScripts:: @ 8162685 +PokemonLeague_BrunosRoom_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_BrunosRoom_OnResume map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_BrunosRoom_OnLoad map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_BrunosRoom_OnWarp map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_BrunosRoom_OnFrame .byte 0 -PokemonLeague_BrunosRoom_OnResume:: @ 816269A +PokemonLeague_BrunosRoom_OnResume:: setvar VAR_0x8004, 1 call PokemonLeague_EventScript_DoLightingEffect end -PokemonLeague_BrunosRoom_OnLoad:: @ 81626A5 +PokemonLeague_BrunosRoom_OnLoad:: call_if_set FLAG_DEFEATED_BRUNO, PokemonLeague_BrunosRoom_EventScript_SetDoorOpen compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2 call_if_eq PokemonLeague_BrunosRoom_EventScript_CloseEntry end -PokemonLeague_BrunosRoom_EventScript_CloseEntry:: @ 81626BA +PokemonLeague_BrunosRoom_EventScript_CloseEntry:: call PokemonLeague_EventScript_CloseEntry return -PokemonLeague_BrunosRoom_EventScript_SetDoorOpen:: @ 81626C0 +PokemonLeague_BrunosRoom_EventScript_SetDoorOpen:: call PokemonLeague_EventScript_SetDoorOpen return -PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6 +PokemonLeague_BrunosRoom_OnWarp:: map_script_2 VAR_TEMP_1, 0, PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth .2byte 0 -PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth:: @ 81626D0 +PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5 +PokemonLeague_BrunosRoom_OnFrame:: map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, PokemonLeague_BrunosRoom_EventScript_EnterRoom .2byte 0 -PokemonLeague_BrunosRoom_EventScript_EnterRoom:: @ 81626DF +PokemonLeague_BrunosRoom_EventScript_EnterRoom:: lockall call PokemonLeague_EventScript_EnterRoom setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 2 releaseall end -PokemonLeague_BrunosRoom_EventScript_Bruno:: @ 81626EC +PokemonLeague_BrunosRoom_EventScript_Bruno:: lock faceplayer famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 @@ -62,23 +62,23 @@ PokemonLeague_BrunosRoom_EventScript_Bruno:: @ 81626EC goto PokemonLeague_BrunosRoom_EventScript_DefeatedBruno end -PokemonLeague_BrunosRoom_EventScript_Intro:: @ 8162751 +PokemonLeague_BrunosRoom_EventScript_Intro:: msgbox PokemonLeague_BrunosRoom_Text_Intro return -PokemonLeague_BrunosRoom_EventScript_RematchIntro:: @ 816275A +PokemonLeague_BrunosRoom_EventScript_RematchIntro:: msgbox PokemonLeague_BrunosRoom_Text_RematchIntro return -PokemonLeague_BrunosRoom_EventScript_Battle:: @ 8162763 +PokemonLeague_BrunosRoom_EventScript_Battle:: trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO, PokemonLeague_BrunosRoom_Text_Defeat return -PokemonLeague_BrunosRoom_EventScript_Rematch:: @ 816276E +PokemonLeague_BrunosRoom_EventScript_Rematch:: trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO_2, PokemonLeague_BrunosRoom_Text_Defeat return -PokemonLeague_BrunosRoom_EventScript_PostBattle:: @ 8162779 +PokemonLeague_BrunosRoom_EventScript_PostBattle:: msgbox PokemonLeague_BrunosRoom_Text_PostBattle closemessage compare VAR_FACING, DIR_NORTH @@ -92,7 +92,7 @@ PokemonLeague_BrunosRoom_EventScript_PostBattle:: @ 8162779 release end -PokemonLeague_BrunosRoom_EventScript_DefeatedBruno:: @ 81627B0 +PokemonLeague_BrunosRoom_EventScript_DefeatedBruno:: setflag FLAG_DEFEATED_BRUNO call PokemonLeague_EventScript_OpenDoor msgbox PokemonLeague_BrunosRoom_Text_PostBattle @@ -108,17 +108,17 @@ PokemonLeague_BrunosRoom_EventScript_DefeatedBruno:: @ 81627B0 release end -PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft:: @ 81627EF +PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft:: applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestLeft waitmovement 0 return -PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight:: @ 81627FA +PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight:: applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestRight waitmovement 0 return -PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown:: @ 8162805 +PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown:: applymovement LOCALID_BRUNO, Movement_WalkInPlaceFastestDown waitmovement 0 return diff --git a/data/maps/PokemonLeague_BrunosRoom/text.inc b/data/maps/PokemonLeague_BrunosRoom/text.inc index a9a7ef5e1..2668289c1 100644 --- a/data/maps/PokemonLeague_BrunosRoom/text.inc +++ b/data/maps/PokemonLeague_BrunosRoom/text.inc @@ -1,4 +1,4 @@ -PokemonLeague_BrunosRoom_Text_Intro:: @ 817820F +PokemonLeague_BrunosRoom_Text_Intro:: .string "I am BRUNO of the ELITE FOUR!\p" .string "Through rigorous training, people\n" .string "and POKéMON can become stronger\l" @@ -11,7 +11,7 @@ PokemonLeague_BrunosRoom_Text_Intro:: @ 817820F .string "superior power!\p" .string "Hoo hah!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -PokemonLeague_BrunosRoom_Text_RematchIntro:: @ 817830C +PokemonLeague_BrunosRoom_Text_RematchIntro:: .string "I am BRUNO of the ELITE FOUR!\p" .string "Through rigorous training, people\n" .string "and POKéMON can become stronger\l" @@ -24,11 +24,11 @@ PokemonLeague_BrunosRoom_Text_RematchIntro:: @ 817830C .string "superior power!\p" .string "Hoo hah!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -PokemonLeague_BrunosRoom_Text_Defeat:: @ 8178409 +PokemonLeague_BrunosRoom_Text_Defeat:: .string "Why?\n" .string "How could I lose?$" -PokemonLeague_BrunosRoom_Text_PostBattle:: @ 8178420 +PokemonLeague_BrunosRoom_Text_PostBattle:: .string "My job is done.\n" .string "Go face your next challenge.$" diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 84879db66..1c9558459 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -1,13 +1,13 @@ .equ LOCALID_RIVAL, 1 .equ LOCALID_PROF_OAK, 2 -PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2 +PokemonLeague_ChampionsRoom_MapScripts:: map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_ChampionsRoom_OnFrame .byte 0 -PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2 +PokemonLeague_ChampionsRoom_OnResume:: setvar VAR_0x8004, 4 call PokemonLeague_EventScript_DoLightingEffect compare VAR_STARTER_MON, 2 @@ -18,38 +18,38 @@ PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2 call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander end -PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle:: @ 8162B1E +PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle:: goto_if_defeated TRAINER_CHAMPION_FIRST_SQUIRTLE, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger goto_if_defeated TRAINER_CHAMPION_REMATCH_SQUIRTLE, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger return -PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur:: @ 8162B31 +PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur:: goto_if_defeated TRAINER_CHAMPION_FIRST_BULBASAUR, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger goto_if_defeated TRAINER_CHAMPION_REMATCH_BULBASAUR, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger return -PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander:: @ 8162B44 +PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander:: goto_if_defeated TRAINER_CHAMPION_FIRST_CHARMANDER, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger goto_if_defeated TRAINER_CHAMPION_REMATCH_CHARMANDER, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger return -PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger:: @ 8162B57 +PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger:: setvar VAR_TEMP_1, 1 return -PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D +PokemonLeague_ChampionsRoom_OnWarp:: map_script_2 VAR_TEMP_1, 0, PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth .2byte 0 -PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth:: @ 8162B67 +PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C +PokemonLeague_ChampionsRoom_OnFrame:: map_script_2 VAR_TEMP_1, 0, PokemonLeague_ChampionsRoom_EventScript_EnterRoom .2byte 0 -PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76 +PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: lockall textcolor 0 setflag FLAG_TEMP_2 @@ -101,12 +101,12 @@ PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76 releaseall end -PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd:: @ 8162C68 +PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd:: call PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger releaseall end -PokemonLeague_ChampionsRoom_EventScript_Battle:: @ 8162C6F +PokemonLeague_ChampionsRoom_EventScript_Battle:: compare VAR_STARTER_MON, 2 call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle compare VAR_STARTER_MON, 1 @@ -115,7 +115,7 @@ PokemonLeague_ChampionsRoom_EventScript_Battle:: @ 8162C6F call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleCharmander return -PokemonLeague_ChampionsRoom_EventScript_Rematch:: @ 8162C91 +PokemonLeague_ChampionsRoom_EventScript_Rematch:: compare VAR_STARTER_MON, 2 call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle compare VAR_STARTER_MON, 1 @@ -124,39 +124,39 @@ PokemonLeague_ChampionsRoom_EventScript_Rematch:: @ 8162C91 call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchCharmander return -PokemonLeague_ChampionsRoom_EventScript_Intro:: @ 8162CB3 +PokemonLeague_ChampionsRoom_EventScript_Intro:: msgbox PokemonLeague_ChampionsRoom_Text_Intro return -PokemonLeague_ChampionsRoom_EventScript_RematchIntro:: @ 8162CBC +PokemonLeague_ChampionsRoom_EventScript_RematchIntro:: msgbox PokemonLeague_ChampionsRoom_Text_RematchIntro return -PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle:: @ 8162CC5 +PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle:: trainerbattle_no_intro TRAINER_CHAMPION_FIRST_SQUIRTLE, PokemonLeague_ChampionsRoom_Text_Defeat return -PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur:: @ 8162CD0 +PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur:: trainerbattle_no_intro TRAINER_CHAMPION_FIRST_BULBASAUR, PokemonLeague_ChampionsRoom_Text_Defeat return -PokemonLeague_ChampionsRoom_EventScript_BattleCharmander:: @ 8162CDB +PokemonLeague_ChampionsRoom_EventScript_BattleCharmander:: trainerbattle_no_intro TRAINER_CHAMPION_FIRST_CHARMANDER, PokemonLeague_ChampionsRoom_Text_Defeat return -PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle:: @ 8162CE6 +PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle:: trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_SQUIRTLE, PokemonLeague_ChampionsRoom_Text_Defeat return -PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur:: @ 8162CF1 +PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur:: trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_BULBASAUR, PokemonLeague_ChampionsRoom_Text_Defeat return -PokemonLeague_ChampionsRoom_EventScript_RematchCharmander:: @ 8162CFC +PokemonLeague_ChampionsRoom_EventScript_RematchCharmander:: trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_CHARMANDER, PokemonLeague_ChampionsRoom_Text_Defeat return -PokemonLeague_ChampionsRoom_Movement_PlayerEnter:: @ 8162D07 +PokemonLeague_ChampionsRoom_Movement_PlayerEnter:: walk_up walk_up walk_up @@ -169,7 +169,7 @@ PokemonLeague_ChampionsRoom_Movement_PlayerEnter:: @ 8162D07 walk_up step_end -PokemonLeague_ChampionsRoom_Movement_PlayerExit:: @ 8162D12 +PokemonLeague_ChampionsRoom_Movement_PlayerExit:: delay_16 walk_left walk_up @@ -184,7 +184,7 @@ PokemonLeague_ChampionsRoom_Movement_PlayerExit:: @ 8162D12 set_invisible step_end -PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter:: @ 8162D1F +PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter:: delay_8 walk_in_place_fastest_down delay_16 @@ -197,7 +197,7 @@ PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter:: @ 8162D1F walk_in_place_fastest_left step_end -PokemonLeague_ChampionsRoom_Movement_OakEnter:: @ 8162D2A +PokemonLeague_ChampionsRoom_Movement_OakEnter:: delay_16 delay_16 walk_up @@ -212,7 +212,7 @@ PokemonLeague_ChampionsRoom_Movement_OakEnter:: @ 8162D2A delay_16 step_end -PokemonLeague_ChampionsRoom_Movement_OakExit:: @ 8162D37 +PokemonLeague_ChampionsRoom_Movement_OakExit:: walk_up walk_up walk_right @@ -224,7 +224,7 @@ PokemonLeague_ChampionsRoom_Movement_OakExit:: @ 8162D37 set_invisible step_end -PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter:: @ 8162D41 +PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter:: delay_16 delay_16 delay_16 diff --git a/data/maps/PokemonLeague_ChampionsRoom/text.inc b/data/maps/PokemonLeague_ChampionsRoom/text.inc index 19ba16fa3..b00d117f6 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/text.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/text.inc @@ -1,4 +1,4 @@ -PokemonLeague_ChampionsRoom_Text_Intro:: @ 8178B6C +PokemonLeague_ChampionsRoom_Text_Intro:: .string "{RIVAL}: Hey, {PLAYER}!\p" .string "I was looking forward to seeing\n" .string "you, {PLAYER}.\p" @@ -16,7 +16,7 @@ PokemonLeague_ChampionsRoom_Text_Intro:: @ 8178B6C .string "I am the most powerful TRAINER in\n" .string "the world!$" -PokemonLeague_ChampionsRoom_Text_RematchIntro:: @ 8178CD4 +PokemonLeague_ChampionsRoom_Text_RematchIntro:: .string "{RIVAL}: Hey, {PLAYER}!\p" .string "You came back, {PLAYER}!\n" .string "Hahah, that is so great!\p" @@ -34,7 +34,7 @@ PokemonLeague_ChampionsRoom_Text_RematchIntro:: @ 8178CD4 .string "I am the most powerful TRAINER in\n" .string "the world!$" -PokemonLeague_ChampionsRoom_Text_Defeat:: @ 8178E3F +PokemonLeague_ChampionsRoom_Text_Defeat:: .string "NO!\n" .string "That can't be!\l" .string "You beat me at my best!\p" @@ -43,7 +43,7 @@ PokemonLeague_ChampionsRoom_Text_Defeat:: @ 8178E3F .string "My reign is over already?\n" .string "It's not fair!$" -PokemonLeague_ChampionsRoom_Text_Victory:: @ 8178EC3 +PokemonLeague_ChampionsRoom_Text_Victory:: .string "はーはッ！\n" .string "かった！　かった！　かった！\p" .string "{PLAYER}に　まける　ような\n" @@ -54,7 +54,7 @@ PokemonLeague_ChampionsRoom_Text_Victory:: @ 8178EC3 .string "ほめて　つかわす！\n" .string "はーッ！　はーはッはッ！$" -PokemonLeague_ChampionsRoom_Text_PostBattle:: @ 8178F2F +PokemonLeague_ChampionsRoom_Text_PostBattle:: .string "Why?\n" .string "Why did I lose?\p" .string "I never made any mistakes raising\n" @@ -63,10 +63,10 @@ PokemonLeague_ChampionsRoom_Text_PostBattle:: @ 8178F2F .string "LEAGUE CHAMPION!\p" .string "Although I don't like to admit it…$" -PokemonLeague_ChampionsRoom_Text_OakPlayer:: @ 8178FC6 +PokemonLeague_ChampionsRoom_Text_OakPlayer:: .string "OAK: {PLAYER}!$" -PokemonLeague_ChampionsRoom_Text_OakCongratulations:: @ 8178FCF +PokemonLeague_ChampionsRoom_Text_OakCongratulations:: .string "OAK: So, you've won!\n" .string "Sincerely, congratulations!\p" .string "You're the new POKéMON LEAGUE\n" @@ -76,7 +76,7 @@ PokemonLeague_ChampionsRoom_Text_OakCongratulations:: @ 8178FCF .string "on the POKéDEX.\p" .string "{PLAYER}, you have come of age!$" -PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival:: @ 817908F +PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival:: .string "OAK: {RIVAL}…\n" .string "I'm disappointed in you.\p" .string "I came when I heard you'd beaten\n" @@ -90,7 +90,7 @@ PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival:: @ 817908F .string "Without them, you will never\n" .string "become a CHAMP again!$" -PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe:: @ 81791A3 +PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe:: .string "OAK: {PLAYER}.\p" .string "You understand that your victory\n" .string "was not just your own doing.\p" diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index 69ba2c973..c91027354 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -1,23 +1,23 @@ .set LOCALID_PROF_OAK, 1 -PokemonLeague_HallOfFame_MapScripts:: @ 8162D4C +PokemonLeague_HallOfFame_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_HallOfFame_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_HallOfFame_OnWarp .byte 0 -PokemonLeague_HallOfFame_OnWarp:: @ 8162D57 +PokemonLeague_HallOfFame_OnWarp:: map_script_2 VAR_TEMP_1, 0, PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth .2byte 0 -PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth:: @ 8162D61 +PokemonLeague_HallOfFame_EventScript_TurnPlayerNorth:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 +PokemonLeague_HallOfFame_OnFrame:: map_script_2 VAR_TEMP_1, 0, PokemonLeague_HallOfFame_EventScript_EnterRoom .2byte 0 -PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70 +PokemonLeague_HallOfFame_EventScript_EnterRoom:: lockall textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom @@ -44,7 +44,7 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70 releaseall end -PokemonLeague_HallOfFame_Movement_EnterRoom:: @ 8162DCD +PokemonLeague_HallOfFame_Movement_EnterRoom:: walk_up walk_up walk_up diff --git a/data/maps/PokemonLeague_HallOfFame/text.inc b/data/maps/PokemonLeague_HallOfFame/text.inc index a5bc2e47a..fbcf553b9 100644 --- a/data/maps/PokemonLeague_HallOfFame/text.inc +++ b/data/maps/PokemonLeague_HallOfFame/text.inc @@ -1,4 +1,4 @@ -PokemonLeague_HallOfFame_Text_OakCongratulations:: @ 817922F +PokemonLeague_HallOfFame_Text_OakCongratulations:: .string "OAK: Er-hem!\n" .string "Congratulations, {PLAYER}!\p" .string "This floor is the POKéMON HALL OF\n" diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 9bea13a2e..e191cd3c6 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -1,44 +1,44 @@ .set LOCALID_LANCE, 1 -PokemonLeague_LancesRoom_MapScripts:: @ 816292D +PokemonLeague_LancesRoom_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LancesRoom_OnResume map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LancesRoom_OnLoad map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_LancesRoom_OnWarp map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_LancesRoom_OnFrame .byte 0 -PokemonLeague_LancesRoom_OnResume:: @ 8162942 +PokemonLeague_LancesRoom_OnResume:: setvar VAR_0x8004, 3 call PokemonLeague_EventScript_DoLightingEffect end -PokemonLeague_LancesRoom_OnLoad:: @ 816294D +PokemonLeague_LancesRoom_OnLoad:: compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4 call_if_eq PokemonLeague_LancesRoom_EventScript_CloseEntry call_if_set FLAG_DEFEATED_LANCE, PokemonLeague_LancesRoom_EventScript_SetDoorOpen end -PokemonLeague_LancesRoom_EventScript_CloseEntry:: @ 8162962 +PokemonLeague_LancesRoom_EventScript_CloseEntry:: call PokemonLeague_LancesRoom_EventScript_SetEntryClosed return -PokemonLeague_LancesRoom_EventScript_SetDoorOpen:: @ 8162968 +PokemonLeague_LancesRoom_EventScript_SetDoorOpen:: call PokemonLeague_EventScript_SetDoorOpenLance return -PokemonLeague_LancesRoom_OnWarp:: @ 816296E +PokemonLeague_LancesRoom_OnWarp:: map_script_2 VAR_TEMP_1, 0, PokemonLeague_LancesRoom_EventScript_TurnPlayerNorth .2byte 0 -PokemonLeague_LancesRoom_EventScript_TurnPlayerNorth:: @ 8162978 +PokemonLeague_LancesRoom_EventScript_TurnPlayerNorth:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_LancesRoom_OnFrame:: @ 816297D +PokemonLeague_LancesRoom_OnFrame:: map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, PokemonLeague_LancesRoom_EventScript_EnterRoom .2byte 0 -PokemonLeague_LancesRoom_EventScript_EnterRoom:: @ 8162987 +PokemonLeague_LancesRoom_EventScript_EnterRoom:: lockall applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_LancesRoom_Movement_WalkThroughCorridor waitmovement 0 @@ -51,7 +51,7 @@ PokemonLeague_LancesRoom_EventScript_EnterRoom:: @ 8162987 releaseall end -PokemonLeague_LancesRoom_EventScript_SetEntryClosed:: @ 81629A8 +PokemonLeague_LancesRoom_EventScript_SetEntryClosed:: setmetatile 5, 14, METATILE_PokemonLeague_Entry_TopLeft_Closed, 1 setmetatile 6, 14, METATILE_PokemonLeague_Entry_TopMid_Closed, 1 setmetatile 7, 14, METATILE_PokemonLeague_Entry_TopRight_Closed, 1 @@ -62,7 +62,7 @@ PokemonLeague_LancesRoom_EventScript_SetEntryClosed:: @ 81629A8 setmetatile 7, 16, METATILE_PokemonLeague_Floor_ShadeFull_Lance, 0 return -PokemonLeague_LancesRoom_Movement_WalkThroughCorridor:: @ 81629F1 +PokemonLeague_LancesRoom_Movement_WalkThroughCorridor:: walk_up walk_up walk_left @@ -99,7 +99,7 @@ PokemonLeague_LancesRoom_Movement_WalkThroughCorridor:: @ 81629F1 walk_up step_end -PokemonLeague_LancesRoom_EventScript_Lance:: @ 8162A14 +PokemonLeague_LancesRoom_EventScript_Lance:: lock faceplayer famechecker FAMECHECKER_LANCE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 @@ -116,28 +116,28 @@ PokemonLeague_LancesRoom_EventScript_Lance:: @ 8162A14 goto PokemonLeague_LancesRoom_EventScript_DefeatedLance end -PokemonLeague_LancesRoom_EventScript_Intro:: @ 8162A79 +PokemonLeague_LancesRoom_EventScript_Intro:: msgbox PokemonLeague_LancesRoom_Text_Intro return -PokemonLeague_LancesRoom_EventScript_RematchIntro:: @ 8162A82 +PokemonLeague_LancesRoom_EventScript_RematchIntro:: msgbox PokemonLeague_LancesRoom_Text_RematchIntro return -PokemonLeague_LancesRoom_EventScript_Battle:: @ 8162A8B +PokemonLeague_LancesRoom_EventScript_Battle:: trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE, PokemonLeague_LancesRoom_Text_Defeat return -PokemonLeague_LancesRoom_EventScript_Rematch:: @ 8162A96 +PokemonLeague_LancesRoom_EventScript_Rematch:: trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE_2, PokemonLeague_LancesRoom_Text_Defeat return -PokemonLeague_LancesRoom_EventScript_PostBattle:: @ 8162AA1 +PokemonLeague_LancesRoom_EventScript_PostBattle:: msgbox PokemonLeague_LancesRoom_Text_PostBattle release end -PokemonLeague_LancesRoom_EventScript_DefeatedLance:: @ 8162AAB +PokemonLeague_LancesRoom_EventScript_DefeatedLance:: setvar VAR_0x8004, 0 special Script_TryGainNewFanFromCounter setflag FLAG_DEFEATED_LANCE @@ -147,22 +147,22 @@ PokemonLeague_LancesRoom_EventScript_DefeatedLance:: @ 8162AAB release end -PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayLeft:: @ 8162AC6 +PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayLeft:: applymovement LOCALID_LANCE, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft waitmovement 0 return -PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayRight:: @ 8162AD1 +PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayRight:: applymovement LOCALID_LANCE, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight waitmovement 0 return -PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft:: @ 8162ADC +PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft:: walk_left walk_in_place_fastest_right step_end -PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight:: @ 8162ADF +PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight:: walk_right walk_in_place_fastest_left step_end diff --git a/data/maps/PokemonLeague_LancesRoom/text.inc b/data/maps/PokemonLeague_LancesRoom/text.inc index cef8c7712..dd5bb3877 100644 --- a/data/maps/PokemonLeague_LancesRoom/text.inc +++ b/data/maps/PokemonLeague_LancesRoom/text.inc @@ -1,4 +1,4 @@ -PokemonLeague_LancesRoom_Text_Intro:: @ 8178764 +PokemonLeague_LancesRoom_Text_Intro:: .string "Ah! I've heard about you,\n" .string "{PLAYER}!\p" .string "I lead the ELITE FOUR.\p" @@ -14,7 +14,7 @@ PokemonLeague_LancesRoom_Text_Intro:: @ 8178764 .string "Your LEAGUE challenge ends with\n" .string "me, {PLAYER}!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -PokemonLeague_LancesRoom_Text_RematchIntro:: @ 81788BD +PokemonLeague_LancesRoom_Text_RematchIntro:: .string "Ah!\n" .string "So, you've returned, {PLAYER}!\p" .string "I lead the ELITE FOUR.\p" @@ -30,12 +30,12 @@ PokemonLeague_LancesRoom_Text_RematchIntro:: @ 81788BD .string "Your LEAGUE challenge ends with\n" .string "me, {PLAYER}!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -PokemonLeague_LancesRoom_Text_Defeat:: @ 8178A15 +PokemonLeague_LancesRoom_Text_Defeat:: .string "That's it!\p" .string "I hate to admit it, but you are a\n" .string "POKéMON master!$" -PokemonLeague_LancesRoom_Text_PostBattle:: @ 8178A52 +PokemonLeague_LancesRoom_Text_PostBattle:: .string "I still can't believe my dragons\n" .string "lost to you, {PLAYER}.\p" .string "You are now the POKéMON LEAGUE\n" diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 422029153..98430fcce 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -1,4 +1,4 @@ -PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C +PokemonLeague_LoreleisRoom_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_LoreleisRoom_OnResume map_script MAP_SCRIPT_ON_LOAD, PokemonLeague_LoreleisRoom_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, PokemonLeague_LoreleisRoom_OnTransition @@ -6,49 +6,49 @@ PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C map_script MAP_SCRIPT_ON_FRAME_TABLE, PokemonLeague_LoreleisRoom_OnFrame .byte 0 -PokemonLeague_LoreleisRoom_OnResume:: @ 8162586 +PokemonLeague_LoreleisRoom_OnResume:: setvar VAR_0x8004, 0 call PokemonLeague_EventScript_DoLightingEffect end -PokemonLeague_LoreleisRoom_OnLoad:: @ 8162591 +PokemonLeague_LoreleisRoom_OnLoad:: call_if_set FLAG_DEFEATED_LORELEI, PokemonLeague_LoreleisRoom_EventScript_SetDoorOpen compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1 call_if_eq PokemonLeague_LoreleisRoom_EventScript_CloseEntry end -PokemonLeague_LoreleisRoom_EventScript_CloseEntry:: @ 81625A6 +PokemonLeague_LoreleisRoom_EventScript_CloseEntry:: call PokemonLeague_EventScript_CloseEntry return -PokemonLeague_LoreleisRoom_EventScript_SetDoorOpen:: @ 81625AC +PokemonLeague_LoreleisRoom_EventScript_SetDoorOpen:: call PokemonLeague_EventScript_SetDoorOpen return -PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2 +PokemonLeague_LoreleisRoom_OnTransition:: setworldmapflag FLAG_WORLD_MAP_POKEMON_LEAGUE_LORELEIS_ROOM end -PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6 +PokemonLeague_LoreleisRoom_OnWarp:: map_script_2 VAR_TEMP_1, 0, PokemonLeague_LoreleisRoom_EventScript_TurnPlayerNorth .2byte 0 -PokemonLeague_LoreleisRoom_EventScript_TurnPlayerNorth:: @ 81625C0 +PokemonLeague_LoreleisRoom_EventScript_TurnPlayerNorth:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5 +PokemonLeague_LoreleisRoom_OnFrame:: map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, PokemonLeague_LoreleisRoom_EventScript_EnterRoom .2byte 0 -PokemonLeague_LoreleisRoom_EventScript_EnterRoom:: @ 81625CF +PokemonLeague_LoreleisRoom_EventScript_EnterRoom:: lockall call PokemonLeague_EventScript_EnterRoom setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 1 releaseall end -PokemonLeague_LoreleisRoom_EventScript_Lorelei:: @ 81625DC +PokemonLeague_LoreleisRoom_EventScript_Lorelei:: lock faceplayer famechecker FAMECHECKER_LORELEI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 @@ -65,28 +65,28 @@ PokemonLeague_LoreleisRoom_EventScript_Lorelei:: @ 81625DC goto PokemonLeague_LoreleisRoom_EventScript_DefeatedLorelei end -PokemonLeague_LoreleisRoom_EventScript_Intro:: @ 8162641 +PokemonLeague_LoreleisRoom_EventScript_Intro:: msgbox PokemonLeague_LoreleisRoom_Text_Intro return -PokemonLeague_LoreleisRoom_EventScript_RematchIntro:: @ 816264A +PokemonLeague_LoreleisRoom_EventScript_RematchIntro:: msgbox PokemonLeague_LoreleisRoom_Text_RematchIntro return -PokemonLeague_LoreleisRoom_EventScript_Battle:: @ 8162653 +PokemonLeague_LoreleisRoom_EventScript_Battle:: trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI, PokemonLeague_LoreleisRoom_Text_Defeat return -PokemonLeague_LoreleisRoom_EventScript_Rematch:: @ 816265E +PokemonLeague_LoreleisRoom_EventScript_Rematch:: trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI_2, PokemonLeague_LoreleisRoom_Text_Defeat return -PokemonLeague_LoreleisRoom_EventScript_PostBattle:: @ 8162669 +PokemonLeague_LoreleisRoom_EventScript_PostBattle:: msgbox PokemonLeague_LoreleisRoom_Text_PostBattle release end -PokemonLeague_LoreleisRoom_EventScript_DefeatedLorelei:: @ 8162673 +PokemonLeague_LoreleisRoom_EventScript_DefeatedLorelei:: setflag FLAG_DEFEATED_LORELEI call PokemonLeague_EventScript_OpenDoor msgbox PokemonLeague_LoreleisRoom_Text_PostBattle diff --git a/data/maps/PokemonLeague_LoreleisRoom/text.inc b/data/maps/PokemonLeague_LoreleisRoom/text.inc index be9ff69e2..1945c56a6 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/text.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/text.inc @@ -1,4 +1,4 @@ -PokemonLeague_LoreleisRoom_Text_Intro:: @ 8177FA4 +PokemonLeague_LoreleisRoom_Text_Intro:: .string "Welcome to the POKéMON LEAGUE.\p" .string "I am LORELEI of the ELITE FOUR.\p" .string "No one can best me when it comes\n" @@ -9,7 +9,7 @@ PokemonLeague_LoreleisRoom_Text_Intro:: @ 8177FA4 .string "Hahaha!\n" .string "Are you ready?{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -PokemonLeague_LoreleisRoom_Text_RematchIntro:: @ 8178089 +PokemonLeague_LoreleisRoom_Text_RematchIntro:: .string "Welcome to the POKéMON LEAGUE.\p" .string "I, LORELEI of the ELITE FOUR,\n" .string "have returned!\p" @@ -22,10 +22,10 @@ PokemonLeague_LoreleisRoom_Text_RematchIntro:: @ 8178089 .string "Hahaha!\n" .string "Are you ready?{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -PokemonLeague_LoreleisRoom_Text_Defeat:: @ 8178191 +PokemonLeague_LoreleisRoom_Text_Defeat:: .string "…Things shouldn't be this way!$" -PokemonLeague_LoreleisRoom_Text_PostBattle:: @ 81781B0 +PokemonLeague_LoreleisRoom_Text_PostBattle:: .string "You're better than I thought.\n" .string "Go on ahead.\p" .string "You only got a taste of the\n" diff --git a/data/maps/PokemonMansion_1F/scripts.inc b/data/maps/PokemonMansion_1F/scripts.inc index 38b41d545..7e2a67e52 100644 --- a/data/maps/PokemonMansion_1F/scripts.inc +++ b/data/maps/PokemonMansion_1F/scripts.inc @@ -1,17 +1,17 @@ -PokemonMansion_1F_MapScripts:: @ 81621F9 +PokemonMansion_1F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_1F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, PokemonMansion_1F_OnTransition .byte 0 -PokemonMansion_1F_OnLoad:: @ 8162204 +PokemonMansion_1F_OnLoad:: call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, PokemonMansion_EventScript_PressSwitch_1F end -PokemonMansion_1F_OnTransition:: @ 816220E +PokemonMansion_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_POKEMON_MANSION_1F end -PokemonMansion_1F_EventScript_Statue:: @ 8162212 +PokemonMansion_1F_EventScript_Statue:: lockall setvar VAR_0x8004, 0 call PokemonMansion_EventScript_SecretSwitch @@ -21,12 +21,12 @@ PokemonMansion_1F_EventScript_Statue:: @ 8162212 releaseall end -PokemonMansion_1F_EventScript_Ted:: @ 8162226 +PokemonMansion_1F_EventScript_Ted:: trainerbattle_single TRAINER_SCIENTIST_TED, PokemonMansion_1F_Text_TedIntro, PokemonMansion_1F_Text_TedDefeat msgbox PokemonMansion_1F_Text_TedPostBattle, MSGBOX_AUTOCLOSE end -PokemonMansion_1F_EventScript_Johnson:: @ 816223D +PokemonMansion_1F_EventScript_Johnson:: trainerbattle_single TRAINER_YOUNGSTER_JOHNSON, PokemonMansion_1F_Text_JohnsonIntro, PokemonMansion_1F_Text_JohnsonDefeat msgbox PokemonMansion_1F_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_1F/text.inc b/data/maps/PokemonMansion_1F/text.inc index b13082554..c1c82557e 100644 --- a/data/maps/PokemonMansion_1F/text.inc +++ b/data/maps/PokemonMansion_1F/text.inc @@ -1,23 +1,23 @@ -PokemonMansion_1F_Text_TedIntro:: @ 8177364 +PokemonMansion_1F_Text_TedIntro:: .string "Who are you?\n" .string "There shouldn't be anyone here.$" -PokemonMansion_1F_Text_TedDefeat:: @ 8177391 +PokemonMansion_1F_Text_TedDefeat:: .string "Ouch!$" -PokemonMansion_1F_Text_TedPostBattle:: @ 8177397 +PokemonMansion_1F_Text_TedPostBattle:: .string "A key? I don't know what you're\n" .string "talking about.$" -PokemonMansion_1F_Text_JohnsonIntro:: @ 81773C6 +PokemonMansion_1F_Text_JohnsonIntro:: .string "W-w-waah! You startled me!\n" .string "I thought you were a ghost.$" -PokemonMansion_1F_Text_JohnsonDefeat:: @ 81773FD +PokemonMansion_1F_Text_JohnsonDefeat:: .string "Tch!\n" .string "I can't get any wins.$" -PokemonMansion_1F_Text_JohnsonPostBattle:: @ 8177418 +PokemonMansion_1F_Text_JohnsonPostBattle:: .string "I was exploring here by myself,\n" .string "but I feel spooked.\p" .string "I ought to go soon.$" diff --git a/data/maps/PokemonMansion_2F/scripts.inc b/data/maps/PokemonMansion_2F/scripts.inc index 9a33853b4..b2f686148 100644 --- a/data/maps/PokemonMansion_2F/scripts.inc +++ b/data/maps/PokemonMansion_2F/scripts.inc @@ -1,12 +1,12 @@ -PokemonMansion_2F_MapScripts:: @ 8162254 +PokemonMansion_2F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_2F_OnLoad .byte 0 -PokemonMansion_2F_OnLoad:: @ 816225A +PokemonMansion_2F_OnLoad:: call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, PokemonMansion_EventScript_PressSwitch_2F end -PokemonMansion_2F_EventScript_Statue:: @ 8162264 +PokemonMansion_2F_EventScript_Statue:: lockall setvar VAR_0x8004, 1 call PokemonMansion_EventScript_SecretSwitch @@ -16,15 +16,15 @@ PokemonMansion_2F_EventScript_Statue:: @ 8162264 releaseall end -PokemonMansion_2F_EventScript_DiaryJuly5th:: @ 8162278 +PokemonMansion_2F_EventScript_DiaryJuly5th:: msgbox PokemonMansion_1F_Text_NewMonDiscoveredInGuyanaJungle, MSGBOX_SIGN end -PokemonMansion_2F_EventScript_DiaryJuly10th:: @ 8162281 +PokemonMansion_2F_EventScript_DiaryJuly10th:: msgbox PokemonMansion_1F_Text_ChristenedDiscoveredMonMew, MSGBOX_SIGN end -PokemonMansion_2F_EventScript_Arnie:: @ 816228A +PokemonMansion_2F_EventScript_Arnie:: trainerbattle_single TRAINER_BURGLAR_ARNIE, PokemonMansion_1F_Text_ArnieIntro, PokemonMansion_1F_Text_ArnieDefeat msgbox PokemonMansion_1F_Text_ArniePostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_2F/text.inc b/data/maps/PokemonMansion_2F/text.inc index 08b75e036..01d7fab8e 100644 --- a/data/maps/PokemonMansion_2F/text.inc +++ b/data/maps/PokemonMansion_2F/text.inc @@ -1,32 +1,32 @@ -PokemonMansion_Text_PressSecretSwitch:: @ 8177460 +PokemonMansion_Text_PressSecretSwitch:: .string "A secret switch!\p" .string "Press it?$" -PokemonMansion_Text_WhoWouldnt:: @ 817747B +PokemonMansion_Text_WhoWouldnt:: .string "Who wouldn't?$" -PokemonMansion_Text_NotQuiteYet:: @ 8177489 +PokemonMansion_Text_NotQuiteYet:: .string "Not quite yet!$" -PokemonMansion_1F_Text_ArnieIntro:: @ 8177498 +PokemonMansion_1F_Text_ArnieIntro:: .string "I can't get out!\n" .string "This old place is one big puzzle.$" -PokemonMansion_1F_Text_ArnieDefeat:: @ 81774CB +PokemonMansion_1F_Text_ArnieDefeat:: .string "Oh, no!\n" .string "My bag of loot!$" -PokemonMansion_1F_Text_ArniePostBattle:: @ 81774E3 +PokemonMansion_1F_Text_ArniePostBattle:: .string "The switches here open and close\n" .string "alternating sets of doors.$" -PokemonMansion_1F_Text_NewMonDiscoveredInGuyanaJungle:: @ 817751F +PokemonMansion_1F_Text_NewMonDiscoveredInGuyanaJungle:: .string "Diary: July 5\n" .string "Guyana, South America\p" .string "A new POKéMON was discovered deep\n" .string "in the jungle.$" -PokemonMansion_1F_Text_ChristenedDiscoveredMonMew:: @ 8177574 +PokemonMansion_1F_Text_ChristenedDiscoveredMonMew:: .string "Diary: July 10\n" .string "We christened the newly discovered\l" .string "POKéMON, MEW.$" diff --git a/data/maps/PokemonMansion_3F/scripts.inc b/data/maps/PokemonMansion_3F/scripts.inc index 71ba27874..83dd077dd 100644 --- a/data/maps/PokemonMansion_3F/scripts.inc +++ b/data/maps/PokemonMansion_3F/scripts.inc @@ -1,12 +1,12 @@ -PokemonMansion_3F_MapScripts:: @ 81622A1 +PokemonMansion_3F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_3F_OnLoad .byte 0 -PokemonMansion_3F_OnLoad:: @ 81622A7 +PokemonMansion_3F_OnLoad:: call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, PokemonMansion_EventScript_PressSwitch_3F end -PokemonMansion_3F_EventScript_Statue:: @ 81622B1 +PokemonMansion_3F_EventScript_Statue:: lockall setvar VAR_0x8004, 2 call PokemonMansion_EventScript_SecretSwitch @@ -16,16 +16,16 @@ PokemonMansion_3F_EventScript_Statue:: @ 81622B1 releaseall end -PokemonMansion_3F_EventScript_DiaryFeb6th:: @ 81622C5 +PokemonMansion_3F_EventScript_DiaryFeb6th:: msgbox PokemonMansion_1F_Text_MewGaveBirthToMewtwo, MSGBOX_SIGN end -PokemonMansion_3F_EventScript_Simon:: @ 81622CE +PokemonMansion_3F_EventScript_Simon:: trainerbattle_single TRAINER_BURGLAR_SIMON, PokemonMansion_1F_Text_SimonIntro, PokemonMansion_1F_Text_SimonDefeat msgbox PokemonMansion_1F_Text_SimonPostBattle, MSGBOX_AUTOCLOSE end -PokemonMansion_3F_EventScript_Braydon:: @ 81622E5 +PokemonMansion_3F_EventScript_Braydon:: trainerbattle_single TRAINER_SCIENTIST_BRAYDON, PokemonMansion_1F_Text_BraydonIntro, PokemonMansion_1F_Text_BraydonDefeat msgbox PokemonMansion_1F_Text_BraydonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_3F/text.inc b/data/maps/PokemonMansion_3F/text.inc index bf59f641d..68c2b12e5 100644 --- a/data/maps/PokemonMansion_3F/text.inc +++ b/data/maps/PokemonMansion_3F/text.inc @@ -1,34 +1,34 @@ -PokemonMansion_Text_PressSecretSwitchJP:: @ 81775B4 +PokemonMansion_Text_PressSecretSwitchJP:: .string "ひみつの　スイッチが　ある！\p" .string "おして　みますか？$" -PokemonMansion_Text_LetsTryIt:: @ 81775CD +PokemonMansion_Text_LetsTryIt:: .string "おしてみよう！　‥ポチッとな$" -PokemonMansion_Text_GaveUpOnPressingSwitch:: @ 81775DC +PokemonMansion_Text_GaveUpOnPressingSwitch:: .string "おすのは　あきらめた$" -PokemonMansion_1F_Text_SimonIntro:: @ 81775E7 +PokemonMansion_1F_Text_SimonIntro:: .string "This place is, like, huge!$" -PokemonMansion_1F_Text_SimonDefeat:: @ 8177602 +PokemonMansion_1F_Text_SimonDefeat:: .string "Ayah!$" -PokemonMansion_1F_Text_SimonPostBattle:: @ 8177608 +PokemonMansion_1F_Text_SimonPostBattle:: .string "I wonder where my partner went.$" -PokemonMansion_1F_Text_BraydonIntro:: @ 8177628 +PokemonMansion_1F_Text_BraydonIntro:: .string "My mentor once lived here.$" -PokemonMansion_1F_Text_BraydonDefeat:: @ 8177643 +PokemonMansion_1F_Text_BraydonDefeat:: .string "Whew!\n" .string "Overwhelming!$" -PokemonMansion_1F_Text_BraydonPostBattle:: @ 8177657 +PokemonMansion_1F_Text_BraydonPostBattle:: .string "So, you're stuck?\n" .string "Try jumping off over there!$" -PokemonMansion_1F_Text_MewGaveBirthToMewtwo:: @ 8177685 +PokemonMansion_1F_Text_MewGaveBirthToMewtwo:: .string "Diary: Feb. 6\n" .string "MEW gave birth.\p" .string "We named the newborn MEWTWO.$" diff --git a/data/maps/PokemonMansion_B1F/scripts.inc b/data/maps/PokemonMansion_B1F/scripts.inc index c522096e1..d4429afe1 100644 --- a/data/maps/PokemonMansion_B1F/scripts.inc +++ b/data/maps/PokemonMansion_B1F/scripts.inc @@ -1,12 +1,12 @@ -PokemonMansion_B1F_MapScripts:: @ 81622FC +PokemonMansion_B1F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, PokemonMansion_B1F_OnLoad .byte 0 -PokemonMansion_B1F_OnLoad:: @ 8162302 +PokemonMansion_B1F_OnLoad:: call_if_set FLAG_POKEMON_MANSION_SWITCH_STATE, PokemonMansion_EventScript_PressSwitch_B1F end -PokemonMansion_B1F_EventScript_Statue:: @ 816230C +PokemonMansion_B1F_EventScript_Statue:: lockall setvar VAR_0x8004, 3 call PokemonMansion_EventScript_SecretSwitch @@ -16,16 +16,16 @@ PokemonMansion_B1F_EventScript_Statue:: @ 816230C releaseall end -PokemonMansion_B1F_EventScript_DiarySep1st:: @ 8162320 +PokemonMansion_B1F_EventScript_DiarySep1st:: msgbox PokemonMansion_B1F_Text_MewtwoIsFarTooPowerful, MSGBOX_SIGN end -PokemonMansion_B1F_EventScript_Lewis:: @ 8162329 +PokemonMansion_B1F_EventScript_Lewis:: trainerbattle_single TRAINER_BURGLAR_LEWIS, PokemonMansion_B1F_Text_LewisIntro, PokemonMansion_B1F_Text_LewisDefeat msgbox PokemonMansion_B1F_Text_LewisPostBattle, MSGBOX_AUTOCLOSE end -PokemonMansion_B1F_EventScript_Ivan:: @ 8162340 +PokemonMansion_B1F_EventScript_Ivan:: trainerbattle_single TRAINER_SCIENTIST_IVAN, PokemonMansion_B1F_Text_IvanIntro, PokemonMansion_B1F_Text_IvanDefeat msgbox PokemonMansion_B1F_Text_IvanPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonMansion_B1F/text.inc b/data/maps/PokemonMansion_B1F/text.inc index 6e9646f14..9fdd87e7a 100644 --- a/data/maps/PokemonMansion_B1F/text.inc +++ b/data/maps/PokemonMansion_B1F/text.inc @@ -1,26 +1,26 @@ -PokemonMansion_B1F_Text_LewisIntro:: @ 81776C0 +PokemonMansion_B1F_Text_LewisIntro:: .string "Uh-oh…\n" .string "Where am I now?$" -PokemonMansion_B1F_Text_LewisDefeat:: @ 81776D7 +PokemonMansion_B1F_Text_LewisDefeat:: .string "Awooh!$" -PokemonMansion_B1F_Text_LewisPostBattle:: @ 81776DE +PokemonMansion_B1F_Text_LewisPostBattle:: .string "You can find stuff lying around.\n" .string "The residents must've left them.$" -PokemonMansion_B1F_Text_IvanIntro:: @ 8177720 +PokemonMansion_B1F_Text_IvanIntro:: .string "This place is ideal for a lab.\n" .string "Look at all this space.$" -PokemonMansion_B1F_Text_IvanDefeat:: @ 8177757 +PokemonMansion_B1F_Text_IvanDefeat:: .string "What was that for?$" -PokemonMansion_B1F_Text_IvanPostBattle:: @ 817776A +PokemonMansion_B1F_Text_IvanPostBattle:: .string "I like it here.\n" .string "It's conducive to my studies.$" -PokemonMansion_B1F_Text_MewtwoIsFarTooPowerful:: @ 8177798 +PokemonMansion_B1F_Text_MewtwoIsFarTooPowerful:: .string "Diary: Sept. 1\n" .string "MEWTWO is far too powerful.\p" .string "We have failed to curb its vicious\n" diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc index aa84c96c7..5e5665a15 100644 --- a/data/maps/PokemonTower_1F/scripts.inc +++ b/data/maps/PokemonTower_1F/scripts.inc @@ -1,24 +1,24 @@ -PokemonTower_1F_MapScripts:: @ 8163235 +PokemonTower_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, PokemonTower_1F_OnTransition .byte 0 -PokemonTower_1F_OnTransition:: @ 816323B +PokemonTower_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_POKEMON_TOWER_1F end -PokemonTower_1F_EventScript_Channeler:: @ 816323F +PokemonTower_1F_EventScript_Channeler:: msgbox PokemonTower_1F_Text_SenseSpiritsUpToMischief, MSGBOX_NPC end -PokemonTower_1F_EventScript_Woman1:: @ 8163248 +PokemonTower_1F_EventScript_Woman1:: msgbox PokemonTower_1F_Text_GrowlitheWhyDidYouDie, MSGBOX_NPC end -PokemonTower_1F_EventScript_BaldingMan:: @ 8163251 +PokemonTower_1F_EventScript_BaldingMan:: msgbox PokemonTower_1F_Text_CameToPrayForDepartedClefairy, MSGBOX_NPC end -PokemonTower_1F_EventScript_Woman2:: @ 816325A +PokemonTower_1F_EventScript_Woman2:: lock faceplayer checkplayergender @@ -28,11 +28,11 @@ PokemonTower_1F_EventScript_Woman2:: @ 816325A release end -PokemonTower_1F_EventScript_Woman2MalePlayer:: @ 8163272 +PokemonTower_1F_EventScript_Woman2MalePlayer:: msgbox PokemonTower_1F_Text_ComeToPayRespectsSon release end -PokemonTower_1F_EventScript_WorkerF:: @ 816327C +PokemonTower_1F_EventScript_WorkerF:: msgbox PokemonTower_1F_Text_ErectedInMemoryOfDeadMons, MSGBOX_NPC end diff --git a/data/maps/PokemonTower_1F/text.inc b/data/maps/PokemonTower_1F/text.inc index 04ba0d5fa..708a63c96 100644 --- a/data/maps/PokemonTower_1F/text.inc +++ b/data/maps/PokemonTower_1F/text.inc @@ -1,28 +1,28 @@ -PokemonTower_1F_Text_ErectedInMemoryOfDeadMons:: @ 8179B7A +PokemonTower_1F_Text_ErectedInMemoryOfDeadMons:: .string "POKéMON TOWER was erected in the\n" .string "memory of POKéMON that died.$" -PokemonTower_1F_Text_ComeToPayRespectsSon:: @ 8179BB8 +PokemonTower_1F_Text_ComeToPayRespectsSon:: .string "Did you come to pay respects?\p" .string "Bless your POKéMON-loving heart,\n" .string "son.$" -PokemonTower_1F_Text_ComeToPayRespectsGirl:: @ 8179BFC +PokemonTower_1F_Text_ComeToPayRespectsGirl:: .string "Did you come to pay respects?\p" .string "Bless your POKéMON-loving heart,\n" .string "girl.$" -PokemonTower_1F_Text_CameToPrayForDepartedClefairy:: @ 8179C41 +PokemonTower_1F_Text_CameToPrayForDepartedClefairy:: .string "I came to pray for my dearly\n" .string "departed CLEFAIRY.\p" .string "Sniff!\n" .string "I'm awash in tears…$" -PokemonTower_1F_Text_GrowlitheWhyDidYouDie:: @ 8179C8C +PokemonTower_1F_Text_GrowlitheWhyDidYouDie:: .string "My GROWLITHE…\n" .string "Why did you die?$" -PokemonTower_1F_Text_SenseSpiritsUpToMischief:: @ 8179CAB +PokemonTower_1F_Text_SenseSpiritsUpToMischief:: .string "I am a CHANNELER.\p" .string "There are spirits up to mischief.\n" .string "I sense them high in the TOWER.$" diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc index 5d8091adc..c20e4e1ce 100644 --- a/data/maps/PokemonTower_2F/scripts.inc +++ b/data/maps/PokemonTower_2F/scripts.inc @@ -1,25 +1,25 @@ .set LOCALID_RIVAL, 1 -PokemonTower_2F_MapScripts:: @ 8163285 +PokemonTower_2F_MapScripts:: .byte 0 -PokemonTower_2F_EventScript_Channeler:: @ 8163286 +PokemonTower_2F_EventScript_Channeler:: msgbox PokemonTower_2F_Text_SilphScopeCouldUnmaskGhosts, MSGBOX_NPC end -PokemonTower_2F_EventScript_RivalTriggerRight:: @ 816328F +PokemonTower_2F_EventScript_RivalTriggerRight:: lockall setvar VAR_TEMP_1, 0 goto PokemonTower_2F_EventScript_Rival end -PokemonTower_2F_EventScript_RivalTriggerDown:: @ 816329B +PokemonTower_2F_EventScript_RivalTriggerDown:: lockall setvar VAR_TEMP_1, 1 goto PokemonTower_2F_EventScript_Rival end -PokemonTower_2F_EventScript_Rival:: @ 81632A7 +PokemonTower_2F_EventScript_Rival:: textcolor 0 playbgm MUS_ENCOUNTER_RIVAL, 0 compare VAR_TEMP_1, 0 @@ -53,41 +53,41 @@ PokemonTower_2F_EventScript_Rival:: @ 81632A7 releaseall end -PokemonTower_2F_EventScript_RivalFacePlayerRight:: @ 8163339 +PokemonTower_2F_EventScript_RivalFacePlayerRight:: applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -PokemonTower_2F_EventScript_RivalFacePlayerDown:: @ 816334B +PokemonTower_2F_EventScript_RivalFacePlayerDown:: applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -PokemonTower_2F_EventScript_RivalSquirtle:: @ 816335D +PokemonTower_2F_EventScript_RivalSquirtle:: trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, PokemonTower_2F_Text_RivalDefeat return -PokemonTower_2F_EventScript_RivalBulbasaur:: @ 8163368 +PokemonTower_2F_EventScript_RivalBulbasaur:: trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, PokemonTower_2F_Text_RivalDefeat return -PokemonTower_2F_EventScript_RivalCharmander:: @ 8163373 +PokemonTower_2F_EventScript_RivalCharmander:: trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, PokemonTower_2F_Text_RivalDefeat return -PokemonTower_2F_EventScript_RivalExitRight:: @ 816337E +PokemonTower_2F_EventScript_RivalExitRight:: applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitRight waitmovement 0 return -PokemonTower_2F_EventScript_RivalExitDown:: @ 8163389 +PokemonTower_2F_EventScript_RivalExitDown:: applymovement LOCALID_RIVAL, PokemonTower_2F_Movement_RivalExitDown waitmovement 0 return -PokemonTower_2F_Movement_RivalExitRight:: @ 8163394 +PokemonTower_2F_Movement_RivalExitRight:: walk_down walk_right walk_right @@ -98,7 +98,7 @@ PokemonTower_2F_Movement_RivalExitRight:: @ 8163394 walk_in_place_fastest_right step_end -PokemonTower_2F_Movement_RivalExitDown:: @ 816339D +PokemonTower_2F_Movement_RivalExitDown:: walk_right walk_right walk_down diff --git a/data/maps/PokemonTower_2F/text.inc b/data/maps/PokemonTower_2F/text.inc index 804f58110..bd19b2317 100644 --- a/data/maps/PokemonTower_2F/text.inc +++ b/data/maps/PokemonTower_2F/text.inc @@ -1,4 +1,4 @@ -PokemonTower_2F_Text_RivalIntro:: @ 8179CFF +PokemonTower_2F_Text_RivalIntro:: .string "{RIVAL}: Hey, {PLAYER}!\n" .string "What brings you here?\l" .string "Is your POKéMON dead?\p" @@ -6,20 +6,20 @@ PokemonTower_2F_Text_RivalIntro:: @ 8179CFF .string "I can at least make them faint!\n" .string "Let's go!$" -PokemonTower_2F_Text_RivalDefeat:: @ 8179D73 +PokemonTower_2F_Text_RivalDefeat:: .string "What?\n" .string "You stinker!\p" .string "I took it easy on you, too!$" @ Unused. Translated below @ Aw, man! They really kicked the bucket! Weak! Do them a favor and raise them more properly. -PokemonTower_2F_Text_RivalVictory:: @ 8179DA2 +PokemonTower_2F_Text_RivalVictory:: .string "{RIVAL}“あーあ‥！\n" .string "ほんとに　くたばっちまったぞ！\l" .string "よわいなー！\l" .string "もっと　ちゃんと　そだてて　やれよ$" -PokemonTower_2F_Text_RivalPostBattle:: @ 8179DD4 +PokemonTower_2F_Text_RivalPostBattle:: .string "How's your POKéDEX coming?\n" .string "I just caught a CUBONE!\p" .string "I can't find the bigger MAROWAK.\n" @@ -30,7 +30,7 @@ PokemonTower_2F_Text_RivalPostBattle:: @ 8179DD4 .string "unlike you.\p" .string "Smell ya later!$" -PokemonTower_2F_Text_SilphScopeCouldUnmaskGhosts:: @ 8179EAE +PokemonTower_2F_Text_SilphScopeCouldUnmaskGhosts:: .string "Even we could not identify the\n" .string "wayward ghosts.\p" .string "A SILPH SCOPE might be able to\n" diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc index 5432268b2..76368c142 100644 --- a/data/maps/PokemonTower_3F/scripts.inc +++ b/data/maps/PokemonTower_3F/scripts.inc @@ -1,17 +1,17 @@ -PokemonTower_3F_MapScripts:: @ 81633A6 +PokemonTower_3F_MapScripts:: .byte 0 -PokemonTower_3F_EventScript_Patricia:: @ 81633A7 +PokemonTower_3F_EventScript_Patricia:: trainerbattle_single TRAINER_CHANNELER_PATRICIA, PokemonTower_3F_Text_PatriciaIntro, PokemonTower_3F_Text_PatriciaDefeat msgbox PokemonTower_3F_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_3F_EventScript_Carly:: @ 81633BE +PokemonTower_3F_EventScript_Carly:: trainerbattle_single TRAINER_CHANNELER_CARLY, PokemonTower_3F_Text_CarlyIntro, PokemonTower_3F_Text_CarlyDefeat msgbox PokemonTower_3F_Text_CarlyPostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_3F_EventScript_Hope:: @ 81633D5 +PokemonTower_3F_EventScript_Hope:: trainerbattle_single TRAINER_CHANNELER_HOPE, PokemonTower_3F_Text_HopeIntro, PokemonTower_3F_Text_HopeDefeat msgbox PokemonTower_3F_Text_HopePostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_3F/text.inc b/data/maps/PokemonTower_3F/text.inc index 2df4ad713..f1d3e5f4f 100644 --- a/data/maps/PokemonTower_3F/text.inc +++ b/data/maps/PokemonTower_3F/text.inc @@ -1,36 +1,36 @@ -PokemonTower_3F_Text_HopeIntro:: @ 8179F09 +PokemonTower_3F_Text_HopeIntro:: .string "Urrg… Awaa…\n" .string "Huhu… Graa…$" -PokemonTower_3F_Text_HopeDefeat:: @ 8179F21 +PokemonTower_3F_Text_HopeDefeat:: .string "Hwa!\n" .string "I'm saved!$" -PokemonTower_3F_Text_HopePostBattle:: @ 8179F31 +PokemonTower_3F_Text_HopePostBattle:: .string "The ghosts can be identified by\n" .string "the SILPH SCOPE.$" -PokemonTower_3F_Text_CarlyIntro:: @ 8179F62 +PokemonTower_3F_Text_CarlyIntro:: .string "Kekeke…\n" .string "Kwaaah!$" -PokemonTower_3F_Text_CarlyDefeat:: @ 8179F72 +PokemonTower_3F_Text_CarlyDefeat:: .string "Hmm?\n" .string "What am I doing?$" -PokemonTower_3F_Text_CarlyPostBattle:: @ 8179F88 +PokemonTower_3F_Text_CarlyPostBattle:: .string "Sorry!\n" .string "I was possessed!$" -PokemonTower_3F_Text_PatriciaIntro:: @ 8179FA0 +PokemonTower_3F_Text_PatriciaIntro:: .string "Be gone!\n" .string "Malevolent spirit!$" -PokemonTower_3F_Text_PatriciaDefeat:: @ 8179FBC +PokemonTower_3F_Text_PatriciaDefeat:: .string "Whew!\n" .string "The spirit left!$" -PokemonTower_3F_Text_PatriciaPostBattle:: @ 8179FD3 +PokemonTower_3F_Text_PatriciaPostBattle:: .string "The others above…\n" .string "They must have been possessed.$" diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc index 126cc33ef..e777bdb01 100644 --- a/data/maps/PokemonTower_4F/scripts.inc +++ b/data/maps/PokemonTower_4F/scripts.inc @@ -1,17 +1,17 @@ -PokemonTower_4F_MapScripts:: @ 81633EC +PokemonTower_4F_MapScripts:: .byte 0 -PokemonTower_4F_EventScript_Paula:: @ 81633ED +PokemonTower_4F_EventScript_Paula:: trainerbattle_single TRAINER_CHANNELER_PAULA, PokemonTower_4F_Text_PaulaIntro, PokemonTower_4F_Text_PaulaDefeat msgbox PokemonTower_4F_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_4F_EventScript_Laurel:: @ 8163404 +PokemonTower_4F_EventScript_Laurel:: trainerbattle_single TRAINER_CHANNELER_LAUREL, PokemonTower_4F_Text_LaurelIntro, PokemonTower_4F_Text_LaurelDefeat msgbox PokemonTower_4F_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_4F_EventScript_Jody:: @ 816341B +PokemonTower_4F_EventScript_Jody:: trainerbattle_single TRAINER_CHANNELER_JODY, PokemonTower_4F_Text_JodyIntro, PokemonTower_4F_Text_JodyDefeat msgbox PokemonTower_4F_Text_JodyPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_4F/text.inc b/data/maps/PokemonTower_4F/text.inc index 78692d6b5..021dc73ac 100644 --- a/data/maps/PokemonTower_4F/text.inc +++ b/data/maps/PokemonTower_4F/text.inc @@ -1,33 +1,33 @@ -PokemonTower_4F_Text_PaulaIntro:: @ 817A004 +PokemonTower_4F_Text_PaulaIntro:: .string "Ghost! No!\n" .string "Kwaaah!$" -PokemonTower_4F_Text_PaulaDefeat:: @ 817A017 +PokemonTower_4F_Text_PaulaDefeat:: .string "Where is the ghost?$" -PokemonTower_4F_Text_PaulaPostBattle:: @ 817A02B +PokemonTower_4F_Text_PaulaPostBattle:: .string "I must have been dreaming…$" -PokemonTower_4F_Text_LaurelIntro:: @ 817A046 +PokemonTower_4F_Text_LaurelIntro:: .string "Be cursed with me!\n" .string "Kwaaah!$" -PokemonTower_4F_Text_LaurelDefeat:: @ 817A061 +PokemonTower_4F_Text_LaurelDefeat:: .string "What!$" -PokemonTower_4F_Text_LaurelPostBattle:: @ 817A067 +PokemonTower_4F_Text_LaurelPostBattle:: .string "We can't determine the identity of\n" .string "the ghosts…$" -PokemonTower_4F_Text_JodyIntro:: @ 817A096 +PokemonTower_4F_Text_JodyIntro:: .string "Huhuhu…\n" .string "Beat me not!$" -PokemonTower_4F_Text_JodyDefeat:: @ 817A0AB +PokemonTower_4F_Text_JodyDefeat:: .string "Huh?\n" .string "Who? What?$" -PokemonTower_4F_Text_JodyPostBattle:: @ 817A0BB +PokemonTower_4F_Text_JodyPostBattle:: .string "May the departed POKéMON rest in\n" .string "peace…$" diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc index a21caf79e..5a70571fa 100644 --- a/data/maps/PokemonTower_5F/scripts.inc +++ b/data/maps/PokemonTower_5F/scripts.inc @@ -1,11 +1,11 @@ -PokemonTower_5F_MapScripts:: @ 8163432 +PokemonTower_5F_MapScripts:: .byte 0 -PokemonTower_5F_EventScript_Channeler:: @ 8163433 +PokemonTower_5F_EventScript_Channeler:: msgbox PokemonTower_5F_Text_RestHereInPurifiedSpace, MSGBOX_NPC end -PokemonTower_5F_EventScript_PurifiedZone:: @ 816343C +PokemonTower_5F_EventScript_PurifiedZone:: lockall fadescreen FADE_TO_WHITE special HealPlayerParty @@ -15,28 +15,28 @@ PokemonTower_5F_EventScript_PurifiedZone:: @ 816343C releaseall end -PokemonTower_5F_EventScript_ExitPurifiedZone:: @ 8163453 +PokemonTower_5F_EventScript_ExitPurifiedZone:: lockall setvar VAR_TEMP_1, 0 releaseall end -PokemonTower_5F_EventScript_Tammy:: @ 816345B +PokemonTower_5F_EventScript_Tammy:: trainerbattle_single TRAINER_CHANNELER_TAMMY, PokemonTower_5F_Text_TammyIntro, PokemonTower_5F_Text_TammyDefeat msgbox PokemonTower_5F_Text_TammyPostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_5F_EventScript_Ruth:: @ 8163472 +PokemonTower_5F_EventScript_Ruth:: trainerbattle_single TRAINER_CHANNELER_RUTH, PokemonTower_5F_Text_RuthIntro, PokemonTower_5F_Text_RuthDefeat msgbox PokemonTower_5F_Text_RuthPostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_5F_EventScript_Karina:: @ 8163489 +PokemonTower_5F_EventScript_Karina:: trainerbattle_single TRAINER_CHANNELER_KARINA, PokemonTower_5F_Text_KarinaIntro, PokemonTower_5F_Text_KarinaDefeat msgbox PokemonTower_5F_Text_KarinaPostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_5F_EventScript_Janae:: @ 81634A0 +PokemonTower_5F_EventScript_Janae:: trainerbattle_single TRAINER_CHANNELER_JANAE, PokemonTower_5F_Text_JanaeIntro, PokemonTower_5F_Text_JanaeDefeat msgbox PokemonTower_5F_Text_JanaePostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_5F/text.inc b/data/maps/PokemonTower_5F/text.inc index 9bcf84a12..ceef660c2 100644 --- a/data/maps/PokemonTower_5F/text.inc +++ b/data/maps/PokemonTower_5F/text.inc @@ -1,49 +1,49 @@ -PokemonTower_5F_Text_RestHereInPurifiedSpace:: @ 817A0E3 +PokemonTower_5F_Text_RestHereInPurifiedSpace:: .string "Come, child!\n" .string "I have purified this space.\l" .string "You can rest here.$" -PokemonTower_5F_Text_TammyIntro:: @ 817A11F +PokemonTower_5F_Text_TammyIntro:: .string "Give…me…\n" .string "your…all…$" -PokemonTower_5F_Text_TammyDefeat:: @ 817A132 +PokemonTower_5F_Text_TammyDefeat:: .string "Gasp!$" -PokemonTower_5F_Text_TammyPostBattle:: @ 817A138 +PokemonTower_5F_Text_TammyPostBattle:: .string "I was under possession.$" -PokemonTower_5F_Text_RuthIntro:: @ 817A150 +PokemonTower_5F_Text_RuthIntro:: .string "You…shall…\n" .string "join…us…$" -PokemonTower_5F_Text_RuthDefeat:: @ 817A164 +PokemonTower_5F_Text_RuthDefeat:: .string "What a nightmare!$" -PokemonTower_5F_Text_RuthPostBattle:: @ 817A176 +PokemonTower_5F_Text_RuthPostBattle:: .string "I was possessed.$" -PokemonTower_5F_Text_KarinaIntro:: @ 817A187 +PokemonTower_5F_Text_KarinaIntro:: .string "Zombies!$" -PokemonTower_5F_Text_KarinaDefeat:: @ 817A190 +PokemonTower_5F_Text_KarinaDefeat:: .string "Ha?$" -PokemonTower_5F_Text_KarinaPostBattle:: @ 817A194 +PokemonTower_5F_Text_KarinaPostBattle:: .string "I regained my senses.$" -PokemonTower_5F_Text_JanaeIntro:: @ 817A1AA +PokemonTower_5F_Text_JanaeIntro:: .string "Urgah…\n" .string "Urff…$" -PokemonTower_5F_Text_JanaeDefeat:: @ 817A1B7 +PokemonTower_5F_Text_JanaeDefeat:: .string "Whoo!$" -PokemonTower_5F_Text_JanaePostBattle:: @ 817A1BD +PokemonTower_5F_Text_JanaePostBattle:: .string "I fell to evil spirits despite my\n" .string "training in the mountains…$" -PokemonTower_5F_Text_PurifiedZoneMonsFullyHealed:: @ 817A1FA +PokemonTower_5F_Text_PurifiedZoneMonsFullyHealed:: .string "Entered the purified and protected\n" .string "zone.\p" .string "{PLAYER}'s POKéMON were fully\n" diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index 529defec3..d24c42336 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -1,7 +1,7 @@ -PokemonTower_6F_MapScripts:: @ 81634B7 +PokemonTower_6F_MapScripts:: .byte 0 -PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8 +PokemonTower_6F_EventScript_MarowakGhost:: lockall textcolor 2 msgbox PokemonTower_6F_Text_BeGoneIntruders @@ -17,7 +17,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8 releaseall end -PokemonTower_6F_EventScript_DefeatedMarowakGhost:: @ 81634F5 +PokemonTower_6F_EventScript_DefeatedMarowakGhost:: message PokemonTower_6F_Text_GhostWasCubonesMother waitmessage waitse @@ -29,21 +29,21 @@ PokemonTower_6F_EventScript_DefeatedMarowakGhost:: @ 81634F5 releaseall end -PokemonTower_6F_Movement_ForcePlayerUp:: @ 8163512 +PokemonTower_6F_Movement_ForcePlayerUp:: walk_up step_end -PokemonTower_6F_EventScript_Angelica:: @ 8163514 +PokemonTower_6F_EventScript_Angelica:: trainerbattle_single TRAINER_CHANNELER_ANGELICA, PokemonTower_6F_Text_AngelicaIntro, PokemonTower_6F_Text_AngelicaDefeat msgbox PokemonTower_6F_Text_AngelicaPostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_6F_EventScript_Emilia:: @ 816352B +PokemonTower_6F_EventScript_Emilia:: trainerbattle_single TRAINER_CHANNELER_EMILIA, PokemonTower_6F_Text_EmiliaIntro, PokemonTower_6F_Text_EmiliaDefeat msgbox PokemonTower_6F_Text_EmiliaPostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_6F_EventScript_Jennifer:: @ 8163542 +PokemonTower_6F_EventScript_Jennifer:: trainerbattle_single TRAINER_CHANNELER_JENNIFER, PokemonTower_6F_Text_JenniferIntro, PokemonTower_6F_Text_JenniferDefeat msgbox PokemonTower_6F_Text_JenniferPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/PokemonTower_6F/text.inc b/data/maps/PokemonTower_6F/text.inc index 8d968a69b..729ebfb06 100644 --- a/data/maps/PokemonTower_6F/text.inc +++ b/data/maps/PokemonTower_6F/text.inc @@ -1,43 +1,43 @@ -PokemonTower_6F_Text_AngelicaIntro:: @ 817A243 +PokemonTower_6F_Text_AngelicaIntro:: .string "Give…me…\n" .string "blood…$" -PokemonTower_6F_Text_AngelicaDefeat:: @ 817A253 +PokemonTower_6F_Text_AngelicaDefeat:: .string "Groan!$" -PokemonTower_6F_Text_AngelicaPostBattle:: @ 817A25A +PokemonTower_6F_Text_AngelicaPostBattle:: .string "I feel anemic and weak…$" -PokemonTower_6F_Text_EmiliaIntro:: @ 817A272 +PokemonTower_6F_Text_EmiliaIntro:: .string "Urff…\n" .string "Kwaah!$" -PokemonTower_6F_Text_EmiliaDefeat:: @ 817A27F +PokemonTower_6F_Text_EmiliaDefeat:: .string "Something fell out!$" -PokemonTower_6F_Text_EmiliaPostBattle:: @ 817A293 +PokemonTower_6F_Text_EmiliaPostBattle:: .string "My hair didn't fall out!\n" .string "It was a malevolent spirit!$" -PokemonTower_6F_Text_JenniferIntro:: @ 817A2C8 +PokemonTower_6F_Text_JenniferIntro:: .string "Ke…ke…ke…\n" .string "ke…ke…ke!$" -PokemonTower_6F_Text_JenniferDefeat:: @ 817A2DC +PokemonTower_6F_Text_JenniferDefeat:: .string "Keee!$" -PokemonTower_6F_Text_JenniferPostBattle:: @ 817A2E2 +PokemonTower_6F_Text_JenniferPostBattle:: .string "What's going on here?$" -PokemonTower_6F_Text_BeGoneIntruders:: @ 817A2F8 +PokemonTower_6F_Text_BeGoneIntruders:: .string "Be gone…\n" .string "Intruders…$" -PokemonTower_6F_Text_GhostWasCubonesMother:: @ 817A30C +PokemonTower_6F_Text_GhostWasCubonesMother:: .string "The ghost was the restless spirit\n" .string "of CUBONE's mother!$" -PokemonTower_6F_Text_MothersSpiritWasCalmed:: @ 817A342 +PokemonTower_6F_Text_MothersSpiritWasCalmed:: .string "The mother's spirit was calmed.\p" .string "It departed to the afterlife…$" diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc index a701e543f..91379e132 100644 --- a/data/maps/PokemonTower_7F/scripts.inc +++ b/data/maps/PokemonTower_7F/scripts.inc @@ -2,10 +2,10 @@ .set LOCALID_GRUNT2, 3 .set LOCALID_GRUNT3, 4 -PokemonTower_7F_MapScripts:: @ 8163559 +PokemonTower_7F_MapScripts:: .byte 0 -PokemonTower_7F_EventScript_MrFuji:: @ 816355A +PokemonTower_7F_EventScript_MrFuji:: lock faceplayer famechecker FAMECHECKER_MRFUJI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 @@ -19,12 +19,12 @@ PokemonTower_7F_EventScript_MrFuji:: @ 816355A release end -PokemonTower_7F_EventScript_Grunt1:: @ 8163586 +PokemonTower_7F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, PokemonTower_7F_Text_Grunt1Intro, PokemonTower_7F_Text_Grunt1Defeat, PokemonTower_7F_EventScript_DefeatedGrunt1 msgbox PokemonTower_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_7F_EventScript_DefeatedGrunt1:: @ 81635A1 +PokemonTower_7F_EventScript_DefeatedGrunt1:: msgbox PokemonTower_7F_Text_Grunt1PostBattle closemessage getplayerxy VAR_0x8004, VAR_0x8005 @@ -39,19 +39,19 @@ PokemonTower_7F_EventScript_DefeatedGrunt1:: @ 81635A1 goto PokemonTower_7F_EventScript_RemoveGrunt1 end -PokemonTower_7F_EventScript_Grunt1ExitMid:: @ 81635E0 +PokemonTower_7F_EventScript_Grunt1ExitMid:: applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitMid waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt1 end -PokemonTower_7F_EventScript_Grunt1ExitRight:: @ 81635F0 +PokemonTower_7F_EventScript_Grunt1ExitRight:: applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt1 end -PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600 +PokemonTower_7F_EventScript_Grunt1ExitLeft:: applymovement LOCALID_GRUNT1, PokemonTower_7F_Movement_Grunt1ExitLeft waitmovement 0 playse SE_EXIT @@ -59,12 +59,12 @@ PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600 goto PokemonTower_7F_EventScript_RemoveGrunt1 end -PokemonTower_7F_EventScript_RemoveGrunt1:: @ 8163616 +PokemonTower_7F_EventScript_RemoveGrunt1:: removeobject LOCALID_GRUNT1 release end -PokemonTower_7F_Movement_Grunt1ExitMid:: @ 816361B +PokemonTower_7F_Movement_Grunt1ExitMid:: walk_down walk_right walk_down @@ -75,7 +75,7 @@ PokemonTower_7F_Movement_Grunt1ExitMid:: @ 816361B walk_down step_end -PokemonTower_7F_Movement_Grunt1ExitRight:: @ 8163624 +PokemonTower_7F_Movement_Grunt1ExitRight:: walk_down walk_down walk_down @@ -85,7 +85,7 @@ PokemonTower_7F_Movement_Grunt1ExitRight:: @ 8163624 walk_down step_end -PokemonTower_7F_Movement_Grunt1Exit:: @ 816362C +PokemonTower_7F_Movement_Grunt1Exit:: walk_down walk_down walk_down @@ -94,7 +94,7 @@ PokemonTower_7F_Movement_Grunt1Exit:: @ 816362C walk_down step_end -PokemonTower_7F_Movement_Grunt1ExitLeft:: @ 8163633 +PokemonTower_7F_Movement_Grunt1ExitLeft:: walk_right walk_down walk_down @@ -106,12 +106,12 @@ PokemonTower_7F_Movement_Grunt1ExitLeft:: @ 8163633 walk_in_place_fastest_left step_end -PokemonTower_7F_EventScript_Grunt2:: @ 816363D +PokemonTower_7F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, PokemonTower_7F_Text_Grunt2Intro, PokemonTower_7F_Text_Grunt2Defeat, PokemonTower_7F_EventScript_DefeatedGrunt2 msgbox PokemonTower_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_7F_EventScript_DefeatedGrunt2:: @ 8163658 +PokemonTower_7F_EventScript_DefeatedGrunt2:: famechecker FAMECHECKER_MRFUJI, 1 msgbox PokemonTower_7F_Text_Grunt2PostBattle closemessage @@ -125,24 +125,24 @@ PokemonTower_7F_EventScript_DefeatedGrunt2:: @ 8163658 goto PokemonTower_7F_EventScript_RemoveGrunt2 end -PokemonTower_7F_EventScript_Grunt2ExitLeft:: @ 8163699 +PokemonTower_7F_EventScript_Grunt2ExitLeft:: applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitLeft waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt2 end -PokemonTower_7F_EventScript_Grunt2ExitRight:: @ 81636A9 +PokemonTower_7F_EventScript_Grunt2ExitRight:: applymovement LOCALID_GRUNT2, PokemonTower_7F_Movement_Grunt2ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt2 end -PokemonTower_7F_EventScript_RemoveGrunt2:: @ 81636B9 +PokemonTower_7F_EventScript_RemoveGrunt2:: removeobject LOCALID_GRUNT2 release end -PokemonTower_7F_Movement_Grunt2ExitLeft:: @ 81636BE +PokemonTower_7F_Movement_Grunt2ExitLeft:: walk_down walk_down walk_down @@ -152,7 +152,7 @@ PokemonTower_7F_Movement_Grunt2ExitLeft:: @ 81636BE walk_down step_end -PokemonTower_7F_Movement_Grunt2Exit:: @ 81636C6 +PokemonTower_7F_Movement_Grunt2Exit:: walk_down walk_down walk_down @@ -161,7 +161,7 @@ PokemonTower_7F_Movement_Grunt2Exit:: @ 81636C6 walk_down step_end -PokemonTower_7F_Movement_Grunt2ExitRight:: @ 81636CD +PokemonTower_7F_Movement_Grunt2ExitRight:: walk_left walk_down walk_down @@ -172,12 +172,12 @@ PokemonTower_7F_Movement_Grunt2ExitRight:: @ 81636CD walk_down step_end -PokemonTower_7F_EventScript_Grunt3:: @ 81636D6 +PokemonTower_7F_EventScript_Grunt3:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, PokemonTower_7F_Text_Grunt3Intro, PokemonTower_7F_Text_Grunt3Defeat, PokemonTower_7F_EventScript_DefeatedGrunt3 msgbox PokemonTower_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -PokemonTower_7F_EventScript_DefeatedGrunt3:: @ 81636F1 +PokemonTower_7F_EventScript_DefeatedGrunt3:: msgbox PokemonTower_7F_Text_Grunt3PostBattle closemessage getplayerxy VAR_0x8004, VAR_0x8005 @@ -190,28 +190,28 @@ PokemonTower_7F_EventScript_DefeatedGrunt3:: @ 81636F1 goto PokemonTower_7F_EventScript_RemoveGrunt3 end -PokemonTower_7F_EventScript_Grunt3ExitRight:: @ 8163725 +PokemonTower_7F_EventScript_Grunt3ExitRight:: applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitRight waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt3 end -PokemonTower_7F_EventScript_Grunt3ExitLeft:: @ 8163735 +PokemonTower_7F_EventScript_Grunt3ExitLeft:: applymovement LOCALID_GRUNT3, PokemonTower_7F_Movement_Grunt3ExitLeft waitmovement 0 goto PokemonTower_7F_EventScript_RemoveGrunt3 end -PokemonTower_7F_EventScript_RemoveGrunt3:: @ 8163745 +PokemonTower_7F_EventScript_RemoveGrunt3:: removeobject LOCALID_GRUNT3 release end -PokemonTower_7F_EventScript_Unused:: @ 816374A +PokemonTower_7F_EventScript_Unused:: release end -PokemonTower_7F_Movement_Grunt3ExitRight:: @ 816374C +PokemonTower_7F_Movement_Grunt3ExitRight:: walk_down walk_down walk_down @@ -221,7 +221,7 @@ PokemonTower_7F_Movement_Grunt3ExitRight:: @ 816374C walk_down step_end -PokemonTower_7F_Movement_Grunt3Exit:: @ 8163754 +PokemonTower_7F_Movement_Grunt3Exit:: walk_down walk_down walk_down @@ -230,7 +230,7 @@ PokemonTower_7F_Movement_Grunt3Exit:: @ 8163754 walk_down step_end -PokemonTower_7F_Movement_Grunt3ExitLeft:: @ 816375B +PokemonTower_7F_Movement_Grunt3ExitLeft:: walk_right walk_down walk_down diff --git a/data/maps/PokemonTower_7F/text.inc b/data/maps/PokemonTower_7F/text.inc index c11f66791..75aafae54 100644 --- a/data/maps/PokemonTower_7F/text.inc +++ b/data/maps/PokemonTower_7F/text.inc @@ -1,14 +1,14 @@ -PokemonTower_7F_Text_Grunt1Intro:: @ 817A380 +PokemonTower_7F_Text_Grunt1Intro:: .string "What do you want?\n" .string "Why are you here?$" -PokemonTower_7F_Text_Grunt1Defeat:: @ 817A3A4 +PokemonTower_7F_Text_Grunt1Defeat:: .string "I give up!$" -PokemonTower_7F_Text_Grunt1PostBattle:: @ 817A3AF +PokemonTower_7F_Text_Grunt1PostBattle:: .string "I'm not going to forget this!$" -PokemonTower_7F_Text_Grunt2Intro:: @ 817A3CD +PokemonTower_7F_Text_Grunt2Intro:: .string "This old guy marched right up to\n" .string "our HIDEOUT.\p" .string "Then, he starts ranting about how\n" @@ -16,25 +16,25 @@ PokemonTower_7F_Text_Grunt2Intro:: @ 817A3CD .string "So, we're just talking it over as\n" .string "adults.$" -PokemonTower_7F_Text_Grunt2Defeat:: @ 817A466 +PokemonTower_7F_Text_Grunt2Defeat:: .string "Please!\n" .string "No more!$" -PokemonTower_7F_Text_Grunt2PostBattle:: @ 817A477 +PokemonTower_7F_Text_Grunt2PostBattle:: .string "POKéMON are only good for making\n" .string "money. Why not use them?\p" .string "You stay out of our business!$" -PokemonTower_7F_Text_Grunt3Intro:: @ 817A4CF +PokemonTower_7F_Text_Grunt3Intro:: .string "You're not saving anyone, kid!$" -PokemonTower_7F_Text_Grunt3Defeat:: @ 817A4EE +PokemonTower_7F_Text_Grunt3Defeat:: .string "Don't fight us ROCKETS!$" -PokemonTower_7F_Text_Grunt3PostBattle:: @ 817A506 +PokemonTower_7F_Text_Grunt3PostBattle:: .string "You're not getting away with this!$" -PokemonTower_7F_Text_MrFujiThankYouFollowMe:: @ 817A529 +PokemonTower_7F_Text_MrFujiThankYouFollowMe:: .string "MR. FUJI: Heh?\n" .string "You came to save me?\p" .string "Thank you. But, I came here of my\n" diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 1cbd06d48..76641a299 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -1,39 +1,39 @@ -PowerPlant_MapScripts:: @ 8163764 +PowerPlant_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, PowerPlant_OnResume map_script MAP_SCRIPT_ON_TRANSITION, PowerPlant_OnTransition .byte 0 -PowerPlant_OnResume:: @ 816376F +PowerPlant_OnResume:: call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, PowerPlant_EventScript_TryRemoveStaticMon end -PowerPlant_EventScript_TryRemoveStaticMon:: @ 8163779 +PowerPlant_EventScript_TryRemoveStaticMon:: specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return -PowerPlant_OnTransition:: @ 816378D +PowerPlant_OnTransition:: setworldmapflag FLAG_WORLD_MAP_POWER_PLANT call_if_unset FLAG_FOUGHT_ZAPDOS, PowerPlant_EventScript_ShowZapdos call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1, PowerPlant_EventScript_ShowElectrode1 call_if_unset FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2, PowerPlant_EventScript_ShowElectrode2 end -PowerPlant_EventScript_ShowZapdos:: @ 81637AC +PowerPlant_EventScript_ShowZapdos:: clearflag FLAG_HIDE_ZAPDOS return -PowerPlant_EventScript_ShowElectrode1:: @ 81637B0 +PowerPlant_EventScript_ShowElectrode1:: clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_1 return -PowerPlant_EventScript_ShowElectrode2:: @ 81637B4 +PowerPlant_EventScript_ShowElectrode2:: clearflag FLAG_HIDE_POWER_PLANT_ELECTRODE_2 return -PowerPlant_EventScript_Zapdos:: @ 81637B8 +PowerPlant_EventScript_Zapdos:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -62,17 +62,17 @@ PowerPlant_EventScript_Zapdos:: @ 81637B8 release end -PowerPlant_EventScript_DefeatedZapdos:: @ 816381B +PowerPlant_EventScript_DefeatedZapdos:: setflag FLAG_FOUGHT_ZAPDOS goto EventScript_RemoveStaticMon end -PowerPlant_EventScript_RanFromZapdos:: @ 8163824 +PowerPlant_EventScript_RanFromZapdos:: setvar VAR_0x8004, SPECIES_ZAPDOS goto EventScript_MonFlewAway end -PowerPlant_EventScript_Electrode1:: @ 816382F +PowerPlant_EventScript_Electrode1:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -96,12 +96,12 @@ PowerPlant_EventScript_Electrode1:: @ 816382F release end -PowerPlant_EventScript_FoughtElectrode1:: @ 8163884 +PowerPlant_EventScript_FoughtElectrode1:: setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_1 goto EventScript_RemoveStaticMon end -PowerPlant_EventScript_Electrode2:: @ 816388D +PowerPlant_EventScript_Electrode2:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -125,7 +125,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D release end -PowerPlant_EventScript_FoughtElectrode2:: @ 81638E2 +PowerPlant_EventScript_FoughtElectrode2:: setflag FLAG_FOUGHT_POWER_PLANT_ELECTRODE_2 goto EventScript_RemoveStaticMon end diff --git a/data/maps/Prototype_SeviiIsle_6/scripts.inc b/data/maps/Prototype_SeviiIsle_6/scripts.inc index 459729f14..cb177e706 100644 --- a/data/maps/Prototype_SeviiIsle_6/scripts.inc +++ b/data/maps/Prototype_SeviiIsle_6/scripts.inc @@ -1,2 +1,2 @@ -Prototype_SeviiIsle_6_MapScripts:: @ 81687E0 +Prototype_SeviiIsle_6_MapScripts:: .byte 0 diff --git a/data/maps/Prototype_SeviiIsle_7/scripts.inc b/data/maps/Prototype_SeviiIsle_7/scripts.inc index b7eaa6bd5..52e507ee3 100644 --- a/data/maps/Prototype_SeviiIsle_7/scripts.inc +++ b/data/maps/Prototype_SeviiIsle_7/scripts.inc @@ -1,2 +1,2 @@ -Prototype_SeviiIsle_7_MapScripts:: @ 81687E1 +Prototype_SeviiIsle_7_MapScripts:: .byte 0 diff --git a/data/maps/Prototype_SeviiIsle_8/scripts.inc b/data/maps/Prototype_SeviiIsle_8/scripts.inc index 411a66513..b9a55dff7 100644 --- a/data/maps/Prototype_SeviiIsle_8/scripts.inc +++ b/data/maps/Prototype_SeviiIsle_8/scripts.inc @@ -1,2 +1,2 @@ -Prototype_SeviiIsle_8_MapScripts:: @ 81687E2 +Prototype_SeviiIsle_8_MapScripts:: .byte 0 diff --git a/data/maps/Prototype_SeviiIsle_9/scripts.inc b/data/maps/Prototype_SeviiIsle_9/scripts.inc index 00b06c7f0..8540a074b 100644 --- a/data/maps/Prototype_SeviiIsle_9/scripts.inc +++ b/data/maps/Prototype_SeviiIsle_9/scripts.inc @@ -1,2 +1,2 @@ -Prototype_SeviiIsle_9_MapScripts:: @ 81687E3 +Prototype_SeviiIsle_9_MapScripts:: .byte 0 diff --git a/data/maps/RecordCorner/scripts.inc b/data/maps/RecordCorner/scripts.inc index 979b17ac2..af5511148 100644 --- a/data/maps/RecordCorner/scripts.inc +++ b/data/maps/RecordCorner/scripts.inc @@ -1,2 +1,2 @@ -RecordCorner_MapScripts:: @ 816047A +RecordCorner_MapScripts:: .byte 0 diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc index f18e0cd3e..6ab2e4506 100644 --- a/data/maps/RockTunnel_1F/scripts.inc +++ b/data/maps/RockTunnel_1F/scripts.inc @@ -1,46 +1,46 @@ -RockTunnel_1F_MapScripts:: @ 8162DD6 +RockTunnel_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, RockTunnel_1F_OnTransition .byte 0 -RockTunnel_1F_OnTransition:: @ 8162DDC +RockTunnel_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F end -RockTunnel_1F_EventScript_RouteSign:: @ 8162DE0 +RockTunnel_1F_EventScript_RouteSign:: msgbox RockTunnel_1F_Text_RouteSign, MSGBOX_SIGN end -RockTunnel_1F_EventScript_Lenny:: @ 8162DE9 +RockTunnel_1F_EventScript_Lenny:: trainerbattle_single TRAINER_HIKER_LENNY, RockTunnel_1F_Text_LennyIntro, RockTunnel_1F_Text_LennyDefeat msgbox RockTunnel_1F_Text_LennyPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_Oliver:: @ 8162E00 +RockTunnel_1F_EventScript_Oliver:: trainerbattle_single TRAINER_HIKER_OLIVER, RockTunnel_1F_Text_OliverIntro, RockTunnel_1F_Text_OliverDefeat msgbox RockTunnel_1F_Text_OliverPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_Lucas:: @ 8162E17 +RockTunnel_1F_EventScript_Lucas:: trainerbattle_single TRAINER_HIKER_LUCAS, RockTunnel_1F_Text_LucasIntro, RockTunnel_1F_Text_LucasDefeat msgbox RockTunnel_1F_Text_LucasPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_Ashton:: @ 8162E2E +RockTunnel_1F_EventScript_Ashton:: trainerbattle_single TRAINER_POKEMANIAC_ASHTON, RockTunnel_1F_Text_AshtonIntro, RockTunnel_1F_Text_AshtonDefeat msgbox RockTunnel_1F_Text_AshtonPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_Leah:: @ 8162E45 +RockTunnel_1F_EventScript_Leah:: trainerbattle_single TRAINER_PICNICKER_LEAH, RockTunnel_1F_Text_LeahIntro, RockTunnel_1F_Text_LeahDefeat msgbox RockTunnel_1F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_Ariana:: @ 8162E5C +RockTunnel_1F_EventScript_Ariana:: trainerbattle_single TRAINER_PICNICKER_ARIANA, RockTunnel_1F_Text_ArianaIntro, RockTunnel_1F_Text_ArianaDefeat msgbox RockTunnel_1F_Text_ArianaPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_1F_EventScript_Dana:: @ 8162E73 +RockTunnel_1F_EventScript_Dana:: trainerbattle_single TRAINER_PICNICKER_DANA, RockTunnel_1F_Text_DanaIntro, RockTunnel_1F_Text_DanaDefeat msgbox RockTunnel_1F_Text_DanaPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RockTunnel_1F/text.inc b/data/maps/RockTunnel_1F/text.inc index 162e20f7d..21cf45f11 100644 --- a/data/maps/RockTunnel_1F/text.inc +++ b/data/maps/RockTunnel_1F/text.inc @@ -1,83 +1,83 @@ -RockTunnel_1F_Text_LennyIntro:: @ 8179366 +RockTunnel_1F_Text_LennyIntro:: .string "This tunnel goes a long way, kid!$" -RockTunnel_1F_Text_LennyDefeat:: @ 8179388 +RockTunnel_1F_Text_LennyDefeat:: .string "Doh!\n" .string "You win!$" -RockTunnel_1F_Text_LennyPostBattle:: @ 8179396 +RockTunnel_1F_Text_LennyPostBattle:: .string "Watch for ONIX.\n" .string "They appear only occasionally.\p" .string "High-level ones can put the\n" .string "squeeze on you!$" -RockTunnel_1F_Text_OliverIntro:: @ 81793F1 +RockTunnel_1F_Text_OliverIntro:: .string "Hmm.\n" .string "Maybe I'm lost in here…$" -RockTunnel_1F_Text_OliverDefeat:: @ 817940E +RockTunnel_1F_Text_OliverDefeat:: .string "Ease up!\n" .string "What am I doing?\l" .string "Which way is out?$" -RockTunnel_1F_Text_OliverPostBattle:: @ 817943A +RockTunnel_1F_Text_OliverPostBattle:: .string "That sleeping POKéMON on ROUTE 12\n" .string "forced me to take this detour.$" -RockTunnel_1F_Text_LucasIntro:: @ 817947B +RockTunnel_1F_Text_LucasIntro:: .string "Outsiders like you need to show me\n" .string "some respect!$" -RockTunnel_1F_Text_LucasDefeat:: @ 81794AC +RockTunnel_1F_Text_LucasDefeat:: .string "I give!$" -RockTunnel_1F_Text_LucasPostBattle:: @ 81794B4 +RockTunnel_1F_Text_LucasPostBattle:: .string "You're talented enough to hike!$" -RockTunnel_1F_Text_AshtonIntro:: @ 81794D4 +RockTunnel_1F_Text_AshtonIntro:: .string "POKéMON fight!\n" .string "Ready, go!$" -RockTunnel_1F_Text_AshtonDefeat:: @ 81794EE +RockTunnel_1F_Text_AshtonDefeat:: .string "Game over!$" -RockTunnel_1F_Text_AshtonPostBattle:: @ 81794F9 +RockTunnel_1F_Text_AshtonPostBattle:: .string "Oh well, I'll get a ZUBAT as I go!$" -RockTunnel_1F_Text_LeahIntro:: @ 817951C +RockTunnel_1F_Text_LeahIntro:: .string "Eek!\p" .string "Don't try anything funny in the\n" .string "dark!$" -RockTunnel_1F_Text_LeahDefeat:: @ 8179547 +RockTunnel_1F_Text_LeahDefeat:: .string "It was too dark…$" -RockTunnel_1F_Text_LeahPostBattle:: @ 8179558 +RockTunnel_1F_Text_LeahPostBattle:: .string "I saw a MACHOP in this tunnel.$" -RockTunnel_1F_Text_DanaIntro:: @ 8179577 +RockTunnel_1F_Text_DanaIntro:: .string "I came this far looking for wild\n" .string "POKéMON.$" -RockTunnel_1F_Text_DanaDefeat:: @ 81795A1 +RockTunnel_1F_Text_DanaDefeat:: .string "I'm out of POKéMON!$" -RockTunnel_1F_Text_DanaPostBattle:: @ 81795B5 +RockTunnel_1F_Text_DanaPostBattle:: .string "You looked cute and harmless.\n" .string "Was I ever wrong!$" -RockTunnel_1F_Text_ArianaIntro:: @ 81795E5 +RockTunnel_1F_Text_ArianaIntro:: .string "You have POKéMON!\n" .string "Let's start!$" -RockTunnel_1F_Text_ArianaDefeat:: @ 8179604 +RockTunnel_1F_Text_ArianaDefeat:: .string "You play hard!$" -RockTunnel_1F_Text_ArianaPostBattle:: @ 8179613 +RockTunnel_1F_Text_ArianaPostBattle:: .string "Whew!\n" .string "I'm all sweaty now.$" -RockTunnel_1F_Text_RouteSign:: @ 817962D +RockTunnel_1F_Text_RouteSign:: .string "ROCK TUNNEL\n" .string "CERULEAN CITY - LAVENDER TOWN$" diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc index 54d0e8153..028414b8a 100644 --- a/data/maps/RockTunnel_B1F/scripts.inc +++ b/data/maps/RockTunnel_B1F/scripts.inc @@ -1,42 +1,42 @@ -RockTunnel_B1F_MapScripts:: @ 8162E8A +RockTunnel_B1F_MapScripts:: .byte 0 -RockTunnel_B1F_EventScript_Sofia:: @ 8162E8B +RockTunnel_B1F_EventScript_Sofia:: trainerbattle_single TRAINER_PICNICKER_SOFIA, RockTunnel_B1F_Text_SofiaIntro, RockTunnel_B1F_Text_SofiaDefeat msgbox RockTunnel_B1F_Text_SofiaPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_Martha:: @ 8162EA2 +RockTunnel_B1F_EventScript_Martha:: trainerbattle_single TRAINER_PICNICKER_MARTHA, RockTunnel_B1F_Text_MarthaIntro, RockTunnel_B1F_Text_MarthaDefeat msgbox RockTunnel_B1F_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_Dudley:: @ 8162EB9 +RockTunnel_B1F_EventScript_Dudley:: trainerbattle_single TRAINER_HIKER_DUDLEY, RockTunnel_B1F_Text_DudleyIntro, RockTunnel_B1F_Text_DudleyDefeat msgbox RockTunnel_B1F_Text_DudleyPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_Allen:: @ 8162ED0 +RockTunnel_B1F_EventScript_Allen:: trainerbattle_single TRAINER_HIKER_ALLEN, RockTunnel_B1F_Text_AllenIntro, RockTunnel_B1F_Text_AllenDefeat msgbox RockTunnel_B1F_Text_AllenPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_Eric:: @ 8162EE7 +RockTunnel_B1F_EventScript_Eric:: trainerbattle_single TRAINER_HIKER_ERIC, RockTunnel_B1F_Text_EricIntro, RockTunnel_B1F_Text_EricDefeat msgbox RockTunnel_B1F_Text_EricPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_Cooper:: @ 8162EFE +RockTunnel_B1F_EventScript_Cooper:: trainerbattle_single TRAINER_POKEMANIAC_COOPER, RockTunnel_B1F_Text_CooperIntro, RockTunnel_B1F_Text_CooperDefeat msgbox RockTunnel_B1F_Text_CooperPostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_Steve:: @ 8162F15 +RockTunnel_B1F_EventScript_Steve:: trainerbattle_single TRAINER_POKEMANIAC_STEVE, RockTunnel_B1F_Text_SteveIntro, RockTunnel_B1F_Text_SteveDefeat msgbox RockTunnel_B1F_Text_StevePostBattle, MSGBOX_AUTOCLOSE end -RockTunnel_B1F_EventScript_Winston:: @ 8162F2C +RockTunnel_B1F_EventScript_Winston:: trainerbattle_single TRAINER_POKEMANIAC_WINSTON, RockTunnel_B1F_Text_WinstonIntro, RockTunnel_B1F_Text_WinstonDefeat msgbox RockTunnel_B1F_Text_WinstonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RockTunnel_B1F/text.inc b/data/maps/RockTunnel_B1F/text.inc index 1bf86a5eb..06b558b79 100644 --- a/data/maps/RockTunnel_B1F/text.inc +++ b/data/maps/RockTunnel_B1F/text.inc @@ -1,95 +1,95 @@ -RockTunnel_B1F_Text_SofiaIntro:: @ 8179657 +RockTunnel_B1F_Text_SofiaIntro:: .string "Do you know how you can avoid\n" .string "getting lost in the mountains?\p" .string "You can bend twigs as trail\n" .string "markers.$" -RockTunnel_B1F_Text_SofiaDefeat:: @ 81796B9 +RockTunnel_B1F_Text_SofiaDefeat:: .string "Ohhh!\n" .string "I did my best!$" -RockTunnel_B1F_Text_SofiaPostBattle:: @ 81796CE +RockTunnel_B1F_Text_SofiaPostBattle:: .string "I want to go home!$" -RockTunnel_B1F_Text_DudleyIntro:: @ 81796E1 +RockTunnel_B1F_Text_DudleyIntro:: .string "Hahaha!\n" .string "Can you beat my power?$" -RockTunnel_B1F_Text_DudleyDefeat:: @ 8179700 +RockTunnel_B1F_Text_DudleyDefeat:: .string "Oops!\n" .string "Outmuscled!$" -RockTunnel_B1F_Text_DudleyPostBattle:: @ 8179712 +RockTunnel_B1F_Text_DudleyPostBattle:: .string "I go for power because I hate\n" .string "thinking.$" -RockTunnel_B1F_Text_CooperIntro:: @ 817973A +RockTunnel_B1F_Text_CooperIntro:: .string "You have a POKéDEX?\n" .string "I want one, too.$" -RockTunnel_B1F_Text_CooperDefeat:: @ 817975F +RockTunnel_B1F_Text_CooperDefeat:: .string "Shoot!\n" .string "I am so jealous!$" -RockTunnel_B1F_Text_CooperPostBattle:: @ 8179777 +RockTunnel_B1F_Text_CooperPostBattle:: .string "When you finish your POKéDEX,\n" .string "can I have it?$" -RockTunnel_B1F_Text_SteveIntro:: @ 81797A4 +RockTunnel_B1F_Text_SteveIntro:: .string "Um… Do you know about POKéMON\n" .string "cosplay?$" -RockTunnel_B1F_Text_SteveDefeat:: @ 81797CB +RockTunnel_B1F_Text_SteveDefeat:: .string "Well, that's that.$" -RockTunnel_B1F_Text_StevePostBattle:: @ 81797DE +RockTunnel_B1F_Text_StevePostBattle:: .string "POKéMON cosplay is dressing up as\n" .string "POKéMON for fun.\p" .string "CLEFAIRY is a favorite.$" -RockTunnel_B1F_Text_AllenIntro:: @ 8179829 +RockTunnel_B1F_Text_AllenIntro:: .string "My POKéMON techniques will leave\n" .string "you crying!$" -RockTunnel_B1F_Text_AllenDefeat:: @ 8179856 +RockTunnel_B1F_Text_AllenDefeat:: .string "I give!\n" .string "You're a better technician!$" -RockTunnel_B1F_Text_AllenPostBattle:: @ 817987A +RockTunnel_B1F_Text_AllenPostBattle:: .string "In mountains, you'll often find\n" .string "ROCK-type POKéMON.$" -RockTunnel_B1F_Text_MarthaIntro:: @ 81798AD +RockTunnel_B1F_Text_MarthaIntro:: .string "I don't often come here, but I will\n" .string "battle you.$" -RockTunnel_B1F_Text_MarthaDefeat:: @ 81798DD +RockTunnel_B1F_Text_MarthaDefeat:: .string "Oh!\n" .string "I lost!$" -RockTunnel_B1F_Text_MarthaPostBattle:: @ 81798E9 +RockTunnel_B1F_Text_MarthaPostBattle:: .string "I like tiny POKéMON.\n" .string "Big ones are too scary!$" -RockTunnel_B1F_Text_EricIntro:: @ 8179916 +RockTunnel_B1F_Text_EricIntro:: .string "Hit me with your best shot!$" -RockTunnel_B1F_Text_EricDefeat:: @ 8179932 +RockTunnel_B1F_Text_EricDefeat:: .string "Fired away!$" -RockTunnel_B1F_Text_EricPostBattle:: @ 817993E +RockTunnel_B1F_Text_EricPostBattle:: .string "I'll raise my POKéMON to beat\n" .string "yours, kid.$" -RockTunnel_B1F_Text_WinstonIntro:: @ 8179968 +RockTunnel_B1F_Text_WinstonIntro:: .string "I draw illustrations of POKéMON\n" .string "when I'm home.$" -RockTunnel_B1F_Text_WinstonDefeat:: @ 8179997 +RockTunnel_B1F_Text_WinstonDefeat:: .string "Whew…\n" .string "I'm exhausted…$" -RockTunnel_B1F_Text_WinstonPostBattle:: @ 81799AC +RockTunnel_B1F_Text_WinstonPostBattle:: .string "I'm an artist, not a fighter.\n" .string "I'll go home to draw.$" diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc index efc2c17a2..6d9a2df9d 100644 --- a/data/maps/RocketHideout_B1F/scripts.inc +++ b/data/maps/RocketHideout_B1F/scripts.inc @@ -1,42 +1,42 @@ -RocketHideout_B1F_MapScripts:: @ 8161195 +RocketHideout_B1F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B1F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, RocketHideout_B1F_OnTransition .byte 0 -RocketHideout_B1F_OnLoad:: @ 81611A0 +RocketHideout_B1F_OnLoad:: call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 RocketHideout_B1F_EventScript_SetBarrier end -RocketHideout_B1F_OnTransition:: @ 81611AA +RocketHideout_B1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F end -RocketHideout_B1F_EventScript_Grunt1:: @ 81611AE +RocketHideout_B1F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, RocketHideout_B1F_Text_Grunt1Intro, RocketHideout_B1F_Text_Grunt1Defeat msgbox RocketHideout_B1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_Grunt2:: @ 81611C5 +RocketHideout_B1F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, RocketHideout_B1F_Text_Grunt2Intro, RocketHideout_B1F_Text_Grunt2Defeat msgbox RocketHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_Grunt3:: @ 81611DC +RocketHideout_B1F_EventScript_Grunt3:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, RocketHideout_B1F_Text_Grunt3Intro, RocketHideout_B1F_Text_Grunt3Defeat msgbox RocketHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_Grunt4:: @ 81611F3 +RocketHideout_B1F_EventScript_Grunt4:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, RocketHideout_B1F_Text_Grunt4Intro, RocketHideout_B1F_Text_Grunt4Defeat msgbox RocketHideout_B1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_Grunt5:: @ 816120A +RocketHideout_B1F_EventScript_Grunt5:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, RocketHideout_B1F_Text_Grunt5Intro, RocketHideout_B1F_Text_Grunt5Defeat, RocketHideout_B1F_EventScript_DefeatedGrunt5 msgbox RocketHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225 +RocketHideout_B1F_EventScript_DefeatedGrunt5:: call RocketHideout_B1F_EventScript_RemoveBarrier playse SE_UNLOCK special DrawWholeMapView @@ -44,7 +44,7 @@ RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225 release end -RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233 +RocketHideout_B1F_EventScript_SetBarrier:: setmetatile 20, 19, METATILE_SilphCo_HideoutBarrier_TopLeft_Floor, 1 setmetatile 21, 19, METATILE_SilphCo_HideoutBarrier_TopRight_Floor, 1 setmetatile 20, 20, METATILE_SilphCo_HideoutBarrier_BottomLeft, 1 @@ -53,7 +53,7 @@ RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233 setmetatile 21, 21, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 return -RocketHideout_B1F_EventScript_RemoveBarrier:: @ 816126A +RocketHideout_B1F_EventScript_RemoveBarrier:: setmetatile 20, 19, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 setmetatile 21, 19, METATILE_SilphCo_HideoutFloor, 0 setmetatile 20, 20, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 diff --git a/data/maps/RocketHideout_B1F/text.inc b/data/maps/RocketHideout_B1F/text.inc index 9dea66b16..513cc7cab 100644 --- a/data/maps/RocketHideout_B1F/text.inc +++ b/data/maps/RocketHideout_B1F/text.inc @@ -1,53 +1,53 @@ -RocketHideout_B1F_Text_Grunt1Intro:: @ 8174ECA +RocketHideout_B1F_Text_Grunt1Intro:: .string "Who are you?\n" .string "How did you get here?$" -RocketHideout_B1F_Text_Grunt1Defeat:: @ 8174EED +RocketHideout_B1F_Text_Grunt1Defeat:: .string "Oww!\n" .string "Beaten!$" -RocketHideout_B1F_Text_Grunt1PostBattle:: @ 8174EFA +RocketHideout_B1F_Text_Grunt1PostBattle:: .string "Blast it… You're dissing TEAM\n" .string "ROCKET, aren't you?$" -RocketHideout_B1F_Text_Grunt2Intro:: @ 8174F2C +RocketHideout_B1F_Text_Grunt2Intro:: .string "You broke into TEAM ROCKET's\n" .string "operation? What nerve!$" -RocketHideout_B1F_Text_Grunt2Defeat:: @ 8174F60 +RocketHideout_B1F_Text_Grunt2Defeat:: .string "Boom!$" -RocketHideout_B1F_Text_Grunt2PostBattle:: @ 8174F66 +RocketHideout_B1F_Text_Grunt2PostBattle:: .string "You're not going to get away with\n" .string "this, brat!$" -RocketHideout_B1F_Text_Grunt3Intro:: @ 8174F94 +RocketHideout_B1F_Text_Grunt3Intro:: .string "Intruder alert!$" -RocketHideout_B1F_Text_Grunt3Defeat:: @ 8174FA4 +RocketHideout_B1F_Text_Grunt3Defeat:: .string "I can't do it!$" -RocketHideout_B1F_Text_Grunt3PostBattle:: @ 8174FB3 +RocketHideout_B1F_Text_Grunt3PostBattle:: .string "SILPH SCOPE? Humph!\n" .string "I don't know where it is.$" -RocketHideout_B1F_Text_Grunt4Intro:: @ 8174FE1 +RocketHideout_B1F_Text_Grunt4Intro:: .string "Why did you come here?$" -RocketHideout_B1F_Text_Grunt4Defeat:: @ 8174FF8 +RocketHideout_B1F_Text_Grunt4Defeat:: .string "This won't do!$" -RocketHideout_B1F_Text_Grunt4PostBattle:: @ 8175007 +RocketHideout_B1F_Text_Grunt4PostBattle:: .string "Okay, I'll talk…\n" .string "Take the elevator to see my BOSS.$" -RocketHideout_B1F_Text_Grunt5Intro:: @ 817503A +RocketHideout_B1F_Text_Grunt5Intro:: .string "Are you lost, you little mouse?$" -RocketHideout_B1F_Text_Grunt5Defeat:: @ 817505A +RocketHideout_B1F_Text_Grunt5Defeat:: .string "Why…?$" -RocketHideout_B1F_Text_Grunt5PostBattle:: @ 8175060 +RocketHideout_B1F_Text_Grunt5PostBattle:: .string "Uh-oh, that ruckus somehow opened\n" .string "the door!$" diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc index 55e7f6a2a..0b12d3cbb 100644 --- a/data/maps/RocketHideout_B2F/scripts.inc +++ b/data/maps/RocketHideout_B2F/scripts.inc @@ -1,7 +1,7 @@ -RocketHideout_B2F_MapScripts:: @ 81612A1 +RocketHideout_B2F_MapScripts:: .byte 0 -RocketHideout_B2F_EventScript_Grunt:: @ 81612A2 +RocketHideout_B2F_EventScript_Grunt:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, RocketHideout_B2F_Text_GruntIntro, RocketHideout_B2F_Text_GruntDefeat msgbox RocketHideout_B2F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B2F/text.inc b/data/maps/RocketHideout_B2F/text.inc index a27121152..62e6add0f 100644 --- a/data/maps/RocketHideout_B2F/text.inc +++ b/data/maps/RocketHideout_B2F/text.inc @@ -1,11 +1,11 @@ -RocketHideout_B2F_Text_GruntIntro:: @ 817508C +RocketHideout_B2F_Text_GruntIntro:: .string "BOSS said you can see ghosts with\n" .string "the SILPH SCOPE.$" -RocketHideout_B2F_Text_GruntDefeat:: @ 81750BF +RocketHideout_B2F_Text_GruntDefeat:: .string "I surrender!$" -RocketHideout_B2F_Text_GruntPostBattle:: @ 81750CC +RocketHideout_B2F_Text_GruntPostBattle:: .string "The TEAM ROCKET HQ has four\n" .string "underground floors.\p" .string "Think you can reach the BOSS?$" diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc index ab1fd6bb3..8ca9a57d9 100644 --- a/data/maps/RocketHideout_B3F/scripts.inc +++ b/data/maps/RocketHideout_B3F/scripts.inc @@ -1,12 +1,12 @@ -RocketHideout_B3F_MapScripts:: @ 81612B9 +RocketHideout_B3F_MapScripts:: .byte 0 -RocketHideout_B3F_EventScript_Grunt1:: @ 81612BA +RocketHideout_B3F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B3F_EventScript_Grunt2:: @ 81612D1 +RocketHideout_B3F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/RocketHideout_B3F/text.inc b/data/maps/RocketHideout_B3F/text.inc index 12a9c5a7e..a130540d3 100644 --- a/data/maps/RocketHideout_B3F/text.inc +++ b/data/maps/RocketHideout_B3F/text.inc @@ -1,25 +1,25 @@ -RocketHideout_B3F_Text_Grunt1Intro:: @ 817511A +RocketHideout_B3F_Text_Grunt1Intro:: .string "Stop meddling in TEAM ROCKET's\n" .string "affairs or else!$" -RocketHideout_B3F_Text_Grunt1Defeat:: @ 817514A +RocketHideout_B3F_Text_Grunt1Defeat:: .string "Oof!\n" .string "Taken down!$" -RocketHideout_B3F_Text_Grunt1PostBattle:: @ 817515B +RocketHideout_B3F_Text_Grunt1PostBattle:: .string "SILPH SCOPE?\n" .string "Oh, that machine the BOSS stole.\p" .string "It's here somewhere.$" -RocketHideout_B3F_Text_Grunt2Intro:: @ 817519E +RocketHideout_B3F_Text_Grunt2Intro:: .string "We got word from upstairs that you\n" .string "were coming!$" -RocketHideout_B3F_Text_Grunt2Defeat:: @ 81751CE +RocketHideout_B3F_Text_Grunt2Defeat:: .string "What?\n" .string "I lost? No!$" -RocketHideout_B3F_Text_Grunt2PostBattle:: @ 81751E0 +RocketHideout_B3F_Text_Grunt2PostBattle:: .string "Go ahead and go!\p" .string "But you can't run the elevator\n" .string "without the LIFT KEY.$" diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc index 820325485..eceb02ee2 100644 --- a/data/maps/RocketHideout_B4F/scripts.inc +++ b/data/maps/RocketHideout_B4F/scripts.inc @@ -4,11 +4,11 @@ .equ NUM_DOOR_GRUNTS_DEFEATED, VAR_TEMP_1 -RocketHideout_B4F_MapScripts:: @ 81612E8 +RocketHideout_B4F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B4F_OnLoad .byte 0 -RocketHideout_B4F_OnLoad:: @ 81612EE +RocketHideout_B4F_OnLoad:: setvar NUM_DOOR_GRUNTS_DEFEATED, 0 call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated @@ -16,11 +16,11 @@ RocketHideout_B4F_OnLoad:: @ 81612EE call_if_ne RocketHideout_B4F_EventScript_SetBarrier end -RocketHideout_B4F_EventScript_CountGruntDefeated:: @ 8161311 +RocketHideout_B4F_EventScript_CountGruntDefeated:: addvar NUM_DOOR_GRUNTS_DEFEATED, 1 return -RocketHideout_B4F_EventScript_Giovanni:: @ 8161317 +RocketHideout_B4F_EventScript_Giovanni:: lock faceplayer famechecker FAMECHECKER_GIOVANNI, 0 @@ -41,7 +41,7 @@ RocketHideout_B4F_EventScript_Giovanni:: @ 8161317 release end -RocketHideout_B4F_EventScript_SilphScope:: @ 8161363 +RocketHideout_B4F_EventScript_SilphScope:: lock faceplayer removeobject LOCALID_SILPH_SCOPE @@ -51,20 +51,20 @@ RocketHideout_B4F_EventScript_SilphScope:: @ 8161363 release end -RocketHideout_B4F_EventScript_Grunt1:: @ 8161381 +RocketHideout_B4F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, RocketHideout_B4F_Text_Grunt1Intro, RocketHideout_B4F_Text_Grunt1Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt1 msgbox RocketHideout_B4F_Text_Grunt1PostBattle release end -RocketHideout_B4F_EventScript_DefeatedGrunt1:: @ 816139D +RocketHideout_B4F_EventScript_DefeatedGrunt1:: msgbox RocketHideout_B4F_Text_Grunt1PostBattle addobject LOCALID_LIFT_KEY clearflag FLAG_HIDE_LIFT_KEY release end -RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD +RocketHideout_B4F_EventScript_LiftKey:: lock faceplayer setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT @@ -75,12 +75,12 @@ RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD release end -RocketHideout_B4F_EventScript_Grunt2:: @ 81613CE +RocketHideout_B4F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_Text_Grunt2Intro, RocketHideout_B4F_Text_Grunt2Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt2 msgbox RocketHideout_B4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B4F_EventScript_DefeatedGrunt2:: @ 81613E9 +RocketHideout_B4F_EventScript_DefeatedGrunt2:: setvar NUM_DOOR_GRUNTS_DEFEATED, 0 call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated @@ -91,12 +91,12 @@ RocketHideout_B4F_EventScript_DefeatedGrunt2:: @ 81613E9 release end -RocketHideout_B4F_EventScript_Grunt3:: @ 8161418 +RocketHideout_B4F_EventScript_Grunt3:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_Text_Grunt3Intro, RocketHideout_B4F_Text_Grunt3Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt3 msgbox RocketHideout_B4F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433 +RocketHideout_B4F_EventScript_DefeatedGrunt3:: setvar NUM_DOOR_GRUNTS_DEFEATED, 0 call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated @@ -107,13 +107,13 @@ RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433 release end -RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462 +RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: playse SE_UNLOCK special DrawWholeMapView waitse return -RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A +RocketHideout_B4F_EventScript_SetBarrier:: setmetatile 17, 12, METATILE_SilphCo_HideoutBarrier_TopLeft_Floor, 1 setmetatile 18, 12, METATILE_SilphCo_HideoutBarrier_TopRight_Floor, 1 setmetatile 17, 13, METATILE_SilphCo_HideoutBarrier_BottomLeft, 1 @@ -122,7 +122,7 @@ RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A setmetatile 18, 14, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 return -RocketHideout_B4F_EventScript_RemoveBarrier:: @ 81614A1 +RocketHideout_B4F_EventScript_RemoveBarrier:: setmetatile 17, 12, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 setmetatile 18, 12, METATILE_SilphCo_HideoutFloor, 0 setmetatile 17, 13, METATILE_SilphCo_HideoutFloor_ShadeFull, 0 diff --git a/data/maps/RocketHideout_B4F/text.inc b/data/maps/RocketHideout_B4F/text.inc index 9d11d7502..0e7c73469 100644 --- a/data/maps/RocketHideout_B4F/text.inc +++ b/data/maps/RocketHideout_B4F/text.inc @@ -1,4 +1,4 @@ -RocketHideout_B4F_Text_GiovanniIntro:: @ 8175226 +RocketHideout_B4F_Text_GiovanniIntro:: .string "So! I must say, I am impressed you\n" .string "got here.\p" .string "TEAM ROCKET captures POKéMON from\n" @@ -9,11 +9,11 @@ RocketHideout_B4F_Text_GiovanniIntro:: @ 8175226 .string "For your insolence, you will feel a\n" .string "world of pain!$" -RocketHideout_B4F_Text_GiovanniDefeat:: @ 8175318 +RocketHideout_B4F_Text_GiovanniDefeat:: .string "WHAT!\n" .string "This can't be!$" -RocketHideout_B4F_Text_GiovanniPostBattle:: @ 817532D +RocketHideout_B4F_Text_GiovanniPostBattle:: .string "I see that you raise POKéMON with\n" .string "utmost care.\p" .string "A child like you would never\n" @@ -21,36 +21,36 @@ RocketHideout_B4F_Text_GiovanniPostBattle:: @ 817532D .string "I shall step aside this time!\p" .string "I hope we meet again…$" -RocketHideout_B4F_Text_Grunt2Intro:: @ 81753D0 +RocketHideout_B4F_Text_Grunt2Intro:: .string "I know you!\n" .string "You ruined our plans at MT. MOON!$" -RocketHideout_B4F_Text_Grunt2Defeat:: @ 81753FE +RocketHideout_B4F_Text_Grunt2Defeat:: .string "Burned again!$" -RocketHideout_B4F_Text_Grunt2PostBattle:: @ 817540C +RocketHideout_B4F_Text_Grunt2PostBattle:: .string "Do you have something against TEAM\n" .string "ROCKET?$" -RocketHideout_B4F_Text_Grunt3Intro:: @ 8175437 +RocketHideout_B4F_Text_Grunt3Intro:: .string "How can you not see the beauty of\n" .string "our evil?$" -RocketHideout_B4F_Text_Grunt3Defeat:: @ 8175463 +RocketHideout_B4F_Text_Grunt3Defeat:: .string "Ayaya!$" -RocketHideout_B4F_Text_Grunt3PostBattle:: @ 817546A +RocketHideout_B4F_Text_Grunt3PostBattle:: .string "BOSS!\n" .string "I'm sorry I failed you!$" -RocketHideout_B4F_Text_Grunt1Intro:: @ 8175488 +RocketHideout_B4F_Text_Grunt1Intro:: .string "The elevator doesn't work?\n" .string "Who has the LIFT KEY?$" -RocketHideout_B4F_Text_Grunt1Defeat:: @ 81754B9 +RocketHideout_B4F_Text_Grunt1Defeat:: .string "No!$" -RocketHideout_B4F_Text_Grunt1PostBattle:: @ 81754BD +RocketHideout_B4F_Text_Grunt1PostBattle:: .string "Oh, no!\n" .string "I dropped the LIFT KEY!$" diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc index 43e3f8782..eb7adaa96 100644 --- a/data/maps/RocketHideout_Elevator/scripts.inc +++ b/data/maps/RocketHideout_Elevator/scripts.inc @@ -1,7 +1,7 @@ -RocketHideout_Elevator_MapScripts:: @ 81614D8 +RocketHideout_Elevator_MapScripts:: .byte 0 -RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9 +RocketHideout_Elevator_EventScript_FloorSelect:: lockall goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, RocketHideout_Elevator_EventScript_NeedKey setvar VAR_0x8004, 2 @@ -18,22 +18,22 @@ RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9 case 2, RocketHideout_Elevator_EventScript_FloorSelectFromB4F end -RocketHideout_Elevator_EventScript_FloorSelectFromB1F:: @ 8161530 +RocketHideout_Elevator_EventScript_FloorSelectFromB1F:: multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 0, FALSE goto RocketHideout_Elevator_EventScript_ChooseFloor end -RocketHideout_Elevator_EventScript_FloorSelectFromB2F:: @ 816153C +RocketHideout_Elevator_EventScript_FloorSelectFromB2F:: multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 1, FALSE goto RocketHideout_Elevator_EventScript_ChooseFloor end -RocketHideout_Elevator_EventScript_FloorSelectFromB4F:: @ 8161548 +RocketHideout_Elevator_EventScript_FloorSelectFromB4F:: multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 2, FALSE goto RocketHideout_Elevator_EventScript_ChooseFloor end -RocketHideout_Elevator_EventScript_ChooseFloor:: @ 8161554 +RocketHideout_Elevator_EventScript_ChooseFloor:: switch VAR_RESULT case 0, RocketHideout_Elevator_EventScript_ToB1F case 1, RocketHideout_Elevator_EventScript_ToB2F @@ -42,7 +42,7 @@ RocketHideout_Elevator_EventScript_ChooseFloor:: @ 8161554 case 127, RocketHideout_Elevator_EventScript_ExitFloorSelect end -RocketHideout_Elevator_EventScript_ToB1F:: @ 8161591 +RocketHideout_Elevator_EventScript_ToB1F:: setvar VAR_0x8006, 3 setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25 compare VAR_ELEVATOR_FLOOR, 3 @@ -52,7 +52,7 @@ RocketHideout_Elevator_EventScript_ToB1F:: @ 8161591 goto RocketHideout_Elevator_EventScript_ExitFloorSelect end -RocketHideout_Elevator_EventScript_ToB2F:: @ 81615B9 +RocketHideout_Elevator_EventScript_ToB2F:: setvar VAR_0x8006, 2 setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16 compare VAR_ELEVATOR_FLOOR, 2 @@ -62,7 +62,7 @@ RocketHideout_Elevator_EventScript_ToB2F:: @ 81615B9 goto RocketHideout_Elevator_EventScript_ExitFloorSelect end -RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1 +RocketHideout_Elevator_EventScript_ToB4F:: setvar VAR_0x8006, 0 setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23 compare VAR_ELEVATOR_FLOOR, 0 @@ -72,12 +72,12 @@ RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1 goto RocketHideout_Elevator_EventScript_ExitFloorSelect end -RocketHideout_Elevator_EventScript_ExitFloorSelect:: @ 8161609 +RocketHideout_Elevator_EventScript_ExitFloorSelect:: special CloseElevatorCurrentFloorWindow releaseall end -RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E +RocketHideout_Elevator_EventScript_MoveElevator:: special CloseElevatorCurrentFloorWindow closemessage waitse @@ -86,7 +86,7 @@ RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E setflag FLAG_TEMP_2 return -RocketHideout_Elevator_EventScript_NeedKey:: @ 816161B +RocketHideout_Elevator_EventScript_NeedKey:: msgbox RocketHideout_Elevator_Text_AppearsToNeedAKey releaseall end diff --git a/data/maps/RocketHideout_Elevator/text.inc b/data/maps/RocketHideout_Elevator/text.inc index f0e5e09f8..02fa23ec6 100644 --- a/data/maps/RocketHideout_Elevator/text.inc +++ b/data/maps/RocketHideout_Elevator/text.inc @@ -1,3 +1,3 @@ -RocketHideout_Elevator_Text_AppearsToNeedAKey:: @ 81754DD +RocketHideout_Elevator_Text_AppearsToNeedAKey:: .string "It appears to need a key.$" diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc index 8004f3626..90bc0327b 100644 --- a/data/maps/Route1/scripts.inc +++ b/data/maps/Route1/scripts.inc @@ -1,7 +1,7 @@ -Route1_MapScripts:: @ 8167EFD +Route1_MapScripts:: .byte 0 -Route1_EventScript_MartClerk:: @ 8167EFE +Route1_EventScript_MartClerk:: lock faceplayer goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, Route1_EventScript_AlreadyGotPotion @@ -22,15 +22,15 @@ Route1_EventScript_MartClerk:: @ 8167EFE release end -Route1_EventScript_AlreadyGotPotion:: @ 8167F48 +Route1_EventScript_AlreadyGotPotion:: msgbox Route1_Text_ComeSeeUsIfYouNeedPokeBalls release end -Route1_EventScript_Boy:: @ 8167F52 +Route1_EventScript_Boy:: msgbox Route1_Text_CanJumpFromLedges, MSGBOX_NPC end -Route1_EventScript_RouteSign:: @ 8167F5B +Route1_EventScript_RouteSign:: msgbox Route1_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route1/text.inc b/data/maps/Route1/text.inc index 57ebecb86..271e96da2 100644 --- a/data/maps/Route1/text.inc +++ b/data/maps/Route1/text.inc @@ -1,4 +1,4 @@ -Route1_Text_WorkAtPokeMartTakeSample:: @ 818329D +Route1_Text_WorkAtPokeMartTakeSample:: .string "Hi!\n" .string "I work at a POKéMON MART.\p" .string "It's part of a convenient chain\n" @@ -7,22 +7,22 @@ Route1_Text_WorkAtPokeMartTakeSample:: @ 818329D .string "I know, I'll give you a sample.\n" .string "Here you go!$" -Route1_Text_ComeSeeUsIfYouNeedPokeBalls:: @ 8183347 +Route1_Text_ComeSeeUsIfYouNeedPokeBalls:: .string "Please come see us if you need\n" .string "POKé BALLS for catching POKéMON.$" -Route1_Text_PutPotionAway:: @ 8183387 +Route1_Text_PutPotionAway:: .string "{PLAYER} put the POTION away in\n" .string "the BAG's ITEMS POCKET.$" -Route1_Text_CanJumpFromLedges:: @ 81833B9 +Route1_Text_CanJumpFromLedges:: .string "See those ledges along the road?\p" .string "It's a bit scary, but you can jump\n" .string "from them.\p" .string "You can get back to PALLET TOWN\n" .string "quicker that way.$" -Route1_Text_RouteSign:: @ 818343A +Route1_Text_RouteSign:: .string "ROUTE 1\n" .string "PALLET TOWN - VIRIDIAN CITY$" diff --git a/data/maps/Route10/scripts.inc b/data/maps/Route10/scripts.inc index 93694dc8a..bafab64e8 100644 --- a/data/maps/Route10/scripts.inc +++ b/data/maps/Route10/scripts.inc @@ -1,17 +1,17 @@ -Route10_MapScripts:: @ 8167FD9 +Route10_MapScripts:: .byte 0 -Route10_EventScript_Unused:: @ 8167FDA +Route10_EventScript_Unused:: end -Route10_EventScript_NorthRockTunnelSign:: @ 8167FDB +Route10_EventScript_NorthRockTunnelSign:: msgbox Route10_Text_RockTunnelDetourToLavender, MSGBOX_SIGN end -Route10_EventScript_SouthRockTunnelSign:: @ 8167FE4 +Route10_EventScript_SouthRockTunnelSign:: msgbox Route10_Text_RockTunnel, MSGBOX_SIGN end -Route10_EventScript_PowerPlantSign:: @ 8167FED +Route10_EventScript_PowerPlantSign:: msgbox Route10_Text_PowerPlant, MSGBOX_SIGN end diff --git a/data/maps/Route10/text.inc b/data/maps/Route10/text.inc index 5a2d48efb..a5814b72d 100644 --- a/data/maps/Route10/text.inc +++ b/data/maps/Route10/text.inc @@ -1,86 +1,86 @@ -Route10_Text_MarkIntro:: @ 8184B8A +Route10_Text_MarkIntro:: .string "Wow, you came all the way here?\n" .string "Maybe you're a POKéMANIAC, too?\l" .string "Want to see my collection?$" -Route10_Text_MarkDefeat:: @ 8184BE5 +Route10_Text_MarkDefeat:: .string "Humph.\n" .string "I'm not angry!$" -Route10_Text_MarkPostBattle:: @ 8184BFB +Route10_Text_MarkPostBattle:: .string "I have more rare POKéMON at home!$" -Route10_Text_ClarkIntro:: @ 8184C1D +Route10_Text_ClarkIntro:: .string "Ha-hahah-ah-ha!$" -Route10_Text_ClarkDefeat:: @ 8184C2D +Route10_Text_ClarkDefeat:: .string "Ha-haha!\n" .string "Not laughing!\l" .string "Ha-hay fever! Haha-ha-choo!$" -Route10_Text_ClarkPostBattle:: @ 8184C60 +Route10_Text_ClarkPostBattle:: .string "Haha-ha-choo!\n" .string "Ha-choo!\l" .string "Snort! Snivel!$" -Route10_Text_HermanIntro:: @ 8184C86 +Route10_Text_HermanIntro:: .string "Hi, kid!\n" .string "Want to see my POKéMON?$" -Route10_Text_HermanDefeat:: @ 8184CA7 +Route10_Text_HermanDefeat:: .string "Oh, no!\n" .string "My POKéMON!$" -Route10_Text_HermanPostBattle:: @ 8184CBB +Route10_Text_HermanPostBattle:: .string "I don't like you.\n" .string "I don't like anyone better than me!$" -Route10_Text_HeidiIntro:: @ 8184CF1 +Route10_Text_HeidiIntro:: .string "I've been out at a POKéMON GYM\n" .string "a few times.\p" .string "…But I always lose.$" -Route10_Text_HeidiDefeat:: @ 8184D31 +Route10_Text_HeidiDefeat:: .string "Ohh!\n" .string "After all my training!$" -Route10_Text_HeidiPostBattle:: @ 8184D4D +Route10_Text_HeidiPostBattle:: .string "I noticed some POKéMANIACS\n" .string "prowling around.\p" .string "Can you imagine? Them?\n" .string "Up here in the mountains?$" -Route10_Text_TrentIntro:: @ 8184DAA +Route10_Text_TrentIntro:: .string "Ah!\n" .string "This mountain air is delicious!$" -Route10_Text_TrentDefeat:: @ 8184DCE +Route10_Text_TrentDefeat:: .string "That cleared my head!$" -Route10_Text_TrentPostBattle:: @ 8184DE4 +Route10_Text_TrentPostBattle:: .string "I feel bloated on mountain air!$" -Route10_Text_CarolIntro:: @ 8184E04 +Route10_Text_CarolIntro:: .string "I'm feeling a bit faint.\n" .string "I haven't hiked in some time.$" -Route10_Text_CarolDefeat:: @ 8184E3B +Route10_Text_CarolDefeat:: .string "I'm too tired.\n" .string "I wasn't up for it.$" -Route10_Text_CarolPostBattle:: @ 8184E5E +Route10_Text_CarolPostBattle:: .string "The POKéMON here in the mountains\n" .string "are so chunky…\p" .string "I wish there were pink POKéMON\n" .string "with a floral pattern!$" -Route10_Text_RockTunnelDetourToLavender:: @ 8184EC5 +Route10_Text_RockTunnelDetourToLavender:: .string "ROCK TUNNEL\n" .string "Detour to LAVENDER TOWN$" -Route10_Text_RockTunnel:: @ 8184EE9 +Route10_Text_RockTunnel:: .string "ROCK TUNNEL$" -Route10_Text_PowerPlant:: @ 8184EF5 +Route10_Text_PowerPlant:: .string "POWER PLANT$" diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc index aa59cd95b..5cbe2e973 100644 --- a/data/maps/Route10_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc @@ -1,35 +1,35 @@ .equ REQUIRED_OWNED_MONS, 20 -Route10_PokemonCenter_1F_MapScripts:: @ 816FC2F +Route10_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route10_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -Route10_PokemonCenter_1F_OnTransition:: @ 816FC3A +Route10_PokemonCenter_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_ROUTE10_POKEMON_CENTER_1F setrespawn SPAWN_ROUTE10 end -Route10_PokemonCenter_1F_EventScript_Nurse:: @ 816FC41 +Route10_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -Route10_PokemonCenter_1F_EventScript_FatMan:: @ 816FC4A +Route10_PokemonCenter_1F_EventScript_FatMan:: msgbox Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_Gentleman:: @ 816FC53 +Route10_PokemonCenter_1F_EventScript_Gentleman:: msgbox Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_Youngster:: @ 816FC5C +Route10_PokemonCenter_1F_EventScript_Youngster:: msgbox Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender, MSGBOX_NPC end -Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65 +Route10_PokemonCenter_1F_EventScript_Aide:: lock faceplayer call Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo @@ -53,12 +53,12 @@ Route10_PokemonCenter_1F_EventScript_Aide:: @ 816FC65 release end -Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone:: @ 816FCE7 +Route10_PokemonCenter_1F_EventScript_AlreadyGotEverstone:: msgbox Route10_PokemonCenter_1F_Text_ExplainEverstone release end -Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo:: @ 816FCF1 +Route10_PokemonCenter_1F_EventScript_GetAideRequestInfo:: getnumberstring 0, REQUIRED_OWNED_MONS getitemname 1, ITEM_EVERSTONE return diff --git a/data/maps/Route10_PokemonCenter_1F/text.inc b/data/maps/Route10_PokemonCenter_1F/text.inc index 7c63407ae..c47c5ad17 100644 --- a/data/maps/Route10_PokemonCenter_1F/text.inc +++ b/data/maps/Route10_PokemonCenter_1F/text.inc @@ -1,18 +1,18 @@ -Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers:: @ 819E523 +Route10_PokemonCenter_1F_Text_EveryTypeStrongerThanOthers:: .string "The types of POKéMON match up\n" .string "differently with each other.\p" .string "Every type is stronger than some\n" .string "types and weaker than others.$" -Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000:: @ 819E59D +Route10_PokemonCenter_1F_Text_NuggetUselessSoldFor5000:: .string "A NUGGET is totally useless.\n" .string "So I sold it for ¥5000.$" -Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender:: @ 819E5D2 +Route10_PokemonCenter_1F_Text_HeardGhostsHauntLavender:: .string "I heard that ghosts haunt\n" .string "LAVENDER TOWN.$" -Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons:: @ 819E5FB +Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons:: .string "Oh… {PLAYER}!\n" .string "I've been looking for you!\p" .string "It's me, one of the ever-present\n" @@ -26,17 +26,17 @@ Route10_PokemonCenter_1F_Text_GiveEverstoneIfCaught20Mons:: @ 819E5FB .string "Have you gathered data on at least\n" .string "twenty kinds of POKéMON?$" -Route10_PokemonCenter_1F_Text_GreatHereYouGo:: @ 819E733 +Route10_PokemonCenter_1F_Text_GreatHereYouGo:: .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide:: @ 819E786 +Route10_PokemonCenter_1F_Text_ReceivedEverstoneFromAide:: .string "{PLAYER} received the EVERSTONE\n" .string "from the AIDE.$" -Route10_PokemonCenter_1F_Text_ExplainEverstone:: @ 819E7AF +Route10_PokemonCenter_1F_Text_ExplainEverstone:: .string "Making POKéMON evolve certainly\n" .string "can add to the POKéDEX.\p" .string "However, at times, you may not\n" diff --git a/data/maps/Route10_PokemonCenter_2F/scripts.inc b/data/maps/Route10_PokemonCenter_2F/scripts.inc index 2760e125c..73a04875a 100644 --- a/data/maps/Route10_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route10_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA +Route10_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ Route10_PokemonCenter_2F_MapScripts:: @ 816FCFA .byte 0 @ The below 3 are unused and leftover from RS -Route10_PokemonCenter_2F_EventScript_Colosseum:: @ 816FD0F +Route10_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -Route10_PokemonCenter_2F_EventScript_TradeCenter:: @ 816FD15 +Route10_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -Route10_PokemonCenter_2F_EventScript_RecordCorner:: @ 816FD1B +Route10_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/Route11/scripts.inc b/data/maps/Route11/scripts.inc index 821b8256f..e150114a5 100644 --- a/data/maps/Route11/scripts.inc +++ b/data/maps/Route11/scripts.inc @@ -1,6 +1,6 @@ -Route11_MapScripts:: @ 8167FF6 +Route11_MapScripts:: .byte 0 -Route11_EventScript_DiglettsCaveSign:: @ 8167FF7 +Route11_EventScript_DiglettsCaveSign:: msgbox Route11_Text_DiglettsCave, MSGBOX_SIGN end diff --git a/data/maps/Route11/text.inc b/data/maps/Route11/text.inc index 2f7c7fc6d..27e256cd8 100644 --- a/data/maps/Route11/text.inc +++ b/data/maps/Route11/text.inc @@ -1,113 +1,113 @@ -Route11_Text_HugoIntro:: @ 8184F01 +Route11_Text_HugoIntro:: .string "Win, lose, or draw!$" -Route11_Text_HugoDefeat:: @ 8184F15 +Route11_Text_HugoDefeat:: .string "Atcha!\n" .string "Didn't go my way!$" -Route11_Text_HugoPostBattle:: @ 8184F2E +Route11_Text_HugoPostBattle:: .string "POKéMON is life!\n" .string "And to live is to play games!$" -Route11_Text_JasperIntro:: @ 8184F5D +Route11_Text_JasperIntro:: .string "Competition!\n" .string "I can't get enough!$" -Route11_Text_JasperDefeat:: @ 8184F7E +Route11_Text_JasperDefeat:: .string "I had a chance!$" -Route11_Text_JasperPostBattle:: @ 8184F8E +Route11_Text_JasperPostBattle:: .string "You can't be a coward in the world\n" .string "of POKéMON!$" -Route11_Text_EddieIntro:: @ 8184FBD +Route11_Text_EddieIntro:: .string "Let's go, but don't cheat!$" -Route11_Text_EddieDefeat:: @ 8184FD8 +Route11_Text_EddieDefeat:: .string "Huh?\n" .string "That's not right!$" -Route11_Text_EddiePostBattle:: @ 8184FEF +Route11_Text_EddiePostBattle:: .string "I did my best.\n" .string "I have no regrets.$" -Route11_Text_BraxtonIntro:: @ 8185011 +Route11_Text_BraxtonIntro:: .string "Careful!\n" .string "I'm laying down some cables!$" -Route11_Text_BraxtonDefeat:: @ 8185037 +Route11_Text_BraxtonDefeat:: .string "That was electric!$" -Route11_Text_BraxtonPostBattle:: @ 818504A +Route11_Text_BraxtonPostBattle:: .string "Spread the word to save energy!$" -Route11_Text_DillonIntro:: @ 818506A +Route11_Text_DillonIntro:: .string "I just became a TRAINER.\n" .string "But, I think I can win.$" -Route11_Text_DillonDefeat:: @ 818509B +Route11_Text_DillonDefeat:: .string "My POKéMON couldn't win…\n" .string "Haven't they grown enough?$" -Route11_Text_DillonPostBattle:: @ 81850CF +Route11_Text_DillonPostBattle:: .string "What now?\n" .string "Leave me alone!$" -Route11_Text_DirkIntro:: @ 81850E9 +Route11_Text_DirkIntro:: .string "Fwahaha!\n" .string "I have never lost!$" -Route11_Text_DirkDefeat:: @ 8185105 +Route11_Text_DirkDefeat:: .string "My first loss!$" -Route11_Text_DirkPostBattle:: @ 8185114 +Route11_Text_DirkPostBattle:: .string "You were just lucky, that's all.$" -Route11_Text_DarianIntro:: @ 8185135 +Route11_Text_DarianIntro:: .string "I have never won before…$" -Route11_Text_DarianDefeat:: @ 818514E +Route11_Text_DarianDefeat:: .string "I saw this coming…$" -Route11_Text_DarianPostBattle:: @ 8185161 +Route11_Text_DarianPostBattle:: .string "I was unlucky, as always.$" -Route11_Text_YasuIntro:: @ 818517B +Route11_Text_YasuIntro:: .string "I'm the best in my class.\n" .string "I train every morning.$" -Route11_Text_YasuDefeat:: @ 81851AC +Route11_Text_YasuDefeat:: .string "Darn!\n" .string "My POKéMON need to be stronger!$" -Route11_Text_YasuPostBattle:: @ 81851D2 +Route11_Text_YasuPostBattle:: .string "There's a fat POKéMON that comes\n" .string "down from the mountains.\p" .string "I bet it'd be strong if you can\n" .string "catch it.$" -Route11_Text_BernieIntro:: @ 8185236 +Route11_Text_BernieIntro:: .string "Watch out for live wires!$" -Route11_Text_BernieDefeat:: @ 8185250 +Route11_Text_BernieDefeat:: .string "Whoa!\n" .string "You spark plug!$" -Route11_Text_BerniePostBattle:: @ 8185266 +Route11_Text_BerniePostBattle:: .string "Well, better get back to work.$" -Route11_Text_DaveIntro:: @ 8185285 +Route11_Text_DaveIntro:: .string "I raised my POKéMON carefully.\n" .string "They should be ready by now!$" -Route11_Text_DaveDefeat:: @ 81852C1 +Route11_Text_DaveDefeat:: .string "Bye-bye!\n" .string "Thank you, and good-bye!$" -Route11_Text_DavePostBattle:: @ 81852E3 +Route11_Text_DavePostBattle:: .string "Tch…\n" .string "I better go find stronger ones!$" -Route11_Text_DiglettsCave:: @ 8185308 +Route11_Text_DiglettsCave:: .string "DIGLETT'S CAVE$" diff --git a/data/maps/Route11_EastEntrance_1F/scripts.inc b/data/maps/Route11_EastEntrance_1F/scripts.inc index e8097b62a..6eec9e168 100644 --- a/data/maps/Route11_EastEntrance_1F/scripts.inc +++ b/data/maps/Route11_EastEntrance_1F/scripts.inc @@ -1,10 +1,10 @@ -Route11_EastEntrance_1F_MapScripts:: @ 816FD21 +Route11_EastEntrance_1F_MapScripts:: .byte 0 -Route11_EastEntrance_1F_EventScript_TopGuard:: @ 816FD22 +Route11_EastEntrance_1F_EventScript_TopGuard:: msgbox Route11_EastEntrance_1F_Text_ManInLavenderRatesNames, MSGBOX_NPC end -Route11_EastEntrance_1F_EventScript_BottomGuard:: @ 816FD2B +Route11_EastEntrance_1F_EventScript_BottomGuard:: msgbox Route11_EastEntrance_1F_Text_RockTunnelToReachLavender, MSGBOX_NPC end diff --git a/data/maps/Route11_EastEntrance_1F/text.inc b/data/maps/Route11_EastEntrance_1F/text.inc index de5965bcf..4d6f7e7ad 100644 --- a/data/maps/Route11_EastEntrance_1F/text.inc +++ b/data/maps/Route11_EastEntrance_1F/text.inc @@ -1,9 +1,9 @@ @ Unclear where this is originally from -Route11_EastEntrance_1F_Text_BagIsFull:: @ 819E890 +Route11_EastEntrance_1F_Text_BagIsFull:: .string "{PLAYER}{KUN}の　バッグ\n" .string "いっぱい　みたい　だね$" -Route11_EastEntrance_1F_Text_ManInLavenderRatesNames:: @ 819E8A6 +Route11_EastEntrance_1F_Text_ManInLavenderRatesNames:: .string "Don't you think it's hard to think\n" .string "up good names for POKéMON?\p" .string "Especially if you've caught a\n" @@ -13,7 +13,7 @@ Route11_EastEntrance_1F_Text_ManInLavenderRatesNames:: @ 819E8A6 .string "He can even help you rename your\n" .string "POKéMON, too.$" -Route11_EastEntrance_1F_Text_RockTunnelToReachLavender:: @ 819E97B +Route11_EastEntrance_1F_Text_RockTunnelToReachLavender:: .string "If you're aiming to reach LAVENDER\n" .string "TOWN, take ROCK TUNNEL.\p" .string "You can get to ROCK TUNNEL from\n" diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc index 22bd6e743..e59125e42 100644 --- a/data/maps/Route11_EastEntrance_2F/scripts.inc +++ b/data/maps/Route11_EastEntrance_2F/scripts.inc @@ -1,25 +1,25 @@ .equ REQUIRED_CAUGHT_MONS, 30 -Route11_EastEntrance_2F_MapScripts:: @ 816FD34 +Route11_EastEntrance_2F_MapScripts:: .byte 0 -Route11_EastEntrance_2F_EventScript_LeftBinoculars:: @ 816FD35 +Route11_EastEntrance_2F_EventScript_LeftBinoculars:: lockall goto_if_set FLAG_WOKE_UP_ROUTE_12_SNORLAX, Route11_EastEntrance_2F_EventScript_LeftBinocularsSnorlaxGone msgbox Route11_EastEntrance_2F_Text_BigMonAsleepOnRoad releaseall end -Route11_EastEntrance_2F_EventScript_LeftBinocularsSnorlaxGone:: @ 816FD49 +Route11_EastEntrance_2F_EventScript_LeftBinocularsSnorlaxGone:: msgbox Route11_EastEntrance_2F_Text_WhatABreathtakingView releaseall end -Route11_EastEntrance_2F_EventScript_RightBinoculars:: @ 816FD53 +Route11_EastEntrance_2F_EventScript_RightBinoculars:: msgbox Route11_EastEntrance_2F_Text_RockTunnelGoodRouteToLavender, MSGBOX_SIGN end -Route11_EastEntrance_2F_EventScript_Turner:: @ 816FD5C +Route11_EastEntrance_2F_EventScript_Turner:: lock faceplayer setvar VAR_0x8008, INGAME_TRADE_NIDORINOA @@ -40,23 +40,23 @@ Route11_EastEntrance_2F_EventScript_Turner:: @ 816FD5C release end -Route11_EastEntrance_2F_EventScript_DeclineTrade:: @ 816FDB6 +Route11_EastEntrance_2F_EventScript_DeclineTrade:: msgbox Trade_Text_AwwOhWell release end -Route11_EastEntrance_2F_EventScript_NotRequestedMon:: @ 816FDC0 +Route11_EastEntrance_2F_EventScript_NotRequestedMon:: getspeciesname 0, VAR_0x8009 msgbox Trade_Text_WhatThatsNoMon release end -Route11_EastEntrance_2F_EventScript_AlreadyTraded:: @ 816FDCE +Route11_EastEntrance_2F_EventScript_AlreadyTraded:: msgbox Trade_Text_IsntMyOldMonGreat release end -Route11_EastEntrance_2F_EventScript_Aide:: @ 816FDD8 +Route11_EastEntrance_2F_EventScript_Aide:: lock faceplayer call Route11_EastEntrance_2F_EventScript_GetAideRequestInfo @@ -80,12 +80,12 @@ Route11_EastEntrance_2F_EventScript_Aide:: @ 816FDD8 release end -Route11_EastEntrance_2F_EventScript_AlreadyGotItemfinder:: @ 816FE5A +Route11_EastEntrance_2F_EventScript_AlreadyGotItemfinder:: msgbox Route11_EastEntrance_2F_Text_ExplainItemfinder release end -Route11_EastEntrance_2F_EventScript_GetAideRequestInfo:: @ 816FE64 +Route11_EastEntrance_2F_EventScript_GetAideRequestInfo:: getnumberstring 0, REQUIRED_CAUGHT_MONS getitemname 1, ITEM_ITEMFINDER return diff --git a/data/maps/Route11_EastEntrance_2F/text.inc b/data/maps/Route11_EastEntrance_2F/text.inc index 66e871199..bdfa03e9c 100644 --- a/data/maps/Route11_EastEntrance_2F/text.inc +++ b/data/maps/Route11_EastEntrance_2F/text.inc @@ -1,4 +1,4 @@ -Route11_EastEntrance_2F_Text_GiveItemfinderIfCaught30:: @ 819E9E5 +Route11_EastEntrance_2F_Text_GiveItemfinderIfCaught30:: .string "Hi! Remember me?\n" .string "I'm one of PROF. OAK's AIDES.\p" .string "If your POKéDEX has complete data\n" @@ -10,17 +10,17 @@ Route11_EastEntrance_2F_Text_GiveItemfinderIfCaught30:: @ 819E9E5 .string "Have you gathered data on at least\n" .string "{STR_VAR_1} kinds of POKéMON?$" -Route11_EastEntrance_2F_Text_GreatHereYouGo:: @ 819EAE4 +Route11_EastEntrance_2F_Text_GreatHereYouGo:: .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -Route11_EastEntrance_2F_Text_ReceivedItemfinderFromAide:: @ 819EB37 +Route11_EastEntrance_2F_Text_ReceivedItemfinderFromAide:: .string "{PLAYER} received the {STR_VAR_2}\n" .string "from the AIDE.$" -Route11_EastEntrance_2F_Text_ExplainItemfinder:: @ 819EB59 +Route11_EastEntrance_2F_Text_ExplainItemfinder:: .string "There are items on the ground that\n" .string "may be hidden from view.\p" .string "Use the ITEMFINDER to detect any\n" @@ -32,17 +32,17 @@ Route11_EastEntrance_2F_Text_ExplainItemfinder:: @ 819EB59 .string "Use it to get your bearings, then\n" .string "search the suspect area by hand.$" -Route11_EastEntrance_2F_Text_BigMonAsleepOnRoad:: @ 819EC8A +Route11_EastEntrance_2F_Text_BigMonAsleepOnRoad:: .string "Let's see what the binoculars have\n" .string "to show…\p" .string "A big POKéMON is asleep on a road!$" -Route11_EastEntrance_2F_Text_WhatABreathtakingView:: @ 819ECD9 +Route11_EastEntrance_2F_Text_WhatABreathtakingView:: .string "Let's see what the binoculars have\n" .string "to show…\p" .string "What a breathtaking view!$" -Route11_EastEntrance_2F_Text_RockTunnelGoodRouteToLavender:: @ 819ED1F +Route11_EastEntrance_2F_Text_RockTunnelGoodRouteToLavender:: .string "Let's see what the binoculars have\n" .string "to show…\p" .string "To get to LAVENDER TOWN from\n" diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 9e3aa0ad0..7a5c9c5a3 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -1,16 +1,16 @@ -Route12_MapScripts:: @ 8168000 +Route12_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, Route12_OnResume .byte 0 -Route12_OnResume:: @ 8168006 +Route12_OnResume:: call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, Route12_EventScript_TryRemoveSnorlax end -Route12_EventScript_TryRemoveSnorlax:: @ 8168010 +Route12_EventScript_TryRemoveSnorlax:: removeobject VAR_LAST_TALKED return -Route12_EventScript_Snorlax:: @ 8168014 +Route12_EventScript_Snorlax:: lock faceplayer goto_if_unset FLAG_GOT_POKE_FLUTE, Route12_EventScript_SnorlaxNoPokeFlute @@ -40,24 +40,24 @@ Route12_EventScript_Snorlax:: @ 8168014 release end -Route12_EventScript_DontUsePokeFlute:: @ 816808D +Route12_EventScript_DontUsePokeFlute:: release end -Route12_EventScript_FoughtSnorlax:: @ 816808F +Route12_EventScript_FoughtSnorlax:: msgbox Text_SnorlaxReturnedToMountains release end -Route12_EventScript_SnorlaxNoPokeFlute:: @ 8168099 +Route12_EventScript_SnorlaxNoPokeFlute:: msgbox Route12_Text_MonSprawledOutInSlumber release end -Route12_EventScript_RouteSign:: @ 81680A3 +Route12_EventScript_RouteSign:: msgbox Route12_Text_RouteSign, MSGBOX_SIGN end -Route12_EventScript_FishingSign:: @ 81680AC +Route12_EventScript_FishingSign:: msgbox Route12_Text_SportfishingArea, MSGBOX_SIGN end diff --git a/data/maps/Route12/text.inc b/data/maps/Route12/text.inc index 9c984cc47..c4bd1d9e6 100644 --- a/data/maps/Route12/text.inc +++ b/data/maps/Route12/text.inc @@ -1,144 +1,144 @@ -Route12_Text_MonSprawledOutInSlumber:: @ 8185317 +Route12_Text_MonSprawledOutInSlumber:: .string "A POKéMON is sprawled out in\n" .string "a deep and comfortable slumber.$" -Text_SnorlaxWokeUp:: @ 8185354 +Text_SnorlaxWokeUp:: .string "SNORLAX woke up!\p" .string "It attacked in a grumpy rage!$" -Text_SnorlaxReturnedToMountains:: @ 8185383 +Text_SnorlaxReturnedToMountains:: .string "SNORLAX calmed down.\n" .string "It gave a huge yawn…\l" .string "And returned to the mountains.$" -Text_WantToUsePokeFlute:: @ 81853CC +Text_WantToUsePokeFlute:: .string "Want to use the POKé FLUTE?$" -Text_PlayedPokeFlute:: @ 81853E8 +Text_PlayedPokeFlute:: .string "{PLAYER} played the POKé FLUTE.$" -Route12_Text_NedIntro:: @ 8185402 +Route12_Text_NedIntro:: .string "Yeah!\n" .string "I got a bite here!$" -Route12_Text_NedDefeat:: @ 818541B +Route12_Text_NedDefeat:: .string "Tch!\n" .string "Just a small fry…$" -Route12_Text_NedPostBattle:: @ 8185432 +Route12_Text_NedPostBattle:: .string "Hang on!\n" .string "My line's snagged!$" -Route12_Text_ChipIntro:: @ 818544E +Route12_Text_ChipIntro:: .string "Be patient.\n" .string "Fishing is a waiting game.$" -Route12_Text_ChipDefeat:: @ 8185475 +Route12_Text_ChipDefeat:: .string "That one got away!$" -Route12_Text_ChipPostBattle:: @ 8185488 +Route12_Text_ChipPostBattle:: .string "With a better ROD, I could catch\n" .string "better POKéMON…$" -Route12_Text_JustinIntro:: @ 81854B9 +Route12_Text_JustinIntro:: .string "I'm searching for a MOON STONE.\n" .string "Have you found one?$" -Route12_Text_JustinDefeat:: @ 81854ED +Route12_Text_JustinDefeat:: .string "Oww!$" -Route12_Text_JustinPostBattle:: @ 81854F2 +Route12_Text_JustinPostBattle:: .string "I could have made my POKéMON\n" .string "evolve with a MOON STONE.\p" .string "I would have won then, I bet.$" -Route12_Text_LucaIntro:: @ 8185547 +Route12_Text_LucaIntro:: .string "Electricity is my specialty.\p" .string "I don't know a thing about POKéMON\n" .string "of the sea, though.$" -Route12_Text_LucaDefeat:: @ 818559B +Route12_Text_LucaDefeat:: .string "Unplugged!$" -Route12_Text_LucaPostBattle:: @ 81855A6 +Route12_Text_LucaPostBattle:: .string "Water conducts electricity, so you\n" .string "should zap sea POKéMON.$" -Route12_Text_HankIntro:: @ 81855E1 +Route12_Text_HankIntro:: .string "The FISHING FOOL versus POKéMON\n" .string "KID!$" -Route12_Text_HankDefeat:: @ 8185606 +Route12_Text_HankDefeat:: .string "Touch too much!$" -Route12_Text_HankPostBattle:: @ 8185616 +Route12_Text_HankPostBattle:: .string "I guess you get to be good at\n" .string "what you like.\p" .string "Well, you beat me at POKéMON,\n" .string "but you can't top me at fishing.$" -Route12_Text_ElliotIntro:: @ 8185682 +Route12_Text_ElliotIntro:: .string "I love fishing, don't get me wrong.\p" .string "But it'd be best if I also had more\n" .string "work.$" -Route12_Text_ElliotDefeat:: @ 81856D0 +Route12_Text_ElliotDefeat:: .string "It's not easy…$" -Route12_Text_ElliotPostBattle:: @ 81856DF +Route12_Text_ElliotPostBattle:: .string "It's all right.\n" .string "Losing doesn't bug me anymore.$" -Route12_Text_AndrewIntro:: @ 818570E +Route12_Text_AndrewIntro:: .string "What's catching?\p" .string "You never know what you could\n" .string "catch!$" -Route12_Text_AndrewDefeat:: @ 8185744 +Route12_Text_AndrewDefeat:: .string "Lost it!$" -Route12_Text_AndrewPostBattle:: @ 818574D +Route12_Text_AndrewPostBattle:: .string "What, MAGIKARP?\p" .string "I catch them all the time, sure.\n" .string "But, boy are they wimpy.$" -Route12_Text_RouteSign:: @ 8185797 +Route12_Text_RouteSign:: .string "ROUTE 12 \n" .string "North to LAVENDER$" -Route12_Text_SportfishingArea:: @ 81857B3 +Route12_Text_SportfishingArea:: .string "SPORTFISHING AREA$" -Route12_Text_JesIntro:: @ 81857C5 +Route12_Text_JesIntro:: .string "JES: If I win, I'm going to\n" .string "propose to GIA.$" -Route12_Text_JesDefeat:: @ 81857F1 +Route12_Text_JesDefeat:: .string "JES: Oh, please, why couldn't you\n" .string "let us win?$" -Route12_Text_JesPostBattle:: @ 818581F +Route12_Text_JesPostBattle:: .string "JES: Oh, GIA, forgive me,\n" .string "my love!$" -Route12_Text_JesNotEnoughMons:: @ 8185842 +Route12_Text_JesNotEnoughMons:: .string "JES: GIA and I, we'll be\n" .string "together forever.\p" .string "We won't battle unless you have\n" .string "two POKéMON of your own.$" -Route12_Text_GiaIntro:: @ 81858A6 +Route12_Text_GiaIntro:: .string "GIA: Hey, JES…\p" .string "If we win, I'll marry you!$" -Route12_Text_GiaDefeat:: @ 81858D0 +Route12_Text_GiaDefeat:: .string "GIA: Oh, but why?$" -Route12_Text_GiaPostBattle:: @ 81858E2 +Route12_Text_GiaPostBattle:: .string "GIA: JES, you silly!\n" .string "You ruined this!$" -Route12_Text_GiaNotEnoughMons:: @ 8185908 +Route12_Text_GiaNotEnoughMons:: .string "GIA: I can't bear to battle\n" .string "without my JES!\p" .string "Don't you have one more POKéMON?$" diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 60ba742b3..620753d7d 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -1,7 +1,7 @@ -Route12_FishingHouse_MapScripts:: @ 816FF0B +Route12_FishingHouse_MapScripts:: .byte 0 -Route12_FishingHouse_EventScript_FishingGuruBrother:: @ 816FF0C +Route12_FishingHouse_EventScript_FishingGuruBrother:: lock faceplayer goto_if_set FLAG_GOT_SUPER_ROD, Route12_FishingHouse_EventScript_CheckMagikarpRecord @@ -12,7 +12,7 @@ Route12_FishingHouse_EventScript_FishingGuruBrother:: @ 816FF0C release end -Route12_FishingHouse_EventScript_GiveSuperRod:: @ 816FF34 +Route12_FishingHouse_EventScript_GiveSuperRod:: checkitemspace ITEM_SUPER_ROD, 1 compare VAR_RESULT, FALSE goto_if_eq Route12_FishingHouse_EventScript_NoRoomForSuperRod @@ -24,12 +24,12 @@ Route12_FishingHouse_EventScript_GiveSuperRod:: @ 816FF34 release end -Route12_FishingHouse_EventScript_NoRoomForSuperRod:: @ 816FF75 +Route12_FishingHouse_EventScript_NoRoomForSuperRod:: msgbox Route12_FishingHouse_Text_NoRoomForGift release end -Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F +Route12_FishingHouse_EventScript_CheckMagikarpRecord:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording setvar VAR_0x8004, SPECIES_MAGIKARP @@ -55,33 +55,33 @@ Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F release end -Route12_FishingHouse_EventScript_NoMagikarpInParty:: @ 816FFF5 +Route12_FishingHouse_EventScript_NoMagikarpInParty:: msgbox Route12_FishingHouse_Text_TryFishingBringMeMagikarp release end -Route12_FishingHouse_EventScript_CancelShowMon:: @ 816FFFF +Route12_FishingHouse_EventScript_CancelShowMon:: release end -Route12_FishingHouse_EventScript_NotMagikarp:: @ 8170001 +Route12_FishingHouse_EventScript_NotMagikarp:: msgbox Route12_FishingHouse_Text_DoesntLookLikeMagikarp release end -Route12_FishingHouse_EventScript_NotRecordMagikarp:: @ 817000B +Route12_FishingHouse_EventScript_NotRecordMagikarp:: goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_NewRecordMagikarp msgbox Route12_FishingHouse_Text_HmmXInchesDoesntMeasureUp release end -Route12_FishingHouse_EventScript_TieRecordMagikarp:: @ 817001E +Route12_FishingHouse_EventScript_TieRecordMagikarp:: goto_if_unset FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_NewRecordMagikarp msgbox Route12_FishingHouse_Text_HuhXInchesSameSizeAsLast release end -Route12_FishingHouse_EventScript_NewRecordMagikarp:: @ 8170031 +Route12_FishingHouse_EventScript_NewRecordMagikarp:: setflag FLAG_GOT_RECORD_SETTING_MAGIKARP msgbox Route12_FishingHouse_Text_WhoaXInchesTakeThis giveitem ITEM_NET_BALL @@ -91,19 +91,19 @@ Route12_FishingHouse_EventScript_NewRecordMagikarp:: @ 8170031 release end -Route12_FishingHouse_EventScript_NoRoomForNetBall:: @ 817005D +Route12_FishingHouse_EventScript_NoRoomForNetBall:: msgbox Route12_FishingHouse_Text_NoRoomForGift release end -Route12_FishingHouse_EventScript_MagikarpRecordSign:: @ 8170067 +Route12_FishingHouse_EventScript_MagikarpRecordSign:: lockall goto_if_set FLAG_GOT_RECORD_SETTING_MAGIKARP, Route12_FishingHouse_EventScript_MagikarpRecordSignRecordSet msgbox Route12_FishingHouse_Text_BlankChartOfSomeSort releaseall end -Route12_FishingHouse_EventScript_MagikarpRecordSignRecordSet:: @ 817007B +Route12_FishingHouse_EventScript_MagikarpRecordSignRecordSet:: special GetMagikarpSizeRecordInfo msgbox Route12_FishingHouse_Text_MostGiganticMagikarpXInches releaseall diff --git a/data/maps/Route12_FishingHouse/text.inc b/data/maps/Route12_FishingHouse/text.inc index efe9b62a6..adf48c1b0 100644 --- a/data/maps/Route12_FishingHouse/text.inc +++ b/data/maps/Route12_FishingHouse/text.inc @@ -1,20 +1,20 @@ -Route12_FishingHouse_Text_DoYouLikeToFish:: @ 819EFE0 +Route12_FishingHouse_Text_DoYouLikeToFish:: .string "I'm the FISHING GURU's younger\n" .string "brother.\p" .string "I simply looove fishing!\n" .string "I can't bear to go without.\p" .string "Tell me, do you like to fish?$" -Route12_FishingHouse_Text_TakeThisAndFish:: @ 819F05B +Route12_FishingHouse_Text_TakeThisAndFish:: .string "Grand! I like your style.\n" .string "I think we can be friends.\p" .string "Take this and fish, young friend!$" -Route12_FishingHouse_Text_ReceivedSuperRod:: @ 819F0B2 +Route12_FishingHouse_Text_ReceivedSuperRod:: .string "{PLAYER} received a SUPER ROD from\n" .string "the FISHING GURU's brother.$" -Route12_FishingHouse_Text_IfYouCatchBigMagikarpShowMe:: @ 819F0EB +Route12_FishingHouse_Text_IfYouCatchBigMagikarpShowMe:: .string "Fishing is a way of life!\n" .string "It is like the finest poetry.\p" .string "From the seas to rivers, go out\n" @@ -25,11 +25,11 @@ Route12_FishingHouse_Text_IfYouCatchBigMagikarpShowMe:: @ 819F0EB .string "As much as I love to fish, I also\n" .string "love seeing gigantic MAGIKARP.$" -Route12_FishingHouse_Text_OhThatsDisappointing:: @ 819F1FA +Route12_FishingHouse_Text_OhThatsDisappointing:: .string "Oh…\n" .string "That's so disappointing…$" -Route12_FishingHouse_Text_TryFishingBringMeMagikarp:: @ 819F217 +Route12_FishingHouse_Text_TryFishingBringMeMagikarp:: .string "Hello there, {PLAYER}!\n" .string "Have you been fishing?\p" .string "Try fishing with the SUPER ROD in\n" @@ -39,12 +39,12 @@ Route12_FishingHouse_Text_TryFishingBringMeMagikarp:: @ 819F217 .string "Oh, and don't forget to bring me\n" .string "gigantic MAGIKARP.$" -Route12_FishingHouse_Text_OhMagikarpAllowMeToSee:: @ 819F2DB +Route12_FishingHouse_Text_OhMagikarpAllowMeToSee:: .string "Oh? {PLAYER}?\n" .string "Why, if it isn't a MAGIKARP!\p" .string "Allow me to see it, quick!$" -Route12_FishingHouse_Text_WhoaXInchesTakeThis:: @ 819F31B +Route12_FishingHouse_Text_WhoaXInchesTakeThis:: .string "… … …Whoa!\n" .string "{STR_VAR_2} inches!\p" .string "You have a rare appreciation for\n" @@ -52,37 +52,37 @@ Route12_FishingHouse_Text_WhoaXInchesTakeThis:: @ 819F31B .string "You must take this.\n" .string "I insist!$" -Route12_FishingHouse_Text_LookForwardToGreaterRecords:: @ 819F395 +Route12_FishingHouse_Text_LookForwardToGreaterRecords:: .string "I'll look forward to seeing greater\n" .string "records from you!$" -Route12_FishingHouse_Text_HuhXInchesSameSizeAsLast:: @ 819F3CB +Route12_FishingHouse_Text_HuhXInchesSameSizeAsLast:: .string "Huh?\n" .string "{STR_VAR_2} inches?\p" .string "This is the same size as the one\n" .string "I saw before.$" -Route12_FishingHouse_Text_HmmXInchesDoesntMeasureUp:: @ 819F40A +Route12_FishingHouse_Text_HmmXInchesDoesntMeasureUp:: .string "Hmm…\n" .string "This one is {STR_VAR_2} inches long.\p" .string "It doesn't measure up to the\n" .string "{STR_VAR_3}-inch one you brought before.$" -Route12_FishingHouse_Text_DoesntLookLikeMagikarp:: @ 819F468 +Route12_FishingHouse_Text_DoesntLookLikeMagikarp:: .string "Uh… That doesn't look much like\n" .string "a MAGIKARP.$" -Route12_FishingHouse_Text_NoRoomForGift:: @ 819F494 +Route12_FishingHouse_Text_NoRoomForGift:: .string "Oh, no!\p" .string "I had a gift for you, but you have\n" .string "no room for it.$" -Route12_FishingHouse_Text_MostGiganticMagikarpXInches:: @ 819F4CF +Route12_FishingHouse_Text_MostGiganticMagikarpXInches:: .string "The most gigantic MAGIKARP\n" .string "I have ever witnessed…\p" .string "{STR_VAR_3} inches!$" -Route12_FishingHouse_Text_BlankChartOfSomeSort:: @ 819F50C +Route12_FishingHouse_Text_BlankChartOfSomeSort:: .string "It's a blank chart of some sort.\p" .string "It has spaces for writing in\n" .string "records of some kind.$" diff --git a/data/maps/Route12_NorthEntrance_1F/scripts.inc b/data/maps/Route12_NorthEntrance_1F/scripts.inc index a2aa84b00..d638ba6a7 100644 --- a/data/maps/Route12_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_1F/scripts.inc @@ -1,6 +1,6 @@ -Route12_NorthEntrance_1F_MapScripts:: @ 816FE6D +Route12_NorthEntrance_1F_MapScripts:: .byte 0 -Route12_NorthEntrance_1F_EventScript_Guard:: @ 816FE6E +Route12_NorthEntrance_1F_EventScript_Guard:: msgbox Route12_NorthEntrance_1F_Text_LookoutSpotUpstairs, MSGBOX_NPC end diff --git a/data/maps/Route12_NorthEntrance_1F/text.inc b/data/maps/Route12_NorthEntrance_1F/text.inc index 34dc041f8..f5fc2c1c4 100644 --- a/data/maps/Route12_NorthEntrance_1F/text.inc +++ b/data/maps/Route12_NorthEntrance_1F/text.inc @@ -1,4 +1,4 @@ -Route12_NorthEntrance_1F_Text_LookoutSpotUpstairs:: @ 819EDA7 +Route12_NorthEntrance_1F_Text_LookoutSpotUpstairs:: .string "There's a lookout spot upstairs.\n" .string "The view is magnificent.$" diff --git a/data/maps/Route12_NorthEntrance_2F/scripts.inc b/data/maps/Route12_NorthEntrance_2F/scripts.inc index a85398238..c30488de4 100644 --- a/data/maps/Route12_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route12_NorthEntrance_2F/scripts.inc @@ -1,15 +1,15 @@ -Route12_NorthEntrance_2F_MapScripts:: @ 816FE77 +Route12_NorthEntrance_2F_MapScripts:: .byte 0 -Route12_NorthEntrance_2F_EventScript_LeftBinoculars:: @ 816FE78 +Route12_NorthEntrance_2F_EventScript_LeftBinoculars:: msgbox Route12_NorthEntrance_2F_Text_TheresManFishing, MSGBOX_SIGN end -Route12_NorthEntrance_2F_EventScript_RightBinoculars:: @ 816FE81 +Route12_NorthEntrance_2F_EventScript_RightBinoculars:: msgbox Route12_NorthEntrance_2F_Text_ItsPokemonTower, MSGBOX_SIGN end -Route12_NorthEntrance_2F_EventScript_Lass:: @ 816FE8A +Route12_NorthEntrance_2F_EventScript_Lass:: lock faceplayer goto_if_set FLAG_GOT_TM27, Route12_NorthEntrance_2F_EventScript_ExplainTM27 @@ -27,20 +27,20 @@ Route12_NorthEntrance_2F_EventScript_Lass:: @ 816FE8A release end -Route12_NorthEntrance_2F_EventScript_TakeTMMale:: @ 816FEE5 +Route12_NorthEntrance_2F_EventScript_TakeTMMale:: msgbox Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreMale return -Route12_NorthEntrance_2F_EventScript_TakeTMFemale:: @ 816FEEE +Route12_NorthEntrance_2F_EventScript_TakeTMFemale:: msgbox Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreFemale return -Route12_NorthEntrance_2F_EventScript_NoRoomForTM27:: @ 816FEF7 +Route12_NorthEntrance_2F_EventScript_NoRoomForTM27:: msgbox Route12_NorthEntrance_2F_Text_DontHaveRoomForThis release end -Route12_NorthEntrance_2F_EventScript_ExplainTM27:: @ 816FF01 +Route12_NorthEntrance_2F_EventScript_ExplainTM27:: msgbox Route12_NorthEntrance_2F_Text_ExplainTM27 release end diff --git a/data/maps/Route12_NorthEntrance_2F/text.inc b/data/maps/Route12_NorthEntrance_2F/text.inc index 6e525d6e4..28e6c47ac 100644 --- a/data/maps/Route12_NorthEntrance_2F/text.inc +++ b/data/maps/Route12_NorthEntrance_2F/text.inc @@ -1,35 +1,35 @@ @ Male and female text identical, differ (presumably) in JP -Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreMale:: @ 819EDE1 +Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreMale:: .string "My POKéMON's ashes are stored in\n" .string "POKéMON TOWER.\p" .string "You can have this TM.\n" .string "I don't need it anymore…$" -Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreFemale:: @ 819EE40 +Route12_NorthEntrance_2F_Text_TakeTMDontNeedAnymoreFemale:: .string "My POKéMON's ashes are stored in\n" .string "POKéMON TOWER.\p" .string "You can have this TM.\n" .string "I don't need it anymore…$" -Route12_NorthEntrance_2F_Text_ReceivedTM27FromLittleGirl:: @ 819EE9F +Route12_NorthEntrance_2F_Text_ReceivedTM27FromLittleGirl:: .string "{PLAYER} received TM27\n" .string "from the little girl.$" -Route12_NorthEntrance_2F_Text_ExplainTM27:: @ 819EEC6 +Route12_NorthEntrance_2F_Text_ExplainTM27:: .string "TM27 is a move called RETURN…\p" .string "If you treat your POKéMON good,\n" .string "it will return your love by working\l" .string "its hardest in battle.$" -Route12_NorthEntrance_2F_Text_DontHaveRoomForThis:: @ 819EF3F +Route12_NorthEntrance_2F_Text_DontHaveRoomForThis:: .string "You don't have room for this.$" -Route12_NorthEntrance_2F_Text_TheresManFishing:: @ 819EF5D +Route12_NorthEntrance_2F_Text_TheresManFishing:: .string "Let's see what the binoculars have\n" .string "to show…\p" .string "There's a man fishing!$" -Route12_NorthEntrance_2F_Text_ItsPokemonTower:: @ 819EFA0 +Route12_NorthEntrance_2F_Text_ItsPokemonTower:: .string "Let's see what the binoculars have\n" .string "to show…\p" .string "It's POKéMON TOWER!$" diff --git a/data/maps/Route13/scripts.inc b/data/maps/Route13/scripts.inc index 9cedaa23f..37067ece2 100644 --- a/data/maps/Route13/scripts.inc +++ b/data/maps/Route13/scripts.inc @@ -1,14 +1,14 @@ -Route13_MapScripts:: @ 81680B5 +Route13_MapScripts:: .byte 0 -Route13_EventScript_TrainerTips1:: @ 81680B6 +Route13_EventScript_TrainerTips1:: msgbox Route13_Text_LookToLeftOfThatPost, MSGBOX_SIGN end -Route13_EventScript_TrainerTips2:: @ 81680BF +Route13_EventScript_TrainerTips2:: msgbox Route13_Text_SelectToSwitchItems, MSGBOX_SIGN end -Route13_EventScript_RouteSign:: @ 81680C8 +Route13_EventScript_RouteSign:: msgbox Route13_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route13/text.inc b/data/maps/Route13/text.inc index edf58209c..bf7fdd65e 100644 --- a/data/maps/Route13/text.inc +++ b/data/maps/Route13/text.inc @@ -1,128 +1,128 @@ -Route13_Text_SebastianIntro:: @ 8185955 +Route13_Text_SebastianIntro:: .string "My bird POKéMON want to battle\n" .string "with you!$" -Route13_Text_SebastianDefeat:: @ 818597E +Route13_Text_SebastianDefeat:: .string "My PIDGEY and PIDGEOTTO combo\n" .string "lost?$" -Route13_Text_SebastianPostBattle:: @ 81859A2 +Route13_Text_SebastianPostBattle:: .string "My POKéMON look happy even though\n" .string "they lost.$" -Route13_Text_SusieIntro:: @ 81859CF +Route13_Text_SusieIntro:: .string "I'm told I'm good for a kid.$" -Route13_Text_SusieDefeat:: @ 81859EC +Route13_Text_SusieDefeat:: .string "Ohh!\n" .string "I lost!$" -Route13_Text_SusiePostBattle:: @ 81859F9 +Route13_Text_SusiePostBattle:: .string "I want to become a good TRAINER.\n" .string "I'll train hard, just watch.$" -Route13_Text_ValerieIntro:: @ 8185A37 +Route13_Text_ValerieIntro:: .string "Wow!\n" .string "Your BADGES are too cool!$" -Route13_Text_ValerieDefeat:: @ 8185A56 +Route13_Text_ValerieDefeat:: .string "Not enough!$" -Route13_Text_ValeriePostBattle:: @ 8185A62 +Route13_Text_ValeriePostBattle:: .string "You got those BADGES from GYM\n" .string "LEADERS. I know!$" -Route13_Text_GwenIntro:: @ 8185A91 +Route13_Text_GwenIntro:: .string "My cute POKéMON wish to make your\n" .string "acquaintance.$" -Route13_Text_GwenDefeat:: @ 8185AC1 +Route13_Text_GwenDefeat:: .string "Good going!\n" .string "You totally won!$" -Route13_Text_GwenPostBattle:: @ 8185ADE +Route13_Text_GwenPostBattle:: .string "You have to make POKéMON battle\n" .string "to toughen them up.$" -Route13_Text_AlmaIntro:: @ 8185B12 +Route13_Text_AlmaIntro:: .string "I found CARBOS in a cave once\n" .string "while I was spelunking.$" -Route13_Text_AlmaDefeat:: @ 8185B48 +Route13_Text_AlmaDefeat:: .string "Oh, too bad!\n" .string "I just messed up!$" -Route13_Text_AlmaPostBattle:: @ 8185B67 +Route13_Text_AlmaPostBattle:: .string "CARBOS boosted the SPEED of my\n" .string "POKéMON.$" -Route13_Text_PerryIntro:: @ 8185B8F +Route13_Text_PerryIntro:: .string "I'm not going to lose.\n" .string "Not when the wind's blowing my way!$" -Route13_Text_PerryDefeat:: @ 8185BCA +Route13_Text_PerryDefeat:: .string "The wind turned!$" -Route13_Text_PerryPostBattle:: @ 8185BDB +Route13_Text_PerryPostBattle:: .string "I'm beat.\n" .string "I guess I'll FLY home.$" -Route13_Text_LolaIntro:: @ 8185BFC +Route13_Text_LolaIntro:: .string "Sure, I'll play with you, sweetie.$" -Route13_Text_LolaDefeat:: @ 8185C1F +Route13_Text_LolaDefeat:: .string "Oh!\n" .string "You little beast!$" -Route13_Text_LolaPostBattle:: @ 8185C35 +Route13_Text_LolaPostBattle:: .string "I wonder which is stronger, male or\n" .string "female POKéMON?$" -Route13_Text_SheilaIntro:: @ 8185C69 +Route13_Text_SheilaIntro:: .string "Do you want to battle some\n" .string "POKéMON with me?$" -Route13_Text_SheilaDefeat:: @ 8185C95 +Route13_Text_SheilaDefeat:: .string "It's over already?$" -Route13_Text_SheilaPostBattle:: @ 8185CA8 +Route13_Text_SheilaPostBattle:: .string "I don't know anything about\n" .string "POKéMON actually.\p" .string "The ones I use… I picked them\n" .string "for their looks!$" -Route13_Text_JaredIntro:: @ 8185D05 +Route13_Text_JaredIntro:: .string "What're you lookin' at?$" -Route13_Text_JaredDefeat:: @ 8185D1D +Route13_Text_JaredDefeat:: .string "Dang!\n" .string "Stripped gears!$" -Route13_Text_JaredPostBattle:: @ 8185D33 +Route13_Text_JaredPostBattle:: .string "Get lost!$" -Route13_Text_RobertIntro:: @ 8185D3D +Route13_Text_RobertIntro:: .string "I always go with bird POKéMON.\n" .string "I've dedicated myself to them.$" -Route13_Text_RobertDefeat:: @ 8185D7B +Route13_Text_RobertDefeat:: .string "Out of power!$" -Route13_Text_RobertPostBattle:: @ 8185D89 +Route13_Text_RobertPostBattle:: .string "I wish I could fly like PIDGEY and\n" .string "PIDGEOTTO…$" -Route13_Text_LookToLeftOfThatPost:: @ 8185DB7 +Route13_Text_LookToLeftOfThatPost:: .string "TRAINER TIPS\p" .string "Look, look!\n" .string "Look to the left of that post!$" -Route13_Text_SelectToSwitchItems:: @ 8185DEF +Route13_Text_SelectToSwitchItems:: .string "TRAINER TIPS\p" .string "Use SELECT to switch items in the\n" .string "ITEMS window.$" -Route13_Text_RouteSign:: @ 8185E2C +Route13_Text_RouteSign:: .string "ROUTE 13\n" .string "North to SILENCE BRIDGE$" diff --git a/data/maps/Route14/scripts.inc b/data/maps/Route14/scripts.inc index 46e3774ee..0ed51239b 100644 --- a/data/maps/Route14/scripts.inc +++ b/data/maps/Route14/scripts.inc @@ -1,6 +1,6 @@ -Route14_MapScripts:: @ 81680D1 +Route14_MapScripts:: .byte 0 -Route14_EventScript_RouteSign:: @ 81680D2 +Route14_EventScript_RouteSign:: msgbox Route14_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route14/text.inc b/data/maps/Route14/text.inc index 320c250ee..d473ef2de 100644 --- a/data/maps/Route14/text.inc +++ b/data/maps/Route14/text.inc @@ -1,156 +1,156 @@ -Route14_Text_CarterIntro:: @ 8185E4D +Route14_Text_CarterIntro:: .string "You need to use TMs to teach good\n" .string "moves to POKéMON.$" -Route14_Text_CarterDefeat:: @ 8185E81 +Route14_Text_CarterDefeat:: .string "Not good enough quite yet.$" -Route14_Text_CarterPostBattle:: @ 8185E9C +Route14_Text_CarterPostBattle:: .string "You have some HMs, right? POKéMON\n" .string "can't forget those moves easily.$" -Route14_Text_MitchIntro:: @ 8185EDF +Route14_Text_MitchIntro:: .string "My bird POKéMON should be ready\n" .string "for battle.$" -Route14_Text_MitchDefeat:: @ 8185F0B +Route14_Text_MitchDefeat:: .string "Not ready yet!$" -Route14_Text_MitchPostBattle:: @ 8185F1A +Route14_Text_MitchPostBattle:: .string "My bird POKéMON need to learn\n" .string "better moves.$" -Route14_Text_BeckIntro:: @ 8185F46 +Route14_Text_BeckIntro:: .string "They have TMs on sale at the\n" .string "CELADON DEPT. STORE.\p" .string "TMs aren't really rare, but not\n" .string "many people have HMs.$" -Route14_Text_BeckDefeat:: @ 8185FAE +Route14_Text_BeckDefeat:: .string "Aww, bummer!$" -Route14_Text_BeckPostBattle:: @ 8185FBB +Route14_Text_BeckPostBattle:: .string "Try teaching POKéMON a move that's\n" .string "the same type as it.\p" .string "That apparently boosts the power\n" .string "of the move.$" -Route14_Text_MarlonIntro:: @ 8186021 +Route14_Text_MarlonIntro:: .string "Have you taught your bird POKéMON\n" .string "how to FLY?\p" .string "You'll be able to soar with it into\n" .string "the sky!$" -Route14_Text_MarlonDefeat:: @ 818607C +Route14_Text_MarlonDefeat:: .string "Shot down in flames!$" -Route14_Text_MarlonPostBattle:: @ 8186091 +Route14_Text_MarlonPostBattle:: .string "Bird POKéMON are my one true love.\n" .string "I don't want to raise anything else.$" -Route14_Text_DonaldIntro:: @ 81860D9 +Route14_Text_DonaldIntro:: .string "Have you heard the legend of the\n" .string "winged mirages?$" -Route14_Text_DonaldDefeat:: @ 818610A +Route14_Text_DonaldDefeat:: .string "Why?\n" .string "Why'd I lose?$" -Route14_Text_DonaldPostBattle:: @ 818611D +Route14_Text_DonaldPostBattle:: .string "Well, the winged mirages are the\n" .string "legendary bird POKéMON.\p" .string "There are three of them: ARTICUNO,\n" .string "ZAPDOS, and MOLTRES.$" -Route14_Text_BennyIntro:: @ 818618E +Route14_Text_BennyIntro:: .string "I'm not into it, but okay.\n" .string "Let's go!$" -Route14_Text_BennyDefeat:: @ 81861B3 +Route14_Text_BennyDefeat:: .string "I knew it!$" -Route14_Text_BennyPostBattle:: @ 81861BE +Route14_Text_BennyPostBattle:: .string "Winning, losing… It's insignificant\n" .string "under this huge sky.$" -Route14_Text_LukasIntro:: @ 81861F7 +Route14_Text_LukasIntro:: .string "C'mon, c'mon.\n" .string "Let's go, let's go, let's go!$" -Route14_Text_LukasDefeat:: @ 8186223 +Route14_Text_LukasDefeat:: .string "Arrg!\n" .string "Lost! Get lost!$" -Route14_Text_LukasPostBattle:: @ 8186239 +Route14_Text_LukasPostBattle:: .string "What, what, what?\n" .string "What do you want still?$" -Route14_Text_IsaacIntro:: @ 8186263 +Route14_Text_IsaacIntro:: .string "I need to burn some time.\n" .string "Shut up and battle.$" -Route14_Text_IsaacDefeat:: @ 8186291 +Route14_Text_IsaacDefeat:: .string "What?\n" .string "You!?$" -Route14_Text_IsaacPostBattle:: @ 818629D +Route14_Text_IsaacPostBattle:: .string "Raising POKéMON is a drag, man.$" -Route14_Text_GeraldIntro:: @ 81862BD +Route14_Text_GeraldIntro:: .string "We ride out here because of the\n" .string "wide-open spaces.$" -Route14_Text_GeraldDefeat:: @ 81862EF +Route14_Text_GeraldDefeat:: .string "Wipeout!$" -Route14_Text_GeraldPostBattle:: @ 81862F8 +Route14_Text_GeraldPostBattle:: .string "It's cool you made your POKéMON so\n" .string "strong.\p" .string "Might is right!\n" .string "And you know it!$" -Route14_Text_MalikIntro:: @ 8186344 +Route14_Text_MalikIntro:: .string "POKéMON battle?\n" .string "Cool! Rumble!$" -Route14_Text_MalikDefeat:: @ 8186362 +Route14_Text_MalikDefeat:: .string "Blown away!$" -Route14_Text_MalikPostBattle:: @ 818636E +Route14_Text_MalikPostBattle:: .string "You know who'd win, you and me\n" .string "one-on-one!$" -Route14_Text_RouteSign:: @ 8186399 +Route14_Text_RouteSign:: .string "ROUTE 14\n" .string "West to FUCHSIA CITY$" -Route14_Text_KiriIntro:: @ 81863B7 +Route14_Text_KiriIntro:: .string "KIRI: JAN, let's try really,\n" .string "really hard together.$" -Route14_Text_KiriDefeat:: @ 81863EA +Route14_Text_KiriDefeat:: .string "KIRI: Whimper…\n" .string "We lost, didn't we?$" -Route14_Text_KiriPostBattle:: @ 818640D +Route14_Text_KiriPostBattle:: .string "KIRI: Did we lose because of me?$" -Route14_Text_KiriNotEnoughMons:: @ 818642E +Route14_Text_KiriNotEnoughMons:: .string "KIRI: We can battle if you have\n" .string "two POKéMON.$" -Route14_Text_JanIntro:: @ 818645B +Route14_Text_JanIntro:: .string "JAN: KIRI, here we go!\n" .string "We have to try hard!$" -Route14_Text_JanDefeat:: @ 8186487 +Route14_Text_JanDefeat:: .string "JAN: Eeeeh!\n" .string "No fair!$" -Route14_Text_JanPostBattle:: @ 818649C +Route14_Text_JanPostBattle:: .string "JAN: KIRI, don't cry!\n" .string "We'll just try harder next time.$" -Route14_Text_JanNotEnoughMons:: @ 81864D3 +Route14_Text_JanNotEnoughMons:: .string "JAN: You want to battle?\n" .string "You don't have enough POKéMON.$" diff --git a/data/maps/Route15/scripts.inc b/data/maps/Route15/scripts.inc index 85d24e49b..0cc31e547 100644 --- a/data/maps/Route15/scripts.inc +++ b/data/maps/Route15/scripts.inc @@ -1,6 +1,6 @@ -Route15_MapScripts:: @ 81680DB +Route15_MapScripts:: .byte 0 -Route15_EventScript_RouteSign:: @ 81680DC +Route15_EventScript_RouteSign:: msgbox Route15_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route15/text.inc b/data/maps/Route15/text.inc index be3e38e6c..5d783f256 100644 --- a/data/maps/Route15/text.inc +++ b/data/maps/Route15/text.inc @@ -1,154 +1,154 @@ -Route15_Text_KindraIntro:: @ 818650B +Route15_Text_KindraIntro:: .string "I just got some POKéMON in trades.\n" .string "Can I try them out on you?$" -Route15_Text_KindraDefeat:: @ 8186549 +Route15_Text_KindraDefeat:: .string "Not good enough!$" -Route15_Text_KindraPostBattle:: @ 818655A +Route15_Text_KindraPostBattle:: .string "You can't change the nickname of\n" .string "any POKéMON you get in a trade.\p" .string "Only the Original TRAINER can get\n" .string "the nickname changed.$" -Route15_Text_BeckyIntro:: @ 81865D3 +Route15_Text_BeckyIntro:: .string "You look gentle, so I think I can\n" .string "beat you.\p" .string "I'll give it a go!$" -Route15_Text_BeckyDefeat:: @ 8186612 +Route15_Text_BeckyDefeat:: .string "No, wrong!$" -Route15_Text_BeckyPostBattle:: @ 818661D +Route15_Text_BeckyPostBattle:: .string "I'm afraid of BIKERS. They look so\n" .string "ugly and mean!$" -Route15_Text_EdwinIntro:: @ 818664F +Route15_Text_EdwinIntro:: .string "When I whistle, I can summon bird\n" .string "POKéMON.$" -Route15_Text_EdwinDefeat:: @ 818667A +Route15_Text_EdwinDefeat:: .string "Ow!\n" .string "That's tragic!$" -Route15_Text_EdwinPostBattle:: @ 818668D +Route15_Text_EdwinPostBattle:: .string "Maybe I'm not cut out for battles.\n" .string "I'm not the right type, I guess.$" -Route15_Text_ChesterIntro:: @ 81866D1 +Route15_Text_ChesterIntro:: .string "Hmm? My birds are shivering!\n" .string "You're good, aren't you?$" -Route15_Text_ChesterDefeat:: @ 8186707 +Route15_Text_ChesterDefeat:: .string "Just as I thought!$" -Route15_Text_ChesterPostBattle:: @ 818671A +Route15_Text_ChesterPostBattle:: .string "This is so obvious, you should know\n" .string "this, but…\p" .string "Moves like EARTHQUAKE and FISSURE\n" .string "have no effect on bird POKéMON.$" -Route15_Text_GraceIntro:: @ 818678B +Route15_Text_GraceIntro:: .string "Oh, you're a little cutie!\n" .string "So like a darling POKéMON!$" -Route15_Text_GraceDefeat:: @ 81867C1 +Route15_Text_GraceDefeat:: .string "You looked so cute, too!$" -Route15_Text_GracePostBattle:: @ 81867DA +Route15_Text_GracePostBattle:: .string "I forgive you.\n" .string "I can take it.\l" .string "I'm a big girl now.$" -Route15_Text_OliviaIntro:: @ 818680C +Route15_Text_OliviaIntro:: .string "I raise POKéMON for protection\n" .string "because I live alone.$" -Route15_Text_OliviaDefeat:: @ 8186841 +Route15_Text_OliviaDefeat:: .string "POKéMON isn't about winning or\n" .string "losing for me.$" -Route15_Text_OliviaPostBattle:: @ 818686F +Route15_Text_OliviaPostBattle:: .string "I love having my POKéMON greet me\n" .string "when I get home.\p" .string "It's so reassuring.$" -Route15_Text_ErnestIntro:: @ 81868B6 +Route15_Text_ErnestIntro:: .string "Hey, kid! C'mon!\n" .string "I just got these off some loser!$" -Route15_Text_ErnestDefeat:: @ 81868E8 +Route15_Text_ErnestDefeat:: .string "Why not?$" -Route15_Text_ErnestPostBattle:: @ 81868F1 +Route15_Text_ErnestPostBattle:: .string "Life's too short.\n" .string "It's cool to live as an outlaw.\l" .string "TEAM ROCKET RULES!$" -Route15_Text_AlexIntro:: @ 8186936 +Route15_Text_AlexIntro:: .string "Fork over all your cash when you\n" .string "lose to me, kid!$" -Route15_Text_AlexDefeat:: @ 8186968 +Route15_Text_AlexDefeat:: .string "That can't be true!$" -Route15_Text_AlexPostBattle:: @ 818697C +Route15_Text_AlexPostBattle:: .string "I was just joking about the money.\n" .string "Don't take me all serious.$" -Route15_Text_CeliaIntro:: @ 81869BA +Route15_Text_CeliaIntro:: .string "What's cool and happening?\n" .string "Trading POKéMON!$" -Route15_Text_CeliaDefeat:: @ 81869E6 +Route15_Text_CeliaDefeat:: .string "I said trade!$" -Route15_Text_CeliaPostBattle:: @ 81869F4 +Route15_Text_CeliaPostBattle:: .string "I trade POKéMON with my friends\n" .string "all the time.$" -Route15_Text_YazminIntro:: @ 8186A22 +Route15_Text_YazminIntro:: .string "Want to play with my POKéMON?$" -Route15_Text_YazminDefeat:: @ 8186A40 +Route15_Text_YazminDefeat:: .string "I was too impatient!$" -Route15_Text_YazminPostBattle:: @ 8186A55 +Route15_Text_YazminPostBattle:: .string "I'll go train with weaker people.$" -Route15_Text_RouteSign:: @ 8186A77 +Route15_Text_RouteSign:: .string "ROUTE 15\n" .string "West to FUCHSIA CITY$" -Route15_Text_MyaIntro:: @ 8186A95 +Route15_Text_MyaIntro:: .string "MYA: You're perfect.\n" .string "Help me train my little brother?$" -Route15_Text_MyaDefeat:: @ 8186ACB +Route15_Text_MyaDefeat:: .string "MYA: RON, you have to focus!\n" .string "Concentrate on what you're doing!$" -Route15_Text_MyaPostBattle:: @ 8186B0A +Route15_Text_MyaPostBattle:: .string "MYA: Okay, we'll turn it up.\n" .string "I'll add to our training menu!$" -Route15_Text_MyaNotEnoughMons:: @ 8186B46 +Route15_Text_MyaNotEnoughMons:: .string "MYA: Do you want to challenge us?\n" .string "You'll need two POKéMON, though.$" -Route15_Text_RonIntro:: @ 8186B89 +Route15_Text_RonIntro:: .string "RON: My sister gets scary when we\n" .string "lose.$" -Route15_Text_RonDefeat:: @ 8186BB1 +Route15_Text_RonDefeat:: .string "RON: Oh, no, no…\n" .string "Sis, I'm sorry!$" -Route15_Text_RonPostBattle:: @ 8186BD2 +Route15_Text_RonPostBattle:: .string "RON: Oh, bleah…\n" .string "I wish I had a nice sister…$" -Route15_Text_RonNotEnoughMons:: @ 8186BFE +Route15_Text_RonNotEnoughMons:: .string "RON: Did you want to battle with\n" .string "my sister and me?\p" .string "You need two POKéMON, then.$" diff --git a/data/maps/Route15_WestEntrance_1F/scripts.inc b/data/maps/Route15_WestEntrance_1F/scripts.inc index 222be2356..7f5a81a02 100644 --- a/data/maps/Route15_WestEntrance_1F/scripts.inc +++ b/data/maps/Route15_WestEntrance_1F/scripts.inc @@ -1,6 +1,6 @@ -Route15_WestEntrance_1F_MapScripts:: @ 8170088 +Route15_WestEntrance_1F_MapScripts:: .byte 0 -Route15_WestEntrance_1F_EventScript_Guard:: @ 8170089 +Route15_WestEntrance_1F_EventScript_Guard:: msgbox Route15_WestEntrance_1F_Text_OaksAideCameByHere, MSGBOX_NPC end diff --git a/data/maps/Route15_WestEntrance_1F/text.inc b/data/maps/Route15_WestEntrance_1F/text.inc index 6cdbe8a2a..89194b5c8 100644 --- a/data/maps/Route15_WestEntrance_1F/text.inc +++ b/data/maps/Route15_WestEntrance_1F/text.inc @@ -1,4 +1,4 @@ -Route15_WestEntrance_1F_Text_OaksAideCameByHere:: @ 819F560 +Route15_WestEntrance_1F_Text_OaksAideCameByHere:: .string "Are you the kid who's working on\n" .string "a POKéDEX?\p" .string "PROF. OAK's AIDE came by here.$" diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc index 9fa417865..9b74877b8 100644 --- a/data/maps/Route15_WestEntrance_2F/scripts.inc +++ b/data/maps/Route15_WestEntrance_2F/scripts.inc @@ -1,9 +1,9 @@ .equ REQUIRED_CAUGHT_MONS, 50 -Route15_WestEntrance_2F_MapScripts:: @ 8170092 +Route15_WestEntrance_2F_MapScripts:: .byte 0 -Route15_WestEntrance_2F_EventScript_LeftBinoculars:: @ 8170093 +Route15_WestEntrance_2F_EventScript_LeftBinoculars:: lockall msgbox Route15_WestEntrance_2F_Text_LargeShiningBird drawmonpic SPECIES_ARTICUNO, 10, 3 @@ -15,11 +15,11 @@ Route15_WestEntrance_2F_EventScript_LeftBinoculars:: @ 8170093 releaseall end -Route15_WestEntrance_2F_EventScript_RightBinoculars:: @ 81700B0 +Route15_WestEntrance_2F_EventScript_RightBinoculars:: msgbox Route15_WestEntrance_2F_Text_SmallIslandOnHorizon, MSGBOX_SIGN end -Route15_WestEntrance_2F_EventScript_Aide:: @ 81700B9 +Route15_WestEntrance_2F_EventScript_Aide:: lock faceplayer call Route15_WestEntrance_2F_EventScript_GetAideRequestInfo @@ -43,12 +43,12 @@ Route15_WestEntrance_2F_EventScript_Aide:: @ 81700B9 release end -Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare:: @ 817013B +Route15_WestEntrance_2F_EventScript_AlreadyGotExpShare:: msgbox Route15_WestEntrance_2F_Text_ExplainExpShare release end -Route15_WestEntrance_2F_EventScript_GetAideRequestInfo:: @ 8170145 +Route15_WestEntrance_2F_EventScript_GetAideRequestInfo:: getnumberstring 0, REQUIRED_CAUGHT_MONS getitemname 1, ITEM_EXP_SHARE return diff --git a/data/maps/Route15_WestEntrance_2F/text.inc b/data/maps/Route15_WestEntrance_2F/text.inc index c3c9866eb..28561c4f3 100644 --- a/data/maps/Route15_WestEntrance_2F/text.inc +++ b/data/maps/Route15_WestEntrance_2F/text.inc @@ -1,4 +1,4 @@ -Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough:: @ 819F5AB +Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough:: .string "Hi! Remember me?\n" .string "I'm one of PROF. OAK's AIDES.\p" .string "If your POKéDEX has complete data\n" @@ -10,30 +10,30 @@ Route15_WestEntrance_2F_Text_GiveItemIfCaughtEnough:: @ 819F5AB .string "Have you gathered data on at least\n" .string "{STR_VAR_1} kinds of POKéMON?$" -Route15_WestEntrance_2F_Text_GreatHereYouGo:: @ 819F6AA +Route15_WestEntrance_2F_Text_GreatHereYouGo:: .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -Route15_WestEntrance_2F_Text_ReceivedItemFromAide:: @ 819F6FD +Route15_WestEntrance_2F_Text_ReceivedItemFromAide:: .string "{PLAYER} received the {STR_VAR_2}\n" .string "from the AIDE.$" -Route15_WestEntrance_2F_Text_ExplainExpShare:: @ 819F71F +Route15_WestEntrance_2F_Text_ExplainExpShare:: .string "EXP. SHARE is an item to be held\n" .string "by a POKéMON.\p" .string "The POKéMON will receive a share\n" .string "of the EXP. Points without having\l" .string "to battle.$" -Route15_WestEntrance_2F_Text_LargeShiningBird:: @ 819F79C +Route15_WestEntrance_2F_Text_LargeShiningBird:: .string "Let's see what the binoculars have\n" .string "to show…\p" .string "A large, shining bird is flying\n" .string "toward the sea.$" -Route15_WestEntrance_2F_Text_SmallIslandOnHorizon:: @ 819F7F8 +Route15_WestEntrance_2F_Text_SmallIslandOnHorizon:: .string "Let's see what the binoculars have\n" .string "to show…\p" .string "It looks like a small island on\n" diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index f13b2ac6f..132dcd280 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -1,35 +1,35 @@ -Route16_MapScripts:: @ 81680E5 +Route16_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, Route16_OnResume map_script MAP_SCRIPT_ON_TRANSITION, Route16_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route16_OnWarp .byte 0 -Route16_OnResume:: @ 81680F5 +Route16_OnResume:: call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, Route16_EventScript_RemoveSnorlax end -Route16_EventScript_RemoveSnorlax:: @ 81680FF +Route16_EventScript_RemoveSnorlax:: removeobject VAR_LAST_TALKED return -Route16_OnTransition:: @ 8168103 +Route16_OnTransition:: compare VAR_MAP_SCENE_ROUTE16, 1 call_if_eq Route16_OnTransitionCyclingRoad end -Route16_OnTransitionCyclingRoad:: @ 816810F +Route16_OnTransitionCyclingRoad:: setflag FLAG_SYS_ON_CYCLING_ROAD return -Route16_OnWarp:: @ 8168113 +Route16_OnWarp:: map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route16_OnWarpCyclingRoad .2byte 0 -Route16_OnWarpCyclingRoad:: @ 816811D +Route16_OnWarpCyclingRoad:: special ForcePlayerOntoBike end -Route16_EventScript_Snorlax:: @ 8168121 +Route16_EventScript_Snorlax:: lock faceplayer goto_if_unset FLAG_GOT_POKE_FLUTE, Route16_EventScript_SnorlaxNoPokeFlute @@ -58,24 +58,24 @@ Route16_EventScript_Snorlax:: @ 8168121 release end -Route16_EventScript_DontUsePokeFlute:: @ 8168197 +Route16_EventScript_DontUsePokeFlute:: release end -Route16_EventScript_FoughtSnorlax:: @ 8168199 +Route16_EventScript_FoughtSnorlax:: msgbox Text_SnorlaxReturnedToMountains release end -Route16_EventScript_SnorlaxNoPokeFlute:: @ 81681A3 +Route16_EventScript_SnorlaxNoPokeFlute:: msgbox Route16_Text_MonSprawledOutInSlumber release end -Route16_EventScript_CyclingRoadSign:: @ 81681AD +Route16_EventScript_CyclingRoadSign:: msgbox Route16_Text_CyclingRoadSign, MSGBOX_SIGN end -Route16_EventScript_RouteSign:: @ 81681B6 +Route16_EventScript_RouteSign:: msgbox Route16_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route16/text.inc b/data/maps/Route16/text.inc index ca3507cc7..3d9715ca5 100644 --- a/data/maps/Route16/text.inc +++ b/data/maps/Route16/text.inc @@ -1,112 +1,112 @@ -Route16_Text_LaoIntro:: @ 8186C4D +Route16_Text_LaoIntro:: .string "What do you want?$" -Route16_Text_LaoDefeat:: @ 8186C5F +Route16_Text_LaoDefeat:: .string "Don't you dare laugh!$" -Route16_Text_LaoPostBattle:: @ 8186C75 +Route16_Text_LaoPostBattle:: .string "We like just hanging here.\n" .string "What's it to you?$" -Route16_Text_KojiIntro:: @ 8186CA2 +Route16_Text_KojiIntro:: .string "Nice BIKE!\n" .string "Hand it over!$" -Route16_Text_KojiDefeat:: @ 8186CBB +Route16_Text_KojiDefeat:: .string "Knockout!$" -Route16_Text_KojiPostBattle:: @ 8186CC5 +Route16_Text_KojiPostBattle:: .string "Forget it, who needs your BIKE!$" -Route16_Text_LukeIntro:: @ 8186CE5 +Route16_Text_LukeIntro:: .string "Come out and play, little mouse!$" -Route16_Text_LukeDefeat:: @ 8186D06 +Route16_Text_LukeDefeat:: .string "You little rat!$" -Route16_Text_LukePostBattle:: @ 8186D16 +Route16_Text_LukePostBattle:: .string "I hate losing!\n" .string "Get out of my face!$" -Route16_Text_HideoIntro:: @ 8186D39 +Route16_Text_HideoIntro:: .string "Hey, you just bumped me!$" -Route16_Text_HideoDefeat:: @ 8186D52 +Route16_Text_HideoDefeat:: .string "Kaboom!$" -Route16_Text_HideoPostBattle:: @ 8186D5A +Route16_Text_HideoPostBattle:: .string "We'll always be hanging around here\n" .string "even if you don't like it.\p" .string "You can detour to VERMILION from\n" .string "FUCHSIA going along the coast.$" -Route16_Text_CamronIntro:: @ 8186DD9 +Route16_Text_CamronIntro:: .string "I'm feeling hungry and mean!\n" .string "I need a punching bag!$" -Route16_Text_CamronDefeat:: @ 8186E0D +Route16_Text_CamronDefeat:: .string "Bad, bad, bad!$" -Route16_Text_CamronPostBattle:: @ 8186E1C +Route16_Text_CamronPostBattle:: .string "If I'm going to have POKéMON, they\n" .string "may as well be ferocious.\p" .string "I'd use them to leave my enemies\n" .string "in tatters.$" -Route16_Text_RubenIntro:: @ 8186E86 +Route16_Text_RubenIntro:: .string "Hey, there!\n" .string "Let's have ourselves a good time!$" -Route16_Text_RubenDefeat:: @ 8186EB4 +Route16_Text_RubenDefeat:: .string "Don't make me mad!$" -Route16_Text_RubenPostBattle:: @ 8186EC7 +Route16_Text_RubenPostBattle:: .string "I get my kicks by harassing people\n" .string "with my stinking POKéMON.\p" .string "They're great for startling people.\n" .string "And, they bite, too.$" -Route16_Text_MonSprawledOutInSlumber:: @ 8186F3D +Route16_Text_MonSprawledOutInSlumber:: .string "A POKéMON is sprawled out in\n" .string "a deep and comfortable slumber.$" -Route16_Text_CyclingRoadSign:: @ 8186F7A +Route16_Text_CyclingRoadSign:: .string "Enjoy the slope!\n" .string "CYCLING ROAD$" -Route16_Text_RouteSign:: @ 8186F98 +Route16_Text_RouteSign:: .string "ROUTE 16\n" .string "CELADON CITY - FUCHSIA CITY$" -Route16_Text_JedIntro:: @ 8186FBD +Route16_Text_JedIntro:: .string "JED: Our love knows no bounds.\n" .string "We're in love and we show it!$" -Route16_Text_JedDefeat:: @ 8186FFA +Route16_Text_JedDefeat:: .string "JED: Oh, no!\n" .string "My love has seen me as a loser!$" -Route16_Text_JedPostBattle:: @ 8187027 +Route16_Text_JedPostBattle:: .string "JED: Listen, LEA.\n" .string "You need to focus less on me.$" -Route16_Text_JedNotEnoughMons:: @ 8187057 +Route16_Text_JedNotEnoughMons:: .string "JED: You have just one POKéMON?\n" .string "Is there no love in your heart?$" -Route16_Text_LeaIntro:: @ 8187097 +Route16_Text_LeaIntro:: .string "LEA: Sometimes, the intensity of\n" .string "our love scares me.$" -Route16_Text_LeaDefeat:: @ 81870CC +Route16_Text_LeaDefeat:: .string "LEA: Ohh! But JED looks cool\n" .string "even in a loss!$" -Route16_Text_LeaPostBattle:: @ 81870F9 +Route16_Text_LeaPostBattle:: .string "LEA: Ehehe, I'm sorry.\n" .string "JED is so cool.$" -Route16_Text_LeaNotEnoughMons:: @ 8187120 +Route16_Text_LeaNotEnoughMons:: .string "LEA: Oh, you don't have two\n" .string "POKéMON with you?\p" .string "Doesn't it feel lonely for you or\n" diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index baf6fcc32..8deed78a9 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -1,7 +1,7 @@ -Route16_House_MapScripts:: @ 817014E +Route16_House_MapScripts:: .byte 0 -Route16_House_EventScript_Woman:: @ 817014F +Route16_House_EventScript_Woman:: lock faceplayer goto_if_set FLAG_GOT_HM02, Route16_House_EventScript_AlreadyGotHM02 @@ -15,17 +15,17 @@ Route16_House_EventScript_Woman:: @ 817014F release end -Route16_House_EventScript_NoRoomForHM02:: @ 817019B +Route16_House_EventScript_NoRoomForHM02:: msgbox Route16_House_Text_DontHaveAnyRoomForThis release end -Route16_House_EventScript_AlreadyGotHM02:: @ 81701A5 +Route16_House_EventScript_AlreadyGotHM02:: msgbox Route16_House_Text_ExplainHM02 release end -Route16_House_EventScript_Fearow:: @ 81701AF +Route16_House_EventScript_Fearow:: lock faceplayer waitse diff --git a/data/maps/Route16_House/text.inc b/data/maps/Route16_House/text.inc index 2cdfe38d9..3966d0982 100644 --- a/data/maps/Route16_House/text.inc +++ b/data/maps/Route16_House/text.inc @@ -1,21 +1,21 @@ -Route16_House_Text_FoundMySecretRetreat:: @ 819F851 +Route16_House_Text_FoundMySecretRetreat:: .string "Oh, dear.\n" .string "You've found my secret retreat.\p" .string "Please don't tell anyone I'm here.\n" .string "I'll make it up to you with this!$" -Route16_House_Text_ReceivedHM02FromGirl:: @ 819F8C0 +Route16_House_Text_ReceivedHM02FromGirl:: .string "{PLAYER} received HM02\n" .string "from the girl.$" -Route16_House_Text_ExplainHM02:: @ 819F8E0 +Route16_House_Text_ExplainHM02:: .string "HM02 is FLY.\n" .string "It's a wonderfully convenient move.\p" .string "Please, put it to good use.$" -Route16_House_Text_DontHaveAnyRoomForThis:: @ 819F92D +Route16_House_Text_DontHaveAnyRoomForThis:: .string "You don't have any room for this.$" -Route16_House_Text_Fearow:: @ 819F94F +Route16_House_Text_Fearow:: .string "FEAROW: Kyueen!$" diff --git a/data/maps/Route16_NorthEntrance_1F/scripts.inc b/data/maps/Route16_NorthEntrance_1F/scripts.inc index d00ba5805..f305b656d 100644 --- a/data/maps/Route16_NorthEntrance_1F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_1F/scripts.inc @@ -1,51 +1,51 @@ -Route16_NorthEntrance_1F_MapScripts:: @ 81701C2 +Route16_NorthEntrance_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route16_NorthEntrance_1F_OnTransition .byte 0 -Route16_NorthEntrance_1F_OnTransition:: @ 81701C8 +Route16_NorthEntrance_1F_OnTransition:: clearflag FLAG_SYS_ON_CYCLING_ROAD call_if_set FLAG_GOT_BICYCLE, Route16_NorthEntrance_1F_EventScript_DisableNeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_DisableNeedBikeTrigger:: @ 81701D5 +Route16_NorthEntrance_1F_EventScript_DisableNeedBikeTrigger:: setvar VAR_TEMP_1, 1 return -Route16_NorthEntrance_1F_EventScript_Guard:: @ 81701DB +Route16_NorthEntrance_1F_EventScript_Guard:: msgbox Route16_NorthEntrance_1F_Text_CyclingRoadIsDownhillCourse, MSGBOX_NPC end -Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerTop:: @ 81701E4 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerTop:: lockall setvar VAR_0x8008, 0 goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidTop:: @ 81701F0 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidTop:: lockall setvar VAR_0x8008, 1 goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMid:: @ 81701FC +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMid:: lockall setvar VAR_0x8008, 2 goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: @ 8170208 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: lockall setvar VAR_0x8008, 3 goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom:: @ 8170214 +Route16_NorthEntrance_1F_EventScript_NeedBikeTriggerBottom:: lockall setvar VAR_0x8008, 4 goto Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger end -Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger:: @ 8170220 +Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger:: textcolor 0 msgbox Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp closemessage @@ -67,52 +67,52 @@ Route16_NorthEntrance_1F_EventScript_NeedBikeTrigger:: @ 8170220 releaseall end -Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: @ 8170279 +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp waitmovement 0 return -Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid:: @ 8170284 +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMid:: applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp2 waitmovement 0 return -Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: @ 817028F +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp3 waitmovement 0 return -Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom:: @ 817029A +Route16_NorthEntrance_1F_EventScript_PlayerWalkToCounterBottom:: applymovement OBJ_EVENT_ID_PLAYER, Route16_NorthEntrance_1F_Movement_WalkUp4 waitmovement 0 return -Route16_NorthEntrance_1F_Movement_WalkUp:: @ 81702A5 +Route16_NorthEntrance_1F_Movement_WalkUp:: walk_up step_end -Route16_NorthEntrance_1F_Movement_WalkUp2:: @ 81702A7 +Route16_NorthEntrance_1F_Movement_WalkUp2:: walk_up walk_up step_end -Route16_NorthEntrance_1F_Movement_WalkUp3:: @ 81702AA +Route16_NorthEntrance_1F_Movement_WalkUp3:: walk_up walk_up walk_up step_end -Route16_NorthEntrance_1F_Movement_WalkUp4:: @ 81702AE +Route16_NorthEntrance_1F_Movement_WalkUp4:: walk_up walk_up walk_up walk_up step_end -Route16_NorthEntrance_1F_Movement_WalkRight:: @ 81702B3 +Route16_NorthEntrance_1F_Movement_WalkRight:: walk_right step_end -Route16_NorthEntrance_1F_EventScript_OldMan:: @ 81702B5 +Route16_NorthEntrance_1F_EventScript_OldMan:: msgbox Route16_NorthEntrance_1F_Text_HowdYouGetInGoodEffort, MSGBOX_NPC end diff --git a/data/maps/Route16_NorthEntrance_1F/text.inc b/data/maps/Route16_NorthEntrance_1F/text.inc index 156e93bfa..4e0eecee9 100644 --- a/data/maps/Route16_NorthEntrance_1F/text.inc +++ b/data/maps/Route16_NorthEntrance_1F/text.inc @@ -1,16 +1,16 @@ -Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad:: @ 819F95F +Route16_NorthEntrance_1F_Text_NoPedestriansOnCyclingRoad:: .string "No pedestrians are allowed on\n" .string "CYCLING ROAD!$" -Route16_NorthEntrance_1F_Text_CyclingRoadIsDownhillCourse:: @ 819F98B +Route16_NorthEntrance_1F_Text_CyclingRoadIsDownhillCourse:: .string "CYCLING ROAD is a downhill course\n" .string "by the sea. It's a great ride.$" -Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp:: @ 819F9CC +Route16_NorthEntrance_1F_Text_ExcuseMeWaitUp:: .string "Excuse me!\n" .string "Wait up, please!$" -Route16_NorthEntrance_1F_Text_HowdYouGetInGoodEffort:: @ 819F9E8 +Route16_NorthEntrance_1F_Text_HowdYouGetInGoodEffort:: .string "How'd you get in?\n" .string "Good effort!$" diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc index 08c02d0ee..57ef19ea4 100644 --- a/data/maps/Route16_NorthEntrance_2F/scripts.inc +++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc @@ -1,25 +1,25 @@ .equ REQUIRED_CAUGHT_MONS, 40 -Route16_NorthEntrance_2F_MapScripts:: @ 81702BE +Route16_NorthEntrance_2F_MapScripts:: .byte 0 -Route16_NorthEntrance_2F_EventScript_LittleBoy:: @ 81702BF +Route16_NorthEntrance_2F_EventScript_LittleBoy:: msgbox Route16_NorthEntrance_2F_Text_OnBikeRideWithGirlfriend, MSGBOX_NPC end -Route16_NorthEntrance_2F_EventScript_LittleGirl:: @ 81702C8 +Route16_NorthEntrance_2F_EventScript_LittleGirl:: msgbox Route16_NorthEntrance_2F_Text_RidingTogetherOnNewBikes, MSGBOX_NPC end -Route16_NorthEntrance_2F_EventScript_LeftBinoculars:: @ 81702D1 +Route16_NorthEntrance_2F_EventScript_LeftBinoculars:: msgbox Route16_NorthEntrance_2F_Text_ItsCeladonDeptStore, MSGBOX_SIGN end -Route16_NorthEntrance_2F_EventScript_RightBinoculars:: @ 81702DA +Route16_NorthEntrance_2F_EventScript_RightBinoculars:: msgbox Route16_NorthEntrance_2F_Text_LongPathOverWater, MSGBOX_SIGN end -Route16_NorthEntrance_2F_EventScript_Aide:: @ 81702E3 +Route16_NorthEntrance_2F_EventScript_Aide:: lock faceplayer call Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo @@ -43,12 +43,12 @@ Route16_NorthEntrance_2F_EventScript_Aide:: @ 81702E3 release end -Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin:: @ 8170365 +Route16_NorthEntrance_2F_EventScript_AlreadyGotAmuletCoin:: msgbox Route16_NorthEntrance_2F_Text_ExplainAmuletCoin release end -Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo:: @ 817036F +Route16_NorthEntrance_2F_EventScript_GetAideRequestInfo:: getnumberstring 0, REQUIRED_CAUGHT_MONS getitemname 1, ITEM_AMULET_COIN return diff --git a/data/maps/Route16_NorthEntrance_2F/text.inc b/data/maps/Route16_NorthEntrance_2F/text.inc index 37c518fb4..a7a344a74 100644 --- a/data/maps/Route16_NorthEntrance_2F/text.inc +++ b/data/maps/Route16_NorthEntrance_2F/text.inc @@ -1,23 +1,23 @@ -Route16_NorthEntrance_2F_Text_OnBikeRideWithGirlfriend:: @ 819FA07 +Route16_NorthEntrance_2F_Text_OnBikeRideWithGirlfriend:: .string "I'm on a relaxing ride on my new\n" .string "bike with my girlfriend.$" -Route16_NorthEntrance_2F_Text_RidingTogetherOnNewBikes:: @ 819FA41 +Route16_NorthEntrance_2F_Text_RidingTogetherOnNewBikes:: .string "We're going riding together on our\n" .string "new bikes.$" -Route16_NorthEntrance_2F_Text_ItsCeladonDeptStore:: @ 819FA6F +Route16_NorthEntrance_2F_Text_ItsCeladonDeptStore:: .string "Let's see what the binoculars have\n" .string "to show…\p" .string "It's the CELADON DEPT. STORE!$" -Route16_NorthEntrance_2F_Text_LongPathOverWater:: @ 819FAB9 +Route16_NorthEntrance_2F_Text_LongPathOverWater:: .string "Let's see what the binoculars have\n" .string "to show…\p" .string "There's a long path over water far\n" .string "away.$" -Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40:: @ 819FB0E +Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40:: .string "Hi! Remember me?\n" .string "I'm one of PROF. OAK's AIDES.\p" .string "If your POKéDEX has complete data\n" @@ -29,17 +29,17 @@ Route16_NorthEntrance_2F_Text_GiveAmuletCoinIfCaught40:: @ 819FB0E .string "Have you gathered data on at least\n" .string "40 kinds of POKéMON?$" -Route16_NorthEntrance_2F_Text_GreatHereYouGo:: @ 819FC15 +Route16_NorthEntrance_2F_Text_GreatHereYouGo:: .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide:: @ 819FC68 +Route16_NorthEntrance_2F_Text_ReceivedAmuletCoinFromAide:: .string "{PLAYER} received the AMULET COIN\n" .string "from the AIDE.$" -Route16_NorthEntrance_2F_Text_ExplainAmuletCoin:: @ 819FC93 +Route16_NorthEntrance_2F_Text_ExplainAmuletCoin:: .string "An AMULET COIN is an item to be\n" .string "held by a POKéMON.\p" .string "If the POKéMON appears in a winning\n" diff --git a/data/maps/Route17/scripts.inc b/data/maps/Route17/scripts.inc index 787e68e04..d0f7ea653 100644 --- a/data/maps/Route17/scripts.inc +++ b/data/maps/Route17/scripts.inc @@ -1,26 +1,26 @@ -Route17_MapScripts:: @ 81681BF +Route17_MapScripts:: .byte 0 -Route17_EventScript_ItemsNotice:: @ 81681C0 +Route17_EventScript_ItemsNotice:: msgbox Route17_Text_WatchOutForDiscardedItems, MSGBOX_SIGN end -Route17_EventScript_TrainerTips1:: @ 81681C9 +Route17_EventScript_TrainerTips1:: msgbox Route17_Text_SameSpeciesGrowDifferentRates, MSGBOX_SIGN end -Route17_EventScript_TrainerTips2:: @ 81681D2 +Route17_EventScript_TrainerTips2:: msgbox Route17_Text_PressBToStayInPlace, MSGBOX_SIGN end -Route17_EventScript_RouteSign:: @ 81681DB +Route17_EventScript_RouteSign:: msgbox Route17_Text_RouteSign, MSGBOX_SIGN end -Route17_EventScript_BallsNotice:: @ 81681E4 +Route17_EventScript_BallsNotice:: msgbox Route17_Text_DontThrowGameThrowBalls, MSGBOX_SIGN end -Route17_EventScript_CyclingRoadSign:: @ 81681ED +Route17_EventScript_CyclingRoadSign:: msgbox Route17_Text_CyclingRoadSign, MSGBOX_SIGN end diff --git a/data/maps/Route17/text.inc b/data/maps/Route17/text.inc index 21d7978a3..a033a6b4f 100644 --- a/data/maps/Route17/text.inc +++ b/data/maps/Route17/text.inc @@ -1,131 +1,131 @@ -Route17_Text_RaulIntro:: @ 818717E +Route17_Text_RaulIntro:: .string "There's no getting rich quick in\n" .string "battling kids.$" -Route17_Text_RaulDefeat:: @ 81871AE +Route17_Text_RaulDefeat:: .string "Burned out!$" -Route17_Text_RaulPostBattle:: @ 81871BA +Route17_Text_RaulPostBattle:: .string "You can find good stuff lying\n" .string "around on CYCLING ROAD.\p" .string "There's good money in picking them\n" .string "up and selling them.$" -Route17_Text_IsaiahIntro:: @ 8187228 +Route17_Text_IsaiahIntro:: .string "I'm mighty proud of my bod, kiddo.\n" .string "Come on!$" -Route17_Text_IsaiahDefeat:: @ 8187254 +Route17_Text_IsaiahDefeat:: .string "Whoo!$" -Route17_Text_IsaiahPostBattle:: @ 818725A +Route17_Text_IsaiahPostBattle:: .string "I could belly-bump you outta\n" .string "here!$" -Route17_Text_VirgilIntro:: @ 818727D +Route17_Text_VirgilIntro:: .string "You heading to FUCHSIA?$" -Route17_Text_VirgilDefeat:: @ 8187295 +Route17_Text_VirgilDefeat:: .string "Crash and burn!$" -Route17_Text_VirgilPostBattle:: @ 81872A5 +Route17_Text_VirgilPostBattle:: .string "I love racing downhill!$" -Route17_Text_BillyIntro:: @ 81872BD +Route17_Text_BillyIntro:: .string "We're BIKERS!\n" .string "We rule the roads, man!$" -Route17_Text_BillyDefeat:: @ 81872E3 +Route17_Text_BillyDefeat:: .string "Smoked!$" -Route17_Text_BillyPostBattle:: @ 81872EB +Route17_Text_BillyPostBattle:: .string "Are you looking for adventure?$" -Route17_Text_NikolasIntro:: @ 818730A +Route17_Text_NikolasIntro:: .string "Let VOLTORB electrify you!$" -Route17_Text_NikolasDefeat:: @ 8187325 +Route17_Text_NikolasDefeat:: .string "Grounded out!$" -Route17_Text_NikolasPostBattle:: @ 8187333 +Route17_Text_NikolasPostBattle:: .string "I got my VOLTORB at the abandoned\n" .string "POWER PLANT.$" -Route17_Text_ZeekIntro:: @ 8187362 +Route17_Text_ZeekIntro:: .string "I leveled up my POKéMON, but it\n" .string "won't evolve. Why?$" -Route17_Text_ZeekDefeat:: @ 8187395 +Route17_Text_ZeekDefeat:: .string "Why, you!$" -Route17_Text_ZeekPostBattle:: @ 818739F +Route17_Text_ZeekPostBattle:: .string "Maybe some POKéMON need element\n" .string "STONES to evolve.$" -Route17_Text_JamalIntro:: @ 81873D1 +Route17_Text_JamalIntro:: .string "I need a little exercise!$" -Route17_Text_JamalDefeat:: @ 81873EB +Route17_Text_JamalDefeat:: .string "Whew!\n" .string "Good workout!$" -Route17_Text_JamalPostBattle:: @ 81873FF +Route17_Text_JamalPostBattle:: .string "I'm sure I lost weight there!$" -Route17_Text_CoreyIntro:: @ 818741D +Route17_Text_CoreyIntro:: .string "Be a rebel!$" -Route17_Text_CoreyDefeat:: @ 8187429 +Route17_Text_CoreyDefeat:: .string "Aaaargh!$" -Route17_Text_CoreyPostBattle:: @ 8187432 +Route17_Text_CoreyPostBattle:: .string "Be ready to fight for your beliefs!$" -Route17_Text_JaxonIntro:: @ 8187456 +Route17_Text_JaxonIntro:: .string "Nice BIKE!\n" .string "How's it handle?$" -Route17_Text_JaxonDefeat:: @ 8187472 +Route17_Text_JaxonDefeat:: .string "Shoot!$" -Route17_Text_JaxonPostBattle:: @ 8187479 +Route17_Text_JaxonPostBattle:: .string "The slope makes it hard to steer.$" -Route17_Text_WilliamIntro:: @ 818749B +Route17_Text_WilliamIntro:: .string "Get lost, kid!\n" .string "I'm bushed!$" -Route17_Text_WilliamDefeat:: @ 81874B6 +Route17_Text_WilliamDefeat:: .string "Are you satisfied?$" -Route17_Text_WilliamPostBattle:: @ 81874C9 +Route17_Text_WilliamPostBattle:: .string "I need to catch a few z's!$" -Route17_Text_WatchOutForDiscardedItems:: @ 81874E4 +Route17_Text_WatchOutForDiscardedItems:: .string "It's a notice.\p" .string "Watch out for discarded items.$" -Route17_Text_SameSpeciesGrowDifferentRates:: @ 8187512 +Route17_Text_SameSpeciesGrowDifferentRates:: .string "TRAINER TIPS\p" .string "All POKéMON are unique.\p" .string "Even POKéMON of the same species\n" .string "and level grow at different rates.$" -Route17_Text_PressBToStayInPlace:: @ 818757B +Route17_Text_PressBToStayInPlace:: .string "TRAINER TIPS\p" .string "Press the B Button to stay in place\n" .string "while on a slope.$" -Route17_Text_RouteSign:: @ 81875BE +Route17_Text_RouteSign:: .string "ROUTE 17\n" .string "CELADON CITY - FUCHSIA CITY$" -Route17_Text_DontThrowGameThrowBalls:: @ 81875E3 +Route17_Text_DontThrowGameThrowBalls:: .string "It's a notice!\p" .string "Don't throw the game, throw POKé\n" .string "BALLS instead!$" -Route17_Text_CyclingRoadSign:: @ 8187622 +Route17_Text_CyclingRoadSign:: .string "CYCLING ROAD\n" .string "Slope ends here!$" diff --git a/data/maps/Route18/scripts.inc b/data/maps/Route18/scripts.inc index 385d60134..8269eceb5 100644 --- a/data/maps/Route18/scripts.inc +++ b/data/maps/Route18/scripts.inc @@ -1,29 +1,29 @@ -Route18_MapScripts:: @ 81681F6 +Route18_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route18_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route18_OnWarp .byte 0 -Route18_OnTransition:: @ 8168201 +Route18_OnTransition:: compare VAR_MAP_SCENE_ROUTE16, 1 call_if_eq Route18_OnTransitionCyclingRoad end -Route18_OnTransitionCyclingRoad:: @ 816820D +Route18_OnTransitionCyclingRoad:: setflag FLAG_SYS_ON_CYCLING_ROAD return -Route18_OnWarp:: @ 8168211 +Route18_OnWarp:: map_script_2 VAR_MAP_SCENE_ROUTE16, 1, Route18_OnWarpCyclingRoad .2byte 0 -Route18_OnWarpCyclingRoad:: @ 816821B +Route18_OnWarpCyclingRoad:: special ForcePlayerOntoBike end -Route18_EventScript_RouteSign:: @ 816821F +Route18_EventScript_RouteSign:: msgbox Route18_Text_RouteSign, MSGBOX_SIGN end -Route18_EventScript_CyclingRoadSign:: @ 8168228 +Route18_EventScript_CyclingRoadSign:: msgbox Route18_Text_CyclingRoadSign, MSGBOX_SIGN end diff --git a/data/maps/Route18/text.inc b/data/maps/Route18/text.inc index 107804cfb..d6751386a 100644 --- a/data/maps/Route18/text.inc +++ b/data/maps/Route18/text.inc @@ -1,40 +1,40 @@ -Route18_Text_WiltonIntro:: @ 8187640 +Route18_Text_WiltonIntro:: .string "I always check every grassy area\n" .string "for new POKéMON.$" -Route18_Text_WiltonDefeat:: @ 8187672 +Route18_Text_WiltonDefeat:: .string "Tch!$" -Route18_Text_WiltonPostBattle:: @ 8187677 +Route18_Text_WiltonPostBattle:: .string "I wish I had a BIKE!$" -Route18_Text_RamiroIntro:: @ 818768C +Route18_Text_RamiroIntro:: .string "Kurukkoo!\n" .string "How do you like my birdcall?$" -Route18_Text_RamiroDefeat:: @ 81876B3 +Route18_Text_RamiroDefeat:: .string "I had to bug you!$" -Route18_Text_RamiroPostBattle:: @ 81876C5 +Route18_Text_RamiroPostBattle:: .string "I collect sea POKéMON on weekends\n" .string "because the sea is so close.$" -Route18_Text_JacobIntro:: @ 8187704 +Route18_Text_JacobIntro:: .string "This is my turf!\n" .string "Get out of here!$" -Route18_Text_JacobDefeat:: @ 8187726 +Route18_Text_JacobDefeat:: .string "Darn!$" -Route18_Text_JacobPostBattle:: @ 818772C +Route18_Text_JacobPostBattle:: .string "This is my fave area for catching\n" .string "POKéMON.$" -Route18_Text_RouteSign:: @ 8187757 +Route18_Text_RouteSign:: .string "ROUTE 18\n" .string "CELADON CITY - FUCHSIA CITY$" -Route18_Text_CyclingRoadSign:: @ 818777C +Route18_Text_CyclingRoadSign:: .string "CYCLING ROAD\n" .string "No pedestrians permitted!$" diff --git a/data/maps/Route18_EastEntrance_1F/scripts.inc b/data/maps/Route18_EastEntrance_1F/scripts.inc index 0a6b3b56f..6d3afed96 100644 --- a/data/maps/Route18_EastEntrance_1F/scripts.inc +++ b/data/maps/Route18_EastEntrance_1F/scripts.inc @@ -1,51 +1,51 @@ -Route18_EastEntrance_1F_MapScripts:: @ 8170378 +Route18_EastEntrance_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route18_EastEntrance_1F_OnTransition .byte 0 -Route18_EastEntrance_1F_OnTransition:: @ 817037E +Route18_EastEntrance_1F_OnTransition:: clearflag FLAG_SYS_ON_CYCLING_ROAD call_if_set FLAG_GOT_BICYCLE, Route18_EastEntrance_1F_EventScript_DisableNeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_DisableNeedBikeTrigger:: @ 817038B +Route18_EastEntrance_1F_EventScript_DisableNeedBikeTrigger:: setvar VAR_TEMP_1, 1 return -Route18_EastEntrance_1F_EventScript_Guard:: @ 8170391 +Route18_EastEntrance_1F_EventScript_Guard:: msgbox Route18_EastEntrance_1F_Text_CyclingRoadAllUphillFromHere, MSGBOX_NPC end -Route18_EastEntrance_1F_EventScript_NeedBikeTriggerTop:: @ 817039A +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerTop:: lockall setvar VAR_0x8008, 0 goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidTop:: @ 81703A6 +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidTop:: lockall setvar VAR_0x8008, 1 goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMid:: @ 81703B2 +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMid:: lockall setvar VAR_0x8008, 2 goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: @ 81703BE +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerMidBottom:: lockall setvar VAR_0x8008, 3 goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom:: @ 81703CA +Route18_EastEntrance_1F_EventScript_NeedBikeTriggerBottom:: lockall setvar VAR_0x8008, 4 goto Route18_EastEntrance_1F_EventScript_NeedBikeTrigger end -Route18_EastEntrance_1F_EventScript_NeedBikeTrigger:: @ 81703D6 +Route18_EastEntrance_1F_EventScript_NeedBikeTrigger:: textcolor 0 msgbox Route18_EastEntrance_1F_Text_ExcuseMe closemessage @@ -67,48 +67,48 @@ Route18_EastEntrance_1F_EventScript_NeedBikeTrigger:: @ 81703D6 releaseall end -Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: @ 817042F +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidTop:: applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp waitmovement 0 return -Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid:: @ 817043A +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMid:: applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp2 waitmovement 0 return -Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: @ 8170445 +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterMidBottom:: applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp3 waitmovement 0 return -Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom:: @ 8170450 +Route18_EastEntrance_1F_EventScript_PlayerWalkToCounterBottom:: applymovement OBJ_EVENT_ID_PLAYER, Route18_EastEntrance_1F_Movement_WalkUp4 waitmovement 0 return -Route18_EastEntrance_1F_Movement_WalkUp:: @ 817045B +Route18_EastEntrance_1F_Movement_WalkUp:: walk_up step_end -Route18_EastEntrance_1F_Movement_WalkUp2:: @ 817045D +Route18_EastEntrance_1F_Movement_WalkUp2:: walk_up walk_up step_end -Route18_EastEntrance_1F_Movement_WalkUp3:: @ 8170460 +Route18_EastEntrance_1F_Movement_WalkUp3:: walk_up walk_up walk_up step_end -Route18_EastEntrance_1F_Movement_WalkUp4:: @ 8170464 +Route18_EastEntrance_1F_Movement_WalkUp4:: walk_up walk_up walk_up walk_up step_end -Route18_EastEntrance_1F_Movement_WalkRight:: @ 8170469 +Route18_EastEntrance_1F_Movement_WalkRight:: walk_right step_end diff --git a/data/maps/Route18_EastEntrance_1F/text.inc b/data/maps/Route18_EastEntrance_1F/text.inc index 9551d993f..3cb08b5cf 100644 --- a/data/maps/Route18_EastEntrance_1F/text.inc +++ b/data/maps/Route18_EastEntrance_1F/text.inc @@ -1,11 +1,11 @@ -Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad:: @ 819FD0C +Route18_EastEntrance_1F_Text_NeedBicycleForCyclingRoad:: .string "You need a BICYCLE to go out on\n" .string "CYCLING ROAD!$" -Route18_EastEntrance_1F_Text_CyclingRoadAllUphillFromHere:: @ 819FD3A +Route18_EastEntrance_1F_Text_CyclingRoadAllUphillFromHere:: .string "CYCLING ROAD is all uphill from\n" .string "here.$" -Route18_EastEntrance_1F_Text_ExcuseMe:: @ 819FD60 +Route18_EastEntrance_1F_Text_ExcuseMe:: .string "Excuse me!$" diff --git a/data/maps/Route18_EastEntrance_2F/scripts.inc b/data/maps/Route18_EastEntrance_2F/scripts.inc index 910f238e4..edf1eafe1 100644 --- a/data/maps/Route18_EastEntrance_2F/scripts.inc +++ b/data/maps/Route18_EastEntrance_2F/scripts.inc @@ -1,15 +1,15 @@ -Route18_EastEntrance_2F_MapScripts:: @ 817046B +Route18_EastEntrance_2F_MapScripts:: .byte 0 -Route18_EastEntrance_2F_EventScript_LeftBinoculars:: @ 817046C +Route18_EastEntrance_2F_EventScript_LeftBinoculars:: msgbox Route18_EastEntrance_2F_Text_PalletTownInWest, MSGBOX_SIGN end -Route18_EastEntrance_2F_EventScript_RightBinoculars:: @ 8170475 +Route18_EastEntrance_2F_EventScript_RightBinoculars:: msgbox Route18_EastEntrance_2F_Text_PeopleSwimming, MSGBOX_SIGN end -Route18_EastEntrance_2F_EventScript_Haden:: @ 817047E +Route18_EastEntrance_2F_EventScript_Haden:: lock faceplayer setvar VAR_0x8008, INGAME_TRADE_LICKITUNG @@ -30,18 +30,18 @@ Route18_EastEntrance_2F_EventScript_Haden:: @ 817047E release end -Route18_EastEntrance_2F_EventScript_DeclineTrade:: @ 81704D8 +Route18_EastEntrance_2F_EventScript_DeclineTrade:: msgbox Trade_Text_AwwOhWell release end -Route18_EastEntrance_2F_EventScript_NotRequestedMon:: @ 81704E2 +Route18_EastEntrance_2F_EventScript_NotRequestedMon:: getspeciesname 0, VAR_0x8009 msgbox Trade_Text_WhatThatsNoMon release end -Route18_EastEntrance_2F_EventScript_AlreadyTraded:: @ 81704F0 +Route18_EastEntrance_2F_EventScript_AlreadyTraded:: msgbox Trade_Text_IsntMyOldMonGreat release end diff --git a/data/maps/Route18_EastEntrance_2F/text.inc b/data/maps/Route18_EastEntrance_2F/text.inc index aac533f71..16099b428 100644 --- a/data/maps/Route18_EastEntrance_2F/text.inc +++ b/data/maps/Route18_EastEntrance_2F/text.inc @@ -1,9 +1,9 @@ -Route18_EastEntrance_2F_Text_PalletTownInWest:: @ 819FD6B +Route18_EastEntrance_2F_Text_PalletTownInWest:: .string "Let's see what the binoculars have\n" .string "to show…\p" .string "PALLET TOWN is in the west.$" -Route18_EastEntrance_2F_Text_PeopleSwimming:: @ 819FDB3 +Route18_EastEntrance_2F_Text_PeopleSwimming:: .string "Let's see what the binoculars have\n" .string "to show…\p" .string "There are people swimming.$" diff --git a/data/maps/Route19/scripts.inc b/data/maps/Route19/scripts.inc index 10b361e83..c76e2cd81 100644 --- a/data/maps/Route19/scripts.inc +++ b/data/maps/Route19/scripts.inc @@ -1,6 +1,6 @@ -Route19_MapScripts:: @ 8168231 +Route19_MapScripts:: .byte 0 -Route19_EventScript_RouteSign:: @ 8168232 +Route19_EventScript_RouteSign:: msgbox Route19_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route19/text.inc b/data/maps/Route19/text.inc index a414146b4..a46dae4cf 100644 --- a/data/maps/Route19/text.inc +++ b/data/maps/Route19/text.inc @@ -1,154 +1,154 @@ -Route19_Text_RichardIntro:: @ 81877A3 +Route19_Text_RichardIntro:: .string "I have to exercise and warm up\n" .string "before going out for a swim.$" -Route19_Text_RichardDefeat:: @ 81877DF +Route19_Text_RichardDefeat:: .string "All warmed up!$" -Route19_Text_RichardPostBattle:: @ 81877EE +Route19_Text_RichardPostBattle:: .string "Thanks, kid!\n" .string "I'm ready for a swim.$" -Route19_Text_ReeceIntro:: @ 8187811 +Route19_Text_ReeceIntro:: .string "Wait! Slow down!\n" .string "You'll have a heart attack!$" -Route19_Text_ReeceDefeat:: @ 818783E +Route19_Text_ReeceDefeat:: .string "Ooh!\n" .string "That's chilly!$" -Route19_Text_ReecePostBattle:: @ 8187852 +Route19_Text_ReecePostBattle:: .string "Watch out for TENTACOOL.\n" .string "They sting so painfully.$" -Route19_Text_MatthewIntro:: @ 8187884 +Route19_Text_MatthewIntro:: .string "I love swimming!\n" .string "What about you?$" -Route19_Text_MatthewDefeat:: @ 81878A5 +Route19_Text_MatthewDefeat:: .string "Belly flop!$" -Route19_Text_MatthewPostBattle:: @ 81878B1 +Route19_Text_MatthewPostBattle:: .string "I can beat even marine POKéMON\n" .string "at swimming.$" -Route19_Text_DouglasIntro:: @ 81878DD +Route19_Text_DouglasIntro:: .string "What's beyond the horizon?$" -Route19_Text_DouglasDefeat:: @ 81878F8 +Route19_Text_DouglasDefeat:: .string "Glub!$" -Route19_Text_DouglasPostBattle:: @ 81878FE +Route19_Text_DouglasPostBattle:: .string "I see a couple of islands over\n" .string "yonder!$" -Route19_Text_DavidIntro:: @ 8187925 +Route19_Text_DavidIntro:: .string "I tried diving for POKéMON, but it\n" .string "was a no-go.$" -Route19_Text_DavidDefeat:: @ 8187955 +Route19_Text_DavidDefeat:: .string "Help!$" -Route19_Text_DavidPostBattle:: @ 818795B +Route19_Text_DavidPostBattle:: .string "I guess you have to fish for sea\n" .string "POKéMON.$" -Route19_Text_TonyIntro:: @ 8187985 +Route19_Text_TonyIntro:: .string "I look at the sea to forget all\n" .string "the bad things that happened.$" -Route19_Text_TonyDefeat:: @ 81879C3 +Route19_Text_TonyDefeat:: .string "Ooh!\n" .string "Traumatic!$" -Route19_Text_TonyPostBattle:: @ 81879D3 +Route19_Text_TonyPostBattle:: .string "I'm looking at the sea to forget\n" .string "the bad thing that happened!$" -Route19_Text_AnyaIntro:: @ 8187A11 +Route19_Text_AnyaIntro:: .string "Oh, I just love your ride!\n" .string "Can I have it if I win?$" -Route19_Text_AnyaDefeat:: @ 8187A44 +Route19_Text_AnyaDefeat:: .string "Oh! I lost!$" -Route19_Text_AnyaPostBattle:: @ 8187A50 +Route19_Text_AnyaPostBattle:: .string "It's still a long way to go to\n" .string "SEAFOAM ISLANDS…\p" .string "I want to go back to FUCHSIA…$" -Route19_Text_AliceIntro:: @ 8187A9E +Route19_Text_AliceIntro:: .string "Swimming's great!\n" .string "Sunburns aren't!$" -Route19_Text_AliceDefeat:: @ 8187AC1 +Route19_Text_AliceDefeat:: .string "Shocker!$" -Route19_Text_AlicePostBattle:: @ 8187ACA +Route19_Text_AlicePostBattle:: .string "My boyfriend wanted to swim to\n" .string "SEAFOAM ISLANDS.$" -Route19_Text_AxleIntro:: @ 8187AFA +Route19_Text_AxleIntro:: .string "Ahoy, there!\n" .string "These waters are treacherous!$" -Route19_Text_AxleDefeat:: @ 8187B25 +Route19_Text_AxleDefeat:: .string "Ooh!\n" .string "Dangerous!$" -Route19_Text_AxlePostBattle:: @ 8187B35 +Route19_Text_AxlePostBattle:: .string "M-my legs! They cramped up!\n" .string "Glub, glub…$" -Route19_Text_ConnieIntro:: @ 8187B5D +Route19_Text_ConnieIntro:: .string "I swam here with my friends…\n" .string "I'm tired…$" -Route19_Text_ConnieDefeat:: @ 8187B85 +Route19_Text_ConnieDefeat:: .string "I'm exhausted…$" -Route19_Text_ConniePostBattle:: @ 8187B94 +Route19_Text_ConniePostBattle:: .string "If I were to ride a POKéMON on\n" .string "the sea, I'd like a LAPRAS.\p" .string "LAPRAS is so big, I bet it\n" .string "would keep me dry on water.$" -Route19_Text_RouteSign:: @ 8187C06 +Route19_Text_RouteSign:: .string "SEA ROUTE 19\n" .string "FUCHSIA CITY - SEAFOAM ISLANDS$" -Route19_Text_LiaIntro:: @ 8187C32 +Route19_Text_LiaIntro:: .string "LIA: I'm looking after my brother.\n" .string "He just became a TRAINER.$" -Route19_Text_LiaDefeat:: @ 8187C6F +Route19_Text_LiaDefeat:: .string "LIA: That's no way to treat my\n" .string "little brother!$" -Route19_Text_LiaPostBattle:: @ 8187C9E +Route19_Text_LiaPostBattle:: .string "LIA: Do you have a younger\n" .string "brother?\p" .string "I hope you're teaching him all\n" .string "sorts of things.$" -Route19_Text_LiaNotEnoughMons:: @ 8187CF2 +Route19_Text_LiaNotEnoughMons:: .string "LIA: I want to battle together\n" .string "with my little brother.\p" .string "Don't you have two POKéMON?$" -Route19_Text_LucIntro:: @ 8187D45 +Route19_Text_LucIntro:: .string "LUC: My big sis taught me how\n" .string "to swim and train POKéMON.$" -Route19_Text_LucDefeat:: @ 8187D7E +Route19_Text_LucDefeat:: .string "LUC: Oh, wow!\n" .string "Someone tougher than my big sis!$" -Route19_Text_LucPostBattle:: @ 8187DAD +Route19_Text_LucPostBattle:: .string "LUC: My big sis is strong and nice.\n" .string "I think she's awesome!$" -Route19_Text_LucNotEnoughMons:: @ 8187DE8 +Route19_Text_LucNotEnoughMons:: .string "LUC: I don't want to if I can't\n" .string "battle you with my big sis.\p" .string "Don't you have two POKéMON?$" diff --git a/data/maps/Route19_UnusedHouse/scripts.inc b/data/maps/Route19_UnusedHouse/scripts.inc index 5f807660c..f72f0ec4b 100644 --- a/data/maps/Route19_UnusedHouse/scripts.inc +++ b/data/maps/Route19_UnusedHouse/scripts.inc @@ -1,2 +1,2 @@ -Route19_UnusedHouse_MapScripts:: @ 81704FA +Route19_UnusedHouse_MapScripts:: .byte 0 diff --git a/data/maps/Route2/scripts.inc b/data/maps/Route2/scripts.inc index 2ecb31d72..f4f3b6c0b 100644 --- a/data/maps/Route2/scripts.inc +++ b/data/maps/Route2/scripts.inc @@ -1,10 +1,10 @@ -Route2_MapScripts:: @ 8167F64 +Route2_MapScripts:: .byte 0 -Route2_EventScript_RouteSign:: @ 8167F65 +Route2_EventScript_RouteSign:: msgbox Route2_Text_RouteSign, MSGBOX_SIGN end -Route2_EventScript_DiglettsCaveSign:: @ 8167F6E +Route2_EventScript_DiglettsCaveSign:: msgbox Route2_Text_DiglettsCave, MSGBOX_SIGN end diff --git a/data/maps/Route2/text.inc b/data/maps/Route2/text.inc index 1ca497d6b..8ef3dc5a3 100644 --- a/data/maps/Route2/text.inc +++ b/data/maps/Route2/text.inc @@ -1,7 +1,7 @@ -Route2_Text_RouteSign:: @ 818345E +Route2_Text_RouteSign:: .string "ROUTE 2\n" .string "VIRIDIAN CITY - PEWTER CITY$" -Route2_Text_DiglettsCave:: @ 8183482 +Route2_Text_DiglettsCave:: .string "DIGLETT'S CAVE$" diff --git a/data/maps/Route20/scripts.inc b/data/maps/Route20/scripts.inc index 7ef352f82..7809a8679 100644 --- a/data/maps/Route20/scripts.inc +++ b/data/maps/Route20/scripts.inc @@ -1,13 +1,13 @@ -Route20_MapScripts:: @ 816823B +Route20_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route20_OnTransition .byte 0 -Route20_OnTransition:: @ 8168241 +Route20_OnTransition:: call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB3F call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, Route20_EventScript_ResetSeafoamBouldersForB4F end -Route20_EventScript_ResetSeafoamBouldersForB3F:: @ 8168254 +Route20_EventScript_ResetSeafoamBouldersForB3F:: clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_1 clearflag FLAG_HIDE_SEAFOAM_1F_BOULDER_2 setflag FLAG_HIDE_SEAFOAM_B1F_BOULDER_1 @@ -18,7 +18,7 @@ Route20_EventScript_ResetSeafoamBouldersForB3F:: @ 8168254 setflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_2 return -Route20_EventScript_ResetSeafoamBouldersForB4F:: @ 816826D +Route20_EventScript_ResetSeafoamBouldersForB4F:: clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_3 clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_4 clearflag FLAG_HIDE_SEAFOAM_B3F_BOULDER_5 @@ -27,6 +27,6 @@ Route20_EventScript_ResetSeafoamBouldersForB4F:: @ 816826D setflag FLAG_HIDE_SEAFOAM_B4F_BOULDER_2 return -Route20_EventScript_SeafoamIslandsSign:: @ 8168280 +Route20_EventScript_SeafoamIslandsSign:: msgbox Route20_Text_SeafoamIslands, MSGBOX_SIGN end diff --git a/data/maps/Route20/text.inc b/data/maps/Route20/text.inc index 5ca372ef6..8d76723bf 100644 --- a/data/maps/Route20/text.inc +++ b/data/maps/Route20/text.inc @@ -1,119 +1,119 @@ -Route20_Text_BarryIntro:: @ 8187E40 +Route20_Text_BarryIntro:: .string "The water is shallow here.\n" .string "There are many people swimming.$" -Route20_Text_BarryDefeat:: @ 8187E7B +Route20_Text_BarryDefeat:: .string "Splash!$" -Route20_Text_BarryPostBattle:: @ 8187E83 +Route20_Text_BarryPostBattle:: .string "I wish I could ride my POKéMON.\n" .string "I bet you're not tired.$" -Route20_Text_ShirleyIntro:: @ 8187EBB +Route20_Text_ShirleyIntro:: .string "SEAFOAM is a quiet getaway.\n" .string "I'm vacationing here.$" -Route20_Text_ShirleyDefeat:: @ 8187EED +Route20_Text_ShirleyDefeat:: .string "Quit it!$" -Route20_Text_ShirleyPostBattle:: @ 8187EF6 +Route20_Text_ShirleyPostBattle:: .string "There's a huge cavern underneath\n" .string "this island.$" -Route20_Text_TiffanyIntro:: @ 8187F24 +Route20_Text_TiffanyIntro:: .string "I love floating with the fishes\n" .string "here among the waves.$" -Route20_Text_TiffanyDefeat:: @ 8187F5A +Route20_Text_TiffanyDefeat:: .string "Yowch!$" -Route20_Text_TiffanyPostBattle:: @ 8187F61 +Route20_Text_TiffanyPostBattle:: .string "Want to float with me?$" -Route20_Text_IreneIntro:: @ 8187F78 +Route20_Text_IreneIntro:: .string "Are you on vacation, too?$" -Route20_Text_IreneDefeat:: @ 8187F92 +Route20_Text_IreneDefeat:: .string "No mercy at all!$" -Route20_Text_IrenePostBattle:: @ 8187FA3 +Route20_Text_IrenePostBattle:: .string "SEAFOAM used to be a single island\n" .string "in the distant past.$" -Route20_Text_DeanIntro:: @ 8187FDB +Route20_Text_DeanIntro:: .string "Check out my buff physique!$" -Route20_Text_DeanDefeat:: @ 8187FF7 +Route20_Text_DeanDefeat:: .string "Wimpy!$" -Route20_Text_DeanPostBattle:: @ 8187FFE +Route20_Text_DeanPostBattle:: .string "I should've been buffing up my\n" .string "POKéMON, not me!$" -Route20_Text_DarrinIntro:: @ 818802E +Route20_Text_DarrinIntro:: .string "Why are you riding a POKéMON?\n" .string "Can't you swim?$" -Route20_Text_DarrinDefeat:: @ 818805C +Route20_Text_DarrinDefeat:: .string "Ouch!\n" .string "Torpedoed!$" -Route20_Text_DarrinPostBattle:: @ 818806D +Route20_Text_DarrinPostBattle:: .string "Riding a POKéMON sure looks fun!$" -Route20_Text_RogerIntro:: @ 818808E +Route20_Text_RogerIntro:: .string "I rode my bird POKéMON here.$" -Route20_Text_RogerDefeat:: @ 81880AB +Route20_Text_RogerDefeat:: .string "Oh, no!\n" .string "Now what am I to do?$" -Route20_Text_RogerPostBattle:: @ 81880C8 +Route20_Text_RogerPostBattle:: .string "My birds are exhausted.\n" .string "They can't FLY me back!$" -Route20_Text_NoraIntro:: @ 81880F8 +Route20_Text_NoraIntro:: .string "My boyfriend gave me big pearls.$" -Route20_Text_NoraDefeat:: @ 8188119 +Route20_Text_NoraDefeat:: .string "Oh, no!\n" .string "My pearls were in them!$" -Route20_Text_NoraPostBattle:: @ 8188139 +Route20_Text_NoraPostBattle:: .string "Will my pearls grow bigger inside\n" .string "CLOYSTER?$" -Route20_Text_MissyIntro:: @ 8188165 +Route20_Text_MissyIntro:: .string "I swam here from CINNABAR ISLAND.\n" .string "It wasn't easy, I tell you.$" -Route20_Text_MissyDefeat:: @ 81881A3 +Route20_Text_MissyDefeat:: .string "I'm so disappointed!$" -Route20_Text_MissyPostBattle:: @ 81881B8 +Route20_Text_MissyPostBattle:: .string "POKéMON have taken over an\n" .string "abandoned mansion on CINNABAR.\p" .string "They call it the POKéMON MANSION\n" .string "now.$" -Route20_Text_MelissaIntro:: @ 8188218 +Route20_Text_MelissaIntro:: .string "CINNABAR, in the west, has a LAB\n" .string "for POKéMON.\p" .string "My daddy works there.$" -Route20_Text_MelissaDefeat:: @ 818825C +Route20_Text_MelissaDefeat:: .string "Wait!\n" .string "You're supposed to wait!$" -Route20_Text_MelissaPostBattle:: @ 818827B +Route20_Text_MelissaPostBattle:: .string "CINNABAR is a volcanic island.\p" .string "I heard it rose out of the sea\n" .string "when a volcano erupted.$" -Route20_Text_SeafoamIslands:: @ 81882D1 +Route20_Text_SeafoamIslands:: .string "SEAFOAM ISLANDS$" -Route20_Text_MistyTrainsHere:: @ 81882E1 +Route20_Text_MistyTrainsHere:: .string "Strong TRAINERS and WATER POKéMON\n" .string "are common sights in these parts.\p" .string "They say that MISTY of the\n" diff --git a/data/maps/Route21_North/scripts.inc b/data/maps/Route21_North/scripts.inc index 473a8ac59..4468971c6 100644 --- a/data/maps/Route21_North/scripts.inc +++ b/data/maps/Route21_North/scripts.inc @@ -1,2 +1,2 @@ -Route21_North_MapScripts:: @ 8168289 +Route21_North_MapScripts:: .byte 0 diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc index 60caf4702..41d34605d 100644 --- a/data/maps/Route21_North/text.inc +++ b/data/maps/Route21_North/text.inc @@ -1,32 +1,32 @@ -Route21_North_Text_RonaldIntro:: @ 818835A +Route21_North_Text_RonaldIntro:: .string "You want to know if the fish are\n" .string "biting?$" -Route21_North_Text_RonaldDefeat:: @ 8188383 +Route21_North_Text_RonaldDefeat:: .string "Dang!$" -Route21_North_Text_RonaldPostBattle:: @ 8188389 +Route21_North_Text_RonaldPostBattle:: .string "I can't catch anything good.\n" .string "Not one good POKéMON to be had!$" -Route21_North_Text_WadeIntro:: @ 81883C6 +Route21_North_Text_WadeIntro:: .string "I got a big haul!\n" .string "Wanna go for it?$" -Route21_North_Text_WadeDefeat:: @ 81883E9 +Route21_North_Text_WadeDefeat:: .string "Heheh, MAGIKARP just don't make\n" .string "the grade, do they?$" -Route21_North_Text_WadePostBattle:: @ 818841D +Route21_North_Text_WadePostBattle:: .string "I seem to only catch MAGIKARP!$" -Route21_North_Text_SpencerIntro:: @ 818843C +Route21_North_Text_SpencerIntro:: .string "The sea cleanses my body and soul!$" -Route21_North_Text_SpencerDefeat:: @ 818845F +Route21_North_Text_SpencerDefeat:: .string "Ayah!$" -Route21_North_Text_SpencerPostBattle:: @ 8188465 +Route21_North_Text_SpencerPostBattle:: .string "The sea is great and all, but I\n" .string "like the mountains, too.$" @@ -36,15 +36,15 @@ Route21_North_Text_SpencerPostBattle:: @ 8188465 @ English translations from RB are listed @ "What's wrong with me swimming?" -Route21_North_Text_CueBallIntro:: @ 818849E +Route21_North_Text_CueBallIntro:: .string "おれだって　たまには\n" .string "およぎに　くるぜ！$" @ "Cheap shot!" -Route21_North_Text_CueBallDefeat:: @ 81884B3 +Route21_North_Text_CueBallDefeat:: .string "ぐわわ！$" @ "I look like what? A studded inner tube? Get lost!" -Route21_North_Text_CueBallPostBattle:: @ 81884B8 +Route21_North_Text_CueBallPostBattle:: .string "うきやすそう　だと？\n" .string "うるせー　おおきな　おせわだッ！$" diff --git a/data/maps/Route21_South/scripts.inc b/data/maps/Route21_South/scripts.inc index caab96b6a..db41d1c77 100644 --- a/data/maps/Route21_South/scripts.inc +++ b/data/maps/Route21_South/scripts.inc @@ -1,2 +1,2 @@ -Route21_South_MapScripts:: @ 816828A +Route21_South_MapScripts:: .byte 0 diff --git a/data/maps/Route21_South/text.inc b/data/maps/Route21_South/text.inc index 255c1eaed..1e91e52f2 100644 --- a/data/maps/Route21_South/text.inc +++ b/data/maps/Route21_South/text.inc @@ -1,87 +1,87 @@ -Route21_South_Text_JackIntro:: @ 81884D4 +Route21_South_Text_JackIntro:: .string "I caught my POKéMON at sea.$" -Route21_South_Text_JackDefeat:: @ 81884F0 +Route21_South_Text_JackDefeat:: .string "Diver!!\n" .string "Down!!$" -Route21_South_Text_JackPostBattle:: @ 81884FF +Route21_South_Text_JackPostBattle:: .string "Where'd you catch your POKéMON?$" -Route21_South_Text_JeromeIntro:: @ 818851F +Route21_South_Text_JeromeIntro:: .string "Right now, I'm in a triathlon meet.$" -Route21_South_Text_JeromeDefeat:: @ 8188543 +Route21_South_Text_JeromeDefeat:: .string "Pant…\n" .string "Pant… Pant…$" -Route21_South_Text_JeromePostBattle:: @ 8188555 +Route21_South_Text_JeromePostBattle:: .string "I'm beat! But, I still have the\n" .string "bike race and marathon left!$" -Route21_South_Text_RolandIntro:: @ 8188592 +Route21_South_Text_RolandIntro:: .string "Ahh!\n" .string "Feel the sun and the wind!$" -Route21_South_Text_RolandDefeat:: @ 81885B2 +Route21_South_Text_RolandDefeat:: .string "Yow!\n" .string "I lost!$" -Route21_South_Text_RolandPostBattle:: @ 81885BF +Route21_South_Text_RolandPostBattle:: .string "I'm sunburnt to a crisp!$" -Route21_South_Text_ClaudeIntro:: @ 81885D8 +Route21_South_Text_ClaudeIntro:: .string "Hey, don't scare away the fish!$" -Route21_South_Text_ClaudeDefeat:: @ 81885F8 +Route21_South_Text_ClaudeDefeat:: .string "Sorry! I'm just so frustrated from\n" .string "not catching anything.$" -Route21_South_Text_ClaudePostBattle:: @ 8188632 +Route21_South_Text_ClaudePostBattle:: .string "Sheesh, I haven't caught a thing.\n" .string "Could this place actually be a\l" .string "giant pool or something?$" -Route21_South_Text_NolanIntro:: @ 818868C +Route21_South_Text_NolanIntro:: .string "Keep me company till I get a hit.$" -Route21_South_Text_NolanDefeat:: @ 81886AE +Route21_South_Text_NolanDefeat:: .string "That burned some time.$" -Route21_South_Text_NolanPostBattle:: @ 81886C5 +Route21_South_Text_NolanPostBattle:: .string "Oh wait!\n" .string "I got a bite! Yeah!$" -Route21_North_Text_LilIntro:: @ 81886E2 +Route21_North_Text_LilIntro:: .string "LIL: Huh? A battle?\n" .string "IAN, can't you do it alone?$" -Route21_North_Text_LilDefeat:: @ 8188712 +Route21_North_Text_LilDefeat:: .string "LIL: Oh, see?\n" .string "We lost. Happy now?$" -Route21_North_Text_LilPostBattle:: @ 8188734 +Route21_North_Text_LilPostBattle:: .string "LIL: I'm tired.\n" .string "Can't we go home already?$" -Route21_North_Text_LilNotEnoughMons:: @ 818875E +Route21_North_Text_LilNotEnoughMons:: .string "LIL: Huh? A battle?\n" .string "I can't be bothered to do it alone.\l" .string "Bring two POKéMON, won't you?$" -Route21_North_Text_IanIntro:: @ 81887B4 +Route21_North_Text_IanIntro:: .string "IAN: My sis doesn't get enough\n" .string "exercise, so I made her come.$" -Route21_North_Text_IanDefeat:: @ 81887F1 +Route21_North_Text_IanDefeat:: .string "IAN: Awww, Sis!\n" .string "Get it together!$" -Route21_North_Text_IanPostBattle:: @ 8188812 +Route21_North_Text_IanPostBattle:: .string "IAN: Come on, Sis!\p" .string "You're not going to lose weight\n" .string "like this!$" -Route21_North_Text_IanNotEnoughMons:: @ 8188850 +Route21_North_Text_IanNotEnoughMons:: .string "IAN: We want a two-on-two battle.\n" .string "So can you bring two POKéMON?$" diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc index 3ca746ed6..5df278bae 100644 --- a/data/maps/Route22/scripts.inc +++ b/data/maps/Route22/scripts.inc @@ -1,29 +1,29 @@ .set LOCALID_RIVAL, 1 -Route22_MapScripts:: @ 816828B +Route22_MapScripts:: .byte 0 -Route22_EventScript_EarlyRivalTriggerTop:: @ 816828C +Route22_EventScript_EarlyRivalTriggerTop:: lockall setvar VAR_TEMP_1, 0 goto Route22_EventScript_EarlyRival end -Route22_EventScript_EarlyRivalTriggerMid:: @ 8168298 +Route22_EventScript_EarlyRivalTriggerMid:: lockall setvar VAR_TEMP_1, 1 setobjectxyperm LOCALID_RIVAL, 25, 5 goto Route22_EventScript_EarlyRival end -Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB +Route22_EventScript_EarlyRivalTriggerBottom:: lockall setvar VAR_TEMP_1, 2 setobjectxyperm LOCALID_RIVAL, 25, 5 goto Route22_EventScript_EarlyRival end -Route22_EventScript_EarlyRival:: @ 81682BE +Route22_EventScript_EarlyRival:: textcolor 0 playbgm MUS_ENCOUNTER_RIVAL, 0 addobject LOCALID_RIVAL @@ -57,35 +57,35 @@ Route22_EventScript_EarlyRival:: @ 81682BE releaseall end -Route22_EventScript_EarlyRivalApproach:: @ 8168350 +Route22_EventScript_EarlyRivalApproach:: applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach waitmovement 0 return -Route22_EventScript_EarlyRivalApproachBottom:: @ 816835B +Route22_EventScript_EarlyRivalApproachBottom:: applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return -Route22_EventScript_EarlyRivalSquirtle:: @ 816836D +Route22_EventScript_EarlyRivalSquirtle:: trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory return -Route22_EventScript_EarlyRivalBulbasaur:: @ 816837C +Route22_EventScript_EarlyRivalBulbasaur:: trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory return -Route22_EventScript_EarlyRivalCharmander:: @ 816838B +Route22_EventScript_EarlyRivalCharmander:: trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory return -Route22_EventScript_EarlyRivalExit:: @ 816839A +Route22_EventScript_EarlyRivalExit:: applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExit waitmovement 0 return -Route22_EventScript_EarlyRivalExitBottom:: @ 81683A5 +Route22_EventScript_EarlyRivalExitBottom:: applymovement LOCALID_RIVAL, Route22_Movement_EarlyRivalExitBottom waitmovement 0 return @@ -100,7 +100,7 @@ Route22_Movement_UnusedRivalExit:: @ 8 walk_right step_end -Route22_Movement_EarlyRivalExit:: @ 81683B8 +Route22_Movement_EarlyRivalExit:: walk_down walk_right walk_right @@ -115,7 +115,7 @@ Route22_Movement_EarlyRivalExit:: @ 81683B8 walk_down step_end -Route22_Movement_EarlyRivalExitBottom:: @ 81683C5 +Route22_Movement_EarlyRivalExitBottom:: walk_right walk_right walk_right @@ -129,7 +129,7 @@ Route22_Movement_EarlyRivalExitBottom:: @ 81683C5 walk_down step_end -Route22_Movement_RivalApproach:: @ 81683D1 +Route22_Movement_RivalApproach:: walk_right walk_right walk_right @@ -139,7 +139,7 @@ Route22_Movement_RivalApproach:: @ 81683D1 walk_right step_end -Route22_Movement_RivalApproachBottom:: @ 81683D9 +Route22_Movement_RivalApproachBottom:: walk_right walk_right walk_right @@ -151,7 +151,7 @@ Route22_Movement_RivalApproachBottom:: @ 81683D9 walk_in_place_fastest_down step_end -Route22_Movement_PlayerFaceRival:: @ 81683E3 +Route22_Movement_PlayerFaceRival:: delay_16 delay_16 delay_16 @@ -163,27 +163,27 @@ Route22_Movement_PlayerFaceRival:: @ 81683E3 walk_in_place_fastest_up step_end -Route22_EventScript_LateRivalTriggerTop:: @ 81683ED +Route22_EventScript_LateRivalTriggerTop:: lockall setvar VAR_TEMP_1, 0 goto Route22_EventScript_LateRival end -Route22_EventScript_LateRivalTriggerMid:: @ 81683F9 +Route22_EventScript_LateRivalTriggerMid:: lockall setvar VAR_TEMP_1, 1 setobjectxyperm LOCALID_RIVAL, 25, 5 goto Route22_EventScript_LateRival end -Route22_EventScript_LateRivalTriggerBottom:: @ 816840C +Route22_EventScript_LateRivalTriggerBottom:: lockall setvar VAR_TEMP_1, 2 setobjectxyperm LOCALID_RIVAL, 25, 5 goto Route22_EventScript_LateRival end -Route22_EventScript_LateRival:: @ 816841F +Route22_EventScript_LateRival:: textcolor 0 playbgm MUS_ENCOUNTER_RIVAL, 0 addobject LOCALID_RIVAL @@ -213,30 +213,30 @@ Route22_EventScript_LateRival:: @ 816841F releaseall end -Route22_EventScript_LateRivalApproach:: @ 816849C +Route22_EventScript_LateRivalApproach:: applymovement LOCALID_RIVAL, Route22_Movement_RivalApproach waitmovement 0 return -Route22_EventScript_LateRivalApproachBottom:: @ 81684A7 +Route22_EventScript_LateRivalApproachBottom:: applymovement LOCALID_RIVAL, Route22_Movement_RivalApproachBottom applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival waitmovement 0 return -Route22_EventScript_LateRivalSquirtle:: @ 81684B9 +Route22_EventScript_LateRivalSquirtle:: trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Route22_Text_LateRivalDefeat return -Route22_EventScript_LateRivalBulbasaur:: @ 81684C4 +Route22_EventScript_LateRivalBulbasaur:: trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Route22_Text_LateRivalDefeat return -Route22_EventScript_LateRivalCharmander:: @ 81684CF +Route22_EventScript_LateRivalCharmander:: trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Route22_Text_LateRivalDefeat return -Route22_Movement_LateRivalExit:: @ 81684DA +Route22_Movement_LateRivalExit:: walk_left walk_left walk_left @@ -246,6 +246,6 @@ Route22_Movement_LateRivalExit:: @ 81684DA walk_left step_end -Route22_EventScript_LeagueGateSign:: @ 81684E2 +Route22_EventScript_LeagueGateSign:: msgbox Route22_Text_LeagueGateSign, MSGBOX_SIGN end diff --git a/data/maps/Route22/text.inc b/data/maps/Route22/text.inc index 72b4ca28b..911b732a6 100644 --- a/data/maps/Route22/text.inc +++ b/data/maps/Route22/text.inc @@ -1,4 +1,4 @@ -Route22_Text_EarlyRivalIntro:: @ 8188890 +Route22_Text_EarlyRivalIntro:: .string "{RIVAL}: Hey! {PLAYER}!\p" .string "You're off to the POKéMON LEAGUE?\n" .string "Forget about it!\p" @@ -9,11 +9,11 @@ Route22_Text_EarlyRivalIntro:: @ 8188890 .string "By the way, did your POKéMON get\n" .string "any stronger?$" -Route22_Text_EarlyRivalDefeat:: @ 8188959 +Route22_Text_EarlyRivalDefeat:: .string "Awww!\n" .string "You just lucked out!$" -Route22_Text_EarlyRivalPostBattle:: @ 8188974 +Route22_Text_EarlyRivalPostBattle:: .string "I heard the POKéMON LEAGUE is\n" .string "crawling with tough TRAINERS.\p" .string "I have to figure out how to get\n" @@ -22,14 +22,14 @@ Route22_Text_EarlyRivalPostBattle:: @ 8188974 .string "move on!$" @ Translated in RB as "{RIVAL}: What? Why do I have 2 POKéMON? You should catch some more too!" -Route22_Text_RivalShouldCatchSomeMons:: @ 8188A07 +Route22_Text_RivalShouldCatchSomeMons:: .string "{RIVAL}“なんだ？\n" .string "ポケモン　2ひきも\l" .string "もってるの　なぜか　だって？\p" .string "おまえも\n" .string "つかまえれば　いい　じゃん！$" -Route22_Text_LateRivalIntro:: @ 8188A3C +Route22_Text_LateRivalIntro:: .string "{RIVAL}: What? {PLAYER}!\n" .string "What a surprise to see you here!\p" .string "So you're going to the POKéMON\n" @@ -40,11 +40,11 @@ Route22_Text_LateRivalIntro:: @ 8188A3C .string "warm-up for the POKéMON LEAGUE!\p" .string "Come on!$" -Route22_Text_LateRivalDefeat:: @ 8188B08 +Route22_Text_LateRivalDefeat:: .string "What!?\p" .string "I was just careless, you!$" -Route22_Text_LateRivalPostBattle:: @ 8188B29 +Route22_Text_LateRivalPostBattle:: .string "That loosened me up.\n" .string "I'm ready for the POKéMON LEAGUE!\p" .string "{PLAYER}, you need more practice.\p" @@ -52,7 +52,7 @@ Route22_Text_LateRivalPostBattle:: @ 8188B29 .string "I'm out of here. Smell ya!$" @ Translated in RB as "{RIVAL}: Hahaha! {PLAYER}! That's your best? You're nowhere near as good as me, pal! Go train some more! You loser!" -Route22_Text_LateRivalVictory:: @ 8188BAF +Route22_Text_LateRivalVictory:: .string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n" .string "それで　がんばってるのかよ！\l" .string "おれの　さいのうに　くらべりゃ\l" @@ -60,7 +60,7 @@ Route22_Text_LateRivalVictory:: @ 8188BAF .string "もっと　れんしゅう　こいよ！\n" .string "あははーッ！$" -Route22_Text_LeagueGateSign:: @ 8188BFF +Route22_Text_LeagueGateSign:: .string "POKéMON LEAGUE\n" .string "Front Gate$" diff --git a/data/maps/Route22_NorthEntrance/scripts.inc b/data/maps/Route22_NorthEntrance/scripts.inc index edd436b48..b21257306 100644 --- a/data/maps/Route22_NorthEntrance/scripts.inc +++ b/data/maps/Route22_NorthEntrance/scripts.inc @@ -1,7 +1,7 @@ -Route22_NorthEntrance_MapScripts:: @ 81704FB +Route22_NorthEntrance_MapScripts:: .byte 0 -Route22_NorthEntrance_EventScript_BoulderBadgeGuard:: @ 81704FC +Route22_NorthEntrance_EventScript_BoulderBadgeGuard:: lock faceplayer setvar VAR_TEMP_1, 1 @@ -9,7 +9,7 @@ Route22_NorthEntrance_EventScript_BoulderBadgeGuard:: @ 81704FC goto Route22_NorthEntrance_EventScript_BadgeGuard end -Route22_NorthEntrance_EventScript_BoulderBadgeGuardTrigger:: @ 817050D +Route22_NorthEntrance_EventScript_BoulderBadgeGuardTrigger:: lockall setvar VAR_TEMP_1, 1 setvar VAR_0x8009, 1 diff --git a/data/maps/Route23/scripts.inc b/data/maps/Route23/scripts.inc index e75830cd7..45a33ac4d 100644 --- a/data/maps/Route23/scripts.inc +++ b/data/maps/Route23/scripts.inc @@ -6,11 +6,11 @@ .set LOCALID_VOLCANO_BADGE_GUARD, 6 .set LOCALID_EARTH_BADGE_GUARD, 7 -Route23_MapScripts:: @ 81684EB +Route23_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route23_OnTransition .byte 0 -Route23_OnTransition:: @ 81684F1 +Route23_OnTransition:: clearflag FLAG_HIDE_VICTORY_ROAD_3F_BOULDER setflag FLAG_HIDE_VICTORY_ROAD_2F_BOULDER setvar VAR_MAP_SCENE_VICTORY_ROAD_1F, 0 @@ -19,7 +19,7 @@ Route23_OnTransition:: @ 81684F1 setvar VAR_MAP_SCENE_VICTORY_ROAD_3F, 0 end -Route23_EventScript_CascadeBadgeGuard:: @ 816850C +Route23_EventScript_CascadeBadgeGuard:: lock faceplayer setvar VAR_TEMP_1, 2 @@ -27,7 +27,7 @@ Route23_EventScript_CascadeBadgeGuard:: @ 816850C goto Route23_EventScript_BadgeGuard end -Route23_EventScript_ThunderBadgeGuard:: @ 816851D +Route23_EventScript_ThunderBadgeGuard:: lock faceplayer setvar VAR_TEMP_1, 3 @@ -35,7 +35,7 @@ Route23_EventScript_ThunderBadgeGuard:: @ 816851D goto Route23_EventScript_BadgeGuard end -Route23_EventScript_RainbowBadgeGuard:: @ 816852E +Route23_EventScript_RainbowBadgeGuard:: lock faceplayer setvar VAR_TEMP_1, 4 @@ -43,7 +43,7 @@ Route23_EventScript_RainbowBadgeGuard:: @ 816852E goto Route23_EventScript_BadgeGuard end -Route23_EventScript_SoulBadgeGuard:: @ 816853F +Route23_EventScript_SoulBadgeGuard:: lock faceplayer setvar VAR_TEMP_1, 5 @@ -51,7 +51,7 @@ Route23_EventScript_SoulBadgeGuard:: @ 816853F goto Route23_EventScript_BadgeGuard end -Route23_EventScript_MarshBadgeGuard:: @ 8168550 +Route23_EventScript_MarshBadgeGuard:: lock faceplayer setvar VAR_TEMP_1, 6 @@ -59,7 +59,7 @@ Route23_EventScript_MarshBadgeGuard:: @ 8168550 goto Route23_EventScript_BadgeGuard end -Route23_EventScript_VolcanoBadgeGuard:: @ 8168561 +Route23_EventScript_VolcanoBadgeGuard:: lock faceplayer setvar VAR_TEMP_1, 7 @@ -67,7 +67,7 @@ Route23_EventScript_VolcanoBadgeGuard:: @ 8168561 goto Route23_EventScript_BadgeGuard end -Route23_EventScript_EarthBadgeGuard:: @ 8168572 +Route23_EventScript_EarthBadgeGuard:: lock faceplayer setvar VAR_TEMP_1, 8 @@ -75,7 +75,7 @@ Route23_EventScript_EarthBadgeGuard:: @ 8168572 goto Route23_EventScript_BadgeGuard end -Route23_EventScript_CascadeBadgeGuardTrigger:: @ 8168583 +Route23_EventScript_CascadeBadgeGuardTrigger:: lockall setvar VAR_TEMP_1, 2 setvar VAR_0x8009, LOCALID_CASCADE_BADGE_GUARD @@ -83,7 +83,7 @@ Route23_EventScript_CascadeBadgeGuardTrigger:: @ 8168583 goto Route23_EventScript_BadgeGuardTrigger end -Route23_EventScript_ThunderBadgeGuardTrigger:: @ 8168598 +Route23_EventScript_ThunderBadgeGuardTrigger:: lockall setvar VAR_TEMP_1, 3 setvar VAR_0x8009, LOCALID_THUNDER_BADGE_GUARD @@ -91,7 +91,7 @@ Route23_EventScript_ThunderBadgeGuardTrigger:: @ 8168598 goto Route23_EventScript_BadgeGuardTrigger end -Route23_EventScript_RainbowBadgeGuardTrigger:: @ 81685AD +Route23_EventScript_RainbowBadgeGuardTrigger:: lockall setvar VAR_TEMP_1, 4 setvar VAR_0x8009, LOCALID_RAINBOW_BADGE_GUARD @@ -99,7 +99,7 @@ Route23_EventScript_RainbowBadgeGuardTrigger:: @ 81685AD goto Route23_EventScript_BadgeGuardTrigger end -Route23_EventScript_SoulBadgeGuardTrigger:: @ 81685C2 +Route23_EventScript_SoulBadgeGuardTrigger:: lockall setvar VAR_TEMP_1, 5 setvar VAR_0x8009, LOCALID_SOUL_BADGE_GUARD @@ -107,7 +107,7 @@ Route23_EventScript_SoulBadgeGuardTrigger:: @ 81685C2 goto Route23_EventScript_BadgeGuardTrigger end -Route23_EventScript_MarshBadgeGuardTrigger:: @ 81685D7 +Route23_EventScript_MarshBadgeGuardTrigger:: lockall setvar VAR_TEMP_1, 6 setvar VAR_0x8009, LOCALID_MARSH_BADGE_GUARD @@ -115,7 +115,7 @@ Route23_EventScript_MarshBadgeGuardTrigger:: @ 81685D7 goto Route23_EventScript_BadgeGuardTrigger end -Route23_EventScript_VolcanoBadgeGuardTrigger:: @ 81685EC +Route23_EventScript_VolcanoBadgeGuardTrigger:: lockall setvar VAR_TEMP_1, 7 setvar VAR_0x8009, LOCALID_VOLCANO_BADGE_GUARD @@ -123,7 +123,7 @@ Route23_EventScript_VolcanoBadgeGuardTrigger:: @ 81685EC goto Route23_EventScript_BadgeGuardTrigger end -Route23_EventScript_EarthBadgeGuardTrigger:: @ 8168601 +Route23_EventScript_EarthBadgeGuardTrigger:: lockall setvar VAR_TEMP_1, 8 setvar VAR_0x8009, LOCALID_EARTH_BADGE_GUARD @@ -131,6 +131,6 @@ Route23_EventScript_EarthBadgeGuardTrigger:: @ 8168601 goto Route23_EventScript_BadgeGuardTrigger end -Route23_EventScript_VictoryRoadGateSign:: @ 8168616 +Route23_EventScript_VictoryRoadGateSign:: msgbox Route23_Text_VictoryRoadGateSign, MSGBOX_SIGN end diff --git a/data/maps/Route23/text.inc b/data/maps/Route23/text.inc index 7429303cd..c636fc531 100644 --- a/data/maps/Route23/text.inc +++ b/data/maps/Route23/text.inc @@ -1,4 +1,4 @@ -Route23_Text_VictoryRoadGateSign:: @ 8188C19 +Route23_Text_VictoryRoadGateSign:: .string "VICTORY ROAD GATE -\n" .string "POKéMON LEAGUE$" diff --git a/data/maps/Route23_UnusedHouse/scripts.inc b/data/maps/Route23_UnusedHouse/scripts.inc index 276915e12..1c1c8ea88 100644 --- a/data/maps/Route23_UnusedHouse/scripts.inc +++ b/data/maps/Route23_UnusedHouse/scripts.inc @@ -1,2 +1,2 @@ -Route23_UnusedHouse_MapScripts:: @ 8170522 +Route23_UnusedHouse_MapScripts:: .byte 0 diff --git a/data/maps/Route24/scripts.inc b/data/maps/Route24/scripts.inc index abaa43b47..dbcc621bc 100644 --- a/data/maps/Route24/scripts.inc +++ b/data/maps/Route24/scripts.inc @@ -1,9 +1,9 @@ .equ LOCALID_ROCKET, 1 -Route24_MapScripts:: @ 816861F +Route24_MapScripts:: .byte 0 -Route24_EventScript_Rocket:: @ 8168620 +Route24_EventScript_Rocket:: lock faceplayer compare VAR_MAP_SCENE_ROUTE24, 1 @@ -16,29 +16,29 @@ Route24_EventScript_Rocket:: @ 8168620 release end -Route24_EventScript_NoRoomForNugget:: @ 816864C +Route24_EventScript_NoRoomForNugget:: msgbox Route24_Text_YouDontHaveAnyRoom release end -Route24_EventScript_RocketPostBattle:: @ 8168656 +Route24_EventScript_RocketPostBattle:: msgbox Route24_Text_YoudBecomeTopRocketLeader release end -Route24_EventScript_RocketTriggerLeft:: @ 8168660 +Route24_EventScript_RocketTriggerLeft:: lockall setvar VAR_TEMP_1, 0 goto Route24_EventScript_RocketTrigger end -Route24_EventScript_RocketTriggerRight:: @ 816866C +Route24_EventScript_RocketTriggerRight:: lockall setvar VAR_TEMP_1, 1 goto Route24_EventScript_RocketTrigger end -Route24_EventScript_RocketTrigger:: @ 8168678 +Route24_EventScript_RocketTrigger:: textcolor 0 compare VAR_TEMP_1, 0 call_if_eq Route24_EventScript_RocketApproachPlayer @@ -54,7 +54,7 @@ Route24_EventScript_RocketTrigger:: @ 8168678 releaseall end -Route24_EventScript_BattleRocket:: @ 81686B9 +Route24_EventScript_BattleRocket:: giveitem_msg Route24_Text_ReceivedNuggetFromMysteryTrainer, ITEM_NUGGET message Route24_Text_JoinTeamRocket waitmessage @@ -66,17 +66,17 @@ Route24_EventScript_BattleRocket:: @ 81686B9 setvar VAR_MAP_SCENE_ROUTE24, 1 return -Route24_EventScript_RocketApproachPlayer:: @ 81686FD +Route24_EventScript_RocketApproachPlayer:: applymovement LOCALID_ROCKET, Route24_Movement_RocketApproachPlayer waitmovement 0 return -Route24_EventScript_RocketMotionToPlayer:: @ 8168708 +Route24_EventScript_RocketMotionToPlayer:: applymovement LOCALID_ROCKET, Movement_WalkInPlaceFastestLeft waitmovement 0 return -Route24_EventScript_NoRoomForNuggetTrigger:: @ 8168713 +Route24_EventScript_NoRoomForNuggetTrigger:: msgbox Route24_Text_YouDontHaveAnyRoom closemessage applymovement OBJ_EVENT_ID_PLAYER, Route24_Movement_WalkDown @@ -86,20 +86,20 @@ Route24_EventScript_NoRoomForNuggetTrigger:: @ 8168713 release end -Route24_EventScript_RocketWalkBackToPos:: @ 8168733 +Route24_EventScript_RocketWalkBackToPos:: applymovement LOCALID_ROCKET, Route24_Movement_RocketWalkBackToPos waitmovement 0 return -Route24_Movement_RocketApproachPlayer:: @ 816873E +Route24_Movement_RocketApproachPlayer:: walk_left step_end -Route24_Movement_RocketWalkBackToPos:: @ 8168740 +Route24_Movement_RocketWalkBackToPos:: walk_right walk_in_place_fastest_left step_end -Route24_Movement_WalkDown:: @ 8168743 +Route24_Movement_WalkDown:: walk_down step_end diff --git a/data/maps/Route24/text.inc b/data/maps/Route24/text.inc index 7b9d09e6f..094a4b83a 100644 --- a/data/maps/Route24/text.inc +++ b/data/maps/Route24/text.inc @@ -1,16 +1,16 @@ -Route24_Text_JustEarnedFabulousPrize:: @ 8188C3C +Route24_Text_JustEarnedFabulousPrize:: .string "Congratulations! You beat our\n" .string "five contest TRAINERS!\p" .string "You just earned a fabulous prize!$" -Route24_Text_ReceivedNuggetFromMysteryTrainer:: @ 8188C93 +Route24_Text_ReceivedNuggetFromMysteryTrainer:: .string "{PLAYER} received a NUGGET\n" .string "from the mystery TRAINER!$" -Route24_Text_YouDontHaveAnyRoom:: @ 8188CC2 +Route24_Text_YouDontHaveAnyRoom:: .string "You don't have any room!$" -Route24_Text_JoinTeamRocket:: @ 8188CDB +Route24_Text_JoinTeamRocket:: .string "By the way, how would you like to\n" .string "join TEAM ROCKET?\p" .string "We're a group of professional\n" @@ -23,78 +23,78 @@ Route24_Text_JoinTeamRocket:: @ 8188CDB .string "I'll make you an offer you can't\n" .string "refuse!$" -Route24_Text_RocketDefeat:: @ 8188DDC +Route24_Text_RocketDefeat:: .string "Arrgh!\n" .string "You are good!$" -Route24_Text_YoudBecomeTopRocketLeader:: @ 8188DF1 +Route24_Text_YoudBecomeTopRocketLeader:: .string "With your ability, you'd become\n" .string "a top leader in TEAM ROCKET.\p" .string "Come on, think of the opportunity!\n" .string "Don't let this chance go to waste.$" -Route24_Text_ShaneIntro:: @ 8188E74 +Route24_Text_ShaneIntro:: .string "I saw your feat from the grass!$" -Route24_Text_ShaneDefeat:: @ 8188E94 +Route24_Text_ShaneDefeat:: .string "I thought not!$" -Route24_Text_ShanePostBattle:: @ 8188EA3 +Route24_Text_ShanePostBattle:: .string "I hid because the people on the\n" .string "bridge frightened me.$" -Route24_Text_EthanIntro:: @ 8188ED9 +Route24_Text_EthanIntro:: .string "Okay! I'm No. 5!\n" .string "I'll stomp you!$" -Route24_Text_EthanDefeat:: @ 8188EFA +Route24_Text_EthanDefeat:: .string "Whoa!\n" .string "Too much!$" -Route24_Text_EthanPostBattle:: @ 8188F0A +Route24_Text_EthanPostBattle:: .string "I did my best. I have no regrets!$" -Route24_Text_ReliIntro:: @ 8188F2C +Route24_Text_ReliIntro:: .string "I'm No. 4!\n" .string "Getting tired?$" -Route24_Text_ReliDefeat:: @ 8188F46 +Route24_Text_ReliDefeat:: .string "I lost, too!$" -Route24_Text_ReliPostBattle:: @ 8188F53 +Route24_Text_ReliPostBattle:: .string "I did my best, so I've no regrets!$" -Route24_Text_TimmyIntro:: @ 8188F76 +Route24_Text_TimmyIntro:: .string "Here's No. 3!\n" .string "I won't be easy!$" -Route24_Text_TimmyDefeat:: @ 8188F95 +Route24_Text_TimmyDefeat:: .string "Ow!\n" .string "Stomped flat!$" -Route24_Text_TimmyPostBattle:: @ 8188FA7 +Route24_Text_TimmyPostBattle:: .string "I did my best. I have no regrets!$" -Route24_Text_AliIntro:: @ 8188FC9 +Route24_Text_AliIntro:: .string "I'm second!\n" .string "Now it's serious!$" -Route24_Text_AliDefeat:: @ 8188FE7 +Route24_Text_AliDefeat:: .string "How could I lose?$" -Route24_Text_AliPostBattle:: @ 8188FF9 +Route24_Text_AliPostBattle:: .string "I did my best. I have no regrets!$" -Route24_Text_CaleIntro:: @ 818901B +Route24_Text_CaleIntro:: .string "People call this the NUGGET\n" .string "BRIDGE!\p" .string "Beat us five TRAINERS and win\n" .string "a fabulous prize!\p" .string "Think you got what it takes?$" -Route24_Text_CaleDefeat:: @ 818908C +Route24_Text_CaleDefeat:: .string "Whoo!\n" .string "Good stuff!$" -Route24_Text_CalePostBattle:: @ 818909E +Route24_Text_CalePostBattle:: .string "I did my best. I have no regrets!$" diff --git a/data/maps/Route25/scripts.inc b/data/maps/Route25/scripts.inc index 4dc03b3e9..a714ba498 100644 --- a/data/maps/Route25/scripts.inc +++ b/data/maps/Route25/scripts.inc @@ -1,10 +1,10 @@ -Route25_MapScripts:: @ 8168745 +Route25_MapScripts:: .byte 0 -Route25_EventScript_SeaCottageSign:: @ 8168746 +Route25_EventScript_SeaCottageSign:: msgbox Route25_Text_SeaCottageSign, MSGBOX_SIGN end -Route25_EventScript_Man:: @ 816874F +Route25_EventScript_Man:: msgbox Route25_Text_AreYouHereAlone, MSGBOX_NPC end diff --git a/data/maps/Route25/text.inc b/data/maps/Route25/text.inc index 56bf3df94..49e33c09a 100644 --- a/data/maps/Route25/text.inc +++ b/data/maps/Route25/text.inc @@ -1,118 +1,118 @@ -Route25_Text_JoeyIntro:: @ 81890C0 +Route25_Text_JoeyIntro:: .string "Local TRAINERS come here to\n" .string "practice.$" -Route25_Text_JoeyDefeat:: @ 81890E6 +Route25_Text_JoeyDefeat:: .string "You're decent.$" -Route25_Text_JoeyPostBattle:: @ 81890F5 +Route25_Text_JoeyPostBattle:: .string "All POKéMON have weaknesses.\n" .string "Even the strongest ones.\p" .string "That's why it's best to raise\n" .string "POKéMON of different types.$" -Route25_Text_DanIntro:: @ 8189165 +Route25_Text_DanIntro:: .string "Dad took me to a great party on\n" .string "the S.S. ANNE at VERMILION CITY.$" -Route25_Text_DanDefeat:: @ 81891A6 +Route25_Text_DanDefeat:: .string "I'm not mad!$" -Route25_Text_DanPostBattle:: @ 81891B3 +Route25_Text_DanPostBattle:: .string "On the S.S. ANNE, I saw TRAINERS\n" .string "from around the world.$" -Route25_Text_FlintIntro:: @ 81891EB +Route25_Text_FlintIntro:: .string "I'm a cool guy.\n" .string "I've got a girlfriend!$" -Route25_Text_FlintDefeat:: @ 8189212 +Route25_Text_FlintDefeat:: .string "Aww, darn…$" -Route25_Text_FlintPostBattle:: @ 818921D +Route25_Text_FlintPostBattle:: .string "Oh, well.\n" .string "My girlfriend will cheer me up.$" -Route25_Text_KelseyIntro:: @ 8189247 +Route25_Text_KelseyIntro:: .string "Hi!\n" .string "My boyfriend is cool!$" -Route25_Text_KelseyDefeat:: @ 8189261 +Route25_Text_KelseyDefeat:: .string "My conditioning isn't the best…$" -Route25_Text_KelseyPostBattle:: @ 8189281 +Route25_Text_KelseyPostBattle:: .string "I wish my boyfriend was as good\n" .string "as you.$" -Route25_Text_ChadIntro:: @ 81892A9 +Route25_Text_ChadIntro:: .string "I had this feeling…\n" .string "I knew I had to battle you!$" -Route25_Text_ChadDefeat:: @ 81892D9 +Route25_Text_ChadDefeat:: .string "I knew I'd lose, too!$" -Route25_Text_ChadPostBattle:: @ 81892EF +Route25_Text_ChadPostBattle:: .string "If your POKéMON gets confused,\n" .string "switch it out.\p" .string "That's a good tactic.$" -Route25_Text_HaleyIntro:: @ 8189333 +Route25_Text_HaleyIntro:: .string "My friend has many cute POKéMON.\n" .string "I'm so jealous!$" -Route25_Text_HaleyDefeat:: @ 8189364 +Route25_Text_HaleyDefeat:: .string "I'm not so jealous!$" -Route25_Text_HaleyPostBattle:: @ 8189378 +Route25_Text_HaleyPostBattle:: .string "You came from MT. MOON?\n" .string "May I have a CLEFAIRY?$" -Route25_Text_FranklinIntro:: @ 81893A7 +Route25_Text_FranklinIntro:: .string "I just got down from MT. MOON,\n" .string "but I've still got gas in the tank!$" -Route25_Text_FranklinDefeat:: @ 81893EA +Route25_Text_FranklinDefeat:: .string "You worked hard!$" -Route25_Text_FranklinPostBattle:: @ 81893FB +Route25_Text_FranklinPostBattle:: .string "Drat!\n" .string "A ZUBAT bit me back in that cave.$" -Route25_Text_NobIntro:: @ 8189423 +Route25_Text_NobIntro:: .string "I'm off to see a POKéMANIAC's\n" .string "collection at the cape.$" -Route25_Text_NobDefeat:: @ 8189459 +Route25_Text_NobDefeat:: .string "You done got me, and real good,\n" .string "too!$" -Route25_Text_NobPostBattle:: @ 818947E +Route25_Text_NobPostBattle:: .string "The POKéMANIAC sure lives up to\n" .string "his name.\p" .string "His collection includes many rare\n" .string "species of POKéMON.$" -Route25_Text_WayneIntro:: @ 81894DE +Route25_Text_WayneIntro:: .string "You're going to see BILL?\n" .string "First, we battle!$" -Route25_Text_WayneDefeat:: @ 818950A +Route25_Text_WayneDefeat:: .string "You're something.$" -Route25_Text_WaynePostBattle:: @ 818951C +Route25_Text_WaynePostBattle:: .string "The trail below is a shortcut to\n" .string "CERULEAN CITY.$" -Route25_Text_SeaCottageSign:: @ 818954C +Route25_Text_SeaCottageSign:: .string "SEA COTTAGE\n" .string "BILL lives here!$" -Route25_Text_MistyHighHopesAboutThisPlace:: @ 8189569 +Route25_Text_MistyHighHopesAboutThisPlace:: .string "This cape is a famous date spot.\p" .string "MISTY, the GYM LEADER, has high\n" .string "hopes about this place.$" -Route25_Text_AreYouHereAlone:: @ 81895C2 +Route25_Text_AreYouHereAlone:: .string "Hello, are you here alone?\p" .string "If you're out at CERULEAN's cape…\n" .string "Well, it should be as a couple.$" diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 517195dfb..83173399c 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -4,25 +4,25 @@ .equ BILL_IN_TELEPORTER, FLAG_TEMP_2 .equ RETURN_AFTER_SS_TICKET, FLAG_TEMP_3 -Route25_SeaCottage_MapScripts:: @ 8170523 +Route25_SeaCottage_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route25_SeaCottage_OnTransition .byte 0 -Route25_SeaCottage_OnTransition:: @ 8170529 +Route25_SeaCottage_OnTransition:: call_if_unset FLAG_HELPED_BILL_IN_SEA_COTTAGE, Route25_SeaCottage_EventScript_HideClefairyBill call_if_set FLAG_GOT_SS_TICKET, Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket end -Route25_SeaCottage_EventScript_HideClefairyBill:: @ 817053C +Route25_SeaCottage_EventScript_HideClefairyBill:: clearflag FLAG_HIDE_BILL_CLEFAIRY setobjectxyperm LOCALID_BILL_HUMAN, 3, 3 return -Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket:: @ 8170547 +Route25_SeaCottage_EventScript_SetReturnedAfterSSTicket:: setflag RETURN_AFTER_SS_TICKET return -Route25_SeaCottage_EventScript_Bill:: @ 817054B +Route25_SeaCottage_EventScript_Bill:: lock faceplayer goto_if_set RETURN_AFTER_SS_TICKET, Route25_SeaCottage_EventScript_BillGoLookAtPC @@ -35,17 +35,17 @@ Route25_SeaCottage_EventScript_Bill:: @ 817054B goto_if_eq Route25_SeaCottage_EventScript_BillAskForHelpFemale end -Route25_SeaCottage_EventScript_BillAskForHelpMale:: @ 8170580 +Route25_SeaCottage_EventScript_BillAskForHelpMale:: msgbox Route25_SeaCottage_Text_ImBillHelpMeOutPal, MSGBOX_YESNO goto Route25_SeaCottage_EventScript_BillAskForHelp end -Route25_SeaCottage_EventScript_BillAskForHelpFemale:: @ 817058E +Route25_SeaCottage_EventScript_BillAskForHelpFemale:: msgbox Route25_SeaCottage_Text_ImBillHelpMeOutLady, MSGBOX_YESNO goto Route25_SeaCottage_EventScript_BillAskForHelp end -Route25_SeaCottage_EventScript_BillAskForHelp:: @ 817059C +Route25_SeaCottage_EventScript_BillAskForHelp:: compare VAR_RESULT, NO call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBill msgbox Route25_SeaCottage_Text_RunCellSeparationOnPC @@ -72,7 +72,7 @@ Route25_SeaCottage_EventScript_BillAskForHelp:: @ 817059C end @ Just returns after message, execution continues as if player had said yes -Route25_SeaCottage_EventScript_DeclineHelpBill:: @ 8170600 +Route25_SeaCottage_EventScript_DeclineHelpBill:: checkplayergender compare VAR_RESULT, MALE call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillMale @@ -80,30 +80,30 @@ Route25_SeaCottage_EventScript_DeclineHelpBill:: @ 8170600 call_if_eq Route25_SeaCottage_EventScript_DeclineHelpBillFemale return -Route25_SeaCottage_EventScript_DeclineHelpBillMale:: @ 8170618 +Route25_SeaCottage_EventScript_DeclineHelpBillMale:: msgbox Route25_SeaCottage_Text_NoPleaseChief return -Route25_SeaCottage_EventScript_DeclineHelpBillFemale:: @ 8170621 +Route25_SeaCottage_EventScript_DeclineHelpBillFemale:: msgbox Route25_SeaCottage_Text_NoPleaseBeautiful return -Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth:: @ 817062A +Route25_SeaCottage_EventScript_BillWalkToTeleporterSouth:: applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillWalkToTeleporterSouth waitmovement 0 return -Route25_SeaCottage_EventScript_BillWalkToTeleporter:: @ 8170635 +Route25_SeaCottage_EventScript_BillWalkToTeleporter:: applymovement LOCALID_BILL_CLEFAIRY, Route25_SeaCottage_Movement_BillWalkToTeleporter waitmovement 0 return -Route25_SeaCottage_EventScript_BillGoToSSAnne:: @ 8170640 +Route25_SeaCottage_EventScript_BillGoToSSAnne:: msgbox Route25_SeaCottage_Text_SSAnnePartyYouGoInstead release end -Route25_SeaCottage_EventScript_BillGiveSSTicket:: @ 817064A +Route25_SeaCottage_EventScript_BillGiveSSTicket:: famechecker FAMECHECKER_BILL, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 checkplayergender compare VAR_RESULT, MALE @@ -121,30 +121,30 @@ Route25_SeaCottage_EventScript_BillGiveSSTicket:: @ 817064A goto Route25_SeaCottage_EventScript_BillGoToSSAnne end -Route25_SeaCottage_EventScript_BillThanksMale:: @ 81706AC +Route25_SeaCottage_EventScript_BillThanksMale:: msgbox Route25_SeaCottage_Text_ThanksBudTakeThis return -Route25_SeaCottage_EventScript_BillThanksFemale:: @ 81706B5 +Route25_SeaCottage_EventScript_BillThanksFemale:: msgbox Route25_SeaCottage_Text_ThanksLadyTakeThis return -Route25_SeaCottage_EventScript_NoRoomForSSTicket:: @ 81706BE +Route25_SeaCottage_EventScript_NoRoomForSSTicket:: msgbox Route25_SeaCottage_Text_YouveGotTooMuchStuff release end -Route25_SeaCottage_EventScript_BillGoLookAtPC:: @ 81706C8 +Route25_SeaCottage_EventScript_BillGoLookAtPC:: msgbox Route25_SeaCottage_Text_CheckOutRareMonsOnPC release end -Route25_SeaCottage_Movement_BillWalkToTeleporter:: @ 81706D2 +Route25_SeaCottage_Movement_BillWalkToTeleporter:: walk_up walk_up step_end -Route25_SeaCottage_Movement_BillWalkToTeleporterSouth:: @ 81706D5 +Route25_SeaCottage_Movement_BillWalkToTeleporterSouth:: walk_right walk_up walk_up @@ -152,11 +152,11 @@ Route25_SeaCottage_Movement_BillWalkToTeleporterSouth:: @ 81706D5 walk_in_place_fastest_up step_end -Route25_SeaCottage_Movement_BillEnterTeleporter:: @ 81706DB +Route25_SeaCottage_Movement_BillEnterTeleporter:: walk_up step_end -Route25_SeaCottage_EventScript_Computer:: @ 81706DD +Route25_SeaCottage_EventScript_Computer:: lockall goto_if_set RETURN_AFTER_SS_TICKET, Route25_SeaCottage_EventScript_OpenBillsMonList goto_if_set BILL_IN_TELEPORTER, Route25_SeaCottage_EventScript_RunCellSeparator @@ -164,7 +164,7 @@ Route25_SeaCottage_EventScript_Computer:: @ 81706DD releaseall end -Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA +Route25_SeaCottage_EventScript_RunCellSeparator:: fadeoutbgm 0 msgbox Route25_SeaCottage_Text_InitiatedTeleportersCellSeparator closemessage @@ -217,20 +217,20 @@ Route25_SeaCottage_EventScript_RunCellSeparator:: @ 81706FA releaseall end -Route25_SeaCottage_EventScript_PlayTeleporterBeepSE:: @ 81707B6 +Route25_SeaCottage_EventScript_PlayTeleporterBeepSE:: playse SE_BALL waitse delay 20 return -Route25_SeaCottage_Movement_CameraPanToTeleporters:: @ 81707BE +Route25_SeaCottage_Movement_CameraPanToTeleporters:: walk_up walk_up walk_right walk_right step_end -Route25_SeaCottage_Movement_CameraPanBackFromTeleporters:: @ 81707C3 +Route25_SeaCottage_Movement_CameraPanBackFromTeleporters:: delay_16 delay_16 walk_down @@ -239,12 +239,12 @@ Route25_SeaCottage_Movement_CameraPanBackFromTeleporters:: @ 81707C3 walk_left step_end -Route25_SeaCottage_EventScript_OpenBillsMonList:: @ 81707CA +Route25_SeaCottage_EventScript_OpenBillsMonList:: msgbox Route25_SeaCottage_Text_BillsFavoriteMonList goto Route25_SeaCottage_EventScript_BillsMonList end -Route25_SeaCottage_EventScript_BillsMonList:: @ 81707D8 +Route25_SeaCottage_EventScript_BillsMonList:: message Route25_SeaCottage_Text_SeeWhichMon waitmessage multichoice 0, 0, MULTICHOICE_EEVEELUTIONS, FALSE @@ -257,7 +257,7 @@ Route25_SeaCottage_EventScript_BillsMonList:: @ 81707D8 case 127, Route25_SeaCottage_EventScript_ExitBillsMonList end -Route25_SeaCottage_EventScript_ViewEevee:: @ 817082B +Route25_SeaCottage_EventScript_ViewEevee:: drawmonpic SPECIES_EEVEE, 10, 3 waitbuttonpress erasemonpic @@ -266,7 +266,7 @@ Route25_SeaCottage_EventScript_ViewEevee:: @ 817082B goto Route25_SeaCottage_EventScript_BillsMonList end -Route25_SeaCottage_EventScript_ViewFlareon:: @ 8170840 +Route25_SeaCottage_EventScript_ViewFlareon:: drawmonpic SPECIES_FLAREON, 10, 3 waitbuttonpress erasemonpic @@ -275,7 +275,7 @@ Route25_SeaCottage_EventScript_ViewFlareon:: @ 8170840 goto Route25_SeaCottage_EventScript_BillsMonList end -Route25_SeaCottage_EventScript_ViewJolteon:: @ 8170855 +Route25_SeaCottage_EventScript_ViewJolteon:: drawmonpic SPECIES_JOLTEON, 10, 3 waitbuttonpress erasemonpic @@ -284,7 +284,7 @@ Route25_SeaCottage_EventScript_ViewJolteon:: @ 8170855 goto Route25_SeaCottage_EventScript_BillsMonList end -Route25_SeaCottage_EventScript_ViewVaporeon:: @ 817086A +Route25_SeaCottage_EventScript_ViewVaporeon:: drawmonpic SPECIES_VAPOREON, 10, 3 waitbuttonpress erasemonpic @@ -293,11 +293,11 @@ Route25_SeaCottage_EventScript_ViewVaporeon:: @ 817086A goto Route25_SeaCottage_EventScript_BillsMonList end -Route25_SeaCottage_EventScript_ExitBillsMonList:: @ 817087F +Route25_SeaCottage_EventScript_ExitBillsMonList:: releaseall end -Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom:: @ 8170881 +Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom:: walk_right walk_right walk_right @@ -306,6 +306,6 @@ Route25_SeaCottage_Movement_BillWalkToMiddleOfRoom:: @ 8170881 walk_down step_end -Route25_SeaCottage_Movement_BillExitTeleporter:: @ 8170888 +Route25_SeaCottage_Movement_BillExitTeleporter:: walk_down step_end diff --git a/data/maps/Route25_SeaCottage/text.inc b/data/maps/Route25_SeaCottage/text.inc index 9fd189426..96528afdd 100644 --- a/data/maps/Route25_SeaCottage/text.inc +++ b/data/maps/Route25_SeaCottage/text.inc @@ -1,4 +1,4 @@ -Route25_SeaCottage_Text_ImBillHelpMeOutPal:: @ 819FDFA +Route25_SeaCottage_Text_ImBillHelpMeOutPal:: .string "Hiya! I'm a POKéMON…\n" .string "…No I'm not!\p" .string "Call me BILL!\n" @@ -11,7 +11,7 @@ Route25_SeaCottage_Text_ImBillHelpMeOutPal:: @ 819FDFA .string "So, how about it?\n" .string "Help me out here!$" -Route25_SeaCottage_Text_ImBillHelpMeOutLady:: @ 819FEE6 +Route25_SeaCottage_Text_ImBillHelpMeOutLady:: .string "Hiya! I'm a POKéMON…\n" .string "…No I'm not!\p" .string "Call me BILL!\n" @@ -24,13 +24,13 @@ Route25_SeaCottage_Text_ImBillHelpMeOutLady:: @ 819FEE6 .string "So, how about it?\n" .string "Help me out here!$" -Route25_SeaCottage_Text_RunCellSeparationOnPC:: @ 819FFD3 +Route25_SeaCottage_Text_RunCellSeparationOnPC:: .string "Wait till I get inside the\n" .string "TELEPORTER.\p" .string "When I do, go to my PC and run\n" .string "the Cell Separation System.$" -Route25_SeaCottage_Text_NoPleaseChief:: @ 81A0035 +Route25_SeaCottage_Text_NoPleaseChief:: .string "No!?\n" .string "Now don't be so cold!\p" .string "Come on, you gotta help a guy in\n" @@ -40,7 +40,7 @@ Route25_SeaCottage_Text_NoPleaseChief:: @ 81A0035 .string "Okay?\l" .string "All right!$" -Route25_SeaCottage_Text_NoPleaseBeautiful:: @ 81A00B6 +Route25_SeaCottage_Text_NoPleaseBeautiful:: .string "No!?\n" .string "Now don't be so cold!\p" .string "Come on, you gotta help a guy in\n" @@ -50,7 +50,7 @@ Route25_SeaCottage_Text_NoPleaseBeautiful:: @ 81A00B6 .string "Okay?\l" .string "All right!$" -Route25_SeaCottage_Text_ThanksBudTakeThis:: @ 81A013B +Route25_SeaCottage_Text_ThanksBudTakeThis:: .string "BILL: Yeehah!\n" .string "Thanks, bud! I owe you one!\p" .string "So, did you come to see my\n" @@ -60,7 +60,7 @@ Route25_SeaCottage_Text_ThanksBudTakeThis:: @ 81A013B .string "I've got to thank you…\n" .string "Oh, here, maybe this'll do.$" -Route25_SeaCottage_Text_ThanksLadyTakeThis:: @ 81A01E4 +Route25_SeaCottage_Text_ThanksLadyTakeThis:: .string "BILL: Yeehah!\n" .string "Thanks, lady! I owe you one!\p" .string "So, did you come to see my\n" @@ -70,14 +70,14 @@ Route25_SeaCottage_Text_ThanksLadyTakeThis:: @ 81A01E4 .string "I've got to thank you…\n" .string "Oh, here, maybe this'll do.$" -Route25_SeaCottage_Text_ReceivedSSTicketFromBill:: @ 81A028E +Route25_SeaCottage_Text_ReceivedSSTicketFromBill:: .string "{PLAYER} received an S.S. TICKET\n" .string "from BILL.$" -Route25_SeaCottage_Text_YouveGotTooMuchStuff:: @ 81A02B4 +Route25_SeaCottage_Text_YouveGotTooMuchStuff:: .string "You've got too much stuff!$" -Route25_SeaCottage_Text_SSAnnePartyYouGoInstead:: @ 81A02CF +Route25_SeaCottage_Text_SSAnnePartyYouGoInstead:: .string "That cruise ship S.S. ANNE is in\n" .string "VERMILION CITY.\p" .string "I hear there are lots of TRAINERS\n" @@ -87,22 +87,22 @@ Route25_SeaCottage_Text_SSAnnePartyYouGoInstead:: @ 81A02CF .string "Why don't you go instead of me?\n" .string "Go on and have a good time.$" -Route25_SeaCottage_Text_CheckOutRareMonsOnPC:: @ 81A03AB +Route25_SeaCottage_Text_CheckOutRareMonsOnPC:: .string "BILL: Feel like checking out some\n" .string "of my rare POKéMON on my PC?\p" .string "Go on, check out my PC.$" -Route25_SeaCottage_Text_TeleporterIsDisplayed:: @ 81A0402 +Route25_SeaCottage_Text_TeleporterIsDisplayed:: .string "TELEPORTER is displayed on the PC\n" .string "monitor.$" -Route25_SeaCottage_Text_InitiatedTeleportersCellSeparator:: @ 81A042D +Route25_SeaCottage_Text_InitiatedTeleportersCellSeparator:: .string "{PLAYER} initiated the TELEPORTER's\n" .string "Cell Separator.$" -Route25_SeaCottage_Text_BillsFavoriteMonList:: @ 81A045B +Route25_SeaCottage_Text_BillsFavoriteMonList:: .string "BILL's favorite POKéMON list!$" -Route25_SeaCottage_Text_SeeWhichMon:: @ 81A0479 +Route25_SeaCottage_Text_SeeWhichMon:: .string "Which POKéMON do you want to see?$" diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc index c1a21bc35..e602b4fc0 100644 --- a/data/maps/Route2_EastBuilding/scripts.inc +++ b/data/maps/Route2_EastBuilding/scripts.inc @@ -1,9 +1,9 @@ .equ REQUIRED_SEEN_MONS, 10 -Route2_EastBuilding_MapScripts:: @ 816F67E +Route2_EastBuilding_MapScripts:: .byte 0 -Route2_EastBuilding_EventScript_Aide:: @ 816F67F +Route2_EastBuilding_EventScript_Aide:: lock faceplayer call Route2_EastBuilding_EventScript_GetAideRequestInfo @@ -27,16 +27,16 @@ Route2_EastBuilding_EventScript_Aide:: @ 816F67F release end -Route2_EastBuilding_EventScript_AlreadyGotHM05:: @ 816F701 +Route2_EastBuilding_EventScript_AlreadyGotHM05:: msgbox Route2_EastBuilding_Text_ExplainHM05 release end -Route2_EastBuilding_EventScript_GetAideRequestInfo:: @ 816F70B +Route2_EastBuilding_EventScript_GetAideRequestInfo:: getnumberstring 0, REQUIRED_SEEN_MONS getitemname 1, ITEM_HM05 return -Route2_EastBuilding_EventScript_Rocker:: @ 816F714 +Route2_EastBuilding_EventScript_Rocker:: msgbox Route2_EastBuilding_Text_CanGetThroughRockTunnel, MSGBOX_NPC end diff --git a/data/maps/Route2_EastBuilding/text.inc b/data/maps/Route2_EastBuilding/text.inc index 1de4b8fc7..509dae3c2 100644 --- a/data/maps/Route2_EastBuilding/text.inc +++ b/data/maps/Route2_EastBuilding/text.inc @@ -1,4 +1,4 @@ -Route2_EastBuilding_Text_GiveHM05IfSeen10Mons:: @ 819D64F +Route2_EastBuilding_Text_GiveHM05IfSeen10Mons:: .string "Hi! Remember me?\n" .string "I'm one of PROF. OAK's AIDES.\p" .string "If your POKéDEX has complete data\n" @@ -10,23 +10,23 @@ Route2_EastBuilding_Text_GiveHM05IfSeen10Mons:: @ 819D64F .string "Have you gathered data on at least\n" .string "ten kinds of POKéMON?$" -Route2_EastBuilding_Text_GreatHereYouGo:: @ 819D74E +Route2_EastBuilding_Text_GreatHereYouGo:: .string "Great! You have caught or owned\n" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "Congratulations!\n" .string "Here you go!$" -Route2_EastBuilding_Text_ReceivedHM05FromAide:: @ 819D7A1 +Route2_EastBuilding_Text_ReceivedHM05FromAide:: .string "{PLAYER} received HM05\n" .string "from the AIDE.$" -Route2_EastBuilding_Text_ExplainHM05:: @ 819D7C1 +Route2_EastBuilding_Text_ExplainHM05:: .string "HM05 contains the hidden move\n" .string "FLASH.\p" .string "FLASH lights up even the darkest\n" .string "of caves and dungeons.$" -Route2_EastBuilding_Text_CanGetThroughRockTunnel:: @ 819D81E +Route2_EastBuilding_Text_CanGetThroughRockTunnel:: .string "Once a POKéMON learns FLASH, you\n" .string "can get through ROCK TUNNEL.$" diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc index 6c442958c..9ddb1e292 100644 --- a/data/maps/Route2_House/scripts.inc +++ b/data/maps/Route2_House/scripts.inc @@ -1,11 +1,11 @@ -Route2_House_MapScripts:: @ 816F5F8 +Route2_House_MapScripts:: .byte 0 -Route2_House_EventScript_Scientist:: @ 816F5F9 +Route2_House_EventScript_Scientist:: msgbox Route2_House_Text_FaintedMonsCanUseFieldMoves, MSGBOX_NPC end -Route2_House_EventScript_Reyley:: @ 816F602 +Route2_House_EventScript_Reyley:: lock faceplayer setvar VAR_0x8008, INGAME_TRADE_MR_MIME @@ -26,18 +26,18 @@ Route2_House_EventScript_Reyley:: @ 816F602 release end -Route2_House_EventScript_DeclineTrade:: @ 816F65C +Route2_House_EventScript_DeclineTrade:: msgbox Trade_Text_AwwOhWell release end -Route2_House_EventScript_NotRequestedMon:: @ 816F666 +Route2_House_EventScript_NotRequestedMon:: getspeciesname 0, VAR_0x8009 msgbox Trade_Text_WhatThatsNoMon release end -Route2_House_EventScript_AlreadyTraded:: @ 816F674 +Route2_House_EventScript_AlreadyTraded:: msgbox Trade_Text_IsntMyOldMonGreat release end diff --git a/data/maps/Route2_House/text.inc b/data/maps/Route2_House/text.inc index 76267c113..c7084903a 100644 --- a/data/maps/Route2_House/text.inc +++ b/data/maps/Route2_House/text.inc @@ -1,4 +1,4 @@ -Route2_House_Text_FaintedMonsCanUseFieldMoves:: @ 819D5E7 +Route2_House_Text_FaintedMonsCanUseFieldMoves:: .string "A fainted POKéMON just has no\n" .string "energy left to battle.\p" .string "It can still use moves like CUT\n" diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc index 756cf31d9..979e4bea9 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc @@ -1,14 +1,14 @@ -Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D +Route2_ViridianForest_NorthEntrance_MapScripts:: .byte 0 -Route2_ViridianForest_NorthEntrance_EventScript_Youngster:: @ 816F71E +Route2_ViridianForest_NorthEntrance_EventScript_Youngster:: msgbox Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests, MSGBOX_NPC end -Route2_ViridianForest_NorthEntrance_EventScript_OldMan:: @ 816F727 +Route2_ViridianForest_NorthEntrance_EventScript_OldMan:: msgbox Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees, MSGBOX_NPC end -Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF:: @ 816F730 +Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF:: msgbox Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution, MSGBOX_NPC end diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/text.inc b/data/maps/Route2_ViridianForest_NorthEntrance/text.inc index 9fec461a8..a07d27306 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/text.inc +++ b/data/maps/Route2_ViridianForest_NorthEntrance/text.inc @@ -1,16 +1,16 @@ -Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests:: @ 819D85C +Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests:: .string "Many POKéMON live only in forests \n" .string "and caves.\p" .string "You need to be persistent and look\n" .string "everywhere to get different kinds.$" -Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees:: @ 819D8D0 +Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees:: .string "Have you noticed the skinny trees\n" .string "on the roadside?\p" .string "They can be cut down by a special\n" .string "POKéMON move, I hear.$" -Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution:: @ 819D93B +Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution:: .string "Do you know the evolution-cancel\n" .string "technique?\p" .string "When a POKéMON is evolving, you\n" diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc index 2a60a3772..14480c59c 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc @@ -1,10 +1,10 @@ -Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5 +Route2_ViridianForest_SouthEntrance_MapScripts:: .byte 0 -Route2_ViridianForest_SouthEntrance_EventScript_Woman1:: @ 816F5E6 +Route2_ViridianForest_SouthEntrance_EventScript_Woman1:: msgbox Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze, MSGBOX_NPC end -Route2_ViridianForest_SouthEntrance_EventScript_Woman2:: @ 816F5EF +Route2_ViridianForest_SouthEntrance_EventScript_Woman2:: msgbox Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite, MSGBOX_NPC end diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/text.inc b/data/maps/Route2_ViridianForest_SouthEntrance/text.inc index 20e25429f..3e7581602 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/text.inc +++ b/data/maps/Route2_ViridianForest_SouthEntrance/text.inc @@ -1,9 +1,9 @@ -Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze:: @ 819D52C +Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze:: .string "Are you going to VIRIDIAN FOREST?\n" .string "It's a natural maze in there.\l" .string "Be careful you don't get lost.$" -Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite:: @ 819D58B +Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite:: .string "RATTATA may be small, but don't\n" .string "underestimate its wicked bite.\p" .string "Have you caught one already?$" diff --git a/data/maps/Route3/scripts.inc b/data/maps/Route3/scripts.inc index c8e3c1a58..09225d327 100644 --- a/data/maps/Route3/scripts.inc +++ b/data/maps/Route3/scripts.inc @@ -1,10 +1,10 @@ -Route3_MapScripts:: @ 8167F77 +Route3_MapScripts:: .byte 0 -Route3_EventScript_Youngster:: @ 8167F78 +Route3_EventScript_Youngster:: msgbox Route3_Text_TunnelFromCeruleanTiring, MSGBOX_NPC end -Route3_EventScript_RouteSign:: @ 8167F81 +Route3_EventScript_RouteSign:: msgbox Route3_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route3/text.inc b/data/maps/Route3/text.inc index 6e5ad9c69..a144e5d63 100644 --- a/data/maps/Route3/text.inc +++ b/data/maps/Route3/text.inc @@ -1,104 +1,104 @@ -Route3_Text_TunnelFromCeruleanTiring:: @ 8183491 +Route3_Text_TunnelFromCeruleanTiring:: .string "Whew… I better take a rest…\n" .string "Groan…\p" .string "That tunnel from CERULEAN takes a\n" .string "lot out of you!$" -Route3_Text_ColtonIntro:: @ 81834E6 +Route3_Text_ColtonIntro:: .string "Hey!\n" .string "I saw you in VIRIDIAN FOREST!$" -Route3_Text_ColtonDefeat:: @ 8183509 +Route3_Text_ColtonDefeat:: .string "You beat me again!$" -Route3_Text_ColtonPostBattle:: @ 818351C +Route3_Text_ColtonPostBattle:: .string "There are other kinds of POKéMON\n" .string "than the ones you find in forests.$" -Route3_Text_BenIntro:: @ 8183560 +Route3_Text_BenIntro:: .string "Hi!\n" .string "I like shorts!\p" .string "They're delightfully comfy and\n" .string "easy to wear!$" -Route3_Text_BenDefeat:: @ 81835A0 +Route3_Text_BenDefeat:: .string "I don't believe it!$" -Route3_Text_BenPostBattle:: @ 81835B4 +Route3_Text_BenPostBattle:: .string "Are you using a POKéMON CENTER's\n" .string "PC for storing your POKéMON?\p" .string "Each BOX can hold up to\n" .string "30 POKéMON.$" -Route3_Text_JaniceIntro:: @ 8183616 +Route3_Text_JaniceIntro:: .string "Excuse me!\n" .string "You looked at me, didn't you?$" -Route3_Text_JaniceDefeat:: @ 818363F +Route3_Text_JaniceDefeat:: .string "You're mean!$" -Route3_Text_JanicePostBattle:: @ 818364C +Route3_Text_JanicePostBattle:: .string "You shouldn't be staring if you\n" .string "don't want to battle!$" -Route3_Text_GregIntro:: @ 8183682 +Route3_Text_GregIntro:: .string "Are you a TRAINER?\n" .string "Let's get with it right away!$" -Route3_Text_GregDefeat:: @ 81836B3 +Route3_Text_GregDefeat:: .string "If I had new POKéMON, I would've\n" .string "won!$" -Route3_Text_GregPostBattle:: @ 81836D9 +Route3_Text_GregPostBattle:: .string "If a POKéMON BOX on the PC gets\n" .string "full, just switch to another BOX.$" -Route3_Text_SallyIntro:: @ 818371B +Route3_Text_SallyIntro:: .string "That look you gave me…\n" .string "It's so intriguing!$" -Route3_Text_SallyDefeat:: @ 8183746 +Route3_Text_SallyDefeat:: .string "Be nice!$" -Route3_Text_SallyPostBattle:: @ 818374F +Route3_Text_SallyPostBattle:: .string "You can avoid battles by not\n" .string "letting TRAINERS see you.$" -Route3_Text_CalvinIntro:: @ 8183786 +Route3_Text_CalvinIntro:: .string "Hey! You're not wearing shorts!\n" .string "What's wrong with you?$" -Route3_Text_CalvinDefeat:: @ 81837BD +Route3_Text_CalvinDefeat:: .string "Lost!\n" .string "Lost! Lost!$" -Route3_Text_CalvinPostBattle:: @ 81837CF +Route3_Text_CalvinPostBattle:: .string "I always wear shorts, even in\n" .string "winter. That's my policy.$" -Route3_Text_JamesIntro:: @ 8183807 +Route3_Text_JamesIntro:: .string "I'll battle you with the POKéMON\n" .string "I just caught.$" -Route3_Text_JamesDefeat:: @ 8183837 +Route3_Text_JamesDefeat:: .string "Done like dinner!$" -Route3_Text_JamesPostBattle:: @ 8183849 +Route3_Text_JamesPostBattle:: .string "Trained POKéMON are stronger than\n" .string "the wild ones.$" -Route3_Text_RobinIntro:: @ 818387A +Route3_Text_RobinIntro:: .string "Eek!\n" .string "Did you touch me?$" -Route3_Text_RobinDefeat:: @ 8183891 +Route3_Text_RobinDefeat:: .string "That's it?$" -Route3_Text_RobinPostBattle:: @ 818389C +Route3_Text_RobinPostBattle:: .string "ROUTE 4 is at the foot of\n" .string "MT. MOON.$" -Route3_Text_RouteSign:: @ 81838C0 +Route3_Text_RouteSign:: .string "ROUTE 3\n" .string "MT. MOON AHEAD$" diff --git a/data/maps/Route4/scripts.inc b/data/maps/Route4/scripts.inc index c6c7e6bbd..abdea4e25 100644 --- a/data/maps/Route4/scripts.inc +++ b/data/maps/Route4/scripts.inc @@ -1,17 +1,17 @@ -Route4_MapScripts:: @ 8167F8A +Route4_MapScripts:: .byte 0 -Route4_EventScript_Unused:: @ 8167F8B +Route4_EventScript_Unused:: end -Route4_EventScript_Woman:: @ 8167F8C +Route4_EventScript_Woman:: msgbox Route4_Text_TrippedOverGeodude, MSGBOX_NPC end -Route4_EventScript_MtMoonSign:: @ 8167F95 +Route4_EventScript_MtMoonSign:: msgbox Route4_Text_MtMoonEntrance, MSGBOX_SIGN end -Route4_EventScript_RouteSign:: @ 8167F9E +Route4_EventScript_RouteSign:: msgbox Route4_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route4/text.inc b/data/maps/Route4/text.inc index a6bd24787..37d59604a 100644 --- a/data/maps/Route4/text.inc +++ b/data/maps/Route4/text.inc @@ -1,28 +1,28 @@ -Route4_Text_TrippedOverGeodude:: @ 81838D7 +Route4_Text_TrippedOverGeodude:: .string "Ouch! I tripped over a rocky\n" .string "POKéMON, GEODUDE!$" -Route4_Text_CrissyIntro:: @ 8183906 +Route4_Text_CrissyIntro:: .string "I came to MT. MOON in search of\n" .string "mushroom POKéMON.$" -Route4_Text_CrissyDefeat:: @ 8183938 +Route4_Text_CrissyDefeat:: .string "After all I did to catch them!$" -Route4_Text_CrissyPostBattle:: @ 8183957 +Route4_Text_CrissyPostBattle:: .string "There might not be any more\n" .string "mushrooms here.\p" .string "I think I got them all.$" -Route4_Text_MtMoonEntrance:: @ 818399B +Route4_Text_MtMoonEntrance:: .string "MT. MOON\n" .string "Tunnel Entrance$" -Route4_Text_RouteSign:: @ 81839B4 +Route4_Text_RouteSign:: .string "ROUTE 4\n" .string "MT. MOON - CERULEAN CITY$" -Text_MegaPunchTeach:: @ 81839D5 +Text_MegaPunchTeach:: .string "A punch of roaring ferocity!\p" .string "Packed with destructive power!\p" .string "When the chips are down,\n" @@ -31,22 +31,22 @@ Text_MegaPunchTeach:: @ 81839D5 .string "Now!\n" .string "Let me teach it to your POKéMON!$" -Text_MegaPunchDeclined:: @ 8183A83 +Text_MegaPunchDeclined:: .string "You'll be back when you understand\n" .string "the worth of MEGA PUNCH.$" -Text_MegaPunchWhichMon:: @ 8183ABF +Text_MegaPunchWhichMon:: .string "Fine!\n" .string "Which POKéMON will learn it?$" -Text_MegaPunchTaught:: @ 8183AE2 +Text_MegaPunchTaught:: .string "Now, we are comrades in the way of\n" .string "punching!\p" .string "You should go before you're seen\n" .string "by the misguided fool who trains\l" .string "only his silly kicking over there.$" -Text_MegaKickTeach:: @ 8183B74 +Text_MegaKickTeach:: .string "A kick of brutal ferocity!\p" .string "Packed with destructive power!\p" .string "When you get right down to it,\n" @@ -55,22 +55,22 @@ Text_MegaKickTeach:: @ 8183B74 .string "Okay!\n" .string "I'll teach it to your POKéMON!$" -Text_MegaKickDeclined:: @ 8183C25 +Text_MegaKickDeclined:: .string "You'll come crawling back when you\n" .string "realize the value of MEGA KICK.$" -Text_MegaKickWhichMon:: @ 8183C68 +Text_MegaKickWhichMon:: .string "All right!\n" .string "Which POKéMON wants to learn it?$" -Text_MegaKickTaught:: @ 8183C94 +Text_MegaKickTaught:: .string "Now, we are soul mates in the way\n" .string "of kicking!\p" .string "You should run before you're seen\n" .string "by the deluded nitwit who trains\l" .string "only simple punching over there.$" -Route4_Text_PeopleLikeAndRespectBrock:: @ 8183D26 +Route4_Text_PeopleLikeAndRespectBrock:: .string "Oh, wow, that's the BOULDERBADGE!\n" .string "You got it from BROCK, didn't you?\p" .string "BROCK is cool. He's not just tough.\n" diff --git a/data/maps/Route4_PokemonCenter_1F/scripts.inc b/data/maps/Route4_PokemonCenter_1F/scripts.inc index d09fd1b3b..0f32e6f43 100644 --- a/data/maps/Route4_PokemonCenter_1F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_1F/scripts.inc @@ -1,26 +1,26 @@ .equ MAGIKARP_PRICE, 500 -Route4_PokemonCenter_1F_MapScripts:: @ 816F739 +Route4_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, Route4_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -Route4_PokemonCenter_1F_OnTransition:: @ 816F744 +Route4_PokemonCenter_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_ROUTE4_POKEMON_CENTER_1F setrespawn SPAWN_ROUTE4 end -Route4_PokemonCenter_1F_EventScript_Boy:: @ 816F74B +Route4_PokemonCenter_1F_EventScript_Boy:: msgbox Route4_PokemonCenter_1F_Text_CanHaveSixMonsWithYou, MSGBOX_NPC end -Route4_PokemonCenter_1F_EventScript_Gentleman:: @ 816F754 +Route4_PokemonCenter_1F_EventScript_Gentleman:: lock msgbox Route4_PokemonCenter_1F_Text_TeamRocketAttacksCerulean release end -Route4_PokemonCenter_1F_EventScript_MagikarpSalesman:: @ 816F75F +Route4_PokemonCenter_1F_EventScript_MagikarpSalesman:: lock faceplayer goto_if_set FLAG_BOUGHT_MAGIKARP, Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp @@ -32,17 +32,17 @@ Route4_PokemonCenter_1F_EventScript_MagikarpSalesman:: @ 816F75F goto_if_eq Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale end -Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale:: @ 816F786 +Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpMale:: msgbox Route4_PokemonCenter_1F_Text_LaddieBuyMagikarpForJust500, MSGBOX_YESNO goto Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp end -Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale:: @ 816F794 +Route4_PokemonCenter_1F_EventScript_AskBuyMagikarpFemale:: msgbox Route4_PokemonCenter_1F_Text_SweetieBuyMagikarpForJust500, MSGBOX_YESNO goto Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp end -Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp:: @ 816F7A2 +Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp:: compare VAR_RESULT, NO goto_if_eq Route4_PokemonCenter_1F_EventScript_DeclineMagikarp checkmoney MAGIKARP_PRICE, 0 @@ -59,7 +59,7 @@ Route4_PokemonCenter_1F_EventScript_TryBuyMagikarp:: @ 816F7A2 goto_if_eq Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp end -Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty:: @ 816F7F6 +Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty:: call Route4_PokemonCenter_1F_EventScript_PayForMagikarp msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO @@ -72,7 +72,7 @@ Route4_PokemonCenter_1F_EventScript_BuyMagikarpParty:: @ 816F7F6 goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC:: @ 816F822 +Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC:: call Route4_PokemonCenter_1F_EventScript_PayForMagikarp msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO compare VAR_RESULT, NO @@ -86,27 +86,27 @@ Route4_PokemonCenter_1F_EventScript_BuyMagikarpPC:: @ 816F822 goto Route4_PokemonCenter_1F_EventScript_TransferMagikarp end -Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox:: @ 816F84B +Route4_PokemonCenter_1F_EventScript_TransferMagikarpCloseMoneyBox:: call EventScript_TransferredToPC goto Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp end -Route4_PokemonCenter_1F_EventScript_TransferMagikarp:: @ 816F856 +Route4_PokemonCenter_1F_EventScript_TransferMagikarp:: call EventScript_TransferredToPC goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp:: @ 816F861 +Route4_PokemonCenter_1F_EventScript_EndPurchaseMagikarp:: hidemoneybox 0, 0 goto Route4_PokemonCenter_1F_EventScript_BoughtMagikarp end -Route4_PokemonCenter_1F_EventScript_BoughtMagikarp:: @ 816F86A +Route4_PokemonCenter_1F_EventScript_BoughtMagikarp:: setflag FLAG_BOUGHT_MAGIKARP release end -Route4_PokemonCenter_1F_EventScript_PayForMagikarp:: @ 816F86F +Route4_PokemonCenter_1F_EventScript_PayForMagikarp:: removemoney MAGIKARP_PRICE, 0 updatemoneybox 0, 0, 0 playfanfare MUS_LEVEL_UP @@ -116,42 +116,42 @@ Route4_PokemonCenter_1F_EventScript_PayForMagikarp:: @ 816F86F getspeciesname 0, SPECIES_MAGIKARP return -Route4_PokemonCenter_1F_EventScript_DeclineMagikarp:: @ 816F888 +Route4_PokemonCenter_1F_EventScript_DeclineMagikarp:: msgbox Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou hidemoneybox 0, 0 release end -Route4_PokemonCenter_1F_EventScript_NotEnoughMoney:: @ 816F895 +Route4_PokemonCenter_1F_EventScript_NotEnoughMoney:: msgbox Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney hidemoneybox 0, 0 release end -Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp:: @ 816F8A2 +Route4_PokemonCenter_1F_EventScript_AlreadyBoughtMagikarp:: msgbox Route4_PokemonCenter_1F_Text_IDontGiveRefunds release end -Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp:: @ 816F8AC +Route4_PokemonCenter_1F_EventScript_NoRoomForMagikarp:: textcolor 0 msgbox Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon hidemoneybox 0, 0 release end -Route4_PokemonCenter_1F_EventScript_Nurse:: @ 816F8BB +Route4_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -Route4_PokemonCenter_1F_EventScript_Youngster:: @ 816F8C4 +Route4_PokemonCenter_1F_EventScript_Youngster:: msgbox Route4_PokemonCenter_1F_Text_ShouldStoreMonsUsingPC, MSGBOX_NPC end -Route4_PokemonCenter_1F_EventScript_Newspaper:: @ 816F8CD +Route4_PokemonCenter_1F_EventScript_Newspaper:: lock msgbox Route4_PokemonCenter_1F_Text_ItsANewspaper release diff --git a/data/maps/Route4_PokemonCenter_1F/text.inc b/data/maps/Route4_PokemonCenter_1F/text.inc index df65ae33a..b53968394 100644 --- a/data/maps/Route4_PokemonCenter_1F/text.inc +++ b/data/maps/Route4_PokemonCenter_1F/text.inc @@ -1,54 +1,54 @@ -Route4_PokemonCenter_1F_Text_CanHaveSixMonsWithYou:: @ 819D9D4 +Route4_PokemonCenter_1F_Text_CanHaveSixMonsWithYou:: .string "Okay, set six POKé BALLS in my\n" .string "belt…\p" .string "Yeah, that'll do it. At most, you\n" .string "can have six POKéMON with you.$" -Route4_PokemonCenter_1F_Text_TeamRocketAttacksCerulean:: @ 819DA3A +Route4_PokemonCenter_1F_Text_TeamRocketAttacksCerulean:: .string "TEAM ROCKET attacks CERULEAN\n" .string "citizens…\p" .string "Not a day goes by without TEAM\n" .string "ROCKET being in the news.$" -Route4_PokemonCenter_1F_Text_LaddieBuyMagikarpForJust500:: @ 819DA9A +Route4_PokemonCenter_1F_Text_LaddieBuyMagikarpForJust500:: .string "MAN: Hello there, laddie!\n" .string "Have I got a deal just for you!\p" .string "I'll let you have a secret POKéMON\n" .string "- a MAGIKARP - for just ¥500!\p" .string "So, you'll buy it, am I right?$" -Route4_PokemonCenter_1F_Text_SweetieBuyMagikarpForJust500:: @ 819DB34 +Route4_PokemonCenter_1F_Text_SweetieBuyMagikarpForJust500:: .string "MAN: Hello there, sweetie pie!\n" .string "Have I got a deal just for you!\p" .string "I'll let you have a secret POKéMON\n" .string "- a MAGIKARP - for just ¥500!\p" .string "So, you'll buy it, am I right?$" -Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp:: @ 819DBD3 +Route4_PokemonCenter_1F_Text_PaidOutrageouslyForMagikarp:: .string "{PLAYER} paid an outrageous ¥500\n" .string "and bought the MAGIKARP…$" -Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou:: @ 819DC07 +Route4_PokemonCenter_1F_Text_OnlyDoingThisAsFavorToYou:: .string "No? You say no? I'm only doing this\n" .string "as a favor to you!$" -Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon:: @ 819DC3E +Route4_PokemonCenter_1F_Text_NoRoomForMorePokemon:: .string "There's no more room for any more\n" .string "POKéMON, it looks like.$" -Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney:: @ 819DC78 +Route4_PokemonCenter_1F_Text_YoullNeedMoreMoney:: .string "You'll need more money than that!$" -Route4_PokemonCenter_1F_Text_IDontGiveRefunds:: @ 819DC9A +Route4_PokemonCenter_1F_Text_IDontGiveRefunds:: .string "MAN: Well, I don't give refunds.\n" .string "You knew what you were getting!$" -Route4_PokemonCenter_1F_Text_ShouldStoreMonsUsingPC:: @ 819DCDB +Route4_PokemonCenter_1F_Text_ShouldStoreMonsUsingPC:: .string "Sometimes, you'll have too many\n" .string "POKéMON with you to add any more.\p" .string "In that case, you should just\n" .string "store some using any PC.$" -Route4_PokemonCenter_1F_Text_ItsANewspaper:: @ 819DD54 +Route4_PokemonCenter_1F_Text_ItsANewspaper:: .string "It's a newspaper.$" diff --git a/data/maps/Route4_PokemonCenter_2F/scripts.inc b/data/maps/Route4_PokemonCenter_2F/scripts.inc index 32b1905a4..83a70af11 100644 --- a/data/maps/Route4_PokemonCenter_2F/scripts.inc +++ b/data/maps/Route4_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 +Route4_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ Route4_PokemonCenter_2F_MapScripts:: @ 816F8D8 .byte 0 @ The below 3 are unused and leftover from RS -Route4_PokemonCenter_2F_EventScript_Colosseum:: @ 816F8ED +Route4_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -Route4_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F8F3 +Route4_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -Route4_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F8F9 +Route4_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/Route5/scripts.inc b/data/maps/Route5/scripts.inc index cc5b0d1d2..b755e2ac9 100644 --- a/data/maps/Route5/scripts.inc +++ b/data/maps/Route5/scripts.inc @@ -1,6 +1,6 @@ -Route5_MapScripts:: @ 8167FA7 +Route5_MapScripts:: .byte 0 -Route5_EventScript_UndergroundPathSign:: @ 8167FA8 +Route5_EventScript_UndergroundPathSign:: msgbox Route5_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route5/text.inc b/data/maps/Route5/text.inc index 1aab5cc6b..b28423d29 100644 --- a/data/maps/Route5/text.inc +++ b/data/maps/Route5/text.inc @@ -1,4 +1,4 @@ -Route5_Text_UndergroundPathSign:: @ 8183DD4 +Route5_Text_UndergroundPathSign:: .string "UNDERGROUND PATH\n" .string "CERULEAN CITY - VERMILION CITY$" diff --git a/data/maps/Route5_PokemonDayCare/scripts.inc b/data/maps/Route5_PokemonDayCare/scripts.inc index 0f2ceb484..4183ea2dc 100644 --- a/data/maps/Route5_PokemonDayCare/scripts.inc +++ b/data/maps/Route5_PokemonDayCare/scripts.inc @@ -1,4 +1,4 @@ @ Handled by data/scripts/day_care.inc -Route5_PokemonDayCare_MapScripts:: @ 816F8FF +Route5_PokemonDayCare_MapScripts:: .byte 0 diff --git a/data/maps/Route5_PokemonDayCare/text.inc b/data/maps/Route5_PokemonDayCare/text.inc index 2176583a1..00dc2fe51 100644 --- a/data/maps/Route5_PokemonDayCare/text.inc +++ b/data/maps/Route5_PokemonDayCare/text.inc @@ -1,68 +1,68 @@ -Route5_PokemonDayCare_Text_WantMeToRaiseMon:: @ 819DD66 +Route5_PokemonDayCare_Text_WantMeToRaiseMon:: .string "I run the DAY-CARE service.\p" .string "Would you like me to raise one of\n" .string "your POKéMON?$" -Route5_PokemonDayCare_Text_ComeAgain:: @ 819DDB2 +Route5_PokemonDayCare_Text_ComeAgain:: .string "Come again.$" -Route5_PokemonDayCare_Text_WhichMonShouldIRaise:: @ 819DDBE +Route5_PokemonDayCare_Text_WhichMonShouldIRaise:: .string "Which POKéMON should I raise?$" -Route5_PokemonDayCare_Text_ComeAnytimeYouLike:: @ 819DDDC +Route5_PokemonDayCare_Text_ComeAnytimeYouLike:: .string "Fine.\n" .string "Come anytime you like.$" -Route5_PokemonDayCare_Text_LookAfterMonForAWhile:: @ 819DDF9 +Route5_PokemonDayCare_Text_LookAfterMonForAWhile:: .string "Fine, I'll look after your\n" .string "{STR_VAR_1} for a while.$" -Route5_PokemonDayCare_Text_ComeSeeMeInAWhile:: @ 819DE24 +Route5_PokemonDayCare_Text_ComeSeeMeInAWhile:: .string "Come see me in a while.$" -Route5_PokemonDayCare_Text_MonNeedsToSpendMoreTime:: @ 819DE3C +Route5_PokemonDayCare_Text_MonNeedsToSpendMoreTime:: .string "You're back already?\p" .string "Your {STR_VAR_1} needs to spend\n" .string "some more time with me.$" -Route5_PokemonDayCare_Text_OweMeXForMonsReturn:: @ 819DE80 +Route5_PokemonDayCare_Text_OweMeXForMonsReturn:: .string "You owe me ¥{STR_VAR_2} for the return\n" .string "of this POKéMON.$" -Route5_PokemonDayCare_Text_ThankYouHeresMon:: @ 819DEAF +Route5_PokemonDayCare_Text_ThankYouHeresMon:: .string "Thank you!\n" .string "Here's your POKéMON.$" -Route5_PokemonDayCare_Text_PlayerGotMonBack:: @ 819DECF +Route5_PokemonDayCare_Text_PlayerGotMonBack:: .string "{PLAYER} got {STR_VAR_1} back\n" .string "from the DAY-CARE MAN.$" -Route5_PokemonDayCare_Text_OnlyHaveOneMonWithYou:: @ 819DEF5 +Route5_PokemonDayCare_Text_OnlyHaveOneMonWithYou:: .string "Oh? You only have one POKéMON\n" .string "with you.$" -Route5_PokemonDayCare_Text_WhatWillYouBattleWith:: @ 819DF1D +Route5_PokemonDayCare_Text_WhatWillYouBattleWith:: .string "If you leave me that POKéMON,\n" .string "what will you battle with?$" -Route5_PokemonDayCare_Text_MonHasGrownByXLevels:: @ 819DF56 +Route5_PokemonDayCare_Text_MonHasGrownByXLevels:: .string "Your {STR_VAR_1} has grown a lot.\n" .string "Yes, quite a lot, I'd say.\p" .string "Let me see…\n" .string "By level, it's grown by {STR_VAR_2}.\p" .string "Aren't I great?$" -Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2 +Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: .string "You can't take this POKéMON back\n" .string "if you've got no room for it.$" -Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001 +Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: .string "You don't have enough money.$" -Route5_PokemonDayCare_Text_WantMeToTakeALookAtYours:: @ 819E01E +Route5_PokemonDayCare_Text_WantMeToTakeALookAtYours:: .string "きみの\n" .string "みてみるかね？$" -Route5_PokemonDayCare_Text_CantAcceptMonWithHM:: @ 819E02A +Route5_PokemonDayCare_Text_CantAcceptMonWithHM:: .string "わるいけど　ひでんのわざを　もった\n" .string "ポケモンは　あずかれないなぁ$" diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc index b06a2aa2c..f9a914e26 100644 --- a/data/maps/Route5_SouthEntrance/scripts.inc +++ b/data/maps/Route5_SouthEntrance/scripts.inc @@ -1,29 +1,29 @@ -Route5_SouthEntrance_MapScripts:: @ 816F900 +Route5_SouthEntrance_MapScripts:: .byte 0 -Route5_SouthEntrance_EventScript_Guard:: @ 816F901 +Route5_SouthEntrance_EventScript_Guard:: msgbox Route5_SouthEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route5_SouthEntrance_EventScript_GuardTriggerLeft:: @ 816F90A +Route5_SouthEntrance_EventScript_GuardTriggerLeft:: lockall setvar VAR_TEMP_1, 0 goto Route5_SouthEntrance_EventScript_GuardTrigger end -Route5_SouthEntrance_EventScript_GuardTriggerMid:: @ 816F916 +Route5_SouthEntrance_EventScript_GuardTriggerMid:: lockall setvar VAR_TEMP_1, 1 goto Route5_SouthEntrance_EventScript_GuardTrigger end -Route5_SouthEntrance_EventScript_GuardTriggerRight:: @ 816F922 +Route5_SouthEntrance_EventScript_GuardTriggerRight:: lockall setvar VAR_TEMP_1, 2 goto Route5_SouthEntrance_EventScript_GuardTrigger end -Route5_SouthEntrance_EventScript_GuardTrigger:: @ 816F92E +Route5_SouthEntrance_EventScript_GuardTrigger:: textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 @@ -35,12 +35,12 @@ Route5_SouthEntrance_EventScript_GuardTrigger:: @ 816F92E releaseall end -Route5_SouthEntrance_EventScript_GiveTea:: @ 816F958 +Route5_SouthEntrance_EventScript_GiveTea:: removeitem ITEM_TEA, 1 goto Route5_SouthEntrance_EventScript_GuardDrinkTea end -Route5_SouthEntrance_EventScript_GuardDrinkTea:: @ 816F963 +Route5_SouthEntrance_EventScript_GuardDrinkTea:: msgbox Route5_SouthEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 @@ -54,34 +54,34 @@ Route5_SouthEntrance_EventScript_GuardDrinkTea:: @ 816F963 releaseall end -Route5_SouthEntrance_EventScript_WalkToGuardLeft:: @ 816F99C +Route5_SouthEntrance_EventScript_WalkToGuardLeft:: applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardLeft waitmovement 0 return -Route5_SouthEntrance_EventScript_WalkToGuardMid:: @ 816F9A7 +Route5_SouthEntrance_EventScript_WalkToGuardMid:: applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardMid waitmovement 0 return -Route5_SouthEntrance_EventScript_WalkToGuardRight:: @ 816F9B2 +Route5_SouthEntrance_EventScript_WalkToGuardRight:: applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardRight waitmovement 0 return -Route5_SouthEntrance_Movement_WalkToGuardMid:: @ 816F9BD +Route5_SouthEntrance_Movement_WalkToGuardMid:: walk_left step_end -Route5_SouthEntrance_Movement_WalkToGuardRight:: @ 816F9BF +Route5_SouthEntrance_Movement_WalkToGuardRight:: walk_left walk_left step_end -Route5_SouthEntrance_Movement_WalkToGuardLeft:: @ 816F9C2 +Route5_SouthEntrance_Movement_WalkToGuardLeft:: walk_in_place_left step_end -Route5_SouthEntrance_Movement_BlockPlayerEntry:: @ 816F9C4 +Route5_SouthEntrance_Movement_BlockPlayerEntry:: walk_up step_end diff --git a/data/maps/Route5_SouthEntrance/text.inc b/data/maps/Route5_SouthEntrance/text.inc index 2b740e141..941b17129 100644 --- a/data/maps/Route5_SouthEntrance/text.inc +++ b/data/maps/Route5_SouthEntrance/text.inc @@ -1,13 +1,13 @@ -Route5_SouthEntrance_Text_ThirstyOnGuardDuty:: @ 819E04B +Route5_SouthEntrance_Text_ThirstyOnGuardDuty:: .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -Route5_SouthEntrance_Text_ThatTeaLooksTasty:: @ 819E09B +Route5_SouthEntrance_Text_ThatTeaLooksTasty:: .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E0C1 +Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards:: .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E0C1 .string "I'll share this TEA with the other\n" .string "guards!$" -Route5_SouthEntrance_Text_HiHowsItGoing:: @ 819E16D +Route5_SouthEntrance_Text_HiHowsItGoing:: .string "Hi, how's it going?$" diff --git a/data/maps/Route6/scripts.inc b/data/maps/Route6/scripts.inc index 575c05fe6..2ff51ddf4 100644 --- a/data/maps/Route6/scripts.inc +++ b/data/maps/Route6/scripts.inc @@ -1,6 +1,6 @@ -Route6_MapScripts:: @ 8167FB1 +Route6_MapScripts:: .byte 0 -Route6_EventScript_UndergroundPathSign:: @ 8167FB2 +Route6_EventScript_UndergroundPathSign:: msgbox Route6_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route6/text.inc b/data/maps/Route6/text.inc index 0242ceee8..5566cbaae 100644 --- a/data/maps/Route6/text.inc +++ b/data/maps/Route6/text.inc @@ -1,73 +1,73 @@ -Route6_Text_RickyIntro:: @ 8183E04 +Route6_Text_RickyIntro:: .string "Who's there?\n" .string "Quit listening in on us!$" -Route6_Text_RickyDefeat:: @ 8183E2A +Route6_Text_RickyDefeat:: .string "I just can't win!$" -Route6_Text_RickyPostBattle:: @ 8183E3C +Route6_Text_RickyPostBattle:: .string "Whisper…\n" .string "Whisper…$" -Route6_Text_NancyIntro:: @ 8183E4E +Route6_Text_NancyIntro:: .string "Excuse me!\n" .string "This is a private conversation!$" -Route6_Text_NancyDefeat:: @ 8183E79 +Route6_Text_NancyDefeat:: .string "Ugh!\n" .string "I hate losing.$" -Route6_Text_NancyPostBattle:: @ 8183E8D +Route6_Text_NancyPostBattle:: .string "Whisper…\n" .string "Whisper…$" -Route6_Text_KeigoIntro:: @ 8183E9F +Route6_Text_KeigoIntro:: .string "There aren't many bugs out here.$" -Route6_Text_KeigoDefeat:: @ 8183EC0 +Route6_Text_KeigoDefeat:: .string "No!\n" .string "You're kidding!$" -Route6_Text_KeigoPostBattle:: @ 8183ED4 +Route6_Text_KeigoPostBattle:: .string "I like bugs, so I'm going back to\n" .string "VIRIDIAN FOREST.$" -Route6_Text_JeffIntro:: @ 8183F07 +Route6_Text_JeffIntro:: .string "Huh?\n" .string "You want to talk to me?$" -Route6_Text_JeffDefeat:: @ 8183F24 +Route6_Text_JeffDefeat:: .string "This stinks…\n" .string "I couldn't beat your challenge…$" -Route6_Text_JeffPostBattle:: @ 8183F51 +Route6_Text_JeffPostBattle:: .string "I should bring more POKéMON with\n" .string "me. I'll feel safer that way.$" -Route6_Text_IsabelleIntro:: @ 8183F90 +Route6_Text_IsabelleIntro:: .string "Me?\n" .string "Well, okay. I'll play!$" -Route6_Text_IsabelleDefeat:: @ 8183FAB +Route6_Text_IsabelleDefeat:: .string "Things just didn't work…$" -Route6_Text_IsabellePostBattle:: @ 8183FC4 +Route6_Text_IsabellePostBattle:: .string "I want to get stronger.\n" .string "What's your secret?$" -Route6_Text_ElijahIntro:: @ 8183FF0 +Route6_Text_ElijahIntro:: .string "I've never seen you around.\n" .string "Are you good?$" -Route6_Text_ElijahDefeat:: @ 818401A +Route6_Text_ElijahDefeat:: .string "You're too good!$" -Route6_Text_ElijahPostBattle:: @ 818402B +Route6_Text_ElijahPostBattle:: .string "Are my POKéMON weak?\n" .string "Or, am I just bad?\l" .string "Which do you think?$" -Route6_Text_UndergroundPathSign:: @ 8184067 +Route6_Text_UndergroundPathSign:: .string "UNDERGROUND PATH\n" .string "CERULEAN CITY - VERMILION CITY$" diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc index 5c7add642..6fbbfe87d 100644 --- a/data/maps/Route6_NorthEntrance/scripts.inc +++ b/data/maps/Route6_NorthEntrance/scripts.inc @@ -1,29 +1,29 @@ -Route6_NorthEntrance_MapScripts:: @ 816F9C6 +Route6_NorthEntrance_MapScripts:: .byte 0 -Route6_NorthEntrance_EventScript_Guard:: @ 816F9C7 +Route6_NorthEntrance_EventScript_Guard:: msgbox Route6_NorthEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route6_NorthEntrance_EventScript_GuardTriggerLeft:: @ 816F9D0 +Route6_NorthEntrance_EventScript_GuardTriggerLeft:: lockall setvar VAR_TEMP_1, 0 goto Route6_NorthEntrance_EventScript_GuardTrigger end -Route6_NorthEntrance_EventScript_GuardTriggerMid:: @ 816F9DC +Route6_NorthEntrance_EventScript_GuardTriggerMid:: lockall setvar VAR_TEMP_1, 1 goto Route6_NorthEntrance_EventScript_GuardTrigger end -Route6_NorthEntrance_EventScript_GuardTriggerRight:: @ 816F9E8 +Route6_NorthEntrance_EventScript_GuardTriggerRight:: lockall setvar VAR_TEMP_1, 2 goto Route6_NorthEntrance_EventScript_GuardTrigger end -Route6_NorthEntrance_EventScript_GuardTrigger:: @ 816F9F4 +Route6_NorthEntrance_EventScript_GuardTrigger:: textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 @@ -35,12 +35,12 @@ Route6_NorthEntrance_EventScript_GuardTrigger:: @ 816F9F4 releaseall end -Route6_NorthEntrance_EventScript_GiveTea:: @ 816FA1E +Route6_NorthEntrance_EventScript_GiveTea:: removeitem ITEM_TEA, 1 goto Route6_NorthEntrance_EventScript_GuardDrinkTea end -Route6_NorthEntrance_EventScript_GuardDrinkTea:: @ 816FA29 +Route6_NorthEntrance_EventScript_GuardDrinkTea:: msgbox Route6_NorthEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 @@ -54,34 +54,34 @@ Route6_NorthEntrance_EventScript_GuardDrinkTea:: @ 816FA29 releaseall end -Route6_NorthEntrance_EventScript_WalkToGuardLeft:: @ 816FA62 +Route6_NorthEntrance_EventScript_WalkToGuardLeft:: applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardLeft waitmovement 0 return -Route6_NorthEntrance_EventScript_WalkToGuardMid:: @ 816FA6D +Route6_NorthEntrance_EventScript_WalkToGuardMid:: applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardMid waitmovement 0 return -Route6_NorthEntrance_EventScript_WalkToGuardRight:: @ 816FA78 +Route6_NorthEntrance_EventScript_WalkToGuardRight:: applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardRight waitmovement 0 return -Route6_NorthEntrance_Movement_WalkToGuardLeft:: @ 816FA83 +Route6_NorthEntrance_Movement_WalkToGuardLeft:: walk_right walk_right step_end -Route6_NorthEntrance_Movement_WalkToGuardMid:: @ 816FA86 +Route6_NorthEntrance_Movement_WalkToGuardMid:: walk_right step_end -Route6_NorthEntrance_Movement_WalkToGuardRight:: @ 816FA88 +Route6_NorthEntrance_Movement_WalkToGuardRight:: walk_in_place_right step_end -Route6_NorthEntrance_Movement_BlockPlayerEntry:: @ 816FA8A +Route6_NorthEntrance_Movement_BlockPlayerEntry:: walk_down step_end diff --git a/data/maps/Route6_NorthEntrance/text.inc b/data/maps/Route6_NorthEntrance/text.inc index 09705517c..bc727ad97 100644 --- a/data/maps/Route6_NorthEntrance/text.inc +++ b/data/maps/Route6_NorthEntrance/text.inc @@ -1,13 +1,13 @@ -Route6_NorthEntrance_Text_ThirstyOnGuardDuty:: @ 819E181 +Route6_NorthEntrance_Text_ThirstyOnGuardDuty:: .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -Route6_NorthEntrance_Text_ThatTeaLooksTasty:: @ 819E1D1 +Route6_NorthEntrance_Text_ThatTeaLooksTasty:: .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E1F7 +Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards:: .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E1F7 .string "I'll share this TEA with the other\n" .string "guards!$" -Route6_NorthEntrance_Text_HiHowsItGoing:: @ 819E2A3 +Route6_NorthEntrance_Text_HiHowsItGoing:: .string "Hi, how's it going?$" diff --git a/data/maps/Route6_UnusedHouse/scripts.inc b/data/maps/Route6_UnusedHouse/scripts.inc index 365de06a3..99c06c154 100644 --- a/data/maps/Route6_UnusedHouse/scripts.inc +++ b/data/maps/Route6_UnusedHouse/scripts.inc @@ -1,2 +1,2 @@ -Route6_UnusedHouse_MapScripts:: @ 816FA8C +Route6_UnusedHouse_MapScripts:: .byte 0 diff --git a/data/maps/Route7/scripts.inc b/data/maps/Route7/scripts.inc index 299d6bad8..50e9a95b3 100644 --- a/data/maps/Route7/scripts.inc +++ b/data/maps/Route7/scripts.inc @@ -1,6 +1,6 @@ -Route7_MapScripts:: @ 8167FBB +Route7_MapScripts:: .byte 0 -Route7_EventScript_UndergroundPathSign:: @ 8167FBC +Route7_EventScript_UndergroundPathSign:: msgbox Route7_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route7/text.inc b/data/maps/Route7/text.inc index 4a58cc14b..9ae858487 100644 --- a/data/maps/Route7/text.inc +++ b/data/maps/Route7/text.inc @@ -1,4 +1,4 @@ -Route7_Text_UndergroundPathSign:: @ 8184097 +Route7_Text_UndergroundPathSign:: .string "UNDERGROUND PATH\n" .string "CELADON CITY - LAVENDER TOWN$" diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc index 767601f49..6786a148b 100644 --- a/data/maps/Route7_EastEntrance/scripts.inc +++ b/data/maps/Route7_EastEntrance/scripts.inc @@ -1,29 +1,29 @@ -Route7_EastEntrance_MapScripts:: @ 816FA8D +Route7_EastEntrance_MapScripts:: .byte 0 -Route7_EastEntrance_EventScript_Guard:: @ 816FA8E +Route7_EastEntrance_EventScript_Guard:: msgbox Route7_EastEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route7_EastEntrance_EventScript_GuardTriggerTop:: @ 816FA97 +Route7_EastEntrance_EventScript_GuardTriggerTop:: lockall setvar VAR_TEMP_1, 0 goto Route7_EastEntrance_EventScript_GuardTrigger end -Route7_EastEntrance_EventScript_GuardTriggerMid:: @ 816FAA3 +Route7_EastEntrance_EventScript_GuardTriggerMid:: lockall setvar VAR_TEMP_1, 1 goto Route7_EastEntrance_EventScript_GuardTrigger end -Route7_EastEntrance_EventScript_GuardTriggerBottom:: @ 816FAAF +Route7_EastEntrance_EventScript_GuardTriggerBottom:: lockall setvar VAR_TEMP_1, 2 goto Route7_EastEntrance_EventScript_GuardTrigger end -Route7_EastEntrance_EventScript_GuardTrigger:: @ 816FABB +Route7_EastEntrance_EventScript_GuardTrigger:: textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 @@ -35,12 +35,12 @@ Route7_EastEntrance_EventScript_GuardTrigger:: @ 816FABB releaseall end -Route7_EastEntrance_EventScript_GiveTea:: @ 816FAE5 +Route7_EastEntrance_EventScript_GiveTea:: removeitem ITEM_TEA, 1 goto Route7_EastEntrance_EventScript_GuardDrinkTea end -Route7_EastEntrance_EventScript_GuardDrinkTea:: @ 816FAF0 +Route7_EastEntrance_EventScript_GuardDrinkTea:: msgbox Route7_EastEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 @@ -54,34 +54,34 @@ Route7_EastEntrance_EventScript_GuardDrinkTea:: @ 816FAF0 releaseall end -Route7_EastEntrance_WalkToGuardTop:: @ 816FB29 +Route7_EastEntrance_WalkToGuardTop:: applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardTop waitmovement 0 return -Route7_EastEntrance_WalkToGuardMid:: @ 816FB34 +Route7_EastEntrance_WalkToGuardMid:: applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardMid waitmovement 0 return -Route7_EastEntrance_WalkToGuardBottom:: @ 816FB3F +Route7_EastEntrance_WalkToGuardBottom:: applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardBottom waitmovement 0 return -Route7_EastEntrance_Movement_WalkToGuardMid:: @ 816FB4A +Route7_EastEntrance_Movement_WalkToGuardMid:: walk_up step_end -Route7_EastEntrance_Movement_WalkToGuardBottom:: @ 816FB4C +Route7_EastEntrance_Movement_WalkToGuardBottom:: walk_up walk_up step_end -Route7_EastEntrance_Movement_WalkToGuardTop:: @ 816FB4F +Route7_EastEntrance_Movement_WalkToGuardTop:: walk_in_place_up step_end -Route7_EastEntrance_Movement_BlockPlayerEntry:: @ 816FB51 +Route7_EastEntrance_Movement_BlockPlayerEntry:: walk_left step_end diff --git a/data/maps/Route7_EastEntrance/text.inc b/data/maps/Route7_EastEntrance/text.inc index ec98a5867..432525101 100644 --- a/data/maps/Route7_EastEntrance/text.inc +++ b/data/maps/Route7_EastEntrance/text.inc @@ -1,13 +1,13 @@ -Route7_EastEntrance_Text_ThirstyOnGuardDuty:: @ 819E2B7 +Route7_EastEntrance_Text_ThirstyOnGuardDuty:: .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -Route7_EastEntrance_Text_ThatTeaLooksTasty:: @ 819E307 +Route7_EastEntrance_Text_ThatTeaLooksTasty:: .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E32D +Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards:: .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E32D .string "I'll share this TEA with the other\n" .string "guards!$" -Route7_EastEntrance_Text_HiHowsItGoing:: @ 819E3D9 +Route7_EastEntrance_Text_HiHowsItGoing:: .string "Hi, how's it going?$" diff --git a/data/maps/Route8/scripts.inc b/data/maps/Route8/scripts.inc index 93e0aa38a..8f6358ccf 100644 --- a/data/maps/Route8/scripts.inc +++ b/data/maps/Route8/scripts.inc @@ -1,6 +1,6 @@ -Route8_MapScripts:: @ 8167FC5 +Route8_MapScripts:: .byte 0 -Route8_EventScript_UndergroundPathSign:: @ 8167FC6 +Route8_EventScript_UndergroundPathSign:: msgbox Route8_Text_UndergroundPathSign, MSGBOX_SIGN end diff --git a/data/maps/Route8/text.inc b/data/maps/Route8/text.inc index c9891575c..d0c2217b2 100644 --- a/data/maps/Route8/text.inc +++ b/data/maps/Route8/text.inc @@ -1,162 +1,162 @@ -Route8_Text_AidanIntro:: @ 81840C5 +Route8_Text_AidanIntro:: .string "You look good at POKéMON, but how\n" .string "is your chemistry grade?$" -Route8_Text_AidanDefeat:: @ 8184100 +Route8_Text_AidanDefeat:: .string "Ow!\n" .string "Meltdown!$" -Route8_Text_AidanPostBattle:: @ 818410E +Route8_Text_AidanPostBattle:: .string "I am better at school than this!$" -Route8_Text_StanIntro:: @ 818412F +Route8_Text_StanIntro:: .string "All right!\n" .string "Let's play a game!$" -Route8_Text_StanDefeat:: @ 818414D +Route8_Text_StanDefeat:: .string "Drat!\n" .string "Came up short!$" -Route8_Text_StanPostBattle:: @ 8184162 +Route8_Text_StanPostBattle:: .string "Things didn't work today.$" -Route8_Text_GlennIntro:: @ 818417C +Route8_Text_GlennIntro:: .string "You should be informed.\n" .string "You need strategy to win at this!$" -Route8_Text_GlennDefeat:: @ 81841B6 +Route8_Text_GlennDefeat:: .string "It's not logical!$" -Route8_Text_GlennPostBattle:: @ 81841C8 +Route8_Text_GlennPostBattle:: .string "Go with GRIMER first…and…\n" .string "…and…then…$" -Route8_Text_PaigeIntro:: @ 81841ED +Route8_Text_PaigeIntro:: .string "I like NIDORAN, so I collect them!$" -Route8_Text_PaigeDefeat:: @ 8184210 +Route8_Text_PaigeDefeat:: .string "Why?\n" .string "Why??$" -Route8_Text_PaigePostBattle:: @ 818421B +Route8_Text_PaigePostBattle:: .string "When POKéMON grow up, they get\n" .string "ugly! They shouldn't evolve.$" -Route8_Text_LeslieIntro:: @ 8184257 +Route8_Text_LeslieIntro:: .string "School is fun, but so are POKéMON.$" -Route8_Text_LeslieDefeat:: @ 818427A +Route8_Text_LeslieDefeat:: .string "You made it clear to me that\n" .string "I should stick with school.$" -Route8_Text_LesliePostBattle:: @ 81842B3 +Route8_Text_LesliePostBattle:: .string "I was planning on getting some\n" .string "fresh air for a change, but…\p" .string "We're stuck here because of the\n" .string "gates at SAFFRON.$" -Route8_Text_AndreaIntro:: @ 8184321 +Route8_Text_AndreaIntro:: .string "MEOWTH is so cute, meow, meow,\n" .string "meow!$" -Route8_Text_AndreaDefeat:: @ 8184346 +Route8_Text_AndreaDefeat:: .string "Meeeeyow!$" -Route8_Text_AndreaPostBattle:: @ 8184350 +Route8_Text_AndreaPostBattle:: .string "I think PIDGEY and RATTATA are\n" .string "cute, too!$" -Route8_Text_MeganIntro:: @ 818437A +Route8_Text_MeganIntro:: .string "We must look silly standing here\n" .string "like this.$" -Route8_Text_MeganDefeat:: @ 81843A6 +Route8_Text_MeganDefeat:: .string "Look what you did to my poor, cute\n" .string "POKéMON!$" -Route8_Text_MeganPostBattle:: @ 81843D2 +Route8_Text_MeganPostBattle:: .string "SAFFRON's gatekeeper won't let us\n" .string "go through.\p" .string "I know he's doing his job, but I\n" .string "think he's mean.$" -Route8_Text_RichIntro:: @ 8184432 +Route8_Text_RichIntro:: .string "I'm a rambling, gaming dude!$" -Route8_Text_RichDefeat:: @ 818444F +Route8_Text_RichDefeat:: .string "Missed the big chance!$" -Route8_Text_RichPostBattle:: @ 8184466 +Route8_Text_RichPostBattle:: .string "Playing games and POKéMON are like\n" .string "eating peanuts! I just can't stop!$" -Route8_Text_JuliaIntro:: @ 81844AC +Route8_Text_JuliaIntro:: .string "What's a cute, round, and fluffy\n" .string "POKéMON?$" -Route8_Text_JuliaDefeat:: @ 81844D6 +Route8_Text_JuliaDefeat:: .string "Stop!\p" .string "Don't be so mean to my CLEFAIRY!$" -Route8_Text_JuliaPostBattle:: @ 81844FD +Route8_Text_JuliaPostBattle:: .string "I read that CLEFAIRY evolves when\n" .string "it's exposed to a MOON STONE.\p" .string "I read that in a POKéMON JOURNAL.\n" .string "I wonder if it's true?$" -Route8_Text_UndergroundPathSign:: @ 8184576 +Route8_Text_UndergroundPathSign:: .string "UNDERGROUND PATH\n" .string "CELADON CITY - LAVENDER TOWN$" -Route8_Text_EliIntro:: @ 81845A4 +Route8_Text_EliIntro:: .string "ELI: Twin power is fantastic.\n" .string "Did you know?$" -Route8_Text_EliDefeat:: @ 81845D0 +Route8_Text_EliDefeat:: .string "ELI: But…\n" .string "We used our twin power…$" -Route8_Text_EliPostBattle:: @ 81845F2 +Route8_Text_EliPostBattle:: .string "ELI: I caught my POKéMON with\n" .string "ANNE!$" -Route8_Text_EliNotEnoughMons:: @ 8184616 +Route8_Text_EliNotEnoughMons:: .string "ELI: We can't battle if you don't\n" .string "have two POKéMON.$" -Route8_Text_AnneIntro:: @ 818464A +Route8_Text_AnneIntro:: .string "ANNE: We'll shock you with our twin\n" .string "power!$" -Route8_Text_AnneDefeat:: @ 8184675 +Route8_Text_AnneDefeat:: .string "ANNE: Our twin power…$" -Route8_Text_AnnePostBattle:: @ 818468B +Route8_Text_AnnePostBattle:: .string "ANNE: I'm raising POKéMON with\n" .string "ELI.$" -Route8_Text_AnneNotEnoughMons:: @ 81846AF +Route8_Text_AnneNotEnoughMons:: .string "ANNE: Hi, hi! Let's battle!\n" .string "But bring two POKéMON.$" -Route8_Text_RicardoIntro:: @ 81846E2 +Route8_Text_RicardoIntro:: .string "My bike's acting up, man.$" -Route8_Text_RicardoDefeat:: @ 81846FC +Route8_Text_RicardoDefeat:: .string "Aww, man.\n" .string "I'm not into this.$" -Route8_Text_RicardoPostBattle:: @ 8184719 +Route8_Text_RicardoPostBattle:: .string "I got grass caught up in my\n" .string "spokes, man.$" -Route8_Text_JarenIntro:: @ 8184742 +Route8_Text_JarenIntro:: .string "Clear the way, or I'll run you\n" .string "down!$" -Route8_Text_JarenDefeat:: @ 8184767 +Route8_Text_JarenDefeat:: .string "You for real, kid?$" -Route8_Text_JarenPostBattle:: @ 818477A +Route8_Text_JarenPostBattle:: .string "Don't think you're all special and\n" .string "all just because of this.$" diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc index 1b36e9a15..f9ca6bda5 100644 --- a/data/maps/Route8_WestEntrance/scripts.inc +++ b/data/maps/Route8_WestEntrance/scripts.inc @@ -1,29 +1,29 @@ -Route8_WestEntrance_MapScripts:: @ 816FB53 +Route8_WestEntrance_MapScripts:: .byte 0 -Route8_WestEntrance_EventScript_Guard:: @ 816FB54 +Route8_WestEntrance_EventScript_Guard:: msgbox Route8_WestEntrance_Text_HiHowsItGoing, MSGBOX_NPC end -Route8_WestEntrance_EventScript_GuardTriggerTop:: @ 816FB5D +Route8_WestEntrance_EventScript_GuardTriggerTop:: lockall setvar VAR_TEMP_1, 0 goto Route8_WestEntrance_EventScript_GuardTrigger end -Route8_WestEntrance_EventScript_GuardTriggerMid:: @ 816FB69 +Route8_WestEntrance_EventScript_GuardTriggerMid:: lockall setvar VAR_TEMP_1, 1 goto Route8_WestEntrance_EventScript_GuardTrigger end -Route8_WestEntrance_EventScript_GuardTriggerBottom:: @ 816FB75 +Route8_WestEntrance_EventScript_GuardTriggerBottom:: lockall setvar VAR_TEMP_1, 2 goto Route8_WestEntrance_EventScript_GuardTrigger end -Route8_WestEntrance_EventScript_GuardTrigger:: @ 816FB81 +Route8_WestEntrance_EventScript_GuardTrigger:: textcolor 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 @@ -35,24 +35,24 @@ Route8_WestEntrance_EventScript_GuardTrigger:: @ 816FB81 releaseall end -Route8_WestEntrance_EventScript_GiveTea:: @ 816FBAB +Route8_WestEntrance_EventScript_GiveTea:: removeitem ITEM_TEA, 1 goto Route8_WestEntrance_EventScript_GuardDrinkTea end @ Unused -Route8_WestEntrance_EventScript_GiveSodaPop:: @ 816FBB6 +Route8_WestEntrance_EventScript_GiveSodaPop:: removeitem ITEM_SODA_POP, 1 goto Route8_WestEntrance_EventScript_GuardDrinkTea end @ Unused -Route8_WestEntrance_EventScript_GiveLemonade:: @ 816FBC1 +Route8_WestEntrance_EventScript_GiveLemonade:: removeitem ITEM_LEMONADE, 1 goto Route8_WestEntrance_EventScript_GuardDrinkTea end -Route8_WestEntrance_EventScript_GuardDrinkTea:: @ 816FBCC +Route8_WestEntrance_EventScript_GuardDrinkTea:: msgbox Route8_WestEntrance_Text_ThatTeaLooksTasty closemessage compare VAR_TEMP_1, 0 @@ -66,34 +66,34 @@ Route8_WestEntrance_EventScript_GuardDrinkTea:: @ 816FBCC releaseall end -Route8_WestEntrance_EventScript_WalkToGuardTop:: @ 816FC05 +Route8_WestEntrance_EventScript_WalkToGuardTop:: applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardTop waitmovement 0 return -Route8_WestEntrance_EventScript_WalkToGuardMid:: @ 816FC10 +Route8_WestEntrance_EventScript_WalkToGuardMid:: applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardMid waitmovement 0 return -Route8_WestEntrance_EventScript_WalkToGuardBottom:: @ 816FC1B +Route8_WestEntrance_EventScript_WalkToGuardBottom:: applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardBottom waitmovement 0 return -Route8_WestEntrance_Movement_WalkToGuardMid:: @ 816FC26 +Route8_WestEntrance_Movement_WalkToGuardMid:: walk_up step_end -Route8_WestEntrance_Movement_WalkToGuardBottom:: @ 816FC28 +Route8_WestEntrance_Movement_WalkToGuardBottom:: walk_up walk_up step_end -Route8_WestEntrance_Movement_WalkToGuardTop:: @ 816FC2B +Route8_WestEntrance_Movement_WalkToGuardTop:: walk_in_place_up step_end -Route8_WestEntrance_Movement_BlockPlayerEntry:: @ 816FC2D +Route8_WestEntrance_Movement_BlockPlayerEntry:: walk_right step_end diff --git a/data/maps/Route8_WestEntrance/text.inc b/data/maps/Route8_WestEntrance/text.inc index 3c0be19e1..244fbf797 100644 --- a/data/maps/Route8_WestEntrance/text.inc +++ b/data/maps/Route8_WestEntrance/text.inc @@ -1,13 +1,13 @@ -Route8_WestEntrance_Text_ThirstyOnGuardDuty:: @ 819E3ED +Route8_WestEntrance_Text_ThirstyOnGuardDuty:: .string "I'm on guard duty.\n" .string "Gee, I'm thirsty, though!\p" .string "Oh, wait there, the road's closed.$" -Route8_WestEntrance_Text_ThatTeaLooksTasty:: @ 819E43D +Route8_WestEntrance_Text_ThatTeaLooksTasty:: .string "Oh, that TEA…\n" .string "It looks awfully tasty…$" -Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E463 +Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards:: .string "Huh? I can have this drink?\n" .string "Gee, thanks!\l" .string "… …\l" @@ -21,6 +21,6 @@ Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E463 .string "I'll share this TEA with the other\n" .string "guards!$" -Route8_WestEntrance_Text_HiHowsItGoing:: @ 819E50F +Route8_WestEntrance_Text_HiHowsItGoing:: .string "Hi, how's it going?$" diff --git a/data/maps/Route9/scripts.inc b/data/maps/Route9/scripts.inc index bd4be2115..790905867 100644 --- a/data/maps/Route9/scripts.inc +++ b/data/maps/Route9/scripts.inc @@ -1,6 +1,6 @@ -Route9_MapScripts:: @ 8167FCF +Route9_MapScripts:: .byte 0 -Route9_EventScript_RouteSign:: @ 8167FD0 +Route9_EventScript_RouteSign:: msgbox Route9_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/Route9/text.inc b/data/maps/Route9/text.inc index 2f3762a87..d8138a357 100644 --- a/data/maps/Route9/text.inc +++ b/data/maps/Route9/text.inc @@ -1,106 +1,106 @@ -Route9_Text_AliciaIntro:: @ 81847B7 +Route9_Text_AliciaIntro:: .string "You have POKéMON with you!\n" .string "You're mine!$" -Route9_Text_AliciaDefeat:: @ 81847DF +Route9_Text_AliciaDefeat:: .string "You deceived me…$" -Route9_Text_AliciaPostBattle:: @ 81847F0 +Route9_Text_AliciaPostBattle:: .string "The tunnel coming up is pitch-black\n" .string "inside.\p" .string "You'll need FLASH to get through\n" .string "there.$" -Route9_Text_ChrisIntro:: @ 8184844 +Route9_Text_ChrisIntro:: .string "Who's that walking there with those\n" .string "good-looking POKéMON?$" -Route9_Text_ChrisDefeat:: @ 818487E +Route9_Text_ChrisDefeat:: .string "Out like a light!$" -Route9_Text_ChrisPostBattle:: @ 8184890 +Route9_Text_ChrisPostBattle:: .string "Keep walking!$" -Route9_Text_DrewIntro:: @ 818489E +Route9_Text_DrewIntro:: .string "I'm taking the ROCK TUNNEL to\n" .string "go to LAVENDER…$" -Route9_Text_DrewDefeat:: @ 81848CC +Route9_Text_DrewDefeat:: .string "Can't measure up…$" -Route9_Text_DrewPostBattle:: @ 81848DE +Route9_Text_DrewPostBattle:: .string "Are you off to ROCK TUNNEL, too?$" -Route9_Text_CaitlinIntro:: @ 81848FF +Route9_Text_CaitlinIntro:: .string "Don't you dare patronize me!$" -Route9_Text_CaitlinDefeat:: @ 818491C +Route9_Text_CaitlinDefeat:: .string "No!\n" .string "You're too much.$" -Route9_Text_CaitlinPostBattle:: @ 8184931 +Route9_Text_CaitlinPostBattle:: .string "You're obviously talented.\n" .string "Good luck to you!$" -Route9_Text_JeremyIntro:: @ 818495E +Route9_Text_JeremyIntro:: .string "Bwahaha!\n" .string "Great! I was bored, eh!$" -Route9_Text_JeremyDefeat:: @ 818497F +Route9_Text_JeremyDefeat:: .string "Keep it coming, eh!\p" .string "Oh wait.\n" .string "I'm out of POKéMON!$" -Route9_Text_JeremyPostBattle:: @ 81849B0 +Route9_Text_JeremyPostBattle:: .string "You sure had guts standing up to\n" .string "me there, eh?$" -Route9_Text_BriceIntro:: @ 81849DF +Route9_Text_BriceIntro:: .string "Hahaha!\n" .string "Aren't you a little toughie!$" -Route9_Text_BriceDefeat:: @ 8184A04 +Route9_Text_BriceDefeat:: .string "What's that?$" -Route9_Text_BricePostBattle:: @ 8184A11 +Route9_Text_BricePostBattle:: .string "Hahaha!\n" .string "Kids should be tough!$" -Route9_Text_BrentIntro:: @ 8184A2F +Route9_Text_BrentIntro:: .string "I got up early every day to raise\n" .string "my POKéMON from cocoons!$" -Route9_Text_BrentDefeat:: @ 8184A6A +Route9_Text_BrentDefeat:: .string "WHAT?\p" .string "What a total waste of time!$" -Route9_Text_BrentPostBattle:: @ 8184A8C +Route9_Text_BrentPostBattle:: .string "I have to collect more than bugs\n" .string "to get stronger…$" -Route9_Text_AlanIntro:: @ 8184ABE +Route9_Text_AlanIntro:: .string "Hahahaha!\n" .string "Bring it on!$" -Route9_Text_AlanDefeat:: @ 8184AD5 +Route9_Text_AlanDefeat:: .string "Hahahaha!\n" .string "You beat me fair!$" -Route9_Text_AlanPostBattle:: @ 8184AF1 +Route9_Text_AlanPostBattle:: .string "Hahahaha!\n" .string "Us hearty guys always laugh!$" -Route9_Text_ConnerIntro:: @ 8184B18 +Route9_Text_ConnerIntro:: .string "Go, my super BUG POKéMON!$" -Route9_Text_ConnerDefeat:: @ 8184B32 +Route9_Text_ConnerDefeat:: .string "My bugs…$" -Route9_Text_ConnerPostBattle:: @ 8184B3B +Route9_Text_ConnerPostBattle:: .string "If you don't like BUG POKéMON,\n" .string "you bug me!$" -Route9_Text_RouteSign:: @ 8184B66 +Route9_Text_RouteSign:: .string "ROUTE 9\n" .string "CERULEAN CITY - ROCK TUNNEL$" diff --git a/data/maps/SSAnne_1F_Corridor/scripts.inc b/data/maps/SSAnne_1F_Corridor/scripts.inc index bc116f99b..e90a83d0b 100644 --- a/data/maps/SSAnne_1F_Corridor/scripts.inc +++ b/data/maps/SSAnne_1F_Corridor/scripts.inc @@ -1,10 +1,10 @@ -SSAnne_1F_Corridor_MapScripts:: @ 81608CB +SSAnne_1F_Corridor_MapScripts:: .byte 0 -SSAnne_1F_Corridor_EventScript_WorkerM:: @ 81608CC +SSAnne_1F_Corridor_EventScript_WorkerM:: msgbox SSAnne_1F_Corridor_Text_LeStrongSilentType, MSGBOX_NPC end -SSAnne_1F_Corridor_EventScript_Sailor:: @ 81608D5 +SSAnne_1F_Corridor_EventScript_Sailor:: msgbox SSAnne_1F_Corridor_Text_PassengersAreRestless, MSGBOX_NPC end diff --git a/data/maps/SSAnne_1F_Corridor/text.inc b/data/maps/SSAnne_1F_Corridor/text.inc index f720e2ed9..d643e20c5 100644 --- a/data/maps/SSAnne_1F_Corridor/text.inc +++ b/data/maps/SSAnne_1F_Corridor/text.inc @@ -1,4 +1,4 @@ -SSAnne_1F_Corridor_Text_LeStrongSilentType:: @ 8172EE7 +SSAnne_1F_Corridor_Text_LeStrongSilentType:: .string "Bonjour!\n" .string "I am le waiter on this ship!\p" .string "I will be happy to serve you\n" @@ -6,7 +6,7 @@ SSAnne_1F_Corridor_Text_LeStrongSilentType:: @ 8172EE7 .string "… … …\n" .string "Ah! Le strong silent type!$" -SSAnne_1F_Corridor_Text_PassengersAreRestless:: @ 8172F60 +SSAnne_1F_Corridor_Text_PassengersAreRestless:: .string "The passengers are restless from\n" .string "this long voyage.\p" .string "You might be challenged by the\n" diff --git a/data/maps/SSAnne_1F_Room1/scripts.inc b/data/maps/SSAnne_1F_Room1/scripts.inc index 8cbf9edb7..560e4603e 100644 --- a/data/maps/SSAnne_1F_Room1/scripts.inc +++ b/data/maps/SSAnne_1F_Room1/scripts.inc @@ -1,6 +1,6 @@ -SSAnne_1F_Room1_MapScripts:: @ 8160BDB +SSAnne_1F_Room1_MapScripts:: .byte 0 -SSAnne_1F_Room1_EventScript_Gentleman:: @ 8160BDC +SSAnne_1F_Room1_EventScript_Gentleman:: msgbox SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent, MSGBOX_NPC end diff --git a/data/maps/SSAnne_1F_Room1/text.inc b/data/maps/SSAnne_1F_Room1/text.inc index 1466bcfe8..47ec9c603 100644 --- a/data/maps/SSAnne_1F_Room1/text.inc +++ b/data/maps/SSAnne_1F_Room1/text.inc @@ -1,4 +1,4 @@ -SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent:: @ 817393B +SSAnne_1F_Room1_Text_ImAGlobalPoliceAgent:: .string "Ssh…!\n" .string "I'm a GLOBAL POLICE agent.\p" .string "I'm on the trail of TEAM ROCKET.\n" diff --git a/data/maps/SSAnne_1F_Room2/scripts.inc b/data/maps/SSAnne_1F_Room2/scripts.inc index 10154e734..ae1cc71e4 100644 --- a/data/maps/SSAnne_1F_Room2/scripts.inc +++ b/data/maps/SSAnne_1F_Room2/scripts.inc @@ -1,16 +1,16 @@ -SSAnne_1F_Room2_MapScripts:: @ 8160BE5 +SSAnne_1F_Room2_MapScripts:: .byte 0 -SSAnne_1F_Room2_EventScript_Woman:: @ 8160BE6 +SSAnne_1F_Room2_EventScript_Woman:: msgbox SSAnne_1F_Room2_Text_CruisingAroundWorld, MSGBOX_NPC end -SSAnne_1F_Room2_EventScript_Ann:: @ 8160BEF +SSAnne_1F_Room2_EventScript_Ann:: trainerbattle_single TRAINER_LASS_ANN, SSAnne_1F_Room2_Text_AnnIntro, SSAnne_1F_Room2_Text_AnnDefeat msgbox SSAnne_1F_Room2_Text_AnnPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_1F_Room2_EventScript_Tyler:: @ 8160C06 +SSAnne_1F_Room2_EventScript_Tyler:: trainerbattle_single TRAINER_YOUNGSTER_TYLER, SSAnne_1F_Room2_Text_TylerIntro, SSAnne_1F_Room2_Text_TylerDefeat msgbox SSAnne_1F_Room2_Text_TylerPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room2/text.inc b/data/maps/SSAnne_1F_Room2/text.inc index 55daa017f..46840b54d 100644 --- a/data/maps/SSAnne_1F_Room2/text.inc +++ b/data/maps/SSAnne_1F_Room2/text.inc @@ -1,31 +1,31 @@ -SSAnne_1F_Room2_Text_TylerIntro:: @ 8173999 +SSAnne_1F_Room2_Text_TylerIntro:: .string "I love POKéMON!\n" .string "Do you?$" -SSAnne_1F_Room2_Text_TylerDefeat:: @ 81739B1 +SSAnne_1F_Room2_Text_TylerDefeat:: .string "Wow! \n" .string "You're great!$" -SSAnne_1F_Room2_Text_TylerPostBattle:: @ 81739C5 +SSAnne_1F_Room2_Text_TylerPostBattle:: .string "Listen, listen!\n" .string "Let me be your friend, okay?\p" .string "Then we can trade POKéMON and\n" .string "do stuff.$" -SSAnne_1F_Room2_Text_AnnIntro:: @ 8173A1A +SSAnne_1F_Room2_Text_AnnIntro:: .string "I collected these POKéMON\n" .string "from all around the world!$" -SSAnne_1F_Room2_Text_AnnDefeat:: @ 8173A4F +SSAnne_1F_Room2_Text_AnnDefeat:: .string "Oh, no!\n" .string "I went around the world for these!$" -SSAnne_1F_Room2_Text_AnnPostBattle:: @ 8173A7A +SSAnne_1F_Room2_Text_AnnPostBattle:: .string "You hurt my poor POKéMON!\p" .string "I demand that you heal them at a\n" .string "POKéMON CENTER!$" -SSAnne_1F_Room2_Text_CruisingAroundWorld:: @ 8173AC5 +SSAnne_1F_Room2_Text_CruisingAroundWorld:: .string "We are cruising around the world,\n" .string "my children and I.$" diff --git a/data/maps/SSAnne_1F_Room3/scripts.inc b/data/maps/SSAnne_1F_Room3/scripts.inc index 446106c4e..67fc9ba93 100644 --- a/data/maps/SSAnne_1F_Room3/scripts.inc +++ b/data/maps/SSAnne_1F_Room3/scripts.inc @@ -1,15 +1,15 @@ -SSAnne_1F_Room3_MapScripts:: @ 8160C1D +SSAnne_1F_Room3_MapScripts:: .byte 0 -SSAnne_1F_Room3_EventScript_LittleGirl:: @ 8160C1E +SSAnne_1F_Room3_EventScript_LittleGirl:: msgbox SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff, MSGBOX_NPC end -SSAnne_1F_Room3_EventScript_BaldingMan:: @ 8160C27 +SSAnne_1F_Room3_EventScript_BaldingMan:: msgbox SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy, MSGBOX_NPC end -SSAnne_1F_Room3_EventScript_Wigglytuff:: @ 8160C30 +SSAnne_1F_Room3_EventScript_Wigglytuff:: lock faceplayer waitse diff --git a/data/maps/SSAnne_1F_Room3/text.inc b/data/maps/SSAnne_1F_Room3/text.inc index d79d495e9..0efe21432 100644 --- a/data/maps/SSAnne_1F_Room3/text.inc +++ b/data/maps/SSAnne_1F_Room3/text.inc @@ -1,11 +1,11 @@ -SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy:: @ 8173AFA +SSAnne_1F_Room3_Text_CruiseIsElegantAndCozy:: .string "A world cruise is so elegant yet\n" .string "cozy!$" -SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff:: @ 8173B21 +SSAnne_1F_Room3_Text_AlwaysTravelWithWigglytuff:: .string "I always travel with WIGGLYTUFF.\n" .string "I never leave home without it.$" -SSAnne_1F_Room3_Text_Wigglytuff:: @ 8173B61 +SSAnne_1F_Room3_Text_Wigglytuff:: .string "WIGGLYTUFF: Puup pupuu!$" diff --git a/data/maps/SSAnne_1F_Room4/scripts.inc b/data/maps/SSAnne_1F_Room4/scripts.inc index 7a4dfde80..c2fe4a166 100644 --- a/data/maps/SSAnne_1F_Room4/scripts.inc +++ b/data/maps/SSAnne_1F_Room4/scripts.inc @@ -1,7 +1,7 @@ -SSAnne_1F_Room4_MapScripts:: @ 8160C43 +SSAnne_1F_Room4_MapScripts:: .byte 0 -SSAnne_1F_Room4_EventScript_Woman:: @ 8160C44 +SSAnne_1F_Room4_EventScript_Woman:: lock faceplayer checkplayergender @@ -11,7 +11,7 @@ SSAnne_1F_Room4_EventScript_Woman:: @ 8160C44 release end -SSAnne_1F_Room4_EventScript_WomanPlayerMale:: @ 8160C5C +SSAnne_1F_Room4_EventScript_WomanPlayerMale:: msgbox SSAnne_1F_Room4_Text_WaiterCherryPiePlease release end diff --git a/data/maps/SSAnne_1F_Room4/text.inc b/data/maps/SSAnne_1F_Room4/text.inc index e0eb0bcce..3c3932d69 100644 --- a/data/maps/SSAnne_1F_Room4/text.inc +++ b/data/maps/SSAnne_1F_Room4/text.inc @@ -1,8 +1,8 @@ -SSAnne_1F_Room4_Text_WaiterCherryPiePlease:: @ 8173B79 +SSAnne_1F_Room4_Text_WaiterCherryPiePlease:: .string "Waiter, I would like a cherry pie,\n" .string "please!$" -SSAnne_1F_Room4_Text_WaitressCherryPiePlease:: @ 8173BA4 +SSAnne_1F_Room4_Text_WaitressCherryPiePlease:: .string "Waitress, I would like a cherry\n" .string "pie, please!$" diff --git a/data/maps/SSAnne_1F_Room5/scripts.inc b/data/maps/SSAnne_1F_Room5/scripts.inc index e91e35bf6..1ce15d72c 100644 --- a/data/maps/SSAnne_1F_Room5/scripts.inc +++ b/data/maps/SSAnne_1F_Room5/scripts.inc @@ -1,7 +1,7 @@ -SSAnne_1F_Room5_MapScripts:: @ 8160C66 +SSAnne_1F_Room5_MapScripts:: .byte 0 -SSAnne_1F_Room5_EventScript_Arthur:: @ 8160C67 +SSAnne_1F_Room5_EventScript_Arthur:: trainerbattle_single TRAINER_GENTLEMAN_ARTHUR, SSAnne_1F_Room5_Text_ArthurIntro, SSAnne_1F_Room5_Text_ArthurDefeat msgbox SSAnne_1F_Room5_Text_ArthurPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room5/text.inc b/data/maps/SSAnne_1F_Room5/text.inc index dd2f80262..ece1b8e3a 100644 --- a/data/maps/SSAnne_1F_Room5/text.inc +++ b/data/maps/SSAnne_1F_Room5/text.inc @@ -1,12 +1,12 @@ -SSAnne_1F_Room5_Text_ArthurIntro:: @ 8173BD1 +SSAnne_1F_Room5_Text_ArthurIntro:: .string "You insolent pup!\n" .string "How dare you barge in!$" -SSAnne_1F_Room5_Text_ArthurDefeat:: @ 8173BFA +SSAnne_1F_Room5_Text_ArthurDefeat:: .string "Humph! You rude child!\n" .string "You have no sense of courtesy!$" -SSAnne_1F_Room5_Text_ArthurPostBattle:: @ 8173C30 +SSAnne_1F_Room5_Text_ArthurPostBattle:: .string "I wish to be left alone!\n" .string "Get out!$" diff --git a/data/maps/SSAnne_1F_Room6/scripts.inc b/data/maps/SSAnne_1F_Room6/scripts.inc index dec1181bf..d416dd818 100644 --- a/data/maps/SSAnne_1F_Room6/scripts.inc +++ b/data/maps/SSAnne_1F_Room6/scripts.inc @@ -1,7 +1,7 @@ -SSAnne_1F_Room6_MapScripts:: @ 8160DF2 +SSAnne_1F_Room6_MapScripts:: .byte 0 -SSAnne_1F_Room6_EventScript_Woman:: @ 8160DF3 +SSAnne_1F_Room6_EventScript_Woman:: lock faceplayer msgbox SSAnne_1F_Room6_Text_TakeAShortRest, MSGBOX_YESNO @@ -13,7 +13,7 @@ SSAnne_1F_Room6_EventScript_Woman:: @ 8160DF3 release end -SSAnne_1F_Room6_EventScript_DeclineHeal:: @ 8160E18 +SSAnne_1F_Room6_EventScript_DeclineHeal:: checkplayergender compare VAR_RESULT, MALE goto_if_eq SSAnne_1F_Room6_EventScript_DeclineHealMale @@ -21,7 +21,7 @@ SSAnne_1F_Room6_EventScript_DeclineHeal:: @ 8160E18 release end -SSAnne_1F_Room6_EventScript_DeclineHealMale:: @ 8160E2E +SSAnne_1F_Room6_EventScript_DeclineHealMale:: msgbox SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother release end diff --git a/data/maps/SSAnne_1F_Room6/text.inc b/data/maps/SSAnne_1F_Room6/text.inc index 6d4d98ff5..c3851beec 100644 --- a/data/maps/SSAnne_1F_Room6/text.inc +++ b/data/maps/SSAnne_1F_Room6/text.inc @@ -1,16 +1,16 @@ -SSAnne_1F_Room6_Text_TakeAShortRest:: @ 817445B +SSAnne_1F_Room6_Text_TakeAShortRest:: .string "You look tired. Would you like to\n" .string "take a short rest?$" -SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed:: @ 8174490 +SSAnne_1F_Room6_Text_GladEveryoneIsRefreshed:: .string "I'm glad to see that everyone is\n" .string "looking refreshed and chipper.$" -SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother:: @ 81744D0 +SSAnne_1F_Room6_Text_SorryYouLookLikeMyBrother:: .string "Oh, I'm sorry for fussing over you.\n" .string "You look like my little brother…$" -SSAnne_1F_Room6_Text_SorryYouLookLikeMySister:: @ 8174515 +SSAnne_1F_Room6_Text_SorryYouLookLikeMySister:: .string "Oh, I'm sorry for fussing over you.\n" .string "You look like my little sister…$" diff --git a/data/maps/SSAnne_1F_Room7/scripts.inc b/data/maps/SSAnne_1F_Room7/scripts.inc index 60e26dc73..480c81e35 100644 --- a/data/maps/SSAnne_1F_Room7/scripts.inc +++ b/data/maps/SSAnne_1F_Room7/scripts.inc @@ -1,7 +1,7 @@ -SSAnne_1F_Room7_MapScripts:: @ 8160C7E +SSAnne_1F_Room7_MapScripts:: .byte 0 -SSAnne_1F_Room7_EventScript_Thomas:: @ 8160C7F +SSAnne_1F_Room7_EventScript_Thomas:: trainerbattle_single TRAINER_GENTLEMAN_THOMAS, SSAnne_1F_Room7_Text_ThomasIntro, SSAnne_1F_Room7_Text_ThomasDefeat msgbox SSAnne_1F_Room7_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_1F_Room7/text.inc b/data/maps/SSAnne_1F_Room7/text.inc index 3a8ce2f28..69682e845 100644 --- a/data/maps/SSAnne_1F_Room7/text.inc +++ b/data/maps/SSAnne_1F_Room7/text.inc @@ -1,11 +1,11 @@ -SSAnne_1F_Room7_Text_ThomasIntro:: @ 8173C52 +SSAnne_1F_Room7_Text_ThomasIntro:: .string "I am but a solitary traveler…\p" .string "My sole companions and friends are\n" .string "POKéMON I caught on my journeys…$" -SSAnne_1F_Room7_Text_ThomasDefeat:: @ 8173CB4 +SSAnne_1F_Room7_Text_ThomasDefeat:: .string "My, my friends…$" -SSAnne_1F_Room7_Text_ThomasPostBattle:: @ 8173CC4 +SSAnne_1F_Room7_Text_ThomasPostBattle:: .string "You should be nice to friends!$" diff --git a/data/maps/SSAnne_2F_Corridor/scripts.inc b/data/maps/SSAnne_2F_Corridor/scripts.inc index 4a2bbe5d1..c2feafdbd 100644 --- a/data/maps/SSAnne_2F_Corridor/scripts.inc +++ b/data/maps/SSAnne_2F_Corridor/scripts.inc @@ -1,27 +1,27 @@ .set LOCALID_RIVAL, 1 -SSAnne_2F_Corridor_MapScripts:: @ 81608DE +SSAnne_2F_Corridor_MapScripts:: .byte 0 -SSAnne_2F_Corridor_EventScript_RivalTriggerLeft:: @ 81608DF +SSAnne_2F_Corridor_EventScript_RivalTriggerLeft:: lockall setvar VAR_TEMP_1, 0 goto SSAnne_2F_Corridor_EventScript_RivalTrigger end -SSAnne_2F_Corridor_EventScript_RivalTriggerMid:: @ 81608EB +SSAnne_2F_Corridor_EventScript_RivalTriggerMid:: lockall setvar VAR_TEMP_1, 1 goto SSAnne_2F_Corridor_EventScript_RivalTrigger end -SSAnne_2F_Corridor_EventScript_RivalTriggerRight:: @ 81608F7 +SSAnne_2F_Corridor_EventScript_RivalTriggerRight:: lockall setvar VAR_TEMP_1, 2 goto SSAnne_2F_Corridor_EventScript_RivalTrigger end -SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 +SSAnne_2F_Corridor_EventScript_RivalTrigger:: textcolor 0 playse SE_EXIT delay 5 @@ -61,51 +61,51 @@ SSAnne_2F_Corridor_EventScript_RivalTrigger:: @ 8160903 releaseall end -SSAnne_2F_Corridor_EventScript_RivalApproachLeft:: @ 81609AD +SSAnne_2F_Corridor_EventScript_RivalApproachLeft:: applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachLeft waitmovement 0 return -SSAnne_2F_Corridor_EventScript_RivalApproachMid:: @ 81609B8 +SSAnne_2F_Corridor_EventScript_RivalApproachMid:: applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachMid applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid waitmovement 0 return -SSAnne_2F_Corridor_EventScript_RivalApproachRight:: @ 81609CA +SSAnne_2F_Corridor_EventScript_RivalApproachRight:: applymovement OBJ_EVENT_ID_PLAYER, SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalApproachRight waitmovement 0 return -SSAnne_2F_Corridor_EventScript_RivalSquirtle:: @ 81609DC +SSAnne_2F_Corridor_EventScript_RivalSquirtle:: trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_SQUIRTLE, SSAnne_2F_Corridor_Text_RivalDefeat return -SSAnne_2F_Corridor_EventScript_RivalBulbasaur:: @ 81609E7 +SSAnne_2F_Corridor_EventScript_RivalBulbasaur:: trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_BULBASAUR, SSAnne_2F_Corridor_Text_RivalDefeat return -SSAnne_2F_Corridor_EventScript_RivalCharmander:: @ 81609F2 +SSAnne_2F_Corridor_EventScript_RivalCharmander:: trainerbattle_no_intro TRAINER_RIVAL_SS_ANNE_CHARMANDER, SSAnne_2F_Corridor_Text_RivalDefeat return -SSAnne_2F_Corridor_EventScript_RivalExitLeft:: @ 81609FD +SSAnne_2F_Corridor_EventScript_RivalExitLeft:: applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitLeft waitmovement 0 return -SSAnne_2F_Corridor_EventScript_RivalExitMid:: @ 8160A08 +SSAnne_2F_Corridor_EventScript_RivalExitMid:: applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitMid waitmovement 0 return -SSAnne_2F_Corridor_EventScript_RivalExitRight:: @ 8160A13 +SSAnne_2F_Corridor_EventScript_RivalExitRight:: applymovement LOCALID_RIVAL, SSAnne_2F_Corridor_Movement_RivalExitRight waitmovement 0 return -SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight:: @ 8160A1E +SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight:: delay_16 delay_16 delay_16 @@ -113,7 +113,7 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalRight:: @ 8160A1E walk_in_place_fastest_left step_end -SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: @ 8160A24 +SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: delay_16 delay_16 delay_16 @@ -121,13 +121,13 @@ SSAnne_2F_Corridor_Movement_PlayerFaceRivalMid:: @ 8160A24 walk_in_place_fastest_left step_end -SSAnne_2F_Corridor_Movement_RivalApproachLeft:: @ 8160A2A +SSAnne_2F_Corridor_Movement_RivalApproachLeft:: walk_down walk_down walk_down step_end -SSAnne_2F_Corridor_Movement_RivalApproachMid:: @ 8160A2E +SSAnne_2F_Corridor_Movement_RivalApproachMid:: walk_down walk_down walk_down @@ -135,7 +135,7 @@ SSAnne_2F_Corridor_Movement_RivalApproachMid:: @ 8160A2E walk_in_place_fastest_right step_end -SSAnne_2F_Corridor_Movement_RivalApproachRight:: @ 8160A34 +SSAnne_2F_Corridor_Movement_RivalApproachRight:: walk_down walk_down walk_down @@ -144,7 +144,7 @@ SSAnne_2F_Corridor_Movement_RivalApproachRight:: @ 8160A34 delay_4 step_end -SSAnne_2F_Corridor_Movement_RivalExitLeft:: @ 8160A3B +SSAnne_2F_Corridor_Movement_RivalExitLeft:: walk_right walk_down walk_down @@ -155,7 +155,7 @@ SSAnne_2F_Corridor_Movement_RivalExitLeft:: @ 8160A3B walk_down step_end -SSAnne_2F_Corridor_Movement_RivalExitMid:: @ 8160A44 +SSAnne_2F_Corridor_Movement_RivalExitMid:: walk_down walk_down walk_down @@ -165,7 +165,7 @@ SSAnne_2F_Corridor_Movement_RivalExitMid:: @ 8160A44 walk_down step_end -SSAnne_2F_Corridor_Movement_RivalExitRight:: @ 8160A4C +SSAnne_2F_Corridor_Movement_RivalExitRight:: walk_down walk_down walk_down @@ -175,6 +175,6 @@ SSAnne_2F_Corridor_Movement_RivalExitRight:: @ 8160A4C walk_down step_end -SSAnne_2F_Corridor_EventScript_Sailor:: @ 8160A54 +SSAnne_2F_Corridor_EventScript_Sailor:: msgbox SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Corridor/text.inc b/data/maps/SSAnne_2F_Corridor/text.inc index 2f830479d..45e2754ba 100644 --- a/data/maps/SSAnne_2F_Corridor/text.inc +++ b/data/maps/SSAnne_2F_Corridor/text.inc @@ -1,10 +1,10 @@ -SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner:: @ 8172FC3 +SSAnne_2F_Corridor_Text_ThisShipIsLuxuryLiner:: .string "This ship, she is a luxury liner for\n" .string "TRAINERS of the world!\p" .string "At every port, we hold parties with\n" .string "invited TRAINERS.$" -SSAnne_2F_Corridor_Text_RivalIntro:: @ 8173035 +SSAnne_2F_Corridor_Text_RivalIntro:: .string "{RIVAL}: Bonjour!\n" .string "{PLAYER}!\p" .string "Imagine seeing you here!\n" @@ -15,18 +15,18 @@ SSAnne_2F_Corridor_Text_RivalIntro:: @ 8173035 .string "Crawl around in grassy areas, and\n" .string "look hard for them.$" -SSAnne_2F_Corridor_Text_RivalDefeat:: @ 8173110 +SSAnne_2F_Corridor_Text_RivalDefeat:: .string "Humph!\p" .string "At least you're raising your\n" .string "POKéMON!$" -SSAnne_2F_Corridor_Text_RivalVictory:: @ 817313D +SSAnne_2F_Corridor_Text_RivalVictory:: .string "{PLAYER}‥！\n" .string "ふなよい　してるのか！\p" .string "もっと　からだ\n" .string "きたえた　ほうが　いいぜ！$" -SSAnne_2F_Corridor_Text_RivalPostBattle:: @ 8173164 +SSAnne_2F_Corridor_Text_RivalPostBattle:: .string "{RIVAL}: I heard there was a CUT\n" .string "master on board.\p" .string "But he was just a seasick old man!\p" diff --git a/data/maps/SSAnne_2F_Room1/scripts.inc b/data/maps/SSAnne_2F_Room1/scripts.inc index f713d6a7a..183c71528 100644 --- a/data/maps/SSAnne_2F_Room1/scripts.inc +++ b/data/maps/SSAnne_2F_Room1/scripts.inc @@ -1,7 +1,7 @@ -SSAnne_2F_Room1_MapScripts:: @ 8160C96 +SSAnne_2F_Room1_MapScripts:: .byte 0 -SSAnne_2F_Room1_EventScript_Gentleman:: @ 8160C97 +SSAnne_2F_Room1_EventScript_Gentleman:: lock faceplayer message SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis diff --git a/data/maps/SSAnne_2F_Room1/text.inc b/data/maps/SSAnne_2F_Room1/text.inc index c75f4adb7..38de125df 100644 --- a/data/maps/SSAnne_2F_Room1/text.inc +++ b/data/maps/SSAnne_2F_Room1/text.inc @@ -1,4 +1,4 @@ -SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis:: @ 8173CE3 +SSAnne_2F_Room1_Text_SleepingMonLookedLikeThis:: .string "I've journeyed far and wide, but in\n" .string "all my travels I've never seen\l" .string "any POKéMON sleep like this one!\p" diff --git a/data/maps/SSAnne_2F_Room2/scripts.inc b/data/maps/SSAnne_2F_Room2/scripts.inc index 3968c2726..76d31608c 100644 --- a/data/maps/SSAnne_2F_Room2/scripts.inc +++ b/data/maps/SSAnne_2F_Room2/scripts.inc @@ -1,12 +1,12 @@ -SSAnne_2F_Room2_MapScripts:: @ 8160CB0 +SSAnne_2F_Room2_MapScripts:: .byte 0 -SSAnne_2F_Room2_EventScript_Dale:: @ 8160CB1 +SSAnne_2F_Room2_EventScript_Dale:: trainerbattle_single TRAINER_FISHERMAN_DALE, SSAnne_2F_Room2_Text_DaleIntro, SSAnne_2F_Room2_Text_DaleDefeat msgbox SSAnne_2F_Room2_Text_DalePostBattle, MSGBOX_AUTOCLOSE end -SSAnne_2F_Room2_EventScript_Brooks:: @ 8160CC8 +SSAnne_2F_Room2_EventScript_Brooks:: trainerbattle_single TRAINER_GENTLEMAN_BROOKS, SSAnne_2F_Room2_Text_BrooksIntro, SSAnne_2F_Room2_Text_BrooksDefeat msgbox SSAnne_2F_Room2_Text_BrooksPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Room2/text.inc b/data/maps/SSAnne_2F_Room2/text.inc index e7fb8ea8a..65df9dc7a 100644 --- a/data/maps/SSAnne_2F_Room2/text.inc +++ b/data/maps/SSAnne_2F_Room2/text.inc @@ -1,22 +1,22 @@ -SSAnne_2F_Room2_Text_BrooksIntro:: @ 8173D63 +SSAnne_2F_Room2_Text_BrooksIntro:: .string "Competing against the young keeps\n" .string "me youthful.$" -SSAnne_2F_Room2_Text_BrooksDefeat:: @ 8173D92 +SSAnne_2F_Room2_Text_BrooksDefeat:: .string "Good match!\n" .string "Ah, I feel young again!$" -SSAnne_2F_Room2_Text_BrooksPostBattle:: @ 8173DB6 +SSAnne_2F_Room2_Text_BrooksPostBattle:: .string "Fifteen years ago, I would\n" .string "have won!$" -SSAnne_2F_Room2_Text_DaleIntro:: @ 8173DDB +SSAnne_2F_Room2_Text_DaleIntro:: .string "Check out what I fished up!$" -SSAnne_2F_Room2_Text_DaleDefeat:: @ 8173DF7 +SSAnne_2F_Room2_Text_DaleDefeat:: .string "I'm all out!$" -SSAnne_2F_Room2_Text_DalePostBattle:: @ 8173E04 +SSAnne_2F_Room2_Text_DalePostBattle:: .string "Party?\p" .string "The cruise ship's party should be\n" .string "over by now.$" diff --git a/data/maps/SSAnne_2F_Room3/scripts.inc b/data/maps/SSAnne_2F_Room3/scripts.inc index 8de8f47f3..a0b190830 100644 --- a/data/maps/SSAnne_2F_Room3/scripts.inc +++ b/data/maps/SSAnne_2F_Room3/scripts.inc @@ -1,10 +1,10 @@ -SSAnne_2F_Room3_MapScripts:: @ 8160CDF +SSAnne_2F_Room3_MapScripts:: .byte 0 -SSAnne_2F_Room3_EventScript_Gentleman:: @ 8160CE0 +SSAnne_2F_Room3_EventScript_Gentleman:: msgbox SSAnne_2F_Room3_Text_SeenMonsFerryPeople, MSGBOX_NPC end -SSAnne_2F_Room3_EventScript_OldMan:: @ 8160CE9 +SSAnne_2F_Room3_EventScript_OldMan:: msgbox SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room3/text.inc b/data/maps/SSAnne_2F_Room3/text.inc index 680267ced..5e0d13edf 100644 --- a/data/maps/SSAnne_2F_Room3/text.inc +++ b/data/maps/SSAnne_2F_Room3/text.inc @@ -1,8 +1,8 @@ -SSAnne_2F_Room3_Text_SeenMonsFerryPeople:: @ 8173E3A +SSAnne_2F_Room3_Text_SeenMonsFerryPeople:: .string "Ah, yes, I have seen some POKéMON\n" .string "ferry people across the water!$" -SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown:: @ 8173E7B +SSAnne_2F_Room3_Text_SomeTreesCanBeCutDown:: .string "Small trees can be chopped down\n" .string "using the move CUT.\p" .string "But remember this!\n" diff --git a/data/maps/SSAnne_2F_Room4/scripts.inc b/data/maps/SSAnne_2F_Room4/scripts.inc index 13694bcfb..30a5e5802 100644 --- a/data/maps/SSAnne_2F_Room4/scripts.inc +++ b/data/maps/SSAnne_2F_Room4/scripts.inc @@ -1,12 +1,12 @@ -SSAnne_2F_Room4_MapScripts:: @ 8160CF2 +SSAnne_2F_Room4_MapScripts:: .byte 0 -SSAnne_2F_Room4_EventScript_Lamar:: @ 8160CF3 +SSAnne_2F_Room4_EventScript_Lamar:: trainerbattle_single TRAINER_GENTLEMAN_LAMAR, SSAnne_2F_Room4_Text_LamarIntro, SSAnne_2F_Room4_Text_LamarDefeat msgbox SSAnne_2F_Room4_Text_LamarPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_2F_Room4_EventScript_Dawn:: @ 8160D0A +SSAnne_2F_Room4_EventScript_Dawn:: trainerbattle_single TRAINER_LASS_DAWN, SSAnne_2F_Room4_Text_DawnIntro, SSAnne_2F_Room4_Text_DawnDefeat msgbox SSAnne_2F_Room4_Text_DawnPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_2F_Room4/text.inc b/data/maps/SSAnne_2F_Room4/text.inc index 9eb19a2b4..feffbde9e 100644 --- a/data/maps/SSAnne_2F_Room4/text.inc +++ b/data/maps/SSAnne_2F_Room4/text.inc @@ -1,22 +1,22 @@ -SSAnne_2F_Room4_Text_LamarIntro:: @ 8173F07 +SSAnne_2F_Room4_Text_LamarIntro:: .string "Which do you find more worthy,\n" .string "a strong or a rare POKéMON?$" -SSAnne_2F_Room4_Text_LamarDefeat:: @ 8173F42 +SSAnne_2F_Room4_Text_LamarDefeat:: .string "I must salute you!$" -SSAnne_2F_Room4_Text_LamarPostBattle:: @ 8173F55 +SSAnne_2F_Room4_Text_LamarPostBattle:: .string "Personally, I prefer strong and\n" .string "rare POKéMON.$" -SSAnne_2F_Room4_Text_DawnIntro:: @ 8173F83 +SSAnne_2F_Room4_Text_DawnIntro:: .string "I don't believe I saw you at the\n" .string "party?$" -SSAnne_2F_Room4_Text_DawnDefeat:: @ 8173FAB +SSAnne_2F_Room4_Text_DawnDefeat:: .string "Take it easy!$" -SSAnne_2F_Room4_Text_DawnPostBattle:: @ 8173FB9 +SSAnne_2F_Room4_Text_DawnPostBattle:: .string "Oh, I adore your strong POKéMON!\n" .string "Oh, how I envy you for them!$" diff --git a/data/maps/SSAnne_2F_Room5/scripts.inc b/data/maps/SSAnne_2F_Room5/scripts.inc index 2a02c6d91..427ea57fb 100644 --- a/data/maps/SSAnne_2F_Room5/scripts.inc +++ b/data/maps/SSAnne_2F_Room5/scripts.inc @@ -1,10 +1,10 @@ -SSAnne_2F_Room5_MapScripts:: @ 8160D21 +SSAnne_2F_Room5_MapScripts:: .byte 0 -SSAnne_2F_Room5_EventScript_Gentleman:: @ 8160D22 +SSAnne_2F_Room5_EventScript_Gentleman:: msgbox SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone, MSGBOX_NPC end -SSAnne_2F_Room5_EventScript_LittleBoy:: @ 8160D2B +SSAnne_2F_Room5_EventScript_LittleBoy:: msgbox SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room5/text.inc b/data/maps/SSAnne_2F_Room5/text.inc index 7aa3e2ade..2cc8cde4d 100644 --- a/data/maps/SSAnne_2F_Room5/text.inc +++ b/data/maps/SSAnne_2F_Room5/text.inc @@ -1,10 +1,10 @@ -SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone:: @ 8173FF7 +SSAnne_2F_Room5_Text_HaveYouGoneToSafariZone:: .string "Have you gone to the SAFARI ZONE\n" .string "in FUCHSIA CITY?\p" .string "There are many kinds of rare\n" .string "POKéMON.$" -SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome:: @ 817404F +SSAnne_2F_Room5_Text_WeThinkSafariZoneIsAwesome:: .string "Me and my daddy think the SAFARI\n" .string "ZONE is awesome!\l" .string "I wish we could go there again.$" diff --git a/data/maps/SSAnne_2F_Room6/scripts.inc b/data/maps/SSAnne_2F_Room6/scripts.inc index 458e7c35b..50e1fe9cb 100644 --- a/data/maps/SSAnne_2F_Room6/scripts.inc +++ b/data/maps/SSAnne_2F_Room6/scripts.inc @@ -1,10 +1,10 @@ -SSAnne_2F_Room6_MapScripts:: @ 8160D34 +SSAnne_2F_Room6_MapScripts:: .byte 0 -SSAnne_2F_Room6_EventScript_Woman1:: @ 8160D35 +SSAnne_2F_Room6_EventScript_Woman1:: msgbox SSAnne_2F_Room6_Text_CaptainIsAwfullySick, MSGBOX_NPC end -SSAnne_2F_Room6_EventScript_Woman2:: @ 8160D3E +SSAnne_2F_Room6_EventScript_Woman2:: msgbox SSAnne_2F_Room6_Text_ManyPeopleGetSeasick, MSGBOX_NPC end diff --git a/data/maps/SSAnne_2F_Room6/text.inc b/data/maps/SSAnne_2F_Room6/text.inc index 9820c1870..ef84d3276 100644 --- a/data/maps/SSAnne_2F_Room6/text.inc +++ b/data/maps/SSAnne_2F_Room6/text.inc @@ -1,7 +1,7 @@ -SSAnne_2F_Room6_Text_CaptainIsAwfullySick:: @ 81740A1 +SSAnne_2F_Room6_Text_CaptainIsAwfullySick:: .string "The CAPTAIN said he's awfully sick.\n" .string "He was all pale.$" -SSAnne_2F_Room6_Text_ManyPeopleGetSeasick:: @ 81740D6 +SSAnne_2F_Room6_Text_ManyPeopleGetSeasick:: .string "I hear many people get seasick.$" diff --git a/data/maps/SSAnne_3F_Corridor/scripts.inc b/data/maps/SSAnne_3F_Corridor/scripts.inc index 549fe8f84..ac67eeadb 100644 --- a/data/maps/SSAnne_3F_Corridor/scripts.inc +++ b/data/maps/SSAnne_3F_Corridor/scripts.inc @@ -1,6 +1,6 @@ -SSAnne_3F_Corridor_MapScripts:: @ 8160A5D +SSAnne_3F_Corridor_MapScripts:: .byte 0 -SSAnne_3F_Corridor_EventScript_Sailor:: @ 8160A5E +SSAnne_3F_Corridor_EventScript_Sailor:: msgbox SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons, MSGBOX_NPC end diff --git a/data/maps/SSAnne_3F_Corridor/text.inc b/data/maps/SSAnne_3F_Corridor/text.inc index a76f43a11..ae9266425 100644 --- a/data/maps/SSAnne_3F_Corridor/text.inc +++ b/data/maps/SSAnne_3F_Corridor/text.inc @@ -1,4 +1,4 @@ -SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons:: @ 817320C +SSAnne_3F_Corridor_Text_CaptainTeachesCutToMons:: .string "Our CAPTAIN is a sword master.\n" .string "He's awesome at using CUT.\p" .string "They say he even teaches CUT\n" diff --git a/data/maps/SSAnne_B1F_Corridor/scripts.inc b/data/maps/SSAnne_B1F_Corridor/scripts.inc index be04386e6..dc68fb91f 100644 --- a/data/maps/SSAnne_B1F_Corridor/scripts.inc +++ b/data/maps/SSAnne_B1F_Corridor/scripts.inc @@ -1,2 +1,2 @@ -SSAnne_B1F_Corridor_MapScripts:: @ 8160A67 +SSAnne_B1F_Corridor_MapScripts:: .byte 0 diff --git a/data/maps/SSAnne_B1F_Room1/scripts.inc b/data/maps/SSAnne_B1F_Room1/scripts.inc index eb35be89e..482276ed3 100644 --- a/data/maps/SSAnne_B1F_Room1/scripts.inc +++ b/data/maps/SSAnne_B1F_Room1/scripts.inc @@ -1,12 +1,12 @@ -SSAnne_B1F_Room1_MapScripts:: @ 8160D47 +SSAnne_B1F_Room1_MapScripts:: .byte 0 -SSAnne_B1F_Room1_EventScript_Barny:: @ 8160D48 +SSAnne_B1F_Room1_EventScript_Barny:: trainerbattle_single TRAINER_FISHERMAN_BARNY, SSAnne_B1F_Room1_Text_BarnyIntro, SSAnne_B1F_Room1_Text_BarnyDefeat msgbox SSAnne_B1F_Room1_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_B1F_Room1_EventScript_Phillip:: @ 8160D5F +SSAnne_B1F_Room1_EventScript_Phillip:: trainerbattle_single TRAINER_SAILOR_PHILLIP, SSAnne_B1F_Room1_Text_PhillipIntro, SSAnne_B1F_Room1_Text_PhillipDefeat msgbox SSAnne_B1F_Room1_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room1/text.inc b/data/maps/SSAnne_B1F_Room1/text.inc index bdd4b753c..c14d6a450 100644 --- a/data/maps/SSAnne_B1F_Room1/text.inc +++ b/data/maps/SSAnne_B1F_Room1/text.inc @@ -1,26 +1,26 @@ -SSAnne_B1F_Room1_Text_PhillipIntro:: @ 81740F6 +SSAnne_B1F_Room1_Text_PhillipIntro:: .string "Matey, you're walking the plank if\n" .string "you lose!$" -SSAnne_B1F_Room1_Text_PhillipDefeat:: @ 8174123 +SSAnne_B1F_Room1_Text_PhillipDefeat:: .string "Argh!\n" .string "Beaten by a kid!$" -SSAnne_B1F_Room1_Text_PhillipPostBattle:: @ 817413A +SSAnne_B1F_Room1_Text_PhillipPostBattle:: .string "When we're out at sea, jellyfish\n" .string "POKéMON sometimes drift by.$" -SSAnne_B1F_Room1_Text_BarnyIntro:: @ 8174177 +SSAnne_B1F_Room1_Text_BarnyIntro:: .string "Hello, stranger!\p" .string "I can't tell if you're from the seas\n" .string "or mountains, but stop and chat.\p" .string "All my POKéMON are from the sea.$" -SSAnne_B1F_Room1_Text_BarnyDefeat:: @ 81741EF +SSAnne_B1F_Room1_Text_BarnyDefeat:: .string "Darn!\n" .string "I let that one get away!$" -SSAnne_B1F_Room1_Text_BarnyPostBattle:: @ 817420E +SSAnne_B1F_Room1_Text_BarnyPostBattle:: .string "I was going to make you my\n" .string "assistant, too!$" diff --git a/data/maps/SSAnne_B1F_Room2/scripts.inc b/data/maps/SSAnne_B1F_Room2/scripts.inc index 011950863..089214386 100644 --- a/data/maps/SSAnne_B1F_Room2/scripts.inc +++ b/data/maps/SSAnne_B1F_Room2/scripts.inc @@ -1,7 +1,7 @@ -SSAnne_B1F_Room2_MapScripts:: @ 8160D76 +SSAnne_B1F_Room2_MapScripts:: .byte 0 -SSAnne_B1F_Room2_EventScript_Huey:: @ 8160D77 +SSAnne_B1F_Room2_EventScript_Huey:: trainerbattle_single TRAINER_SAILOR_HUEY, SSAnne_B1F_Room2_Text_HueyIntro, SSAnne_B1F_Room2_Text_HueyDefeat msgbox SSAnne_B1F_Room2_Text_HueyPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room2/text.inc b/data/maps/SSAnne_B1F_Room2/text.inc index 852bf55b1..969ab0e28 100644 --- a/data/maps/SSAnne_B1F_Room2/text.inc +++ b/data/maps/SSAnne_B1F_Room2/text.inc @@ -1,10 +1,10 @@ -SSAnne_B1F_Room2_Text_HueyIntro:: @ 8174239 +SSAnne_B1F_Room2_Text_HueyIntro:: .string "Even us sailors have POKéMON, too!$" -SSAnne_B1F_Room2_Text_HueyDefeat:: @ 817425C +SSAnne_B1F_Room2_Text_HueyDefeat:: .string "Okay, you're not bad.$" -SSAnne_B1F_Room2_Text_HueyPostBattle:: @ 8174272 +SSAnne_B1F_Room2_Text_HueyPostBattle:: .string "We caught all our POKéMON while\n" .string "we were out at sea.$" diff --git a/data/maps/SSAnne_B1F_Room3/scripts.inc b/data/maps/SSAnne_B1F_Room3/scripts.inc index 9d0ffc95e..f29f1a403 100644 --- a/data/maps/SSAnne_B1F_Room3/scripts.inc +++ b/data/maps/SSAnne_B1F_Room3/scripts.inc @@ -1,7 +1,7 @@ -SSAnne_B1F_Room3_MapScripts:: @ 8160D8E +SSAnne_B1F_Room3_MapScripts:: .byte 0 -SSAnne_B1F_Room3_EventScript_Dylan:: @ 8160D8F +SSAnne_B1F_Room3_EventScript_Dylan:: trainerbattle_single TRAINER_SAILOR_DYLAN, SSAnne_B1F_Room3_Text_DylanIntro, SSAnne_B1F_Room3_Text_DylanDefeat msgbox SSAnne_B1F_Room3_Text_DylanPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room3/text.inc b/data/maps/SSAnne_B1F_Room3/text.inc index cec2b5ec6..6ce4f3f86 100644 --- a/data/maps/SSAnne_B1F_Room3/text.inc +++ b/data/maps/SSAnne_B1F_Room3/text.inc @@ -1,11 +1,11 @@ -SSAnne_B1F_Room3_Text_DylanIntro:: @ 81742A6 +SSAnne_B1F_Room3_Text_DylanIntro:: .string "I like feisty kids like you!$" -SSAnne_B1F_Room3_Text_DylanDefeat:: @ 81742C3 +SSAnne_B1F_Room3_Text_DylanDefeat:: .string "Argh!\n" .string "Lost it!$" -SSAnne_B1F_Room3_Text_DylanPostBattle:: @ 81742D2 +SSAnne_B1F_Room3_Text_DylanPostBattle:: .string "Sea POKéMON live in deep water.\n" .string "You'll need a ROD to fish them up!$" diff --git a/data/maps/SSAnne_B1F_Room4/scripts.inc b/data/maps/SSAnne_B1F_Room4/scripts.inc index 66b928b4c..e1fde84a4 100644 --- a/data/maps/SSAnne_B1F_Room4/scripts.inc +++ b/data/maps/SSAnne_B1F_Room4/scripts.inc @@ -1,12 +1,12 @@ -SSAnne_B1F_Room4_MapScripts:: @ 8160DA6 +SSAnne_B1F_Room4_MapScripts:: .byte 0 -SSAnne_B1F_Room4_EventScript_Leonard:: @ 8160DA7 +SSAnne_B1F_Room4_EventScript_Leonard:: trainerbattle_single TRAINER_SAILOR_LEONARD, SSAnne_B1F_Room4_Text_LeonardIntro, SSAnne_B1F_Room4_Text_LeonardDefeat msgbox SSAnne_B1F_Room4_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_B1F_Room4_EventScript_Duncan:: @ 8160DBE +SSAnne_B1F_Room4_EventScript_Duncan:: trainerbattle_single TRAINER_SAILOR_DUNCAN, SSAnne_B1F_Room4_Text_DuncanIntro, SSAnne_B1F_Room4_Text_DuncanDefeat msgbox SSAnne_B1F_Room4_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_B1F_Room4/text.inc b/data/maps/SSAnne_B1F_Room4/text.inc index fa6d7eb2e..cd4e6ba83 100644 --- a/data/maps/SSAnne_B1F_Room4/text.inc +++ b/data/maps/SSAnne_B1F_Room4/text.inc @@ -1,23 +1,23 @@ -SSAnne_B1F_Room4_Text_LeonardIntro:: @ 8174315 +SSAnne_B1F_Room4_Text_LeonardIntro:: .string "You know what they say about\n" .string "sailors and battling!$" -SSAnne_B1F_Room4_Text_LeonardDefeat:: @ 8174348 +SSAnne_B1F_Room4_Text_LeonardDefeat:: .string "Right!\n" .string "Good battle, mate!$" -SSAnne_B1F_Room4_Text_LeonardPostBattle:: @ 8174362 +SSAnne_B1F_Room4_Text_LeonardPostBattle:: .string "Hahaha!\n" .string "Want to be a sailor, mate?$" -SSAnne_B1F_Room4_Text_DuncanIntro:: @ 8174385 +SSAnne_B1F_Room4_Text_DuncanIntro:: .string "Come on, then!\n" .string "My sailor's pride is at stake!$" -SSAnne_B1F_Room4_Text_DuncanDefeat:: @ 81743B3 +SSAnne_B1F_Room4_Text_DuncanDefeat:: .string "Your spirit sank me!$" -SSAnne_B1F_Room4_Text_DuncanPostBattle:: @ 81743C8 +SSAnne_B1F_Room4_Text_DuncanPostBattle:: .string "Did you see the FISHING GURU in\n" .string "VERMILION CITY?$" diff --git a/data/maps/SSAnne_B1F_Room5/scripts.inc b/data/maps/SSAnne_B1F_Room5/scripts.inc index 320f233fd..f2358c179 100644 --- a/data/maps/SSAnne_B1F_Room5/scripts.inc +++ b/data/maps/SSAnne_B1F_Room5/scripts.inc @@ -1,11 +1,11 @@ -SSAnne_B1F_Room5_MapScripts:: @ 8160DD5 +SSAnne_B1F_Room5_MapScripts:: .byte 0 -SSAnne_B1F_Room5_EventScript_Boy:: @ 8160DD6 +SSAnne_B1F_Room5_EventScript_Boy:: msgbox SSAnne_B1F_Room5_Text_MachokeHasStrengthToMoveRocks, MSGBOX_NPC end -SSAnne_B1F_Room5_EventScript_Machoke:: @ 8160DDF +SSAnne_B1F_Room5_EventScript_Machoke:: lock faceplayer waitse diff --git a/data/maps/SSAnne_B1F_Room5/text.inc b/data/maps/SSAnne_B1F_Room5/text.inc index 3126f97e3..037096581 100644 --- a/data/maps/SSAnne_B1F_Room5/text.inc +++ b/data/maps/SSAnne_B1F_Room5/text.inc @@ -1,8 +1,8 @@ -SSAnne_B1F_Room5_Text_MachokeHasStrengthToMoveRocks:: @ 81743F8 +SSAnne_B1F_Room5_Text_MachokeHasStrengthToMoveRocks:: .string "My buddy MACHOKE is super strong!\p" .string "He has enough STRENGTH to move\n" .string "big rocks!$" -SSAnne_B1F_Room5_Text_Machoke:: @ 8174444 +SSAnne_B1F_Room5_Text_Machoke:: .string "MACHOKE: Gwoh! Goggoh!$" diff --git a/data/maps/SSAnne_CaptainsOffice/scripts.inc b/data/maps/SSAnne_CaptainsOffice/scripts.inc index 2e087148a..95088fcc6 100644 --- a/data/maps/SSAnne_CaptainsOffice/scripts.inc +++ b/data/maps/SSAnne_CaptainsOffice/scripts.inc @@ -1,9 +1,9 @@ .set LOCALID_CAPTAIN, 1 -SSAnne_CaptainsOffice_MapScripts:: @ 8160B39 +SSAnne_CaptainsOffice_MapScripts:: .byte 0 -SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A +SSAnne_CaptainsOffice_EventScript_Captain:: lock goto_if_set FLAG_GOT_HM01, SSAnne_CaptainsOffice_EventScript_AlreadyGotCut msgbox SSAnne_CaptainsOffice_Text_CaptainIFeelSeasick @@ -25,7 +25,7 @@ SSAnne_CaptainsOffice_EventScript_Captain:: @ 8160B3A end @ Unused -SSAnne_CaptainsOffice_EventScript_NoRoomForCut:: @ 8160BA0 +SSAnne_CaptainsOffice_EventScript_NoRoomForCut:: msgbox SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis closemessage applymovement LOCALID_CAPTAIN, Movement_FaceOriginalDirection @@ -33,17 +33,17 @@ SSAnne_CaptainsOffice_EventScript_NoRoomForCut:: @ 8160BA0 release end -SSAnne_CaptainsOffice_EventScript_AlreadyGotCut:: @ 8160BB5 +SSAnne_CaptainsOffice_EventScript_AlreadyGotCut:: applymovement LOCALID_CAPTAIN, Movement_FacePlayer waitmovement 0 msgbox SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon release end -SSAnne_CaptainsOffice_EventScript_TrashCan:: @ 8160BC9 +SSAnne_CaptainsOffice_EventScript_TrashCan:: msgbox SSAnne_CaptainsOffice_Text_YuckShouldntHaveLooked, MSGBOX_SIGN end -SSAnne_CaptainsOffice_EventScript_Book:: @ 8160BD2 +SSAnne_CaptainsOffice_EventScript_Book:: msgbox SSAnne_CaptainsOffice_Text_HowToConquerSeasickness, MSGBOX_SIGN end diff --git a/data/maps/SSAnne_CaptainsOffice/text.inc b/data/maps/SSAnne_CaptainsOffice/text.inc index f4860b998..8d98bfdf5 100644 --- a/data/maps/SSAnne_CaptainsOffice/text.inc +++ b/data/maps/SSAnne_CaptainsOffice/text.inc @@ -1,15 +1,15 @@ -SSAnne_CaptainsOffice_Text_CaptainIFeelSeasick:: @ 8173646 +SSAnne_CaptainsOffice_Text_CaptainIFeelSeasick:: .string "CAPTAIN: Ooargh…\n" .string "I feel hideous…\l" .string "Urrp! Seasick…$" -SSAnne_CaptainsOffice_Text_RubbedCaptainsBack:: @ 8173676 +SSAnne_CaptainsOffice_Text_RubbedCaptainsBack:: .string "{PLAYER} rubbed the CAPTAIN's\n" .string "back!\p" .string "Rub-rub…\n" .string "Rub-rub…$" -SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut:: @ 81736A6 +SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut:: .string "CAPTAIN: Whew! Thank you!\n" .string "I'm feeling much better now.\p" .string "You want to see my hidden CUT\n" @@ -21,17 +21,17 @@ SSAnne_CaptainsOffice_Text_ThankYouHaveHMForCut:: @ 81736A6 .string "Teach CUT to your POKéMON, and\n" .string "you can see it CUT anytime!$" -SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain:: @ 81737AF +SSAnne_CaptainsOffice_Text_ObtainedHM01FromCaptain:: .string "{PLAYER} obtained HM01\n" .string "from the CAPTAIN!$" -SSAnne_CaptainsOffice_Text_ExplainCut:: @ 81737D2 +SSAnne_CaptainsOffice_Text_ExplainCut:: .string "Using CUT, you can chop down\n" .string "small trees.\p" .string "Why not try it with the trees\n" .string "around VERMILION CITY?$" -SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon:: @ 8173831 +SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon:: .string "CAPTAIN: …Whew!\p" .string "Now that I'm not sick anymore,\n" .string "I guess it's time.\p" @@ -39,15 +39,15 @@ SSAnne_CaptainsOffice_Text_SSAnneWillSetSailSoon:: @ 8173831 .string "Farewell, until our return to\n" .string "VERMILION CITY!$" -SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis:: @ 81738C3 +SSAnne_CaptainsOffice_Text_YouHaveNoRoomForThis:: .string "Oh, no!\n" .string "You have no room for this!$" -SSAnne_CaptainsOffice_Text_YuckShouldntHaveLooked:: @ 81738E6 +SSAnne_CaptainsOffice_Text_YuckShouldntHaveLooked:: .string "Yuck!\n" .string "Shouldn't have looked!$" -SSAnne_CaptainsOffice_Text_HowToConquerSeasickness:: @ 8173903 +SSAnne_CaptainsOffice_Text_HowToConquerSeasickness:: .string "How to Conquer Seasickness…\n" .string "The CAPTAIN's reading this!$" diff --git a/data/maps/SSAnne_Deck/scripts.inc b/data/maps/SSAnne_Deck/scripts.inc index feee8040c..10360fbbe 100644 --- a/data/maps/SSAnne_Deck/scripts.inc +++ b/data/maps/SSAnne_Deck/scripts.inc @@ -1,24 +1,24 @@ -SSAnne_Deck_MapScripts:: @ 8160A68 +SSAnne_Deck_MapScripts:: .byte 0 -SSAnne_Deck_EventScript_Youngster:: @ 8160A69 +SSAnne_Deck_EventScript_Youngster:: msgbox SSAnne_Deck_Text_ShipDepartingSoon, MSGBOX_NPC end -SSAnne_Deck_EventScript_BaldingMan:: @ 8160A72 +SSAnne_Deck_EventScript_BaldingMan:: msgbox SSAnne_Deck_Text_FeelSeasick, MSGBOX_NPC end -SSAnne_Deck_EventScript_Sailor:: @ 8160A7B +SSAnne_Deck_EventScript_Sailor:: msgbox SSAnne_Deck_Text_ScrubbingDecksHardWork, MSGBOX_NPC end -SSAnne_Deck_EventScript_Edmond:: @ 8160A84 +SSAnne_Deck_EventScript_Edmond:: trainerbattle_single TRAINER_SAILOR_EDMOND, SSAnne_Deck_Text_EdmondIntro, SSAnne_Deck_Text_EdmondDefeat msgbox SSAnne_Deck_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE end -SSAnne_Deck_EventScript_Trevor:: @ 8160A9B +SSAnne_Deck_EventScript_Trevor:: trainerbattle_single TRAINER_SAILOR_TREVOR, SSAnne_Deck_Text_TrevorIntro, SSAnne_Deck_Text_TrevorDefeat msgbox SSAnne_Deck_Text_TrevorPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SSAnne_Deck/text.inc b/data/maps/SSAnne_Deck/text.inc index 73c4f42e5..51827d3a7 100644 --- a/data/maps/SSAnne_Deck/text.inc +++ b/data/maps/SSAnne_Deck/text.inc @@ -1,35 +1,35 @@ -SSAnne_Deck_Text_ShipDepartingSoon:: @ 817326F +SSAnne_Deck_Text_ShipDepartingSoon:: .string "The party's over.\n" .string "The ship will be departing soon.$" -SSAnne_Deck_Text_ScrubbingDecksHardWork:: @ 81732A2 +SSAnne_Deck_Text_ScrubbingDecksHardWork:: .string "Whew!\n" .string "Scrubbing decks is hard work!$" -SSAnne_Deck_Text_FeelSeasick:: @ 81732C6 +SSAnne_Deck_Text_FeelSeasick:: .string "Urf… I feel ill…\p" .string "I got seasick, so I stepped out to\n" .string "get some air…$" -SSAnne_Deck_Text_EdmondIntro:: @ 8173308 +SSAnne_Deck_Text_EdmondIntro:: .string "Hey, matey!\p" .string "Let's do a little jig!$" -SSAnne_Deck_Text_EdmondDefeat:: @ 817332B +SSAnne_Deck_Text_EdmondDefeat:: .string "You're impressive!$" -SSAnne_Deck_Text_EdmondPostBattle:: @ 817333E +SSAnne_Deck_Text_EdmondPostBattle:: .string "How many kinds of POKéMON do you\n" .string "think there are in this big world?$" -SSAnne_Deck_Text_TrevorIntro:: @ 8173382 +SSAnne_Deck_Text_TrevorIntro:: .string "Ahoy, there!\n" .string "Are you seasick?$" -SSAnne_Deck_Text_TrevorDefeat:: @ 81733A0 +SSAnne_Deck_Text_TrevorDefeat:: .string "I was just careless!$" -SSAnne_Deck_Text_TrevorPostBattle:: @ 81733B5 +SSAnne_Deck_Text_TrevorPostBattle:: .string "My pa said there are 100 kinds of\n" .string "POKéMON. I think there are more.$" diff --git a/data/maps/SSAnne_Exterior/scripts.inc b/data/maps/SSAnne_Exterior/scripts.inc index eb06748b9..acd1c6aac 100644 --- a/data/maps/SSAnne_Exterior/scripts.inc +++ b/data/maps/SSAnne_Exterior/scripts.inc @@ -1,19 +1,19 @@ .set LOCALID_SS_ANNE, 1 -SSAnne_Exterior_MapScripts:: @ 8160840 +SSAnne_Exterior_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SSAnne_Exterior_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SSAnne_Exterior_OnFrame .byte 0 -SSAnne_Exterior_OnTransition:: @ 816084B +SSAnne_Exterior_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SSANNE_EXTERIOR end -SSAnne_Exterior_OnFrame:: @ 816084F +SSAnne_Exterior_OnFrame:: map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 1, SSAnne_Exterior_ExitSSAnne .2byte 0 -SSAnne_Exterior_ExitSSAnne:: @ 8160859 +SSAnne_Exterior_ExitSSAnne:: lockall getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8005, 6 @@ -34,17 +34,17 @@ SSAnne_Exterior_ExitSSAnne:: @ 8160859 releaseall end -SSAnne_Exterior_WalkDown:: @ 81608A1 +SSAnne_Exterior_WalkDown:: applymovement OBJ_EVENT_ID_PLAYER, SSAnne_Exterior_Movement_WalkDown waitmovement 0 return -SSAnne_Exterior_WalkInPlaceDown:: @ 81608AC +SSAnne_Exterior_WalkInPlaceDown:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -SSAnne_Exterior_Movement_Exit:: @ 81608B7 +SSAnne_Exterior_Movement_Exit:: walk_up walk_up walk_up @@ -56,7 +56,7 @@ SSAnne_Exterior_Movement_Exit:: @ 81608B7 walk_up step_end -SSAnne_Exterior_Movement_WalkDown:: @ 81608C1 +SSAnne_Exterior_Movement_WalkDown:: walk_down walk_down walk_down diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc index 2f3d0ee06..7ce4c6a3e 100644 --- a/data/maps/SSAnne_Kitchen/scripts.inc +++ b/data/maps/SSAnne_Kitchen/scripts.inc @@ -1,19 +1,19 @@ -SSAnne_Kitchen_MapScripts:: @ 8160AB2 +SSAnne_Kitchen_MapScripts:: .byte 0 -SSAnne_Kitchen_EventScript_Chef1:: @ 8160AB3 +SSAnne_Kitchen_EventScript_Chef1:: msgbox SSAnne_Kitchen_Text_BusyOutOfTheWay, MSGBOX_NPC end -SSAnne_Kitchen_EventScript_Chef2:: @ 8160ABC +SSAnne_Kitchen_EventScript_Chef2:: msgbox SSAnne_Kitchen_Text_SawOddBerryInTrash, MSGBOX_NPC end -SSAnne_Kitchen_EventScript_Chef3:: @ 8160AC5 +SSAnne_Kitchen_EventScript_Chef3:: msgbox SSAnne_Kitchen_Text_SoBusyImDizzy, MSGBOX_NPC end -SSAnne_Kitchen_EventScript_Chef4:: @ 8160ACE +SSAnne_Kitchen_EventScript_Chef4:: lock faceplayer msgbox SSAnne_Kitchen_Text_IAmLeChefMainCourseIs @@ -28,26 +28,26 @@ SSAnne_Kitchen_EventScript_Chef4:: @ 8160ACE release end -SSAnne_Kitchen_EventScript_SalmonDuSalad:: @ 8160B03 +SSAnne_Kitchen_EventScript_SalmonDuSalad:: msgbox SSAnne_Kitchen_Text_SalmonDuSalad return -SSAnne_Kitchen_EventScript_EelsAuBarbecue:: @ 8160B0C +SSAnne_Kitchen_EventScript_EelsAuBarbecue:: msgbox SSAnne_Kitchen_Text_EelsAuBarbecue return -SSAnne_Kitchen_EventScript_PrimeBeefsteak:: @ 8160B15 +SSAnne_Kitchen_EventScript_PrimeBeefsteak:: msgbox SSAnne_Kitchen_Text_PrimeBeefsteak return -SSAnne_Kitchen_EventScript_Chef5:: @ 8160B1E +SSAnne_Kitchen_EventScript_Chef5:: msgbox SSAnne_Kitchen_Text_PeelSpudsEveryDay, MSGBOX_NPC end -SSAnne_Kitchen_EventScript_Chef6:: @ 8160B27 +SSAnne_Kitchen_EventScript_Chef6:: msgbox SSAnne_Kitchen_Text_HearAboutSnorlaxItsAGlutton, MSGBOX_NPC end -SSAnne_Kitchen_EventScript_Chef7:: @ 8160B30 +SSAnne_Kitchen_EventScript_Chef7:: msgbox SSAnne_Kitchen_Text_OnlyGetToPeelOnions, MSGBOX_NPC end diff --git a/data/maps/SSAnne_Kitchen/text.inc b/data/maps/SSAnne_Kitchen/text.inc index 24146ac8a..95df017a5 100644 --- a/data/maps/SSAnne_Kitchen/text.inc +++ b/data/maps/SSAnne_Kitchen/text.inc @@ -1,47 +1,47 @@ -SSAnne_Kitchen_Text_BusyOutOfTheWay:: @ 81733F8 +SSAnne_Kitchen_Text_BusyOutOfTheWay:: .string "You, mon petit!\n" .string "We're busy here!\l" .string "Out of the way!$" -SSAnne_Kitchen_Text_SawOddBerryInTrash:: @ 8173429 +SSAnne_Kitchen_Text_SawOddBerryInTrash:: .string "I saw an odd BERRY in the trash.\n" .string "I wonder what that was?$" -SSAnne_Kitchen_Text_SoBusyImDizzy:: @ 8173462 +SSAnne_Kitchen_Text_SoBusyImDizzy:: .string "I'm so busy I'm getting dizzy!\n" .string "You have to give me room here!$" -SSAnne_Kitchen_Text_PeelSpudsEveryDay:: @ 81734A0 +SSAnne_Kitchen_Text_PeelSpudsEveryDay:: .string "Hum-de-hum-de-ho…\p" .string "I peel spuds every day!\n" .string "Hum-hum…$" -SSAnne_Kitchen_Text_HearAboutSnorlaxItsAGlutton:: @ 81734D3 +SSAnne_Kitchen_Text_HearAboutSnorlaxItsAGlutton:: .string "Did you hear about SNORLAX?\n" .string "It's a glutton.\p" .string "No other POKéMON eats and sleeps\n" .string "the way SNORLAX can and does!$" -SSAnne_Kitchen_Text_OnlyGetToPeelOnions:: @ 817353E +SSAnne_Kitchen_Text_OnlyGetToPeelOnions:: .string "Snivel… Sniff…\p" .string "I only get to peel onions…\n" .string "Snivel…$" -SSAnne_Kitchen_Text_IAmLeChefMainCourseIs:: @ 8173570 +SSAnne_Kitchen_Text_IAmLeChefMainCourseIs:: .string "Er-hem!\n" .string "Indeed I am le CHEF!\p" .string "Le main course is$" -SSAnne_Kitchen_Text_SalmonDuSalad:: @ 817359F +SSAnne_Kitchen_Text_SalmonDuSalad:: .string "Salmon du Salad!\p" .string "Les guests may gripe it's fish\n" .string "again, however!$" -SSAnne_Kitchen_Text_EelsAuBarbecue:: @ 81735DF +SSAnne_Kitchen_Text_EelsAuBarbecue:: .string "Eels au Barbecue!\p" .string "Les guests will mutiny, I fear.$" -SSAnne_Kitchen_Text_PrimeBeefsteak:: @ 8173611 +SSAnne_Kitchen_Text_PrimeBeefsteak:: .string "Prime Beefsteak!\p" .string "But, have I enough fillets du\n" .string "beef?$" diff --git a/data/maps/SafariZone_Center/scripts.inc b/data/maps/SafariZone_Center/scripts.inc index 21ca58264..d3cb3af08 100644 --- a/data/maps/SafariZone_Center/scripts.inc +++ b/data/maps/SafariZone_Center/scripts.inc @@ -1,19 +1,19 @@ -SafariZone_Center_MapScripts:: @ 8162357 +SafariZone_Center_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_Center_OnTransition .byte 0 -SafariZone_Center_OnTransition:: @ 816235D +SafariZone_Center_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SAFARI_ZONE_CENTER end -SafariZone_Center_EventScript_RestHouseSign:: @ 8162361 +SafariZone_Center_EventScript_RestHouseSign:: msgbox SafariZone_Center_Text_RestHouse, MSGBOX_SIGN end -SafariZone_Center_EventScript_TrainerTips:: @ 816236A +SafariZone_Center_EventScript_TrainerTips:: msgbox SafariZone_Center_Text_PressStartToCheckTime, MSGBOX_SIGN end -SafariZone_Center_EventScript_AreaSign:: @ 8162373 +SafariZone_Center_EventScript_AreaSign:: msgbox SafariZone_Center_Text_CenterArea, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_Center/text.inc b/data/maps/SafariZone_Center/text.inc index a0d7a61de..a5d528a94 100644 --- a/data/maps/SafariZone_Center/text.inc +++ b/data/maps/SafariZone_Center/text.inc @@ -1,11 +1,11 @@ -SafariZone_Center_Text_RestHouse:: @ 81777F2 +SafariZone_Center_Text_RestHouse:: .string "REST HOUSE$" -SafariZone_Center_Text_PressStartToCheckTime:: @ 81777FD +SafariZone_Center_Text_PressStartToCheckTime:: .string "TRAINER TIPS\p" .string "Press START to check\n" .string "remaining time.$" -SafariZone_Center_Text_CenterArea:: @ 817782F +SafariZone_Center_Text_CenterArea:: .string "CENTER AREA$" diff --git a/data/maps/SafariZone_Center_RestHouse/scripts.inc b/data/maps/SafariZone_Center_RestHouse/scripts.inc index 75e9cbe1d..9171bda0c 100644 --- a/data/maps/SafariZone_Center_RestHouse/scripts.inc +++ b/data/maps/SafariZone_Center_RestHouse/scripts.inc @@ -1,10 +1,10 @@ -SafariZone_Center_RestHouse_MapScripts:: @ 81623EB +SafariZone_Center_RestHouse_MapScripts:: .byte 0 -SafariZone_Center_RestHouse_EventScript_Sara:: @ 81623EC +SafariZone_Center_RestHouse_EventScript_Sara:: msgbox SafariZone_Center_Text_WhereDidErikGo, MSGBOX_NPC end -SafariZone_Center_RestHouse_EventScript_Scientist:: @ 81623F5 +SafariZone_Center_RestHouse_EventScript_Scientist:: msgbox SafariZone_Center_Text_CatchingMonsAsGifts, MSGBOX_NPC end diff --git a/data/maps/SafariZone_Center_RestHouse/text.inc b/data/maps/SafariZone_Center_RestHouse/text.inc index 156457318..f1d84bbda 100644 --- a/data/maps/SafariZone_Center_RestHouse/text.inc +++ b/data/maps/SafariZone_Center_RestHouse/text.inc @@ -1,8 +1,8 @@ -SafariZone_Center_Text_WhereDidErikGo:: @ 8177A5A +SafariZone_Center_Text_WhereDidErikGo:: .string "SARA: Where did my boyfriend,\n" .string "ERIK, go?$" -SafariZone_Center_Text_CatchingMonsAsGifts:: @ 8177A82 +SafariZone_Center_Text_CatchingMonsAsGifts:: .string "I'm catching POKéMON to take home\n" .string "as gifts.$" diff --git a/data/maps/SafariZone_East/scripts.inc b/data/maps/SafariZone_East/scripts.inc index fb7c074d1..a797196d0 100644 --- a/data/maps/SafariZone_East/scripts.inc +++ b/data/maps/SafariZone_East/scripts.inc @@ -1,14 +1,14 @@ -SafariZone_East_MapScripts:: @ 816237C +SafariZone_East_MapScripts:: .byte 0 -SafariZone_East_EventScript_RestHouseSign:: @ 816237D +SafariZone_East_EventScript_RestHouseSign:: msgbox SafariZone_East_Text_RestHouse, MSGBOX_SIGN end -SafariZone_East_EventScript_TrainerTips:: @ 8162386 +SafariZone_East_EventScript_TrainerTips:: msgbox SafariZone_East_Text_TimeDeclinesOnlyWhileYouWalk, MSGBOX_SIGN end -SafariZone_East_EventScript_AreaSign:: @ 816238F +SafariZone_East_EventScript_AreaSign:: msgbox SafariZone_East_Text_AreaSign, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_East/text.inc b/data/maps/SafariZone_East/text.inc index 617399c7b..522eea82b 100644 --- a/data/maps/SafariZone_East/text.inc +++ b/data/maps/SafariZone_East/text.inc @@ -1,12 +1,12 @@ -SafariZone_East_Text_RestHouse:: @ 817783B +SafariZone_East_Text_RestHouse:: .string "REST HOUSE$" -SafariZone_East_Text_TimeDeclinesOnlyWhileYouWalk:: @ 8177846 +SafariZone_East_Text_TimeDeclinesOnlyWhileYouWalk:: .string "TRAINER TIPS\p" .string "The remaining time declines only\n" .string "while you walk.$" -SafariZone_East_Text_AreaSign:: @ 8177884 +SafariZone_East_Text_AreaSign:: .string "AREA 1\n" .string "WEST: CENTER AREA$" diff --git a/data/maps/SafariZone_East_RestHouse/scripts.inc b/data/maps/SafariZone_East_RestHouse/scripts.inc index 5d95c153f..9262a90ef 100644 --- a/data/maps/SafariZone_East_RestHouse/scripts.inc +++ b/data/maps/SafariZone_East_RestHouse/scripts.inc @@ -1,14 +1,14 @@ -SafariZone_East_RestHouse_MapScripts:: @ 81623FE +SafariZone_East_RestHouse_MapScripts:: .byte 0 -SafariZone_East_RestHouse_EventScript_Rocker:: @ 81623FF +SafariZone_East_RestHouse_EventScript_Rocker:: msgbox SafariZone_East_Text_CaughtChanseyAllWorthwhile, MSGBOX_NPC end -SafariZone_East_RestHouse_EventScript_Scientist:: @ 8162408 +SafariZone_East_RestHouse_EventScript_Scientist:: msgbox SafariZone_East_Text_HowManyDidYouCatch, MSGBOX_NPC end -SafariZone_East_RestHouse_EventScript_BaldingMan:: @ 8162411 +SafariZone_East_RestHouse_EventScript_BaldingMan:: msgbox SafariZone_East_Text_TiredFromAllTheFun, MSGBOX_NPC end diff --git a/data/maps/SafariZone_East_RestHouse/text.inc b/data/maps/SafariZone_East_RestHouse/text.inc index ea914b754..eda217350 100644 --- a/data/maps/SafariZone_East_RestHouse/text.inc +++ b/data/maps/SafariZone_East_RestHouse/text.inc @@ -1,12 +1,12 @@ -SafariZone_East_Text_HowManyDidYouCatch:: @ 8177AAE +SafariZone_East_Text_HowManyDidYouCatch:: .string "How many did you catch?\n" .string "I'm bushed from the effort!$" -SafariZone_East_Text_CaughtChanseyAllWorthwhile:: @ 8177AE2 +SafariZone_East_Text_CaughtChanseyAllWorthwhile:: .string "I caught a CHANSEY!\p" .string "That makes this all worthwhile.$" -SafariZone_East_Text_TiredFromAllTheFun:: @ 8177B16 +SafariZone_East_Text_TiredFromAllTheFun:: .string "Whew!\n" .string "I'm tired from all the fun!$" diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc index 5acf50ae8..e9c14ad6f 100644 --- a/data/maps/SafariZone_North/scripts.inc +++ b/data/maps/SafariZone_North/scripts.inc @@ -1,22 +1,22 @@ -SafariZone_North_MapScripts:: @ 8162398 +SafariZone_North_MapScripts:: .byte 0 -SafariZone_North_EventScript_RestHouseSign:: @ 8162399 +SafariZone_North_EventScript_RestHouseSign:: msgbox SafariZone_North_Text_RestHouse, MSGBOX_SIGN end -SafariZone_North_EventScript_TrainerTips1:: @ 81623A2 +SafariZone_North_EventScript_TrainerTips1:: msgbox SafariZone_North_Text_SecretHouseStillAhead, MSGBOX_SIGN end -SafariZone_North_EventScript_AreaSign:: @ 81623AB +SafariZone_North_EventScript_AreaSign:: msgbox SafariZone_North_Text_Area2, MSGBOX_SIGN end -SafariZone_North_EventScript_TrainerTips2:: @ 81623B4 +SafariZone_North_EventScript_TrainerTips2:: msgbox SafariZone_North_Text_ZigzagThroughTallGrass, MSGBOX_SIGN end -SafariZone_North_EventScript_TrainerTips3:: @ 81623BD +SafariZone_North_EventScript_TrainerTips3:: msgbox SafariZone_North_Text_WinFreeHMFindSecretHouse, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_North/text.inc b/data/maps/SafariZone_North/text.inc index 4d1bbca97..f0f7235ea 100644 --- a/data/maps/SafariZone_North/text.inc +++ b/data/maps/SafariZone_North/text.inc @@ -1,20 +1,20 @@ -SafariZone_North_Text_RestHouse:: @ 817789D +SafariZone_North_Text_RestHouse:: .string "REST HOUSE$" -SafariZone_North_Text_SecretHouseStillAhead:: @ 81778A8 +SafariZone_North_Text_SecretHouseStillAhead:: .string "TRAINER TIPS\p" .string "The SECRET HOUSE is still ahead.$" -SafariZone_North_Text_Area2:: @ 81778D6 +SafariZone_North_Text_Area2:: .string "AREA 2$" -SafariZone_North_Text_ZigzagThroughTallGrass:: @ 81778DD +SafariZone_North_Text_ZigzagThroughTallGrass:: .string "TRAINER TIPS\p" .string "POKéMON hide in tall grass.\p" .string "Zigzag through grassy areas to\n" .string "flush them out.$" -SafariZone_North_Text_WinFreeHMFindSecretHouse:: @ 8177935 +SafariZone_North_Text_WinFreeHMFindSecretHouse:: .string "TRAINER TIPS\p" .string "Win a free HM for finding the\n" .string "SECRET HOUSE.$" diff --git a/data/maps/SafariZone_North_RestHouse/scripts.inc b/data/maps/SafariZone_North_RestHouse/scripts.inc index b7bcce8ed..20904f41b 100644 --- a/data/maps/SafariZone_North_RestHouse/scripts.inc +++ b/data/maps/SafariZone_North_RestHouse/scripts.inc @@ -1,14 +1,14 @@ -SafariZone_North_RestHouse_MapScripts:: @ 816241A +SafariZone_North_RestHouse_MapScripts:: .byte 0 -SafariZone_North_RestHouse_EventScript_Fisher:: @ 816241B +SafariZone_North_RestHouse_EventScript_Fisher:: msgbox SafariZone_East_Text_PrizeInDeepestPartOfSafariZone, MSGBOX_NPC end -SafariZone_North_RestHouse_EventScript_Scientist:: @ 8162424 +SafariZone_North_RestHouse_EventScript_Scientist:: msgbox SafariZone_East_Text_KeepAnyItemFoundOnSafari, MSGBOX_NPC end -SafariZone_North_RestHouse_EventScript_Gentleman:: @ 816242D +SafariZone_North_RestHouse_EventScript_Gentleman:: msgbox SafariZone_East_Text_MyEeveeEvolvedIntoFlareon, MSGBOX_NPC end diff --git a/data/maps/SafariZone_North_RestHouse/text.inc b/data/maps/SafariZone_North_RestHouse/text.inc index cf0188053..c1f864741 100644 --- a/data/maps/SafariZone_North_RestHouse/text.inc +++ b/data/maps/SafariZone_North_RestHouse/text.inc @@ -1,14 +1,14 @@ -SafariZone_East_Text_KeepAnyItemFoundOnSafari:: @ 8177B38 +SafariZone_East_Text_KeepAnyItemFoundOnSafari:: .string "You can keep any item you find in\n" .string "the SAFARI ZONE.\p" .string "But, you'll run out of time if you\n" .string "try for all of them at once.$" -SafariZone_East_Text_PrizeInDeepestPartOfSafariZone:: @ 8177BAB +SafariZone_East_Text_PrizeInDeepestPartOfSafariZone:: .string "Go to the deepest part of the\n" .string "SAFARI ZONE. You will win a prize!$" -SafariZone_East_Text_MyEeveeEvolvedIntoFlareon:: @ 8177BEC +SafariZone_East_Text_MyEeveeEvolvedIntoFlareon:: .string "My EEVEE evolved into FLAREON.\p" .string "But, a friend's EEVEE turned into a\n" .string "VAPOREON. I wonder why?$" diff --git a/data/maps/SafariZone_SecretHouse/scripts.inc b/data/maps/SafariZone_SecretHouse/scripts.inc index 44884acd3..8b3102f82 100644 --- a/data/maps/SafariZone_SecretHouse/scripts.inc +++ b/data/maps/SafariZone_SecretHouse/scripts.inc @@ -1,7 +1,7 @@ -SafariZone_SecretHouse_MapScripts:: @ 8162452 +SafariZone_SecretHouse_MapScripts:: .byte 0 -SafariZone_SecretHouse_EventScript_Attendant:: @ 8162453 +SafariZone_SecretHouse_EventScript_Attendant:: lock faceplayer goto_if_set FLAG_GOT_HM03, SafariZone_SecretHouse_EventScript_ExplainSurf @@ -15,12 +15,12 @@ SafariZone_SecretHouse_EventScript_Attendant:: @ 8162453 release end -SafariZone_SecretHouse_EventScript_NoRoomForHM03:: @ 816249F +SafariZone_SecretHouse_EventScript_NoRoomForHM03:: msgbox SafariZone_SecretHouse_Text_DontHaveRoomForPrize release end -SafariZone_SecretHouse_EventScript_ExplainSurf:: @ 81624A9 +SafariZone_SecretHouse_EventScript_ExplainSurf:: msgbox SafariZone_SecretHouse_Text_ExplainSurf release end diff --git a/data/maps/SafariZone_SecretHouse/text.inc b/data/maps/SafariZone_SecretHouse/text.inc index bfa505689..71c9a0b39 100644 --- a/data/maps/SafariZone_SecretHouse/text.inc +++ b/data/maps/SafariZone_SecretHouse/text.inc @@ -1,4 +1,4 @@ -SafariZone_SecretHouse_Text_CongratsYouveWon:: @ 8177DC1 +SafariZone_SecretHouse_Text_CongratsYouveWon:: .string "Ah! Finally!\p" .string "You're the first person to reach\n" .string "the SECRET HOUSE!\p" @@ -9,11 +9,11 @@ SafariZone_SecretHouse_Text_CongratsYouveWon:: @ 8177DC1 .string "Congratulations!\n" .string "You have won!$" -SafariZone_SecretHouse_Text_ReceivedHM03FromAttendant:: @ 8177E92 +SafariZone_SecretHouse_Text_ReceivedHM03FromAttendant:: .string "{PLAYER} received HM03\n" .string "from the attendant!$" -SafariZone_SecretHouse_Text_ExplainSurf:: @ 8177EB7 +SafariZone_SecretHouse_Text_ExplainSurf:: .string "HM03 is SURF.\p" .string "POKéMON will be able to ferry you\n" .string "across water using it.\p" @@ -22,7 +22,7 @@ SafariZone_SecretHouse_Text_ExplainSurf:: @ 8177EB7 .string "You're super lucky for winning this\n" .string "fabulous prize!$" -SafariZone_SecretHouse_Text_DontHaveRoomForPrize:: @ 8177F72 +SafariZone_SecretHouse_Text_DontHaveRoomForPrize:: .string "You don't have room for this\n" .string "fabulous prize!$" diff --git a/data/maps/SafariZone_West/scripts.inc b/data/maps/SafariZone_West/scripts.inc index aeff53ed8..5b31f43a9 100644 --- a/data/maps/SafariZone_West/scripts.inc +++ b/data/maps/SafariZone_West/scripts.inc @@ -1,18 +1,18 @@ -SafariZone_West_MapScripts:: @ 81623C6 +SafariZone_West_MapScripts:: .byte 0 -SafariZone_West_EventScript_RestHouseSign:: @ 81623C7 +SafariZone_West_EventScript_RestHouseSign:: msgbox SafariZone_West_Text_RestHouse, MSGBOX_SIGN end -SafariZone_West_EventScript_LostTeethNotice:: @ 81623D0 +SafariZone_West_EventScript_LostTeethNotice:: msgbox SafariZone_West_Text_PleaseFindWardensLostTeeth, MSGBOX_SIGN end -SafariZone_West_EventScript_TrainerTips:: @ 81623D9 +SafariZone_West_EventScript_TrainerTips:: msgbox SafariZone_West_Text_SearchForSecretHouse, MSGBOX_SIGN end -SafariZone_West_EventScript_AreaSign:: @ 81623E2 +SafariZone_West_EventScript_AreaSign:: msgbox SafariZone_West_Text_AreaSign, MSGBOX_SIGN end diff --git a/data/maps/SafariZone_West/text.inc b/data/maps/SafariZone_West/text.inc index c158c3467..f96dc28ea 100644 --- a/data/maps/SafariZone_West/text.inc +++ b/data/maps/SafariZone_West/text.inc @@ -1,7 +1,7 @@ -SafariZone_West_Text_RestHouse:: @ 817796E +SafariZone_West_Text_RestHouse:: .string "REST HOUSE$" -SafariZone_West_Text_PleaseFindWardensLostTeeth:: @ 8177979 +SafariZone_West_Text_PleaseFindWardensLostTeeth:: .string "REQUEST NOTICE\p" .string "Please find the SAFARI WARDEN's\n" .string "lost GOLD TEETH.\l" @@ -9,12 +9,12 @@ SafariZone_West_Text_PleaseFindWardensLostTeeth:: @ 8177979 .string "Reward offered!\n" .string "Contact: WARDEN$" -SafariZone_West_Text_SearchForSecretHouse:: @ 81779F8 +SafariZone_West_Text_SearchForSecretHouse:: .string "TRAINER TIPS\p" .string "Zone Exploration Campaign!\n" .string "The Search for the SECRET HOUSE!$" -SafariZone_West_Text_AreaSign:: @ 8177A41 +SafariZone_West_Text_AreaSign:: .string "AREA 3\n" .string "EAST: CENTER AREA$" diff --git a/data/maps/SafariZone_West_RestHouse/scripts.inc b/data/maps/SafariZone_West_RestHouse/scripts.inc index cc3b70df4..347a084c2 100644 --- a/data/maps/SafariZone_West_RestHouse/scripts.inc +++ b/data/maps/SafariZone_West_RestHouse/scripts.inc @@ -1,14 +1,14 @@ -SafariZone_West_RestHouse_MapScripts:: @ 8162436 +SafariZone_West_RestHouse_MapScripts:: .byte 0 -SafariZone_West_RestHouse_EventScript_Man:: @ 8162437 +SafariZone_West_RestHouse_EventScript_Man:: msgbox SafariZone_West_Text_BaitMakesMonStickAround, MSGBOX_NPC end -SafariZone_West_RestHouse_EventScript_Scientist:: @ 8162440 +SafariZone_West_RestHouse_EventScript_Scientist:: msgbox SafariZone_West_Text_RocksMakeMonRunButEasierCatch, MSGBOX_NPC end -SafariZone_West_RestHouse_EventScript_CooltrainerF:: @ 8162449 +SafariZone_West_RestHouse_EventScript_CooltrainerF:: msgbox SafariZone_West_Text_HikedLotsDidntSeeMonIWanted, MSGBOX_NPC end diff --git a/data/maps/SafariZone_West_RestHouse/text.inc b/data/maps/SafariZone_West_RestHouse/text.inc index c6ef1ae59..774bede2f 100644 --- a/data/maps/SafariZone_West_RestHouse/text.inc +++ b/data/maps/SafariZone_West_RestHouse/text.inc @@ -1,4 +1,4 @@ -SafariZone_West_Text_KogaPatrolsSafariEverySoOften:: @ 8177C47 +SafariZone_West_Text_KogaPatrolsSafariEverySoOften:: .string "The SAFARI ZONE's huge, wouldn't\n" .string "you say?\p" .string "FUCHSIA's GYM LEADER, KOGA, \n" @@ -6,17 +6,17 @@ SafariZone_West_Text_KogaPatrolsSafariEverySoOften:: @ 8177C47 .string "Thanks to him, we can play here\n" .string "knowing that we're safe.$" -SafariZone_West_Text_RocksMakeMonRunButEasierCatch:: @ 8177CEB +SafariZone_West_Text_RocksMakeMonRunButEasierCatch:: .string "Tossing ROCKS at POKéMON might\n" .string "make them run, but they'll be\l" .string "easier to catch.$" -SafariZone_West_Text_BaitMakesMonStickAround:: @ 8177D39 +SafariZone_West_Text_BaitMakesMonStickAround:: .string "Using BAIT will make POKéMON more\n" .string "likely to stick around if they get\l" .string "busy eating.$" -SafariZone_West_Text_HikedLotsDidntSeeMonIWanted:: @ 8177D8B +SafariZone_West_Text_HikedLotsDidntSeeMonIWanted:: .string "I hiked a lot, but I didn't see any\n" .string "POKéMON I wanted.$" diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index e035cc16e..085c0e37a 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -1,47 +1,47 @@ .set LOCALID_DOOR_GUARD_GRUNT, 6 -SaffronCity_MapScripts:: @ 816735F +SaffronCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_OnTransition .byte 0 -SaffronCity_OnTransition:: @ 8167365 +SaffronCity_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY call_if_unset FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_MoveDoorGuardGrunt end -SaffronCity_EventScript_MoveDoorGuardGrunt:: @ 8167372 +SaffronCity_EventScript_MoveDoorGuardGrunt:: setobjectxyperm LOCALID_DOOR_GUARD_GRUNT, 33, 31 return -SaffronCity_EventScript_RocketGrunt1:: @ 816737A +SaffronCity_EventScript_RocketGrunt1:: msgbox SaffronCity_Text_WhatDoYouWantGetLost, MSGBOX_NPC end -SaffronCity_EventScript_RocketGrunt2:: @ 8167383 +SaffronCity_EventScript_RocketGrunt2:: msgbox SaffronCity_Text_BossTakeTownForTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_RocketGrunt3:: @ 816738C +SaffronCity_EventScript_RocketGrunt3:: msgbox SaffronCity_Text_DontGetDefiantOrIllHurtYou, MSGBOX_NPC end -SaffronCity_EventScript_RocketGrunt4:: @ 8167395 +SaffronCity_EventScript_RocketGrunt4:: msgbox SaffronCity_Text_SaffronBelongsToTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_RocketGrunt5:: @ 816739E +SaffronCity_EventScript_RocketGrunt5:: msgbox SaffronCity_Text_CriminalLifeMakesMeFeelAlive, MSGBOX_NPC end -SaffronCity_EventScript_RocketGrunt6:: @ 81673A7 +SaffronCity_EventScript_RocketGrunt6:: msgbox SaffronCity_Text_WatchWhereYoureWalking, MSGBOX_NPC end -SaffronCity_EventScript_RocketGrunt7:: @ 81673B0 +SaffronCity_EventScript_RocketGrunt7:: msgbox SaffronCity_Text_WeCanExploitMonsAroundWorld, MSGBOX_NPC end -SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9 +SaffronCity_EventScript_DoorGuardGrunt:: lock goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep applymovement LOCALID_DOOR_GUARD_GRUNT, Movement_FacePlayer @@ -50,29 +50,29 @@ SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9 release end -SaffronCity_EventScript_DoorGuardAsleep:: @ 81673D7 +SaffronCity_EventScript_DoorGuardAsleep:: textcolor 3 msgbox SaffronCity_Text_HesTakingASnooze release end -SaffronCity_EventScript_WorkerM:: @ 81673E3 +SaffronCity_EventScript_WorkerM:: msgbox SaffronCity_Text_YouBeatTeamRocket, MSGBOX_NPC end -SaffronCity_EventScript_Youngster:: @ 81673EC +SaffronCity_EventScript_Youngster:: msgbox SaffronCity_Text_SafeToGoOutAgain, MSGBOX_NPC end -SaffronCity_EventScript_Lass:: @ 81673F5 +SaffronCity_EventScript_Lass:: msgbox SaffronCity_Text_PeopleComingBackToSaffron, MSGBOX_NPC end -SaffronCity_EventScript_Boy:: @ 81673FE +SaffronCity_EventScript_Boy:: msgbox SaffronCity_Text_FlewHereOnPidgeot, MSGBOX_NPC end -SaffronCity_EventScript_Pidgeot:: @ 8167407 +SaffronCity_EventScript_Pidgeot:: lock faceplayer waitse @@ -82,45 +82,45 @@ SaffronCity_EventScript_Pidgeot:: @ 8167407 release end -SaffronCity_EventScript_Man:: @ 816741A +SaffronCity_EventScript_Man:: msgbox SaffronCity_Text_SawRocketBossEscaping, MSGBOX_NPC end -SaffronCity_EventScript_CitySign:: @ 8167423 +SaffronCity_EventScript_CitySign:: msgbox SaffronCity_Text_CitySign, MSGBOX_SIGN end -SaffronCity_EventScript_DojoSign:: @ 816742C +SaffronCity_EventScript_DojoSign:: msgbox SaffronCity_Text_FightingDojo, MSGBOX_SIGN end -SaffronCity_EventScript_GymSign:: @ 8167435 +SaffronCity_EventScript_GymSign:: lockall famechecker FAMECHECKER_SABRINA, 0 msgbox SaffronCity_Text_GymSign releaseall end -SaffronCity_EventScript_TrainerTips1:: @ 816744D +SaffronCity_EventScript_TrainerTips1:: msgbox SaffronCity_Text_FullHealCuresStatus, MSGBOX_SIGN end -SaffronCity_EventScript_TrainerTips2:: @ 8167456 +SaffronCity_EventScript_TrainerTips2:: msgbox SaffronCity_Text_GreatBallImprovedCatchRate, MSGBOX_SIGN end -SaffronCity_EventScript_SilphCoSign:: @ 816745F +SaffronCity_EventScript_SilphCoSign:: msgbox SaffronCity_Text_SilphCoSign, MSGBOX_SIGN end -SaffronCity_EventScript_MrPsychicsHouseSign:: @ 8167468 +SaffronCity_EventScript_MrPsychicsHouseSign:: msgbox SaffronCity_Text_MrPsychicsHouse, MSGBOX_SIGN end -SaffronCity_EventScript_SilphProductSign:: @ 8167471 +SaffronCity_EventScript_SilphProductSign:: msgbox SaffronCity_Text_SilphsLatestProduct, MSGBOX_SIGN end -SaffronCity_EventScript_TrainerFanClubSign:: @ 816747A +SaffronCity_EventScript_TrainerFanClubSign:: msgbox SaffronCity_Text_TrainerFanClubSign, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity/text.inc b/data/maps/SaffronCity/text.inc index d3044d14b..bacc22817 100644 --- a/data/maps/SaffronCity/text.inc +++ b/data/maps/SaffronCity/text.inc @@ -1,80 +1,80 @@ -SaffronCity_Text_WhatDoYouWantGetLost:: @ 8181003 +SaffronCity_Text_WhatDoYouWantGetLost:: .string "What do you want?\n" .string "Get lost!$" -SaffronCity_Text_BossTakeTownForTeamRocket:: @ 818101F +SaffronCity_Text_BossTakeTownForTeamRocket:: .string "BOSS said he'll take this town\n" .string "in the name of TEAM ROCKET!$" -SaffronCity_Text_DontGetDefiantOrIllHurtYou:: @ 818105A +SaffronCity_Text_DontGetDefiantOrIllHurtYou:: .string "Don't get defiant!\n" .string "Or I'll have to hurt you!$" -SaffronCity_Text_SaffronBelongsToTeamRocket:: @ 8181087 +SaffronCity_Text_SaffronBelongsToTeamRocket:: .string "SAFFRON belongs to TEAM ROCKET!$" -SaffronCity_Text_CriminalLifeMakesMeFeelAlive:: @ 81810A7 +SaffronCity_Text_CriminalLifeMakesMeFeelAlive:: .string "My life as a criminal makes me feel\n" .string "so alive!$" -SaffronCity_Text_WatchWhereYoureWalking:: @ 81810D5 +SaffronCity_Text_WatchWhereYoureWalking:: .string "Ow!\n" .string "Watch where you're walking!$" -SaffronCity_Text_WeCanExploitMonsAroundWorld:: @ 81810F5 +SaffronCity_Text_WeCanExploitMonsAroundWorld:: .string "With SILPH under control, we can\n" .string "exploit POKéMON around the world!\p" .string "We'll get stinking rich, yeahah!$" -SaffronCity_Text_YouBeatTeamRocket:: @ 8181159 +SaffronCity_Text_YouBeatTeamRocket:: .string "You beat TEAM ROCKET all alone?\n" .string "That's amazing!$" -SaffronCity_Text_SafeToGoOutAgain:: @ 8181189 +SaffronCity_Text_SafeToGoOutAgain:: .string "Yeah! TEAM ROCKET is gone!\n" .string "It's safe to go out again!$" -SaffronCity_Text_PeopleComingBackToSaffron:: @ 81811BF +SaffronCity_Text_PeopleComingBackToSaffron:: .string "People fled from here in droves\n" .string "when those ROCKETS came.\p" .string "They should be flocking back to\n" .string "SAFFRON now.$" -SaffronCity_Text_FlewHereOnPidgeot:: @ 8181225 +SaffronCity_Text_FlewHereOnPidgeot:: .string "I flew here on my PIDGEOT when\n" .string "I read about SILPH.\p" .string "It's already over?\n" .string "I missed the media action…$" -SaffronCity_Text_Pidgeot:: @ 8181286 +SaffronCity_Text_Pidgeot:: .string "PIDGEOT: Bi bibii!$" -SaffronCity_Text_SawRocketBossEscaping:: @ 8181299 +SaffronCity_Text_SawRocketBossEscaping:: .string "I saw the ROCKET BOSS escaping\n" .string "SILPH's building.$" -SaffronCity_Text_ImASecurityGuard:: @ 81812CA +SaffronCity_Text_ImASecurityGuard:: .string "I'm a security guard.\p" .string "Suspicious kids I don't allow in!$" -SaffronCity_Text_HesTakingASnooze:: @ 8181302 +SaffronCity_Text_HesTakingASnooze:: .string "…\n" .string "Snore…\p" .string "Hah! He's taking a snooze!$" -SaffronCity_Text_CitySign:: @ 8181326 +SaffronCity_Text_CitySign:: .string "SAFFRON CITY\n" .string "Shining, Golden Land of Commerce$" -SaffronCity_Text_FightingDojo:: @ 8181354 +SaffronCity_Text_FightingDojo:: .string "FIGHTING DOJO$" -SaffronCity_Text_GymSign:: @ 8181362 +SaffronCity_Text_GymSign:: .string "SAFFRON CITY POKéMON GYM\n" .string "LEADER: SABRINA\l" .string "The Master of PSYCHIC POKéMON!$" -SaffronCity_Text_FullHealCuresStatus:: @ 81813AA +SaffronCity_Text_FullHealCuresStatus:: .string "TRAINER TIPS\p" .string "FULL HEAL cures all ailments like\n" .string "burns, paralysis, poisoning,\l" @@ -82,29 +82,29 @@ SaffronCity_Text_FullHealCuresStatus:: @ 81813AA .string "It costs a bit more, but it's more\n" .string "convenient than buying other items.$" -SaffronCity_Text_GreatBallImprovedCatchRate:: @ 8181452 +SaffronCity_Text_GreatBallImprovedCatchRate:: .string "TRAINER TIPS\p" .string "The new GREAT BALL offers improved\n" .string "catching rates.\p" .string "Try it on those hard-to-catch\n" .string "POKéMON.$" -SaffronCity_Text_SilphCoSign:: @ 81814B9 +SaffronCity_Text_SilphCoSign:: .string "SILPH CO. OFFICE BUILDING$" -SaffronCity_Text_MrPsychicsHouse:: @ 81814D3 +SaffronCity_Text_MrPsychicsHouse:: .string "MR. PSYCHIC'S HOUSE$" -SaffronCity_Text_SilphsLatestProduct:: @ 81814E7 +SaffronCity_Text_SilphsLatestProduct:: .string "SILPH's latest product!\n" .string "Release to be determined…$" -SaffronCity_Text_TrainerFanClubSign:: @ 8181519 +SaffronCity_Text_TrainerFanClubSign:: .string "POKéMON TRAINER FAN CLUB\p" .string "Many TRAINERS have scribbled their\n" .string "names on this sign.$" -SaffronCity_Text_HowCanClubNotRecognizeLance:: @ 8181569 +SaffronCity_Text_HowCanClubNotRecognizeLance:: .string "This FAN CLUB…\n" .string "No one here has a clue!\p" .string "How could they not recognize\n" diff --git a/data/maps/SaffronCity_Connection/scripts.inc b/data/maps/SaffronCity_Connection/scripts.inc index 94f49eb2d..d04a9c516 100644 --- a/data/maps/SaffronCity_Connection/scripts.inc +++ b/data/maps/SaffronCity_Connection/scripts.inc @@ -1,2 +1,2 @@ -SaffronCity_Connection_MapScripts:: @ 8167483 +SaffronCity_Connection_MapScripts:: .byte 0 diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc index e6f779e15..4dfd950e0 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc +++ b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc @@ -1,15 +1,15 @@ -SaffronCity_CopycatsHouse_1F_MapScripts:: @ 816EB36 +SaffronCity_CopycatsHouse_1F_MapScripts:: .byte 0 -SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom:: @ 816EB37 +SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom:: msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered, MSGBOX_NPC end -SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad:: @ 816EB40 +SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad:: msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople, MSGBOX_NPC end -SaffronCity_CopycatsHouse_1F_EventScript_Chansey:: @ 816EB49 +SaffronCity_CopycatsHouse_1F_EventScript_Chansey:: lock faceplayer waitse diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/text.inc b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc index d7efe0281..02f174286 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/text.inc +++ b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc @@ -1,13 +1,13 @@ -SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered:: @ 819AB9B +SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered:: .string "My daughter is so self-centered.\n" .string "She has but a few friends.$" -SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople:: @ 819ABD7 +SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople:: .string "My daughter likes to mimic people.\n" .string "It's rather vexing.\p" .string "Her mimicry has earned her the\n" .string "nickname COPYCAT around here.$" -SaffronCity_CopycatsHouse_1F_Text_Chansey:: @ 819AC4B +SaffronCity_CopycatsHouse_1F_Text_Chansey:: .string "CHANSEY: Chaan! Sii!$" diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc index 361849355..b29cff36d 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc +++ b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc @@ -1,7 +1,7 @@ -SaffronCity_CopycatsHouse_2F_MapScripts:: @ 816EB5C +SaffronCity_CopycatsHouse_2F_MapScripts:: .byte 0 -SaffronCity_CopycatsHouse_2F_EventScript_Doduo:: @ 816EB5D +SaffronCity_CopycatsHouse_2F_EventScript_Doduo:: lock faceplayer waitse @@ -11,13 +11,13 @@ SaffronCity_CopycatsHouse_2F_EventScript_Doduo:: @ 816EB5D release end -SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70 +SaffronCity_CopycatsHouse_2F_EventScript_Doll:: lock msgbox SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll release end -SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B +SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -33,18 +33,18 @@ SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B release end -SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale:: @ 816EBB7 +SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale:: msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale return -SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale:: @ 816EBC0 +SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale:: msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale return -SaffronCity_CopycatsHouse_2F_EventScript_Computer:: @ 816EBC9 +SaffronCity_CopycatsHouse_2F_EventScript_Computer:: msgbox SaffronCity_CopycatsHouse_2F_Text_MySecrets, MSGBOX_SIGN end -SaffronCity_CopycatsHouse_2F_EventScript_Game:: @ 816EBD2 +SaffronCity_CopycatsHouse_2F_EventScript_Game:: msgbox SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/text.inc b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc index 978b660f5..a060ab286 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/text.inc +++ b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc @@ -1,4 +1,4 @@ -SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale:: @ 819AC60 +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale:: .string "{PLAYER}: Hi!\n" .string "Do you like POKéMON?\p" .string "{PLAYER}: Uh, no, I just asked you.\p" @@ -7,7 +7,7 @@ SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale:: @ 819AC60 .string "COPYCAT: Hmm? Quit mimicking?\n" .string "But, that's my favorite hobby!$" -SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale:: @ 819ACF1 +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale:: .string "{PLAYER}: Hi.\n" .string "You must like POKéMON.\p" .string "{PLAYER}: No, not me.\n" @@ -18,7 +18,7 @@ SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale:: @ 819ACF1 .string "COPYCAT: Hmm? Quit mimicking?\l" .string "But that's my favorite hobby!$" -Text_MimicTeach:: @ 819AD85 +Text_MimicTeach:: .string "Oh wow!\n" .string "A POKé DOLL!\p" .string "For me?\n" @@ -26,14 +26,14 @@ Text_MimicTeach:: @ 819AD85 .string "You know what?\n" .string "I can teach the move MIMIC.$" -Text_MimicDeclined:: @ 819ADD8 +Text_MimicDeclined:: .string "Don't you like MIMIC?$" -Text_MimicWhichMon:: @ 819ADEE +Text_MimicWhichMon:: .string "I really love MIMIC!\n" .string "Who's going to learn it?$" -Text_MimicTaughtMale:: @ 819AE1C +Text_MimicTaughtMale:: .string "{PLAYER}: Hi!\n" .string "Thanks for earlier!\p" .string "{PLAYER}: Pardon?\p" @@ -42,7 +42,7 @@ Text_MimicTaughtMale:: @ 819AE1C .string "COPYCAT: You bet!\n" .string "It's a scream!$" -Text_MimicTaughtFemale:: @ 819AE90 +Text_MimicTaughtFemale:: .string "{PLAYER}: Hi!\n" .string "Thanks for what you did for us.\p" .string "{PLAYER}: Pardon?\p" @@ -51,10 +51,10 @@ Text_MimicTaughtFemale:: @ 819AE90 .string "COPYCAT: You bet!\n" .string "It's a scream!$" -SaffronCity_CopycatsHouse_2F_Text_TooMuchInBag:: @ 819AF1A +SaffronCity_CopycatsHouse_2F_Text_TooMuchInBag:: .string "にもつが　いっぱいね！$" -SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMaleJP:: @ 819AF26 +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMaleJP:: .string "{PLAYER}“やあ！　こんにちは！\n" .string "きみ　ポケモン　すきかい？\p" .string "{PLAYER}“ぼく　じゃなくって\n" @@ -66,7 +66,7 @@ SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMaleJP:: @ 819AF26 .string "だって　あたし　\n" .string "ものまね　しゅみ　なんだ　もん！”$" -SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemaleJP:: @ 819AFB0 +SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemaleJP:: .string "{PLAYER}“こんにちは！\n" .string "ポケモン　すきなのね？\p" .string "{PLAYER}“わたし　じゃなくって\n" @@ -78,25 +78,25 @@ SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemaleJP:: @ 819AFB0 .string "だって　あたし\n" .string "ものまね　しゅみ　なんだ　もん！$" -SaffronCity_CopycatsHouse_2F_Text_Doduo:: @ 819B030 +SaffronCity_CopycatsHouse_2F_Text_Doduo:: .string "DODUO: Giiih!\p" .string "PRETTY MIRROR LOOK AT ME,\n" .string "SEE HOW PRETTY I CAN BE?$" -SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll:: @ 819B071 +SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll:: .string "This is a rare POKéMON!\n" .string "Huh? It's only a doll!$" -SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket:: @ 819B0A0 +SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket:: .string "A game with MARIO wearing a bucket\n" .string "on his head!$" -SaffronCity_CopycatsHouse_2F_Text_MySecrets:: @ 819B0D0 +SaffronCity_CopycatsHouse_2F_Text_MySecrets:: .string "…\p" .string "My Secrets!\p" .string "Skill: Mimicry!\n" .string "Hobby: Collecting dolls!\l" .string "Favorite POKéMON: CLEFAIRY!$" -SaffronCity_CopycatsHouse_2F_Text_HuhCantSee:: @ 819B123 +SaffronCity_CopycatsHouse_2F_Text_HuhCantSee:: .string "？　みえないぞ‥$" diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc index 7e08d5684..2cc0b23bc 100644 --- a/data/maps/SaffronCity_Dojo/scripts.inc +++ b/data/maps/SaffronCity_Dojo/scripts.inc @@ -1,9 +1,9 @@ .equ LOCALID_KARATE_MASTER, 5 -SaffronCity_Dojo_MapScripts:: @ 816EBDB +SaffronCity_Dojo_MapScripts:: .byte 0 -SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: @ 816EBDC +SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft @@ -11,7 +11,7 @@ SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: @ 816EBDC releaseall end -SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: @ 816EBEE +SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: lockall setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight @@ -19,7 +19,7 @@ SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: @ 816EBEE releaseall end -SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00 +SaffronCity_Dojo_EventScript_HitmonleeBall:: lock faceplayer goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon @@ -36,12 +36,12 @@ SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00 release end -SaffronCity_Dojo_EventScript_AlreadyGotHitmon:: @ 816EC3C +SaffronCity_Dojo_EventScript_AlreadyGotHitmon:: msgbox SaffronCity_Dojo_Text_BetterNotGetGreedy release end -SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46 +SaffronCity_Dojo_EventScript_HitmonchanBall:: lock faceplayer goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon @@ -58,7 +58,7 @@ SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46 release end -SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82 +SaffronCity_Dojo_EventScript_GiveHitmon:: erasemonpic givemon VAR_TEMP_1, 25, ITEM_NONE compare VAR_RESULT, 0 @@ -70,7 +70,7 @@ SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82 release end -SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5 +SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 playfanfare MUS_LEVEL_UP @@ -86,7 +86,7 @@ SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5 goto SaffronCity_Dojo_EventScript_EndGiveMon end -SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC +SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: removeobject VAR_LAST_TALKED getspeciesname 0, VAR_TEMP_1 playfanfare MUS_LEVEL_UP @@ -101,59 +101,59 @@ SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC goto SaffronCity_Dojo_EventScript_TransferredHitmonToPC end -SaffronCity_Dojo_EventScript_TransferredHitmonToPC:: @ 816ED1E +SaffronCity_Dojo_EventScript_TransferredHitmonToPC:: call EventScript_TransferredToPC goto SaffronCity_Dojo_EventScript_EndGiveMon end -SaffronCity_Dojo_EventScript_EndGiveMon:: @ 816ED29 +SaffronCity_Dojo_EventScript_EndGiveMon:: release end -SaffronCity_Dojo_EventScript_Statue:: @ 816ED2B +SaffronCity_Dojo_EventScript_Statue:: msgbox SaffronCity_Dojo_Text_FightingDojo, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_LeftScroll:: @ 816ED34 +SaffronCity_Dojo_EventScript_LeftScroll:: msgbox SaffronCity_Dojo_Text_EnemiesOnEverySide, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_RightScroll:: @ 816ED3D +SaffronCity_Dojo_EventScript_RightScroll:: msgbox SaffronCity_Dojo_Text_GoesAroundComesAround, MSGBOX_SIGN end -SaffronCity_Dojo_EventScript_Hitoshi:: @ 816ED46 +SaffronCity_Dojo_EventScript_Hitoshi:: trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, SaffronCity_Dojo_Text_HitoshiIntro, SaffronCity_Dojo_Text_HitoshiDefeat msgbox SaffronCity_Dojo_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_Hideki:: @ 816ED5D +SaffronCity_Dojo_EventScript_Hideki:: trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, SaffronCity_Dojo_Text_HidekiIntro, SaffronCity_Dojo_Text_HidekiDefeat msgbox SaffronCity_Dojo_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_Aaron:: @ 816ED74 +SaffronCity_Dojo_EventScript_Aaron:: trainerbattle_single TRAINER_BLACK_BELT_AARON, SaffronCity_Dojo_Text_AaronIntro, SaffronCity_Dojo_Text_AaronDefeat msgbox SaffronCity_Dojo_Text_AaronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_Mike:: @ 816ED8B +SaffronCity_Dojo_EventScript_Mike:: trainerbattle_single TRAINER_BLACK_BELT_MIKE, SaffronCity_Dojo_Text_MikeIntro, SaffronCity_Dojo_Text_MikeDefeat msgbox SaffronCity_Dojo_Text_MikePostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_MasterKoichi:: @ 816EDA2 +SaffronCity_Dojo_EventScript_MasterKoichi:: trainerbattle_single TRAINER_BLACK_BELT_KOICHI, SaffronCity_Dojo_Text_MasterKoichiIntro, SaffronCity_Dojo_Text_MasterKoichiDefeat, SaffronCity_Dojo_EventScript_DefeatedMasterKoichi goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon msgbox SaffronCity_Dojo_Text_ChoosePrizedFightingMon, MSGBOX_AUTOCLOSE end -SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon:: @ 816EDC6 +SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon:: msgbox SaffronCity_Dojo_Text_StayAndTrainWithUs release end -SaffronCity_Dojo_EventScript_DefeatedMasterKoichi:: @ 816EDD0 +SaffronCity_Dojo_EventScript_DefeatedMasterKoichi:: setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1 release end diff --git a/data/maps/SaffronCity_Dojo/text.inc b/data/maps/SaffronCity_Dojo/text.inc index 9c73ffcb9..e6b272e8a 100644 --- a/data/maps/SaffronCity_Dojo/text.inc +++ b/data/maps/SaffronCity_Dojo/text.inc @@ -1,4 +1,4 @@ -SaffronCity_Dojo_Text_MasterKoichiIntro:: @ 819B12C +SaffronCity_Dojo_Text_MasterKoichiIntro:: .string "Grunt!\p" .string "I am the KARATE MASTER!\n" .string "I am the LEADER here!\p" @@ -6,11 +6,11 @@ SaffronCity_Dojo_Text_MasterKoichiIntro:: @ 819B12C .string "Expect no mercy!\p" .string "Fwaaa!$" -SaffronCity_Dojo_Text_MasterKoichiDefeat:: @ 819B193 +SaffronCity_Dojo_Text_MasterKoichiDefeat:: .string "Hwa!\n" .string "Arrgh! Beaten!$" -SaffronCity_Dojo_Text_ChoosePrizedFightingMon:: @ 819B1A7 +SaffronCity_Dojo_Text_ChoosePrizedFightingMon:: .string "Indeed, I have lost!\p" .string "But, I beseech you, do not take\n" .string "our emblem as your trophy!\p" @@ -18,85 +18,85 @@ SaffronCity_Dojo_Text_ChoosePrizedFightingMon:: @ 819B1A7 .string "FIGHTING POKéMON!\p" .string "Choose whichever one you like!$" -SaffronCity_Dojo_Text_StayAndTrainWithUs:: @ 819B24C +SaffronCity_Dojo_Text_StayAndTrainWithUs:: .string "Grunt!\n" .string "Stay and train at karate with us!$" -SaffronCity_Dojo_Text_MikeIntro:: @ 819B275 +SaffronCity_Dojo_Text_MikeIntro:: .string "Hoargh!\n" .string "Take your shoes off!$" -SaffronCity_Dojo_Text_MikeDefeat:: @ 819B292 +SaffronCity_Dojo_Text_MikeDefeat:: .string "I give up!$" -SaffronCity_Dojo_Text_MikePostBattle:: @ 819B29D +SaffronCity_Dojo_Text_MikePostBattle:: .string "You wait 'til you see our MASTER!\n" .string "I'm a small fry compared to him!$" -SaffronCity_Dojo_Text_HidekiIntro:: @ 819B2E0 +SaffronCity_Dojo_Text_HidekiIntro:: .string "I hear you're good!\n" .string "Show me!$" -SaffronCity_Dojo_Text_HidekiDefeat:: @ 819B2FD +SaffronCity_Dojo_Text_HidekiDefeat:: .string "Judge!\n" .string "One point!$" -SaffronCity_Dojo_Text_HidekiPostBattle:: @ 819B30F +SaffronCity_Dojo_Text_HidekiPostBattle:: .string "Our MASTER is a pro fighter.\n" .string "Be prepared to lose!$" -SaffronCity_Dojo_Text_AaronIntro:: @ 819B341 +SaffronCity_Dojo_Text_AaronIntro:: .string "Hiyah!\n" .string "I have no fear for anything tough!\p" .string "I shatter boulders for training\n" .string "every day!$" -SaffronCity_Dojo_Text_AaronDefeat:: @ 819B396 +SaffronCity_Dojo_Text_AaronDefeat:: .string "Yow!\n" .string "Stubbed fingers!$" -SaffronCity_Dojo_Text_AaronPostBattle:: @ 819B3AC +SaffronCity_Dojo_Text_AaronPostBattle:: .string "The only thing that frightens us is\n" .string "psychic power!$" -SaffronCity_Dojo_Text_HitoshiIntro:: @ 819B3DF +SaffronCity_Dojo_Text_HitoshiIntro:: .string "Hwaah!\p" .string "You're trespassing in our\n" .string "FIGHTING DOJO!$" -SaffronCity_Dojo_Text_HitoshiDefeat:: @ 819B40F +SaffronCity_Dojo_Text_HitoshiDefeat:: .string "Oof!\n" .string "I give up!$" -SaffronCity_Dojo_Text_HitoshiPostBattle:: @ 819B41F +SaffronCity_Dojo_Text_HitoshiPostBattle:: .string "The prime fighters across the land\n" .string "train here.$" -SaffronCity_Dojo_Text_YouWantHitmonlee:: @ 819B44E +SaffronCity_Dojo_Text_YouWantHitmonlee:: .string "You want the hard-kicking\n" .string "HITMONLEE?$" -SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster:: @ 819B473 +SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster:: .string "{PLAYER} received the {STR_VAR_1}\n" .string "from the KARATE MASTER.$" -SaffronCity_Dojo_Text_YouWantHitmonchan:: @ 819B49E +SaffronCity_Dojo_Text_YouWantHitmonchan:: .string "You want the piston-punching\n" .string "HITMONCHAN?$" -SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster2:: @ 819B4C7 +SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster2:: .string "{PLAYER}は　カラテ　だいおう　から\n" .string "{STR_VAR_1}を　もらった！$" -SaffronCity_Dojo_Text_BetterNotGetGreedy:: @ 819B4E1 +SaffronCity_Dojo_Text_BetterNotGetGreedy:: .string "Better not get greedy…$" -SaffronCity_Dojo_Text_EnemiesOnEverySide:: @ 819B4F8 +SaffronCity_Dojo_Text_EnemiesOnEverySide:: .string "Enemies on every side!$" -SaffronCity_Dojo_Text_GoesAroundComesAround:: @ 819B50F +SaffronCity_Dojo_Text_GoesAroundComesAround:: .string "What goes around comes around.$" -SaffronCity_Dojo_Text_FightingDojo:: @ 819B52E +SaffronCity_Dojo_Text_FightingDojo:: .string "FIGHTING DOJO$" diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc index 8b4542fab..c142e9e7c 100644 --- a/data/maps/SaffronCity_Gym/scripts.inc +++ b/data/maps/SaffronCity_Gym/scripts.inc @@ -1,7 +1,7 @@ -SaffronCity_Gym_MapScripts:: @ 816EDD7 +SaffronCity_Gym_MapScripts:: .byte 0 -SaffronCity_Gym_EventScript_Sabrina:: @ 816EDD8 +SaffronCity_Gym_EventScript_Sabrina:: famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle_single TRAINER_LEADER_SABRINA, SaffronCity_Gym_Text_SabrinaIntro, SaffronCity_Gym_Text_SabrinaDefeat, SaffronCity_Gym_EventScript_DefeatedSabrina, NO_MUSIC goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, SaffronCity_Gym_EventScript_GiveTM04 @@ -9,7 +9,7 @@ SaffronCity_Gym_EventScript_Sabrina:: @ 816EDD8 release end -SaffronCity_Gym_EventScript_DefeatedSabrina:: @ 816EE0A +SaffronCity_Gym_EventScript_DefeatedSabrina:: famechecker FAMECHECKER_SABRINA, 2 famechecker FAMECHECKER_SABRINA, 3 clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS @@ -19,7 +19,7 @@ SaffronCity_Gym_EventScript_DefeatedSabrina:: @ 816EE0A goto SaffronCity_Gym_EventScript_GiveTM04 end -SaffronCity_Gym_EventScript_GiveTM04:: @ 816EE3D +SaffronCity_Gym_EventScript_GiveTM04:: msgbox SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis checkitemspace ITEM_TM04, 1 compare VAR_RESULT, FALSE @@ -30,48 +30,48 @@ SaffronCity_Gym_EventScript_GiveTM04:: @ 816EE3D release end -SaffronCity_Gym_EventScript_NoRoomForTM04:: @ 816EE7E +SaffronCity_Gym_EventScript_NoRoomForTM04:: msgbox SaffronCity_Gym_Text_BagFullOfOtherItems release end -SaffronCity_Gym_EventScript_Johan:: @ 816EE88 +SaffronCity_Gym_EventScript_Johan:: trainerbattle_single TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_Tyron:: @ 816EE9F +SaffronCity_Gym_EventScript_Tyron:: trainerbattle_single TRAINER_PSYCHIC_TYRON, SaffronCity_Gym_Text_TyronIntro, SaffronCity_Gym_Text_TyronDefeat famechecker FAMECHECKER_SABRINA, 5 msgbox SaffronCity_Gym_Text_TyronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_Cameron:: @ 816EEC3 +SaffronCity_Gym_EventScript_Cameron:: trainerbattle_single TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_Preston:: @ 816EEDA +SaffronCity_Gym_EventScript_Preston:: trainerbattle_single TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_Amanda:: @ 816EEF1 +SaffronCity_Gym_EventScript_Amanda:: trainerbattle_single TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_Stacy:: @ 816EF08 +SaffronCity_Gym_EventScript_Stacy:: trainerbattle_single TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_Tasha:: @ 816EF1F +SaffronCity_Gym_EventScript_Tasha:: trainerbattle_single TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE end -SaffronCity_Gym_EventScript_GymGuy:: @ 816EF36 +SaffronCity_Gym_EventScript_GymGuy:: lock faceplayer goto_if_set FLAG_DEFEATED_SABRINA, SaffronCity_Gym_EventScript_GymGuyPostVictory @@ -79,19 +79,19 @@ SaffronCity_Gym_EventScript_GymGuy:: @ 816EF36 release end -SaffronCity_Gym_EventScript_GymGuyPostVictory:: @ 816EF4B +SaffronCity_Gym_EventScript_GymGuyPostVictory:: msgbox SaffronCity_Gym_Text_GymGuyPostVictory release end -SaffronCity_Gym_EventScript_GymStatue:: @ 816EF55 +SaffronCity_Gym_EventScript_GymStatue:: lockall goto_if_set FLAG_BADGE06_GET, SaffronCity_Gym_EventScript_GymStatuePostVictory msgbox SaffronCity_Gym_Text_GymStatue releaseall end -SaffronCity_Gym_EventScript_GymStatuePostVictory:: @ 816EF69 +SaffronCity_Gym_EventScript_GymStatuePostVictory:: msgbox SaffronCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc index 349c86423..6cd8b937a 100644 --- a/data/maps/SaffronCity_Gym/text.inc +++ b/data/maps/SaffronCity_Gym/text.inc @@ -1,4 +1,4 @@ -SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C +SaffronCity_Gym_Text_SabrinaIntro:: .string "I had a vision of your arrival.\p" .string "I have had psychic powers since\n" .string "I was a child.\p" @@ -7,7 +7,7 @@ SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C .string "I dislike battling, but if you wish,\n" .string "I will show you my powers!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602 +SaffronCity_Gym_Text_SabrinaDefeat:: .string "This loss shocks me!\n" .string "But, a loss is a loss.\p" .string "I admit, I didn't work hard enough\n" @@ -15,13 +15,13 @@ SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602 .string "Your victory has earned you the\n" .string "MARSHBADGE.$" -SaffronCity_Gym_Text_SabrinaPostBattle:: @ 819B685 +SaffronCity_Gym_Text_SabrinaPostBattle:: .string "Psychic power isn't something that\n" .string "only a few people have.\p" .string "Everyone has psychic power.\n" .string "People just don't realize it.$" -SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis:: @ 819B6FA +SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis:: .string "The MARSHBADGE makes POKéMON up\n" .string "to Lv. 70 obey you.\p" .string "Stronger POKéMON will become wild,\n" @@ -30,87 +30,87 @@ SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis:: @ 819B6FA .string "much to avoid that problem.\p" .string "Wait, please take this TM with you.$" -SaffronCity_Gym_Text_ReceivedTM04FromSabrina:: @ 819B7D3 +SaffronCity_Gym_Text_ReceivedTM04FromSabrina:: .string "{PLAYER} received TM04 from\n" .string "SABRINA.$" -SaffronCity_Gym_Text_ExplainTM04:: @ 819B7F2 +SaffronCity_Gym_Text_ExplainTM04:: .string "TM04 is CALM MIND.\p" .string "It makes the POKéMON concentrate\n" .string "to raise both SP. ATK and SP. DEF.$" -SaffronCity_Gym_Text_BagFullOfOtherItems:: @ 819B849 +SaffronCity_Gym_Text_BagFullOfOtherItems:: .string "Your BAG is full of other items.$" -SaffronCity_Gym_Text_AmandaIntro:: @ 819B86A +SaffronCity_Gym_Text_AmandaIntro:: .string "SABRINA is far younger than I,\n" .string "but she has earned my respect.$" -SaffronCity_Gym_Text_AmandaDefeat:: @ 819B8A8 +SaffronCity_Gym_Text_AmandaDefeat:: .string "Not good enough!$" -SaffronCity_Gym_Text_AmandaPostBattle:: @ 819B8B9 +SaffronCity_Gym_Text_AmandaPostBattle:: .string "In a battle of equals, the one\n" .string "with the stronger will wins.\p" .string "If you wish to beat SABRINA, focus\n" .string "and will yourself to victory.$" -SaffronCity_Gym_Text_JohanIntro:: @ 819B936 +SaffronCity_Gym_Text_JohanIntro:: .string "Does our unseen power scare you?$" -SaffronCity_Gym_Text_JohanDefeat:: @ 819B957 +SaffronCity_Gym_Text_JohanDefeat:: .string "I never foresaw this!$" -SaffronCity_Gym_Text_JohanPostBattle:: @ 819B96D +SaffronCity_Gym_Text_JohanPostBattle:: .string "PSYCHIC POKéMON fear only ghosts\n" .string "and bugs!$" -SaffronCity_Gym_Text_StacyIntro:: @ 819B998 +SaffronCity_Gym_Text_StacyIntro:: .string "POKéMON take on the appearance of\n" .string "their TRAINERS.\p" .string "Your POKéMON must be tough, then!$" -SaffronCity_Gym_Text_StacyDefeat:: @ 819B9EC +SaffronCity_Gym_Text_StacyDefeat:: .string "I knew it!$" -SaffronCity_Gym_Text_StacyPostBattle:: @ 819B9F7 +SaffronCity_Gym_Text_StacyPostBattle:: .string "I have much to learn still…\p" .string "I must master PSYCHIC and teach it\n" .string "to my POKéMON…$" -SaffronCity_Gym_Text_TyronIntro:: @ 819BA45 +SaffronCity_Gym_Text_TyronIntro:: .string "You understand, don't you?\p" .string "That power alone isn't enough to\n" .string "win in the world of POKéMON?$" -SaffronCity_Gym_Text_TyronDefeat:: @ 819BA9E +SaffronCity_Gym_Text_TyronDefeat:: .string "I don't believe this!$" -SaffronCity_Gym_Text_TyronPostBattle:: @ 819BAB4 +SaffronCity_Gym_Text_TyronPostBattle:: .string "SABRINA just wiped out the KARATE\n" .string "MASTER next door.$" -SaffronCity_Gym_Text_TashaIntro:: @ 819BAE8 +SaffronCity_Gym_Text_TashaIntro:: .string "You and I, our POKéMON shall\n" .string "battle!$" -SaffronCity_Gym_Text_TashaDefeat:: @ 819BB0D +SaffronCity_Gym_Text_TashaDefeat:: .string "I lost after all!$" -SaffronCity_Gym_Text_TashaPostBattle:: @ 819BB1F +SaffronCity_Gym_Text_TashaPostBattle:: .string "I knew that this was going to take\n" .string "place.$" -SaffronCity_Gym_Text_CameronIntro:: @ 819BB49 +SaffronCity_Gym_Text_CameronIntro:: .string "SABRINA is young, but she's also\n" .string "our highly skilled LEADER.\p" .string "You won't reach her easily!$" -SaffronCity_Gym_Text_CameronDefeat:: @ 819BBA1 +SaffronCity_Gym_Text_CameronDefeat:: .string "Ow!\n" .string "Down and out!$" -SaffronCity_Gym_Text_CameronPostBattle:: @ 819BBB3 +SaffronCity_Gym_Text_CameronPostBattle:: .string "There used to be two POKéMON GYMS\n" .string "in SAFFRON.\p" .string "The FIGHTING DOJO next door lost\n" @@ -118,20 +118,20 @@ SaffronCity_Gym_Text_CameronPostBattle:: @ 819BBB3 .string "We simply creamed them when we\n" .string "decided to have just one GYM.$" -SaffronCity_Gym_Text_PrestonIntro:: @ 819BC57 +SaffronCity_Gym_Text_PrestonIntro:: .string "SAFFRON POKéMON GYM is famous for\n" .string "training psychics.\p" .string "You want to see SABRINA, don't\n" .string "you? I can tell!$" -SaffronCity_Gym_Text_PrestonDefeat:: @ 819BCBC +SaffronCity_Gym_Text_PrestonDefeat:: .string "Arrrgh!$" -SaffronCity_Gym_Text_PrestonPostBattle:: @ 819BCC4 +SaffronCity_Gym_Text_PrestonPostBattle:: .string "That's right! I used telepathy to\n" .string "read your mind!$" -SaffronCity_Gym_Text_GymGuyAdvice:: @ 819BCF6 +SaffronCity_Gym_Text_GymGuyAdvice:: .string "Yo!\n" .string "Champ in the making!\p" .string "SABRINA's POKéMON use psychic\n" @@ -141,18 +141,18 @@ SaffronCity_Gym_Text_GymGuyAdvice:: @ 819BCF6 .string "They'll get destroyed before they\n" .string "can even aim a punch!$" -SaffronCity_Gym_Text_GymGuyPostVictory:: @ 819BDBB +SaffronCity_Gym_Text_GymGuyPostVictory:: .string "Psychic power, huh?\p" .string "If I had that, I'd make a bundle\n" .string "at the slots!$" -SaffronCity_Gym_Text_GymStatue:: @ 819BDFE +SaffronCity_Gym_Text_GymStatue:: .string "SAFFRON POKéMON GYM\n" .string "LEADER: SABRINA\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -SaffronCity_Gym_Text_GymStatuePlayerWon:: @ 819BE37 +SaffronCity_Gym_Text_GymStatuePlayerWon:: .string "SAFFRON POKéMON GYM\n" .string "LEADER: SABRINA\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/SaffronCity_House/scripts.inc b/data/maps/SaffronCity_House/scripts.inc index d94baa8a0..8401002fa 100644 --- a/data/maps/SaffronCity_House/scripts.inc +++ b/data/maps/SaffronCity_House/scripts.inc @@ -1,15 +1,15 @@ -SaffronCity_House_MapScripts:: @ 816EF73 +SaffronCity_House_MapScripts:: .byte 0 -SaffronCity_House_EventScript_Lass:: @ 816EF74 +SaffronCity_House_EventScript_Lass:: msgbox SaffronCity_House_Text_DontLookAtMyLetter, MSGBOX_NPC end -SaffronCity_House_EventScript_Youngster:: @ 816EF7D +SaffronCity_House_EventScript_Youngster:: msgbox SaffronCity_House_Text_GettingCopycatPokeDoll, MSGBOX_NPC end -SaffronCity_House_EventScript_Pidgey:: @ 816EF86 +SaffronCity_House_EventScript_Pidgey:: lock faceplayer waitse @@ -19,6 +19,6 @@ SaffronCity_House_EventScript_Pidgey:: @ 816EF86 release end -SaffronCity_House_EventScript_Letter:: @ 816EF99 +SaffronCity_House_EventScript_Letter:: msgbox SaffronCity_House_Text_ExplainPPUp, MSGBOX_SIGN end diff --git a/data/maps/SaffronCity_House/text.inc b/data/maps/SaffronCity_House/text.inc index 7d13c13fa..955e6a822 100644 --- a/data/maps/SaffronCity_House/text.inc +++ b/data/maps/SaffronCity_House/text.inc @@ -1,17 +1,17 @@ -SaffronCity_House_Text_DontLookAtMyLetter:: @ 819BE74 +SaffronCity_House_Text_DontLookAtMyLetter:: .string "…Thank you for writing.\n" .string "I hope to see you soon!\p" .string "…Hey!\n" .string "Don't look at my letter!$" -SaffronCity_House_Text_Pidgey:: @ 819BEC3 +SaffronCity_House_Text_Pidgey:: .string "PIDGEY: Kurukkoo!$" -SaffronCity_House_Text_GettingCopycatPokeDoll:: @ 819BED5 +SaffronCity_House_Text_GettingCopycatPokeDoll:: .string "The COPYCAT is cute!\n" .string "I'm getting her a POKé DOLL.$" -SaffronCity_House_Text_ExplainPPUp:: @ 819BF07 +SaffronCity_House_Text_ExplainPPUp:: .string "I was given a PP UP as a gift.\p" .string "It's used to increase the PP of\n" .string "a POKéMON's move.\p" diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc index c00a93776..6b18a5fd5 100644 --- a/data/maps/SaffronCity_Mart/scripts.inc +++ b/data/maps/SaffronCity_Mart/scripts.inc @@ -1,15 +1,15 @@ -SaffronCity_Mart_MapScripts:: @ 816EFA2 +SaffronCity_Mart_MapScripts:: .byte 0 -SaffronCity_Mart_EventScript_Lass:: @ 816EFA3 +SaffronCity_Mart_EventScript_Lass:: msgbox SaffronCity_Mart_Text_ReviveIsCostly, MSGBOX_NPC end -SaffronCity_Mart_EventScript_Youngster:: @ 816EFAC +SaffronCity_Mart_EventScript_Youngster:: msgbox SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper, MSGBOX_NPC end -SaffronCity_Mart_EventScript_Clerk:: @ 816EFB5 +SaffronCity_Mart_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -21,7 +21,7 @@ SaffronCity_Mart_EventScript_Clerk:: @ 816EFB5 end .align 2 -SaffronCity_Mart_Items:: @ 816EFDC +SaffronCity_Mart_Items:: .2byte ITEM_GREAT_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_REVIVE diff --git a/data/maps/SaffronCity_Mart/text.inc b/data/maps/SaffronCity_Mart/text.inc index edf13f2fe..f8a0d3542 100644 --- a/data/maps/SaffronCity_Mart/text.inc +++ b/data/maps/SaffronCity_Mart/text.inc @@ -1,10 +1,10 @@ -SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper:: @ 819BF8F +SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper:: .string "MAX REPEL keeps weaker POKéMON\n" .string "from appearing.\p" .string "MAX REPEL stays effective longer\n" .string "than SUPER REPEL.$" -SaffronCity_Mart_Text_ReviveIsCostly:: @ 819BFF1 +SaffronCity_Mart_Text_ReviveIsCostly:: .string "REVIVE is costly, but it revives\n" .string "fainted POKéMON!$" diff --git a/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc index 24bd51cc1..1455945d7 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc +++ b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc @@ -1,7 +1,7 @@ -SaffronCity_MrPsychicsHouse_MapScripts:: @ 816F05E +SaffronCity_MrPsychicsHouse_MapScripts:: .byte 0 -SaffronCity_MrPsychicsHouse_EventScript_MrPsychic:: @ 816F05F +SaffronCity_MrPsychicsHouse_EventScript_MrPsychic:: lock faceplayer goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29 @@ -15,12 +15,12 @@ SaffronCity_MrPsychicsHouse_EventScript_MrPsychic:: @ 816F05F release end -SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29:: @ 816F0AB +SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29:: msgbox SaffronCity_MrPsychicsHouse_Text_YouveNoRoom release end -SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29:: @ 816F0B5 +SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29:: msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29 release end diff --git a/data/maps/SaffronCity_MrPsychicsHouse/text.inc b/data/maps/SaffronCity_MrPsychicsHouse/text.inc index 31d220c69..4270846bd 100644 --- a/data/maps/SaffronCity_MrPsychicsHouse/text.inc +++ b/data/maps/SaffronCity_MrPsychicsHouse/text.inc @@ -1,18 +1,18 @@ -SaffronCity_MrPsychicsHouse_Text_YouWantedThis:: @ 819C142 +SaffronCity_MrPsychicsHouse_Text_YouWantedThis:: .string "…Wait! Don't say a word!\p" .string "You wanted this!$" -SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic:: @ 819C16C +SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic:: .string "{PLAYER} received TM29\n" .string "from MR. PSYCHIC.$" -SaffronCity_MrPsychicsHouse_Text_ExplainTM29:: @ 819C18F +SaffronCity_MrPsychicsHouse_Text_ExplainTM29:: .string "You already know, don't you?\n" .string "TM29 is PSYCHIC.\p" .string "It's an attack that may also lower\n" .string "the target's special stats.$" -SaffronCity_MrPsychicsHouse_Text_YouveNoRoom:: @ 819C1FC +SaffronCity_MrPsychicsHouse_Text_YouveNoRoom:: .string "Where do you plan to put this?\n" .string "You've no room.$" diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc index b8e2385e6..24986f8e8 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc @@ -1,28 +1,28 @@ -SaffronCity_PokemonCenter_1F_MapScripts:: @ 816EFEC +SaffronCity_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7 +SaffronCity_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_SAFFRON_CITY end -SaffronCity_PokemonCenter_1F_EventScript_Nurse:: @ 816EFFB +SaffronCity_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -SaffronCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816F004 +SaffronCity_PokemonCenter_1F_EventScript_Gentleman:: msgbox SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame, MSGBOX_NPC end -SaffronCity_PokemonCenter_1F_EventScript_Woman:: @ 816F00D +SaffronCity_PokemonCenter_1F_EventScript_Woman:: msgbox SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies, MSGBOX_NPC end -SaffronCity_PokemonCenter_1F_EventScript_Youngster:: @ 816F016 +SaffronCity_PokemonCenter_1F_EventScript_Youngster:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -31,7 +31,7 @@ SaffronCity_PokemonCenter_1F_EventScript_Youngster:: @ 816F016 release end -SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone:: @ 816F02D +SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone:: msgbox SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff release end diff --git a/data/maps/SaffronCity_PokemonCenter_1F/text.inc b/data/maps/SaffronCity_PokemonCenter_1F/text.inc index 51d64d42c..5ad48d77a 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/text.inc +++ b/data/maps/SaffronCity_PokemonCenter_1F/text.inc @@ -1,19 +1,19 @@ -SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies:: @ 819C023 +SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies:: .string "POKéMON growth rates differ from\n" .string "species to species.$" -SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame:: @ 819C058 +SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame:: .string "SILPH CO. is widely known to all.\p" .string "It's a victim of its own fame - it\n" .string "attracted TEAM ROCKET.$" -SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets:: @ 819C0B4 +SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets:: .string "Sigh…\n" .string "Wouldn't this be great?\p" .string "If the ELITE FOUR came and\n" .string "stomped TEAM ROCKET?$" -SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff:: @ 819C102 +SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff:: .string "TEAM ROCKET took off!\n" .string "We can go out safely again!\l" .string "That's great!$" diff --git a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc index 5a62223a3..94cc9b51b 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/SaffronCity_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 +SaffronCity_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ SaffronCity_PokemonCenter_2F_MapScripts:: @ 816F037 .byte 0 @ The below 3 are unused and leftover from RS -SaffronCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816F04C +SaffronCity_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -SaffronCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816F052 +SaffronCity_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -SaffronCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816F058 +SaffronCity_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc index ef2bb7131..4bd8bb684 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc @@ -7,16 +7,16 @@ .set LOCALID_BEAUTY, 7 .set LOCALID_BLACK_BELT, 8 -SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF +SaffronCity_PokemonTrainerFanClub_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, SaffronCity_PokemonTrainerFanClub_OnFrame map_script MAP_SCRIPT_ON_TRANSITION, SaffronCity_PokemonTrainerFanClub_OnTransition .byte 0 -SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA +SaffronCity_PokemonTrainerFanClub_OnFrame:: map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans .2byte 0 -SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 816F0D4 +SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: lockall textcolor 1 applymovement LOCALID_BATTLE_GIRL, Movement_WalkInPlaceFastestDown @@ -37,7 +37,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 816F0D4 releaseall end -SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F124 +SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: delay_16 delay_8 walk_down @@ -48,7 +48,7 @@ SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F124 step_end @ Unused, leftover from RS -LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F12C +LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: delay_8 walk_in_place_fastest_down walk_down @@ -59,7 +59,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F12C step_end @ Unused, leftover from RS -LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: @ 816F134 +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: walk_fast_left walk_fast_left walk_fast_down @@ -69,13 +69,13 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: @ 816F134 step_end @ Unused, leftover from RS -LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:: @ 816F13B +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:: walk_down walk_in_place_fastest_right step_end @ Unused, leftover from RS -LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: @ 816F13E +LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: jump_in_place_right walk_fast_up walk_fast_up @@ -83,14 +83,14 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: @ 816F13E walk_in_place_fastest_down step_end -SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144 +SaffronCity_PokemonTrainerFanClub_OnTransition:: compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions end -SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F15B +SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: special Script_TryLoseFansFromPlayTime setvar VAR_0x8004, FANCLUB_MEMBER1 specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer @@ -126,47 +126,47 @@ SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F1 call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 816F207 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: setobjectxyperm LOCALID_BATTLE_GIRL, 5, 2 setobjectmovementtype LOCALID_BATTLE_GIRL, MOVEMENT_TYPE_FACE_UP return -SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 816F213 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: setobjectxyperm LOCALID_YOUNGSTER, 7, 4 setobjectmovementtype LOCALID_YOUNGSTER, MOVEMENT_TYPE_FACE_LEFT return -SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 816F21F +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: setobjectxyperm LOCALID_GENTLEMAN, 2, 2 setobjectmovementtype LOCALID_GENTLEMAN, MOVEMENT_TYPE_FACE_UP return -SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 816F22B +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: setobjectxyperm LOCALID_LITTLE_GIRL, 3, 4 setobjectmovementtype LOCALID_LITTLE_GIRL, MOVEMENT_TYPE_FACE_RIGHT return -SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 816F237 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: setobjectxyperm LOCALID_ROCKER, 4, 6 setobjectmovementtype LOCALID_ROCKER, MOVEMENT_TYPE_FACE_UP return -SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 816F243 +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: setobjectxyperm LOCALID_WOMAN, 10, 3 setobjectmovementtype LOCALID_WOMAN, MOVEMENT_TYPE_FACE_UP return -SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 816F24F +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: setobjectxyperm LOCALID_BEAUTY, 7, 5 setobjectmovementtype LOCALID_BEAUTY, MOVEMENT_TYPE_FACE_LEFT return -SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 816F25B +SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: setobjectxyperm LOCALID_BLACK_BELT, 9, 6 setobjectmovementtype LOCALID_BLACK_BELT, MOVEMENT_TYPE_FACE_LEFT return -SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: @ 816F267 +SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable @@ -174,7 +174,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: @ 81 call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER1 @@ -191,7 +191,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281 release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan @@ -199,22 +199,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0 release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan:: @ 816F2DA +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan:: @ 816F2E4 +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe release end -SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion:: @ 816F2EE +SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion:: msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling release end -SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER4 @@ -231,7 +231,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8 release end -SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan @@ -239,22 +239,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337 release end -SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan:: @ 816F351 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan release end -SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan:: @ 816F35B +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan release end -SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion:: @ 816F365 +SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion:: msgbox SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay release end -SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F +SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER2 @@ -271,7 +271,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F release end -SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan @@ -279,22 +279,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE release end -SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan:: @ 816F3C8 +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou release end -SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan:: @ 816F3D2 +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd release end -SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion:: @ 816F3DC +SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion:: msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool release end -SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6 +SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER3 @@ -311,7 +311,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6 release end -SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan @@ -319,22 +319,22 @@ SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425 release end -SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan:: @ 816F43F +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence release end -SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan:: @ 816F449 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo release end -SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion:: @ 816F453 +SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion:: msgbox SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning release end -SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D +SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER6 @@ -349,7 +349,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D release end -SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491 +SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan @@ -357,17 +357,17 @@ SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491 release end -SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan:: @ 816F4AB +SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan release end -SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan:: @ 816F4B5 +SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou release end -SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF +SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER5 @@ -382,7 +382,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF release end -SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3 +SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan @@ -390,17 +390,17 @@ SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3 release end -SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan:: @ 816F50D +SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans release end -SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan:: @ 816F517 +SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan release end -SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521 +SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER7 @@ -415,7 +415,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521 release end -SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555 +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan @@ -423,17 +423,17 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555 release end -SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan:: @ 816F56F +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan release end -SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan:: @ 816F579 +SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart release end -SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: lock faceplayer setvar VAR_0x8004, FANCLUB_MEMBER8 @@ -448,7 +448,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583 release end -SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub compare VAR_RESULT, 1 goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan @@ -456,12 +456,12 @@ SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7 release end -SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan:: @ 816F5D1 +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan release end -SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan:: @ 816F5DB +SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan:: msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster release end diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc index fb9358c70..1b7780b7f 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc @@ -1,8 +1,8 @@ -SaffronCity_PokemonTrainerFanClub_Text_HuhYou:: @ 819C22B +SaffronCity_PokemonTrainerFanClub_Text_HuhYou:: .string "Huh?\n" .string "You…$" -SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow:: @ 819C235 +SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow:: .string "Are you maybe…\n" .string "… …\p" .string "You are!\n" @@ -19,17 +19,17 @@ SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow:: @ 819C235 .string "That way, maybe other people will\n" .string "become fans just like me.$" -SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou:: @ 819C390 +SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou:: .string "I'll always be cheering for you!\p" .string "Go, {PLAYER}, go!$" -SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou:: @ 819C3BD +SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou:: .string "I'll always believe in you,\n" .string "{PLAYER}.\p" .string "Please show the others what you're\n" .string "like when you battle seriously.$" -SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore:: @ 819C420 +SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore:: .string "I'm sorry.\n" .string "I was your fan before.\p" .string "But now, you seem to have lost\n" @@ -37,7 +37,7 @@ SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore:: @ 819C420 .string "Lately, I think {STR_VAR_1} has been\n" .string "a lot cooler.$" -SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe:: @ 819C4A5 +SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe:: .string "Oh!\n" .string "{PLAYER}!\p" .string "Everyone's been all excited about\n" @@ -48,12 +48,12 @@ SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe:: @ 819C4A5 .string "Once I became {STR_VAR_1}'s fan,\n" .string "I can't just stop being a fan.$" -SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling:: @ 819C55C +SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling:: .string "I think TRAINERS are so cool when\n" .string "they're battling.\p" .string "Don't you think so, too?$" -SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts:: @ 819C5A9 +SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts:: .string "Oh! It's {PLAYER}!\n" .string "Too cool!\p" .string "Oh!\n" @@ -61,7 +61,7 @@ SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts:: @ 819C5A9 .string "Can you autograph something?\n" .string "How about my shorts?$" -SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou:: @ 819C600 +SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou:: .string "However hot it's been…\p" .string "And however cold it may get…\p" .string "I've always believed in, and worn,\n" @@ -71,7 +71,7 @@ SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou:: @ 819C600 .string "I believe in you just as much as\n" .string "I believe in shorts!$" -SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero:: @ 819C6BA +SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero:: .string "BROCK's my hero!\n" .string "He's a man among men!\p" .string "Heheh, I got my mom to do\n" @@ -79,7 +79,7 @@ SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero:: @ 819C6BA .string "I got her to embroider “BROCK”\n" .string "on my shorts!$" -SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd:: @ 819C73A +SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd:: .string "… …\p" .string "… …\n" .string "I'm BROCK's fan!\p" @@ -88,13 +88,13 @@ SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd:: @ 819C73A .string "and on my shorts!\p" .string "I'll be his fan to the bitter end!$" -SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool:: @ 819C7C8 +SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool:: .string "BROCK's the last word on cool,\n" .string "end of story!\p" .string "Now there's a guy who I want to\n" .string "be like!$" -SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle:: @ 819C81E +SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle:: .string "{PLAYER}, I've had the pleasure of\n" .string "watching you battle.\p" .string "It brings back sweet memories of\n" @@ -102,7 +102,7 @@ SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle:: @ 819C81 .string "May you continue to find success.\n" .string "You have a fan in me!$" -SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence:: @ 819C8C1 +SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence:: .string "I have journeyed far and wide\n" .string "across the lands.\p" .string "But never have I seen a TRAINER\n" @@ -112,13 +112,13 @@ SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence:: @ 81 .string "Make that a promise to me,\n" .string "my young idol!$" -SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre:: @ 819C986 +SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre:: .string "Hmm…\n" .string "And you are?\p" .string "Were you hoping to sign up for\n" .string "a membership in our FAN CLUB?$" -SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo:: @ 819C9D5 +SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo:: .string "Ah, so you are the much-\n" .string "talked-about {PLAYER}.\p" .string "You certainly do have the look of\n" @@ -128,7 +128,7 @@ SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo:: @ 819C9D5 .string "… …\p" .string "You've still a ways to go!$" -SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning:: @ 819CA7C +SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning:: .string "All of us gathered here are fans\n" .string "of POKéMON TRAINERS.\p" .string "The way they look in battle…\n" @@ -136,12 +136,12 @@ SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning:: @ 81 .string "Perhaps you will be talked about\n" .string "here, too, if you keep winning.$" -SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay:: @ 819CB32 +SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay:: .string "It's {PLAYER}!\n" .string "It's {PLAYER}!\p" .string "I want to be like {PLAYER} one day!$" -SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan:: @ 819CB62 +SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan:: .string "Everyone stopped being {PLAYER}'s\n" .string "fan…\p" .string "But that means I can have {PLAYER}\n" @@ -149,13 +149,13 @@ SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan:: @ 819C .string "Yay! Go for it!\n" .string "My one and only {PLAYER}!$" -SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina:: @ 819CBD3 +SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina:: .string "Do you know what?\n" .string "I want to be like SABRINA!\p" .string "I want to be a psychic girl just\n" .string "like her!$" -SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan:: @ 819CC2B +SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan:: .string "Even if I'm the only one, I won't\n" .string "stop being SABRINA's fan.\p" .string "My dream is to be like SABRINA,\n" @@ -163,11 +163,11 @@ SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan:: @ 819CC2B .string "I want to be a psychic girl just\n" .string "like her!$" -SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay:: @ 819CCC2 +SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay:: .string "I wonder if I can become a cool\n" .string "TRAINER one day?$" -SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool:: @ 819CCF3 +SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool:: .string "Oh, man, oh, man!\n" .string "Cool! Too cool!\p" .string "…Huh?\n" @@ -175,7 +175,7 @@ SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool:: @ 819CCF3 .string "Just the way you battle.\n" .string "That's cool.$" -SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans:: @ 819CD4E +SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans:: .string "Yo, {PLAYER}!\p" .string "Looks like I'm the only one left\n" .string "out of your fans.\p" @@ -183,13 +183,13 @@ SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans:: @ 819CD4E .string "fan… It's less stressful.\p" .string "Keep up and at it!$" -SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks:: @ 819CDDA +SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks:: .string "{STR_VAR_1}'s cool, huh?\n" .string "I love the way he talks.\p" .string "I'd really relish a chance to meet\n" .string "him in person once.$" -SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan:: @ 819CE3A +SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan:: .string "Huh, can you believe it?\n" .string "Everyone turned into your fans.\p" .string "So after all we've been through,\n" @@ -197,7 +197,7 @@ SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan:: @ 819CE3A .string "Eh, being the one and only\n" .string "{STR_VAR_1} fan's my style, anyway.$" -SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle:: @ 819CEDF +SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle:: .string "Oh, my goodness!\n" .string "Is it really you, {PLAYER}?\p" .string "I have to tell you, I adore the\n" @@ -205,7 +205,7 @@ SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle:: @ 819CEDF .string "I hope you'll keep at it.\n" .string "I'll be your number one fan!$" -SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan:: @ 819CF6D +SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan:: .string "Oh, my goodness!\n" .string "If it isn't {PLAYER}!\p" .string "It's so disappointing… I realized\n" @@ -214,13 +214,13 @@ SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan:: @ 819CF6D .string "Let me cheer you on, at least!\p" .string "Hurray, hurray, {PLAYER}!$" -SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire:: @ 819D01F +SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire:: .string "Recently, {STR_VAR_1} has been on\n" .string "fire.\p" .string "The way he battles… It's just \n" .string "the way that I like it!$" -SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou:: @ 819D075 +SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou:: .string "Oh, hello!\n" .string "If it isn't {PLAYER}!\p" .string "Lately, all everyone talks about\n" @@ -228,25 +228,25 @@ SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou:: @ 819D075 .string "I'm feeling lonesome because I\n" .string "prefer {STR_VAR_1}.$" -SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing:: @ 819D0E3 +SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing:: .string "Amazing!\n" .string "{PLAYER}, you really are amazing!\p" .string "Instead of just watching, maybe\n" .string "I should become a TRAINER, too.$" -SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan:: @ 819D148 +SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan:: .string "I'm your only fan…\n" .string "Sigh… This is lonely…\p" .string "Can't you try harder and make the\n" .string "others take notice of you?$" -SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity:: @ 819D1AE +SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity:: .string "Master {STR_VAR_1} is so dignified…\n" .string "He is so my type.\p" .string "Why can't the others see the\n" .string "dignity he simply oozes?$" -SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart:: @ 819D211 +SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart:: .string "I believe in Master {STR_VAR_1}\n" .string "with all my heart.\p" .string "Even if I am the only one to\n" @@ -255,14 +255,14 @@ SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart:: @ 819D211 .string "Not if I keep thinking about Master\n" .string "{STR_VAR_1}.$" -SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational:: @ 819D2B4 +SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational:: .string "Hiyah!\p" .string "Your battling style is most\n" .string "educational.\p" .string "I hope that you will keep plugging\n" .string "away at success, hiyah!$" -SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan:: @ 819D31F +SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan:: .string "Instead of just watching others\n" .string "battle, battle yourself!\p" .string "…My DOJO's MASTER chewed me out\n" @@ -271,7 +271,7 @@ SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan:: @ 819D31F .string "being your fan!\p" .string "I can't stop being your fan!$" -SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect:: @ 819D3D2 +SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect:: .string "Hiyah! There is but one TRAINER\n" .string "who has my respect.\p" .string "And that is none other than my\n" @@ -279,7 +279,7 @@ SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect:: @ 819D3D2 .string "You should become a fan of my\n" .string "MASTER like me! Hiyah!$" -SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster:: @ 819D477 +SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster:: .string "Hiyah! I respect my MASTER at the\n" .string "FIGHTING DOJO.\p" .string "I will never become a fan of\n" diff --git a/data/maps/SeafoamIslands_1F/scripts.inc b/data/maps/SeafoamIslands_1F/scripts.inc index 5cb6d2208..039742b60 100644 --- a/data/maps/SeafoamIslands_1F/scripts.inc +++ b/data/maps/SeafoamIslands_1F/scripts.inc @@ -1,7 +1,7 @@ -SeafoamIslands_1F_MapScripts:: @ 8162F43 +SeafoamIslands_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_1F_OnTransition .byte 0 -SeafoamIslands_1F_OnTransition:: @ 8162F49 +SeafoamIslands_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SEAFOAM_ISLANDS_1F end diff --git a/data/maps/SeafoamIslands_B1F/scripts.inc b/data/maps/SeafoamIslands_B1F/scripts.inc index 25fc3de3c..2addc30b8 100644 --- a/data/maps/SeafoamIslands_B1F/scripts.inc +++ b/data/maps/SeafoamIslands_B1F/scripts.inc @@ -1,2 +1,2 @@ -SeafoamIslands_B1F_MapScripts:: @ 8162F4D +SeafoamIslands_B1F_MapScripts:: .byte 0 diff --git a/data/maps/SeafoamIslands_B2F/scripts.inc b/data/maps/SeafoamIslands_B2F/scripts.inc index e719cc327..9389f8308 100644 --- a/data/maps/SeafoamIslands_B2F/scripts.inc +++ b/data/maps/SeafoamIslands_B2F/scripts.inc @@ -1,2 +1,2 @@ -SeafoamIslands_B2F_MapScripts:: @ 8162F4E +SeafoamIslands_B2F_MapScripts:: .byte 0 diff --git a/data/maps/SeafoamIslands_B3F/scripts.inc b/data/maps/SeafoamIslands_B3F/scripts.inc index d45cc05e9..e130a05d9 100644 --- a/data/maps/SeafoamIslands_B3F/scripts.inc +++ b/data/maps/SeafoamIslands_B3F/scripts.inc @@ -1,16 +1,16 @@ .equ NUM_BOULDERS_PRESENT, VAR_TEMP_2 -SeafoamIslands_B3F_MapScripts:: @ 8162F4F +SeafoamIslands_B3F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B3F_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B3F_OnFrame .byte 0 -SeafoamIslands_B3F_OnTransition:: @ 8162F5A +SeafoamIslands_B3F_OnTransition:: call_if_unset FLAG_STOPPED_SEAFOAM_B3F_CURRENT, SeafoamIslands_B3F_EventScript_CheckStoppedCurrent call_if_set FLAG_STOPPED_SEAFOAM_B3F_CURRENT, SeafoamIslands_B3F_EventScript_SetNoCurrentLayout end -SeafoamIslands_B3F_EventScript_CheckStoppedCurrent:: @ 8162F6D +SeafoamIslands_B3F_EventScript_CheckStoppedCurrent:: setvar NUM_BOULDERS_PRESENT, 0 call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, SeafoamIslands_B3F_EventScript_AddBoulderPresent call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_2, SeafoamIslands_B3F_EventScript_AddBoulderPresent @@ -18,19 +18,19 @@ SeafoamIslands_B3F_EventScript_CheckStoppedCurrent:: @ 8162F6D call_if_eq SeafoamIslands_B3F_EventScript_StoppedCurrent return -SeafoamIslands_B3F_EventScript_StoppedCurrent:: @ 8162F90 +SeafoamIslands_B3F_EventScript_StoppedCurrent:: setflag FLAG_STOPPED_SEAFOAM_B3F_CURRENT return -SeafoamIslands_B3F_EventScript_SetNoCurrentLayout:: @ 8162F94 +SeafoamIslands_B3F_EventScript_SetNoCurrentLayout:: setmaplayoutindex LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED return -SeafoamIslands_B3F_OnFrame:: @ 8162F98 +SeafoamIslands_B3F_OnFrame:: map_script_2 VAR_TEMP_1, 1, SeafoamIslands_B3F_EventScript_EnterByFalling .2byte 0 -SeafoamIslands_B3F_EventScript_EnterByFalling:: @ 8162FA2 +SeafoamIslands_B3F_EventScript_EnterByFalling:: lockall setvar NUM_BOULDERS_PRESENT, 0 call_if_unset FLAG_HIDE_SEAFOAM_B3F_BOULDER_1, SeafoamIslands_B3F_EventScript_AddBoulderPresent @@ -48,26 +48,26 @@ SeafoamIslands_B3F_EventScript_EnterByFalling:: @ 8162FA2 releaseall end -SeafoamIslands_B3F_EventScript_AddBoulderPresent:: @ 8162FF0 +SeafoamIslands_B3F_EventScript_AddBoulderPresent:: addvar NUM_BOULDERS_PRESENT, 1 return -SeafoamIslands_B3F_EventScript_RideCurrentFar:: @ 8162FF6 +SeafoamIslands_B3F_EventScript_RideCurrentFar:: applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentFar waitmovement 0 return -SeafoamIslands_B3F_EventScript_RideCurrentClose:: @ 8163001 +SeafoamIslands_B3F_EventScript_RideCurrentClose:: applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B3F_Movement_RideCurrentClose waitmovement 0 return -SeafoamIslands_B3F_EventScript_CurrentBlocked:: @ 816300C +SeafoamIslands_B3F_EventScript_CurrentBlocked:: setvar VAR_TEMP_1, 0 releaseall end -SeafoamIslands_B3F_Movement_RideCurrentFar:: @ 8163013 +SeafoamIslands_B3F_Movement_RideCurrentFar:: walk_fast_down walk_fast_down walk_fast_down @@ -83,7 +83,7 @@ SeafoamIslands_B3F_Movement_RideCurrentFar:: @ 8163013 walk_fast_down step_end -SeafoamIslands_B3F_Movement_RideCurrentClose:: @ 8163021 +SeafoamIslands_B3F_Movement_RideCurrentClose:: walk_fast_down walk_fast_down walk_fast_down diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 9970bde9c..31cb2fe30 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -1,6 +1,6 @@ .equ NUM_BOULDERS_PRESENT, VAR_TEMP_2 -SeafoamIslands_B4F_MapScripts:: @ 816302E +SeafoamIslands_B4F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SeafoamIslands_B4F_OnTransition map_script MAP_SCRIPT_ON_RESUME, SeafoamIslands_B4F_OnResume map_script MAP_SCRIPT_ON_LOAD, SeafoamIslands_B4F_OnLoad @@ -8,24 +8,24 @@ SeafoamIslands_B4F_MapScripts:: @ 816302E map_script MAP_SCRIPT_ON_FRAME_TABLE, SeafoamIslands_B4F_OnFrame .byte 0 -SeafoamIslands_B4F_OnResume:: @ 8163048 +SeafoamIslands_B4F_OnResume:: call_if_set FLAG_SYS_SPECIAL_WILD_BATTLE, SeafoamIslands_B4F_EventScript_TryRemoveArticuno end -SeafoamIslands_B4F_EventScript_TryRemoveArticuno:: @ 8163052 +SeafoamIslands_B4F_EventScript_TryRemoveArticuno:: specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne EventScript_Return removeobject VAR_LAST_TALKED return -SeafoamIslands_B4F_OnTransition:: @ 8163066 +SeafoamIslands_B4F_OnTransition:: call_if_unset FLAG_FOUGHT_ARTICUNO, SeafoamIslands_B4F_EventScript_ShowArticuno call_if_unset FLAG_STOPPED_SEAFOAM_B4F_CURRENT, SeafoamIslands_B4F_EventScript_CheckStoppedCurrent call_if_set FLAG_STOPPED_SEAFOAM_B4F_CURRENT, SeafoamIslands_B4F_EventScript_SetNoCurrentLayout end -SeafoamIslands_B4F_EventScript_CheckStoppedCurrent:: @ 8163082 +SeafoamIslands_B4F_EventScript_CheckStoppedCurrent:: setvar NUM_BOULDERS_PRESENT, 0 call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, SeafoamIslands_B4F_EventScript_AddBoulderPresent @@ -33,19 +33,19 @@ SeafoamIslands_B4F_EventScript_CheckStoppedCurrent:: @ 8163082 call_if_eq SeafoamIslands_B4F_EventScript_StoppedCurrent return -SeafoamIslands_B4F_EventScript_StoppedCurrent:: @ 81630A5 +SeafoamIslands_B4F_EventScript_StoppedCurrent:: setflag FLAG_STOPPED_SEAFOAM_B4F_CURRENT return -SeafoamIslands_B4F_EventScript_SetNoCurrentLayout:: @ 81630A9 +SeafoamIslands_B4F_EventScript_SetNoCurrentLayout:: setmaplayoutindex LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED return -SeafoamIslands_B4F_EventScript_ShowArticuno:: @ 81630AD +SeafoamIslands_B4F_EventScript_ShowArticuno:: clearflag FLAG_HIDE_ARTICUNO return -SeafoamIslands_B4F_OnLoad:: @ 81630B1 +SeafoamIslands_B4F_OnLoad:: setvar NUM_BOULDERS_PRESENT, 0 call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_2, SeafoamIslands_B4F_EventScript_AddBoulderPresent @@ -53,27 +53,27 @@ SeafoamIslands_B4F_OnLoad:: @ 81630B1 goto_if_eq SeafoamIslands_B4F_EventScript_SetCalmWaterNearStairs end -SeafoamIslands_B4F_EventScript_SetCalmWaterNearStairs:: @ 81630D4 +SeafoamIslands_B4F_EventScript_SetCalmWaterNearStairs:: setmetatile 12, 14, METATILE_General_CalmWater, 0 setmetatile 13, 14, METATILE_General_CalmWater, 0 end -SeafoamIslands_B4F_OnWarp:: @ 81630E7 +SeafoamIslands_B4F_OnWarp:: map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, SeafoamIslands_B4F_EventScript_WarpInOnCurrent .2byte 0 -SeafoamIslands_B4F_EventScript_WarpInOnCurrent:: @ 81630F1 +SeafoamIslands_B4F_EventScript_WarpInOnCurrent:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH special ForcePlayerToStartSurfing end -SeafoamIslands_B4F_OnFrame:: @ 81630F9 +SeafoamIslands_B4F_OnFrame:: map_script_2 VAR_MAP_SCENE_SEAFOAM_ISLANDS_B4F, 1, SeafoamIslands_B4F_EventScript_EnterOnCurrent map_script_2 VAR_TEMP_1, 1, SeafoamIslands_B4F_EventScript_EnterByFalling .2byte 0 @ The current the player is forced in on from B3F -SeafoamIslands_B4F_EventScript_EnterOnCurrent:: @ 816310B +SeafoamIslands_B4F_EventScript_EnterOnCurrent:: lockall applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_EnterOnCurrent waitmovement 0 @@ -81,14 +81,14 @@ SeafoamIslands_B4F_EventScript_EnterOnCurrent:: @ 816310B releaseall end -SeafoamIslands_B4F_Movement_EnterOnCurrent:: @ 816311D +SeafoamIslands_B4F_Movement_EnterOnCurrent:: walk_fast_up walk_fast_up walk_fast_up step_end @ The current the player lands on when entering the map by falling -SeafoamIslands_B4F_EventScript_EnterByFalling:: @ 8163121 +SeafoamIslands_B4F_EventScript_EnterByFalling:: lockall setvar NUM_BOULDERS_PRESENT, 0 call_if_unset FLAG_HIDE_SEAFOAM_B4F_BOULDER_1, SeafoamIslands_B4F_EventScript_AddBoulderPresent @@ -105,26 +105,26 @@ SeafoamIslands_B4F_EventScript_EnterByFalling:: @ 8163121 releaseall end -SeafoamIslands_B4F_EventScript_AddBoulderPresent:: @ 8163169 +SeafoamIslands_B4F_EventScript_AddBoulderPresent:: addvar NUM_BOULDERS_PRESENT, 1 return -SeafoamIslands_B4F_EventScript_RideCurrentFar:: @ 816316F +SeafoamIslands_B4F_EventScript_RideCurrentFar:: applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentFar waitmovement 0 return -SeafoamIslands_B4F_EventScript_RideCurrentClose:: @ 816317A +SeafoamIslands_B4F_EventScript_RideCurrentClose:: applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_RideCurrentClose waitmovement 0 return -SeafoamIslands_B4F_EventScript_CurrentBlocked:: @ 8163185 +SeafoamIslands_B4F_EventScript_CurrentBlocked:: setvar VAR_TEMP_1, 0 releaseall end -SeafoamIslands_B4F_Movement_RideCurrentFar:: @ 816318C +SeafoamIslands_B4F_Movement_RideCurrentFar:: walk_up walk_up walk_up @@ -135,7 +135,7 @@ SeafoamIslands_B4F_Movement_RideCurrentFar:: @ 816318C walk_up step_end -SeafoamIslands_B4F_Movement_RideCurrentClose:: @ 8163195 +SeafoamIslands_B4F_Movement_RideCurrentClose:: walk_up walk_up walk_up @@ -146,18 +146,18 @@ SeafoamIslands_B4F_Movement_RideCurrentClose:: @ 8163195 step_end @ Triggers blocking re-entry to B3F -SeafoamIslands_B4F_EventScript_UpwardCurrent:: @ 816319D +SeafoamIslands_B4F_EventScript_UpwardCurrent:: lockall applymovement OBJ_EVENT_ID_PLAYER, SeafoamIslands_B4F_Movement_WalkUp waitmovement 0 releaseall end -SeafoamIslands_B4F_Movement_WalkUp:: @ 81631AA +SeafoamIslands_B4F_Movement_WalkUp:: walk_up step_end -SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC +SeafoamIslands_B4F_EventScript_Articuno:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -186,20 +186,20 @@ SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC release end -SeafoamIslands_B4F_EventScript_DefeatedArticuno:: @ 816320F +SeafoamIslands_B4F_EventScript_DefeatedArticuno:: setflag FLAG_FOUGHT_ARTICUNO goto EventScript_RemoveStaticMon end -SeafoamIslands_B4F_EventScript_RanFromArticuno:: @ 8163218 +SeafoamIslands_B4F_EventScript_RanFromArticuno:: setvar VAR_0x8004, SPECIES_ARTICUNO goto EventScript_MonFlewAway end -SeafoamIslands_B4F_EventScript_BoulderHintSign:: @ 8163223 +SeafoamIslands_B4F_EventScript_BoulderHintSign:: msgbox SeafoamIslands_B4F_Text_BouldersMightChangeWaterFlow, MSGBOX_SIGN end -SeafoamIslands_B4F_EventScript_FastCurrentSign:: @ 816322C +SeafoamIslands_B4F_EventScript_FastCurrentSign:: msgbox SeafoamIslands_B4F_Text_DangerFastCurrent, MSGBOX_SIGN end diff --git a/data/maps/SeafoamIslands_B4F/text.inc b/data/maps/SeafoamIslands_B4F/text.inc index 2747110e5..ba860e20f 100644 --- a/data/maps/SeafoamIslands_B4F/text.inc +++ b/data/maps/SeafoamIslands_B4F/text.inc @@ -1,4 +1,4 @@ -Text_RockSlideTeach:: @ 81799E0 +Text_RockSlideTeach:: .string "When you're up on a rocky mountain\n" .string "like this, rockslides are a threat.\p" .string "Can you imagine?\n" @@ -8,22 +8,22 @@ Text_RockSlideTeach:: @ 81799E0 .string "You don't seem to be scared.\n" .string "Want to try using ROCK SLIDE?$" -Text_RockSlideDeclined:: @ 8179AC0 +Text_RockSlideDeclined:: .string "Oh, so you are scared after all.$" -Text_RockSlideWhichMon:: @ 8179AE1 +Text_RockSlideWhichMon:: .string "Which POKéMON should I teach\n" .string "ROCK SLIDE?$" -Text_RockSlideTaught:: @ 8179B0A +Text_RockSlideTaught:: .string "It might be scary to use it in this\n" .string "tunnel…$" -SeafoamIslands_B4F_Text_BouldersMightChangeWaterFlow:: @ 8179B36 +SeafoamIslands_B4F_Text_BouldersMightChangeWaterFlow:: .string "Hint: Boulders might change the\n" .string "flow of water.$" -SeafoamIslands_B4F_Text_DangerFastCurrent:: @ 8179B65 +SeafoamIslands_B4F_Text_DangerFastCurrent:: .string "DANGER\n" .string "Fast current!$" diff --git a/data/maps/SevenIsland/scripts.inc b/data/maps/SevenIsland/scripts.inc index 649c1ea73..8ed3bd403 100644 --- a/data/maps/SevenIsland/scripts.inc +++ b/data/maps/SevenIsland/scripts.inc @@ -1,19 +1,19 @@ -SevenIsland_MapScripts:: @ 8167EB3 +SevenIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_OnTransition .byte 0 -SevenIsland_OnTransition:: @ 8167EB9 +SevenIsland_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND end -SevenIsland_EventScript_IslandSign:: @ 8167EBD +SevenIsland_EventScript_IslandSign:: msgbox SevenIsland_Text_IslandSign, MSGBOX_SIGN end -SevenIsland_EventScript_OldWoman:: @ 8167EC6 +SevenIsland_EventScript_OldWoman:: msgbox SevenIsland_Text_IslandsMadeInSevenDays, MSGBOX_NPC end -SevenIsland_EventScript_Scientist:: @ 8167ECF +SevenIsland_EventScript_Scientist:: msgbox SevenIsland_Text_IslandVirtuallyUntouched, MSGBOX_NPC end diff --git a/data/maps/SevenIsland/text.inc b/data/maps/SevenIsland/text.inc index 8b0e98818..4f06fad1c 100644 --- a/data/maps/SevenIsland/text.inc +++ b/data/maps/SevenIsland/text.inc @@ -1,4 +1,4 @@ -Text_SwordsDanceTeach:: @ 8182F01 +Text_SwordsDanceTeach:: .string "Not many people come out here.\p" .string "If I train here, I'm convinced that\n" .string "I'll get stronger and stronger.\p" @@ -6,22 +6,22 @@ Text_SwordsDanceTeach:: @ 8182F01 .string "How would you like to learn a move\n" .string "like that? It's SWORDS DANCE.$" -Text_SwordsDanceDeclined:: @ 8182FC1 +Text_SwordsDanceDeclined:: .string "Well, that's fine, too.$" -Text_SwordsDanceWhichMon:: @ 8182FD9 +Text_SwordsDanceWhichMon:: .string "All right, pick which POKéMON\n" .string "I should teach it to.$" -Text_SwordsDanceTaught:: @ 818300D +Text_SwordsDanceTaught:: .string "If only we could keep getting\n" .string "stronger and stronger, eh?$" -SevenIsland_Text_IslandSign:: @ 8183046 +SevenIsland_Text_IslandSign:: .string "SEVEN ISLAND\n" .string "Quest Island of Infinity$" -SevenIsland_Text_IslandsMadeInSevenDays:: @ 818306C +SevenIsland_Text_IslandsMadeInSevenDays:: .string "These islands are called the SEVII\n" .string "ISLANDS because there are seven.\p" .string "…Or at least that's what the young\n" @@ -30,7 +30,7 @@ SevenIsland_Text_IslandsMadeInSevenDays:: @ 818306C .string "named because they are said to\l" .string "have been made in seven days.$" -SevenIsland_Text_IslandVirtuallyUntouched:: @ 8183143 +SevenIsland_Text_IslandVirtuallyUntouched:: .string "This island has been left virtually\n" .string "untouched in its natural state.\p" .string "It could be a little difficult to\n" diff --git a/data/maps/SevenIsland_Harbor/scripts.inc b/data/maps/SevenIsland_Harbor/scripts.inc index fb51c905c..131826c80 100644 --- a/data/maps/SevenIsland_Harbor/scripts.inc +++ b/data/maps/SevenIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ -SevenIsland_Harbor_MapScripts:: @ 8170BE4 +SevenIsland_Harbor_MapScripts:: .byte 0 -SevenIsland_Harbor_EventScript_Sailor:: @ 8170BE5 +SevenIsland_Harbor_EventScript_Sailor:: lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 63e8a7250..e2e8c4e6b 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -2,12 +2,12 @@ .equ TRAINER_VISITING, VAR_TEMP_1 -SevenIsland_House_Room1_MapScripts:: @ 817088A +SevenIsland_House_Room1_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room1_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room1_OnFrame .byte 0 -SevenIsland_House_Room1_OnTransition:: @ 8170895 +SevenIsland_House_Room1_OnTransition:: special ValidateEReaderTrainer compare VAR_RESULT, 0 call_if_eq SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout @@ -15,25 +15,25 @@ SevenIsland_House_Room1_OnTransition:: @ 8170895 call_if_ne SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor end -SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout:: @ 81708AF +SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout:: setvar TRAINER_VISITING, TRUE setobjectxyperm LOCALID_OLD_WOMAN, 4, 2 setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN return -SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor:: @ 81708C3 +SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor:: setobjectxyperm LOCALID_OLD_WOMAN, 3, 2 setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_RIGHT return -SevenIsland_House_Room1_OnFrame:: @ 81708CF +SevenIsland_House_Room1_OnFrame:: map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle .2byte 0 -SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: @ 1708E9 +SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: lockall textcolor 1 applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerReEnterRoom @@ -54,28 +54,28 @@ SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: @ 1708E9 releaseall end -SevenIsland_House_Room1_EventScript_BattleWonComment:: @ 8170938 +SevenIsland_House_Room1_EventScript_BattleWonComment:: msgbox SevenIsland_House_Room1_Text_AstoundingBattle return -SevenIsland_House_Room1_EventScript_BattleLostComment:: @ 8170941 +SevenIsland_House_Room1_EventScript_BattleLostComment:: msgbox SevenIsland_House_Room1_Text_FeelYourDisappointment return -SevenIsland_House_Room1_EventScript_BattleTiedComment:: @ 817094A +SevenIsland_House_Room1_EventScript_BattleTiedComment:: msgbox SevenIsland_House_Room1_Text_DrawWasIt return -SevenIsland_House_Room1_Movement_PlayerReEnterRoom:: @ 8170953 +SevenIsland_House_Room1_Movement_PlayerReEnterRoom:: walk_down step_end -SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer:: @ 8170955 +SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer:: walk_right walk_in_place_fastest_down step_end -SevenIsland_House_Room1_EventScript_OldWoman:: @ 8170958 +SevenIsland_House_Room1_EventScript_OldWoman:: lock faceplayer special ValidateEReaderTrainer @@ -87,12 +87,12 @@ SevenIsland_House_Room1_EventScript_OldWoman:: @ 8170958 release end -SevenIsland_House_Room1_EventScript_InvalidVisitingTrainer:: @ 817097D +SevenIsland_House_Room1_EventScript_InvalidVisitingTrainer:: msgbox SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles release end -SevenIsland_House_Room1_EventScript_TrainerVisiting:: @ 8170987 +SevenIsland_House_Room1_EventScript_TrainerVisiting:: special SavePlayerParty special BufferEReaderTrainerName msgbox SevenIsland_House_Room1_Text_ChallengeVisitingTrainer, MSGBOX_YESNO @@ -123,65 +123,65 @@ SevenIsland_House_Room1_EventScript_TrainerVisiting:: @ 8170987 release end -SevenIsland_House_Room1_EventScript_DeclineBattle:: @ 8170A11 +SevenIsland_House_Room1_EventScript_DeclineBattle:: special LoadPlayerParty msgbox SevenIsland_House_Room1_Text_OhYouWontBattle release end -SevenIsland_House_Room1_EventScript_ChooseParty:: @ 8170A1E +SevenIsland_House_Room1_EventScript_ChooseParty:: msgbox SevenIsland_House_Room1_Text_LimitThreeMonsPerSide fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate return -SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth:: @ 8170A2D +SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth:: applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth waitmovement 0 return -SevenIsland_House_Room1_EventScript_EnterBattleRoomEast:: @ 8170A3F +SevenIsland_House_Room1_EventScript_EnterBattleRoomEast:: applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast waitmovement 0 return -SevenIsland_House_Room1_EventScript_EnterBattleRoomWest:: @ 8170A51 +SevenIsland_House_Room1_EventScript_EnterBattleRoomWest:: applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest waitmovement 0 return -SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth:: @ 8170A63 +SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth:: delay_16 walk_up walk_up step_end -SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast:: @ 8170A67 +SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast:: delay_16 walk_right walk_up step_end -SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest:: @ 8170A6B +SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest:: delay_16 walk_left walk_up step_end -SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft:: @ 8170A6F +SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft:: walk_left walk_in_place_fastest_right step_end -SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight:: @ 8170A72 +SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight:: walk_right walk_in_place_fastest_left step_end -SevenIsland_House_Room1_EventScript_Box:: @ 8170A75 +SevenIsland_House_Room1_EventScript_Box:: msgbox SevenIsland_House_Room1_Text_SlightBreezeAroundBox, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_House_Room1/text.inc b/data/maps/SevenIsland_House_Room1/text.inc index d8ddad04e..9fde68d59 100644 --- a/data/maps/SevenIsland_House_Room1/text.inc +++ b/data/maps/SevenIsland_House_Room1/text.inc @@ -1,4 +1,4 @@ -SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles:: @ 81A049B +SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles:: .string "I may not look like much now,\n" .string "but when I was younger…\p" .string "I flew everywhere, challenging\n" @@ -7,11 +7,11 @@ SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles:: @ 81A049B .string "is reminiscing about the past while\l" .string "watching battles.$" -SevenIsland_House_Room1_Text_SlightBreezeAroundBox:: @ 81A0567 +SevenIsland_House_Room1_Text_SlightBreezeAroundBox:: .string "There is a slight breeze blowing\n" .string "around the box.$" -SevenIsland_House_Room1_Text_ChallengeVisitingTrainer:: @ 81A0598 +SevenIsland_House_Room1_Text_ChallengeVisitingTrainer:: .string "Ah!\n" .string "Welcome, my friend!\p" .string "Let me tell you something. There's\n" @@ -21,7 +21,7 @@ SevenIsland_House_Room1_Text_ChallengeVisitingTrainer:: @ 81A0598 .string "Tell me, you did come to challenge\n" .string "{STR_VAR_1}, am I right?$" -SevenIsland_House_Room1_Text_OhYouWontBattle:: @ 81A064E +SevenIsland_House_Room1_Text_OhYouWontBattle:: .string "Oh…\n" .string "You won't battle…\p" .string "I see, I see.\n" @@ -29,7 +29,7 @@ SevenIsland_House_Room1_Text_OhYouWontBattle:: @ 81A064E .string "Well, perhaps if you change your\n" .string "mind, do come back.$" -SevenIsland_House_Room1_Text_LimitThreeMonsPerSide:: @ 81A06AB +SevenIsland_House_Room1_Text_LimitThreeMonsPerSide:: .string "Ah!\n" .string "You will battle for me?\p" .string "It was worth my time moving the\n" @@ -41,22 +41,22 @@ SevenIsland_House_Room1_Text_LimitThreeMonsPerSide:: @ 81A06AB .string "Can I get you to limit it to\n" .string "battles of three POKéMON per side?$" -SevenIsland_House_Room1_Text_SaveProgressBeforeBattle:: @ 81A0788 +SevenIsland_House_Room1_Text_SaveProgressBeforeBattle:: .string "Fine! Before your battle, would\n" .string "you like to save your game?$" -SevenIsland_House_Room1_Text_DontHoldAnythingBack:: @ 81A07C4 +SevenIsland_House_Room1_Text_DontHoldAnythingBack:: .string "All right.\n" .string "Don't hold anything back!$" @ Unused -SevenIsland_House_Room1_Text_StrVar1_1:: @ 81A07E9 +SevenIsland_House_Room1_Text_StrVar1_1:: .string "{STR_VAR_1}$" -SevenIsland_House_Room2_Text_MatchEndedUpDraw:: @ 81A07EC +SevenIsland_House_Room2_Text_MatchEndedUpDraw:: .string "The match ended up a draw.$" -SevenIsland_House_Room1_Text_DrawWasIt:: @ 81A0807 +SevenIsland_House_Room1_Text_DrawWasIt:: .string "A draw, was it?\p" .string "However, let me say that it was\n" .string "a worthy spectacle.\p" @@ -64,10 +64,10 @@ SevenIsland_House_Room1_Text_DrawWasIt:: @ 81A0807 .string "with a real sense of depth!$" @ Unused -SevenIsland_House_Room1_Text_StrVar1_2:: @ 81A0889 +SevenIsland_House_Room1_Text_StrVar1_2:: .string "{STR_VAR_1}$" -SevenIsland_House_Room1_Text_AstoundingBattle:: @ 81A088C +SevenIsland_House_Room1_Text_AstoundingBattle:: .string "Bravo!\p" .string "Bravo, indeed!\n" .string "What an astounding battle!\p" @@ -80,10 +80,10 @@ SevenIsland_House_Room1_Text_AstoundingBattle:: @ 81A088C .string "It was sheer magnificence!$" @ Unused -SevenIsland_House_Room1_Text_StrVar1_3:: @ 81A096E +SevenIsland_House_Room1_Text_StrVar1_3:: .string "{STR_VAR_1}$" -SevenIsland_House_Room1_Text_FeelYourDisappointment:: @ 81A0971 +SevenIsland_House_Room1_Text_FeelYourDisappointment:: .string "Too bad!\n" .string "I feel your disappointment.\p" .string "However, that disappointment is\n" diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc index be7e4ac77..2f319eebf 100644 --- a/data/maps/SevenIsland_House_Room2/scripts.inc +++ b/data/maps/SevenIsland_House_Room2/scripts.inc @@ -1,17 +1,17 @@ -SevenIsland_House_Room2_MapScripts:: @ 8170A7E +SevenIsland_House_Room2_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room2_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room2_OnFrame .byte 0 -SevenIsland_House_Room2_OnTransition:: @ 8170A89 +SevenIsland_House_Room2_OnTransition:: special SetEReaderTrainerGfxId end -SevenIsland_House_Room2_OnFrame:: @ 8170A8D +SevenIsland_House_Room2_OnFrame:: map_script_2 VAR_TEMP_1, 0, SevenIsland_House_Room2_EventScript_BattleVisitingTrainer .2byte 0 -SevenIsland_House_Room2_EventScript_BattleVisitingTrainer:: @ 8170A97 +SevenIsland_House_Room2_EventScript_BattleVisitingTrainer:: lockall applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerEnterRoom waitmovement 0 @@ -39,26 +39,26 @@ SevenIsland_House_Room2_EventScript_BattleVisitingTrainer:: @ 8170A97 releaseall end -SevenIsland_House_Room2_EventScript_BattleTie:: @ 8170AFE +SevenIsland_House_Room2_EventScript_BattleTie:: setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3 msgbox SevenIsland_House_Room2_Text_MatchEndedUpDraw return -SevenIsland_House_Room2_EventScript_BattleWon:: @ 8170B0C +SevenIsland_House_Room2_EventScript_BattleWon:: setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return -SevenIsland_House_Room2_EventScript_BattleLost:: @ 8170B17 +SevenIsland_House_Room2_EventScript_BattleLost:: setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return -SevenIsland_House_Room2_Movement_PlayerEnterRoom:: @ 8170B22 +SevenIsland_House_Room2_Movement_PlayerEnterRoom:: walk_down walk_down walk_down @@ -66,7 +66,7 @@ SevenIsland_House_Room2_Movement_PlayerEnterRoom:: @ 8170B22 walk_right step_end -SevenIsland_House_Room2_Movement_PlayerExitRoom:: @ 8170B28 +SevenIsland_House_Room2_Movement_PlayerExitRoom:: walk_left walk_left walk_up diff --git a/data/maps/SevenIsland_Mart/scripts.inc b/data/maps/SevenIsland_Mart/scripts.inc index a816cb8b4..4bd5a1e53 100644 --- a/data/maps/SevenIsland_Mart/scripts.inc +++ b/data/maps/SevenIsland_Mart/scripts.inc @@ -1,7 +1,7 @@ -SevenIsland_Mart_MapScripts:: @ 8170B30 +SevenIsland_Mart_MapScripts:: .byte 0 -SevenIsland_Mart_EventScript_Clerk:: @ 8170B31 +SevenIsland_Mart_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -13,7 +13,7 @@ SevenIsland_Mart_EventScript_Clerk:: @ 8170B31 end .align 2 -SevenIsland_Mart_Items:: @ 8170B58 +SevenIsland_Mart_Items:: .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_FULL_RESTORE @@ -27,14 +27,14 @@ SevenIsland_Mart_Items:: @ 8170B58 release end -SevenIsland_Mart_EventScript_Lass:: @ 8170B6E +SevenIsland_Mart_EventScript_Lass:: msgbox SevenIsland_Mart_Text_MonHavePersonalitiesOfTheirOwn, MSGBOX_NPC end -SevenIsland_Mart_EventScript_Hiker:: @ 8170B77 +SevenIsland_Mart_EventScript_Hiker:: msgbox SevenIsland_Mart_Text_PreparationsCompleteForRuins, MSGBOX_NPC end -SevenIsland_Mart_EventScript_Fisher:: @ 8170B80 +SevenIsland_Mart_EventScript_Fisher:: msgbox SevenIsland_Mart_Text_NeedToFishOnSevenIsland, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_Mart/text.inc b/data/maps/SevenIsland_Mart/text.inc index ab364c889..89bf7f4dc 100644 --- a/data/maps/SevenIsland_Mart/text.inc +++ b/data/maps/SevenIsland_Mart/text.inc @@ -1,14 +1,14 @@ -SevenIsland_Mart_Text_MonHavePersonalitiesOfTheirOwn:: @ 81A0A4F +SevenIsland_Mart_Text_MonHavePersonalitiesOfTheirOwn:: .string "POKéMON have personalities of their\n" .string "own, just like people.\p" .string "My PIKACHU has a HASTY nature,\n" .string "so it grew to be a speedy POKéMON.$" -SevenIsland_Mart_Text_PreparationsCompleteForRuins:: @ 81A0ACC +SevenIsland_Mart_Text_PreparationsCompleteForRuins:: .string "Okay, preparations are complete\n" .string "for me to explore the RUINS.$" -SevenIsland_Mart_Text_NeedToFishOnSevenIsland:: @ 81A0B09 +SevenIsland_Mart_Text_NeedToFishOnSevenIsland:: .string "I need to fish on SEVEN ISLAND.\p" .string "That will complete my fishing tour\n" .string "of the SEVII ISLANDS.\p" diff --git a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc index 447d9d1e8..7d2400d67 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ -SevenIsland_PokemonCenter_1F_MapScripts:: @ 8170B89 +SevenIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94 +SevenIsland_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_SEVEN_ISLAND end -SevenIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8170B98 +SevenIsland_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -SevenIsland_PokemonCenter_1F_EventScript_OldMan:: @ 8170BA1 +SevenIsland_PokemonCenter_1F_EventScript_OldMan:: msgbox SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections, MSGBOX_NPC end -SevenIsland_PokemonCenter_1F_EventScript_Sailor:: @ 8170BAA +SevenIsland_PokemonCenter_1F_EventScript_Sailor:: msgbox SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere, MSGBOX_NPC end -SevenIsland_PokemonCenter_1F_EventScript_Beauty:: @ 8170BB3 +SevenIsland_PokemonCenter_1F_EventScript_Beauty:: msgbox SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower, MSGBOX_NPC end diff --git a/data/maps/SevenIsland_PokemonCenter_1F/text.inc b/data/maps/SevenIsland_PokemonCenter_1F/text.inc index feacb5b4d..5add9db04 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/text.inc +++ b/data/maps/SevenIsland_PokemonCenter_1F/text.inc @@ -1,11 +1,11 @@ -SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections:: @ 81A0B98 +SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections:: .string "On this island, different events\n" .string "occur depending on connections.\p" .string "What are those connections?\p" .string "They are for you to discover on\n" .string "your own.$" -SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere:: @ 81A0C1F +SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere:: .string "Did you ride a SEAGALLOP ferry\n" .string "to get here?\p" .string "There are at least ten of those\n" @@ -13,7 +13,7 @@ SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere:: @ 81A0C1F .string "I don't know where they all go,\n" .string "though.$" -SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower:: @ 81A0CA5 +SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower:: .string "If you're confident, you should\n" .string "check out TRAINER TOWER.$" diff --git a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc index 7aa713902..2dd361f26 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SevenIsland_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC +SevenIsland_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ SevenIsland_PokemonCenter_2F_MapScripts:: @ 8170BBC .byte 0 @ The below 3 are unused and leftover from RS -SevenIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8170BD1 +SevenIsland_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -SevenIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8170BD7 +SevenIsland_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -SevenIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8170BDD +SevenIsland_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SevenIsland_SevaultCanyon/scripts.inc b/data/maps/SevenIsland_SevaultCanyon/scripts.inc index 0d5b46b87..e2168a346 100644 --- a/data/maps/SevenIsland_SevaultCanyon/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon/scripts.inc @@ -1,6 +1,6 @@ -SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD +SevenIsland_SevaultCanyon_MapScripts:: .byte 0 -SevenIsland_SevaultCanyon_EventScript_RouteSign:: @ 8168BFE +SevenIsland_SevaultCanyon_EventScript_RouteSign:: msgbox SevenIsland_SevaultCanyon_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_SevaultCanyon/text.inc b/data/maps/SevenIsland_SevaultCanyon/text.inc index 4e3dda9d1..5810ebb78 100644 --- a/data/maps/SevenIsland_SevaultCanyon/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon/text.inc @@ -1,126 +1,126 @@ -SevenIsland_SevaultCanyon_Text_CyndyIntro:: @ 818C887 +SevenIsland_SevaultCanyon_Text_CyndyIntro:: .string "My conditioning's in top form!$" -SevenIsland_SevaultCanyon_Text_CyndyDefeat:: @ 818C8A6 +SevenIsland_SevaultCanyon_Text_CyndyDefeat:: .string "Huh?\n" .string "Something's not right…$" -SevenIsland_SevaultCanyon_Text_CyndyPostBattle:: @ 818C8C2 +SevenIsland_SevaultCanyon_Text_CyndyPostBattle:: .string "The way I am now, I may have to\n" .string "hold off on TRAINER TOWER…$" -SevenIsland_SevaultCanyon_Text_EvanIntro:: @ 818C8FD +SevenIsland_SevaultCanyon_Text_EvanIntro:: .string "It doesn't matter if you happen to\n" .string "have the strongest POKéMON…\p" .string "It doesn't mean a thing if you don't\n" .string "know how to use them properly!$" -SevenIsland_SevaultCanyon_Text_EvanDefeat:: @ 818C980 +SevenIsland_SevaultCanyon_Text_EvanDefeat:: .string "You're a master at this.$" -SevenIsland_SevaultCanyon_Text_EvanPostBattle:: @ 818C999 +SevenIsland_SevaultCanyon_Text_EvanPostBattle:: .string "You see them every so often,\n" .string "TRAINERS with awesome POKéMON\l" .string "who have no idea what to do.\p" .string "Before training POKéMON, TRAINERS\n" .string "themselves need to grow up.$" -SevenIsland_SevaultCanyon_Text_JacksonIntro:: @ 818CA2F +SevenIsland_SevaultCanyon_Text_JacksonIntro:: .string "I work to protect the environment.\n" .string "In turn, nature protects me!$" -SevenIsland_SevaultCanyon_Text_JacksonDefeat:: @ 818CA6F +SevenIsland_SevaultCanyon_Text_JacksonDefeat:: .string "Whoa! You're tough!\n" .string "How about protecting me?$" -SevenIsland_SevaultCanyon_Text_JacksonPostBattle:: @ 818CA9C +SevenIsland_SevaultCanyon_Text_JacksonPostBattle:: .string "From far out among the stars, our\n" .string "planet is just a drop of water.\p" .string "But we want to protect that drop\n" .string "of water for everyone.$" -SevenIsland_SevaultCanyon_Text_KatelynIntro:: @ 818CB16 +SevenIsland_SevaultCanyon_Text_KatelynIntro:: .string "Those shoes you have are pretty\n" .string "snazzy.$" -SevenIsland_SevaultCanyon_Text_KatelynDefeat:: @ 818CB3E +SevenIsland_SevaultCanyon_Text_KatelynDefeat:: .string "You're hot stuff in spite of your\n" .string "cute looks.$" -SevenIsland_SevaultCanyon_Text_KatelynPostBattle:: @ 818CB6C +SevenIsland_SevaultCanyon_Text_KatelynPostBattle:: .string "Your mom bought those snazzy\n" .string "RUNNING SHOES for you?\p" .string "She must adore you.$" -SevenIsland_SevaultCanyon_Text_LeroyIntro:: @ 818CBB4 +SevenIsland_SevaultCanyon_Text_LeroyIntro:: .string "You look strong.\n" .string "Let me battle you, please!$" -SevenIsland_SevaultCanyon_Text_LeroyDefeat:: @ 818CBE0 +SevenIsland_SevaultCanyon_Text_LeroyDefeat:: .string "I knew it!\n" .string "You're as tough as I thought!$" -SevenIsland_SevaultCanyon_Text_LeroyPostBattle:: @ 818CC09 +SevenIsland_SevaultCanyon_Text_LeroyPostBattle:: .string "The way you battle has given me\n" .string "a lot of useful data.\p" .string "Thanks so much!$" -SevenIsland_SevaultCanyon_Text_MichelleIntro:: @ 818CC4F +SevenIsland_SevaultCanyon_Text_MichelleIntro:: .string "I was given the best possible\n" .string "education to become this strong.\p" .string "I don't want to lose to anyone!$" -SevenIsland_SevaultCanyon_Text_MichelleDefeat:: @ 818CCAE +SevenIsland_SevaultCanyon_Text_MichelleDefeat:: .string "Thank you. I feel like I've been\n" .string "set free by losing to you.$" -SevenIsland_SevaultCanyon_Text_MichellePostBattle:: @ 818CCEA +SevenIsland_SevaultCanyon_Text_MichellePostBattle:: .string "For some reason, I get furious\n" .string "over the slightest thing.\p" .string "I'll calm myself by breathing\n" .string "deeply.$" -SevenIsland_SevaultCanyon_Text_LexIntro:: @ 818CD49 +SevenIsland_SevaultCanyon_Text_LexIntro:: .string "LEX: My darling NYA, together\n" .string "we could win!$" -SevenIsland_SevaultCanyon_Text_LexDefeat:: @ 818CD75 +SevenIsland_SevaultCanyon_Text_LexDefeat:: .string "LEX: I seem to have been too\n" .string "careless…$" -SevenIsland_SevaultCanyon_Text_LexPostBattle:: @ 818CD9C +SevenIsland_SevaultCanyon_Text_LexPostBattle:: .string "LEX: I think it was a good\n" .string "experience for NYA.\p" .string "You have my gratitude.$" -SevenIsland_SevaultCanyon_Text_LexNotEnoughMons:: @ 818CDE2 +SevenIsland_SevaultCanyon_Text_LexNotEnoughMons:: .string "LEX: May I ask you to battle the\n" .string "both of us at the same time?$" -SevenIsland_SevaultCanyon_Text_NyaIntro:: @ 818CE20 +SevenIsland_SevaultCanyon_Text_NyaIntro:: .string "NYA: I'll do my best so I won't\n" .string "drag down my mentor, LEX!$" -SevenIsland_SevaultCanyon_Text_NyaDefeat:: @ 818CE5A +SevenIsland_SevaultCanyon_Text_NyaDefeat:: .string "NYA: Oh, no…\n" .string "I'm so sorry, I…$" -SevenIsland_SevaultCanyon_Text_NyaPostBattle:: @ 818CE78 +SevenIsland_SevaultCanyon_Text_NyaPostBattle:: .string "NYA: I think I'm going to need\n" .string "much more seasoning and tutoring\l" .string "under LEX…\p" .string "…So, LEX, please, may I stay with\n" .string "you like this?$" -SevenIsland_SevaultCanyon_Text_NyaNotEnoughMons:: @ 818CEF4 +SevenIsland_SevaultCanyon_Text_NyaNotEnoughMons:: .string "NYA: I'm sorry, but may we battle\n" .string "in two-on-two style?$" -SevenIsland_SevaultCanyon_Text_RouteSign:: @ 818CF2B +SevenIsland_SevaultCanyon_Text_RouteSign:: .string "SEVAULT CANYON\n" .string "TANOBY RUINS AHEAD$" -SevenIsland_SevaultCanyon_Text_BrunoTrainedWithBrawly:: @ 818CF4D +SevenIsland_SevaultCanyon_Text_BrunoTrainedWithBrawly:: .string "Training by oneself is certainly\n" .string "not a bad thing.\p" .string "But it's also not bad to aim for\n" diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc index b032d990b..523017107 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc @@ -1,6 +1,6 @@ -SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3 +SevenIsland_SevaultCanyon_Entrance_MapScripts:: .byte 0 -SevenIsland_SevaultCanyon_Entrance_EventScript_RouteSign:: @ 8168BF4 +SevenIsland_SevaultCanyon_Entrance_EventScript_RouteSign:: msgbox SevenIsland_SevaultCanyon_Entrance_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc b/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc index 3ab590e41..eebebaa21 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc @@ -1,92 +1,92 @@ -SevenIsland_SevaultCanyon_Entrance_Text_MiahIntro:: @ 818C3BC +SevenIsland_SevaultCanyon_Entrance_Text_MiahIntro:: .string "Kyahaha!\n" .string "I'll flick you away effortlessly!$" -SevenIsland_SevaultCanyon_Entrance_Text_MiahDefeat:: @ 818C3E7 +SevenIsland_SevaultCanyon_Entrance_Text_MiahDefeat:: .string "Tch!\n" .string "Too strong for me!$" -SevenIsland_SevaultCanyon_Entrance_Text_MiahPostBattle:: @ 818C3FF +SevenIsland_SevaultCanyon_Entrance_Text_MiahPostBattle:: .string "What's that?\n" .string "I don't act the way I look?\p" .string "Heh, that's a part of my strategy!$" -SevenIsland_SevaultCanyon_Entrance_Text_MasonIntro:: @ 818C44B +SevenIsland_SevaultCanyon_Entrance_Text_MasonIntro:: .string "Howdy!\n" .string "Are you a member of my fan club?$" -SevenIsland_SevaultCanyon_Entrance_Text_MasonDefeat:: @ 818C473 +SevenIsland_SevaultCanyon_Entrance_Text_MasonDefeat:: .string "Oh, so you're not a fan…\p" .string "Well, I can change that.\n" .string "Let me sing for you!$" -SevenIsland_SevaultCanyon_Entrance_Text_MasonPostBattle:: @ 818C4BA +SevenIsland_SevaultCanyon_Entrance_Text_MasonPostBattle:: .string "Lalalah…\n" .string "My POKéMON, I send them out,\l" .string "all the girls scream and shout!$" -SevenIsland_SevaultCanyon_Entrance_Text_NicolasIntro:: @ 818C500 +SevenIsland_SevaultCanyon_Entrance_Text_NicolasIntro:: .string "This island is too spread out…\n" .string "It's not easy patrolling the place.$" -SevenIsland_SevaultCanyon_Entrance_Text_NicolasDefeat:: @ 818C543 +SevenIsland_SevaultCanyon_Entrance_Text_NicolasDefeat:: .string "Uh-huh…$" -SevenIsland_SevaultCanyon_Entrance_Text_NicolasPostBattle:: @ 818C54B +SevenIsland_SevaultCanyon_Entrance_Text_NicolasPostBattle:: .string "TRAINERS like you from cities,\n" .string "they sure are tough.\p" .string "You'll be headed for the TOWER,\n" .string "won't you?$" -SevenIsland_SevaultCanyon_Entrance_Text_MadelineIntro:: @ 818C5AA +SevenIsland_SevaultCanyon_Entrance_Text_MadelineIntro:: .string "I punish people who abuse\n" .string "POKéMON!$" -SevenIsland_SevaultCanyon_Entrance_Text_MadelineDefeat:: @ 818C5CD +SevenIsland_SevaultCanyon_Entrance_Text_MadelineDefeat:: .string "You don't seem to be a problem\n" .string "TRAINER.$" -SevenIsland_SevaultCanyon_Entrance_Text_MadelinePostBattle:: @ 818C5F5 +SevenIsland_SevaultCanyon_Entrance_Text_MadelinePostBattle:: .string "If you treat your POKéMON with\n" .string "kindness, they'll understand.$" -SevenIsland_SevaultCanyon_Entrance_Text_EveIntro:: @ 818C632 +SevenIsland_SevaultCanyon_Entrance_Text_EveIntro:: .string "EVE: I'll team up with JON and\n" .string "battle together.$" -SevenIsland_SevaultCanyon_Entrance_Text_EveDefeat:: @ 818C662 +SevenIsland_SevaultCanyon_Entrance_Text_EveDefeat:: .string "EVE: Me and JON, we lost.\n" .string "Ehehe.$" -SevenIsland_SevaultCanyon_Entrance_Text_EvePostBattle:: @ 818C683 +SevenIsland_SevaultCanyon_Entrance_Text_EvePostBattle:: .string "EVE: I'm going to work harder with\n" .string "JON.$" -SevenIsland_SevaultCanyon_Entrance_Text_EveNotEnoughMons:: @ 818C6AB +SevenIsland_SevaultCanyon_Entrance_Text_EveNotEnoughMons:: .string "EVE: I want to team up with JON\n" .string "when I battle you.\p" .string "Come back with two POKéMON, okay?$" -SevenIsland_SevaultCanyon_Entrance_Text_JonIntro:: @ 818C700 +SevenIsland_SevaultCanyon_Entrance_Text_JonIntro:: .string "JON: When I'm with EVE, it feels\n" .string "like we could never lose.$" -SevenIsland_SevaultCanyon_Entrance_Text_JonDefeat:: @ 818C73B +SevenIsland_SevaultCanyon_Entrance_Text_JonDefeat:: .string "JON: When I'm with EVE,\n" .string "it doesn't feel like I've lost!$" -SevenIsland_SevaultCanyon_Entrance_Text_JonPostBattle:: @ 818C773 +SevenIsland_SevaultCanyon_Entrance_Text_JonPostBattle:: .string "JON: When I'm with EVE, I feel\n" .string "giddy whether I win or lose.\p" .string "It's magical!$" -SevenIsland_SevaultCanyon_Entrance_Text_JonNotEnoughMons:: @ 818C7BD +SevenIsland_SevaultCanyon_Entrance_Text_JonNotEnoughMons:: .string "JON: If it's with EVE, I'll be\n" .string "happy to battle with you.\p" .string "So, I'd like to make it a\n" .string "two-on-two battle, if I may.$" -SevenIsland_SevaultCanyon_Entrance_Text_RouteSign:: @ 818C82D +SevenIsland_SevaultCanyon_Entrance_Text_RouteSign:: .string "SEVAULT CANYON ENTRANCE\p" .string "TRAINERS are asked to refrain from\n" .string "damaging plants in the CANYON.$" diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 4ef749d71..4b33397aa 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -1,9 +1,9 @@ .set LOCALID_BALDING_MAN, 1 -SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182 +SevenIsland_SevaultCanyon_House_MapScripts:: .byte 0 -SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183 +SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: lock goto_if_set FLAG_TEMP_2, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced playbgm MUS_SCHOOL, 0 @@ -35,25 +35,25 @@ SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183 release end -SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown:: @ 8172206 +SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced:: @ 8172211 +SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced:: applymovement LOCALID_BALDING_MAN, Movement_FacePlayer waitmovement 0 msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn release end -SevenIsland_SevaultCanyon_House_EventScript_DeclineDance:: @ 8172225 +SevenIsland_SevaultCanyon_House_EventScript_DeclineDance:: textcolor 0 msgbox SevenIsland_SevaultCanyon_House_Text_ComeOnDance release end -SevenIsland_SevaultCanyon_House_Movement_ChanseyDance:: @ 8172231 +SevenIsland_SevaultCanyon_House_Movement_ChanseyDance:: walk_in_place_down delay_16 walk_in_place_down @@ -72,7 +72,7 @@ SevenIsland_SevaultCanyon_House_Movement_ChanseyDance:: @ 8172231 delay_4 step_end -SevenIsland_SevaultCanyon_House_EventScript_Chansey:: @ 8172242 +SevenIsland_SevaultCanyon_House_EventScript_Chansey:: lock faceplayer waitse diff --git a/data/maps/SevenIsland_SevaultCanyon_House/text.inc b/data/maps/SevenIsland_SevaultCanyon_House/text.inc index 478107036..c129b5891 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/text.inc @@ -1,22 +1,22 @@ -SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn:: @ 81A4D72 +SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn:: .string "Dance, dance!\n" .string "CHANSEY Dance!\p" .string "You join in, too!\n" .string "Dance, dance!$" -SevenIsland_SevaultCanyon_House_Text_WouldYouLikeToDance:: @ 81A4DAF +SevenIsland_SevaultCanyon_House_Text_WouldYouLikeToDance:: .string "Would you like to dance?$" -SevenIsland_SevaultCanyon_House_Text_ComeOnDance:: @ 81A4DC8 +SevenIsland_SevaultCanyon_House_Text_ComeOnDance:: .string "Come on, dance!$" -SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance:: @ 81A4DD8 +SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance:: .string "{PLAYER} danced the CHANSEY Dance!$" -SevenIsland_SevaultCanyon_House_Text_YoureAllChipperNow:: @ 81A4DF5 +SevenIsland_SevaultCanyon_House_Text_YoureAllChipperNow:: .string "Ahahahaha!\p" .string "There, you're all chipper now!\n" .string "Lucky!$" -SevenIsland_SevaultCanyon_House_Text_Chansey:: @ 81A4E26 +SevenIsland_SevaultCanyon_House_Text_Chansey:: .string "CHANSEY: Chansi! Chansi!$" diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc index 9bc7be467..f7b0f96e2 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc @@ -8,11 +8,11 @@ .equ NUM_SWITCHES_PRESSED, VAR_TEMP_8 -SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC +SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_SevaultCanyon_TanobyKey_OnTransition .byte 0 -SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 +SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos setvar VAR_TEMP_1, 0 @@ -25,7 +25,7 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2 setvar NUM_SWITCHES_PRESSED, 0 end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: @ 8164E07 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: setobjectxyperm LOCALID_BOULDER1, 7, 2 setobjectxyperm LOCALID_BOULDER2, 4, 4 setobjectxyperm LOCALID_BOULDER3, 10, 4 @@ -35,7 +35,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: @ 8164 setobjectxyperm LOCALID_BOULDER7, 9, 8 return -SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: @ 8164E39 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: lockall compare VAR_TEMP_1, 100 goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed @@ -46,7 +46,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: @ 8164E39 releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2:: @ 8164E5C +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2:: lockall compare VAR_TEMP_2, 100 goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed @@ -57,7 +57,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2:: @ 8164E5C releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3:: @ 8164E7F +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3:: lockall compare VAR_TEMP_3, 100 goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed @@ -68,7 +68,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3:: @ 8164E7F releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4:: @ 8164EA2 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4:: lockall compare VAR_TEMP_4, 100 goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed @@ -79,7 +79,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4:: @ 8164EA2 releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5:: @ 8164EC5 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5:: lockall compare VAR_TEMP_5, 100 goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed @@ -90,7 +90,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5:: @ 8164EC5 releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6:: @ 8164EE8 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6:: lockall compare VAR_TEMP_6, 100 goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed @@ -101,7 +101,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6:: @ 8164EE8 releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B +SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: lockall compare VAR_TEMP_7, 100 goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed @@ -112,7 +112,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E +SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: addvar NUM_SWITCHES_PRESSED, 1 playse SE_TRUCK_MOVE setvar VAR_0x8004, 1 @@ -123,7 +123,7 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E delay 60 return -SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164F51 +SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: setvar VAR_0x8004, 2 setvar VAR_0x8005, 2 setvar VAR_0x8006, 10 @@ -140,11 +140,11 @@ SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164 waitse return -SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed:: @ 8164F8A +SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed:: releaseall end -SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved:: @ 8164F8C +SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved:: call SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen msgbox SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway setflag FLAG_SYS_UNLOCKED_TANOBY_RUINS diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc index f86669ce4..8432e63c1 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc @@ -1,4 +1,4 @@ -SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway:: @ 817D31B +SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway:: .string "A mysterious rumble echoed\n" .string "somewhere far away.$" diff --git a/data/maps/SevenIsland_TanobyRuins/scripts.inc b/data/maps/SevenIsland_TanobyRuins/scripts.inc index 7bb8054e3..aa44366c9 100644 --- a/data/maps/SevenIsland_TanobyRuins/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins/scripts.inc @@ -1,2 +1,2 @@ -SevenIsland_TanobyRuins_MapScripts:: @ 8168C07 +SevenIsland_TanobyRuins_MapScripts:: .byte 0 diff --git a/data/maps/SevenIsland_TanobyRuins/text.inc b/data/maps/SevenIsland_TanobyRuins/text.inc index a5453f527..f1cb02c1a 100644 --- a/data/maps/SevenIsland_TanobyRuins/text.inc +++ b/data/maps/SevenIsland_TanobyRuins/text.inc @@ -1,51 +1,51 @@ -SevenIsland_TanobyRuins_Text_BrandonIntro:: @ 818CFFB +SevenIsland_TanobyRuins_Text_BrandonIntro:: .string "Do you know anything about this\n" .string "stone chamber?$" -SevenIsland_TanobyRuins_Text_BrandonDefeat:: @ 818D02A +SevenIsland_TanobyRuins_Text_BrandonDefeat:: .string "That was uncalled for.\n" .string "You didn't have to be so rough.$" -SevenIsland_TanobyRuins_Text_BrandonPostBattle:: @ 818D061 +SevenIsland_TanobyRuins_Text_BrandonPostBattle:: .string "The TANOBY RUINS date back at\n" .string "least 1,500 years.\p" .string "But it's a baffling mystery as to\n" .string "why it was built in the first place.$" -SevenIsland_TanobyRuins_Text_BenjaminIntro:: @ 818D0D9 +SevenIsland_TanobyRuins_Text_BenjaminIntro:: .string "A mystic POKéMON is said to sleep\n" .string "inside here.$" -SevenIsland_TanobyRuins_Text_BenjaminDefeat:: @ 818D108 +SevenIsland_TanobyRuins_Text_BenjaminDefeat:: .string "I'm not much good in battle.$" -SevenIsland_TanobyRuins_Text_BenjaminPostBattle:: @ 818D125 +SevenIsland_TanobyRuins_Text_BenjaminPostBattle:: .string "I hear there are other ruins like\n" .string "the one here.\p" .string "Might they be the resting places\n" .string "of other mystic POKéMON?$" -SevenIsland_TanobyRuins_Text_EdnaIntro:: @ 818D18F +SevenIsland_TanobyRuins_Text_EdnaIntro:: .string "CLIFFORD is teaching me how to\n" .string "paint.$" -SevenIsland_TanobyRuins_Text_EdnaDefeat:: @ 818D1B5 +SevenIsland_TanobyRuins_Text_EdnaDefeat:: .string "We might get in trouble for being\n" .string "noisy here.$" -SevenIsland_TanobyRuins_Text_EdnaPostBattle:: @ 818D1E3 +SevenIsland_TanobyRuins_Text_EdnaPostBattle:: .string "I said that I wanted to paint an\n" .string "old building.\p" .string "So CLIFFORD brought me here.$" -SevenIsland_TanobyRuins_Text_CliffordIntro:: @ 818D22F +SevenIsland_TanobyRuins_Text_CliffordIntro:: .string "Today, in addition to our lesson,\n" .string "we came to see the chamber.$" -SevenIsland_TanobyRuins_Text_CliffordDefeat:: @ 818D26D +SevenIsland_TanobyRuins_Text_CliffordDefeat:: .string "My, how extraordinary.$" -SevenIsland_TanobyRuins_Text_CliffordPostBattle:: @ 818D284 +SevenIsland_TanobyRuins_Text_CliffordPostBattle:: .string "Ah, so you are studying POKéMON\n" .string "on your own…\p" .string "Yes, you certainly are quite the\n" diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc index 0646e661d..aa0376bba 100644 --- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc @@ -1,7 +1,7 @@ -SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6 +SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_DilfordChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_DilfordChamber_OnTransition:: @ 8164CFC +SevenIsland_TanobyRuins_DilfordChamber_OnTransition:: call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc index 8a606a2c3..1a872bbff 100644 --- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc @@ -1,7 +1,7 @@ -SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE +SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_LiptooChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_LiptooChamber_OnTransition:: @ 8164CE4 +SevenIsland_TanobyRuins_LiptooChamber_OnTransition:: call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc index 819b2bbc1..635f4ab42 100644 --- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc @@ -1,8 +1,8 @@ -SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF +SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_MoneanChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_MoneanChamber_OnTransition:: @ 8164CD5 +SevenIsland_TanobyRuins_MoneanChamber_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc index e29694d8f..03f1551b8 100644 --- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc @@ -1,7 +1,7 @@ -SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E +SevenIsland_TanobyRuins_RixyChamber_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_RixyChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_RixyChamber_OnTransition:: @ 8164D14 +SevenIsland_TanobyRuins_RixyChamber_OnTransition:: call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc index 4917ecdf8..381477f94 100644 --- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc @@ -1,7 +1,7 @@ -SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02 +SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_ScufibChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_ScufibChamber_OnTransition:: @ 8164D08 +SevenIsland_TanobyRuins_ScufibChamber_OnTransition:: call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc index f1a13adcb..2557804fd 100644 --- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc @@ -1,7 +1,7 @@ -SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A +SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_ViapoisChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_ViapoisChamber_OnTransition:: @ 8164D20 +SevenIsland_TanobyRuins_ViapoisChamber_OnTransition:: call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc index 3a7720b4c..60a04561c 100644 --- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc +++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc @@ -1,7 +1,7 @@ -SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA +SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TanobyRuins_WeepthChamber_OnTransition .byte 0 -SevenIsland_TanobyRuins_WeepthChamber_OnTransition:: @ 8164CF0 +SevenIsland_TanobyRuins_WeepthChamber_OnTransition:: call EventScript_TryDarkenRuins end diff --git a/data/maps/SevenIsland_TrainerTower/scripts.inc b/data/maps/SevenIsland_TrainerTower/scripts.inc index 6e9daea9f..b35753759 100644 --- a/data/maps/SevenIsland_TrainerTower/scripts.inc +++ b/data/maps/SevenIsland_TrainerTower/scripts.inc @@ -1,15 +1,15 @@ -SevenIsland_TrainerTower_MapScripts:: @ 8168BD5 +SevenIsland_TrainerTower_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_OnTransition .byte 0 -SevenIsland_TrainerTower_OnTransition:: @ 8168BDB +SevenIsland_TrainerTower_OnTransition:: setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 end -SevenIsland_TrainerTower_EventScript_TrainerTowerSign:: @ 8168BE1 +SevenIsland_TrainerTower_EventScript_TrainerTowerSign:: msgbox SevenIsland_TrainerTower_Text_TrainerTowerSign, MSGBOX_SIGN end -SevenIsland_TrainerTower_EventScript_TrainerTowerAheadSign:: @ 8168BEA +SevenIsland_TrainerTower_EventScript_TrainerTowerAheadSign:: msgbox SevenIsland_TrainerTower_Text_TrainerTowerAhead, MSGBOX_SIGN end diff --git a/data/maps/SevenIsland_TrainerTower/text.inc b/data/maps/SevenIsland_TrainerTower/text.inc index 92fa81605..a98fa7189 100644 --- a/data/maps/SevenIsland_TrainerTower/text.inc +++ b/data/maps/SevenIsland_TrainerTower/text.inc @@ -1,41 +1,41 @@ -SevenIsland_TrainerTower_Text_DarioIntro:: @ 818C1ED +SevenIsland_TrainerTower_Text_DarioIntro:: .string "I sensed your approach.$" -SevenIsland_TrainerTower_Text_DarioDefeat:: @ 818C205 +SevenIsland_TrainerTower_Text_DarioDefeat:: .string "Give up…$" -SevenIsland_TrainerTower_Text_DarioPostBattle:: @ 818C20E +SevenIsland_TrainerTower_Text_DarioPostBattle:: .string "In your future, I sense that you\n" .string "will meet many others.\p" .string "I think you will be linked to each\n" .string "other by a strange power.$" -SevenIsland_TrainerTower_Text_RodetteIntro:: @ 818C283 +SevenIsland_TrainerTower_Text_RodetteIntro:: .string "Somewhere on this island, peculiar\n" .string "POKéMON are sleeping.$" -SevenIsland_TrainerTower_Text_RodetteDefeat:: @ 818C2BC +SevenIsland_TrainerTower_Text_RodetteDefeat:: .string "What an amazing TRAINER!$" -SevenIsland_TrainerTower_Text_RodettePostBattle:: @ 818C2D5 +SevenIsland_TrainerTower_Text_RodettePostBattle:: .string "Somewhere on this island, peculiar\n" .string "POKéMON are sleeping.\p" .string "Could it be that they're waiting\n" .string "for you?$" -SevenIsland_TrainerTower_Text_TrainerTowerSign:: @ 818C338 +SevenIsland_TrainerTower_Text_TrainerTowerSign:: .string "TRAINER TOWER ENTRANCE\n" .string "Rise to the Challenge, TRAINERS!$" -SevenIsland_TrainerTower_Text_TrainerTowerAhead:: @ 818C370 +SevenIsland_TrainerTower_Text_TrainerTowerAhead:: .string "TRAINER TOWER AHEAD$" @ Unused text perhaps indicating Trainer Tower was planned to be unlocked by something -SevenIsland_TrainerTower_Text_LooksLikeTrainerTowerIsClosed:: @ 818C384 +SevenIsland_TrainerTower_Text_LooksLikeTrainerTowerIsClosed:: .string "トレーナータワーには\n" .string "いまは　はいれない　みたい‥$" -SevenIsland_TrainerTower_Text_TrainerTowerIsOpenLetsGoIn:: @ 818C39E +SevenIsland_TrainerTower_Text_TrainerTowerIsOpenLetsGoIn:: .string "トレーナータワーが　あいてる！\n" .string "さっそく　はいってみよう！$" diff --git a/data/maps/SevenIsland_UnusedHouse/scripts.inc b/data/maps/SevenIsland_UnusedHouse/scripts.inc index d6014463c..604e7c426 100644 --- a/data/maps/SevenIsland_UnusedHouse/scripts.inc +++ b/data/maps/SevenIsland_UnusedHouse/scripts.inc @@ -1,2 +1,2 @@ -SevenIsland_UnusedHouse_MapScripts:: @ 8170BE3 +SevenIsland_UnusedHouse_MapScripts:: .byte 0 diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc index 20d98d291..4df7c880c 100644 --- a/data/maps/SilphCo_10F/scripts.inc +++ b/data/maps/SilphCo_10F/scripts.inc @@ -1,12 +1,12 @@ -SilphCo_10F_MapScripts:: @ 8161D86 +SilphCo_10F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_10F_OnLoad .byte 0 -SilphCo_10F_OnLoad:: @ 8161D8C +SilphCo_10F_OnLoad:: call_if_unset FLAG_SILPH_10F_DOOR, EventScript_Close10FDoor end -SilphCo_10F_EventScript_WorkerF:: @ 8161D96 +SilphCo_10F_EventScript_WorkerF:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -15,21 +15,21 @@ SilphCo_10F_EventScript_WorkerF:: @ 8161D96 release end -SilphCo_10F_EventScript_WorkerFRocketsGone:: @ 8161DAD +SilphCo_10F_EventScript_WorkerFRocketsGone:: msgbox SilphCo_10F_Text_KeepMeCryingASecret release end -SilphCo_10F_EventScript_FloorSign:: @ 8161DB7 +SilphCo_10F_EventScript_FloorSign:: msgbox SilphCo_10F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_10F_EventScript_Travis:: @ 8161DC0 +SilphCo_10F_EventScript_Travis:: trainerbattle_single TRAINER_SCIENTIST_TRAVIS, SilphCo_10F_Text_TravisIntro, SilphCo_10F_Text_TravisDefeat msgbox SilphCo_10F_Text_TravisPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_10F_EventScript_Grunt:: @ 8161DD7 +SilphCo_10F_EventScript_Grunt:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, SilphCo_10F_Text_GruntIntro, SilphCo_10F_Text_GruntDefeat msgbox SilphCo_10F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_10F/text.inc b/data/maps/SilphCo_10F/text.inc index ac8483558..fca816628 100644 --- a/data/maps/SilphCo_10F/text.inc +++ b/data/maps/SilphCo_10F/text.inc @@ -1,33 +1,33 @@ -SilphCo_10F_Text_GruntIntro:: @ 8176CED +SilphCo_10F_Text_GruntIntro:: .string "Welcome to 10F!\n" .string "So good of you to join me!$" -SilphCo_10F_Text_GruntDefeat:: @ 8176D18 +SilphCo_10F_Text_GruntDefeat:: .string "I'm stunned!$" -SilphCo_10F_Text_GruntPostBattle:: @ 8176D25 +SilphCo_10F_Text_GruntPostBattle:: .string "Nice try, but the boardroom is up\n" .string "one more floor.$" -SilphCo_10F_Text_TravisIntro:: @ 8176D57 +SilphCo_10F_Text_TravisIntro:: .string "Enough of your silly games!$" -SilphCo_10F_Text_TravisDefeat:: @ 8176D73 +SilphCo_10F_Text_TravisDefeat:: .string "No continues left!$" -SilphCo_10F_Text_TravisPostBattle:: @ 8176D86 +SilphCo_10F_Text_TravisPostBattle:: .string "Are you satisfied with beating me?\n" .string "Then go on home!$" -SilphCo_10F_Text_WaaaImScared:: @ 8176DBA +SilphCo_10F_Text_WaaaImScared:: .string "Waaaaa!\n" .string "I'm scared!$" -SilphCo_10F_Text_KeepMeCryingASecret:: @ 8176DCE +SilphCo_10F_Text_KeepMeCryingASecret:: .string "About me crying…\n" .string "Please keep it a secret.$" -SilphCo_10F_Text_FloorSign:: @ 8176DF8 +SilphCo_10F_Text_FloorSign:: .string "SILPH CO. HEAD OFFICE\n" .string "10F$" diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc index 26c81dd4f..61d2ef04b 100644 --- a/data/maps/SilphCo_11F/scripts.inc +++ b/data/maps/SilphCo_11F/scripts.inc @@ -2,15 +2,15 @@ .set LOCALID_GRUNT1, 4 .set LOCALID_GRUNT2, 6 -SilphCo_11F_MapScripts:: @ 8161DEE +SilphCo_11F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_11F_OnLoad .byte 0 -SilphCo_11F_OnLoad:: @ 8161DF4 +SilphCo_11F_OnLoad:: call_if_unset FLAG_SILPH_11F_DOOR, EventScript_Close11FDoor end -SilphCo_11F_EventScript_President:: @ 8161DFE +SilphCo_11F_EventScript_President:: lock faceplayer goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, SilphCo_11F_EventScript_AlreadyGotMasterBall @@ -28,41 +28,41 @@ SilphCo_11F_EventScript_President:: @ 8161DFE release end -SilphCo_11F_EventScript_PresidentThanksMale:: @ 8161E59 +SilphCo_11F_EventScript_PresidentThanksMale:: msgbox SilphCo_11F_Text_ThanksForSavingMeDearBoy return -SilphCo_11F_EventScript_PresidentThanksFemale:: @ 8161E62 +SilphCo_11F_EventScript_PresidentThanksFemale:: msgbox SilphCo_11F_Text_ThanksForSavingMeDearGirl return -SilphCo_11F_EventScript_NoRoomForMasterBall:: @ 8161E6B +SilphCo_11F_EventScript_NoRoomForMasterBall:: msgbox SilphCo_11F_Text_YouHaveNoRoomForThis release end -SilphCo_11F_EventScript_AlreadyGotMasterBall:: @ 8161E75 +SilphCo_11F_EventScript_AlreadyGotMasterBall:: msgbox SilphCo_11F_Text_ThatsOurSecretPrototype release end -SilphCo_11F_EventScript_Secretary:: @ 8161E7F +SilphCo_11F_EventScript_Secretary:: msgbox SilphCo_11F_Text_ThanksForRescuingUs, MSGBOX_NPC end -SilphCo_11F_EventScript_GiovanniTriggerLeft:: @ 8161E88 +SilphCo_11F_EventScript_GiovanniTriggerLeft:: lockall setvar VAR_TEMP_1, 0 goto SilphCo_11F_EventScript_BattleGiovanni end -SilphCo_11F_EventScript_GiovanniTriggerRight:: @ 8161E94 +SilphCo_11F_EventScript_GiovanniTriggerRight:: lockall setvar VAR_TEMP_1, 1 goto SilphCo_11F_EventScript_BattleGiovanni end -SilphCo_11F_EventScript_BattleGiovanni:: @ 8161EA0 +SilphCo_11F_EventScript_BattleGiovanni:: textcolor 0 applymovement LOCALID_GIOVANNI, Movement_WalkInPlaceFastestDown waitmovement 0 @@ -88,18 +88,18 @@ SilphCo_11F_EventScript_BattleGiovanni:: @ 8161EA0 releaseall end -SilphCo_11F_EventScript_GiovanniApproachLeft:: @ 8161F00 +SilphCo_11F_EventScript_GiovanniApproachLeft:: applymovement LOCALID_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachLeft applymovement OBJ_EVENT_ID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni waitmovement 0 return -SilphCo_11F_EventScript_GiovanniApproachRight:: @ 8161F12 +SilphCo_11F_EventScript_GiovanniApproachRight:: applymovement LOCALID_GIOVANNI, SilphCo_11F_Movement_GiovanniApproachRight waitmovement 0 return -SilphCo_11F_Movement_GiovanniApproachLeft:: @ 8161F1D +SilphCo_11F_Movement_GiovanniApproachLeft:: walk_down walk_down walk_down @@ -107,13 +107,13 @@ SilphCo_11F_Movement_GiovanniApproachLeft:: @ 8161F1D walk_in_place_fastest_left step_end -SilphCo_11F_Movement_GiovanniApproachRight:: @ 8161F23 +SilphCo_11F_Movement_GiovanniApproachRight:: walk_down walk_down walk_down step_end -SilphCo_11F_Movement_PlayerFaceGiovanni:: @ 8161F27 +SilphCo_11F_Movement_PlayerFaceGiovanni:: delay_16 delay_16 delay_16 @@ -123,20 +123,20 @@ SilphCo_11F_Movement_PlayerFaceGiovanni:: @ 8161F27 step_end @ Unused -SilphCo_11F_EventScript_Monitor:: @ 8161F2E +SilphCo_11F_EventScript_Monitor:: msgbox SilphCo_11F_Text_MonitorHasMonsOnIt, MSGBOX_SIGN end -SilphCo_11F_EventScript_FloorSign:: @ 8161F37 +SilphCo_11F_EventScript_FloorSign:: msgbox SilphCo_11F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_11F_EventScript_Grunt1:: @ 8161F40 +SilphCo_11F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, SilphCo_11F_Text_Grunt1Intro, SilphCo_11F_Text_Grunt1Defeat msgbox SilphCo_11F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_11F_EventScript_Grunt2:: @ 8161F57 +SilphCo_11F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, SilphCo_11F_Text_Grunt2Intro, SilphCo_11F_Text_Grunt2Defeat msgbox SilphCo_11F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_11F/text.inc b/data/maps/SilphCo_11F/text.inc index 83b004f4a..db5943903 100644 --- a/data/maps/SilphCo_11F/text.inc +++ b/data/maps/SilphCo_11F/text.inc @@ -1,4 +1,4 @@ -SilphCo_11F_Text_ThanksForSavingMeDearBoy:: @ 8176E12 +SilphCo_11F_Text_ThanksForSavingMeDearBoy:: .string "PRESIDENT: Oh, dear boy!\n" .string "Thank you for saving SILPH.\p" .string "I will never forget you saved us in\n" @@ -8,7 +8,7 @@ SilphCo_11F_Text_ThanksForSavingMeDearBoy:: @ 8176E12 .string "anything.\p" .string "Here, maybe this will do.$" -SilphCo_11F_Text_ThanksForSavingMeDearGirl:: @ 8176EE7 +SilphCo_11F_Text_ThanksForSavingMeDearGirl:: .string "PRESIDENT: Oh, dear girl!\n" .string "Thank you for saving SILPH.\p" .string "I will never forget you saved us in\n" @@ -18,11 +18,11 @@ SilphCo_11F_Text_ThanksForSavingMeDearGirl:: @ 8176EE7 .string "anything.\p" .string "Here, maybe this will do.$" -SilphCo_11F_Text_ObtainedMasterBallFromPresident:: @ 8176FBD +SilphCo_11F_Text_ObtainedMasterBallFromPresident:: .string "{PLAYER} obtained a MASTER BALL\n" .string "from the PRESIDENT!$" -SilphCo_11F_Text_ThatsOurSecretPrototype:: @ 8176FEB +SilphCo_11F_Text_ThatsOurSecretPrototype:: .string "PRESIDENT: You can't buy that\n" .string "anywhere.\p" .string "It's our secret prototype MASTER\n" @@ -32,16 +32,16 @@ SilphCo_11F_Text_ThatsOurSecretPrototype:: @ 8176FEB .string "You should be quiet about using it,\n" .string "though.$" -SilphCo_11F_Text_YouHaveNoRoomForThis:: @ 817708E +SilphCo_11F_Text_YouHaveNoRoomForThis:: .string "You have no room for this.$" -SilphCo_11F_Text_ThanksForRescuingUs:: @ 81770A9 +SilphCo_11F_Text_ThanksForRescuingUs:: .string "SECRETARY: Thank you for rescuing\n" .string "all of us.\p" .string "We, from the PRESIDENT down,\n" .string "are indebted to you.$" -SilphCo_11F_Text_GiovanniIntro:: @ 8177108 +SilphCo_11F_Text_GiovanniIntro:: .string "Ah, {PLAYER}!\n" .string "So we meet again!\p" .string "The PRESIDENT and I are discussing\n" @@ -50,11 +50,11 @@ SilphCo_11F_Text_GiovanniIntro:: @ 8177108 .string "matters…\p" .string "Or, experience a world of pain!$" -SilphCo_11F_Text_GiovanniDefeat:: @ 81771AB +SilphCo_11F_Text_GiovanniDefeat:: .string "Arrgh!!\n" .string "I lost again!?$" -SilphCo_11F_Text_GiovanniPostBattle:: @ 81771C2 +SilphCo_11F_Text_GiovanniPostBattle:: .string "Blast it all!\n" .string "You ruined our plans for SILPH!\p" .string "But, TEAM ROCKET will never fall!\p" @@ -62,33 +62,33 @@ SilphCo_11F_Text_GiovanniPostBattle:: @ 81771C2 .string "POKéMON exist for TEAM ROCKET!\p" .string "I must go, but I shall return!$" -SilphCo_11F_Text_Grunt2Intro:: @ 817726A +SilphCo_11F_Text_Grunt2Intro:: .string "Stop right there!\n" .string "Don't you move!$" -SilphCo_11F_Text_Grunt2Defeat:: @ 817728C +SilphCo_11F_Text_Grunt2Defeat:: .string "Don't…\n" .string "Please!$" -SilphCo_11F_Text_Grunt2PostBattle:: @ 817729B +SilphCo_11F_Text_Grunt2PostBattle:: .string "So, you want to see my BOSS?$" -SilphCo_11F_Text_Grunt1Intro:: @ 81772B8 +SilphCo_11F_Text_Grunt1Intro:: .string "Halt! Do you have an appointment\n" .string "with my BOSS?$" -SilphCo_11F_Text_Grunt1Defeat:: @ 81772E7 +SilphCo_11F_Text_Grunt1Defeat:: .string "Gaah!\n" .string "Demolished!$" -SilphCo_11F_Text_Grunt1PostBattle:: @ 81772F9 +SilphCo_11F_Text_Grunt1PostBattle:: .string "Watch your step…\n" .string "My BOSS likes his POKéMON tough!$" -SilphCo_11F_Text_MonitorHasMonsOnIt:: @ 817732B +SilphCo_11F_Text_MonitorHasMonsOnIt:: .string "The monitor has POKéMON on it!$" -SilphCo_11F_Text_FloorSign:: @ 817734A +SilphCo_11F_Text_FloorSign:: .string "SILPH CO. HEAD OFFICE\n" .string "11F$" diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc index 004d2de0c..16d249cd0 100644 --- a/data/maps/SilphCo_1F/scripts.inc +++ b/data/maps/SilphCo_1F/scripts.inc @@ -1,15 +1,15 @@ -SilphCo_1F_MapScripts:: @ 8161625 +SilphCo_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_1F_OnTransition .byte 0 -SilphCo_1F_OnTransition:: @ 816162B +SilphCo_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SILPH_CO_1F end -SilphCo_1F_EventScript_Receptionist:: @ 816162F +SilphCo_1F_EventScript_Receptionist:: msgbox SilphCo_1F_Text_WelcomePresidentInBoardroom, MSGBOX_NPC end -SilphCo_1F_EventScript_FloorSign:: @ 8161638 +SilphCo_1F_EventScript_FloorSign:: msgbox SilphCo_1F_Text_FloorSign, MSGBOX_SIGN end diff --git a/data/maps/SilphCo_1F/text.inc b/data/maps/SilphCo_1F/text.inc index a62665236..43a4fdae5 100644 --- a/data/maps/SilphCo_1F/text.inc +++ b/data/maps/SilphCo_1F/text.inc @@ -1,14 +1,14 @@ -SilphCo_1F_Text_WelcomePresidentInBoardroom:: @ 81754F7 +SilphCo_1F_Text_WelcomePresidentInBoardroom:: .string "Welcome.\p" .string "The PRESIDENT is in the boardroom\n" .string "on 11F.$" @ Tentative translation. Unknown origin -SilphCo_1F_Text_DestroyedWontBeFixedForWhile:: @ 817552A +SilphCo_1F_Text_DestroyedWontBeFixedForWhile:: .string "めちゃめちゃに　こわされてる\n" .string "とうぶん　なおりそうに　ない‥$" -SilphCo_1F_Text_FloorSign:: @ 8175549 +SilphCo_1F_Text_FloorSign:: .string "SILPH CO. HEAD OFFICE\n" .string "1F$" diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc index 161ddefe6..9fb2624fd 100644 --- a/data/maps/SilphCo_2F/scripts.inc +++ b/data/maps/SilphCo_2F/scripts.inc @@ -1,36 +1,36 @@ -SilphCo_2F_MapScripts:: @ 8161641 +SilphCo_2F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_2F_OnLoad .byte 0 -SilphCo_2F_OnLoad:: @ 8161647 +SilphCo_2F_OnLoad:: call_if_unset FLAG_SILPH_2F_DOOR_1, EventScript_Close2FDoor1 call_if_unset FLAG_SILPH_2F_DOOR_2, EventScript_Close2FDoor2 end -SilphCo_2F_EventScript_ThunderWaveTutor:: @ 816165A +SilphCo_2F_EventScript_ThunderWaveTutor:: goto EventScript_ThunderWaveTutor end -SilphCo_2F_EventScript_FloorSign:: @ 8161660 +SilphCo_2F_EventScript_FloorSign:: msgbox SilphCo_2F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_2F_EventScript_Connor:: @ 8161669 +SilphCo_2F_EventScript_Connor:: trainerbattle_single TRAINER_SCIENTIST_CONNOR, SilphCo_2F_Text_ConnorIntro, SilphCo_2F_Text_ConnorDefeat msgbox SilphCo_2F_Text_ConnorPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_2F_EventScript_Jerry:: @ 8161680 +SilphCo_2F_EventScript_Jerry:: trainerbattle_single TRAINER_SCIENTIST_JERRY, SilphCo_2F_Text_JerryIntro, SilphCo_2F_Text_JerryDefeat msgbox SilphCo_2F_Text_JerryPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_2F_EventScript_Grunt1:: @ 8161697 +SilphCo_2F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, SilphCo_2F_Text_Grunt1Intro, SilphCo_2F_Text_Grunt1Defeat msgbox SilphCo_2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_2F_EventScript_Grunt2:: @ 81616AE +SilphCo_2F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, SilphCo_2F_Text_Grunt2Intro, SilphCo_2F_Text_Grunt2Defeat msgbox SilphCo_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_2F/text.inc b/data/maps/SilphCo_2F/text.inc index 82c7bac99..33e1f39ad 100644 --- a/data/maps/SilphCo_2F/text.inc +++ b/data/maps/SilphCo_2F/text.inc @@ -1,50 +1,50 @@ -SilphCo_2F_Text_ConnorIntro:: @ 8175562 +SilphCo_2F_Text_ConnorIntro:: .string "Help!\n" .string "I'm a SILPH employee.$" -SilphCo_2F_Text_ConnorDefeat:: @ 817557E +SilphCo_2F_Text_ConnorDefeat:: .string "How did you know\n" .string "I was a ROCKET?$" -SilphCo_2F_Text_ConnorPostBattle:: @ 817559F +SilphCo_2F_Text_ConnorPostBattle:: .string "I work for both SILPH and TEAM\n" .string "ROCKET.$" -SilphCo_2F_Text_JerryIntro:: @ 81755C6 +SilphCo_2F_Text_JerryIntro:: .string "It's off-limits here!\n" .string "Go home!$" -SilphCo_2F_Text_JerryDefeat:: @ 81755E5 +SilphCo_2F_Text_JerryDefeat:: .string "You're good.$" -SilphCo_2F_Text_JerryPostBattle:: @ 81755F2 +SilphCo_2F_Text_JerryPostBattle:: .string "Can you solve the maze in here?\n" .string "It's not easy, I tell you!$" -SilphCo_2F_Text_Grunt1Intro:: @ 817562D +SilphCo_2F_Text_Grunt1Intro:: .string "No kids are allowed in here!$" -SilphCo_2F_Text_Grunt1Defeat:: @ 817564A +SilphCo_2F_Text_Grunt1Defeat:: .string "Tough!$" -SilphCo_2F_Text_Grunt1PostBattle:: @ 8175651 +SilphCo_2F_Text_Grunt1PostBattle:: .string "Diamond-shaped tiles are teleport\n" .string "blocks.\p" .string "They're transporters for this\n" .string "high-tech building.$" -SilphCo_2F_Text_Grunt2Intro:: @ 81756AD +SilphCo_2F_Text_Grunt2Intro:: .string "Hey, kid!\n" .string "What are you wandering here for?$" -SilphCo_2F_Text_Grunt2Defeat:: @ 81756D8 +SilphCo_2F_Text_Grunt2Defeat:: .string "I goofed!$" -SilphCo_2F_Text_Grunt2PostBattle:: @ 81756E2 +SilphCo_2F_Text_Grunt2PostBattle:: .string "SILPH CO. will be associated with\n" .string "TEAM ROCKET!$" -Text_ThunderWaveTeach:: @ 8175711 +Text_ThunderWaveTeach:: .string "Eeek!\n" .string "No! Stop! Help!\p" .string "Oh, you're not with TEAM ROCKET.\n" @@ -52,15 +52,15 @@ Text_ThunderWaveTeach:: @ 8175711 .string "Will you forgive me if I teach\n" .string "you the THUNDER WAVE technique?$" -Text_ThunderWaveDeclined:: @ 817579D +Text_ThunderWaveDeclined:: .string "Oh…\n" .string "But THUNDER WAVE is convenient…$" -Text_ThunderWaveWhichMon:: @ 81757C1 +Text_ThunderWaveWhichMon:: .string "Which POKéMON should I teach\n" .string "THUNDER WAVE?$" -Text_ThunderWaveTaught:: @ 81757EC +Text_ThunderWaveTaught:: .string "THUNDER WAVE causes paralysis in\n" .string "the target POKéMON.\p" .string "A paralyzed POKéMON may be unable\n" @@ -68,7 +68,7 @@ Text_ThunderWaveTaught:: @ 81757EC .string "It's an ELECTRIC-type move, so it\n" .string "won't work on some POKéMON.$" -SilphCo_2F_Text_FloorSign:: @ 8175894 +SilphCo_2F_Text_FloorSign:: .string "SILPH CO. HEAD OFFICE\n" .string "2F$" diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc index 2fab54a56..5a39471e0 100644 --- a/data/maps/SilphCo_3F/scripts.inc +++ b/data/maps/SilphCo_3F/scripts.inc @@ -1,13 +1,13 @@ -SilphCo_3F_MapScripts:: @ 81616C5 +SilphCo_3F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_3F_OnLoad .byte 0 -SilphCo_3F_OnLoad:: @ 81616CB +SilphCo_3F_OnLoad:: call_if_unset FLAG_SILPH_3F_DOOR_1, EventScript_Close3FDoor1 call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2 end -SilphCo_3F_EventScript_WorkerM:: @ 81616DE +SilphCo_3F_EventScript_WorkerM:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -16,21 +16,21 @@ SilphCo_3F_EventScript_WorkerM:: @ 81616DE release end -SilphCo_3F_EventScript_WorkerMRocketsGone:: @ 81616F5 +SilphCo_3F_EventScript_WorkerMRocketsGone:: msgbox SilphCo_3F_Text_YouAndYourMonsSavedUs release end -SilphCo_3F_EventScript_FloorSign:: @ 81616FF +SilphCo_3F_EventScript_FloorSign:: msgbox SilphCo_3F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_3F_EventScript_Jose:: @ 8161708 +SilphCo_3F_EventScript_Jose:: trainerbattle_single TRAINER_SCIENTIST_JOSE, SilphCo_3F_Text_JoseIntro, SilphCo_3F_Text_JoseDefeat msgbox SilphCo_3F_Text_JosePostBattle, MSGBOX_AUTOCLOSE end -SilphCo_3F_EventScript_Grunt:: @ 816171F +SilphCo_3F_EventScript_Grunt:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, SilphCo_3F_Text_GruntIntro, SilphCo_3F_Text_GruntDefeat msgbox SilphCo_3F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_3F/text.inc b/data/maps/SilphCo_3F/text.inc index 128865c1b..c18975d9e 100644 --- a/data/maps/SilphCo_3F/text.inc +++ b/data/maps/SilphCo_3F/text.inc @@ -1,34 +1,34 @@ -SilphCo_3F_Text_WhatAmIToDo:: @ 81758AD +SilphCo_3F_Text_WhatAmIToDo:: .string "I work for SILPH CO.\n" .string "What am I to do?$" -SilphCo_3F_Text_YouAndYourMonsSavedUs:: @ 81758D3 +SilphCo_3F_Text_YouAndYourMonsSavedUs:: .string "{PLAYER}!\n" .string "You and your POKéMON saved us!$" -SilphCo_3F_Text_GruntIntro:: @ 81758F6 +SilphCo_3F_Text_GruntIntro:: .string "Quit messing with us, kid!$" -SilphCo_3F_Text_GruntDefeat:: @ 8175911 +SilphCo_3F_Text_GruntDefeat:: .string "I give up!$" -SilphCo_3F_Text_GruntPostBattle:: @ 817591C +SilphCo_3F_Text_GruntPostBattle:: .string "A hint? You can open doors with\n" .string "a CARD KEY!$" -SilphCo_3F_Text_JoseIntro:: @ 8175948 +SilphCo_3F_Text_JoseIntro:: .string "I support TEAM ROCKET more than\n" .string "I support SILPH CO.!$" -SilphCo_3F_Text_JoseDefeat:: @ 817597D +SilphCo_3F_Text_JoseDefeat:: .string "You really got me!$" -SilphCo_3F_Text_JosePostBattle:: @ 8175990 +SilphCo_3F_Text_JosePostBattle:: .string "Humph…\p" .string "TEAM ROCKET said that if I helped\n" .string "them, they'd let me study POKéMON.$" -SilphCo_3F_Text_FloorSign:: @ 81759DC +SilphCo_3F_Text_FloorSign:: .string "SILPH CO. HEAD OFFICE\n" .string "3F$" diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc index bd20cb533..ab416bc98 100644 --- a/data/maps/SilphCo_4F/scripts.inc +++ b/data/maps/SilphCo_4F/scripts.inc @@ -1,13 +1,13 @@ -SilphCo_4F_MapScripts:: @ 8161736 +SilphCo_4F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_4F_OnLoad .byte 0 -SilphCo_4F_OnLoad:: @ 816173C +SilphCo_4F_OnLoad:: call_if_unset FLAG_SILPH_4F_DOOR_1, EventScript_Close4FDoor1 call_if_unset FLAG_SILPH_4F_DOOR_2, EventScript_Close4FDoor2 end -SilphCo_4F_EventScript_WorkerM:: @ 816174F +SilphCo_4F_EventScript_WorkerM:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -16,26 +16,26 @@ SilphCo_4F_EventScript_WorkerM:: @ 816174F release end -SilphCo_4F_EventScript_WorkerMRocketsGone:: @ 8161766 +SilphCo_4F_EventScript_WorkerMRocketsGone:: msgbox SilphCo_4F_Text_TeamRocketIsGone release end -SilphCo_4F_EventScript_FloorSign:: @ 8161770 +SilphCo_4F_EventScript_FloorSign:: msgbox SilphCo_4F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_4F_EventScript_Rodney:: @ 8161779 +SilphCo_4F_EventScript_Rodney:: trainerbattle_single TRAINER_SCIENTIST_RODNEY, SilphCo_4F_Text_RodneyIntro, SilphCo_4F_Text_RodneyDefeat msgbox SilphCo_4F_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_4F_EventScript_Grunt1:: @ 8161790 +SilphCo_4F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, SilphCo_4F_Text_Grunt1Intro, SilphCo_4F_Text_Grunt1Defeat msgbox SilphCo_4F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_4F_EventScript_Grunt2:: @ 81617A7 +SilphCo_4F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, SilphCo_4F_Text_Grunt2Intro, SilphCo_4F_Text_Grunt2Defeat msgbox SilphCo_4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_4F/text.inc b/data/maps/SilphCo_4F/text.inc index dd1ed2d20..357a6ee48 100644 --- a/data/maps/SilphCo_4F/text.inc +++ b/data/maps/SilphCo_4F/text.inc @@ -1,45 +1,45 @@ -SilphCo_4F_Text_CantYouSeeImHiding:: @ 81759F5 +SilphCo_4F_Text_CantYouSeeImHiding:: .string "Sssh!\n" .string "Can't you see I'm hiding?$" -SilphCo_4F_Text_TeamRocketIsGone:: @ 8175A15 +SilphCo_4F_Text_TeamRocketIsGone:: .string "Huh?\n" .string "TEAM ROCKET is gone?$" -SilphCo_4F_Text_Grunt1Intro:: @ 8175A2F +SilphCo_4F_Text_Grunt1Intro:: .string "TEAM ROCKET has taken control\n" .string "of SILPH CO.!$" -SilphCo_4F_Text_Grunt1Defeat:: @ 8175A5B +SilphCo_4F_Text_Grunt1Defeat:: .string "Arrgh!$" -SilphCo_4F_Text_Grunt1PostBattle:: @ 8175A62 +SilphCo_4F_Text_Grunt1PostBattle:: .string "Fwahahaha!\n" .string "My BOSS has been after this place!$" -SilphCo_4F_Text_RodneyIntro:: @ 8175A90 +SilphCo_4F_Text_RodneyIntro:: .string "My POKéMON is my loyal servant.$" -SilphCo_4F_Text_RodneyDefeat:: @ 8175AB0 +SilphCo_4F_Text_RodneyDefeat:: .string "Darn!\n" .string "You weak POKéMON!$" -SilphCo_4F_Text_RodneyPostBattle:: @ 8175AC8 +SilphCo_4F_Text_RodneyPostBattle:: .string "The doors are electronically\n" .string "locked.\p" .string "It takes a CARD KEY to open the\n" .string "doors here.$" -SilphCo_4F_Text_Grunt2Intro:: @ 8175B19 +SilphCo_4F_Text_Grunt2Intro:: .string "Intruder spotted!$" -SilphCo_4F_Text_Grunt2Defeat:: @ 8175B2B +SilphCo_4F_Text_Grunt2Defeat:: .string "Who are you?$" -SilphCo_4F_Text_Grunt2PostBattle:: @ 8175B38 +SilphCo_4F_Text_Grunt2PostBattle:: .string "I better tell the BOSS on 11F!$" -SilphCo_4F_Text_FloorSign:: @ 8175B57 +SilphCo_4F_Text_FloorSign:: .string "SILPH CO. HEAD OFFICE\n" .string "4F$" diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc index ae195ee09..c3245a7ca 100644 --- a/data/maps/SilphCo_5F/scripts.inc +++ b/data/maps/SilphCo_5F/scripts.inc @@ -1,14 +1,14 @@ -SilphCo_5F_MapScripts:: @ 81617BE +SilphCo_5F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_5F_OnLoad .byte 0 -SilphCo_5F_OnLoad:: @ 81617C4 +SilphCo_5F_OnLoad:: call_if_unset FLAG_SILPH_5F_DOOR_1, EventScript_Close5FDoor1 call_if_unset FLAG_SILPH_5F_DOOR_2, EventScript_Close5FDoor2 call_if_unset FLAG_SILPH_5F_DOOR_3, EventScript_Close5FDoor3 end -SilphCo_5F_EventScript_WorkerM:: @ 81617E0 +SilphCo_5F_EventScript_WorkerM:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -17,43 +17,43 @@ SilphCo_5F_EventScript_WorkerM:: @ 81617E0 release end -SilphCo_5F_EventScript_WorkerMRocketsGone:: @ 81617F7 +SilphCo_5F_EventScript_WorkerMRocketsGone:: msgbox SilphCo_5F_Text_YoureOurHeroThankYou release end -SilphCo_5F_EventScript_PokemonReport1:: @ 8161801 +SilphCo_5F_EventScript_PokemonReport1:: msgbox SilphCo_5F_Text_PorygonFirstVRMon, MSGBOX_SIGN end -SilphCo_5F_EventScript_PokemonReport2:: @ 816180A +SilphCo_5F_EventScript_PokemonReport2:: msgbox SilphCo_5F_Text_Over350TechniquesConfirmed, MSGBOX_SIGN end -SilphCo_5F_EventScript_PokemonReport3:: @ 8161813 +SilphCo_5F_EventScript_PokemonReport3:: msgbox SilphCo_5F_Text_SomeMonsEvolveWhenTraded, MSGBOX_SIGN end -SilphCo_5F_EventScript_FloorSign:: @ 816181C +SilphCo_5F_EventScript_FloorSign:: msgbox SilphCo_5F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_5F_EventScript_Beau:: @ 8161825 +SilphCo_5F_EventScript_Beau:: trainerbattle_single TRAINER_SCIENTIST_BEAU, SilphCo_5F_Text_BeauIntro, SilphCo_5F_Text_BeauDefeat msgbox SilphCo_5F_Text_BeauPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_5F_EventScript_Grunt1:: @ 816183C +SilphCo_5F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, SilphCo_5F_Text_Grunt1Intro, SilphCo_5F_Text_Grunt1Defeat msgbox SilphCo_5F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_5F_EventScript_Grunt2:: @ 8161853 +SilphCo_5F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, SilphCo_5F_Text_Grunt2Intro, SilphCo_5F_Text_Grunt2Defeat msgbox SilphCo_5F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_5F_EventScript_Dalton:: @ 816186A +SilphCo_5F_EventScript_Dalton:: trainerbattle_single TRAINER_JUGGLER_DALTON, SilphCo_5F_Text_DaltonIntro, SilphCo_5F_Text_DaltonDefeat msgbox SilphCo_5F_Text_DaltonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_5F/text.inc b/data/maps/SilphCo_5F/text.inc index 3161f971c..4b49eeb43 100644 --- a/data/maps/SilphCo_5F/text.inc +++ b/data/maps/SilphCo_5F/text.inc @@ -1,78 +1,78 @@ -SilphCo_5F_Text_RocketsInUproarAboutIntruder:: @ 8175B70 +SilphCo_5F_Text_RocketsInUproarAboutIntruder:: .string "TEAM ROCKET is in an uproar over\n" .string "some intruder.\p" .string "That's you, right?$" -SilphCo_5F_Text_YoureOurHeroThankYou:: @ 8175BB3 +SilphCo_5F_Text_YoureOurHeroThankYou:: .string "TEAM ROCKET took off!\n" .string "You're our hero! Thank you!$" -SilphCo_5F_Text_Grunt1Intro:: @ 8175BE5 +SilphCo_5F_Text_Grunt1Intro:: .string "I heard a kid was wandering\n" .string "around.$" -SilphCo_5F_Text_Grunt1Defeat:: @ 8175C09 +SilphCo_5F_Text_Grunt1Defeat:: .string "Boom!$" -SilphCo_5F_Text_Grunt1PostBattle:: @ 8175C0F +SilphCo_5F_Text_Grunt1PostBattle:: .string "It's not smart to pick a fight with\n" .string "TEAM ROCKET!$" -SilphCo_5F_Text_BeauIntro:: @ 8175C40 +SilphCo_5F_Text_BeauIntro:: .string "We study POKé BALL technology on\n" .string "this floor.$" -SilphCo_5F_Text_BeauDefeat:: @ 8175C6D +SilphCo_5F_Text_BeauDefeat:: .string "Dang!\n" .string "Blast it!$" -SilphCo_5F_Text_BeauPostBattle:: @ 8175C7D +SilphCo_5F_Text_BeauPostBattle:: .string "We worked on the ultimate POKé\n" .string "BALL which would catch anything.$" -SilphCo_5F_Text_DaltonIntro:: @ 8175CBD +SilphCo_5F_Text_DaltonIntro:: .string "Whaaat?\p" .string "There shouldn't be any children\n" .string "here!$" -SilphCo_5F_Text_DaltonDefeat:: @ 8175CEB +SilphCo_5F_Text_DaltonDefeat:: .string "Oh, goodness!$" -SilphCo_5F_Text_DaltonPostBattle:: @ 8175CF9 +SilphCo_5F_Text_DaltonPostBattle:: .string "You're only on 5F.\n" .string "It's a long way to my BOSS!$" -SilphCo_5F_Text_Grunt2Intro:: @ 8175D28 +SilphCo_5F_Text_Grunt2Intro:: .string "Show TEAM ROCKET a little respect!$" -SilphCo_5F_Text_Grunt2Defeat:: @ 8175D4B +SilphCo_5F_Text_Grunt2Defeat:: .string "Cough…\n" .string "Cough…$" -SilphCo_5F_Text_Grunt2PostBattle:: @ 8175D59 +SilphCo_5F_Text_Grunt2PostBattle:: .string "Which reminds me.\p" .string "KOFFING evolves into WEEZING!$" -SilphCo_5F_Text_PorygonFirstVRMon:: @ 8175D89 +SilphCo_5F_Text_PorygonFirstVRMon:: .string "It's a POKéMON REPORT!\p" .string "POKéMON LAB created PORYGON,\n" .string "the first virtual-reality POKéMON.$" -SilphCo_5F_Text_Over350TechniquesConfirmed:: @ 8175DE0 +SilphCo_5F_Text_Over350TechniquesConfirmed:: .string "It's a POKéMON REPORT!\p" .string "Over 350 POKéMON techniques have\n" .string "been confirmed.$" -SilphCo_5F_Text_SomeMonsEvolveWhenTraded:: @ 8175E28 +SilphCo_5F_Text_SomeMonsEvolveWhenTraded:: .string "It's a POKéMON REPORT!\p" .string "Some POKéMON have been confirmed\n" .string "to evolve when they are traded.$" -SilphCo_5F_Text_FloorSign:: @ 8175E80 +SilphCo_5F_Text_FloorSign:: .string "SILPH CO. HEAD OFFICE\n" .string "5F$" -SilphCo_5F_Text_RocketBossLookingForStrongMons:: @ 8175E99 +SilphCo_5F_Text_RocketBossLookingForStrongMons:: .string "Those thugs that took over our\n" .string "building…\p" .string "Their BOSS said he was looking for\n" diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc index 478ff3309..06e2636ea 100644 --- a/data/maps/SilphCo_6F/scripts.inc +++ b/data/maps/SilphCo_6F/scripts.inc @@ -1,12 +1,12 @@ -SilphCo_6F_MapScripts:: @ 8161881 +SilphCo_6F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_6F_OnLoad .byte 0 -SilphCo_6F_OnLoad:: @ 8161887 +SilphCo_6F_OnLoad:: call_if_unset FLAG_SILPH_6F_DOOR, EventScript_Close6FDoor end -SilphCo_6F_EventScript_WorkerM2:: @ 8161891 +SilphCo_6F_EventScript_WorkerM2:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -15,12 +15,12 @@ SilphCo_6F_EventScript_WorkerM2:: @ 8161891 release end -SilphCo_6F_EventScript_WorkerM2RocketsGone:: @ 81618A8 +SilphCo_6F_EventScript_WorkerM2RocketsGone:: msgbox SilphCo_6F_Text_ComeWorkForSilphWhenYoureOlder release end -SilphCo_6F_EventScript_WorkerM3:: @ 81618B2 +SilphCo_6F_EventScript_WorkerM3:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -29,12 +29,12 @@ SilphCo_6F_EventScript_WorkerM3:: @ 81618B2 release end -SilphCo_6F_EventScript_WorkerM3RocketsGone:: @ 81618C9 +SilphCo_6F_EventScript_WorkerM3RocketsGone:: msgbox SilphCo_6F_Text_BetterGetBackToWork release end -SilphCo_6F_EventScript_WorkerM1:: @ 81618D3 +SilphCo_6F_EventScript_WorkerM1:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -43,12 +43,12 @@ SilphCo_6F_EventScript_WorkerM1:: @ 81618D3 release end -SilphCo_6F_EventScript_WorkerM1RocketsGone:: @ 81618EA +SilphCo_6F_EventScript_WorkerM1RocketsGone:: msgbox SilphCo_6F_Text_WeGotEngaged release end -SilphCo_6F_EventScript_WorkerF1:: @ 81618F4 +SilphCo_6F_EventScript_WorkerF1:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -57,12 +57,12 @@ SilphCo_6F_EventScript_WorkerF1:: @ 81618F4 release end -SilphCo_6F_EventScript_WorkerF1RocketsGone:: @ 816190B +SilphCo_6F_EventScript_WorkerF1RocketsGone:: msgbox SilphCo_6F_Text_NeedsMeToLookAfterHim release end -SilphCo_6F_EventScript_WorkerF2:: @ 8161915 +SilphCo_6F_EventScript_WorkerF2:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -71,26 +71,26 @@ SilphCo_6F_EventScript_WorkerF2:: @ 8161915 release end -SilphCo_6F_EventScript_WorkerF2RocketsGone:: @ 816192C +SilphCo_6F_EventScript_WorkerF2RocketsGone:: msgbox SilphCo_6F_Text_RocketsRanAwayBecauseOfYou release end -SilphCo_6F_EventScript_FloorSign:: @ 8161936 +SilphCo_6F_EventScript_FloorSign:: msgbox SilphCo_6F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_6F_EventScript_Taylor:: @ 816193F +SilphCo_6F_EventScript_Taylor:: trainerbattle_single TRAINER_SCIENTIST_TAYLOR, SilphCo_6F_Text_TaylorIntro, SilphCo_6F_Text_TaylorDefeat msgbox SilphCo_6F_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_6F_EventScript_Grunt1:: @ 8161956 +SilphCo_6F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, SilphCo_6F_Text_Grunt1Intro, SilphCo_6F_Text_Grunt1Defeat msgbox SilphCo_6F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_6F_EventScript_Grunt2:: @ 816196D +SilphCo_6F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, SilphCo_6F_Text_Grunt2Intro, SilphCo_6F_Text_Grunt2Defeat msgbox SilphCo_6F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_6F/text.inc b/data/maps/SilphCo_6F/text.inc index f0d1084a1..3f6603ae4 100644 --- a/data/maps/SilphCo_6F/text.inc +++ b/data/maps/SilphCo_6F/text.inc @@ -1,78 +1,78 @@ -SilphCo_6F_Text_RocketsTookOverBuilding:: @ 8175F24 +SilphCo_6F_Text_RocketsTookOverBuilding:: .string "The ROCKETS came and took over\n" .string "the building!$" -SilphCo_6F_Text_BetterGetBackToWork:: @ 8175F51 +SilphCo_6F_Text_BetterGetBackToWork:: .string "Well, better get back to work.$" -SilphCo_6F_Text_HelpMePlease:: @ 8175F70 +SilphCo_6F_Text_HelpMePlease:: .string "Oh dear, oh dear.\n" .string "Help me, please!$" -SilphCo_6F_Text_WeGotEngaged:: @ 8175F93 +SilphCo_6F_Text_WeGotEngaged:: .string "We got engaged.\n" .string "Heheh!$" -SilphCo_6F_Text_ThatManIsSuchACoward:: @ 8175FAA +SilphCo_6F_Text_ThatManIsSuchACoward:: .string "That man next to me…\n" .string "He's such a coward!$" -SilphCo_6F_Text_NeedsMeToLookAfterHim:: @ 8175FD3 +SilphCo_6F_Text_NeedsMeToLookAfterHim:: .string "He's so helpless, he needed\n" .string "someone like me to look after him.$" -SilphCo_6F_Text_RocketsTryingToConquerWorld:: @ 8176012 +SilphCo_6F_Text_RocketsTryingToConquerWorld:: .string "TEAM ROCKET is trying to conquer\n" .string "the world with POKéMON.$" -SilphCo_6F_Text_RocketsRanAwayBecauseOfYou:: @ 817604B +SilphCo_6F_Text_RocketsRanAwayBecauseOfYou:: .string "TEAM ROCKET ran away, and it's all\n" .string "because of you!$" -SilphCo_6F_Text_TargetedSilphForOurMonProducts:: @ 817607E +SilphCo_6F_Text_TargetedSilphForOurMonProducts:: .string "They must have targeted SILPH for\n" .string "our POKéMON products.$" -SilphCo_6F_Text_ComeWorkForSilphWhenYoureOlder:: @ 81760B6 +SilphCo_6F_Text_ComeWorkForSilphWhenYoureOlder:: .string "Come work for SILPH when you\n" .string "get older.$" -SilphCo_6F_Text_Grunt1Intro:: @ 81760DE +SilphCo_6F_Text_Grunt1Intro:: .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -SilphCo_6F_Text_Grunt1Defeat:: @ 8176104 +SilphCo_6F_Text_Grunt1Defeat:: .string "Flame out!$" -SilphCo_6F_Text_Grunt1PostBattle:: @ 817610F +SilphCo_6F_Text_Grunt1PostBattle:: .string "No matter!\n" .string "My brothers will avenge me!$" -SilphCo_6F_Text_TaylorIntro:: @ 8176136 +SilphCo_6F_Text_TaylorIntro:: .string "That rotten PRESIDENT!\p" .string "Serves him right for shipping me\n" .string "off to the TIKSI BRANCH!\p" .string "That's why TEAM ROCKET came after\n" .string "us, I'm sure of it!$" -SilphCo_6F_Text_TaylorDefeat:: @ 81761BD +SilphCo_6F_Text_TaylorDefeat:: .string "Shoot!$" -SilphCo_6F_Text_TaylorPostBattle:: @ 81761C4 +SilphCo_6F_Text_TaylorPostBattle:: .string "TIKSI BRANCH?\n" .string "It's in Russian no-man's-land!$" -SilphCo_6F_Text_Grunt2Intro:: @ 81761F1 +SilphCo_6F_Text_Grunt2Intro:: .string "You dare betray TEAM ROCKET?$" -SilphCo_6F_Text_Grunt2Defeat:: @ 817620E +SilphCo_6F_Text_Grunt2Defeat:: .string "You traitor!$" -SilphCo_6F_Text_Grunt2PostBattle:: @ 817621B +SilphCo_6F_Text_Grunt2PostBattle:: .string "If you stand for justice, you\n" .string "betray us bad guys!$" -SilphCo_6F_Text_FloorSign:: @ 817624D +SilphCo_6F_Text_FloorSign:: .string "SILPH CO. HEAD OFFICE\n" .string "6F$" diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc index c276483f5..cce9193ae 100644 --- a/data/maps/SilphCo_7F/scripts.inc +++ b/data/maps/SilphCo_7F/scripts.inc @@ -1,39 +1,39 @@ .set LOCALID_RIVAL, 1 .set LOCALID_WORKER_M2, 8 -SilphCo_7F_MapScripts:: @ 8161984 +SilphCo_7F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_7F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, SilphCo_7F_OnTransition .byte 0 -SilphCo_7F_OnLoad:: @ 816198F +SilphCo_7F_OnLoad:: call_if_unset FLAG_SILPH_7F_DOOR_1, EventScript_Close7FDoor1 call_if_unset FLAG_SILPH_7F_DOOR_2, EventScript_Close7FDoor2 call_if_unset FLAG_SILPH_7F_DOOR_3, EventScript_Close7FDoor3 end -SilphCo_7F_OnTransition:: @ 81619AB +SilphCo_7F_OnTransition:: compare VAR_MAP_SCENE_SILPH_CO_11F, 1 call_if_ge SilphCo_7F_EventScript_SetObjRocketsGone end -SilphCo_7F_EventScript_SetObjRocketsGone:: @ 81619B7 +SilphCo_7F_EventScript_SetObjRocketsGone:: setobjectmovementtype LOCALID_WORKER_M2, MOVEMENT_TYPE_FACE_UP return -SilphCo_7F_EventScript_RivalTriggerTop:: @ 81619BC +SilphCo_7F_EventScript_RivalTriggerTop:: lockall setvar VAR_TEMP_1, 0 goto SilphCo_7F_EventScript_RivalScene end -SilphCo_7F_EventScript_RivalTriggerBottom:: @ 81619C8 +SilphCo_7F_EventScript_RivalTriggerBottom:: lockall setvar VAR_TEMP_1, 1 goto SilphCo_7F_EventScript_RivalScene end -SilphCo_7F_EventScript_RivalScene:: @ 81619D4 +SilphCo_7F_EventScript_RivalScene:: textcolor 0 playbgm MUS_ENCOUNTER_RIVAL, 0 applymovement LOCALID_RIVAL, Movement_ExclamationMark @@ -69,42 +69,42 @@ SilphCo_7F_EventScript_RivalScene:: @ 81619D4 releaseall end -SilphCo_7F_EventScript_RivalApproachTop:: @ 8161A73 +SilphCo_7F_EventScript_RivalApproachTop:: closemessage applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalApproachTop waitmovement 0 return -SilphCo_7F_EventScript_RivalApproachBottom:: @ 8161A7F +SilphCo_7F_EventScript_RivalApproachBottom:: return -SilphCo_7F_EventScript_RivalSquirtle:: @ 8161A80 +SilphCo_7F_EventScript_RivalSquirtle:: trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, SilphCo_7F_Text_RivalDefeat return -SilphCo_7F_EventScript_RivalBulbasaur:: @ 8161A8B +SilphCo_7F_EventScript_RivalBulbasaur:: trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, SilphCo_7F_Text_RivalDefeat return -SilphCo_7F_EventScript_RivalCharmander:: @ 8161A96 +SilphCo_7F_EventScript_RivalCharmander:: trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, SilphCo_7F_Text_RivalDefeat return -SilphCo_7F_EventScript_RivalExitTop:: @ 8161AA1 +SilphCo_7F_EventScript_RivalExitTop:: applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitTop waitmovement 0 return -SilphCo_7F_EventScript_RivalExitBottom:: @ 8161AAC +SilphCo_7F_EventScript_RivalExitBottom:: applymovement LOCALID_RIVAL, SilphCo_7F_Movement_RivalExitBottom waitmovement 0 return -SilphCo_7F_Movement_RivalApproachTop:: @ 8161AB7 +SilphCo_7F_Movement_RivalApproachTop:: walk_up step_end -SilphCo_7F_Movement_RivalExitTop:: @ 8161AB9 +SilphCo_7F_Movement_RivalExitTop:: walk_right walk_right walk_right @@ -112,7 +112,7 @@ SilphCo_7F_Movement_RivalExitTop:: @ 8161AB9 delay_16 step_end -SilphCo_7F_Movement_RivalExitBottom:: @ 8161ABF +SilphCo_7F_Movement_RivalExitBottom:: walk_left walk_up walk_up @@ -123,7 +123,7 @@ SilphCo_7F_Movement_RivalExitBottom:: @ 8161ABF delay_16 step_end -SilphCo_7F_EventScript_LaprasGuy:: @ 8161AC8 +SilphCo_7F_EventScript_LaprasGuy:: lock faceplayer goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, SilphCo_7F_EventScript_AlreadyGotLapras @@ -139,7 +139,7 @@ SilphCo_7F_EventScript_LaprasGuy:: @ 8161AC8 release end -SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 +SilphCo_7F_EventScript_ReceiveLaprasParty:: textcolor 3 playfanfare MUS_LEVEL_UP message SilphCo_7F_Text_ObtainedLaprasFromEmployee @@ -154,7 +154,7 @@ SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12 goto SilphCo_7F_EventScript_EndReceiveLapras end -SilphCo_7F_EventScript_ReceiveLaprasPC:: @ 8161B45 +SilphCo_7F_EventScript_ReceiveLaprasPC:: textcolor 3 playfanfare MUS_LEVEL_UP message SilphCo_7F_Text_ObtainedLaprasFromEmployee @@ -168,24 +168,24 @@ SilphCo_7F_EventScript_ReceiveLaprasPC:: @ 8161B45 goto SilphCo_7F_EventScript_LaprasTransferredToPC end -SilphCo_7F_EventScript_LaprasTransferredToPC:: @ 8161B73 +SilphCo_7F_EventScript_LaprasTransferredToPC:: call EventScript_TransferredToPC goto SilphCo_7F_EventScript_EndReceiveLapras end -SilphCo_7F_EventScript_EndReceiveLapras:: @ 8161B7E +SilphCo_7F_EventScript_EndReceiveLapras:: textcolor 0 msgbox SilphCo_7F_Text_ExplainLapras setflag FLAG_GOT_LAPRAS_FROM_SILPH release end -SilphCo_7F_EventScript_AlreadyGotLapras:: @ 8161B8D +SilphCo_7F_EventScript_AlreadyGotLapras:: msgbox SilphCo_7F_Text_RocketBossWentToBoardroom release end -SilphCo_7F_EventScript_WorkerM1:: @ 8161B97 +SilphCo_7F_EventScript_WorkerM1:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -194,12 +194,12 @@ SilphCo_7F_EventScript_WorkerM1:: @ 8161B97 release end -SilphCo_7F_EventScript_WorkerM1RocketsGone:: @ 8161BAE +SilphCo_7F_EventScript_WorkerM1RocketsGone:: msgbox SilphCo_7F_Text_CanceledMasterBallProject release end -SilphCo_7F_EventScript_WorkerM2:: @ 8161BB8 +SilphCo_7F_EventScript_WorkerM2:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -208,12 +208,12 @@ SilphCo_7F_EventScript_WorkerM2:: @ 8161BB8 release end -SilphCo_7F_EventScript_WorkerM2RocketsGone:: @ 8161BCF +SilphCo_7F_EventScript_WorkerM2RocketsGone:: msgbox SilphCo_7F_Text_WowYouChasedOffTeamRocket release end -SilphCo_7F_EventScript_WorkerF:: @ 8161BD9 +SilphCo_7F_EventScript_WorkerF:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -222,31 +222,31 @@ SilphCo_7F_EventScript_WorkerF:: @ 8161BD9 release end -SilphCo_7F_EventScript_WorkerFRocketsGone:: @ 8161BF0 +SilphCo_7F_EventScript_WorkerFRocketsGone:: msgbox SilphCo_7F_Text_ThankYouSoMuch release end -SilphCo_7F_EventScript_FloorSign:: @ 8161BFA +SilphCo_7F_EventScript_FloorSign:: msgbox SilphCo_7F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_7F_EventScript_Joshua:: @ 8161C03 +SilphCo_7F_EventScript_Joshua:: trainerbattle_single TRAINER_SCIENTIST_JOSHUA, SilphCo_7F_Text_JoshuaIntro, SilphCo_7F_Text_JoshuaDefeat msgbox SilphCo_7F_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_7F_EventScript_Grunt1:: @ 8161C1A +SilphCo_7F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, SilphCo_7F_Text_Grunt1Intro, SilphCo_7F_Text_Grunt1Defeat msgbox SilphCo_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_7F_EventScript_Grunt2:: @ 8161C31 +SilphCo_7F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, SilphCo_7F_Text_Grunt2Intro, SilphCo_7F_Text_Grunt2Defeat msgbox SilphCo_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_7F_EventScript_Grunt3:: @ 8161C48 +SilphCo_7F_EventScript_Grunt3:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, SilphCo_7F_Text_Grunt3Intro, SilphCo_7F_Text_Grunt3Defeat msgbox SilphCo_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_7F/text.inc b/data/maps/SilphCo_7F/text.inc index 27e01c4a5..daa122897 100644 --- a/data/maps/SilphCo_7F/text.inc +++ b/data/maps/SilphCo_7F/text.inc @@ -1,15 +1,15 @@ -SilphCo_7F_Text_HaveMonForSavingUs:: @ 8176266 +SilphCo_7F_Text_HaveMonForSavingUs:: .string "Oh! Hi! You're not a ROCKET!\n" .string "You came to save us?\l" .string "Why, thank you!\p" .string "I want you to have this POKéMON\n" .string "for saving us.$" -SilphCo_7F_Text_ObtainedLaprasFromEmployee:: @ 81762D7 +SilphCo_7F_Text_ObtainedLaprasFromEmployee:: .string "{PLAYER} obtained a LAPRAS from\n" .string "the SILPH employee!$" -SilphCo_7F_Text_ExplainLapras:: @ 8176305 +SilphCo_7F_Text_ExplainLapras:: .string "It's a LAPRAS.\n" .string "It's a very intelligent POKéMON.\p" .string "We kept it in our lab, but it will\n" @@ -19,94 +19,94 @@ SilphCo_7F_Text_ExplainLapras:: @ 8176305 .string "It's a good swimmer.\n" .string "It'll give you a lift across water!$" -SilphCo_7F_Text_RocketBossWentToBoardroom:: @ 81763DD +SilphCo_7F_Text_RocketBossWentToBoardroom:: .string "TEAM ROCKET's BOSS went to the\n" .string "boardroom!\p" .string "Is our PRESIDENT okay?\n" .string "I'm worried.$" -SilphCo_7F_Text_OhNo:: @ 817642B +SilphCo_7F_Text_OhNo:: .string "あ‥　もう　もてないぞ$" -SilphCo_7F_Text_SavedAtLast:: @ 8176437 +SilphCo_7F_Text_SavedAtLast:: .string "たすかったよ　ありがと！$" -SilphCo_7F_Text_RocketsAfterMasterBall:: @ 8176444 +SilphCo_7F_Text_RocketsAfterMasterBall:: .string "TEAM ROCKET was after the MASTER\n" .string "BALL, which catches any POKéMON.$" -SilphCo_7F_Text_CanceledMasterBallProject:: @ 8176486 +SilphCo_7F_Text_CanceledMasterBallProject:: .string "We canceled the MASTER BALL\n" .string "project because of TEAM ROCKET.$" -SilphCo_7F_Text_BadIfTeamRocketTookOver:: @ 81764C2 +SilphCo_7F_Text_BadIfTeamRocketTookOver:: .string "It would be bad if TEAM ROCKET\n" .string "took over SILPH or our POKéMON.$" -SilphCo_7F_Text_WowYouChasedOffTeamRocket:: @ 8176501 +SilphCo_7F_Text_WowYouChasedOffTeamRocket:: .string "Wow!\p" .string "You chased off TEAM ROCKET all by\n" .string "yourself?$" -SilphCo_7F_Text_ReallyDangerousHere:: @ 8176532 +SilphCo_7F_Text_ReallyDangerousHere:: .string "You!\n" .string "It's really dangerous here!\p" .string "You came to save me?\n" .string "You can't!$" -SilphCo_7F_Text_ThankYouSoMuch:: @ 8176573 +SilphCo_7F_Text_ThankYouSoMuch:: .string "Thank you so much!$" -SilphCo_7F_Text_Grunt3Intro:: @ 8176586 +SilphCo_7F_Text_Grunt3Intro:: .string "Uh-oh!\n" .string "I smell a little mouse!$" -SilphCo_7F_Text_Grunt3Defeat:: @ 81765A5 +SilphCo_7F_Text_Grunt3Defeat:: .string "Lights out!$" -SilphCo_7F_Text_Grunt3PostBattle:: @ 81765B1 +SilphCo_7F_Text_Grunt3PostBattle:: .string "You won't find my BOSS by just\n" .string "scurrying around!$" -SilphCo_7F_Text_JoshuaIntro:: @ 81765E2 +SilphCo_7F_Text_JoshuaIntro:: .string "Heheh!\p" .string "You mistook me for a SILPH worker?$" -SilphCo_7F_Text_JoshuaDefeat:: @ 817660C +SilphCo_7F_Text_JoshuaDefeat:: .string "I'm done!$" -SilphCo_7F_Text_JoshuaPostBattle:: @ 8176616 +SilphCo_7F_Text_JoshuaPostBattle:: .string "Despite your age, you are a\n" .string "skilled TRAINER!$" -SilphCo_7F_Text_Grunt1Intro:: @ 8176643 +SilphCo_7F_Text_Grunt1Intro:: .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -SilphCo_7F_Text_Grunt1Defeat:: @ 8176669 +SilphCo_7F_Text_Grunt1Defeat:: .string "Aack!\n" .string "Brothers, I lost!$" -SilphCo_7F_Text_Grunt1PostBattle:: @ 8176681 +SilphCo_7F_Text_Grunt1PostBattle:: .string "Doesn't matter.\n" .string "My brothers will repay the favor!$" -SilphCo_7F_Text_Grunt2Intro:: @ 81766B3 +SilphCo_7F_Text_Grunt2Intro:: .string "A child intruder?\n" .string "That must be you!$" -SilphCo_7F_Text_Grunt2Defeat:: @ 81766D7 +SilphCo_7F_Text_Grunt2Defeat:: .string "Fine!\n" .string "I lost!$" -SilphCo_7F_Text_Grunt2PostBattle:: @ 81766E5 +SilphCo_7F_Text_Grunt2PostBattle:: .string "Go on home before my BOSS gets\n" .string "ticked off!$" -SilphCo_7F_Text_RivalWhatKeptYou:: @ 8176710 +SilphCo_7F_Text_RivalWhatKeptYou:: .string "{RIVAL}: What kept you, {PLAYER}?$" -SilphCo_7F_Text_RivalIntro:: @ 8176727 +SilphCo_7F_Text_RivalIntro:: .string "{RIVAL}: Hahaha! I thought you'd\n" .string "turn up if I waited here!\p" .string "I guess TEAM ROCKET slowed you\n" @@ -114,18 +114,18 @@ SilphCo_7F_Text_RivalIntro:: @ 8176727 .string "I saw you in SAFFRON, so I decided\n" .string "to see if you got better!$" -SilphCo_7F_Text_RivalDefeat:: @ 81767D0 +SilphCo_7F_Text_RivalDefeat:: .string "Oh, man!\n" .string "So, you are ready for BOSS\l" .string "ROCKET!$" -SilphCo_7F_Text_RivalVictory:: @ 81767FC +SilphCo_7F_Text_RivalVictory:: .string "{RIVAL}“おまえなあ‥\p" .string "こんな　うでまえじゃ\n" .string "まだまだ‥\l" .string "いちにんまえ　とは　いえないぜ$" -SilphCo_7F_Text_RivalPostBattle:: @ 8176827 +SilphCo_7F_Text_RivalPostBattle:: .string "Well, {PLAYER}!\n" .string "I'm moving on up and ahead!\p" .string "By checking my POKéDEX, I'm\n" @@ -140,7 +140,7 @@ SilphCo_7F_Text_RivalPostBattle:: @ 8176827 .string "Don't sweat it!\l" .string "Smell ya!$" -SilphCo_7F_Text_FloorSign:: @ 8176954 +SilphCo_7F_Text_FloorSign:: .string "SILPH CO. HEAD OFFICE\n" .string "7F$" diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc index d888f339e..c8605fcac 100644 --- a/data/maps/SilphCo_8F/scripts.inc +++ b/data/maps/SilphCo_8F/scripts.inc @@ -1,12 +1,12 @@ -SilphCo_8F_MapScripts:: @ 8161C5F +SilphCo_8F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_8F_OnLoad .byte 0 -SilphCo_8F_OnLoad:: @ 8161C65 +SilphCo_8F_OnLoad:: call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor end -SilphCo_8F_EventScript_WorkerM:: @ 8161C6F +SilphCo_8F_EventScript_WorkerM:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -15,26 +15,26 @@ SilphCo_8F_EventScript_WorkerM:: @ 8161C6F release end -SilphCo_8F_EventScript_WorkerMRocketsGone:: @ 8161C86 +SilphCo_8F_EventScript_WorkerMRocketsGone:: msgbox SilphCo_8F_Text_ThanksForSavingUs release end -SilphCo_8F_EventScript_FloorSign:: @ 8161C90 +SilphCo_8F_EventScript_FloorSign:: msgbox SilphCo_8F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_8F_EventScript_Parker:: @ 8161C99 +SilphCo_8F_EventScript_Parker:: trainerbattle_single TRAINER_SCIENTIST_PARKER, SilphCo_8F_Text_ParkerIntro, SilphCo_8F_Text_ParkerDefeat msgbox SilphCo_8F_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_8F_EventScript_Grunt1:: @ 8161CB0 +SilphCo_8F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, SilphCo_8F_Text_Grunt1Intro, SilphCo_8F_Text_Grunt1Defeat msgbox SilphCo_8F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_8F_EventScript_Grunt2:: @ 8161CC7 +SilphCo_8F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, SilphCo_8F_Text_Grunt2Intro, SilphCo_8F_Text_Grunt2Defeat msgbox SilphCo_8F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_8F/text.inc b/data/maps/SilphCo_8F/text.inc index 9144cda4e..12149199e 100644 --- a/data/maps/SilphCo_8F/text.inc +++ b/data/maps/SilphCo_8F/text.inc @@ -1,46 +1,46 @@ -SilphCo_8F_Text_WonderIfSilphIsFinished:: @ 817696D +SilphCo_8F_Text_WonderIfSilphIsFinished:: .string "I wonder if SILPH is finished…$" -SilphCo_8F_Text_ThanksForSavingUs:: @ 817698C +SilphCo_8F_Text_ThanksForSavingUs:: .string "Thanks for saving us!$" -SilphCo_8F_Text_Grunt1Intro:: @ 81769A2 +SilphCo_8F_Text_Grunt1Intro:: .string "That's as far as you'll go!$" -SilphCo_8F_Text_Grunt1Defeat:: @ 81769BE +SilphCo_8F_Text_Grunt1Defeat:: .string "Not enough grit!$" -SilphCo_8F_Text_Grunt1PostBattle:: @ 81769CF +SilphCo_8F_Text_Grunt1PostBattle:: .string "If you don't turn back…\n" .string "I'll call for backup!$" -SilphCo_8F_Text_ParkerIntro:: @ 81769FD +SilphCo_8F_Text_ParkerIntro:: .string "You're causing us problems!$" -SilphCo_8F_Text_ParkerDefeat:: @ 8176A19 +SilphCo_8F_Text_ParkerDefeat:: .string "Huh?\n" .string "I lost?$" -SilphCo_8F_Text_ParkerPostBattle:: @ 8176A26 +SilphCo_8F_Text_ParkerPostBattle:: .string "So, what do you think of SILPH\n" .string "BUILDING's maze?$" -SilphCo_8F_Text_Grunt2Intro:: @ 8176A56 +SilphCo_8F_Text_Grunt2Intro:: .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -SilphCo_8F_Text_Grunt2Defeat:: @ 8176A7C +SilphCo_8F_Text_Grunt2Defeat:: .string "Whoo!\n" .string "Oh, Brothers!$" -SilphCo_8F_Text_Grunt2PostBattle:: @ 8176A90 +SilphCo_8F_Text_Grunt2PostBattle:: .string "I'll leave you up to my brothers.$" -SilphCo_8F_Text_FloorSign:: @ 8176AB2 +SilphCo_8F_Text_FloorSign:: .string "SILPH CO. HEAD OFFICE\n" .string "8F$" -SilphCo_8F_Text_ToRocketBossMonsAreTools:: @ 8176ACB +SilphCo_8F_Text_ToRocketBossMonsAreTools:: .string "TEAM ROCKET's BOSS is terribly\n" .string "cruel!\p" .string "To him, POKéMON are just tools to\n" diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc index 5cdfc2c82..8584190db 100644 --- a/data/maps/SilphCo_9F/scripts.inc +++ b/data/maps/SilphCo_9F/scripts.inc @@ -1,15 +1,15 @@ -SilphCo_9F_MapScripts:: @ 8161CDE +SilphCo_9F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SilphCo_9F_OnLoad .byte 0 -SilphCo_9F_OnLoad:: @ 8161CE4 +SilphCo_9F_OnLoad:: call_if_unset FLAG_SILPH_9F_DOOR_1, EventScript_Close9FDoor1 call_if_unset FLAG_SILPH_9F_DOOR_2, EventScript_Close9FDoor2 call_if_unset FLAG_SILPH_9F_DOOR_3, EventScript_Close9FDoor3 call_if_unset FLAG_SILPH_9F_DOOR_4, EventScript_Close9FDoor4 end -SilphCo_9F_EventScript_HealWoman:: @ 8161D09 +SilphCo_9F_EventScript_HealWoman:: lock faceplayer compare VAR_MAP_SCENE_SILPH_CO_11F, 1 @@ -21,26 +21,26 @@ SilphCo_9F_EventScript_HealWoman:: @ 8161D09 release end -SilphCo_9F_EventScript_HealWomanRocketsGone:: @ 8161D2E +SilphCo_9F_EventScript_HealWomanRocketsGone:: msgbox SilphCo_9F_Text_ThankYouSoMuch release end -SilphCo_9F_EventScript_FloorSign:: @ 8161D38 +SilphCo_9F_EventScript_FloorSign:: msgbox SilphCo_9F_Text_FloorSign, MSGBOX_SIGN end -SilphCo_9F_EventScript_Ed:: @ 8161D41 +SilphCo_9F_EventScript_Ed:: trainerbattle_single TRAINER_SCIENTIST_ED, SilphCo_9F_Text_EdIntro, SilphCo_9F_Text_EdDefeat msgbox SilphCo_9F_Text_EdPostBattle, MSGBOX_AUTOCLOSE end -SilphCo_9F_EventScript_Grunt1:: @ 8161D58 +SilphCo_9F_EventScript_Grunt1:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, SilphCo_9F_Text_Grunt1Intro, SilphCo_9F_Text_Grunt1Defeat msgbox SilphCo_9F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -SilphCo_9F_EventScript_Grunt2:: @ 8161D6F +SilphCo_9F_EventScript_Grunt2:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, SilphCo_9F_Text_Grunt2Intro, SilphCo_9F_Text_Grunt2Defeat msgbox SilphCo_9F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SilphCo_9F/text.inc b/data/maps/SilphCo_9F/text.inc index f89262090..079745760 100644 --- a/data/maps/SilphCo_9F/text.inc +++ b/data/maps/SilphCo_9F/text.inc @@ -1,47 +1,47 @@ -SilphCo_9F_Text_YouShouldTakeQuickNap:: @ 8176B54 +SilphCo_9F_Text_YouShouldTakeQuickNap:: .string "You look tired.\n" .string "You should take a quick nap.$" -SilphCo_9F_Text_DontGiveUp:: @ 8176B81 +SilphCo_9F_Text_DontGiveUp:: .string "Don't give up!$" -SilphCo_9F_Text_ThankYouSoMuch:: @ 8176B90 +SilphCo_9F_Text_ThankYouSoMuch:: .string "Thank you so much.$" -SilphCo_9F_Text_Grunt1Intro:: @ 8176BA3 +SilphCo_9F_Text_Grunt1Intro:: .string "Your POKéMON seem to adore you,\n" .string "kid!$" -SilphCo_9F_Text_Grunt1Defeat:: @ 8176BC8 +SilphCo_9F_Text_Grunt1Defeat:: .string "Ghaaah!$" -SilphCo_9F_Text_Grunt1PostBattle:: @ 8176BD0 +SilphCo_9F_Text_Grunt1PostBattle:: .string "If I had started as a TRAINER at\n" .string "your age…$" -SilphCo_9F_Text_EdIntro:: @ 8176BFB +SilphCo_9F_Text_EdIntro:: .string "Your POKéMON have weak points!\n" .string "I can nail them!$" -SilphCo_9F_Text_EdDefeat:: @ 8176C2B +SilphCo_9F_Text_EdDefeat:: .string "You hammered me!$" -SilphCo_9F_Text_EdPostBattle:: @ 8176C3C +SilphCo_9F_Text_EdPostBattle:: .string "Exploiting weak spots does work.\n" .string "Think about type advantages.$" -SilphCo_9F_Text_Grunt2Intro:: @ 8176C7A +SilphCo_9F_Text_Grunt2Intro:: .string "I am one of the four ROCKET\n" .string "BROTHERS!$" -SilphCo_9F_Text_Grunt2Defeat:: @ 8176CA0 +SilphCo_9F_Text_Grunt2Defeat:: .string "Warg!\n" .string "Brothers, I lost!$" -SilphCo_9F_Text_Grunt2PostBattle:: @ 8176CB8 +SilphCo_9F_Text_Grunt2PostBattle:: .string "My brothers will avenge me!$" -SilphCo_9F_Text_FloorSign:: @ 8176CD4 +SilphCo_9F_Text_FloorSign:: .string "SILPH CO. HEAD OFFICE\n" .string "9F$" diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc index 9a9017004..6c305e4d5 100644 --- a/data/maps/SilphCo_Elevator/scripts.inc +++ b/data/maps/SilphCo_Elevator/scripts.inc @@ -1,7 +1,7 @@ -SilphCo_Elevator_MapScripts:: @ 8161F6E +SilphCo_Elevator_MapScripts:: .byte 0 -SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F +SilphCo_Elevator_EventScript_FloorSelect:: lockall setvar VAR_0x8004, 1 call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor @@ -29,7 +29,7 @@ SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F case 127, SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_To1F:: @ 816202F +SilphCo_Elevator_EventScript_To1F:: setvar VAR_0x8006, 4 setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 4 @@ -39,7 +39,7 @@ SilphCo_Elevator_EventScript_To1F:: @ 816202F goto SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_To2F:: @ 8162057 +SilphCo_Elevator_EventScript_To2F:: setvar VAR_0x8006, 5 setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 5 @@ -49,7 +49,7 @@ SilphCo_Elevator_EventScript_To2F:: @ 8162057 goto SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_To3F:: @ 816207F +SilphCo_Elevator_EventScript_To3F:: setvar VAR_0x8006, 6 setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 6 @@ -59,7 +59,7 @@ SilphCo_Elevator_EventScript_To3F:: @ 816207F goto SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_To4F:: @ 81620A7 +SilphCo_Elevator_EventScript_To4F:: setvar VAR_0x8006, 7 setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 7 @@ -69,7 +69,7 @@ SilphCo_Elevator_EventScript_To4F:: @ 81620A7 goto SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_To5F:: @ 81620CF +SilphCo_Elevator_EventScript_To5F:: setvar VAR_0x8006, 8 setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 8 @@ -79,7 +79,7 @@ SilphCo_Elevator_EventScript_To5F:: @ 81620CF goto SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_To6F:: @ 81620F7 +SilphCo_Elevator_EventScript_To6F:: setvar VAR_0x8006, 9 setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3 compare VAR_ELEVATOR_FLOOR, 9 @@ -89,7 +89,7 @@ SilphCo_Elevator_EventScript_To6F:: @ 81620F7 goto SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_To7F:: @ 816211F +SilphCo_Elevator_EventScript_To7F:: setvar VAR_0x8006, 10 setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3 compare VAR_ELEVATOR_FLOOR, 10 @@ -99,7 +99,7 @@ SilphCo_Elevator_EventScript_To7F:: @ 816211F goto SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_To8F:: @ 8162147 +SilphCo_Elevator_EventScript_To8F:: setvar VAR_0x8006, 11 setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3 compare VAR_ELEVATOR_FLOOR, 11 @@ -109,7 +109,7 @@ SilphCo_Elevator_EventScript_To8F:: @ 8162147 goto SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_To9F:: @ 816216F +SilphCo_Elevator_EventScript_To9F:: setvar VAR_0x8006, 12 setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3 compare VAR_ELEVATOR_FLOOR, 12 @@ -119,7 +119,7 @@ SilphCo_Elevator_EventScript_To9F:: @ 816216F goto SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_To10F:: @ 8162197 +SilphCo_Elevator_EventScript_To10F:: setvar VAR_0x8006, 13 setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3 compare VAR_ELEVATOR_FLOOR, 13 @@ -129,7 +129,7 @@ SilphCo_Elevator_EventScript_To10F:: @ 8162197 goto SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_To11F:: @ 81621BF +SilphCo_Elevator_EventScript_To11F:: setvar VAR_0x8006, 14 setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3 compare VAR_ELEVATOR_FLOOR, 14 @@ -139,12 +139,12 @@ SilphCo_Elevator_EventScript_To11F:: @ 81621BF goto SilphCo_Elevator_EventScript_ExitFloorSelect end -SilphCo_Elevator_EventScript_ExitFloorSelect:: @ 81621E7 +SilphCo_Elevator_EventScript_ExitFloorSelect:: special CloseElevatorCurrentFloorWindow releaseall end -SilphCo_Elevator_EventScript_MoveElevator:: @ 81621EC +SilphCo_Elevator_EventScript_MoveElevator:: special CloseElevatorCurrentFloorWindow closemessage waitse diff --git a/data/maps/SixIsland/scripts.inc b/data/maps/SixIsland/scripts.inc index 863390ba8..f62d96ed9 100644 --- a/data/maps/SixIsland/scripts.inc +++ b/data/maps/SixIsland/scripts.inc @@ -1,19 +1,19 @@ -SixIsland_MapScripts:: @ 8167ED8 +SixIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_OnTransition .byte 0 -SixIsland_OnTransition:: @ 8167EDE +SixIsland_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND end -SixIsland_EventScript_Hiker:: @ 8167EE2 +SixIsland_EventScript_Hiker:: msgbox SixIsland_Text_ThatWayToWaterPathRuinValley, MSGBOX_NPC end -SixIsland_EventScript_Boy:: @ 8167EEB +SixIsland_EventScript_Boy:: msgbox SixIsland_Text_SkyAtNightIsFantastic, MSGBOX_NPC end -SixIsland_EventScript_IslandSign:: @ 8167EF4 +SixIsland_EventScript_IslandSign:: msgbox SixIsland_Text_IslandSign, MSGBOX_SIGN end diff --git a/data/maps/SixIsland/text.inc b/data/maps/SixIsland/text.inc index 0d2fc43ce..97d8f70d2 100644 --- a/data/maps/SixIsland/text.inc +++ b/data/maps/SixIsland/text.inc @@ -1,14 +1,14 @@ -SixIsland_Text_IslandSign:: @ 81831C6 +SixIsland_Text_IslandSign:: .string "SIX ISLAND\n" .string "Fortune Island of Aged Wisdom$" -SixIsland_Text_ThatWayToWaterPathRuinValley:: @ 81831EF +SixIsland_Text_ThatWayToWaterPathRuinValley:: .string "Keep going this way and you'll get\n" .string "to the WATER PATH.\p" .string "Stay on that and you'll get to\n" .string "the RUIN VALLEY.$" -SixIsland_Text_SkyAtNightIsFantastic:: @ 8183255 +SixIsland_Text_SkyAtNightIsFantastic:: .string "When you're this far away from the\n" .string "city, the sky at night is fantastic.$" diff --git a/data/maps/SixIsland_AlteringCave/scripts.inc b/data/maps/SixIsland_AlteringCave/scripts.inc index bf34536f1..c4bf71026 100644 --- a/data/maps/SixIsland_AlteringCave/scripts.inc +++ b/data/maps/SixIsland_AlteringCave/scripts.inc @@ -1,7 +1,7 @@ -SixIsland_AlteringCave_MapScripts:: @ 81646A4 +SixIsland_AlteringCave_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_AlteringCave_OnTransition .byte 0 -SixIsland_AlteringCave_OnTransition:: @ 81646AA +SixIsland_AlteringCave_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_ALTERING_CAVE end diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc index 21a47dcd6..ec0c34e6e 100644 --- a/data/maps/SixIsland_DottedHole_1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc @@ -1,33 +1,33 @@ -SixIsland_DottedHole_1F_MapScripts:: @ 8164182 +SixIsland_DottedHole_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_DottedHole_1F_OnTransition .byte 0 -SixIsland_DottedHole_1F_OnTransition:: @ 8164188 +SixIsland_DottedHole_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F end -SixIsland_DottedHole_B1F_EventScript_BrailleUp:: @ 816418C +SixIsland_DottedHole_B1F_EventScript_BrailleUp:: lockall braillemessage Braille_Text_Up waitbuttonpress releaseall end -SixIsland_DottedHole_B4F_EventScript_BrailleDown:: @ 8164195 +SixIsland_DottedHole_B4F_EventScript_BrailleDown:: lockall braillemessage Braille_Text_Down waitbuttonpress releaseall end -SixIsland_DottedHole_B3F_EventScript_BrailleRight:: @ 816419E +SixIsland_DottedHole_B3F_EventScript_BrailleRight:: lockall braillemessage Braille_Text_Right waitbuttonpress releaseall end -SixIsland_DottedHole_B2F_EventScript_BrailleLeft:: @ 81641A7 +SixIsland_DottedHole_B2F_EventScript_BrailleLeft:: lockall braillemessage Braille_Text_Left waitbuttonpress diff --git a/data/maps/SixIsland_DottedHole_B1F/scripts.inc b/data/maps/SixIsland_DottedHole_B1F/scripts.inc index ee0b34abc..8b33c614e 100644 --- a/data/maps/SixIsland_DottedHole_B1F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_B1F/scripts.inc @@ -1,2 +1,2 @@ -SixIsland_DottedHole_B1F_MapScripts:: @ 81641B0 +SixIsland_DottedHole_B1F_MapScripts:: .byte 0 diff --git a/data/maps/SixIsland_DottedHole_B2F/scripts.inc b/data/maps/SixIsland_DottedHole_B2F/scripts.inc index 8517edd5a..17693d6e6 100644 --- a/data/maps/SixIsland_DottedHole_B2F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_B2F/scripts.inc @@ -1,2 +1,2 @@ -SixIsland_DottedHole_B2F_MapScripts:: @ 81641B1 +SixIsland_DottedHole_B2F_MapScripts:: .byte 0 diff --git a/data/maps/SixIsland_DottedHole_B3F/scripts.inc b/data/maps/SixIsland_DottedHole_B3F/scripts.inc index 2810ad0b3..1198775ad 100644 --- a/data/maps/SixIsland_DottedHole_B3F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_B3F/scripts.inc @@ -1,2 +1,2 @@ -SixIsland_DottedHole_B3F_MapScripts:: @ 81641B2 +SixIsland_DottedHole_B3F_MapScripts:: .byte 0 diff --git a/data/maps/SixIsland_DottedHole_B4F/scripts.inc b/data/maps/SixIsland_DottedHole_B4F/scripts.inc index acde6c019..f5d0972c7 100644 --- a/data/maps/SixIsland_DottedHole_B4F/scripts.inc +++ b/data/maps/SixIsland_DottedHole_B4F/scripts.inc @@ -1,2 +1,2 @@ -SixIsland_DottedHole_B4F_MapScripts:: @ 81641B3 +SixIsland_DottedHole_B4F_MapScripts:: .byte 0 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 4792179ec..fa1b9a367 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -1,10 +1,10 @@ .equ LOCALID_SAPPHIRE, 1 .equ LOCALID_THIEF, 2 -SixIsland_DottedHole_SapphireRoom_MapScripts:: @ 81641B4 +SixIsland_DottedHole_SapphireRoom_MapScripts:: .byte 0 -SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 +SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: lock faceplayer textcolor 3 @@ -79,119 +79,119 @@ SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5 end @ Lots of redundant scripts below -SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2:: @ 81642F9 +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2:: @ 8164304 +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft:: @ 816430F +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: @ 816431A +SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth:: @ 8164325 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth:: @ 8164330 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast:: @ 816433B +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: @ 8164346 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: @ 8164351 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: @ 8164366 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: @ 816437B +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: @ 8164390 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow waitmovement 0 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth:: @ 81643A5 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth:: applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth:: @ 81643B7 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth:: applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast:: @ 81643C9 +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast:: applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: @ 81643DB +SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest waitmovement 0 return -SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft:: @ 81643ED +SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft:: walk_up walk_up walk_in_place_fastest_right step_end -SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow:: @ 81643F1 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow:: walk_right walk_right walk_in_place_fastest_up step_end -SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft:: @ 81643F5 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft:: walk_right step_end -SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow:: @ 81643F7 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow:: walk_up step_end -SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth:: @ 81643F9 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth:: walk_fast_up walk_fast_right walk_fast_right @@ -201,7 +201,7 @@ SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth:: @ 81643F9 walk_fast_right step_end -SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth:: @ 8164401 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth:: walk_fast_down walk_fast_right walk_fast_right @@ -211,7 +211,7 @@ SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth:: @ 8164401 walk_fast_right step_end -SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest:: @ 8164409 +SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest:: walk_fast_right walk_fast_right walk_fast_right @@ -219,7 +219,7 @@ SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest:: @ 8164409 walk_fast_up step_end -SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn:: @ 816440F +SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn:: face_down disable_anim slide_down @@ -234,12 +234,12 @@ SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn:: @ 816440F restore_anim step_end -SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit:: @ 816441C +SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit:: delay_16 walk_in_place_fastest_right step_end -SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage:: @ 816441F +SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage:: lockall setvar VAR_0x8005, 130 braillemessage_wait Braille_Text_LetTheTwo diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc index 4fdef4a5d..5f6e51a08 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc @@ -1,12 +1,12 @@ -SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire:: @ 817BD82 +SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire:: .string "{PLAYER} found a SAPPHIRE!$" -SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou:: @ 817BD97 +SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou:: .string "Fufu… Fufufufu…\n" .string "I guessed right.\p" .string "I was right in tailing you!$" -SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword:: @ 817BDD4 +SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword:: .string "I knew that there was a SAPPHIRE\n" .string "here, so it belongs to me!\p" .string "I'll sell it to TEAM ROCKET for\n" diff --git a/data/maps/SixIsland_GreenPath/scripts.inc b/data/maps/SixIsland_GreenPath/scripts.inc index 559158455..73b556b65 100644 --- a/data/maps/SixIsland_GreenPath/scripts.inc +++ b/data/maps/SixIsland_GreenPath/scripts.inc @@ -1,10 +1,10 @@ -SixIsland_GreenPath_MapScripts:: @ 8168B2D +SixIsland_GreenPath_MapScripts:: .byte 0 -SixIsland_GreenPath_EventScript_RightRouteSign:: @ 8168B2E +SixIsland_GreenPath_EventScript_RightRouteSign:: msgbox SixIsland_GreenPath_Text_LeftRouteSign, MSGBOX_SIGN end -SixIsland_GreenPath_EventScript_LeftRouteSign:: @ 8168B37 +SixIsland_GreenPath_EventScript_LeftRouteSign:: msgbox SixIsland_GreenPath_Text_RightRouteSign, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_GreenPath/text.inc b/data/maps/SixIsland_GreenPath/text.inc index e8113cac3..337d8a9dd 100644 --- a/data/maps/SixIsland_GreenPath/text.inc +++ b/data/maps/SixIsland_GreenPath/text.inc @@ -1,21 +1,21 @@ -SixIsland_GreenPath_Text_JaclynIntro:: @ 818B7B0 +SixIsland_GreenPath_Text_JaclynIntro:: .string "…Huh?\p" .string "I was envisioning my house, but\n" .string "this is where I TELEPORT?$" -SixIsland_GreenPath_Text_JaclynDefeat:: @ 818B7F0 +SixIsland_GreenPath_Text_JaclynDefeat:: .string "Big boo-boo!$" -SixIsland_GreenPath_Text_JaclynPostBattle:: @ 818B7FD +SixIsland_GreenPath_Text_JaclynPostBattle:: .string "I am so scatterbrained!\p" .string "I need to focus so I can TELEPORT\n" .string "properly to my house!$" -SixIsland_GreenPath_Text_LeftRouteSign:: @ 818B84D +SixIsland_GreenPath_Text_LeftRouteSign:: .string "GREEN PATH\n" .string "PATTERN BUSH AHEAD$" -SixIsland_GreenPath_Text_RightRouteSign:: @ 818B86B +SixIsland_GreenPath_Text_RightRouteSign:: .string "GREEN PATH\n" .string "Think Green, Keep Nature Clean!$" diff --git a/data/maps/SixIsland_Harbor/scripts.inc b/data/maps/SixIsland_Harbor/scripts.inc index fabf9d841..ec43db237 100644 --- a/data/maps/SixIsland_Harbor/scripts.inc +++ b/data/maps/SixIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ -SixIsland_Harbor_MapScripts:: @ 8171E47 +SixIsland_Harbor_MapScripts:: .byte 0 -SixIsland_Harbor_EventScript_Sailor:: @ 8171E48 +SixIsland_Harbor_EventScript_Sailor:: lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/SixIsland_House/scripts.inc b/data/maps/SixIsland_House/scripts.inc index bf61629b2..24ffc1d19 100644 --- a/data/maps/SixIsland_House/scripts.inc +++ b/data/maps/SixIsland_House/scripts.inc @@ -1,6 +1,6 @@ -SixIsland_House_MapScripts:: @ 8171E5B +SixIsland_House_MapScripts:: .byte 0 -SixIsland_House_EventScript_OldMan:: @ 8171E5C +SixIsland_House_EventScript_OldMan:: msgbox SixIsland_House_Text_GoodPlaceForNatureAndHistory, MSGBOX_NPC end diff --git a/data/maps/SixIsland_House/text.inc b/data/maps/SixIsland_House/text.inc index 839cdf2f3..51a2dcbb8 100644 --- a/data/maps/SixIsland_House/text.inc +++ b/data/maps/SixIsland_House/text.inc @@ -1,4 +1,4 @@ -SixIsland_House_Text_GoodPlaceForNatureAndHistory:: @ 81A412E +SixIsland_House_Text_GoodPlaceForNatureAndHistory:: .string "There's nothing that young people'd\n" .string "find exciting here on this island.\p" .string "But, this is a good place in terms\n" diff --git a/data/maps/SixIsland_Mart/scripts.inc b/data/maps/SixIsland_Mart/scripts.inc index da7515c52..06540929c 100644 --- a/data/maps/SixIsland_Mart/scripts.inc +++ b/data/maps/SixIsland_Mart/scripts.inc @@ -1,7 +1,7 @@ -SixIsland_Mart_MapScripts:: @ 8171E65 +SixIsland_Mart_MapScripts:: .byte 0 -SixIsland_Mart_EventScript_Clerk:: @ 8171E66 +SixIsland_Mart_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -13,7 +13,7 @@ SixIsland_Mart_EventScript_Clerk:: @ 8171E66 end .align 2 -SixIsland_Mart_Items:: @ 8171E8C +SixIsland_Mart_Items:: .2byte ITEM_ULTRA_BALL .2byte ITEM_FULL_RESTORE .2byte ITEM_MAX_POTION @@ -26,6 +26,6 @@ SixIsland_Mart_Items:: @ 8171E8C release end -SixIsland_Mart_EventScript_Picnicker:: @ 8171EA0 +SixIsland_Mart_EventScript_Picnicker:: msgbox SixIsland_Mart_Text_ShouldBuyMailAndWriteLetter, MSGBOX_NPC end diff --git a/data/maps/SixIsland_Mart/text.inc b/data/maps/SixIsland_Mart/text.inc index 178f635ea..19425edd3 100644 --- a/data/maps/SixIsland_Mart/text.inc +++ b/data/maps/SixIsland_Mart/text.inc @@ -1,4 +1,4 @@ -SixIsland_Mart_Text_AgathaOldestEverEliteFourMember:: @ 81A41CA +SixIsland_Mart_Text_AgathaOldestEverEliteFourMember:: .string "Play with POKéMON lots and live\n" .string "a long life!\p" .string "Take AGATHA, for example.\p" @@ -6,7 +6,7 @@ SixIsland_Mart_Text_AgathaOldestEverEliteFourMember:: @ 81A41CA .string "oldest-ever ELITE FOUR member.\p" .string "She spurs me to do bigger things.$" -SixIsland_Mart_Text_ShouldBuyMailAndWriteLetter:: @ 81A4271 +SixIsland_Mart_Text_ShouldBuyMailAndWriteLetter:: .string "I should buy some MAIL and write\n" .string "him a letter…$" diff --git a/data/maps/SixIsland_OutcastIsland/scripts.inc b/data/maps/SixIsland_OutcastIsland/scripts.inc index b43a93095..d920cd7c1 100644 --- a/data/maps/SixIsland_OutcastIsland/scripts.inc +++ b/data/maps/SixIsland_OutcastIsland/scripts.inc @@ -1,7 +1,7 @@ -SixIsland_OutcastIsland_MapScripts:: @ 8168B15 +SixIsland_OutcastIsland_MapScripts:: .byte 0 -SixIsland_OutcastIsland_EventScript_Rocket:: @ 8168B16 +SixIsland_OutcastIsland_EventScript_Rocket:: trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, SixIsland_OutcastIsland_Text_RocketIntro, SixIsland_OutcastIsland_Text_RocketDefeat msgbox SixIsland_OutcastIsland_Text_RocketPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland_OutcastIsland/text.inc b/data/maps/SixIsland_OutcastIsland/text.inc index 67218e416..f65edfe2b 100644 --- a/data/maps/SixIsland_OutcastIsland/text.inc +++ b/data/maps/SixIsland_OutcastIsland/text.inc @@ -1,85 +1,85 @@ -SixIsland_OutcastIsland_Text_RocketIntro:: @ 818B35A +SixIsland_OutcastIsland_Text_RocketIntro:: .string "There're no rare POKéMON around\n" .string "these parts! Not a one!\p" .string "That burns me up, man.\n" .string "I'll take it out on you!$" -SixIsland_OutcastIsland_Text_RocketDefeat:: @ 818B3C2 +SixIsland_OutcastIsland_Text_RocketDefeat:: .string "…Huh?$" -SixIsland_OutcastIsland_Text_RocketPostBattle:: @ 818B3C8 +SixIsland_OutcastIsland_Text_RocketPostBattle:: .string "So listen, you haven't seen any\n" .string "rare POKéMON, have you?$" -SixIsland_OutcastIsland_Text_TylorIntro:: @ 818B400 +SixIsland_OutcastIsland_Text_TylorIntro:: .string "I'm having no luck at all.\n" .string "A battle'd be a change of pace!$" -SixIsland_OutcastIsland_Text_TylorDefeat:: @ 818B43B +SixIsland_OutcastIsland_Text_TylorDefeat:: .string "Nope, no luck at all…$" -SixIsland_OutcastIsland_Text_TylorPostBattle:: @ 818B451 +SixIsland_OutcastIsland_Text_TylorPostBattle:: .string "I can't very well go home without\n" .string "catching something, though.$" -SixIsland_OutcastIsland_Text_MymoIntro:: @ 818B48F +SixIsland_OutcastIsland_Text_MymoIntro:: .string "Gasp… Gasp…\p" .string "I swam here from SIX ISLE PORT\n" .string "in one go.$" -SixIsland_OutcastIsland_Text_MymoDefeat:: @ 818B4C5 +SixIsland_OutcastIsland_Text_MymoDefeat:: .string "Gasp…\n" .string "Gasp…$" -SixIsland_OutcastIsland_Text_MymoPostBattle:: @ 818B4D1 +SixIsland_OutcastIsland_Text_MymoPostBattle:: .string "I'm only at the halfway point…\n" .string "I'm beat…$" -SixIsland_OutcastIsland_Text_NicoleIntro:: @ 818B4FA +SixIsland_OutcastIsland_Text_NicoleIntro:: .string "It's not so easy sending POKéMON\n" .string "out while swimming, you know?$" -SixIsland_OutcastIsland_Text_NicoleDefeat:: @ 818B539 +SixIsland_OutcastIsland_Text_NicoleDefeat:: .string "I didn't lose to you at swimming.\n" .string "This doesn't bother me.$" -SixIsland_OutcastIsland_Text_NicolePostBattle:: @ 818B573 +SixIsland_OutcastIsland_Text_NicolePostBattle:: .string "Are you headed for the island up\n" .string "past here?\p" .string "I didn't see anything interesting\n" .string "there.$" -SixIsland_OutcastIsland_Text_AvaIntro:: @ 818B5C8 +SixIsland_OutcastIsland_Text_AvaIntro:: .string "AVA: Let's have a two-on-two\n" .string "marine battle!$" -SixIsland_OutcastIsland_Text_AvaDefeat:: @ 818B5F4 +SixIsland_OutcastIsland_Text_AvaDefeat:: .string "AVA: Oh, you're amazing!\n" .string "Even better, you're on your own!$" -SixIsland_OutcastIsland_Text_AvaPostBattle:: @ 818B62E +SixIsland_OutcastIsland_Text_AvaPostBattle:: .string "AVA: You know, I do prefer the\n" .string "sea over any pool.$" -SixIsland_OutcastIsland_Text_AvaNotEnoughMons:: @ 818B660 +SixIsland_OutcastIsland_Text_AvaNotEnoughMons:: .string "AVA: You're challenging us to\n" .string "a battle?\p" .string "You'll need at least two POKéMON\n" .string "if you want to do that.$" -SixIsland_OutcastIsland_Text_GebIntro:: @ 818B6C1 +SixIsland_OutcastIsland_Text_GebIntro:: .string "GEB: Big Sister, help!\n" .string "Please battle with me!$" -SixIsland_OutcastIsland_Text_GebDefeat:: @ 818B6EF +SixIsland_OutcastIsland_Text_GebDefeat:: .string "GEB: Wow, Big Sister, this person's\n" .string "really good!$" -SixIsland_OutcastIsland_Text_GebPostBattle:: @ 818B720 +SixIsland_OutcastIsland_Text_GebPostBattle:: .string "GEB: I'm hanging onto my sister\n" .string "because I can't touch the bottom.$" -SixIsland_OutcastIsland_Text_GebNotEnoughMons:: @ 818B762 +SixIsland_OutcastIsland_Text_GebNotEnoughMons:: .string "GEB: Please battle against me and\n" .string "my sister!\p" .string "…Oh, you don't have two POKéMON?$" diff --git a/data/maps/SixIsland_PatternBush/scripts.inc b/data/maps/SixIsland_PatternBush/scripts.inc index a9d9be019..d42ed5241 100644 --- a/data/maps/SixIsland_PatternBush/scripts.inc +++ b/data/maps/SixIsland_PatternBush/scripts.inc @@ -1,8 +1,8 @@ -SixIsland_PatternBush_MapScripts:: @ 8164559 +SixIsland_PatternBush_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PatternBush_OnTransition .byte 0 -SixIsland_PatternBush_OnTransition:: @ 816455F +SixIsland_PatternBush_OnTransition:: setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH getplayerxy VAR_TEMP_1, VAR_TEMP_2 compare VAR_TEMP_1, 50 @@ -11,70 +11,70 @@ SixIsland_PatternBush_OnTransition:: @ 816455F call_if_le SixIsland_PatternBush_EventScript_SetEscapeLeftExit end -SixIsland_PatternBush_EventScript_SetEscapeRightExit:: @ 816457E +SixIsland_PatternBush_EventScript_SetEscapeRightExit:: setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 64, 10 return -SixIsland_PatternBush_EventScript_SetEscapeLeftExit:: @ 8164587 +SixIsland_PatternBush_EventScript_SetEscapeLeftExit:: setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 45, 10 return -SixIsland_PatternBush_EventScript_Bethany:: @ 8164590 +SixIsland_PatternBush_EventScript_Bethany:: trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, SixIsland_PatternBush_Text_BethanyIntro, SixIsland_PatternBush_Text_BethanyDefeat msgbox SixIsland_PatternBush_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_Allison:: @ 81645A7 +SixIsland_PatternBush_EventScript_Allison:: trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, SixIsland_PatternBush_Text_AllisonIntro, SixIsland_PatternBush_Text_AllisonDefeat msgbox SixIsland_PatternBush_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_Garret:: @ 81645BE +SixIsland_PatternBush_EventScript_Garret:: trainerbattle_single TRAINER_BUG_CATCHER_GARRET, SixIsland_PatternBush_Text_GarretIntro, SixIsland_PatternBush_Text_GarretDefeat msgbox SixIsland_PatternBush_Text_GarretPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_Jonah:: @ 81645D5 +SixIsland_PatternBush_EventScript_Jonah:: trainerbattle_single TRAINER_BUG_CATCHER_JONAH, SixIsland_PatternBush_Text_JonahIntro, SixIsland_PatternBush_Text_JonahDefeat msgbox SixIsland_PatternBush_Text_JonahPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_Vance:: @ 81645EC +SixIsland_PatternBush_EventScript_Vance:: trainerbattle_single TRAINER_BUG_CATCHER_VANCE, SixIsland_PatternBush_Text_VanceIntro, SixIsland_PatternBush_Text_VanceDefeat msgbox SixIsland_PatternBush_Text_VancePostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_Nash:: @ 8164603 +SixIsland_PatternBush_EventScript_Nash:: trainerbattle_single TRAINER_YOUNGSTER_NASH, SixIsland_PatternBush_Text_NashIntro, SixIsland_PatternBush_Text_NashDefeat msgbox SixIsland_PatternBush_Text_NashPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_Cordell:: @ 816461A +SixIsland_PatternBush_EventScript_Cordell:: trainerbattle_single TRAINER_YOUNGSTER_CORDELL, SixIsland_PatternBush_Text_CordellIntro, SixIsland_PatternBush_Text_CordellDefeat msgbox SixIsland_PatternBush_Text_CordellPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_Dalia:: @ 8164631 +SixIsland_PatternBush_EventScript_Dalia:: trainerbattle_single TRAINER_LASS_DALIA, SixIsland_PatternBush_Text_DaliaIntro, SixIsland_PatternBush_Text_DaliaDefeat msgbox SixIsland_PatternBush_Text_DaliaPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_Joana:: @ 8164648 +SixIsland_PatternBush_EventScript_Joana:: trainerbattle_single TRAINER_LASS_JOANA, SixIsland_PatternBush_Text_JoanaIntro, SixIsland_PatternBush_Text_JoanaDefeat msgbox SixIsland_PatternBush_Text_JoanaPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_Riley:: @ 816465F +SixIsland_PatternBush_EventScript_Riley:: trainerbattle_single TRAINER_CAMPER_RILEY, SixIsland_PatternBush_Text_RileyIntro, SixIsland_PatternBush_Text_RileyDefeat msgbox SixIsland_PatternBush_Text_RileyPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_Marcy:: @ 8164676 +SixIsland_PatternBush_EventScript_Marcy:: trainerbattle_single TRAINER_PICNICKER_MARCY, SixIsland_PatternBush_Text_MarcyIntro, SixIsland_PatternBush_Text_MarcyDefeat msgbox SixIsland_PatternBush_Text_MarcyPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_PatternBush_EventScript_Layton:: @ 816468D +SixIsland_PatternBush_EventScript_Layton:: trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, SixIsland_PatternBush_Text_LaytonIntro, SixIsland_PatternBush_Text_LaytonDefeat msgbox SixIsland_PatternBush_Text_LaytonPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/SixIsland_PatternBush/text.inc b/data/maps/SixIsland_PatternBush/text.inc index 4c4161fe9..92f3dbd77 100644 --- a/data/maps/SixIsland_PatternBush/text.inc +++ b/data/maps/SixIsland_PatternBush/text.inc @@ -1,154 +1,154 @@ -SixIsland_PatternBush_Text_BethanyIntro:: @ 817BF3A +SixIsland_PatternBush_Text_BethanyIntro:: .string "I'm curious, how do you raise your\n" .string "POKéMON?$" -SixIsland_PatternBush_Text_BethanyDefeat:: @ 817BF66 +SixIsland_PatternBush_Text_BethanyDefeat:: .string "You raise your POKéMON with a\n" .string "whole lot of love!$" -SixIsland_PatternBush_Text_BethanyPostBattle:: @ 817BF97 +SixIsland_PatternBush_Text_BethanyPostBattle:: .string "In the same way your mother raised\n" .string "you full of love, you should raise\l" .string "your POKéMON.$" -SixIsland_PatternBush_Text_AllisonIntro:: @ 817BFEB +SixIsland_PatternBush_Text_AllisonIntro:: .string "I'm working to preserve the natural\n" .string "ecology of POKéMON here.$" -SixIsland_PatternBush_Text_AllisonDefeat:: @ 817C028 +SixIsland_PatternBush_Text_AllisonDefeat:: .string "Oh, for someone so young, you are\n" .string "tremendous!$" -SixIsland_PatternBush_Text_AllisonPostBattle:: @ 817C056 +SixIsland_PatternBush_Text_AllisonPostBattle:: .string "I'm not saying that you shouldn't\n" .string "catch POKéMON.\p" .string "I just want people to raise their\n" .string "POKéMON responsibly.$" -SixIsland_PatternBush_Text_GarretIntro:: @ 817C0BE +SixIsland_PatternBush_Text_GarretIntro:: .string "I caught a BUG POKéMON that lives\n" .string "only around here!$" -SixIsland_PatternBush_Text_GarretDefeat:: @ 817C0F2 +SixIsland_PatternBush_Text_GarretDefeat:: .string "Heheh…\n" .string "Isn't my POKéMON awesome?$" -SixIsland_PatternBush_Text_GarretPostBattle:: @ 817C113 +SixIsland_PatternBush_Text_GarretPostBattle:: .string "There's a girl near the BUSH who\n" .string "measures HERACROSS for TRAINERS.$" -SixIsland_PatternBush_Text_JonahIntro:: @ 817C155 +SixIsland_PatternBush_Text_JonahIntro:: .string "You know, it just doesn't feel right\n" .string "if I don't use BUG POKéMON.$" -SixIsland_PatternBush_Text_JonahDefeat:: @ 817C196 +SixIsland_PatternBush_Text_JonahDefeat:: .string "It's okay, losing is a fun part of\n" .string "POKéMON's appeal, too.$" -SixIsland_PatternBush_Text_JonahPostBattle:: @ 817C1D0 +SixIsland_PatternBush_Text_JonahPostBattle:: .string "By the way, “appeal” is a weird\n" .string "word, if you think about it.\p" .string "Like, is it like an orange peel?\n" .string "Or like a ringing bell?$" -SixIsland_PatternBush_Text_VanceIntro:: @ 817C246 +SixIsland_PatternBush_Text_VanceIntro:: .string "Yeah, yeah, yeah!\n" .string "Look at all the BUG POKéMON!$" -SixIsland_PatternBush_Text_VanceDefeat:: @ 817C275 +SixIsland_PatternBush_Text_VanceDefeat:: .string "I got beat while I was still busy\n" .string "celebrating!$" -SixIsland_PatternBush_Text_VancePostBattle:: @ 817C2A4 +SixIsland_PatternBush_Text_VancePostBattle:: .string "I'm going to bring my little brother\n" .string "here next time.$" -SixIsland_PatternBush_Text_NashIntro:: @ 817C2D9 +SixIsland_PatternBush_Text_NashIntro:: .string "Look, look! There are funny\n" .string "patterns on the ground.$" -SixIsland_PatternBush_Text_NashDefeat:: @ 817C30D +SixIsland_PatternBush_Text_NashDefeat:: .string "Super awesome!$" -SixIsland_PatternBush_Text_NashPostBattle:: @ 817C31C +SixIsland_PatternBush_Text_NashPostBattle:: .string "The funny patterns on the ground…\p" .string "They look like the patterns on my\n" .string "grandpa's clothes.$" -SixIsland_PatternBush_Text_CordellIntro:: @ 817C373 +SixIsland_PatternBush_Text_CordellIntro:: .string "I bet you think I'm just some guy,\n" .string "don't you, eh?$" -SixIsland_PatternBush_Text_CordellDefeat:: @ 817C3A5 +SixIsland_PatternBush_Text_CordellDefeat:: .string "I bet you think I'm weak,\n" .string "don't you, eh?$" -SixIsland_PatternBush_Text_CordellPostBattle:: @ 817C3CE +SixIsland_PatternBush_Text_CordellPostBattle:: .string "Ayup, you townies come around all\n" .string "so dandy with a hat that flashy…\p" .string "How about giving me that?$" -SixIsland_PatternBush_Text_DaliaIntro:: @ 817C42B +SixIsland_PatternBush_Text_DaliaIntro:: .string "Take a deep breath.\n" .string "Isn't the air delicious?$" -SixIsland_PatternBush_Text_DaliaDefeat:: @ 817C458 +SixIsland_PatternBush_Text_DaliaDefeat:: .string "If you'd like, I can teach you how\n" .string "to breathe properly.$" -SixIsland_PatternBush_Text_DaliaPostBattle:: @ 817C490 +SixIsland_PatternBush_Text_DaliaPostBattle:: .string "First, exhale.\n" .string "Blow everything out.\p" .string "When you can't exhale anymore,\n" .string "inhale the clean air!\p" .string "Isn't it refreshing?$" -SixIsland_PatternBush_Text_JoanaIntro:: @ 817C4FE +SixIsland_PatternBush_Text_JoanaIntro:: .string "I love BUG POKéMON.\n" .string "That's why I'm here all the time.\p" .string "Am I the only girl like that?$" -SixIsland_PatternBush_Text_JoanaDefeat:: @ 817C552 +SixIsland_PatternBush_Text_JoanaDefeat:: .string "I lost, but I'm still laughing.\n" .string "Am I the only girl like that?$" -SixIsland_PatternBush_Text_JoanaPostBattle:: @ 817C590 +SixIsland_PatternBush_Text_JoanaPostBattle:: .string "I'm going to keep on collecting\n" .string "BUG POKéMON.\p" .string "Am I the only girl like that?$" -SixIsland_PatternBush_Text_RileyIntro:: @ 817C5DB +SixIsland_PatternBush_Text_RileyIntro:: .string "This is a good spot.\n" .string "I'll pitch my tent here.$" -SixIsland_PatternBush_Text_RileyDefeat:: @ 817C609 +SixIsland_PatternBush_Text_RileyDefeat:: .string "Wimped out…$" -SixIsland_PatternBush_Text_RileyPostBattle:: @ 817C615 +SixIsland_PatternBush_Text_RileyPostBattle:: .string "I'm going to observe the night sky\n" .string "here.$" -SixIsland_PatternBush_Text_MarcyIntro:: @ 817C63E +SixIsland_PatternBush_Text_MarcyIntro:: .string "Oh, yuck!\n" .string "I think a bug stung me!$" -SixIsland_PatternBush_Text_MarcyDefeat:: @ 817C660 +SixIsland_PatternBush_Text_MarcyDefeat:: .string "It wasn't a bug.\n" .string "I cut my shin on some grass.$" -SixIsland_PatternBush_Text_MarcyPostBattle:: @ 817C68E +SixIsland_PatternBush_Text_MarcyPostBattle:: .string "A little cut like that…\n" .string "A little spit's enough to cure it!$" -SixIsland_PatternBush_Text_LaytonIntro:: @ 817C6C9 +SixIsland_PatternBush_Text_LaytonIntro:: .string "Have you noticed something odd\n" .string "about these parts?$" -SixIsland_PatternBush_Text_LaytonDefeat:: @ 817C6FB +SixIsland_PatternBush_Text_LaytonDefeat:: .string "Have you taken a good look around\n" .string "your feet?$" -SixIsland_PatternBush_Text_LaytonPostBattle:: @ 817C728 +SixIsland_PatternBush_Text_LaytonPostBattle:: .string "There are places here in PATTERN\n" .string "BUSH where grass won't grow.\p" .string "What could be the cause of such\n" diff --git a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc index ff8f2c4e7..c67d905e3 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/scripts.inc @@ -1,26 +1,26 @@ .equ LOCALID_RIVAL, 2 -SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A +SixIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume map_script MAP_SCRIPT_ON_FRAME_TABLE, SixIsland_PokemonCenter_1F_OnFrame .byte 0 -SixIsland_PokemonCenter_1F_OnTransition:: @ 8171D7A +SixIsland_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_SIX_ISLAND compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0 call_if_eq SixIsland_PokemonCenter_1F_EventScript_ShowRival end -SixIsland_PokemonCenter_1F_EventScript_ShowRival:: @ 8171D89 +SixIsland_PokemonCenter_1F_EventScript_ShowRival:: clearflag FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL return -SixIsland_PokemonCenter_1F_OnFrame:: @ 8171D8D +SixIsland_PokemonCenter_1F_OnFrame:: map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, SixIsland_PokemonCenter_1F_EventScript_RivalScene .2byte 0 -SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97 +SixIsland_PokemonCenter_1F_EventScript_RivalScene:: lockall textcolor 0 applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown @@ -47,35 +47,35 @@ SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97 releaseall end -SixIsland_PokemonCenter_1F_Movement_RivalApproach:: @ 8171DF9 +SixIsland_PokemonCenter_1F_Movement_RivalApproach:: walk_right walk_right walk_down walk_down step_end -SixIsland_PokemonCenter_1F_Movement_RivalExit:: @ 8171DFE +SixIsland_PokemonCenter_1F_Movement_RivalExit:: delay_16 delay_4 walk_down step_end -SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit:: @ 8171E02 +SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit:: walk_left walk_in_place_fastest_right step_end -SixIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171E05 +SixIsland_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -SixIsland_PokemonCenter_1F_EventScript_Hiker:: @ 8171E0E +SixIsland_PokemonCenter_1F_EventScript_Hiker:: msgbox SixIsland_PokemonCenter_1F_Text_SomethingHiddenOnThisIsland, MSGBOX_NPC end -SixIsland_PokemonCenter_1F_EventScript_OldMan:: @ 8171E17 +SixIsland_PokemonCenter_1F_EventScript_OldMan:: msgbox SixIsland_PokemonCenter_1F_Text_SomeMonsEvolveByTradingWithHeldItem, MSGBOX_NPC end diff --git a/data/maps/SixIsland_PokemonCenter_1F/text.inc b/data/maps/SixIsland_PokemonCenter_1F/text.inc index 170a0e011..d758073e1 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/text.inc +++ b/data/maps/SixIsland_PokemonCenter_1F/text.inc @@ -1,11 +1,11 @@ -SixIsland_PokemonCenter_1F_Text_SomethingHiddenOnThisIsland:: @ 81A3E02 +SixIsland_PokemonCenter_1F_Text_SomethingHiddenOnThisIsland:: .string "For ten years, I've searched for\n" .string "RUINS.\p" .string "No, make that twenty years.\p" .string "I get this feeling that there's\n" .string "something hidden on this island.$" -SixIsland_PokemonCenter_1F_Text_SomeMonsEvolveByTradingWithHeldItem:: @ 81A3E87 +SixIsland_PokemonCenter_1F_Text_SomeMonsEvolveByTradingWithHeldItem:: .string "You know of POKéMON that evolve\n" .string "only upon trading, yes?\p" .string "But did you know that there are\n" @@ -13,7 +13,7 @@ SixIsland_PokemonCenter_1F_Text_SomeMonsEvolveByTradingWithHeldItem:: @ 81A3E87 .string "Some POKéMON evolve only when\n" .string "traded while holding specific items.$" -SixIsland_PokemonCenter_1F_Text_RivalImpossibleToGetAllMonsAroundHere:: @ 81A3F30 +SixIsland_PokemonCenter_1F_Text_RivalImpossibleToGetAllMonsAroundHere:: .string "{RIVAL}: Hey, {PLAYER}!\n" .string "How's your POKéDEX filling up?\p" .string "It looks like it's impossible to get\n" diff --git a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc index 05555c8d1..cb7a00ad2 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/SixIsland_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 +SixIsland_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ SixIsland_PokemonCenter_2F_MapScripts:: @ 8171E20 .byte 0 @ The below 3 are unused and leftover from RS -SixIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 8171E35 +SixIsland_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -SixIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171E3B +SixIsland_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -SixIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171E41 +SixIsland_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/SixIsland_RuinValley/scripts.inc b/data/maps/SixIsland_RuinValley/scripts.inc index 988c98a39..133add073 100644 --- a/data/maps/SixIsland_RuinValley/scripts.inc +++ b/data/maps/SixIsland_RuinValley/scripts.inc @@ -1,18 +1,18 @@ .set LOCALID_SCIENTIST, 1 -SixIsland_RuinValley_MapScripts:: @ 8168B53 +SixIsland_RuinValley_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, SixIsland_RuinValley_OnLoad .byte 0 -SixIsland_RuinValley_OnLoad:: @ 8168B59 +SixIsland_RuinValley_OnLoad:: call_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, SixIsland_RuinValley_EventScript_OpenDottedHoleDoor end -SixIsland_RuinValley_EventScript_OpenDottedHoleDoor:: @ 8168B63 +SixIsland_RuinValley_EventScript_OpenDottedHoleDoor:: setmetatile 24, 24, METATILE_SeviiIslands67_DottedHoleDoor_Open, 0 return -SixIsland_RuinValley_EventScript_Scientist:: @ 8168B6D +SixIsland_RuinValley_EventScript_Scientist:: lock msgbox SixIsland_RuinValley_Text_CantFigureOutHowToGetInside applymovement LOCALID_SCIENTIST, Movement_FacePlayer @@ -23,7 +23,7 @@ SixIsland_RuinValley_EventScript_Scientist:: @ 8168B6D release end -SixIsland_RuinValley_EventScript_DottedHoleDoor:: @ 8168B94 +SixIsland_RuinValley_EventScript_DottedHoleDoor:: lockall goto_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, SixIsland_RuinValley_EventScript_DottedHoleDoorOpen msgbox SixIsland_RuinValley_Text_CheckDoorMoreThoroughly, MSGBOX_YESNO @@ -35,12 +35,12 @@ SixIsland_RuinValley_EventScript_DottedHoleDoor:: @ 8168B94 releaseall end -SixIsland_RuinValley_EventScript_DottedHoleDoorOpen:: @ 8168BC1 +SixIsland_RuinValley_EventScript_DottedHoleDoorOpen:: msgbox SixIsland_RuinValley_Text_DoorIsOpen releaseall end -SixIsland_RuinValley_EventScript_IgnoreDottedHoleDoor:: @ 8168BCB +SixIsland_RuinValley_EventScript_IgnoreDottedHoleDoor:: msgbox SixIsland_RuinValley_Text_LeftDoorAlone releaseall end diff --git a/data/maps/SixIsland_RuinValley/text.inc b/data/maps/SixIsland_RuinValley/text.inc index 63524bb19..446e660f2 100644 --- a/data/maps/SixIsland_RuinValley/text.inc +++ b/data/maps/SixIsland_RuinValley/text.inc @@ -1,85 +1,85 @@ -SixIsland_RuinValley_Text_CantFigureOutHowToGetInside:: @ 818BD47 +SixIsland_RuinValley_Text_CantFigureOutHowToGetInside:: .string "I can't figure out how I'm supposed\n" .string "to get inside.$" -SixIsland_RuinValley_Text_IFoundThisPlace:: @ 818BD7A +SixIsland_RuinValley_Text_IFoundThisPlace:: .string "Let me tell you, I found this\n" .string "place.\p" .string "Don't look so envious, will you?$" -SixIsland_RuinValley_Text_CheckDoorMoreThoroughly:: @ 818BDC0 +SixIsland_RuinValley_Text_CheckDoorMoreThoroughly:: .string "The door doesn't budge at all.\n" .string "Check it more thoroughly?$" -SixIsland_RuinValley_Text_LeftDoorAlone:: @ 818BDF9 +SixIsland_RuinValley_Text_LeftDoorAlone:: .string "{PLAYER} left the door alone.$" -SixIsland_RuinValley_Text_SeveralDotsOnTheDoor:: @ 818BE11 +SixIsland_RuinValley_Text_SeveralDotsOnTheDoor:: .string "On closer inspection, there are\n" .string "several dots on the door…$" -SixIsland_RuinValley_Text_DoorIsOpen:: @ 818BE4B +SixIsland_RuinValley_Text_DoorIsOpen:: .string "The door is open.$" -SixIsland_RuinValley_Text_StanlyIntro:: @ 818BE5D +SixIsland_RuinValley_Text_StanlyIntro:: .string "There appear to be many secrets\n" .string "still unsolved in this world.$" -SixIsland_RuinValley_Text_StanlyDefeat:: @ 818BE9B +SixIsland_RuinValley_Text_StanlyDefeat:: .string "Hmm…$" -SixIsland_RuinValley_Text_StanlyPostBattle:: @ 818BEA0 +SixIsland_RuinValley_Text_StanlyPostBattle:: .string "I suggest to you that you, too,\n" .string "give a thought to the secrets and\l" .string "mysteries of our world once a day.$" -SixIsland_RuinValley_Text_FosterIntro:: @ 818BF05 +SixIsland_RuinValley_Text_FosterIntro:: .string "I'm curious, what compelled you to\n" .string "come here?$" -SixIsland_RuinValley_Text_FosterDefeat:: @ 818BF33 +SixIsland_RuinValley_Text_FosterDefeat:: .string "It's been so long since I battled,\n" .string "my instincts are off.$" -SixIsland_RuinValley_Text_FosterPostBattle:: @ 818BF6C +SixIsland_RuinValley_Text_FosterPostBattle:: .string "There are several ruins on the\n" .string "SEVII ISLANDS.\p" .string "The majority of them date back\n" .string "a long way.$" -SixIsland_RuinValley_Text_LarryIntro:: @ 818BFC5 +SixIsland_RuinValley_Text_LarryIntro:: .string "It's been said that there are\n" .string "mysterious stones on this island.\p" .string "I suspect it has something to do\n" .string "with the ruins here.$" -SixIsland_RuinValley_Text_LarryDefeat:: @ 818C03B +SixIsland_RuinValley_Text_LarryDefeat:: .string "Oh, interesting.$" -SixIsland_RuinValley_Text_LarryPostBattle:: @ 818C04C +SixIsland_RuinValley_Text_LarryPostBattle:: .string "Those ruins over there…\p" .string "I haven't had any luck in finding\n" .string "how I can get inside.$" -SixIsland_RuinValley_Text_DarylIntro:: @ 818C09C +SixIsland_RuinValley_Text_DarylIntro:: .string "A battle with you, so high up!$" -SixIsland_RuinValley_Text_DarylDefeat:: @ 818C0BB +SixIsland_RuinValley_Text_DarylDefeat:: .string "Oh, the heartbreak of losing so\n" .string "easily to you!$" -SixIsland_RuinValley_Text_DarylPostBattle:: @ 818C0EA +SixIsland_RuinValley_Text_DarylPostBattle:: .string "Experience the joy of climbing!$" -SixIsland_RuinValley_Text_HectorIntro:: @ 818C10A +SixIsland_RuinValley_Text_HectorIntro:: .string "I'm pretty familiar with the land\n" .string "around these parts.$" -SixIsland_RuinValley_Text_HectorDefeat:: @ 818C140 +SixIsland_RuinValley_Text_HectorDefeat:: .string "You don't need to be so pushy.\n" .string "I'll be happy to tell you.$" -SixIsland_RuinValley_Text_HectorPostBattle:: @ 818C17A +SixIsland_RuinValley_Text_HectorPostBattle:: .string "The door to the ruins…\n" .string "It has these strange patterns\l" .string "engraved on the outside.\p" diff --git a/data/maps/SixIsland_WaterPath/scripts.inc b/data/maps/SixIsland_WaterPath/scripts.inc index 0df3fab4b..4d496ae14 100644 --- a/data/maps/SixIsland_WaterPath/scripts.inc +++ b/data/maps/SixIsland_WaterPath/scripts.inc @@ -1,10 +1,10 @@ -SixIsland_WaterPath_MapScripts:: @ 8168B40 +SixIsland_WaterPath_MapScripts:: .byte 0 -SixIsland_WaterPath_EventScript_HornWantedSign:: @ 8168B41 +SixIsland_WaterPath_EventScript_HornWantedSign:: msgbox SixIsland_WaterPath_Text_WantedUltimateHorn, MSGBOX_SIGN end -SixIsland_WaterPath_EventScript_RouteSign:: @ 8168B4A +SixIsland_WaterPath_EventScript_RouteSign:: msgbox SixIsland_WaterPath_Text_RouteSign, MSGBOX_SIGN end diff --git a/data/maps/SixIsland_WaterPath/text.inc b/data/maps/SixIsland_WaterPath/text.inc index 7ee28923a..57ed276bd 100644 --- a/data/maps/SixIsland_WaterPath/text.inc +++ b/data/maps/SixIsland_WaterPath/text.inc @@ -1,102 +1,102 @@ -SixIsland_WaterPath_Text_RoseIntro:: @ 818B896 +SixIsland_WaterPath_Text_RoseIntro:: .string "I let a pleasant breeze lead me\n" .string "all the way here.$" -SixIsland_WaterPath_Text_RoseDefeat:: @ 818B8C8 +SixIsland_WaterPath_Text_RoseDefeat:: .string "Giggle… You're so cute when you're\n" .string "determined.$" -SixIsland_WaterPath_Text_RosePostBattle:: @ 818B8F7 +SixIsland_WaterPath_Text_RosePostBattle:: .string "I want to go to the woods over\n" .string "there, but…\p" .string "There are lots of BUG POKéMON.\n" .string "They scare me a little.$" -SixIsland_WaterPath_Text_EdwardIntro:: @ 818B959 +SixIsland_WaterPath_Text_EdwardIntro:: .string "I'm practicing in secret so no one\n" .string "can see me.$" -SixIsland_WaterPath_Text_EdwardDefeat:: @ 818B988 +SixIsland_WaterPath_Text_EdwardDefeat:: .string "Nobody saw me losing, right?$" -SixIsland_WaterPath_Text_EdwardPostBattle:: @ 818B9A5 +SixIsland_WaterPath_Text_EdwardPostBattle:: .string "As a performer, I don't want people\n" .string "to know about the effort I put in.$" -SixIsland_WaterPath_Text_SamirIntro:: @ 818B9EC +SixIsland_WaterPath_Text_SamirIntro:: .string "What, you're suggesting that you're\n" .string "sick of seeing SWIMMERS like me?\p" .string "Aww, don't be hatin'!$" -SixIsland_WaterPath_Text_SamirDefeat:: @ 818BA47 +SixIsland_WaterPath_Text_SamirDefeat:: .string "Oh, no, no, no.$" -SixIsland_WaterPath_Text_SamirPostBattle:: @ 818BA57 +SixIsland_WaterPath_Text_SamirPostBattle:: .string "I couldn't lift the stigma of being\n" .string "a SWIMMER…$" -SixIsland_WaterPath_Text_DeniseIntro:: @ 818BA86 +SixIsland_WaterPath_Text_DeniseIntro:: .string "My boyfriend's always busy, so I\n" .string "come swimming by myself.$" -SixIsland_WaterPath_Text_DeniseDefeat:: @ 818BAC0 +SixIsland_WaterPath_Text_DeniseDefeat:: .string "Awww, I knew this would happen!$" -SixIsland_WaterPath_Text_DenisePostBattle:: @ 818BAE0 +SixIsland_WaterPath_Text_DenisePostBattle:: .string "When I can't be with my boyfriend,\n" .string "I spend time with the POKéMON he\l" .string "gave me.$" -SixIsland_WaterPath_Text_EarlIntro:: @ 818BB2D +SixIsland_WaterPath_Text_EarlIntro:: .string "Tell me, where are the mountains\n" .string "around these parts?$" -SixIsland_WaterPath_Text_EarlDefeat:: @ 818BB62 +SixIsland_WaterPath_Text_EarlDefeat:: .string "I lost my way while I was busy\n" .string "battling!$" -SixIsland_WaterPath_Text_EarlPostBattle:: @ 818BB8B +SixIsland_WaterPath_Text_EarlPostBattle:: .string "Aren't there any mountains around\n" .string "these parts?$" -SixIsland_WaterPath_Text_MiuIntro:: @ 818BBBA +SixIsland_WaterPath_Text_MiuIntro:: .string "MIU: Hello, POKéMON!\n" .string "It's time to play!$" -SixIsland_WaterPath_Text_MiuDefeat:: @ 818BBE2 +SixIsland_WaterPath_Text_MiuDefeat:: .string "MIU: Oh, no!\n" .string "Mommy!$" -SixIsland_WaterPath_Text_MiuPostBattle:: @ 818BBF6 +SixIsland_WaterPath_Text_MiuPostBattle:: .string "MIU: It makes me all sad inside\n" .string "when we lose…$" -SixIsland_WaterPath_Text_MiuNotEnoughMons:: @ 818BC24 +SixIsland_WaterPath_Text_MiuNotEnoughMons:: .string "MIU: MIA and I are TWINS.\n" .string "We want to battle together.$" -SixIsland_WaterPath_Text_MiaIntro:: @ 818BC5A +SixIsland_WaterPath_Text_MiaIntro:: .string "MIA: Hello, POKéMON!\n" .string "It's time to battle!$" -SixIsland_WaterPath_Text_MiaDefeat:: @ 818BC84 +SixIsland_WaterPath_Text_MiaDefeat:: .string "MIA: You're mean!\n" .string "You're bad for winning!$" -SixIsland_WaterPath_Text_MiaPostBattle:: @ 818BCAE +SixIsland_WaterPath_Text_MiaPostBattle:: .string "MIA: Ohh…\n" .string "I'm sorry, my POKéMON…$" -SixIsland_WaterPath_Text_MiaNotEnoughMons:: @ 818BCCF +SixIsland_WaterPath_Text_MiaNotEnoughMons:: .string "MIA: Oh, you only have one\n" .string "POKéMON?\p" .string "Don't you feel lonesome?$" -SixIsland_WaterPath_Text_WantedUltimateHorn:: @ 818BD0C +SixIsland_WaterPath_Text_WantedUltimateHorn:: .string "Wanted!\n" .string "The Ultimate Horn!$" -SixIsland_WaterPath_Text_RouteSign:: @ 818BD27 +SixIsland_WaterPath_Text_RouteSign:: .string "WATER PATH\n" .string "Leads to RUIN VALLEY$" diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index 34d0839be..eb253ce81 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -1,7 +1,7 @@ -SixIsland_WaterPath_House1_MapScripts:: @ 817206C +SixIsland_WaterPath_House1_MapScripts:: .byte 0 -SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D +SixIsland_WaterPath_House1_EventScript_Beauty:: lock faceplayer goto_if_questlog EventScript_ReleaseEnd @@ -29,33 +29,33 @@ SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D release end -SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty:: @ 81720E5 +SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty:: msgbox SixIsland_WaterPath_House1_Text_LoveItNeedItHeracross release end -SixIsland_WaterPath_House1_EventScript_DontShowMon:: @ 81720EF +SixIsland_WaterPath_House1_EventScript_DontShowMon:: release end -SixIsland_WaterPath_House1_EventScript_ShownNonHeracross:: @ 81720F1 +SixIsland_WaterPath_House1_EventScript_ShownNonHeracross:: msgbox SixIsland_WaterPath_House1_Text_ThisWontDo release end -SixIsland_WaterPath_House1_EventScript_ShownSmallHeracross:: @ 81720FB +SixIsland_WaterPath_House1_EventScript_ShownSmallHeracross:: goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_ShownBigHeracross msgbox SixIsland_WaterPath_House1_Text_ItsXInchesYInchesWasBiggest release end -SixIsland_WaterPath_House1_EventScript_ShownTiedHeracross:: @ 817210E +SixIsland_WaterPath_House1_EventScript_ShownTiedHeracross:: goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_ShownBigHeracross msgbox SixIsland_WaterPath_House1_Text_ItsXInchesSameAsBefore release end -SixIsland_WaterPath_House1_EventScript_ShownBigHeracross:: @ 8172121 +SixIsland_WaterPath_House1_EventScript_ShownBigHeracross:: setflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1 msgbox SixIsland_WaterPath_House1_Text_ItsXInchesDeserveReward giveitem ITEM_NEST_BALL @@ -65,19 +65,19 @@ SixIsland_WaterPath_House1_EventScript_ShownBigHeracross:: @ 8172121 release end -SixIsland_WaterPath_House1_EventScript_NoRoomForNestBall:: @ 817214D +SixIsland_WaterPath_House1_EventScript_NoRoomForNestBall:: msgbox SixIsland_WaterPath_House1_Text_YourBagIsFull release end -SixIsland_WaterPath_House1_EventScript_SizeRecord:: @ 8172157 +SixIsland_WaterPath_House1_EventScript_SizeRecord:: lockall goto_if_set FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_SizeRecordNonEmpty msgbox SixIsland_WaterPath_House1_Text_BlankChartOfSomeSort releaseall end -SixIsland_WaterPath_House1_EventScript_SizeRecordNonEmpty:: @ 817216B +SixIsland_WaterPath_House1_EventScript_SizeRecordNonEmpty:: special GetHeracrossSizeRecordInfo msgbox SixIsland_WaterPath_House1_Text_BiggestHeracrossIsXInches releaseall diff --git a/data/maps/SixIsland_WaterPath_House1/text.inc b/data/maps/SixIsland_WaterPath_House1/text.inc index a7e61b961..36484111b 100644 --- a/data/maps/SixIsland_WaterPath_House1/text.inc +++ b/data/maps/SixIsland_WaterPath_House1/text.inc @@ -1,50 +1,50 @@ -SixIsland_WaterPath_House1_Text_LoveItNeedItHeracross:: @ 81A49E9 +SixIsland_WaterPath_House1_Text_LoveItNeedItHeracross:: .string "Hera, hera, HERACROSS!\n" .string "Big and shiny, it's the bug boss!\l" .string "Love it, need it, HERACROSS!$" -SixIsland_WaterPath_House1_Text_MayIMeasureHeracross:: @ 81A4A3F +SixIsland_WaterPath_House1_Text_MayIMeasureHeracross:: .string "Eeeeek!\n" .string "That's a HERACROSS!\p" .string "Please, please, may I measure how\n" .string "big it is?$" -SixIsland_WaterPath_House1_Text_ItsXInchesDeserveReward:: @ 81A4A88 +SixIsland_WaterPath_House1_Text_ItsXInchesDeserveReward:: .string "Eeeek, it's {STR_VAR_2} inches!\n" .string "I've never seen anything like this!\l" .string "You deserve a reward!$" -SixIsland_WaterPath_House1_Text_WantToSeeBiggerOne:: @ 81A4AD9 +SixIsland_WaterPath_House1_Text_WantToSeeBiggerOne:: .string "I want to see a much, much bigger\n" .string "HERACROSS than that one.\p" .string "Oh, how I adore them, big\n" .string "HERACROSS!$" -SixIsland_WaterPath_House1_Text_ItsXInchesSameAsBefore:: @ 81A4B39 +SixIsland_WaterPath_House1_Text_ItsXInchesSameAsBefore:: .string "Huh? This {STR_VAR_2}-inch measurement…\n" .string "Oh, boo! It's the same as before.$" -SixIsland_WaterPath_House1_Text_ItsXInchesYInchesWasBiggest:: @ 81A4B7A +SixIsland_WaterPath_House1_Text_ItsXInchesYInchesWasBiggest:: .string "Oh, it's just {STR_VAR_2} inches.\n" .string "The HERACROSS before was bigger.\p" .string "It was {STR_VAR_3} inches, the biggest\n" .string "HERACROSS you've brought me.$" -SixIsland_WaterPath_House1_Text_ThisWontDo:: @ 81A4BEF +SixIsland_WaterPath_House1_Text_ThisWontDo:: .string "Oh, no! This won't do!\p" .string "HERACROSS looks much more macho\n" .string "and cool, and has a lovely horn!$" -SixIsland_WaterPath_House1_Text_YourBagIsFull:: @ 81A4C47 +SixIsland_WaterPath_House1_Text_YourBagIsFull:: .string "Your BAG is full.\n" .string "My reward won't fit.$" -SixIsland_WaterPath_House1_Text_BiggestHeracrossIsXInches:: @ 81A4C6E +SixIsland_WaterPath_House1_Text_BiggestHeracrossIsXInches:: .string "The biggest HERACROSS that I have\n" .string "ever seen measured so far is:\p" .string "{STR_VAR_3} inches!$" -SixIsland_WaterPath_House1_Text_BlankChartOfSomeSort:: @ 81A4CB9 +SixIsland_WaterPath_House1_Text_BlankChartOfSomeSort:: .string "It's a blank chart of some sort.\p" .string "It has spaces for writing in\n" .string "records of some kind.$" diff --git a/data/maps/SixIsland_WaterPath_House2/scripts.inc b/data/maps/SixIsland_WaterPath_House2/scripts.inc index 937fdd178..3b3800458 100644 --- a/data/maps/SixIsland_WaterPath_House2/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House2/scripts.inc @@ -1,6 +1,6 @@ -SixIsland_WaterPath_House2_MapScripts:: @ 8172178 +SixIsland_WaterPath_House2_MapScripts:: .byte 0 -SixIsland_WaterPath_House2_EventScript_Man:: @ 8172179 +SixIsland_WaterPath_House2_EventScript_Man:: msgbox SixIsland_WaterPath_House2_Text_MyNeighborMeasuredMe, MSGBOX_NPC end diff --git a/data/maps/SixIsland_WaterPath_House2/text.inc b/data/maps/SixIsland_WaterPath_House2/text.inc index 19dd60965..f4e53db1f 100644 --- a/data/maps/SixIsland_WaterPath_House2/text.inc +++ b/data/maps/SixIsland_WaterPath_House2/text.inc @@ -1,4 +1,4 @@ -SixIsland_WaterPath_House2_Text_MyNeighborMeasuredMe:: @ 81A4D0D +SixIsland_WaterPath_House2_Text_MyNeighborMeasuredMe:: .string "My height is 67.0 inches on the\n" .string "button.\p" .string "I know it is this precisely because\n" diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 303fd046e..7293d0bab 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -8,34 +8,34 @@ .equ LOCALID_BIKER5, 8 .equ LOCALID_BIKER6, 14 -ThreeIsland_MapScripts:: @ 81677AD +ThreeIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_OnTransition .byte 0 -ThreeIsland_OnTransition:: @ 81677B3 +ThreeIsland_OnTransition:: setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND call_if_set FLAG_RESCUED_LOSTELLE, ThreeIsland_EventScript_HideAntiBikers compare VAR_MAP_SCENE_THREE_ISLAND, 4 call_if_eq ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers end -ThreeIsland_EventScript_HideAntiBikers:: @ 81677CB +ThreeIsland_EventScript_HideAntiBikers:: setflag FLAG_HIDE_THREE_ISLAND_ANTIBIKERS return -ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers:: @ 81677CF +ThreeIsland_EventScript_SetAntiBikersMovementAfterBikers:: setobjectmovementtype LOCALID_ANTIBIKER1, MOVEMENT_TYPE_LOOK_AROUND setobjectmovementtype LOCALID_ANTIBIKER2, MOVEMENT_TYPE_LOOK_AROUND return -ThreeIsland_EventScript_Biker:: @ 81677D8 +ThreeIsland_EventScript_Biker:: lock setvar VAR_TEMP_1, 2 call ThreeIsland_EventScript_BikerArgumentScene release end -ThreeIsland_EventScript_AntiBiker1:: @ 81677E5 +ThreeIsland_EventScript_AntiBiker1:: lock goto_if_set FLAG_GOT_FULL_RESTORE_FROM_THREE_ISLAND_DEFENDER, ThreeIsland_EventScript_AntiBiker1GotFullRestore compare VAR_MAP_SCENE_THREE_ISLAND, 4 @@ -45,14 +45,14 @@ ThreeIsland_EventScript_AntiBiker1:: @ 81677E5 release end -ThreeIsland_EventScript_AntiBiker1GotFullRestore:: @ 8167806 +ThreeIsland_EventScript_AntiBiker1GotFullRestore:: applymovement LOCALID_ANTIBIKER1, Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_Text_YouveGotImpressiveMons release end -ThreeIsland_EventScript_GiveFullRestore:: @ 816781A +ThreeIsland_EventScript_GiveFullRestore:: applymovement LOCALID_ANTIBIKER1, Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_Text_ThankYouOhYourMonGotHurt @@ -66,12 +66,12 @@ ThreeIsland_EventScript_GiveFullRestore:: @ 816781A release end -ThreeIsland_EventScript_NoRoomForFullRestore:: @ 8167865 +ThreeIsland_EventScript_NoRoomForFullRestore:: msgbox ThreeIsland_Text_OhYourBagIsFull release end -ThreeIsland_EventScript_BikerArgumentScene:: @ 816786F +ThreeIsland_EventScript_BikerArgumentScene:: compare VAR_TEMP_1, 1 call_if_eq ThreeIsland_EventScript_PlayerFaceLeft compare VAR_TEMP_1, 2 @@ -108,42 +108,42 @@ ThreeIsland_EventScript_BikerArgumentScene:: @ 816786F msgbox ThreeIsland_Text_WhosGonnaMakeMe return -ThreeIsland_EventScript_PlayerFaceUp:: @ 8167931 +ThreeIsland_EventScript_PlayerFaceUp:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp waitmovement 0 return @ Unused -ThreeIsland_EventScript_PlayerFaceDown:: @ 816793C +ThreeIsland_EventScript_PlayerFaceDown:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown waitmovement 0 return -ThreeIsland_EventScript_PlayerFaceLeft:: @ 8167947 +ThreeIsland_EventScript_PlayerFaceLeft:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft waitmovement 0 return -ThreeIsland_EventScript_PlayerFaceRight:: @ 8167952 +ThreeIsland_EventScript_PlayerFaceRight:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight waitmovement 0 return -ThreeIsland_EventScript_PlayerFaceBiker:: @ 816795D +ThreeIsland_EventScript_PlayerFaceBiker:: getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 goto_if_ge ThreeIsland_EventScript_PlayerFaceUp goto ThreeIsland_EventScript_PlayerFaceRight end -ThreeIsland_EventScript_PlayerFaceAntiBiker:: @ 8167973 +ThreeIsland_EventScript_PlayerFaceAntiBiker:: getplayerxy VAR_0x8004, VAR_0x8005 compare VAR_0x8004, 9 goto_if_ge ThreeIsland_EventScript_PlayerFaceLeft goto ThreeIsland_EventScript_PlayerFaceUp end -ThreeIsland_EventScript_AntiBiker2:: @ 8167989 +ThreeIsland_EventScript_AntiBiker2:: lock compare VAR_MAP_SCENE_THREE_ISLAND, 4 goto_if_eq ThreeIsland_EventScript_AntiBiker2BikersGone @@ -152,14 +152,14 @@ ThreeIsland_EventScript_AntiBiker2:: @ 8167989 release end -ThreeIsland_EventScript_AntiBiker2BikersGone:: @ 81679A1 +ThreeIsland_EventScript_AntiBiker2BikersGone:: applymovement LOCALID_ANTIBIKER2, Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_Text_LostelleWentOffTowardsBondBridge release end -ThreeIsland_EventScript_BikerBossIntroTrigger:: @ 81679B5 +ThreeIsland_EventScript_BikerBossIntroTrigger:: lockall textcolor 0 applymovement LOCALID_ANTIBIKER1, ThreeIsland_Movement_SpeakRight @@ -181,45 +181,45 @@ ThreeIsland_EventScript_BikerBossIntroTrigger:: @ 81679B5 releaseall end -ThreeIsland_Movement_SpeakLeft:: @ 8167A19 +ThreeIsland_Movement_SpeakLeft:: walk_in_place_left step_end -ThreeIsland_Movement_SpeakRight:: @ 8167A1B +ThreeIsland_Movement_SpeakRight:: walk_in_place_right step_end -ThreeIsland_EventScript_BattleBikersTriggerLeft:: @ 8167A1D +ThreeIsland_EventScript_BattleBikersTriggerLeft:: lockall setvar VAR_TEMP_1, 0 goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_BattleBikersTriggerMidLeft:: @ 8167A29 +ThreeIsland_EventScript_BattleBikersTriggerMidLeft:: lockall setvar VAR_TEMP_1, 1 goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_BattleBikersTriggerMid:: @ 8167A35 +ThreeIsland_EventScript_BattleBikersTriggerMid:: lockall setvar VAR_TEMP_1, 2 goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_BattleBikersTriggerMidRight:: @ 8167A41 +ThreeIsland_EventScript_BattleBikersTriggerMidRight:: lockall setvar VAR_TEMP_1, 3 goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_BattleBikersTriggerRight:: @ 8167A4D +ThreeIsland_EventScript_BattleBikersTriggerRight:: lockall setvar VAR_TEMP_1, 4 goto ThreeIsland_EventScript_BattleBikersScene end -ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 +ThreeIsland_EventScript_BattleBikersScene:: textcolor 0 applymovement LOCALID_BIKER1, Movement_WalkInPlaceFastestDown waitmovement 0 @@ -294,40 +294,40 @@ ThreeIsland_EventScript_BattleBikersScene:: @ 8167A59 releaseall end -ThreeIsland_EventScript_PaxtonApproachLeft:: @ 8167BC6 +ThreeIsland_EventScript_PaxtonApproachLeft:: applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachLeft waitmovement 0 return -ThreeIsland_EventScript_PaxtonApproachMidLeft:: @ 8167BD8 +ThreeIsland_EventScript_PaxtonApproachMidLeft:: applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidLeft waitmovement 0 return -ThreeIsland_EventScript_PaxtonApproachMid:: @ 8167BEA +ThreeIsland_EventScript_PaxtonApproachMid:: applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMid applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton waitmovement 0 return -ThreeIsland_EventScript_PaxtonApproachMidRight:: @ 8167C03 +ThreeIsland_EventScript_PaxtonApproachMidRight:: applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachMidRight waitmovement 0 return -ThreeIsland_EventScript_PaxtonApproachRight:: @ 8167C1C +ThreeIsland_EventScript_PaxtonApproachRight:: applymovement LOCALID_BIKER3, Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerFacePaxton applymovement LOCALID_PAXTON, ThreeIsland_Movement_PaxtonApproachRight waitmovement 0 return -ThreeIsland_EventScript_LeaveBikersAlone:: @ 8167C35 +ThreeIsland_EventScript_LeaveBikersAlone:: msgbox ThreeIsland_Text_ThatsSmart closemessage applymovement OBJ_EVENT_ID_PLAYER, ThreeIsland_Movement_PlayerLeaveBikers @@ -338,53 +338,53 @@ ThreeIsland_EventScript_LeaveBikersAlone:: @ 8167C35 releaseall end -ThreeIsland_Movement_PlayerLeaveBikers:: @ 8167C55 +ThreeIsland_Movement_PlayerLeaveBikers:: walk_down step_end -ThreeIsland_Movement_BikerApproach:: @ 8167C57 +ThreeIsland_Movement_BikerApproach:: walk_down step_end -ThreeIsland_Movement_Biker1ReturnToPack:: @ 8167C59 +ThreeIsland_Movement_Biker1ReturnToPack:: walk_up walk_in_place_fastest_left step_end -ThreeIsland_Movement_BikerSpeak:: @ 8167C5C +ThreeIsland_Movement_BikerSpeak:: walk_in_place_down step_end -ThreeIsland_Movement_PaxtonApproachLeft:: @ 8167C5E +ThreeIsland_Movement_PaxtonApproachLeft:: walk_down walk_left walk_in_place_fastest_down step_end -ThreeIsland_Movement_PaxtonApproachMidLeft:: @ 8167C62 +ThreeIsland_Movement_PaxtonApproachMidLeft:: walk_down step_end -ThreeIsland_Movement_PaxtonApproachMid:: @ 8167C64 +ThreeIsland_Movement_PaxtonApproachMid:: walk_down walk_down walk_in_place_fastest_right step_end -ThreeIsland_Movement_PlayerFacePaxton:: @ 8167C68 +ThreeIsland_Movement_PlayerFacePaxton:: delay_16 delay_16 walk_in_place_fastest_left step_end -ThreeIsland_Movement_PaxtonApproachMidRight:: @ 8167C6C +ThreeIsland_Movement_PaxtonApproachMidRight:: walk_down walk_down walk_right walk_in_place_fastest_right step_end -ThreeIsland_Movement_PaxtonApproachRight:: @ 8167C71 +ThreeIsland_Movement_PaxtonApproachRight:: walk_down walk_down walk_right @@ -392,15 +392,15 @@ ThreeIsland_Movement_PaxtonApproachRight:: @ 8167C71 walk_in_place_fastest_right step_end -ThreeIsland_EventScript_Woman:: @ 8167C77 +ThreeIsland_EventScript_Woman:: msgbox ThreeIsland_Text_WouldntWantToSeeBikersHereAgain, MSGBOX_NPC end -ThreeIsland_EventScript_LittleBoy:: @ 8167C80 +ThreeIsland_EventScript_LittleBoy:: msgbox ThreeIsland_Text_WhenDodouEvolvesGoingToPlayGame, MSGBOX_NPC end -ThreeIsland_EventScript_Doduo:: @ 8167C89 +ThreeIsland_EventScript_Doduo:: lock faceplayer waitse @@ -410,10 +410,10 @@ ThreeIsland_EventScript_Doduo:: @ 8167C89 release end -ThreeIsland_EventScript_IslandSign:: @ 8167C9C +ThreeIsland_EventScript_IslandSign:: msgbox ThreeIsland_Text_IslandSign, MSGBOX_SIGN end -ThreeIsland_EventScript_Biker6:: @ 8167CA5 +ThreeIsland_EventScript_Biker6:: msgbox ThreeIsland_Text_IslandBelongsToUs, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland/text.inc b/data/maps/ThreeIsland/text.inc index 6f18aab9d..06bde9865 100644 --- a/data/maps/ThreeIsland/text.inc +++ b/data/maps/ThreeIsland/text.inc @@ -1,50 +1,50 @@ -ThreeIsland_Text_IslandSign:: @ 8182061 +ThreeIsland_Text_IslandSign:: .string "THREE ISLAND\n" .string "Kin Island of Family Bonding$" -ThreeIsland_Text_IslandBelongsToUs:: @ 818208B +ThreeIsland_Text_IslandBelongsToUs:: .string "Hyahoo!\p" .string "From this day on, this island\n" .string "belongs to us!$" -ThreeIsland_Text_GoBackToKanto:: @ 81820C0 +ThreeIsland_Text_GoBackToKanto:: .string "We don't need you people bringing\n" .string "your noise and trouble here!\p" .string "We're asking you to go back to\n" .string "KANTO!$" -ThreeIsland_Text_BossIsOnHisWay:: @ 8182125 +ThreeIsland_Text_BossIsOnHisWay:: .string "Hey, go cry somewhere else.\n" .string "Our boss is on his way.\p" .string "When he gets here, we'll give you\n" .string "a k-rad motorbike show you won't\l" .string "soon forget!$" -ThreeIsland_Text_GetOffIslandNow:: @ 81821A9 +ThreeIsland_Text_GetOffIslandNow:: .string "W-what!? Not on your life!\n" .string "Get off the island now!$" -ThreeIsland_Text_WhosGonnaMakeMe:: @ 81821DC +ThreeIsland_Text_WhosGonnaMakeMe:: .string "Who's gonna make me?$" -ThreeIsland_Text_AreYouBossGoBackToKanto:: @ 81821F1 +ThreeIsland_Text_AreYouBossGoBackToKanto:: .string "Are you the boss?\n" .string "Go back to KANTO right now!$" -ThreeIsland_Text_JustGotHerePal:: @ 818221F +ThreeIsland_Text_JustGotHerePal:: .string "Hah?\p" .string "I just got here, pal.\p" .string "What's with the hostile attitude?\n" .string "It's mighty cold of you!$" -ThreeIsland_Text_FollowersRaisingHavoc:: @ 8182275 +ThreeIsland_Text_FollowersRaisingHavoc:: .string "Your gang of followers have been\n" .string "raising havoc on their bikes.\p" .string "Do you have any idea how much\n" .string "trouble they've caused us on the\l" .string "island?$" -ThreeIsland_Text_OughtToBeThankingUs:: @ 81822FB +ThreeIsland_Text_OughtToBeThankingUs:: .string "No, man, I don't get it at all.\p" .string "Look at this place.\n" .string "What do you do for entertainment?\p" @@ -53,57 +53,57 @@ ThreeIsland_Text_OughtToBeThankingUs:: @ 81822FB .string "But hey, if you insist, you can try\n" .string "making us leave.$" -ThreeIsland_Text_YouCowardsToughInPack:: @ 81823C7 +ThreeIsland_Text_YouCowardsToughInPack:: .string "Grr… You cowards…\n" .string "So tough in a pack…$" -ThreeIsland_Text_WannaMakeSomethingOfYourStaring:: @ 81823ED +ThreeIsland_Text_WannaMakeSomethingOfYourStaring:: .string "You, what are you staring at?\n" .string "Don't you know it's not polite?\p" .string "You wanna make something of it\n" .string "or what?$" -ThreeIsland_Text_ThatsSmart:: @ 8182453 +ThreeIsland_Text_ThatsSmart:: .string "That's smart.\n" .string "Keep your nose out of this.$" -ThreeIsland_Text_Biker1Intro:: @ 818247D +ThreeIsland_Text_Biker1Intro:: .string "Heh, I like your guts.\n" .string "You'll be losing money to me, but…$" -ThreeIsland_Text_Biker1Defeat:: @ 81824B7 +ThreeIsland_Text_Biker1Defeat:: .string "Wha…\n" .string "What is this kid?!$" -ThreeIsland_Text_Biker1PostBattle:: @ 81824CF +ThreeIsland_Text_Biker1PostBattle:: .string "Aww, man…\n" .string "Don't you dare laugh!$" -ThreeIsland_Text_Biker2Intro:: @ 81824EF +ThreeIsland_Text_Biker2Intro:: .string "Aren't you from KANTO?\n" .string "You should be on our side!$" -ThreeIsland_Text_Biker2Defeat:: @ 8182521 +ThreeIsland_Text_Biker2Defeat:: .string "Stop fooling around!$" -ThreeIsland_Text_Biker2PostBattle:: @ 8182536 +ThreeIsland_Text_Biker2PostBattle:: .string "What's the matter with you,\n" .string "getting all hot like that?\p" .string "Totally uncool, man!$" -ThreeIsland_Text_Biker3Intro:: @ 8182582 +ThreeIsland_Text_Biker3Intro:: .string "We invited the boss out here,\n" .string "but you had to mess it up!\p" .string "You embarrassed us, man!$" -ThreeIsland_Text_Biker3Defeat:: @ 81825D4 +ThreeIsland_Text_Biker3Defeat:: .string "… … … … … …$" -ThreeIsland_Text_Biker3PostBattle:: @ 81825E2 +ThreeIsland_Text_Biker3PostBattle:: .string "Boss, I'm telling you, you've gotta\n" .string "do something about this kid!$" -ThreeIsland_Text_PaxtonIntro:: @ 8182623 +ThreeIsland_Text_PaxtonIntro:: .string "I've been watching you, and I'd say\n" .string "you've done enough.\p" .string "What are you, their friend or\n" @@ -111,35 +111,35 @@ ThreeIsland_Text_PaxtonIntro:: @ 8182623 .string "Then I guess you'll be battling me\n" .string "in their place.$" -ThreeIsland_Text_PaxtonDefeat:: @ 81826B7 +ThreeIsland_Text_PaxtonDefeat:: .string "All right, enough!\n" .string "We'll leave like you wanted!\p" .string "We'll be happy to see the last of\n" .string "this boring island!$" -ThreeIsland_Text_PaxtonPostBattle:: @ 818271D +ThreeIsland_Text_PaxtonPostBattle:: .string "Humph! Yeah, go right on hanging\n" .string "around with these hayseeds!$" -ThreeIsland_Text_ThankYouOhYourMonGotHurt:: @ 818275A +ThreeIsland_Text_ThankYouOhYourMonGotHurt:: .string "Thank you! Those goons were\n" .string "nothing but bad trouble.\p" .string "Oh, look, your POKéMON got hurt\n" .string "on my account.$" -ThreeIsland_Text_GivenFullRestore:: @ 81827BE +ThreeIsland_Text_GivenFullRestore:: .string "{PLAYER} was given\n" .string "a FULL RESTORE.$" -ThreeIsland_Text_OhYourBagIsFull:: @ 81827DB +ThreeIsland_Text_OhYourBagIsFull:: .string "Oh?\n" .string "Your BAG is full.$" -ThreeIsland_Text_YouveGotImpressiveMons:: @ 81827F1 +ThreeIsland_Text_YouveGotImpressiveMons:: .string "You've got seriously impressive\n" .string "POKéMON with you.$" -ThreeIsland_Text_LostelleWentOffTowardsBondBridge:: @ 8182823 +ThreeIsland_Text_LostelleWentOffTowardsBondBridge:: .string "It'd be fantastic if someone as\n" .string "strong as you lived here.\p" .string "I hope you'll at least stay here\n" @@ -149,19 +149,19 @@ ThreeIsland_Text_LostelleWentOffTowardsBondBridge:: @ 8182823 .string "LOSTELLE went off towards BOND\n" .string "BRIDGE a while ago.$" -ThreeIsland_Text_WouldntWantToSeeBikersHereAgain:: @ 81828EB +ThreeIsland_Text_WouldntWantToSeeBikersHereAgain:: .string "THREE ISLAND is actually the most\n" .string "populous of the islands here.\p" .string "Still, it could be less sleepy.\p" .string "But I wouldn't want to see goons\n" .string "like those BIKERS here again.$" -ThreeIsland_Text_WhenDodouEvolvesGoingToPlayGame:: @ 818298A +ThreeIsland_Text_WhenDodouEvolvesGoingToPlayGame:: .string "I'm going to train my DODUO in the\n" .string "BERRY FOREST.\p" .string "When it evolves, I'm going to play\n" .string "a game on TWO ISLAND.$" -ThreeIsland_Text_Doduo:: @ 81829F4 +ThreeIsland_Text_Doduo:: .string "DODUO: Gigiih!$" diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index fc4f76703..35134b0b3 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -1,15 +1,15 @@ .set LOCALID_LOSTELLE, 1 -ThreeIsland_BerryForest_MapScripts:: @ 8163C71 +ThreeIsland_BerryForest_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_BerryForest_OnTransition .byte 0 -ThreeIsland_BerryForest_OnTransition:: @ 8163C77 +ThreeIsland_BerryForest_OnTransition:: setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_BERRY_FOREST setescapewarp MAP_THREE_ISLAND_BOND_BRIDGE, 255, 12, 6 end -ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83 +ThreeIsland_BerryForest_EventScript_Lostelle:: lock faceplayer msgbox ThreeIsland_BerryForest_Text_HelpScaryPokemon @@ -44,11 +44,11 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83 release end -ThreeIsland_BerryForest_EventScript_NoRoomForBerry:: @ 8163D19 +ThreeIsland_BerryForest_EventScript_NoRoomForBerry:: msgbox ThreeIsland_BerryForest_Text_BerryPouchIsFull return -ThreeIsland_BerryForest_Movement_LostelleLookAround:: @ 8163D22 +ThreeIsland_BerryForest_Movement_LostelleLookAround:: walk_in_place_fastest_left delay_16 walk_in_place_fastest_right @@ -56,10 +56,10 @@ ThreeIsland_BerryForest_Movement_LostelleLookAround:: @ 8163D22 walk_in_place_fastest_left step_end -ThreeIsland_BerryForest_EventScript_WelcomeSign:: @ 8163D28 +ThreeIsland_BerryForest_EventScript_WelcomeSign:: msgbox ThreeIsland_BerryForest_Text_WelcomeToBerryForest, MSGBOX_SIGN end -ThreeIsland_BerryForest_EventScript_BewareSign:: @ 8163D31 +ThreeIsland_BerryForest_EventScript_BewareSign:: msgbox ThreeIsland_BerryForest_Text_BewareWildBerryLovingMons, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_BerryForest/text.inc b/data/maps/ThreeIsland_BerryForest/text.inc index fdb08e3c6..866321eff 100644 --- a/data/maps/ThreeIsland_BerryForest/text.inc +++ b/data/maps/ThreeIsland_BerryForest/text.inc @@ -1,4 +1,4 @@ -ThreeIsland_BerryForest_Text_HelpScaryPokemon:: @ 817ADD6 +ThreeIsland_BerryForest_Text_HelpScaryPokemon:: .string "LOSTELLE: Whimper… Sniff…\n" .string "Oh! Please, help!\p" .string "A scary POKéMON appeared there\n" @@ -8,36 +8,36 @@ ThreeIsland_BerryForest_Text_HelpScaryPokemon:: @ 817ADD6 .string "I'm too scared to move!\n" .string "But I want to go home…$" -ThreeIsland_BerryForest_Text_HereItComesAgain:: @ 817AE8E +ThreeIsland_BerryForest_Text_HereItComesAgain:: .string "Oh! Here it comes again!\n" .string "No! Go away! It's scaring me!\p" .string "Waaaaaaah!\n" .string "I want my daddy!$" -ThreeIsland_BerryForest_Text_ThankYouHaveThis:: @ 817AEE1 +ThreeIsland_BerryForest_Text_ThankYouHaveThis:: .string "Ohh! That was so scary!\n" .string "Thank you!\p" .string "LOSTELLE came to pick some\n" .string "BERRIES.\p" .string "You can have this!$" -ThreeIsland_BerryForest_Text_LetsGoHome:: @ 817AF3B +ThreeIsland_BerryForest_Text_LetsGoHome:: .string "What's your name?\p" .string "LOSTELLE's scared, so can I go\n" .string "with you to my daddy's house?\p" .string "Okay!\n" .string "Let's go home!$" -ThreeIsland_BerryForest_Text_BerryPouchIsFull:: @ 817AF9F +ThreeIsland_BerryForest_Text_BerryPouchIsFull:: .string "Your BERRY POUCH is full.\n" .string "I guess you don't want this.$" -ThreeIsland_BerryForest_Text_WelcomeToBerryForest:: @ 817AFD6 +ThreeIsland_BerryForest_Text_WelcomeToBerryForest:: .string "Welcome to the BERRY FOREST\p" .string "Be friendly and share BERRIES with\n" .string "others and POKéMON.$" -ThreeIsland_BerryForest_Text_BewareWildBerryLovingMons:: @ 817B029 +ThreeIsland_BerryForest_Text_BewareWildBerryLovingMons:: .string "Beware of wild, BERRY-loving\n" .string "POKéMON!$" diff --git a/data/maps/ThreeIsland_BondBridge/scripts.inc b/data/maps/ThreeIsland_BondBridge/scripts.inc index 7c3210ba8..aa6adfad7 100644 --- a/data/maps/ThreeIsland_BondBridge/scripts.inc +++ b/data/maps/ThreeIsland_BondBridge/scripts.inc @@ -1,10 +1,10 @@ -ThreeIsland_BondBridge_MapScripts:: @ 8168776 +ThreeIsland_BondBridge_MapScripts:: .byte 0 -ThreeIsland_BondBridge_EventScript_BerryForestSign:: @ 8168777 +ThreeIsland_BondBridge_EventScript_BerryForestSign:: msgbox ThreeIsland_BondBridge_Text_BerryForestAhead, MSGBOX_SIGN end -ThreeIsland_BondBridge_EventScript_BondBridgeSign:: @ 8168780 +ThreeIsland_BondBridge_EventScript_BondBridgeSign:: msgbox ThreeIsland_BondBridge_Text_BondBridgeSign, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_BondBridge/text.inc b/data/maps/ThreeIsland_BondBridge/text.inc index 57f96b6d8..3e952b0a6 100644 --- a/data/maps/ThreeIsland_BondBridge/text.inc +++ b/data/maps/ThreeIsland_BondBridge/text.inc @@ -1,100 +1,100 @@ -ThreeIsland_BondBridge_Text_NikkiIntro:: @ 8189E42 +ThreeIsland_BondBridge_Text_NikkiIntro:: .string "The salty tang of the sea…\n" .string "It tickles my heart.$" -ThreeIsland_BondBridge_Text_NikkiDefeat:: @ 8189E72 +ThreeIsland_BondBridge_Text_NikkiDefeat:: .string "…Sniff, sniff…\n" .string "Something smells unpleasant…$" -ThreeIsland_BondBridge_Text_NikkiPostBattle:: @ 8189E9E +ThreeIsland_BondBridge_Text_NikkiPostBattle:: .string "Perhaps that reek is your sweaty\n" .string "POKéMON's body odor…$" -ThreeIsland_BondBridge_Text_VioletIntro:: @ 8189ED4 +ThreeIsland_BondBridge_Text_VioletIntro:: .string "Where are you off to in such\n" .string "a hurry?$" -ThreeIsland_BondBridge_Text_VioletDefeat:: @ 8189EFA +ThreeIsland_BondBridge_Text_VioletDefeat:: .string "You're raising some wonderful\n" .string "POKéMON.$" -ThreeIsland_BondBridge_Text_VioletPostBattle:: @ 8189F21 +ThreeIsland_BondBridge_Text_VioletPostBattle:: .string "If you keep going this way, you'll\n" .string "eventually reach BERRY FOREST.$" -ThreeIsland_BondBridge_Text_AmiraIntro:: @ 8189F63 +ThreeIsland_BondBridge_Text_AmiraIntro:: .string "My mommy said that I can't swim\n" .string "without my float ring.$" -ThreeIsland_BondBridge_Text_AmiraDefeat:: @ 8189F9A +ThreeIsland_BondBridge_Text_AmiraDefeat:: .string "Waaah!\n" .string "Waaah!$" -ThreeIsland_BondBridge_Text_AmiraPostBattle:: @ 8189FA8 +ThreeIsland_BondBridge_Text_AmiraPostBattle:: .string "This year, I'm going to finally\n" .string "learn how to swim!$" -ThreeIsland_BondBridge_Text_AlexisIntro:: @ 8189FDB +ThreeIsland_BondBridge_Text_AlexisIntro:: .string "Yay, yay!\n" .string "POKéMON!$" -ThreeIsland_BondBridge_Text_AlexisDefeat:: @ 8189FEE +ThreeIsland_BondBridge_Text_AlexisDefeat:: .string "What happens now?$" -ThreeIsland_BondBridge_Text_AlexisPostBattle:: @ 818A000 +ThreeIsland_BondBridge_Text_AlexisPostBattle:: .string "Did I just win?\n" .string "Or did I lose?$" -ThreeIsland_BondBridge_Text_TishaIntro:: @ 818A01F +ThreeIsland_BondBridge_Text_TishaIntro:: .string "Oh, no, don't come here!\n" .string "Please, stay away from me!$" -ThreeIsland_BondBridge_Text_TishaDefeat:: @ 818A053 +ThreeIsland_BondBridge_Text_TishaDefeat:: .string "Okay, you've won!\n" .string "Now will you please go away?$" -ThreeIsland_BondBridge_Text_TishaPostBattle:: @ 818A082 +ThreeIsland_BondBridge_Text_TishaPostBattle:: .string "A POKéMON bit through my \n" .string "swimsuit.\p" .string "I can't get out of the water!$" -ThreeIsland_BondBridge_Text_JoyIntro:: @ 818A0C4 +ThreeIsland_BondBridge_Text_JoyIntro:: .string "JOY: We'll teach you what our\n" .string "favorite POKéMON is!$" -ThreeIsland_BondBridge_Text_JoyDefeat:: @ 818A0F7 +ThreeIsland_BondBridge_Text_JoyDefeat:: .string "JOY: Ohh…\n" .string "MEG!$" -ThreeIsland_BondBridge_Text_JoyPostBattle:: @ 818A106 +ThreeIsland_BondBridge_Text_JoyPostBattle:: .string "JOY: Wasn't that fun?\n" .string "I hope we can battle again!$" -ThreeIsland_BondBridge_Text_JoyNotEnoughMons:: @ 818A138 +ThreeIsland_BondBridge_Text_JoyNotEnoughMons:: .string "JOY: I really want to battle with\n" .string "MEG.\p" .string "One POKéMON isn't enough.$" -ThreeIsland_BondBridge_Text_MegIntro:: @ 818A179 +ThreeIsland_BondBridge_Text_MegIntro:: .string "MEG: We'll show you our favorite\n" .string "POKéMON.$" -ThreeIsland_BondBridge_Text_MegDefeat:: @ 818A1A3 +ThreeIsland_BondBridge_Text_MegDefeat:: .string "MEG: Ohh…\n" .string "JOY!$" -ThreeIsland_BondBridge_Text_MegPostBattle:: @ 818A1B2 +ThreeIsland_BondBridge_Text_MegPostBattle:: .string "MEG: JOY, wasn't that fun?$" -ThreeIsland_BondBridge_Text_MegNotEnoughMons:: @ 818A1CD +ThreeIsland_BondBridge_Text_MegNotEnoughMons:: .string "MEG: I want to battle together\n" .string "with JOY.\p" .string "One POKéMON isn't enough.$" -ThreeIsland_BondBridge_Text_BerryForestAhead:: @ 818A210 +ThreeIsland_BondBridge_Text_BerryForestAhead:: .string "BERRY FOREST AHEAD$" -ThreeIsland_BondBridge_Text_BondBridgeSign:: @ 818A223 +ThreeIsland_BondBridge_Text_BondBridgeSign:: .string "BOND BRIDGE\n" .string "Please be quiet when crossing.\p" .string "BERRY FOREST AHEAD$" diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc index cfec31c53..52493703a 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc @@ -1,10 +1,10 @@ .set LOCALID_PROSPECTOR, 1 -ThreeIsland_DunsparceTunnel_MapScripts:: @ 8164D26 +ThreeIsland_DunsparceTunnel_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_DunsparceTunnel_OnTransition .byte 0 -ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C +ThreeIsland_DunsparceTunnel_OnTransition:: setworldmapflag FLAG_WORLD_MAP_THREE_ISLAND_DUNSPARCE_TUNNEL specialvar VAR_RESULT, IsNationalPokedexEnabled copyvar VAR_0x8008, VAR_RESULT @@ -14,16 +14,16 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C call_if_eq ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall end -ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut:: @ 8164D50 +ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut:: setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT return -ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall:: @ 8164D54 +ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall:: setobjectxyperm LOCALID_PROSPECTOR, 6, 3 setobjectmovementtype LOCALID_PROSPECTOR, MOVEMENT_TYPE_FACE_RIGHT return -ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60 +ThreeIsland_DunsparceTunnel_EventScript_Prospector:: lock faceplayer goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget @@ -37,7 +37,7 @@ ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60 release end -ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold:: @ 8164D90 +ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold:: msgbox ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou giveitem ITEM_NUGGET compare VAR_RESULT, FALSE @@ -46,12 +46,12 @@ ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold:: @ 8164D90 goto ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget end -ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget:: @ 8164DB8 +ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget:: msgbox ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull release end -ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget:: @ 8164DC2 +ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget:: msgbox ThreeIsland_DunsparceTunnel_Text_ThatsANugget release end diff --git a/data/maps/ThreeIsland_DunsparceTunnel/text.inc b/data/maps/ThreeIsland_DunsparceTunnel/text.inc index 96a0603c4..f830cebd6 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/text.inc +++ b/data/maps/ThreeIsland_DunsparceTunnel/text.inc @@ -1,4 +1,4 @@ -ThreeIsland_DunsparceTunnel_Text_ProspectingForGold:: @ 817D13B +ThreeIsland_DunsparceTunnel_Text_ProspectingForGold:: .string "Hey, there!\n" .string "How's it going?\p" .string "What am I doing here, you ask?\n" @@ -6,7 +6,7 @@ ThreeIsland_DunsparceTunnel_Text_ProspectingForGold:: @ 817D13B .string "When I strike it rich, I'm buying\n" .string "a house in KANTO.$" -ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou:: @ 817D1C9 +ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou:: .string "Hey, there! How's it going?\n" .string "Did you hear? I've struck gold!\p" .string "You remembered that I was\n" @@ -16,12 +16,12 @@ ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou:: @ 817D1C9 .string "So, I'll show you!\n" .string "This is for you!$" -ThreeIsland_DunsparceTunnel_Text_ThatsANugget:: @ 817D28C +ThreeIsland_DunsparceTunnel_Text_ThatsANugget:: .string "That's a NUGGET!\p" .string "I can't give you any nuggets of\n" .string "wisdom, so that'll have to do!$" -ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull:: @ 817D2DC +ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull:: .string "Whoops, your BAG is crammed full!\n" .string "I'll give this to you later.$" diff --git a/data/maps/ThreeIsland_Harbor/scripts.inc b/data/maps/ThreeIsland_Harbor/scripts.inc index 473b8b368..dac73ea50 100644 --- a/data/maps/ThreeIsland_Harbor/scripts.inc +++ b/data/maps/ThreeIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ -ThreeIsland_Harbor_MapScripts:: @ 8171EA9 +ThreeIsland_Harbor_MapScripts:: .byte 0 -ThreeIsland_Harbor_EventScript_Sailor:: @ 8171EAA +ThreeIsland_Harbor_EventScript_Sailor:: lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/ThreeIsland_House1/scripts.inc b/data/maps/ThreeIsland_House1/scripts.inc index 603cc3095..53e516ad3 100644 --- a/data/maps/ThreeIsland_House1/scripts.inc +++ b/data/maps/ThreeIsland_House1/scripts.inc @@ -1,7 +1,7 @@ -ThreeIsland_House1_MapScripts:: @ 8171819 +ThreeIsland_House1_MapScripts:: .byte 0 -ThreeIsland_House1_EventScript_Lostelle:: @ 817181A +ThreeIsland_House1_EventScript_Lostelle:: lock faceplayer special BufferBigGuyOrBigGirlString @@ -9,6 +9,6 @@ ThreeIsland_House1_EventScript_Lostelle:: @ 817181A release end -ThreeIsland_House1_EventScript_DisplayCase:: @ 8171829 +ThreeIsland_House1_EventScript_DisplayCase:: msgbox ThreeIsland_House1_Text_RareRocksGemsDisplayed, MSGBOX_SIGN end diff --git a/data/maps/ThreeIsland_House1/text.inc b/data/maps/ThreeIsland_House1/text.inc index 2e6a51b36..732b57548 100644 --- a/data/maps/ThreeIsland_House1/text.inc +++ b/data/maps/ThreeIsland_House1/text.inc @@ -1,9 +1,9 @@ -ThreeIsland_House1_Text_YoureAlwaysSoCool:: @ 81A2F3E +ThreeIsland_House1_Text_YoureAlwaysSoCool:: .string "LOSTELLE: Hi, {PLAYER}!\n" .string "You're always so cool!\p" .string "I'll make lunch for you, too, one\n" .string "day, {PLAYER}.$" -ThreeIsland_House1_Text_RareRocksGemsDisplayed:: @ 81A2F92 +ThreeIsland_House1_Text_RareRocksGemsDisplayed:: .string "Rare rocks and gems are displayed.$" diff --git a/data/maps/ThreeIsland_House2/scripts.inc b/data/maps/ThreeIsland_House2/scripts.inc index d66a13530..b27b1139e 100644 --- a/data/maps/ThreeIsland_House2/scripts.inc +++ b/data/maps/ThreeIsland_House2/scripts.inc @@ -1,7 +1,7 @@ -ThreeIsland_House2_MapScripts:: @ 81718DF +ThreeIsland_House2_MapScripts:: .byte 0 -ThreeIsland_House2_EventScript_Man:: @ 81718E0 +ThreeIsland_House2_EventScript_Man:: lock faceplayer famechecker FAMECHECKER_SABRINA, 1 @@ -9,6 +9,6 @@ ThreeIsland_House2_EventScript_Man:: @ 81718E0 release end -ThreeIsland_House2_EventScript_Rocker:: @ 81718F9 +ThreeIsland_House2_EventScript_Rocker:: msgbox ThreeIsland_House2_Text_CantMakeThisSpoonBend, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House2/text.inc b/data/maps/ThreeIsland_House2/text.inc index c265b2805..61ba78e31 100644 --- a/data/maps/ThreeIsland_House2/text.inc +++ b/data/maps/ThreeIsland_House2/text.inc @@ -1,4 +1,4 @@ -ThreeIsland_House2_Text_CantMakeThisSpoonBend:: @ 81A3245 +ThreeIsland_House2_Text_CantMakeThisSpoonBend:: .string "Urrrrrrrrgggghhhh…\n" .string "Kwaaaaah!\p" .string "…It's useless! I can't make this\n" @@ -6,7 +6,7 @@ ThreeIsland_House2_Text_CantMakeThisSpoonBend:: @ 81A3245 .string "Maybe I really don't have any\n" .string "psychic powers.$" -ThreeIsland_House2_Text_IAdmireSabrina:: @ 81A32CA +ThreeIsland_House2_Text_IAdmireSabrina:: .string "You know about a girl GYM LEADER\n" .string "in SAFFRON CITY?\p" .string "She uses PSYCHIC-type POKéMON,\n" diff --git a/data/maps/ThreeIsland_House3/scripts.inc b/data/maps/ThreeIsland_House3/scripts.inc index 414761426..3c1e2be11 100644 --- a/data/maps/ThreeIsland_House3/scripts.inc +++ b/data/maps/ThreeIsland_House3/scripts.inc @@ -1,6 +1,6 @@ -ThreeIsland_House3_MapScripts:: @ 8171902 +ThreeIsland_House3_MapScripts:: .byte 0 -ThreeIsland_House3_EventScript_Beauty:: @ 8171903 +ThreeIsland_House3_EventScript_Beauty:: msgbox ThreeIsland_House3_Text_WantedToLiveSomewhereQuiet, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House3/text.inc b/data/maps/ThreeIsland_House3/text.inc index 2a36d1ab1..50b441f16 100644 --- a/data/maps/ThreeIsland_House3/text.inc +++ b/data/maps/ThreeIsland_House3/text.inc @@ -1,4 +1,4 @@ -ThreeIsland_House3_Text_WantedToLiveSomewhereQuiet:: @ 81A3379 +ThreeIsland_House3_Text_WantedToLiveSomewhereQuiet:: .string "I bought this house because I\n" .string "wanted to live somewhere quiet.\p" .string "Today, I think I'll go out fishing.$" diff --git a/data/maps/ThreeIsland_House4/scripts.inc b/data/maps/ThreeIsland_House4/scripts.inc index d33f7a6ad..ac4d2ca44 100644 --- a/data/maps/ThreeIsland_House4/scripts.inc +++ b/data/maps/ThreeIsland_House4/scripts.inc @@ -1,10 +1,10 @@ -ThreeIsland_House4_MapScripts:: @ 817190C +ThreeIsland_House4_MapScripts:: .byte 0 -ThreeIsland_House4_EventScript_BaldingMan:: @ 817190D +ThreeIsland_House4_EventScript_BaldingMan:: msgbox ThreeIsland_House4_Text_GhostsInBerryForest, MSGBOX_NPC end -ThreeIsland_House4_EventScript_LittleBoy:: @ 8171916 +ThreeIsland_House4_EventScript_LittleBoy:: msgbox ThreeIsland_House4_Text_PapaKeepsLyingToMe, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_House4/text.inc b/data/maps/ThreeIsland_House4/text.inc index f636555e5..0b6dd4e1a 100644 --- a/data/maps/ThreeIsland_House4/text.inc +++ b/data/maps/ThreeIsland_House4/text.inc @@ -1,10 +1,10 @@ -ThreeIsland_House4_Text_GhostsInBerryForest:: @ 81A33DB +ThreeIsland_House4_Text_GhostsInBerryForest:: .string "You must never, ever go out to\n" .string "the BERRY FOREST alone.\p" .string "Why?\n" .string "There are ghosts there.$" -ThreeIsland_House4_Text_PapaKeepsLyingToMe:: @ 81A342F +ThreeIsland_House4_Text_PapaKeepsLyingToMe:: .string "Papa keeps lying to me, and won't\n" .string "let me go out and play!$" diff --git a/data/maps/ThreeIsland_House5/scripts.inc b/data/maps/ThreeIsland_House5/scripts.inc index f8d72e35b..00b299824 100644 --- a/data/maps/ThreeIsland_House5/scripts.inc +++ b/data/maps/ThreeIsland_House5/scripts.inc @@ -1,7 +1,7 @@ -ThreeIsland_House5_MapScripts:: @ 817191F +ThreeIsland_House5_MapScripts:: .byte 0 -ThreeIsland_House5_EventScript_LittleGirl:: @ 8171920 +ThreeIsland_House5_EventScript_LittleGirl:: lock faceplayer goto_if_set FLAG_RESCUED_LOSTELLE, ThreeIsland_House5_EventScript_LittleGirlLostelleFound @@ -9,7 +9,7 @@ ThreeIsland_House5_EventScript_LittleGirl:: @ 8171920 release end -ThreeIsland_House5_EventScript_LittleGirlLostelleFound:: @ 8171935 +ThreeIsland_House5_EventScript_LittleGirlLostelleFound:: msgbox ThreeIsland_House5_Text_IllGoPlayWithLostelle release end diff --git a/data/maps/ThreeIsland_House5/text.inc b/data/maps/ThreeIsland_House5/text.inc index 85ba66658..94a91e818 100644 --- a/data/maps/ThreeIsland_House5/text.inc +++ b/data/maps/ThreeIsland_House5/text.inc @@ -1,4 +1,4 @@ -ThreeIsland_House5_Text_ImNotLostelle:: @ 81A3469 +ThreeIsland_House5_Text_ImNotLostelle:: .string "Me?\n" .string "I'm not LOSTELLE.\p" .string "She's probably gone to the\n" @@ -6,7 +6,7 @@ ThreeIsland_House5_Text_ImNotLostelle:: @ 81A3469 .string "She picks BERRIES there for making\n" .string "lunch.$" -ThreeIsland_House5_Text_IllGoPlayWithLostelle:: @ 81A34DB +ThreeIsland_House5_Text_IllGoPlayWithLostelle:: .string "I think I'll go play with LOSTELLE\n" .string "today.$" diff --git a/data/maps/ThreeIsland_Mart/scripts.inc b/data/maps/ThreeIsland_Mart/scripts.inc index 337bb2709..9b09a1e60 100644 --- a/data/maps/ThreeIsland_Mart/scripts.inc +++ b/data/maps/ThreeIsland_Mart/scripts.inc @@ -1,7 +1,7 @@ -ThreeIsland_Mart_MapScripts:: @ 817188C +ThreeIsland_Mart_MapScripts:: .byte 0 -ThreeIsland_Mart_EventScript_Clerk:: @ 817188D +ThreeIsland_Mart_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -13,7 +13,7 @@ ThreeIsland_Mart_EventScript_Clerk:: @ 817188D end .align 2 -ThreeIsland_Mart_Items:: @ 81718B4 +ThreeIsland_Mart_Items:: .2byte ITEM_ULTRA_BALL .2byte ITEM_HYPER_POTION .2byte ITEM_REVIVE @@ -24,14 +24,14 @@ ThreeIsland_Mart_Items:: @ 81718B4 release end -ThreeIsland_Mart_EventScript_Picnicker:: @ 81718C4 +ThreeIsland_Mart_EventScript_Picnicker:: msgbox ThreeIsland_Mart_Text_TrueThatCeldadonDeptStoreBigger, MSGBOX_NPC end -ThreeIsland_Mart_EventScript_BugCatcher:: @ 81718CD +ThreeIsland_Mart_EventScript_BugCatcher:: msgbox ThreeIsland_Mart_Text_PeopleHealWithBerriesFromForest, MSGBOX_NPC end -ThreeIsland_Mart_EventScript_Youngster:: @ 81718D6 +ThreeIsland_Mart_EventScript_Youngster:: msgbox ThreeIsland_Mart_Text_BikersWereAboutToTrashMart, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_Mart/text.inc b/data/maps/ThreeIsland_Mart/text.inc index 8123f1e9c..9047252e6 100644 --- a/data/maps/ThreeIsland_Mart/text.inc +++ b/data/maps/ThreeIsland_Mart/text.inc @@ -1,16 +1,16 @@ -ThreeIsland_Mart_Text_TrueThatCeldadonDeptStoreBigger:: @ 81A3114 +ThreeIsland_Mart_Text_TrueThatCeldadonDeptStoreBigger:: .string "Is it true?\p" .string "CELADON DEPT. STORE is several\n" .string "times bigger than this shop?$" -ThreeIsland_Mart_Text_PeopleHealWithBerriesFromForest:: @ 81A315C +ThreeIsland_Mart_Text_PeopleHealWithBerriesFromForest:: .string "I sometimes buy medicine here.\p" .string "But a lot of people heal POKéMON\n" .string "with BERRIES from BERRY FOREST.\p" .string "After all, BERRIES are free and\n" .string "they never run out.$" -ThreeIsland_Mart_Text_BikersWereAboutToTrashMart:: @ 81A31F0 +ThreeIsland_Mart_Text_BikersWereAboutToTrashMart:: .string "Those BIKERS were about to trash\n" .string "this POKéMON MART.\p" .string "Am I glad they decided to leave!$" diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc index 1f66b557d..e336cc956 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ -ThreeIsland_PokemonCenter_1F_MapScripts:: @ 8171832 +ThreeIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -ThreeIsland_PokemonCenter_1F_OnTransition:: @ 817183D +ThreeIsland_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_THREE_ISLAND end -ThreeIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171841 +ThreeIsland_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -ThreeIsland_PokemonCenter_1F_EventScript_Sailor:: @ 817184A +ThreeIsland_PokemonCenter_1F_EventScript_Sailor:: msgbox ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands, MSGBOX_NPC end -ThreeIsland_PokemonCenter_1F_EventScript_Lass:: @ 8171853 +ThreeIsland_PokemonCenter_1F_EventScript_Lass:: msgbox ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest, MSGBOX_NPC end -ThreeIsland_PokemonCenter_1F_EventScript_Rocker:: @ 817185C +ThreeIsland_PokemonCenter_1F_EventScript_Rocker:: msgbox ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto, MSGBOX_NPC end diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc index a9d553efd..c752e2550 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/text.inc +++ b/data/maps/ThreeIsland_PokemonCenter_1F/text.inc @@ -1,17 +1,17 @@ -ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto:: @ 81A2FB5 +ThreeIsland_PokemonCenter_1F_Text_PCNetworkCanLinkWithKanto:: .string "Hey, did you hear the news?\p" .string "The PC network here can now link\n" .string "with PCs in KANTO.\p" .string "I don't know how that came about,\n" .string "but it's fantastic!$" -ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands:: @ 81A303B +ThreeIsland_PokemonCenter_1F_Text_ImpossibleToSurfBetweenIslands:: .string "It's impossible to SURF between the\n" .string "islands around these parts.\p" .string "The tides are too fast and\n" .string "treacherous.$" -ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest:: @ 81A30A3 +ThreeIsland_PokemonCenter_1F_Text_AlwaysBerriesInBerryForest:: .string "Let's crush BERRIES!\n" .string "…That'd be wasting BERRIES?\p" .string "You can always find some BERRIES\n" diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc index 83b97c22d..e59326fa4 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/ThreeIsland_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 +ThreeIsland_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ ThreeIsland_PokemonCenter_2F_MapScripts:: @ 8171865 .byte 0 @ The below 3 are unused and leftover from RS -ThreeIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 817187A +ThreeIsland_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -ThreeIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 8171880 +ThreeIsland_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -ThreeIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 8171886 +ThreeIsland_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/ThreeIsland_Port/scripts.inc b/data/maps/ThreeIsland_Port/scripts.inc index 0a664b07d..d48609a81 100644 --- a/data/maps/ThreeIsland_Port/scripts.inc +++ b/data/maps/ThreeIsland_Port/scripts.inc @@ -1,13 +1,13 @@ -ThreeIsland_Port_MapScripts:: @ 8168789 +ThreeIsland_Port_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ThreeIsland_Port_OnTransition .byte 0 -ThreeIsland_Port_OnTransition:: @ 816878F +ThreeIsland_Port_OnTransition:: clearflag FLAG_SYS_PC_STORAGE_DISABLED setflag FLAG_SEVII_DETOUR_FINISHED end -ThreeIsland_Port_EventScript_Woman:: @ 8168796 +ThreeIsland_Port_EventScript_Woman:: lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2 @@ -18,21 +18,21 @@ ThreeIsland_Port_EventScript_Woman:: @ 8168796 release end -ThreeIsland_Port_EventScript_WomanLostelleFound:: @ 81687B8 +ThreeIsland_Port_EventScript_WomanLostelleFound:: msgbox ThreeIsland_Port_Text_EverythingTurnedOutForBest release end -ThreeIsland_Port_EventScript_WomanBikersGone:: @ 81687C2 +ThreeIsland_Port_EventScript_WomanBikersGone:: msgbox ThreeIsland_Port_Text_ThankGoodnessBikersGone release end -ThreeIsland_Port_EventScript_Biker1:: @ 81687CC +ThreeIsland_Port_EventScript_Biker1:: msgbox ThreeIsland_Port_Text_WereKantoRiderFederation, MSGBOX_NPC end -ThreeIsland_Port_EventScript_Biker2:: @ 81687D5 +ThreeIsland_Port_EventScript_Biker2:: lock msgbox ThreeIsland_Port_Text_ForkOverMoney release diff --git a/data/maps/ThreeIsland_Port/text.inc b/data/maps/ThreeIsland_Port/text.inc index 72026b353..b59090b27 100644 --- a/data/maps/ThreeIsland_Port/text.inc +++ b/data/maps/ThreeIsland_Port/text.inc @@ -1,25 +1,25 @@ -ThreeIsland_Port_Text_WereKantoRiderFederation:: @ 818A261 +ThreeIsland_Port_Text_WereKantoRiderFederation:: .string "We're the KANTO RIDER FEDERATION!\n" .string "Vroom! Vavavavooom! Vroom!\p" .string "My bike's wimpy, so I have to\n" .string "make exhaust noises myself!$" -ThreeIsland_Port_Text_ForkOverMoney:: @ 818A2D8 +ThreeIsland_Port_Text_ForkOverMoney:: .string "Hey, hey, lady!\n" .string "Fork over some spending money!$" -ThreeIsland_Port_Text_IllCallThePolice:: @ 818A307 +ThreeIsland_Port_Text_IllCallThePolice:: .string "Aiyeeh!\p" .string "Wh-who are you?!\n" .string "I… I'll call the police!$" -ThreeIsland_Port_Text_ThankGoodnessBikersGone:: @ 818A339 +ThreeIsland_Port_Text_ThankGoodnessBikersGone:: .string "Those BIKERS…\n" .string "Are they gone?\p" .string "Oh, thank goodness!\n" .string "They certainly had me terrified!$" -ThreeIsland_Port_Text_EverythingTurnedOutForBest:: @ 818A38B +ThreeIsland_Port_Text_EverythingTurnedOutForBest:: .string "Those BIKERS ran off, and\n" .string "LOSTELLE was found safe.\p" .string "Everything turned out for the best!$" diff --git a/data/maps/TradeCenter/scripts.inc b/data/maps/TradeCenter/scripts.inc index fa3ed8869..19f472dff 100644 --- a/data/maps/TradeCenter/scripts.inc +++ b/data/maps/TradeCenter/scripts.inc @@ -1,2 +1,2 @@ -TradeCenter_MapScripts:: @ 8160479 +TradeCenter_MapScripts:: .byte 0 diff --git a/data/maps/TrainerTower_1F/scripts.inc b/data/maps/TrainerTower_1F/scripts.inc index 77917c4a4..372c44088 100644 --- a/data/maps/TrainerTower_1F/scripts.inc +++ b/data/maps/TrainerTower_1F/scripts.inc @@ -1,4 +1,4 @@ -TrainerTower_1F_MapScripts:: @ 81646B8 +TrainerTower_1F_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame @@ -6,22 +6,22 @@ TrainerTower_1F_MapScripts:: @ 81646B8 @ All Trainer Tower floors/roof share these scripts for their object events -TrainerTower_EventScript_DoublesTrainer1:: @ 81646C8 +TrainerTower_EventScript_DoublesTrainer1:: call TrainerTower_EventScript_SpeakToDoublesTrainer1 end -TrainerTower_EventScript_SinglesTrainer:: @ 81646CE +TrainerTower_EventScript_SinglesTrainer:: call TrainerTower_EventScript_SpeakToSinglesTrainer end -TrainerTower_EventScript_KnockoutTrainer:: @ 81646D4 +TrainerTower_EventScript_KnockoutTrainer:: call TrainerTower_EventScript_SpeakToKnockoutTrainer end -TrainerTower_EventScript_DoublesTrainer2:: @ 81646DA +TrainerTower_EventScript_DoublesTrainer2:: call TrainerTower_EventScript_SpeakToDoublesTrainer2 end -TrainerTower_EventScript_Owner:: @ 81646E0 +TrainerTower_EventScript_Owner:: call TrainerTower_EventScript_SpeakToOwner end diff --git a/data/maps/TrainerTower_2F/scripts.inc b/data/maps/TrainerTower_2F/scripts.inc index c34f36a34..53656a9cd 100644 --- a/data/maps/TrainerTower_2F/scripts.inc +++ b/data/maps/TrainerTower_2F/scripts.inc @@ -1,4 +1,4 @@ -TrainerTower_2F_MapScripts:: @ 81646E6 +TrainerTower_2F_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame @@ -6,22 +6,22 @@ TrainerTower_2F_MapScripts:: @ 81646E6 @ Below scripts are unused, the identical versions in the 1F script are used instead -TrainerTower_2F_EventScript_DoublesTrainer1:: @ 81646F6 +TrainerTower_2F_EventScript_DoublesTrainer1:: call TrainerTower_EventScript_SpeakToDoublesTrainer1 end -TrainerTower_2F_EventScript_SinglesTrainer:: @ 81646FC +TrainerTower_2F_EventScript_SinglesTrainer:: call TrainerTower_EventScript_SpeakToSinglesTrainer end -TrainerTower_2F_EventScript_KnockoutTrainer:: @ 8164702 +TrainerTower_2F_EventScript_KnockoutTrainer:: call TrainerTower_EventScript_SpeakToKnockoutTrainer end -TrainerTower_2F_EventScript_DoublesTrainer2:: @ 8164708 +TrainerTower_2F_EventScript_DoublesTrainer2:: call TrainerTower_EventScript_SpeakToDoublesTrainer2 end -TrainerTower_2F_EventScript_Owner:: @ 816470E +TrainerTower_2F_EventScript_Owner:: call TrainerTower_EventScript_SpeakToOwner end diff --git a/data/maps/TrainerTower_3F/scripts.inc b/data/maps/TrainerTower_3F/scripts.inc index 0c8d434eb..4a05c3d20 100644 --- a/data/maps/TrainerTower_3F/scripts.inc +++ b/data/maps/TrainerTower_3F/scripts.inc @@ -1,4 +1,4 @@ -TrainerTower_3F_MapScripts:: @ 8164714 +TrainerTower_3F_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame @@ -6,22 +6,22 @@ TrainerTower_3F_MapScripts:: @ 8164714 @ Below scripts are unused, the identical versions in the 1F script are used instead -TrainerTower_3F_EventScript_DoublesTrainer1:: @ 8164724 +TrainerTower_3F_EventScript_DoublesTrainer1:: call TrainerTower_EventScript_SpeakToDoublesTrainer1 end -TrainerTower_3F_EventScript_SinglesTrainer:: @ 816472A +TrainerTower_3F_EventScript_SinglesTrainer:: call TrainerTower_EventScript_SpeakToSinglesTrainer end -TrainerTower_3F_EventScript_KnockoutTrainer:: @ 8164730 +TrainerTower_3F_EventScript_KnockoutTrainer:: call TrainerTower_EventScript_SpeakToKnockoutTrainer end -TrainerTower_3F_EventScript_DoublesTrainer2:: @ 8164736 +TrainerTower_3F_EventScript_DoublesTrainer2:: call TrainerTower_EventScript_SpeakToDoublesTrainer2 end -TrainerTower_3F_EventScript_Owner:: @ 816473C +TrainerTower_3F_EventScript_Owner:: call TrainerTower_EventScript_SpeakToOwner end diff --git a/data/maps/TrainerTower_4F/scripts.inc b/data/maps/TrainerTower_4F/scripts.inc index 6e0e7e09f..fe739642e 100644 --- a/data/maps/TrainerTower_4F/scripts.inc +++ b/data/maps/TrainerTower_4F/scripts.inc @@ -1,4 +1,4 @@ -TrainerTower_4F_MapScripts:: @ 8164742 +TrainerTower_4F_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame @@ -6,22 +6,22 @@ TrainerTower_4F_MapScripts:: @ 8164742 @ Below scripts are unused, the identical versions in the 1F script are used instead -TrainerTower_4F_EventScript_DoublesTrainer1:: @ 8164752 +TrainerTower_4F_EventScript_DoublesTrainer1:: call TrainerTower_EventScript_SpeakToDoublesTrainer1 end -TrainerTower_4F_EventScript_SinglesTrainer:: @ 8164758 +TrainerTower_4F_EventScript_SinglesTrainer:: call TrainerTower_EventScript_SpeakToSinglesTrainer end -TrainerTower_4F_EventScript_KnockoutTrainer:: @ 816475E +TrainerTower_4F_EventScript_KnockoutTrainer:: call TrainerTower_EventScript_SpeakToKnockoutTrainer end -TrainerTower_4F_EventScript_DoublesTrainer2:: @ 8164764 +TrainerTower_4F_EventScript_DoublesTrainer2:: call TrainerTower_EventScript_SpeakToDoublesTrainer2 end -TrainerTower_4F_EventScript_Owner:: @ 816476A +TrainerTower_4F_EventScript_Owner:: call TrainerTower_EventScript_SpeakToOwner end diff --git a/data/maps/TrainerTower_5F/scripts.inc b/data/maps/TrainerTower_5F/scripts.inc index 71af237be..499884160 100644 --- a/data/maps/TrainerTower_5F/scripts.inc +++ b/data/maps/TrainerTower_5F/scripts.inc @@ -1,4 +1,4 @@ -TrainerTower_5F_MapScripts:: @ 8164770 +TrainerTower_5F_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame @@ -6,22 +6,22 @@ TrainerTower_5F_MapScripts:: @ 8164770 @ Below scripts are unused, the identical versions in the 1F script are used instead -TrainerTower_5F_EventScript_DoublesTrainer1:: @ 8164780 +TrainerTower_5F_EventScript_DoublesTrainer1:: call TrainerTower_EventScript_SpeakToDoublesTrainer1 end -TrainerTower_5F_EventScript_SinglesTrainer:: @ 8164786 +TrainerTower_5F_EventScript_SinglesTrainer:: call TrainerTower_EventScript_SpeakToSinglesTrainer end -TrainerTower_5F_EventScript_KnockoutTrainer:: @ 816478C +TrainerTower_5F_EventScript_KnockoutTrainer:: call TrainerTower_EventScript_SpeakToKnockoutTrainer end -TrainerTower_5F_EventScript_DoublesTrainer2:: @ 8164792 +TrainerTower_5F_EventScript_DoublesTrainer2:: call TrainerTower_EventScript_SpeakToDoublesTrainer2 end -TrainerTower_5F_EventScript_Owner:: @ 8164798 +TrainerTower_5F_EventScript_Owner:: call TrainerTower_EventScript_SpeakToOwner end diff --git a/data/maps/TrainerTower_6F/scripts.inc b/data/maps/TrainerTower_6F/scripts.inc index 8b9e1dd38..44f0ddce8 100644 --- a/data/maps/TrainerTower_6F/scripts.inc +++ b/data/maps/TrainerTower_6F/scripts.inc @@ -1,4 +1,4 @@ -TrainerTower_6F_MapScripts:: @ 816479E +TrainerTower_6F_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame @@ -6,22 +6,22 @@ TrainerTower_6F_MapScripts:: @ 816479E @ Below scripts are unused, the identical versions in the 1F script are used instead -TrainerTower_6F_EventScript_DoublesTrainer1:: @ 81647AE +TrainerTower_6F_EventScript_DoublesTrainer1:: call TrainerTower_EventScript_SpeakToDoublesTrainer1 end -TrainerTower_6F_EventScript_SinglesTrainer:: @ 81647B4 +TrainerTower_6F_EventScript_SinglesTrainer:: call TrainerTower_EventScript_SpeakToSinglesTrainer end -TrainerTower_6F_EventScript_KnockoutTrainer:: @ 81647BA +TrainerTower_6F_EventScript_KnockoutTrainer:: call TrainerTower_EventScript_SpeakToKnockoutTrainer end -TrainerTower_6F_EventScript_DoublesTrainer2:: @ 81647C0 +TrainerTower_6F_EventScript_DoublesTrainer2:: call TrainerTower_EventScript_SpeakToDoublesTrainer2 end -TrainerTower_6F_EventScript_Owner:: @ 81647C6 +TrainerTower_6F_EventScript_Owner:: call TrainerTower_EventScript_SpeakToOwner end diff --git a/data/maps/TrainerTower_7F/scripts.inc b/data/maps/TrainerTower_7F/scripts.inc index de47276ca..2f2f5cde7 100644 --- a/data/maps/TrainerTower_7F/scripts.inc +++ b/data/maps/TrainerTower_7F/scripts.inc @@ -1,4 +1,4 @@ -TrainerTower_7F_MapScripts:: @ 81647CC +TrainerTower_7F_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame @@ -6,22 +6,22 @@ TrainerTower_7F_MapScripts:: @ 81647CC @ Below scripts are unused, the identical versions in the 1F script are used instead -TrainerTower_7F_EventScript_DoublesTrainer1:: @ 81647DC +TrainerTower_7F_EventScript_DoublesTrainer1:: call TrainerTower_EventScript_SpeakToDoublesTrainer1 end -TrainerTower_7F_EventScript_SinglesTrainer:: @ 81647E2 +TrainerTower_7F_EventScript_SinglesTrainer:: call TrainerTower_EventScript_SpeakToSinglesTrainer end -TrainerTower_7F_EventScript_KnockoutTrainer:: @ 81647E8 +TrainerTower_7F_EventScript_KnockoutTrainer:: call TrainerTower_EventScript_SpeakToKnockoutTrainer end -TrainerTower_7F_EventScript_DoublesTrainer2:: @ 81647EE +TrainerTower_7F_EventScript_DoublesTrainer2:: call TrainerTower_EventScript_SpeakToDoublesTrainer2 end -TrainerTower_7F_EventScript_Owner:: @ 81647F4 +TrainerTower_7F_EventScript_Owner:: call TrainerTower_EventScript_SpeakToOwner end diff --git a/data/maps/TrainerTower_8F/scripts.inc b/data/maps/TrainerTower_8F/scripts.inc index fc168780b..8f97efe21 100644 --- a/data/maps/TrainerTower_8F/scripts.inc +++ b/data/maps/TrainerTower_8F/scripts.inc @@ -1,4 +1,4 @@ -TrainerTower_8F_MapScripts:: @ 81647FA +TrainerTower_8F_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame @@ -6,22 +6,22 @@ TrainerTower_8F_MapScripts:: @ 81647FA @ Below scripts are unused, the identical versions in the 1F script are used instead -TrainerTower_8F_EventScript_DoublesTrainer1:: @ 816480A +TrainerTower_8F_EventScript_DoublesTrainer1:: call TrainerTower_EventScript_SpeakToDoublesTrainer1 end -TrainerTower_8F_EventScript_SinglesTrainer:: @ 8164810 +TrainerTower_8F_EventScript_SinglesTrainer:: call TrainerTower_EventScript_SpeakToSinglesTrainer end -TrainerTower_8F_EventScript_KnockoutTrainer:: @ 8164816 +TrainerTower_8F_EventScript_KnockoutTrainer:: call TrainerTower_EventScript_SpeakToKnockoutTrainer end -TrainerTower_8F_EventScript_DoublesTrainer2:: @ 816481C +TrainerTower_8F_EventScript_DoublesTrainer2:: call TrainerTower_EventScript_SpeakToDoublesTrainer2 end -TrainerTower_8F_EventScript_Owner:: @ 8164822 +TrainerTower_8F_EventScript_Owner:: call TrainerTower_EventScript_SpeakToOwner end diff --git a/data/maps/TrainerTower_Elevator/scripts.inc b/data/maps/TrainerTower_Elevator/scripts.inc index b49a9b45a..eb871699e 100644 --- a/data/maps/TrainerTower_Elevator/scripts.inc +++ b/data/maps/TrainerTower_Elevator/scripts.inc @@ -1,9 +1,9 @@ -TrainerTower_Elevator_MapScripts:: @ 8164AF8 +TrainerTower_Elevator_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame .byte 0 -TrainerTower_Elevator_EventScript_FloorSelect:: @ 8164B03 +TrainerTower_Elevator_EventScript_FloorSelect:: lockall setvar VAR_0x8004, 6 call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor @@ -18,17 +18,17 @@ TrainerTower_Elevator_EventScript_FloorSelect:: @ 8164B03 case 1, TrainerTower_Elevator_EventScript_FloorSelectFromLobby end -TrainerTower_Elevator_EventScript_FloorSelectFromRoof:: @ 8164B46 +TrainerTower_Elevator_EventScript_FloorSelectFromRoof:: multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE goto TrainerTower_Elevator_EventScript_ChooseFloor end -TrainerTower_Elevator_EventScript_FloorSelectFromLobby:: @ 8164B52 +TrainerTower_Elevator_EventScript_FloorSelectFromLobby:: multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE goto TrainerTower_Elevator_EventScript_ChooseFloor end -TrainerTower_Elevator_EventScript_ChooseFloor:: @ 8164B5E +TrainerTower_Elevator_EventScript_ChooseFloor:: switch VAR_RESULT case 0, TrainerTower_Elevator_EventScript_SelectRoof case 1, TrainerTower_Elevator_EventScript_SelectLobby @@ -36,7 +36,7 @@ TrainerTower_Elevator_EventScript_ChooseFloor:: @ 8164B5E case SCR_MENU_CANCEL, TrainerTower_Elevator_EventScript_CloseFloorSelect end -TrainerTower_Elevator_EventScript_SelectLobby:: @ 8164B90 +TrainerTower_Elevator_EventScript_SelectLobby:: setvar VAR_0x8006, 3 setdynamicwarp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8 compare VAR_ELEVATOR_FLOOR, 3 @@ -52,16 +52,16 @@ TrainerTower_Elevator_EventScript_SelectLobby:: @ 8164B90 releaseall end -TrainerTower_Elevator_EventScript_SelectRoof:: @ 8164BCD +TrainerTower_Elevator_EventScript_SelectRoof:: goto TrainerTower_Elevator_EventScript_CloseFloorSelect end -TrainerTower_Elevator_EventScript_CloseFloorSelect:: @ 8164BD3 +TrainerTower_Elevator_EventScript_CloseFloorSelect:: special CloseElevatorCurrentFloorWindow releaseall end -TrainerTower_Elevator_EventScript_MoveElevator:: @ 8164BD8 +TrainerTower_Elevator_EventScript_MoveElevator:: special CloseElevatorCurrentFloorWindow closemessage waitse @@ -70,7 +70,7 @@ TrainerTower_Elevator_EventScript_MoveElevator:: @ 8164BD8 setflag FLAG_TEMP_2 return -TrainerTower_Elevator_Movement_ExitElevator:: @ 8164BE5 +TrainerTower_Elevator_Movement_ExitElevator:: walk_in_place_fastest_down delay_16 walk_down diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc index eaf3f2568..15a1bbb44 100644 --- a/data/maps/TrainerTower_Lobby/scripts.inc +++ b/data/maps/TrainerTower_Lobby/scripts.inc @@ -4,7 +4,7 @@ .set LOCALID_COOLTRAINER_F, 4 .set LOCALID_BALDING_MAN, 5 -TrainerTower_Lobby_MapScripts:: @ 8164839 +TrainerTower_Lobby_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_Lobby_OnResume map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerTower_Lobby_OnReturnToField map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_Lobby_OnTransition @@ -12,7 +12,7 @@ TrainerTower_Lobby_MapScripts:: @ 8164839 map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_Lobby_OnFrame .byte 0 -TrainerTower_Lobby_OnResume:: @ 8164853 +TrainerTower_Lobby_OnResume:: setvar VAR_TEMP_2, 0 ttower_resumetimer ttower_shouldexit @@ -22,10 +22,10 @@ TrainerTower_Lobby_OnResume:: @ 8164853 setvar VAR_TEMP_0, 0 setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7 applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist -TrainerTower_Lobby_OnResumeEnd:: @ 8164886 +TrainerTower_Lobby_OnResumeEnd:: end -TrainerTower_Lobby_OnReturnToField:: @ 8164887 +TrainerTower_Lobby_OnReturnToField:: addobject LOCALID_NURSE addobject LOCALID_MART_CLERK addobject LOCALID_RECEPTIONIST @@ -33,26 +33,26 @@ TrainerTower_Lobby_OnReturnToField:: @ 8164887 addobject LOCALID_BALDING_MAN end -TrainerTower_Lobby_OnLoad:: @ 8164897 +TrainerTower_Lobby_OnLoad:: compare VAR_TEMP_D, 17 call_if_eq TrainerTower_Lobby_OpenCounterBarrier end -TrainerTower_Lobby_OpenCounterBarrier:: @ 81648A3 +TrainerTower_Lobby_OpenCounterBarrier:: setmetatile 17, 10, METATILE_TrainerTower_Floor_ShadeBottomLeft, 0 return -TrainerTower_Lobby_OnTransition:: @ 81648AD +TrainerTower_Lobby_OnTransition:: setworldmapflag FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY getplayerxy VAR_TEMP_D, VAR_RESULT end -TrainerTower_Lobby_OnFrame:: @ 81648B6 +TrainerTower_Lobby_OnFrame:: map_script_2 VAR_TEMP_0, 0, TrainerTower_Lobby_EventScript_Enter map_script_2 VAR_TEMP_D, 17, TrainerTower_Lobby_EventScript_ExitElevator .2byte 0 -TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8 +TrainerTower_Lobby_EventScript_ExitElevator:: lockall applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator waitmovement 0 @@ -64,12 +64,12 @@ TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8 releaseall end -TrainerTower_Lobby_Movement_ExitElevator:: @ 81648EA +TrainerTower_Lobby_Movement_ExitElevator:: walk_down walk_down step_end -TrainerTower_Lobby_EventScript_Enter:: @ 81648ED +TrainerTower_Lobby_EventScript_Enter:: setvar VAR_TEMP_0, 1 ttower_getchallengestatus switch VAR_RESULT @@ -77,7 +77,7 @@ TrainerTower_Lobby_EventScript_Enter:: @ 81648ED case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_164938 case CHALLENGE_STATUS_NORMAL, TrainerTower_Lobby_EventScript_EnterEnd -TrainerTower_Lobby_EventScript_LostChallenge:: @ 8164920 +TrainerTower_Lobby_EventScript_LostChallenge:: lock faceplayer applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist @@ -86,29 +86,29 @@ TrainerTower_Lobby_EventScript_LostChallenge:: @ 8164920 goto TrainerTower_Lobby_EventScript_ExitChallenge @ Presumably E-Reader related -TrainerTower_Lobby_EventScript_164938:: @ 8164938 +TrainerTower_Lobby_EventScript_164938:: lock faceplayer applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist textcolor 1 msgbox TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch -TrainerTower_Lobby_EventScript_ExitChallenge:: @ 816494B +TrainerTower_Lobby_EventScript_ExitChallenge:: closemessage applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown waitmovement 0 setvar VAR_MAP_SCENE_TRAINER_TOWER, 0 release -TrainerTower_Lobby_EventScript_EnterEnd:: @ 816495C +TrainerTower_Lobby_EventScript_EnterEnd:: end -TrainerTower_Lobby_EventScript_Nurse:: @ 816495D +TrainerTower_Lobby_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -TrainerTower_Lobby_EventScript_Receptionist:: @ 8164966 +TrainerTower_Lobby_EventScript_Receptionist:: lock faceplayer ttower_getbeatchallenge @@ -117,13 +117,13 @@ TrainerTower_Lobby_EventScript_Receptionist:: @ 8164966 msgbox TrainerTower_Lobby_Text_GiveItYourBest goto TrainerTower_Lobby_EventScript_ReceptionistEnd -TrainerTower_Lobby_EventScript_ThanksForCompeting:: @ 8164988 +TrainerTower_Lobby_EventScript_ThanksForCompeting:: msgbox TrainerTower_Lobby_Text_ThanksForCompeting -TrainerTower_Lobby_EventScript_ReceptionistEnd:: @ 8164990 +TrainerTower_Lobby_EventScript_ReceptionistEnd:: release end -TrainerTower_Lobby_EventScript_MartClerk:: @ 8164992 +TrainerTower_Lobby_EventScript_MartClerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -135,7 +135,7 @@ TrainerTower_Lobby_EventScript_MartClerk:: @ 8164992 end .align 2 -TrainerTower_Lobby_Mart_Items:: @ 81649B8 +TrainerTower_Lobby_Mart_Items:: .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_FULL_RESTORE @@ -149,7 +149,7 @@ TrainerTower_Lobby_Mart_Items:: @ 81649B8 release end -TrainerTower_Lobby_EventScript_EntryTrigger:: @ 81649CE +TrainerTower_Lobby_EventScript_EntryTrigger:: lockall applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist textcolor 1 @@ -160,9 +160,9 @@ TrainerTower_Lobby_EventScript_EntryTrigger:: @ 81649CE msgbox TrainerTower_Lobby_Text_TrainersUpToFloorNum goto TrainerTower_Lobby_EventScript_AskEnterChallenge -TrainerTower_Lobby_EventScript_AllFloorsUsed:: @ 8164A00 +TrainerTower_Lobby_EventScript_AllFloorsUsed:: msgbox TrainerTower_Lobby_Text_TrainersUpEighthFloor -TrainerTower_Lobby_EventScript_AskEnterChallenge:: @ 8164A08 +TrainerTower_Lobby_EventScript_AskEnterChallenge:: message TrainerTower_Lobby_Text_LikeToChallengeTrainers waitmessage multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE @@ -173,12 +173,12 @@ TrainerTower_Lobby_EventScript_AskEnterChallenge:: @ 8164A08 case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge end -TrainerTower_Lobby_EventScript_ChallengeInfo:: @ 8164A45 +TrainerTower_Lobby_EventScript_ChallengeInfo:: msgbox TrainerTower_Lobby_Text_ExplainTrainerTower goto TrainerTower_Lobby_EventScript_AskEnterChallenge end -TrainerTower_Lobby_EventScript_ChooseChallenge:: @ 8164A53 +TrainerTower_Lobby_EventScript_ChooseChallenge:: multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE switch VAR_RESULT case 0, TrainerTower_Lobby_EventScript_BeginChallenge @@ -189,7 +189,7 @@ TrainerTower_Lobby_EventScript_ChooseChallenge:: @ 8164A53 case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge end -TrainerTower_Lobby_EventScript_BeginChallenge:: @ 8164AA0 +TrainerTower_Lobby_EventScript_BeginChallenge:: copyvar VAR_0x8005, VAR_RESULT setvar VAR_MAP_SCENE_TRAINER_TOWER, 1 special HealPlayerParty @@ -198,7 +198,7 @@ TrainerTower_Lobby_EventScript_BeginChallenge:: @ 8164AA0 releaseall end -TrainerTower_Lobby_EventScript_DeclineChallenge:: @ 8164ABF +TrainerTower_Lobby_EventScript_DeclineChallenge:: msgbox TrainerTower_Lobby_Text_PleaseVisitUsAgain closemessage applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown @@ -206,15 +206,15 @@ TrainerTower_Lobby_EventScript_DeclineChallenge:: @ 8164ABF releaseall end -TrainerTower_Lobby_Movement_FaceReceptionist:: @ 8164AD4 +TrainerTower_Lobby_Movement_FaceReceptionist:: face_right step_end -TrainerTower_Lobby_Movement_WalkDown:: @ 8164AD6 +TrainerTower_Lobby_Movement_WalkDown:: walk_down step_end -TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8 +TrainerTower_Lobby_EventScript_ShowRecords:: lockall fadescreen FADE_TO_BLACK setvar VAR_0x8004, 1 @@ -223,10 +223,10 @@ TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8 releaseall end -TrainerTower_Lobby_EventScript_CooltrainerF:: @ 8164AE6 +TrainerTower_Lobby_EventScript_CooltrainerF:: msgbox TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers, MSGBOX_NPC end -TrainerTower_Lobby_EventScript_BaldingMan:: @ 8164AEF +TrainerTower_Lobby_EventScript_BaldingMan:: msgbox TrainerTower_Lobby_Text_StairsTougherThanAnyBattle, MSGBOX_NPC end diff --git a/data/maps/TrainerTower_Lobby/text.inc b/data/maps/TrainerTower_Lobby/text.inc index 4e6bb8b07..b71ddf4bd 100644 --- a/data/maps/TrainerTower_Lobby/text.inc +++ b/data/maps/TrainerTower_Lobby/text.inc @@ -1,52 +1,52 @@ @ All Trainer Tower text (Lobby and Roof) is interleaved here -TrainerTower_Lobby_Text_WelcomeToTrainerTower:: @ 817C794 +TrainerTower_Lobby_Text_WelcomeToTrainerTower:: .string "Hello!\p" .string "Welcome to TRAINER TOWER where\n" .string "TRAINERS gather from all over!$" -TrainerTower_Lobby_Text_TrainersUpToFloorNum:: @ 817C7D9 +TrainerTower_Lobby_Text_TrainersUpToFloorNum:: .string "TRAINERS from all over the world\n" .string "gather here to battle.\p" .string "Let me see…\p" .string "Right now, there are TRAINERS only\n" .string "up to Floor {STR_VAR_1}.$" -TrainerTower_Lobby_Text_TrainersUpEighthFloor:: @ 817C850 +TrainerTower_Lobby_Text_TrainersUpEighthFloor:: .string "TRAINERS are awaiting your\n" .string "challenge up to the eighth floor.$" -TrainerTower_Lobby_Text_LikeToChallengeTrainers:: @ 817C88D +TrainerTower_Lobby_Text_LikeToChallengeTrainers:: .string "Would you like to challenge the\n" .string "waiting TRAINERS?$" -TrainerTower_Lobby_Text_StartClockGetSetGo:: @ 817C8BF +TrainerTower_Lobby_Text_StartClockGetSetGo:: .string "Okay, I'll get the clock started,\n" .string "so give it everything you have.\p" .string "On your marks…\p" .string "Get set…\p" .string "Go!$" -TrainerTower_Lobby_Text_PleaseVisitUsAgain:: @ 817C91D +TrainerTower_Lobby_Text_PleaseVisitUsAgain:: .string "Please do visit us again!$" -TrainerTower_Lobby_Text_TooBadComeBackTryAgain:: @ 817C937 +TrainerTower_Lobby_Text_TooBadComeBackTryAgain:: .string "That was too bad.\p" .string "I think you put in a tremendous\n" .string "effort in your battling.\p" .string "Please come back and try again!$" -TrainerTower_Lobby_Text_GiveItYourBest:: @ 817C9A2 +TrainerTower_Lobby_Text_GiveItYourBest:: .string "I hope you give it your best.$" -TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch:: @ 817C9C0 +TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch:: .string "When the TRAINERS switch places,\n" .string "the movement can be hectic.\p" .string "To avoid the stampede, we moved\n" .string "the reception counter here.\p" .string "I'm sorry for the inconvenience.$" -TrainerTower_Roof_Text_ImOwnerBattledPerfectly:: @ 817CA5A +TrainerTower_Roof_Text_ImOwnerBattledPerfectly:: .string "Hello…\p" .string "I am the owner of this TOWER…\p" .string "How the sky soars above this\n" @@ -56,10 +56,10 @@ TrainerTower_Roof_Text_ImOwnerBattledPerfectly:: @ 817CA5A .string "The way you battled…\n" .string "It, too, was perfection…$" -TrainerTower_Roof_Text_ThisIsForYou:: @ 817CB09 +TrainerTower_Roof_Text_ThisIsForYou:: .string "This is for you…$" -TrainerTower_Roof_Text_DoneItInRecordTime:: @ 817CB1A +TrainerTower_Roof_Text_DoneItInRecordTime:: .string "Oh!\n" .string "Stupendous!\p" .string "It's marvelous how you've come up\n" @@ -69,28 +69,28 @@ TrainerTower_Roof_Text_DoneItInRecordTime:: @ 817CB1A .string "I'll have your record posted at\n" .string "the reception counter.$" -TrainerTower_Roof_Text_TookSweetTimeGettingHere:: @ 817CBC0 +TrainerTower_Roof_Text_TookSweetTimeGettingHere:: .string "You seem to have taken your sweet\n" .string "time getting here…$" -TrainerTower_Roof_Text_IdLikeToSeeBetterTime:: @ 817CBF5 +TrainerTower_Roof_Text_IdLikeToSeeBetterTime:: .string "What I would like to see is a\n" .string "better time out of you…\p" .string "I'm counting on you.\p" .string "Until then, farewell…$" -TrainerTower_Text_XMinYZSec:: @ 817CC56 +TrainerTower_Text_XMinYZSec:: .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$" -TrainerTower_Lobby_Text_HereAreTheResults:: @ 817CC69 +TrainerTower_Lobby_Text_HereAreTheResults:: .string "せいせきひょうです$" -TrainerTower_Lobby_Text_NeedTwoMonsForDouble:: @ 817CC73 +TrainerTower_Lobby_Text_NeedTwoMonsForDouble:: .string "This is a two-on-two battle.\p" .string "You may not battle unless you have\n" .string "at least two POKéMON.$" -TrainerTower_Lobby_Text_ExplainTrainerTower:: @ 817CCC9 +TrainerTower_Lobby_Text_ExplainTrainerTower:: .string "Here at TRAINER TOWER, there is an\n" .string "event called TIME ATTACK.\p" .string "You will be timed on how quickly\n" @@ -103,16 +103,16 @@ TrainerTower_Lobby_Text_ExplainTrainerTower:: @ 817CCC9 .string "You will not earn any EXP. Points\n" .string "or money by beating TRAINERS here.$" -TrainerTower_Lobby_Text_ThanksForCompeting:: @ 817CE1F +TrainerTower_Lobby_Text_ThanksForCompeting:: .string "Thank you for competing!$" -TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers:: @ 817CE38 +TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers:: .string "I'm here to see how good I am.\p" .string "I wonder what kinds of TRAINERS\n" .string "are waiting for me?\p" .string "It's nerve-racking!$" -TrainerTower_Lobby_Text_StairsTougherThanAnyBattle:: @ 817CE9F +TrainerTower_Lobby_Text_StairsTougherThanAnyBattle:: .string "Gasp, gasp…\n" .string "Gasp…\p" .string "Never mind battling! These stairs…\n" diff --git a/data/maps/TrainerTower_Roof/scripts.inc b/data/maps/TrainerTower_Roof/scripts.inc index b338e3a62..f6fb4c122 100644 --- a/data/maps/TrainerTower_Roof/scripts.inc +++ b/data/maps/TrainerTower_Roof/scripts.inc @@ -1,10 +1,10 @@ -TrainerTower_Roof_MapScripts:: @ 8164828 +TrainerTower_Roof_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame .byte 0 @ Below script is unused, the identical version in the 1F script is used instead -TrainerTower_Roof_EventScript_Owner:: @ 8164833 +TrainerTower_Roof_EventScript_Owner:: call TrainerTower_EventScript_SpeakToOwner end diff --git a/data/maps/TwoIsland/scripts.inc b/data/maps/TwoIsland/scripts.inc index 530fd3928..591cb7368 100644 --- a/data/maps/TwoIsland/scripts.inc +++ b/data/maps/TwoIsland/scripts.inc @@ -1,63 +1,63 @@ -TwoIsland_MapScripts:: @ 8167564 +TwoIsland_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_OnTransition .byte 0 -TwoIsland_OnTransition:: @ 816756A +TwoIsland_OnTransition:: setworldmapflag FLAG_WORLD_MAP_TWO_ISLAND setflag FLAG_VISITED_TWO_ISLAND call TwoIsland_EventScript_SetShopState end -TwoIsland_EventScript_SetShopState:: @ 8167576 +TwoIsland_EventScript_SetShopState:: goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, TwoIsland_EventScript_SetShopStateAfterHoennLink goto_if_set FLAG_SYS_GAME_CLEAR, TwoIsland_EventScript_SetShopStateAfterChampion goto_if_set FLAG_RESCUED_LOSTELLE, TwoIsland_EventScript_SetShopStateAfterLostelleRescue goto TwoIsland_EventScript_SetShopStateDefault end -TwoIsland_EventScript_SetShopStateAfterHoennLink:: @ 8167597 +TwoIsland_EventScript_SetShopStateAfterHoennLink:: goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_SetShopExpanded1 goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_2, TwoIsland_EventScript_SetShopExpanded2 goto TwoIsland_EventScript_SetShopExpanded3 end -TwoIsland_EventScript_SetShopStateAfterChampion:: @ 81675B8 +TwoIsland_EventScript_SetShopStateAfterChampion:: goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial goto_if_unset FLAG_RESCUED_LOSTELLE, TwoIsland_EventScript_SetShopInitial goto_if_unset FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_SetShopExpanded1 goto TwoIsland_EventScript_SetShopExpanded2 end -TwoIsland_EventScript_SetShopStateAfterLostelleRescue:: @ 81675D9 +TwoIsland_EventScript_SetShopStateAfterLostelleRescue:: goto_if_unset FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_SetShopInitial goto TwoIsland_EventScript_SetShopExpanded1 end -TwoIsland_EventScript_SetShopStateDefault:: @ 81675E8 +TwoIsland_EventScript_SetShopStateDefault:: goto TwoIsland_EventScript_SetShopInitial end -TwoIsland_EventScript_SetShopInitial:: @ 81675EE +TwoIsland_EventScript_SetShopInitial:: setvar VAR_MAP_SCENE_TWO_ISLAND, 1 return -TwoIsland_EventScript_SetShopExpanded1:: @ 81675F4 +TwoIsland_EventScript_SetShopExpanded1:: setvar VAR_MAP_SCENE_TWO_ISLAND, 2 clearflag FLAG_HIDE_TWO_ISLAND_WOMAN return -TwoIsland_EventScript_SetShopExpanded2:: @ 81675FD +TwoIsland_EventScript_SetShopExpanded2:: setvar VAR_MAP_SCENE_TWO_ISLAND, 3 clearflag FLAG_HIDE_TWO_ISLAND_BEAUTY return -TwoIsland_EventScript_SetShopExpanded3:: @ 8167606 +TwoIsland_EventScript_SetShopExpanded3:: setvar VAR_MAP_SCENE_TWO_ISLAND, 4 clearflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD return -TwoIsland_EventScript_Clerk:: @ 816760F +TwoIsland_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -70,7 +70,7 @@ TwoIsland_EventScript_Clerk:: @ 816760F goto TwoIsland_EventScript_ClerkShopInitial end -TwoIsland_EventScript_ClerkShopExpanded3:: @ 8167646 +TwoIsland_EventScript_ClerkShopExpanded3:: goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_3, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_3 message TwoIsland_Text_BringingItemsFromDistantLands @@ -78,7 +78,7 @@ TwoIsland_EventScript_ClerkShopExpanded3:: @ 8167646 goto TwoIsland_EventScript_ShopExpanded3 end -TwoIsland_EventScript_ClerkShopExpanded2:: @ 816765E +TwoIsland_EventScript_ClerkShopExpanded2:: goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_2, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_2 message TwoIsland_Text_HopeYouGiveItYourBest @@ -86,7 +86,7 @@ TwoIsland_EventScript_ClerkShopExpanded2:: @ 816765E goto TwoIsland_EventScript_ShopExpanded2 end -TwoIsland_EventScript_ClerkShopExpanded1:: @ 8167676 +TwoIsland_EventScript_ClerkShopExpanded1:: goto_if_set FLAG_TWO_ISLAND_SHOP_EXPANDED_1, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_EXPANDED_1 message TwoIsland_Text_AddedMerchandiseForLostelle @@ -94,7 +94,7 @@ TwoIsland_EventScript_ClerkShopExpanded1:: @ 8167676 goto TwoIsland_EventScript_ShopExpanded1 end -TwoIsland_EventScript_ClerkShopInitial:: @ 816768E +TwoIsland_EventScript_ClerkShopInitial:: goto_if_set FLAG_TWO_ISLAND_SHOP_INTRODUCED, TwoIsland_EventScript_ClerkShopSkipIntro setflag FLAG_TWO_ISLAND_SHOP_INTRODUCED message TwoIsland_Text_WelcomeToShopMerchandiseLimited @@ -102,7 +102,7 @@ TwoIsland_EventScript_ClerkShopInitial:: @ 816768E goto TwoIsland_EventScript_ShopInitial end -TwoIsland_EventScript_ClerkShopSkipIntro:: @ 81676A6 +TwoIsland_EventScript_ClerkShopSkipIntro:: message Text_MayIHelpYou waitmessage compare VAR_MAP_SCENE_TWO_ISLAND, 4 @@ -114,28 +114,28 @@ TwoIsland_EventScript_ClerkShopSkipIntro:: @ 81676A6 goto TwoIsland_EventScript_ShopInitial end -TwoIsland_EventScript_ShopInitial:: @ 81676D3 +TwoIsland_EventScript_ShopInitial:: pokemart TwoIsland_Items_ShopInitial msgbox Text_PleaseComeAgain release end .align 2 -TwoIsland_Items_ShopInitial:: @ 81676E4 +TwoIsland_Items_ShopInitial:: .2byte ITEM_GREAT_BALL .2byte ITEM_FRESH_WATER .2byte ITEM_NONE release end -TwoIsland_EventScript_ShopExpanded1:: @ 81676EC +TwoIsland_EventScript_ShopExpanded1:: pokemart TwoIsland_Items_ShopExpanded1 msgbox Text_PleaseComeAgain release end .align 2 -TwoIsland_Items_ShopExpanded1:: @ 81676FC +TwoIsland_Items_ShopExpanded1:: .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_SODA_POP @@ -144,14 +144,14 @@ TwoIsland_Items_ShopExpanded1:: @ 81676FC release end -TwoIsland_EventScript_ShopExpanded2:: @ 8167708 +TwoIsland_EventScript_ShopExpanded2:: pokemart TwoIsland_Items_ShopExpanded2 msgbox Text_PleaseComeAgain release end .align 2 -TwoIsland_Items_ShopExpanded2:: @ 8167718 +TwoIsland_Items_ShopExpanded2:: .2byte ITEM_ULTRA_BALL .2byte ITEM_GREAT_BALL .2byte ITEM_LEMONADE @@ -162,14 +162,14 @@ TwoIsland_Items_ShopExpanded2:: @ 8167718 release end -TwoIsland_EventScript_ShopExpanded3:: @ 8167728 +TwoIsland_EventScript_ShopExpanded3:: pokemart TwoIsland_Items_ShopExpanded3 msgbox Text_PleaseComeAgain release end .align 2 -TwoIsland_Items_ShopExpanded3:: @ 8167738 +TwoIsland_Items_ShopExpanded3:: .2byte ITEM_ULTRA_BALL .2byte ITEM_REPEAT_BALL .2byte ITEM_TIMER_BALL @@ -182,15 +182,15 @@ TwoIsland_Items_ShopExpanded3:: @ 8167738 release end -TwoIsland_EventScript_Sailor:: @ 816774C +TwoIsland_EventScript_Sailor:: msgbox TwoIsland_Text_FellowMovedFromCeladonCity, MSGBOX_NPC end -TwoIsland_EventScript_Woman:: @ 8167755 +TwoIsland_EventScript_Woman:: msgbox TwoIsland_Text_ShopkeepersBrotherWorksGameCorner, MSGBOX_NPC end -TwoIsland_EventScript_Beauty:: @ 816775E +TwoIsland_EventScript_Beauty:: lock faceplayer famechecker FAMECHECKER_BRUNO, 4 @@ -198,26 +198,26 @@ TwoIsland_EventScript_Beauty:: @ 816775E release end -TwoIsland_EventScript_SuperNerd:: @ 8167777 +TwoIsland_EventScript_SuperNerd:: msgbox TwoIsland_Text_BuyRareItemsHere, MSGBOX_NPC end -TwoIsland_EventScript_Boy:: @ 8167780 +TwoIsland_EventScript_Boy:: msgbox TwoIsland_Text_OldWomanLivesOutOnCape, MSGBOX_NPC end -TwoIsland_EventScript_LittleBoy:: @ 8167789 +TwoIsland_EventScript_LittleBoy:: msgbox TwoIsland_Text_HaveYouTriedJumpingGame, MSGBOX_NPC end -TwoIsland_EventScript_IslandSign:: @ 8167792 +TwoIsland_EventScript_IslandSign:: msgbox TwoIsland_Text_IslandSign, MSGBOX_SIGN end -TwoIsland_EventScript_JoyfulGameCornerSign:: @ 816779B +TwoIsland_EventScript_JoyfulGameCornerSign:: msgbox TwoIsland_Text_JoyfulGameCornerSign, MSGBOX_SIGN end -TwoIsland_EventScript_FastCurrentSign:: @ 81677A4 +TwoIsland_EventScript_FastCurrentSign:: msgbox TwoIsland_Text_DangerFastCurrent, MSGBOX_SIGN end diff --git a/data/maps/TwoIsland/text.inc b/data/maps/TwoIsland/text.inc index c0834abb8..d7add8475 100644 --- a/data/maps/TwoIsland/text.inc +++ b/data/maps/TwoIsland/text.inc @@ -1,23 +1,23 @@ -TwoIsland_Text_IslandSign:: @ 8181A88 +TwoIsland_Text_IslandSign:: .string "TWO ISLAND\n" .string "Boon Island for Two$" -TwoIsland_Text_JoyfulGameCornerSign:: @ 8181AA7 +TwoIsland_Text_JoyfulGameCornerSign:: .string "Skip & Chomp!\n" .string "Joyful GAME CORNER$" -TwoIsland_Text_DangerFastCurrent:: @ 8181AC8 +TwoIsland_Text_DangerFastCurrent:: .string "DANGER! FAST CURRENT!\n" .string "Fishing and surfing prohibited!$" -TwoIsland_Text_WelcomeToShopMerchandiseLimited:: @ 8181AFE +TwoIsland_Text_WelcomeToShopMerchandiseLimited:: .string "Oh!\n" .string "Hello, welcome to my shop!\p" .string "We've only opened up recently.\p" .string "Our merchandise is limited, but I\n" .string "hope we can serve your needs.$" -TwoIsland_Text_AddedMerchandiseForLostelle:: @ 8181B7C +TwoIsland_Text_AddedMerchandiseForLostelle:: .string "I can't tell you how grateful I am\n" .string "for your rescue of LOSTELLE.\p" .string "Thanks to your feat, the people of\n" @@ -27,11 +27,11 @@ TwoIsland_Text_AddedMerchandiseForLostelle:: @ 8181B7C .string "The people of THREE ISLAND\n" .string "helped me add to my merchandise.$" -TwoIsland_Text_HopeYouGiveItYourBest:: @ 8181C77 +TwoIsland_Text_HopeYouGiveItYourBest:: .string "Hi! I'm giving it my best here.\n" .string "I hope you do too, {PLAYER}.$" -TwoIsland_Text_BringingItemsFromDistantLands:: @ 8181CAE +TwoIsland_Text_BringingItemsFromDistantLands:: .string "Oh, hello, {PLAYER}!\n" .string "Welcome!\p" .string "I've started bringing in items from\n" @@ -39,7 +39,7 @@ TwoIsland_Text_BringingItemsFromDistantLands:: @ 8181CAE .string "I've got some rare items in, too.\n" .string "Please have a look!$" -TwoIsland_Text_FellowMovedFromCeladonCity:: @ 8181D2F +TwoIsland_Text_FellowMovedFromCeladonCity:: .string "That fellow there, he moved here\n" .string "from CELADON CITY.\p" .string "He started up a shop with his\n" @@ -47,13 +47,13 @@ TwoIsland_Text_FellowMovedFromCeladonCity:: @ 8181D2F .string "You have to wonder if he knew what\n" .string "he was getting into.$" -TwoIsland_Text_ShopkeepersBrotherWorksGameCorner:: @ 8181DCA +TwoIsland_Text_ShopkeepersBrotherWorksGameCorner:: .string "The shopkeeper's brother took\n" .string "a job at the GAME CORNER.\p" .string "He's trying to pull together money\n" .string "so they can buy more merchandise.$" -TwoIsland_Text_BrunoCameToIslandWhileBack:: @ 8181E47 +TwoIsland_Text_BrunoCameToIslandWhileBack:: .string "Listen, listen.\n" .string "Did you know?\p" .string "A famous TRAINER came to the\n" @@ -64,17 +64,17 @@ TwoIsland_Text_BrunoCameToIslandWhileBack:: @ 8181E47 .string "found out that they were all sold\l" .string "out of Rage Candybars.$" -TwoIsland_Text_BuyRareItemsHere:: @ 8181F28 +TwoIsland_Text_BuyRareItemsHere:: .string "The discerning TRAINER knows to\n" .string "buy rare items here!$" -TwoIsland_Text_OldWomanLivesOutOnCape:: @ 8181F5D +TwoIsland_Text_OldWomanLivesOutOnCape:: .string "There's an old woman who lives in\n" .string "a cottage out on the cape.\p" .string "She gives the eye to POKéMON.\n" .string "It's a bit unnerving.$" -TwoIsland_Text_HaveYouTriedJumpingGame:: @ 8181FCE +TwoIsland_Text_HaveYouTriedJumpingGame:: .string "Boing! Boing!\n" .string "Have you tried the jumping game?\p" .string "The POKéMON you can enter…\n" diff --git a/data/maps/TwoIsland_CapeBrink/scripts.inc b/data/maps/TwoIsland_CapeBrink/scripts.inc index 243c440da..4c6b6972f 100644 --- a/data/maps/TwoIsland_CapeBrink/scripts.inc +++ b/data/maps/TwoIsland_CapeBrink/scripts.inc @@ -1,2 +1,2 @@ -TwoIsland_CapeBrink_MapScripts:: @ 8168775 +TwoIsland_CapeBrink_MapScripts:: .byte 0 diff --git a/data/maps/TwoIsland_CapeBrink_House/scripts.inc b/data/maps/TwoIsland_CapeBrink_House/scripts.inc index d472e9e6c..d8eb810d4 100644 --- a/data/maps/TwoIsland_CapeBrink_House/scripts.inc +++ b/data/maps/TwoIsland_CapeBrink_House/scripts.inc @@ -1,4 +1,4 @@ -TwoIsland_CapeBrink_House_MapScripts:: @ 817206B +TwoIsland_CapeBrink_House_MapScripts:: .byte 0 @ See move_tutors.inc diff --git a/data/maps/TwoIsland_CapeBrink_House/text.inc b/data/maps/TwoIsland_CapeBrink_House/text.inc index 4b691163c..f00cf70bf 100644 --- a/data/maps/TwoIsland_CapeBrink_House/text.inc +++ b/data/maps/TwoIsland_CapeBrink_House/text.inc @@ -1,4 +1,4 @@ -Text_UltimateMoveThatMon:: @ 81A46C6 +Text_UltimateMoveThatMon:: .string "I perfected the ultimate move of\n" .string "its type…\p" .string "But will no one take it for\n" @@ -7,11 +7,11 @@ Text_UltimateMoveThatMon:: @ 81A46C6 .string "Y-you…\n" .string "Th-that {STR_VAR_1}…$" -Text_JustMistaken:: @ 81A4737 +Text_JustMistaken:: .string "…No…\n" .string "I was just mistaken.$" -Text_AllowMeToTeachMonUltimateMove:: @ 81A4751 +Text_AllowMeToTeachMonUltimateMove:: .string "Oh! This is the one!\n" .string "This is the POKéMON!\p" .string "This {STR_VAR_1} is worthy of\n" @@ -20,33 +20,33 @@ Text_AllowMeToTeachMonUltimateMove:: @ 81A4751 .string "Will you allow your {STR_VAR_1} to\n" .string "learn my {STR_VAR_2}?$" -Text_YouRejectIt:: @ 81A47E5 +Text_YouRejectIt:: .string "Gaah! You reject it?\n" .string "No, I won't be dissuaded!$" -Text_LetMeConferUltimateMove:: @ 81A4814 +Text_LetMeConferUltimateMove:: .string "You will allow it?\p" .string "Then, let me confer my ultimate\n" .string "{STR_VAR_2} on your {STR_VAR_1}.\p" .string "Ggggrah-awooo!$" -Text_TaughtMove:: @ 81A4865 +Text_TaughtMove:: .string "Gasp, gasp, gasp…\p" .string "I didn't think I could teach that\n" .string "move while I still lived…$" -Text_MakeBestUseOfMove:: @ 81A48B3 +Text_MakeBestUseOfMove:: .string "I implore you to make the best\n" .string "use of that move and gain power!$" -Text_PassedOnEverythingIKnow:: @ 81A48F3 +Text_PassedOnEverythingIKnow:: .string "Gasp, gasp, gasp…\p" .string "I have no regrets now.\n" .string "I've passed on everything I know.\p" .string "Now I can live out my life knowing\n" .string "my work is done.$" -Text_FeelRejuvenated:: @ 81A4972 +Text_FeelRejuvenated:: .string "After I passed on my knowledge to\n" .string "you, I felt so much relief.\p" .string "In fact, I feel rejuvenated,\n" diff --git a/data/maps/TwoIsland_Harbor/scripts.inc b/data/maps/TwoIsland_Harbor/scripts.inc index c59f8cf53..0cb91f783 100644 --- a/data/maps/TwoIsland_Harbor/scripts.inc +++ b/data/maps/TwoIsland_Harbor/scripts.inc @@ -1,7 +1,7 @@ -TwoIsland_Harbor_MapScripts:: @ 8171805 +TwoIsland_Harbor_MapScripts:: .byte 0 -TwoIsland_Harbor_EventScript_Sailor:: @ 8171806 +TwoIsland_Harbor_EventScript_Sailor:: lock faceplayer message Text_WhereDoYouWantToSail diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index e975add34..024c61f15 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -3,10 +3,10 @@ .equ HAS_TINY_MUSHROOMS, FLAG_TEMP_3 .equ HAS_BOTH_MUSHROOMS, FLAG_TEMP_4 -TwoIsland_House_MapScripts:: @ 8171618 +TwoIsland_House_MapScripts:: .byte 0 -TwoIsland_House_EventScript_MoveManiac:: @ 8171619 +TwoIsland_House_EventScript_MoveManiac:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -20,7 +20,7 @@ TwoIsland_House_EventScript_MoveManiac:: @ 8171619 goto TwoIsland_House_EventScript_CheckPlayerHasMushrooms end -TwoIsland_House_EventScript_CheckPlayerHasMushrooms:: @ 817164F +TwoIsland_House_EventScript_CheckPlayerHasMushrooms:: checkitem ITEM_BIG_MUSHROOM, 1 compare VAR_RESULT, TRUE call_if_eq TwoIsland_House_EventScript_SetHasBigMushroom @@ -32,24 +32,24 @@ TwoIsland_House_EventScript_CheckPlayerHasMushrooms:: @ 817164F goto TwoIsland_House_EventScript_EndTutorMove end -TwoIsland_House_EventScript_CheckAlsoHasTinyMushrooms:: @ 8171687 +TwoIsland_House_EventScript_CheckAlsoHasTinyMushrooms:: call_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_SetHasBothMushrooms goto TwoIsland_House_EventScript_AskTutorMon end -TwoIsland_House_EventScript_CheckAlsoHasBigMushroom:: @ 8171696 +TwoIsland_House_EventScript_CheckAlsoHasBigMushroom:: call_if_set HAS_BIG_MUSHROOM, TwoIsland_House_EventScript_SetHasBothMushrooms goto TwoIsland_House_EventScript_AskTutorMon end -TwoIsland_House_EventScript_AskTutorMon:: @ 81716A5 +TwoIsland_House_EventScript_AskTutorMon:: msgbox TwoIsland_House_Text_WantMeToTeachMove, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq TwoIsland_House_EventScript_EndTutorMove goto TwoIsland_House_EventScript_ChooseMonToTutor end -TwoIsland_House_EventScript_ChooseMonToTutor:: @ 81716BE +TwoIsland_House_EventScript_ChooseMonToTutor:: msgbox TwoIsland_House_Text_TutorWhichMon special SelectMoveTutorMon waitstate @@ -63,7 +63,7 @@ TwoIsland_House_EventScript_ChooseMonToTutor:: @ 81716BE goto TwoIsland_House_EventScript_ChooseMoveToTeach end -TwoIsland_House_EventScript_ChooseMoveToTeach:: @ 81716F4 +TwoIsland_House_EventScript_ChooseMoveToTeach:: msgbox TwoIsland_House_Text_TeachWhichMove special DisplayMoveTutorMenu waitstate @@ -74,7 +74,7 @@ TwoIsland_House_EventScript_ChooseMoveToTeach:: @ 81716F4 goto_if_set HAS_TINY_MUSHROOMS, TwoIsland_House_EventScript_GiveTinyMushrooms end -TwoIsland_House_EventScript_GiveBigMushroom:: @ 8171727 +TwoIsland_House_EventScript_GiveBigMushroom:: removeitem ITEM_BIG_MUSHROOM, 1 textcolor 3 msgbox TwoIsland_House_Text_HandedOverOneBigMushroom @@ -82,7 +82,7 @@ TwoIsland_House_EventScript_GiveBigMushroom:: @ 8171727 goto TwoIsland_House_EventScript_EndTutorMove end -TwoIsland_House_EventScript_GiveTinyMushrooms:: @ 8171741 +TwoIsland_House_EventScript_GiveTinyMushrooms:: removeitem ITEM_TINY_MUSHROOM, 2 textcolor 3 msgbox TwoIsland_House_Text_HandedOverTwoTinyMushrooms @@ -90,7 +90,7 @@ TwoIsland_House_EventScript_GiveTinyMushrooms:: @ 8171741 goto TwoIsland_House_EventScript_EndTutorMove end -TwoIsland_House_EventScript_ChooseMushroom:: @ 817175B +TwoIsland_House_EventScript_ChooseMushroom:: message TwoIsland_House_Text_IllNeedMushroomOrTwo waitmessage multichoice 0, 0, MULTICHOICE_MUSHROOMS, TRUE @@ -99,29 +99,29 @@ TwoIsland_House_EventScript_ChooseMushroom:: @ 817175B case 1, TwoIsland_House_EventScript_GiveBigMushroom end -TwoIsland_House_EventScript_NoMoveToTutorMon:: @ 8171782 +TwoIsland_House_EventScript_NoMoveToTutorMon:: msgbox TwoIsland_House_Text_NoMoveICanTeachThatMon goto TwoIsland_House_EventScript_ChooseMonToTutor end -TwoIsland_House_EventScript_CantTutorEgg:: @ 8171790 +TwoIsland_House_EventScript_CantTutorEgg:: msgbox TwoIsland_House_Text_CantTeachAnEgg goto TwoIsland_House_EventScript_ChooseMonToTutor end -TwoIsland_House_EventScript_EndTutorMove:: @ 817179E +TwoIsland_House_EventScript_EndTutorMove:: msgbox TwoIsland_House_Text_NeedMushroomOrTwoToLearnMove release end -TwoIsland_House_EventScript_SetHasBigMushroom:: @ 81717A8 +TwoIsland_House_EventScript_SetHasBigMushroom:: setflag HAS_BIG_MUSHROOM return -TwoIsland_House_EventScript_SetHasTinyMushrooms:: @ 81717AC +TwoIsland_House_EventScript_SetHasTinyMushrooms:: setflag HAS_TINY_MUSHROOMS return -TwoIsland_House_EventScript_SetHasBothMushrooms:: @ 81717B0 +TwoIsland_House_EventScript_SetHasBothMushrooms:: setflag HAS_BOTH_MUSHROOMS return diff --git a/data/maps/TwoIsland_House/text.inc b/data/maps/TwoIsland_House/text.inc index 6f8a37f97..2f0a70c67 100644 --- a/data/maps/TwoIsland_House/text.inc +++ b/data/maps/TwoIsland_House/text.inc @@ -1,4 +1,4 @@ -TwoIsland_House_Text_TeachMonMoveForMushroom:: @ 81A2B88 +TwoIsland_House_Text_TeachMonMoveForMushroom:: .string "I'm the POKéMON MOVE MANIAC.\p" .string "I know every single move that\n" .string "POKéMON learn growing up.\p" @@ -8,40 +8,40 @@ TwoIsland_House_Text_TeachMonMoveForMushroom:: @ 81A2B88 .string "If you do that for me, I'll teach\n" .string "a move to one POKéMON.$" -TwoIsland_House_Text_WantMeToTeachMove:: @ 81A2C63 +TwoIsland_House_Text_WantMeToTeachMove:: .string "Sniff, sniff…\n" .string "Hm! You smell of MUSHROOMS!\p" .string "Do you want me to teach a move\n" .string "to a POKéMON of yours?$" -TwoIsland_House_Text_TutorWhichMon:: @ 81A2CC3 +TwoIsland_House_Text_TutorWhichMon:: .string "Which POKéMON needs tutoring?$" -TwoIsland_House_Text_TeachWhichMove:: @ 81A2CE1 +TwoIsland_House_Text_TeachWhichMove:: .string "Which move should I teach?$" -TwoIsland_House_Text_NoMoveICanTeachThatMon:: @ 81A2CFC +TwoIsland_House_Text_NoMoveICanTeachThatMon:: .string "Sorry…\p" .string "It doesn't appear as if I have a\n" .string "move I can teach that POKéMON.$" -TwoIsland_House_Text_IllNeedMushroomOrTwo:: @ 81A2D43 +TwoIsland_House_Text_IllNeedMushroomOrTwo:: .string "Then, I'll need a MUSHROOM or two.\n" .string "What are you going to give me?$" -TwoIsland_House_Text_HandedOverTwoTinyMushrooms:: @ 81A2D85 +TwoIsland_House_Text_HandedOverTwoTinyMushrooms:: .string "{PLAYER} handed over two\n" .string "TINYMUSHROOMS in exchange.$" -TwoIsland_House_Text_HandedOverOneBigMushroom:: @ 81A2DB3 +TwoIsland_House_Text_HandedOverOneBigMushroom:: .string "{PLAYER} handed over one\n" .string "BIG MUSHROOM in exchange.$" -TwoIsland_House_Text_NeedMushroomOrTwoToLearnMove:: @ 81A2DE0 +TwoIsland_House_Text_NeedMushroomOrTwoToLearnMove:: .string "If your POKéMON need to learn a\n" .string "move, I need a MUSHROOM or two.$" -TwoIsland_House_Text_CantTeachAnEgg:: @ 81A2E20 +TwoIsland_House_Text_CantTeachAnEgg:: .string "Hunh? There isn't a single move\n" .string "that I can teach an EGG.$" diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 2e7290eb7..e2a5cdf02 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -2,40 +2,40 @@ .equ LOCALID_BIKER, 2 .equ LOCALID_LOSTELLE, 3 -TwoIsland_JoyfulGameCorner_MapScripts:: @ 81713D0 +TwoIsland_JoyfulGameCorner_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_JoyfulGameCorner_OnTransition map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TwoIsland_JoyfulGameCorner_OnWarp map_script MAP_SCRIPT_ON_FRAME_TABLE, TwoIsland_JoyfulGameCorner_OnFrame map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad .byte 0 -TwoIsland_JoyfulGameCorner_OnTransition:: @ 81713E5 +TwoIsland_JoyfulGameCorner_OnTransition:: call_if_set FLAG_GOT_MOON_STONE_FROM_JOYFUL_GAME_CORNER, TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos end -TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos:: @ 81713EF +TwoIsland_JoyfulGameCorner_EventScript_SetLostelleReturnedPos:: setobjectxyperm LOCALID_DADDY, 6, 2 setobjectmovementtype LOCALID_DADDY, MOVEMENT_TYPE_FACE_DOWN setobjectmovementtype LOCALID_LOSTELLE, MOVEMENT_TYPE_LOOK_AROUND setvar VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 return -TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404 +TwoIsland_JoyfulGameCorner_OnWarp:: map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, EventScript_CheckTurnAttendant .2byte 0 -TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth:: @ 8171416 +TwoIsland_JoyfulGameCorner_EventScript_TurnPlayerNorth:: turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end -TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B +TwoIsland_JoyfulGameCorner_OnFrame:: map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 0, TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene map_script_2 VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 2, TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom .2byte 0 -TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: @ 8171435 +TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: lockall textcolor 0 msgbox TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle @@ -49,7 +49,7 @@ TwoIsland_JoyfulGameCorner_EventScript_FoundLostelleScene:: @ 8171435 releaseall end -TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F +TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: lockall textcolor 0 applymovement LOCALID_DADDY, Movement_171520 @@ -96,7 +96,7 @@ TwoIsland_JoyfulGameCorner_EventScript_HelpFindLostelleScene:: @ 817145F releaseall end -Movement_171520:: @ 8171520 +Movement_171520:: walk_left walk_right walk_right @@ -105,19 +105,19 @@ Movement_171520:: @ 8171520 delay_16 step_end -Movement_171527:: @ 8171527 +Movement_171527:: walk_down walk_down walk_down walk_in_place_fastest_left step_end -Movement_17152C:: @ 817152C +Movement_17152C:: walk_left walk_in_place_fastest_right step_end -TwoIsland_JoyfulGameCorner_Movement_BikerLookAround:: @ 817152F +TwoIsland_JoyfulGameCorner_Movement_BikerLookAround:: walk_in_place_fastest_left delay_8 walk_in_place_fastest_right @@ -125,7 +125,7 @@ TwoIsland_JoyfulGameCorner_Movement_BikerLookAround:: @ 817152F walk_in_place_fastest_up step_end -TwoIsland_JoyfulGameCorner_EventScript_InfoMan:: @ 8171535 +TwoIsland_JoyfulGameCorner_EventScript_InfoMan:: lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 @@ -135,13 +135,13 @@ TwoIsland_JoyfulGameCorner_EventScript_InfoMan:: @ 8171535 release end -TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon:: @ 8171555 +TwoIsland_JoyfulGameCorner_EventScript_GetGamesGoingSoon:: msgbox TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon release end @ Only referred to as Lostelles Daddy in text -TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy:: @ 817155F +TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy:: lock faceplayer compare VAR_MAP_SCENE_TWO_ISLAND_JOYFUL_GAME_CORNER, 4 @@ -153,7 +153,7 @@ TwoIsland_JoyfulGameCorner_EventScript_LostellesDaddy:: @ 817155F release end -TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A +TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: goto_if_set FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE, TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone msgbox TwoIsland_JoyfulGameCorner_Text_ThisIsForMe setvar VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 2 @@ -168,7 +168,7 @@ TwoIsland_JoyfulGameCorner_EventScript_GiveDaddyMeteorite:: @ 817158A goto TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone end -TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone:: @ 81715C4 +TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone:: checkitemspace ITEM_MOON_STONE, 1 compare VAR_RESULT, FALSE goto_if_eq TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone @@ -178,18 +178,18 @@ TwoIsland_JoyfulGameCorner_EventScript_ReceiveMoonStone:: @ 81715C4 release end -TwoIsland_JoyfulGameCorner_EventScript_GetGameCornerRunning:: @ 81715F5 +TwoIsland_JoyfulGameCorner_EventScript_GetGameCornerRunning:: msgbox TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning release end -TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone:: @ 81715FF +TwoIsland_JoyfulGameCorner_EventScript_NoRoomForMoonStone:: setflag FLAG_NO_ROOM_FOR_JOYFUL_GAME_CORNER_MOON_STONE msgbox TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag release end -TwoIsland_JoyfulGameCorner_EventScript_Lostelle:: @ 817160C +TwoIsland_JoyfulGameCorner_EventScript_Lostelle:: lock faceplayer msgbox TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool diff --git a/data/maps/TwoIsland_JoyfulGameCorner/text.inc b/data/maps/TwoIsland_JoyfulGameCorner/text.inc index 3884e8a32..28e436a11 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/text.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/text.inc @@ -1,10 +1,10 @@ -TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo:: @ 81A2408 +TwoIsland_JoyfulGameCorner_Text_WhereHasLostelleGottenTo:: .string "Now, where's LOSTELLE gotten to\n" .string "today?\p" .string "She always brings me lunch every\n" .string "day right about now…$" -TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle:: @ 81A2465 +TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle:: .string "Hm? You, there!\n" .string "Are you a friend of LOSTELLE's?\p" .string "Have you seen LOSTELLE around?\n" @@ -17,7 +17,7 @@ TwoIsland_JoyfulGameCorner_Text_PleaseHelpFindLostelle:: @ 81A2465 .string "Please, help me find her!\n" .string "Please go search THREE ISLAND!$" -TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland:: @ 81A259A +TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland:: .string "Hah? What is this GAME CORNER?\n" .string "How much sadder can this get?\p" .string "Those clowns…\p" @@ -26,24 +26,24 @@ TwoIsland_JoyfulGameCorner_Text_IsThisOnlyThreeIsland:: @ 81A259A .string "Hey, you! Is this the only THREE\n" .string "ISLAND around here?$" -TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt:: @ 81A2658 +TwoIsland_JoyfulGameCorner_Text_ThisIsTwoIslandMoveIt:: .string "Try waking up before you crawl out\n" .string "of bed, you punk.\p" .string "This is TWO ISLAND!\p" .string "Move it! Get your filthy motorbike\n" .string "out of my place!$" -TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing:: @ 81A26D5 +TwoIsland_JoyfulGameCorner_Text_TheseIslandsAreConfusing:: .string "Huh…\n" .string "Oh, oh, gotcha.\p" .string "Tch…\n" .string "These islands are confusing…$" -TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor:: @ 81A270C +TwoIsland_JoyfulGameCorner_Text_PunkScuffedUpMyFloor:: .string "Would you look at that?\n" .string "That punk scuffed up my floor.$" -TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland:: @ 81A2743 +TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland:: .string "Hey, but listen! I'm begging you,\n" .string "you have to go to THREE ISLAND.\p" .string "If anything were to happen to my\n" @@ -55,26 +55,26 @@ TwoIsland_JoyfulGameCorner_Text_PleaseGoToThreeIsland:: @ 81A2743 .string "That's why I have to get you to do\n" .string "me this big favor.$" -TwoIsland_JoyfulGameCorner_Text_NotRunningAnyGamesToday:: @ 81A285C +TwoIsland_JoyfulGameCorner_Text_NotRunningAnyGamesToday:: .string "I'm sorry.\n" .string "We're not running any games today.$" -TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon:: @ 81A288A +TwoIsland_JoyfulGameCorner_Text_GetGamesGoingSoon:: .string "We'll get the games going soon\n" .string "for you!$" -TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle:: @ 81A28B2 +TwoIsland_JoyfulGameCorner_Text_YouRescuedLostelle:: .string "So you rescued LOSTELLE?\n" .string "How can I thank you?\p" .string "LOSTELLE, darling, forgive me!\p" .string "Daddy didn't know you were scared\n" .string "and in trouble!$" -TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy:: @ 81A2931 +TwoIsland_JoyfulGameCorner_Text_LostelleItsOkayDaddy:: .string "LOSTELLE: It's okay, Daddy.\n" .string "I got to be friends with {PLAYER}!$" -TwoIsland_JoyfulGameCorner_Text_ThisIsForMe:: @ 81A296A +TwoIsland_JoyfulGameCorner_Text_ThisIsForMe:: .string "Oh, what's that?\n" .string "You're saying that this is for me?\p" .string "How did you know that I love rare\n" @@ -82,31 +82,31 @@ TwoIsland_JoyfulGameCorner_Text_ThisIsForMe:: @ 81A296A .string "You sure know how to make a guy\n" .string "happy.$" -TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy:: @ 81A29F7 +TwoIsland_JoyfulGameCorner_Text_HandedMeteoriteToLostellesDaddy:: .string "{PLAYER} handed the METEORITE\n" .string "to LOSTELLE's daddy.$" -TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill:: @ 81A2A24 +TwoIsland_JoyfulGameCorner_Text_OhThisIsFromBill:: .string "Oh, I see, this is from BILL!\n" .string "You have to thank him for me!\p" .string "You know, you've been fantastic.\n" .string "I want you to have this.$" -TwoIsland_JoyfulGameCorner_Text_ReceivedMoonStoneFromLostellesDaddy:: @ 81A2A9A +TwoIsland_JoyfulGameCorner_Text_ReceivedMoonStoneFromLostellesDaddy:: .string "{PLAYER} received a MOON STONE\n" .string "from LOSTELLE's daddy.$" -TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag:: @ 81A2ACA +TwoIsland_JoyfulGameCorner_Text_NotGoingToFitInBag:: .string "Your BAG's not going to fit another\n" .string "thing…$" -TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning:: @ 81A2AF5 +TwoIsland_JoyfulGameCorner_Text_IllGetGameCornerRunning:: .string "All right, I'll get the GAME CORNER\n" .string "running right away.\p" .string "You have to come visit with a\n" .string "friend.$" -TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool:: @ 81A2B53 +TwoIsland_JoyfulGameCorner_Text_PleaseShowMeYouBeingCool:: .string "Listen, listen!\p" .string "Please show me you being cool\n" .string "again!$" diff --git a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc index 4fbc3bce9..66ed1ecf5 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/scripts.inc @@ -1,23 +1,23 @@ -TwoIsland_PokemonCenter_1F_MapScripts:: @ 81717B4 +TwoIsland_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, TwoIsland_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -TwoIsland_PokemonCenter_1F_OnTransition:: @ 81717BF +TwoIsland_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_TWO_ISLAND end -TwoIsland_PokemonCenter_1F_EventScript_Nurse:: @ 81717C3 +TwoIsland_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -TwoIsland_PokemonCenter_1F_EventScript_GBAKid:: @ 81717CC +TwoIsland_PokemonCenter_1F_EventScript_GBAKid:: msgbox TwoIsland_PokemonCenter_1F_Text_HaveYouVisitedGameCorner, MSGBOX_NPC end -TwoIsland_PokemonCenter_1F_EventScript_BugCatcher:: @ 81717D5 +TwoIsland_PokemonCenter_1F_EventScript_BugCatcher:: msgbox TwoIsland_PokemonCenter_1F_Text_OldLadyLivesOutOnCape, MSGBOX_NPC end diff --git a/data/maps/TwoIsland_PokemonCenter_1F/text.inc b/data/maps/TwoIsland_PokemonCenter_1F/text.inc index c7c5561c0..a0520aa7a 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/text.inc +++ b/data/maps/TwoIsland_PokemonCenter_1F/text.inc @@ -1,10 +1,10 @@ -TwoIsland_PokemonCenter_1F_Text_HaveYouVisitedGameCorner:: @ 81A2E59 +TwoIsland_PokemonCenter_1F_Text_HaveYouVisitedGameCorner:: .string "Have you visited the GAME CORNER\n" .string "already?\p" .string "It's no good to go alone.\n" .string "You have to take a friend along.$" -TwoIsland_PokemonCenter_1F_Text_OldLadyLivesOutOnCape:: @ 81A2EBE +TwoIsland_PokemonCenter_1F_Text_OldLadyLivesOutOnCape:: .string "Not many people live on\n" .string "TWO ISLAND.\p" .string "There is this old lady who lives\n" diff --git a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc index f8e803ccb..99db222c2 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc +++ b/data/maps/TwoIsland_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE +TwoIsland_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ TwoIsland_PokemonCenter_2F_MapScripts:: @ 81717DE .byte 0 @ The below 3 are unused and leftover from RS -TwoIsland_PokemonCenter_2F_EventScript_Colosseum:: @ 81717F3 +TwoIsland_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -TwoIsland_PokemonCenter_2F_EventScript_TradeCenter:: @ 81717F9 +TwoIsland_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -TwoIsland_PokemonCenter_2F_EventScript_RecordCorner:: @ 81717FF +TwoIsland_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/UndergroundPath_EastEntrance/scripts.inc b/data/maps/UndergroundPath_EastEntrance/scripts.inc index 88bc29730..b5a5ec8f6 100644 --- a/data/maps/UndergroundPath_EastEntrance/scripts.inc +++ b/data/maps/UndergroundPath_EastEntrance/scripts.inc @@ -1,6 +1,6 @@ -UndergroundPath_EastEntrance_MapScripts:: @ 8160EDD +UndergroundPath_EastEntrance_MapScripts:: .byte 0 -UndergroundPath_EastEntrance_EventScript_Woman:: @ 8160EDE +UndergroundPath_EastEntrance_EventScript_Woman:: msgbox UndergroundPath_EastEntrance_Text_DoYouGoToCeladonDeptStore, MSGBOX_NPC end diff --git a/data/maps/UndergroundPath_EastEntrance/text.inc b/data/maps/UndergroundPath_EastEntrance/text.inc index 7333a73cc..a85c8663a 100644 --- a/data/maps/UndergroundPath_EastEntrance/text.inc +++ b/data/maps/UndergroundPath_EastEntrance/text.inc @@ -1,4 +1,4 @@ -UndergroundPath_EastEntrance_Text_DoYouGoToCeladonDeptStore:: @ 81745D9 +UndergroundPath_EastEntrance_Text_DoYouGoToCeladonDeptStore:: .string "The DEPARTMENT STORE in CELADON\n" .string "has a great selection.\p" .string "Do you go there very often?$" diff --git a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc index 0604a7712..9b0bb6244 100644 --- a/data/maps/UndergroundPath_EastWestTunnel/scripts.inc +++ b/data/maps/UndergroundPath_EastWestTunnel/scripts.inc @@ -1,7 +1,7 @@ -UndergroundPath_EastWestTunnel_MapScripts:: @ 8160ED3 +UndergroundPath_EastWestTunnel_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, UndergroundPath_EastWestTunnel_OnTransition .byte 0 -UndergroundPath_EastWestTunnel_OnTransition:: @ 8160ED9 +UndergroundPath_EastWestTunnel_OnTransition:: setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_EAST_WEST_TUNNEL end diff --git a/data/maps/UndergroundPath_NorthEntrance/scripts.inc b/data/maps/UndergroundPath_NorthEntrance/scripts.inc index b34ef1e59..207055dc7 100644 --- a/data/maps/UndergroundPath_NorthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_NorthEntrance/scripts.inc @@ -1,7 +1,7 @@ -UndergroundPath_NorthEntrance_MapScripts:: @ 8160E38 +UndergroundPath_NorthEntrance_MapScripts:: .byte 0 -UndergroundPath_NorthEntrance_EventScript_Saige:: @ 8160E39 +UndergroundPath_NorthEntrance_EventScript_Saige:: lock faceplayer setvar VAR_0x8008, INGAME_TRADE_NIDORAN @@ -22,18 +22,18 @@ UndergroundPath_NorthEntrance_EventScript_Saige:: @ 8160E39 release end -UndergroundPath_NorthEntrance_EventScript_DeclineTrade:: @ 8160E93 +UndergroundPath_NorthEntrance_EventScript_DeclineTrade:: msgbox Trade_Text_ThatsTooBad release end -UndergroundPath_NorthEntrance_EventScript_NotRequestedMon:: @ 8160E9D +UndergroundPath_NorthEntrance_EventScript_NotRequestedMon:: getspeciesname 0, VAR_0x8009 msgbox Trade_Text_ThisIsNoMon release end -UndergroundPath_NorthEntrance_EventScript_AlreadyTraded:: @ 8160EAB +UndergroundPath_NorthEntrance_EventScript_AlreadyTraded:: msgbox Trade_Text_HowIsMyOldMon release end diff --git a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc index d5c9a4ad5..fb676d76e 100644 --- a/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc +++ b/data/maps/UndergroundPath_NorthSouthTunnel/scripts.inc @@ -1,7 +1,7 @@ -UndergroundPath_NorthSouthTunnel_MapScripts:: @ 8160EB5 +UndergroundPath_NorthSouthTunnel_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, UndergroundPath_NorthSouthTunnel_OnTransition .byte 0 -UndergroundPath_NorthSouthTunnel_OnTransition:: @ 8160EBB +UndergroundPath_NorthSouthTunnel_OnTransition:: setworldmapflag FLAG_WORLD_MAP_UNDERGROUND_PATH_NORTH_SOUTH_TUNNEL end diff --git a/data/maps/UndergroundPath_SouthEntrance/scripts.inc b/data/maps/UndergroundPath_SouthEntrance/scripts.inc index 1bc0b2a31..31e952407 100644 --- a/data/maps/UndergroundPath_SouthEntrance/scripts.inc +++ b/data/maps/UndergroundPath_SouthEntrance/scripts.inc @@ -1,6 +1,6 @@ -UndergroundPath_SouthEntrance_MapScripts:: @ 8160EBF +UndergroundPath_SouthEntrance_MapScripts:: .byte 0 -UndergroundPath_SouthEntrance_EventScript_Woman:: @ 8160EC0 +UndergroundPath_SouthEntrance_EventScript_Woman:: msgbox UndergroundPath_SouthEntrance_Text_PeopleLoseThingsInTheDarkness, MSGBOX_NPC end diff --git a/data/maps/UndergroundPath_SouthEntrance/text.inc b/data/maps/UndergroundPath_SouthEntrance/text.inc index 5e35c333d..23769dbec 100644 --- a/data/maps/UndergroundPath_SouthEntrance/text.inc +++ b/data/maps/UndergroundPath_SouthEntrance/text.inc @@ -1,4 +1,4 @@ -UndergroundPath_SouthEntrance_Text_PeopleLoseThingsInTheDarkness:: @ 8174559 +UndergroundPath_SouthEntrance_Text_PeopleLoseThingsInTheDarkness:: .string "People often lose things in the\n" .string "darkness of the UNDERGROUND PATH.$" diff --git a/data/maps/UndergroundPath_WestEntrance/scripts.inc b/data/maps/UndergroundPath_WestEntrance/scripts.inc index 35fab8e7a..08a9210b3 100644 --- a/data/maps/UndergroundPath_WestEntrance/scripts.inc +++ b/data/maps/UndergroundPath_WestEntrance/scripts.inc @@ -1,6 +1,6 @@ -UndergroundPath_WestEntrance_MapScripts:: @ 8160EC9 +UndergroundPath_WestEntrance_MapScripts:: .byte 0 -UndergroundPath_WestEntrance_EventScript_BaldingMan:: @ 8160ECA +UndergroundPath_WestEntrance_EventScript_BaldingMan:: msgbox UndergroundPath_WestEntrance_Text_SleepyMonNearCeladon, MSGBOX_NPC end diff --git a/data/maps/UndergroundPath_WestEntrance/text.inc b/data/maps/UndergroundPath_WestEntrance/text.inc index 6130a5244..cf0f3c5f5 100644 --- a/data/maps/UndergroundPath_WestEntrance/text.inc +++ b/data/maps/UndergroundPath_WestEntrance/text.inc @@ -1,4 +1,4 @@ -UndergroundPath_WestEntrance_Text_SleepyMonNearCeladon:: @ 817459B +UndergroundPath_WestEntrance_Text_SleepyMonNearCeladon:: .string "I heard a sleepy POKéMON appeared\n" .string "out near CELADON CITY, too.$" diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc index 7a9b758a0..f75bb1a97 100644 --- a/data/maps/UnionRoom/scripts.inc +++ b/data/maps/UnionRoom/scripts.inc @@ -7,12 +7,12 @@ .set LOCALID_UNION_ROOM_PLAYER_2, 8 .set LOCALID_UNION_ROOM_PLAYER_1, 9 -UnionRoom_MapScripts:: @ 816047C +UnionRoom_MapScripts:: map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition .byte 0 -UnionRoom_OnResume:: @ 8160487 +UnionRoom_OnResume:: setflag FLAG_HIDE_UNION_ROOM_PLAYER_1 setflag FLAG_HIDE_UNION_ROOM_PLAYER_2 setflag FLAG_HIDE_UNION_ROOM_PLAYER_3 @@ -32,10 +32,10 @@ UnionRoom_OnResume:: @ 8160487 special UnionRoomSpecial end -UnionRoom_OnTransition:: @ 81604BB +UnionRoom_OnTransition:: end -UnionRoom_EventScript_Player1:: @ 81604BC +UnionRoom_EventScript_Player1:: lock faceplayer setvar VAR_RESULT, 1 @@ -43,7 +43,7 @@ UnionRoom_EventScript_Player1:: @ 81604BC release end -UnionRoom_EventScript_Player2:: @ 81604C6 +UnionRoom_EventScript_Player2:: lock faceplayer setvar VAR_RESULT, 2 @@ -51,7 +51,7 @@ UnionRoom_EventScript_Player2:: @ 81604C6 release end -UnionRoom_EventScript_Player3:: @ 81604D0 +UnionRoom_EventScript_Player3:: lock faceplayer setvar VAR_RESULT, 3 @@ -59,7 +59,7 @@ UnionRoom_EventScript_Player3:: @ 81604D0 release end -UnionRoom_EventScript_Player4:: @ 81604DA +UnionRoom_EventScript_Player4:: lock faceplayer setvar VAR_RESULT, 4 @@ -67,7 +67,7 @@ UnionRoom_EventScript_Player4:: @ 81604DA release end -UnionRoom_EventScript_Player5:: @ 81604E4 +UnionRoom_EventScript_Player5:: lock faceplayer setvar VAR_RESULT, 5 @@ -75,7 +75,7 @@ UnionRoom_EventScript_Player5:: @ 81604E4 release end -UnionRoom_EventScript_Player6:: @ 81604EE +UnionRoom_EventScript_Player6:: lock faceplayer setvar VAR_RESULT, 6 @@ -83,7 +83,7 @@ UnionRoom_EventScript_Player6:: @ 81604EE release end -UnionRoom_EventScript_Player7:: @ 81604F8 +UnionRoom_EventScript_Player7:: lock faceplayer setvar VAR_RESULT, 7 @@ -91,7 +91,7 @@ UnionRoom_EventScript_Player7:: @ 81604F8 release end -UnionRoom_EventScript_Player8:: @ 8160502 +UnionRoom_EventScript_Player8:: lock faceplayer setvar VAR_RESULT, 8 @@ -99,7 +99,7 @@ UnionRoom_EventScript_Player8:: @ 8160502 release end -UnionRoom_EventScript_Attendant:: @ 816050C +UnionRoom_EventScript_Attendant:: lock faceplayer setvar VAR_RESULT, 9 @@ -107,7 +107,7 @@ UnionRoom_EventScript_Attendant:: @ 816050C release end -UnionRoom_EventScript_Unused:: @ 8160516 +UnionRoom_EventScript_Unused:: lockall setvar VAR_RESULT, 10 waitstate diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 84ef9e183..2d1e95944 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -1,15 +1,15 @@ .equ LOCALID_FERRY_SAILOR, 6 -VermilionCity_MapScripts:: @ 81668DC +VermilionCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_OnTransition map_script MAP_SCRIPT_ON_FRAME_TABLE, VermilionCity_OnFrame .byte 0 -VermilionCity_OnFrame:: @ 81668E7 +VermilionCity_OnFrame:: map_script_2 VAR_MAP_SCENE_VERMILION_CITY, 2, VermilionCity_EventScript_ExitSSAnne .2byte 0 -VermilionCity_EventScript_ExitSSAnne:: @ 81668F1 +VermilionCity_EventScript_ExitSSAnne:: lockall applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_ExitSSAnne waitmovement 0 @@ -17,25 +17,25 @@ VermilionCity_EventScript_ExitSSAnne:: @ 81668F1 releaseall end -VermilionCity_Movement_ExitSSAnne:: @ 8166903 +VermilionCity_Movement_ExitSSAnne:: walk_up walk_up step_end -VermilionCity_OnTransition:: @ 8166906 +VermilionCity_OnTransition:: setworldmapflag FLAG_WORLD_MAP_VERMILION_CITY call_if_set FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION, VermilionCity_EventScript_HideOaksAide end -VermilionCity_EventScript_HideOaksAide:: @ 8166913 +VermilionCity_EventScript_HideOaksAide:: setflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE return -VermilionCity_EventScript_Woman:: @ 8166917 +VermilionCity_EventScript_Woman:: msgbox VermilionCity_Text_GrimerMultipliesInSludge, MSGBOX_NPC end -VermilionCity_EventScript_OldMan1:: @ 8166920 +VermilionCity_EventScript_OldMan1:: lock faceplayer compare VAR_MAP_SCENE_VERMILION_CITY, 3 @@ -44,12 +44,12 @@ VermilionCity_EventScript_OldMan1:: @ 8166920 release end -VermilionCity_EventScript_OldMan1SSAnneLeft:: @ 8166937 +VermilionCity_EventScript_OldMan1SSAnneLeft:: msgbox VermilionCity_Text_SSAnneHasDepartedForYear release end -VermilionCity_EventScript_FerrySailor:: @ 8166941 +VermilionCity_EventScript_FerrySailor:: lock faceplayer compare VAR_MAP_SCENE_VERMILION_CITY, 3 @@ -58,7 +58,7 @@ VermilionCity_EventScript_FerrySailor:: @ 8166941 release end -VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958 +VermilionCity_EventScript_CheckHasMysticTicket:: goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, EventScript_SetResultFalse checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, FALSE @@ -66,7 +66,7 @@ VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958 goto EventScript_SetResultTrue end -VermilionCity_EventScript_CheckHasAuroraTicket:: @ 8166977 +VermilionCity_EventScript_CheckHasAuroraTicket:: goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, EventScript_SetResultFalse checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, FALSE @@ -74,7 +74,7 @@ VermilionCity_EventScript_CheckHasAuroraTicket:: @ 8166977 goto EventScript_SetResultTrue end -VermilionCity_EventScript_CheckSeagallopPresent:: @ 8166996 +VermilionCity_EventScript_CheckSeagallopPresent:: setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestRainbowPass @@ -84,7 +84,7 @@ VermilionCity_EventScript_CheckSeagallopPresent:: @ 8166996 release end -VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB +VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording call VermilionCity_EventScript_CheckHasMysticTicket @@ -99,7 +99,7 @@ VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB goto EventScript_SeviiDestinationsPage1 end -VermilionCity_EventScript_HasMysticTicket:: @ 81669FD +VermilionCity_EventScript_HasMysticTicket:: call VermilionCity_EventScript_CheckHasAuroraTicket compare VAR_RESULT, TRUE goto_if_eq VermilionCity_EventScript_HasMysticAndAuroraTickets @@ -114,12 +114,12 @@ VermilionCity_EventScript_HasMysticTicket:: @ 81669FD case 127, EventScript_CancelSail end -VermilionCity_EventScript_ShowMysticTicket:: @ 8166A53 +VermilionCity_EventScript_ShowMysticTicket:: setflag FLAG_SHOWN_MYSTIC_TICKET msgbox VermilionCity_Text_OhMysticTicketTakeYouToNavelRock return -VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F +VermilionCity_EventScript_HasAuroraTicket:: call_if_unset FLAG_SHOWN_AURORA_TICKET, VermilionCity_EventScript_ShowAuroraTicket message VermilionCity_Text_BoardSeagallopFerry waitmessage @@ -131,12 +131,12 @@ VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F case 127, EventScript_CancelSail end -VermilionCity_EventScript_ShowAuroraTicket:: @ 8166AA5 +VermilionCity_EventScript_ShowAuroraTicket:: setflag FLAG_SHOWN_AURORA_TICKET msgbox VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland return -VermilionCity_EventScript_HasMysticAndAuroraTickets:: @ 8166AB1 +VermilionCity_EventScript_HasMysticAndAuroraTickets:: call_if_unset FLAG_SHOWN_MYSTIC_TICKET, VermilionCity_EventScript_ShowMysticTicket call_if_unset FLAG_SHOWN_AURORA_TICKET, VermilionCity_EventScript_ShowAuroraTicket message VermilionCity_Text_BoardSeagallopFerry @@ -150,21 +150,21 @@ VermilionCity_EventScript_HasMysticAndAuroraTickets:: @ 8166AB1 case 127, EventScript_CancelSail end -EventScript_SailToNavelRock:: @ 8166B0B +EventScript_SailToNavelRock:: msgbox VermilionCity_Text_Seagallop10Departing setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY setvar VAR_0x8006, SEAGALLOP_NAVEL_ROCK goto EventScript_SetSail end -EventScript_SailToBirthIsland:: @ 8166B23 +EventScript_SailToBirthIsland:: msgbox VermilionCity_Text_Seagallop12Departing setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY setvar VAR_0x8006, SEAGALLOP_BIRTH_ISLAND goto EventScript_SetSail end -VermilionCity_EventScript_ChooseSeagallopDestTriPass:: @ 8166B3B +VermilionCity_EventScript_ChooseSeagallopDestTriPass:: message VermilionCity_Text_BoardSeagallopTriPass waitmessage setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY @@ -178,27 +178,27 @@ VermilionCity_EventScript_ChooseSeagallopDestTriPass:: @ 8166B3B end @ Unreachable -Vermilion_EventScript_Unused:: @ 8166B88 +Vermilion_EventScript_Unused:: release end -VermilionCity_EventScript_CheckTicketLeft:: @ 8166B8A +VermilionCity_EventScript_CheckTicketLeft:: lockall goto VermilionCity_EventScript_CheckTicket end -VermilionCity_EventScript_CheckTicketRight:: @ 8166B91 +VermilionCity_EventScript_CheckTicketRight:: lockall goto VermilionCity_EventScript_CheckTicket end -VermilionCity_EventScript_ExitedTicketCheck:: @ 8166B98 +VermilionCity_EventScript_ExitedTicketCheck:: lockall setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0 releaseall end -VermilionCity_EventScript_CheckTicket:: @ 8166BA0 +VermilionCity_EventScript_CheckTicket:: textcolor 0 applymovement LOCALID_FERRY_SAILOR, Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight @@ -212,13 +212,13 @@ VermilionCity_EventScript_CheckTicket:: @ 8166BA0 releaseall end -VermilionCity_EventScript_DontHaveSSTicket:: @ 8166BDE +VermilionCity_EventScript_DontHaveSSTicket:: msgbox VermilionCity_Text_DontHaveNeededSSTicket closemessage goto VermilionCity_EventScript_WalkUpPier end -VermilionCity_EventScript_CheckSeagallopPresentTrigger:: @ 8166BED +VermilionCity_EventScript_CheckSeagallopPresentTrigger:: setvar VAR_0x8004, SEAGALLOP_VERMILION_CITY compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if_ge VermilionCity_EventScript_ChooseSeagallopDestRainbowPass @@ -229,11 +229,11 @@ VermilionCity_EventScript_CheckSeagallopPresentTrigger:: @ 8166BED goto VermilionCity_EventScript_WalkUpPier end -VermilionCity_EventScript_Sailor:: @ 8166C17 +VermilionCity_EventScript_Sailor:: msgbox VermilionCity_Text_SSAnneVisitsOnceAYear, MSGBOX_NPC end -VermilionCity_EventScript_OaksAide:: @ 8166C20 +VermilionCity_EventScript_OaksAide:: lock faceplayer setflag FLAG_TALKED_TO_OAKS_AIDE_IN_VERMILION @@ -241,11 +241,11 @@ VermilionCity_EventScript_OaksAide:: @ 8166C20 release end -VermilionCity_EventScript_OldMan2:: @ 8166C2F +VermilionCity_EventScript_OldMan2:: msgbox VermilionCity_Text_BuildingOnThisLand, MSGBOX_NPC end -VermilionCity_EventScript_Machop:: @ 8166C38 +VermilionCity_EventScript_Machop:: lock faceplayer waitse @@ -256,25 +256,25 @@ VermilionCity_EventScript_Machop:: @ 8166C38 release end -VermilionCity_EventScript_CitySign:: @ 8166C53 +VermilionCity_EventScript_CitySign:: msgbox VermilionCity_Text_CitySign, MSGBOX_SIGN end -VermilionCity_EventScript_SnorlaxNotice:: @ 8166C5C +VermilionCity_EventScript_SnorlaxNotice:: msgbox VermilionCity_Text_SnorlaxBlockingRoute12, MSGBOX_SIGN end -VermilionCity_EventScript_PokemonFanClubSign:: @ 8166C65 +VermilionCity_EventScript_PokemonFanClubSign:: msgbox VermilionCity_Text_PokemonFanClubSign, MSGBOX_SIGN end -VermilionCity_EventScript_GymSign:: @ 8166C6E +VermilionCity_EventScript_GymSign:: lockall famechecker FAMECHECKER_LTSURGE, 0 msgbox VermilionCity_Text_GymSign releaseall end -VermilionCity_EventScript_HarborSign:: @ 8166C86 +VermilionCity_EventScript_HarborSign:: msgbox VermilionCity_Text_VermilionHarbor, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity/text.inc b/data/maps/VermilionCity/text.inc index bb784b83a..3674d5fe5 100644 --- a/data/maps/VermilionCity/text.inc +++ b/data/maps/VermilionCity/text.inc @@ -1,39 +1,39 @@ -VermilionCity_Text_GrimerMultipliesInSludge:: @ 817F723 +VermilionCity_Text_GrimerMultipliesInSludge:: .string "We're careful about pollution here.\p" .string "We've heard GRIMER multiplies in\n" .string "toxic sludge.$" -VermilionCity_Text_DidYouSeeSSAnneInHarbor:: @ 817F776 +VermilionCity_Text_DidYouSeeSSAnneInHarbor:: .string "Did you see the S.S. ANNE moored\n" .string "in the harbor?$" -VermilionCity_Text_SSAnneHasDepartedForYear:: @ 817F7A6 +VermilionCity_Text_SSAnneHasDepartedForYear:: .string "So, the S.S. ANNE has departed?\p" .string "She'll be back in VERMILION about\n" .string "this time next year.$" -VermilionCity_Text_BuildingOnThisLand:: @ 817F7FD +VermilionCity_Text_BuildingOnThisLand:: .string "I'm putting up a building on this\n" .string "plot of land. I own it all.\p" .string "My POKéMON is tamping the land\n" .string "to lay the foundation.$" -VermilionCity_Text_Machop:: @ 817F871 +VermilionCity_Text_Machop:: .string "MACHOP: Guoh! Gogogoh!$" -VermilionCity_Text_MachopStompingLandFlat:: @ 817F888 +VermilionCity_Text_MachopStompingLandFlat:: .string "A MACHOP is stomping the land flat.$" -VermilionCity_Text_SSAnneVisitsOnceAYear:: @ 817F8AC +VermilionCity_Text_SSAnneVisitsOnceAYear:: .string "The S.S. ANNE is a famous luxury\n" .string "cruise ship.\p" .string "It visits VERMILION once a year.$" -VermilionCity_Text_CitySign:: @ 817F8FB +VermilionCity_Text_CitySign:: .string "VERMILION CITY\n" .string "The Port of Exquisite Sunsets$" -VermilionCity_Text_SnorlaxBlockingRoute12:: @ 817F928 +VermilionCity_Text_SnorlaxBlockingRoute12:: .string "NOTICE!\p" .string "ROUTE 12 may be blocked off by a\n" .string "sleeping POKéMON.\p" @@ -41,83 +41,83 @@ VermilionCity_Text_SnorlaxBlockingRoute12:: @ 817F928 .string "LAVENDER TOWN.\p" .string "VERMILION POLICE$" -VermilionCity_Text_PokemonFanClubSign:: @ 817F9A1 +VermilionCity_Text_PokemonFanClubSign:: .string "POKéMON FAN CLUB\n" .string "All POKéMON fans welcome!$" -VermilionCity_Text_GymSign:: @ 817F9CC +VermilionCity_Text_GymSign:: .string "VERMILION CITY POKéMON GYM\n" .string "LEADER: LT. SURGE\l" .string "The Lightning American!$" -VermilionCity_Text_VermilionHarbor:: @ 817FA11 +VermilionCity_Text_VermilionHarbor:: .string "VERMILION HARBOR$" -VermilionCity_Text_WelcomeToTheSSAnne:: @ 817FA22 +VermilionCity_Text_WelcomeToTheSSAnne:: .string "Welcome to the S.S. ANNE!$" -VermilionCity_Text_DoYouHaveATicket:: @ 817FA3C +VermilionCity_Text_DoYouHaveATicket:: .string "Welcome to the S.S. ANNE!\p" .string "Excuse me, do you have a ticket?$" -VermilionCity_Text_FlashedSSTicket:: @ 817FA77 +VermilionCity_Text_FlashedSSTicket:: .string "{SIZE}Á{PLAYER} flashed the S.S. TICKET!\p" .string "{SIZE}ÇGreat!\n" .string "Welcome to the S.S. ANNE!$" -VermilionCity_Text_DontHaveNeededSSTicket:: @ 817FABA +VermilionCity_Text_DontHaveNeededSSTicket:: .string "{SIZE}Á{PLAYER} doesn't have the needed\n" .string "S.S. TICKET.\p" .string "{SIZE}ÇSorry!\p" .string "You need a ticket to get aboard.$" -VermilionCity_Text_TheShipSetSail:: @ 817FB10 +VermilionCity_Text_TheShipSetSail:: .string "The ship set sail.$" -VermilionCity_Text_BoardSeagallopTriPass:: @ 817FB23 +VermilionCity_Text_BoardSeagallopTriPass:: .string "Ah, you have a TRI-PASS.\p" .string "Would you like to board\n" .string "a SEAGALLOP ferry?$" -VermilionCity_Text_Seagallop7Departing:: @ 817FB67 +VermilionCity_Text_Seagallop7Departing:: .string "Okay, everything's in order.\p" .string "SEAGALLOP HI-SPEED 7 will be\n" .string "departing immediately.$" -VermilionCity_Text_BoardSeagallopRainbowPass:: @ 817FBB8 +VermilionCity_Text_BoardSeagallopRainbowPass:: .string "Ah, you have a RAINBOW PASS.\p" .string "Would you like to board\n" .string "a SEAGALLOP ferry?$" -VermilionCity_Text_OhMysticTicketTakeYouToNavelRock:: @ 817FC00 +VermilionCity_Text_OhMysticTicketTakeYouToNavelRock:: .string "Oh! That's a MYSTICTICKET!\n" .string "Now that is rare.\p" .string "We'll be happy to take you to\n" .string "NAVEL ROCK anytime.$" -VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland:: @ 817FC5F +VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland:: .string "Oh! That's an AURORATICKET!\n" .string "Now that is rare.\p" .string "We'll be happy to take you to\n" .string "BIRTH ISLAND anytime.$" -VermilionCity_Text_BoardSeagallopFerry:: @ 817FCC1 +VermilionCity_Text_BoardSeagallopFerry:: .string "Would you like to board\n" .string "a SEAGALLOP ferry?$" -VermilionCity_Text_Seagallop10Departing:: @ 817FCEC +VermilionCity_Text_Seagallop10Departing:: .string "Okay, everything's in order for you\n" .string "to board a special ferry.\p" .string "SEAGALLOP HI-SPEED 10 will be\n" .string "departing immediately.$" -VermilionCity_Text_Seagallop12Departing:: @ 817FD5F +VermilionCity_Text_Seagallop12Departing:: .string "Okay, everything's in order for you\n" .string "to board a special ferry.\p" .string "SEAGALLOP HI-SPEED 12 will be\n" .string "departing immediately.$" -VermilionCity_Text_Route2AideHasPackageForYou:: @ 817FDD2 +VermilionCity_Text_Route2AideHasPackageForYou:: .string "Oh, hello, {PLAYER}!\n" .string "How are you doing?\p" .string "It's me, one of PROF. OAK's AIDES.\p" diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index bb6b5c91a..5e1ad744b 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -3,17 +3,17 @@ .equ SWITCH2_ID, VAR_0x8005 .equ TRASH_CAN_ID, VAR_0x8008 -VermilionCity_Gym_MapScripts:: @ 816B69E +VermilionCity_Gym_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, VermilionCity_Gym_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_Gym_OnTransition .byte 0 -VermilionCity_Gym_OnLoad:: @ 816B6A9 +VermilionCity_Gym_OnLoad:: call_if_set FOUND_FIRST_SWITCH, VermilionCity_Gym_EventScript_SetOneBeamOff call_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_SetBeamsOff end -VermilionCity_Gym_EventScript_SetOneBeamOff:: @ 816B6BC +VermilionCity_Gym_EventScript_SetOneBeamOff:: setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_HalfOn, 1 setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_HalfOn, 1 setmetatile 5, 6, METATILE_VermilionGym_Beam_MidTop_HalfOn, 1 @@ -26,7 +26,7 @@ VermilionCity_Gym_EventScript_SetOneBeamOff:: @ 816B6BC setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_HalfOn, 1 return -VermilionCity_Gym_EventScript_SetBeamsOff:: @ 816B717 +VermilionCity_Gym_EventScript_SetBeamsOff:: setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Off, 1 setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_Off, 0 setmetatile 5, 6, METATILE_VermilionGym_Floor, 0 @@ -39,108 +39,108 @@ VermilionCity_Gym_EventScript_SetBeamsOff:: @ 816B717 setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_Off, 1 return -VermilionCity_Gym_OnTransition:: @ 816B772 +VermilionCity_Gym_OnTransition:: call VermilionCity_Gym_EventScript_InitTrashCans end -VermilionCity_Gym_EventScript_InitTrashCans:: @ 816B778 +VermilionCity_Gym_EventScript_InitTrashCans:: goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, EventScript_Return special SetVermilionTrashCans copyvar VAR_TEMP_0, SWITCH1_ID copyvar VAR_TEMP_1, SWITCH2_ID return -VermilionCity_Gym_EventScript_TrashCan1:: @ 816B78F +VermilionCity_Gym_EventScript_TrashCan1:: lockall setvar TRASH_CAN_ID, 1 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan2:: @ 816B79B +VermilionCity_Gym_EventScript_TrashCan2:: lockall setvar TRASH_CAN_ID, 2 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan3:: @ 816B7A7 +VermilionCity_Gym_EventScript_TrashCan3:: lockall setvar TRASH_CAN_ID, 3 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan4:: @ 816B7B3 +VermilionCity_Gym_EventScript_TrashCan4:: lockall setvar TRASH_CAN_ID, 4 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan5:: @ 816B7BF +VermilionCity_Gym_EventScript_TrashCan5:: lockall setvar TRASH_CAN_ID, 5 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan6:: @ 816B7CB +VermilionCity_Gym_EventScript_TrashCan6:: lockall setvar TRASH_CAN_ID, 6 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan7:: @ 816B7D7 +VermilionCity_Gym_EventScript_TrashCan7:: lockall setvar TRASH_CAN_ID, 7 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan8:: @ 816B7E3 +VermilionCity_Gym_EventScript_TrashCan8:: lockall setvar TRASH_CAN_ID, 8 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan9:: @ 816B7EF +VermilionCity_Gym_EventScript_TrashCan9:: lockall setvar TRASH_CAN_ID, 9 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan10:: @ 816B7FB +VermilionCity_Gym_EventScript_TrashCan10:: lockall setvar TRASH_CAN_ID, 10 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan11:: @ 816B807 +VermilionCity_Gym_EventScript_TrashCan11:: lockall setvar TRASH_CAN_ID, 11 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan12:: @ 816B813 +VermilionCity_Gym_EventScript_TrashCan12:: lockall setvar TRASH_CAN_ID, 12 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan13:: @ 816B81F +VermilionCity_Gym_EventScript_TrashCan13:: lockall setvar TRASH_CAN_ID, 13 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan14:: @ 816B82B +VermilionCity_Gym_EventScript_TrashCan14:: lockall setvar TRASH_CAN_ID, 14 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan15:: @ 816B837 +VermilionCity_Gym_EventScript_TrashCan15:: lockall setvar TRASH_CAN_ID, 15 goto VermilionCity_Gym_EventScript_TrashCan end -VermilionCity_Gym_EventScript_TrashCan:: @ 816B843 +VermilionCity_Gym_EventScript_TrashCan:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording copyvar SWITCH1_ID, VAR_TEMP_0 @@ -153,7 +153,7 @@ VermilionCity_Gym_EventScript_TrashCan:: @ 816B843 releaseall end -VermilionCity_Gym_EventScript_FoundSwitchOne:: @ 816B885 +VermilionCity_Gym_EventScript_FoundSwitchOne:: msgbox VermilionCity_Gym_Text_SwitchUnderTrashFirstLockOpened playse SE_PIN waitse @@ -163,7 +163,7 @@ VermilionCity_Gym_EventScript_FoundSwitchOne:: @ 816B885 releaseall end -VermilionCity_Gym_EventScript_TrySwitchTwo:: @ 816B89E +VermilionCity_Gym_EventScript_TrySwitchTwo:: compare SWITCH2_ID, TRASH_CAN_ID goto_if_eq VermilionCity_Gym_EventScript_FoundSwitchTwo msgbox VermilionCity_Gym_Text_OnlyTrashLocksWereReset @@ -176,7 +176,7 @@ VermilionCity_Gym_EventScript_TrySwitchTwo:: @ 816B89E releaseall end -VermilionCity_Gym_EventScript_FoundSwitchTwo:: @ 816B8CB +VermilionCity_Gym_EventScript_FoundSwitchTwo:: msgbox VermilionCity_Gym_Text_SecondLockOpened closemessage call VermilionCity_Gym_EventScript_SetBeamsOff @@ -187,12 +187,12 @@ VermilionCity_Gym_EventScript_FoundSwitchTwo:: @ 816B8CB releaseall end -VermilionCity_Gym_EventScript_LocksAlreadyOpen:: @ 816B8E5 +VermilionCity_Gym_EventScript_LocksAlreadyOpen:: msgbox VermilionCity_Gym_Text_NopeOnlyTrashHere releaseall end -VermilionCity_Gym_EventScript_SetBeamsOn:: @ 816B8EF +VermilionCity_Gym_EventScript_SetBeamsOn:: setmetatile 3, 6, METATILE_VermilionGym_Beam_Node_TopLeft_On, 1 setmetatile 4, 6, METATILE_VermilionGym_Beam_Node_TopLeft_Edge_On, 1 setmetatile 5, 6, METATILE_VermilionGym_Beam_MidTop, 1 @@ -205,7 +205,7 @@ VermilionCity_Gym_EventScript_SetBeamsOn:: @ 816B8EF setmetatile 7, 7, METATILE_VermilionGym_Beam_Node_BottomRight_On, 1 return -VermilionCity_Gym_EventScript_LtSurge:: @ 816B94A +VermilionCity_Gym_EventScript_LtSurge:: famechecker FAMECHECKER_LTSURGE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle_single TRAINER_LEADER_LT_SURGE, VermilionCity_Gym_Text_LtSurgeIntro, VermilionCity_Gym_Text_LtSurgeDefeat, VermilionCity_Gym_EventScript_DefeatedLtSurge, NO_MUSIC goto_if_unset FLAG_GOT_TM34_FROM_SURGE, VermilionCity_Gym_EventScript_GiveTM34 @@ -213,7 +213,7 @@ VermilionCity_Gym_EventScript_LtSurge:: @ 816B94A release end -VermilionCity_Gym_EventScript_DefeatedLtSurge:: @ 816B97C +VermilionCity_Gym_EventScript_DefeatedLtSurge:: famechecker FAMECHECKER_LTSURGE, 1 call_if_unset FLAG_GOT_HM05, VermilionCity_Gym_EventScript_ShowOaksAide clearflag FLAG_HIDE_FAME_CHECKER_LT_SURGE_JOURNAL @@ -223,11 +223,11 @@ VermilionCity_Gym_EventScript_DefeatedLtSurge:: @ 816B97C goto VermilionCity_Gym_EventScript_GiveTM34 end -VermilionCity_Gym_EventScript_ShowOaksAide:: @ 816B9AB +VermilionCity_Gym_EventScript_ShowOaksAide:: clearflag FLAG_HIDE_VERMILION_CITY_OAKS_AIDE return -VermilionCity_Gym_EventScript_GiveTM34:: @ 816B9AF +VermilionCity_Gym_EventScript_GiveTM34:: msgbox VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis checkitemspace ITEM_TM34, 1 compare VAR_RESULT, FALSE @@ -238,34 +238,34 @@ VermilionCity_Gym_EventScript_GiveTM34:: @ 816B9AF release end -VermilionCity_Gym_EventScript_NoRoomForTM34:: @ 816B9F0 +VermilionCity_Gym_EventScript_NoRoomForTM34:: msgbox VermilionCity_Gym_Text_MakeRoomInYourBag release end -VermilionCity_Gym_EventScript_Dwayne:: @ 816B9FA +VermilionCity_Gym_EventScript_Dwayne:: trainerbattle_single TRAINER_SAILOR_DWAYNE, VermilionCity_Gym_Text_DwayneIntro, VermilionCity_Gym_Text_DwayneDefeat famechecker FAMECHECKER_LTSURGE, 4 msgbox VermilionCity_Gym_Text_DwaynePostBattle, MSGBOX_AUTOCLOSE end -VermilionCity_Gym_EventScript_Baily:: @ 816BA1E +VermilionCity_Gym_EventScript_Baily:: trainerbattle_single TRAINER_ENGINEER_BAILY, VermilionCity_Gym_Text_BailyIntro, VermilionCity_Gym_Text_BailyDefeat msgbox VermilionCity_Gym_Text_BailyPostBattle, MSGBOX_AUTOCLOSE end -VermilionCity_Gym_EventScript_Tucker:: @ 816BA35 +VermilionCity_Gym_EventScript_Tucker:: trainerbattle_single TRAINER_GENTLEMAN_TUCKER, VermilionCity_Gym_Text_TuckerIntro, VermilionCity_Gym_Text_TuckerDefeat, VermilionCity_Gym_EventScript_DefeatedTucker famechecker FAMECHECKER_LTSURGE, 3 msgbox VermilionCity_Gym_Text_TuckerPostBattle, MSGBOX_AUTOCLOSE end -VermilionCity_Gym_EventScript_DefeatedTucker:: @ 816BA5D +VermilionCity_Gym_EventScript_DefeatedTucker:: famechecker FAMECHECKER_LTSURGE, 2 release end -VermilionCity_Gym_EventScript_GymGuy:: @ 816BA6C +VermilionCity_Gym_EventScript_GymGuy:: lock faceplayer goto_if_set FLAG_DEFEATED_LT_SURGE, VermilionCity_Gym_EventScript_GymGuyPostVictory @@ -273,19 +273,19 @@ VermilionCity_Gym_EventScript_GymGuy:: @ 816BA6C release end -VermilionCity_Gym_EventScript_GymGuyPostVictory:: @ 816BA81 +VermilionCity_Gym_EventScript_GymGuyPostVictory:: msgbox VermilionCity_Gym_Text_GymGuyPostVictory release end -VermilionCity_Gym_EventScript_GymStatue:: @ 816BA8B +VermilionCity_Gym_EventScript_GymStatue:: lockall goto_if_set FLAG_BADGE03_GET, VermilionCity_Gym_EventScript_GymStatuePostVictory msgbox VermilionCity_Gym_Text_GymStatue releaseall end -VermilionCity_Gym_EventScript_GymStatuePostVictory:: @ 816BA9F +VermilionCity_Gym_EventScript_GymStatuePostVictory:: msgbox VermilionCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/VermilionCity_Gym/text.inc b/data/maps/VermilionCity_Gym/text.inc index c9d1ef12d..e6f6fda43 100644 --- a/data/maps/VermilionCity_Gym/text.inc +++ b/data/maps/VermilionCity_Gym/text.inc @@ -1,4 +1,4 @@ -VermilionCity_Gym_Text_LtSurgeIntro:: @ 8194BA4 +VermilionCity_Gym_Text_LtSurgeIntro:: .string "Hey, kid! What do you think you're\n" .string "doing here?\p" .string "You won't live long in combat!\n" @@ -9,13 +9,13 @@ VermilionCity_Gym_Text_LtSurgeIntro:: @ 8194BA4 .string "paralysis!\p" .string "The same as I'll do to you!{PLAY_BGM}{MUS_ENCOUNTER_GYM_LEADER}$" -VermilionCity_Gym_Text_LtSurgePostBattle:: @ 8194C8E +VermilionCity_Gym_Text_LtSurgePostBattle:: .string "A little word of advice, kid!\p" .string "Electricity is sure powerful!\p" .string "But, it's useless against GROUND-\n" .string "type POKéMON!$" -VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis:: @ 8194CFA +VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis:: .string "The THUNDERBADGE cranks up your\n" .string "POKéMON's SPEED!\p" .string "It also lets your POKéMON FLY\n" @@ -23,58 +23,58 @@ VermilionCity_Gym_Text_ExplainThunderBadgeTakeThis:: @ 8194CFA .string "You're special, kid!\n" .string "Take this!$" -VermilionCity_Gym_Text_ReceivedTM34FromLtSurge:: @ 8194D87 +VermilionCity_Gym_Text_ReceivedTM34FromLtSurge:: .string "{PLAYER} received TM34\n" .string "from LT. SURGE.$" -VermilionCity_Gym_Text_ExplainTM34:: @ 8194DA8 +VermilionCity_Gym_Text_ExplainTM34:: .string "TM34 contains SHOCK WAVE!\p" .string "Teach it to an ELECTRIC POKéMON!$" -VermilionCity_Gym_Text_MakeRoomInYourBag:: @ 8194DE3 +VermilionCity_Gym_Text_MakeRoomInYourBag:: .string "Yo, kid, make room in your BAG!$" -VermilionCity_Gym_Text_LtSurgeDefeat:: @ 8194E03 +VermilionCity_Gym_Text_LtSurgeDefeat:: .string "Now that's a shocker!\p" .string "You're the real deal, kid!\p" .string "Fine, then, take the THUNDERBADGE!$" -VermilionCity_Gym_Text_TuckerIntro:: @ 8194E57 +VermilionCity_Gym_Text_TuckerIntro:: .string "When I was in the Army, LT. SURGE\n" .string "was my strict CO.\p" .string "He was a hard taskmaster.$" -VermilionCity_Gym_Text_TuckerDefeat:: @ 8194EA5 +VermilionCity_Gym_Text_TuckerDefeat:: .string "Stop!\n" .string "You're very good!$" -VermilionCity_Gym_Text_TuckerPostBattle:: @ 8194EBD +VermilionCity_Gym_Text_TuckerPostBattle:: .string "It's not easy opening that door.\p" .string "LT. SURGE was always famous for\n" .string "his cautious nature in the Army.$" -VermilionCity_Gym_Text_BailyIntro:: @ 8194F1F +VermilionCity_Gym_Text_BailyIntro:: .string "I'm a lightweight, but I'm good\n" .string "with electricity!\p" .string "That's why I joined this GYM.$" -VermilionCity_Gym_Text_BailyDefeat:: @ 8194F6F +VermilionCity_Gym_Text_BailyDefeat:: .string "Fried!$" -VermilionCity_Gym_Text_BailyPostBattle:: @ 8194F76 +VermilionCity_Gym_Text_BailyPostBattle:: .string "Okay, I'll talk!\p" .string "LT. SURGE said he hid door\n" .string "switches inside something.$" -VermilionCity_Gym_Text_DwayneIntro:: @ 8194FBD +VermilionCity_Gym_Text_DwayneIntro:: .string "This is no place for kids!\n" .string "Not even if you're good!$" -VermilionCity_Gym_Text_DwayneDefeat:: @ 8194FF1 +VermilionCity_Gym_Text_DwayneDefeat:: .string "Wow!\n" .string "Surprised me!$" -VermilionCity_Gym_Text_DwaynePostBattle:: @ 8195004 +VermilionCity_Gym_Text_DwaynePostBattle:: .string "LT. SURGE installed the traps in\n" .string "the GYM himself.\p" .string "He set up double locks everywhere.\n" @@ -82,7 +82,7 @@ VermilionCity_Gym_Text_DwaynePostBattle:: @ 8195004 .string "When you open the first lock, the\n" .string "second lock is right next to it.$" -VermilionCity_Gym_Text_GymGuyAdvice:: @ 81950B4 +VermilionCity_Gym_Text_GymGuyAdvice:: .string "Yo!\n" .string "Champ in the making!\p" .string "LT. SURGE has a nickname.\p" @@ -97,42 +97,42 @@ VermilionCity_Gym_Text_GymGuyAdvice:: @ 81950B4 .string "He's locked himself in, so it won't\n" .string "be easy getting to him.$" -VermilionCity_Gym_Text_GymGuyPostVictory:: @ 81951EC +VermilionCity_Gym_Text_GymGuyPostVictory:: .string "Whew!\n" .string "That match was electric!$" -VermilionCity_Gym_Text_GymStatue:: @ 819520B +VermilionCity_Gym_Text_GymStatue:: .string "VERMILION POKéMON GYM\n" .string "LEADER: LT. SURGE\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -VermilionCity_Gym_Text_GymStatuePlayerWon:: @ 8195248 +VermilionCity_Gym_Text_GymStatuePlayerWon:: .string "VERMILION POKéMON GYM\n" .string "LEADER: LT. SURGE\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}, {PLAYER}$" -VermilionCity_Gym_Text_NopeOnlyTrashHere:: @ 8195289 +VermilionCity_Gym_Text_NopeOnlyTrashHere:: .string "Nope!\n" .string "There's only trash here.$" -VermilionCity_Gym_Text_SwitchUnderTrashFirstLockOpened:: @ 81952A8 +VermilionCity_Gym_Text_SwitchUnderTrashFirstLockOpened:: .string "Hey! There's a switch under the\n" .string "trash! Turn it on!\p" .string "The first electric lock opened!$" -VermilionCity_Gym_Text_AnotherSwitchInTrash:: @ 81952FB +VermilionCity_Gym_Text_AnotherSwitchInTrash:: .string "ガサゴソ‥！\n" .string "おっと！　ゴミばこの　そこに\l" .string "また　スイッチが　あった！\l" .string "おして　みよう！　‥　ポチッとな$" -VermilionCity_Gym_Text_SecondLockOpened:: @ 8195330 +VermilionCity_Gym_Text_SecondLockOpened:: .string "The second electric lock opened!\n" .string "The motorized door opened!$" -VermilionCity_Gym_Text_OnlyTrashLocksWereReset:: @ 819536C +VermilionCity_Gym_Text_OnlyTrashLocksWereReset:: .string "Nope!\n" .string "There's only trash here.\p" .string "Hey!\n" diff --git a/data/maps/VermilionCity_House1/scripts.inc b/data/maps/VermilionCity_House1/scripts.inc index 8ab0b17f2..e4194b549 100644 --- a/data/maps/VermilionCity_House1/scripts.inc +++ b/data/maps/VermilionCity_House1/scripts.inc @@ -1,7 +1,7 @@ -VermilionCity_House1_MapScripts:: @ 816B3A6 +VermilionCity_House1_MapScripts:: .byte 0 -VermilionCity_House1_EventScript_FishingGuru:: @ 816B3A7 +VermilionCity_House1_EventScript_FishingGuru:: lock faceplayer goto_if_set FLAG_GOT_OLD_ROD, VermilionCity_House1_EventScript_AlreadyGotOldRod @@ -12,12 +12,12 @@ VermilionCity_House1_EventScript_FishingGuru:: @ 816B3A7 release end -VermilionCity_House1_EventScript_AlreadyGotOldRod:: @ 816B3CF +VermilionCity_House1_EventScript_AlreadyGotOldRod:: msgbox VermilionCity_House1_Text_HowAreTheFishBiting release end -VermilionCity_House1_EventScript_GiveOldRod:: @ 816B3D9 +VermilionCity_House1_EventScript_GiveOldRod:: checkitemspace ITEM_OLD_ROD, 1 compare VAR_RESULT, FALSE goto_if_eq VermilionCity_House1_EventScript_NoRoomForOldRod @@ -29,7 +29,7 @@ VermilionCity_House1_EventScript_GiveOldRod:: @ 816B3D9 release end -VermilionCity_House1_EventScript_NoRoomForOldRod:: @ 816B41A +VermilionCity_House1_EventScript_NoRoomForOldRod:: msgbox VermilionCity_House1_Text_NoRoomForNiceGift release end diff --git a/data/maps/VermilionCity_House1/text.inc b/data/maps/VermilionCity_House1/text.inc index 55c2c700c..466f8f554 100644 --- a/data/maps/VermilionCity_House1/text.inc +++ b/data/maps/VermilionCity_House1/text.inc @@ -1,33 +1,33 @@ -VermilionCity_House1_Text_ImFishingGuruDoYouLikeToFish:: @ 8193EC1 +VermilionCity_House1_Text_ImFishingGuruDoYouLikeToFish:: .string "I'm the FISHING GURU!\p" .string "I simply looove fishing!\n" .string "I can't bear to go without.\p" .string "Tell me, do you like to fish?$" -VermilionCity_House1_Text_TakeThisAndFish:: @ 8193F2A +VermilionCity_House1_Text_TakeThisAndFish:: .string "Grand! I like your style.\n" .string "I think we can be friends.\p" .string "Take this and fish, young friend!$" -VermilionCity_House1_Text_ReceivedOldRodFromFishingGuru:: @ 8193F81 +VermilionCity_House1_Text_ReceivedOldRodFromFishingGuru:: .string "{PLAYER} received an OLD ROD from\n" .string "the FISHING GURU.$" -VermilionCity_House1_Text_FishingIsAWayOfLife:: @ 8193FAF +VermilionCity_House1_Text_FishingIsAWayOfLife:: .string "Fishing is a way of life!\n" .string "It is like the finest poetry.\p" .string "From the seas to rivers, go out\n" .string "and land the big one, my friend.$" -VermilionCity_House1_Text_OhThatsSoDisappointing:: @ 8194028 +VermilionCity_House1_Text_OhThatsSoDisappointing:: .string "Oh…\n" .string "That's so disappointing…$" -VermilionCity_House1_Text_HowAreTheFishBiting:: @ 8194045 +VermilionCity_House1_Text_HowAreTheFishBiting:: .string "Hello there, {PLAYER}!\p" .string "How are the fish biting?$" -VermilionCity_House1_Text_NoRoomForNiceGift:: @ 819406F +VermilionCity_House1_Text_NoRoomForNiceGift:: .string "Oh, no!\p" .string "I had a nice gift for you, but you\n" .string "have no room for it!$" diff --git a/data/maps/VermilionCity_House2/scripts.inc b/data/maps/VermilionCity_House2/scripts.inc index 8dbdd4888..51ff9a355 100644 --- a/data/maps/VermilionCity_House2/scripts.inc +++ b/data/maps/VermilionCity_House2/scripts.inc @@ -1,7 +1,7 @@ -VermilionCity_House2_MapScripts:: @ 816B5D6 +VermilionCity_House2_MapScripts:: .byte 0 -VermilionCity_House2_EventScript_Elyssa:: @ 816B5D7 +VermilionCity_House2_EventScript_Elyssa:: lock faceplayer setvar VAR_0x8008, INGAME_TRADE_FARFETCHD @@ -22,18 +22,18 @@ VermilionCity_House2_EventScript_Elyssa:: @ 816B5D7 release end -VermilionCity_House2_EventScript_DeclineTrade:: @ 816B631 +VermilionCity_House2_EventScript_DeclineTrade:: msgbox VermilionCity_House2_Text_ThatsTooBad release end -VermilionCity_House2_EventScript_NotRequestedMon:: @ 816B63B +VermilionCity_House2_EventScript_NotRequestedMon:: getspeciesname 0, VAR_0x8009 msgbox VermilionCity_House2_Text_ThisIsNoMon release end -VermilionCity_House2_EventScript_AlreadyTraded:: @ 816B649 +VermilionCity_House2_EventScript_AlreadyTraded:: msgbox VermilionCity_House2_Text_HowIsMyOldMon release end diff --git a/data/maps/VermilionCity_House2/text.inc b/data/maps/VermilionCity_House2/text.inc index 2908cb450..339cd7d87 100644 --- a/data/maps/VermilionCity_House2/text.inc +++ b/data/maps/VermilionCity_House2/text.inc @@ -1,20 +1,20 @@ -VermilionCity_House2_Text_DoYouHaveMonWantToTradeForMyMon:: @ 81949CB +VermilionCity_House2_Text_DoYouHaveMonWantToTradeForMyMon:: .string "Hi!\n" .string "Do you have a {STR_VAR_1}?\p" .string "Want to trade it for my\n" .string "{STR_VAR_2}?$" -VermilionCity_House2_Text_ThatsTooBad:: @ 81949FD +VermilionCity_House2_Text_ThatsTooBad:: .string "That's too bad.$" -VermilionCity_House2_Text_ThisIsNoMon:: @ 8194A0D +VermilionCity_House2_Text_ThisIsNoMon:: .string "…This is no {STR_VAR_1}.\p" .string "If you get one, please trade it\n" .string "to me!$" -VermilionCity_House2_Text_ThankYou:: @ 8194A44 +VermilionCity_House2_Text_ThankYou:: .string "Thank you!$" -VermilionCity_House2_Text_HowIsMyOldMon:: @ 8194A4F +VermilionCity_House2_Text_HowIsMyOldMon:: .string "How is my old {STR_VAR_2}?\p" .string "My {STR_VAR_1} is doing great!$" diff --git a/data/maps/VermilionCity_House3/scripts.inc b/data/maps/VermilionCity_House3/scripts.inc index 78caf2156..aeeb8b77c 100644 --- a/data/maps/VermilionCity_House3/scripts.inc +++ b/data/maps/VermilionCity_House3/scripts.inc @@ -1,15 +1,15 @@ -VermilionCity_House3_MapScripts:: @ 816BAA9 +VermilionCity_House3_MapScripts:: .byte 0 -VermilionCity_House3_EventScript_Boy:: @ 816BAAA +VermilionCity_House3_EventScript_Boy:: msgbox VermilionCity_House3_Text_PidgeyFlyLetterToSaffron, MSGBOX_NPC end -VermilionCity_House3_EventScript_Lass:: @ 816BAB3 +VermilionCity_House3_EventScript_Lass:: msgbox VermilionCity_House3_Text_SendMyPidgeyToUnionRoom, MSGBOX_NPC end -VermilionCity_House3_EventScript_Pidgey:: @ 816BABC +VermilionCity_House3_EventScript_Pidgey:: lock faceplayer waitse @@ -19,6 +19,6 @@ VermilionCity_House3_EventScript_Pidgey:: @ 816BABC release end -VermilionCity_House3_EventScript_Letter:: @ 816BACF +VermilionCity_House3_EventScript_Letter:: msgbox VermilionCity_House3_Text_DearPippiLetter, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity_House3/text.inc b/data/maps/VermilionCity_House3/text.inc index 88be18c10..7a8435da4 100644 --- a/data/maps/VermilionCity_House3/text.inc +++ b/data/maps/VermilionCity_House3/text.inc @@ -1,18 +1,18 @@ -VermilionCity_House3_Text_PidgeyFlyLetterToSaffron:: @ 81953AF +VermilionCity_House3_Text_PidgeyFlyLetterToSaffron:: .string "I'm getting my PIDGEY to fly a\n" .string "letter to SAFFRON in the north.$" -VermilionCity_House3_Text_Pidgey:: @ 81953EE +VermilionCity_House3_Text_Pidgey:: .string "PIDGEY: Kurukkoo!$" -VermilionCity_House3_Text_DearPippiLetter:: @ 8195400 +VermilionCity_House3_Text_DearPippiLetter:: .string "Dear PIPPI,\n" .string "I hope to see you soon.\p" .string "I heard SAFFRON has problems with\n" .string "TEAM ROCKET.\p" .string "VERMILION appears to be safe.$" -VermilionCity_House3_Text_SendMyPidgeyToUnionRoom:: @ 8195471 +VermilionCity_House3_Text_SendMyPidgeyToUnionRoom:: .string "I want to exchange MAIL with all\n" .string "sorts of people.\p" .string "I send my PIDGEY to a UNION ROOM\n" diff --git a/data/maps/VermilionCity_Mart/scripts.inc b/data/maps/VermilionCity_Mart/scripts.inc index 3ce0d842a..dc3b1bf12 100644 --- a/data/maps/VermilionCity_Mart/scripts.inc +++ b/data/maps/VermilionCity_Mart/scripts.inc @@ -1,15 +1,15 @@ -VermilionCity_Mart_MapScripts:: @ 816B653 +VermilionCity_Mart_MapScripts:: .byte 0 -VermilionCity_Mart_EventScript_CooltrainerF:: @ 816B654 +VermilionCity_Mart_EventScript_CooltrainerF:: msgbox VermilionCity_Mart_Text_MonsGoodOrBadDependingOnTrainer, MSGBOX_NPC end -VermilionCity_Mart_EventScript_BaldingMan:: @ 816B65D +VermilionCity_Mart_EventScript_BaldingMan:: msgbox VermilionCity_Mart_Text_TeamRocketAreWickedPeople, MSGBOX_NPC end -VermilionCity_Mart_EventScript_Clerk:: @ 816B666 +VermilionCity_Mart_EventScript_Clerk:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -21,7 +21,7 @@ VermilionCity_Mart_EventScript_Clerk:: @ 816B666 end .align 2 -VermilionCity_Mart_Items:: @ 816B68C +VermilionCity_Mart_Items:: .2byte ITEM_POKE_BALL .2byte ITEM_SUPER_POTION .2byte ITEM_ANTIDOTE diff --git a/data/maps/VermilionCity_Mart/text.inc b/data/maps/VermilionCity_Mart/text.inc index b8685b62a..da5f20d9f 100644 --- a/data/maps/VermilionCity_Mart/text.inc +++ b/data/maps/VermilionCity_Mart/text.inc @@ -1,4 +1,4 @@ -VermilionCity_Mart_Text_TeamRocketAreWickedPeople:: @ 8194A77 +VermilionCity_Mart_Text_TeamRocketAreWickedPeople:: .string "There are wicked people who will\n" .string "use POKéMON for criminal acts.\p" .string "TEAM ROCKET traffics in rare\n" @@ -8,7 +8,7 @@ VermilionCity_Mart_Text_TeamRocketAreWickedPeople:: @ 8194A77 .string "That's the sort of horrid people\n" .string "they are, TEAM ROCKET.$" -VermilionCity_Mart_Text_MonsGoodOrBadDependingOnTrainer:: @ 8194B65 +VermilionCity_Mart_Text_MonsGoodOrBadDependingOnTrainer:: .string "I think POKéMON can be good or\n" .string "bad. It depends on the TRAINER.$" diff --git a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc index 5f4338101..b0a892f09 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ -VermilionCity_PokemonCenter_1F_MapScripts:: @ 816B424 +VermilionCity_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, VermilionCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -VermilionCity_PokemonCenter_1F_OnTransition:: @ 816B42F +VermilionCity_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_VERMILION_CITY end -VermilionCity_PokemonCenter_1F_EventScript_Nurse:: @ 816B433 +VermilionCity_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -VermilionCity_PokemonCenter_1F_EventScript_Man:: @ 816B43C +VermilionCity_PokemonCenter_1F_EventScript_Man:: msgbox VermilionCity_PokemonCenter_1F_Text_PoisonedMonFaintedWhileWalking, MSGBOX_NPC end -VermilionCity_PokemonCenter_1F_EventScript_Hiker:: @ 816B445 +VermilionCity_PokemonCenter_1F_EventScript_Hiker:: msgbox VermilionCity_PokemonCenter_1F_Text_TrainerMonsStrongerThanWild, MSGBOX_NPC end -VermilionCity_PokemonCenter_1F_EventScript_Youngster:: @ 816B44E +VermilionCity_PokemonCenter_1F_EventScript_Youngster:: msgbox VermilionCity_PokemonCenter_1F_Text_AllMonWeakToSpecificTypes, MSGBOX_NPC end diff --git a/data/maps/VermilionCity_PokemonCenter_1F/text.inc b/data/maps/VermilionCity_PokemonCenter_1F/text.inc index cd3780286..00ec59594 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/text.inc +++ b/data/maps/VermilionCity_PokemonCenter_1F/text.inc @@ -1,15 +1,15 @@ -VermilionCity_PokemonCenter_1F_Text_TrainerMonsStrongerThanWild:: @ 81940AF +VermilionCity_PokemonCenter_1F_Text_TrainerMonsStrongerThanWild:: .string "Even if they are the same level,\n" .string "POKéMON can have very different\l" .string "stats and abilities.\p" .string "A POKéMON raised by a TRAINER is\n" .string "stronger than one in the wild.$" -VermilionCity_PokemonCenter_1F_Text_PoisonedMonFaintedWhileWalking:: @ 8194145 +VermilionCity_PokemonCenter_1F_Text_PoisonedMonFaintedWhileWalking:: .string "My POKéMON was poisoned!\n" .string "It fainted while we were walking!$" -VermilionCity_PokemonCenter_1F_Text_AllMonWeakToSpecificTypes:: @ 8194180 +VermilionCity_PokemonCenter_1F_Text_AllMonWeakToSpecificTypes:: .string "It is true that a higher-level\n" .string "POKéMON will be more powerful…\p" .string "But, all POKéMON will have weak\n" @@ -17,7 +17,7 @@ VermilionCity_PokemonCenter_1F_Text_AllMonWeakToSpecificTypes:: @ 8194180 .string "So, there appears to be no\n" .string "universally strong POKéMON.$" -VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain:: @ 8194234 +VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain:: .string "The urge to battle with someone\n" .string "you've tangled with before…\p" .string "Have you ever had that urge?\n" @@ -27,13 +27,13 @@ VermilionCity_PokemonCenter_1F_Text_UrgeToBattleSomeoneAgain:: @ 8194234 .string "So, I've been giving these away.\n" .string "Please, take one!$" -VermilionCity_PokemonCenter_1F_Text_UseDeviceForRematches:: @ 819430F +VermilionCity_PokemonCenter_1F_Text_UseDeviceForRematches:: .string "Use that device and you'll find\n" .string "TRAINERS looking for a rematch.\p" .string "You have to charge its battery to\n" .string "use it, though.$" -VermilionCity_PokemonCenter_1F_Text_ExplainVSSeeker:: @ 8194381 +VermilionCity_PokemonCenter_1F_Text_ExplainVSSeeker:: .string "How do you use the VS SEEKER?\n" .string "There's nothing to it.\p" .string "Use it like beep-beep-beep, and\n" diff --git a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc index 66539b9b6..edb5616ab 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/VermilionCity_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 +VermilionCity_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ VermilionCity_PokemonCenter_2F_MapScripts:: @ 816B457 .byte 0 @ The below 3 are unused and leftover from RS -VermilionCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816B46C +VermilionCity_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -VermilionCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816B472 +VermilionCity_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -VermilionCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816B478 +VermilionCity_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 00d67ed08..9310eff12 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -4,10 +4,10 @@ .set SPOKE_TO_WOMAN_LAST, FLAG_TEMP_2 .set SPOKE_TO_FAT_MAN_LAST, FLAG_TEMP_3 -VermilionCity_PokemonFanClub_MapScripts:: @ 816B47E +VermilionCity_PokemonFanClub_MapScripts:: .byte 0 -VermilionCity_PokemonFanClub_EventScript_Chairman:: @ 816B47F +VermilionCity_PokemonFanClub_EventScript_Chairman:: lock faceplayer goto_if_set FLAG_GOT_BIKE_VOUCHER, VermilionCity_PokemonFanClub_EventScript_AlreadyHeardStory @@ -18,12 +18,12 @@ VermilionCity_PokemonFanClub_EventScript_Chairman:: @ 816B47F release end -VermilionCity_PokemonFanClub_EventScript_AlreadyHeardStory:: @ 816B4A7 +VermilionCity_PokemonFanClub_EventScript_AlreadyHeardStory:: msgbox VermilionCity_PokemonFanClub_Text_DidntComeToSeeAboutMonsAgain release end -VermilionCity_PokemonFanClub_EventScript_ChairmanStory:: @ 816B4B1 +VermilionCity_PokemonFanClub_EventScript_ChairmanStory:: msgbox VermilionCity_PokemonFanClub_Text_ChairmansStory checkitemspace ITEM_BIKE_VOUCHER, 1 compare VAR_RESULT, FALSE @@ -34,12 +34,12 @@ VermilionCity_PokemonFanClub_EventScript_ChairmanStory:: @ 816B4B1 release end -VermilionCity_PokemonFanClub_EventScript_NoRoomForBikeVoucher:: @ 816B4F2 +VermilionCity_PokemonFanClub_EventScript_NoRoomForBikeVoucher:: msgbox VermilionCity_PokemonFanClub_Text_MakeRoomForThis release end -VermilionCity_PokemonFanClub_EventScript_WorkerF:: @ 816B4FC +VermilionCity_PokemonFanClub_EventScript_WorkerF:: lock faceplayer goto_if_set FLAG_SYS_GAME_CLEAR, VermilionCity_PokemonFanClub_EventScript_WorkerFGameClear @@ -47,13 +47,13 @@ VermilionCity_PokemonFanClub_EventScript_WorkerF:: @ 816B4FC release end -VermilionCity_PokemonFanClub_EventScript_WorkerFGameClear:: @ 816B511 +VermilionCity_PokemonFanClub_EventScript_WorkerFGameClear:: famechecker FAMECHECKER_DAISY, 1 msgbox VermilionCity_PokemonFanClub_Text_ChairmanReallyAdoresHisMons release end -VermilionCity_PokemonFanClub_EventScript_Woman:: @ 816B528 +VermilionCity_PokemonFanClub_EventScript_Woman:: lock faceplayer goto_if_set SPOKE_TO_FAT_MAN_LAST, VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan @@ -65,7 +65,7 @@ VermilionCity_PokemonFanClub_EventScript_Woman:: @ 816B528 release end -VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan:: @ 816B54B +VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan:: msgbox VermilionCity_PokemonFanClub_Text_SeelFarMoreAttractive closemessage applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection @@ -74,7 +74,7 @@ VermilionCity_PokemonFanClub_EventScript_WomanSpokeToFatMan:: @ 816B54B release end -VermilionCity_PokemonFanClub_EventScript_FatMan:: @ 816B563 +VermilionCity_PokemonFanClub_EventScript_FatMan:: lock faceplayer goto_if_set SPOKE_TO_WOMAN_LAST, VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman @@ -86,7 +86,7 @@ VermilionCity_PokemonFanClub_EventScript_FatMan:: @ 816B563 release end -VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman:: @ 816B586 +VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman:: msgbox VermilionCity_PokemonFanClub_Text_PikachuTwiceAsCute closemessage applymovement LOCALID_FAT_MAN, Movement_FaceOriginalDirection @@ -95,7 +95,7 @@ VermilionCity_PokemonFanClub_EventScript_FatManSpokeToWoman:: @ 816B586 release end -VermilionCity_PokemonFanClub_EventScript_Pikachu:: @ 816B59E +VermilionCity_PokemonFanClub_EventScript_Pikachu:: lock faceplayer waitse @@ -105,7 +105,7 @@ VermilionCity_PokemonFanClub_EventScript_Pikachu:: @ 816B59E release end -VermilionCity_PokemonFanClub_EventScript_Seel:: @ 816B5B1 +VermilionCity_PokemonFanClub_EventScript_Seel:: lock faceplayer waitse @@ -115,10 +115,10 @@ VermilionCity_PokemonFanClub_EventScript_Seel:: @ 816B5B1 release end -VermilionCity_PokemonFanClub_EventScript_RulesSign1:: @ 816B5C4 +VermilionCity_PokemonFanClub_EventScript_RulesSign1:: msgbox VermilionCity_PokemonFanClub_Text_ListenPolitelyToOtherTrainers, MSGBOX_SIGN end -VermilionCity_PokemonFanClub_EventScript_RulesSign2:: @ 816B5CD +VermilionCity_PokemonFanClub_EventScript_RulesSign2:: msgbox VermilionCity_PokemonFanClub_Text_SomeoneBragsBragBack, MSGBOX_SIGN end diff --git a/data/maps/VermilionCity_PokemonFanClub/text.inc b/data/maps/VermilionCity_PokemonFanClub/text.inc index 7e28fd548..c2bf711ef 100644 --- a/data/maps/VermilionCity_PokemonFanClub/text.inc +++ b/data/maps/VermilionCity_PokemonFanClub/text.inc @@ -1,30 +1,30 @@ -VermilionCity_PokemonFanClub_Text_AdmirePikachusTail:: @ 819446F +VermilionCity_PokemonFanClub_Text_AdmirePikachusTail:: .string "Won't you admire my PIKACHU's\n" .string "adorable tail?$" -VermilionCity_PokemonFanClub_Text_PikachuTwiceAsCute:: @ 819449C +VermilionCity_PokemonFanClub_Text_PikachuTwiceAsCute:: .string "Humph!\p" .string "My PIKACHU is twice as cute as\n" .string "that one!$" -VermilionCity_PokemonFanClub_Text_AdoreMySeel:: @ 81944CC +VermilionCity_PokemonFanClub_Text_AdoreMySeel:: .string "I just adore my SEEL!\n" .string "It's so lovable!\p" .string "It squeals, “Kyuuuh,” when I\n" .string "hug it!$" -VermilionCity_PokemonFanClub_Text_SeelFarMoreAttractive:: @ 8194518 +VermilionCity_PokemonFanClub_Text_SeelFarMoreAttractive:: .string "Oh, dear!\p" .string "My SEEL is far more attractive.\n" .string "By double, I would say.$" -VermilionCity_PokemonFanClub_Text_Pikachu:: @ 819455A +VermilionCity_PokemonFanClub_Text_Pikachu:: .string "PIKACHU: Chu! Pikachu!$" -VermilionCity_PokemonFanClub_Text_Seel:: @ 8194571 +VermilionCity_PokemonFanClub_Text_Seel:: .string "SEEL: Kyuoo!$" -VermilionCity_PokemonFanClub_Text_DidYouComeToHearAboutMyMons:: @ 819457E +VermilionCity_PokemonFanClub_Text_DidYouComeToHearAboutMyMons:: .string "I chair the POKéMON Fan Club!\p" .string "I raise more than a hundred\n" .string "POKéMON!\p" @@ -34,7 +34,7 @@ VermilionCity_PokemonFanClub_Text_DidYouComeToHearAboutMyMons:: @ 819457E .string "Did you come visit to hear about\n" .string "my POKéMON?$" -VermilionCity_PokemonFanClub_Text_ChairmansStory:: @ 8194628 +VermilionCity_PokemonFanClub_Text_ChairmansStory:: .string "Good!\n" .string "Then listen up!\p" .string "My favorite RAPIDASH…\p" @@ -50,11 +50,11 @@ VermilionCity_PokemonFanClub_Text_ChairmansStory:: @ 8194628 .string "Thanks for hearing me out!\n" .string "I want you to have this!$" -VermilionCity_PokemonFanClub_Text_ReceivedBikeVoucherFromChairman:: @ 819474E +VermilionCity_PokemonFanClub_Text_ReceivedBikeVoucherFromChairman:: .string "{PLAYER} received a BIKE VOUCHER\n" .string "from the CHAIRMAN.$" -VermilionCity_PokemonFanClub_Text_ExplainBikeVoucher:: @ 819477C +VermilionCity_PokemonFanClub_Text_ExplainBikeVoucher:: .string "Take that BIKE VOUCHER to the\n" .string "BIKE SHOP in CERULEAN CITY.\p" .string "Exchange that for a BICYCLE\n" @@ -64,32 +64,32 @@ VermilionCity_PokemonFanClub_Text_ExplainBikeVoucher:: @ 819477C .string "So, I have no need for a BICYCLE.\p" .string "I hope you like cycling!$" -VermilionCity_PokemonFanClub_Text_ComeBackToHearStory:: @ 8194860 +VermilionCity_PokemonFanClub_Text_ComeBackToHearStory:: .string "Oh. Come back when you want to\n" .string "hear my story!$" -VermilionCity_PokemonFanClub_Text_DidntComeToSeeAboutMonsAgain:: @ 819488E +VermilionCity_PokemonFanClub_Text_DidntComeToSeeAboutMonsAgain:: .string "Hello, {PLAYER}!\p" .string "Did you come see me about my\n" .string "POKéMON again?\p" .string "No?\n" .string "Too bad!$" -VermilionCity_PokemonFanClub_Text_MakeRoomForThis:: @ 81948D2 +VermilionCity_PokemonFanClub_Text_MakeRoomForThis:: .string "Make room for this!$" -VermilionCity_PokemonFanClub_Text_ChairmanVeryVocalAboutPokemon:: @ 81948E6 +VermilionCity_PokemonFanClub_Text_ChairmanVeryVocalAboutPokemon:: .string "Our CHAIRMAN is very vocal about\n" .string "POKéMON.$" -VermilionCity_PokemonFanClub_Text_ListenPolitelyToOtherTrainers:: @ 8194910 +VermilionCity_PokemonFanClub_Text_ListenPolitelyToOtherTrainers:: .string "Let's all listen politely to other\n" .string "TRAINERS!$" -VermilionCity_PokemonFanClub_Text_SomeoneBragsBragBack:: @ 819493D +VermilionCity_PokemonFanClub_Text_SomeoneBragsBragBack:: .string "If someone brags, brag right back!$" -VermilionCity_PokemonFanClub_Text_ChairmanReallyAdoresHisMons:: @ 8194960 +VermilionCity_PokemonFanClub_Text_ChairmanReallyAdoresHisMons:: .string "Our CHAIRMAN really does adore his\n" .string "POKéMON.\p" .string "But the person who is most liked by\n" diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 4c300e6e2..9c3f748bb 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -1,23 +1,23 @@ -VictoryRoad_1F_MapScripts:: @ 8160F05 +VictoryRoad_1F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_1F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition .byte 0 -VictoryRoad_1F_OnLoad:: @ 8160F10 +VictoryRoad_1F_OnLoad:: compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 call_if_ne VictoryRoad_1F_EventScript_SetRockBarrier end -VictoryRoad_1F_EventScript_SetRockBarrier:: @ 8160F1C +VictoryRoad_1F_EventScript_SetRockBarrier:: setmetatile 12, 14, METATILE_Cave_RockBarrier_Top, 1 setmetatile 12, 15, METATILE_Cave_RockBarrier_Bottom, 1 return -VictoryRoad_1F_OnTransition:: @ 8160F2F +VictoryRoad_1F_OnTransition:: setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F end -VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33 +VictoryRoad_1F_EventScript_FloorSwitch:: lockall compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100 goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed @@ -31,16 +31,16 @@ VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33 releaseall end -VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed:: @ 8160F62 +VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed:: releaseall end -VictoryRoad_1F_EventScript_Naomi:: @ 8160F64 +VictoryRoad_1F_EventScript_Naomi:: trainerbattle_single TRAINER_COOLTRAINER_NAOMI, VictoryRoad_1F_Text_NaomiIntro, VictoryRoad_1F_Text_NaomiDefeat msgbox VictoryRoad_1F_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_1F_EventScript_Rolando:: @ 8160F7B +VictoryRoad_1F_EventScript_Rolando:: trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, VictoryRoad_1F_Text_RolandoIntro, VictoryRoad_1F_Text_RolandoDefeat msgbox VictoryRoad_1F_Text_RolandoPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_1F/text.inc b/data/maps/VictoryRoad_1F/text.inc index d83abf202..b4f3253d0 100644 --- a/data/maps/VictoryRoad_1F/text.inc +++ b/data/maps/VictoryRoad_1F/text.inc @@ -1,22 +1,22 @@ -VictoryRoad_1F_Text_NaomiIntro:: @ 8174710 +VictoryRoad_1F_Text_NaomiIntro:: .string "I wonder if you are good enough\n" .string "for me?$" -VictoryRoad_1F_Text_NaomiDefeat:: @ 8174738 +VictoryRoad_1F_Text_NaomiDefeat:: .string "I lost out…$" -VictoryRoad_1F_Text_NaomiPostBattle:: @ 8174744 +VictoryRoad_1F_Text_NaomiPostBattle:: .string "I never wanted to lose to anybody,\n" .string "especially to a younger kid…$" -VictoryRoad_1F_Text_RolandoIntro:: @ 8174784 +VictoryRoad_1F_Text_RolandoIntro:: .string "I can see you're good.\n" .string "Let me see exactly how good!$" -VictoryRoad_1F_Text_RolandoDefeat:: @ 81747B8 +VictoryRoad_1F_Text_RolandoDefeat:: .string "I had a chance…$" -VictoryRoad_1F_Text_RolandoPostBattle:: @ 81747C8 +VictoryRoad_1F_Text_RolandoPostBattle:: .string "Tch!\n" .string "I concede, you are better than I!$" diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc index b9436a11b..46d259144 100644 --- a/data/maps/VictoryRoad_2F/scripts.inc +++ b/data/maps/VictoryRoad_2F/scripts.inc @@ -1,25 +1,25 @@ -VictoryRoad_2F_MapScripts:: @ 8160F92 +VictoryRoad_2F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_2F_OnLoad .byte 0 -VictoryRoad_2F_OnLoad:: @ 8160F98 +VictoryRoad_2F_OnLoad:: compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier1 compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier2 end -VictoryRoad_2F_EventScript_SetRockBarrier1:: @ 8160FAF +VictoryRoad_2F_EventScript_SetRockBarrier1:: setmetatile 13, 10, METATILE_Cave_RockBarrier_Top, 1 setmetatile 13, 11, METATILE_Cave_RockBarrier_Bottom, 1 return -VictoryRoad_2F_EventScript_SetRockBarrier2:: @ 8160FC2 +VictoryRoad_2F_EventScript_SetRockBarrier2:: setmetatile 33, 16, METATILE_Cave_RockBarrier_Top, 1 setmetatile 33, 17, METATILE_Cave_RockBarrier_Bottom, 1 return -VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5 +VictoryRoad_2F_EventScript_FloorSwitch1:: lockall compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100 goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed @@ -33,11 +33,11 @@ VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5 releaseall end -VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed:: @ 8161004 +VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed:: releaseall end -VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006 +VictoryRoad_2F_EventScript_FloorSwitch2:: lockall compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100 goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed @@ -51,31 +51,31 @@ VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006 releaseall end -VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed:: @ 8161035 +VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed:: releaseall end -VictoryRoad_2F_EventScript_Dawson:: @ 8161037 +VictoryRoad_2F_EventScript_Dawson:: trainerbattle_single TRAINER_POKEMANIAC_DAWSON, VictoryRoad_2F_Text_DawsonIntro, VictoryRoad_2F_Text_DawsonDefeat msgbox VictoryRoad_2F_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_Daisuke:: @ 816104E +VictoryRoad_2F_EventScript_Daisuke:: trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, VictoryRoad_2F_Text_DaisukeIntro, VictoryRoad_2F_Text_DaisukeDefeat msgbox VictoryRoad_2F_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_Nelson:: @ 8161065 +VictoryRoad_2F_EventScript_Nelson:: trainerbattle_single TRAINER_JUGGLER_NELSON, VictoryRoad_2F_Text_NelsonIntro, VictoryRoad_2F_Text_NelsonDefeat msgbox VictoryRoad_2F_Text_NelsonPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_Gregory:: @ 816107C +VictoryRoad_2F_EventScript_Gregory:: trainerbattle_single TRAINER_JUGGLER_GREGORY, VictoryRoad_2F_Text_GregoryIntro, VictoryRoad_2F_Text_GregoryDefeat msgbox VictoryRoad_2F_Text_GregoryPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_2F_EventScript_Vincent:: @ 8161093 +VictoryRoad_2F_EventScript_Vincent:: trainerbattle_single TRAINER_TAMER_VINCENT, VictoryRoad_2F_Text_VincentIntro, VictoryRoad_2F_Text_VincentDefeat msgbox VictoryRoad_2F_Text_VincentPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_2F/text.inc b/data/maps/VictoryRoad_2F/text.inc index 301a5f22b..f6b91a3ab 100644 --- a/data/maps/VictoryRoad_2F/text.inc +++ b/data/maps/VictoryRoad_2F/text.inc @@ -1,58 +1,58 @@ -VictoryRoad_2F_Text_DawsonIntro:: @ 81747EF +VictoryRoad_2F_Text_DawsonIntro:: .string "If you can get through here,\n" .string "you can go meet the ELITE FOUR.$" -VictoryRoad_2F_Text_DawsonDefeat:: @ 817482C +VictoryRoad_2F_Text_DawsonDefeat:: .string "No!\n" .string "Unbelievable!$" -VictoryRoad_2F_Text_DawsonPostBattle:: @ 817483E +VictoryRoad_2F_Text_DawsonPostBattle:: .string "I can beat you when it comes to\n" .string "knowledge about POKéMON!$" -VictoryRoad_2F_Text_DaisukeIntro:: @ 8174877 +VictoryRoad_2F_Text_DaisukeIntro:: .string "This here is VICTORY ROAD.\n" .string "It's the final test for TRAINERS!$" -VictoryRoad_2F_Text_DaisukeDefeat:: @ 81748B4 +VictoryRoad_2F_Text_DaisukeDefeat:: .string "Atcho!$" -VictoryRoad_2F_Text_DaisukePostBattle:: @ 81748BB +VictoryRoad_2F_Text_DaisukePostBattle:: .string "If you get stuck, try moving some\n" .string "boulders around.$" -VictoryRoad_2F_Text_NelsonIntro:: @ 81748EE +VictoryRoad_2F_Text_NelsonIntro:: .string "Ah, so you wish to challenge the\n" .string "ELITE FOUR?$" -VictoryRoad_2F_Text_NelsonDefeat:: @ 817491B +VictoryRoad_2F_Text_NelsonDefeat:: .string "You got me!$" -VictoryRoad_2F_Text_NelsonPostBattle:: @ 8174927 +VictoryRoad_2F_Text_NelsonPostBattle:: .string "{RIVAL} also came through here.$" -VictoryRoad_2F_Text_VincentIntro:: @ 8174942 +VictoryRoad_2F_Text_VincentIntro:: .string "Come on!\n" .string "I'll whip you!$" -VictoryRoad_2F_Text_VincentDefeat:: @ 817495A +VictoryRoad_2F_Text_VincentDefeat:: .string "I got whipped!$" -VictoryRoad_2F_Text_VincentPostBattle:: @ 8174969 +VictoryRoad_2F_Text_VincentPostBattle:: .string "You earned the right to be on\n" .string "VICTORY ROAD…$" -VictoryRoad_2F_Text_GregoryIntro:: @ 8174995 +VictoryRoad_2F_Text_GregoryIntro:: .string "Is VICTORY ROAD too tough?$" -VictoryRoad_2F_Text_GregoryDefeat:: @ 81749B0 +VictoryRoad_2F_Text_GregoryDefeat:: .string "Well done!$" -VictoryRoad_2F_Text_GregoryPostBattle:: @ 81749BB +VictoryRoad_2F_Text_GregoryPostBattle:: .string "Many TRAINERS give up their\n" .string "challenge here and go home.$" @ Unused, old text for Moltres -VictoryRoad_2F_Text_Gyaoo:: @ 81749F3 +VictoryRoad_2F_Text_Gyaoo:: .string "ギヤーオ！$" diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc index 6af6eb0bc..6348480b7 100644 --- a/data/maps/VictoryRoad_3F/scripts.inc +++ b/data/maps/VictoryRoad_3F/scripts.inc @@ -1,18 +1,18 @@ -VictoryRoad_3F_MapScripts:: @ 81610AA +VictoryRoad_3F_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, VictoryRoad_3F_OnLoad .byte 0 -VictoryRoad_3F_OnLoad:: @ 81610B0 +VictoryRoad_3F_OnLoad:: compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 call_if_ne VictoryRoad_3F_EventScript_SetRockBarrier end -VictoryRoad_3F_EventScript_SetRockBarrier:: @ 81610BC +VictoryRoad_3F_EventScript_SetRockBarrier:: setmetatile 12, 12, METATILE_Cave_RockBarrier_Top, 1 setmetatile 12, 13, METATILE_Cave_RockBarrier_Bottom, 1 return -VictoryRoad_3F_EventScript_FloorSwitch:: @ 81610CF +VictoryRoad_3F_EventScript_FloorSwitch:: lockall compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100 goto_if_eq VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed @@ -27,36 +27,36 @@ VictoryRoad_3F_EventScript_FloorSwitch:: @ 81610CF releaseall end -VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed:: @ 8161101 +VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed:: releaseall end -VictoryRoad_3F_EventScript_George:: @ 8161103 +VictoryRoad_3F_EventScript_George:: trainerbattle_single TRAINER_COOLTRAINER_GEORGE, VictoryRoad_3F_Text_GeorgeIntro, VictoryRoad_3F_Text_GeorgeDefeat msgbox VictoryRoad_3F_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_Colby:: @ 816111A +VictoryRoad_3F_EventScript_Colby:: trainerbattle_single TRAINER_COOLTRAINER_COLBY, VictoryRoad_3F_Text_ColbyIntro, VictoryRoad_3F_Text_ColbyDefeat msgbox VictoryRoad_3F_Text_ColbyPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_Caroline:: @ 8161131 +VictoryRoad_3F_EventScript_Caroline:: trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, VictoryRoad_3F_Text_CarolineIntro, VictoryRoad_3F_Text_CarolineDefeat msgbox VictoryRoad_3F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_Alexa:: @ 8161148 +VictoryRoad_3F_EventScript_Alexa:: trainerbattle_single TRAINER_COOLTRAINER_ALEXA, VictoryRoad_3F_Text_AlexaIntro, VictoryRoad_3F_Text_AlexaDefeat msgbox VictoryRoad_3F_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_Ray:: @ 816115F +VictoryRoad_3F_EventScript_Ray:: trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_RayIntro, VictoryRoad_3F_Text_RayDefeat, VictoryRoad_3F_Text_RayNotEnoughMons msgbox VictoryRoad_3F_Text_RayPostBattle, MSGBOX_AUTOCLOSE end -VictoryRoad_3F_EventScript_Tyra:: @ 816117A +VictoryRoad_3F_EventScript_Tyra:: trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_TyraIntro, VictoryRoad_3F_Text_TyraDefeat, VictoryRoad_3F_Text_TyraNotEnoughMons msgbox VictoryRoad_3F_Text_TyraPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/VictoryRoad_3F/text.inc b/data/maps/VictoryRoad_3F/text.inc index dd60180df..b73ac92e4 100644 --- a/data/maps/VictoryRoad_3F/text.inc +++ b/data/maps/VictoryRoad_3F/text.inc @@ -1,4 +1,4 @@ -Text_DoubleEdgeTeach:: @ 81749F9 +Text_DoubleEdgeTeach:: .string "You should be proud of yourself,\n" .string "having battled your way through\l" .string "VICTORY ROAD so courageously.\p" @@ -7,94 +7,94 @@ Text_DoubleEdgeTeach:: @ 81749F9 .string "Would you like me to teach that\n" .string "technique?$" -Text_DoubleEdgeDeclined:: @ 8174ABC +Text_DoubleEdgeDeclined:: .string "I'll teach you the technique\n" .string "anytime.$" -Text_DoubleEdgeWhichMon:: @ 8174AE2 +Text_DoubleEdgeWhichMon:: .string "Which POKéMON should I teach\n" .string "DOUBLE-EDGE?$" -Text_DoubleEdgeTaught:: @ 8174B0C +Text_DoubleEdgeTaught:: .string "Keep that drive going for the\n" .string "POKéMON LEAGUE!\p" .string "Take a run at them and knock 'em\n" .string "out!$" -VictoryRoad_3F_Text_GeorgeIntro:: @ 8174B60 +VictoryRoad_3F_Text_GeorgeIntro:: .string "I heard rumors of a child prodigy.$" -VictoryRoad_3F_Text_GeorgeDefeat:: @ 8174B83 +VictoryRoad_3F_Text_GeorgeDefeat:: .string "The rumors were true!$" -VictoryRoad_3F_Text_GeorgePostBattle:: @ 8174B99 +VictoryRoad_3F_Text_GeorgePostBattle:: .string "So, it was you who beat GIOVANNI\n" .string "of TEAM ROCKET?$" -VictoryRoad_3F_Text_AlexaIntro:: @ 8174BCA +VictoryRoad_3F_Text_AlexaIntro:: .string "TRAINERS live to seek stronger\n" .string "opponents.$" -VictoryRoad_3F_Text_AlexaDefeat:: @ 8174BF4 +VictoryRoad_3F_Text_AlexaDefeat:: .string "Oh!\n" .string "So strong!$" -VictoryRoad_3F_Text_AlexaPostBattle:: @ 8174C03 +VictoryRoad_3F_Text_AlexaPostBattle:: .string "By fighting tough battles, you get\n" .string "stronger.$" -VictoryRoad_3F_Text_CarolineIntro:: @ 8174C30 +VictoryRoad_3F_Text_CarolineIntro:: .string "I'll show you just how good you\n" .string "are. Not!$" -VictoryRoad_3F_Text_CarolineDefeat:: @ 8174C5A +VictoryRoad_3F_Text_CarolineDefeat:: .string "I'm furious!$" -VictoryRoad_3F_Text_CarolinePostBattle:: @ 8174C67 +VictoryRoad_3F_Text_CarolinePostBattle:: .string "You showed me just how good\n" .string "I was…$" -VictoryRoad_3F_Text_ColbyIntro:: @ 8174C8A +VictoryRoad_3F_Text_ColbyIntro:: .string "Only the chosen can pass here!$" -VictoryRoad_3F_Text_ColbyDefeat:: @ 8174CA9 +VictoryRoad_3F_Text_ColbyDefeat:: .string "I don't believe it!$" -VictoryRoad_3F_Text_ColbyPostBattle:: @ 8174CBD +VictoryRoad_3F_Text_ColbyPostBattle:: .string "All TRAINERS here are headed to\n" .string "the POKéMON LEAGUE.\p" .string "Don't let down your guard.$" -VictoryRoad_3F_Text_RayIntro:: @ 8174D0C +VictoryRoad_3F_Text_RayIntro:: .string "RAY: Together, the two of us are\n" .string "destined for greatness!$" -VictoryRoad_3F_Text_RayDefeat:: @ 8174D45 +VictoryRoad_3F_Text_RayDefeat:: .string "RAY: Ludicrous!\n" .string "This can't be!$" -VictoryRoad_3F_Text_RayPostBattle:: @ 8174D64 +VictoryRoad_3F_Text_RayPostBattle:: .string "RAY: You've beaten us.\n" .string "Greatness remains elusive…$" -VictoryRoad_3F_Text_RayNotEnoughMons:: @ 8174D96 +VictoryRoad_3F_Text_RayNotEnoughMons:: .string "RAY: Together, the two of us are\n" .string "striving for the pinnacle.\p" .string "We need you to bring two POKéMON\n" .string "into battle with us.$" -VictoryRoad_3F_Text_TyraIntro:: @ 8174E08 +VictoryRoad_3F_Text_TyraIntro:: .string "TYRA: We're trying to become\n" .string "champions together.$" -VictoryRoad_3F_Text_TyraDefeat:: @ 8174E39 +VictoryRoad_3F_Text_TyraDefeat:: .string "TYRA: Oh, but…$" -VictoryRoad_3F_Text_TyraPostBattle:: @ 8174E48 +VictoryRoad_3F_Text_TyraPostBattle:: .string "TYRA: You've taught me that power\n" .string "can be infinite in shape and form.$" -VictoryRoad_3F_Text_TyraNotEnoughMons:: @ 8174E8D +VictoryRoad_3F_Text_TyraNotEnoughMons:: .string "TYRA: You can't battle with us if\n" .string "you have only one POKéMON.$" diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 864788ccf..c1b735a6d 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -2,11 +2,11 @@ .set LOCALID_TUTORIAL_MAN, 4 .set LOCALID_WOMAN, 5 -ViridianCity_MapScripts:: @ 81658D3 +ViridianCity_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition .byte 0 -ViridianCity_OnTransition:: @ 81658D9 +ViridianCity_OnTransition:: setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 call_if_eq ViridianCity_EventScript_SetOldManBlockingRoad @@ -18,23 +18,23 @@ ViridianCity_OnTransition:: @ 81658D9 call_if_eq ViridianCity_EventScript_TryUnlockGym end -ViridianCity_EventScript_SetOldManNormal:: @ 8165909 +ViridianCity_EventScript_SetOldManNormal:: setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_1 return -ViridianCity_EventScript_SetOldManStandingByRoad:: @ 816590F +ViridianCity_EventScript_SetOldManStandingByRoad:: setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_1 setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 8 setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_LOOK_AROUND return -ViridianCity_EventScript_SetOldManBlockingRoad:: @ 8165920 +ViridianCity_EventScript_SetOldManBlockingRoad:: setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_OLD_MAN_LYING_DOWN setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 11 setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_FACE_DOWN return -ViridianCity_EventScript_TryUnlockGym:: @ 8165931 +ViridianCity_EventScript_TryUnlockGym:: goto_if_unset FLAG_BADGE02_GET, EventScript_Return goto_if_unset FLAG_BADGE03_GET, EventScript_Return goto_if_unset FLAG_BADGE04_GET, EventScript_Return @@ -44,7 +44,7 @@ ViridianCity_EventScript_TryUnlockGym:: @ 8165931 setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 return -ViridianCity_EventScript_GymDoorLocked:: @ 816596D +ViridianCity_EventScript_GymDoorLocked:: lockall textcolor 3 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp @@ -57,36 +57,36 @@ ViridianCity_EventScript_GymDoorLocked:: @ 816596D releaseall end -ViridianCity_Movement_JumpDownLedge:: @ 8165992 +ViridianCity_Movement_JumpDownLedge:: jump_2_down step_end -ViridianCity_EventScript_CitySign:: @ 8165994 +ViridianCity_EventScript_CitySign:: msgbox ViridianCity_Text_CitySign, MSGBOX_SIGN end -ViridianCity_EventScript_TrainerTips1:: @ 816599D +ViridianCity_EventScript_TrainerTips1:: msgbox ViridianCity_Text_CatchMonsForEasierBattles, MSGBOX_SIGN end -ViridianCity_EventScript_TrainerTips2:: @ 81659A6 +ViridianCity_EventScript_TrainerTips2:: msgbox ViridianCity_Text_MovesLimitedByPP, MSGBOX_SIGN end -ViridianCity_EventScript_GymSign:: @ 81659AF +ViridianCity_EventScript_GymSign:: msgbox ViridianCity_Text_GymSign, MSGBOX_SIGN end -ViridianCity_EventScript_GymDoor:: @ 81659B8 +ViridianCity_EventScript_GymDoor:: msgbox ViridianCity_Text_GymDoorsAreLocked, MSGBOX_SIGN end -ViridianCity_EventScript_Boy:: @ 81659C1 +ViridianCity_EventScript_Boy:: msgbox ViridianCity_Text_CanCarryMonsAnywhere, MSGBOX_NPC end @ Other old man, not the tutorial old man -ViridianCity_EventScript_OldMan:: @ 81659CA +ViridianCity_EventScript_OldMan:: lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1 @@ -98,12 +98,12 @@ ViridianCity_EventScript_OldMan:: @ 81659CA release end -ViridianCity_EventScript_OldManGymLeaderReturned:: @ 81659EC +ViridianCity_EventScript_OldManGymLeaderReturned:: msgbox ViridianCity_Text_ViridiansGymLeaderReturned release end -ViridianCity_EventScript_TutorialOldMan:: @ 81659F6 +ViridianCity_EventScript_TutorialOldMan:: lock faceplayer goto_if_set FLAG_BADGE01_GET, ViridianCity_EventScript_AskIfTeachyTVHelpful @@ -115,7 +115,7 @@ ViridianCity_EventScript_TutorialOldMan:: @ 81659F6 goto_if_eq ViridianCity_EventScript_TutorialNotReady end -ViridianCity_EventScript_AskIfTeachyTVHelpful:: @ 8165A23 +ViridianCity_EventScript_AskIfTeachyTVHelpful:: msgbox ViridianCity_Text_HowsTeachyTVHelping, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq ViridianCity_EventScript_TeachyTVNotHelpful @@ -123,29 +123,29 @@ ViridianCity_EventScript_AskIfTeachyTVHelpful:: @ 8165A23 release end -ViridianCity_EventScript_TeachyTVNotHelpful:: @ 8165A40 +ViridianCity_EventScript_TeachyTVNotHelpful:: msgbox ViridianCity_Text_TooBusyForTeachyTV release end -ViridianCity_EventScript_TutorialCompleted:: @ 8165A4A +ViridianCity_EventScript_TutorialCompleted:: msgbox ViridianCity_Text_WeakenMonsFirstToCatch release end -ViridianCity_EventScript_TutorialStart:: @ 8165A54 +ViridianCity_EventScript_TutorialStart:: call ViridianCity_EventScript_DoTutorialBattle release end @ Unused -ViridianCity_EventScript_WatchToLearnBasics:: @ 8165A5B +ViridianCity_EventScript_WatchToLearnBasics:: msgbox ViridianCity_Text_WatchThatToLearnBasics release end @ Unused. Starts battle after the post battle text, which is odd. -ViridianCity_EventScript_TutorialUnused:: @ 8165A65 +ViridianCity_EventScript_TutorialUnused:: msgbox ViridianCity_Text_ThatWasEducationalTakeThis goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording @@ -154,13 +154,13 @@ ViridianCity_EventScript_TutorialUnused:: @ 8165A65 release end -ViridianCity_EventScript_TutorialNotReady:: @ 8165A84 +ViridianCity_EventScript_TutorialNotReady:: msgbox ViridianCity_Text_ThisIsPrivateProperty closemessage release end -ViridianCity_EventScript_Youngster:: @ 8165A8F +ViridianCity_EventScript_Youngster:: lock faceplayer msgbox ViridianCity_Text_WantToKnowAboutCaterpillarMons, MSGBOX_YESNO @@ -170,17 +170,17 @@ ViridianCity_EventScript_Youngster:: @ 8165A8F goto_if_eq ViridianCity_EventScript_YoungsterDeclineExplanation end -ViridianCity_EventScript_YoungsterExplainCaterpillars:: @ 8165AB0 +ViridianCity_EventScript_YoungsterExplainCaterpillars:: msgbox ViridianCity_Text_ExplainCaterpieWeedle release end -ViridianCity_EventScript_YoungsterDeclineExplanation:: @ 8165ABA +ViridianCity_EventScript_YoungsterDeclineExplanation:: msgbox ViridianCity_Text_OhOkayThen release end -ViridianCity_EventScript_Woman:: @ 8165AC4 +ViridianCity_EventScript_Woman:: lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0 @@ -189,7 +189,7 @@ ViridianCity_EventScript_Woman:: @ 8165AC4 release end -ViridianCity_EventScript_WomanRoadBlocked:: @ 8165ADB +ViridianCity_EventScript_WomanRoadBlocked:: msgbox ViridianCity_Text_GrandpaHasntHadCoffeeYet closemessage applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection @@ -197,11 +197,11 @@ ViridianCity_EventScript_WomanRoadBlocked:: @ 8165ADB release end -ViridianCity_EventScript_DreamEaterTutor:: @ 8165AF0 +ViridianCity_EventScript_DreamEaterTutor:: goto EventScript_DreamEaterTutor end -ViridianCity_EventScript_RoadBlocked:: @ 8165AF6 +ViridianCity_EventScript_RoadBlocked:: lockall textcolor 0 msgbox ViridianCity_Text_ThisIsPrivateProperty @@ -211,11 +211,11 @@ ViridianCity_EventScript_RoadBlocked:: @ 8165AF6 releaseall end -ViridianCity_Movement_WalkDown:: @ 8165B0E +ViridianCity_Movement_WalkDown:: walk_down step_end -ViridianCity_EventScript_TutorialTriggerLeft:: @ 8165B10 +ViridianCity_EventScript_TutorialTriggerLeft:: lockall textcolor 0 applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestLeft @@ -226,7 +226,7 @@ ViridianCity_EventScript_TutorialTriggerLeft:: @ 8165B10 release end -ViridianCity_EventScript_TutorialTriggerRight:: @ 8165B2E +ViridianCity_EventScript_TutorialTriggerRight:: lockall textcolor 0 applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestRight @@ -237,7 +237,7 @@ ViridianCity_EventScript_TutorialTriggerRight:: @ 8165B2E release end -ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C +ViridianCity_EventScript_DoTutorialBattle:: msgbox ViridianCity_Text_ShowYouHowToCatchMons closemessage goto_if_questlog EventScript_ReleaseEnd diff --git a/data/maps/ViridianCity/text.inc b/data/maps/ViridianCity/text.inc index d029c942d..7293afb81 100644 --- a/data/maps/ViridianCity/text.inc +++ b/data/maps/ViridianCity/text.inc @@ -1,47 +1,47 @@ -ViridianCity_Text_CanCarryMonsAnywhere:: @ 817DABB +ViridianCity_Text_CanCarryMonsAnywhere:: .string "Those POKé BALLS at your waist!\n" .string "You have POKéMON, don't you?\p" .string "It's great that you can carry and\n" .string "use POKéMON anytime, anywhere.$" -ViridianCity_Text_GymClosedWonderWhoLeaderIs:: @ 817DB39 +ViridianCity_Text_GymClosedWonderWhoLeaderIs:: .string "This POKéMON GYM is always closed.\p" .string "I wonder who the LEADER is?$" -ViridianCity_Text_ViridiansGymLeaderReturned:: @ 817DB78 +ViridianCity_Text_ViridiansGymLeaderReturned:: .string "VIRIDIAN GYM's LEADER returned!$" -ViridianCity_Text_WantToKnowAboutCaterpillarMons:: @ 817DB98 +ViridianCity_Text_WantToKnowAboutCaterpillarMons:: .string "You want to know about the two\n" .string "kinds of caterpillar POKéMON?$" -ViridianCity_Text_OhOkayThen:: @ 817DBD5 +ViridianCity_Text_OhOkayThen:: .string "Oh, okay then!$" -ViridianCity_Text_ExplainCaterpieWeedle:: @ 817DBE4 +ViridianCity_Text_ExplainCaterpieWeedle:: .string "CATERPIE has no poison,\n" .string "but WEEDLE does.\p" .string "Watch that your POKéMON aren't\n" .string "stabbed by WEEDLE's POISON STING.$" -ViridianCity_Text_GrandpaHasntHadCoffeeYet:: @ 817DC4E +ViridianCity_Text_GrandpaHasntHadCoffeeYet:: .string "Oh, Grandpa!\n" .string "Don't be so mean!\p" .string "I'm so sorry.\n" .string "He hasn't had his coffee yet.$" -ViridianCity_Text_GoShoppingInPewterOccasionally:: @ 817DC99 +ViridianCity_Text_GoShoppingInPewterOccasionally:: .string "I go shopping in PEWTER CITY\n" .string "occasionally.\p" .string "I have to take the winding trail in\n" .string "VIRIDIAN FOREST when I go.$" -ViridianCity_Text_ThisIsPrivateProperty:: @ 817DD03 +ViridianCity_Text_ThisIsPrivateProperty:: .string "I absolutely forbid you from\n" .string "going through here!\p" .string "This is private property!$" -ViridianCity_Text_ShowYouHowToCatchMons:: @ 817DD4E +ViridianCity_Text_ShowYouHowToCatchMons:: .string "Well, now, I've had my coffee, and\n" .string "that's what I need to get going!\p" .string "Hm?\n" @@ -58,18 +58,18 @@ ViridianCity_Text_ShowYouHowToCatchMons:: @ 817DD4E .string "I suppose I had better show you\n" .string "then!$" -ViridianCity_Text_ThatWasEducationalTakeThis:: @ 817DE9B +ViridianCity_Text_ThatWasEducationalTakeThis:: .string "There! Now tell me, that was\n" .string "educational, was it not?\p" .string "And here, take this, too.$" -ViridianCity_Text_WatchThatToLearnBasics:: @ 817DEEB +ViridianCity_Text_WatchThatToLearnBasics:: .string "If there's something you don't\n" .string "understand, watch that.\p" .string "It will teach you about the basics\n" .string "of being a POKéMON TRAINER.$" -ViridianCity_Text_WeakenMonsFirstToCatch:: @ 817DF61 +ViridianCity_Text_WeakenMonsFirstToCatch:: .string "Well, now, I've had my coffee, and\n" .string "that's what I need to get going!\p" .string "But I made it too strong.\n" @@ -79,7 +79,7 @@ ViridianCity_Text_WeakenMonsFirstToCatch:: @ 817DF61 .string "At first, focus on weakening the\n" .string "POKéMON before trying to catch it.$" -ViridianCity_Text_HowsTeachyTVHelping:: @ 817E046 +ViridianCity_Text_HowsTeachyTVHelping:: .string "Well, now, I've had my coffee, and\n" .string "that's what I need to get going!\p" .string "But I made it too strong.\n" @@ -87,39 +87,39 @@ ViridianCity_Text_HowsTeachyTVHelping:: @ 817E046 .string "Incidentally, is my old TEACHY TV\n" .string "helping you?$" -ViridianCity_Text_MyGrandsonOnTheShow:: @ 817E0EA +ViridianCity_Text_MyGrandsonOnTheShow:: .string "Wahaha!\n" .string "It's my grandson on the show!\p" .string "Since he's the one doing the\n" .string "teaching, you're bound to learn.$" -ViridianCity_Text_TooBusyForTeachyTV:: @ 817E14E +ViridianCity_Text_TooBusyForTeachyTV:: .string "Hm… You're too busy to not even\n" .string "have the time for TEACHY TV…\p" .string "Time is money, and neither should\n" .string "be ill spent…$" -ViridianCity_Text_CitySign:: @ 817E1BB +ViridianCity_Text_CitySign:: .string "VIRIDIAN CITY \n" .string "The Eternally Green Paradise$" -ViridianCity_Text_CatchMonsForEasierBattles:: @ 817E1E7 +ViridianCity_Text_CatchMonsForEasierBattles:: .string "TRAINER TIPS\p" .string "Catch POKéMON and expand your\n" .string "collection.\p" .string "The more you have, the easier it\n" .string "is to battle.$" -ViridianCity_Text_MovesLimitedByPP:: @ 817E24D +ViridianCity_Text_MovesLimitedByPP:: .string "TRAINER TIPS\p" .string "The battle moves of POKéMON are\n" .string "limited by their POWER POINTS, PP.\p" .string "To replenish PP, rest your tired\n" .string "POKéMON at a POKéMON CENTER.$" -ViridianCity_Text_GymSign:: @ 817E2DB +ViridianCity_Text_GymSign:: .string "VIRIDIAN CITY POKéMON GYM$" -ViridianCity_Text_GymDoorsAreLocked:: @ 817E2F5 +ViridianCity_Text_GymDoorsAreLocked:: .string "VIRIDIAN GYM's doors are locked…$" diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc index 397337837..a7fad40be 100644 --- a/data/maps/ViridianCity_Gym/scripts.inc +++ b/data/maps/ViridianCity_Gym/scripts.inc @@ -1,9 +1,9 @@ .set LOCALID_GIOVANNI, 8 -ViridianCity_Gym_MapScripts:: @ 8169EC9 +ViridianCity_Gym_MapScripts:: .byte 0 -ViridianCity_Gym_EventScript_Giovanni:: @ 8169ECA +ViridianCity_Gym_EventScript_Giovanni:: famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005 trainerbattle_single TRAINER_LEADER_GIOVANNI, ViridianCity_Gym_Text_GiovanniIntro, ViridianCity_Gym_Text_GiovanniDefeat, ViridianCity_Gym_EventScript_DefeatedGiovanni, NO_MUSIC goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, ViridianCity_Gym_EventScript_GiveTM26 @@ -15,7 +15,7 @@ ViridianCity_Gym_EventScript_Giovanni:: @ 8169ECA release end -ViridianCity_Gym_EventScript_DefeatedGiovanni:: @ 8169F04 +ViridianCity_Gym_EventScript_DefeatedGiovanni:: famechecker FAMECHECKER_GIOVANNI, 3 setflag FLAG_HIDE_MISC_KANTO_ROCKETS setflag FLAG_DEFEATED_LEADER_GIOVANNI @@ -25,7 +25,7 @@ ViridianCity_Gym_EventScript_DefeatedGiovanni:: @ 8169F04 goto ViridianCity_Gym_EventScript_GiveTM26 end -ViridianCity_Gym_EventScript_GiveTM26:: @ 8169F2F +ViridianCity_Gym_EventScript_GiveTM26:: msgbox ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis checkitemspace ITEM_TM26, 1 compare VAR_RESULT, FALSE @@ -36,52 +36,52 @@ ViridianCity_Gym_EventScript_GiveTM26:: @ 8169F2F release end -ViridianCity_Gym_EventScript_NoRoomForTM26:: @ 8169F70 +ViridianCity_Gym_EventScript_NoRoomForTM26:: msgbox ViridianCity_Gym_Text_YouDoNotHaveSpace release end -ViridianCity_Gym_EventScript_Jason:: @ 8169F7A +ViridianCity_Gym_EventScript_Jason:: trainerbattle_single TRAINER_TAMER_JASON, ViridianCity_Gym_Text_JasonIntro, ViridianCity_Gym_Text_JasonDefeat msgbox ViridianCity_Gym_Text_JasonPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_Cole:: @ 8169F91 +ViridianCity_Gym_EventScript_Cole:: trainerbattle_single TRAINER_TAMER_COLE, ViridianCity_Gym_Text_ColeIntro, ViridianCity_Gym_Text_ColeDefeat msgbox ViridianCity_Gym_Text_ColePostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_Atsushi:: @ 8169FA8 +ViridianCity_Gym_EventScript_Atsushi:: trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, ViridianCity_Gym_Text_AtsushiIntro, ViridianCity_Gym_Text_AtsushiDefeat msgbox ViridianCity_Gym_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_Kiyo:: @ 8169FBF +ViridianCity_Gym_EventScript_Kiyo:: trainerbattle_single TRAINER_BLACK_BELT_KIYO, ViridianCity_Gym_Text_KiyoIntro, ViridianCity_Gym_Text_KiyoDefeat msgbox ViridianCity_Gym_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_Takashi:: @ 8169FD6 +ViridianCity_Gym_EventScript_Takashi:: trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, ViridianCity_Gym_Text_TakashiIntro, ViridianCity_Gym_Text_TakashiDefeat msgbox ViridianCity_Gym_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_Samuel:: @ 8169FED +ViridianCity_Gym_EventScript_Samuel:: trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, ViridianCity_Gym_Text_SamuelIntro, ViridianCity_Gym_Text_SamuelDefeat msgbox ViridianCity_Gym_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_Yuji:: @ 816A004 +ViridianCity_Gym_EventScript_Yuji:: trainerbattle_single TRAINER_COOLTRAINER_YUJI, ViridianCity_Gym_Text_YujiIntro, ViridianCity_Gym_Text_YujiDefeat msgbox ViridianCity_Gym_Text_YujiPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_Warren:: @ 816A01B +ViridianCity_Gym_EventScript_Warren:: trainerbattle_single TRAINER_COOLTRAINER_WARREN, ViridianCity_Gym_Text_WarrenIntro, ViridianCity_Gym_Text_WarrenDefeat msgbox ViridianCity_Gym_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE end -ViridianCity_Gym_EventScript_GymGuy:: @ 816A032 +ViridianCity_Gym_EventScript_GymGuy:: lock faceplayer goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, ViridianCity_Gym_EventScript_GymGuyPostVictory @@ -89,20 +89,20 @@ ViridianCity_Gym_EventScript_GymGuy:: @ 816A032 release end -ViridianCity_Gym_EventScript_GymGuyPostVictory:: @ 816A047 +ViridianCity_Gym_EventScript_GymGuyPostVictory:: famechecker FAMECHECKER_GIOVANNI, 4 msgbox ViridianCity_Gym_Text_GymGuyPostVictory release end -ViridianCity_Gym_EventScript_GymStatue:: @ 816A05E +ViridianCity_Gym_EventScript_GymStatue:: lockall goto_if_set FLAG_BADGE08_GET, ViridianCity_Gym_EventScript_GymStatuePostVictory msgbox ViridianCity_Gym_Text_GymStatue releaseall end -ViridianCity_Gym_EventScript_GymStatuePostVictory:: @ 816A072 +ViridianCity_Gym_EventScript_GymStatuePostVictory:: msgbox ViridianCity_Gym_Text_GymStatuePlayerWon releaseall end diff --git a/data/maps/ViridianCity_Gym/text.inc b/data/maps/ViridianCity_Gym/text.inc index 44ee4d9bb..40b6ccc8a 100644 --- a/data/maps/ViridianCity_Gym/text.inc +++ b/data/maps/ViridianCity_Gym/text.inc @@ -1,4 +1,4 @@ -ViridianCity_Gym_Text_GiovanniIntro:: @ 818F352 +ViridianCity_Gym_Text_GiovanniIntro:: .string "Fwahahaha!\n" .string "Welcome to my hideout!\p" .string "It shall be so until I can restore\n" @@ -9,14 +9,14 @@ ViridianCity_Gym_Text_GiovanniIntro:: @ 818F352 .string "Once more, you shall face\n" .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ENCOUNTER_ROCKET}$" -ViridianCity_Gym_Text_GiovanniDefeat:: @ 818F43F +ViridianCity_Gym_Text_GiovanniDefeat:: .string "Ha!\n" .string "That was a truly intense fight.\l" .string "You have won!\p" .string "As proof, here is the EARTHBADGE!\n" .string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$" -ViridianCity_Gym_Text_GiovanniPostBattle:: @ 818F4A2 +ViridianCity_Gym_Text_GiovanniPostBattle:: .string "Having lost in this fashion, \n" .string "I can't face my followers.\l" .string "I have betrayed their trust.\p" @@ -27,7 +27,7 @@ ViridianCity_Gym_Text_GiovanniPostBattle:: @ 818F4A2 .string "Let us meet again someday!\n" .string "Farewell!$" -ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis:: @ 818F586 +ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis:: .string "The EARTHBADGE makes POKéMON of\n" .string "any level obey without question.\p" .string "It is evidence of your mastery as\n" @@ -38,111 +38,111 @@ ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis:: @ 818F586 .string "Consider it a gift for your POKéMON\n" .string "LEAGUE challenge.$" -ViridianCity_Gym_Text_ReceivedTM26FromGiovanni:: @ 818F675 +ViridianCity_Gym_Text_ReceivedTM26FromGiovanni:: .string "{PLAYER} received TM26\n" .string "from GIOVANNI.$" -ViridianCity_Gym_Text_ExplainTM26:: @ 818F695 +ViridianCity_Gym_Text_ExplainTM26:: .string "TM26 contains EARTHQUAKE.\p" .string "It is a powerful attack that causes\n" .string "a massive tremor.\p" .string "I made it when I ran the GYM here,\n" .string "far too long ago… $" -ViridianCity_Gym_Text_YouDoNotHaveSpace:: @ 818F71B +ViridianCity_Gym_Text_YouDoNotHaveSpace:: .string "You do not have space for this!$" -ViridianCity_Gym_Text_YujiIntro:: @ 818F73B +ViridianCity_Gym_Text_YujiIntro:: .string "Heh!\n" .string "You must be running out of steam\l" .string "by now!$" -ViridianCity_Gym_Text_YujiDefeat:: @ 818F769 +ViridianCity_Gym_Text_YujiDefeat:: .string "I ran out of gas!$" -ViridianCity_Gym_Text_YujiPostBattle:: @ 818F77B +ViridianCity_Gym_Text_YujiPostBattle:: .string "You'll need power to keep up with\n" .string "our GYM LEADER.$" -ViridianCity_Gym_Text_AtsushiIntro:: @ 818F7AD +ViridianCity_Gym_Text_AtsushiIntro:: .string "Rrrroar!\n" .string "I'm working myself into a rage!$" -ViridianCity_Gym_Text_AtsushiDefeat:: @ 818F7D6 +ViridianCity_Gym_Text_AtsushiDefeat:: .string "Wargh!$" -ViridianCity_Gym_Text_AtsushiPostBattle:: @ 818F7DD +ViridianCity_Gym_Text_AtsushiPostBattle:: .string "I'm still not worthy!$" -ViridianCity_Gym_Text_JasonIntro:: @ 818F7F3 +ViridianCity_Gym_Text_JasonIntro:: .string "POKéMON and I, we make wonderful\n" .string "music together!$" -ViridianCity_Gym_Text_JasonDefeat:: @ 818F824 +ViridianCity_Gym_Text_JasonDefeat:: .string "You are in perfect harmony!$" -ViridianCity_Gym_Text_JasonPostBattle:: @ 818F840 +ViridianCity_Gym_Text_JasonPostBattle:: .string "Do you know the identity of our\n" .string "GYM LEADER?$" -ViridianCity_Gym_Text_KiyoIntro:: @ 818F86C +ViridianCity_Gym_Text_KiyoIntro:: .string "Karate is the ultimate form of\n" .string "martial arts!$" -ViridianCity_Gym_Text_KiyoDefeat:: @ 818F899 +ViridianCity_Gym_Text_KiyoDefeat:: .string "Aiyah!$" -ViridianCity_Gym_Text_KiyoPostBattle:: @ 818F8A0 +ViridianCity_Gym_Text_KiyoPostBattle:: .string "If my POKéMON were as good at\n" .string "karate as I…$" -ViridianCity_Gym_Text_WarrenIntro:: @ 818F8CB +ViridianCity_Gym_Text_WarrenIntro:: .string "The truly talented win with style.$" -ViridianCity_Gym_Text_WarrenDefeat:: @ 818F8EE +ViridianCity_Gym_Text_WarrenDefeat:: .string "I lost my grip!$" -ViridianCity_Gym_Text_WarrenPostBattle:: @ 818F8FE +ViridianCity_Gym_Text_WarrenPostBattle:: .string "The LEADER will scold me for\n" .string "losing this way…$" -ViridianCity_Gym_Text_TakashiIntro:: @ 818F92C +ViridianCity_Gym_Text_TakashiIntro:: .string "I'm the KARATE KING!\n" .string "Your fate rests with me!$" -ViridianCity_Gym_Text_TakashiDefeat:: @ 818F95A +ViridianCity_Gym_Text_TakashiDefeat:: .string "Ayah!$" -ViridianCity_Gym_Text_TakashiPostBattle:: @ 818F960 +ViridianCity_Gym_Text_TakashiPostBattle:: .string "The POKéMON LEAGUE?\n" .string "You? Don't get cocky!$" -ViridianCity_Gym_Text_ColeIntro:: @ 818F98A +ViridianCity_Gym_Text_ColeIntro:: .string "Your POKéMON will cower at the\n" .string "crack of my whip!$" -ViridianCity_Gym_Text_ColeDefeat:: @ 818F9BB +ViridianCity_Gym_Text_ColeDefeat:: .string "Yowch!\n" .string "Whiplash!$" -ViridianCity_Gym_Text_ColePostBattle:: @ 818F9CC +ViridianCity_Gym_Text_ColePostBattle:: .string "Wait!\n" .string "I was just careless!$" -ViridianCity_Gym_Text_SamuelIntro:: @ 818F9E7 +ViridianCity_Gym_Text_SamuelIntro:: .string "VIRIDIAN GYM was closed for a\n" .string "long time.\p" .string "But now, our LEADER is back!$" -ViridianCity_Gym_Text_SamuelDefeat:: @ 818FA2D +ViridianCity_Gym_Text_SamuelDefeat:: .string "I was beaten?$" -ViridianCity_Gym_Text_SamuelPostBattle:: @ 818FA3B +ViridianCity_Gym_Text_SamuelPostBattle:: .string "You can go on to the POKéMON\n" .string "LEAGUE only by defeating our GYM\l" .string "LEADER!$" -ViridianCity_Gym_Text_GymGuyAdvice:: @ 818FA81 +ViridianCity_Gym_Text_GymGuyAdvice:: .string "Yo!\n" .string "Champ in the making!\p" .string "Even I don't know the VIRIDIAN\n" @@ -153,17 +153,17 @@ ViridianCity_Gym_Text_GymGuyAdvice:: @ 818FA81 .string "Also, I heard that the TRAINERS\n" .string "here like GROUND-type POKéMON.$" -ViridianCity_Gym_Text_GymGuyPostVictory:: @ 818FB56 +ViridianCity_Gym_Text_GymGuyPostVictory:: .string "Blow me away! GIOVANNI was the\n" .string "GYM LEADER of VIRIDIAN?$" -ViridianCity_Gym_Text_GymStatue:: @ 818FB8D +ViridianCity_Gym_Text_GymStatue:: .string "VIRIDIAN POKéMON GYM\n" .string "LEADER: ?\p" .string "WINNING TRAINERS:\n" .string "{RIVAL}$" -ViridianCity_Gym_Text_GymStatuePlayerWon:: @ 818FBC1 +ViridianCity_Gym_Text_GymStatuePlayerWon:: .string "VIRIDIAN POKéMON GYM\n" .string "LEADER: GIOVANNI\p" .string "WINNING TRAINERS:\n" diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc index 0af4621cf..20b7b06d6 100644 --- a/data/maps/ViridianCity_House1/scripts.inc +++ b/data/maps/ViridianCity_House1/scripts.inc @@ -1,15 +1,15 @@ -ViridianCity_House1_MapScripts:: @ 8169E9A +ViridianCity_House1_MapScripts:: .byte 0 -ViridianCity_House1_EventScript_BaldingMan:: @ 8169E9B +ViridianCity_House1_EventScript_BaldingMan:: msgbox ViridianCity_House1_Text_NicknamingIsFun, MSGBOX_NPC end -ViridianCity_House1_EventScript_LittleGirl:: @ 8169EA4 +ViridianCity_House1_EventScript_LittleGirl:: msgbox ViridianCity_House1_Text_MyDaddyLovesMonsToo, MSGBOX_NPC end -ViridianCity_House1_EventScript_Speary:: @ 8169EAD +ViridianCity_House1_EventScript_Speary:: lock faceplayer waitse @@ -19,6 +19,6 @@ ViridianCity_House1_EventScript_Speary:: @ 8169EAD release end -ViridianCity_House1_EventScript_NicknameSign:: @ 8169EC0 +ViridianCity_House1_EventScript_NicknameSign:: msgbox ViridianCity_House1_Text_SpearowNameSpeary, MSGBOX_SIGN end diff --git a/data/maps/ViridianCity_House1/text.inc b/data/maps/ViridianCity_House1/text.inc index 15b066efa..83d3cec1a 100644 --- a/data/maps/ViridianCity_House1/text.inc +++ b/data/maps/ViridianCity_House1/text.inc @@ -1,16 +1,16 @@ -ViridianCity_House1_Text_NicknamingIsFun:: @ 818F292 +ViridianCity_House1_Text_NicknamingIsFun:: .string "Coming up with nicknames is fun,\n" .string "but it's not so easy to do.\p" .string "Clever names are nice, but simple\n" .string "names are easier to remember.$" -ViridianCity_House1_Text_MyDaddyLovesMonsToo:: @ 818F30F +ViridianCity_House1_Text_MyDaddyLovesMonsToo:: .string "My daddy loves POKéMON, too.$" -ViridianCity_House1_Text_Speary:: @ 818F32C +ViridianCity_House1_Text_Speary:: .string "SPEARY: Tetweet!$" -ViridianCity_House1_Text_SpearowNameSpeary:: @ 818F33D +ViridianCity_House1_Text_SpearowNameSpeary:: .string "SPEAROW\n" .string "Name: SPEARY$" diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc index 5458b0f4b..4b0a7d420 100644 --- a/data/maps/ViridianCity_House2/scripts.inc +++ b/data/maps/ViridianCity_House2/scripts.inc @@ -1,10 +1,10 @@ .set LOCALID_WOMAN, 1 .set LOCALID_LASS, 2 -ViridianCity_House2_MapScripts:: @ 816A07C +ViridianCity_House2_MapScripts:: .byte 0 -ViridianCity_House2_EventScript_Lass:: @ 816A07D +ViridianCity_House2_EventScript_Lass:: lock faceplayer msgbox ViridianCity_House2_Text_TryingToMemorizeNotes @@ -14,7 +14,7 @@ ViridianCity_House2_EventScript_Lass:: @ 816A07D release end -ViridianCity_House2_EventScript_Woman:: @ 816A094 +ViridianCity_House2_EventScript_Woman:: lock faceplayer msgbox ViridianCity_House2_Text_ReadBlackboardCarefully @@ -24,7 +24,7 @@ ViridianCity_House2_EventScript_Woman:: @ 816A094 release end -ViridianCity_House2_EventScript_Notebook:: @ 816A0AB +ViridianCity_House2_EventScript_Notebook:: lockall msgbox ViridianCity_House2_Text_NotebookFirstPage msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO @@ -46,17 +46,17 @@ ViridianCity_House2_EventScript_Notebook:: @ 816A0AB releaseall end -ViridianCity_House2_EventScript_StopReadingNotebook:: @ 816A11B +ViridianCity_House2_EventScript_StopReadingNotebook:: releaseall end -ViridianCity_House2_EventScript_Blackboard:: @ 816A11D +ViridianCity_House2_EventScript_Blackboard:: lockall msgbox ViridianCity_House2_Text_BlackboardListsStatusProblems goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -ViridianCity_House2_EventScript_ChooseBlackboardTopic:: @ 816A12C +ViridianCity_House2_EventScript_ChooseBlackboardTopic:: message ViridianCity_House2_Text_ReadWhichTopic waitmessage multichoicegrid 7, 1, MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD, 3, FALSE @@ -70,31 +70,31 @@ ViridianCity_House2_EventScript_ChooseBlackboardTopic:: @ 816A12C case 127, ViridianCity_House2_EventScript_ExitBlackboard end -ViridianCity_House2_EventScript_ReadSleep:: @ 816A18B +ViridianCity_House2_EventScript_ReadSleep:: msgbox ViridianCity_House2_Text_ExplainSleep goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -ViridianCity_House2_EventScript_ReadBurn:: @ 816A199 +ViridianCity_House2_EventScript_ReadBurn:: msgbox ViridianCity_House2_Text_ExplainBurn goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -ViridianCity_House2_EventScript_ReadPoison:: @ 816A1A7 +ViridianCity_House2_EventScript_ReadPoison:: msgbox ViridianCity_House2_Text_ExplainPoison goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -ViridianCity_House2_EventScript_ReadFreeze:: @ 816A1B5 +ViridianCity_House2_EventScript_ReadFreeze:: msgbox ViridianCity_House2_Text_ExplainFreeze goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -ViridianCity_House2_EventScript_ReadParalysis:: @ 816A1C3 +ViridianCity_House2_EventScript_ReadParalysis:: msgbox ViridianCity_House2_Text_ExplainParalysis goto ViridianCity_House2_EventScript_ChooseBlackboardTopic end -ViridianCity_House2_EventScript_ExitBlackboard:: @ 816A1D1 +ViridianCity_House2_EventScript_ExitBlackboard:: releaseall end diff --git a/data/maps/ViridianCity_House2/text.inc b/data/maps/ViridianCity_House2/text.inc index 176bb713a..0d3cc3ab9 100644 --- a/data/maps/ViridianCity_House2/text.inc +++ b/data/maps/ViridianCity_House2/text.inc @@ -1,13 +1,13 @@ -ViridianCity_House2_Text_TryingToMemorizeNotes:: @ 818FC00 +ViridianCity_House2_Text_TryingToMemorizeNotes:: .string "Whew! I'm trying to memorize all my\n" .string "notes.$" -ViridianCity_House2_Text_ReadBlackboardCarefully:: @ 818FC2B +ViridianCity_House2_Text_ReadBlackboardCarefully:: .string "Okay!\p" .string "Be sure to read what's on the\n" .string "blackboard carefully!$" -ViridianCity_House2_Text_NotebookFirstPage:: @ 818FC65 +ViridianCity_House2_Text_NotebookFirstPage:: .string "Let's check out the notebook.\p" .string "First page…\p" .string "POKé BALLS are used to catch\n" @@ -17,14 +17,14 @@ ViridianCity_House2_Text_NotebookFirstPage:: @ 818FC65 .string "People who raise and battle\n" .string "with POKéMON are called TRAINERS.$" -ViridianCity_House2_Text_NotebookSecondPage:: @ 818FD23 +ViridianCity_House2_Text_NotebookSecondPage:: .string "Second page…\p" .string "A healthy POKéMON may be hard to\n" .string "catch, so weaken it first.\p" .string "Poison, burn, or cause another\n" .string "status problem to weaken it.$" -ViridianCity_House2_Text_NotebookThirdPage:: @ 818FDA8 +ViridianCity_House2_Text_NotebookThirdPage:: .string "Third page…\p" .string "POKéMON TRAINERS seek others to\n" .string "engage in POKéMON battles.\p" @@ -33,7 +33,7 @@ ViridianCity_House2_Text_NotebookThirdPage:: @ 818FDA8 .string "Battles are constantly waged at\n" .string "POKéMON GYMS everywhere.$" -ViridianCity_House2_Text_NotebookFourthPage:: @ 818FE5C +ViridianCity_House2_Text_NotebookFourthPage:: .string "Fourth page…\p" .string "The ultimate goal for all POKéMON\n" .string "TRAINERS is simple.\p" @@ -43,21 +43,21 @@ ViridianCity_House2_Text_NotebookFourthPage:: @ 818FE5C .string "The ELITE FOUR of the POKéMON\n" .string "LEAGUE!$" -ViridianCity_House2_Text_TurnThePage:: @ 818FF19 +ViridianCity_House2_Text_TurnThePage:: .string "Turn the page?$" -ViridianCity_House2_Text_HeyDontLookAtMyNotes:: @ 818FF28 +ViridianCity_House2_Text_HeyDontLookAtMyNotes:: .string "GIRL: Hey!\n" .string "Don't look at my notes!$" -ViridianCity_House2_Text_BlackboardListsStatusProblems:: @ 818FF4B +ViridianCity_House2_Text_BlackboardListsStatusProblems:: .string "The blackboard lists POKéMON\n" .string "STATUS problems during battles.$" -ViridianCity_House2_Text_ReadWhichTopic:: @ 818FF88 +ViridianCity_House2_Text_ReadWhichTopic:: .string "Which topic do you want to read?$" -ViridianCity_House2_Text_ExplainSleep:: @ 818FFA9 +ViridianCity_House2_Text_ExplainSleep:: .string "A POKéMON can't attack if it's\n" .string "asleep.\p" .string "POKéMON will stay asleep even\n" @@ -65,19 +65,19 @@ ViridianCity_House2_Text_ExplainSleep:: @ 818FFA9 .string "Use AWAKENING to awaken one\n" .string "from sleep.$" -ViridianCity_House2_Text_ExplainBurn:: @ 8190025 +ViridianCity_House2_Text_ExplainBurn:: .string "A burn reduces ATTACK power.\n" .string "It also causes ongoing HP loss.\p" .string "A burn remains after a battle.\n" .string "Use BURN HEAL to cure a burn.$" -ViridianCity_House2_Text_ExplainPoison:: @ 819009F +ViridianCity_House2_Text_ExplainPoison:: .string "When poisoned, a POKéMON's health\n" .string "steadily drops.\p" .string "Poison lingers after battles.\n" .string "Use an ANTIDOTE to cure poison!$" -ViridianCity_House2_Text_ExplainFreeze:: @ 819010F +ViridianCity_House2_Text_ExplainFreeze:: .string "A frozen POKéMON becomes\n" .string "helplessly immobile.\p" .string "It stays frozen even after the\n" @@ -85,7 +85,7 @@ ViridianCity_House2_Text_ExplainFreeze:: @ 819010F .string "Use ICE HEAL to thaw out the\n" .string "suffering POKéMON.$" -ViridianCity_House2_Text_ExplainParalysis:: @ 8190199 +ViridianCity_House2_Text_ExplainParalysis:: .string "Paralysis reduces SPEED and may\n" .string "prevent the POKéMON from moving.\p" .string "Paralysis remains after battles.\n" diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index da6d66923..3142b0500 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -1,24 +1,24 @@ .set LOCALID_CLERK, 1 -ViridianCity_Mart_MapScripts:: @ 816A1D3 +ViridianCity_Mart_MapScripts:: map_script MAP_SCRIPT_ON_LOAD, ViridianCity_Mart_OnLoad map_script MAP_SCRIPT_ON_FRAME_TABLE, ViridianCity_Mart_OnFrame .byte 0 -ViridianCity_Mart_OnLoad:: @ 816A1DE +ViridianCity_Mart_OnLoad:: goto_if_unset FLAG_SYS_POKEDEX_GET, ViridianCity_Mart_EventScript_HideQuestionnaire end -ViridianCity_Mart_EventScript_HideQuestionnaire:: @ 816A1E8 +ViridianCity_Mart_EventScript_HideQuestionnaire:: setmetatile 1, 3, METATILE_Mart_CounterMid_Top, 1 setmetatile 1, 4, METATILE_Mart_CounterMid_Bottom, 1 end -ViridianCity_Mart_OnFrame:: @ 816A1FB +ViridianCity_Mart_OnFrame:: map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, ViridianCity_Mart_EventScript_ParcelScene .2byte 0 -ViridianCity_Mart_EventScript_ParcelScene:: @ 816A205 +ViridianCity_Mart_EventScript_ParcelScene:: lockall textcolor 0 applymovement LOCALID_CLERK, Movement_WalkInPlaceFastestDown @@ -35,7 +35,7 @@ ViridianCity_Mart_EventScript_ParcelScene:: @ 816A205 releaseall end -ViridianCity_Mart_Movement_ApproachCounter:: @ 816A25C +ViridianCity_Mart_Movement_ApproachCounter:: walk_up walk_up walk_up @@ -43,7 +43,7 @@ ViridianCity_Mart_Movement_ApproachCounter:: @ 816A25C walk_in_place_fastest_left step_end -ViridianCity_Mart_Movement_FacePlayer:: @ 816A262 +ViridianCity_Mart_Movement_FacePlayer:: delay_16 delay_16 delay_16 @@ -51,7 +51,7 @@ ViridianCity_Mart_Movement_FacePlayer:: @ 816A262 walk_in_place_fastest_right step_end -ViridianCity_Mart_EventScript_Clerk:: @ 816A268 +ViridianCity_Mart_EventScript_Clerk:: lock faceplayer compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1 @@ -65,7 +65,7 @@ ViridianCity_Mart_EventScript_Clerk:: @ 816A268 end .align 2 -ViridianCity_Mart_Items:: @ 816A298 +ViridianCity_Mart_Items:: .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_ANTIDOTE @@ -74,15 +74,15 @@ ViridianCity_Mart_Items:: @ 816A298 release end -ViridianCity_Mart_EventScript_SayHiToOak:: @ 816A2A4 +ViridianCity_Mart_EventScript_SayHiToOak:: msgbox ViridianCity_Mart_Text_SayHiToOakForMe release end -ViridianCity_Mart_EventScript_Woman:: @ 816A2AE +ViridianCity_Mart_EventScript_Woman:: msgbox ViridianCity_Mart_Text_ShopDoesGoodBusinessInAntidotes, MSGBOX_NPC end -ViridianCity_Mart_EventScript_Youngster:: @ 816A2B7 +ViridianCity_Mart_EventScript_Youngster:: msgbox ViridianCity_Mart_Text_GotToBuySomePotions, MSGBOX_NPC end diff --git a/data/maps/ViridianCity_Mart/text.inc b/data/maps/ViridianCity_Mart/text.inc index c54f4220a..e07a63756 100644 --- a/data/maps/ViridianCity_Mart/text.inc +++ b/data/maps/ViridianCity_Mart/text.inc @@ -1,25 +1,25 @@ -ViridianCity_Mart_Text_YouCameFromPallet:: @ 819021A +ViridianCity_Mart_Text_YouCameFromPallet:: .string "Hey!\n" .string "You came from PALLET TOWN?$" -ViridianCity_Mart_Text_TakeThisToProfOak:: @ 819023A +ViridianCity_Mart_Text_TakeThisToProfOak:: .string "You know PROF. OAK, right?\p" .string "His order came in.\n" .string "Can I get you to take it to him?$" -ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk:: @ 8190289 +ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk:: .string "{PLAYER} received OAK'S PARCEL\n" .string "from the POKéMON MART clerk.$" -ViridianCity_Mart_Text_SayHiToOakForMe:: @ 81902BF +ViridianCity_Mart_Text_SayHiToOakForMe:: .string "Okay, thanks! Please say hi to\n" .string "PROF. OAK for me, too.$" -ViridianCity_Mart_Text_ShopDoesGoodBusinessInAntidotes:: @ 81902F5 +ViridianCity_Mart_Text_ShopDoesGoodBusinessInAntidotes:: .string "This shop does good business in\n" .string "ANTIDOTES, I've heard.$" -ViridianCity_Mart_Text_GotToBuySomePotions:: @ 819032C +ViridianCity_Mart_Text_GotToBuySomePotions:: .string "I've got to buy some POTIONS.\p" .string "You never know when your POKéMON\n" .string "will need quick healing.$" diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc index ca02e1113..ce6b68820 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc @@ -1,27 +1,27 @@ -ViridianCity_PokemonCenter_1F_MapScripts:: @ 816A2C0 +ViridianCity_PokemonCenter_1F_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_PokemonCenter_1F_OnTransition map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume .byte 0 -ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB +ViridianCity_PokemonCenter_1F_OnTransition:: setrespawn SPAWN_VIRIDIAN_CITY end -ViridianCity_PokemonCenter_1F_EventScript_Nurse:: @ 816A2CF +ViridianCity_PokemonCenter_1F_EventScript_Nurse:: lock faceplayer call EventScript_PkmnCenterNurse release end -ViridianCity_PokemonCenter_1F_EventScript_Boy:: @ 816A2D8 +ViridianCity_PokemonCenter_1F_EventScript_Boy:: msgbox ViridianCity_PokemonCenter_1F_Text_PokeCenterInEveryTown, MSGBOX_NPC end -ViridianCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816A2E1 +ViridianCity_PokemonCenter_1F_EventScript_Gentleman:: msgbox ViridianCity_PokemonCenter_1F_Text_FeelFreeToUsePC, MSGBOX_NPC end -ViridianCity_PokemonCenter_1F_EventScript_Youngster:: @ 816A2EA +ViridianCity_PokemonCenter_1F_EventScript_Youngster:: msgbox ViridianCity_PokemonCenter_1F_Text_PokeCentersHealMons, MSGBOX_NPC end diff --git a/data/maps/ViridianCity_PokemonCenter_1F/text.inc b/data/maps/ViridianCity_PokemonCenter_1F/text.inc index f0e636704..c4726b3cc 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/text.inc +++ b/data/maps/ViridianCity_PokemonCenter_1F/text.inc @@ -1,16 +1,16 @@ -ViridianCity_PokemonCenter_1F_Text_FeelFreeToUsePC:: @ 8190384 +ViridianCity_PokemonCenter_1F_Text_FeelFreeToUsePC:: .string "Please feel free to use that PC in\n" .string "the corner.\p" .string "The receptionist told me so.\n" .string "It's so kind of her!$" -ViridianCity_PokemonCenter_1F_Text_PokeCenterInEveryTown:: @ 81903E5 +ViridianCity_PokemonCenter_1F_Text_PokeCenterInEveryTown:: .string "There's a POKéMON CENTER in every\n" .string "town ahead.\p" .string "They charge no money, so don't\n" .string "be shy about healing POKéMON.$" -ViridianCity_PokemonCenter_1F_Text_PokeCentersHealMons:: @ 8190450 +ViridianCity_PokemonCenter_1F_Text_PokeCentersHealMons:: .string "POKéMON CENTERS heal your tired,\n" .string "hurt, or fainted POKéMON.\p" .string "They make all POKéMON completely\n" diff --git a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc index 58ada3f9f..a732914ca 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc +++ b/data/maps/ViridianCity_PokemonCenter_2F/scripts.inc @@ -1,4 +1,4 @@ -ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 +ViridianCity_PokemonCenter_2F_MapScripts:: map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad @@ -6,14 +6,14 @@ ViridianCity_PokemonCenter_2F_MapScripts:: @ 816A2F3 .byte 0 @ The below 3 are unused and leftover from RS -ViridianCity_PokemonCenter_2F_EventScript_Colosseum:: @ 816A308 +ViridianCity_PokemonCenter_2F_EventScript_Colosseum:: call CableClub_EventScript_Colosseum end -ViridianCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 816A30E +ViridianCity_PokemonCenter_2F_EventScript_TradeCenter:: call CableClub_EventScript_TradeCenter end -ViridianCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 816A314 +ViridianCity_PokemonCenter_2F_EventScript_RecordCorner:: call CableClub_EventScript_RecordCorner end diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc index a54fa1377..5bee9e264 100644 --- a/data/maps/ViridianForest/scripts.inc +++ b/data/maps/ViridianForest/scripts.inc @@ -1,64 +1,64 @@ -ViridianForest_MapScripts:: @ 816051F +ViridianForest_MapScripts:: map_script MAP_SCRIPT_ON_TRANSITION, ViridianForest_OnTransition .byte 0 -ViridianForest_OnTransition:: @ 8160525 +ViridianForest_OnTransition:: setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_FOREST end -ViridianForest_EventScript_Youngster:: @ 8160529 +ViridianForest_EventScript_Youngster:: msgbox ViridianForest_Text_FriendsItchingToBattle, MSGBOX_NPC end -ViridianForest_EventScript_Boy:: @ 8160532 +ViridianForest_EventScript_Boy:: msgbox ViridianForest_Text_RanOutOfPokeBalls, MSGBOX_NPC end -ViridianForest_EventScript_TrainerTips1:: @ 816053B +ViridianForest_EventScript_TrainerTips1:: msgbox ViridianForest_Text_AvoidGrassyAreasWhenWeak, MSGBOX_SIGN end -ViridianForest_EventScript_TrainerTips2:: @ 8160544 +ViridianForest_EventScript_TrainerTips2:: msgbox ViridianForest_Text_UseAntidoteForPoison, MSGBOX_SIGN end -ViridianForest_EventScript_TrainerTips3:: @ 816054D +ViridianForest_EventScript_TrainerTips3:: msgbox ViridianForest_Text_ContactOakViaPCToRatePokedex, MSGBOX_SIGN end -ViridianForest_EventScript_TrainerTips4:: @ 8160556 +ViridianForest_EventScript_TrainerTips4:: msgbox ViridianForest_Text_CantCatchOwnedMons, MSGBOX_SIGN end -ViridianForest_EventScript_TrainerTips5:: @ 816055F +ViridianForest_EventScript_TrainerTips5:: msgbox ViridianForest_Text_WeakenMonsBeforeCapture, MSGBOX_SIGN end -ViridianForest_EventScript_ExitSign:: @ 8160568 +ViridianForest_EventScript_ExitSign:: msgbox ViridianForest_Text_LeavingViridianForest, MSGBOX_SIGN end -ViridianForest_EventScript_Rick:: @ 8160571 +ViridianForest_EventScript_Rick:: trainerbattle_single TRAINER_BUG_CATCHER_RICK, ViridianForest_Text_RickIntro, ViridianForest_Text_RickDefeat msgbox ViridianForest_Text_RickPostBattle, MSGBOX_AUTOCLOSE end -ViridianForest_EventScript_Doug:: @ 8160588 +ViridianForest_EventScript_Doug:: trainerbattle_single TRAINER_BUG_CATCHER_DOUG, ViridianForest_Text_DougIntro, ViridianForest_Text_DougDefeat msgbox ViridianForest_Text_DougPostBattle, MSGBOX_AUTOCLOSE end -ViridianForest_EventScript_Sammy:: @ 816059F +ViridianForest_EventScript_Sammy:: trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, ViridianForest_Text_SammyIntro, ViridianForest_Text_SammyDefeat msgbox ViridianForest_Text_SammyPostBattle, MSGBOX_AUTOCLOSE end -ViridianForest_EventScript_Anthony:: @ 81605B6 +ViridianForest_EventScript_Anthony:: trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, ViridianForest_Text_AnthonyIntro, ViridianForest_Text_AnthonyDefeat msgbox ViridianForest_Text_AnthonyPostBattle, MSGBOX_AUTOCLOSE end -ViridianForest_EventScript_Charlie:: @ 81605CD +ViridianForest_EventScript_Charlie:: trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, ViridianForest_Text_CharlieIntro, ViridianForest_Text_CharlieDefeat msgbox ViridianForest_Text_CharliePostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/maps/ViridianForest/text.inc b/data/maps/ViridianForest/text.inc index 226d9f905..fb1154755 100644 --- a/data/maps/ViridianForest/text.inc +++ b/data/maps/ViridianForest/text.inc @@ -1,105 +1,105 @@ -ViridianForest_Text_FriendsItchingToBattle:: @ 8172255 +ViridianForest_Text_FriendsItchingToBattle:: .string "I came here with some friends to\n" .string "catch us some BUG POKéMON!\p" .string "They're all itching to get into\n" .string "some POKéMON battles!$" -ViridianForest_Text_RickIntro:: @ 81722C7 +ViridianForest_Text_RickIntro:: .string "Hey! You have POKéMON!\n" .string "Come on!\l" .string "Let's battle 'em!$" -ViridianForest_Text_RickDefeat:: @ 81722F9 +ViridianForest_Text_RickDefeat:: .string "No!\nCATERPIE can't hack it!$" -ViridianForest_Text_RickPostBattle:: @ 8172315 +ViridianForest_Text_RickPostBattle:: .string "Ssh! You'll scare the bugs away.\n" .string "Another time, okay?$" -ViridianForest_Text_DougIntro:: @ 817234A +ViridianForest_Text_DougIntro:: .string "Yo!\n" .string "You can't jam out if you're a\l" .string "POKéMON TRAINER!$" -ViridianForest_Text_DougDefeat:: @ 817237D +ViridianForest_Text_DougDefeat:: .string "Huh?\n" .string "I ran out of POKéMON!$" -ViridianForest_Text_DougPostBattle:: @ 8172398 +ViridianForest_Text_DougPostBattle:: .string "That totally stinks! I'm going to\n" .string "catch some stronger ones!$" -ViridianForest_Text_SammyIntro:: @ 81723D4 +ViridianForest_Text_SammyIntro:: .string "Hey, wait up!\n" .string "What's the hurry? Why the rush?$" -ViridianForest_Text_SammyDefeat:: @ 8172402 +ViridianForest_Text_SammyDefeat:: .string "I give!\n" .string "You're good at this!$" -ViridianForest_Text_SammyPostBattle:: @ 817241F +ViridianForest_Text_SammyPostBattle:: .string "Sometimes, you can find stuff on\n" .string "the ground.\p" .string "I'm looking for the stuff I\n" .string "dropped. Can you help me?$" -ViridianForest_Text_AnthonyIntro:: @ 8172482 +ViridianForest_Text_AnthonyIntro:: .string "I might be little, but I won't like\n" .string "it if you go easy on me!$" -ViridianForest_Text_AnthonyDefeat:: @ 81724BF +ViridianForest_Text_AnthonyDefeat:: .string "Oh, boo.\n" .string "Nothing went right.$" -ViridianForest_Text_AnthonyPostBattle:: @ 81724DC +ViridianForest_Text_AnthonyPostBattle:: .string "I lost some of my allowance…$" -ViridianForest_Text_CharlieIntro:: @ 81724F9 +ViridianForest_Text_CharlieIntro:: .string "Did you know that POKéMON evolve?$" -ViridianForest_Text_CharlieDefeat:: @ 817251B +ViridianForest_Text_CharlieDefeat:: .string "Oh!\n" .string "I lost!$" -ViridianForest_Text_CharliePostBattle:: @ 8172527 +ViridianForest_Text_CharliePostBattle:: .string "BUG POKéMON evolve quickly.\n" .string "They're a lot of fun!$" -ViridianForest_Text_RanOutOfPokeBalls:: @ 8172559 +ViridianForest_Text_RanOutOfPokeBalls:: .string "I was throwing POKé BALLS to\n" .string "catch POKéMON, and I ran out.\p" .string "That's why you can never have too\n" .string "many POKé BALLS.$" -ViridianForest_Text_AvoidGrassyAreasWhenWeak:: @ 81725C7 +ViridianForest_Text_AvoidGrassyAreasWhenWeak:: .string "TRAINER TIPS\p" .string "If your POKéMON are weak and you\n" .string "want to avoid battles, stay away\l" .string "from grassy areas!$" -ViridianForest_Text_UseAntidoteForPoison:: @ 8172629 +ViridianForest_Text_UseAntidoteForPoison:: .string "For poison, use ANTIDOTE!\n" .string "Get it at POKéMON MARTS!$" -ViridianForest_Text_ContactOakViaPCToRatePokedex:: @ 817265C +ViridianForest_Text_ContactOakViaPCToRatePokedex:: .string "TRAINER TIPS\p" .string "Contact PROF. OAK via a PC to\n" .string "get your POKéDEX evaluated!$" -ViridianForest_Text_CantCatchOwnedMons:: @ 81726A3 +ViridianForest_Text_CantCatchOwnedMons:: .string "TRAINER TIPS\p" .string "You can't catch a POKéMON that\n" .string "belongs to someone else.\p" .string "Throw POKé BALLS only at wild\n" .string "POKéMON to catch them!$" -ViridianForest_Text_WeakenMonsBeforeCapture:: @ 817271D +ViridianForest_Text_WeakenMonsBeforeCapture:: .string "TRAINER TIPS\p" .string "Weaken POKéMON before attempting\n" .string "capture!\p" .string "When healthy, they may escape!$" -ViridianForest_Text_LeavingViridianForest:: @ 8172773 +ViridianForest_Text_LeavingViridianForest:: .string "LEAVING VIRIDIAN FOREST\n" .string "PEWTER CITY AHEAD$" diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s index 9820f22d6..d0d54d550 100644 --- a/data/multiboot_berry_glitch_fix.s +++ b/data/multiboot_berry_glitch_fix.s @@ -1,5 +1,5 @@ .section .rodata -gMultiBootProgram_BerryGlitchFix_Start:: @ 86FFC6C +gMultiBootProgram_BerryGlitchFix_Start:: .incbin "data/mb_berry_fix.gba" gMultiBootProgram_BerryGlitchFix_End:: diff --git a/data/multiboot_ereader.s b/data/multiboot_ereader.s index d91fc2e23..3e5d2aa25 100644 --- a/data/multiboot_ereader.s +++ b/data/multiboot_ereader.s @@ -1,5 +1,5 @@ .section .rodata -gMultiBootProgram_EReader_Start:: @ 86FC50C +gMultiBootProgram_EReader_Start:: .incbin "data/mb_ereader.gba" gMultiBootProgram_EReader_End:: diff --git a/data/multiboot_pokemon_colosseum.s b/data/multiboot_pokemon_colosseum.s index 5d8abec4a..a5f894908 100644 --- a/data/multiboot_pokemon_colosseum.s +++ b/data/multiboot_pokemon_colosseum.s @@ -1,5 +1,5 @@ .section .rodata -gMultiBootProgram_PokemonColosseum_Start:: @ 8703860 +gMultiBootProgram_PokemonColosseum_Start:: .incbin "data/mb_colosseum.gba" gMultiBootProgram_PokemonColosseum_End:: diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index c88b84cc6..af7048be3 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -14,7 +14,7 @@ .section .rodata .align 2 -MysteryEventScript_StampCard:: @ 8488E28 +MysteryEventScript_StampCard:: setvaddress MysteryEventScript_StampCard setorcopyvar VAR_RESULT, 1 specialvar VAR_0x8008, BattleCardAction @@ -30,18 +30,18 @@ MysteryEventScript_StampCard:: @ 8488E28 release end -sText_MysteryGiftStampCard: @ 8488E55 +sText_MysteryGiftStampCard: .string "Thank you for using the STAMP CARD\n" .string "System.\p" .string "You have {STR_VAR_1} more to collect to\n" .string "fill your STAMP CARD.$" -MysteryEventScript_SurfPichu:: @ 8488EB5 +MysteryEventScript_SurfPichu:: setvaddress MysteryEventScript_SurfPichu vgoto_if_unset FLAG_MYSTERY_GIFT_DONE, SurfPichu_GiveIfPossible gotoram -SurfPichu_GiveIfPossible: @ 8488EC4 +SurfPichu_GiveIfPossible: specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE vgoto_if_eq SurfPichu_FullParty @@ -57,7 +57,7 @@ SurfPichu_GiveIfPossible: @ 8488EC4 release end -SurfPichu_FullParty: @ 8488EEB +SurfPichu_FullParty: lock faceplayer vmessage sText_FullParty @@ -66,7 +66,7 @@ SurfPichu_FullParty: @ 8488EEB release end -SurfPichu_GiveEgg: @ 8488EF6 +SurfPichu_GiveEgg: giveegg SPECIES_PICHU setmoneventlegal VAR_EVENT_PICHU_SLOT setmonmetlocation VAR_EVENT_PICHU_SLOT, 0xff @@ -82,27 +82,27 @@ SurfPichu_GiveEgg: @ 8488EF6 vgoto_if_eq SurfPichu_Slot5 return -SurfPichu_Slot1: @ 8488F38 +SurfPichu_Slot1: setmonmove 1, 2, MOVE_SURF return -SurfPichu_Slot2: @ 8488F3E +SurfPichu_Slot2: setmonmove 2, 2, MOVE_SURF return -SurfPichu_Slot3: @ 8488F44 +SurfPichu_Slot3: setmonmove 3, 2, MOVE_SURF return -SurfPichu_Slot4: @ 8488F4A +SurfPichu_Slot4: setmonmove 4, 2, MOVE_SURF return -SurfPichu_Slot5: @ 8488F50 +SurfPichu_Slot5: setmonmove 5, 2, MOVE_SURF return -sText_MysteryGiftEgg: @ 8488F56 +sText_MysteryGiftEgg: .string "Thank you for using the MYSTERY\n" .string "GIFT System.\p" .string "From the POKéMON CENTER we\n" @@ -110,12 +110,12 @@ sText_MysteryGiftEgg: @ 8488F56 .string "Please raise it with love and\n" .string "kindness.$" -sText_FullParty: @ 8488FE3 +sText_FullParty: .string "Oh, your party appears to be full.\p" .string "Please come see me after storing\n" .string "a POKéMON on a PC.$" -MysteryEventScript_VisitingTrainer:: @ 848903A +MysteryEventScript_VisitingTrainer:: setvaddress MysteryEventScript_VisitingTrainer special ValidateEReaderTrainer compare VAR_RESULT, 0 @@ -128,7 +128,7 @@ MysteryEventScript_VisitingTrainer:: @ 848903A release end -MysteryEventScript_VisitingTrainerArrived: @ 8489058 +MysteryEventScript_VisitingTrainerArrived: lock faceplayer vmessage sText_MysteryGiftVisitingTrainer_2 @@ -137,7 +137,7 @@ MysteryEventScript_VisitingTrainerArrived: @ 8489058 release end -sText_MysteryGiftVisitingTrainer: @ 8489063 +sText_MysteryGiftVisitingTrainer: .string "Thank you for using the MYSTERY\n" .string "GIFT System.\p" .string "By holding this WONDER CARD, you\n" @@ -153,7 +153,7 @@ sText_MysteryGiftVisitingTrainer: @ 8489063 .string "it to the WIRELESS\l" .string "COMMUNICATION SYSTEM.$" -sText_MysteryGiftVisitingTrainer_2: @ 84891B0 +sText_MysteryGiftVisitingTrainer_2: .string "Thank you for using the MYSTERY\n" .string "GIFT System.\p" .string "A TRAINER has arrived in the SEVII\n" @@ -165,7 +165,7 @@ sText_MysteryGiftVisitingTrainer_2: @ 84891B0 .string "Try looking for other passwords\n" .string "that may work.$" -MysteryEventScript_BattleCard:: @ 84892B9 +MysteryEventScript_BattleCard:: setvaddress MysteryEventScript_BattleCard vgoto_if_set FLAG_MYSTERY_GIFT_DONE, MysteryEventScript_BattleCardInfo setorcopyvar VAR_RESULT, 2 @@ -182,7 +182,7 @@ MysteryEventScript_BattleCard:: @ 84892B9 setflag FLAG_MYSTERY_GIFT_DONE end -MysteryEventScript_BattleCardInfo: @ 84892F6 +MysteryEventScript_BattleCardInfo: lock faceplayer vmessage sText_MysteryGiftBattleCountCard @@ -191,7 +191,7 @@ MysteryEventScript_BattleCardInfo: @ 84892F6 release end -sText_MysteryGiftBattleCountCard: @ 8489301 +sText_MysteryGiftBattleCountCard: .string "Thank you for using the MYSTERY\n" .string "GIFT System.\p" .string "Your BATTLE COUNT CARD keeps\n" @@ -203,7 +203,7 @@ sText_MysteryGiftBattleCountCard: @ 8489301 .string "by reading the NEWS.\p" .string "Please do give it a try!$" -sText_MysteryGiftBattleCountCard_2: @ 8489419 +sText_MysteryGiftBattleCountCard_2: .string "Thank you for using the MYSTERY\n" .string "GIFT System.\p" .string "Congratulations!\p" @@ -212,7 +212,7 @@ sText_MysteryGiftBattleCountCard_2: @ 8489419 .string "We hope you will be inspired to\n" .string "battle some more.$" -MysteryEventScript_AuroraTicket:: @ 84894B9 +MysteryEventScript_AuroraTicket:: setvaddress MysteryEventScript_AuroraTicket lock faceplayer @@ -236,43 +236,43 @@ MysteryEventScript_AuroraTicket:: @ 84894B9 release end -AuroraTicket_NoBagSpace: @ 8489514 +AuroraTicket_NoBagSpace: vmessage sText_AuroraTicketNoPlace waitmessage waitbuttonpress release end -AuroraTicket_Obtained: @ 848951D +AuroraTicket_Obtained: vmessage sText_AuroraTicketGot waitmessage waitbuttonpress release end -sText_AuroraTicket1: @ 8489526 +sText_AuroraTicket1: .string "Thank you for using the MYSTERY\n" .string "GIFT System.\p" .string "You must be {PLAYER}.\n" .string "There is a ticket here for you.$" -sText_AuroraTicket2: @ 8489583 +sText_AuroraTicket2: .string "It appears to be for use at the\n" .string "VERMILION CITY port.\p" .string "Why not give it a try and see what\n" .string "it is about?$" -sText_AuroraTicketGot: @ 84895E8 +sText_AuroraTicketGot: .string "Thank you for using the MYSTERY\n" .string "GIFT System.$" -sText_AuroraTicketNoPlace: @ 8489615 +sText_AuroraTicketNoPlace: .string "Oh, I'm sorry, {PLAYER}. Your BAG's\n" .string "KEY ITEMS POCKET is full.\p" .string "Please store something on your PC,\n" .string "then come back for this.$" -MysteryEventScript_MysticTicket:: @ 8489689 +MysteryEventScript_MysticTicket:: setvaddress MysteryEventScript_MysticTicket lock faceplayer @@ -297,49 +297,49 @@ MysteryEventScript_MysticTicket:: @ 8489689 release end -MysticTicket_NoBagSpace: @ 84896ED +MysticTicket_NoBagSpace: vmessage sText_MysticTicketNoPlace waitmessage waitbuttonpress release end -MysticTicket_Obtained: @ 84896F6 +MysticTicket_Obtained: vmessage sText_MysticTicketGot waitmessage waitbuttonpress release end -sText_MysticTicket2: @ 84896FF +sText_MysticTicket2: .string "Thank you for using the MYSTERY\n" .string "GIFT System.\p" .string "You must be {PLAYER}.\n" .string "There is a ticket here for you.$" -sText_MysticTicket1: @ 848975C +sText_MysticTicket1: .string "It appears to be for use at the\n" .string "VERMILION CITY port.\p" .string "Why not give it a try and see what\n" .string "it is about?$" -sText_MysticTicketGot: @ 84897C1 +sText_MysticTicketGot: .string "Thank you for using the MYSTERY\n" .string "GIFT System.$" -sText_MysticTicketNoPlace: @ 84897EE +sText_MysticTicketNoPlace: .string "Oh, I'm sorry, {PLAYER}. Your BAG's\n" .string "KEY ITEMS POCKET is full.\p" .string "Please store something on your PC,\n" .string "then come back for this.$" -MysteryEventScript_AlteringCave:: @ 8489862 +MysteryEventScript_AlteringCave:: setvaddress MysteryEventScript_AlteringCave addvar VAR_ALTERING_CAVE_WILD_SET, 1 compare VAR_ALTERING_CAVE_WILD_SET, 10 vgoto_if_ne MysteryEventScript_AlteringCave_ setvar VAR_ALTERING_CAVE_WILD_SET, 0 -MysteryEventScript_AlteringCave_: @ 848987C +MysteryEventScript_AlteringCave_: lock faceplayer vmessage sText_MysteryGiftAlteringCave @@ -348,7 +348,7 @@ MysteryEventScript_AlteringCave_: @ 848987C release end -sText_MysteryGiftAlteringCave: @ 8489887 +sText_MysteryGiftAlteringCave: .string "Thank you for using the MYSTERY\n" .string "GIFT System.\p" .string "Recently, there have been rumors\n" diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s index 9d74b6282..e22d84f08 100644 --- a/data/mystery_event_script_cmd_table.s +++ b/data/mystery_event_script_cmd_table.s @@ -1,7 +1,7 @@ .section script_data, "aw", %progbits .align 2 -gMysteryEventScriptCmdTable:: @ 81DBCF0 +gMysteryEventScriptCmdTable:: .4byte MEScrCmd_nop .4byte MEScrCmd_checkcompat .4byte MEScrCmd_end @@ -19,4 +19,4 @@ gMysteryEventScriptCmdTable:: @ 81DBCF0 .4byte MEScrCmd_enableresetrtc .4byte MEScrCmd_checksum .4byte MEScrCmd_crc -gMysteryEventScriptCmdTableEnd:: @ 81DBD34 +gMysteryEventScriptCmdTableEnd:: diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 8612b810d..11449b86f 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -1,6 +1,6 @@ .align 2 -gScriptCmdTable:: @ 815F9B4 +gScriptCmdTable:: .4byte ScrCmd_nop .4byte ScrCmd_nop1 .4byte ScrCmd_end @@ -215,5 +215,5 @@ gScriptCmdTable:: @ 815F9B4 .4byte ScrCmd_getbraillestringwidth .4byte ScrCmd_bufferitemnameplural -gScriptCmdTableEnd:: @ 815FD08 +gScriptCmdTableEnd:: .4byte ScrCmd_nop diff --git a/data/scripts/aide.inc b/data/scripts/aide.inc index 3201de769..6a4a40cc6 100644 --- a/data/scripts/aide.inc +++ b/data/scripts/aide.inc @@ -1,14 +1,14 @@ -Aide_EventScript_HaventCaughtEnough:: @ 81A7ABD +Aide_EventScript_HaventCaughtEnough:: msgbox Aide_Text_HaventCaughtEnoughMonsForItem release end -Aide_EventScript_NoRoomForItem:: @ 81A7AC7 +Aide_EventScript_NoRoomForItem:: msgbox Aide_Text_DontHaveAnyRoomForItem release end -Aide_EventScript_DeclineCheckMons:: @ 81A7AD1 +Aide_EventScript_DeclineCheckMons:: msgbox Aide_Text_GetEnoughMonsComeBackForItem release end diff --git a/data/scripts/bag_full.inc b/data/scripts/bag_full.inc index 4454b326a..7ce421e78 100644 --- a/data/scripts/bag_full.inc +++ b/data/scripts/bag_full.inc @@ -1,21 +1,21 @@ -EventScript_BagIsFull:: @ 81A6BF9 +EventScript_BagIsFull:: textcolor 3 msgbox Text_TooBadBagFull release end @ Unused -EventScript_BagIsFullRet:: @ 81A6C05 +EventScript_BagIsFullRet:: msgbox Text_TooBadBagFull return @ Unused -EventScript_NoRoomForAnotherDecor:: @ 81A6C0E +EventScript_NoRoomForAnotherDecor:: msgbox Text_NoRoomForAnotherDecor release end @ Unused -EventScript_NoRoomForAnotherDecorRet:: @ 81A6C18 +EventScript_NoRoomForAnotherDecorRet:: msgbox Text_NoRoomForAnotherDecor return diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index e1902c6e4..4774025e8 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1,29 +1,29 @@ -CableClub_OnTransition:: @ 81BB1B4 +CableClub_OnTransition:: call CableClub_EventScript_HideOrShowMysteryGiftMan end -CableClub_EventScript_HideOrShowMysteryGiftMan:: @ 81BB1BA +CableClub_EventScript_HideOrShowMysteryGiftMan:: specialvar VAR_RESULT, ValidateReceivedWonderCard compare VAR_RESULT, FALSE goto_if_eq EventScript_HideMysteryGiftMan clearflag FLAG_HIDE_MG_DELIVERYMEN return -EventScript_HideMysteryGiftMan:: @ 81BB1CE +EventScript_HideMysteryGiftMan:: setflag FLAG_HIDE_MG_DELIVERYMEN return -CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2 +CableClub_EventScript_MysteryGiftMan:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording execram @ Unused -EventScript_MysteryGiftThankYou:: @ 81BB1E4 +EventScript_MysteryGiftThankYou:: msgbox Text_ThankYouForAccessingMysteryGift, MSGBOX_NPC end -CableClub_OnWarp:: @ 81BB1ED +CableClub_OnWarp:: map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, EventScript_CheckTurnAttendant map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, EventScript_CheckTurnAttendant map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, EventScript_CheckTurnAttendant @@ -33,14 +33,14 @@ CableClub_OnWarp:: @ 81BB1ED map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, EventScript_CheckTurnAttendant .2byte 0 -EventScript_CheckTurnAttendant:: @ 81BB227 +EventScript_CheckTurnAttendant:: compare VAR_0x8007, 0 goto_if_eq EventScript_CheckTurnAttendantEnd turnobject VAR_0x8007, DIR_WEST EventScript_CheckTurnAttendantEnd: end -CableClub_OnLoad:: @ 81BB237 +CableClub_OnLoad:: compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE goto_if_eq EventScript_OnLoadFromColosseum compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE @@ -57,27 +57,27 @@ CableClub_OnLoad:: @ 81BB237 goto_if_eq EventScript_OnLoadFromGameCorner end -EventScript_OnLoadFromColosseum:: @ 81BB285 +EventScript_OnLoadFromColosseum:: call CableClub_EventScript_OpenDirectCornerBarrier end -EventScript_OnLoadFromTradeCenter:: @ 81BB28B +EventScript_OnLoadFromTradeCenter:: call CableClub_EventScript_OpenDirectCornerBarrier end -EventScript_OnLoadFromUnionRoom:: @ 81BB291 +EventScript_OnLoadFromUnionRoom:: call CableClub_EventScript_OpenUnionRoomBarrier end -EventScript_OnLoadFromBerryCrush:: @ 81BB297 +EventScript_OnLoadFromBerryCrush:: call CableClub_EventScript_OpenDirectCornerBarrier end -EventScript_OnLoadFromGameCorner:: @ 81BB29D +EventScript_OnLoadFromGameCorner:: call CableClub_EventScript_OpenGameCornerBarrier end -CableClub_OnFrame:: @ 81BB2A3 +CableClub_OnFrame:: map_script_2 VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1, CableClub_EventScript_Tutorial map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_ExitLinkRoom map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_ExitLinkRoom @@ -88,7 +88,7 @@ CableClub_OnFrame:: @ 81BB2A3 map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom .2byte 0 -CableClub_EventScript_ExitLinkRoom:: @ 81BB2E5 +CableClub_EventScript_ExitLinkRoom:: lockall call CableClub_EventScript_CloseLinkAndExitLinkRoom call CableClub_EventScript_CloseDirectCornerBarrier @@ -98,7 +98,7 @@ CableClub_EventScript_ExitLinkRoom:: @ 81BB2E5 releaseall end -CableClub_EventScript_ExitMinigameRoom:: @ 81BB2FD +CableClub_EventScript_ExitMinigameRoom:: lockall call CableClub_EventScript_CloseLinkAndExitLinkRoom call CableClub_EventScript_CloseGameCornerBarrier @@ -108,7 +108,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 81BB2FD releaseall end -CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315 +CableClub_EventScript_CloseLinkAndExitLinkRoom:: special CloseLink special HelpSystem_Enable special QuestLog_StartRecordingInputsAfterDeferredEvent @@ -124,7 +124,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315 waitmovement 0 return -CableClub_EventScript_ExitTradeCenter:: @ 81BB34F +CableClub_EventScript_ExitTradeCenter:: lockall call CableClub_EventScript_PlayerExitTradeCenter call CableClub_EventScript_CloseDirectCornerBarrier @@ -134,7 +134,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 81BB34F releaseall end -CableClub_EventScript_PlayerExitTradeCenter:: @ 81BB367 +CableClub_EventScript_PlayerExitTradeCenter:: special CloseLink special HelpSystem_Enable special QuestLog_StartRecordingInputsAfterDeferredEvent @@ -149,7 +149,7 @@ CableClub_EventScript_PlayerExitTradeCenter:: @ 81BB367 call CableClub_EventScript_TrainerCardDataOverwritten return -CableClub_EventScript_ExitUnionRoom:: @ 81BB39C +CableClub_EventScript_ExitUnionRoom:: lockall call CableClub_EventScript_PlayerExitUnionRoom call CableClub_EventScript_CloseUnionRoomBarrier @@ -159,7 +159,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 81BB39C releaseall end -CableClub_EventScript_PlayerExitUnionRoom:: @ 81BB3B4 +CableClub_EventScript_PlayerExitUnionRoom:: special HelpSystem_Enable special QuestLog_StartRecordingInputsAfterDeferredEvent setvar VAR_CABLE_CLUB_STATE, 0 @@ -173,7 +173,7 @@ CableClub_EventScript_PlayerExitUnionRoom:: @ 81BB3B4 call CableClub_EventScript_TrainerCardDataOverwritten return -CableClub_EventScript_TrainerCardDataOverwritten:: @ 81BB3E6 +CableClub_EventScript_TrainerCardDataOverwritten:: message CableClub_Text_TrainerCardDataOverwritten waitmessage playse SE_PIN @@ -185,12 +185,12 @@ CableClub_EventScript_TrainerCardDataOverwritten:: @ 81BB3E6 waitmovement 0 return -CableClub_EventScript_PlayerExitLinkRoom:: @ 81BB40A +CableClub_EventScript_PlayerExitLinkRoom:: applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom waitmovement 0 return -CableClub_EventScript_Tutorial:: @ 81BB415 +CableClub_EventScript_Tutorial:: lockall textcolor 1 applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp @@ -205,24 +205,24 @@ CableClub_EventScript_Tutorial:: @ 81BB415 releaseall end -Movement_PlayerApproachCounter: @ 81BB447 +Movement_PlayerApproachCounter: walk_up walk_up step_end -CableClub_EventScript_WelcomeToCableClub:: @ 81BB44A +CableClub_EventScript_WelcomeToCableClub:: message CableClub_Text_WelcomeWhichCableClubService waitmessage delay 15 goto CableClub_EventScript_SelectCableClubRoom end -CableClub_EventScript_UnusedWelcomeToCableClub:: @ 81BB459 +CableClub_EventScript_UnusedWelcomeToCableClub:: msgbox CableClub_Text_WhichService goto CableClub_EventScript_SelectCableClubRoom end -CableClub_EventScript_SelectCableClubRoom:: @ 81BB467 +CableClub_EventScript_SelectCableClubRoom:: setvar VAR_0x8004, 0 multichoice 0, 0, MULTICHOICE_TRADE_CENTER_COLOSSEUM, FALSE switch VAR_RESULT @@ -232,12 +232,12 @@ CableClub_EventScript_SelectCableClubRoom:: @ 81BB467 case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -CableClub_EventScript_Colosseum:: @ 81BB4A3 +CableClub_EventScript_Colosseum:: copyvar VAR_0x8007, VAR_LAST_TALKED goto CableClub_EventScript_SelectBattleMode end -CableClub_EventScript_SelectBattleMode:: @ 81BB4AE +CableClub_EventScript_SelectBattleMode:: message CableClub_Text_PlayWhichBattleMode waitmessage multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE @@ -250,17 +250,17 @@ CableClub_EventScript_SelectBattleMode:: @ 81BB4AE case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -CableClub_EventScript_BattleModeInfo:: @ 81BB501 +CableClub_EventScript_BattleModeInfo:: msgbox CableClub_Text_ExplainBattleModes goto CableClub_EventScript_SelectBattleMode end -CableClub_EventScript_SingleBattleMode:: @ 81BB50F +CableClub_EventScript_SingleBattleMode:: setvar VAR_0x8004, USING_SINGLE_BATTLE goto CableClub_EventScript_TryEnterColosseum end -CableClub_EventScript_DoubleBattleMode:: @ 81BB51A +CableClub_EventScript_DoubleBattleMode:: special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne CableClub_EventScript_NeedTwoMonsForDoubleBattle @@ -268,17 +268,17 @@ CableClub_EventScript_DoubleBattleMode:: @ 81BB51A goto CableClub_EventScript_TryEnterColosseum end -CableClub_EventScript_NeedTwoMonsForDoubleBattle:: @ 81BB533 +CableClub_EventScript_NeedTwoMonsForDoubleBattle:: msgbox CableClub_Text_NeedTwoMonsForDoubleBattle goto CableClub_EventScript_SelectBattleMode end -CableClub_EventScript_MultiBattleMode:: @ 81BB541 +CableClub_EventScript_MultiBattleMode:: setvar VAR_0x8004, USING_MULTI_BATTLE goto CableClub_EventScript_TryEnterColosseum end -CableClub_EventScript_TryEnterColosseum:: @ 81BB54C +CableClub_EventScript_TryEnterColosseum:: call EventScript_AskSaveGame compare VAR_RESULT, 0 goto_if_eq CableClub_EventScript_AbortLink @@ -303,7 +303,7 @@ CableClub_EventScript_TryEnterColosseum:: @ 81BB54C goto_if_eq CableClub_EventScript_AbortLinkConnectionError end -CableClub_EventScript_EnterColosseum:: @ 81BB5B3 +CableClub_EventScript_EnterColosseum:: special HealPlayerParty special SavePlayerParty special LoadPlayerBag @@ -336,19 +336,19 @@ CableClub_EventScript_EnterColosseum:: @ 81BB5B3 end @ Unused -CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 81BB621 +CableClub_EventScript_PlayerApproachLinkRoomRight:: applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomRight waitmovement 0 return -CableClub_EventScript_WarpTo4PColosseum:: @ 81BB62C +CableClub_EventScript_WarpTo4PColosseum:: special SetCableClubWarp warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8 special DoCableClubWarp waitstate end -CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers:: @ 81BB63C +CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers:: switch VAR_0x8004 case USING_SINGLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForSingleBattle case USING_DOUBLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle @@ -356,32 +356,32 @@ CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers:: @ 81BB63C goto CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants end -CableClub_EventScript_AbortLinkNeedFourPlayers:: @ 81BB668 +CableClub_EventScript_AbortLinkNeedFourPlayers:: special CloseLink msgbox CableClub_Text_NeedFourPlayers goto CableClub_EventScript_ConfirmNumberAndRestart end -CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle:: @ 81BB679 +CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle:: special CloseLink msgbox CableClub_Text_CantDoubleBattleWithXPlayers goto CableClub_EventScript_ConfirmNumberAndRestart end -CableClub_EventScript_AbortLinkWrongNumberForSingleBattle:: @ 81BB68A +CableClub_EventScript_AbortLinkWrongNumberForSingleBattle:: special CloseLink msgbox CableClub_Text_CantSingleBattleWithXPlayers goto CableClub_EventScript_ConfirmNumberAndRestart end -CableClub_EventScript_ConfirmNumberAndRestart:: @ 81BB69B +CableClub_EventScript_ConfirmNumberAndRestart:: special CloseLink @ Redundant special HelpSystem_Enable msgbox CableClub_Text_PleaseConfirmNumberAndRestart release end -CableClub_EventScript_TradeCenter:: @ 81BB6AB +CableClub_EventScript_TradeCenter:: copyvar VAR_0x8007, VAR_LAST_TALKED call CableClub_EventScript_CheckPartyTradeRequirements compare VAR_RESULT, 0 @@ -414,7 +414,7 @@ CableClub_EventScript_TradeCenter:: @ 81BB6AB goto_if_eq CableClub_EventScript_AbortLinkOtherTrainerNotReady end -CableClub_EventScript_EnterTradeCenter:: @ 81BB73D +CableClub_EventScript_EnterTradeCenter:: setvar VAR_0x8004, USING_TRADE_CENTER copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004 messageautoscroll CableClub_Text_PleaseEnter @@ -442,7 +442,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 81BB73D waitstate end -CableClub_EventScript_CheckPartyTradeRequirements:: @ 81BB79C +CableClub_EventScript_CheckPartyTradeRequirements:: specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, 2 goto_if_lt CableClub_EventScript_NeedTwoMonsToTrade @@ -452,63 +452,63 @@ CableClub_EventScript_CheckPartyTradeRequirements:: @ 81BB79C setvar VAR_RESULT, TRUE return -CableClub_EventScript_NeedTwoMonsToTrade:: @ 81BB7C2 +CableClub_EventScript_NeedTwoMonsToTrade:: msgbox CableClub_Text_NeedTwoMonsToTrade setvar VAR_RESULT, FALSE return -CableClub_EventScript_CantTradeEnigmaBerry:: @ 81BB7D0 +CableClub_EventScript_CantTradeEnigmaBerry:: msgbox CableClub_Text_CantTradeEnigmaBerry setvar VAR_RESULT, FALSE return @ Record Corner is nopped in FRLG -CableClub_EventScript_RecordCorner:: @ 81BB7DE +CableClub_EventScript_RecordCorner:: end -CableClub_EventScript_AbortLinkPlayerNotReady:: @ 81BB7DF +CableClub_EventScript_AbortLinkPlayerNotReady:: special CloseLink special HelpSystem_Enable msgbox CableClub_Text_NotSetUpForFarAwayRegion release end -CableClub_EventScript_AbortLinkOtherTrainerNotReady:: @ 81BB7EF +CableClub_EventScript_AbortLinkOtherTrainerNotReady:: special CloseLink special HelpSystem_Enable msgbox CableClub_Text_OtherTrainerNotReady release end -CableClub_EventScript_AbortLinkConnectionError:: @ 81BB7FF +CableClub_EventScript_AbortLinkConnectionError:: special CloseLink special HelpSystem_Enable msgbox CableClub_Text_LinkErrorPleaseReset release end -CableClub_EventScript_AbortLinkSomeoneNotReady:: @ 81BB80F +CableClub_EventScript_AbortLinkSomeoneNotReady:: special CloseLink special HelpSystem_Enable msgbox CableClub_Text_SomeoneIsNotReadyToLink release end -CableClub_EventScript_AbortLinkDifferentSelections:: @ 81BB81F +CableClub_EventScript_AbortLinkDifferentSelections:: special CloseLink special HelpSystem_Enable msgbox CableClub_Text_PlayersMadeDifferentSelections release end -CableClub_EventScript_AbortLink:: @ 81BB82F +CableClub_EventScript_AbortLink:: special CloseLink special HelpSystem_Enable msgbox CableClub_Text_PleaseVisitAgain release end -CableClub_EventScript_AbortMinigame:: @ 81BB83F +CableClub_EventScript_AbortMinigame:: special CloseLink special HelpSystem_Enable msgbox CableClub_Text_ComeAgain @@ -516,87 +516,87 @@ CableClub_EventScript_AbortMinigame:: @ 81BB83F end @ Unused -CableClub_EventScript_CableClubWarp:: @ 81BB84F +CableClub_EventScript_CableClubWarp:: special SetCableClubWarp special DoCableClubWarp waitstate end -CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants:: @ 81BB857 +CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants:: special CloseLink special HelpSystem_Enable msgbox CableClub_Text_IncorrectNumberOfParticipants release end -CableClub_EventScript_AbortLinkPlayerHasBadEgg:: @ 81BB867 +CableClub_EventScript_AbortLinkPlayerHasBadEgg:: special CloseLink special HelpSystem_Enable msgbox CableClub_Text_YouHaveAMonThatCantBeTaken release end -CableClub_EventScript_WirelessClubAdjustements:: @ 81BB877 +CableClub_EventScript_WirelessClubAdjustements:: msgbox Text_WirelessClubUndergoingAdjustments release end -CableClub_EventScript_NotReadyYet:: @ 81BB881 +CableClub_EventScript_NotReadyYet:: msgbox Text_AppearsToBeUndergoingAdjustments releaseall end -Movement_AttendantFaceDown:: @ 81BB88B +Movement_AttendantFaceDown:: face_down step_end @ Unused -Movement_AttendantFaceRight:: @ 81BB88D +Movement_AttendantFaceRight:: face_right step_end -Movement_AttendantFaceLeft:: @ 81BB88F +Movement_AttendantFaceLeft:: face_left step_end -Movement_PlayerExitLinkRoom:: @ 81BB891 +Movement_PlayerExitLinkRoom:: walk_down walk_down step_end -Movement_PlayerApproachLinkRoomRight:: @ 81BB894 +Movement_PlayerApproachLinkRoomRight:: walk_right walk_up walk_up step_end -Movement_PlayerApproachLinkRoomLeft:: @ 81BB898 +Movement_PlayerApproachLinkRoomLeft:: walk_left walk_up walk_up step_end -Movement_PlayerEnterLinkRoom:: @ 81BB89C +Movement_PlayerEnterLinkRoom:: walk_up step_end @ Unused -Movement_PlayerFaceAttendantLeft:: @ 81BB89E +Movement_PlayerFaceAttendantLeft:: face_left step_end -Movement_PlayerFaceAttendantRight:: @ 81BB8A0 +Movement_PlayerFaceAttendantRight:: face_right step_end -Movement_PlayerEnterMinigameRoom:: @ 81BB8A2 +Movement_PlayerEnterMinigameRoom:: walk_left walk_up walk_up walk_up step_end -CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7 +CableClub_EventScript_ShowBattleRecords:: goto_if_questlog EventScript_ReleaseEnd lockall fadescreen FADE_TO_BLACK @@ -606,21 +606,21 @@ CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7 releaseall end -BattleColosseum_2P_EventScript_PlayerSpot0:: @ 81BB8C3 +BattleColosseum_2P_EventScript_PlayerSpot0:: setvar VAR_0x8005, 0 textcolor 3 special EnterColosseumPlayerSpot waitstate end -BattleColosseum_2P_EventScript_PlayerSpot1:: @ 81BB8CF +BattleColosseum_2P_EventScript_PlayerSpot1:: setvar VAR_0x8005, 1 textcolor 3 special EnterColosseumPlayerSpot waitstate end -BattleColosseum_4P_EventScript_PlayerSpot0:: @ 81BB8DB +BattleColosseum_4P_EventScript_PlayerSpot0:: fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate @@ -632,7 +632,7 @@ BattleColosseum_4P_EventScript_PlayerSpot0:: @ 81BB8DB waitstate end -BattleColosseum_4P_EventScript_PlayerSpot1:: @ 81BB8F8 +BattleColosseum_4P_EventScript_PlayerSpot1:: fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate @@ -644,7 +644,7 @@ BattleColosseum_4P_EventScript_PlayerSpot1:: @ 81BB8F8 waitstate end -BattleColosseum_4P_EventScript_PlayerSpot2:: @ 81BB915 +BattleColosseum_4P_EventScript_PlayerSpot2:: fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate @@ -656,7 +656,7 @@ BattleColosseum_4P_EventScript_PlayerSpot2:: @ 81BB915 waitstate end -BattleColosseum_4P_EventScript_PlayerSpot3:: @ 81BB932 +BattleColosseum_4P_EventScript_PlayerSpot3:: fadescreen FADE_TO_BLACK special ChooseHalfPartyForBattle waitstate @@ -668,17 +668,17 @@ BattleColosseum_4P_EventScript_PlayerSpot3:: @ 81BB932 waitstate end -BattleColosseum_4P_EventScript_CancelSpotTrigger:: @ 81BB94F +BattleColosseum_4P_EventScript_CancelSpotTrigger:: end -TradeCenter_EventScript_Chair0:: @ 81BB950 +TradeCenter_EventScript_Chair0:: setvar VAR_0x8005, 0 textcolor 3 special EnterTradeSeat waitstate end -TradeCenter_EventScript_Chair1:: @ 81BB95C +TradeCenter_EventScript_Chair1:: setvar VAR_0x8005, 1 textcolor 3 special EnterTradeSeat @@ -686,7 +686,7 @@ TradeCenter_EventScript_Chair1:: @ 81BB95C end @ Unused -TradeCenter_EventScript_Chair2:: @ 81BB968 +TradeCenter_EventScript_Chair2:: setvar VAR_0x8005, 2 textcolor 3 special EnterTradeSeat @@ -694,7 +694,7 @@ TradeCenter_EventScript_Chair2:: @ 81BB968 end @ Unused -TradeCenter_EventScript_Chair3:: @ 81BB974 +TradeCenter_EventScript_Chair3:: setvar VAR_0x8005, 3 textcolor 3 special EnterTradeSeat @@ -703,13 +703,13 @@ TradeCenter_EventScript_Chair3:: @ 81BB974 @ Nop in FRLG @ Separate labels to match GetDirectionForEventScript -RecordCorner_EventScript_Spot0:: @ 81BB980 -RecordCorner_EventScript_Spot1:: @ 81BB980 -RecordCorner_EventScript_Spot2:: @ 81BB980 -RecordCorner_EventScript_Spot3:: @ 81BB980 +RecordCorner_EventScript_Spot0:: +RecordCorner_EventScript_Spot1:: +RecordCorner_EventScript_Spot2:: +RecordCorner_EventScript_Spot3:: end -CableClub_EventScript_ReadTrainerCard:: @ 81BB981 +CableClub_EventScript_ReadTrainerCard:: textcolor 3 msgbox Text_LookedAtPlayersTrainerCard fadescreen FADE_TO_BLACK @@ -717,7 +717,7 @@ CableClub_EventScript_ReadTrainerCard:: @ 81BB981 waitstate end -CableClub_EventScript_ReadTrainerCardColored:: @ 81BB992 +CableClub_EventScript_ReadTrainerCardColored:: textcolor 3 msgbox Text_LookedAtPlayersTrainerCardColored fadescreen FADE_TO_BLACK @@ -725,13 +725,13 @@ CableClub_EventScript_ReadTrainerCardColored:: @ 81BB992 waitstate end -CableClub_EventScript_TooBusyToNotice:: @ 81BB9A3 +CableClub_EventScript_TooBusyToNotice:: textcolor 3 msgbox Text_TrainerTooBusyToNotice closemessage end -BattleColosseum_2P_EventScript_Attendant:: @ 81BB9AF +BattleColosseum_2P_EventScript_Attendant:: textcolor 3 special Script_FacePlayer msgbox Text_TakeSeatStartBattle @@ -739,7 +739,7 @@ BattleColosseum_2P_EventScript_Attendant:: @ 81BB9AF closemessage end -TradeCenter_EventScript_Attendant:: @ 81BB9C1 +TradeCenter_EventScript_Attendant:: textcolor 3 special Script_FacePlayer msgbox Text_TakeSeatStartTrade @@ -748,10 +748,10 @@ TradeCenter_EventScript_Attendant:: @ 81BB9C1 end @ Nop in FRLG -RecordCorner_EventScript_Attendant:: @ 81BB9D3 +RecordCorner_EventScript_Attendant:: end -TradeCenter_ConfirmLeaveRoom:: @ 81BB9D4 +TradeCenter_ConfirmLeaveRoom:: textcolor 3 msgbox Text_TerminateLinkIfYouLeaveRoom, MSGBOX_YESNO compare VAR_RESULT, YES @@ -760,20 +760,20 @@ TradeCenter_ConfirmLeaveRoom:: @ 81BB9D4 releaseall end -TradeCenter_TerminateLink:: @ 81BB9F0 +TradeCenter_TerminateLink:: textcolor 3 messageautoscroll Text_TerminateLinkConfirmation waitmessage special ExitLinkRoom end -CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC +CableClub_EventScript_DoLinkRoomExit:: special CleanupLinkRoomState special ReturnFromLinkRoom waitstate end -CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04 +CableClub_EventScript_UnionRoomAttendant:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -791,7 +791,7 @@ CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04 goto CableClub_EventScript_AskEnterUnionRoom end -CableClub_EventScript_AskEnterUnionRoom:: @ 81BBA51 +CableClub_EventScript_AskEnterUnionRoom:: multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE switch VAR_RESULT case 0, CableClub_EventScript_EnterUnionRoom @@ -800,13 +800,13 @@ CableClub_EventScript_AskEnterUnionRoom:: @ 81BBA51 case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -CableClub_EventScript_UnionRoomInfo:: @ 81BBA88 +CableClub_EventScript_UnionRoomInfo:: message CableClub_Text_UnionRoomInfo waitmessage goto CableClub_EventScript_AskEnterUnionRoom end -CableClub_EventScript_EnterUnionRoom:: @ 81BBA94 +CableClub_EventScript_EnterUnionRoom:: call CableClub_EventScript_CheckPartyUnionRoomRequirements compare VAR_RESULT, FALSE goto_if_eq CableClub_EventScript_AbortLink @@ -842,7 +842,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 81BBA94 waitstate end -CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 81BBB1E +CableClub_EventScript_CheckPartyUnionRoomRequirements:: specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 2 goto_if_lt CableClub_EventScript_NeedTwoMonsForUnionRoom @@ -852,22 +852,22 @@ CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 81BBB1E setvar VAR_RESULT, TRUE return -CableClub_EventScript_NeedTwoMonsForUnionRoom:: @ 81BBB44 +CableClub_EventScript_NeedTwoMonsForUnionRoom:: msgbox CableClub_Text_NeedTwoMonsForUnionRoom goto EventScript_SetResultFalse end -CableClub_EventScript_NoEnigmaBerryInUnionRoom:: @ 81BBB52 +CableClub_EventScript_NoEnigmaBerryInUnionRoom:: msgbox CableClub_Text_NoEnigmaBerryInUnionRoom goto EventScript_SetResultFalse end -CableClub_EventScript_UnionRoomAdapterNotConnected:: @ 81BBB60 +CableClub_EventScript_UnionRoomAdapterNotConnected:: msgbox CableClub_Text_UnionRoomAdapterNotConnected release return -CableClub_EventScript_WirelessClubAttendant:: @ 81BBB6A +CableClub_EventScript_WirelessClubAttendant:: lock faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements @@ -878,12 +878,12 @@ CableClub_EventScript_WirelessClubAttendant:: @ 81BBB6A release return -CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92 +CableClub_EventScript_DontAskAboutLinking:: msgbox CableClub_Text_HopeYouEnjoyWirelessSystem release return -CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C +CableClub_EventScript_DirectCornerAttendant:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -901,7 +901,7 @@ CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C goto CableClub_EventScript_DirectCornerSelectService end -CableClub_EventScript_DirectCornerSelectService:: @ 81BBBE7 +CableClub_EventScript_DirectCornerSelectService:: goto_if_unset FLAG_GOT_POWDER_JAR, CableClub_EventScript_DirectCornerNoBerry multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_CRUSH, FALSE switch VAR_RESULT @@ -912,7 +912,7 @@ CableClub_EventScript_DirectCornerSelectService:: @ 81BBBE7 case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -CableClub_EventScript_DirectCornerNoBerry:: @ 81BBC32 +CableClub_EventScript_DirectCornerNoBerry:: multichoice 0, 0, MULTICHOICE_TRADE_COLOSSEUM_2, FALSE switch VAR_RESULT case 0, CableClub_EventScript_WirelessTrade @@ -921,7 +921,7 @@ CableClub_EventScript_DirectCornerNoBerry:: @ 81BBC32 case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -CableClub_EventScript_WirelessTrade:: @ 81BBC69 +CableClub_EventScript_WirelessTrade:: msgbox CableClub_Text_TradePokemon, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq CableClub_EventScript_AbortLink @@ -932,7 +932,7 @@ CableClub_EventScript_WirelessTrade:: @ 81BBC69 goto CableClub_EventScript_SaveAndChooseLinkLeader end -CableClub_EventScript_WirelessBattleSelect:: @ 81BBC97 +CableClub_EventScript_WirelessBattleSelect:: message CableClub_Text_PlayWhichBattleMode waitmessage multichoice 0, 0, MULTICHOICE_SINGLE_DOUBLE_MULTI_INFO_EXIT, FALSE @@ -945,12 +945,12 @@ CableClub_EventScript_WirelessBattleSelect:: @ 81BBC97 case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -CableClub_EventScript_WirelessSingleBattle:: @ 81BBCEA +CableClub_EventScript_WirelessSingleBattle:: setvar VAR_0x8004, LINK_GROUP_SINGLE_BATTLE goto CableClub_EventScript_SaveAndChooseLinkLeader end -CableClub_EventScript_WirelessDoubleBattle:: @ 81BBCF5 +CableClub_EventScript_WirelessDoubleBattle:: special HasEnoughMonsForDoubleBattle compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS goto_if_ne CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle @@ -958,22 +958,22 @@ CableClub_EventScript_WirelessDoubleBattle:: @ 81BBCF5 goto CableClub_EventScript_SaveAndChooseLinkLeader end -CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: @ 81BBD0E +CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: msgbox CableClub_Text_NeedTwoMonsForDoubleBattle goto CableClub_EventScript_WirelessBattleSelect end -CableClub_EventScript_WirelessMultiBattle:: @ 81BBD1C +CableClub_EventScript_WirelessMultiBattle:: setvar VAR_0x8004, LINK_GROUP_MULTI_BATTLE goto CableClub_EventScript_SaveAndChooseLinkLeader end -CableClub_EventScript_WirelessBattleInfo:: @ 81BBD27 +CableClub_EventScript_WirelessBattleInfo:: msgbox CableClub_Text_ExplainBattleModes goto CableClub_EventScript_WirelessBattleSelect end -CableClub_EventScript_WirelessBerryCrush:: @ 81BBD35 +CableClub_EventScript_WirelessBerryCrush:: msgbox CableClub_Text_UseBerryCrush, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq CableClub_EventScript_AbortLink @@ -984,12 +984,12 @@ CableClub_EventScript_WirelessBerryCrush:: @ 81BBD35 goto CableClub_EventScript_SaveAndChooseLinkLeader end -CableClub_EventScript_NeedBerryForBerryCrush:: @ 81BBD61 +CableClub_EventScript_NeedBerryForBerryCrush:: msgbox CableClub_Text_NeedBerryForBerryCrush goto CableClub_EventScript_DirectCornerSelectService end -CableClub_EventScript_SaveAndChooseLinkLeader:: @ 81BBD6F +CableClub_EventScript_SaveAndChooseLinkLeader:: call EventScript_AskSaveGame compare VAR_RESULT, 0 goto_if_eq CableClub_EventScript_AbortLink @@ -1001,7 +1001,7 @@ CableClub_EventScript_SaveAndChooseLinkLeader:: @ 81BBD6F case LINK_GROUP_BERRY_CRUSH, CableClub_EventScript_ChooseLinkLeader end -CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 81BBDBC +CableClub_EventScript_ChooseLinkLeaderFrom2:: textcolor 3 message CableClub_Text_ChooseGroupLeaderOfTwo waitmessage @@ -1014,7 +1014,7 @@ CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 81BBDBC case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -CableClub_EventScript_TryLeadGroup2Players:: @ 81BBE00 +CableClub_EventScript_TryLeadGroup2Players:: call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom @@ -1025,7 +1025,7 @@ CableClub_EventScript_TryLeadGroup2Players:: @ 81BBE00 release return -CableClub_EventScript_TryJoinGroup2Players:: @ 81BBE28 +CableClub_EventScript_TryJoinGroup2Players:: call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom @@ -1036,7 +1036,7 @@ CableClub_EventScript_TryJoinGroup2Players:: @ 81BBE28 release return -CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 81BBE50 +CableClub_EventScript_ChooseLinkLeaderFrom4:: textcolor 3 message CableClub_Text_ChooseGroupLeaderOfFour waitmessage @@ -1049,7 +1049,7 @@ CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 81BBE50 case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -CableClub_EventScript_TryLeadGroup4Players:: @ 81BBE94 +CableClub_EventScript_TryLeadGroup4Players:: call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom @@ -1060,7 +1060,7 @@ CableClub_EventScript_TryLeadGroup4Players:: @ 81BBE94 release return -CableClub_EventScript_TryJoinGroup4Players:: @ 81BBEBC +CableClub_EventScript_TryJoinGroup4Players:: call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom @@ -1071,7 +1071,7 @@ CableClub_EventScript_TryJoinGroup4Players:: @ 81BBEBC release return -CableClub_EventScript_ChooseLinkLeader:: @ 81BBEE4 +CableClub_EventScript_ChooseLinkLeader:: textcolor 3 message CableClub_Text_ChooseGroupLeader waitmessage @@ -1084,7 +1084,7 @@ CableClub_EventScript_ChooseLinkLeader:: @ 81BBEE4 case SCR_MENU_CANCEL, CableClub_EventScript_AbortLink end -CableClub_EventScript_TryLeadGroupXPlayers:: @ 81BBF28 +CableClub_EventScript_TryLeadGroupXPlayers:: call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom @@ -1095,7 +1095,7 @@ CableClub_EventScript_TryLeadGroupXPlayers:: @ 81BBF28 release return -CableClub_EventScript_TryJoinGroupXPlayers:: @ 81BBF50 +CableClub_EventScript_TryJoinGroupXPlayers:: call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom @@ -1106,19 +1106,19 @@ CableClub_EventScript_TryJoinGroupXPlayers:: @ 81BBF50 release return -CableClub_EventScript_TryBecomeLinkLeader:: @ 81BBF78 +CableClub_EventScript_TryBecomeLinkLeader:: special HelpSystem_Disable special TryBecomeLinkLeader waitstate return -CableClub_EventScript_TryJoinLinkGroup:: @ 81BBF80 +CableClub_EventScript_TryJoinLinkGroup:: special HelpSystem_Disable special TryJoinLinkGroup waitstate return -CableClub_EventScript_EnterWirelessLinkRoom:: @ 81BBF88 +CableClub_EventScript_EnterWirelessLinkRoom:: messageautoscroll CableClub_Text_DirectYouToYourRoom waitmessage delay 60 @@ -1144,7 +1144,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 81BBF88 waitstate end -CableClub_EventScript_ShowWirelessCommunicationScreen:: @ 81BBFD8 +CableClub_EventScript_ShowWirelessCommunicationScreen:: goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_NotReadyYet @@ -1160,40 +1160,40 @@ CableClub_EventScript_ShowWirelessCommunicationScreen:: @ 81BBFD8 releaseall end -CableClub_EventScript_AdapterNotConnected:: @ 81BC016 +CableClub_EventScript_AdapterNotConnected:: msgbox CableClub_Text_AdapterNotConnected releaseall end -CableClub_EventScript_OpenUnionRoomBarrier:: @ 81BC020 +CableClub_EventScript_OpenUnionRoomBarrier:: setmetatile 5, 3, METATILE_PokemonCenter_Floor_ShadeLeft, 0 return -CableClub_EventScript_CloseUnionRoomBarrier:: @ 81BC02A +CableClub_EventScript_CloseUnionRoomBarrier:: setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1 return -CableClub_EventScript_OpenDirectCornerBarrier:: @ 81BC034 +CableClub_EventScript_OpenDirectCornerBarrier:: setmetatile 9, 3, METATILE_PokemonCenter_Floor_ShadeLeft, 0 return -CableClub_EventScript_CloseDirectCornerBarrier:: @ 81BC03E +CableClub_EventScript_CloseDirectCornerBarrier:: setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1 return -CableClub_EventScript_OpenGameCornerBarrier:: @ 81BC048 +CableClub_EventScript_OpenGameCornerBarrier:: setmetatile 5, 3, METATILE_GameCorner_CheckeredFloor_ShadeLeft, 0 return -CableClub_EventScript_CloseGameCornerBarrier:: @ 81BC052 +CableClub_EventScript_CloseGameCornerBarrier:: setmetatile 5, 3, METATILE_GameCorner_CounterBarrier, 1 return -CableClub_OnResume:: @ 81BC05C +CableClub_OnResume:: special InitUnionRoom end -JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060 +JoyfulGameCorner_EventScript_InfoMan2:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -1208,22 +1208,22 @@ JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060 case SCR_MENU_CANCEL, CableClub_EventScript_MinigameInfoExit end -CableClub_EventScript_PokemonJumpInfo:: @ 81BC0B0 +CableClub_EventScript_PokemonJumpInfo:: msgbox Text_PokemonJumpInfo release end -CableClub_EventScript_DodrioBerryPickingInfo:: @ 81BC0BA +CableClub_EventScript_DodrioBerryPickingInfo:: msgbox Text_DodrioBerryPickingInfo release end -CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4 +CableClub_EventScript_MinigameInfoExit:: msgbox Text_TalkToManToPlay release end -JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE +JoyfulGameCorner_EventScript_MinigameAttendant:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -1245,7 +1245,7 @@ JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE case SCR_MENU_CANCEL, CableClub_EventScript_AbortMinigame end -CableClub_EventScript_PlayPokemonJump:: @ 81BC13A +CableClub_EventScript_PlayPokemonJump:: setvar VAR_0x8005, 0 special IsPokemonJumpSpeciesInParty compare VAR_RESULT, FALSE @@ -1263,7 +1263,7 @@ CableClub_EventScript_PlayPokemonJump:: @ 81BC13A goto CableClub_EventScript_ChooseLinkLeaderMinigame end -CableClub_EventScript_PlayDodrioBerryPicking:: @ 81BC184 +CableClub_EventScript_PlayDodrioBerryPicking:: setvar VAR_0x8005, 1 special IsDodrioInParty compare VAR_RESULT, 0 @@ -1281,7 +1281,7 @@ CableClub_EventScript_PlayDodrioBerryPicking:: @ 81BC184 goto CableClub_EventScript_ChooseLinkLeaderMinigame end -CableClub_EventScript_ChooseLinkLeaderMinigame:: @ 81BC1CE +CableClub_EventScript_ChooseLinkLeaderMinigame:: textcolor 3 message CableClub_Text_ChooseGroupLeader waitmessage @@ -1294,7 +1294,7 @@ CableClub_EventScript_ChooseLinkLeaderMinigame:: @ 81BC1CE case SCR_MENU_CANCEL, CableClub_EventScript_AbortMinigame end -CableClub_EventScript_TryBecomeMinigameLinkLeader:: @ 81BC212 +CableClub_EventScript_TryBecomeMinigameLinkLeader:: call CableClub_EventScript_TryBecomeLinkLeader compare VAR_RESULT, 1 goto_if_eq CableClub_EventScript_EnterMinigame @@ -1305,7 +1305,7 @@ CableClub_EventScript_TryBecomeMinigameLinkLeader:: @ 81BC212 release return -CableClub_EventScript_TryJoinMinigameLinkGroup:: @ 81BC23A +CableClub_EventScript_TryJoinMinigameLinkGroup:: call CableClub_EventScript_TryJoinLinkGroup compare VAR_RESULT, 1 goto_if_eq CableClub_EventScript_EnterMinigame @@ -1316,7 +1316,7 @@ CableClub_EventScript_TryJoinMinigameLinkGroup:: @ 81BC23A release return -CableClub_EventScript_EnterMinigame:: @ 81BC262 +CableClub_EventScript_EnterMinigame:: messageautoscroll Text_AllGoodToGo waitmessage delay 120 @@ -1336,12 +1336,12 @@ CableClub_EventScript_EnterMinigame:: @ 81BC262 waitstate end -CableClub_EventScript_AdapterNotConnectedMinigame:: @ 81BC29C +CableClub_EventScript_AdapterNotConnectedMinigame:: msgbox Text_AdapterNotConnectedMinigame release end -CableClub_EventScript_NoEligiblePkmn:: @ 81BC2A6 +CableClub_EventScript_NoEligiblePkmn:: msgbox EventScript_ExplainPokemonJumpRequirements, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq CableClub_EventScript_AbortMinigame @@ -1352,15 +1352,15 @@ CableClub_EventScript_NoEligiblePkmn:: @ 81BC2A6 goto CableClub_EventScript_AbortMinigame end -CableClub_EventScript_ExplainPokemonJumpRequirements:: @ 81BC2D5 +CableClub_EventScript_ExplainPokemonJumpRequirements:: msgbox Text_ShortJumpingPokemonAllowed return -CableClub_EventScript_ExplainDodrioBerryPickingRequirements:: @ 81BC2DE +CableClub_EventScript_ExplainDodrioBerryPickingRequirements:: msgbox Text_OnlyDodrioAllowed return -TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords:: @ 81BC2E7 +TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords:: goto_if_questlog EventScript_ReleaseEnd lockall special ShowPokemonJumpRecords @@ -1368,7 +1368,7 @@ TwoIsland_JoyfulGameCorner_EventScript_ShowPokemonJumpRecords:: @ 81BC2E7 releaseall end -TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords:: @ 81BC2FC +TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords:: goto_if_questlog EventScript_ReleaseEnd lockall special ShowDodrioBerryPickingRecords @@ -1376,216 +1376,216 @@ TwoIsland_JoyfulGameCorner_EventScript_ShowDodrioBerryPickingRecords:: @ 81BC2FC releaseall end -CableClub_Text_WelcomeWhichCableClubService:: @ 81BC311 +CableClub_Text_WelcomeWhichCableClubService:: .string "Welcome to the POKéMON CABLE\n" .string "CLUB.\p" .string "Which of our services do you wish\n" .string "to use?$" -CableClub_Text_WhichService:: @ 81BC35E +CableClub_Text_WhichService:: .string "Which of our services do you wish\n" .string "to use?$" -CableClub_Text_TradeMonsUsingLinkCable:: @ 81BC388 +CableClub_Text_TradeMonsUsingLinkCable:: .string "Trade POKéMON with another player\n" .string "using a GBA Game Link cable.$" -CableClub_Text_BattleUsingLinkCable:: @ 81BC3C7 +CableClub_Text_BattleUsingLinkCable:: .string "You may battle another TRAINER\n" .string "using a GBA Game Link cable.$" @ Unused, translated in Emerald -CableClub_Text_CloseThisMenu:: @ 81BC403 +CableClub_Text_CloseThisMenu:: .string "おわります$" -CableClub_Text_NeedTwoMonsForDoubleBattle:: @ 81BC409 +CableClub_Text_NeedTwoMonsForDoubleBattle:: .string "For a DOUBLE BATTLE, you must\n" .string "have at least two POKéMON.$" -CableClub_Text_NeedTwoMonsToTrade:: @ 81BC442 +CableClub_Text_NeedTwoMonsToTrade:: .string "For trading, you must have at\n" .string "least two POKéMON with you.$" -CableClub_Text_CantTradeEnigmaBerry:: @ 81BC47C +CableClub_Text_CantTradeEnigmaBerry:: .string "A POKéMON holding the {STR_VAR_1}\n" .string "BERRY can't be traded.$" -CableClub_Text_PleaseWaitBCancel:: @ 81BC4AC +CableClub_Text_PleaseWaitBCancel:: .string "Please wait.\n" .string "… … B Button: Cancel$" -CableClub_Text_WhenAllPlayersReadyAConfirmBCancel:: @ 81BC4CE +CableClub_Text_WhenAllPlayersReadyAConfirmBCancel:: .string "When all players are ready…\n" .string "A Button: Confirm\l" .string "B Button: Cancel$" -CableClub_Text_StartLinkWithXPlayersAConfirmBCancel:: @ 81BC50D +CableClub_Text_StartLinkWithXPlayersAConfirmBCancel:: .string "Start link with {STR_VAR_1} players.\n" .string "A Button: Confirm\l" .string "B Button: Cancel$" -CableClub_Text_AwaitingLinkupBCancel:: @ 81BC54C +CableClub_Text_AwaitingLinkupBCancel:: .string "Awaiting linkup…\n" .string "… … B Button: Cancel$" @ Unused, translated in Emerald -CableClub_Text_OkayToSaveProgress:: @ 81BC572 +CableClub_Text_OkayToSaveProgress:: .string "はじめる　まえに　レポートを\n" .string "かきますが　よろしいですか？$" -CableClub_Text_PleaseEnter:: @ 81BC590 +CableClub_Text_PleaseEnter:: .string "Please enter.$" -CableClub_Text_DirectYouToYourRoom:: @ 81BC59E +CableClub_Text_DirectYouToYourRoom:: .string "I'll direct you to your room now.$" -CableClub_Text_SomeoneIsNotReadyToLink:: @ 81BC5C0 +CableClub_Text_SomeoneIsNotReadyToLink:: .string "Someone is not ready to link.\p" .string "Please come back after everyone\n" .string "has made preparations.$" -CableClub_Text_LinkErrorPleaseReset:: @ 81BC615 +CableClub_Text_LinkErrorPleaseReset:: .string "Sorry, we have a link error…\n" .string "Please reset and try again.$" -CableClub_Text_PlayersMadeDifferentSelections:: @ 81BC64E +CableClub_Text_PlayersMadeDifferentSelections:: .string "The link partners appear to have\n" .string "made different selections.$" -CableClub_Text_PleaseVisitAgain:: @ 81BC68A +CableClub_Text_PleaseVisitAgain:: .string "Please do visit again.$" -CableClub_Text_IncorrectNumberOfParticipants:: @ 81BC6A1 +CableClub_Text_IncorrectNumberOfParticipants:: .string "The number of participants is\n" .string "incorrect.$" -CableClub_Text_CantSingleBattleWithXPlayers:: @ 81BC6CA +CableClub_Text_CantSingleBattleWithXPlayers:: .string "The SINGLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" -CableClub_Text_CantDoubleBattleWithXPlayers:: @ 81BC700 +CableClub_Text_CantDoubleBattleWithXPlayers:: .string "The DOUBLE BATTLE Mode can't be\n" .string "played by {STR_VAR_1} players.$" -CableClub_Text_NeedFourPlayers:: @ 81BC736 +CableClub_Text_NeedFourPlayers:: .string "There must be four players to play\n" .string "this Battle Mode.$" -CableClub_Text_PleaseConfirmNumberAndRestart:: @ 81BC76B +CableClub_Text_PleaseConfirmNumberAndRestart:: .string "Please confirm the number of\n" .string "players and start again.$" -Text_TerminateLinkIfYouLeaveRoom:: @ 81BC7A1 +Text_TerminateLinkIfYouLeaveRoom:: .string "The link will be terminated if you\n" .string "leave the room. Is that okay?$" -Text_TerminateLinkConfirmation:: @ 81BC7E2 +Text_TerminateLinkConfirmation:: .string "Terminating link…\n" .string "You will be escorted out of\l" .string "the room. Please wait.$" -Text_TrainerTooBusyToNotice:: @ 81BC827 +Text_TrainerTooBusyToNotice:: .string "This TRAINER is too busy to\n" .string "notice…$" -Text_LookedAtPlayersTrainerCard:: @ 81BC84B +Text_LookedAtPlayersTrainerCard:: .string "Score! Got to look at {STR_VAR_1}'s\n" .string "TRAINER CARD!$" -Text_LookedAtPlayersTrainerCardColored:: @ 81BC874 +Text_LookedAtPlayersTrainerCardColored:: .string "Score! Got to look at {STR_VAR_1}'s\n" .string "TRAINER CARD!\p" .string "It's a {STR_VAR_2} card!$" -Text_TakeSeatStartBattle:: @ 81BC8AD +Text_TakeSeatStartBattle:: .string "Please take your seat and start\n" .string "your battle.$" -Text_TakeSeatStartTrade:: @ 81BC8DA +Text_TakeSeatStartTrade:: .string "Please take your seat and start\n" .string "your trade.$" @ Unused, leftover from RS -RecordCorner_Text_ThanksForComing:: @ 81BC906 +RecordCorner_Text_ThanksForComing:: .string "ごりよう　ありがとう　ございました$" -CableClub_Text_TrainerCardDataOverwritten:: @ 81BC918 +CableClub_Text_TrainerCardDataOverwritten:: .string "The TRAINER CARD data will\n" .string "be overwritten.$" -CableClub_Text_HopeToSeeYouAgain:: @ 81BC943 +CableClub_Text_HopeToSeeYouAgain:: .string "I hope to see you again!$" -CableClub_Text_NotSetUpForFarAwayRegion:: @ 81BC95C +CableClub_Text_NotSetUpForFarAwayRegion:: .string "I'm awfully sorry.\p" .string "We're not set up to conduct trades\n" .string "with TRAINERS far away in another\l" .string "region yet…$" -CableClub_Text_OtherTrainerNotReady:: @ 81BC9C0 +CableClub_Text_OtherTrainerNotReady:: .string "The other TRAINER is not ready.$" -CableClub_Text_YouHaveAMonThatCantBeTaken:: @ 81BC9E0 +CableClub_Text_YouHaveAMonThatCantBeTaken:: .string "You have at least one POKéMON\n" .string "that can't be taken.$" -CableClub_Text_AdapterNotConnected:: @ 81BCA13 +CableClub_Text_AdapterNotConnected:: .string "The Wireless Adapter is not\n" .string "connected properly.$" -CableClub_Text_ParticipantsStepUpToCounter:: @ 81BCA43 +CableClub_Text_ParticipantsStepUpToCounter:: .string "Participants are asked to step up\n" .string "to the reception counter.$" @ Unused, translated in Emerald -CableClub_Text_Hello:: @ 81BCA7F +CableClub_Text_Hello:: .string "こんにちは！$" @ Unused, translated in Emerald -CableClub_Text_PleaseWait:: @ 81BCA86 +CableClub_Text_PleaseWait:: .string "しょうしょう　おまちください$" -CableClub_Text_YouMayTradeHere:: @ 81BCA95 +CableClub_Text_YouMayTradeHere:: .string "You may trade your POKéMON here\n" .string "with another TRAINER.$" -CableClub_Text_YouMayBattleHere:: @ 81BCACB +CableClub_Text_YouMayBattleHere:: .string "You may battle with your friends\n" .string "here.$" -CableClub_Text_CanMakeBerryPowder:: @ 81BCAF2 +CableClub_Text_CanMakeBerryPowder:: .string "Two to five TRAINERS can make\n" .string "BERRY POWDER together.$" @ Unused, Record Mix nopped -CableClub_Text_CanMixRecords:: @ 81BCB27 +CableClub_Text_CanMixRecords:: .string "ワイヤレス　クラブでの\n" .string "あそびかたを　せつめいします$" -CableClub_Text_CancelSelectedItem:: @ 81BCB42 +CableClub_Text_CancelSelectedItem:: .string "Cancels the selected MENU item.$" @ Unused, translated in Emerald -CableClub_Text_WhichBattleMode:: @ 81BCB62 +CableClub_Text_WhichBattleMode:: .string "どちらの　しょうぶに　しますか？$" @ Unused, translated in Emerald -CableClub_Text_ReturnsToPreviousStep:: @ 81BCB73 +CableClub_Text_ReturnsToPreviousStep:: .string "ひとつ　まえに　もどります$" -CableClub_Text_NeedBerryForBerryCrush:: @ 81BCB81 +CableClub_Text_NeedBerryForBerryCrush:: .string "To use the BERRY CRUSH service,\n" .string "you must have at least one BERRY.$" -CableClub_Text_NeedTwoMonsForUnionRoom:: @ 81BCBC3 +CableClub_Text_NeedTwoMonsForUnionRoom:: .string "To enter the UNION ROOM, you must\n" .string "have at least two POKéMON.$" -CableClub_Text_NoEnigmaBerryInUnionRoom:: @ 81BCC00 +CableClub_Text_NoEnigmaBerryInUnionRoom:: .string "No POKéMON holding the {STR_VAR_1}\n" .string "BERRY may enter the UNION ROOM.$" -CableClub_Text_UnionRoomAdapterNotConnected:: @ 81BCC3A +CableClub_Text_UnionRoomAdapterNotConnected:: .string "This is the POKéMON WIRELESS CLUB\n" .string "UNION ROOM.\p" .string "Unfortunately, your Wireless\n" @@ -1593,21 +1593,21 @@ CableClub_Text_UnionRoomAdapterNotConnected:: @ 81BCC3A .string "Please do come again.$" @ Unused, translated in Emerald -CableClub_Text_OhExcuseMe:: @ 81BCCBE +CableClub_Text_OhExcuseMe:: .string "あ‥‥\n" .string "おきゃくさま！$" -Text_PlayerIsPlayingRightNowGoForIt:: @ 81BCCCA +Text_PlayerIsPlayingRightNowGoForIt:: .string "It appears as if {STR_VAR_1} is playing\n" .string "right now.\l" .string "Go for it!$" -Text_DescribeWhichGame:: @ 81BCCFF +Text_DescribeWhichGame:: .string "I can explain game rules to you,\n" .string "if you'd like.\p" .string "Which game should I describe?$" -Text_PokemonJumpInfo:: @ 81BCD4D +Text_PokemonJumpInfo:: .string "“POKéMON JUMP”\p" .string "Make your POKéMON skip the\n" .string "VINE WHIP rope with the A Button.\p" @@ -1620,7 +1620,7 @@ Text_PokemonJumpInfo:: @ 81BCD4D .string "Good things happen if everyone\n" .string "jumps in time.$" -Text_DodrioBerryPickingInfo:: @ 81BCE73 +Text_DodrioBerryPickingInfo:: .string "“DODRIO BERRY-PICKING”\p" .string "Command DODRIO's three heads to\n" .string "catch falling BERRIES.\p" @@ -1629,48 +1629,48 @@ Text_DodrioBerryPickingInfo:: @ 81BCE73 .string "To play this game, you must have\n" .string "a DODRIO.$" -Text_TalkToManToPlay:: @ 81BCF2E +Text_TalkToManToPlay:: .string "If you want to play a game,\n" .string "please tell the man beside me.$" -Text_WelcomeCanYouWait:: @ 81BCF69 +Text_WelcomeCanYouWait:: .string "Hi, welcome!\n" .string "You can play games over the\l" .string "Wireless Communication System.\p" .string "Can you wait just a little bit?$" -CableClub_Text_ComeAgain:: @ 81BCFD1 +CableClub_Text_ComeAgain:: .string "All right, come again!$" -Text_AdapterNotConnectedMinigame:: @ 81BCFE8 +Text_AdapterNotConnectedMinigame:: .string "The Wireless Adapter isn't\n" .string "connected.\p" .string "Come back when it's hooked up!$" -Text_PlayWhichGame:: @ 81BD02D +Text_PlayWhichGame:: .string "All right, which game did you want\n" .string "to play?$" -Text_EnterWhichPokemon:: @ 81BD059 +Text_EnterWhichPokemon:: .string "Which POKéMON would you like to\n" .string "enter?$" -Text_AllGoodToGo:: @ 81BD080 +Text_AllGoodToGo:: .string "Okay, you're all good to go.\n" .string "Don't let the others beat you!$" @ Unused, translated in Emerald -Text_LeavingDoComeAgain:: @ 81BD0BC +Text_LeavingDoComeAgain:: .string "きょうは　けえるのか？\n" .string "またこいよ！$" -EventScript_ExplainPokemonJumpRequirements:: @ 81BD0CF +EventScript_ExplainPokemonJumpRequirements:: .string "It doesn't look like you have any\n" .string "POKéMON that you can enter…\p" .string "Would you like me to explain what\n" .string "kinds of POKéMON can enter?$" -Text_ShortJumpingPokemonAllowed:: @ 81BD14B +Text_ShortJumpingPokemonAllowed:: .string "“POKéMON JUMP” is open to POKéMON\n" .string "around 28 inches or less.\p" .string "What you can't enter are those\n" @@ -1679,18 +1679,18 @@ Text_ShortJumpingPokemonAllowed:: @ 81BD14B .string "swim, burrow, or fly.\p" .string "That's all you need to know.$" -Text_OnlyDodrioAllowed:: @ 81BD213 +Text_OnlyDodrioAllowed:: .string "“DODRIO BERRY-PICKING”…\n" .string "Well, the name says it all.\p" .string "You have to have a DODRIO to play\n" .string "this game.$" @ Unused, translated in Emerald -Text_RetryFromStartPlease:: @ 81BD274 +Text_RetryFromStartPlease:: .string "もういちど　はじめから\n" .string "やりなおして　みて　くれ$" -CableClub_Text_WelcomeWhichDirectCornerRoom:: @ 81BD28D +CableClub_Text_WelcomeWhichDirectCornerRoom:: .string "Welcome to the POKéMON WIRELESS\n" .string "CLUB DIRECT CORNER.\p" .string "You may interact directly with\n" @@ -1698,18 +1698,18 @@ CableClub_Text_WelcomeWhichDirectCornerRoom:: @ 81BD28D .string "Which room would you like to\n" .string "enter?$" -CableClub_Text_TradePokemon:: @ 81BD317 +CableClub_Text_TradePokemon:: .string "Would you like to trade POKéMON?$" -CableClub_Text_PlayWhichBattleMode:: @ 81BD338 +CableClub_Text_PlayWhichBattleMode:: .string "Which Battle Mode would you like\n" .string "to play?$" -CableClub_Text_UseBerryCrush:: @ 81BD362 +CableClub_Text_UseBerryCrush:: .string "Would you like to use the\n" .string "BERRY CRUSH System?$" -CableClub_Text_ExplainBattleModes:: @ 81BD390 +CableClub_Text_ExplainBattleModes:: .string "There are three Battle Modes.\p" .string "SINGLE BATTLE is for two TRAINERS\n" .string "with one or more POKéMON each.\p" @@ -1724,25 +1724,25 @@ CableClub_Text_ExplainBattleModes:: @ 81BD390 .string "Each TRAINER can have one POKéMON\n" .string "in battle at a time.$" -CableClub_Text_ChooseGroupLeaderOfTwo:: @ 81BD51B +CableClub_Text_ChooseGroupLeaderOfTwo:: .string "Please decide which of you two\n" .string "will become the LEADER.\p" .string "The other player must then choose\n" .string "“JOIN GROUP.”$" -CableClub_Text_ChooseGroupLeaderOfFour:: @ 81BD582 +CableClub_Text_ChooseGroupLeaderOfFour:: .string "Please decide which of you four\n" .string "will become the GROUP LEADER.\p" .string "The other players must then choose\n" .string "“JOIN GROUP.”$" -CableClub_Text_ChooseGroupLeader:: @ 81BD5F1 +CableClub_Text_ChooseGroupLeader:: .string "Please decide which of you will\n" .string "become the GROUP LEADER.\p" .string "The other players must then choose\n" .string "“JOIN GROUP.”$" -CableClub_Text_WelcomeUnionRoomEnter:: @ 81BD65B +CableClub_Text_WelcomeUnionRoomEnter:: .string "Welcome to the POKéMON WIRELESS\n" .string "CLUB UNION ROOM.\p" .string "You may interact directly with\n" @@ -1750,7 +1750,7 @@ CableClub_Text_WelcomeUnionRoomEnter:: @ 81BD65B .string "whom you may not even know.\p" .string "Would you like to enter the ROOM?$" -CableClub_Text_UnionRoomInfo:: @ 81BD706 +CableClub_Text_UnionRoomInfo:: .string "The TRAINERS in the UNION ROOM\n" .string "will be those players around you\l" .string "who have also entered the ROOM.\p" @@ -1764,11 +1764,11 @@ CableClub_Text_UnionRoomInfo:: @ 81BD706 .string "trade.\p" .string "Would you like to enter the ROOM?$" -CableClub_Text_EnjoyUnionRoom:: @ 81BD86A +CableClub_Text_EnjoyUnionRoom:: .string "I hope you enjoy your time in\n" .string "the UNION ROOM.$" -CableClub_Text_FirstTimeRightThisWay:: @ 81BD898 +CableClub_Text_FirstTimeRightThisWay:: .string "Hello!\n" .string "My name is TEALA.\p" .string "This must be your first time\n" @@ -1779,7 +1779,7 @@ CableClub_Text_FirstTimeRightThisWay:: @ 81BD898 .string "floor of our POKéMON CENTER.\p" .string "Right this way, please.$" -CableClub_Text_ExplainWirelessClubFirstTime:: @ 81BD966 +CableClub_Text_ExplainWirelessClubFirstTime:: .string "On the top floor, there are two\n" .string "rooms.\p" .string "First, the room on the left.\n" @@ -1801,14 +1801,14 @@ CableClub_Text_ExplainWirelessClubFirstTime:: @ 81BD966 .string "I hope you enjoy the Wireless \n" .string "Communication System.$" -CableClub_Text_AskAboutLinking:: @ 81BDB85 +CableClub_Text_AskAboutLinking:: .string "Hello, {PLAYER}!\p" .string "It's me, TEALA, the POKéMON\n" .string "CENTER 2F attendant.\p" .string "Is there something you needed to\n" .string "ask me about linking?$" -CableClub_Text_ExplainWirelessClub:: @ 81BDBF8 +CableClub_Text_ExplainWirelessClub:: .string "Let me explain how the POKéMON\n" .string "WIRELESS CLUB works.\p" .string "On this, the top floor, there are\n" @@ -1837,6 +1837,6 @@ CableClub_Text_ExplainWirelessClub:: @ 81BDBF8 .string "I hope you enjoy the Wireless \n" .string "Communication System.$" -CableClub_Text_HopeYouEnjoyWirelessSystem:: @ 81BDEDF +CableClub_Text_HopeYouEnjoyWirelessSystem:: .string "I hope you enjoy the Wireless\n" .string "Communication System.$" diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc index 88e402ac3..c9310f69c 100644 --- a/data/scripts/cave_of_origin.inc +++ b/data/scripts/cave_of_origin.inc @@ -1,23 +1,23 @@ @ All unused / leftover scripts from RS -CaveOfOrigin_EventScript_Shake1:: @ 81A7493 +CaveOfOrigin_EventScript_Shake1:: lockall setvar VAR_TEMP_1, 1 goto CaveOfOrigin_EventScript_Shake end -CaveOfOrigin_EventScript_Shake2:: @ 81A749F +CaveOfOrigin_EventScript_Shake2:: lockall setvar VAR_TEMP_2, 1 goto CaveOfOrigin_EventScript_Shake end -CaveOfOrigin_EventScript_Shake3:: @ 81A74AB +CaveOfOrigin_EventScript_Shake3:: lockall setvar VAR_TEMP_3, 1 goto CaveOfOrigin_EventScript_Shake end -CaveOfOrigin_EventScript_Shake:: @ 81A74B7 +CaveOfOrigin_EventScript_Shake:: setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 setvar VAR_0x8006, 8 @@ -27,7 +27,7 @@ CaveOfOrigin_EventScript_Shake:: @ 81A74B7 releaseall end -CaveOfOrigin_EventScript_DisableShakes:: @ 81A74D1 +CaveOfOrigin_EventScript_DisableShakes:: setvar VAR_TEMP_1, 1 setvar VAR_TEMP_2, 1 setvar VAR_TEMP_3, 1 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 59b65332b..9fa631bbc 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -1,4 +1,4 @@ -Route5_PokemonDayCare_EventScript_DaycareMan:: @ 81BF398 +Route5_PokemonDayCare_EventScript_DaycareMan:: goto_if_questlog EventScript_ReleaseEnd lock faceplayer @@ -13,7 +13,7 @@ Route5_PokemonDayCare_EventScript_DaycareMan:: @ 81BF398 goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -Route5_PokemonDayCare_EventScript_TryGiveMon:: @ 81BF3DD +Route5_PokemonDayCare_EventScript_TryGiveMon:: specialvar VAR_RESULT, CountPartyNonEggMons compare VAR_RESULT, 1 goto_if_eq Route5_PokemonDayCare_EventScript_OnlyOneMonInParty @@ -39,22 +39,22 @@ Route5_PokemonDayCare_EventScript_TryGiveMon:: @ 81BF3DD goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -Route5_PokemonDayCare_EventScript_ComeAgain:: @ 81BF444 +Route5_PokemonDayCare_EventScript_ComeAgain:: msgbox Route5_PokemonDayCare_Text_ComeAnytimeYouLike goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -Route5_PokemonDayCare_EventScript_OnlyOneMonInParty:: @ 81BF452 +Route5_PokemonDayCare_EventScript_OnlyOneMonInParty:: msgbox Route5_PokemonDayCare_Text_OnlyHaveOneMonWithYou goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -Route5_PokemonDayCare_EventScript_OnlyOneAliveMonInParty:: @ 81BF460 +Route5_PokemonDayCare_EventScript_OnlyOneAliveMonInParty:: msgbox Route5_PokemonDayCare_Text_WhatWillYouBattleWith goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -Route5_PokemonDayCare_EventScript_CheckOnMon:: @ 81BF46E +Route5_PokemonDayCare_EventScript_CheckOnMon:: setvar VAR_0x8004, 0 specialvar VAR_RESULT, GetNumLevelsGainedForRoute5DaycareMon compare VAR_RESULT, 0 @@ -68,15 +68,15 @@ Route5_PokemonDayCare_EventScript_CheckOnMon:: @ 81BF46E goto Route5_PokemonDayCare_EventScript_ComeAgain end -Route5_PokemonDayCare_EventScript_MonHasGrownByXLevels:: @ 81BF4AA +Route5_PokemonDayCare_EventScript_MonHasGrownByXLevels:: msgbox Route5_PokemonDayCare_Text_MonHasGrownByXLevels return -Route5_PokemonDayCare_EventScript_NotEnoughTime:: @ 81BF4B3 +Route5_PokemonDayCare_EventScript_NotEnoughTime:: msgbox Route5_PokemonDayCare_Text_MonNeedsToSpendMoreTime return -Route5_PokemonDayCare_EventScript_TryRetrieveMon:: @ 81BF4BC +Route5_PokemonDayCare_EventScript_TryRetrieveMon:: specialvar VAR_RESULT, CalculatePlayerPartyCount compare VAR_RESULT, PARTY_SIZE goto_if_eq Route5_PokemonDayCare_EventScript_NoRoomInParty @@ -87,7 +87,7 @@ Route5_PokemonDayCare_EventScript_TryRetrieveMon:: @ 81BF4BC goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -Route5_PokemonDayCare_EventScript_RetrieveMon:: @ 81BF4EA +Route5_PokemonDayCare_EventScript_RetrieveMon:: setvar VAR_0x8004, 0 specialvar VAR_RESULT, TakePokemonFromRoute5Daycare special SubtractMoneyFromVar0x8005 @@ -107,17 +107,17 @@ Route5_PokemonDayCare_EventScript_RetrieveMon:: @ 81BF4EA goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -Route5_PokemonDayCare_EventScript_NoRoomInParty:: @ 81BF533 +Route5_PokemonDayCare_EventScript_NoRoomInParty:: msgbox Route5_PokemonDayCare_Text_YouveGotNoRoomForIt goto Route5_PokemonDayCare_EventScript_CloseMoneyBox end -Route5_PokemonDayCare_EventScript_CloseMoneyBox:: @ 81BF541 +Route5_PokemonDayCare_EventScript_CloseMoneyBox:: hidemoneybox 0, 0 release end -EventScript_EggHatch:: @ 81BF546 +EventScript_EggHatch:: lockall msgbox DayCare_Text_Huh special EggHatch diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index 76b5d5c81..b2e12c4c2 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -1,4 +1,4 @@ -ViridianCity_House2_EventScript_PokemonJournal:: @ 81ACD65 +ViridianCity_House2_EventScript_PokemonJournal:: lock faceplayer famechecker FAMECHECKER_OAK, 3 @@ -8,7 +8,7 @@ ViridianCity_House2_EventScript_PokemonJournal:: @ 81ACD65 release end -EventScript_PokemonJournalUnused1:: @ 81ACD8D +EventScript_PokemonJournalUnused1:: lock faceplayer famechecker FAMECHECKER_DAISY, 1 @@ -18,7 +18,7 @@ EventScript_PokemonJournalUnused1:: @ 81ACD8D release end -EventScript_PokemonJournalUnused2:: @ 81ACDB5 +EventScript_PokemonJournalUnused2:: lock faceplayer famechecker FAMECHECKER_DAISY, 4 @@ -27,7 +27,7 @@ EventScript_PokemonJournalUnused2:: @ 81ACDB5 release end -FourIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACDD0 +FourIsland_PokemonCenter_1F_EventScript_PokemonJournal:: lockall famechecker FAMECHECKER_DAISY, 5 textcolor 3 @@ -35,7 +35,7 @@ FourIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACDD0 releaseall end -Route4_EventScript_Boy:: @ 81ACDEA +Route4_EventScript_Boy:: lock faceplayer famechecker FAMECHECKER_BROCK, 3 @@ -43,7 +43,7 @@ Route4_EventScript_Boy:: @ 81ACDEA release end -MtMoon_1F_EventScript_BaldingMan:: @ 81ACE03 +MtMoon_1F_EventScript_BaldingMan:: lock faceplayer famechecker FAMECHECKER_BROCK, 4 @@ -51,7 +51,7 @@ MtMoon_1F_EventScript_BaldingMan:: @ 81ACE03 release end -PewterCity_Museum_1F_EventScript_PokemonJournalBrock:: @ 81ACE1C +PewterCity_Museum_1F_EventScript_PokemonJournalBrock:: lockall famechecker FAMECHECKER_BROCK, 5 textcolor 3 @@ -59,7 +59,7 @@ PewterCity_Museum_1F_EventScript_PokemonJournalBrock:: @ 81ACE1C releaseall end -Route20_EventScript_Camper:: @ 81ACE36 +Route20_EventScript_Camper:: lock faceplayer famechecker FAMECHECKER_MISTY, 3 @@ -67,7 +67,7 @@ Route20_EventScript_Camper:: @ 81ACE36 release end -Route25_EventScript_Beauty:: @ 81ACE4F +Route25_EventScript_Beauty:: lock faceplayer famechecker FAMECHECKER_MISTY, 4 @@ -75,7 +75,7 @@ Route25_EventScript_Beauty:: @ 81ACE4F release end -CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty:: @ 81ACE68 +CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty:: lock faceplayer famechecker FAMECHECKER_MISTY, 5 @@ -84,7 +84,7 @@ CeruleanCity_PokemonCenter_1F_EventScript_PokemonJournalMisty:: @ 81ACE68 release end -VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge:: @ 81ACE83 +VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge:: lockall famechecker FAMECHECKER_LTSURGE, 5 textcolor 3 @@ -92,7 +92,7 @@ VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge:: @ 81ACE83 releaseall end -CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika:: @ 81ACE9D +CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika:: lock faceplayer famechecker FAMECHECKER_ERIKA, 5 @@ -101,7 +101,7 @@ CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika:: @ 81ACE9D release end -FuchsiaCity_WardensHouse_EventScript_PokemonJournalKoga:: @ 81ACEB8 +FuchsiaCity_WardensHouse_EventScript_PokemonJournalKoga:: lock faceplayer famechecker FAMECHECKER_KOGA, 4 @@ -110,7 +110,7 @@ FuchsiaCity_WardensHouse_EventScript_PokemonJournalKoga:: @ 81ACEB8 release end -SafariZone_North_RestHouse_EventScript_BaldingMan:: @ 81ACED3 +SafariZone_North_RestHouse_EventScript_BaldingMan:: lock faceplayer famechecker FAMECHECKER_KOGA, 5 @@ -118,7 +118,7 @@ SafariZone_North_RestHouse_EventScript_BaldingMan:: @ 81ACED3 release end -SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina:: @ 81ACEEC +SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina:: lock faceplayer famechecker FAMECHECKER_SABRINA, 4 @@ -127,7 +127,7 @@ SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina:: @ 81ACEEC release end -CinnabarIsland_Gym_EventScript_BlaineFujiPhoto:: @ 81ACF07 +CinnabarIsland_Gym_EventScript_BlaineFujiPhoto:: lockall famechecker FAMECHECKER_BLAINE, 4 famechecker FAMECHECKER_MRFUJI, 4 @@ -135,7 +135,7 @@ CinnabarIsland_Gym_EventScript_BlaineFujiPhoto:: @ 81ACF07 releaseall end -FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal:: @ 81ACF2C +FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal:: lockall famechecker FAMECHECKER_BLAINE, 5 textcolor 3 @@ -143,7 +143,7 @@ FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal:: @ 81ACF2C releaseall end -FourIsland_Mart_EventScript_OldMan:: @ 81ACF46 +FourIsland_Mart_EventScript_OldMan:: lock faceplayer famechecker FAMECHECKER_LORELEI, 2 @@ -151,7 +151,7 @@ FourIsland_Mart_EventScript_OldMan:: @ 81ACF46 release end -FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACF5F +FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal:: lock faceplayer famechecker FAMECHECKER_LORELEI, 3 @@ -160,7 +160,7 @@ FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACF5F release end -SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno:: @ 81ACF7A +SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno:: lock faceplayer famechecker FAMECHECKER_BRUNO, 2 @@ -169,7 +169,7 @@ SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno:: @ 81ACF7A release end -SevenIsland_SevaultCanyon_EventScript_BlackBelt:: @ 81ACF95 +SevenIsland_SevaultCanyon_EventScript_BlackBelt:: lock faceplayer famechecker FAMECHECKER_BRUNO, 5 @@ -177,7 +177,7 @@ SevenIsland_SevaultCanyon_EventScript_BlackBelt:: @ 81ACF95 release end -IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt:: @ 81ACFAE +IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt:: lock faceplayer famechecker FAMECHECKER_AGATHA, 1 @@ -186,7 +186,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt:: @ 81ACFAE release end -SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACFD4 +SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal:: lock faceplayer famechecker FAMECHECKER_AGATHA, 3 @@ -195,7 +195,7 @@ SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACFD4 release end -SixIsland_Mart_EventScript_OldWoman:: @ 81ACFEF +SixIsland_Mart_EventScript_OldWoman:: lock faceplayer famechecker FAMECHECKER_AGATHA, 5 @@ -203,7 +203,7 @@ SixIsland_Mart_EventScript_OldWoman:: @ 81ACFEF release end -EventScript_LanceUnused:: @ 81AD008 +EventScript_LanceUnused:: lock faceplayer famechecker FAMECHECKER_LANCE, 0 @@ -211,7 +211,7 @@ EventScript_LanceUnused:: @ 81AD008 release end -SaffronCity_EventScript_BattleGirlUnused:: @ 81AD021 +SaffronCity_EventScript_BattleGirlUnused:: lock faceplayer famechecker FAMECHECKER_LANCE, 1 @@ -219,7 +219,7 @@ SaffronCity_EventScript_BattleGirlUnused:: @ 81AD021 release end -SaffronCity_EventScript_BattleGirl:: @ 81AD03A +SaffronCity_EventScript_BattleGirl:: lock faceplayer famechecker FAMECHECKER_LANCE, 2 @@ -227,7 +227,7 @@ SaffronCity_EventScript_BattleGirl:: @ 81AD03A release end -CeladonCity_DepartmentStore_2F_EventScript_Woman:: @ 81AD053 +CeladonCity_DepartmentStore_2F_EventScript_Woman:: lock faceplayer famechecker FAMECHECKER_LANCE, 3 @@ -235,7 +235,7 @@ CeladonCity_DepartmentStore_2F_EventScript_Woman:: @ 81AD053 release end -IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81AD06C +IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal:: lock faceplayer famechecker FAMECHECKER_LANCE, 4 @@ -244,7 +244,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81AD06C release end -IndigoPlateau_PokemonCenter_1F_EventScript_CooltrainerM:: @ 81AD087 +IndigoPlateau_PokemonCenter_1F_EventScript_CooltrainerM:: lock faceplayer famechecker FAMECHECKER_LANCE, 5 @@ -252,7 +252,7 @@ IndigoPlateau_PokemonCenter_1F_EventScript_CooltrainerM:: @ 81AD087 release end -LavenderTown_PokemonCenter_1F_EventScript_BaldingMan:: @ 81AD0A0 +LavenderTown_PokemonCenter_1F_EventScript_BaldingMan:: lock faceplayer famechecker FAMECHECKER_MRFUJI, 3 @@ -260,7 +260,7 @@ LavenderTown_PokemonCenter_1F_EventScript_BaldingMan:: @ 81AD0A0 release end -CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji:: @ 81AD0B9 +CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji:: lock faceplayer famechecker FAMECHECKER_MRFUJI, 5 @@ -269,7 +269,7 @@ CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji:: @ 81AD0B9 release end -SilphCo_5F_EventScript_Scientist:: @ 81AD0D4 +SilphCo_5F_EventScript_Scientist:: lock faceplayer famechecker FAMECHECKER_GIOVANNI, 1 @@ -277,7 +277,7 @@ SilphCo_5F_EventScript_Scientist:: @ 81AD0D4 release end -SilphCo_8F_EventScript_Scientist:: @ 81AD0ED +SilphCo_8F_EventScript_Scientist:: lock faceplayer famechecker FAMECHECKER_GIOVANNI, 2 diff --git a/data/scripts/field_moves.inc b/data/scripts/field_moves.inc index 7ae90849d..74a93e8af 100644 --- a/data/scripts/field_moves.inc +++ b/data/scripts/field_moves.inc @@ -1,4 +1,4 @@ -EventScript_CutTree:: @ 81BDF13 +EventScript_CutTree:: goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE02_GET, EventScript_CantCutTree @@ -18,47 +18,47 @@ EventScript_CutTree:: @ 81BDF13 goto EventScript_CutTreeDown end -EventScript_FldEffCut:: @ 81BDF6B +EventScript_FldEffCut:: lockall dofieldeffect FLDEFF_USE_CUT_ON_TREE waitstate goto EventScript_CutTreeDown end -EventScript_CutTreeDown:: @ 81BDF76 +EventScript_CutTreeDown:: applymovement VAR_LAST_TALKED, Movement_CutTreeDown waitmovement 0 removeobject VAR_LAST_TALKED releaseall end -Movement_CutTreeDown:: @ 81BDF85 +Movement_CutTreeDown:: cut_tree step_end -EventScript_CantCutTree:: @ 81BDF87 +EventScript_CantCutTree:: msgbox Text_TreeCanBeCutDown, MSGBOX_SIGN releaseall end -EventScript_DontCutTree:: @ 81BDF91 +EventScript_DontCutTree:: closemessage releaseall end -Text_CutTreeDown:: @ 81BDF94 +Text_CutTreeDown:: .string "This tree looks like it can be CUT\n" .string "down!\p" .string "Would you like to CUT it?$" -Text_MonUsedMove:: @ 81BDFD7 +Text_MonUsedMove:: .string "{STR_VAR_1} used {STR_VAR_2}!$" -Text_TreeCanBeCutDown:: @ 81BDFE3 +Text_TreeCanBeCutDown:: .string "This tree looks like it can be CUT\n" .string "down!$" -EventScript_RockSmash:: @ 81BE00C +EventScript_RockSmash:: goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE06_GET, EventScript_CantSmashRock @@ -78,14 +78,14 @@ EventScript_RockSmash:: @ 81BE00C goto EventScript_UseRockSmash end -EventScript_FldEffRockSmash:: @ 81BE064 +EventScript_FldEffRockSmash:: lockall dofieldeffect FLDEFF_USE_ROCK_SMASH waitstate goto EventScript_UseRockSmash end -EventScript_UseRockSmash:: @ 81BE06F +EventScript_UseRockSmash:: applymovement VAR_LAST_TALKED, Movement_BreakRock waitmovement 0 removeobject VAR_LAST_TALKED @@ -96,32 +96,32 @@ EventScript_UseRockSmash:: @ 81BE06F releaseall end -EventScript_RockSmashNoEncounter:: @ 81BE08D +EventScript_RockSmashNoEncounter:: releaseall end -Movement_BreakRock:: @ 81BE08F +Movement_BreakRock:: rock_smash_break step_end -EventScript_CantSmashRock:: @ 81BE091 +EventScript_CantSmashRock:: msgbox Text_MonMaySmashRock, MSGBOX_SIGN end -EventScript_DontSmashRock:: @ 81BE09A +EventScript_DontSmashRock:: closemessage releaseall end -Text_UseRockSmash:: @ 81BE09D +Text_UseRockSmash:: .string "This rock appears to be breakable.\n" .string "Would you like to use ROCK SMASH?$" -Text_MonMaySmashRock:: @ 81BE0E2 +Text_MonMaySmashRock:: .string "It's a rugged rock, but a POKéMON\n" .string "may be able to smash it.$" -EventScript_StrengthBoulder:: @ 81BE11D +EventScript_StrengthBoulder:: goto_if_questlog EventScript_ReleaseEnd lockall goto_if_unset FLAG_BADGE04_GET, EventScript_CantMoveBoulder @@ -139,50 +139,50 @@ EventScript_StrengthBoulder:: @ 81BE11D goto EventScript_UseStrength end -EventScript_FldEffStrength:: @ 81BE16E +EventScript_FldEffStrength:: lockall dofieldeffect FLDEFF_USE_STRENGTH waitstate goto EventScript_UseStrength end -EventScript_UseStrength:: @ 81BE179 +EventScript_UseStrength:: setflag FLAG_SYS_USE_STRENGTH msgbox Text_MonUsedStrengthCanMoveBoulders, MSGBOX_SIGN end -EventScript_CantMoveBoulder:: @ 81BE185 +EventScript_CantMoveBoulder:: msgbox Text_MonMayPushBoulder, MSGBOX_SIGN end -EventScript_AlreadyUsedStrength:: @ 81BE18E +EventScript_AlreadyUsedStrength:: msgbox Text_StrengthMadeMovingBouldersPossible, MSGBOX_SIGN end -EventScript_DontUseStrength:: @ 81BE197 +EventScript_DontUseStrength:: closemessage releaseall end -Text_UseStrength:: @ 81BE19A +Text_UseStrength:: .string "It's a big boulder, but a POKéMON\n" .string "may be able to push it aside.\p" .string "Would you like to use STRENGTH?$" -Text_MonUsedStrengthCanMoveBoulders:: @ 81BE1FA +Text_MonUsedStrengthCanMoveBoulders:: .string "{STR_VAR_1} used STRENGTH!\p" .string "{STR_VAR_1}'s STRENGTH made it\n" .string "possible to move boulders around!$" -Text_MonMayPushBoulder:: @ 81BE244 +Text_MonMayPushBoulder:: .string "It's a big boulder, but a POKéMON\n" .string "may be able to push it aside.$" -Text_StrengthMadeMovingBouldersPossible:: @ 81BE284 +Text_StrengthMadeMovingBouldersPossible:: .string "STRENGTH made it possible to move\n" .string "boulders around.$" -EventScript_Waterfall:: @ 81BE2B7 +EventScript_Waterfall:: goto_if_questlog EventScript_ReleaseEnd lockall checkpartymove MOVE_WATERFALL @@ -197,7 +197,7 @@ EventScript_Waterfall:: @ 81BE2B7 dofieldeffect FLDEFF_USE_WATERFALL goto EventScript_EndWaterfall -EventScript_CantUseWaterfall:: @ 81BE2FF +EventScript_CantUseWaterfall:: lockall EventScript_WaterCrashingDown: msgbox Text_WallOfWaterCrashingDown @@ -205,19 +205,19 @@ EventScript_EndWaterfall: releaseall end -Text_WallOfWaterCrashingDown:: @ 81BE30A +Text_WallOfWaterCrashingDown:: .string "A wall of water is crashing down\n" .string "with a mighty roar.$" -Text_UseWaterfall:: @ 81BE33F +Text_UseWaterfall:: .string "It's a large waterfall.\n" .string "Would you like to use WATERFALL?$" -Text_MonUsedWaterfall:: @ 81BE378 +Text_MonUsedWaterfall:: .string "{STR_VAR_1} used WATERFALL.$" @ Unused leftover from R/S -EventScript_DeepWater:: @ 81BE38B +EventScript_DeepWater:: lockall checkpartymove MOVE_DIVE compare VAR_RESULT, PARTY_SIZE @@ -232,7 +232,7 @@ EventScript_DeepWater:: @ 81BE38B dofieldeffect FLDEFF_USE_DIVE goto EventScript_EndDive -EventScript_CantDive:: @ 81BE3C9 +EventScript_CantDive:: lockall EventScript_MayGoUnderwater: msgbox Text_MonMayGoUnderwater @@ -240,7 +240,7 @@ EventScript_EndDive: releaseall end -EventScript_TrySurface:: @ 81BE3D4 +EventScript_TrySurface:: lockall checkpartymove MOVE_DIVE compare VAR_RESULT, PARTY_SIZE @@ -255,44 +255,44 @@ EventScript_TrySurface:: @ 81BE3D4 dofieldeffect FLDEFF_USE_DIVE goto EventScript_EndSurface -EventScript_CantSurface:: @ 81BE412 +EventScript_CantSurface:: lockall msgbox Text_MonMaySurface goto EventScript_EndSurface -EventScript_ObstacleCantSurface:: @ 81BE420 +EventScript_ObstacleCantSurface:: lockall msgbox Text_DiveCantBeUsedHere EventScript_EndSurface: releaseall end -Text_MonMayGoUnderwater:: @ 81BE42B +Text_MonMayGoUnderwater:: .string "The sea is deep here. A POKéMON\n" .string "may be able to go underwater.$" -Text_SeaIsDeepUseDive:: @ 81BE469 +Text_SeaIsDeepUseDive:: .string "The sea is deep here.\n" .string "Would you like to use DIVE?$" -Text_MonUsedDive:: @ 81BE49B +Text_MonUsedDive:: .string "{STR_VAR_1} used DIVE.$" -Text_MonMaySurface:: @ 81BE4A9 +Text_MonMaySurface:: .string "Light is filtering down from above.\n" .string "A POKéMON may be able to surface.$" -Text_LightFilteringUseDive:: @ 81BE4EF +Text_LightFilteringUseDive:: .string "Light is filtering down from above.\n" .string "Would you like to use DIVE?$" -Text_DiveCantBeUsedHere:: @ 81BE52F +Text_DiveCantBeUsedHere:: .string "There is an obstacle above.\n" .string "DIVE can't be used here.$" -EventScript_FailSweetScent:: @ 81BE564 +EventScript_FailSweetScent:: msgbox Text_LooksLikeNothingHere, MSGBOX_SIGN end -Text_LooksLikeNothingHere:: @ 81BE56D +Text_LooksLikeNothingHere:: .string "Looks like there's nothing here…$" diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc index 1e9eeedac..38b6db6cf 100644 --- a/data/scripts/flash.inc +++ b/data/scripts/flash.inc @@ -1,4 +1,4 @@ -EventScript_FldEffFlash:: @ 81BFB5F +EventScript_FldEffFlash:: animateflash 0 setflashradius 0 end diff --git a/data/scripts/flavor_text.inc b/data/scripts/flavor_text.inc index 26855beec..ec0f62247 100644 --- a/data/scripts/flavor_text.inc +++ b/data/scripts/flavor_text.inc @@ -1,113 +1,113 @@ @ Flavor text for interacting with various background objects -EventScript_Bookshelf:: @ 81A7606 +EventScript_Bookshelf:: msgbox Text_Bookshelf, MSGBOX_SIGN end -EventScript_PokeMartShelf:: @ 81A760F +EventScript_PokeMartShelf:: msgbox Text_PokeMartShelf, MSGBOX_SIGN end -EventScript_Food:: @ 81A7618 +EventScript_Food:: msgbox Text_Food, MSGBOX_SIGN end -EventScript_VideoGame:: @ 81A7621 +EventScript_VideoGame:: msgbox Text_VideoGame, MSGBOX_SIGN end -EventScript_Computer:: @ 81A762A +EventScript_Computer:: msgbox Text_Computer, MSGBOX_SIGN end -EventScript_ImpressiveMachine:: @ 81A7633 +EventScript_ImpressiveMachine:: msgbox Text_ImpressiveMachine, MSGBOX_SIGN end -EventScript_Blueprints:: @ 81A763C +EventScript_Blueprints:: msgbox Text_Blueprints, MSGBOX_SIGN end -EventScript_Burglary:: @ 81A7645 +EventScript_Burglary:: msgbox Text_Burglary, MSGBOX_SIGN end -EventScript_PlayerFacingTVScreen:: @ 81A764E +EventScript_PlayerFacingTVScreen:: msgbox Text_PlayerFacingTVScreen, MSGBOX_SIGN end -EventScript_Cabinet:: @ 81A7657 +EventScript_Cabinet:: msgbox Text_DishesPlatesNeatlyLinedUp, MSGBOX_SIGN end -EventScript_Kitchen:: @ 81A7660 +EventScript_Kitchen:: msgbox Text_Kitchen, MSGBOX_SIGN end -EventScript_Dresser:: @ 81A7669 +EventScript_Dresser:: msgbox Text_Dresser, MSGBOX_SIGN end -EventScript_Snacks:: @ 81A7672 +EventScript_Snacks:: msgbox Text_Snacks, MSGBOX_SIGN end -EventScript_Painting:: @ 81A767B +EventScript_Painting:: msgbox Text_Painting, MSGBOX_SIGN end -EventScript_PowerPlantMachine:: @ 81A7684 +EventScript_PowerPlantMachine:: msgbox Text_PowerPlantMachine, MSGBOX_SIGN end -EventScript_Telephone:: @ 81A768D +EventScript_Telephone:: msgbox Text_Telephone, MSGBOX_SIGN end -EventScript_AdvertisingPoster:: @ 81A7696 +EventScript_AdvertisingPoster:: msgbox Text_AdvertisingPoster, MSGBOX_SIGN end -EventScript_TastyFood:: @ 81A769F +EventScript_TastyFood:: msgbox Text_TastyFood, MSGBOX_SIGN end -EventScript_TrashBin:: @ 81A76A8 +EventScript_TrashBin:: msgbox Text_TrashBin, MSGBOX_SIGN end -EventScript_Cup:: @ 81A76B1 +EventScript_Cup:: msgbox Text_Cup, MSGBOX_SIGN end -EventScript_PolishedWindow:: @ 81A76BA +EventScript_PolishedWindow:: msgbox Text_PolishedWindow, MSGBOX_SIGN end -EventScript_BeautifulSkyWindow:: @ 81A76C3 +EventScript_BeautifulSkyWindow:: msgbox Text_BeautifulSkyWindow, MSGBOX_SIGN end -EventScript_BlinkingLights:: @ 81A76CC +EventScript_BlinkingLights:: msgbox Text_BlinkingLights, MSGBOX_SIGN end -EventScript_NeatlyLinedUpTools:: @ 81A76D5 +EventScript_NeatlyLinedUpTools:: msgbox Text_NeatlyLinedUpTools, MSGBOX_SIGN end -EventScript_PokemartSign:: @ 81A76DE +EventScript_PokemartSign:: msgbox Text_PokemartSign, MSGBOX_SIGN end -EventScript_PokecenterSign:: @ 81A76E7 +EventScript_PokecenterSign:: msgbox Text_PokecenterSign, MSGBOX_SIGN end -EventScript_Indigo_UltimateGoal:: @ 81A76F0 +EventScript_Indigo_UltimateGoal:: msgbox Text_Indigo_UltimateGoal, MSGBOX_SIGN end -EventScript_Indigo_HighestAuthority:: @ 81A76F9 +EventScript_Indigo_HighestAuthority:: msgbox Text_Indigo_HighestAuthority, MSGBOX_SIGN end diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc index 5657ff2dd..d34a8766f 100644 --- a/data/scripts/hall_of_fame.inc +++ b/data/scripts/hall_of_fame.inc @@ -1,4 +1,4 @@ -EventScript_SetDefeatedEliteFourFlagsVars:: @ 81A651A +EventScript_SetDefeatedEliteFourFlagsVars:: clearflag FLAG_HIDE_POSTGAME_GOSSIPERS call EventScript_ResetEliteFour special Script_UpdateTrainerFanClubGameClear @@ -8,21 +8,21 @@ EventScript_SetDefeatedEliteFourFlagsVars:: @ 81A651A call EventScript_ResetLegendaries return -EventScript_SetReadyTryGiveNationalDexScene:: @ 81A653B +EventScript_SetReadyTryGiveNationalDexScene:: setvar VAR_MAP_SCENE_PALLET_TOWN_OAK, 2 return -EventScript_ResetLegendaries:: @ 81A6541 +EventScript_ResetLegendaries:: clearflag FLAG_LUGIA_FLEW_AWAY clearflag FLAG_HO_OH_FLEW_AWAY clearflag FLAG_DEOXYS_FLEW_AWAY return -EventScript_ResetEliteFourEnd:: @ 81A654B +EventScript_ResetEliteFourEnd:: call EventScript_ResetEliteFour end -EventScript_ResetEliteFour:: @ 81A6551 +EventScript_ResetEliteFour:: clearflag FLAG_DEFEATED_LORELEI clearflag FLAG_DEFEATED_BRUNO clearflag FLAG_DEFEATED_AGATHA diff --git a/data/scripts/hole.inc b/data/scripts/hole.inc index fddd574ad..6ca793691 100644 --- a/data/scripts/hole.inc +++ b/data/scripts/hole.inc @@ -1,5 +1,5 @@ @ Unused -EventScript_CheckFallDownHole:: @ 81C1338 +EventScript_CheckFallDownHole:: map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole .2byte 0 @@ -8,7 +8,7 @@ EventScript_FixCrackedGround:: copyvar VAR_ICE_STEP_COUNT, 1 end -EventScript_FallDownHole:: @ 81C1348 +EventScript_FallDownHole:: lockall delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible @@ -20,7 +20,7 @@ EventScript_FallDownHole:: @ 81C1348 end @ TODO: EventScript_FallDownHoleMtPyre in pokeemerald, needs generic name -EventScript_1C1361:: @ 81C1361 +EventScript_1C1361:: lockall delay 20 applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible @@ -31,6 +31,6 @@ EventScript_1C1361:: @ 81C1361 waitstate end -Movement_SetInvisible: @ 81C137A +Movement_SetInvisible: set_invisible step_end diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc index f6662368c..25233baa0 100644 --- a/data/scripts/item_ball_scripts.inc +++ b/data/scripts/item_ball_scripts.inc @@ -1,671 +1,671 @@ -Route2_EventScript_ItemEther:: @ 81BE58E +Route2_EventScript_ItemEther:: finditem ITEM_ETHER end -Route2_EventScript_ItemParalyzeHeal:: @ 81BE59B +Route2_EventScript_ItemParalyzeHeal:: finditem ITEM_PARALYZE_HEAL end -ViridianForest_EventScript_ItemPokeBall:: @ 81BE5A8 +ViridianForest_EventScript_ItemPokeBall:: finditem ITEM_POKE_BALL end -ViridianForest_EventScript_ItemAntidote:: @ 81BE5B5 +ViridianForest_EventScript_ItemAntidote:: finditem ITEM_ANTIDOTE end -ViridianForest_EventScript_ItemPotion:: @ 81BE5C2 +ViridianForest_EventScript_ItemPotion:: finditem ITEM_POTION end -MtMoon_1F_EventScript_ItemParalyzeHeal:: @ 81BE5CF +MtMoon_1F_EventScript_ItemParalyzeHeal:: finditem ITEM_PARALYZE_HEAL end -MtMoon_1F_EventScript_ItemTM09:: @ 81BE5DC +MtMoon_1F_EventScript_ItemTM09:: finditem ITEM_TM09 end -MtMoon_1F_EventScript_ItemPotion:: @ 81BE5E9 +MtMoon_1F_EventScript_ItemPotion:: finditem ITEM_POTION end -MtMoon_1F_EventScript_ItemRareCandy:: @ 81BE5F6 +MtMoon_1F_EventScript_ItemRareCandy:: finditem ITEM_RARE_CANDY end -MtMoon_1F_EventScript_ItemEscapeRope:: @ 81BE603 +MtMoon_1F_EventScript_ItemEscapeRope:: finditem ITEM_ESCAPE_ROPE end -MtMoon_1F_EventScript_ItemMoonStone:: @ 81BE610 +MtMoon_1F_EventScript_ItemMoonStone:: finditem ITEM_MOON_STONE end -MtMoon_B2F_EventScript_ItemStarPiece:: @ 81BE61D +MtMoon_B2F_EventScript_ItemStarPiece:: finditem ITEM_STAR_PIECE end -MtMoon_B2F_EventScript_ItemTM46:: @ 81BE62A +MtMoon_B2F_EventScript_ItemTM46:: finditem ITEM_TM46 end -Route4_EventScript_ItemTM05:: @ 81BE637 +Route4_EventScript_ItemTM05:: finditem ITEM_TM05 end -Route24_EventScript_ItemTM45:: @ 81BE644 +Route24_EventScript_ItemTM45:: finditem ITEM_TM45 end -Route25_EventScript_ItemTM43:: @ 81BE651 +Route25_EventScript_ItemTM43:: finditem ITEM_TM43 end -SSAnne_1F_Room2_EventScript_ItemTM31:: @ 81BE65E +SSAnne_1F_Room2_EventScript_ItemTM31:: finditem ITEM_TM31 end -SSAnne_2F_Room2_EventScript_ItemStardust:: @ 81BE66B +SSAnne_2F_Room2_EventScript_ItemStardust:: finditem ITEM_STARDUST end -SSAnne_2F_Room4_EventScript_ItemXAttack:: @ 81BE678 +SSAnne_2F_Room4_EventScript_ItemXAttack:: finditem ITEM_X_ATTACK end -SSAnne_B1F_Room2_EventScript_ItemTM44:: @ 81BE685 +SSAnne_B1F_Room2_EventScript_ItemTM44:: finditem ITEM_TM44 end -SSAnne_B1F_Room3_EventScript_ItemEther:: @ 81BE692 +SSAnne_B1F_Room3_EventScript_ItemEther:: finditem ITEM_ETHER end -SSAnne_B1F_Room5_EventScript_ItemSuperPotion:: @ 81BE69F +SSAnne_B1F_Room5_EventScript_ItemSuperPotion:: finditem ITEM_SUPER_POTION end -SSAnne_Kitchen_EventScript_ItemGreatBall:: @ 81BE6AC +SSAnne_Kitchen_EventScript_ItemGreatBall:: finditem ITEM_GREAT_BALL end -Route9_EventScript_ItemTM40:: @ 81BE6B9 +Route9_EventScript_ItemTM40:: finditem ITEM_TM40 end -RocketHideout_B1F_EventScript_ItemEscapeRope:: @ 81BE6C6 +RocketHideout_B1F_EventScript_ItemEscapeRope:: finditem ITEM_ESCAPE_ROPE end -RocketHideout_B1F_EventScript_ItemHyperPotion:: @ 81BE6D3 +RocketHideout_B1F_EventScript_ItemHyperPotion:: finditem ITEM_HYPER_POTION end -RocketHideout_B2F_EventScript_ItemXSpeed:: @ 81BE6E0 +RocketHideout_B2F_EventScript_ItemXSpeed:: finditem ITEM_X_SPEED end -RocketHideout_B2F_EventScript_ItemMoonStone:: @ 81BE6ED +RocketHideout_B2F_EventScript_ItemMoonStone:: finditem ITEM_MOON_STONE end -RocketHideout_B2F_EventScript_ItemTM12:: @ 81BE6FA +RocketHideout_B2F_EventScript_ItemTM12:: finditem ITEM_TM12 end -RocketHideout_B2F_EventScript_ItemSuperPotion:: @ 81BE707 +RocketHideout_B2F_EventScript_ItemSuperPotion:: finditem ITEM_SUPER_POTION end -RocketHideout_B3F_EventScript_ItemRareCandy:: @ 81BE714 +RocketHideout_B3F_EventScript_ItemRareCandy:: finditem ITEM_RARE_CANDY end -RocketHideout_B3F_EventScript_ItemTM21:: @ 81BE721 +RocketHideout_B3F_EventScript_ItemTM21:: finditem ITEM_TM21 end -RocketHideout_B4F_EventScript_ItemTM49:: @ 81BE72E +RocketHideout_B4F_EventScript_ItemTM49:: finditem ITEM_TM49 end -RocketHideout_B4F_EventScript_ItemMaxEther:: @ 81BE73B +RocketHideout_B4F_EventScript_ItemMaxEther:: finditem ITEM_MAX_ETHER end -RocketHideout_B4F_EventScript_ItemCalcium:: @ 81BE748 +RocketHideout_B4F_EventScript_ItemCalcium:: finditem ITEM_CALCIUM end -PokemonTower_3F_EventScript_ItemEscapeRope:: @ 81BE755 +PokemonTower_3F_EventScript_ItemEscapeRope:: finditem ITEM_ESCAPE_ROPE end -PokemonTower_4F_EventScript_ItemElixir:: @ 81BE762 +PokemonTower_4F_EventScript_ItemElixir:: finditem ITEM_ELIXIR end -PokemonTower_4F_EventScript_ItemAwakening:: @ 81BE76F +PokemonTower_4F_EventScript_ItemAwakening:: finditem ITEM_AWAKENING end -PokemonTower_4F_EventScript_ItemGreatBall:: @ 81BE77C +PokemonTower_4F_EventScript_ItemGreatBall:: finditem ITEM_GREAT_BALL end -PokemonTower_5F_EventScript_ItemNugget:: @ 81BE789 +PokemonTower_5F_EventScript_ItemNugget:: finditem ITEM_NUGGET end -PokemonTower_6F_EventScript_ItemRareCandy:: @ 81BE796 +PokemonTower_6F_EventScript_ItemRareCandy:: finditem ITEM_RARE_CANDY end -PokemonTower_6F_EventScript_ItemXAccuracy:: @ 81BE7A3 +PokemonTower_6F_EventScript_ItemXAccuracy:: finditem ITEM_X_ACCURACY end -Route12_EventScript_ItemTM48:: @ 81BE7B0 +Route12_EventScript_ItemTM48:: finditem ITEM_TM48 end -Route12_EventScript_ItemIron:: @ 81BE7BD +Route12_EventScript_ItemIron:: finditem ITEM_IRON end -Route15_EventScript_ItemTM18:: @ 81BE7CA +Route15_EventScript_ItemTM18:: finditem ITEM_TM18 end -SafariZone_Center_EventScript_ItemNugget:: @ 81BE7D7 +SafariZone_Center_EventScript_ItemNugget:: finditem ITEM_NUGGET end -SafariZone_East_EventScript_ItemMaxPotion:: @ 81BE7E4 +SafariZone_East_EventScript_ItemMaxPotion:: finditem ITEM_MAX_POTION end -SafariZone_East_EventScript_ItemFullRestore:: @ 81BE7F1 +SafariZone_East_EventScript_ItemFullRestore:: finditem ITEM_FULL_RESTORE end -SafariZone_East_EventScript_ItemTM11:: @ 81BE7FE +SafariZone_East_EventScript_ItemTM11:: finditem ITEM_TM11 end -SafariZone_East_EventScript_ItemLeafStone:: @ 81BE80B +SafariZone_East_EventScript_ItemLeafStone:: finditem ITEM_LEAF_STONE end -SafariZone_North_EventScript_ItemProtein:: @ 81BE818 +SafariZone_North_EventScript_ItemProtein:: finditem ITEM_PROTEIN end -SafariZone_North_EventScript_ItemTM47:: @ 81BE825 +SafariZone_North_EventScript_ItemTM47:: finditem ITEM_TM47 end -SafariZone_West_EventScript_ItemTM32:: @ 81BE832 +SafariZone_West_EventScript_ItemTM32:: finditem ITEM_TM32 end -SafariZone_West_EventScript_ItemGoldTeeth:: @ 81BE83F +SafariZone_West_EventScript_ItemGoldTeeth:: finditem ITEM_GOLD_TEETH end -SafariZone_West_EventScript_ItemMaxPotion:: @ 81BE84C +SafariZone_West_EventScript_ItemMaxPotion:: finditem ITEM_MAX_POTION end -SafariZone_West_EventScript_ItemMaxRevive:: @ 81BE859 +SafariZone_West_EventScript_ItemMaxRevive:: finditem ITEM_MAX_REVIVE end -SilphCo_3F_EventScript_ItemHyperPotion:: @ 81BE866 +SilphCo_3F_EventScript_ItemHyperPotion:: finditem ITEM_HYPER_POTION end -SilphCo_4F_EventScript_ItemMaxRevive:: @ 81BE873 +SilphCo_4F_EventScript_ItemMaxRevive:: finditem ITEM_MAX_REVIVE end -SilphCo_4F_EventScript_ItemEscapeRope:: @ 81BE880 +SilphCo_4F_EventScript_ItemEscapeRope:: finditem ITEM_ESCAPE_ROPE end -SilphCo_4F_EventScript_ItemFullHeal:: @ 81BE88D +SilphCo_4F_EventScript_ItemFullHeal:: finditem ITEM_FULL_HEAL end -SilphCo_5F_EventScript_ItemProtein:: @ 81BE89A +SilphCo_5F_EventScript_ItemProtein:: finditem ITEM_PROTEIN end -SilphCo_5F_EventScript_ItemTM01:: @ 81BE8A7 +SilphCo_5F_EventScript_ItemTM01:: finditem ITEM_TM01 end -SilphCo_5F_EventScript_ItemCardKey:: @ 81BE8B4 +SilphCo_5F_EventScript_ItemCardKey:: finditem ITEM_CARD_KEY end -SilphCo_6F_EventScript_ItemHPUp:: @ 81BE8C1 +SilphCo_6F_EventScript_ItemHPUp:: finditem ITEM_HP_UP end -SilphCo_6F_EventScript_ItemXSpecial:: @ 81BE8CE +SilphCo_6F_EventScript_ItemXSpecial:: finditem ITEM_X_SPECIAL end -SilphCo_7F_EventScript_ItemCalcium:: @ 81BE8DB +SilphCo_7F_EventScript_ItemCalcium:: finditem ITEM_CALCIUM end -SilphCo_7F_EventScript_ItemTM08:: @ 81BE8E8 +SilphCo_7F_EventScript_ItemTM08:: finditem ITEM_TM08 end -SilphCo_10F_EventScript_ItemCarbos:: @ 81BE8F5 +SilphCo_10F_EventScript_ItemCarbos:: finditem ITEM_CARBOS end -SilphCo_10F_EventScript_ItemUltraBall:: @ 81BE902 +SilphCo_10F_EventScript_ItemUltraBall:: finditem ITEM_ULTRA_BALL end -SilphCo_10F_EventScript_ItemRareCandy:: @ 81BE90F +SilphCo_10F_EventScript_ItemRareCandy:: finditem ITEM_RARE_CANDY end -PowerPlant_EventScript_ItemMaxPotion:: @ 81BE91C +PowerPlant_EventScript_ItemMaxPotion:: finditem ITEM_MAX_POTION end -PowerPlant_EventScript_ItemTM17:: @ 81BE929 +PowerPlant_EventScript_ItemTM17:: finditem ITEM_TM17 end -PowerPlant_EventScript_ItemTM25:: @ 81BE936 +PowerPlant_EventScript_ItemTM25:: finditem ITEM_TM25 end -PowerPlant_EventScript_ItemThunderStone:: @ 81BE943 +PowerPlant_EventScript_ItemThunderStone:: finditem ITEM_THUNDER_STONE end -PowerPlant_EventScript_ItemElixir:: @ 81BE950 +PowerPlant_EventScript_ItemElixir:: finditem ITEM_ELIXIR end -PokemonMansion_1F_EventScript_ItemCarbos:: @ 81BE95D +PokemonMansion_1F_EventScript_ItemCarbos:: finditem ITEM_CARBOS end -PokemonMansion_1F_EventScript_ItemEscapeRope:: @ 81BE96A +PokemonMansion_1F_EventScript_ItemEscapeRope:: finditem ITEM_ESCAPE_ROPE end -PokemonMansion_2F_EventScript_ItemCalcium:: @ 81BE977 +PokemonMansion_2F_EventScript_ItemCalcium:: finditem ITEM_CALCIUM end -PokemonMansion_3F_EventScript_ItemMaxPotion:: @ 81BE984 +PokemonMansion_3F_EventScript_ItemMaxPotion:: finditem ITEM_MAX_POTION end -PokemonMansion_3F_EventScript_ItemIron:: @ 81BE991 +PokemonMansion_3F_EventScript_ItemIron:: finditem ITEM_IRON end -PokemonMansion_B1F_EventScript_ItemTM14:: @ 81BE99E +PokemonMansion_B1F_EventScript_ItemTM14:: finditem ITEM_TM14 end -PokemonMansion_B1F_EventScript_ItemFullRestore:: @ 81BE9AB +PokemonMansion_B1F_EventScript_ItemFullRestore:: finditem ITEM_FULL_RESTORE end -PokemonMansion_B1F_EventScript_ItemTM22:: @ 81BE9B8 +PokemonMansion_B1F_EventScript_ItemTM22:: finditem ITEM_TM22 end -PokemonMansion_B1F_EventScript_ItemSecretKey:: @ 81BE9C5 +PokemonMansion_B1F_EventScript_ItemSecretKey:: finditem ITEM_SECRET_KEY end -VictoryRoad_1F_EventScript_ItemRareCandy:: @ 81BE9D2 +VictoryRoad_1F_EventScript_ItemRareCandy:: finditem ITEM_RARE_CANDY end -VictoryRoad_1F_EventScript_ItemTM02:: @ 81BE9DF +VictoryRoad_1F_EventScript_ItemTM02:: finditem ITEM_TM02 end -VictoryRoad_2F_EventScript_ItemGuardSpec:: @ 81BE9EC +VictoryRoad_2F_EventScript_ItemGuardSpec:: finditem ITEM_GUARD_SPEC end -VictoryRoad_2F_EventScript_ItemTM07:: @ 81BE9F9 +VictoryRoad_2F_EventScript_ItemTM07:: finditem ITEM_TM07 end -VictoryRoad_2F_EventScript_ItemFullHeal:: @ 81BEA06 +VictoryRoad_2F_EventScript_ItemFullHeal:: finditem ITEM_FULL_HEAL end -VictoryRoad_2F_EventScript_ItemTM37:: @ 81BEA13 +VictoryRoad_2F_EventScript_ItemTM37:: finditem ITEM_TM37 end -VictoryRoad_3F_EventScript_ItemMaxRevive:: @ 81BEA20 +VictoryRoad_3F_EventScript_ItemMaxRevive:: finditem ITEM_MAX_REVIVE end -VictoryRoad_3F_EventScript_ItemTM50:: @ 81BEA2D +VictoryRoad_3F_EventScript_ItemTM50:: finditem ITEM_TM50 end -CeruleanCave_1F_EventScript_ItemMaxElixir:: @ 81BEA3A +CeruleanCave_1F_EventScript_ItemMaxElixir:: finditem ITEM_MAX_ELIXIR end -CeruleanCave_1F_EventScript_ItemNugget:: @ 81BEA47 +CeruleanCave_1F_EventScript_ItemNugget:: finditem ITEM_NUGGET end -CeruleanCave_1F_EventScript_ItemFullRestore:: @ 81BEA54 +CeruleanCave_1F_EventScript_ItemFullRestore:: finditem ITEM_FULL_RESTORE end -CeruleanCave_2F_EventScript_ItemFullRestore:: @ 81BEA61 +CeruleanCave_2F_EventScript_ItemFullRestore:: finditem ITEM_FULL_RESTORE end -CeruleanCave_2F_EventScript_ItemPPUp:: @ 81BEA6E +CeruleanCave_2F_EventScript_ItemPPUp:: finditem ITEM_PP_UP end -CeruleanCave_2F_EventScript_ItemUltraBall:: @ 81BEA7B +CeruleanCave_2F_EventScript_ItemUltraBall:: finditem ITEM_ULTRA_BALL end -CeruleanCave_B1F_EventScript_ItemMaxRevive:: @ 81BEA88 +CeruleanCave_B1F_EventScript_ItemMaxRevive:: finditem ITEM_MAX_REVIVE end -CeruleanCave_B1F_EventScript_ItemUltraBall:: @ 81BEA95 +CeruleanCave_B1F_EventScript_ItemUltraBall:: finditem ITEM_ULTRA_BALL end -FuchsiaCity_WardensHouse_EventScript_ItemRareCandy:: @ 81BEAA2 +FuchsiaCity_WardensHouse_EventScript_ItemRareCandy:: finditem ITEM_RARE_CANDY end -TwoIsland_EventScript_ItemRevive:: @ 81BEAAF +TwoIsland_EventScript_ItemRevive:: finditem ITEM_REVIVE end -ThreeIsland_EventScript_ItemZinc:: @ 81BEABC +ThreeIsland_EventScript_ItemZinc:: finditem ITEM_ZINC end -ViridianForest_EventScript_ItemPotion2:: @ 81BEAC9 +ViridianForest_EventScript_ItemPotion2:: finditem ITEM_POTION end -MtMoon_B2F_EventScript_ItemRevive:: @ 81BEAD6 +MtMoon_B2F_EventScript_ItemRevive:: finditem ITEM_REVIVE end -MtMoon_B2F_EventScript_ItemAntidote:: @ 81BEAE3 +MtMoon_B2F_EventScript_ItemAntidote:: finditem ITEM_ANTIDOTE end -Route11_EventScript_ItemXDefend:: @ 81BEAF0 +Route11_EventScript_ItemXDefend:: finditem ITEM_X_DEFEND end -Route9_EventScript_ItemBurnHeal:: @ 81BEAFD +Route9_EventScript_ItemBurnHeal:: finditem ITEM_BURN_HEAL end -RockTunnel_1F_EventScript_ItemRepel:: @ 81BEB0A +RockTunnel_1F_EventScript_ItemRepel:: finditem ITEM_REPEL end -RockTunnel_1F_EventScript_ItemPearl:: @ 81BEB17 +RockTunnel_1F_EventScript_ItemPearl:: finditem ITEM_PEARL end -RockTunnel_1F_EventScript_ItemEscapeRope:: @ 81BEB24 +RockTunnel_1F_EventScript_ItemEscapeRope:: finditem ITEM_ESCAPE_ROPE end -RockTunnel_B1F_EventScript_ItemRevive:: @ 81BEB31 +RockTunnel_B1F_EventScript_ItemRevive:: finditem ITEM_REVIVE end -RockTunnel_B1F_EventScript_ItemMaxEther:: @ 81BEB3E +RockTunnel_B1F_EventScript_ItemMaxEther:: finditem ITEM_MAX_ETHER end -SilphCo_8F_EventScript_ItemIron:: @ 81BEB4B +SilphCo_8F_EventScript_ItemIron:: finditem ITEM_IRON end -SilphCo_11F_EventScript_ItemZinc:: @ 81BEB58 +SilphCo_11F_EventScript_ItemZinc:: finditem ITEM_ZINC end -PokemonMansion_1F_EventScript_ItemProtein:: @ 81BEB65 +PokemonMansion_1F_EventScript_ItemProtein:: finditem ITEM_PROTEIN end -PokemonMansion_2F_EventScript_ItemZinc:: @ 81BEB72 +PokemonMansion_2F_EventScript_ItemZinc:: finditem ITEM_ZINC end -PokemonMansion_2F_EventScript_ItemHPUp:: @ 81BEB7F +PokemonMansion_2F_EventScript_ItemHPUp:: finditem ITEM_HP_UP end -ViridianCity_EventScript_ItemPotion:: @ 81BEB8C +ViridianCity_EventScript_ItemPotion:: finditem ITEM_POTION end -Route11_EventScript_ItemGreatBall:: @ 81BEB99 +Route11_EventScript_ItemGreatBall:: finditem ITEM_GREAT_BALL end -Route11_EventScript_ItemAwakening:: @ 81BEBA6 +Route11_EventScript_ItemAwakening:: finditem ITEM_AWAKENING end -PokemonTower_5F_EventScript_ItemCleanseTag:: @ 81BEBB3 +PokemonTower_5F_EventScript_ItemCleanseTag:: finditem ITEM_CLEANSE_TAG end -CeladonCity_EventScript_ItemEther:: @ 81BEBC0 +CeladonCity_EventScript_ItemEther:: finditem ITEM_ETHER end -RocketHideout_B3F_EventScript_ItemBlackGlasses:: @ 81BEBCD +RocketHideout_B3F_EventScript_ItemBlackGlasses:: finditem ITEM_BLACK_GLASSES end -SafariZone_North_EventScript_ItemQuickClaw:: @ 81BEBDA +SafariZone_North_EventScript_ItemQuickClaw:: finditem ITEM_QUICK_CLAW end -SeafoamIslands_1F_EventScript_ItemIceHeal:: @ 81BEBE7 +SeafoamIslands_1F_EventScript_ItemIceHeal:: finditem ITEM_ICE_HEAL end -SeafoamIslands_B1F_EventScript_ItemWaterStone:: @ 81BEBF4 +SeafoamIslands_B1F_EventScript_ItemWaterStone:: finditem ITEM_WATER_STONE end -SeafoamIslands_B1F_EventScript_ItemRevive:: @ 81BEC01 +SeafoamIslands_B1F_EventScript_ItemRevive:: finditem ITEM_REVIVE end -SeafoamIslands_B2F_EventScript_ItemBigPearl:: @ 81BEC0E +SeafoamIslands_B2F_EventScript_ItemBigPearl:: finditem ITEM_BIG_PEARL end -SeafoamIslands_B4F_EventScript_ItemUltraBall:: @ 81BEC1B +SeafoamIslands_B4F_EventScript_ItemUltraBall:: finditem ITEM_ULTRA_BALL end -FourIsland_EventScript_ItemStarPiece:: @ 81BEC28 +FourIsland_EventScript_ItemStarPiece:: finditem ITEM_STAR_PIECE end -FourIsland_EventScript_ItemStardust:: @ 81BEC35 +FourIsland_EventScript_ItemStardust:: finditem ITEM_STARDUST end -OneIsland_KindleRoad_EventScript_ItemEther:: @ 81BEC42 +OneIsland_KindleRoad_EventScript_ItemEther:: finditem ITEM_ETHER end -OneIsland_KindleRoad_EventScript_ItemMaxRepel:: @ 81BEC4F +OneIsland_KindleRoad_EventScript_ItemMaxRepel:: finditem ITEM_MAX_REPEL end -OneIsland_KindleRoad_EventScript_ItemCarbos:: @ 81BEC5C +OneIsland_KindleRoad_EventScript_ItemCarbos:: finditem ITEM_CARBOS end -FiveIsland_Meadow_EventScript_ItemMaxPotion:: @ 81BEC69 +FiveIsland_Meadow_EventScript_ItemMaxPotion:: finditem ITEM_MAX_POTION end -FiveIsland_Meadow_EventScript_ItemPPUp:: @ 81BEC76 +FiveIsland_Meadow_EventScript_ItemPPUp:: finditem ITEM_PP_UP end -FiveIsland_MemorialPillar_EventScript_ItemMetalCoat:: @ 81BEC83 +FiveIsland_MemorialPillar_EventScript_ItemMetalCoat:: finditem ITEM_METAL_COAT end -SixIsland_OutcastIsland_EventScript_ItemPPUp:: @ 81BEC90 +SixIsland_OutcastIsland_EventScript_ItemPPUp:: finditem ITEM_PP_UP end -SixIsland_WaterPath_EventScript_ItemElixir:: @ 81BEC9D +SixIsland_WaterPath_EventScript_ItemElixir:: finditem ITEM_ELIXIR end -SixIsland_WaterPath_EventScript_ItemDragonScale:: @ 81BECAA +SixIsland_WaterPath_EventScript_ItemDragonScale:: finditem ITEM_DRAGON_SCALE end -SixIsland_RuinValley_EventScript_ItemFullRestore:: @ 81BECB7 +SixIsland_RuinValley_EventScript_ItemFullRestore:: finditem ITEM_FULL_RESTORE end -SixIsland_RuinValley_EventScript_ItemHPUp:: @ 81BECC4 +SixIsland_RuinValley_EventScript_ItemHPUp:: finditem ITEM_HP_UP end -SixIsland_RuinValley_EventScript_ItemSunStone:: @ 81BECD1 +SixIsland_RuinValley_EventScript_ItemSunStone:: finditem ITEM_SUN_STONE end -SevenIsland_SevaultCanyon_EventScript_ItemKingsRock:: @ 81BECDE +SevenIsland_SevaultCanyon_EventScript_ItemKingsRock:: finditem ITEM_KINGS_ROCK end -SevenIsland_SevaultCanyon_EventScript_ItemMaxElixir:: @ 81BECEB +SevenIsland_SevaultCanyon_EventScript_ItemMaxElixir:: finditem ITEM_MAX_ELIXIR end -SevenIsland_SevaultCanyon_EventScript_ItemNugget:: @ 81BECF8 +SevenIsland_SevaultCanyon_EventScript_ItemNugget:: finditem ITEM_NUGGET end -ThreeIsland_BerryForest_EventScript_ItemMaxEther:: @ 81BED05 +ThreeIsland_BerryForest_EventScript_ItemMaxEther:: finditem ITEM_MAX_ETHER end -ThreeIsland_BerryForest_EventScript_ItemFullHeal:: @ 81BED12 +ThreeIsland_BerryForest_EventScript_ItemFullHeal:: finditem ITEM_FULL_HEAL end -ThreeIsland_BerryForest_EventScript_ItemMaxElixir:: @ 81BED1F +ThreeIsland_BerryForest_EventScript_ItemMaxElixir:: finditem ITEM_MAX_ELIXIR end -MtEmber_Exterior_EventScript_ItemUltraBall:: @ 81BED2C +MtEmber_Exterior_EventScript_ItemUltraBall:: finditem ITEM_ULTRA_BALL end -MtEmber_Exterior_EventScript_ItemFireStone:: @ 81BED39 +MtEmber_Exterior_EventScript_ItemFireStone:: finditem ITEM_FIRE_STONE end -MtEmber_Exterior_EventScript_ItemDireHit:: @ 81BED46 +MtEmber_Exterior_EventScript_ItemDireHit:: finditem ITEM_DIRE_HIT end -FourIsland_IcefallCave_1F_EventScript_ItemUltraBall:: @ 81BED53 +FourIsland_IcefallCave_1F_EventScript_ItemUltraBall:: finditem ITEM_ULTRA_BALL end -FourIsland_IcefallCave_1F_EventScript_ItemHM07:: @ 81BED60 +FourIsland_IcefallCave_1F_EventScript_ItemHM07:: finditem ITEM_HM07 end -FourIsland_IcefallCave_B1F_EventScript_ItemFullRestore:: @ 81BED6D +FourIsland_IcefallCave_B1F_EventScript_ItemFullRestore:: finditem ITEM_FULL_RESTORE end -FourIsland_IcefallCave_B1F_EventScript_ItemNeverMeltIce:: @ 81BED7A +FourIsland_IcefallCave_B1F_EventScript_ItemNeverMeltIce:: finditem ITEM_NEVER_MELT_ICE end -FiveIsland_RocketWarehouse_EventScript_ItemBigPearl:: @ 81BED87 +FiveIsland_RocketWarehouse_EventScript_ItemBigPearl:: finditem ITEM_BIG_PEARL end -FiveIsland_RocketWarehouse_EventScript_ItemTM36:: @ 81BED94 +FiveIsland_RocketWarehouse_EventScript_ItemTM36:: finditem ITEM_TM36 end -FiveIsland_RocketWarehouse_EventScript_ItemPearl:: @ 81BEDA1 +FiveIsland_RocketWarehouse_EventScript_ItemPearl:: finditem ITEM_PEARL end -FiveIsland_RocketWarehouse_EventScript_ItemUpGrade:: @ 81BEDAE +FiveIsland_RocketWarehouse_EventScript_ItemUpGrade:: finditem ITEM_UP_GRADE end -FiveIsland_LostCave_Room10_EventScript_ItemSilkScarf:: @ 81BEDBB +FiveIsland_LostCave_Room10_EventScript_ItemSilkScarf:: finditem ITEM_SILK_SCARF end -FiveIsland_LostCave_Room11_EventScript_ItemLaxIncense:: @ 81BEDC8 +FiveIsland_LostCave_Room11_EventScript_ItemLaxIncense:: finditem ITEM_LAX_INCENSE end -FiveIsland_LostCave_Room12_EventScript_ItemSeaIncense:: @ 81BEDD5 +FiveIsland_LostCave_Room12_EventScript_ItemSeaIncense:: finditem ITEM_SEA_INCENSE end -FiveIsland_LostCave_Room13_EventScript_ItemMaxRevive:: @ 81BEDE2 +FiveIsland_LostCave_Room13_EventScript_ItemMaxRevive:: finditem ITEM_MAX_REVIVE end -FiveIsland_LostCave_Room14_EventScript_ItemRareCandy:: @ 81BEDEF +FiveIsland_LostCave_Room14_EventScript_ItemRareCandy:: finditem ITEM_RARE_CANDY end -SevenIsland_SevaultCanyon_House_EventScript_ItemLuckyPunch:: @ 81BEDFC +SevenIsland_SevaultCanyon_House_EventScript_ItemLuckyPunch:: finditem ITEM_LUCKY_PUNCH end -SilphCo_4F_EventScript_ItemTM41:: @ 81BEE09 +SilphCo_4F_EventScript_ItemTM41:: finditem ITEM_TM41 end diff --git a/data/scripts/itemfinder.inc b/data/scripts/itemfinder.inc index 6eabdc395..d4b96cd76 100644 --- a/data/scripts/itemfinder.inc +++ b/data/scripts/itemfinder.inc @@ -1,4 +1,4 @@ -EventScript_ItemfinderDigUpUnderfootItem:: @ 81A8D49 +EventScript_ItemfinderDigUpUnderfootItem:: lockall textcolor 3 waitse diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 43fb61017..c1b5e4bab 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -1,4 +1,4 @@ -VictoryRoad_2F_EventScript_DoubleEdgeTutor:: @ 81C47AE +VictoryRoad_2F_EventScript_DoubleEdgeTutor:: lock faceplayer goto_if_set FLAG_TUTOR_DOUBLE_EDGE, EventScript_DoubleEdgeTaught @@ -17,17 +17,17 @@ VictoryRoad_2F_EventScript_DoubleEdgeTutor:: @ 81C47AE goto EventScript_DoubleEdgeTaught end -EventScript_DoubleEdgeDeclined:: @ 81C4802 +EventScript_DoubleEdgeDeclined:: msgbox Text_DoubleEdgeDeclined release end -EventScript_DoubleEdgeTaught:: @ 81C480C +EventScript_DoubleEdgeTaught:: msgbox Text_DoubleEdgeTaught release end -EventScript_ThunderWaveTutor:: @ 81C4816 +EventScript_ThunderWaveTutor:: lock faceplayer goto_if_set FLAG_TUTOR_THUNDER_WAVE, EventScript_ThunderWaveTaught @@ -46,17 +46,17 @@ EventScript_ThunderWaveTutor:: @ 81C4816 goto EventScript_ThunderWaveTaught end -EventScript_ThunderWaveDeclined:: @ 81C486A +EventScript_ThunderWaveDeclined:: msgbox Text_ThunderWaveDeclined release end -EventScript_ThunderWaveTaught:: @ 81C4874 +EventScript_ThunderWaveTaught:: msgbox Text_ThunderWaveTaught release end -RockTunnel_B1F_EventScript_RockSlideTutor:: @ 81C487E +RockTunnel_B1F_EventScript_RockSlideTutor:: lock faceplayer goto_if_set FLAG_TUTOR_ROCK_SLIDE, EventScript_RockSlideTaught @@ -75,17 +75,17 @@ RockTunnel_B1F_EventScript_RockSlideTutor:: @ 81C487E goto EventScript_RockSlideTaught end -EventScript_RockSlideDeclined:: @ 81C48D2 +EventScript_RockSlideDeclined:: msgbox Text_RockSlideDeclined release end -EventScript_RockSlideTaught:: @ 81C48DC +EventScript_RockSlideTaught:: msgbox Text_RockSlideTaught release end -MtEmber_Exterior_EventScript_ExplosionTutor:: @ 81C48E6 +MtEmber_Exterior_EventScript_ExplosionTutor:: lock faceplayer goto_if_set FLAG_TUTOR_EXPLOSION, EventScript_ExplosionTaught @@ -104,17 +104,17 @@ MtEmber_Exterior_EventScript_ExplosionTutor:: @ 81C48E6 goto EventScript_ExplosionTaught end -EventScript_ExplosionDeclined:: @ 81C493A +EventScript_ExplosionDeclined:: msgbox Text_ExplosionDeclined release end -EventScript_ExplosionTaught:: @ 81C4944 +EventScript_ExplosionTaught:: msgbox Text_ExplosionTaught release end -Route4_EventScript_MegaPunchTutor:: @ 81C494E +Route4_EventScript_MegaPunchTutor:: lock faceplayer goto_if_set FLAG_TUTOR_MEGA_PUNCH, EventScript_MegaPunchTaught @@ -133,17 +133,17 @@ Route4_EventScript_MegaPunchTutor:: @ 81C494E goto EventScript_MegaPunchTaught end -EventScript_MegaPunchDeclined:: @ 81C49A2 +EventScript_MegaPunchDeclined:: msgbox Text_MegaPunchDeclined release end -EventScript_MegaPunchTaught:: @ 81C49AC +EventScript_MegaPunchTaught:: msgbox Text_MegaPunchTaught release end -Route4_EventScript_MegaKickTutor:: @ 81C49B6 +Route4_EventScript_MegaKickTutor:: lock faceplayer goto_if_set FLAG_TUTOR_MEGA_KICK, EventScript_MegaKickTaught @@ -162,17 +162,17 @@ Route4_EventScript_MegaKickTutor:: @ 81C49B6 goto EventScript_MegaKickTaught end -EventScript_MegaKickDeclined:: @ 81C4A0A +EventScript_MegaKickDeclined:: msgbox Text_MegaKickDeclined release end -EventScript_MegaKickTaught:: @ 81C4A14 +EventScript_MegaKickTaught:: msgbox Text_MegaKickTaught release end -EventScript_DreamEaterTutor:: @ 81C4A1E +EventScript_DreamEaterTutor:: lock faceplayer goto_if_set FLAG_TUTOR_DREAM_EATER, EventScript_DreamEaterTaught @@ -191,17 +191,17 @@ EventScript_DreamEaterTutor:: @ 81C4A1E goto EventScript_DreamEaterTaught end -EventScript_DreamEaterDeclined:: @ 81C4A72 +EventScript_DreamEaterDeclined:: msgbox Text_DreamEaterDeclined release end -EventScript_DreamEaterTaught:: @ 81C4A7C +EventScript_DreamEaterTaught:: msgbox Text_DreamEaterTaught release end -EventScript_SoftboiledTutor:: @ 81C4A86 +EventScript_SoftboiledTutor:: lock faceplayer goto_if_set FLAG_TUTOR_SOFT_BOILED, EventScript_SoftboiledTaught @@ -220,17 +220,17 @@ EventScript_SoftboiledTutor:: @ 81C4A86 goto EventScript_SoftboiledTaught end -EventScript_SoftboiledDeclined:: @ 81C4ADA +EventScript_SoftboiledDeclined:: msgbox Text_SoftboiledDeclined release end -EventScript_SoftboiledTaught:: @ 81C4AE4 +EventScript_SoftboiledTaught:: msgbox Text_SoftboiledTaught release end -FuchsiaCity_EventScript_SubstituteTutor:: @ 81C4AEE +FuchsiaCity_EventScript_SubstituteTutor:: lock faceplayer goto_if_set FLAG_TUTOR_SUBSTITUTE, EventScript_SubstituteTaught @@ -249,17 +249,17 @@ FuchsiaCity_EventScript_SubstituteTutor:: @ 81C4AEE goto EventScript_SubstituteTaught end -EventScript_SubstituteDeclined:: @ 81C4B42 +EventScript_SubstituteDeclined:: msgbox Text_SubstituteDeclined release end -EventScript_SubstituteTaught:: @ 81C4B4C +EventScript_SubstituteTaught:: msgbox Text_SubstituteTaught release end -SevenIsland_EventScript_SwordsDanceTutor:: @ 81C4B56 +SevenIsland_EventScript_SwordsDanceTutor:: lock faceplayer goto_if_set FLAG_TUTOR_SWORDS_DANCE, EventScript_SwordsDanceTaught @@ -278,17 +278,17 @@ SevenIsland_EventScript_SwordsDanceTutor:: @ 81C4B56 goto EventScript_SwordsDanceTaught end -EventScript_SwordsDanceDeclined:: @ 81C4BAA +EventScript_SwordsDanceDeclined:: msgbox Text_SwordsDanceDeclined release end -EventScript_SwordsDanceTaught:: @ 81C4BB4 +EventScript_SwordsDanceTaught:: msgbox Text_SwordsDanceTaught release end -PewterCity_Museum_1F_EventScript_SeismicTossTutor:: @ 81C4BBE +PewterCity_Museum_1F_EventScript_SeismicTossTutor:: lock faceplayer goto_if_set FLAG_TUTOR_SEISMIC_TOSS, EventScript_SeismicTossTaught @@ -307,17 +307,17 @@ PewterCity_Museum_1F_EventScript_SeismicTossTutor:: @ 81C4BBE goto EventScript_SeismicTossTaught end -EventScript_SeismicTossDeclined:: @ 81C4C12 +EventScript_SeismicTossDeclined:: msgbox Text_SeismicTossDeclined release end -EventScript_SeismicTossTaught:: @ 81C4C1C +EventScript_SeismicTossTaught:: msgbox Text_SeismicTossTaught release end -EventScript_CounterTutor:: @ 81C4C26 +EventScript_CounterTutor:: lock faceplayer goto_if_set FLAG_TUTOR_COUNTER, EventScript_CounterTaught @@ -336,17 +336,17 @@ EventScript_CounterTutor:: @ 81C4C26 goto EventScript_CounterTaught end -EventScript_CounterDeclined:: @ 81C4C7A +EventScript_CounterDeclined:: msgbox Text_CounterDeclined release end -EventScript_CounterTaught:: @ 81C4C84 +EventScript_CounterTaught:: msgbox Text_CounterTaught release end -EventScript_MetronomeTutor:: @ 81C4C8E +EventScript_MetronomeTutor:: lock faceplayer goto_if_set FLAG_TUTOR_METRONOME, EventScript_MetronomeTaught @@ -365,17 +365,17 @@ EventScript_MetronomeTutor:: @ 81C4C8E goto EventScript_MetronomeTaught end -EventScript_MetronomeDeclined:: @ 81C4CE2 +EventScript_MetronomeDeclined:: msgbox Text_MetronomeDeclined release end -EventScript_MetronomeTaught:: @ 81C4CEC +EventScript_MetronomeTaught:: msgbox Text_MetronomeTaught release end -EventScript_MimicTutor:: @ 81C4CF6 +EventScript_MimicTutor:: goto_if_set FLAG_TUTOR_MIMIC, EventScript_MimicTaught msgbox Text_MimicTeach, MSGBOX_YESNO compare VAR_RESULT, NO @@ -395,12 +395,12 @@ EventScript_MimicTutor:: @ 81C4CF6 goto EventScript_MimicTaught end -EventScript_MimicDeclined:: @ 81C4D4F +EventScript_MimicDeclined:: msgbox Text_MimicDeclined release end -EventScript_MimicTaught:: @ 81C4D59 +EventScript_MimicTaught:: checkplayergender compare VAR_RESULT, MALE call_if_eq EventScript_MimicTaughtMale @@ -409,15 +409,15 @@ EventScript_MimicTaught:: @ 81C4D59 release end -EventScript_MimicTaughtMale:: @ 81C4D72 +EventScript_MimicTaughtMale:: msgbox Text_MimicTaughtMale return -EventScript_MimicTaughtFemale:: @ 81C4D7B +EventScript_MimicTaughtFemale:: msgbox Text_MimicTaughtFemale return -FourIsland_House1_EventScript_BodySlamTutor:: @ 81C4D84 +FourIsland_House1_EventScript_BodySlamTutor:: lock faceplayer goto_if_set FLAG_TUTOR_BODY_SLAM, EventScript_BodySlamTaught @@ -436,19 +436,19 @@ FourIsland_House1_EventScript_BodySlamTutor:: @ 81C4D84 goto EventScript_BodySlamTaught end -EventScript_BodySlamDeclined:: @ 81C4DD8 +EventScript_BodySlamDeclined:: msgbox Text_BodySlamDeclined release end -EventScript_BodySlamTaught:: @ 81C4DE2 +EventScript_BodySlamTaught:: msgbox Text_BodySlamTaught release end .set LOCALID_CAPE_BRINK_TUTOR, 1 -TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC +TwoIsland_CapeBrink_House_EventScript_StarterTutor:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording lock @@ -481,22 +481,22 @@ TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC goto CapeBrinkTutor_EventScript_ChooseMon @ Unused -CapeBrinkTutor_EventScript_FadeTaughtMove:: @ 81C4E8F +CapeBrinkTutor_EventScript_FadeTaughtMove:: fadescreen FADE_FROM_BLACK goto CapeBrinkTutor_EventScript_TaughtMove end -CapeBrinkTutor_EventScript_MoveJustTaught:: @ 81C4E97 +CapeBrinkTutor_EventScript_MoveJustTaught:: msgbox Text_MakeBestUseOfMove release end -CapeBrinkTutor_EventScript_TaughtAllMoves:: @ 81C4EA1 +CapeBrinkTutor_EventScript_TaughtAllMoves:: msgbox Text_FeelRejuvenated release end -CapeBrinkTutor_EventScript_TaughtMove:: @ 81C4EAB +CapeBrinkTutor_EventScript_TaughtMove:: copyvar VAR_0x8005, VAR_0x8009 specialvar VAR_RESULT, HasLearnedAllMovesFromCapeBrinkTutor compare VAR_RESULT, TRUE @@ -506,57 +506,57 @@ CapeBrinkTutor_EventScript_TaughtMove:: @ 81C4EAB release end -CapeBrinkTutor_EventScript_LearnedAllMoves:: @ 81C4ECD +CapeBrinkTutor_EventScript_LearnedAllMoves:: msgbox Text_PassedOnEverythingIKnow setflag FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK release end -CapeBrinkTutor_EventScript_ChooseMon:: @ 81C4EDA +CapeBrinkTutor_EventScript_ChooseMon:: call EventScript_ChooseMoveTutorMon compare VAR_RESULT, FALSE goto_if_eq CapeBrinkTutor_EventScript_DeclineMove goto CapeBrinkTutor_EventScript_TaughtMove end -CapeBrinkTutor_EventScript_JumpInPlaceDown:: @ 81C4EF0 +CapeBrinkTutor_EventScript_JumpInPlaceDown:: applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceDown waitmovement 0 return -CapeBrinkTutor_EventScript_JumpInPlaceUp:: @ 81C4EFB +CapeBrinkTutor_EventScript_JumpInPlaceUp:: applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceUp waitmovement 0 return -CapeBrinkTutor_EventScript_JumpInPlaceLeft:: @ 81C4F06 +CapeBrinkTutor_EventScript_JumpInPlaceLeft:: applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceLeft waitmovement 0 return -CapeBrinkTutor_EventScript_JumpInPlaceRight:: @ 81C4F11 +CapeBrinkTutor_EventScript_JumpInPlaceRight:: applymovement LOCALID_CAPE_BRINK_TUTOR, Movement_JumpInPlaceRight waitmovement 0 return -CapeBrinkTutor_EventScript_DeclineMove:: @ 81C4F1C +CapeBrinkTutor_EventScript_DeclineMove:: msgbox Text_YouRejectIt release end -CapeBrinkTutor_EventScript_NoLeadStarter:: @ 81C4F26 +CapeBrinkTutor_EventScript_NoLeadStarter:: msgbox Text_JustMistaken release end -EventScript_ChooseMoveTutorMon:: @ 81C4F30 +EventScript_ChooseMoveTutorMon:: special ChooseMonForMoveTutor waitstate lock faceplayer return -EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37 +EventScript_CanOnlyBeLearnedOnce:: textcolor 3 special DisableMsgBoxWalkaway signmsg @@ -565,18 +565,18 @@ EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37 call EventScript_RestorePrevTextColor return -Movement_JumpInPlaceDown: @ 81C4F4C +Movement_JumpInPlaceDown: jump_in_place_down step_end -Movement_JumpInPlaceUp: @ 81C4F4E +Movement_JumpInPlaceUp: jump_in_place_up step_end -Movement_JumpInPlaceLeft: @ 81C4F50 +Movement_JumpInPlaceLeft: jump_in_place_left step_end -Movement_JumpInPlaceRight: @ 81C4F52 +Movement_JumpInPlaceRight: jump_in_place_right step_end diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc index 6a411d811..61960d26a 100644 --- a/data/scripts/movement.inc +++ b/data/scripts/movement.inc @@ -1,55 +1,55 @@ -Movement_QuestionMark:: @ 81A75D9 +Movement_QuestionMark:: emote_question_mark step_end -Movement_ExclamationMark:: @ 81A75DB +Movement_ExclamationMark:: emote_exclamation_mark step_end -Movement_Delay48:: @ 81A75DD +Movement_Delay48:: delay_16 delay_16 delay_16 step_end -Movement_FacePlayer:: @ 81A75E1 +Movement_FacePlayer:: face_player step_end @ Unused -Movement_FaceAwayPlayer:: @ 81A75E3 +Movement_FaceAwayPlayer:: face_away_player step_end -Movement_FaceOriginalDirection:: @ 81A75E5 +Movement_FaceOriginalDirection:: face_original_direction step_end -Movement_WalkInPlaceFastestLeft:: @ 81A75E7 +Movement_WalkInPlaceFastestLeft:: walk_in_place_fastest_left step_end -Movement_WalkInPlaceFastestUp:: @ 81A75E9 +Movement_WalkInPlaceFastestUp:: walk_in_place_fastest_up step_end -Movement_WalkInPlaceFastestRight:: @ 81A75EB +Movement_WalkInPlaceFastestRight:: walk_in_place_fastest_right step_end -Movement_WalkInPlaceFastestDown:: @ 81A75ED +Movement_WalkInPlaceFastestDown:: walk_in_place_fastest_down step_end -Movement_FaceRight:: @ 81A75EF +Movement_FaceRight:: face_right step_end -Movement_FaceDown:: @ 81A75F1 +Movement_FaceDown:: face_down step_end -Movement_WalkUp5:: @ 81A75F3 +Movement_WalkUp5:: walk_up walk_up walk_up @@ -58,25 +58,25 @@ Movement_WalkUp5:: @ 81A75F3 step_end @ Unused -Movement_WalkUp4:: @ 81A75F9 +Movement_WalkUp4:: walk_up walk_up walk_up walk_up step_end -Movement_Delay32:: @ 81A75FE +Movement_Delay32:: delay_16 delay_16 step_end @ Unused -Movement_WalkUp:: @ 81A7601 +Movement_WalkUp:: walk_up step_end @ Unused -Movement_WalkUp2:: @ 81A7603 +Movement_WalkUp2:: walk_up walk_up step_end diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 5c4432714..46e96956a 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,6 +1,6 @@ .equ GAVE_PROFILE, VAR_TEMP_1 -MysteryEventClub_EventScript_Woman:: @ 81BEE16 +MysteryEventClub_EventScript_Woman:: lock faceplayer compare GAVE_PROFILE, TRUE @@ -10,12 +10,12 @@ MysteryEventClub_EventScript_Woman:: @ 81BEE16 goto EventScript_AskForProfile end -EventScript_AlreadyGaveProfile: @ 81BEE3A +EventScript_AlreadyGaveProfile: msgbox Text_TellMoreNextTime release end -EventScript_AskForProfile: @ 81BEE44 +EventScript_AskForProfile: message Text_TellMeWhatsYourProfile waitmessage multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE @@ -26,23 +26,23 @@ EventScript_AskForProfile: @ 81BEE44 case SCR_MENU_CANCEL, EventScript_DeclineGiveProfile end -EventScript_ProfileInfo: @ 81BEE81 +EventScript_ProfileInfo: msgbox Text_ExplainProfile goto EventScript_AskForProfile end -EventScript_AcceptGiveProfile: @ 81BEE8F +EventScript_AcceptGiveProfile: msgbox Text_WhatsYourProfile closemessage goto EventScript_GiveProfile end -EventScript_CancelGiveProfile: @ 81BEE9E +EventScript_CancelGiveProfile: msgbox Text_DecidedNotTo release end -EventScript_GaveProfile: @ 81BEEA8 +EventScript_GaveProfile: setvar GAVE_PROFILE, TRUE setvar VAR_0x8004, 0 special ShowEasyChatMessage @@ -52,17 +52,17 @@ EventScript_GaveProfile: @ 81BEEA8 release end -EventScript_DeclineGiveProfile: @ 81BEEC3 +EventScript_DeclineGiveProfile: msgbox Text_DontBeLikeThat release end -EventScript_GivenProfileBefore: @ 81BEECD +EventScript_GivenProfileBefore: msgbox Text_HiWeMeetAgain goto EventScript_AskForNewProfile end -EventScript_AskForNewProfile: @ 81BEEDB +EventScript_AskForNewProfile: message Text_ChangeYourProfile waitmessage multichoice 18, 6, MULTICHOICE_YES_NO_INFO_2, FALSE @@ -73,23 +73,23 @@ EventScript_AskForNewProfile: @ 81BEEDB case SCR_MENU_CANCEL, EventScript_DeclineGiveNewProfile end -EventScript_ProfileInfo2: @ 81BEF18 +EventScript_ProfileInfo2: msgbox Text_ExplainProfile goto EventScript_AskForNewProfile end -EventScript_AcceptGiveNewProfile: @ 81BEF26 +EventScript_AcceptGiveNewProfile: msgbox Text_WhatAreYouLikeNow closemessage goto EventScript_GiveProfile end -EventScript_DeclineGiveNewProfile: @ 81BEF35 +EventScript_DeclineGiveNewProfile: msgbox Text_LikeProfileWayItIs release end -EventScript_GaveSpecialProfile: @ 81BEF3F +EventScript_GaveSpecialProfile: setvar GAVE_PROFILE, TRUE setvar VAR_0x8004, 0 special ShowEasyChatMessage @@ -99,7 +99,7 @@ EventScript_GaveSpecialProfile: @ 81BEF3F release end -EventScript_GiveProfile: @ 81BEF5A +EventScript_GiveProfile: setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE call Common_ShowEasyChatScreen lock @@ -112,7 +112,7 @@ EventScript_GiveProfile: @ 81BEF5A goto_if_eq EventScript_GaveProfile end -Text_IdLoveToHearYourProfile: @ 81BEF88 +Text_IdLoveToHearYourProfile: .string "Hi, glad to meet you!\p" .string "…That's unfriendly of you.\n" .string "How about saying hi back?\p" @@ -120,11 +120,11 @@ Text_IdLoveToHearYourProfile: @ 81BEF88 .string "yourself.\p" .string "I'd love to hear your profile!$" -Text_TellMeWhatsYourProfile: @ 81BF017 +Text_TellMeWhatsYourProfile: .string "Tell me something good about\n" .string "yourself. What's your profile?$" -Text_ExplainProfile: @ 81BF053 +Text_ExplainProfile: .string "A profile is written using four\n" .string "words or phrases.\p" .string "There're plenty of words to choose\n" @@ -136,46 +136,46 @@ Text_ExplainProfile: @ 81BF053 .string "…It's easier than it sounds.\n" .string "Why don't you try it?$" -Text_WhatsYourProfile: @ 81BF166 +Text_WhatsYourProfile: .string "What's your profile?$" -Text_DontBeLikeThat: @ 81BF17B +Text_DontBeLikeThat: .string "Aww… Don't be like that.\n" .string "You can tell me your profile.$" -Text_DecidedNotTo: @ 81BF1B2 +Text_DecidedNotTo: .string "Oh, you've decided not to?\n" .string "You're fickle, aren't you?$" -Text_HiWeMeetAgain: @ 81BF1E8 +Text_HiWeMeetAgain: .string "Hi!\n" .string "We meet again!$" -Text_ChangeYourProfile: @ 81BF1FB +Text_ChangeYourProfile: .string "Would you like to change your\n" .string "profile?$" -Text_WhatAreYouLikeNow: @ 81BF222 +Text_WhatAreYouLikeNow: .string "What are you like now?\n" .string "I'd really like to know.$" -Text_LikeProfileWayItIs: @ 81BF252 +Text_LikeProfileWayItIs: .string "Okay, you like your profile the\n" .string "way it is.\p" .string "I think so, too.$" -Text_ProfileSaysSomethingAboutYou: @ 81BF28E +Text_ProfileSaysSomethingAboutYou: .string "Hmhm…\p" .string "Your profile really says something\n" .string "about who you are.\p" .string "Now that I know you better, it \n" .string "makes us better friends than ever!$" -Text_HeardThatBefore: @ 81BF30D +Text_HeardThatBefore: .string "Oh, I've heard that before…\p" .string "My cousin, who lives far away,\n" .string "always used to say that, I think.$" -Text_TellMoreNextTime: @ 81BF36A +Text_TellMoreNextTime: .string "Please tell me more about\n" .string "yourself next time!$" diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 6c74df5bd..e4f49c9f6 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -1,13 +1,13 @@ @ Unused, handled by textcolor script cmd -EventScript_SaveTextColor:: @ 81A666F +EventScript_SaveTextColor:: copyvar VAR_PREV_TEXT_COLOR, VAR_TEXT_COLOR return -EventScript_RestorePrevTextColor:: @ 81A6675 +EventScript_RestorePrevTextColor:: copyvar VAR_TEXT_COLOR, VAR_PREV_TEXT_COLOR return -Std_ObtainItem:: @ 81A667B +Std_ObtainItem:: copyvar VAR_PREV_TEXT_COLOR, VAR_TEXT_COLOR textcolor 3 additem VAR_0x8000, VAR_0x8001 @@ -16,7 +16,7 @@ Std_ObtainItem:: @ 81A667B copyvar VAR_TEXT_COLOR, VAR_PREV_TEXT_COLOR return -EventScript_ObtainItemMessage:: @ 81A6697 +EventScript_ObtainItemMessage:: bufferitemnameplural 1, VAR_0x8000, VAR_0x8001 checkitemtype VAR_0x8000 call EventScript_BufferPocketNameTryFanfare @@ -26,7 +26,7 @@ EventScript_ObtainItemMessage:: @ 81A6697 call_if_eq EventScript_NoRoomForItem return -EventScript_BufferPocketNameTryFanfare:: @ 81A66BC +EventScript_BufferPocketNameTryFanfare:: switch VAR_RESULT case POCKET_ITEMS, EventScript_BufferItemsPocket case POCKET_KEY_ITEMS, EventScript_BufferKeyItemsPocket @@ -35,37 +35,37 @@ EventScript_BufferPocketNameTryFanfare:: @ 81A66BC case POCKET_BERRY_POUCH, EventScript_BufferBerryPouch end -EventScript_BufferItemsPocket:: @ 81A66F9 +EventScript_BufferItemsPocket:: getstdstring 2, STDSTRING_ITEMS_POCKET compare VAR_0x8007, TRUE call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_BufferKeyItemsPocket:: @ 81A6709 +EventScript_BufferKeyItemsPocket:: getstdstring 2, STDSTRING_KEY_ITEMS_POCKET compare VAR_0x8007, TRUE call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_BufferPokeBallsPocket:: @ 81A6719 +EventScript_BufferPokeBallsPocket:: getstdstring 2, STDSTRING_POKEBALLS_POCKET compare VAR_0x8007, TRUE call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_BufferTMCase:: @ 81A6729 +EventScript_BufferTMCase:: getstdstring 2, STDSTRING_TM_CASE compare VAR_0x8007, TRUE call_if_eq EventScript_PlayFanfareObtainedTMHM return -EventScript_BufferBerryPouch:: @ 81A6739 +EventScript_BufferBerryPouch:: getstdstring 2, STDSTRING_BERRY_POUCH compare VAR_0x8007, TRUE call_if_eq EventScript_PlayFanfareObtainedItem return -EventScript_ObtainedItem:: @ 81A6749 +EventScript_ObtainedItem:: message Text_ObtainedTheX waitfanfare waitmessage @@ -73,25 +73,25 @@ EventScript_ObtainedItem:: @ 81A6749 setvar VAR_RESULT, 1 return -EventScript_NoRoomForItem:: @ 81A675E +EventScript_NoRoomForItem:: setvar VAR_RESULT, FALSE return -EventScript_PlayFanfareObtainedItem:: @ 81A6764 +EventScript_PlayFanfareObtainedItem:: playfanfare MUS_LEVEL_UP return -EventScript_PlayFanfareObtainedTMHM:: @ 81A6768 +EventScript_PlayFanfareObtainedTMHM:: playfanfare MUS_LEVEL_UP return -Std_ObtainDecoration:: @ 81A676C +Std_ObtainDecoration:: adddecor VAR_0x8000 copyvar VAR_0x8007, VAR_RESULT call EventScript_ObtainDecorMessage return -EventScript_ObtainDecorMessage:: @ 81A677A +EventScript_ObtainDecorMessage:: getdecorname 1, VAR_0x8000 compare VAR_0x8007, TRUE call_if_eq EventScript_ObtainedDecor @@ -99,7 +99,7 @@ EventScript_ObtainDecorMessage:: @ 81A677A call_if_eq EventScript_NoRoomForDecor return -EventScript_ObtainedDecor:: @ 81A6795 +EventScript_ObtainedDecor:: playfanfare MUS_OBTAIN_ITEM message Text_ObtainedTheDecor waitfanfare @@ -108,11 +108,11 @@ EventScript_ObtainedDecor:: @ 81A6795 setvar VAR_RESULT, TRUE return -EventScript_NoRoomForDecor:: @ 81A67AD +EventScript_NoRoomForDecor:: setvar VAR_RESULT, FALSE return -Std_FindItem:: @ 81A67B3 +Std_FindItem:: lock faceplayer waitse @@ -130,7 +130,7 @@ Std_FindItem:: @ 81A67B3 release return -EventScript_PickUpItem:: @ 81A67EE +EventScript_PickUpItem:: removeobject VAR_LAST_TALKED additem VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, BufferTMHMMoveName @@ -144,21 +144,21 @@ EventScript_PickUpItem:: @ 81A67EE msgbox Text_PutItemAway return -EventScript_FoundTMHM:: @ 81A6821 +EventScript_FoundTMHM:: message Text_FoundTMHMContainsMove return -EventScript_FoundItem:: @ 81A6827 +EventScript_FoundItem:: message Text_FoundOneItem return -EventScript_NoRoomToPickUpItem:: @ 81A682D +EventScript_NoRoomToPickUpItem:: msgbox Text_ObtainedTheX msgbox Text_TooBadBagFull setvar VAR_RESULT, FALSE return -EventScript_HiddenItemScript:: @ 81A6843 +EventScript_HiddenItemScript:: lockall textcolor 3 waitse diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index a3190ea26..dedcd041e 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -1,4 +1,4 @@ -EventScript_PC:: @ 81A6955 +EventScript_PC:: goto_if_questlog EventScript_ReleaseEnd lockall goto_if_set FLAG_SYS_PC_STORAGE_DISABLED, EventScript_PCDisabled @@ -12,12 +12,12 @@ EventScript_PC:: @ 81A6955 end @ For when the player first arrives on One Island -EventScript_PCDisabled:: @ 81A698E +EventScript_PCDisabled:: msgbox OneIsland_PokemonCenter_1F_Text_UsualPCServicesUnavailable releaseall end -EventScript_PCMainMenu:: @ 81A6998 +EventScript_PCMainMenu:: message Text_AccessWhichPC waitmessage special CreatePCMenu @@ -25,7 +25,7 @@ EventScript_PCMainMenu:: @ 81A6998 goto EventScript_ChoosePCMenu end -EventScript_ChoosePCMenu:: @ 81A69A8 +EventScript_ChoosePCMenu:: switch VAR_RESULT case 0, EventScript_AccessPokemonStorage case 1, EventScript_AccessPlayersPC @@ -35,7 +35,7 @@ EventScript_ChoosePCMenu:: @ 81A69A8 case SCR_MENU_CANCEL, EventScript_TurnOffPC end -EventScript_AccessPlayersPC:: @ 81A69F0 +EventScript_AccessPlayersPC:: playse SE_PC_LOGIN msgbox Text_AccessedPlayersPC special PlayerPC @@ -43,7 +43,7 @@ EventScript_AccessPlayersPC:: @ 81A69F0 goto EventScript_PCMainMenu end -EventScript_AccessPokemonStorage:: @ 81A6A05 +EventScript_AccessPokemonStorage:: playse SE_PC_LOGIN call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_AccessSomeonesPC call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_AccessBillsPC @@ -55,15 +55,15 @@ EventScript_AccessPokemonStorage:: @ 81A6A05 goto EventScript_PCMainMenu end -EventScript_AccessSomeonesPC:: @ 81A6A34 +EventScript_AccessSomeonesPC:: msgbox Text_AccessedSomeonesPC return -EventScript_AccessBillsPC:: @ 81A6A3D +EventScript_AccessBillsPC:: msgbox Text_AccessedBillsPC return -EventScript_TurnOffPC:: @ 81A6A46 +EventScript_TurnOffPC:: setvar VAR_0x8004, 0 playse SE_PC_OFF special AnimatePcTurnOff @@ -71,7 +71,7 @@ EventScript_TurnOffPC:: @ 81A6A46 releaseall end -EventScript_AccessHallOfFame:: @ 81A6A56 +EventScript_AccessHallOfFame:: goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC playse SE_PC_LOGIN setvar VAR_0x8004, HELPCONTEXT_PC_MISC @@ -83,7 +83,7 @@ EventScript_AccessHallOfFame:: @ 81A6A56 goto EventScript_ChoosePCMenu end -EventScript_AccessProfOaksPC:: @ 81A6A7A +EventScript_AccessProfOaksPC:: goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_TurnOffPC playse SE_PC_LOGIN msgbox Text_AccessedProfOaksPC @@ -96,7 +96,7 @@ EventScript_AccessProfOaksPC:: @ 81A6A7A goto EventScript_ExitOaksPC end -EventScript_ExitOaksPC:: @ 81A6AB2 +EventScript_ExitOaksPC:: msgbox Text_ClosedLinkToProfOaksPC goto EventScript_PCMainMenu end diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc index c04c2d0cd..76df5f0ed 100644 --- a/data/scripts/pc_transfer.inc +++ b/data/scripts/pc_transfer.inc @@ -1,10 +1,10 @@ -EventScript_GetGiftMonPartySlot:: @ 81A8C27 +EventScript_GetGiftMonPartySlot:: getpartysize subvar VAR_RESULT, 1 copyvar VAR_0x8004, VAR_RESULT return -EventScript_NameReceivedBoxMon:: @ 81A8C33 +EventScript_NameReceivedBoxMon:: fadescreen FADE_TO_BLACK special ChangeBoxPokemonNickname waitstate @@ -12,34 +12,34 @@ EventScript_NameReceivedBoxMon:: @ 81A8C33 faceplayer return -EventScript_TransferredToPC:: @ 81A8C3C +EventScript_TransferredToPC:: bufferboxname 0, VAR_PC_BOX_TO_SEND_MON getspeciesname 1, VAR_TEMP_1 call_if_unset FLAG_SYS_NOT_SOMEONES_PC, EventScript_TransferredSomeonesPC call_if_set FLAG_SYS_NOT_SOMEONES_PC, EventScript_TransferredBillsPC return -EventScript_TransferredSomeonesPC:: @ 81A8C57 +EventScript_TransferredSomeonesPC:: specialvar VAR_RESULT, ShouldShowBoxWasFullMessage compare VAR_RESULT, TRUE goto_if_eq EventScript_TransferredSomeonesPCBoxFull msgbox Text_MonSentToBoxInSomeonesPC return -EventScript_TransferredSomeonesPCBoxFull:: @ 81A8C70 +EventScript_TransferredSomeonesPCBoxFull:: specialvar VAR_RESULT, GetPCBoxToSendMon bufferboxname 2, VAR_RESULT msgbox Text_MonSentToBoxSomeonesBoxFull return -EventScript_TransferredBillsPC:: @ 81A8C82 +EventScript_TransferredBillsPC:: specialvar VAR_RESULT, ShouldShowBoxWasFullMessage compare VAR_RESULT, TRUE goto_if_eq EventScript_TransferredBillsPCBoxFull msgbox Text_MonSentToBoxInBillsPC return -EventScript_TransferredBillsPCBoxFull:: @ 81A8C9B +EventScript_TransferredBillsPCBoxFull:: specialvar VAR_RESULT, GetPCBoxToSendMon bufferboxname 2, VAR_RESULT msgbox Text_MonSentToBoxBillsBoxFull diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index 2d537c3af..3c0e6b56e 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -1,4 +1,4 @@ -EventScript_PkmnCenterNurse:: @ 81A6578 +EventScript_PkmnCenterNurse:: goto_if_questlog EventScript_ReleaseEnd message Text_WelcomeWantToHealPkmn waitmessage @@ -9,7 +9,7 @@ EventScript_PkmnCenterNurse:: @ 81A6578 case SCR_MENU_CANCEL, EventScript_PkmnCenterNurse_Goodbye end -EventScript_PkmnCenterNurse_HealPkmn:: @ 81A65B8 +EventScript_PkmnCenterNurse_HealPkmn:: incrementgamestat GAME_STAT_USED_POKECENTER message Text_TakeYourPkmnForFewSeconds waitmessage @@ -18,7 +18,7 @@ EventScript_PkmnCenterNurse_HealPkmn:: @ 81A65B8 goto EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom end -EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE +EventScript_PkmnCenterNurse_TakeAndHealPkmn:: applymovement VAR_LAST_TALKED, Movement_WalkInPlaceFastestLeft waitmovement 0 dofieldeffect FLDEFF_POKECENTER_HEAL @@ -28,7 +28,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 81A65CE special HealPlayerParty return -EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC +EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: specialvar VAR_RESULT, IsPlayerNotInTrainerTowerLobby compare VAR_RESULT, FALSE goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn @@ -40,7 +40,7 @@ EventScript_PkmnCenterNurse_CheckTrainerTowerAndUnionRoom:: @ 81A65EC goto_if_eq EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom end -EventScript_PkmnCenterNurse_ReturnPkmn:: @ 81A661D +EventScript_PkmnCenterNurse_ReturnPkmn:: message Text_RestoredPkmnToFullHealth waitmessage applymovement VAR_LAST_TALKED, Movement_Bow @@ -48,7 +48,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 81A661D msgbox Text_WeHopeToSeeYouAgain return -EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom:: @ 81A6636 +EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom:: goto_if_set FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER, EventScript_PkmnCenterNurse_ReturnPkmn msgbox Text_RestoredPkmnToFullHealth setflag FLAG_SYS_INFORMED_OF_LOCAL_WIRELESS_PLAYER @@ -59,11 +59,11 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUionRoom:: @ 81A6636 msgbox Text_WeHopeToSeeYouAgain return -EventScript_PkmnCenterNurse_Goodbye:: @ 81A6663 +EventScript_PkmnCenterNurse_Goodbye:: msgbox Text_WeHopeToSeeYouAgain return -Movement_Bow:: @ 81A666C +Movement_Bow:: nurse_joy_bow delay_4 step_end diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 64955bb8a..1e537f131 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -1,4 +1,4 @@ -PokedexRating_EventScript_RateInPerson:: @ 81A737B +PokedexRating_EventScript_RateInPerson:: goto_if_questlog EventScript_ReleaseEnd special QuestLog_CutRecording call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro @@ -6,15 +6,15 @@ PokedexRating_EventScript_RateInPerson:: @ 81A737B call PokedexRating_EventScript_Rate return -PokedexRating_EventScript_DexCompleteIntro:: @ 81A73A4 +PokedexRating_EventScript_DexCompleteIntro:: msgbox PokedexRating_Text_LoveSeeingYourPokedex return -PokedexRating_EventScript_NormalIntro:: @ 81A73AD +PokedexRating_EventScript_NormalIntro:: msgbox PokedexRating_Text_HowIsPokedexComingAlong return -PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6 +PokedexRating_EventScript_ShowRatingMsg:: copyvar VAR_0x8004, VAR_0x8009 special GetProfOaksRatingMessage waitmessage @@ -26,15 +26,15 @@ PokedexRating_EventScript_ShowRatingMsg:: @ 81A73B6 waitbuttonpress return -PokedexRating_EventScript_NormalFanfare:: @ 81A73D8 +PokedexRating_EventScript_NormalFanfare:: playfanfare MUS_DEX_RATING return -PokedexRating_EventScript_DexCompleteFanfare:: @ 81A73DC +PokedexRating_EventScript_DexCompleteFanfare:: playfanfare MUS_EVOLVED return -PokedexRating_EventScript_Rate:: @ 81A73E0 +PokedexRating_EventScript_Rate:: setvar VAR_0x8004, HELPCONTEXT_PC_MISC special BackupHelpContext special Script_SetHelpContext @@ -64,21 +64,21 @@ PokedexRating_EventScript_Rate:: @ 81A73E0 goto_if_eq PokedexRating_EventScript_DexComplete end -PokedexRating_EventScript_SetTextColor:: @ 81A746D +PokedexRating_EventScript_SetTextColor:: textcolor 0 return -PokedexRating_EventScript_DexIncomplete:: @ 81A7470 +PokedexRating_EventScript_DexIncomplete:: msgbox PokedexRating_Text_LookForwardToFilledNationalDex goto PokedexRating_EventScript_EndRating end -PokedexRating_EventScript_DexComplete:: @ 81A747E +PokedexRating_EventScript_DexComplete:: setflag FLAG_OAK_SAW_DEX_COMPLETION msgbox PokedexRating_Text_YouveCompletedDex goto PokedexRating_EventScript_EndRating end -PokedexRating_EventScript_EndRating:: @ 81A748F +PokedexRating_EventScript_EndRating:: special RestoreHelpContext return diff --git a/data/scripts/pokemon_league.inc b/data/scripts/pokemon_league.inc index ad39c4528..d30251746 100644 --- a/data/scripts/pokemon_league.inc +++ b/data/scripts/pokemon_league.inc @@ -1,4 +1,4 @@ -PokemonLeague_EventScript_OpenDoor:: @ 81A7506 +PokemonLeague_EventScript_OpenDoor:: applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 waitmovement 0 playse SE_RS_DOOR @@ -7,7 +7,7 @@ PokemonLeague_EventScript_OpenDoor:: @ 81A7506 setflag FLAG_TEMP_4 return -PokemonLeague_EventScript_EnterRoom:: @ 81A751F +PokemonLeague_EventScript_EnterRoom:: applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5 waitmovement 0 setflag FLAG_TEMP_2 @@ -16,12 +16,12 @@ PokemonLeague_EventScript_EnterRoom:: @ 81A751F special DrawWholeMapView return -PokemonLeague_EventScript_SetDoorOpen:: @ 81A7538 +PokemonLeague_EventScript_SetDoorOpen:: setmetatile 6, 1, METATILE_PokemonLeague_Door_Top_Open, 1 setmetatile 6, 2, METATILE_PokemonLeague_Door_Mid_Open, 0 return -PokemonLeague_EventScript_PreventExit:: @ 81A754B +PokemonLeague_EventScript_PreventExit:: lockall textcolor 0 msgbox Text_VoiceRangOutDontRunAway @@ -31,7 +31,7 @@ PokemonLeague_EventScript_PreventExit:: @ 81A754B releaseall end -PokemonLeague_EventScript_OpenDoorLance:: @ 81A7563 +PokemonLeague_EventScript_OpenDoorLance:: applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32 waitmovement 0 playse SE_RS_DOOR @@ -41,12 +41,12 @@ PokemonLeague_EventScript_OpenDoorLance:: @ 81A7563 setflag FLAG_TEMP_4 return -PokemonLeague_EventScript_SetDoorOpenLance:: @ 81A7589 +PokemonLeague_EventScript_SetDoorOpenLance:: setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1 setmetatile 6, 5, METATILE_PokemonLeague_Door_Mid_Open, 0 return -PokemonLeague_EventScript_CloseEntry:: @ 81A759C +PokemonLeague_EventScript_CloseEntry:: setmetatile 5, 11, METATILE_PokemonLeague_Entry_TopLeft_Closed, 1 setmetatile 6, 11, METATILE_PokemonLeague_Entry_TopMid_Closed, 1 setmetatile 7, 11, METATILE_PokemonLeague_Entry_TopRight_Closed, 1 @@ -55,10 +55,10 @@ PokemonLeague_EventScript_CloseEntry:: @ 81A759C setmetatile 7, 12, METATILE_PokemonLeague_Entry_BottomRight_Closed, 1 return -PokemonLeague_Movement_ForcePlayerIn:: @ 81A75D3 +PokemonLeague_Movement_ForcePlayerIn:: walk_up step_end -PokemonLeague_EventScript_DoLightingEffect:: @ 81A75D5 +PokemonLeague_EventScript_DoLightingEffect:: special DoPokemonLeagueLightingEffect return diff --git a/data/scripts/pokemon_mansion.inc b/data/scripts/pokemon_mansion.inc index 9f6fb522a..b750ae1cf 100644 --- a/data/scripts/pokemon_mansion.inc +++ b/data/scripts/pokemon_mansion.inc @@ -1,4 +1,4 @@ -PokemonMansion_EventScript_SecretSwitch:: @ 81A7AE2 +PokemonMansion_EventScript_SecretSwitch:: msgbox PokemonMansion_Text_PressSecretSwitch, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq PokemonMansion_EventScript_DontPressSwitch @@ -12,7 +12,7 @@ PokemonMansion_EventScript_SecretSwitch:: @ 81A7AE2 case 3, PokemonMansion_EventScript_PressSwitch_B1F end -PokemonMansion_EventScript_ResetSwitch:: @ 81A7B3B +PokemonMansion_EventScript_ResetSwitch:: clearflag FLAG_POKEMON_MANSION_SWITCH_STATE switch VAR_0x8004 case 0, PokemonMansion_EventScript_ResetSwitch_1F @@ -21,12 +21,12 @@ PokemonMansion_EventScript_ResetSwitch:: @ 81A7B3B case 3, PokemonMansion_EventScript_ResetSwitch_B1F end -PokemonMansion_EventScript_DontPressSwitch:: @ 81A7B70 +PokemonMansion_EventScript_DontPressSwitch:: msgbox PokemonMansion_Text_NotQuiteYet releaseall end -PokemonMansion_EventScript_PressSwitch_1F:: @ 81A7B7A +PokemonMansion_EventScript_PressSwitch_1F:: setmetatile 22, 10, METATILE_PokemonMansion_Floor_ShadeFull, 0 setmetatile 23, 10, METATILE_PokemonMansion_Floor, 0 setmetatile 24, 10, METATILE_PokemonMansion_Floor, 0 @@ -54,7 +54,7 @@ PokemonMansion_EventScript_PressSwitch_1F:: @ 81A7B7A setmetatile 5, 4, METATILE_PokemonMansion_Statue_RedEyes, 0 return -PokemonMansion_EventScript_ResetSwitch_1F:: @ 81A7C5C +PokemonMansion_EventScript_ResetSwitch_1F:: setmetatile 22, 10, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1 setmetatile 23, 10, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1 setmetatile 24, 10, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1 @@ -82,7 +82,7 @@ PokemonMansion_EventScript_ResetSwitch_1F:: @ 81A7C5C setmetatile 5, 4, METATILE_PokemonMansion_Statue_BlackEyes, 0 return -PokemonMansion_EventScript_PressSwitch_2F:: @ 81A7D3E +PokemonMansion_EventScript_PressSwitch_2F:: setmetatile 24, 14, METATILE_PokemonMansion_Floor_ShadeFull, 0 setmetatile 25, 14, METATILE_PokemonMansion_Floor, 0 setmetatile 26, 14, METATILE_PokemonMansion_Floor, 0 @@ -102,7 +102,7 @@ PokemonMansion_EventScript_PressSwitch_2F:: @ 81A7D3E setmetatile 2, 15, METATILE_PokemonMansion_Statue_RedEyes, 0 return -PokemonMansion_EventScript_ResetSwitch_2F:: @ 81A7DD8 +PokemonMansion_EventScript_ResetSwitch_2F:: setmetatile 24, 14, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1 setmetatile 25, 14, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1 setmetatile 26, 14, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1 @@ -122,7 +122,7 @@ PokemonMansion_EventScript_ResetSwitch_2F:: @ 81A7DD8 setmetatile 2, 15, METATILE_PokemonMansion_Statue_BlackEyes, 0 return -PokemonMansion_EventScript_PressSwitch_3F:: @ 81A7E72 +PokemonMansion_EventScript_PressSwitch_3F:: setmetatile 17, 11, METATILE_PokemonMansion_Floor_ShadeFull, 0 setmetatile 18, 11, METATILE_PokemonMansion_Floor, 0 setmetatile 19, 11, METATILE_PokemonMansion_Floor, 0 @@ -137,7 +137,7 @@ PokemonMansion_EventScript_PressSwitch_3F:: @ 81A7E72 setmetatile 12, 4, METATILE_PokemonMansion_Statue_RedEyes, 0 return -PokemonMansion_EventScript_ResetSwitch_3F:: @ 81A7EDF +PokemonMansion_EventScript_ResetSwitch_3F:: setmetatile 17, 11, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1 setmetatile 18, 11, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1 setmetatile 19, 11, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1 @@ -152,7 +152,7 @@ PokemonMansion_EventScript_ResetSwitch_3F:: @ 81A7EDF setmetatile 12, 4, METATILE_PokemonMansion_Statue_BlackEyes, 0 return -PokemonMansion_EventScript_PressSwitch_B1F:: @ 81A7F4C +PokemonMansion_EventScript_PressSwitch_B1F:: setmetatile 33, 20, METATILE_PokemonMansion_Barrier_Horizontal_TopLeft, 1 setmetatile 34, 20, METATILE_PokemonMansion_Barrier_Horizontal_TopMid, 1 setmetatile 35, 20, METATILE_PokemonMansion_Barrier_Horizontal_TopRight, 1 @@ -179,7 +179,7 @@ PokemonMansion_EventScript_PressSwitch_B1F:: @ 81A7F4C setmetatile 27, 4, METATILE_PokemonMansion_Statue_RedEyes_Basement, 0 return -PokemonMansion_EventScript_ResetSwitch_B1F:: @ 81A8025 +PokemonMansion_EventScript_ResetSwitch_B1F:: setmetatile 33, 20, METATILE_PokemonMansion_BasementFloor_ShadeFull, 0 setmetatile 34, 20, METATILE_PokemonMansion_BasementFloor, 0 setmetatile 35, 20, METATILE_PokemonMansion_BasementFloor, 0 diff --git a/data/scripts/questionnaire.inc b/data/scripts/questionnaire.inc index 75508be5c..da618572d 100644 --- a/data/scripts/questionnaire.inc +++ b/data/scripts/questionnaire.inc @@ -1,4 +1,4 @@ -EventScript_Questionnaire:: @ 81A7702 +EventScript_Questionnaire:: lockall textcolor 3 msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO @@ -18,7 +18,7 @@ EventScript_Questionnaire:: @ 81A7702 goto_if_eq EventScript_TookQuestionnaire end -EventScript_EnableMysteryGift:: @ 81A774D +EventScript_EnableMysteryGift:: applymovement VAR_0x8008, Movement_FaceDown waitmovement 0 playse SE_PIN @@ -36,11 +36,11 @@ EventScript_EnableMysteryGift:: @ 81A774D releaseall end -EventScript_DeclineQuestionnaire:: @ 81A778A +EventScript_DeclineQuestionnaire:: releaseall end -EventScript_TookQuestionnaire:: @ 81A778C +EventScript_TookQuestionnaire:: applymovement VAR_0x8008, Movement_FaceDown waitmovement 0 msgbox Text_QuestionnaireThankYou diff --git a/data/scripts/repel.inc b/data/scripts/repel.inc index db2ec60ec..97bf963b9 100644 --- a/data/scripts/repel.inc +++ b/data/scripts/repel.inc @@ -1,6 +1,6 @@ -EventScript_RepelWoreOff:: @ 81BFB65 +EventScript_RepelWoreOff:: msgbox Text_RepelWoreOff, MSGBOX_SIGN end -Text_RepelWoreOff:: @ 81BFB6E +Text_RepelWoreOff:: .string "REPEL's effect wore off…$" diff --git a/data/scripts/route23.inc b/data/scripts/route23.inc index c59080c6c..3d88bc272 100644 --- a/data/scripts/route23.inc +++ b/data/scripts/route23.inc @@ -1,11 +1,11 @@ -Route23_EventScript_MissingBoulderBadge:: @ 81A77C9 +Route23_EventScript_MissingBoulderBadge:: msgbox Text_OnlySkilledTrainersAllowedThrough playse SE_BOO msgbox Text_CantLetYouPass release end -Route23_EventScript_MissingBadge:: @ 81A77DE +Route23_EventScript_MissingBadge:: message Text_OnlyPassWithBadgeDontHaveYet waitmessage playse SE_BOO @@ -15,7 +15,7 @@ Route23_EventScript_MissingBadge:: @ 81A77DE release end -Route23_EventScript_AlreadyRecognizedBoulderBadge:: @ 81A77EC +Route23_EventScript_AlreadyRecognizedBoulderBadge:: message Text_OhThatsBadgeGoRightAhead waitmessage playfanfare MUS_LEVEL_UP @@ -24,13 +24,13 @@ Route23_EventScript_AlreadyRecognizedBoulderBadge:: @ 81A77EC release end -Route23_EventScript_AlreadyRecognizedBadge:: @ 81A77F9 +Route23_EventScript_AlreadyRecognizedBadge:: msgbox Text_OnlyPassWithBadgeOhGoAhead release end @ Duplicate of the below, only used for Boulder Badge -Route22_NorthEntrance_EventScript_BadgeGuard:: @ 81A7803 +Route22_NorthEntrance_EventScript_BadgeGuard:: compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 goto_if_ge Route23_EventScript_AlreadyRecognizedBoulderBadge switch VAR_TEMP_1 @@ -44,7 +44,7 @@ Route22_NorthEntrance_EventScript_BadgeGuard:: @ 81A7803 case 8, Route23_EventScript_CheckEarthBadge end -Route23_EventScript_BadgeGuard:: @ 81A786C +Route23_EventScript_BadgeGuard:: compare VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 goto_if_ge Route23_EventScript_AlreadyRecognizedBadge switch VAR_TEMP_1 @@ -58,47 +58,47 @@ Route23_EventScript_BadgeGuard:: @ 81A786C case 8, Route23_EventScript_CheckEarthBadge end -Route23_EventScript_CheckBoulderBadge:: @ 81A78D5 +Route23_EventScript_CheckBoulderBadge:: goto_if_set FLAG_BADGE01_GET, Route23_EventScript_RecognizeBoulderBadge goto Route23_EventScript_MissingBoulderBadge end -Route23_EventScript_CheckCascadeBadge:: @ 81A78E4 +Route23_EventScript_CheckCascadeBadge:: goto_if_set FLAG_BADGE02_GET, Route23_EventScript_RecognizeBadge goto Route23_EventScript_MissingBadge end -Route23_EventScript_CheckThunderBadge:: @ 81A78F3 +Route23_EventScript_CheckThunderBadge:: goto_if_set FLAG_BADGE03_GET, Route23_EventScript_RecognizeBadge goto Route23_EventScript_MissingBadge end -Route23_EventScript_CheckRainbowBadge:: @ 81A7902 +Route23_EventScript_CheckRainbowBadge:: goto_if_set FLAG_BADGE04_GET, Route23_EventScript_RecognizeBadge goto Route23_EventScript_MissingBadge end -Route23_EventScript_CheckSoulBadge:: @ 81A7911 +Route23_EventScript_CheckSoulBadge:: goto_if_set FLAG_BADGE05_GET, Route23_EventScript_RecognizeBadge goto Route23_EventScript_MissingBadge end -Route23_EventScript_CheckMarshBadge:: @ 81A7920 +Route23_EventScript_CheckMarshBadge:: goto_if_set FLAG_BADGE06_GET, Route23_EventScript_RecognizeBadge goto Route23_EventScript_MissingBadge end -Route23_EventScript_CheckVolcanoBadge:: @ 81A792F +Route23_EventScript_CheckVolcanoBadge:: goto_if_set FLAG_BADGE07_GET, Route23_EventScript_RecognizeBadge goto Route23_EventScript_MissingBadge end -Route23_EventScript_CheckEarthBadge:: @ 81A793E +Route23_EventScript_CheckEarthBadge:: goto_if_set FLAG_BADGE08_GET, Route23_EventScript_RecognizeBadge goto Route23_EventScript_MissingBadge end -Route23_EventScript_RecognizeBoulderBadge:: @ 81A794D +Route23_EventScript_RecognizeBoulderBadge:: message Text_OhThatsBadgeGoRightAhead waitmessage playfanfare MUS_LEVEL_UP @@ -108,13 +108,13 @@ Route23_EventScript_RecognizeBoulderBadge:: @ 81A794D release end -Route23_EventScript_RecognizeBadge:: @ 81A795F +Route23_EventScript_RecognizeBadge:: msgbox Text_OnlyPassWithBadgeOhGoAhead copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 release end -Route23_EventScript_BadgeGuardTrigger:: @ 81A796E +Route23_EventScript_BadgeGuardTrigger:: textcolor 0 applymovement VAR_0x8009, Movement_WalkInPlaceFastestLeft waitmovement 0 @@ -129,47 +129,47 @@ Route23_EventScript_BadgeGuardTrigger:: @ 81A796E case 8, Route23_EventScript_CheckEarthBadgeTrigger end -Route23_EventScript_CheckBoulderBadgeTrigger:: @ 81A79D8 +Route23_EventScript_CheckBoulderBadgeTrigger:: goto_if_set FLAG_BADGE01_GET, Route23_EventScript_RecognizeBoulderBadgeTrigger goto Route23_EventScript_MissingBoulderBadgeTrigger end -Route23_EventScript_CheckCascadeBadgeTrigger:: @ 81A79E7 +Route23_EventScript_CheckCascadeBadgeTrigger:: goto_if_set FLAG_BADGE02_GET, Route23_EventScript_RecognizeBadgeTrigger goto Route23_EventScript_MissingBadgeTrigger end -Route23_EventScript_CheckThunderBadgeTrigger:: @ 81A79F6 +Route23_EventScript_CheckThunderBadgeTrigger:: goto_if_set FLAG_BADGE03_GET, Route23_EventScript_RecognizeBadgeTrigger goto Route23_EventScript_MissingBadgeTrigger end -Route23_EventScript_CheckRainbowBadgeTrigger:: @ 81A7A05 +Route23_EventScript_CheckRainbowBadgeTrigger:: goto_if_set FLAG_BADGE04_GET, Route23_EventScript_RecognizeBadgeTrigger goto Route23_EventScript_MissingBadgeTrigger end -Route23_EventScript_CheckSoulBadgeTrigger:: @ 81A7A14 +Route23_EventScript_CheckSoulBadgeTrigger:: goto_if_set FLAG_BADGE05_GET, Route23_EventScript_RecognizeBadgeTrigger goto Route23_EventScript_MissingBadgeTrigger end -Route23_EventScript_CheckMarshBadgeTrigger:: @ 81A7A23 +Route23_EventScript_CheckMarshBadgeTrigger:: goto_if_set FLAG_BADGE06_GET, Route23_EventScript_RecognizeBadgeTrigger goto Route23_EventScript_MissingBadgeTrigger end -Route23_EventScript_CheckVolcanoBadgeTrigger:: @ 81A7A32 +Route23_EventScript_CheckVolcanoBadgeTrigger:: goto_if_set FLAG_BADGE07_GET, Route23_EventScript_RecognizeBadgeTrigger goto Route23_EventScript_MissingBadgeTrigger end -Route23_EventScript_CheckEarthBadgeTrigger:: @ 81A7A41 +Route23_EventScript_CheckEarthBadgeTrigger:: goto_if_set FLAG_BADGE08_GET, Route23_EventScript_RecognizeBadgeTrigger goto Route23_EventScript_MissingBadgeTrigger end -Route23_EventScript_MissingBoulderBadgeTrigger:: @ 81A7A50 +Route23_EventScript_MissingBoulderBadgeTrigger:: msgbox Text_OnlySkilledTrainersAllowedThrough playse SE_BOO msgbox Text_CantLetYouPass @@ -180,7 +180,7 @@ Route23_EventScript_MissingBoulderBadgeTrigger:: @ 81A7A50 releaseall end -Route23_EventScript_MissingBadgeTrigger:: @ 81A7A77 +Route23_EventScript_MissingBadgeTrigger:: message Text_OnlyPassWithBadgeDontHaveYet waitmessage playse SE_BOO @@ -193,7 +193,7 @@ Route23_EventScript_MissingBadgeTrigger:: @ 81A7A77 releaseall end -Route23_EventScript_RecognizeBoulderBadgeTrigger:: @ 81A7A96 +Route23_EventScript_RecognizeBoulderBadgeTrigger:: message Text_OhThatsBadgeGoRightAhead waitmessage playfanfare MUS_LEVEL_UP @@ -203,12 +203,12 @@ Route23_EventScript_RecognizeBoulderBadgeTrigger:: @ 81A7A96 releaseall end -Route23_EventScript_RecognizeBadgeTrigger:: @ 81A7AA8 +Route23_EventScript_RecognizeBadgeTrigger:: msgbox Text_OnlyPassWithBadgeOhGoAhead copyvar VAR_MAP_SCENE_ROUTE23, VAR_TEMP_1 releaseall end -Route23_Movement_WalkDown:: @ 81A7AB7 +Route23_Movement_WalkDown:: walk_down step_end diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 65ddd4996..96d8be444 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -1,17 +1,17 @@ -SafariZone_EventScript_OutOfBallsMidBattle:: @ 81BFB87 +SafariZone_EventScript_OutOfBallsMidBattle:: setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 3 special ExitSafariMode setwarp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 255, 4, 1 end -SafariZone_EventScript_Exit:: @ 81BFB98 +SafariZone_EventScript_Exit:: setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 1 special ExitSafariMode warp MAP_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 255, 4, 1 waitstate end -SafariZone_EventScript_RetirePrompt:: @ 81BFBAA +SafariZone_EventScript_RetirePrompt:: lockall msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO compare VAR_RESULT, YES @@ -19,17 +19,17 @@ SafariZone_EventScript_RetirePrompt:: @ 81BFBAA releaseall end -SafariZone_EventScript_Retire:: @ 81BFBC0 +SafariZone_EventScript_Retire:: goto SafariZone_EventScript_Exit -SafariZone_EventScript_TimesUp:: @ 81BFBC5 +SafariZone_EventScript_TimesUp:: lockall playse SE_DING_DONG msgbox SafariZone_Text_TimesUp goto SafariZone_EventScript_Exit end -SafariZone_EventScript_OutOfBalls:: @ 81BFBD7 +SafariZone_EventScript_OutOfBalls:: lockall playse SE_DING_DONG msgbox SafariZone_Text_OutOfBalls diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index 2367e2dd1..fc82f71e3 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -1,5 +1,5 @@ @ Separate selection menus for before the Rainbow Pass is obtained -EventScript_ChooseDestFromOneIsland:: @ 81A8EC5 +EventScript_ChooseDestFromOneIsland:: compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if_ge EventScript_SeviiDestinationsPage1 compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 @@ -12,7 +12,7 @@ EventScript_ChooseDestFromOneIsland:: @ 81A8EC5 case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_ChooseDestFromOneIslandVermilionAllowed:: @ 81A8F12 +EventScript_ChooseDestFromOneIslandVermilionAllowed:: multichoice 19, 5, MULTICHOICE_SEAGALLOP_V23, FALSE switch VAR_RESULT case 0, EventScript_SailToVermilion2 @@ -22,7 +22,7 @@ EventScript_ChooseDestFromOneIslandVermilionAllowed:: @ 81A8F12 case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_ChooseDestFromTwoIsland:: @ 81A8F54 +EventScript_ChooseDestFromTwoIsland:: compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if_ge EventScript_SeviiDestinationsPage1 compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 @@ -35,7 +35,7 @@ EventScript_ChooseDestFromTwoIsland:: @ 81A8F54 case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_ChooseDestFromTwoIslandVermilionAllowed:: @ 81A8FA1 +EventScript_ChooseDestFromTwoIslandVermilionAllowed:: multichoice 19, 5, MULTICHOICE_SEAGALLOP_V13, FALSE switch VAR_RESULT case 0, EventScript_SailToVermilion2 @@ -45,27 +45,27 @@ EventScript_ChooseDestFromTwoIslandVermilionAllowed:: @ 81A8FA1 case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_SailToVermilion2:: @ 81A8FE3 +EventScript_SailToVermilion2:: setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY goto EventScript_SailToDest end -EventScript_SailToOneIsland2:: @ 81A8FEE +EventScript_SailToOneIsland2:: setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND goto EventScript_SailToDest end -EventScript_SailToTwoIsland2:: @ 81A8FF9 +EventScript_SailToTwoIsland2:: setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND goto EventScript_SailToDest end -EventScript_SailToThreeIsland2:: @ 81A9004 +EventScript_SailToThreeIsland2:: setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND goto EventScript_SailToDest end -EventScript_ChooseDestFromIsland:: @ 81A900F +EventScript_ChooseDestFromIsland:: compare VAR_MAP_SCENE_ONE_ISLAND_POKEMON_CENTER_1F, 5 goto_if_ge EventScript_SeviiDestinationsPage1 compare VAR_MAP_SCENE_CINNABAR_ISLAND, 4 @@ -78,7 +78,7 @@ EventScript_ChooseDestFromIsland:: @ 81A900F case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_ChooseDestFromIslandVermilionAllowed:: @ 81A905C +EventScript_ChooseDestFromIslandVermilionAllowed:: multichoice 19, 5, MULTICHOICE_SEAGALLOP_V12, FALSE switch VAR_RESULT case 0, EventScript_SailToVermilion2 @@ -88,7 +88,7 @@ EventScript_ChooseDestFromIslandVermilionAllowed:: @ 81A905C case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_SailToDest:: @ 81A909E +EventScript_SailToDest:: specialvar VAR_RESULT, GetSeagallopNumber getnumberstring 0, VAR_RESULT compare VAR_0x8004, SEAGALLOP_VERMILION_CITY @@ -97,17 +97,17 @@ EventScript_SailToDest:: @ 81A909E goto_if_ne EventScript_DepartingNotVermilion end -EventScript_DepartingVermilion:: @ 81A90BE +EventScript_DepartingVermilion:: msgbox VermilionCity_Text_Seagallop7Departing goto EventScript_SetSail end -EventScript_DepartingNotVermilion:: @ 81A90CC +EventScript_DepartingNotVermilion:: msgbox Text_AllAboardSeagallopNum goto EventScript_SetSail end -EventScript_SetSail:: @ 81A90DA +EventScript_SetSail:: closemessage delay 20 goto_if_questlog EventScript_ReleaseEnd @@ -117,14 +117,14 @@ EventScript_SetSail:: @ 81A90DA waitstate end -EventScript_CancelSail:: @ 81A90F6 +EventScript_CancelSail:: specialvar VAR_RESULT, IsPlayerLeftOfVermilionSailor compare VAR_RESULT, TRUE goto_if_eq VermilionCity_EventScript_WalkUpPier release end -VermilionCity_EventScript_WalkUpPier:: @ 81A9108 +VermilionCity_EventScript_WalkUpPier:: closemessage applymovement LOCALID_FERRY_SAILOR, Movement_FaceOriginalDirection applymovement OBJ_EVENT_ID_PLAYER, VermilionCity_Movement_WalkUp @@ -132,11 +132,11 @@ VermilionCity_EventScript_WalkUpPier:: @ 81A9108 releaseall end -VermilionCity_Movement_WalkUp:: @ 81A911C +VermilionCity_Movement_WalkUp:: walk_up step_end -EventScript_SeviiDestinationsPage1:: @ 81A911E +EventScript_SeviiDestinationsPage1:: setvar VAR_0x8005, 0 special DrawSeagallopDestinationMenu waitstate @@ -151,7 +151,7 @@ EventScript_SeviiDestinationsPage1:: @ 81A911E case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_SeviiDestinationsPage2:: @ 81A917F +EventScript_SeviiDestinationsPage2:: setvar VAR_0x8005, 1 special DrawSeagallopDestinationMenu waitstate @@ -165,42 +165,42 @@ EventScript_SeviiDestinationsPage2:: @ 81A917F case SCR_MENU_CANCEL, EventScript_CancelSail end -EventScript_SailToVermilionCity:: @ 81A91D5 +EventScript_SailToVermilionCity:: setvar VAR_0x8006, SEAGALLOP_VERMILION_CITY goto EventScript_SailToDest end -EventScript_SailToOneIsland:: @ 81A91E0 +EventScript_SailToOneIsland:: setvar VAR_0x8006, SEAGALLOP_ONE_ISLAND goto EventScript_SailToDest end -EventScript_SailToTwoIsland:: @ 81A91EB +EventScript_SailToTwoIsland:: setvar VAR_0x8006, SEAGALLOP_TWO_ISLAND goto EventScript_SailToDest end -EventScript_SailToThreeIsland:: @ 81A91F6 +EventScript_SailToThreeIsland:: setvar VAR_0x8006, SEAGALLOP_THREE_ISLAND goto EventScript_SailToDest end -EventScript_SailToFourIsland:: @ 81A9201 +EventScript_SailToFourIsland:: setvar VAR_0x8006, SEAGALLOP_FOUR_ISLAND goto EventScript_SailToDest end -EventScript_SailToFiveIsland:: @ 81A920C +EventScript_SailToFiveIsland:: setvar VAR_0x8006, SEAGALLOP_FIVE_ISLAND goto EventScript_SailToDest end -EventScript_SailToSixIsland:: @ 81A9217 +EventScript_SailToSixIsland:: setvar VAR_0x8006, SEAGALLOP_SIX_ISLAND goto EventScript_SailToDest end -EventScript_SailToSevenIsland:: @ 81A9222 +EventScript_SailToSevenIsland:: setvar VAR_0x8006, SEAGALLOP_SEVEN_ISLAND goto EventScript_SailToDest end diff --git a/data/scripts/set_gym_trainers.inc b/data/scripts/set_gym_trainers.inc index d90fb1e81..28ce66e0f 100644 --- a/data/scripts/set_gym_trainers.inc +++ b/data/scripts/set_gym_trainers.inc @@ -1,4 +1,4 @@ -EventScript_SetGymTrainers:: @ 81A6B18 +EventScript_SetGymTrainers:: switch VAR_0x8008 case 1, EventScript_SetPewterGymTrainers case 2, EventScript_SetCeruleanGymTrainers @@ -10,22 +10,22 @@ EventScript_SetGymTrainers:: @ 81A6B18 case 8, EventScript_SetViridianGymTrainers end -EventScript_SetPewterGymTrainers:: @ 81A6B76 +EventScript_SetPewterGymTrainers:: settrainerflag TRAINER_CAMPER_LIAM return -EventScript_SetCeruleanGymTrainers:: @ 81A6B7A +EventScript_SetCeruleanGymTrainers:: settrainerflag TRAINER_PICNICKER_DIANA settrainerflag TRAINER_SWIMMER_MALE_LUIS return -EventScript_SetVermilionGymTrainers:: @ 81A6B81 +EventScript_SetVermilionGymTrainers:: settrainerflag TRAINER_SAILOR_DWAYNE settrainerflag TRAINER_ENGINEER_BAILY settrainerflag TRAINER_GENTLEMAN_TUCKER return -EventScript_SetCeladonGymTrainers:: @ 81A6B8B +EventScript_SetCeladonGymTrainers:: settrainerflag TRAINER_LASS_KAY settrainerflag TRAINER_LASS_LISA settrainerflag TRAINER_PICNICKER_TINA @@ -35,7 +35,7 @@ EventScript_SetCeladonGymTrainers:: @ 81A6B8B settrainerflag TRAINER_COOLTRAINER_MARY return -EventScript_SetFuchsiaGymTrainers:: @ 81A6BA1 +EventScript_SetFuchsiaGymTrainers:: settrainerflag TRAINER_TAMER_PHIL settrainerflag TRAINER_TAMER_EDGAR settrainerflag TRAINER_JUGGLER_KIRK @@ -44,7 +44,7 @@ EventScript_SetFuchsiaGymTrainers:: @ 81A6BA1 settrainerflag TRAINER_JUGGLER_NATE return -EventScript_SetSaffronGymTrainers:: @ 81A6BB4 +EventScript_SetSaffronGymTrainers:: settrainerflag TRAINER_PSYCHIC_JOHAN settrainerflag TRAINER_PSYCHIC_TYRON settrainerflag TRAINER_PSYCHIC_CAMERON @@ -54,7 +54,7 @@ EventScript_SetSaffronGymTrainers:: @ 81A6BB4 settrainerflag TRAINER_CHANNELER_TASHA return -EventScript_SetCinnabarGymTrainers:: @ 81A6BCA +EventScript_SetCinnabarGymTrainers:: settrainerflag TRAINER_SUPER_NERD_ERIK settrainerflag TRAINER_SUPER_NERD_AVERY settrainerflag TRAINER_SUPER_NERD_DEREK @@ -64,7 +64,7 @@ EventScript_SetCinnabarGymTrainers:: @ 81A6BCA settrainerflag TRAINER_BURGLAR_DUSTY return -EventScript_SetViridianGymTrainers:: @ 81A6BE0 +EventScript_SetViridianGymTrainers:: settrainerflag TRAINER_TAMER_JASON settrainerflag TRAINER_TAMER_COLE settrainerflag TRAINER_BLACK_BELT_ATSUSHI diff --git a/data/scripts/silphco_doors.inc b/data/scripts/silphco_doors.inc index e648301ff..4486001e5 100644 --- a/data/scripts/silphco_doors.inc +++ b/data/scripts/silphco_doors.inc @@ -1,14 +1,14 @@ -EventScript_NeedCardKey:: @ 81A8135 +EventScript_NeedCardKey:: msgbox Text_ItNeedsCardKey releaseall end -EventScript_DoorUnlocked:: @ 81A813F +EventScript_DoorUnlocked:: msgbox Text_TheDoorIsOpen releaseall end -EventScript_Close2FDoor1:: @ 81A8149 +EventScript_Close2FDoor1:: setmetatile 5, 8, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 setmetatile 6, 8, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 setmetatile 5, 9, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 @@ -16,7 +16,7 @@ EventScript_Close2FDoor1:: @ 81A8149 setmetatile 6, 10, METATILE_SilphCo_Floor_ShadeFull, 0 return -EventScript_Close2FDoor2:: @ 81A8177 +EventScript_Close2FDoor2:: setmetatile 5, 15, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 setmetatile 6, 15, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 setmetatile 5, 16, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 @@ -24,7 +24,7 @@ EventScript_Close2FDoor2:: @ 81A8177 setmetatile 6, 17, METATILE_SilphCo_Floor_ShadeFull, 0 return -EventScript_Close3FDoor1:: @ 81A81A5 +EventScript_Close3FDoor1:: setmetatile 9, 11, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 setmetatile 10, 11, METATILE_SilphCo_VerticalBarrier_TopRight, 1 setmetatile 9, 12, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 @@ -33,7 +33,7 @@ EventScript_Close3FDoor1:: @ 81A81A5 setmetatile 10, 13, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return -EventScript_Close3FDoor2:: @ 81A81DC +EventScript_Close3FDoor2:: setmetatile 20, 11, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 setmetatile 21, 11, METATILE_SilphCo_VerticalBarrier_TopRight, 1 setmetatile 20, 12, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 @@ -42,7 +42,7 @@ EventScript_Close3FDoor2:: @ 81A81DC setmetatile 21, 13, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return -EventScript_Close4FDoor1:: @ 81A8213 +EventScript_Close4FDoor1:: setmetatile 3, 16, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 setmetatile 4, 16, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 setmetatile 3, 17, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 @@ -50,7 +50,7 @@ EventScript_Close4FDoor1:: @ 81A8213 setmetatile 4, 18, METATILE_SilphCo_Floor_ShadeFull, 0 return -EventScript_Close4FDoor2:: @ 81A8241 +EventScript_Close4FDoor2:: setmetatile 14, 11, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 setmetatile 15, 11, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 setmetatile 14, 12, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 @@ -67,7 +67,7 @@ EventScript_Close5FDoor1:: @ 81AMETATILE_SilphCo_Floor_WallRightCornerF setmetatile 8, 10, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return -EventScript_Close5FDoor2:: @ 81A82A6 +EventScript_Close5FDoor2:: setmetatile 7, 17, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 setmetatile 8, 17, METATILE_SilphCo_VerticalBarrier_TopRight, 1 setmetatile 7, 18, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 @@ -76,7 +76,7 @@ EventScript_Close5FDoor2:: @ 81A82A6 setmetatile 8, 19, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return -EventScript_Close5FDoor3:: @ 81A82DD +EventScript_Close5FDoor3:: setmetatile 18, 12, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 setmetatile 19, 12, METATILE_SilphCo_VerticalBarrier_TopRight, 1 setmetatile 18, 13, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 @@ -85,7 +85,7 @@ EventScript_Close5FDoor3:: @ 81A82DD setmetatile 19, 14, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return -EventScript_Close6FDoor:: @ 81A8314 +EventScript_Close6FDoor:: setmetatile 5, 14, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 setmetatile 6, 14, METATILE_SilphCo_VerticalBarrier_TopRight, 1 setmetatile 5, 15, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 @@ -94,7 +94,7 @@ EventScript_Close6FDoor:: @ 81A8314 setmetatile 6, 16, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return -EventScript_Close7FDoor1:: @ 81A834B +EventScript_Close7FDoor1:: setmetatile 11, 8, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 setmetatile 12, 8, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 setmetatile 11, 9, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 @@ -102,7 +102,7 @@ EventScript_Close7FDoor1:: @ 81A834B setmetatile 12, 10, METATILE_SilphCo_Floor_ShadeFull, 0 return -EventScript_Close7FDoor2:: @ 81A8379 +EventScript_Close7FDoor2:: setmetatile 24, 7, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 setmetatile 25, 7, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 setmetatile 24, 8, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 @@ -110,7 +110,7 @@ EventScript_Close7FDoor2:: @ 81A8379 setmetatile 25, 9, METATILE_SilphCo_Floor_ShadeFull, 0 return -EventScript_Close7FDoor3:: @ 81A83A7 +EventScript_Close7FDoor3:: setmetatile 25, 13, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 setmetatile 26, 13, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 setmetatile 25, 14, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 @@ -118,7 +118,7 @@ EventScript_Close7FDoor3:: @ 81A83A7 setmetatile 26, 15, METATILE_SilphCo_Floor_ShadeFull, 0 return -EventScript_Close8FDoor:: @ 81A83D5 +EventScript_Close8FDoor:: setmetatile 5, 9, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 setmetatile 6, 9, METATILE_SilphCo_VerticalBarrier_TopRight, 1 setmetatile 5, 10, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 @@ -127,7 +127,7 @@ EventScript_Close8FDoor:: @ 81A83D5 setmetatile 6, 11, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return -EventScript_Close9FDoor1:: @ 81A840C +EventScript_Close9FDoor1:: setmetatile 2, 9, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 setmetatile 3, 9, METATILE_SilphCo_VerticalBarrier_TopRight, 1 setmetatile 2, 10, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 @@ -136,7 +136,7 @@ EventScript_Close9FDoor1:: @ 81A840C setmetatile 3, 11, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return -EventScript_Close9FDoor2:: @ 81A8443 +EventScript_Close9FDoor2:: setmetatile 12, 15, METATILE_SilphCo_VerticalBarrier_TopLeft, 1 setmetatile 13, 15, METATILE_SilphCo_VerticalBarrier_TopRight, 1 setmetatile 12, 16, METATILE_SilphCo_VerticalBarrier_MidLeft, 1 @@ -145,7 +145,7 @@ EventScript_Close9FDoor2:: @ 81A8443 setmetatile 13, 17, METATILE_SilphCo_VerticalBarrier_BottomRight, 1 return -EventScript_Close9FDoor3:: @ 81A847A +EventScript_Close9FDoor3:: setmetatile 21, 6, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 setmetatile 22, 6, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 setmetatile 21, 7, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 @@ -153,7 +153,7 @@ EventScript_Close9FDoor3:: @ 81A847A setmetatile 22, 8, METATILE_SilphCo_Floor_ShadeFull, 0 return -EventScript_Close9FDoor4:: @ 81A84A8 +EventScript_Close9FDoor4:: setmetatile 21, 12, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 setmetatile 22, 12, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 setmetatile 21, 13, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 @@ -161,7 +161,7 @@ EventScript_Close9FDoor4:: @ 81A84A8 setmetatile 22, 14, METATILE_SilphCo_Floor_ShadeFull, 0 return -EventScript_Close10FDoor:: @ 81A84D6 +EventScript_Close10FDoor:: setmetatile 12, 11, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 setmetatile 13, 11, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 setmetatile 12, 12, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 @@ -169,7 +169,7 @@ EventScript_Close10FDoor:: @ 81A84D6 setmetatile 13, 13, METATILE_SilphCo_Floor_ShadeFull, 0 return -EventScript_Close11FDoor:: @ 81A8504 +EventScript_Close11FDoor:: setmetatile 5, 16, METATILE_SilphCo_HorizontalBarrier_TopLeft, 1 setmetatile 6, 16, METATILE_SilphCo_HorizontalBarrier_TopRight, 1 setmetatile 5, 17, METATILE_SilphCo_HorizontalBarrier_BottomLeft, 1 @@ -177,7 +177,7 @@ EventScript_Close11FDoor:: @ 81A8504 setmetatile 6, 18, METATILE_SilphCo_Floor_ShadeFull, 0 return -EventScript_Open2FDoor1:: @ 81A8532 +EventScript_Open2FDoor1:: setmetatile 5, 8, METATILE_SilphCo_Floor_ShadeFull, 0 setmetatile 6, 8, METATILE_SilphCo_Floor, 0 setmetatile 5, 9, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -185,7 +185,7 @@ EventScript_Open2FDoor1:: @ 81A8532 setmetatile 6, 10, METATILE_SilphCo_Floor, 0 return -EventScript_Open2FDoor2:: @ 81A8560 +EventScript_Open2FDoor2:: setmetatile 5, 15, METATILE_SilphCo_Floor_ShadeFull, 0 setmetatile 6, 15, METATILE_SilphCo_Floor, 0 setmetatile 5, 16, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -193,7 +193,7 @@ EventScript_Open2FDoor2:: @ 81A8560 setmetatile 6, 17, METATILE_SilphCo_Floor, 0 return -EventScript_Open3FDoor1:: @ 81A858E +EventScript_Open3FDoor1:: setmetatile 9, 11, METATILE_SilphCo_Wall_LeftEdge, 1 setmetatile 10, 11, METATILE_SilphCo_Wall_RightEdge, 1 setmetatile 9, 12, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -202,7 +202,7 @@ EventScript_Open3FDoor1:: @ 81A858E setmetatile 10, 13, METATILE_SilphCo_Floor_WallRightCorner, 0 return -EventScript_Open3FDoor2:: @ 81A85C5 +EventScript_Open3FDoor2:: setmetatile 20, 11, METATILE_SilphCo_Wall_LeftEdge, 1 setmetatile 21, 11, METATILE_SilphCo_Wall_RightEdge, 1 setmetatile 20, 12, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -211,7 +211,7 @@ EventScript_Open3FDoor2:: @ 81A85C5 setmetatile 21, 13, METATILE_SilphCo_Floor_WallRightCorner, 0 return -EventScript_Open4FDoor1:: @ 81A85FC +EventScript_Open4FDoor1:: setmetatile 3, 16, METATILE_SilphCo_Floor_ShadeFull, 0 setmetatile 4, 16, METATILE_SilphCo_Floor, 0 setmetatile 3, 17, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -219,7 +219,7 @@ EventScript_Open4FDoor1:: @ 81A85FC setmetatile 4, 18, METATILE_SilphCo_Floor, 0 return -EventScript_Open4FDoor2:: @ 81A862A +EventScript_Open4FDoor2:: setmetatile 14, 11, METATILE_SilphCo_Floor_ShadeFull, 0 setmetatile 15, 11, METATILE_SilphCo_Floor, 0 setmetatile 14, 12, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -227,7 +227,7 @@ EventScript_Open4FDoor2:: @ 81A862A setmetatile 15, 13, METATILE_SilphCo_Floor, 0 return -EventScript_Open5FDoor1:: @ 81A8658 +EventScript_Open5FDoor1:: setmetatile 7, 8, METATILE_SilphCo_Wall_LeftEdge, 1 setmetatile 8, 8, METATILE_SilphCo_Wall_RightEdge, 1 setmetatile 7, 9, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -236,7 +236,7 @@ EventScript_Open5FDoor1:: @ 81A8658 setmetatile 8, 10, METATILE_SilphCo_Floor_WallRightCorner, 0 return -EventScript_Open5FDoor2:: @ 81A868F +EventScript_Open5FDoor2:: setmetatile 7, 17, METATILE_SilphCo_Wall_LeftEdge, 1 setmetatile 8, 17, METATILE_SilphCo_Wall_RightEdge, 1 setmetatile 7, 18, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -245,7 +245,7 @@ EventScript_Open5FDoor2:: @ 81A868F setmetatile 8, 19, METATILE_SilphCo_Floor_WallRightCorner, 0 return -EventScript_Open5FDoor3:: @ 81A86C6 +EventScript_Open5FDoor3:: setmetatile 18, 12, METATILE_SilphCo_Wall_LeftEdge, 1 setmetatile 19, 12, METATILE_SilphCo_Wall_RightEdge, 1 setmetatile 18, 13, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -254,7 +254,7 @@ EventScript_Open5FDoor3:: @ 81A86C6 setmetatile 19, 14, METATILE_SilphCo_Floor_WallRightCorner, 0 return -EventScript_Open6FDoor:: @ 81A86FD +EventScript_Open6FDoor:: setmetatile 5, 14, METATILE_SilphCo_Wall_LeftEdge, 1 setmetatile 6, 14, METATILE_SilphCo_Wall_RightEdge, 1 setmetatile 5, 15, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -263,7 +263,7 @@ EventScript_Open6FDoor:: @ 81A86FD setmetatile 6, 16, METATILE_SilphCo_Floor_WallRightCorner, 0 return -EventScript_Open7FDoor1:: @ 81A8734 +EventScript_Open7FDoor1:: setmetatile 11, 8, METATILE_SilphCo_Floor_ShadeFull, 0 setmetatile 12, 8, METATILE_SilphCo_Floor, 0 setmetatile 11, 9, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -271,7 +271,7 @@ EventScript_Open7FDoor1:: @ 81A8734 setmetatile 12, 10, METATILE_SilphCo_Floor, 0 return -EventScript_Open7FDoor2:: @ 81A8762 +EventScript_Open7FDoor2:: setmetatile 24, 7, METATILE_SilphCo_Floor_ShadeFull, 0 setmetatile 25, 7, METATILE_SilphCo_Floor, 0 setmetatile 24, 8, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -279,7 +279,7 @@ EventScript_Open7FDoor2:: @ 81A8762 setmetatile 25, 9, METATILE_SilphCo_Floor, 0 return -EventScript_Open7FDoor3:: @ 81A8790 +EventScript_Open7FDoor3:: setmetatile 25, 13, METATILE_SilphCo_Floor_ShadeFull, 0 setmetatile 26, 13, METATILE_SilphCo_Floor, 0 setmetatile 25, 14, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -287,7 +287,7 @@ EventScript_Open7FDoor3:: @ 81A8790 setmetatile 26, 15, METATILE_SilphCo_Floor, 0 return -EventScript_Open8FDoor:: @ 81A87BE +EventScript_Open8FDoor:: setmetatile 5, 9, METATILE_SilphCo_Wall_LeftEdge, 1 setmetatile 6, 9, METATILE_SilphCo_Wall_RightEdge, 1 setmetatile 5, 10, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -296,7 +296,7 @@ EventScript_Open8FDoor:: @ 81A87BE setmetatile 6, 11, METATILE_SilphCo_Floor_WallRightCorner, 0 return -EventScript_Open9FDoor1:: @ 81A87F5 +EventScript_Open9FDoor1:: setmetatile 2, 9, METATILE_SilphCo_Wall_LeftEdge, 1 setmetatile 3, 9, METATILE_SilphCo_Wall_RightEdge, 1 setmetatile 2, 10, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -305,7 +305,7 @@ EventScript_Open9FDoor1:: @ 81A87F5 setmetatile 3, 11, METATILE_SilphCo_Floor_WallRightCorner, 0 return -EventScript_Open9FDoor2:: @ 81A882C +EventScript_Open9FDoor2:: setmetatile 12, 15, METATILE_SilphCo_Wall_LeftEdge, 1 setmetatile 13, 15, METATILE_SilphCo_Wall_RightEdge, 1 setmetatile 12, 16, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -314,7 +314,7 @@ EventScript_Open9FDoor2:: @ 81A882C setmetatile 13, 17, METATILE_SilphCo_Floor_WallRightCorner, 0 return -EventScript_Open9FDoor3:: @ 81A8863 +EventScript_Open9FDoor3:: setmetatile 21, 6, METATILE_SilphCo_Floor_ShadeFull, 0 setmetatile 22, 6, METATILE_SilphCo_Floor, 0 setmetatile 21, 7, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -322,7 +322,7 @@ EventScript_Open9FDoor3:: @ 81A8863 setmetatile 22, 8, METATILE_SilphCo_Floor, 0 return -EventScript_Open9FDoor4:: @ 81A8891 +EventScript_Open9FDoor4:: setmetatile 21, 12, METATILE_SilphCo_Floor_ShadeFull, 0 setmetatile 22, 12, METATILE_SilphCo_Floor, 0 setmetatile 21, 13, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -330,7 +330,7 @@ EventScript_Open9FDoor4:: @ 81A8891 setmetatile 22, 14, METATILE_SilphCo_Floor, 0 return -EventScript_Open10FDoor:: @ 81A88BF +EventScript_Open10FDoor:: setmetatile 12, 11, METATILE_SilphCo_Floor_ShadeFull, 0 setmetatile 13, 11, METATILE_SilphCo_Floor, 0 setmetatile 12, 12, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -338,7 +338,7 @@ EventScript_Open10FDoor:: @ 81A88BF setmetatile 13, 13, METATILE_SilphCo_Floor, 0 return -EventScript_Open11FDoor:: @ 81A88ED +EventScript_Open11FDoor:: setmetatile 5, 16, METATILE_SilphCo_Floor_ShadeFull, 0 setmetatile 6, 16, METATILE_SilphCo_Floor, 0 setmetatile 5, 17, METATILE_SilphCo_Floor_ShadeFull, 0 @@ -346,7 +346,7 @@ EventScript_Open11FDoor:: @ 81A88ED setmetatile 6, 18, METATILE_SilphCo_Floor, 0 return -SilphCo_2F_EventScript_Door1:: @ 81A891B +SilphCo_2F_EventScript_Door1:: lockall setvar VAR_TEMP_1, 1 setvar VAR_0x8004, FLAG_SILPH_2F_DOOR_1 @@ -354,7 +354,7 @@ SilphCo_2F_EventScript_Door1:: @ 81A891B goto EventScript_TryUnlockDoor end -SilphCo_2F_EventScript_Door2:: @ 81A8935 +SilphCo_2F_EventScript_Door2:: lockall setvar VAR_TEMP_1, 2 setvar VAR_0x8004, FLAG_SILPH_2F_DOOR_2 @@ -362,7 +362,7 @@ SilphCo_2F_EventScript_Door2:: @ 81A8935 goto EventScript_TryUnlockDoor end -SilphCo_3F_EventScript_Door1:: @ 81A894F +SilphCo_3F_EventScript_Door1:: lockall setvar VAR_TEMP_1, 3 setvar VAR_0x8004, FLAG_SILPH_3F_DOOR_1 @@ -370,7 +370,7 @@ SilphCo_3F_EventScript_Door1:: @ 81A894F goto EventScript_TryUnlockDoor end -SilphCo_3F_EventScript_Door2:: @ 81A8969 +SilphCo_3F_EventScript_Door2:: lockall setvar VAR_TEMP_1, 4 setvar VAR_0x8004, FLAG_SILPH_3F_DOOR_2 @@ -378,7 +378,7 @@ SilphCo_3F_EventScript_Door2:: @ 81A8969 goto EventScript_TryUnlockDoor end -SilphCo_4F_EventScript_Door1:: @ 81A8983 +SilphCo_4F_EventScript_Door1:: lockall setvar VAR_TEMP_1, 5 setvar VAR_0x8004, FLAG_SILPH_4F_DOOR_1 @@ -386,7 +386,7 @@ SilphCo_4F_EventScript_Door1:: @ 81A8983 goto EventScript_TryUnlockDoor end -SilphCo_4F_EventScript_Door2:: @ 81A899D +SilphCo_4F_EventScript_Door2:: lockall setvar VAR_TEMP_1, 6 setvar VAR_0x8004, FLAG_SILPH_4F_DOOR_2 @@ -394,7 +394,7 @@ SilphCo_4F_EventScript_Door2:: @ 81A899D goto EventScript_TryUnlockDoor end -SilphCo_5F_EventScript_Door1:: @ 81A89B7 +SilphCo_5F_EventScript_Door1:: lockall setvar VAR_TEMP_1, 7 setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_1 @@ -402,7 +402,7 @@ SilphCo_5F_EventScript_Door1:: @ 81A89B7 goto EventScript_TryUnlockDoor end -SilphCo_5F_EventScript_Door2:: @ 81A89D1 +SilphCo_5F_EventScript_Door2:: lockall setvar VAR_TEMP_1, 8 setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_2 @@ -410,7 +410,7 @@ SilphCo_5F_EventScript_Door2:: @ 81A89D1 goto EventScript_TryUnlockDoor end -SilphCo_5F_EventScript_Door3:: @ 81A89EB +SilphCo_5F_EventScript_Door3:: lockall setvar VAR_TEMP_1, 9 setvar VAR_0x8004, FLAG_SILPH_5F_DOOR_3 @@ -418,7 +418,7 @@ SilphCo_5F_EventScript_Door3:: @ 81A89EB goto EventScript_TryUnlockDoor end -SilphCo_6F_EventScript_Door:: @ 81A8A05 +SilphCo_6F_EventScript_Door:: lockall setvar VAR_TEMP_1, 10 setvar VAR_0x8004, FLAG_SILPH_6F_DOOR @@ -426,7 +426,7 @@ SilphCo_6F_EventScript_Door:: @ 81A8A05 goto EventScript_TryUnlockDoor end -SilphCo_7F_EventScript_Door1:: @ 81A8A1F +SilphCo_7F_EventScript_Door1:: lockall setvar VAR_TEMP_1, 11 setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_1 @@ -434,7 +434,7 @@ SilphCo_7F_EventScript_Door1:: @ 81A8A1F goto EventScript_TryUnlockDoor end -SilphCo_7F_EventScript_Door2:: @ 81A8A39 +SilphCo_7F_EventScript_Door2:: lockall setvar VAR_TEMP_1, 12 setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_2 @@ -442,7 +442,7 @@ SilphCo_7F_EventScript_Door2:: @ 81A8A39 goto EventScript_TryUnlockDoor end -SilphCo_7F_EventScript_Door3:: @ 81A8A53 +SilphCo_7F_EventScript_Door3:: lockall setvar VAR_TEMP_1, 13 setvar VAR_0x8004, FLAG_SILPH_7F_DOOR_3 @@ -450,7 +450,7 @@ SilphCo_7F_EventScript_Door3:: @ 81A8A53 goto EventScript_TryUnlockDoor end -SilphCo_8F_EventScript_Door:: @ 81A8A6D +SilphCo_8F_EventScript_Door:: lockall setvar VAR_TEMP_1, 14 setvar VAR_0x8004, FLAG_SILPH_8F_DOOR @@ -458,7 +458,7 @@ SilphCo_8F_EventScript_Door:: @ 81A8A6D goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_Door1:: @ 81A8A87 +SilphCo_9F_EventScript_Door1:: lockall setvar VAR_TEMP_1, 15 setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_1 @@ -466,7 +466,7 @@ SilphCo_9F_EventScript_Door1:: @ 81A8A87 goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_Door2:: @ 81A8AA1 +SilphCo_9F_EventScript_Door2:: lockall setvar VAR_TEMP_1, 16 setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_2 @@ -474,7 +474,7 @@ SilphCo_9F_EventScript_Door2:: @ 81A8AA1 goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_Door3:: @ 81A8ABB +SilphCo_9F_EventScript_Door3:: lockall setvar VAR_TEMP_1, 17 setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_3 @@ -482,7 +482,7 @@ SilphCo_9F_EventScript_Door3:: @ 81A8ABB goto EventScript_TryUnlockDoor end -SilphCo_9F_EventScript_Door4:: @ 81A8AD5 +SilphCo_9F_EventScript_Door4:: lockall setvar VAR_TEMP_1, 18 setvar VAR_0x8004, FLAG_SILPH_9F_DOOR_4 @@ -490,7 +490,7 @@ SilphCo_9F_EventScript_Door4:: @ 81A8AD5 goto EventScript_TryUnlockDoor end -SilphCo_10F_EventScript_Door:: @ 81A8AEF +SilphCo_10F_EventScript_Door:: lockall setvar VAR_TEMP_1, 19 setvar VAR_0x8004, FLAG_SILPH_10F_DOOR @@ -498,7 +498,7 @@ SilphCo_10F_EventScript_Door:: @ 81A8AEF goto EventScript_TryUnlockDoor end -SilphCo_11F_EventScript_Door:: @ 81A8B09 +SilphCo_11F_EventScript_Door:: lockall setvar VAR_TEMP_1, 20 setvar VAR_0x8004, FLAG_SILPH_11F_DOOR @@ -506,12 +506,12 @@ SilphCo_11F_EventScript_Door:: @ 81A8B09 goto EventScript_TryUnlockDoor end -EventScript_TryUnlockDoor:: @ 81A8B23 +EventScript_TryUnlockDoor:: goto_if_set FLAG_HIDE_SILPH_CO_5F_CARD_KEY, EventScript_OpenDoor goto EventScript_NeedCardKey end -EventScript_OpenDoor:: @ 81A8B32 +EventScript_OpenDoor:: playfanfare MUS_LEVEL_UP msgbox Text_CardKeyOpenedDoor waitfanfare diff --git a/data/scripts/static_pokemon.inc b/data/scripts/static_pokemon.inc index 906097666..38b5d0c07 100644 --- a/data/scripts/static_pokemon.inc +++ b/data/scripts/static_pokemon.inc @@ -1,11 +1,11 @@ -EventScript_RemoveStaticMon:: @ 81A922D +EventScript_RemoveStaticMon:: fadescreen FADE_TO_BLACK removeobject VAR_LAST_TALKED fadescreen FADE_FROM_BLACK release end -EventScript_MonFlewAway:: @ 81A9236 +EventScript_MonFlewAway:: fadescreen FADE_TO_BLACK removeobject VAR_LAST_TALKED fadescreen FADE_FROM_BLACK @@ -14,7 +14,7 @@ EventScript_MonFlewAway:: @ 81A9236 release end -EventScript_AwakenSnorlax:: @ 81A924B +EventScript_AwakenSnorlax:: message Text_PlayedPokeFlute waitmessage playfanfare MUS_POKE_FLUTE diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc index 9e542e6e7..e7feabfa6 100644 --- a/data/scripts/std_msgbox.inc +++ b/data/scripts/std_msgbox.inc @@ -1,4 +1,4 @@ -Std_MsgboxNPC:: @ 81A4E3F +Std_MsgboxNPC:: lock faceplayer message 0x0 @@ -7,7 +7,7 @@ Std_MsgboxNPC:: @ 81A4E3F release return -Std_MsgboxSign:: @ 81A4E4A +Std_MsgboxSign:: lockall message 0x0 waitmessage @@ -15,19 +15,19 @@ Std_MsgboxSign:: @ 81A4E4A releaseall return -Std_MsgboxDefault:: @ 81A4E54 +Std_MsgboxDefault:: message 0x0 waitmessage waitbuttonpress return -Std_MsgboxYesNo:: @ 81A4E5C +Std_MsgboxYesNo:: message 0x0 waitmessage yesnobox 20, 8 return -Std_ReceivedItem:: @ 81A4E66 +Std_ReceivedItem:: textcolor 3 compare VAR_0x8002, MUS_LEVEL_UP call_if_eq EventScript_ReceivedItemFanfare1 @@ -42,22 +42,22 @@ Std_ReceivedItem:: @ 81A4E66 call EventScript_RestorePrevTextColor return -EventScript_ReceivedItemFanfare1:: @ 81A4EA2 +EventScript_ReceivedItemFanfare1:: playfanfare MUS_LEVEL_UP return -EventScript_ReceivedItemFanfare2:: @ 81A4EA6 +EventScript_ReceivedItemFanfare2:: playfanfare MUS_OBTAIN_KEY_ITEM return -EventScript_ReceivedItemWaitFanfare:: @ 81A4EAA +EventScript_ReceivedItemWaitFanfare:: delay 50 return -EventScript_UnusedReturn:: @ 81A4EAE +EventScript_UnusedReturn:: return -EventScript_AskSaveGame:: @ 81A4EAF +EventScript_AskSaveGame:: special Field_AskSaveTheGame waitstate return diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc index e1d44968b..13d46e028 100644 --- a/data/scripts/surf.inc +++ b/data/scripts/surf.inc @@ -1,4 +1,4 @@ -EventScript_UseSurf:: @ 81A6AC8 +EventScript_UseSurf:: goto_if_questlog EventScript_UseSurfEnd checkpartymove MOVE_SURF compare VAR_RESULT, PARTY_SIZE @@ -11,12 +11,12 @@ EventScript_UseSurf:: @ 81A6AC8 goto_if_eq EventScript_UseSurfRelease msgbox Text_UsedSurf dofieldeffect FLDEFF_USE_SURF -EventScript_UseSurfRelease:@ 81A6B0B +EventScript_UseSurfRelease: releaseall -EventScript_UseSurfEnd: @ 81A6B0C +EventScript_UseSurfEnd: end -EventScript_CurrentTooFast:: @ 81A6B0D +EventScript_CurrentTooFast:: lockall msgbox Text_CurrentTooFast releaseall diff --git a/data/scripts/test.inc b/data/scripts/test.inc index f909dae57..9d1c714b5 100644 --- a/data/scripts/test.inc +++ b/data/scripts/test.inc @@ -1,27 +1,27 @@ -Test_EventScript_NPC:: @ 81C5552 +Test_EventScript_NPC:: msgbox Test_Text_WelcomeToWorldOfPokemon, MSGBOX_NPC end -EventScript_TestSignpostMsg:: @ 81C555B +EventScript_TestSignpostMsg:: msgbox Test_Text_ThisIsASignpost, MSGBOX_SIGN end -Test_EventScript_CoordEvent:: @ 81C5564 +Test_EventScript_CoordEvent:: msgbox Test_Text_ThisIsACoordEvent, MSGBOX_SIGN end -Test_Text_WelcomeToWorldOfPokemon:: @ 81C556D +Test_Text_WelcomeToWorldOfPokemon:: .string "テストよう　メッセージです！\n" .string "ポケモンの　せかいへ　ようこそ！$" -Test_Text_ThisIsASignpost:: @ 81C558D +Test_Text_ThisIsASignpost:: .string "テストよう　メッセージです！\n" .string "かんばん　です$" -Test_Text_ThisIsACoordEvent:: @ 81C55A4 +Test_Text_ThisIsACoordEvent:: .string "テストよう　メッセージです！\n" .string "ざひょう　チェックの　イベントです$" .align 2 -Test_Text_Empty:: @ 81C55C8 +Test_Text_Empty:: .string "$" diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc index 6a5dc3345..657b56b96 100644 --- a/data/scripts/trainer_battle.inc +++ b/data/scripts/trainer_battle.inc @@ -1,11 +1,11 @@ -EventScript_DoTrainerBattleFromApproach:: @ 81A4EB4 +EventScript_DoTrainerBattleFromApproach:: lock special PlayTrainerEncounterMusic special EndTrainerApproach waitstate goto EventScript_DoTrainerBattle -EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 +EventScript_TryDoNormalTrainerBattle:: lock faceplayer applymovement VAR_LAST_TALKED, Movement_RevealTrainer @@ -17,10 +17,10 @@ EventScript_TryDoNormalTrainerBattle:: @ 81A4EC1 special SetUpTrainerMovement goto EventScript_DoTrainerBattle -EventScript_NoTrainerBattle:: @ 81A4EE8 +EventScript_NoTrainerBattle:: ontrainerbattleend -EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 +EventScript_TryDoDoubleTrainerBattle:: lock faceplayer call EventScript_RevealTrainer @@ -34,17 +34,17 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9 special SetUpTrainerMovement goto EventScript_DoTrainerBattle -EventScript_NotEnoughMonsForDoubleBattle:: @ 81A4F19 +EventScript_NotEnoughMonsForDoubleBattle:: special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release end -EventScript_NoDoubleTrainerBattle:: @ 81A4F20 +EventScript_NoDoubleTrainerBattle:: ontrainerbattleend -EventScript_DoNoIntroTrainerBattle:: @ 81A4F21 +EventScript_DoNoIntroTrainerBattle:: applymovement VAR_LAST_TALKED, Movement_RevealTrainer waitmovement 0 special PlayTrainerEncounterMusic @@ -52,7 +52,7 @@ EventScript_DoNoIntroTrainerBattle:: @ 81A4F21 battlebegin ontrainerbattleend -EventScript_TryDoRematchBattle:: @ 81A4F3E +EventScript_TryDoRematchBattle:: call EventScript_RevealTrainer specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, FALSE @@ -68,10 +68,10 @@ EventScript_TryDoRematchBattle:: @ 81A4F3E releaseall end -EventScript_NoRematchBattle:: @ 81A4F72 +EventScript_NoRematchBattle:: ontrainerbattleend -EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 +EventScript_TryDoDoubleRematchBattle:: specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, FALSE goto_if_eq EventScript_NoDoubleRematchBattle @@ -89,30 +89,30 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73 releaseall end -EventScript_NoDoubleRematchBattle:: @ 81A4FB0 +EventScript_NoDoubleRematchBattle:: ontrainerbattleend -EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 81A4FB1 +EventScript_NotEnoughMonsForDoubleRematchBattle:: special ShowTrainerCantBattleSpeech waitmessage waitbuttonpress release end -EventScript_EndQuestLogRematch:: @ 81A4FB8 +EventScript_EndQuestLogRematch:: releaseall end -EventScript_RevealTrainer:: @ 81A4FBA +EventScript_RevealTrainer:: applymovement VAR_LAST_TALKED, Movement_RevealTrainer waitmovement 0 return -Movement_RevealTrainer:: @ 81A4FC5 +Movement_RevealTrainer:: reveal_trainer step_end -EventScript_DoTrainerBattle:: @ 81A4FC7 +EventScript_DoTrainerBattle:: special ShowTrainerIntroSpeech waitmessage waitbuttonpress @@ -129,19 +129,19 @@ EventScript_DoTrainerBattle:: @ 81A4FC7 goto_if_eq EventScript_EndTrainerBattleContinueScript compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC goto_if_eq EventScript_EndTrainerBattleContinueScript -EventScript_EndTrainerBattle:: @ 81A5017 +EventScript_EndTrainerBattle:: releaseall end -EventScript_EndTrainerBattleContinueScript:: @ 81A5019 +EventScript_EndTrainerBattleContinueScript:: ontrainerbattleendgoto -EventScript_EndQuestLogBattle:: @ 81A501A +EventScript_EndQuestLogBattle:: special SetBattledTrainerFlag releaseall end -Std_MsgboxAutoclose:: @ 81A501F +Std_MsgboxAutoclose:: message 0x0 waitmessage waitbuttonpress diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 6b702f1a6..e5439a454 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -1,6 +1,6 @@ .set LOCALID_STICKER_MAN, 1 -CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867 +CeladonCity_GameCorner_EventScript_PhotoPrinter:: lockall showmoneybox 0, 0, 0 msgbox CeladonCity_GameCorner_Text_TryPokemonPrinter, MSGBOX_YESNO @@ -23,27 +23,27 @@ CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867 case 3, CeladonCity_GameCorner_EventScript_PrintTypeSepia end -CeladonCity_GameCorner_EventScript_PrintTypeNormal:: @ 81B28DB +CeladonCity_GameCorner_EventScript_PrintTypeNormal:: setvar VAR_0x8004, MON_ICON_TINT_NORMAL goto CeladonCity_GameCorner_EventScript_PrintPhoto end -CeladonCity_GameCorner_EventScript_PrintTypeBlack:: @ 81B28E6 +CeladonCity_GameCorner_EventScript_PrintTypeBlack:: setvar VAR_0x8004, MON_ICON_TINT_BLACK goto CeladonCity_GameCorner_EventScript_PrintPhoto end -CeladonCity_GameCorner_EventScript_PrintTypePink:: @ 81B28F1 +CeladonCity_GameCorner_EventScript_PrintTypePink:: setvar VAR_0x8004, MON_ICON_TINT_PINK goto CeladonCity_GameCorner_EventScript_PrintPhoto end -CeladonCity_GameCorner_EventScript_PrintTypeSepia:: @ 81B28FC +CeladonCity_GameCorner_EventScript_PrintTypeSepia:: setvar VAR_0x8004, MON_ICON_TINT_SEPIA goto CeladonCity_GameCorner_EventScript_PrintPhoto end -CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907 +CeladonCity_GameCorner_EventScript_PrintPhoto:: message CeladonCity_GameCorner_Text_BigSmileForPhoto waitmessage playse MUS_PHOTO @@ -55,25 +55,25 @@ CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907 releaseall end -CeladonCity_GameCorner_EventScript_DeclinePhoto:: @ 81B2926 +CeladonCity_GameCorner_EventScript_DeclinePhoto:: hidemoneybox 0, 0 releaseall end -CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto:: @ 81B292B +CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto:: msgbox CeladonCity_GameCorner_Text_DontHaveEnoughMoney hidemoneybox 0, 0 releaseall end -FourIsland_House2_EventScript_StickerMan:: @ 81B2938 +FourIsland_House2_EventScript_StickerMan:: lock specialvar VAR_0x8008, StickerManGetBragFlags goto_if_unset FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_MeetStickerMan goto_if_set FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_StickerManAskForBrag end -FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951 +FourIsland_House2_EventScript_MeetStickerMan:: setflag FLAG_MET_STICKER_MAN msgbox FourIsland_House2_Text_WishICouldShowOffStickers applymovement LOCALID_STICKER_MAN, Movement_FacePlayer @@ -90,7 +90,7 @@ FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951 goto FourIsland_House2_EventScript_ChooseBrag end -FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994 +FourIsland_House2_EventScript_StickerManAskForBrag:: applymovement LOCALID_STICKER_MAN, Movement_FacePlayer waitmovement 0 goto_if_questlog EventScript_ReleaseEnd @@ -102,12 +102,12 @@ FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994 goto FourIsland_House2_EventScript_ChooseBrag end -FourIsland_House2_EventScript_NothingToBragAbout:: @ 81B29C6 +FourIsland_House2_EventScript_NothingToBragAbout:: msgbox FourIsland_House2_Text_BragAboutSomethingForMe release end -FourIsland_House2_EventScript_ChooseBrag:: @ 81B29D0 +FourIsland_House2_EventScript_ChooseBrag:: switch VAR_0x8008 case 1, FourIsland_House2_EventScript_ChooseBragHoF case 2, FourIsland_House2_EventScript_ChooseBragEggs @@ -118,7 +118,7 @@ FourIsland_House2_EventScript_ChooseBrag:: @ 81B29D0 case 7, FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins end -FourIsland_House2_EventScript_ChooseBragHoF:: @ 81B2A23 +FourIsland_House2_EventScript_ChooseBragHoF:: multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE switch VAR_RESULT case 0, FourIsland_House2_EventScript_BragHoF @@ -126,7 +126,7 @@ FourIsland_House2_EventScript_ChooseBragHoF:: @ 81B2A23 case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -FourIsland_House2_EventScript_ChooseBragEggs:: @ 81B2A4F +FourIsland_House2_EventScript_ChooseBragEggs:: multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE switch VAR_RESULT case 0, FourIsland_House2_EventScript_BragEggs @@ -134,7 +134,7 @@ FourIsland_House2_EventScript_ChooseBragEggs:: @ 81B2A4F case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -FourIsland_House2_EventScript_ChooseBragLinkWins:: @ 81B2A7B +FourIsland_House2_EventScript_ChooseBragLinkWins:: multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, FourIsland_House2_EventScript_BragLinkWins @@ -142,7 +142,7 @@ FourIsland_House2_EventScript_ChooseBragLinkWins:: @ 81B2A7B case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -FourIsland_House2_EventScript_ChooseBragHoFEggs:: @ 81B2AA7 +FourIsland_House2_EventScript_ChooseBragHoFEggs:: multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE switch VAR_RESULT case 0, FourIsland_House2_EventScript_BragHoF @@ -151,7 +151,7 @@ FourIsland_House2_EventScript_ChooseBragHoFEggs:: @ 81B2AA7 case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -FourIsland_House2_EventScript_ChooseBragHoFLinkWins:: @ 81B2ADE +FourIsland_House2_EventScript_ChooseBragHoFLinkWins:: multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, FourIsland_House2_EventScript_BragHoF @@ -160,7 +160,7 @@ FourIsland_House2_EventScript_ChooseBragHoFLinkWins:: @ 81B2ADE case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -FourIsland_House2_EventScript_ChooseBragEggsLinkWins:: @ 81B2B15 +FourIsland_House2_EventScript_ChooseBragEggsLinkWins:: multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, FourIsland_House2_EventScript_BragEggs @@ -169,7 +169,7 @@ FourIsland_House2_EventScript_ChooseBragEggsLinkWins:: @ 81B2B15 case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins:: @ 81B2B4C +FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins:: multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE switch VAR_RESULT case 0, FourIsland_House2_EventScript_BragHoF @@ -179,12 +179,12 @@ FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins:: @ 81B2B4C case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag end -FourIsland_House2_EventScript_StickerManNothingToBrag:: @ 81B2B8E +FourIsland_House2_EventScript_StickerManNothingToBrag:: msgbox FourIsland_House2_Text_GiveYouStickerIfYouBrag release end -FourIsland_House2_EventScript_BragHoF:: @ 81B2B98 +FourIsland_House2_EventScript_BragHoF:: compare VAR_0x8004, 39 goto_if_le FourIsland_House2_EventScript_BragHoFLowest compare VAR_0x8004, 99 @@ -195,7 +195,7 @@ FourIsland_House2_EventScript_BragHoF:: @ 81B2B98 goto_if_ge FourIsland_House2_EventScript_BragHoFHighest end -FourIsland_House2_EventScript_BragHoFLowest:: @ 81B2BC5 +FourIsland_House2_EventScript_BragHoFLowest:: compare VAR_HOF_BRAG_STATE, 1 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF setvar VAR_HOF_BRAG_STATE, 1 @@ -203,7 +203,7 @@ FourIsland_House2_EventScript_BragHoFLowest:: @ 81B2BC5 goto FourIsland_House2_EventScript_BraggedHoF end -FourIsland_House2_EventScript_BragHoFLow:: @ 81B2BE3 +FourIsland_House2_EventScript_BragHoFLow:: compare VAR_HOF_BRAG_STATE, 2 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF setvar VAR_HOF_BRAG_STATE, 2 @@ -211,7 +211,7 @@ FourIsland_House2_EventScript_BragHoFLow:: @ 81B2BE3 goto FourIsland_House2_EventScript_BraggedHoF end -FourIsland_House2_EventScript_BragHoFHigh:: @ 81B2C01 +FourIsland_House2_EventScript_BragHoFHigh:: compare VAR_HOF_BRAG_STATE, 3 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF setvar VAR_HOF_BRAG_STATE, 3 @@ -219,7 +219,7 @@ FourIsland_House2_EventScript_BragHoFHigh:: @ 81B2C01 goto FourIsland_House2_EventScript_BraggedHoF end -FourIsland_House2_EventScript_BragHoFHighest:: @ 81B2C1F +FourIsland_House2_EventScript_BragHoFHighest:: compare VAR_HOF_BRAG_STATE, 4 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoFMax setvar VAR_HOF_BRAG_STATE, 4 @@ -227,17 +227,17 @@ FourIsland_House2_EventScript_BragHoFHighest:: @ 81B2C1F goto FourIsland_House2_EventScript_BraggedHoF end -FourIsland_House2_EventScript_AlreadyBraggedHoF:: @ 81B2C3D +FourIsland_House2_EventScript_AlreadyBraggedHoF:: msgbox FourIsland_House2_Text_ComeBackWithBetterStoryHoF release end -FourIsland_House2_EventScript_AlreadyBraggedHoFMax:: @ 81B2C47 +FourIsland_House2_EventScript_AlreadyBraggedHoFMax:: msgbox FourIsland_House2_Text_LivingLegendHoF release end -FourIsland_House2_EventScript_BraggedHoF:: @ 81B2C51 +FourIsland_House2_EventScript_BraggedHoF:: textcolor 3 playfanfare MUS_LEVEL_UP message FourIsland_House2_Text_HoFStickerApplied @@ -247,7 +247,7 @@ FourIsland_House2_EventScript_BraggedHoF:: @ 81B2C51 release end -FourIsland_House2_EventScript_BragEggs:: @ 81B2C62 +FourIsland_House2_EventScript_BragEggs:: compare VAR_0x8005, 99 goto_if_le FourIsland_House2_EventScript_BragEggsLowest compare VAR_0x8005, 199 @@ -258,7 +258,7 @@ FourIsland_House2_EventScript_BragEggs:: @ 81B2C62 goto_if_ge FourIsland_House2_EventScript_BragEggsHighest end -FourIsland_House2_EventScript_BragEggsLowest:: @ 81B2C8F +FourIsland_House2_EventScript_BragEggsLowest:: compare VAR_EGG_BRAG_STATE, 1 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs setvar VAR_EGG_BRAG_STATE, 1 @@ -266,7 +266,7 @@ FourIsland_House2_EventScript_BragEggsLowest:: @ 81B2C8F goto FourIsland_House2_EventScript_BraggedEggs end -FourIsland_House2_EventScript_BragEggsLow:: @ 81B2CAD +FourIsland_House2_EventScript_BragEggsLow:: compare VAR_EGG_BRAG_STATE, 2 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs setvar VAR_EGG_BRAG_STATE, 2 @@ -274,7 +274,7 @@ FourIsland_House2_EventScript_BragEggsLow:: @ 81B2CAD goto FourIsland_House2_EventScript_BraggedEggs end -FourIsland_House2_EventScript_BragEggsHigh:: @ 81B2CCB +FourIsland_House2_EventScript_BragEggsHigh:: compare VAR_EGG_BRAG_STATE, 3 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs setvar VAR_EGG_BRAG_STATE, 3 @@ -282,7 +282,7 @@ FourIsland_House2_EventScript_BragEggsHigh:: @ 81B2CCB goto FourIsland_House2_EventScript_BraggedEggs end -FourIsland_House2_EventScript_BragEggsHighest:: @ 81B2CE9 +FourIsland_House2_EventScript_BragEggsHighest:: compare VAR_EGG_BRAG_STATE, 4 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggsMax setvar VAR_EGG_BRAG_STATE, 4 @@ -290,17 +290,17 @@ FourIsland_House2_EventScript_BragEggsHighest:: @ 81B2CE9 goto FourIsland_House2_EventScript_BraggedEggs end -FourIsland_House2_EventScript_AlreadyBraggedEggs:: @ 81B2D07 +FourIsland_House2_EventScript_AlreadyBraggedEggs:: msgbox FourIsland_House2_Text_ComeBackWithBetterStoryEggs release end -FourIsland_House2_EventScript_AlreadyBraggedEggsMax:: @ 81B2D11 +FourIsland_House2_EventScript_AlreadyBraggedEggsMax:: msgbox FourIsland_House2_Text_LivingLegendEggs release end -FourIsland_House2_EventScript_BraggedEggs:: @ 81B2D1B +FourIsland_House2_EventScript_BraggedEggs:: textcolor 3 playfanfare MUS_LEVEL_UP message FourIsland_House2_Text_EggStickerApplied @@ -310,7 +310,7 @@ FourIsland_House2_EventScript_BraggedEggs:: @ 81B2D1B release end -FourIsland_House2_EventScript_BragLinkWins:: @ 81B2D2C +FourIsland_House2_EventScript_BragLinkWins:: compare VAR_0x8006, 19 goto_if_le FourIsland_House2_EventScript_BragLinkWinsLowest compare VAR_0x8006, 49 @@ -321,7 +321,7 @@ FourIsland_House2_EventScript_BragLinkWins:: @ 81B2D2C goto_if_ge FourIsland_House2_EventScript_BragLinkWinsHighest end -FourIsland_House2_EventScript_BragLinkWinsLowest:: @ 81B2D59 +FourIsland_House2_EventScript_BragLinkWinsLowest:: compare VAR_LINK_WIN_BRAG_STATE, 1 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins setvar VAR_LINK_WIN_BRAG_STATE, 1 @@ -329,7 +329,7 @@ FourIsland_House2_EventScript_BragLinkWinsLowest:: @ 81B2D59 goto FourIsland_House2_EventScript_BraggedLinkWins end -FourIsland_House2_EventScript_BragLinkWinsLow:: @ 81B2D77 +FourIsland_House2_EventScript_BragLinkWinsLow:: compare VAR_LINK_WIN_BRAG_STATE, 2 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins setvar VAR_LINK_WIN_BRAG_STATE, 2 @@ -337,7 +337,7 @@ FourIsland_House2_EventScript_BragLinkWinsLow:: @ 81B2D77 goto FourIsland_House2_EventScript_BraggedLinkWins end -FourIsland_House2_EventScript_BragLinkWinsHigh:: @ 81B2D95 +FourIsland_House2_EventScript_BragLinkWinsHigh:: compare VAR_LINK_WIN_BRAG_STATE, 3 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins setvar VAR_LINK_WIN_BRAG_STATE, 3 @@ -345,7 +345,7 @@ FourIsland_House2_EventScript_BragLinkWinsHigh:: @ 81B2D95 goto FourIsland_House2_EventScript_BraggedLinkWins end -FourIsland_House2_EventScript_BragLinkWinsHighest:: @ 81B2DB3 +FourIsland_House2_EventScript_BragLinkWinsHighest:: compare VAR_LINK_WIN_BRAG_STATE, 4 goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax setvar VAR_LINK_WIN_BRAG_STATE, 4 @@ -353,17 +353,17 @@ FourIsland_House2_EventScript_BragLinkWinsHighest:: @ 81B2DB3 goto FourIsland_House2_EventScript_BraggedLinkWins end -FourIsland_House2_EventScript_AlreadyBraggedLinkWins:: @ 81B2DD1 +FourIsland_House2_EventScript_AlreadyBraggedLinkWins:: msgbox FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins release end -FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax:: @ 81B2DDB +FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax:: msgbox FourIsland_House2_Text_LivingLegendLinkWins release end -FourIsland_House2_EventScript_BraggedLinkWins:: @ 81B2DE5 +FourIsland_House2_EventScript_BraggedLinkWins:: textcolor 3 playfanfare MUS_LEVEL_UP message FourIsland_House2_Text_VictoryStickerApplied @@ -373,6 +373,6 @@ FourIsland_House2_EventScript_BraggedLinkWins:: @ 81B2DE5 release end -FourIsland_House2_EventScript_QuitBrag:: @ 81B2DF6 +FourIsland_House2_EventScript_QuitBrag:: release end diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc index 94f1c7263..70a15b3ec 100644 --- a/data/scripts/trainer_tower.inc +++ b/data/scripts/trainer_tower.inc @@ -16,12 +16,12 @@ @@ Map scripts -TrainerTower_OnResume:: @ 81C4F54 +TrainerTower_OnResume:: setvar VAR_TEMP_2, 0 ttower_resumetimer end -TrainerTower_OnTransition:: @ 81C4F62 +TrainerTower_OnTransition:: ttower_initfloor switch VAR_RESULT case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SetObjectsSingles @@ -35,7 +35,7 @@ TrainerTower_OnTransition:: @ 81C4F62 setvar DISABLE_DOUBLES_TRIGGER, TRUE end -TrainerTower_EventScript_SetObjectsSingles:: @ 81C4FA7 +TrainerTower_EventScript_SetObjectsSingles:: setflag HIDE_TRAINER_DOUBLES1 setflag HIDE_TRAINER_KNOCKOUT setflag HIDE_TRAINER_DOUBLES2 @@ -44,7 +44,7 @@ TrainerTower_EventScript_SetObjectsSingles:: @ 81C4FA7 setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT goto TrainerTower_EventScript_HideOwner -TrainerTower_EventScript_SetObjectsDoubles:: @ 81C4FC5 +TrainerTower_EventScript_SetObjectsDoubles:: setflag HIDE_TRAINER_SINGLES setflag HIDE_TRAINER_KNOCKOUT setvar DISABLE_SINGLES_TRIGGER, TRUE @@ -57,7 +57,7 @@ TrainerTower_EventScript_SetObjectsDoubles:: @ 81C4FC5 setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT goto TrainerTower_EventScript_HideOwner -TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten:: @ 81C4FFE +TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten:: setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 12 setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN setobjectxyperm LOCALID_TRAINER_DOUBLES2, 11, 12 @@ -65,7 +65,7 @@ TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten:: @ 81C4FFE goto TrainerTower_EventScript_HideOwner @ Knockout challenge re-uses trainer objects -TrainerTower_EventScript_SetObjectsKnockout:: @ 81C5019 +TrainerTower_EventScript_SetObjectsKnockout:: setflag HIDE_TRAINER_DOUBLES2 setvar DISABLE_DOUBLES_TRIGGER, TRUE setobjectxyperm LOCALID_TRAINER_DOUBLES1, 10, 10 @@ -78,11 +78,11 @@ TrainerTower_EventScript_HideOwner: setflag HIDE_OWNER end -TrainerTower_OnFrame:: @ 81C5046 +TrainerTower_OnFrame:: map_script_2 VAR_TEMP_2, 0, TrainerTower_EventScript_EnterFloor .2byte 0 -TrainerTower_EventScript_EnterFloor:: @ 81C5050 +TrainerTower_EventScript_EnterFloor:: setvar VAR_TEMP_2, 1 ttower_isfloorcleared compare VAR_RESULT, FALSE @@ -96,7 +96,7 @@ TrainerTower_EventScript_EndEnterFloor: end @ Never reached -TrainerTower_EventScript_WarpToLobby:: @ 81C5086 +TrainerTower_EventScript_WarpToLobby:: warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7 waitstate @@ -124,7 +124,7 @@ TrainerTower_EventScript_DoSingleBattle: closemessage goto TrainerTower_EventScript_DoBattle -TrainerTower_EventScript_DoDoubleBattle:: @ 81C510D +TrainerTower_EventScript_DoDoubleBattle:: ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_3 msgbox gStringVar4 setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_SPEECH @@ -140,7 +140,7 @@ TrainerTower_EventScript_DoSecondTrainerIntro: closemessage goto TrainerTower_EventScript_DoBattle -TrainerTower_EventScript_DoKnockoutBattle:: @ 81C515C +TrainerTower_EventScript_DoKnockoutBattle:: switch VAR_TEMP_1 case 0, TrainerTower_EventScript_DoKnockoutBattle1 case 1, TrainerTower_EventScript_DoKnockoutBattle2 @@ -156,7 +156,7 @@ TrainerTower_EventScript_DoKnockoutBattle1: waitmovement 0 goto TrainerTower_EventScript_DoKnockoutBattleIntro -TrainerTower_EventScript_DoKnockoutBattle2:: @ 81C51AD +TrainerTower_EventScript_DoKnockoutBattle2:: ttower_encountermusic applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark waitmovement 0 @@ -166,7 +166,7 @@ TrainerTower_EventScript_DoKnockoutBattle2:: @ 81C51AD waitmovement 0 goto TrainerTower_EventScript_DoKnockoutBattleIntro -TrainerTower_EventScript_DoKnockoutBattle3:: @ 81C51D8 +TrainerTower_EventScript_DoKnockoutBattle3:: ttower_encountermusic applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark waitmovement 0 @@ -202,23 +202,23 @@ TrainerTower_EventScript_DoSecondKnockoutBattle: addvar VAR_TEMP_1, 1 goto TrainerTower_EventScript_DoKnockoutBattle -TrainerTower_EventScript_DoThirdKnockoutBattle:: @ 81C52B0 +TrainerTower_EventScript_DoThirdKnockoutBattle:: addvar VAR_TEMP_1, 1 goto TrainerTower_EventScript_DoKnockoutBattle -TrainerTower_EventScript_MoveDoublesTrainers:: @ 81C52BA +TrainerTower_EventScript_MoveDoublesTrainers:: applymovement LOCALID_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay waitmovement 0 applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown goto TrainerTower_EventScript_SetFloorCleared -TrainerTower_EventScript_MoveLastKnockoutTrainer:: @ 81C52D0 +TrainerTower_EventScript_MoveLastKnockoutTrainer:: applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay TrainerTower_EventScript_SetFloorCleared: ttower_clearedfloor end -TrainerTower_EventScript_WarpToLobbyLost:: @ 81C52E0 +TrainerTower_EventScript_WarpToLobbyLost:: special HealPlayerParty ttower_setlost warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7 @@ -227,7 +227,7 @@ TrainerTower_EventScript_WarpToLobbyLost:: @ 81C52E0 @@ Speaking to trainers after battle -TrainerTower_EventScript_SpeakToDoublesTrainer1:: @ 81C52F4 +TrainerTower_EventScript_SpeakToDoublesTrainer1:: ttower_getchallengetype switch VAR_RESULT case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_DoublesTrainer1PostBattle @@ -237,11 +237,11 @@ TrainerTower_EventScript_DoublesTrainer1PostBattle: setvar VAR_0x8006, 0 goto TrainerTower_EventScript_DoPostBattleText -TrainerTower_EventScript_KnockoutTrainer2PostBattle:: @ 81C5331 +TrainerTower_EventScript_KnockoutTrainer2PostBattle:: setvar VAR_0x8006, 1 goto TrainerTower_EventScript_DoPostBattleText -TrainerTower_EventScript_SpeakToSinglesTrainer:: @ 81C533B +TrainerTower_EventScript_SpeakToSinglesTrainer:: ttower_getchallengetype switch VAR_RESULT case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SinglesTrainerPostBattle @@ -251,15 +251,15 @@ TrainerTower_EventScript_SinglesTrainerPostBattle: setvar VAR_0x8006, 0 goto TrainerTower_EventScript_DoPostBattleText -TrainerTower_EventScript_KnockoutTrainer3PostBattle:: @ 81C5378 +TrainerTower_EventScript_KnockoutTrainer3PostBattle:: setvar VAR_0x8006, 2 goto TrainerTower_EventScript_DoPostBattleText -TrainerTower_EventScript_SpeakToKnockoutTrainer:: @ 81C5382 +TrainerTower_EventScript_SpeakToKnockoutTrainer:: setvar VAR_0x8006, 0 goto TrainerTower_EventScript_DoPostBattleText -TrainerTower_EventScript_SpeakToDoublesTrainer2:: @ 81C538C +TrainerTower_EventScript_SpeakToDoublesTrainer2:: setvar VAR_0x8006, 1 TrainerTower_EventScript_DoPostBattleText: ttower_getspeech TRAINER_TOWER_TEXT_AFTER @@ -272,7 +272,7 @@ TrainerTower_EventScript_DoPostBattleText: @@ Speaking to owner -TrainerTower_EventScript_SpeakToOwner:: @ 81C53AA +TrainerTower_EventScript_SpeakToOwner:: lock faceplayer ttower_getownerstate @@ -302,12 +302,12 @@ TrainerTower_Roof_EventScript_ReceivePrize: call EventScript_RestorePrevTextColor goto TrainerTower_Roof_EventScript_CheckFinalTime -TrainerTower_Roof_EventScript_NoRoomForPrize:: @ 81C543A +TrainerTower_Roof_EventScript_NoRoomForPrize:: msgbox TrainerTower_Roof_Text_ThisIsForYou msgbox Text_BagIsFull goto TrainerTower_Roof_EventScript_CheckFinalTime -TrainerTower_Roof_EventScript_CheckFinalTime:: @ 81C544F +TrainerTower_Roof_EventScript_CheckFinalTime:: ttower_checkfinaltime switch VAR_RESULT case 0, TrainerTower_Roof_EventScript_NewRecord @@ -318,14 +318,14 @@ TrainerTower_Roof_EventScript_NewRecord: msgbox TrainerTower_Roof_Text_DoneItInRecordTime goto TrainerTower_Roof_EventScript_OwnerEnd -TrainerTower_Roof_EventScript_NoNewRecord:: @ 81C548A +TrainerTower_Roof_EventScript_NoNewRecord:: msgbox TrainerTower_Roof_Text_TookSweetTimeGettingHere TrainerTower_Roof_EventScript_OwnerEnd: msgbox TrainerTower_Roof_Text_IdLikeToSeeBetterTime release return -TrainerTower_EventScript_ShowTime:: @ 81C549C +TrainerTower_EventScript_ShowTime:: lockall ttower_gettime msgbox TrainerTower_Text_XMinYZSec @@ -335,10 +335,10 @@ TrainerTower_EventScript_ShowTime:: @ 81C549C @@ Battle triggers -TrainerTower_EventScript_SingleBattleTrigger:: @ 81C54AF +TrainerTower_EventScript_SingleBattleTrigger:: goto TrainerTower_EventScript_TriggerBattle -TrainerTower_EventScript_DoubleBattleTriggerTop:: @ 81C54B4 +TrainerTower_EventScript_DoubleBattleTriggerTop:: setvar VAR_TEMP_3, 0 ttower_checkdoubles compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS @@ -349,7 +349,7 @@ TrainerTower_EventScript_DoubleBattleTriggerTop:: @ 81C54B4 applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48 goto TrainerTower_EventScript_TriggerDoubleBattle -TrainerTower_EventScript_DoubleBattleTriggerBottom:: @ 81C54EA +TrainerTower_EventScript_DoubleBattleTriggerBottom:: setvar VAR_TEMP_3, 1 ttower_checkdoubles compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS @@ -363,7 +363,7 @@ TrainerTower_EventScript_TriggerDoubleBattle: setvar DISABLE_DOUBLES_TRIGGER, TRUE goto TrainerTower_EventScript_TriggerBattle -TrainerTower_EventScript_IneligibleForDoubleBattle:: @ 81C5528 +TrainerTower_EventScript_IneligibleForDoubleBattle:: lockall playse SE_DING_DONG msgbox TrainerTower_Lobby_Text_NeedTwoMonsForDouble @@ -375,30 +375,30 @@ TrainerTower_EventScript_IneligibleForDoubleBattle:: @ 81C5528 TrainerTower_Movement_SingleTrainerApproach: walk_left -TrainerTower_Movement_RightKnockoutTrainerApproach:: @ 81C5542 +TrainerTower_Movement_RightKnockoutTrainerApproach:: walk_left walk_left TrainerTower_Movement_PushPlayerBack: walk_left step_end -TrainerTower_Movement_BottomKnockoutTrainerApproach:: @ 81C5546 +TrainerTower_Movement_BottomKnockoutTrainerApproach:: walk_up walk_up step_end -TrainerTower_Movement_TopKnockoutTrainerApproach:: @ 81C5549 +TrainerTower_Movement_TopKnockoutTrainerApproach:: walk_down walk_down step_end -TrainerTower_Movement_DoublesTrainer2OutOfWay:: @ 81C554C +TrainerTower_Movement_DoublesTrainer2OutOfWay:: walk_right TrainerTower_Movement_LastKnockoutTrainerOutOfWay: walk_up face_down step_end -TrainerTower_Movement_DoublesTrainer1FaceDown:: @ 81C5550 +TrainerTower_Movement_DoublesTrainer1FaceDown:: face_down step_end diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc index 7e5f6102e..c6c66c751 100644 --- a/data/scripts/trainers.inc +++ b/data/scripts/trainers.inc @@ -1,4 +1,4 @@ -Route3_EventScript_Ben:: @ 81A93C9 +Route3_EventScript_Ben:: trainerbattle_single TRAINER_YOUNGSTER_BEN, Route3_Text_BenIntro, Route3_Text_BenDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -6,12 +6,12 @@ Route3_EventScript_Ben:: @ 81A93C9 msgbox Route3_Text_BenPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_BenRematch:: @ 81A93F0 +Route3_EventScript_BenRematch:: trainerbattle_rematch TRAINER_YOUNGSTER_BEN, Route3_Text_BenRematchIntro, Route3_Text_BenDefeat msgbox Route3_Text_BenPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_Calvin:: @ 81A9407 +Route3_EventScript_Calvin:: trainerbattle_single TRAINER_YOUNGSTER_CALVIN, Route3_Text_CalvinIntro, Route3_Text_CalvinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -19,12 +19,12 @@ Route3_EventScript_Calvin:: @ 81A9407 msgbox Route3_Text_CalvinPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_CalvinRematch:: @ 81A942E +Route3_EventScript_CalvinRematch:: trainerbattle_rematch TRAINER_YOUNGSTER_CALVIN, Route3_Text_CalvinRematchIntro, Route3_Text_CalvinDefeat msgbox Route3_Text_CalvinPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_Colton:: @ 81A9445 +Route3_EventScript_Colton:: trainerbattle_single TRAINER_BUG_CATCHER_COLTON, Route3_Text_ColtonIntro, Route3_Text_ColtonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -32,12 +32,12 @@ Route3_EventScript_Colton:: @ 81A9445 msgbox Route3_Text_ColtonPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_ColtonRematch:: @ 81A946C +Route3_EventScript_ColtonRematch:: trainerbattle_rematch TRAINER_BUG_CATCHER_COLTON, Route3_Text_ColtonRematchIntro, Route3_Text_ColtonDefeat msgbox Route3_Text_ColtonPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_Greg:: @ 81A9483 +Route3_EventScript_Greg:: trainerbattle_single TRAINER_BUG_CATCHER_GREG, Route3_Text_GregIntro, Route3_Text_GregDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -45,12 +45,12 @@ Route3_EventScript_Greg:: @ 81A9483 msgbox Route3_Text_GregPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_GregRematch:: @ 81A94AA +Route3_EventScript_GregRematch:: trainerbattle_rematch TRAINER_BUG_CATCHER_GREG, Route3_Text_GregRematchIntro, Route3_Text_GregDefeat msgbox Route3_Text_GregPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_James:: @ 81A94C1 +Route3_EventScript_James:: trainerbattle_single TRAINER_BUG_CATCHER_JAMES, Route3_Text_JamesIntro, Route3_Text_JamesDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -58,12 +58,12 @@ Route3_EventScript_James:: @ 81A94C1 msgbox Route3_Text_JamesPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_JamesRematch:: @ 81A94E8 +Route3_EventScript_JamesRematch:: trainerbattle_rematch TRAINER_BUG_CATCHER_JAMES, Route3_Text_JamesRematchIntro, Route3_Text_JamesDefeat msgbox Route3_Text_JamesPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_Janice:: @ 81A94FF +Route3_EventScript_Janice:: trainerbattle_single TRAINER_LASS_JANICE, Route3_Text_JaniceIntro, Route3_Text_JaniceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -71,12 +71,12 @@ Route3_EventScript_Janice:: @ 81A94FF msgbox Route3_Text_JanicePostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_JaniceRematch:: @ 81A9526 +Route3_EventScript_JaniceRematch:: trainerbattle_rematch TRAINER_LASS_JANICE, Route3_Text_JaniceRematchIntro, Route3_Text_JaniceDefeat msgbox Route3_Text_JanicePostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_Sally:: @ 81A953D +Route3_EventScript_Sally:: trainerbattle_single TRAINER_LASS_SALLY, Route3_Text_SallyIntro, Route3_Text_SallyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -84,12 +84,12 @@ Route3_EventScript_Sally:: @ 81A953D msgbox Route3_Text_SallyPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_SallyRematch:: @ 81A9564 +Route3_EventScript_SallyRematch:: trainerbattle_rematch TRAINER_LASS_SALLY, Route3_Text_SallyRematchIntro, Route3_Text_SallyDefeat msgbox Route3_Text_SallyPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_Robin:: @ 81A957B +Route3_EventScript_Robin:: trainerbattle_single TRAINER_LASS_ROBIN, Route3_Text_RobinIntro, Route3_Text_RobinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -97,12 +97,12 @@ Route3_EventScript_Robin:: @ 81A957B msgbox Route3_Text_RobinPostBattle, MSGBOX_AUTOCLOSE end -Route3_EventScript_RobinRematch:: @ 81A95A2 +Route3_EventScript_RobinRematch:: trainerbattle_rematch TRAINER_LASS_ROBIN, Route3_Text_RobinRematchIntro, Route3_Text_RobinDefeat msgbox Route3_Text_RobinPostBattle, MSGBOX_AUTOCLOSE end -Route4_EventScript_Crissy:: @ 81A95B9 +Route4_EventScript_Crissy:: trainerbattle_single TRAINER_LASS_CRISSY, Route4_Text_CrissyIntro, Route4_Text_CrissyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -110,12 +110,12 @@ Route4_EventScript_Crissy:: @ 81A95B9 msgbox Route4_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE end -Route4_EventScript_CrissyRematch:: @ 81A95E0 +Route4_EventScript_CrissyRematch:: trainerbattle_rematch TRAINER_LASS_CRISSY, Route4_Text_CrissyRematchIntro, Route4_Text_CrissyDefeat msgbox Route4_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_Timmy:: @ 81A95F7 +Route24_EventScript_Timmy:: trainerbattle_single TRAINER_YOUNGSTER_TIMMY, Route24_Text_TimmyIntro, Route24_Text_TimmyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -123,12 +123,12 @@ Route24_EventScript_Timmy:: @ 81A95F7 msgbox Route24_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_TimmyRematch:: @ 81A961E +Route24_EventScript_TimmyRematch:: trainerbattle_rematch TRAINER_YOUNGSTER_TIMMY, Route24_Text_TimmyRematchIntro, Route24_Text_TimmyDefeat msgbox Route24_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_Cale:: @ 81A9635 +Route24_EventScript_Cale:: trainerbattle_single TRAINER_BUG_CATCHER_CALE, Route24_Text_CaleIntro, Route24_Text_CaleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -136,12 +136,12 @@ Route24_EventScript_Cale:: @ 81A9635 msgbox Route24_Text_CalePostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_CaleRematch:: @ 81A965C +Route24_EventScript_CaleRematch:: trainerbattle_rematch TRAINER_BUG_CATCHER_CALE, Route24_Text_CaleRematchIntro, Route24_Text_CaleDefeat msgbox Route24_Text_CalePostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_Reli:: @ 81A9673 +Route24_EventScript_Reli:: trainerbattle_single TRAINER_LASS_RELI, Route24_Text_ReliIntro, Route24_Text_ReliDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -149,12 +149,12 @@ Route24_EventScript_Reli:: @ 81A9673 msgbox Route24_Text_ReliPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_ReliRematch:: @ 81A969A +Route24_EventScript_ReliRematch:: trainerbattle_rematch TRAINER_LASS_RELI, Route24_Text_ReliRematchIntro, Route24_Text_ReliDefeat msgbox Route24_Text_ReliPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_Ali:: @ 81A96B1 +Route24_EventScript_Ali:: trainerbattle_single TRAINER_LASS_ALI, Route24_Text_AliIntro, Route24_Text_AliDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -162,12 +162,12 @@ Route24_EventScript_Ali:: @ 81A96B1 msgbox Route24_Text_AliPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_AliRematch:: @ 81A96D8 +Route24_EventScript_AliRematch:: trainerbattle_rematch TRAINER_LASS_ALI, Route24_Text_AliRematchIntro, Route24_Text_AliDefeat msgbox Route24_Text_AliPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_Shane:: @ 81A96EF +Route24_EventScript_Shane:: trainerbattle_single TRAINER_CAMPER_SHANE, Route24_Text_ShaneIntro, Route24_Text_ShaneDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -175,12 +175,12 @@ Route24_EventScript_Shane:: @ 81A96EF msgbox Route24_Text_ShanePostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_ShaneRematch:: @ 81A9716 +Route24_EventScript_ShaneRematch:: trainerbattle_rematch TRAINER_CAMPER_SHANE, Route24_Text_ShaneRematchIntro, Route24_Text_ShaneDefeat msgbox Route24_Text_ShanePostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_Ethan:: @ 81A972D +Route24_EventScript_Ethan:: trainerbattle_single TRAINER_CAMPER_ETHAN, Route24_Text_EthanIntro, Route24_Text_EthanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -188,12 +188,12 @@ Route24_EventScript_Ethan:: @ 81A972D msgbox Route24_Text_EthanPostBattle, MSGBOX_AUTOCLOSE end -Route24_EventScript_EthanRematch:: @ 81A9754 +Route24_EventScript_EthanRematch:: trainerbattle_rematch TRAINER_CAMPER_ETHAN, Route24_Text_EthanRematchIntro, Route24_Text_EthanDefeat msgbox Route24_Text_EthanPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_Joey:: @ 81A976B +Route25_EventScript_Joey:: trainerbattle_single TRAINER_YOUNGSTER_JOEY, Route25_Text_JoeyIntro, Route25_Text_JoeyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -201,12 +201,12 @@ Route25_EventScript_Joey:: @ 81A976B msgbox Route25_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_JoeyRematch:: @ 81A9792 +Route25_EventScript_JoeyRematch:: trainerbattle_rematch TRAINER_YOUNGSTER_JOEY, Route25_Text_JoeyRematchIntro, Route25_Text_JoeyDefeat msgbox Route25_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_Dan:: @ 81A97A9 +Route25_EventScript_Dan:: trainerbattle_single TRAINER_YOUNGSTER_DAN, Route25_Text_DanIntro, Route25_Text_DanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -214,12 +214,12 @@ Route25_EventScript_Dan:: @ 81A97A9 msgbox Route25_Text_DanPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_DanRematch:: @ 81A97D0 +Route25_EventScript_DanRematch:: trainerbattle_rematch TRAINER_YOUNGSTER_DAN, Route25_Text_DanRematchIntro, Route25_Text_DanDefeat msgbox Route25_Text_DanPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_Chad:: @ 81A97E7 +Route25_EventScript_Chad:: trainerbattle_single TRAINER_YOUNGSTER_CHAD, Route25_Text_ChadIntro, Route25_Text_ChadDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -227,12 +227,12 @@ Route25_EventScript_Chad:: @ 81A97E7 msgbox Route25_Text_ChadPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_ChadRematch:: @ 81A980E +Route25_EventScript_ChadRematch:: trainerbattle_rematch TRAINER_YOUNGSTER_CHAD, Route25_Text_ChadRematchIntro, Route25_Text_ChadDefeat msgbox Route25_Text_ChadPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_Kelsey:: @ 81A9825 +Route25_EventScript_Kelsey:: trainerbattle_single TRAINER_PICNICKER_KELSEY, Route25_Text_KelseyIntro, Route25_Text_KelseyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -240,12 +240,12 @@ Route25_EventScript_Kelsey:: @ 81A9825 msgbox Route25_Text_KelseyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_KelseyRematch:: @ 81A984C +Route25_EventScript_KelseyRematch:: trainerbattle_rematch TRAINER_PICNICKER_KELSEY, Route25_Text_KelseyRematchIntro, Route25_Text_KelseyDefeat msgbox Route25_Text_KelseyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_Haley:: @ 81A9863 +Route25_EventScript_Haley:: trainerbattle_single TRAINER_LASS_HALEY, Route25_Text_HaleyIntro, Route25_Text_HaleyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -253,12 +253,12 @@ Route25_EventScript_Haley:: @ 81A9863 msgbox Route25_Text_HaleyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_HaleyRematch:: @ 81A988A +Route25_EventScript_HaleyRematch:: trainerbattle_rematch TRAINER_LASS_HALEY, Route25_Text_HaleyRematchIntro, Route25_Text_HaleyDefeat msgbox Route25_Text_HaleyPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_Franklin:: @ 81A98A1 +Route25_EventScript_Franklin:: trainerbattle_single TRAINER_HIKER_FRANKLIN, Route25_Text_FranklinIntro, Route25_Text_FranklinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -266,12 +266,12 @@ Route25_EventScript_Franklin:: @ 81A98A1 msgbox Route25_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_FranklinRematch:: @ 81A98C8 +Route25_EventScript_FranklinRematch:: trainerbattle_rematch TRAINER_HIKER_FRANKLIN, Route25_Text_FranklinRematchIntro, Route25_Text_FranklinDefeat msgbox Route25_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_Nob:: @ 81A98DF +Route25_EventScript_Nob:: trainerbattle_single TRAINER_HIKER_NOB, Route25_Text_NobIntro, Route25_Text_NobDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -279,12 +279,12 @@ Route25_EventScript_Nob:: @ 81A98DF msgbox Route25_Text_NobPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_NobRematch:: @ 81A9906 +Route25_EventScript_NobRematch:: trainerbattle_rematch TRAINER_HIKER_NOB, Route25_Text_NobRematchIntro, Route25_Text_NobDefeat msgbox Route25_Text_NobPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_Wayne:: @ 81A991D +Route25_EventScript_Wayne:: trainerbattle_single TRAINER_HIKER_WAYNE, Route25_Text_WayneIntro, Route25_Text_WayneDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -292,12 +292,12 @@ Route25_EventScript_Wayne:: @ 81A991D msgbox Route25_Text_WaynePostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_WayneRematch:: @ 81A9944 +Route25_EventScript_WayneRematch:: trainerbattle_rematch TRAINER_HIKER_WAYNE, Route25_Text_WayneRematchIntro, Route25_Text_WayneDefeat msgbox Route25_Text_WaynePostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_Flint:: @ 81A995B +Route25_EventScript_Flint:: trainerbattle_single TRAINER_CAMPER_FLINT, Route25_Text_FlintIntro, Route25_Text_FlintDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -305,12 +305,12 @@ Route25_EventScript_Flint:: @ 81A995B msgbox Route25_Text_FlintPostBattle, MSGBOX_AUTOCLOSE end -Route25_EventScript_FlintRematch:: @ 81A9982 +Route25_EventScript_FlintRematch:: trainerbattle_rematch TRAINER_CAMPER_FLINT, Route25_Text_FlintRematchIntro, Route25_Text_FlintDefeat msgbox Route25_Text_FlintPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_Keigo:: @ 81A9999 +Route6_EventScript_Keigo:: trainerbattle_single TRAINER_BUG_CATCHER_KEIGO, Route6_Text_KeigoIntro, Route6_Text_KeigoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -318,12 +318,12 @@ Route6_EventScript_Keigo:: @ 81A9999 msgbox Route6_Text_KeigoPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_KeigoRematch:: @ 81A99C0 +Route6_EventScript_KeigoRematch:: trainerbattle_rematch TRAINER_BUG_CATCHER_KEIGO, Route6_Text_KeigoRematchIntro, Route6_Text_KeigoDefeat msgbox Route6_Text_KeigoPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_Elijah:: @ 81A99D7 +Route6_EventScript_Elijah:: trainerbattle_single TRAINER_BUG_CATCHER_ELIJAH, Route6_Text_ElijahIntro, Route6_Text_ElijahDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -331,12 +331,12 @@ Route6_EventScript_Elijah:: @ 81A99D7 msgbox Route6_Text_ElijahPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_ElijahRematch:: @ 81A99FE +Route6_EventScript_ElijahRematch:: trainerbattle_rematch TRAINER_BUG_CATCHER_ELIJAH, Route6_Text_ElijahRematchIntro, Route6_Text_ElijahDefeat msgbox Route6_Text_ElijahPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_Ricky:: @ 81A9A15 +Route6_EventScript_Ricky:: trainerbattle_single TRAINER_CAMPER_RICKY, Route6_Text_RickyIntro, Route6_Text_RickyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -344,12 +344,12 @@ Route6_EventScript_Ricky:: @ 81A9A15 msgbox Route6_Text_RickyPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_RickyRematch:: @ 81A9A3C +Route6_EventScript_RickyRematch:: trainerbattle_rematch TRAINER_CAMPER_RICKY, Route6_Text_RickyRematchIntro, Route6_Text_RickyDefeat msgbox Route6_Text_RickyPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_Jeff:: @ 81A9A53 +Route6_EventScript_Jeff:: trainerbattle_single TRAINER_CAMPER_JEFF, Route6_Text_JeffIntro, Route6_Text_JeffDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -357,12 +357,12 @@ Route6_EventScript_Jeff:: @ 81A9A53 msgbox Route6_Text_JeffPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_JeffRematch:: @ 81A9A7A +Route6_EventScript_JeffRematch:: trainerbattle_rematch TRAINER_CAMPER_JEFF, Route6_Text_JeffRematchIntro, Route6_Text_JeffDefeat msgbox Route6_Text_JeffPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_Nancy:: @ 81A9A91 +Route6_EventScript_Nancy:: trainerbattle_single TRAINER_PICNICKER_NANCY, Route6_Text_NancyIntro, Route6_Text_NancyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -370,12 +370,12 @@ Route6_EventScript_Nancy:: @ 81A9A91 msgbox Route6_Text_NancyPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_NancyRematch:: @ 81A9AB8 +Route6_EventScript_NancyRematch:: trainerbattle_rematch TRAINER_PICNICKER_NANCY, Route6_Text_NancyRematchIntro, Route6_Text_NancyDefeat msgbox Route6_Text_NancyPostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_Isabelle:: @ 81A9ACF +Route6_EventScript_Isabelle:: trainerbattle_single TRAINER_PICNICKER_ISABELLE, Route6_Text_IsabelleIntro, Route6_Text_IsabelleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -383,12 +383,12 @@ Route6_EventScript_Isabelle:: @ 81A9ACF msgbox Route6_Text_IsabellePostBattle, MSGBOX_AUTOCLOSE end -Route6_EventScript_IsabelleRematch:: @ 81A9AF6 +Route6_EventScript_IsabelleRematch:: trainerbattle_rematch TRAINER_PICNICKER_ISABELLE, Route6_Text_IsabelleRematchIntro, Route6_Text_IsabelleDefeat msgbox Route6_Text_IsabellePostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_Eddie:: @ 81A9B0D +Route11_EventScript_Eddie:: trainerbattle_single TRAINER_YOUNGSTER_EDDIE, Route11_Text_EddieIntro, Route11_Text_EddieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -396,12 +396,12 @@ Route11_EventScript_Eddie:: @ 81A9B0D msgbox Route11_Text_EddiePostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_EddieRematch:: @ 81A9B34 +Route11_EventScript_EddieRematch:: trainerbattle_rematch TRAINER_YOUNGSTER_EDDIE, Route11_Text_EddieRematchIntro, Route11_Text_EddieDefeat msgbox Route11_Text_EddiePostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_Dillon:: @ 81A9B4B +Route11_EventScript_Dillon:: trainerbattle_single TRAINER_YOUNGSTER_DILLON, Route11_Text_DillonIntro, Route11_Text_DillonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -409,12 +409,12 @@ Route11_EventScript_Dillon:: @ 81A9B4B msgbox Route11_Text_DillonPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_DillonRematch:: @ 81A9B72 +Route11_EventScript_DillonRematch:: trainerbattle_rematch TRAINER_YOUNGSTER_DILLON, Route11_Text_DillonRematchIntro, Route11_Text_DillonDefeat msgbox Route11_Text_DillonPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_Yasu:: @ 81A9B89 +Route11_EventScript_Yasu:: trainerbattle_single TRAINER_YOUNGSTER_YASU, Route11_Text_YasuIntro, Route11_Text_YasuDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -422,12 +422,12 @@ Route11_EventScript_Yasu:: @ 81A9B89 msgbox Route11_Text_YasuPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_YasuRematch:: @ 81A9BB0 +Route11_EventScript_YasuRematch:: trainerbattle_rematch TRAINER_YOUNGSTER_YASU, Route11_Text_YasuRematchIntro, Route11_Text_YasuDefeat msgbox Route11_Text_YasuPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_Dave:: @ 81A9BC7 +Route11_EventScript_Dave:: trainerbattle_single TRAINER_YOUNGSTER_DAVE, Route11_Text_DaveIntro, Route11_Text_DaveDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -435,12 +435,12 @@ Route11_EventScript_Dave:: @ 81A9BC7 msgbox Route11_Text_DavePostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_DaveRematch:: @ 81A9BEE +Route11_EventScript_DaveRematch:: trainerbattle_rematch TRAINER_YOUNGSTER_DAVE, Route11_Text_DaveRematchIntro, Route11_Text_DaveDefeat msgbox Route11_Text_DavePostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_Braxton:: @ 81A9C05 +Route11_EventScript_Braxton:: trainerbattle_single TRAINER_ENGINEER_BRAXTON, Route11_Text_BraxtonIntro, Route11_Text_BraxtonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -448,12 +448,12 @@ Route11_EventScript_Braxton:: @ 81A9C05 msgbox Route11_Text_BraxtonPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_BraxtonRematch:: @ 81A9C2C +Route11_EventScript_BraxtonRematch:: trainerbattle_rematch TRAINER_ENGINEER_BRAXTON, Route11_Text_BraxtonRematchIntro, Route11_Text_BraxtonDefeat msgbox Route11_Text_BraxtonPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_Bernie:: @ 81A9C43 +Route11_EventScript_Bernie:: trainerbattle_single TRAINER_ENGINEER_BERNIE, Route11_Text_BernieIntro, Route11_Text_BernieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -461,12 +461,12 @@ Route11_EventScript_Bernie:: @ 81A9C43 msgbox Route11_Text_BerniePostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_BernieRematch:: @ 81A9C6A +Route11_EventScript_BernieRematch:: trainerbattle_rematch TRAINER_ENGINEER_BERNIE, Route11_Text_BernieRematchIntro, Route11_Text_BernieDefeat msgbox Route11_Text_BerniePostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_Hugo:: @ 81A9C81 +Route11_EventScript_Hugo:: trainerbattle_single TRAINER_GAMER_HUGO, Route11_Text_HugoIntro, Route11_Text_HugoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -474,12 +474,12 @@ Route11_EventScript_Hugo:: @ 81A9C81 msgbox Route11_Text_HugoPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_HugoRematch:: @ 81A9CA8 +Route11_EventScript_HugoRematch:: trainerbattle_rematch TRAINER_GAMER_HUGO, Route11_Text_HugoRematchIntro, Route11_Text_HugoDefeat msgbox Route11_Text_HugoPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_Jasper:: @ 81A9CBF +Route11_EventScript_Jasper:: trainerbattle_single TRAINER_GAMER_JASPER, Route11_Text_JasperIntro, Route11_Text_JasperDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -487,12 +487,12 @@ Route11_EventScript_Jasper:: @ 81A9CBF msgbox Route11_Text_JasperPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_JasperRematch:: @ 81A9CE6 +Route11_EventScript_JasperRematch:: trainerbattle_rematch TRAINER_GAMER_JASPER, Route11_Text_JasperRematchIntro, Route11_Text_JasperDefeat msgbox Route11_Text_JasperPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_Dirk:: @ 81A9CFD +Route11_EventScript_Dirk:: trainerbattle_single TRAINER_GAMER_DIRK, Route11_Text_DirkIntro, Route11_Text_DirkDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -500,12 +500,12 @@ Route11_EventScript_Dirk:: @ 81A9CFD msgbox Route11_Text_DirkPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_DirkRematch:: @ 81A9D24 +Route11_EventScript_DirkRematch:: trainerbattle_rematch TRAINER_GAMER_DIRK, Route11_Text_DirkRematchIntro, Route11_Text_DirkDefeat msgbox Route11_Text_DirkPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_Darian:: @ 81A9D3B +Route11_EventScript_Darian:: trainerbattle_single TRAINER_GAMER_DARIAN, Route11_Text_DarianIntro, Route11_Text_DarianDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -513,12 +513,12 @@ Route11_EventScript_Darian:: @ 81A9D3B msgbox Route11_Text_DarianPostBattle, MSGBOX_AUTOCLOSE end -Route11_EventScript_DarianRematch:: @ 81A9D62 +Route11_EventScript_DarianRematch:: trainerbattle_rematch TRAINER_GAMER_DARIAN, Route11_Text_DarianRematchIntro, Route11_Text_DarianDefeat msgbox Route11_Text_DarianPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_Brent:: @ 81A9D79 +Route9_EventScript_Brent:: trainerbattle_single TRAINER_BUG_CATCHER_BRENT, Route9_Text_BrentIntro, Route9_Text_BrentDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -526,12 +526,12 @@ Route9_EventScript_Brent:: @ 81A9D79 msgbox Route9_Text_BrentPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_BrentRematch:: @ 81A9DA0 +Route9_EventScript_BrentRematch:: trainerbattle_rematch TRAINER_BUG_CATCHER_BRENT, Route9_Text_BrentRematchIntro, Route9_Text_BrentDefeat msgbox Route9_Text_BrentPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_Conner:: @ 81A9DB7 +Route9_EventScript_Conner:: trainerbattle_single TRAINER_BUG_CATCHER_CONNER, Route9_Text_ConnerIntro, Route9_Text_ConnerDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -539,12 +539,12 @@ Route9_EventScript_Conner:: @ 81A9DB7 msgbox Route9_Text_ConnerPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_ConnerRematch:: @ 81A9DDE +Route9_EventScript_ConnerRematch:: trainerbattle_rematch TRAINER_BUG_CATCHER_CONNER, Route9_Text_ConnerRematchIntro, Route9_Text_ConnerDefeat msgbox Route9_Text_ConnerPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_Chris:: @ 81A9DF5 +Route9_EventScript_Chris:: trainerbattle_single TRAINER_CAMPER_CHRIS, Route9_Text_ChrisIntro, Route9_Text_ChrisDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -552,12 +552,12 @@ Route9_EventScript_Chris:: @ 81A9DF5 msgbox Route9_Text_ChrisPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_ChrisRematch:: @ 81A9E1C +Route9_EventScript_ChrisRematch:: trainerbattle_rematch TRAINER_CAMPER_CHRIS, Route9_Text_ChrisRematchIntro, Route9_Text_ChrisDefeat msgbox Route9_Text_ChrisPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_Drew:: @ 81A9E33 +Route9_EventScript_Drew:: trainerbattle_single TRAINER_CAMPER_DREW, Route9_Text_DrewIntro, Route9_Text_DrewDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -565,12 +565,12 @@ Route9_EventScript_Drew:: @ 81A9E33 msgbox Route9_Text_DrewPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_DrewRematch:: @ 81A9E5A +Route9_EventScript_DrewRematch:: trainerbattle_rematch TRAINER_CAMPER_DREW, Route9_Text_DrewRematchIntro, Route9_Text_DrewDefeat msgbox Route9_Text_DrewPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_Alicia:: @ 81A9E71 +Route9_EventScript_Alicia:: trainerbattle_single TRAINER_PICNICKER_ALICIA, Route9_Text_AliciaIntro, Route9_Text_AliciaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -578,12 +578,12 @@ Route9_EventScript_Alicia:: @ 81A9E71 msgbox Route9_Text_AliciaPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_AliciaRematch:: @ 81A9E98 +Route9_EventScript_AliciaRematch:: trainerbattle_rematch TRAINER_PICNICKER_ALICIA, Route9_Text_AliciaRematchIntro, Route9_Text_AliciaDefeat msgbox Route9_Text_AliciaPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_Caitlin:: @ 81A9EAF +Route9_EventScript_Caitlin:: trainerbattle_single TRAINER_PICNICKER_CAITLIN, Route9_Text_CaitlinIntro, Route9_Text_CaitlinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -591,12 +591,12 @@ Route9_EventScript_Caitlin:: @ 81A9EAF msgbox Route9_Text_CaitlinPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_CaitlinRematch:: @ 81A9ED6 +Route9_EventScript_CaitlinRematch:: trainerbattle_rematch TRAINER_PICNICKER_CAITLIN, Route9_Text_CaitlinRematchIntro, Route9_Text_CaitlinDefeat msgbox Route9_Text_CaitlinPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_Alan:: @ 81A9EED +Route9_EventScript_Alan:: trainerbattle_single TRAINER_HIKER_ALAN, Route9_Text_AlanIntro, Route9_Text_AlanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -604,12 +604,12 @@ Route9_EventScript_Alan:: @ 81A9EED msgbox Route9_Text_AlanPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_AlanRematch:: @ 81A9F14 +Route9_EventScript_AlanRematch:: trainerbattle_rematch TRAINER_HIKER_ALAN, Route9_Text_AlanRematchIntro, Route9_Text_AlanDefeat msgbox Route9_Text_AlanPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_Brice:: @ 81A9F2B +Route9_EventScript_Brice:: trainerbattle_single TRAINER_HIKER_BRICE, Route9_Text_BriceIntro, Route9_Text_BriceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -617,12 +617,12 @@ Route9_EventScript_Brice:: @ 81A9F2B msgbox Route9_Text_BricePostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_BriceRematch:: @ 81A9F52 +Route9_EventScript_BriceRematch:: trainerbattle_rematch TRAINER_HIKER_BRICE, Route9_Text_BriceRematchIntro, Route9_Text_BriceDefeat msgbox Route9_Text_BricePostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_Jeremy:: @ 81A9F69 +Route9_EventScript_Jeremy:: trainerbattle_single TRAINER_HIKER_JEREMY, Route9_Text_JeremyIntro, Route9_Text_JeremyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -630,12 +630,12 @@ Route9_EventScript_Jeremy:: @ 81A9F69 msgbox Route9_Text_JeremyPostBattle, MSGBOX_AUTOCLOSE end -Route9_EventScript_JeremyRematch:: @ 81A9F90 +Route9_EventScript_JeremyRematch:: trainerbattle_rematch TRAINER_HIKER_JEREMY, Route9_Text_JeremyRematchIntro, Route9_Text_JeremyDefeat msgbox Route9_Text_JeremyPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_Heidi:: @ 81A9FA7 +Route10_EventScript_Heidi:: trainerbattle_single TRAINER_PICNICKER_HEIDI, Route10_Text_HeidiIntro, Route10_Text_HeidiDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -643,12 +643,12 @@ Route10_EventScript_Heidi:: @ 81A9FA7 msgbox Route10_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_HeidiRematch:: @ 81A9FCE +Route10_EventScript_HeidiRematch:: trainerbattle_rematch TRAINER_PICNICKER_HEIDI, Route10_Text_HeidiRematchIntro, Route10_Text_HeidiDefeat msgbox Route10_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_Carol:: @ 81A9FE5 +Route10_EventScript_Carol:: trainerbattle_single TRAINER_PICNICKER_CAROL, Route10_Text_CarolIntro, Route10_Text_CarolDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -656,12 +656,12 @@ Route10_EventScript_Carol:: @ 81A9FE5 msgbox Route10_Text_CarolPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_CarolRematch:: @ 81AA00C +Route10_EventScript_CarolRematch:: trainerbattle_rematch TRAINER_PICNICKER_CAROL, Route10_Text_CarolRematchIntro, Route10_Text_CarolDefeat msgbox Route10_Text_CarolPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_Mark:: @ 81AA023 +Route10_EventScript_Mark:: trainerbattle_single TRAINER_POKEMANIAC_MARK, Route10_Text_MarkIntro, Route10_Text_MarkDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -669,12 +669,12 @@ Route10_EventScript_Mark:: @ 81AA023 msgbox Route10_Text_MarkPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_MarkRematch:: @ 81AA04A +Route10_EventScript_MarkRematch:: trainerbattle_rematch TRAINER_POKEMANIAC_MARK, Route10_Text_MarkRematchIntro, Route10_Text_MarkDefeat msgbox Route10_Text_MarkPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_Herman:: @ 81AA061 +Route10_EventScript_Herman:: trainerbattle_single TRAINER_POKEMANIAC_HERMAN, Route10_Text_HermanIntro, Route10_Text_HermanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -682,12 +682,12 @@ Route10_EventScript_Herman:: @ 81AA061 msgbox Route10_Text_HermanPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_HermanRematch:: @ 81AA088 +Route10_EventScript_HermanRematch:: trainerbattle_rematch TRAINER_POKEMANIAC_HERMAN, Route10_Text_HermanRematchIntro, Route10_Text_HermanDefeat msgbox Route10_Text_HermanPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_Clark:: @ 81AA09F +Route10_EventScript_Clark:: trainerbattle_single TRAINER_HIKER_CLARK, Route10_Text_ClarkIntro, Route10_Text_ClarkDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -695,12 +695,12 @@ Route10_EventScript_Clark:: @ 81AA09F msgbox Route10_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_ClarkRematch:: @ 81AA0C6 +Route10_EventScript_ClarkRematch:: trainerbattle_rematch TRAINER_HIKER_CLARK, Route10_Text_ClarkRematchIntro, Route10_Text_ClarkDefeat msgbox Route10_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_Trent:: @ 81AA0DD +Route10_EventScript_Trent:: trainerbattle_single TRAINER_HIKER_TRENT, Route10_Text_TrentIntro, Route10_Text_TrentDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -708,12 +708,12 @@ Route10_EventScript_Trent:: @ 81AA0DD msgbox Route10_Text_TrentPostBattle, MSGBOX_AUTOCLOSE end -Route10_EventScript_TrentRematch:: @ 81AA104 +Route10_EventScript_TrentRematch:: trainerbattle_rematch TRAINER_HIKER_TRENT, Route10_Text_TrentRematchIntro, Route10_Text_TrentDefeat msgbox Route10_Text_TrentPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Paige:: @ 81AA11B +Route8_EventScript_Paige:: trainerbattle_single TRAINER_LASS_PAIGE, Route8_Text_PaigeIntro, Route8_Text_PaigeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -721,12 +721,12 @@ Route8_EventScript_Paige:: @ 81AA11B msgbox Route8_Text_PaigePostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_PaigeRematch:: @ 81AA142 +Route8_EventScript_PaigeRematch:: trainerbattle_rematch TRAINER_LASS_PAIGE, Route8_Text_PaigeRematchIntro, Route8_Text_PaigeDefeat msgbox Route8_Text_PaigePostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Andrea:: @ 81AA159 +Route8_EventScript_Andrea:: trainerbattle_single TRAINER_LASS_ANDREA, Route8_Text_AndreaIntro, Route8_Text_AndreaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -734,12 +734,12 @@ Route8_EventScript_Andrea:: @ 81AA159 msgbox Route8_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_AndreaRematch:: @ 81AA180 +Route8_EventScript_AndreaRematch:: trainerbattle_rematch TRAINER_LASS_ANDREA, Route8_Text_AndreaRematchIntro, Route8_Text_AndreaDefeat msgbox Route8_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Megan:: @ 81AA197 +Route8_EventScript_Megan:: trainerbattle_single TRAINER_LASS_MEGAN, Route8_Text_MeganIntro, Route8_Text_MeganDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -747,12 +747,12 @@ Route8_EventScript_Megan:: @ 81AA197 msgbox Route8_Text_MeganPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_MeganRematch:: @ 81AA1BE +Route8_EventScript_MeganRematch:: trainerbattle_rematch TRAINER_LASS_MEGAN, Route8_Text_MeganRematchIntro, Route8_Text_MeganDefeat msgbox Route8_Text_MeganPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Julia:: @ 81AA1D5 +Route8_EventScript_Julia:: trainerbattle_single TRAINER_LASS_JULIA, Route8_Text_JuliaIntro, Route8_Text_JuliaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -760,12 +760,12 @@ Route8_EventScript_Julia:: @ 81AA1D5 msgbox Route8_Text_JuliaPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_JuliaRematch:: @ 81AA1FC +Route8_EventScript_JuliaRematch:: trainerbattle_rematch TRAINER_LASS_JULIA, Route8_Text_JuliaRematchIntro, Route8_Text_JuliaDefeat msgbox Route8_Text_JuliaPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Aidan:: @ 81AA213 +Route8_EventScript_Aidan:: trainerbattle_single TRAINER_SUPER_NERD_AIDAN, Route8_Text_AidanIntro, Route8_Text_AidanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -773,12 +773,12 @@ Route8_EventScript_Aidan:: @ 81AA213 msgbox Route8_Text_AidanPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_AidanRematch:: @ 81AA23A +Route8_EventScript_AidanRematch:: trainerbattle_rematch TRAINER_SUPER_NERD_AIDAN, Route8_Text_AidanRematchIntro, Route8_Text_AidanDefeat msgbox Route8_Text_AidanPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Glenn:: @ 81AA251 +Route8_EventScript_Glenn:: trainerbattle_single TRAINER_SUPER_NERD_GLENN, Route8_Text_GlennIntro, Route8_Text_GlennDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -786,12 +786,12 @@ Route8_EventScript_Glenn:: @ 81AA251 msgbox Route8_Text_GlennPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_GlennRematch:: @ 81AA278 +Route8_EventScript_GlennRematch:: trainerbattle_rematch TRAINER_SUPER_NERD_GLENN, Route8_Text_GlennRematchIntro, Route8_Text_GlennDefeat msgbox Route8_Text_GlennPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Leslie:: @ 81AA28F +Route8_EventScript_Leslie:: trainerbattle_single TRAINER_SUPER_NERD_LESLIE, Route8_Text_LeslieIntro, Route8_Text_LeslieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -799,12 +799,12 @@ Route8_EventScript_Leslie:: @ 81AA28F msgbox Route8_Text_LesliePostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_LeslieRematch:: @ 81AA2B6 +Route8_EventScript_LeslieRematch:: trainerbattle_rematch TRAINER_SUPER_NERD_LESLIE, Route8_Text_LeslieRematchIntro, Route8_Text_LeslieDefeat msgbox Route8_Text_LesliePostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Stan:: @ 81AA2CD +Route8_EventScript_Stan:: trainerbattle_single TRAINER_GAMER_STAN, Route8_Text_StanIntro, Route8_Text_StanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -812,12 +812,12 @@ Route8_EventScript_Stan:: @ 81AA2CD msgbox Route8_Text_StanPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_StanRematch:: @ 81AA2F4 +Route8_EventScript_StanRematch:: trainerbattle_rematch TRAINER_GAMER_STAN, Route8_Text_StanRematchIntro, Route8_Text_StanDefeat msgbox Route8_Text_StanPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Rich:: @ 81AA30B +Route8_EventScript_Rich:: trainerbattle_single TRAINER_GAMER_RICH, Route8_Text_RichIntro, Route8_Text_RichDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -825,12 +825,12 @@ Route8_EventScript_Rich:: @ 81AA30B msgbox Route8_Text_RichPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_RichRematch:: @ 81AA332 +Route8_EventScript_RichRematch:: trainerbattle_rematch TRAINER_GAMER_RICH, Route8_Text_RichRematchIntro, Route8_Text_RichDefeat msgbox Route8_Text_RichPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Eli:: @ 81AA349 +Route8_EventScript_Eli:: trainerbattle_double TRAINER_TWINS_ELI_ANNE, Route8_Text_EliIntro, Route8_Text_EliDefeat, Route8_Text_EliNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -838,12 +838,12 @@ Route8_EventScript_Eli:: @ 81AA349 msgbox Route8_Text_EliPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_EliRematch:: @ 81AA374 +Route8_EventScript_EliRematch:: trainerbattle_rematch_double TRAINER_TWINS_ELI_ANNE, Route8_Text_EliRematchIntro, Route8_Text_EliDefeat, Route8_Text_EliNotEnoughMons msgbox Route8_Text_EliPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Anne:: @ 81AA38F +Route8_EventScript_Anne:: trainerbattle_double TRAINER_TWINS_ELI_ANNE, Route8_Text_AnneIntro, Route8_Text_AnneDefeat, Route8_Text_AnneNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -851,12 +851,12 @@ Route8_EventScript_Anne:: @ 81AA38F msgbox Route8_Text_AnnePostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_AnneRematch:: @ 81AA3BA +Route8_EventScript_AnneRematch:: trainerbattle_rematch_double TRAINER_TWINS_ELI_ANNE, Route8_Text_AnneRematchIntro, Route8_Text_AnneDefeat, Route8_Text_AnneNotEnoughMons msgbox Route8_Text_AnnePostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Ricardo:: @ 81AA3D5 +Route8_EventScript_Ricardo:: trainerbattle_single TRAINER_BIKER_RICARDO, Route8_Text_RicardoIntro, Route8_Text_RicardoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -864,12 +864,12 @@ Route8_EventScript_Ricardo:: @ 81AA3D5 msgbox Route8_Text_RicardoPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_RicardoRematch:: @ 81AA3FC +Route8_EventScript_RicardoRematch:: trainerbattle_rematch TRAINER_BIKER_RICARDO, Route8_Text_RicardoRematchIntro, Route8_Text_RicardoDefeat msgbox Route8_Text_RicardoPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_Jaren:: @ 81AA413 +Route8_EventScript_Jaren:: trainerbattle_single TRAINER_BIKER_JAREN, Route8_Text_JarenIntro, Route8_Text_JarenDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -877,12 +877,12 @@ Route8_EventScript_Jaren:: @ 81AA413 msgbox Route8_Text_JarenPostBattle, MSGBOX_AUTOCLOSE end -Route8_EventScript_JarenRematch:: @ 81AA43A +Route8_EventScript_JarenRematch:: trainerbattle_rematch TRAINER_BIKER_JAREN, Route8_Text_JarenRematchIntro, Route8_Text_JarenDefeat msgbox Route8_Text_JarenPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_Ned:: @ 81AA451 +Route12_EventScript_Ned:: trainerbattle_single TRAINER_FISHERMAN_NED, Route12_Text_NedIntro, Route12_Text_NedDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -890,12 +890,12 @@ Route12_EventScript_Ned:: @ 81AA451 msgbox Route12_Text_NedPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_NedRematch:: @ 81AA478 +Route12_EventScript_NedRematch:: trainerbattle_rematch TRAINER_FISHERMAN_NED, Route12_Text_NedRematchIntro, Route12_Text_NedDefeat msgbox Route12_Text_NedPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_Chip:: @ 81AA48F +Route12_EventScript_Chip:: trainerbattle_single TRAINER_FISHERMAN_CHIP, Route12_Text_ChipIntro, Route12_Text_ChipDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -903,12 +903,12 @@ Route12_EventScript_Chip:: @ 81AA48F msgbox Route12_Text_ChipPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_ChipRematch:: @ 81AA4B6 +Route12_EventScript_ChipRematch:: trainerbattle_rematch TRAINER_FISHERMAN_CHIP, Route12_Text_ChipRematchIntro, Route12_Text_ChipDefeat msgbox Route12_Text_ChipPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_Hank:: @ 81AA4CD +Route12_EventScript_Hank:: trainerbattle_single TRAINER_FISHERMAN_HANK, Route12_Text_HankIntro, Route12_Text_HankDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -916,12 +916,12 @@ Route12_EventScript_Hank:: @ 81AA4CD msgbox Route12_Text_HankPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_HankRematch:: @ 81AA4F4 +Route12_EventScript_HankRematch:: trainerbattle_rematch TRAINER_FISHERMAN_HANK, Route12_Text_HankRematchIntro, Route12_Text_HankDefeat msgbox Route12_Text_HankPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_Elliot:: @ 81AA50B +Route12_EventScript_Elliot:: trainerbattle_single TRAINER_FISHERMAN_ELLIOT, Route12_Text_ElliotIntro, Route12_Text_ElliotDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -929,12 +929,12 @@ Route12_EventScript_Elliot:: @ 81AA50B msgbox Route12_Text_ElliotPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_ElliotRematch:: @ 81AA532 +Route12_EventScript_ElliotRematch:: trainerbattle_rematch TRAINER_FISHERMAN_ELLIOT, Route12_Text_ElliotRematchIntro, Route12_Text_ElliotDefeat msgbox Route12_Text_ElliotPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_Andrew:: @ 81AA549 +Route12_EventScript_Andrew:: trainerbattle_single TRAINER_FISHERMAN_ANDREW, Route12_Text_AndrewIntro, Route12_Text_AndrewDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -942,12 +942,12 @@ Route12_EventScript_Andrew:: @ 81AA549 msgbox Route12_Text_AndrewPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_AndrewRematch:: @ 81AA570 +Route12_EventScript_AndrewRematch:: trainerbattle_rematch TRAINER_FISHERMAN_ANDREW, Route12_Text_AndrewRematchIntro, Route12_Text_AndrewDefeat msgbox Route12_Text_AndrewPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_Luca:: @ 81AA587 +Route12_EventScript_Luca:: trainerbattle_single TRAINER_ROCKER_LUCA, Route12_Text_LucaIntro, Route12_Text_LucaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -955,12 +955,12 @@ Route12_EventScript_Luca:: @ 81AA587 msgbox Route12_Text_LucaPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_LucaRematch:: @ 81AA5AE +Route12_EventScript_LucaRematch:: trainerbattle_rematch TRAINER_ROCKER_LUCA, Route12_Text_LucaRematchIntro, Route12_Text_LucaDefeat msgbox Route12_Text_LucaPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_Justin:: @ 81AA5C5 +Route12_EventScript_Justin:: trainerbattle_single TRAINER_CAMPER_JUSTIN, Route12_Text_JustinIntro, Route12_Text_JustinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -968,12 +968,12 @@ Route12_EventScript_Justin:: @ 81AA5C5 msgbox Route12_Text_JustinPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_JustinRematch:: @ 81AA5EC +Route12_EventScript_JustinRematch:: trainerbattle_rematch TRAINER_CAMPER_JUSTIN, Route12_Text_JustinRematchIntro, Route12_Text_JustinDefeat msgbox Route12_Text_JustinPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_Jes:: @ 81AA603 +Route12_EventScript_Jes:: trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_JesIntro, Route12_Text_JesDefeat, Route12_Text_JesNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -981,12 +981,12 @@ Route12_EventScript_Jes:: @ 81AA603 msgbox Route12_Text_JesPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_JesRematch:: @ 81AA62E +Route12_EventScript_JesRematch:: trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_JesRematchIntro, Route12_Text_JesDefeat, Route12_Text_JesNotEnoughMons msgbox Route12_Text_JesPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_Gia:: @ 81AA649 +Route12_EventScript_Gia:: trainerbattle_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_GiaIntro, Route12_Text_GiaDefeat, Route12_Text_GiaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -994,12 +994,12 @@ Route12_EventScript_Gia:: @ 81AA649 msgbox Route12_Text_GiaPostBattle, MSGBOX_AUTOCLOSE end -Route12_EventScript_GiaRematch:: @ 81AA674 +Route12_EventScript_GiaRematch:: trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_GIA_JES, Route12_Text_GiaRematchIntro, Route12_Text_GiaDefeat, Route12_Text_GiaNotEnoughMons msgbox Route12_Text_GiaPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_Jared:: @ 81AA68F +Route13_EventScript_Jared:: trainerbattle_single TRAINER_BIKER_JARED, Route13_Text_JaredIntro, Route13_Text_JaredDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1007,12 +1007,12 @@ Route13_EventScript_Jared:: @ 81AA68F msgbox Route13_Text_JaredPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_JaredRematch:: @ 81AA6B6 +Route13_EventScript_JaredRematch:: trainerbattle_rematch TRAINER_BIKER_JARED, Route13_Text_JaredRematchIntro, Route13_Text_JaredDefeat msgbox Route13_Text_JaredPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_Lola:: @ 81AA6CD +Route13_EventScript_Lola:: trainerbattle_single TRAINER_BEAUTY_LOLA, Route13_Text_LolaIntro, Route13_Text_LolaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1020,12 +1020,12 @@ Route13_EventScript_Lola:: @ 81AA6CD msgbox Route13_Text_LolaPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_LolaRematch:: @ 81AA6F4 +Route13_EventScript_LolaRematch:: trainerbattle_rematch TRAINER_BEAUTY_LOLA, Route13_Text_LolaRematchIntro, Route13_Text_LolaDefeat msgbox Route13_Text_LolaPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_Sheila:: @ 81AA70B +Route13_EventScript_Sheila:: trainerbattle_single TRAINER_BEAUTY_SHEILA, Route13_Text_SheilaIntro, Route13_Text_SheilaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1033,12 +1033,12 @@ Route13_EventScript_Sheila:: @ 81AA70B msgbox Route13_Text_SheilaPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_SheilaRematch:: @ 81AA732 +Route13_EventScript_SheilaRematch:: trainerbattle_rematch TRAINER_BEAUTY_SHEILA, Route13_Text_SheilaRematchIntro, Route13_Text_SheilaDefeat msgbox Route13_Text_SheilaPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_Sebastian:: @ 81AA749 +Route13_EventScript_Sebastian:: trainerbattle_single TRAINER_BIRD_KEEPER_SEBASTIAN, Route13_Text_SebastianIntro, Route13_Text_SebastianDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1046,12 +1046,12 @@ Route13_EventScript_Sebastian:: @ 81AA749 msgbox Route13_Text_SebastianPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_SebastianRematch:: @ 81AA770 +Route13_EventScript_SebastianRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_SEBASTIAN, Route13_Text_SebastianRematchIntro, Route13_Text_SebastianDefeat msgbox Route13_Text_SebastianPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_Perry:: @ 81AA787 +Route13_EventScript_Perry:: trainerbattle_single TRAINER_BIRD_KEEPER_PERRY, Route13_Text_PerryIntro, Route13_Text_PerryDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1059,12 +1059,12 @@ Route13_EventScript_Perry:: @ 81AA787 msgbox Route13_Text_PerryPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_PerryRematch:: @ 81AA7AE +Route13_EventScript_PerryRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_PERRY, Route13_Text_PerryRematchIntro, Route13_Text_PerryDefeat msgbox Route13_Text_PerryPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_Robert:: @ 81AA7C5 +Route13_EventScript_Robert:: trainerbattle_single TRAINER_BIRD_KEEPER_ROBERT, Route13_Text_RobertIntro, Route13_Text_RobertDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1072,12 +1072,12 @@ Route13_EventScript_Robert:: @ 81AA7C5 msgbox Route13_Text_RobertPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_RobertRematch:: @ 81AA7EC +Route13_EventScript_RobertRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_ROBERT, Route13_Text_RobertRematchIntro, Route13_Text_RobertDefeat msgbox Route13_Text_RobertPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_Alma:: @ 81AA803 +Route13_EventScript_Alma:: trainerbattle_single TRAINER_PICNICKER_ALMA, Route13_Text_AlmaIntro, Route13_Text_AlmaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1085,12 +1085,12 @@ Route13_EventScript_Alma:: @ 81AA803 msgbox Route13_Text_AlmaPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_AlmaRematch:: @ 81AA82A +Route13_EventScript_AlmaRematch:: trainerbattle_rematch TRAINER_PICNICKER_ALMA, Route13_Text_AlmaRematchIntro, Route13_Text_AlmaDefeat msgbox Route13_Text_AlmaPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_Susie:: @ 81AA841 +Route13_EventScript_Susie:: trainerbattle_single TRAINER_PICNICKER_SUSIE, Route13_Text_SusieIntro, Route13_Text_SusieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1098,12 +1098,12 @@ Route13_EventScript_Susie:: @ 81AA841 msgbox Route13_Text_SusiePostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_SusieRematch:: @ 81AA868 +Route13_EventScript_SusieRematch:: trainerbattle_rematch TRAINER_PICNICKER_SUSIE, Route13_Text_SusieRematchIntro, Route13_Text_SusieDefeat msgbox Route13_Text_SusiePostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_Valerie:: @ 81AA87F +Route13_EventScript_Valerie:: trainerbattle_single TRAINER_PICNICKER_VALERIE, Route13_Text_ValerieIntro, Route13_Text_ValerieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1111,12 +1111,12 @@ Route13_EventScript_Valerie:: @ 81AA87F msgbox Route13_Text_ValeriePostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_ValerieRematch:: @ 81AA8A6 +Route13_EventScript_ValerieRematch:: trainerbattle_rematch TRAINER_PICNICKER_VALERIE, Route13_Text_ValerieRematchIntro, Route13_Text_ValerieDefeat msgbox Route13_Text_ValeriePostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_Gwen:: @ 81AA8BD +Route13_EventScript_Gwen:: trainerbattle_single TRAINER_PICNICKER_GWEN, Route13_Text_GwenIntro, Route13_Text_GwenDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1124,12 +1124,12 @@ Route13_EventScript_Gwen:: @ 81AA8BD msgbox Route13_Text_GwenPostBattle, MSGBOX_AUTOCLOSE end -Route13_EventScript_GwenRematch:: @ 81AA8E4 +Route13_EventScript_GwenRematch:: trainerbattle_rematch TRAINER_PICNICKER_GWEN, Route13_Text_GwenRematchIntro, Route13_Text_GwenDefeat msgbox Route13_Text_GwenPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Malik:: @ 81AA8FB +Route14_EventScript_Malik:: trainerbattle_single TRAINER_BIKER_MALIK, Route14_Text_MalikIntro, Route14_Text_MalikDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1137,12 +1137,12 @@ Route14_EventScript_Malik:: @ 81AA8FB msgbox Route14_Text_MalikPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_MalikRematch:: @ 81AA922 +Route14_EventScript_MalikRematch:: trainerbattle_rematch TRAINER_BIKER_MALIK, Route14_Text_MalikRematchIntro, Route14_Text_MalikDefeat msgbox Route14_Text_MalikPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Lukas:: @ 81AA939 +Route14_EventScript_Lukas:: trainerbattle_single TRAINER_BIKER_LUKAS, Route14_Text_LukasIntro, Route14_Text_LukasDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1150,12 +1150,12 @@ Route14_EventScript_Lukas:: @ 81AA939 msgbox Route14_Text_LukasPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_LukasRematch:: @ 81AA960 +Route14_EventScript_LukasRematch:: trainerbattle_rematch TRAINER_BIKER_LUKAS, Route14_Text_LukasRematchIntro, Route14_Text_LukasDefeat msgbox Route14_Text_LukasPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Isaac:: @ 81AA977 +Route14_EventScript_Isaac:: trainerbattle_single TRAINER_BIKER_ISAAC, Route14_Text_IsaacIntro, Route14_Text_IsaacDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1163,12 +1163,12 @@ Route14_EventScript_Isaac:: @ 81AA977 msgbox Route14_Text_IsaacPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_IsaacRematch:: @ 81AA99E +Route14_EventScript_IsaacRematch:: trainerbattle_rematch TRAINER_BIKER_ISAAC, Route14_Text_IsaacRematchIntro, Route14_Text_IsaacDefeat msgbox Route14_Text_IsaacPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Gerald:: @ 81AA9B5 +Route14_EventScript_Gerald:: trainerbattle_single TRAINER_BIKER_GERALD, Route14_Text_GeraldIntro, Route14_Text_GeraldDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1176,12 +1176,12 @@ Route14_EventScript_Gerald:: @ 81AA9B5 msgbox Route14_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_GeraldRematch:: @ 81AA9DC +Route14_EventScript_GeraldRematch:: trainerbattle_rematch TRAINER_BIKER_GERALD, Route14_Text_GeraldRematchIntro, Route14_Text_GeraldDefeat msgbox Route14_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Donald:: @ 81AA9F3 +Route14_EventScript_Donald:: trainerbattle_single TRAINER_BIRD_KEEPER_DONALD, Route14_Text_DonaldIntro, Route14_Text_DonaldDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1189,12 +1189,12 @@ Route14_EventScript_Donald:: @ 81AA9F3 msgbox Route14_Text_DonaldPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_DonaldRematch:: @ 81AAA1A +Route14_EventScript_DonaldRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_DONALD, Route14_Text_DonaldRematchIntro, Route14_Text_DonaldDefeat msgbox Route14_Text_DonaldPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Benny:: @ 81AAA31 +Route14_EventScript_Benny:: trainerbattle_single TRAINER_BIRD_KEEPER_BENNY, Route14_Text_BennyIntro, Route14_Text_BennyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1202,12 +1202,12 @@ Route14_EventScript_Benny:: @ 81AAA31 msgbox Route14_Text_BennyPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_BennyRematch:: @ 81AAA58 +Route14_EventScript_BennyRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_BENNY, Route14_Text_BennyRematchIntro, Route14_Text_BennyDefeat msgbox Route14_Text_BennyPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Carter:: @ 81AAA6F +Route14_EventScript_Carter:: trainerbattle_single TRAINER_BIRD_KEEPER_CARTER, Route14_Text_CarterIntro, Route14_Text_CarterDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1215,12 +1215,12 @@ Route14_EventScript_Carter:: @ 81AAA6F msgbox Route14_Text_CarterPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_CarterRematch:: @ 81AAA96 +Route14_EventScript_CarterRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_CARTER, Route14_Text_CarterRematchIntro, Route14_Text_CarterDefeat msgbox Route14_Text_CarterPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Mitch:: @ 81AAAAD +Route14_EventScript_Mitch:: trainerbattle_single TRAINER_BIRD_KEEPER_MITCH, Route14_Text_MitchIntro, Route14_Text_MitchDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1228,12 +1228,12 @@ Route14_EventScript_Mitch:: @ 81AAAAD msgbox Route14_Text_MitchPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_MitchRematch:: @ 81AAAD4 +Route14_EventScript_MitchRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_MITCH, Route14_Text_MitchRematchIntro, Route14_Text_MitchDefeat msgbox Route14_Text_MitchPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Beck:: @ 81AAAEB +Route14_EventScript_Beck:: trainerbattle_single TRAINER_BIRD_KEEPER_BECK, Route14_Text_BeckIntro, Route14_Text_BeckDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1241,12 +1241,12 @@ Route14_EventScript_Beck:: @ 81AAAEB msgbox Route14_Text_BeckPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_BeckRematch:: @ 81AAB12 +Route14_EventScript_BeckRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_BECK, Route14_Text_BeckRematchIntro, Route14_Text_BeckDefeat msgbox Route14_Text_BeckPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Marlon:: @ 81AAB29 +Route14_EventScript_Marlon:: trainerbattle_single TRAINER_BIRD_KEEPER_MARLON, Route14_Text_MarlonIntro, Route14_Text_MarlonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1254,12 +1254,12 @@ Route14_EventScript_Marlon:: @ 81AAB29 msgbox Route14_Text_MarlonPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_MarlonRematch:: @ 81AAB50 +Route14_EventScript_MarlonRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_MARLON, Route14_Text_MarlonRematchIntro, Route14_Text_MarlonDefeat msgbox Route14_Text_MarlonPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Kiri:: @ 81AAB67 +Route14_EventScript_Kiri:: trainerbattle_double TRAINER_TWINS_KIRI_JAN, Route14_Text_KiriIntro, Route14_Text_KiriDefeat, Route14_Text_KiriNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1267,12 +1267,12 @@ Route14_EventScript_Kiri:: @ 81AAB67 msgbox Route14_Text_KiriPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_KiriRematch:: @ 81AAB92 +Route14_EventScript_KiriRematch:: trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Route14_Text_KiriRematchIntro, Route14_Text_KiriDefeat, Route14_Text_KiriNotEnoughMons msgbox Route14_Text_KiriPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_Jan:: @ 81AABAD +Route14_EventScript_Jan:: trainerbattle_double TRAINER_TWINS_KIRI_JAN, Route14_Text_JanIntro, Route14_Text_JanDefeat, Route14_Text_JanNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1280,12 +1280,12 @@ Route14_EventScript_Jan:: @ 81AABAD msgbox Route14_Text_JanPostBattle, MSGBOX_AUTOCLOSE end -Route14_EventScript_JanRematch:: @ 81AABD8 +Route14_EventScript_JanRematch:: trainerbattle_rematch_double TRAINER_TWINS_KIRI_JAN, Route14_Text_JanRematchIntro, Route14_Text_JanDefeat, Route14_Text_JanNotEnoughMons msgbox Route14_Text_JanPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Ernest:: @ 81AABF3 +Route15_EventScript_Ernest:: trainerbattle_single TRAINER_BIKER_ERNEST, Route15_Text_ErnestIntro, Route15_Text_ErnestDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1293,12 +1293,12 @@ Route15_EventScript_Ernest:: @ 81AABF3 msgbox Route15_Text_ErnestPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_ErnestRematch:: @ 81AAC1A +Route15_EventScript_ErnestRematch:: trainerbattle_rematch TRAINER_BIKER_ERNEST, Route15_Text_ErnestRematchIntro, Route15_Text_ErnestDefeat msgbox Route15_Text_ErnestPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Alex:: @ 81AAC31 +Route15_EventScript_Alex:: trainerbattle_single TRAINER_BIKER_ALEX, Route15_Text_AlexIntro, Route15_Text_AlexDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1306,12 +1306,12 @@ Route15_EventScript_Alex:: @ 81AAC31 msgbox Route15_Text_AlexPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_AlexRematch:: @ 81AAC58 +Route15_EventScript_AlexRematch:: trainerbattle_rematch TRAINER_BIKER_ALEX, Route15_Text_AlexRematchIntro, Route15_Text_AlexDefeat msgbox Route15_Text_AlexPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Grace:: @ 81AAC6F +Route15_EventScript_Grace:: trainerbattle_single TRAINER_BEAUTY_GRACE, Route15_Text_GraceIntro, Route15_Text_GraceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1319,12 +1319,12 @@ Route15_EventScript_Grace:: @ 81AAC6F msgbox Route15_Text_GracePostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_GraceRematch:: @ 81AAC96 +Route15_EventScript_GraceRematch:: trainerbattle_rematch TRAINER_BEAUTY_GRACE, Route15_Text_GraceRematchIntro, Route15_Text_GraceDefeat msgbox Route15_Text_GracePostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Olivia:: @ 81AACAD +Route15_EventScript_Olivia:: trainerbattle_single TRAINER_BEAUTY_OLIVIA, Route15_Text_OliviaIntro, Route15_Text_OliviaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1332,12 +1332,12 @@ Route15_EventScript_Olivia:: @ 81AACAD msgbox Route15_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_OliviaRematch:: @ 81AACD4 +Route15_EventScript_OliviaRematch:: trainerbattle_rematch TRAINER_BEAUTY_OLIVIA, Route15_Text_OliviaRematchIntro, Route15_Text_OliviaDefeat msgbox Route15_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Edwin:: @ 81AACEB +Route15_EventScript_Edwin:: trainerbattle_single TRAINER_BIRD_KEEPER_EDWIN, Route15_Text_EdwinIntro, Route15_Text_EdwinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1345,12 +1345,12 @@ Route15_EventScript_Edwin:: @ 81AACEB msgbox Route15_Text_EdwinPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_EdwinRematch:: @ 81AAD12 +Route15_EventScript_EdwinRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_EDWIN, Route15_Text_EdwinRematchIntro, Route15_Text_EdwinDefeat msgbox Route15_Text_EdwinPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Chester:: @ 81AAD29 +Route15_EventScript_Chester:: trainerbattle_single TRAINER_BIRD_KEEPER_CHESTER, Route15_Text_ChesterIntro, Route15_Text_ChesterDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1358,12 +1358,12 @@ Route15_EventScript_Chester:: @ 81AAD29 msgbox Route15_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_ChesterRematch:: @ 81AAD50 +Route15_EventScript_ChesterRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_CHESTER, Route15_Text_ChesterRematchIntro, Route15_Text_ChesterDefeat msgbox Route15_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Yazmin:: @ 81AAD67 +Route15_EventScript_Yazmin:: trainerbattle_single TRAINER_PICNICKER_YAZMIN, Route15_Text_YazminIntro, Route15_Text_YazminDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1371,12 +1371,12 @@ Route15_EventScript_Yazmin:: @ 81AAD67 msgbox Route15_Text_YazminPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_YazminRematch:: @ 81AAD8E +Route15_EventScript_YazminRematch:: trainerbattle_rematch TRAINER_PICNICKER_YAZMIN, Route15_Text_YazminRematchIntro, Route15_Text_YazminDefeat msgbox Route15_Text_YazminPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Kindra:: @ 81AADA5 +Route15_EventScript_Kindra:: trainerbattle_single TRAINER_PICNICKER_KINDRA, Route15_Text_KindraIntro, Route15_Text_KindraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1384,12 +1384,12 @@ Route15_EventScript_Kindra:: @ 81AADA5 msgbox Route15_Text_KindraPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_KindraRematch:: @ 81AADCC +Route15_EventScript_KindraRematch:: trainerbattle_rematch TRAINER_PICNICKER_KINDRA, Route15_Text_KindraRematchIntro, Route15_Text_KindraDefeat msgbox Route15_Text_KindraPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Becky:: @ 81AADE3 +Route15_EventScript_Becky:: trainerbattle_single TRAINER_PICNICKER_BECKY, Route15_Text_BeckyIntro, Route15_Text_BeckyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1397,12 +1397,12 @@ Route15_EventScript_Becky:: @ 81AADE3 msgbox Route15_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_BeckyRematch:: @ 81AAE0A +Route15_EventScript_BeckyRematch:: trainerbattle_rematch TRAINER_PICNICKER_BECKY, Route15_Text_BeckyRematchIntro, Route15_Text_BeckyDefeat msgbox Route15_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Celia:: @ 81AAE21 +Route15_EventScript_Celia:: trainerbattle_single TRAINER_PICNICKER_CELIA, Route15_Text_CeliaIntro, Route15_Text_CeliaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1410,12 +1410,12 @@ Route15_EventScript_Celia:: @ 81AAE21 msgbox Route15_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_CeliaRematch:: @ 81AAE48 +Route15_EventScript_CeliaRematch:: trainerbattle_rematch TRAINER_PICNICKER_CELIA, Route15_Text_CeliaRematchIntro, Route15_Text_CeliaDefeat msgbox Route15_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Mya:: @ 81AAE5F +Route15_EventScript_Mya:: trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_MyaIntro, Route15_Text_MyaDefeat, Route15_Text_MyaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1423,12 +1423,12 @@ Route15_EventScript_Mya:: @ 81AAE5F msgbox Route15_Text_MyaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_MyaRematch:: @ 81AAE8A +Route15_EventScript_MyaRematch:: trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_MyaRematchIntro, Route15_Text_MyaDefeat, Route15_Text_MyaNotEnoughMons msgbox Route15_Text_MyaPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_Ron:: @ 81AAEA5 +Route15_EventScript_Ron:: trainerbattle_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_RonIntro, Route15_Text_RonDefeat, Route15_Text_RonNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1436,12 +1436,12 @@ Route15_EventScript_Ron:: @ 81AAEA5 msgbox Route15_Text_RonPostBattle, MSGBOX_AUTOCLOSE end -Route15_EventScript_RonRematch:: @ 81AAED0 +Route15_EventScript_RonRematch:: trainerbattle_rematch_double TRAINER_CRUSH_KIN_RON_MYA, Route15_Text_RonRematchIntro, Route15_Text_RonDefeat, Route15_Text_RonNotEnoughMons msgbox Route15_Text_RonPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_Lao:: @ 81AAEEB +Route16_EventScript_Lao:: trainerbattle_single TRAINER_BIKER_LAO, Route16_Text_LaoIntro, Route16_Text_LaoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1449,12 +1449,12 @@ Route16_EventScript_Lao:: @ 81AAEEB msgbox Route16_Text_LaoPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_LaoRematch:: @ 81AAF12 +Route16_EventScript_LaoRematch:: trainerbattle_rematch TRAINER_BIKER_LAO, Route16_Text_LaoRematchIntro, Route16_Text_LaoDefeat msgbox Route16_Text_LaoPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_Hideo:: @ 81AAF29 +Route16_EventScript_Hideo:: trainerbattle_single TRAINER_BIKER_HIDEO, Route16_Text_HideoIntro, Route16_Text_HideoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1462,12 +1462,12 @@ Route16_EventScript_Hideo:: @ 81AAF29 msgbox Route16_Text_HideoPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_HideoRematch:: @ 81AAF50 +Route16_EventScript_HideoRematch:: trainerbattle_rematch TRAINER_BIKER_HIDEO, Route16_Text_HideoRematchIntro, Route16_Text_HideoDefeat msgbox Route16_Text_HideoPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_Ruben:: @ 81AAF67 +Route16_EventScript_Ruben:: trainerbattle_single TRAINER_BIKER_RUBEN, Route16_Text_RubenIntro, Route16_Text_RubenDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1475,12 +1475,12 @@ Route16_EventScript_Ruben:: @ 81AAF67 msgbox Route16_Text_RubenPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_RubenRematch:: @ 81AAF8E +Route16_EventScript_RubenRematch:: trainerbattle_rematch TRAINER_BIKER_RUBEN, Route16_Text_RubenRematchIntro, Route16_Text_RubenDefeat msgbox Route16_Text_RubenPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_Koji:: @ 81AAFA5 +Route16_EventScript_Koji:: trainerbattle_single TRAINER_CUE_BALL_KOJI, Route16_Text_KojiIntro, Route16_Text_KojiDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1488,12 +1488,12 @@ Route16_EventScript_Koji:: @ 81AAFA5 msgbox Route16_Text_KojiPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_KojiRematch:: @ 81AAFCC +Route16_EventScript_KojiRematch:: trainerbattle_rematch TRAINER_CUE_BALL_KOJI, Route16_Text_KojiRematchIntro, Route16_Text_KojiDefeat msgbox Route16_Text_KojiPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_Luke:: @ 81AAFE3 +Route16_EventScript_Luke:: trainerbattle_single TRAINER_CUE_BALL_LUKE, Route16_Text_LukeIntro, Route16_Text_LukeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1501,12 +1501,12 @@ Route16_EventScript_Luke:: @ 81AAFE3 msgbox Route16_Text_LukePostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_LukeRematch:: @ 81AB00A +Route16_EventScript_LukeRematch:: trainerbattle_rematch TRAINER_CUE_BALL_LUKE, Route16_Text_LukeRematchIntro, Route16_Text_LukeDefeat msgbox Route16_Text_LukePostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_Camron:: @ 81AB021 +Route16_EventScript_Camron:: trainerbattle_single TRAINER_CUE_BALL_CAMRON, Route16_Text_CamronIntro, Route16_Text_CamronDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1514,12 +1514,12 @@ Route16_EventScript_Camron:: @ 81AB021 msgbox Route16_Text_CamronPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_CamronRematch:: @ 81AB048 +Route16_EventScript_CamronRematch:: trainerbattle_rematch TRAINER_CUE_BALL_CAMRON, Route16_Text_CamronRematchIntro, Route16_Text_CamronDefeat msgbox Route16_Text_CamronPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_Jed:: @ 81AB05F +Route16_EventScript_Jed:: trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_JedIntro, Route16_Text_JedDefeat, Route16_Text_JedNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1527,12 +1527,12 @@ Route16_EventScript_Jed:: @ 81AB05F msgbox Route16_Text_JedPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_JedRematch:: @ 81AB08A +Route16_EventScript_JedRematch:: trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_JedRematchIntro, Route16_Text_JedDefeat, Route16_Text_JedNotEnoughMons msgbox Route16_Text_JedPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_Lea:: @ 81AB0A5 +Route16_EventScript_Lea:: trainerbattle_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_LeaIntro, Route16_Text_LeaDefeat, Route16_Text_LeaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1540,12 +1540,12 @@ Route16_EventScript_Lea:: @ 81AB0A5 msgbox Route16_Text_LeaPostBattle, MSGBOX_AUTOCLOSE end -Route16_EventScript_LeaRematch:: @ 81AB0D0 +Route16_EventScript_LeaRematch:: trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_LEA_JED, Route16_Text_LeaRematchIntro, Route16_Text_LeaDefeat, Route16_Text_LeaNotEnoughMons msgbox Route16_Text_LeaPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_Billy:: @ 81AB0EB +Route17_EventScript_Billy:: trainerbattle_single TRAINER_BIKER_BILLY, Route17_Text_BillyIntro, Route17_Text_BillyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1553,12 +1553,12 @@ Route17_EventScript_Billy:: @ 81AB0EB msgbox Route17_Text_BillyPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_BillyRematch:: @ 81AB112 +Route17_EventScript_BillyRematch:: trainerbattle_rematch TRAINER_BIKER_BILLY, Route17_Text_BillyRematchIntro, Route17_Text_BillyDefeat msgbox Route17_Text_BillyPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_Nikolas:: @ 81AB129 +Route17_EventScript_Nikolas:: trainerbattle_single TRAINER_BIKER_NIKOLAS, Route17_Text_NikolasIntro, Route17_Text_NikolasDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1566,12 +1566,12 @@ Route17_EventScript_Nikolas:: @ 81AB129 msgbox Route17_Text_NikolasPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_NikolasRematch:: @ 81AB150 +Route17_EventScript_NikolasRematch:: trainerbattle_rematch TRAINER_BIKER_NIKOLAS, Route17_Text_NikolasRematchIntro, Route17_Text_NikolasDefeat msgbox Route17_Text_NikolasPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_Jaxon:: @ 81AB167 +Route17_EventScript_Jaxon:: trainerbattle_single TRAINER_BIKER_JAXON, Route17_Text_JaxonIntro, Route17_Text_JaxonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1579,12 +1579,12 @@ Route17_EventScript_Jaxon:: @ 81AB167 msgbox Route17_Text_JaxonPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_JaxonRematch:: @ 81AB18E +Route17_EventScript_JaxonRematch:: trainerbattle_rematch TRAINER_BIKER_JAXON, Route17_Text_JaxonRematchIntro, Route17_Text_JaxonDefeat msgbox Route17_Text_JaxonPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_William:: @ 81AB1A5 +Route17_EventScript_William:: trainerbattle_single TRAINER_BIKER_WILLIAM, Route17_Text_WilliamIntro, Route17_Text_WilliamDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1592,12 +1592,12 @@ Route17_EventScript_William:: @ 81AB1A5 msgbox Route17_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_WilliamRematch:: @ 81AB1CC +Route17_EventScript_WilliamRematch:: trainerbattle_rematch TRAINER_BIKER_WILLIAM, Route17_Text_WilliamRematchIntro, Route17_Text_WilliamDefeat msgbox Route17_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_Raul:: @ 81AB1E3 +Route17_EventScript_Raul:: trainerbattle_single TRAINER_CUE_BALL_RAUL, Route17_Text_RaulIntro, Route17_Text_RaulDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1605,12 +1605,12 @@ Route17_EventScript_Raul:: @ 81AB1E3 msgbox Route17_Text_RaulPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_RaulRematch:: @ 81AB20A +Route17_EventScript_RaulRematch:: trainerbattle_rematch TRAINER_CUE_BALL_RAUL, Route17_Text_RaulRematchIntro, Route17_Text_RaulDefeat msgbox Route17_Text_RaulPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_Isaiah:: @ 81AB221 +Route17_EventScript_Isaiah:: trainerbattle_single TRAINER_CUE_BALL_ISAIAH, Route17_Text_IsaiahIntro, Route17_Text_IsaiahDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1618,12 +1618,12 @@ Route17_EventScript_Isaiah:: @ 81AB221 msgbox Route17_Text_IsaiahPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_IsaiahRematch:: @ 81AB248 +Route17_EventScript_IsaiahRematch:: trainerbattle_rematch TRAINER_CUE_BALL_ISAIAH, Route17_Text_IsaiahRematchIntro, Route17_Text_IsaiahDefeat msgbox Route17_Text_IsaiahPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_Zeek:: @ 81AB25F +Route17_EventScript_Zeek:: trainerbattle_single TRAINER_CUE_BALL_ZEEK, Route17_Text_ZeekIntro, Route17_Text_ZeekDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1631,12 +1631,12 @@ Route17_EventScript_Zeek:: @ 81AB25F msgbox Route17_Text_ZeekPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_ZeekRematch:: @ 81AB286 +Route17_EventScript_ZeekRematch:: trainerbattle_rematch TRAINER_CUE_BALL_ZEEK, Route17_Text_ZeekRematchIntro, Route17_Text_ZeekDefeat msgbox Route17_Text_ZeekPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_Jamal:: @ 81AB29D +Route17_EventScript_Jamal:: trainerbattle_single TRAINER_CUE_BALL_JAMAL, Route17_Text_JamalIntro, Route17_Text_JamalDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1644,12 +1644,12 @@ Route17_EventScript_Jamal:: @ 81AB29D msgbox Route17_Text_JamalPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_JamalRematch:: @ 81AB2C4 +Route17_EventScript_JamalRematch:: trainerbattle_rematch TRAINER_CUE_BALL_JAMAL, Route17_Text_JamalRematchIntro, Route17_Text_JamalDefeat msgbox Route17_Text_JamalPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_Corey:: @ 81AB2DB +Route17_EventScript_Corey:: trainerbattle_single TRAINER_CUE_BALL_COREY, Route17_Text_CoreyIntro, Route17_Text_CoreyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1657,12 +1657,12 @@ Route17_EventScript_Corey:: @ 81AB2DB msgbox Route17_Text_CoreyPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_CoreyRematch:: @ 81AB302 +Route17_EventScript_CoreyRematch:: trainerbattle_rematch TRAINER_CUE_BALL_COREY, Route17_Text_CoreyRematchIntro, Route17_Text_CoreyDefeat msgbox Route17_Text_CoreyPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_Virgil:: @ 81AB319 +Route17_EventScript_Virgil:: trainerbattle_single TRAINER_BIKER_VIRGIL, Route17_Text_VirgilIntro, Route17_Text_VirgilDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1670,12 +1670,12 @@ Route17_EventScript_Virgil:: @ 81AB319 msgbox Route17_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE end -Route17_EventScript_VirgilRematch:: @ 81AB340 +Route17_EventScript_VirgilRematch:: trainerbattle_rematch TRAINER_BIKER_VIRGIL, Route17_Text_VirgilRematchIntro, Route17_Text_VirgilDefeat msgbox Route17_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_Wilton:: @ 81AB357 +Route18_EventScript_Wilton:: trainerbattle_single TRAINER_BIRD_KEEPER_WILTON, Route18_Text_WiltonIntro, Route18_Text_WiltonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1683,12 +1683,12 @@ Route18_EventScript_Wilton:: @ 81AB357 msgbox Route18_Text_WiltonPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_WiltonRematch:: @ 81AB37E +Route18_EventScript_WiltonRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_WILTON, Route18_Text_WiltonRematchIntro, Route18_Text_WiltonDefeat msgbox Route18_Text_WiltonPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_Ramiro:: @ 81AB395 +Route18_EventScript_Ramiro:: trainerbattle_single TRAINER_BIRD_KEEPER_RAMIRO, Route18_Text_RamiroIntro, Route18_Text_RamiroDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1696,12 +1696,12 @@ Route18_EventScript_Ramiro:: @ 81AB395 msgbox Route18_Text_RamiroPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_RamiroRematch:: @ 81AB3BC +Route18_EventScript_RamiroRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_RAMIRO, Route18_Text_RamiroRematchIntro, Route18_Text_RamiroDefeat msgbox Route18_Text_RamiroPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_Jacob:: @ 81AB3D3 +Route18_EventScript_Jacob:: trainerbattle_single TRAINER_BIRD_KEEPER_JACOB, Route18_Text_JacobIntro, Route18_Text_JacobDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1709,12 +1709,12 @@ Route18_EventScript_Jacob:: @ 81AB3D3 msgbox Route18_Text_JacobPostBattle, MSGBOX_AUTOCLOSE end -Route18_EventScript_JacobRematch:: @ 81AB3FA +Route18_EventScript_JacobRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_JACOB, Route18_Text_JacobRematchIntro, Route18_Text_JacobDefeat msgbox Route18_Text_JacobPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_Richard:: @ 81AB411 +Route19_EventScript_Richard:: trainerbattle_single TRAINER_SWIMMER_MALE_RICHARD, Route19_Text_RichardIntro, Route19_Text_RichardDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1722,12 +1722,12 @@ Route19_EventScript_Richard:: @ 81AB411 msgbox Route19_Text_RichardPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_RichardRematch:: @ 81AB438 +Route19_EventScript_RichardRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_RICHARD, Route19_Text_RichardRematchIntro, Route19_Text_RichardDefeat msgbox Route19_Text_RichardPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_Reece:: @ 81AB44F +Route19_EventScript_Reece:: trainerbattle_single TRAINER_SWIMMER_MALE_REECE, Route19_Text_ReeceIntro, Route19_Text_ReeceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1735,12 +1735,12 @@ Route19_EventScript_Reece:: @ 81AB44F msgbox Route19_Text_ReecePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_ReeceRematch:: @ 81AB476 +Route19_EventScript_ReeceRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_REECE, Route19_Text_ReeceRematchIntro, Route19_Text_ReeceDefeat msgbox Route19_Text_ReecePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_Matthew:: @ 81AB48D +Route19_EventScript_Matthew:: trainerbattle_single TRAINER_SWIMMER_MALE_MATTHEW, Route19_Text_MatthewIntro, Route19_Text_MatthewDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1748,12 +1748,12 @@ Route19_EventScript_Matthew:: @ 81AB48D msgbox Route19_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_MatthewRematch:: @ 81AB4B4 +Route19_EventScript_MatthewRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_MATTHEW, Route19_Text_MatthewRematchIntro, Route19_Text_MatthewDefeat msgbox Route19_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_Douglas:: @ 81AB4CB +Route19_EventScript_Douglas:: trainerbattle_single TRAINER_SWIMMER_MALE_DOUGLAS, Route19_Text_DouglasIntro, Route19_Text_DouglasDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1761,12 +1761,12 @@ Route19_EventScript_Douglas:: @ 81AB4CB msgbox Route19_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_DouglasRematch:: @ 81AB4F2 +Route19_EventScript_DouglasRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_DOUGLAS, Route19_Text_DouglasRematchIntro, Route19_Text_DouglasDefeat msgbox Route19_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_David:: @ 81AB509 +Route19_EventScript_David:: trainerbattle_single TRAINER_SWIMMER_MALE_DAVID, Route19_Text_DavidIntro, Route19_Text_DavidDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1774,12 +1774,12 @@ Route19_EventScript_David:: @ 81AB509 msgbox Route19_Text_DavidPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_DavidRematch:: @ 81AB530 +Route19_EventScript_DavidRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_DAVID, Route19_Text_DavidRematchIntro, Route19_Text_DavidDefeat msgbox Route19_Text_DavidPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_Tony:: @ 81AB547 +Route19_EventScript_Tony:: trainerbattle_single TRAINER_SWIMMER_MALE_TONY, Route19_Text_TonyIntro, Route19_Text_TonyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1787,12 +1787,12 @@ Route19_EventScript_Tony:: @ 81AB547 msgbox Route19_Text_TonyPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_TonyRematch:: @ 81AB56E +Route19_EventScript_TonyRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_TONY, Route19_Text_TonyRematchIntro, Route19_Text_TonyDefeat msgbox Route19_Text_TonyPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_Axle:: @ 81AB585 +Route19_EventScript_Axle:: trainerbattle_single TRAINER_SWIMMER_MALE_AXLE, Route19_Text_AxleIntro, Route19_Text_AxleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1800,12 +1800,12 @@ Route19_EventScript_Axle:: @ 81AB585 msgbox Route19_Text_AxlePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_AxleRematch:: @ 81AB5AC +Route19_EventScript_AxleRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_AXLE, Route19_Text_AxleRematchIntro, Route19_Text_AxleDefeat msgbox Route19_Text_AxlePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_Anya:: @ 81AB5C3 +Route19_EventScript_Anya:: trainerbattle_single TRAINER_SWIMMER_FEMALE_ANYA, Route19_Text_AnyaIntro, Route19_Text_AnyaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1813,12 +1813,12 @@ Route19_EventScript_Anya:: @ 81AB5C3 msgbox Route19_Text_AnyaPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_AnyaRematch:: @ 81AB5EA +Route19_EventScript_AnyaRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ANYA, Route19_Text_AnyaRematchIntro, Route19_Text_AnyaDefeat msgbox Route19_Text_AnyaPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_Alice:: @ 81AB601 +Route19_EventScript_Alice:: trainerbattle_single TRAINER_SWIMMER_FEMALE_ALICE, Route19_Text_AliceIntro, Route19_Text_AliceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1826,12 +1826,12 @@ Route19_EventScript_Alice:: @ 81AB601 msgbox Route19_Text_AlicePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_AliceRematch:: @ 81AB628 +Route19_EventScript_AliceRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ALICE, Route19_Text_AliceRematchIntro, Route19_Text_AliceDefeat msgbox Route19_Text_AlicePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_Connie:: @ 81AB63F +Route19_EventScript_Connie:: trainerbattle_single TRAINER_SWIMMER_FEMALE_CONNIE, Route19_Text_ConnieIntro, Route19_Text_ConnieDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1839,12 +1839,12 @@ Route19_EventScript_Connie:: @ 81AB63F msgbox Route19_Text_ConniePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_ConnieRematch:: @ 81AB666 +Route19_EventScript_ConnieRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_CONNIE, Route19_Text_ConnieRematchIntro, Route19_Text_ConnieDefeat msgbox Route19_Text_ConniePostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_Lia:: @ 81AB67D +Route19_EventScript_Lia:: trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LiaIntro, Route19_Text_LiaDefeat, Route19_Text_LiaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1852,12 +1852,12 @@ Route19_EventScript_Lia:: @ 81AB67D msgbox Route19_Text_LiaPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_LiaRematch:: @ 81AB6A8 +Route19_EventScript_LiaRematch:: trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LiaRematchIntro, Route19_Text_LiaDefeat, Route19_Text_LiaNotEnoughMons msgbox Route19_Text_LiaPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_Luc:: @ 81AB6C3 +Route19_EventScript_Luc:: trainerbattle_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LucIntro, Route19_Text_LucDefeat, Route19_Text_LucNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1865,12 +1865,12 @@ Route19_EventScript_Luc:: @ 81AB6C3 msgbox Route19_Text_LucPostBattle, MSGBOX_AUTOCLOSE end -Route19_EventScript_LucRematch:: @ 81AB6EE +Route19_EventScript_LucRematch:: trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIA_LUC, Route19_Text_LucRematchIntro, Route19_Text_LucDefeat, Route19_Text_LucNotEnoughMons msgbox Route19_Text_LucPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_Barry:: @ 81AB709 +Route20_EventScript_Barry:: trainerbattle_single TRAINER_SWIMMER_MALE_BARRY, Route20_Text_BarryIntro, Route20_Text_BarryDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1878,12 +1878,12 @@ Route20_EventScript_Barry:: @ 81AB709 msgbox Route20_Text_BarryPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_BarryRematch:: @ 81AB730 +Route20_EventScript_BarryRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_BARRY, Route20_Text_BarryRematchIntro, Route20_Text_BarryDefeat msgbox Route20_Text_BarryPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_Dean:: @ 81AB747 +Route20_EventScript_Dean:: trainerbattle_single TRAINER_SWIMMER_MALE_DEAN, Route20_Text_DeanIntro, Route20_Text_DeanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1891,12 +1891,12 @@ Route20_EventScript_Dean:: @ 81AB747 msgbox Route20_Text_DeanPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_DeanRematch:: @ 81AB76E +Route20_EventScript_DeanRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_DEAN, Route20_Text_DeanRematchIntro, Route20_Text_DeanDefeat msgbox Route20_Text_DeanPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_Darrin:: @ 81AB785 +Route20_EventScript_Darrin:: trainerbattle_single TRAINER_SWIMMER_MALE_DARRIN, Route20_Text_DarrinIntro, Route20_Text_DarrinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1904,12 +1904,12 @@ Route20_EventScript_Darrin:: @ 81AB785 msgbox Route20_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_DarrinRematch:: @ 81AB7AC +Route20_EventScript_DarrinRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_DARRIN, Route20_Text_DarrinRematchIntro, Route20_Text_DarrinDefeat msgbox Route20_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_Tiffany:: @ 81AB7C3 +Route20_EventScript_Tiffany:: trainerbattle_single TRAINER_SWIMMER_FEMALE_TIFFANY, Route20_Text_TiffanyIntro, Route20_Text_TiffanyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1917,12 +1917,12 @@ Route20_EventScript_Tiffany:: @ 81AB7C3 msgbox Route20_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_TiffanyRematch:: @ 81AB7EA +Route20_EventScript_TiffanyRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TIFFANY, Route20_Text_TiffanyRematchIntro, Route20_Text_TiffanyDefeat msgbox Route20_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_Nora:: @ 81AB801 +Route20_EventScript_Nora:: trainerbattle_single TRAINER_SWIMMER_FEMALE_NORA, Route20_Text_NoraIntro, Route20_Text_NoraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1930,12 +1930,12 @@ Route20_EventScript_Nora:: @ 81AB801 msgbox Route20_Text_NoraPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_NoraRematch:: @ 81AB828 +Route20_EventScript_NoraRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NORA, Route20_Text_NoraRematchIntro, Route20_Text_NoraDefeat msgbox Route20_Text_NoraPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_Melissa:: @ 81AB83F +Route20_EventScript_Melissa:: trainerbattle_single TRAINER_SWIMMER_FEMALE_MELISSA, Route20_Text_MelissaIntro, Route20_Text_MelissaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1943,12 +1943,12 @@ Route20_EventScript_Melissa:: @ 81AB83F msgbox Route20_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_MelissaRematch:: @ 81AB866 +Route20_EventScript_MelissaRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MELISSA, Route20_Text_MelissaRematchIntro, Route20_Text_MelissaDefeat msgbox Route20_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_Shirley:: @ 81AB87D +Route20_EventScript_Shirley:: trainerbattle_single TRAINER_SWIMMER_FEMALE_SHIRLEY, Route20_Text_ShirleyIntro, Route20_Text_ShirleyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1956,12 +1956,12 @@ Route20_EventScript_Shirley:: @ 81AB87D msgbox Route20_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_ShirleyRematch:: @ 81AB8A4 +Route20_EventScript_ShirleyRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_SHIRLEY, Route20_Text_ShirleyRematchIntro, Route20_Text_ShirleyDefeat msgbox Route20_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_Roger:: @ 81AB8BB +Route20_EventScript_Roger:: trainerbattle_single TRAINER_BIRD_KEEPER_ROGER, Route20_Text_RogerIntro, Route20_Text_RogerDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1969,12 +1969,12 @@ Route20_EventScript_Roger:: @ 81AB8BB msgbox Route20_Text_RogerPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_RogerRematch:: @ 81AB8E2 +Route20_EventScript_RogerRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_ROGER, Route20_Text_RogerRematchIntro, Route20_Text_RogerDefeat msgbox Route20_Text_RogerPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_Missy:: @ 81AB8F9 +Route20_EventScript_Missy:: trainerbattle_single TRAINER_PICNICKER_MISSY, Route20_Text_MissyIntro, Route20_Text_MissyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1982,12 +1982,12 @@ Route20_EventScript_Missy:: @ 81AB8F9 msgbox Route20_Text_MissyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_MissyRematch:: @ 81AB920 +Route20_EventScript_MissyRematch:: trainerbattle_rematch TRAINER_PICNICKER_MISSY, Route20_Text_MissyRematchIntro, Route20_Text_MissyDefeat msgbox Route20_Text_MissyPostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_Irene:: @ 81AB937 +Route20_EventScript_Irene:: trainerbattle_single TRAINER_PICNICKER_IRENE, Route20_Text_IreneIntro, Route20_Text_IreneDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -1995,12 +1995,12 @@ Route20_EventScript_Irene:: @ 81AB937 msgbox Route20_Text_IrenePostBattle, MSGBOX_AUTOCLOSE end -Route20_EventScript_IreneRematch:: @ 81AB95E +Route20_EventScript_IreneRematch:: trainerbattle_rematch TRAINER_PICNICKER_IRENE, Route20_Text_IreneRematchIntro, Route20_Text_IreneDefeat msgbox Route20_Text_IrenePostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_Ronald:: @ 81AB975 +Route21_North_EventScript_Ronald:: trainerbattle_single TRAINER_FISHERMAN_RONALD, Route21_North_Text_RonaldIntro, Route21_North_Text_RonaldDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2008,12 +2008,12 @@ Route21_North_EventScript_Ronald:: @ 81AB975 msgbox Route21_North_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_RonaldRematch:: @ 81AB99C +Route21_North_EventScript_RonaldRematch:: trainerbattle_rematch TRAINER_FISHERMAN_RONALD, Route21_North_Text_RonaldRematchIntro, Route21_North_Text_RonaldDefeat msgbox Route21_North_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_Claude:: @ 81AB9B3 +Route21_South_EventScript_Claude:: trainerbattle_single TRAINER_FISHERMAN_CLAUDE, Route21_South_Text_ClaudeIntro, Route21_South_Text_ClaudeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2021,12 +2021,12 @@ Route21_South_EventScript_Claude:: @ 81AB9B3 msgbox Route21_South_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_ClaudeRematch:: @ 81AB9DA +Route21_South_EventScript_ClaudeRematch:: trainerbattle_rematch TRAINER_FISHERMAN_CLAUDE, Route21_South_Text_ClaudeRematchIntro, Route21_South_Text_ClaudeDefeat msgbox Route21_South_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_Wade:: @ 81AB9F1 +Route21_North_EventScript_Wade:: trainerbattle_single TRAINER_FISHERMAN_WADE, Route21_North_Text_WadeIntro, Route21_North_Text_WadeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2034,12 +2034,12 @@ Route21_North_EventScript_Wade:: @ 81AB9F1 msgbox Route21_North_Text_WadePostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_WadeRematch:: @ 81ABA18 +Route21_North_EventScript_WadeRematch:: trainerbattle_rematch TRAINER_FISHERMAN_WADE, Route21_North_Text_WadeRematchIntro, Route21_North_Text_WadeDefeat msgbox Route21_North_Text_WadePostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_Nolan:: @ 81ABA2F +Route21_South_EventScript_Nolan:: trainerbattle_single TRAINER_FISHERMAN_NOLAN, Route21_South_Text_NolanIntro, Route21_South_Text_NolanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2047,12 +2047,12 @@ Route21_South_EventScript_Nolan:: @ 81ABA2F msgbox Route21_South_Text_NolanPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_NolanRematch:: @ 81ABA56 +Route21_South_EventScript_NolanRematch:: trainerbattle_rematch TRAINER_FISHERMAN_NOLAN, Route21_South_Text_NolanRematchIntro, Route21_South_Text_NolanDefeat msgbox Route21_South_Text_NolanPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_Spencer:: @ 81ABA6D +Route21_North_EventScript_Spencer:: trainerbattle_single TRAINER_SWIMMER_MALE_SPENCER, Route21_North_Text_SpencerIntro, Route21_North_Text_SpencerDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2060,12 +2060,12 @@ Route21_North_EventScript_Spencer:: @ 81ABA6D msgbox Route21_North_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_SpencerRematch:: @ 81ABA94 +Route21_North_EventScript_SpencerRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_SPENCER, Route21_North_Text_SpencerRematchIntro, Route21_North_Text_SpencerDefeat msgbox Route21_North_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_Jack:: @ 81ABAAB +Route21_South_EventScript_Jack:: trainerbattle_single TRAINER_SWIMMER_MALE_JACK, Route21_South_Text_JackIntro, Route21_South_Text_JackDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2073,12 +2073,12 @@ Route21_South_EventScript_Jack:: @ 81ABAAB msgbox Route21_South_Text_JackPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_JackRematch:: @ 81ABAD2 +Route21_South_EventScript_JackRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_JACK, Route21_South_Text_JackRematchIntro, Route21_South_Text_JackDefeat msgbox Route21_South_Text_JackPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_Jerome:: @ 81ABAE9 +Route21_South_EventScript_Jerome:: trainerbattle_single TRAINER_SWIMMER_MALE_JEROME, Route21_South_Text_JeromeIntro, Route21_South_Text_JeromeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2086,12 +2086,12 @@ Route21_South_EventScript_Jerome:: @ 81ABAE9 msgbox Route21_South_Text_JeromePostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_JeromeRematch:: @ 81ABB10 +Route21_South_EventScript_JeromeRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_JEROME, Route21_South_Text_JeromeRematchIntro, Route21_South_Text_JeromeDefeat msgbox Route21_South_Text_JeromePostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_Roland:: @ 81ABB27 +Route21_South_EventScript_Roland:: trainerbattle_single TRAINER_SWIMMER_MALE_ROLAND, Route21_South_Text_RolandIntro, Route21_South_Text_RolandDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2099,12 +2099,12 @@ Route21_South_EventScript_Roland:: @ 81ABB27 msgbox Route21_South_Text_RolandPostBattle, MSGBOX_AUTOCLOSE end -Route21_South_EventScript_RolandRematch:: @ 81ABB4E +Route21_South_EventScript_RolandRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_ROLAND, Route21_South_Text_RolandRematchIntro, Route21_South_Text_RolandDefeat msgbox Route21_South_Text_RolandPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_Lil:: @ 81ABB65 +Route21_North_EventScript_Lil:: trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_LilIntro, Route21_North_Text_LilDefeat, Route21_North_Text_LilNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2112,12 +2112,12 @@ Route21_North_EventScript_Lil:: @ 81ABB65 msgbox Route21_North_Text_LilPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_LilRematch:: @ 81ABB90 +Route21_North_EventScript_LilRematch:: trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_LilRematchIntro, Route21_North_Text_LilDefeat, Route21_North_Text_LilNotEnoughMons msgbox Route21_North_Text_LilPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_Ian:: @ 81ABBAB +Route21_North_EventScript_Ian:: trainerbattle_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_IanIntro, Route21_North_Text_IanDefeat, Route21_North_Text_IanNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2125,12 +2125,12 @@ Route21_North_EventScript_Ian:: @ 81ABBAB msgbox Route21_North_Text_IanPostBattle, MSGBOX_AUTOCLOSE end -Route21_North_EventScript_IanRematch:: @ 81ABBD6 +Route21_North_EventScript_IanRematch:: trainerbattle_rematch_double TRAINER_SIS_AND_BRO_LIL_IAN, Route21_North_Text_IanRematchIntro, Route21_North_Text_IanDefeat, Route21_North_Text_IanNotEnoughMons msgbox Route21_North_Text_IanPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Maria:: @ 81ABBF1 +OneIsland_KindleRoad_EventScript_Maria:: trainerbattle_single TRAINER_SWIMMER_FEMALE_MARIA, OneIsland_KindleRoad_Text_MariaIntro, OneIsland_KindleRoad_Text_MariaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2138,12 +2138,12 @@ OneIsland_KindleRoad_EventScript_Maria:: @ 81ABBF1 msgbox OneIsland_KindleRoad_Text_MariaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_MariaRematch:: @ 81ABC18 +OneIsland_KindleRoad_EventScript_MariaRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_MARIA, OneIsland_KindleRoad_Text_MariaRematchIntro, OneIsland_KindleRoad_Text_MariaDefeat msgbox OneIsland_KindleRoad_Text_MariaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Abigail:: @ 81ABC2F +OneIsland_KindleRoad_EventScript_Abigail:: trainerbattle_single TRAINER_SWIMMER_FEMALE_ABIGAIL, OneIsland_KindleRoad_Text_AbigailIntro, OneIsland_KindleRoad_Text_AbigailDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2151,12 +2151,12 @@ OneIsland_KindleRoad_EventScript_Abigail:: @ 81ABC2F msgbox OneIsland_KindleRoad_Text_AbigailPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_AbigailRematch:: @ 81ABC56 +OneIsland_KindleRoad_EventScript_AbigailRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_ABIGAIL, OneIsland_KindleRoad_Text_AbigailRematchIntro, OneIsland_KindleRoad_Text_AbigailDefeat msgbox OneIsland_KindleRoad_Text_AbigailPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Finn:: @ 81ABC6D +OneIsland_KindleRoad_EventScript_Finn:: trainerbattle_single TRAINER_SWIMMER_MALE_FINN, OneIsland_KindleRoad_Text_FinnIntro, OneIsland_KindleRoad_Text_FinnDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2164,12 +2164,12 @@ OneIsland_KindleRoad_EventScript_Finn:: @ 81ABC6D msgbox OneIsland_KindleRoad_Text_FinnPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_FinnRematch:: @ 81ABC94 +OneIsland_KindleRoad_EventScript_FinnRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_FINN, OneIsland_KindleRoad_Text_FinnRematchIntro, OneIsland_KindleRoad_Text_FinnDefeat msgbox OneIsland_KindleRoad_Text_FinnPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Garrett:: @ 81ABCAB +OneIsland_KindleRoad_EventScript_Garrett:: trainerbattle_single TRAINER_SWIMMER_MALE_GARRETT, OneIsland_KindleRoad_Text_GarrettIntro, OneIsland_KindleRoad_Text_GarrettDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2177,12 +2177,12 @@ OneIsland_KindleRoad_EventScript_Garrett:: @ 81ABCAB msgbox OneIsland_KindleRoad_Text_GarrettPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_GarrettRematch:: @ 81ABCD2 +OneIsland_KindleRoad_EventScript_GarrettRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_GARRETT, OneIsland_KindleRoad_Text_GarrettRematchIntro, OneIsland_KindleRoad_Text_GarrettDefeat msgbox OneIsland_KindleRoad_Text_GarrettPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Tommy:: @ 81ABCE9 +OneIsland_KindleRoad_EventScript_Tommy:: trainerbattle_single TRAINER_FISHERMAN_TOMMY, OneIsland_KindleRoad_Text_TommyIntro, OneIsland_KindleRoad_Text_TommyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2190,12 +2190,12 @@ OneIsland_KindleRoad_EventScript_Tommy:: @ 81ABCE9 msgbox OneIsland_KindleRoad_Text_TommyPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_TommyRematch:: @ 81ABD10 +OneIsland_KindleRoad_EventScript_TommyRematch:: trainerbattle_rematch TRAINER_FISHERMAN_TOMMY, OneIsland_KindleRoad_Text_TommyRematchIntro, OneIsland_KindleRoad_Text_TommyDefeat msgbox OneIsland_KindleRoad_Text_TommyPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Sharon:: @ 81ABD27 +OneIsland_KindleRoad_EventScript_Sharon:: trainerbattle_single TRAINER_CRUSH_GIRL_SHARON, OneIsland_KindleRoad_Text_SharonIntro, OneIsland_KindleRoad_Text_SharonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2203,12 +2203,12 @@ OneIsland_KindleRoad_EventScript_Sharon:: @ 81ABD27 msgbox OneIsland_KindleRoad_Text_SharonPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_SharonRematch:: @ 81ABD4E +OneIsland_KindleRoad_EventScript_SharonRematch:: trainerbattle_rematch TRAINER_CRUSH_GIRL_SHARON, OneIsland_KindleRoad_Text_SharonRematchIntro, OneIsland_KindleRoad_Text_SharonDefeat msgbox OneIsland_KindleRoad_Text_SharonPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Tanya:: @ 81ABD65 +OneIsland_KindleRoad_EventScript_Tanya:: trainerbattle_single TRAINER_CRUSH_GIRL_TANYA, OneIsland_KindleRoad_Text_TanyaIntro, OneIsland_KindleRoad_Text_TanyaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2216,12 +2216,12 @@ OneIsland_KindleRoad_EventScript_Tanya:: @ 81ABD65 msgbox OneIsland_KindleRoad_Text_TanyaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_TanyaRematch:: @ 81ABD8C +OneIsland_KindleRoad_EventScript_TanyaRematch:: trainerbattle_rematch TRAINER_CRUSH_GIRL_TANYA, OneIsland_KindleRoad_Text_TanyaRematchIntro, OneIsland_KindleRoad_Text_TanyaDefeat msgbox OneIsland_KindleRoad_Text_TanyaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Shea:: @ 81ABDA3 +OneIsland_KindleRoad_EventScript_Shea:: trainerbattle_single TRAINER_BLACK_BELT_SHEA, OneIsland_KindleRoad_Text_SheaIntro, OneIsland_KindleRoad_Text_SheaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2229,12 +2229,12 @@ OneIsland_KindleRoad_EventScript_Shea:: @ 81ABDA3 msgbox OneIsland_KindleRoad_Text_SheaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_SheaRematch:: @ 81ABDCA +OneIsland_KindleRoad_EventScript_SheaRematch:: trainerbattle_rematch TRAINER_BLACK_BELT_SHEA, OneIsland_KindleRoad_Text_SheaRematchIntro, OneIsland_KindleRoad_Text_SheaDefeat msgbox OneIsland_KindleRoad_Text_SheaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Hugh:: @ 81ABDE1 +OneIsland_KindleRoad_EventScript_Hugh:: trainerbattle_single TRAINER_BLACK_BELT_HUGH, OneIsland_KindleRoad_Text_HughIntro, OneIsland_KindleRoad_Text_HughDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2242,12 +2242,12 @@ OneIsland_KindleRoad_EventScript_Hugh:: @ 81ABDE1 msgbox OneIsland_KindleRoad_Text_HughPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_HughRematch:: @ 81ABE08 +OneIsland_KindleRoad_EventScript_HughRematch:: trainerbattle_rematch TRAINER_BLACK_BELT_HUGH, OneIsland_KindleRoad_Text_HughRematchIntro, OneIsland_KindleRoad_Text_HughDefeat msgbox OneIsland_KindleRoad_Text_HughPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Bryce:: @ 81ABE1F +OneIsland_KindleRoad_EventScript_Bryce:: trainerbattle_single TRAINER_CAMPER_BRYCE, OneIsland_KindleRoad_Text_BryceIntro, OneIsland_KindleRoad_Text_BryceDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2255,12 +2255,12 @@ OneIsland_KindleRoad_EventScript_Bryce:: @ 81ABE1F msgbox OneIsland_KindleRoad_Text_BrycePostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_BryceRematch:: @ 81ABE46 +OneIsland_KindleRoad_EventScript_BryceRematch:: trainerbattle_rematch TRAINER_CAMPER_BRYCE, OneIsland_KindleRoad_Text_BryceRematchIntro, OneIsland_KindleRoad_Text_BryceDefeat msgbox OneIsland_KindleRoad_Text_BrycePostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Claire:: @ 81ABE5D +OneIsland_KindleRoad_EventScript_Claire:: trainerbattle_single TRAINER_PICNICKER_CLAIRE, OneIsland_KindleRoad_Text_ClaireIntro, OneIsland_KindleRoad_Text_ClaireDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2268,12 +2268,12 @@ OneIsland_KindleRoad_EventScript_Claire:: @ 81ABE5D msgbox OneIsland_KindleRoad_Text_ClairePostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_ClaireRematch:: @ 81ABE84 +OneIsland_KindleRoad_EventScript_ClaireRematch:: trainerbattle_rematch TRAINER_PICNICKER_CLAIRE, OneIsland_KindleRoad_Text_ClaireRematchIntro, OneIsland_KindleRoad_Text_ClaireDefeat msgbox OneIsland_KindleRoad_Text_ClairePostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Kia:: @ 81ABE9B +OneIsland_KindleRoad_EventScript_Kia:: trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_KiaIntro, OneIsland_KindleRoad_Text_KiaDefeat, OneIsland_KindleRoad_Text_KiaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2281,12 +2281,12 @@ OneIsland_KindleRoad_EventScript_Kia:: @ 81ABE9B msgbox OneIsland_KindleRoad_Text_KiaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_KiaRematch:: @ 81ABEC6 +OneIsland_KindleRoad_EventScript_KiaRematch:: trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_KiaRematchIntro, OneIsland_KindleRoad_Text_KiaDefeat, OneIsland_KindleRoad_Text_KiaNotEnoughMons msgbox OneIsland_KindleRoad_Text_KiaPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_Mik:: @ 81ABEE1 +OneIsland_KindleRoad_EventScript_Mik:: trainerbattle_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_MikIntro, OneIsland_KindleRoad_Text_MikDefeat, OneIsland_KindleRoad_Text_MikNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2294,12 +2294,12 @@ OneIsland_KindleRoad_EventScript_Mik:: @ 81ABEE1 msgbox OneIsland_KindleRoad_Text_MikPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_KindleRoad_EventScript_MikRematch:: @ 81ABF0C +OneIsland_KindleRoad_EventScript_MikRematch:: trainerbattle_rematch_double TRAINER_CRUSH_KIN_MIK_KIA, OneIsland_KindleRoad_Text_MikRematchIntro, OneIsland_KindleRoad_Text_MikDefeat, OneIsland_KindleRoad_Text_MikNotEnoughMons msgbox OneIsland_KindleRoad_Text_MikPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_TreasureBeach_EventScript_Amara:: @ 81ABF27 +OneIsland_TreasureBeach_EventScript_Amara:: trainerbattle_single TRAINER_SWIMMER_FEMALE_AMARA, OneIsland_TreasureBeach_Text_AmaraIntro, OneIsland_TreasureBeach_Text_AmaraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2307,12 +2307,12 @@ OneIsland_TreasureBeach_EventScript_Amara:: @ 81ABF27 msgbox OneIsland_TreasureBeach_Text_AmaraPostBattle, MSGBOX_AUTOCLOSE end -OneIsland_TreasureBeach_EventScript_AmaraRematch:: @ 81ABF4E +OneIsland_TreasureBeach_EventScript_AmaraRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_AMARA, OneIsland_TreasureBeach_Text_AmaraRematchIntro, OneIsland_TreasureBeach_Text_AmaraDefeat msgbox OneIsland_TreasureBeach_Text_AmaraPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_Nikki:: @ 81ABF65 +ThreeIsland_BondBridge_EventScript_Nikki:: trainerbattle_single TRAINER_AROMA_LADY_NIKKI, ThreeIsland_BondBridge_Text_NikkiIntro, ThreeIsland_BondBridge_Text_NikkiDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2320,12 +2320,12 @@ ThreeIsland_BondBridge_EventScript_Nikki:: @ 81ABF65 msgbox ThreeIsland_BondBridge_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_NikkiRematch:: @ 81ABF8C +ThreeIsland_BondBridge_EventScript_NikkiRematch:: trainerbattle_rematch TRAINER_AROMA_LADY_NIKKI, ThreeIsland_BondBridge_Text_NikkiRematchIntro, ThreeIsland_BondBridge_Text_NikkiDefeat msgbox ThreeIsland_BondBridge_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_Violet:: @ 81ABFA3 +ThreeIsland_BondBridge_EventScript_Violet:: trainerbattle_single TRAINER_AROMA_LADY_VIOLET, ThreeIsland_BondBridge_Text_VioletIntro, ThreeIsland_BondBridge_Text_VioletDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2333,12 +2333,12 @@ ThreeIsland_BondBridge_EventScript_Violet:: @ 81ABFA3 msgbox ThreeIsland_BondBridge_Text_VioletPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_VioletRematch:: @ 81ABFCA +ThreeIsland_BondBridge_EventScript_VioletRematch:: trainerbattle_rematch TRAINER_AROMA_LADY_VIOLET, ThreeIsland_BondBridge_Text_VioletRematchIntro, ThreeIsland_BondBridge_Text_VioletDefeat msgbox ThreeIsland_BondBridge_Text_VioletPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_Amira:: @ 81ABFE1 +ThreeIsland_BondBridge_EventScript_Amira:: trainerbattle_single TRAINER_TUBER_AMIRA, ThreeIsland_BondBridge_Text_AmiraIntro, ThreeIsland_BondBridge_Text_AmiraDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2346,12 +2346,12 @@ ThreeIsland_BondBridge_EventScript_Amira:: @ 81ABFE1 msgbox ThreeIsland_BondBridge_Text_AmiraPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_AmiraRematch:: @ 81AC008 +ThreeIsland_BondBridge_EventScript_AmiraRematch:: trainerbattle_rematch TRAINER_TUBER_AMIRA, ThreeIsland_BondBridge_Text_AmiraRematchIntro, ThreeIsland_BondBridge_Text_AmiraDefeat msgbox ThreeIsland_BondBridge_Text_AmiraPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_Alexis:: @ 81AC01F +ThreeIsland_BondBridge_EventScript_Alexis:: trainerbattle_single TRAINER_TUBER_ALEXIS, ThreeIsland_BondBridge_Text_AlexisIntro, ThreeIsland_BondBridge_Text_AlexisDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2359,12 +2359,12 @@ ThreeIsland_BondBridge_EventScript_Alexis:: @ 81AC01F msgbox ThreeIsland_BondBridge_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_AlexisRematch:: @ 81AC046 +ThreeIsland_BondBridge_EventScript_AlexisRematch:: trainerbattle_rematch TRAINER_TUBER_ALEXIS, ThreeIsland_BondBridge_Text_AlexisRematchIntro, ThreeIsland_BondBridge_Text_AlexisDefeat msgbox ThreeIsland_BondBridge_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_Tisha:: @ 81AC05D +ThreeIsland_BondBridge_EventScript_Tisha:: trainerbattle_single TRAINER_SWIMMER_FEMALE_TISHA, ThreeIsland_BondBridge_Text_TishaIntro, ThreeIsland_BondBridge_Text_TishaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2372,12 +2372,12 @@ ThreeIsland_BondBridge_EventScript_Tisha:: @ 81AC05D msgbox ThreeIsland_BondBridge_Text_TishaPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_TishaRematch:: @ 81AC084 +ThreeIsland_BondBridge_EventScript_TishaRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_TISHA, ThreeIsland_BondBridge_Text_TishaRematchIntro, ThreeIsland_BondBridge_Text_TishaDefeat msgbox ThreeIsland_BondBridge_Text_TishaPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_Joy:: @ 81AC09B +ThreeIsland_BondBridge_EventScript_Joy:: trainerbattle_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_JoyIntro, ThreeIsland_BondBridge_Text_JoyDefeat, ThreeIsland_BondBridge_Text_JoyNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2385,12 +2385,12 @@ ThreeIsland_BondBridge_EventScript_Joy:: @ 81AC09B msgbox ThreeIsland_BondBridge_Text_JoyPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_JoyRematch:: @ 81AC0C6 +ThreeIsland_BondBridge_EventScript_JoyRematch:: trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_JoyRematchIntro, ThreeIsland_BondBridge_Text_JoyDefeat, ThreeIsland_BondBridge_Text_JoyNotEnoughMons msgbox ThreeIsland_BondBridge_Text_JoyPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_Meg:: @ 81AC0E1 +ThreeIsland_BondBridge_EventScript_Meg:: trainerbattle_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_MegIntro, ThreeIsland_BondBridge_Text_MegDefeat, ThreeIsland_BondBridge_Text_MegNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2398,12 +2398,12 @@ ThreeIsland_BondBridge_EventScript_Meg:: @ 81AC0E1 msgbox ThreeIsland_BondBridge_Text_MegPostBattle, MSGBOX_AUTOCLOSE end -ThreeIsland_BondBridge_EventScript_MegRematch:: @ 81AC10C +ThreeIsland_BondBridge_EventScript_MegRematch:: trainerbattle_rematch_double TRAINER_TWINS_JOY_MEG, ThreeIsland_BondBridge_Text_MegRematchIntro, ThreeIsland_BondBridge_Text_MegDefeat, ThreeIsland_BondBridge_Text_MegNotEnoughMons msgbox ThreeIsland_BondBridge_Text_MegPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_Daisy:: @ 81AC127 +FiveIsland_ResortGorgeous_EventScript_Daisy:: trainerbattle_single TRAINER_PAINTER_DAISY, FiveIsland_ResortGorgeous_Text_DaisyIntro, FiveIsland_ResortGorgeous_Text_DaisyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2411,12 +2411,12 @@ FiveIsland_ResortGorgeous_EventScript_Daisy:: @ 81AC127 msgbox FiveIsland_ResortGorgeous_Text_DaisyPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_DaisyRematch:: @ 81AC14E +FiveIsland_ResortGorgeous_EventScript_DaisyRematch:: trainerbattle_rematch TRAINER_PAINTER_DAISY, FiveIsland_ResortGorgeous_Text_DaisyRematchIntro, FiveIsland_ResortGorgeous_Text_DaisyDefeat msgbox FiveIsland_ResortGorgeous_Text_DaisyPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_Celina:: @ 81AC165 +FiveIsland_ResortGorgeous_EventScript_Celina:: trainerbattle_single TRAINER_PAINTER_CELINA, FiveIsland_ResortGorgeous_Text_CelinaIntro, FiveIsland_ResortGorgeous_Text_CelinaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2424,12 +2424,12 @@ FiveIsland_ResortGorgeous_EventScript_Celina:: @ 81AC165 msgbox FiveIsland_ResortGorgeous_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_CelinaRematch:: @ 81AC18C +FiveIsland_ResortGorgeous_EventScript_CelinaRematch:: trainerbattle_rematch TRAINER_PAINTER_CELINA, FiveIsland_ResortGorgeous_Text_CelinaRematchIntro, FiveIsland_ResortGorgeous_Text_CelinaDefeat msgbox FiveIsland_ResortGorgeous_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_Rayna:: @ 81AC1A3 +FiveIsland_ResortGorgeous_EventScript_Rayna:: trainerbattle_single TRAINER_PAINTER_RAYNA, FiveIsland_ResortGorgeous_Text_RaynaIntro, FiveIsland_ResortGorgeous_Text_RaynaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2437,12 +2437,12 @@ FiveIsland_ResortGorgeous_EventScript_Rayna:: @ 81AC1A3 msgbox FiveIsland_ResortGorgeous_Text_RaynaPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_RaynaRematch:: @ 81AC1CA +FiveIsland_ResortGorgeous_EventScript_RaynaRematch:: trainerbattle_rematch TRAINER_PAINTER_RAYNA, FiveIsland_ResortGorgeous_Text_RaynaRematchIntro, FiveIsland_ResortGorgeous_Text_RaynaDefeat msgbox FiveIsland_ResortGorgeous_Text_RaynaPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_Jacki:: @ 81AC1E1 +FiveIsland_ResortGorgeous_EventScript_Jacki:: trainerbattle_single TRAINER_LADY_JACKI, FiveIsland_ResortGorgeous_Text_JackiIntro, FiveIsland_ResortGorgeous_Text_JackiDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2450,12 +2450,12 @@ FiveIsland_ResortGorgeous_EventScript_Jacki:: @ 81AC1E1 msgbox FiveIsland_ResortGorgeous_Text_JackiPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_JackiRematch:: @ 81AC208 +FiveIsland_ResortGorgeous_EventScript_JackiRematch:: trainerbattle_rematch TRAINER_LADY_JACKI, FiveIsland_ResortGorgeous_Text_JackiRematchIntro, FiveIsland_ResortGorgeous_Text_JackiDefeat msgbox FiveIsland_ResortGorgeous_Text_JackiPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_Gillian:: @ 81AC21F +FiveIsland_ResortGorgeous_EventScript_Gillian:: trainerbattle_single TRAINER_LADY_GILLIAN, FiveIsland_ResortGorgeous_Text_GillianIntro, FiveIsland_ResortGorgeous_Text_GillianDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2463,12 +2463,12 @@ FiveIsland_ResortGorgeous_EventScript_Gillian:: @ 81AC21F msgbox FiveIsland_ResortGorgeous_Text_GillianPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_GillianRematch:: @ 81AC246 +FiveIsland_ResortGorgeous_EventScript_GillianRematch:: trainerbattle_rematch TRAINER_LADY_GILLIAN, FiveIsland_ResortGorgeous_Text_GillianRematchIntro, FiveIsland_ResortGorgeous_Text_GillianDefeat msgbox FiveIsland_ResortGorgeous_Text_GillianPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_Destin:: @ 81AC25D +FiveIsland_ResortGorgeous_EventScript_Destin:: trainerbattle_single TRAINER_YOUNGSTER_DESTIN, FiveIsland_ResortGorgeous_Text_DestinIntro, FiveIsland_ResortGorgeous_Text_DestinDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2476,12 +2476,12 @@ FiveIsland_ResortGorgeous_EventScript_Destin:: @ 81AC25D msgbox FiveIsland_ResortGorgeous_Text_DestinPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_DestinRematch:: @ 81AC284 +FiveIsland_ResortGorgeous_EventScript_DestinRematch:: trainerbattle_rematch TRAINER_YOUNGSTER_DESTIN, FiveIsland_ResortGorgeous_Text_DestinRematchIntro, FiveIsland_ResortGorgeous_Text_DestinDefeat msgbox FiveIsland_ResortGorgeous_Text_DestinPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_Toby:: @ 81AC29B +FiveIsland_ResortGorgeous_EventScript_Toby:: trainerbattle_single TRAINER_SWIMMER_MALE_TOBY, FiveIsland_ResortGorgeous_Text_TobyIntro, FiveIsland_ResortGorgeous_Text_TobyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2489,12 +2489,12 @@ FiveIsland_ResortGorgeous_EventScript_Toby:: @ 81AC29B msgbox FiveIsland_ResortGorgeous_Text_TobyPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_ResortGorgeous_EventScript_TobyRematch:: @ 81AC2C2 +FiveIsland_ResortGorgeous_EventScript_TobyRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_TOBY, FiveIsland_ResortGorgeous_Text_TobyRematchIntro, FiveIsland_ResortGorgeous_Text_TobyDefeat msgbox FiveIsland_ResortGorgeous_Text_TobyPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_WaterLabyrinth_EventScript_Alize:: @ 81AC2D9 +FiveIsland_WaterLabyrinth_EventScript_Alize:: trainerbattle_single TRAINER_PKMN_BREEDER_ALIZE, FiveIsland_WaterLabyrinth_Text_AlizeIntro, FiveIsland_WaterLabyrinth_Text_AlizeDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2502,12 +2502,12 @@ FiveIsland_WaterLabyrinth_EventScript_Alize:: @ 81AC2D9 msgbox FiveIsland_WaterLabyrinth_Text_AlizePostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_WaterLabyrinth_EventScript_AlizeRematch:: @ 81AC300 +FiveIsland_WaterLabyrinth_EventScript_AlizeRematch:: trainerbattle_rematch TRAINER_PKMN_BREEDER_ALIZE, FiveIsland_WaterLabyrinth_Text_AlizeRematchIntro, FiveIsland_WaterLabyrinth_Text_AlizeDefeat msgbox FiveIsland_WaterLabyrinth_Text_AlizePostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_Milo:: @ 81AC317 +FiveIsland_MemorialPillar_EventScript_Milo:: trainerbattle_single TRAINER_BIRD_KEEPER_MILO, FiveIsland_MemorialPillar_Text_MiloIntro, FiveIsland_MemorialPillar_Text_MiloDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2515,12 +2515,12 @@ FiveIsland_MemorialPillar_EventScript_Milo:: @ 81AC317 msgbox FiveIsland_MemorialPillar_Text_MiloPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_MiloRematch:: @ 81AC33E +FiveIsland_MemorialPillar_EventScript_MiloRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_MILO, FiveIsland_MemorialPillar_Text_MiloRematchIntro, FiveIsland_MemorialPillar_Text_MiloDefeat msgbox FiveIsland_MemorialPillar_Text_MiloPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_Chaz:: @ 81AC355 +FiveIsland_MemorialPillar_EventScript_Chaz:: trainerbattle_single TRAINER_BIRD_KEEPER_CHAZ, FiveIsland_MemorialPillar_Text_ChazIntro, FiveIsland_MemorialPillar_Text_ChazDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2528,12 +2528,12 @@ FiveIsland_MemorialPillar_EventScript_Chaz:: @ 81AC355 msgbox FiveIsland_MemorialPillar_Text_ChazPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_ChazRematch:: @ 81AC37C +FiveIsland_MemorialPillar_EventScript_ChazRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_CHAZ, FiveIsland_MemorialPillar_Text_ChazRematchIntro, FiveIsland_MemorialPillar_Text_ChazDefeat msgbox FiveIsland_MemorialPillar_Text_ChazPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_Harold:: @ 81AC393 +FiveIsland_MemorialPillar_EventScript_Harold:: trainerbattle_single TRAINER_BIRD_KEEPER_HAROLD, FiveIsland_MemorialPillar_Text_HaroldIntro, FiveIsland_MemorialPillar_Text_HaroldDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2541,12 +2541,12 @@ FiveIsland_MemorialPillar_EventScript_Harold:: @ 81AC393 msgbox FiveIsland_MemorialPillar_Text_HaroldPostBattle, MSGBOX_AUTOCLOSE end -FiveIsland_MemorialPillar_EventScript_HaroldRematch:: @ 81AC3BA +FiveIsland_MemorialPillar_EventScript_HaroldRematch:: trainerbattle_rematch TRAINER_BIRD_KEEPER_HAROLD, FiveIsland_MemorialPillar_Text_HaroldRematchIntro, FiveIsland_MemorialPillar_Text_HaroldDefeat msgbox FiveIsland_MemorialPillar_Text_HaroldPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_Tylor:: @ 81AC3D1 +SixIsland_OutcastIsland_EventScript_Tylor:: trainerbattle_single TRAINER_FISHERMAN_TYLOR, SixIsland_OutcastIsland_Text_TylorIntro, SixIsland_OutcastIsland_Text_TylorDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2554,12 +2554,12 @@ SixIsland_OutcastIsland_EventScript_Tylor:: @ 81AC3D1 msgbox SixIsland_OutcastIsland_Text_TylorPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_TylorRematch:: @ 81AC3F8 +SixIsland_OutcastIsland_EventScript_TylorRematch:: trainerbattle_rematch TRAINER_FISHERMAN_TYLOR, SixIsland_OutcastIsland_Text_TylorRematchIntro, SixIsland_OutcastIsland_Text_TylorDefeat msgbox SixIsland_OutcastIsland_Text_TylorPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_Mymo:: @ 81AC40F +SixIsland_OutcastIsland_EventScript_Mymo:: trainerbattle_single TRAINER_SWIMMER_MALE_MYMO, SixIsland_OutcastIsland_Text_MymoIntro, SixIsland_OutcastIsland_Text_MymoDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2567,12 +2567,12 @@ SixIsland_OutcastIsland_EventScript_Mymo:: @ 81AC40F msgbox SixIsland_OutcastIsland_Text_MymoPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_MymoRematch:: @ 81AC436 +SixIsland_OutcastIsland_EventScript_MymoRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_MYMO, SixIsland_OutcastIsland_Text_MymoRematchIntro, SixIsland_OutcastIsland_Text_MymoDefeat msgbox SixIsland_OutcastIsland_Text_MymoPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_Nicole:: @ 81AC44D +SixIsland_OutcastIsland_EventScript_Nicole:: trainerbattle_single TRAINER_SWIMMER_FEMALE_NICOLE, SixIsland_OutcastIsland_Text_NicoleIntro, SixIsland_OutcastIsland_Text_NicoleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2580,12 +2580,12 @@ SixIsland_OutcastIsland_EventScript_Nicole:: @ 81AC44D msgbox SixIsland_OutcastIsland_Text_NicolePostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_NicoleRematch:: @ 81AC474 +SixIsland_OutcastIsland_EventScript_NicoleRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NICOLE, SixIsland_OutcastIsland_Text_NicoleRematchIntro, SixIsland_OutcastIsland_Text_NicoleDefeat msgbox SixIsland_OutcastIsland_Text_NicolePostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_Ava:: @ 81AC48B +SixIsland_OutcastIsland_EventScript_Ava:: trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_AvaIntro, SixIsland_OutcastIsland_Text_AvaDefeat, SixIsland_OutcastIsland_Text_AvaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2593,12 +2593,12 @@ SixIsland_OutcastIsland_EventScript_Ava:: @ 81AC48B msgbox SixIsland_OutcastIsland_Text_AvaPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_AvaRematch:: @ 81AC4B6 +SixIsland_OutcastIsland_EventScript_AvaRematch:: trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_AvaRematchIntro, SixIsland_OutcastIsland_Text_AvaDefeat, SixIsland_OutcastIsland_Text_AvaNotEnoughMons msgbox SixIsland_OutcastIsland_Text_AvaPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_Geb:: @ 81AC4D1 +SixIsland_OutcastIsland_EventScript_Geb:: trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_GebIntro, SixIsland_OutcastIsland_Text_GebDefeat, SixIsland_OutcastIsland_Text_GebNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2606,12 +2606,12 @@ SixIsland_OutcastIsland_EventScript_Geb:: @ 81AC4D1 msgbox SixIsland_OutcastIsland_Text_GebPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_OutcastIsland_EventScript_GebRematch:: @ 81AC4FC +SixIsland_OutcastIsland_EventScript_GebRematch:: trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_GebRematchIntro, SixIsland_OutcastIsland_Text_GebDefeat, SixIsland_OutcastIsland_Text_GebNotEnoughMons msgbox SixIsland_OutcastIsland_Text_GebPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_GreenPath_EventScript_Jaclyn:: @ 81AC517 +SixIsland_GreenPath_EventScript_Jaclyn:: trainerbattle_single TRAINER_PSYCHIC_JACLYN, SixIsland_GreenPath_Text_JaclynIntro, SixIsland_GreenPath_Text_JaclynDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2619,12 +2619,12 @@ SixIsland_GreenPath_EventScript_Jaclyn:: @ 81AC517 msgbox SixIsland_GreenPath_Text_JaclynPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_GreenPath_EventScript_JaclynRematch:: @ 81AC53E +SixIsland_GreenPath_EventScript_JaclynRematch:: trainerbattle_rematch TRAINER_PSYCHIC_JACLYN, SixIsland_GreenPath_Text_JaclynRematchIntro, SixIsland_GreenPath_Text_JaclynDefeat msgbox SixIsland_GreenPath_Text_JaclynPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_Rose:: @ 81AC555 +SixIsland_WaterPath_EventScript_Rose:: trainerbattle_single TRAINER_AROMA_LADY_ROSE, SixIsland_WaterPath_Text_RoseIntro, SixIsland_WaterPath_Text_RoseDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2632,12 +2632,12 @@ SixIsland_WaterPath_EventScript_Rose:: @ 81AC555 msgbox SixIsland_WaterPath_Text_RosePostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_RoseRematch:: @ 81AC57C +SixIsland_WaterPath_EventScript_RoseRematch:: trainerbattle_rematch TRAINER_AROMA_LADY_ROSE, SixIsland_WaterPath_Text_RoseRematchIntro, SixIsland_WaterPath_Text_RoseDefeat msgbox SixIsland_WaterPath_Text_RosePostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_Edward:: @ 81AC593 +SixIsland_WaterPath_EventScript_Edward:: trainerbattle_single TRAINER_JUGGLER_EDWARD, SixIsland_WaterPath_Text_EdwardIntro, SixIsland_WaterPath_Text_EdwardDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2645,12 +2645,12 @@ SixIsland_WaterPath_EventScript_Edward:: @ 81AC593 msgbox SixIsland_WaterPath_Text_EdwardPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_EdwardRematch:: @ 81AC5BA +SixIsland_WaterPath_EventScript_EdwardRematch:: trainerbattle_rematch TRAINER_JUGGLER_EDWARD, SixIsland_WaterPath_Text_EdwardRematchIntro, SixIsland_WaterPath_Text_EdwardDefeat msgbox SixIsland_WaterPath_Text_EdwardPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_Samir:: @ 81AC5D1 +SixIsland_WaterPath_EventScript_Samir:: trainerbattle_single TRAINER_SWIMMER_MALE_SAMIR, SixIsland_WaterPath_Text_SamirIntro, SixIsland_WaterPath_Text_SamirDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2658,12 +2658,12 @@ SixIsland_WaterPath_EventScript_Samir:: @ 81AC5D1 msgbox SixIsland_WaterPath_Text_SamirPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_SamirRematch:: @ 81AC5F8 +SixIsland_WaterPath_EventScript_SamirRematch:: trainerbattle_rematch TRAINER_SWIMMER_MALE_SAMIR, SixIsland_WaterPath_Text_SamirRematchIntro, SixIsland_WaterPath_Text_SamirDefeat msgbox SixIsland_WaterPath_Text_SamirPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_Denise:: @ 81AC60F +SixIsland_WaterPath_EventScript_Denise:: trainerbattle_single TRAINER_SWIMMER_FEMALE_DENISE, SixIsland_WaterPath_Text_DeniseIntro, SixIsland_WaterPath_Text_DeniseDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2671,12 +2671,12 @@ SixIsland_WaterPath_EventScript_Denise:: @ 81AC60F msgbox SixIsland_WaterPath_Text_DenisePostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_DeniseRematch:: @ 81AC636 +SixIsland_WaterPath_EventScript_DeniseRematch:: trainerbattle_rematch TRAINER_SWIMMER_FEMALE_DENISE, SixIsland_WaterPath_Text_DeniseRematchIntro, SixIsland_WaterPath_Text_DeniseDefeat msgbox SixIsland_WaterPath_Text_DenisePostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_Miu:: @ 81AC64D +SixIsland_WaterPath_EventScript_Miu:: trainerbattle_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiuIntro, SixIsland_WaterPath_Text_MiuDefeat, SixIsland_WaterPath_Text_MiuNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2684,12 +2684,12 @@ SixIsland_WaterPath_EventScript_Miu:: @ 81AC64D msgbox SixIsland_WaterPath_Text_MiuPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_MiuRematch:: @ 81AC678 +SixIsland_WaterPath_EventScript_MiuRematch:: trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiuRematchIntro, SixIsland_WaterPath_Text_MiuDefeat, SixIsland_WaterPath_Text_MiuNotEnoughMons msgbox SixIsland_WaterPath_Text_MiuPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_Mia:: @ 81AC693 +SixIsland_WaterPath_EventScript_Mia:: trainerbattle_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiaIntro, SixIsland_WaterPath_Text_MiaDefeat, SixIsland_WaterPath_Text_MiaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2697,12 +2697,12 @@ SixIsland_WaterPath_EventScript_Mia:: @ 81AC693 msgbox SixIsland_WaterPath_Text_MiaPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_MiaRematch:: @ 81AC6BE +SixIsland_WaterPath_EventScript_MiaRematch:: trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiaRematchIntro, SixIsland_WaterPath_Text_MiaDefeat, SixIsland_WaterPath_Text_MiaNotEnoughMons msgbox SixIsland_WaterPath_Text_MiaPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_Earl:: @ 81AC6D9 +SixIsland_WaterPath_EventScript_Earl:: trainerbattle_single TRAINER_HIKER_EARL, SixIsland_WaterPath_Text_EarlIntro, SixIsland_WaterPath_Text_EarlDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2710,12 +2710,12 @@ SixIsland_WaterPath_EventScript_Earl:: @ 81AC6D9 msgbox SixIsland_WaterPath_Text_EarlPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_WaterPath_EventScript_EarlRematch:: @ 81AC700 +SixIsland_WaterPath_EventScript_EarlRematch:: trainerbattle_rematch TRAINER_HIKER_EARL, SixIsland_WaterPath_Text_EarlRematchIntro, SixIsland_WaterPath_Text_EarlDefeat msgbox SixIsland_WaterPath_Text_EarlPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_Stanly:: @ 81AC717 +SixIsland_RuinValley_EventScript_Stanly:: trainerbattle_single TRAINER_RUIN_MANIAC_STANLY, SixIsland_RuinValley_Text_StanlyIntro, SixIsland_RuinValley_Text_StanlyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2723,12 +2723,12 @@ SixIsland_RuinValley_EventScript_Stanly:: @ 81AC717 msgbox SixIsland_RuinValley_Text_StanlyPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_StanlyRematch:: @ 81AC73E +SixIsland_RuinValley_EventScript_StanlyRematch:: trainerbattle_rematch TRAINER_RUIN_MANIAC_STANLY, SixIsland_RuinValley_Text_StanlyRematchIntro, SixIsland_RuinValley_Text_StanlyDefeat msgbox SixIsland_RuinValley_Text_StanlyPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_Foster:: @ 81AC755 +SixIsland_RuinValley_EventScript_Foster:: trainerbattle_single TRAINER_RUIN_MANIAC_FOSTER, SixIsland_RuinValley_Text_FosterIntro, SixIsland_RuinValley_Text_FosterDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2736,12 +2736,12 @@ SixIsland_RuinValley_EventScript_Foster:: @ 81AC755 msgbox SixIsland_RuinValley_Text_FosterPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_FosterRematch:: @ 81AC77C +SixIsland_RuinValley_EventScript_FosterRematch:: trainerbattle_rematch TRAINER_RUIN_MANIAC_FOSTER, SixIsland_RuinValley_Text_FosterRematchIntro, SixIsland_RuinValley_Text_FosterDefeat msgbox SixIsland_RuinValley_Text_FosterPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_Larry:: @ 81AC793 +SixIsland_RuinValley_EventScript_Larry:: trainerbattle_single TRAINER_RUIN_MANIAC_LARRY, SixIsland_RuinValley_Text_LarryIntro, SixIsland_RuinValley_Text_LarryDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2749,12 +2749,12 @@ SixIsland_RuinValley_EventScript_Larry:: @ 81AC793 msgbox SixIsland_RuinValley_Text_LarryPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_LarryRematch:: @ 81AC7BA +SixIsland_RuinValley_EventScript_LarryRematch:: trainerbattle_rematch TRAINER_RUIN_MANIAC_LARRY, SixIsland_RuinValley_Text_LarryRematchIntro, SixIsland_RuinValley_Text_LarryDefeat msgbox SixIsland_RuinValley_Text_LarryPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_Daryl:: @ 81AC7D1 +SixIsland_RuinValley_EventScript_Daryl:: trainerbattle_single TRAINER_HIKER_DARYL, SixIsland_RuinValley_Text_DarylIntro, SixIsland_RuinValley_Text_DarylDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2762,12 +2762,12 @@ SixIsland_RuinValley_EventScript_Daryl:: @ 81AC7D1 msgbox SixIsland_RuinValley_Text_DarylPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_DarylRematch:: @ 81AC7F8 +SixIsland_RuinValley_EventScript_DarylRematch:: trainerbattle_rematch TRAINER_HIKER_DARYL, SixIsland_RuinValley_Text_DarylRematchIntro, SixIsland_RuinValley_Text_DarylDefeat msgbox SixIsland_RuinValley_Text_DarylPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_Hector:: @ 81AC80F +SixIsland_RuinValley_EventScript_Hector:: trainerbattle_single TRAINER_POKEMANIAC_HECTOR, SixIsland_RuinValley_Text_HectorIntro, SixIsland_RuinValley_Text_HectorDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2775,12 +2775,12 @@ SixIsland_RuinValley_EventScript_Hector:: @ 81AC80F msgbox SixIsland_RuinValley_Text_HectorPostBattle, MSGBOX_AUTOCLOSE end -SixIsland_RuinValley_EventScript_HectorRematch:: @ 81AC836 +SixIsland_RuinValley_EventScript_HectorRematch:: trainerbattle_rematch TRAINER_POKEMANIAC_HECTOR, SixIsland_RuinValley_Text_HectorRematchIntro, SixIsland_RuinValley_Text_HectorDefeat msgbox SixIsland_RuinValley_Text_HectorPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TrainerTower_EventScript_Dario:: @ 81AC84D +SevenIsland_TrainerTower_EventScript_Dario:: trainerbattle_single TRAINER_PSYCHIC_DARIO, SevenIsland_TrainerTower_Text_DarioIntro, SevenIsland_TrainerTower_Text_DarioDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2788,12 +2788,12 @@ SevenIsland_TrainerTower_EventScript_Dario:: @ 81AC84D msgbox SevenIsland_TrainerTower_Text_DarioPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TrainerTower_EventScript_DarioRematch:: @ 81AC874 +SevenIsland_TrainerTower_EventScript_DarioRematch:: trainerbattle_rematch TRAINER_PSYCHIC_DARIO, SevenIsland_TrainerTower_Text_DarioRematchIntro, SevenIsland_TrainerTower_Text_DarioDefeat msgbox SevenIsland_TrainerTower_Text_DarioPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TrainerTower_EventScript_Rodette:: @ 81AC88B +SevenIsland_TrainerTower_EventScript_Rodette:: trainerbattle_single TRAINER_PSYCHIC_RODETTE, SevenIsland_TrainerTower_Text_RodetteIntro, SevenIsland_TrainerTower_Text_RodetteDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2801,12 +2801,12 @@ SevenIsland_TrainerTower_EventScript_Rodette:: @ 81AC88B msgbox SevenIsland_TrainerTower_Text_RodettePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TrainerTower_EventScript_RodetteRematch:: @ 81AC8B2 +SevenIsland_TrainerTower_EventScript_RodetteRematch:: trainerbattle_rematch TRAINER_PSYCHIC_RODETTE, SevenIsland_TrainerTower_Text_RodetteRematchIntro, SevenIsland_TrainerTower_Text_RodetteDefeat msgbox SevenIsland_TrainerTower_Text_RodettePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_Miah:: @ 81AC8C9 +SevenIsland_SevaultCanyon_Entrance_EventScript_Miah:: trainerbattle_single TRAINER_AROMA_LADY_MIAH, SevenIsland_SevaultCanyon_Entrance_Text_MiahIntro, SevenIsland_SevaultCanyon_Entrance_Text_MiahDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2814,12 +2814,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_Miah:: @ 81AC8C9 msgbox SevenIsland_SevaultCanyon_Entrance_Text_MiahPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_MiahRematch:: @ 81AC8F0 +SevenIsland_SevaultCanyon_Entrance_EventScript_MiahRematch:: trainerbattle_rematch TRAINER_AROMA_LADY_MIAH, SevenIsland_SevaultCanyon_Entrance_Text_MiahRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_MiahDefeat msgbox SevenIsland_SevaultCanyon_Entrance_Text_MiahPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_Eve:: @ 81AC907 +SevenIsland_SevaultCanyon_Entrance_EventScript_Eve:: trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_EveIntro, SevenIsland_SevaultCanyon_Entrance_Text_EveDefeat, SevenIsland_SevaultCanyon_Entrance_Text_EveNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2827,12 +2827,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_Eve:: @ 81AC907 msgbox SevenIsland_SevaultCanyon_Entrance_Text_EvePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_EveRematch:: @ 81AC932 +SevenIsland_SevaultCanyon_Entrance_EventScript_EveRematch:: trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_EveRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_EveDefeat, SevenIsland_SevaultCanyon_Entrance_Text_EveNotEnoughMons msgbox SevenIsland_SevaultCanyon_Entrance_Text_EvePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_Jon:: @ 81AC94D +SevenIsland_SevaultCanyon_Entrance_EventScript_Jon:: trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_JonIntro, SevenIsland_SevaultCanyon_Entrance_Text_JonDefeat, SevenIsland_SevaultCanyon_Entrance_Text_JonNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2840,12 +2840,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_Jon:: @ 81AC94D msgbox SevenIsland_SevaultCanyon_Entrance_Text_JonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_JonRematch:: @ 81AC978 +SevenIsland_SevaultCanyon_Entrance_EventScript_JonRematch:: trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_JonRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_JonDefeat, SevenIsland_SevaultCanyon_Entrance_Text_JonNotEnoughMons msgbox SevenIsland_SevaultCanyon_Entrance_Text_JonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_Mason:: @ 81AC993 +SevenIsland_SevaultCanyon_Entrance_EventScript_Mason:: trainerbattle_single TRAINER_JUGGLER_MASON, SevenIsland_SevaultCanyon_Entrance_Text_MasonIntro, SevenIsland_SevaultCanyon_Entrance_Text_MasonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2853,12 +2853,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_Mason:: @ 81AC993 msgbox SevenIsland_SevaultCanyon_Entrance_Text_MasonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_MasonRematch:: @ 81AC9BA +SevenIsland_SevaultCanyon_Entrance_EventScript_MasonRematch:: trainerbattle_rematch TRAINER_JUGGLER_MASON, SevenIsland_SevaultCanyon_Entrance_Text_MasonRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_MasonDefeat msgbox SevenIsland_SevaultCanyon_Entrance_Text_MasonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_Nicolas:: @ 81AC9D1 +SevenIsland_SevaultCanyon_Entrance_EventScript_Nicolas:: trainerbattle_single TRAINER_PKMN_RANGER_NICOLAS, SevenIsland_SevaultCanyon_Entrance_Text_NicolasIntro, SevenIsland_SevaultCanyon_Entrance_Text_NicolasDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2866,12 +2866,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_Nicolas:: @ 81AC9D1 msgbox SevenIsland_SevaultCanyon_Entrance_Text_NicolasPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_NicolasRematch:: @ 81AC9F8 +SevenIsland_SevaultCanyon_Entrance_EventScript_NicolasRematch:: trainerbattle_rematch TRAINER_PKMN_RANGER_NICOLAS, SevenIsland_SevaultCanyon_Entrance_Text_NicolasRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_NicolasDefeat msgbox SevenIsland_SevaultCanyon_Entrance_Text_NicolasPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_Madeline:: @ 81ACA0F +SevenIsland_SevaultCanyon_Entrance_EventScript_Madeline:: trainerbattle_single TRAINER_PKMN_RANGER_MADELINE, SevenIsland_SevaultCanyon_Entrance_Text_MadelineIntro, SevenIsland_SevaultCanyon_Entrance_Text_MadelineDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2879,12 +2879,12 @@ SevenIsland_SevaultCanyon_Entrance_EventScript_Madeline:: @ 81ACA0F msgbox SevenIsland_SevaultCanyon_Entrance_Text_MadelinePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_Entrance_EventScript_MadelineRematch:: @ 81ACA36 +SevenIsland_SevaultCanyon_Entrance_EventScript_MadelineRematch:: trainerbattle_rematch TRAINER_PKMN_RANGER_MADELINE, SevenIsland_SevaultCanyon_Entrance_Text_MadelineRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_MadelineDefeat msgbox SevenIsland_SevaultCanyon_Entrance_Text_MadelinePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_Cyndy:: @ 81ACA4D +SevenIsland_SevaultCanyon_EventScript_Cyndy:: trainerbattle_single TRAINER_CRUSH_GIRL_CYNDY, SevenIsland_SevaultCanyon_Text_CyndyIntro, SevenIsland_SevaultCanyon_Text_CyndyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2892,12 +2892,12 @@ SevenIsland_SevaultCanyon_EventScript_Cyndy:: @ 81ACA4D msgbox SevenIsland_SevaultCanyon_Text_CyndyPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_CyndyRematch:: @ 81ACA74 +SevenIsland_SevaultCanyon_EventScript_CyndyRematch:: trainerbattle_rematch TRAINER_CRUSH_GIRL_CYNDY, SevenIsland_SevaultCanyon_Text_CyndyRematchIntro, SevenIsland_SevaultCanyon_Text_CyndyDefeat msgbox SevenIsland_SevaultCanyon_Text_CyndyPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_Evan:: @ 81ACA8B +SevenIsland_SevaultCanyon_EventScript_Evan:: trainerbattle_single TRAINER_TAMER_EVAN, SevenIsland_SevaultCanyon_Text_EvanIntro, SevenIsland_SevaultCanyon_Text_EvanDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2905,12 +2905,12 @@ SevenIsland_SevaultCanyon_EventScript_Evan:: @ 81ACA8B msgbox SevenIsland_SevaultCanyon_Text_EvanPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_EvanRematch:: @ 81ACAB2 +SevenIsland_SevaultCanyon_EventScript_EvanRematch:: trainerbattle_rematch TRAINER_TAMER_EVAN, SevenIsland_SevaultCanyon_Text_EvanRematchIntro, SevenIsland_SevaultCanyon_Text_EvanDefeat msgbox SevenIsland_SevaultCanyon_Text_EvanPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_Jackson:: @ 81ACAC9 +SevenIsland_SevaultCanyon_EventScript_Jackson:: trainerbattle_single TRAINER_PKMN_RANGER_JACKSON, SevenIsland_SevaultCanyon_Text_JacksonIntro, SevenIsland_SevaultCanyon_Text_JacksonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2918,12 +2918,12 @@ SevenIsland_SevaultCanyon_EventScript_Jackson:: @ 81ACAC9 msgbox SevenIsland_SevaultCanyon_Text_JacksonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_JacksonRematch:: @ 81ACAF0 +SevenIsland_SevaultCanyon_EventScript_JacksonRematch:: trainerbattle_rematch TRAINER_PKMN_RANGER_JACKSON, SevenIsland_SevaultCanyon_Text_JacksonRematchIntro, SevenIsland_SevaultCanyon_Text_JacksonDefeat msgbox SevenIsland_SevaultCanyon_Text_JacksonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_Katelyn:: @ 81ACB07 +SevenIsland_SevaultCanyon_EventScript_Katelyn:: trainerbattle_single TRAINER_PKMN_RANGER_KATELYN, SevenIsland_SevaultCanyon_Text_KatelynIntro, SevenIsland_SevaultCanyon_Text_KatelynDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2931,12 +2931,12 @@ SevenIsland_SevaultCanyon_EventScript_Katelyn:: @ 81ACB07 msgbox SevenIsland_SevaultCanyon_Text_KatelynPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_KatelynRematch:: @ 81ACB2E +SevenIsland_SevaultCanyon_EventScript_KatelynRematch:: trainerbattle_rematch TRAINER_PKMN_RANGER_KATELYN, SevenIsland_SevaultCanyon_Text_KatelynRematchIntro, SevenIsland_SevaultCanyon_Text_KatelynDefeat msgbox SevenIsland_SevaultCanyon_Text_KatelynPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_Leroy:: @ 81ACB45 +SevenIsland_SevaultCanyon_EventScript_Leroy:: trainerbattle_single TRAINER_COOLTRAINER_LEROY, SevenIsland_SevaultCanyon_Text_LeroyIntro, SevenIsland_SevaultCanyon_Text_LeroyDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2944,12 +2944,12 @@ SevenIsland_SevaultCanyon_EventScript_Leroy:: @ 81ACB45 msgbox SevenIsland_SevaultCanyon_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_LeroyRematch:: @ 81ACB6C +SevenIsland_SevaultCanyon_EventScript_LeroyRematch:: trainerbattle_rematch TRAINER_COOLTRAINER_LEROY, SevenIsland_SevaultCanyon_Text_LeroyRematchIntro, SevenIsland_SevaultCanyon_Text_LeroyDefeat msgbox SevenIsland_SevaultCanyon_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_Michelle:: @ 81ACB83 +SevenIsland_SevaultCanyon_EventScript_Michelle:: trainerbattle_single TRAINER_COOLTRAINER_MICHELLE, SevenIsland_SevaultCanyon_Text_MichelleIntro, SevenIsland_SevaultCanyon_Text_MichelleDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2957,12 +2957,12 @@ SevenIsland_SevaultCanyon_EventScript_Michelle:: @ 81ACB83 msgbox SevenIsland_SevaultCanyon_Text_MichellePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_MichelleRematch:: @ 81ACBAA +SevenIsland_SevaultCanyon_EventScript_MichelleRematch:: trainerbattle_rematch TRAINER_COOLTRAINER_MICHELLE, SevenIsland_SevaultCanyon_Text_MichelleRematchIntro, SevenIsland_SevaultCanyon_Text_MichelleDefeat msgbox SevenIsland_SevaultCanyon_Text_MichellePostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_Lex:: @ 81ACBC1 +SevenIsland_SevaultCanyon_EventScript_Lex:: trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_LexIntro, SevenIsland_SevaultCanyon_Text_LexDefeat, SevenIsland_SevaultCanyon_Text_LexNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2970,12 +2970,12 @@ SevenIsland_SevaultCanyon_EventScript_Lex:: @ 81ACBC1 msgbox SevenIsland_SevaultCanyon_Text_LexPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_LexRematch:: @ 81ACBEC +SevenIsland_SevaultCanyon_EventScript_LexRematch:: trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_LexRematchIntro, SevenIsland_SevaultCanyon_Text_LexDefeat, SevenIsland_SevaultCanyon_Text_LexNotEnoughMons msgbox SevenIsland_SevaultCanyon_Text_LexPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_Nya:: @ 81ACC07 +SevenIsland_SevaultCanyon_EventScript_Nya:: trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_NyaIntro, SevenIsland_SevaultCanyon_Text_NyaDefeat, SevenIsland_SevaultCanyon_Text_NyaNotEnoughMons specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2983,12 +2983,12 @@ SevenIsland_SevaultCanyon_EventScript_Nya:: @ 81ACC07 msgbox SevenIsland_SevaultCanyon_Text_NyaPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_SevaultCanyon_EventScript_NyaRematch:: @ 81ACC32 +SevenIsland_SevaultCanyon_EventScript_NyaRematch:: trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_NyaRematchIntro, SevenIsland_SevaultCanyon_Text_NyaDefeat, SevenIsland_SevaultCanyon_Text_NyaNotEnoughMons msgbox SevenIsland_SevaultCanyon_Text_NyaPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_Brandon:: @ 81ACC4D +SevenIsland_TanobyRuins_EventScript_Brandon:: trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -2996,12 +2996,12 @@ SevenIsland_TanobyRuins_EventScript_Brandon:: @ 81ACC4D msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_BrandonRematch:: @ 81ACC74 +SevenIsland_TanobyRuins_EventScript_BrandonRematch:: trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonRematchIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_Benjamin:: @ 81ACC8B +SevenIsland_TanobyRuins_EventScript_Benjamin:: trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -3009,12 +3009,12 @@ SevenIsland_TanobyRuins_EventScript_Benjamin:: @ 81ACC8B msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_BenjaminRematch:: @ 81ACCB2 +SevenIsland_TanobyRuins_EventScript_BenjaminRematch:: trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminRematchIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_Edna:: @ 81ACCC9 +SevenIsland_TanobyRuins_EventScript_Edna:: trainerbattle_single TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -3022,12 +3022,12 @@ SevenIsland_TanobyRuins_EventScript_Edna:: @ 81ACCC9 msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_EdnaRematch:: @ 81ACCF0 +SevenIsland_TanobyRuins_EventScript_EdnaRematch:: trainerbattle_rematch TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaRematchIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_Clifford:: @ 81ACD07 +SevenIsland_TanobyRuins_EventScript_Clifford:: trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, TRUE @@ -3035,7 +3035,7 @@ SevenIsland_TanobyRuins_EventScript_Clifford:: @ 81ACD07 msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE end -SevenIsland_TanobyRuins_EventScript_CliffordRematch:: @ 81ACD2E +SevenIsland_TanobyRuins_EventScript_CliffordRematch:: trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordRematchIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE end diff --git a/data/scripts/white_out.inc b/data/scripts/white_out.inc index 7c2199c8e..c86341d8e 100644 --- a/data/scripts/white_out.inc +++ b/data/scripts/white_out.inc @@ -1,4 +1,4 @@ -EventScript_AfterWhiteOutHeal:: @ 81A8D97 +EventScript_AfterWhiteOutHeal:: lockall textcolor 1 msgbox Text_FirstShouldRestoreMonsHealth @@ -11,17 +11,17 @@ EventScript_AfterWhiteOutHeal:: @ 81A8D97 releaseall end -EventScript_AfterWhiteOutHealMsgPreBrock:: @ 81A8DC6 +EventScript_AfterWhiteOutHealMsgPreBrock:: msgbox Text_MonsHealedShouldBuyPotions return -EventScript_AfterWhiteOutHealMsg:: @ 81A8DCF +EventScript_AfterWhiteOutHealMsg:: msgbox Text_MonsHealed return @ LOCALID_MOM set by PalletTown_PlayersHouse_1F -EventScript_AfterWhiteOutMomHeal:: @ 81A8DD8 +EventScript_AfterWhiteOutMomHeal:: lockall textcolor 1 applymovement LOCALID_MOM, Movement_WalkInPlaceFastestDown @@ -33,7 +33,7 @@ EventScript_AfterWhiteOutMomHeal:: @ 81A8DD8 releaseall end -EventScript_FieldPoison:: @ 81A8DFD +EventScript_FieldPoison:: lockall textcolor 3 special TryFieldPoisonWhiteOut @@ -43,7 +43,7 @@ EventScript_FieldPoison:: @ 81A8DFD releaseall end -EventScript_FieldWhiteOut:: @ 81A8E11 +EventScript_FieldWhiteOut:: checkmoney 1, 0 compare VAR_RESULT, FALSE goto_if_eq EventScript_FieldWhiteOutNoMoney @@ -51,18 +51,18 @@ EventScript_FieldWhiteOut:: @ 81A8E11 goto_if_eq EventScript_FieldWhiteOutHasMoney end -EventScript_FieldWhiteOutNoMoney:: @ 81A8E2E +EventScript_FieldWhiteOutNoMoney:: msgbox Text_WhitedOut goto EventScript_FieldWhiteOutFade end -EventScript_FieldWhiteOutHasMoney:: @ 81A8E3C +EventScript_FieldWhiteOutHasMoney:: special OverworldWhiteOutGetMoneyLoss msgbox Text_WhitedOutLostMoney goto EventScript_FieldWhiteOutFade end -EventScript_FieldWhiteOutFade:: @ 81A8E4D +EventScript_FieldWhiteOutFade:: special Script_FadeOutMapMusic waitstate fadescreen FADE_TO_BLACK diff --git a/data/smokescreen.s b/data/smokescreen.s index e30e23b0d..3a4a46558 100644 --- a/data/smokescreen.s +++ b/data/smokescreen.s @@ -3,10 +3,10 @@ .section .rodata .align 2 -gSmokescreenImpactSpriteSheet:: @ 825098C +gSmokescreenImpactSpriteSheet:: obj_tiles gSmokescreenImpactTiles, 0x0180, 55019 -gSmokescreenImpactSpritePalette:: @ 8250994 +gSmokescreenImpactSpritePalette:: obj_pal gSmokescreenImpactPalette, 55019 gOamData_835099C:: @@ -42,14 +42,14 @@ gSpriteAnimTable_82509E4:: .4byte gAnimCmd_82509C4 .4byte gAnimCmd_82509D4 -gSmokescreenImpactSpriteTemplate:: @ 82509F4 +gSmokescreenImpactSpriteTemplate:: spr_template 55019, 55019, gOamData_835099C, gSpriteAnimTable_82509E4, NULL, gDummySpriteAffineAnimTable, SpriteCB_DestroySprite -gSpriteSheet_EnemyShadow:: @ 8250A0C +gSpriteSheet_EnemyShadow:: obj_tiles gFile_graphics_battle_interface_enemy_mon_shadow_sheet, 0x0080, 55129 gOamData_8250A14:: .4byte 0x40004000, 0x00000c00 -gSpriteTemplate_EnemyShadow:: @ 8250A1C +gSpriteTemplate_EnemyShadow:: spr_template 55129, 55039, gOamData_8250A14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_SetInvisible diff --git a/data/specials.inc b/data/specials.inc index 2bc4a2a43..f16dbb79f 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -7,7 +7,7 @@ .set __special__, 0 .align 2 -gSpecials:: @ 815FD60 +gSpecials:: def_special HealPlayerParty def_special SetCableClubWarp def_special DoCableClubWarp diff --git a/data/text/aide.inc b/data/text/aide.inc index 70bf4aa70..8ae650724 100644 --- a/data/text/aide.inc +++ b/data/text/aide.inc @@ -1,15 +1,15 @@ -Aide_Text_HaventCaughtEnoughMonsForItem:: @ 81A58A7 +Aide_Text_HaventCaughtEnoughMonsForItem:: .string "Let's see…\n" .string "Uh-oh! You have caught only\l" .string "{STR_VAR_3} kinds of POKéMON!\p" .string "You need {STR_VAR_1} kinds\n" .string "if you want the {STR_VAR_2}.$" -Aide_Text_GetEnoughMonsComeBackForItem:: @ 81A5909 +Aide_Text_GetEnoughMonsComeBackForItem:: .string "…Oh. I see.\p" .string "When you get {STR_VAR_1} kinds of POKéMON,\n" .string "come back for the {STR_VAR_2}.$" -Aide_Text_DontHaveAnyRoomForItem:: @ 81A594D +Aide_Text_DontHaveAnyRoomForItem:: .string "Oh! I see you don't have any\n" .string "room for the {STR_VAR_2}.$" diff --git a/data/text/berries.inc b/data/text/berries.inc index 3f228df4f..faba8206a 100644 --- a/data/text/berries.inc +++ b/data/text/berries.inc @@ -1,150 +1,150 @@ @ The text here is a copy/paste from Hoenn's various berry NPCs, all unused and untranslated -PetalburgCity_Gym_Text_GiveEnigmaBerry:: @ 81C0523 +PetalburgCity_Gym_Text_GiveEnigmaBerry:: .string "パパ“やあ　{PLAYER}！\p" .string "めずらしい　きのみを　てに　いれたから\n" .string "プレゼント　するよ！$" -Route104_Text_PlantBerriesInSoilTakeThis:: @ 81C054C +Route104_Text_PlantBerriesInSoilTakeThis:: .string "ふかふかの　つちに　はえている　きのみは\n" .string "じゆうに　とっても　よいのじゃが‥\p" .string "1つだけ　きのみを　おなじ　ばしょに　うめる\n" .string "それが　れいぎと　いうものじゃ\p" .string "ほれ　これを　わけてやろう$" -Route104_Text_TrainersOftenMakeMonHoldBerries:: @ 81C05A8 +Route104_Text_TrainersOftenMakeMonHoldBerries:: .string "あんた　みたところ　トレーナーじゃろ？\p" .string "トレーナーは　よく　きのみを　ポケモンに\n" .string "もたせとるわい\p" .string "ふやすも　つかうも　あんた　しだいじゃ$" -Route111_Text_WateredPlantsEveryDayTakeBerry:: @ 81C05ED +Route111_Text_WateredPlantsEveryDayTakeBerry:: .string "いつも　みずを　あげてたら\n" .string "たくさん　はなが　さいたんだ\p" .string "そしたら　きのみも　たくさん　できた！\p" .string "はい！\n" .string "これ　あげる$" -Route111_Text_TryToMakeRedPokeblock:: @ 81C0629 +Route111_Text_TryToMakeRedPokeblock:: .string "がんばって　あかいポロック　つくるんだ！\n" .string "{STR_VAR_1}も　がんばってね！$" -Route111_Text_WhatColorBerriesToLookForToday:: @ 81C064A +Route111_Text_WhatColorBerriesToLookForToday:: .string "きょうは　なにいろの　きのみを\n" .string "さがそっかなー$" -Route114_Text_GatheringBerriesForContest:: @ 81C0662 +Route114_Text_GatheringBerriesForContest:: .string "ポケモンコンテストの　ゆうしょうを　めざして\n" .string "きのみを　あつめているんだ\p" .string "よかったら　きみにも　わけて　あげるよ！$" -Route114_Text_GoodLuckToYouToo:: @ 81C069C +Route114_Text_GoodLuckToYouToo:: .string "きみも　がんばれ！$" -Route114_Text_WhatBerriesShouldIPlantToday:: @ 81C06A6 +Route114_Text_WhatBerriesShouldIPlantToday:: .string "きょうは　どの　きのみを　うめるか‥\n" .string "そして　なにいろの　ポロックを　つくるか‥\p" .string "なやむのも　また　たのしいよ$" -Route120_Text_PokeblocksExpressionOfLove:: @ 81C06DE +Route120_Text_PokeblocksExpressionOfLove:: .string "ケースを　ふると　でてくる　ポロック‥\p" .string "そして　それを　キャッチして\n" .string "たべてくれる　ポケモン‥\p" .string "これって　あい　だよね？$" -Route120_Text_YouUnderstandTakeThis:: @ 81C071B +Route120_Text_YouUnderstandTakeThis:: .string "うん　うん！\n" .string "やっぱ　わかるひとには　わかるよね\p" .string "これ　あげる$" -Route120_Text_OwnImpressionsImportantTakeThis:: @ 81C073B +Route120_Text_OwnImpressionsImportantTakeThis:: .string "そっか‥‥\n" .string "でも　ちがうと　かんじることも　たいせつだね\p" .string "これ　あげる$" -Route120_Text_BerryIsRareRaiseItWithCare:: @ 81C075F +Route120_Text_BerryIsRareRaiseItWithCare:: .string "その　きのみは　めずらしいもの　らしいから\n" .string "たいせつに　そだててね！$" -Route120_Text_IllGetMoreBerriesFromBerryMaster:: @ 81C0782 +Route120_Text_IllGetMoreBerriesFromBerryMaster:: .string "また　きのみめいじんに　もらって　こようっと$" -LilycoveCity_Text_BerrySuitsYou:: @ 81C0799 +LilycoveCity_Text_BerrySuitsYou:: .string "やっぱり\p" .string "わたしに　スーツが　にあうように\n" .string "うみには　しおかぜが　にあうな\l" .string "そして　きみには　きのみが　にあいそうだ‥‥\p" .string "なんでだろうね？$" -LilycoveCity_Text_BecauseYoureTrainer:: @ 81C07DF +LilycoveCity_Text_BecauseYoureTrainer:: .string "やっぱり　それは‥‥‥‥\p" .string "きみが　トレーナーだからだ！$" -LilycoveCity_Text_PokeblocksSuitPokemon:: @ 81C07FB +LilycoveCity_Text_PokeblocksSuitPokemon:: .string "やっぱり\p" .string "わたしに　シンプルさが　にあうように\n" .string "ポケモンには　ポロックが　にあうな$" -Route123_BerryMastersHouse_Text_YoureDeservingOfBerry:: @ 81C0825 +Route123_BerryMastersHouse_Text_YoureDeservingOfBerry:: .string "わしは　きのみめいじんと　よばれておる\p" .string "わしは　せかいじゅうを　うつくしい　はなで\n" .string "うめつくそうと　きのみを　そだてて\l" .string "そして　くばり　まくって　おるのじゃ\p" .string "きみにも　きのみを　わけて　あげよう！$" -Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother:: @ 81C0888 +Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother:: .string "ほれ　えんりょ　せずに　もう　ひとつ！$" -Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop:: @ 81C089C +Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop:: .string "カナズミの　ちかくにある　サン·トウカという\n" .string "フラワーショップも　よろしくの\p" .string "せかいに　はなを　さかせましょう！$" -Route123_BerryMastersHouse_Text_DoneForToday:: @ 81C08D5 +Route123_BerryMastersHouse_Text_DoneForToday:: .string "きょうは　もう　おしまいじゃ\n" .string "また　おいで\p" .string "せかいに　はなを　さかせましょう！$" -Route123_BerryMastersHouse_Text_HeardAGoodSayingLately:: @ 81C08FD +Route123_BerryMastersHouse_Text_HeardAGoodSayingLately:: .string "じいさんの　きのみの　そだてかたは\n" .string "そりゃあ　せかいいちじゃ\p" .string "わしも　はなが　たかいわい\p" .string "ところで　あんた\n" .string "いい　ことばを　きいたことが　ないかい？$" -Route123_BerryMastersHouse_Text_InspirationalTakeThis:: @ 81C0948 +Route123_BerryMastersHouse_Text_InspirationalTakeThis:: .string "おお！　とても　よい　ことばじゃ！\n" .string "かんどう　したわい\p" .string "ほれ　これを　もっていきなされ$" -Route123_BerryMastersHouse_Text_GoodSayingTakeThis:: @ 81C0974 +Route123_BerryMastersHouse_Text_GoodSayingTakeThis:: .string "おお！　なかなか　よい　ことばじゃ\n" .string "あんたも　たいしたもんじゃ\p" .string "ほれ　これを　もっていきなされ$" -Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife:: @ 81C09A4 +Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife:: .string "まごたち　4にんも　じいさんを　しのぐ\n" .string "おおものに　なるじゃろうて\p" .string "じんせい　たのしいことが　つきんのう！$" -Route123_BerryMastersHouse_Text_Ah:: @ 81C09DA +Route123_BerryMastersHouse_Text_Ah:: .string "ほう‥‥$" -Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop:: @ 81C09DF +Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop:: .string "こんにちは！\p" .string "はなを　せかいに　ひろめる\n" .string "フラワーショップ　サン·トウカです！$" -Route104_PrettyPetalFlowerShop_Text_LearnAboutBerries:: @ 81C0A07 +Route104_PrettyPetalFlowerShop_Text_LearnAboutBerries:: .string "{PLAYER}{KUN}　きのみの　こと　しりたい？$" -Route104_PrettyPetalFlowerShop_Text_IntroLearnAboutBerries:: @ 81C0A1A +Route104_PrettyPetalFlowerShop_Text_IntroLearnAboutBerries:: .string "あなたの　なまえは‥‥\p" .string "{PLAYER}{KUN}ね！\n" .string "とっても　いい　なまえだね！\l" .string "{PLAYER}{KUN}　きのみのこと　しりたい？$" -Route104_PrettyPetalFlowerShop_Text_BerriesExplanation:: @ 81C0A4E +Route104_PrettyPetalFlowerShop_Text_BerriesExplanation:: .string "きのみはね　くろい　ふかふかの　つちの\n" .string "ところで　たまに　とれるの\l" .string "でね‥‥\p" @@ -158,18 +158,18 @@ Route104_PrettyPetalFlowerShop_Text_BerriesExplanation:: @ 81C0A4E .string "だから　{PLAYER}{KUN}も　きのみを　うめて\n" .string "せかいに　はなを　ふやしてね！$" -Route104_PrettyPetalFlowerShop_Text_FlowersBringHappiness:: @ 81C0B0B +Route104_PrettyPetalFlowerShop_Text_FlowersBringHappiness:: .string "おはなって　とっても　しあわせな　きぶんに\n" .string "してくれるよね$" -Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis:: @ 81C0B29 +Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis:: .string "こんにちは！\p" .string "おはなは　せわを　すれば　するほど\n" .string "たくさん　きれいに　さいて　くれるの\p" .string "あなたも　せわを　したく　なった　でしょ？\n" .string "これ　あげるわ$" -Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation:: @ 81C0B73 +Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation:: .string "きのみが　そだつ　たびに\n" .string "じょうろで　みずを　あげてね！\p" .string "あとね\p" @@ -179,12 +179,12 @@ Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation:: @ 81C0B73 .string "すごいよね！\n" .string "いきものの　ちからを　かんじるよね$" -Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers:: @ 81C0BE5 +Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers:: .string "おねーちゃんたちを　みならって\n" .string "がんばって　おはなを　そだててるの\p" .string "はい！　これあげる！$" -Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries:: @ 81C0C12 +Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries:: .string "きのみは　うめて　おおきく　したり\n" .string "ポケモンに　もたせたり　できるの\p" .string "でも　さいきん　きのみを　いくつか　まぜると\n" @@ -192,7 +192,7 @@ Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries:: @ 81C0C12 .string "ある　らしいんだ\p" .string "あたしも　おかし　ほしー$" -SootopolisCity_Text_NameIsKiriHaveOneOfThese:: @ 81C0C74 +SootopolisCity_Text_NameIsKiriHaveOneOfThese:: .string "{STR_VAR_1}　なまえ　なんていうの？\p" .string "‥‥‥　‥‥‥　‥‥‥\n" .string "へー　いいねー\p" @@ -202,25 +202,25 @@ SootopolisCity_Text_NameIsKiriHaveOneOfThese:: @ 81C0C74 .string "ほしいっていう　ねがいを　こめたんだって！\p" .string "{STR_VAR_1}にも　これ　あげる$" -SootopolisCity_Text_GiveYouThisBerryToo:: @ 81C0CF5 +SootopolisCity_Text_GiveYouThisBerryToo:: .string "あと　{STR_VAR_1}には　キリの　だいすきな\n" .string "この　きのみも　あげちゃう！$" -SootopolisCity_Text_WhatKindOfWishInYourName:: @ 81C0D16 +SootopolisCity_Text_WhatKindOfWishInYourName:: .string "{STR_VAR_1}の　なまえには\n" .string "どんな　ねがいが　こめられてるの？$" -SootopolisCity_Text_LikeSeasonBornIn:: @ 81C0D32 +SootopolisCity_Text_LikeSeasonBornIn:: .string "はる　なつ　あき　ふゆ\n" .string "はるに　うまれると　はるが　すきで\l" .string "なつに　うまれると　なつが　すきなのかな？$" -SootopolisCity_Text_ThenILoveAutumn:: @ 81C0D66 +SootopolisCity_Text_ThenILoveAutumn:: .string "じゃあ　キリは　あきに　うまれたから\n" .string "あきが　だいすき！\p" .string "{STR_VAR_1}は　いつが　すき？$" -SootopolisCity_Text_OhDoesntMatter:: @ 81C0D8F +SootopolisCity_Text_OhDoesntMatter:: .string "そっか‥\n" .string "かんけいないのか‥\p" .string "しりたいことって　たくさんあるなー$" diff --git a/data/text/braille.inc b/data/text/braille.inc index 7346b2795..59728b7f5 100644 --- a/data/text/braille.inc +++ b/data/text/braille.inc @@ -1,116 +1,116 @@ -Braille_Text_Up:: @ 81A9288 +Braille_Text_Up:: .braille "UP$" -Braille_Text_Down:: @ 81A928B +Braille_Text_Down:: .braille "DOWN$" -Braille_Text_Right:: @ 81A9290 +Braille_Text_Right:: .braille "RIGHT$" -Braille_Text_Left:: @ 81A9296 +Braille_Text_Left:: .braille "LEFT$" -Braille_Text_Cut:: @ 81A929B +Braille_Text_Cut:: .braille "CUT$" -Braille_Text_ABC:: @ 81A929F +Braille_Text_ABC:: .braille "ABC$" -Braille_Text_GHI:: @ 81A92A3 +Braille_Text_GHI:: .braille "GHI$" -Braille_Text_MNO:: @ 81A92A7 +Braille_Text_MNO:: .braille "MNO$" -Braille_Text_TUV:: @ 81A92AB +Braille_Text_TUV:: .braille "TUV$" -Braille_Text_DEF:: @ 81A92AF +Braille_Text_DEF:: .braille "DEF$" -Braille_Text_JKL:: @ 81A92B3 +Braille_Text_JKL:: .braille "JKL$" -Braille_Text_PQRS:: @ 81A92B7 +Braille_Text_PQRS:: .braille "PQRS$" -Braille_Text_WXYZ:: @ 81A92BC +Braille_Text_WXYZ:: .braille "WXYZ$" -Braille_Text_Period:: @ 81A92C1 +Braille_Text_Period:: .braille ".$" -Braille_Text_Comma:: @ 81A92C3 +Braille_Text_Comma:: .braille ",$" -Braille_Text_Everything:: @ 81A92C5 +Braille_Text_Everything:: .braille "EVERYTHING$" -Braille_Text_HasMeaning1:: @ 81A92D0 +Braille_Text_HasMeaning1:: .braille "HAS MEANING$" -Braille_Text_Existence:: @ 81A92DC +Braille_Text_Existence:: .braille "EXISTENCE$" -Braille_Text_HasMeaning2:: @ 81A92E6 +Braille_Text_HasMeaning2:: .braille "HAS MEANING$" -Braille_Text_BeingAlive:: @ 81A92F2 +Braille_Text_BeingAlive:: .braille "BEING ALIVE$" -Braille_Text_HasMeaning3:: @ 81A92FE +Braille_Text_HasMeaning3:: .braille "HAS MEANING$" -Braille_Text_HaveDreams:: @ 81A930A +Braille_Text_HaveDreams:: .braille "HAVE DREAMS$" -Braille_Text_UsePower:: @ 81A9316 +Braille_Text_UsePower:: .braille "USE POWER.$" -Braille_Text_LetTheTwo:: @ 81A9321 +Braille_Text_LetTheTwo:: .braille "LET THE TWO$" -Braille_Text_Glittering:: @ 81A932D +Braille_Text_Glittering:: .braille "GLITTERING$" -Braille_Text_Stones:: @ 81A9338 +Braille_Text_Stones:: .braille "STONES$" -Braille_Text_OneInRed:: @ 81A933F +Braille_Text_OneInRed:: .braille "ONE IN RED$" -Braille_Text_OneInBlue:: @ 81A934A +Braille_Text_OneInBlue:: .braille "ONE IN BLUE$" -Braille_Text_ConnectThe:: @ 81A9356 +Braille_Text_ConnectThe:: .braille "CONNECT THE$" -Braille_Text_Past:: @ 81A9362 +Braille_Text_Past:: .braille "PAST.$" -Braille_Text_TwoFriends:: @ 81A9368 +Braille_Text_TwoFriends:: .braille "TWO FRIENDS$" -Braille_Text_Sharing:: @ 81A9374 +Braille_Text_Sharing:: .braille "SHARING$" -Braille_Text_PowerOpen:: @ 81A937C +Braille_Text_PowerOpen:: .braille "POWER OPEN$" -Braille_Text_AWindowTo:: @ 81A9387 +Braille_Text_AWindowTo:: .braille "A WINDOW TO$" -Braille_Text_ANewWorld:: @ 81A9393 +Braille_Text_ANewWorld:: .braille "A NEW WORLD$" -Braille_Text_ThatGlows:: @ 81A939F +Braille_Text_ThatGlows:: .braille "THAT GLOWS.$" -Braille_Text_TheNext:: @ 81A93AB +Braille_Text_TheNext:: .braille "THE NEXT$" -Braille_Text_WorldWaits:: @ 81A93B4 +Braille_Text_WorldWaits:: .braille "WORLD WAITS$" -Braille_Text_ForYou:: @ 81A93C0 +Braille_Text_ForYou:: .braille "FOR YOU.$" diff --git a/data/text/competitive_brothers.inc b/data/text/competitive_brothers.inc index 65afb5aab..ed96a1ca3 100644 --- a/data/text/competitive_brothers.inc +++ b/data/text/competitive_brothers.inc @@ -1,39 +1,39 @@ @ The text here is a copy/paste from Hoenn's competitive brothers, the NPCs in Sootopolis who request to see big Barboach/Shroomish (Seedot/Lotad in Emerald). It's all unused and untranslated -SootopolisCity_Text_PleaseShowMeBigMon:: @ 81C0283 +SootopolisCity_Text_PleaseShowMeBigMon:: .string "わしは　おおきな　{STR_VAR_1}に\n" .string "とても　きょうみが　ある！\p" .string "ん？　きみ　{STR_VAR_1}　もってるの？\n" .string "ちょ　ちょ　ちょっと···\l" .string "おじさんに　みせて　おくれ！$" -SootopolisCity_Text_GrandMonThanksForShowingMe:: @ 81C02CB +SootopolisCity_Text_GrandMonThanksForShowingMe:: .string "おお！　こいつは　でかい！\n" .string "とても　すばらしい　{STR_VAR_1}だ！\p" .string "みせて　くれて　ありがとう\n" .string "おれいに　これを　もって　いきなさい$" -SootopolisCity_Text_ReceivedOneItem:: @ 81C0309 +SootopolisCity_Text_ReceivedOneItem:: .string "{PLAYER}は\n" .string "{STR_VAR_2}を　もらった！$" -SootopolisCity_Text_HuhBagIsCrammedFull:: @ 81C0317 +SootopolisCity_Text_HuhBagIsCrammedFull:: .string "ありゃ？\n" .string "きみ　もちもの　いっぱいだね$" -SootopolisCity_Text_IveSeenBiggerMonThanThisOne:: @ 81C032B +SootopolisCity_Text_IveSeenBiggerMonThanThisOne:: .string "ううむ　わしは　これより　おおきい\n" .string "{STR_VAR_1}を　みたこと　あるな···$" -SootopolisCity_Text_QuiteSomethingButNotMon:: @ 81C034D +SootopolisCity_Text_QuiteSomethingButNotMon:: .string "おお　こいつは　なかなか···って\n" .string "これ　{STR_VAR_1}じゃ　ないよ！$" -SootopolisCity_Text_TooBadDontHaveBigMon:: @ 81C036C +SootopolisCity_Text_TooBadDontHaveBigMon:: .string "おおきい　{STR_VAR_1}　もってないの？\l" .string "それは　ざんねん···\n" .string "こんど　おおきい　{STR_VAR_1}　みせてね$" -SootopolisCity_Text_BiggestMonPlayersXCmColossus:: @ 81C0399 +SootopolisCity_Text_BiggestMonPlayersXCmColossus:: .string "しじょう　さいだいの　{STR_VAR_1}！\n" .string "{STR_VAR_2}の　{STR_VAR_3}cmのやつ！$" diff --git a/data/text/day_care.inc b/data/text/day_care.inc index 1e1d391be..3de4f4fe3 100644 --- a/data/text/day_care.inc +++ b/data/text/day_care.inc @@ -1,13 +1,13 @@ @ Same as Hoenn's day-care text, used by the Four Island Day-Care. Unused text translated in Emerald -DayCare_Text_ImDaycareManSpeakToMyWife:: @ 81BF555 +DayCare_Text_ImDaycareManSpeakToMyWife:: .string "I'm the DAY-CARE MAN.\p" .string "I help take care of the precious\n" .string "POKéMON of TRAINERS.\p" .string "If you'd like me to raise your\n" .string "POKéMON, have a word with my wife.$" -DayCare_Text_DoYouWantEgg:: @ 81BF5E3 +DayCare_Text_DoYouWantEgg:: .string "Ah, it's you!\p" .string "We were raising your POKéMON, and\n" .string "my goodness, were we surprised!\p" @@ -16,115 +16,115 @@ DayCare_Text_DoYouWantEgg:: @ 81BF5E3 .string "but your POKéMON had it.\p" .string "You do want it, yes?$" -DayCare_Text_YourMonIsDoingFine:: @ 81BF69A +DayCare_Text_YourMonIsDoingFine:: .string "Ah, it's you! Good to see you.\n" .string "Your {STR_VAR_1}'s doing fine.$" -DayCare_Text_IllKeepIt:: @ 81BF6CF +DayCare_Text_IllKeepIt:: .string "Well then, I'll keep it.\n" .string "Thanks!$" -DayCare_Text_YouHaveNoRoomForIt:: @ 81BF6F0 +DayCare_Text_YouHaveNoRoomForIt:: .string "You have no room for it…\n" .string "Come back when you've made room.$" -DayCare_Text_ReceivedEgg:: @ 81BF72A +DayCare_Text_ReceivedEgg:: .string "{PLAYER} received the EGG from\n" .string "the DAY-CARE MAN.$" -DayCare_Text_TakeGoodCareOfIt:: @ 81BF755 +DayCare_Text_TakeGoodCareOfIt:: .string "Take good care of it.$" -DayCare_Text_SeeWifeIfYouWantToPickUpMon:: @ 81BF76B +DayCare_Text_SeeWifeIfYouWantToPickUpMon:: .string "ポケモンを　ひきとりたい　ときは\n" .string "ばさんに　いって　おくれ$" -DayCare_Text_YourMonsAreDoingFine:: @ 81BF789 +DayCare_Text_YourMonsAreDoingFine:: .string "Ah, it's you! Your {STR_VAR_1} and\n" .string "{STR_VAR_2} are doing fine.$" -DayCare_Text_IWillKeepDoYouWantIt:: @ 81BF7B6 +DayCare_Text_IWillKeepDoYouWantIt:: .string "I really will keep it.\n" .string "You do want this, yes?$" -DayCare_Text_WouldYouLikeUsToRaiseMon:: @ 81BF7E4 +DayCare_Text_WouldYouLikeUsToRaiseMon:: .string "I'm the DAY-CARE LADY.\p" .string "We can raise POKéMON for you.\p" .string "Would you like us to raise one?$" -DayCare_Text_WhichMonShouldWeRaise:: @ 81BF839 +DayCare_Text_WhichMonShouldWeRaise:: .string "Which POKéMON should we raise for\n" .string "you?$" -DayCare_Text_WellRaiseYourMon:: @ 81BF860 +DayCare_Text_WellRaiseYourMon:: .string "Fine, we'll raise your {STR_VAR_1}\n" .string "for a while.\p" .string "Come back for it later.$" -DayCare_Text_WeCanRaiseOneMore:: @ 81BF89F +DayCare_Text_WeCanRaiseOneMore:: .string "We can raise two of your POKéMON.\p" .string "Would you like us to raise one\n" .string "more POKéMON for you?$" -DayCare_Text_HusbandWasLookingForYou:: @ 81BF8F6 +DayCare_Text_HusbandWasLookingForYou:: .string "My husband was looking for you.$" -DayCare_Text_FineThenComeAgain:: @ 81BF916 +DayCare_Text_FineThenComeAgain:: .string "Oh, fine, then.\n" .string "Come again.$" -DayCare_Text_NotEnoughMoney:: @ 81BF932 +DayCare_Text_NotEnoughMoney:: .string "You don't have enough money…$" -DayCare_Text_TakeOtherOneBackToo:: @ 81BF94F +DayCare_Text_TakeOtherOneBackToo:: .string "Will you take back the other one,\n" .string "too?$" -DayCare_Text_ComeAgain:: @ 81BF976 +DayCare_Text_ComeAgain:: .string "Fine.\n" .string "Come again.$" -DayCare_Text_GoodToSeeYou:: @ 81BF988 +DayCare_Text_GoodToSeeYou:: .string "Ah, it's you!\n" .string "Good to see you.\p" .string "Your POKéMON can only be doing\n" .string "good!$" -DayCare_Text_YourMonHasGrownXLevels:: @ 81BF9CC +DayCare_Text_YourMonHasGrownXLevels:: .string "By level, your {STR_VAR_1} has\n" .string "grown by {STR_VAR_2}.$" -DayCare_Text_YourPartyIsFull:: @ 81BF9EF +DayCare_Text_YourPartyIsFull:: .string "Your POKéMON party is full.\n" .string "Make room, then come see me.$" -DayCare_Text_TakeBackWhichMon:: @ 81BFA28 +DayCare_Text_TakeBackWhichMon:: .string "どっちの　ポケモンを　ひきとるかい？$" -DayCare_Text_ItWillCostX:: @ 81BFA3B +DayCare_Text_ItWillCostX:: .string "If you want your {STR_VAR_1} back,\n" .string "it will cost ¥{STR_VAR_2}.$" -DayCare_Text_HeresYourMon:: @ 81BFA67 +DayCare_Text_HeresYourMon:: .string "Perfect!\n" .string "Here's your POKéMON.$" -DayCare_Text_TookBackMon:: @ 81BFA85 +DayCare_Text_TookBackMon:: .string "{PLAYER} took back {STR_VAR_1} from\n" .string "the DAY-CARE LADY.$" -DayCare_Text_YouHaveJustOneMon:: @ 81BFAAD +DayCare_Text_YouHaveJustOneMon:: .string "Oh? But you have just one\n" .string "POKéMON.\p" .string "Come back another time.$" -DayCare_Text_TakeYourMonBack:: @ 81BFAE8 +DayCare_Text_TakeYourMonBack:: .string "Will you take your POKéMON back?$" -DayCare_Text_WhatWillYouBattleWith:: @ 81BFB09 +DayCare_Text_WhatWillYouBattleWith:: .string "If you leave me that POKéMON,\n" .string "what will you battle with?\p" .string "Come back another time.$" -DayCare_Text_Huh:: @ 81BFB5A +DayCare_Text_Huh:: .string "Huh?$" diff --git a/data/text/eon_ticket.inc b/data/text/eon_ticket.inc index 25ccb739b..15574d802 100644 --- a/data/text/eon_ticket.inc +++ b/data/text/eon_ticket.inc @@ -1,20 +1,20 @@ @ The text here is a copy/paste from Hoenn's Eon Ticket event, all unused and untranslated -Text_DadLetterArrivedForYouPlayer:: @ 81C03B5 +Text_DadLetterArrivedForYouPlayer:: .string "パパ“{PLAYER}！　よく　きたな！\n" .string "{PLAYER}あての　てがみが　とどけられたぞ$" -Text_DadPassForShipNeverSeenBefore:: @ 81C03D7 +Text_DadPassForShipNeverSeenBefore:: .string "パパ“わたしも　みたことのない\n" .string "ふねの　チケット　だな‥‥\l" .string "ミナモに　いってみると　いいだろう$" -Text_FerryToSlateportOhThatPass:: @ 81C0407 +Text_FerryToSlateportOhThatPass:: .string "カイナいき　れんらくせん‥‥\p" .string "あら？\n" .string "その　チケットは‥‥！$" -Text_YoureOneWhoBroughtOddPass:: @ 81C0426 +Text_YoureOneWhoBroughtOddPass:: .string "ヘンテコな　チケットを\n" .string "もってきたのは　おまえさんか？\p" .string "おまえが　いこうと　しているのは\n" @@ -24,21 +24,21 @@ Text_YoureOneWhoBroughtOddPass:: @ 81C0426 .string "ううむ　ふなのりの　ちが　さわぐぜ！\p" .string "さあ　のりな！$" -Text_NothingHereSailBackToLilycove:: @ 81C049D +Text_NothingHereSailBackToLilycove:: .string "なにもねえ　ちんけな　しま　だな‥‥\n" .string "ミナモへ　かえるか？$" -Text_SailHomeWeWill:: @ 81C04BB +Text_SailHomeWeWill:: .string "よし！　かえると　するか！$" -Text_AsYouLikeThen:: @ 81C04C9 +Text_AsYouLikeThen:: .string "そうかい\n" .string "まあ　すきにするが　いいさ$" -SouthernIsland_Interior_Text_Sign:: @ 81C04DC +SouthernIsland_Interior_Text_Sign:: .string "すべての　ゆめは　もうひとつの　げんじつ\n" .string "それを　わすれるべからず‥‥$" -SouthernIsland_Exterior_Text_Sign:: @ 81C0500 +SouthernIsland_Exterior_Text_Sign:: .string "きおく　かすみし　ものは\n" .string "こころに　きざみつける　ことを　のぞむ‥‥$" diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 9ba1cf28d..37a975411 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -800,594 +800,594 @@ gFameCheckerPersonQuote_Giovanni:: @ 0x81B0BB5 gFameCheckerFlavorTextOriginLocation_ProfOak0:: @ 0x81B0C45 .string "PALLET TOWN$" -gFameCheckerFlavorTextOriginLocation_ProfOak1:: @ 81B0C51 +gFameCheckerFlavorTextOriginLocation_ProfOak1:: .string "RESEARCH LAB$" -gFameCheckerFlavorTextOriginLocation_ProfOak2:: @ 81B0C5E +gFameCheckerFlavorTextOriginLocation_ProfOak2:: .string "RESEARCH LAB$" -gFameCheckerFlavorTextOriginLocation_ProfOak3:: @ 81B0C6B +gFameCheckerFlavorTextOriginLocation_ProfOak3:: .string "VIRIDIAN CITY$" -gFameCheckerFlavorTextOriginLocation_ProfOak4:: @ 81B0C79 +gFameCheckerFlavorTextOriginLocation_ProfOak4:: .string "POKéMON LEAGUE$" -gFameCheckerFlavorTextOriginLocation_ProfOak5:: @ 81B0C88 +gFameCheckerFlavorTextOriginLocation_ProfOak5:: .string "RESEARCH LAB$" -gFameCheckerFlavorTextOriginLocation_Daisy0:: @ 81B0C95 +gFameCheckerFlavorTextOriginLocation_Daisy0:: .string "RESEARCH LAB$" -gFameCheckerFlavorTextOriginLocation_Daisy1:: @ 81B0CA2 +gFameCheckerFlavorTextOriginLocation_Daisy1:: .string "VERMILION CITY$" -gFameCheckerFlavorTextOriginLocation_Daisy2:: @ 81B0CB1 +gFameCheckerFlavorTextOriginLocation_Daisy2:: .string "WATER LABYRINTH$" -gFameCheckerFlavorTextOriginLocation_Daisy3:: @ 81B0CC1 +gFameCheckerFlavorTextOriginLocation_Daisy3:: .string "VIRIDIAN CITY$" -gFameCheckerFlavorTextOriginLocation_Daisy4:: @ 81B0CCF +gFameCheckerFlavorTextOriginLocation_Daisy4:: .string "CELADON MANSION$" -gFameCheckerFlavorTextOriginLocation_Daisy5:: @ 81B0CDF +gFameCheckerFlavorTextOriginLocation_Daisy5:: .string "FOUR ISLAND$" -gFameCheckerFlavorTextOriginLocation_Brock0:: @ 81B0CEB +gFameCheckerFlavorTextOriginLocation_Brock0:: .string "PEWTER CITY$" -gFameCheckerFlavorTextOriginLocation_Brock1:: @ 81B0CF7 +gFameCheckerFlavorTextOriginLocation_Brock1:: .string "PEWTER GYM$" -gFameCheckerFlavorTextOriginLocation_Brock2:: @ 81B0D02 +gFameCheckerFlavorTextOriginLocation_Brock2:: .string "PEWTER CITY$" -gFameCheckerFlavorTextOriginLocation_Brock3:: @ 81B0D0E +gFameCheckerFlavorTextOriginLocation_Brock3:: .string "ROUTE 4$" -gFameCheckerFlavorTextOriginLocation_Brock4:: @ 81B0D16 +gFameCheckerFlavorTextOriginLocation_Brock4:: .string "MT. MOON$" -gFameCheckerFlavorTextOriginLocation_Brock5:: @ 81B0D1F +gFameCheckerFlavorTextOriginLocation_Brock5:: .string "PEWTER MUSEUM$" -gFameCheckerFlavorTextOriginLocation_Misty0:: @ 81B0D2D +gFameCheckerFlavorTextOriginLocation_Misty0:: .string "CERULEAN CITY$" -gFameCheckerFlavorTextOriginLocation_Misty1:: @ 81B0D3B +gFameCheckerFlavorTextOriginLocation_Misty1:: .string "CERULEAN GYM$" -gFameCheckerFlavorTextOriginLocation_Misty2:: @ 81B0D48 +gFameCheckerFlavorTextOriginLocation_Misty2:: .string "CERULEAN GYM$" -gFameCheckerFlavorTextOriginLocation_Misty3:: @ 81B0D55 +gFameCheckerFlavorTextOriginLocation_Misty3:: .string "SEAFOAM ISLANDS$" -gFameCheckerFlavorTextOriginLocation_Misty4:: @ 81B0D65 +gFameCheckerFlavorTextOriginLocation_Misty4:: .string "CERULEAN CAPE$" -gFameCheckerFlavorTextOriginLocation_Misty5:: @ 81B0D73 +gFameCheckerFlavorTextOriginLocation_Misty5:: .string "CERULEAN CITY$" -gFameCheckerFlavorTextOriginLocation_LtSurge0:: @ 81B0D81 +gFameCheckerFlavorTextOriginLocation_LtSurge0:: .string "VERMILION CITY$" -gFameCheckerFlavorTextOriginLocation_LtSurge1:: @ 81B0D90 +gFameCheckerFlavorTextOriginLocation_LtSurge1:: .string "VERMILION GYM$" -gFameCheckerFlavorTextOriginLocation_LtSurge2:: @ 81B0D9E +gFameCheckerFlavorTextOriginLocation_LtSurge2:: .string "VERMILION GYM$" -gFameCheckerFlavorTextOriginLocation_LtSurge3:: @ 81B0DAC +gFameCheckerFlavorTextOriginLocation_LtSurge3:: .string "VERMILION GYM$" -gFameCheckerFlavorTextOriginLocation_LtSurge4:: @ 81B0DBA +gFameCheckerFlavorTextOriginLocation_LtSurge4:: .string "VERMILION GYM$" -gFameCheckerFlavorTextOriginLocation_LtSurge5:: @ 81B0DC8 +gFameCheckerFlavorTextOriginLocation_LtSurge5:: .string "VERMILION CITY$" -gFameCheckerFlavorTextOriginLocation_Erika0:: @ 81B0DD7 +gFameCheckerFlavorTextOriginLocation_Erika0:: .string "CELADON CITY$" -gFameCheckerFlavorTextOriginLocation_Erika1:: @ 81B0DE4 +gFameCheckerFlavorTextOriginLocation_Erika1:: .string "CELADON GYM$" -gFameCheckerFlavorTextOriginLocation_Erika2:: @ 81B0DF0 +gFameCheckerFlavorTextOriginLocation_Erika2:: .string "CELADON GYM$" -gFameCheckerFlavorTextOriginLocation_Erika3:: @ 81B0DFC +gFameCheckerFlavorTextOriginLocation_Erika3:: .string "CELADON GYM$" -gFameCheckerFlavorTextOriginLocation_Erika4:: @ 81B0E08 +gFameCheckerFlavorTextOriginLocation_Erika4:: .string "CELADON GYM$" -gFameCheckerFlavorTextOriginLocation_Erika5:: @ 81B0E14 +gFameCheckerFlavorTextOriginLocation_Erika5:: .string "CELADON MANSION$" -gFameCheckerFlavorTextOriginLocation_Koga0:: @ 81B0E24 +gFameCheckerFlavorTextOriginLocation_Koga0:: .string "FUCHSIA CITY$" -gFameCheckerFlavorTextOriginLocation_Koga1:: @ 81B0E31 +gFameCheckerFlavorTextOriginLocation_Koga1:: .string "FUCHSIA GYM$" -gFameCheckerFlavorTextOriginLocation_Koga2:: @ 81B0E3D +gFameCheckerFlavorTextOriginLocation_Koga2:: .string "FUCHSIA GYM$" -gFameCheckerFlavorTextOriginLocation_Koga3:: @ 81B0E49 +gFameCheckerFlavorTextOriginLocation_Koga3:: .string "FUCHSIA CITY$" -gFameCheckerFlavorTextOriginLocation_Koga4:: @ 81B0E56 +gFameCheckerFlavorTextOriginLocation_Koga4:: .string "FUCHSIA CITY$" -gFameCheckerFlavorTextOriginLocation_Koga5:: @ 81B0E63 +gFameCheckerFlavorTextOriginLocation_Koga5:: .string "SAFARI ZONE$" -gFameCheckerFlavorTextOriginLocation_Sabrina0:: @ 81B0E6F +gFameCheckerFlavorTextOriginLocation_Sabrina0:: .string "SAFFRON CITY$" -gFameCheckerFlavorTextOriginLocation_Sabrina1:: @ 81B0E7C +gFameCheckerFlavorTextOriginLocation_Sabrina1:: .string "THREE ISLAND$" -gFameCheckerFlavorTextOriginLocation_Sabrina2:: @ 81B0E89 +gFameCheckerFlavorTextOriginLocation_Sabrina2:: .string "SAFFRON GYM$" -gFameCheckerFlavorTextOriginLocation_Sabrina3:: @ 81B0E95 +gFameCheckerFlavorTextOriginLocation_Sabrina3:: .string "SAFFRON GYM$" -gFameCheckerFlavorTextOriginLocation_Sabrina4:: @ 81B0EA1 +gFameCheckerFlavorTextOriginLocation_Sabrina4:: .string "SAFFRON CITY$" -gFameCheckerFlavorTextOriginLocation_Sabrina5:: @ 81B0EAE +gFameCheckerFlavorTextOriginLocation_Sabrina5:: .string "SAFFRON GYM$" -gFameCheckerFlavorTextOriginLocation_Blaine0:: @ 81B0EBA +gFameCheckerFlavorTextOriginLocation_Blaine0:: .string "CINNABAR ISLAND$" -gFameCheckerFlavorTextOriginLocation_Blaine1:: @ 81B0ECA +gFameCheckerFlavorTextOriginLocation_Blaine1:: .string "CINNABAR GYM$" -gFameCheckerFlavorTextOriginLocation_Blaine2:: @ 81B0ED7 +gFameCheckerFlavorTextOriginLocation_Blaine2:: .string "CINNABAR GYM$" -gFameCheckerFlavorTextOriginLocation_Blaine3:: @ 81B0EE4 +gFameCheckerFlavorTextOriginLocation_Blaine3:: .string "CINNABAR ISLAND$" -gFameCheckerFlavorTextOriginLocation_Blaine4:: @ 81B0EF4 +gFameCheckerFlavorTextOriginLocation_Blaine4:: .string "CINNABAR GYM$" -gFameCheckerFlavorTextOriginLocation_Blaine5:: @ 81B0F01 +gFameCheckerFlavorTextOriginLocation_Blaine5:: .string "RESORT GORGEOUS$" -gFameCheckerFlavorTextOriginLocation_Lorelei0:: @ 81B0F11 +gFameCheckerFlavorTextOriginLocation_Lorelei0:: .string "POKéMON LEAGUE$" -gFameCheckerFlavorTextOriginLocation_Lorelei1:: @ 81B0F20 +gFameCheckerFlavorTextOriginLocation_Lorelei1:: .string "POKéMON LEAGUE$" -gFameCheckerFlavorTextOriginLocation_Lorelei2:: @ 81B0F2F +gFameCheckerFlavorTextOriginLocation_Lorelei2:: .string "FOUR ISLAND$" -gFameCheckerFlavorTextOriginLocation_Lorelei3:: @ 81B0F3B +gFameCheckerFlavorTextOriginLocation_Lorelei3:: .string "FIVE ISLAND$" -gFameCheckerFlavorTextOriginLocation_Lorelei4:: @ 81B0F47 +gFameCheckerFlavorTextOriginLocation_Lorelei4:: .string "FOUR ISLAND$" -gFameCheckerFlavorTextOriginLocation_Lorelei5:: @ 81B0F53 +gFameCheckerFlavorTextOriginLocation_Lorelei5:: .string "FOUR ISLAND$" -gFameCheckerFlavorTextOriginLocation_Bruno0:: @ 81B0F5F +gFameCheckerFlavorTextOriginLocation_Bruno0:: .string "POKéMON LEAGUE$" -gFameCheckerFlavorTextOriginLocation_Bruno1:: @ 81B0F6E +gFameCheckerFlavorTextOriginLocation_Bruno1:: .string "POKéMON LEAGUE$" -gFameCheckerFlavorTextOriginLocation_Bruno2:: @ 81B0F7D +gFameCheckerFlavorTextOriginLocation_Bruno2:: .string "SAFFRON CITY$" -gFameCheckerFlavorTextOriginLocation_Bruno3:: @ 81B0F8A +gFameCheckerFlavorTextOriginLocation_Bruno3:: .string "EMBER SPA$" -gFameCheckerFlavorTextOriginLocation_Bruno4:: @ 81B0F94 +gFameCheckerFlavorTextOriginLocation_Bruno4:: .string "TWO ISLAND$" -gFameCheckerFlavorTextOriginLocation_Bruno5:: @ 81B0F9F +gFameCheckerFlavorTextOriginLocation_Bruno5:: .string "SEVAULT CANYON$" -gFameCheckerFlavorTextOriginLocation_Agatha0:: @ 81B0FAE +gFameCheckerFlavorTextOriginLocation_Agatha0:: .string "POKéMON LEAGUE$" -gFameCheckerFlavorTextOriginLocation_Agatha1:: @ 81B0FBD +gFameCheckerFlavorTextOriginLocation_Agatha1:: .string "INDIGO PLATEAU$" -gFameCheckerFlavorTextOriginLocation_Agatha2:: @ 81B0FCC +gFameCheckerFlavorTextOriginLocation_Agatha2:: .string "INDIGO PLATEAU$" -gFameCheckerFlavorTextOriginLocation_Agatha3:: @ 81B0FDB +gFameCheckerFlavorTextOriginLocation_Agatha3:: .string "SEVEN ISLAND$" -gFameCheckerFlavorTextOriginLocation_Agatha4:: @ 81B0FE8 +gFameCheckerFlavorTextOriginLocation_Agatha4:: .string "POKéMON LEAGUE$" -gFameCheckerFlavorTextOriginLocation_Agatha5:: @ 81B0FF7 +gFameCheckerFlavorTextOriginLocation_Agatha5:: .string "SIX ISLAND$" -gFameCheckerFlavorTextOriginLocation_Lance0:: @ 81B1002 +gFameCheckerFlavorTextOriginLocation_Lance0:: .string "POKéMON LEAGUE$" -gFameCheckerFlavorTextOriginLocation_Lance1:: @ 81B1011 +gFameCheckerFlavorTextOriginLocation_Lance1:: .string "POKéMON LEAGUE$" -gFameCheckerFlavorTextOriginLocation_Lance2:: @ 81B1020 +gFameCheckerFlavorTextOriginLocation_Lance2:: .string "SAFFRON CITY$" -gFameCheckerFlavorTextOriginLocation_Lance3:: @ 81B102D +gFameCheckerFlavorTextOriginLocation_Lance3:: .string "CELADON DEPT.$" -gFameCheckerFlavorTextOriginLocation_Lance4:: @ 81B103B +gFameCheckerFlavorTextOriginLocation_Lance4:: .string "INDIGO PLATEAU$" -gFameCheckerFlavorTextOriginLocation_Lance5:: @ 81B104A +gFameCheckerFlavorTextOriginLocation_Lance5:: .string "INDIGO PLATEAU$" -gFameCheckerFlavorTextOriginLocation_Bill0:: @ 81B1059 +gFameCheckerFlavorTextOriginLocation_Bill0:: .string "CERULEAN CITY$" -gFameCheckerFlavorTextOriginLocation_Bill1:: @ 81B1067 +gFameCheckerFlavorTextOriginLocation_Bill1:: .string "CERULEAN CITY$" -gFameCheckerFlavorTextOriginLocation_Bill2:: @ 81B1075 +gFameCheckerFlavorTextOriginLocation_Bill2:: .string "FUCHSIA CITY$" -gFameCheckerFlavorTextOriginLocation_Bill3:: @ 81B1082 +gFameCheckerFlavorTextOriginLocation_Bill3:: .string "ONE ISLAND$" -gFameCheckerFlavorTextOriginLocation_Bill4:: @ 81B108D +gFameCheckerFlavorTextOriginLocation_Bill4:: .string "ONE ISLAND$" -gFameCheckerFlavorTextOriginLocation_Bill5:: @ 81B1098 +gFameCheckerFlavorTextOriginLocation_Bill5:: .string "ONE ISLAND$" -gFameCheckerFlavorTextOriginLocation_MrFuji0:: @ 81B10A3 +gFameCheckerFlavorTextOriginLocation_MrFuji0:: .string "LAVENDER TOWN$" -gFameCheckerFlavorTextOriginLocation_MrFuji1:: @ 81B10B1 +gFameCheckerFlavorTextOriginLocation_MrFuji1:: .string "POKéMON TOWER$" -gFameCheckerFlavorTextOriginLocation_MrFuji2:: @ 81B10BF +gFameCheckerFlavorTextOriginLocation_MrFuji2:: .string "LAVENDER TOWN$" -gFameCheckerFlavorTextOriginLocation_MrFuji3:: @ 81B10CD +gFameCheckerFlavorTextOriginLocation_MrFuji3:: .string "LAVENDER TOWN$" -gFameCheckerFlavorTextOriginLocation_MrFuji4:: @ 81B10DB +gFameCheckerFlavorTextOriginLocation_MrFuji4:: .string "CINNABAR GYM$" -gFameCheckerFlavorTextOriginLocation_MrFuji5:: @ 81B10E8 +gFameCheckerFlavorTextOriginLocation_MrFuji5:: .string "CINNABAR ISLAND$" -gFameCheckerFlavorTextOriginLocation_Giovanni0:: @ 81B10F8 +gFameCheckerFlavorTextOriginLocation_Giovanni0:: .string "ROCKET HIDEOUT$" -gFameCheckerFlavorTextOriginLocation_Giovanni1:: @ 81B1107 +gFameCheckerFlavorTextOriginLocation_Giovanni1:: .string "SILPH CO.$" -gFameCheckerFlavorTextOriginLocation_Giovanni2:: @ 81B1111 +gFameCheckerFlavorTextOriginLocation_Giovanni2:: .string "SILPH CO.$" -gFameCheckerFlavorTextOriginLocation_Giovanni3:: @ 81B111B +gFameCheckerFlavorTextOriginLocation_Giovanni3:: .string "VIRIDIAN GYM$" -gFameCheckerFlavorTextOriginLocation_Giovanni4:: @ 81B1128 +gFameCheckerFlavorTextOriginLocation_Giovanni4:: .string "VIRIDIAN GYM$" -gFameCheckerFlavorTextOriginLocation_Giovanni5:: @ 81B1135 +gFameCheckerFlavorTextOriginLocation_Giovanni5:: .string "ROCKET WAREHOUSE$" -gFameCheckerFlavorTextOriginObjectName_ProfOak0:: @ 81B1146 +gFameCheckerFlavorTextOriginObjectName_ProfOak0:: .string "SIGN$" -gFameCheckerFlavorTextOriginObjectName_ProfOak1:: @ 81B114B +gFameCheckerFlavorTextOriginObjectName_ProfOak1:: .string "PROF. OAK$" -gFameCheckerFlavorTextOriginObjectName_ProfOak2:: @ 81B1155 +gFameCheckerFlavorTextOriginObjectName_ProfOak2:: .string "AIDE$" -gFameCheckerFlavorTextOriginObjectName_ProfOak3:: @ 81B115A +gFameCheckerFlavorTextOriginObjectName_ProfOak3:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_ProfOak4:: @ 81B116A +gFameCheckerFlavorTextOriginObjectName_ProfOak4:: .string "AGATHA$" -gFameCheckerFlavorTextOriginObjectName_ProfOak5:: @ 81B1171 +gFameCheckerFlavorTextOriginObjectName_ProfOak5:: .string "AIDE$" -gFameCheckerFlavorTextOriginObjectName_Daisy0:: @ 81B1176 +gFameCheckerFlavorTextOriginObjectName_Daisy0:: .string "AIDE$" -gFameCheckerFlavorTextOriginObjectName_Daisy1:: @ 81B117B +gFameCheckerFlavorTextOriginObjectName_Daisy1:: .string "WOMAN$" -gFameCheckerFlavorTextOriginObjectName_Daisy2:: @ 81B1181 +gFameCheckerFlavorTextOriginObjectName_Daisy2:: .string "MAN$" -gFameCheckerFlavorTextOriginObjectName_Daisy3:: @ 81B1185 +gFameCheckerFlavorTextOriginObjectName_Daisy3:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Daisy4:: @ 81B1195 +gFameCheckerFlavorTextOriginObjectName_Daisy4:: .string "OLD LADY$" -gFameCheckerFlavorTextOriginObjectName_Daisy5:: @ 81B119E +gFameCheckerFlavorTextOriginObjectName_Daisy5:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Brock0:: @ 81B11AE +gFameCheckerFlavorTextOriginObjectName_Brock0:: .string "SIGN$" -gFameCheckerFlavorTextOriginObjectName_Brock1:: @ 81B11B3 +gFameCheckerFlavorTextOriginObjectName_Brock1:: .string "BROCK$" -gFameCheckerFlavorTextOriginObjectName_Brock2:: @ 81B11B9 +gFameCheckerFlavorTextOriginObjectName_Brock2:: .string "YOUNG MAN$" -gFameCheckerFlavorTextOriginObjectName_Brock3:: @ 81B11C3 +gFameCheckerFlavorTextOriginObjectName_Brock3:: .string "BOY$" -gFameCheckerFlavorTextOriginObjectName_Brock4:: @ 81B11C7 +gFameCheckerFlavorTextOriginObjectName_Brock4:: .string "MAN$" -gFameCheckerFlavorTextOriginObjectName_Brock5:: @ 81B11CB +gFameCheckerFlavorTextOriginObjectName_Brock5:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Misty0:: @ 81B11DB +gFameCheckerFlavorTextOriginObjectName_Misty0:: .string "SIGN$" -gFameCheckerFlavorTextOriginObjectName_Misty1:: @ 81B11E0 +gFameCheckerFlavorTextOriginObjectName_Misty1:: .string "MISTY$" -gFameCheckerFlavorTextOriginObjectName_Misty2:: @ 81B11E6 +gFameCheckerFlavorTextOriginObjectName_Misty2:: .string "LUIS$" -gFameCheckerFlavorTextOriginObjectName_Misty3:: @ 81B11EB +gFameCheckerFlavorTextOriginObjectName_Misty3:: .string "YOUNG MAN$" -gFameCheckerFlavorTextOriginObjectName_Misty4:: @ 81B11F5 +gFameCheckerFlavorTextOriginObjectName_Misty4:: .string "DAME$" -gFameCheckerFlavorTextOriginObjectName_Misty5:: @ 81B11FA +gFameCheckerFlavorTextOriginObjectName_Misty5:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_LtSurge0:: @ 81B120A +gFameCheckerFlavorTextOriginObjectName_LtSurge0:: .string "SIGN$" -gFameCheckerFlavorTextOriginObjectName_LtSurge1:: @ 81B120F +gFameCheckerFlavorTextOriginObjectName_LtSurge1:: .string "LT. SURGE$" -gFameCheckerFlavorTextOriginObjectName_LtSurge2:: @ 81B1219 +gFameCheckerFlavorTextOriginObjectName_LtSurge2:: .string "TUCKER$" -gFameCheckerFlavorTextOriginObjectName_LtSurge3:: @ 81B1220 +gFameCheckerFlavorTextOriginObjectName_LtSurge3:: .string "TUCKER$" -gFameCheckerFlavorTextOriginObjectName_LtSurge4:: @ 81B1227 +gFameCheckerFlavorTextOriginObjectName_LtSurge4:: .string "DWAYNE$" -gFameCheckerFlavorTextOriginObjectName_LtSurge5:: @ 81B122E +gFameCheckerFlavorTextOriginObjectName_LtSurge5:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Erika0:: @ 81B123E +gFameCheckerFlavorTextOriginObjectName_Erika0:: .string "SIGN$" -gFameCheckerFlavorTextOriginObjectName_Erika1:: @ 81B1243 +gFameCheckerFlavorTextOriginObjectName_Erika1:: .string "ERIKA$" -gFameCheckerFlavorTextOriginObjectName_Erika2:: @ 81B1249 +gFameCheckerFlavorTextOriginObjectName_Erika2:: .string "LOLA$" -gFameCheckerFlavorTextOriginObjectName_Erika3:: @ 81B124E +gFameCheckerFlavorTextOriginObjectName_Erika3:: .string "TAMIA$" -gFameCheckerFlavorTextOriginObjectName_Erika4:: @ 81B1254 +gFameCheckerFlavorTextOriginObjectName_Erika4:: .string "ERIKA$" -gFameCheckerFlavorTextOriginObjectName_Erika5:: @ 81B125A +gFameCheckerFlavorTextOriginObjectName_Erika5:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Koga0:: @ 81B126A +gFameCheckerFlavorTextOriginObjectName_Koga0:: .string "SIGN$" -gFameCheckerFlavorTextOriginObjectName_Koga1:: @ 81B126F +gFameCheckerFlavorTextOriginObjectName_Koga1:: .string "KOGA$" -gFameCheckerFlavorTextOriginObjectName_Koga2:: @ 81B1274 +gFameCheckerFlavorTextOriginObjectName_Koga2:: .string "KIRK$" -gFameCheckerFlavorTextOriginObjectName_Koga3:: @ 81B1279 +gFameCheckerFlavorTextOriginObjectName_Koga3:: .string "CHARINE$" -gFameCheckerFlavorTextOriginObjectName_Koga4:: @ 81B1281 +gFameCheckerFlavorTextOriginObjectName_Koga4:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Koga5:: @ 81B1291 +gFameCheckerFlavorTextOriginObjectName_Koga5:: .string "MAN$" -gFameCheckerFlavorTextOriginObjectName_Sabrina0:: @ 81B1295 +gFameCheckerFlavorTextOriginObjectName_Sabrina0:: .string "SIGN$" -gFameCheckerFlavorTextOriginObjectName_Sabrina1:: @ 81B129A +gFameCheckerFlavorTextOriginObjectName_Sabrina1:: .string "YOUNG MAN$" -gFameCheckerFlavorTextOriginObjectName_Sabrina2:: @ 81B12A4 +gFameCheckerFlavorTextOriginObjectName_Sabrina2:: .string "SABRINA$" -gFameCheckerFlavorTextOriginObjectName_Sabrina3:: @ 81B12AC +gFameCheckerFlavorTextOriginObjectName_Sabrina3:: .string "SABRINA$" -gFameCheckerFlavorTextOriginObjectName_Sabrina4:: @ 81B12B4 +gFameCheckerFlavorTextOriginObjectName_Sabrina4:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Sabrina5:: @ 81B12C4 +gFameCheckerFlavorTextOriginObjectName_Sabrina5:: .string "TYRON$" -gFameCheckerFlavorTextOriginObjectName_Blaine0:: @ 81B12CA +gFameCheckerFlavorTextOriginObjectName_Blaine0:: .string "SIGN$" -gFameCheckerFlavorTextOriginObjectName_Blaine1:: @ 81B12CF +gFameCheckerFlavorTextOriginObjectName_Blaine1:: .string "BLAINE$" -gFameCheckerFlavorTextOriginObjectName_Blaine2:: @ 81B12D6 +gFameCheckerFlavorTextOriginObjectName_Blaine2:: .string "DEREK$" -gFameCheckerFlavorTextOriginObjectName_Blaine3:: @ 81B12DC +gFameCheckerFlavorTextOriginObjectName_Blaine3:: .string "WOMAN$" -gFameCheckerFlavorTextOriginObjectName_Blaine4:: @ 81B12E2 +gFameCheckerFlavorTextOriginObjectName_Blaine4:: .string "PHOTO$" -gFameCheckerFlavorTextOriginObjectName_Blaine5:: @ 81B12E8 +gFameCheckerFlavorTextOriginObjectName_Blaine5:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Lorelei0:: @ 81B12F8 +gFameCheckerFlavorTextOriginObjectName_Lorelei0:: .string "LORELEI$" -gFameCheckerFlavorTextOriginObjectName_Lorelei1:: @ 81B1300 +gFameCheckerFlavorTextOriginObjectName_Lorelei1:: .string "LORELEI$" -gFameCheckerFlavorTextOriginObjectName_Lorelei2:: @ 81B1308 +gFameCheckerFlavorTextOriginObjectName_Lorelei2:: .string "OLD MAN$" -gFameCheckerFlavorTextOriginObjectName_Lorelei3:: @ 81B1310 +gFameCheckerFlavorTextOriginObjectName_Lorelei3:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Lorelei4:: @ 81B1320 +gFameCheckerFlavorTextOriginObjectName_Lorelei4:: .string "LITTLE GIRL$" -gFameCheckerFlavorTextOriginObjectName_Lorelei5:: @ 81B132C +gFameCheckerFlavorTextOriginObjectName_Lorelei5:: .string "OLD LADY$" -gFameCheckerFlavorTextOriginObjectName_Bruno0:: @ 81B1335 +gFameCheckerFlavorTextOriginObjectName_Bruno0:: .string "BRUNO$" -gFameCheckerFlavorTextOriginObjectName_Bruno1:: @ 81B133B +gFameCheckerFlavorTextOriginObjectName_Bruno1:: .string "BRUNO$" -gFameCheckerFlavorTextOriginObjectName_Bruno2:: @ 81B1341 +gFameCheckerFlavorTextOriginObjectName_Bruno2:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Bruno3:: @ 81B1351 +gFameCheckerFlavorTextOriginObjectName_Bruno3:: .string "CRUSHER$" -gFameCheckerFlavorTextOriginObjectName_Bruno4:: @ 81B1359 +gFameCheckerFlavorTextOriginObjectName_Bruno4:: .string "WOMAN$" -gFameCheckerFlavorTextOriginObjectName_Bruno5:: @ 81B135F +gFameCheckerFlavorTextOriginObjectName_Bruno5:: .string "CRUSHER$" -gFameCheckerFlavorTextOriginObjectName_Agatha0:: @ 81B1367 +gFameCheckerFlavorTextOriginObjectName_Agatha0:: .string "AGATHA$" -gFameCheckerFlavorTextOriginObjectName_Agatha1:: @ 81B136E +gFameCheckerFlavorTextOriginObjectName_Agatha1:: .string "CRUSHER$" -gFameCheckerFlavorTextOriginObjectName_Agatha2:: @ 81B1376 +gFameCheckerFlavorTextOriginObjectName_Agatha2:: .string "CRUSHER$" -gFameCheckerFlavorTextOriginObjectName_Agatha3:: @ 81B137E +gFameCheckerFlavorTextOriginObjectName_Agatha3:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Agatha4:: @ 81B138E +gFameCheckerFlavorTextOriginObjectName_Agatha4:: .string "AGATHA$" -gFameCheckerFlavorTextOriginObjectName_Agatha5:: @ 81B1395 +gFameCheckerFlavorTextOriginObjectName_Agatha5:: .string "OLD LADY$" -gFameCheckerFlavorTextOriginObjectName_Lance0:: @ 81B139E +gFameCheckerFlavorTextOriginObjectName_Lance0:: .string "LANCE$" -gFameCheckerFlavorTextOriginObjectName_Lance1:: @ 81B13A4 +gFameCheckerFlavorTextOriginObjectName_Lance1:: .string "LANCE$" -gFameCheckerFlavorTextOriginObjectName_Lance2:: @ 81B13AA +gFameCheckerFlavorTextOriginObjectName_Lance2:: .string "WOMAN$" -gFameCheckerFlavorTextOriginObjectName_Lance3:: @ 81B13B0 +gFameCheckerFlavorTextOriginObjectName_Lance3:: .string "LITTLE GIRL$" -gFameCheckerFlavorTextOriginObjectName_Lance4:: @ 81B13BC +gFameCheckerFlavorTextOriginObjectName_Lance4:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Lance5:: @ 81B13CC +gFameCheckerFlavorTextOriginObjectName_Lance5:: .string "YOUNG MAN$" -gFameCheckerFlavorTextOriginObjectName_Bill0:: @ 81B13D6 +gFameCheckerFlavorTextOriginObjectName_Bill0:: .string "{RIVAL}$" -gFameCheckerFlavorTextOriginObjectName_Bill1:: @ 81B13D9 +gFameCheckerFlavorTextOriginObjectName_Bill1:: .string "LITTLE BOY$" -gFameCheckerFlavorTextOriginObjectName_Bill2:: @ 81B13E4 +gFameCheckerFlavorTextOriginObjectName_Bill2:: .string "OLD MAN$" -gFameCheckerFlavorTextOriginObjectName_Bill3:: @ 81B13EC +gFameCheckerFlavorTextOriginObjectName_Bill3:: .string "CELIO$" -gFameCheckerFlavorTextOriginObjectName_Bill4:: @ 81B13F2 +gFameCheckerFlavorTextOriginObjectName_Bill4:: .string "CELIO$" -gFameCheckerFlavorTextOriginObjectName_Bill5:: @ 81B13F8 +gFameCheckerFlavorTextOriginObjectName_Bill5:: .string "CELIO$" -gFameCheckerFlavorTextOriginObjectName_MrFuji0:: @ 81B13FE +gFameCheckerFlavorTextOriginObjectName_MrFuji0:: .string "LITTLE GIRL$" -gFameCheckerFlavorTextOriginObjectName_MrFuji1:: @ 81B140A +gFameCheckerFlavorTextOriginObjectName_MrFuji1:: .string "TEAM ROCKET$" -gFameCheckerFlavorTextOriginObjectName_MrFuji2:: @ 81B1416 +gFameCheckerFlavorTextOriginObjectName_MrFuji2:: .string "MAGAZINE$" -gFameCheckerFlavorTextOriginObjectName_MrFuji3:: @ 81B141F +gFameCheckerFlavorTextOriginObjectName_MrFuji3:: .string "MAN$" -gFameCheckerFlavorTextOriginObjectName_MrFuji4:: @ 81B1423 +gFameCheckerFlavorTextOriginObjectName_MrFuji4:: .string "PHOTO$" -gFameCheckerFlavorTextOriginObjectName_MrFuji5:: @ 81B1429 +gFameCheckerFlavorTextOriginObjectName_MrFuji5:: .string "POKéMON JOURNAL$" -gFameCheckerFlavorTextOriginObjectName_Giovanni0:: @ 81B1439 +gFameCheckerFlavorTextOriginObjectName_Giovanni0:: .string "GIOVANNI$" -gFameCheckerFlavorTextOriginObjectName_Giovanni1:: @ 81B1442 +gFameCheckerFlavorTextOriginObjectName_Giovanni1:: .string "SCIENTIST$" -gFameCheckerFlavorTextOriginObjectName_Giovanni2:: @ 81B144C +gFameCheckerFlavorTextOriginObjectName_Giovanni2:: .string "SCIENTIST$" -gFameCheckerFlavorTextOriginObjectName_Giovanni3:: @ 81B1456 +gFameCheckerFlavorTextOriginObjectName_Giovanni3:: .string "GIOVANNI$" -gFameCheckerFlavorTextOriginObjectName_Giovanni4:: @ 81B145F +gFameCheckerFlavorTextOriginObjectName_Giovanni4:: .string "MAN$" -gFameCheckerFlavorTextOriginObjectName_Giovanni5:: @ 81B1463 +gFameCheckerFlavorTextOriginObjectName_Giovanni5:: .string "GIDEON$" -PokemonJournal_Text_SpecialFeatureBrock:: @ 81B146A +PokemonJournal_Text_SpecialFeatureBrock:: .string "POKéMON JOURNAL\p" .string "Special Feature: PEWTER GYM\n" .string "LEADER BROCK!\p" .string "BROCK rarely laughs, but is said to\n" .string "be unable to stop if he starts.$" -PokemonJournal_Text_SpecialFeatureMisty:: @ 81B14E8 +PokemonJournal_Text_SpecialFeatureMisty:: .string "POKéMON JOURNAL\p" .string "Special Feature: CERULEAN GYM\n" .string "LEADER MISTY!\p" .string "MISTY is said to worship LORELEI\n" .string "of the ELITE FOUR.$" -PokemonJournal_Text_SpecialFeatureLtSurge:: @ 81B1558 +PokemonJournal_Text_SpecialFeatureLtSurge:: .string "POKéMON JOURNAL\p" .string "Special Feature: VERMILION GYM\n" .string "LEADER LT. SURGE!\p" @@ -1396,7 +1396,7 @@ PokemonJournal_Text_SpecialFeatureLtSurge:: @ 81B1558 .string "He used the electricity generated\n" .string "by POKéMON to power his plane.$" -PokemonJournal_Text_SpecialFeatureErika:: @ 81B161B +PokemonJournal_Text_SpecialFeatureErika:: .string "POKéMON JOURNAL\p" .string "Special Feature: CELADON GYM\n" .string "LEADER ERIKA!\p" @@ -1404,7 +1404,7 @@ PokemonJournal_Text_SpecialFeatureErika:: @ 81B161B .string "CELADON GYM, you can often\l" .string "see ERIKA snoozing.$" -PokemonJournal_Text_SpecialFeatureKoga:: @ 81B16A8 +PokemonJournal_Text_SpecialFeatureKoga:: .string "POKéMON JOURNAL\p" .string "Special Feature: FUCHSIA GYM\n" .string "LEADER KOGA!\p" @@ -1413,7 +1413,7 @@ PokemonJournal_Text_SpecialFeatureKoga:: @ 81B16A8 .string "He even concocts medicine to nurse\n" .string "his POKéMON to health.$" -PokemonJournal_Text_SpecialFeatureSabrina:: @ 81B1753 +PokemonJournal_Text_SpecialFeatureSabrina:: .string "POKéMON JOURNAL\p" .string "Special Feature: SAFFRON GYM\n" .string "LEADER SABRINA!\p" @@ -1421,7 +1421,7 @@ PokemonJournal_Text_SpecialFeatureSabrina:: @ 81B1753 .string "communicate with her POKéMON\l" .string "during battle without speaking.$" -PokemonJournal_Text_SpecialFeatureBlaine:: @ 81B17E9 +PokemonJournal_Text_SpecialFeatureBlaine:: .string "POKéMON JOURNAL\p" .string "Special Feature: CINNABAR GYM\n" .string "LEADER BLAINE!\p" @@ -1429,7 +1429,7 @@ PokemonJournal_Text_SpecialFeatureBlaine:: @ 81B17E9 .string "shades only when he is thinking up\l" .string "new quiz questions.$" -PokemonJournal_Text_SpecialFeatureLorelei:: @ 81B187F +PokemonJournal_Text_SpecialFeatureLorelei:: .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "ELITE FOUR's LORELEI!\p" @@ -1437,7 +1437,7 @@ PokemonJournal_Text_SpecialFeatureLorelei:: @ 81B187F .string "and cool battling style, LORELEI\l" .string "has a surprising secret!$" -PokemonJournal_Text_SpecialFeatureBruno:: @ 81B1913 +PokemonJournal_Text_SpecialFeatureBruno:: .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "ELITE FOUR's BRUNO!\p" @@ -1445,7 +1445,7 @@ PokemonJournal_Text_SpecialFeatureBruno:: @ 81B1913 .string "FOUR out of his burning ambition to\l" .string "battle the best TRAINERS.$" -PokemonJournal_Text_SpecialFeatureAgatha:: @ 81B19A8 +PokemonJournal_Text_SpecialFeatureAgatha:: .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "ELITE FOUR's AGATHA!\p" @@ -1453,7 +1453,7 @@ PokemonJournal_Text_SpecialFeatureAgatha:: @ 81B19A8 .string "OAK were rivals who vied for\l" .string "supremacy as TRAINERS.$" -PokemonJournal_Text_SpecialFeatureLance:: @ 81B1A31 +PokemonJournal_Text_SpecialFeatureLance:: .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "ELITE FOUR's LANCE!\p" @@ -1461,14 +1461,14 @@ PokemonJournal_Text_SpecialFeatureLance:: @ 81B1A31 .string "be the elder of a famous clan of\l" .string "dragon masters.$" -PokemonJournal_Text_SpecialFeatureProfOak:: @ 81B1AB9 +PokemonJournal_Text_SpecialFeatureProfOak:: .string "POKéMON JOURNAL\p" .string "Special Feature: PROF. OAK,\n" .string "the POKéMON Researcher!\p" .string "PROF. OAK reportedly lives with his\n" .string "grandchildren DAISY and {RIVAL}.$" -PokemonJournal_Text_SpecialFeatureDaisyOak:: @ 81B1B3D +PokemonJournal_Text_SpecialFeatureDaisyOak:: .string "This is a POKéMON JOURNAL from\n" .string "years ago…\p" .string "POKéMON JOURNAL\n" @@ -1477,7 +1477,7 @@ PokemonJournal_Text_SpecialFeatureDaisyOak:: @ 81B1B3D .string "Grand Champion is DAISY OAK of\l" .string "PALLET TOWN!$" -PokemonJournal_Text_SpecialFeatureMrFuji:: @ 81B1BD1 +PokemonJournal_Text_SpecialFeatureMrFuji:: .string "POKéMON JOURNAL\p" .string "Special Feature:\n" .string "MR. FUJI of POKéMON HOUSE!\p" diff --git a/data/text/flavor_text.inc b/data/text/flavor_text.inc index 19c4f8a29..19752ae87 100644 --- a/data/text/flavor_text.inc +++ b/data/text/flavor_text.inc @@ -1,122 +1,122 @@ @ Flavor text for interacting with various background objects -Text_Bookshelf:: @ 81C0DB0 +Text_Bookshelf:: .string "It's crammed full of POKéMON\n" .string "books.$" -Text_NothingButPokemonBooks:: @ 81C0DD4 +Text_NothingButPokemonBooks:: .string "ほんだなに　ならんでいるのは\n" .string "ポケモンの　ほん　ばかりだ$" -Text_ATownMap:: @ 81C0DF1 +Text_ATownMap:: .string "A TOWN MAP.$" -Text_PokeMartShelf:: @ 81C0DFD +Text_PokeMartShelf:: .string "Wow!\n" .string "Tons of POKéMON stuff!$" -Text_DishesPlatesNeatlyLinedUp:: @ 81C0E19 +Text_DishesPlatesNeatlyLinedUp:: .string "Dishes and plates are neatly\n" .string "lined up.$" -Text_Kitchen:: @ 81C0E40 +Text_Kitchen:: .string "It smells delicious!\n" .string "Somebody's been cooking here.$" -Text_Dresser:: @ 81C0E73 +Text_Dresser:: .string "It's a nicely made dresser.\n" .string "It will hold a lot of stuff.$" -Text_Snacks:: @ 81C0EAC +Text_Snacks:: .string "There's a pile of snacks here.$" -Text_PokemartSign:: @ 81C0ECB +Text_PokemartSign:: .string "All your item needs fulfilled!\n" .string "POKéMON MART$" -Text_PokecenterSign:: @ 81C0EF7 +Text_PokecenterSign:: .string "Heal Your POKéMON!\n" .string "POKéMON CENTER$" -Text_Indigo_UltimateGoal:: @ 81C0F19 +Text_Indigo_UltimateGoal:: .string "INDIGO PLATEAU\p" .string "The ultimate goal of TRAINERS!\n" .string "POKéMON LEAGUE HQ$" -Text_Indigo_HighestAuthority:: @ 81C0F59 +Text_Indigo_HighestAuthority:: .string "INDIGO PLATEAU\p" .string "The highest POKéMON authority!\n" .string "POKéMON LEAGUE HQ$" -Text_Food:: @ 81C0F99 +Text_Food:: .string "It should be packed with all kinds\n" .string "of delicious things to eat.$" -Text_Blueprints:: @ 81C0FD8 +Text_Blueprints:: .string "It's a blueprint of some sort.\n" .string "It's filled with diagrams and text.$" -Text_Painting:: @ 81C101B +Text_Painting:: .string "It's a pretty picture of a POKéMON.\n" .string "It looks like it's feeling good.$" -Text_PowerPlantMachine:: @ 81C1060 +Text_PowerPlantMachine:: .string "What could this machine be?\n" .string "Better not mess around with it!$" -Text_Telephone:: @ 81C109C +Text_Telephone:: .string "It's a telephone.\n" .string "Better not use it.$" -Text_Computer:: @ 81C10C1 +Text_Computer:: .string "It's all complicated words and\n" .string "numbers that make no sense…$" -Text_AdvertisingPoster:: @ 81C10FC +Text_AdvertisingPoster:: .string "It's an advertising poster about\n" .string "all kinds of products.$" -Text_TastyFood:: @ 81C1134 +Text_TastyFood:: .string "Oh, that smells tasty!\n" .string "It might get the stomach growling!$" -Text_TrashBin:: @ 81C116E +Text_TrashBin:: .string "Inside this…\n" .string "……\p" .string "There's nothing here!$" -Text_Cup:: @ 81C1194 +Text_Cup:: .string "It's a cup with a POKéMON mark\n" .string "on it.$" -Text_PolishedWindow:: @ 81C11BA +Text_PolishedWindow:: .string "The window is very well polished.$" -Text_BeautifulSkyWindow:: @ 81C11DC +Text_BeautifulSkyWindow:: .string "Outside the window…\p" .string "The sky looks fantastically\n" .string "beautiful.$" -Text_BlinkingLights:: @ 81C1217 +Text_BlinkingLights:: .string "Lights in different colors are\n" .string "flashing on and off.$" -Text_NeatlyLinedUpTools:: @ 81C124B +Text_NeatlyLinedUpTools:: .string "All sorts of tools are lined up\n" .string "neatly.$" -Text_ImpressiveMachine:: @ 81C1273 +Text_ImpressiveMachine:: .string "It's a machine of some sort.\n" .string "It sure is impressive.$" -Text_VideoGame:: @ 81C12A7 +Text_VideoGame:: .string "It's the latest video game!\n" .string "It sure looks fun!$" -Text_Burglary:: @ 81C12D6 +Text_Burglary:: .string "There are obvious signs of burglary\n" .string "here…$" -Text_PlayerFacingTVScreen:: @ 81C1300 +Text_PlayerFacingTVScreen:: .string "There's a POKéMON on TV!\n" .string "It looks like it's having fun.$" diff --git a/data/text/help_system.inc b/data/text/help_system.inc index 0ad59243e..3a083e82b 100644 --- a/data/text/help_system.inc +++ b/data/text/help_system.inc @@ -1,190 +1,190 @@ -Help_Text_WhatShouldIDo:: @ 81B2DF8 +Help_Text_WhatShouldIDo:: .string "What should I do in this situation?$" -Help_Text_HowDoIDoThis:: @ 81B2E1C +Help_Text_HowDoIDoThis:: .string "How do I do this?$" -Help_Text_WhatDoesThisTermMean:: @ 81B2E2E +Help_Text_WhatDoesThisTermMean:: .string "What does this term mean?$" -Help_Text_AboutThisGame:: @ 81B2E48 +Help_Text_AboutThisGame:: .string "About this game$" -Help_Text_TypeMatchupList:: @ 81B2E58 +Help_Text_TypeMatchupList:: .string "Type Matchup List$" -Help_Text_Exit:: @ 81B2E6A +Help_Text_Exit:: .string "EXIT$" -Help_Text_Cancel:: @ 81B2E6F +Help_Text_Cancel:: .string "CANCEL$" Help_Text_TryDoingItOnYourOwn:: .string "じぶんの ちからで やってみよう！$" -Help_Text_DescWhatShouldIDo:: @ 81B2E88 +Help_Text_DescWhatShouldIDo:: .string "Select to obtain hints for getting\n" .string "over challenging situations.$" -Help_Text_DescHowDoIDoThis:: @ 81B2EC8 +Help_Text_DescHowDoIDoThis:: .string "Detailed instructions are given for\n" .string "various operations.$" -Help_Text_DescWhatDoesThisTermMean:: @ 81B2F00 +Help_Text_DescWhatDoesThisTermMean:: .string "Detailed descriptions are given for\n" .string "terms that appear in the game.$" -Help_Text_DescAboutThisGame:: @ 81B2F43 +Help_Text_DescAboutThisGame:: .string "Detailed descriptions are given\n" .string "about this game.$" -Help_Text_DescTypeMatchupList:: @ 81B2F74 +Help_Text_DescTypeMatchupList:: .string "The matchups of POKéMON types\n" .string "and moves are listed.$" -Help_Text_DescExit:: @ 81B2FA9 +Help_Text_DescExit:: .string "Select to exit the HELP System.$" -Help_Text_Greetings:: @ 81B2FC9 +Help_Text_Greetings:: .string "Greetings! This is the HELP System.\n" .string "Call me up whenever and wherever you\l" .string "need by pressing the L or R Button.\l" .string "The help messages change to suit the\l" .string "situation, so check them often, please.$" -Help_Text_PlayingForFirstTime:: @ 81B3083 +Help_Text_PlayingForFirstTime:: .string "I'm playing for the first time. Help!$" -Help_Text_WhatShouldIBeDoing:: @ 81B30A9 +Help_Text_WhatShouldIBeDoing:: .string "What should I be doing?$" -Help_Text_CantGetOutOfRoom:: @ 81B30C1 +Help_Text_CantGetOutOfRoom:: .string "I can't get out of a room!$" -Help_Text_CantFindPersonIWant:: @ 81B30DC +Help_Text_CantFindPersonIWant:: .string "I can't find the person I want.$" -Help_Text_TalkedToEveryoneNowWhat:: @ 81B30FC +Help_Text_TalkedToEveryoneNowWhat:: .string "I've talked to everyone. Now what?$" -Help_Text_SomeoneBlockingMyWay:: @ 81B311F +Help_Text_SomeoneBlockingMyWay:: .string "There's someone blocking my way!$" -Help_Text_ICantGoOn:: @ 81B3140 +Help_Text_ICantGoOn:: .string "I can't go on!$" -Help_Text_OutOfThingsToDo:: @ 81B314F +Help_Text_OutOfThingsToDo:: .string "I'm out of things to do.$" -Help_Text_WhatHappenedToItemIGot:: @ 81B3168 +Help_Text_WhatHappenedToItemIGot:: .string "What happened to the item I got?$" -Help_Text_WhatAreMyAdventureBasics:: @ 81B3189 +Help_Text_WhatAreMyAdventureBasics:: .string "What are the basics of my adventure?$" -Help_Text_HowAreRoadsForestsDifferent:: @ 81B31AE +Help_Text_HowAreRoadsForestsDifferent:: .string "How are roads and forests different?$" -Help_Text_HowAreCavesDifferent:: @ 81B31D3 +Help_Text_HowAreCavesDifferent:: .string "How are caves different?$" -Help_Text_HowDoIProgress:: @ 81B31EC +Help_Text_HowDoIProgress:: .string "How do I progress?$" -Help_Text_WhenCanIUseItem:: @ 81B31FF +Help_Text_WhenCanIUseItem:: .string "When can I use items?$" -Help_Text_WhatsABattle:: @ 81B3215 +Help_Text_WhatsABattle:: .string "What's a battle?$" -Help_Text_HowDoIPrepareForBattle:: @ 81B3226 +Help_Text_HowDoIPrepareForBattle:: .string "How do I prepare for battle?$" -Help_Text_WhatIsAMonsVitality:: @ 81B3243 +Help_Text_WhatIsAMonsVitality:: .string "What is a POKéMON's vitality?$" -Help_Text_MyMonsAreHurt:: @ 81B3261 +Help_Text_MyMonsAreHurt:: .string "My POKéMON are hurt!$" -Help_Text_WhatIsStatusProblem:: @ 81B3276 +Help_Text_WhatIsStatusProblem:: .string "What is a status problem?$" -Help_Text_WhatHappensIfAllMyMonsFaint:: @ 81B3290 +Help_Text_WhatHappensIfAllMyMonsFaint:: .string "What happens if all my POKéMON faint?$" -Help_Text_CantCatchMons:: @ 81B32B6 +Help_Text_CantCatchMons:: .string "I can't catch POKéMON!$" -Help_Text_RanOutOfPotions:: @ 81B32CD +Help_Text_RanOutOfPotions:: .string "I ran out of POTIONS.$" -Help_Text_CanIBuyPokeBalls:: @ 81B32E3 +Help_Text_CanIBuyPokeBalls:: .string "Can I buy POKé BALLS?$" -Help_Text_WhatsATrainer:: @ 81B32F9 +Help_Text_WhatsATrainer:: .string "What's a TRAINER?$" -Help_Text_HowDoIWinAgainstTrainer:: @ 81B330B +Help_Text_HowDoIWinAgainstTrainer:: .string "How do I win against a TRAINER?$" -Help_Text_WhereDoMonsAppear:: @ 81B332B +Help_Text_WhereDoMonsAppear:: .string "Where do POKéMON appear?$" -Help_Text_WhatAreMoves:: @ 81B3344 +Help_Text_WhatAreMoves:: .string "What are POKéMON moves?$" -Help_Text_WhatAreHiddenMoves:: @ 81B335C +Help_Text_WhatAreHiddenMoves:: .string "What are HIDDEN moves?$" -Help_Text_WhatMovesShouldIUse:: @ 81B3373 +Help_Text_WhatMovesShouldIUse:: .string "What moves should I use?$" -Help_Text_WantToAddMoreMoves:: @ 81B338C +Help_Text_WantToAddMoreMoves:: .string "I want to add more moves.$" -Help_Text_WantToMakeMonStronger:: @ 81B33A6 +Help_Text_WantToMakeMonStronger:: .string "I want to make my POKéMON stronger.$" -Help_Text_FoeMonsTooStrong:: @ 81B33CA +Help_Text_FoeMonsTooStrong:: .string "The foe POKéMON are too strong!$" -Help_Text_WhatDoIDoInCave:: @ 81B33EA +Help_Text_WhatDoIDoInCave:: .string "What do I do in a cave?$" -Help_Text_NothingIWantToKnow:: @ 81B3402 +Help_Text_NothingIWantToKnow:: .string "There's nothing that I want to know!$" -Help_Text_WhatsPokemonCenter:: @ 81B3427 +Help_Text_WhatsPokemonCenter:: .string "What's a POKéMON CENTER?$" -Help_Text_WhatsPokemonMart:: @ 81B3440 +Help_Text_WhatsPokemonMart:: .string "What's a POKéMON MART?$" -Help_Text_WantToEndGame:: @ 81B3457 +Help_Text_WantToEndGame:: .string "I want to end the game.$" -Help_Text_WhatsAMon:: @ 81B346F +Help_Text_WhatsAMon:: .string "What's a POKéMON?$" -Help_Text_WhatIsThatPersonLike:: @ 81B3481 +Help_Text_WhatIsThatPersonLike:: .string "What is that person like?$" -Help_Text_WhatDoesHiddenMoveDo:: @ 81B349B +Help_Text_WhatDoesHiddenMoveDo:: .string "What does a HIDDEN move do?$" -Help_Text_WhatDoIDoInSafari:: @ 81B34B7 +Help_Text_WhatDoIDoInSafari:: .string "What do I do in a SAFARI GAME?$" -Help_Text_WhatAreSafariRules:: @ 81B34D6 +Help_Text_WhatAreSafariRules:: .string "What are the SAFARI GAME rules?$" -Help_Text_WantToEndSafari:: @ 81B34F6 +Help_Text_WantToEndSafari:: .string "I want to end this SAFARI GAME!$" -Help_Text_WhatIsAGym:: @ 81B3516 +Help_Text_WhatIsAGym:: .string "What is a GYM?$" -Help_Text_AnswerPlayingForFirstTime:: @ 81B3525 +Help_Text_AnswerPlayingForFirstTime:: .string "You become the main character,\n" .string "exploring the world of POKéMON.\l" .string "By talking to people and solving\l" @@ -192,7 +192,7 @@ Help_Text_AnswerPlayingForFirstTime:: @ 81B3525 .string "Strive for the goal together with your\l" .string "wonderful POKéMON.$" -Help_Text_AnswerWhatShouldIBeDoing:: @ 81B35E6 +Help_Text_AnswerWhatShouldIBeDoing:: .string "When you come across another person,\n" .string "go up to them and press the A Button.\l" .string "That will get them to talk and interact\l" @@ -201,7 +201,7 @@ Help_Text_AnswerWhatShouldIBeDoing:: @ 81B35E6 .string "the same way. Talk to people and check\l" .string "things often to obtain information.$" -Help_Text_AnswerCantGetOutOfRoom:: @ 81B36EB +Help_Text_AnswerCantGetOutOfRoom:: .string "On the stairs or the exits of a\n" .string "building is a red mat. Move your\l" .string "character to stand on top of the\l" @@ -209,7 +209,7 @@ Help_Text_AnswerCantGetOutOfRoom:: @ 81B36EB .string "toward the stairs or the exit to\l" .string "advance.$" -Help_Text_AnswerCantFindPersonIWant:: @ 81B379A +Help_Text_AnswerCantFindPersonIWant:: .string "This isn't something you should worry\n" .string "about too much.\l" .string "Talk to other people, check signs,\l" @@ -217,11 +217,11 @@ Help_Text_AnswerCantFindPersonIWant:: @ 81B379A .string "Sometimes, you may need to just move\l" .string "to a new town or place.$" -Help_Text_AnswerTalkedToEveryoneNowWhat:: @ 81B3849 +Help_Text_AnswerTalkedToEveryoneNowWhat:: .string "Try moving on to a new road, town, or\n" .string "place.$" -Help_Text_AnswerSomeoneBlockingMyWay:: @ 81B3876 +Help_Text_AnswerSomeoneBlockingMyWay:: .string "There could be something in the town\n" .string "or inside a building that is the cause.\l" .string "Try talking to the people in the area\l" @@ -230,7 +230,7 @@ Help_Text_AnswerSomeoneBlockingMyWay:: @ 81B3876 .string "Afterwards, try talking to the person\l" .string "blocking your way again.$" -Help_Text_AnswerICantGoOn:: @ 81B3972 +Help_Text_AnswerICantGoOn:: .string "Try talking to people by going up to\n" .string "them and pressing the A Button.\l" .string "Also, try checking things like odd trees\l" @@ -238,13 +238,13 @@ Help_Text_AnswerICantGoOn:: @ 81B3972 .string "Press the {PLUS} Control Pad and try going\l" .string "to places that look impassable, too.$" -Help_Text_AnswerOutOfThingsToDo:: @ 81B3A51 +Help_Text_AnswerOutOfThingsToDo:: .string "Try going to places where you \n" .string "haven't visited yet.\l" .string "Also, check everything that looks\l" .string "suspicious by pressing the A Button.$" -Help_Text_AnswerWhatHappenedToItemIGot:: @ 81B3ACC +Help_Text_AnswerWhatHappenedToItemIGot:: .string "Any item that you are given by another\n" .string "character goes in your BAG.\l" .string "The item is automatically sorted and\l" @@ -253,7 +253,7 @@ Help_Text_AnswerWhatHappenedToItemIGot:: @ 81B3ACC .string "please refer to the HELP System's\l" .string "“How do I do this?” heading.$" -Help_Text_AnswerWhatAreMyAdventureBasics:: @ 81B3BB6 +Help_Text_AnswerWhatAreMyAdventureBasics:: .string "If POKéMON are hurt in battle,\n" .string "take them to a POKéMON CENTER and\l" .string "have them healed by the staff.\l" @@ -262,13 +262,13 @@ Help_Text_AnswerWhatAreMyAdventureBasics:: @ 81B3BB6 .string "Stock up on healing items at\l" .string "POKéMON MARTS before traveling far.$" -Help_Text_AnswerHowAreRoadsForestsDifferent:: @ 81B3C99 +Help_Text_AnswerHowAreRoadsForestsDifferent:: .string "Forests are basically the same as\n" .string "roads but they can be like mazes.\l" .string "All forests have a way out, so don't\l" .string "give up if you get lost.$" -Help_Text_AnswerHowAreCavesDifferent:: @ 81B3D1B +Help_Text_AnswerHowAreCavesDifferent:: .string "Caves are dark and dangerous. Wild\n" .string "POKéMON can appear anywhere in them.\l" .string "If there is an emergency, rush to a\l" @@ -276,7 +276,7 @@ Help_Text_AnswerHowAreCavesDifferent:: @ 81B3D1B .string "New towns await discovery beyond some\l" .string "caves, so don't give up.$" -Help_Text_AnswerHowDoIProgress:: @ 81B3DE3 +Help_Text_AnswerHowDoIProgress:: .string "The object of the game is to train\n" .string "your POKéMON and move forward.\l" .string "You must collect info and solve\l" @@ -285,7 +285,7 @@ Help_Text_AnswerHowDoIProgress:: @ 81B3DE3 .string "What would get that impeding\l" .string "person out of the way?$" -Help_Text_AnswerWhenCanIUseItem:: @ 81B3EBC +Help_Text_AnswerWhenCanIUseItem:: .string "There are several kinds of items.\n" .string "Some can be used only on the field.\l" .string "Some are only for use during battle.\l" @@ -293,7 +293,7 @@ Help_Text_AnswerWhenCanIUseItem:: @ 81B3EBC .string "Try using an item - if it can't be used,\l" .string "you will be alerted.$" -Help_Text_AnswerWhatsABattle:: @ 81B3F7F +Help_Text_AnswerWhatsABattle:: .string "In a battle, POKéMON try to reduce\n" .string "one another's vitality, expressed as\l" .string "HP. If a POKéMON's HP falls to zero,\l" @@ -302,14 +302,14 @@ Help_Text_AnswerWhatsABattle:: @ 81B3F7F .string "earn EXP. Points, which help them\l" .string "level up (grow stronger).$" -Help_Text_AnswerHowDoIPrepareForBattle:: @ 81B406C +Help_Text_AnswerHowDoIPrepareForBattle:: .string "First, fully heal the POKéMON in your\n" .string "party (the POKéMON with you) at any\l" .string "POKéMON CENTER.\l" .string "You should also buy healing items for\l" .string "emergencies at a POKéMON MART.$" -Help_Text_AnswerWhatIsAMonsVitality:: @ 81B410B +Help_Text_AnswerWhatIsAMonsVitality:: .string "A POKéMON's vitality is expressed in HP.\n" .string "If a POKéMON is hurt in battle, HP is\l" .string "subtracted. If its HP drops to zero,\l" @@ -317,7 +317,7 @@ Help_Text_AnswerWhatIsAMonsVitality:: @ 81B410B .string "Heal hurt or fainted POKéMON at a\l" .string "POKéMON CENTER or by using items.$" -Help_Text_AnswerMyMonsAreHurt:: @ 81B41D7 +Help_Text_AnswerMyMonsAreHurt:: .string "A POKéMON CENTER is like an inn for\n" .string "POKéMON. It will fully heal POKéMON of\l" .string "any status problems and fully restore\l" @@ -325,7 +325,7 @@ Help_Text_AnswerMyMonsAreHurt:: @ 81B41D7 .string "This service is free, so get in the\l" .string "habit of healing your POKéMON often.$" -Help_Text_AnswerWhatIsStatusProblem:: @ 81B42B3 +Help_Text_AnswerWhatIsStatusProblem:: .string "A status problem refers to an ailment\n" .string "that is inflicted on a POKéMON by its\l" .string "foe's attack. These include burns,\l" @@ -334,7 +334,7 @@ Help_Text_AnswerWhatIsStatusProblem:: @ 81B42B3 .string "visiting a POKéMON CENTER or using\l" .string "the appropriate item.$" -Help_Text_AnswerWhatHappensIfAllMyMonsFaint:: @ 81B439D +Help_Text_AnswerWhatHappensIfAllMyMonsFaint:: .string "If all the POKéMON in your party\n" .string "(all the POKéMON with you) faint, you\l" .string "lose some MONEY, and you are\l" @@ -343,7 +343,7 @@ Help_Text_AnswerWhatHappensIfAllMyMonsFaint:: @ 81B439D .string "POKéMON CENTERS often. Also, get\l" .string "in the habit of saving often.$" -Help_Text_AnswerCantCatchMons:: @ 81B4483 +Help_Text_AnswerCantCatchMons:: .string "If a wild POKéMON escapes from a POKé\n" .string "BALL, it's obviously still feisty.\l" .string "Try reducing its HP some more, and\l" @@ -352,7 +352,7 @@ Help_Text_AnswerCantCatchMons:: @ 81B4483 .string "If the POKé BALL rocks for a while,\l" .string "the quarry is close to being caught!$" -Help_Text_AnswerRanOutOfPotions:: @ 81B457C +Help_Text_AnswerRanOutOfPotions:: .string "There are shops, known as POKéMON\n" .string "MARTS, that sell items.\l" .string "You will not find POKéMON MARTS on\l" @@ -360,7 +360,7 @@ Help_Text_AnswerRanOutOfPotions:: @ 81B457C .string "Stock up on needed items while you are\l" .string "visiting a town with a POKéMON MART.$" -Help_Text_AnswerCanIBuyPokeBalls:: @ 81B4645 +Help_Text_AnswerCanIBuyPokeBalls:: .string "You may buy POKé BALLS at any\n" .string "POKéMON MART in any town.\l" .string "You will not find POKéMON MARTS on\l" @@ -368,7 +368,7 @@ Help_Text_AnswerCanIBuyPokeBalls:: @ 81B4645 .string "Stock up on POKé BALLS while you are\l" .string "visiting a town with a POKéMON MART.$" -Help_Text_AnswerWhatsATrainer:: @ 81B470A +Help_Text_AnswerWhatsATrainer:: .string "A TRAINER is a person who raises\n" .string "POKéMON through battling.\l" .string "TRAINERS will challenge you \l" @@ -377,7 +377,7 @@ Help_Text_AnswerWhatsATrainer:: @ 81B470A .string "If your eyes meet, you have to accept\l" .string "their challenge. So be careful!$" -Help_Text_AnswerHowDoIWinAgainstTrainer:: @ 81B47F0 +Help_Text_AnswerHowDoIWinAgainstTrainer:: .string "To beat a TRAINER in battle, use\n" .string "POKéMON that have type advantages\l" .string "over the foe's POKéMON. You may also\l" @@ -386,14 +386,14 @@ Help_Text_AnswerHowDoIWinAgainstTrainer:: @ 81B47F0 .string "foe's POKéMON is another obvious\l" .string "tactic.$" -Help_Text_AnswerWhereDoMonsAppear:: @ 81B48C6 +Help_Text_AnswerWhereDoMonsAppear:: .string "Wild POKéMON will appear in tall grass,\n" .string "on roads, and in forests. They will\l" .string "appear anywhere in dark caves.\l" .string "There are no wild POKéMON or TRAINERS\l" .string "in towns, so they are safe places.$" -Help_Text_AnswerWhatAreMoves:: @ 81B497A +Help_Text_AnswerWhatAreMoves:: .string "POKéMON may learn up to four different\n" .string "techniques, or moves. There is a great\l" .string "variety of moves including attacks and\l" @@ -402,7 +402,7 @@ Help_Text_AnswerWhatAreMoves:: @ 81B497A .string "for each POKéMON. Some moves\l" .string "can be learned from machines.$" -Help_Text_AnswerWhatAreHiddenMoves:: @ 81B4A72 +Help_Text_AnswerWhatAreHiddenMoves:: .string "HIDDEN moves are those that are\n" .string "especially important for your\l" .string "adventure. To use such a move outside\l" @@ -411,7 +411,7 @@ Help_Text_AnswerWhatAreHiddenMoves:: @ 81B4A72 .string "move use it. A fainted POKéMON may use\l" .string "a HIDDEN move outside of battle.$" -Help_Text_AnswerWhatMovesShouldIUse:: @ 81B4B65 +Help_Text_AnswerWhatMovesShouldIUse:: .string "Select “FIGHT,” and the MENU of moves\n" .string "will appear. Consider the type\l" .string "matchups, and use the most effective\l" @@ -420,7 +420,7 @@ Help_Text_AnswerWhatMovesShouldIUse:: @ 81B4B65 .string "picking a POKéMON, opening “SUMMARY,”\l" .string "then opening “POKéMON SKILLS.”$" -Help_Text_AnswerWantToAddMoreMoves:: @ 81B4C54 +Help_Text_AnswerWantToAddMoreMoves:: .string "The most a POKéMON can learn is four\n" .string "moves. They are learned as the\l" .string "POKéMON levels up. It can also be\l" @@ -428,7 +428,7 @@ Help_Text_AnswerWantToAddMoreMoves:: @ 81B4C54 .string "Machine) or HM (Hidden Machine).\l" .string "There are also people who teach moves.$" -Help_Text_AnswerWantToMakeMonStronger:: @ 81B4D26 +Help_Text_AnswerWantToMakeMonStronger:: .string "The key to making your POKéMON\n" .string "strong is to battle and win often.\l" .string "The EXP. (Experience) Points earned\l" @@ -437,7 +437,7 @@ Help_Text_AnswerWantToMakeMonStronger:: @ 81B4D26 .string "them. Battle wild POKéMON often to\l" .string "level up your party.$" -Help_Text_AnswerFoeMonsTooStrong:: @ 81B4E0B +Help_Text_AnswerFoeMonsTooStrong:: .string "If your foes are too strong, try\n" .string "leveling up your POKéMON some more.\l" .string "Go back the way you came and battle\l" @@ -445,7 +445,7 @@ Help_Text_AnswerFoeMonsTooStrong:: @ 81B4E0B .string "You may also battle TRAINERS whom you\l" .string "have not battled before.$" -Help_Text_AnswerWhatDoIDoInCave:: @ 81B4ED8 +Help_Text_AnswerWhatDoIDoInCave:: .string "Unlike roads and forests, wild POKéMON\n" .string "can appear anywhere in caves.\l" .string "If your POKéMON are hurt in a cave,\l" @@ -453,11 +453,11 @@ Help_Text_AnswerWhatDoIDoInCave:: @ 81B4ED8 .string "to heal them right away. It is very\l" .string "dangerous to force your luck in caves.$" -Help_Text_AnswerNothingIWantToKnow:: @ 81B4FB2 +Help_Text_AnswerNothingIWantToKnow:: .string "Trust your own knowledge and power.\n" .string "Believe in yourself and find your way!$" -Help_Text_AnswerWhatsPokemonCenter:: @ 81B4FFD +Help_Text_AnswerWhatsPokemonCenter:: .string "A POKéMON CENTER is identified by its\n" .string "red roof and a “P.C” sign. Every\l" .string "POKéMON CENTER offers such services as\l" @@ -466,14 +466,14 @@ Help_Text_AnswerWhatsPokemonCenter:: @ 81B4FFD .string "On the upper floor are facilities for\l" .string "linking with friends and others.$" -Help_Text_AnswerWhatsPokemonMart:: @ 81B50FF +Help_Text_AnswerWhatsPokemonMart:: .string "A POKéMON MART is identified by its\n" .string "blue roof and a “MART” sign.\l" .string "Items can be bought and sold at any\l" .string "POKéMON MART. Some MARTS carry items\l" .string "that are available only in their towns.$" -Help_Text_AnswerWantToEndGame:: @ 81B51B1 +Help_Text_AnswerWantToEndGame:: .string "You can safely end your game by\n" .string "selecting “SAVE” on the MENU.\l" .string "Once you have saved, the game can be\l" @@ -481,19 +481,19 @@ Help_Text_AnswerWantToEndGame:: @ 81B51B1 .string "turned back on, you can resume from\l" .string "where you last saved.$" -Help_Text_AnswerWhatsAMon:: @ 81B5272 +Help_Text_AnswerWhatsAMon:: .string "POKéMON are living beings about which\n" .string "many mysteries still remain. You may\l" .string "see them in grass, the sea, and caves.\l" .string "They appear to obey the wishes of the\l" .string "TRAINERS that caught them.$" -Help_Text_AnswerWhatIsThatPersonLike:: @ 81B5325 +Help_Text_AnswerWhatIsThatPersonLike:: .string "Use the FAME CHECKER among the\n" .string "KEY ITEMS in your BAG.\l" .string "It may give you a hint, so try it out.$" -Help_Text_AnswerWhatDoesHiddenMoveDo:: @ 81B5382 +Help_Text_AnswerWhatDoesHiddenMoveDo:: .string "A HIDDEN move is taught to a POKéMON\n" .string "using an HM (Hidden Machine).\l" .string "A HIDDEN move is important for helping\l" @@ -502,24 +502,24 @@ Help_Text_AnswerWhatDoesHiddenMoveDo:: @ 81B5382 .string "cuts down small trees. There is one\l" .string "for traveling on water, and so on.$" -Help_Text_AnswerWhatDoIDoInSafari:: @ 81B547C +Help_Text_AnswerWhatDoIDoInSafari:: .string "Try to catch wild POKéMON by throwing\n" .string "the special SAFARI BALLS.\l" .string "You may keep any item you find, too.$" -Help_Text_AnswerWhatAreSafariRules:: @ 81B54E1 +Help_Text_AnswerWhatAreSafariRules:: .string "Your SAFARI GAME ends once you have\n" .string "traveled a certain distance or thrown\l" .string "all your SAFARI BALLS.\l" .string "Open the MENU to check the remaining\l" .string "number of steps and SAFARI BALLS.$" -Help_Text_AnswerWantToEndSafari:: @ 81B5589 +Help_Text_AnswerWantToEndSafari:: .string "If you would like to cut your SAFARI\n" .string "GAME short, open the MENU and select\l" .string "“RETIRE” at the top of the list.$" -Help_Text_AnswerWhatIsAGym:: @ 81B55F4 +Help_Text_AnswerWhatIsAGym:: .string "POKéMON GYMS are operated by the\n" .string "POKéMON LEAGUE and are training\l" .string "facilities for TRAINERS. They are all\l" @@ -528,151 +528,151 @@ Help_Text_AnswerWhatIsAGym:: @ 81B55F4 .string "is a very skilled TRAINER. Beat the\l" .string "LEADER to collect a BADGE.$" -Help_Text_UsingPokedex:: @ 81B56E3 +Help_Text_UsingPokedex:: .string " Using “POKéDEX”$" -Help_Text_UsingPokemon:: @ 81B56F4 +Help_Text_UsingPokemon:: .string " Using “POKéMON”$" -Help_Text_UsingSummary:: @ 81B5705 +Help_Text_UsingSummary:: .string " Using “SUMMARY”$" -Help_Text_UsingSwitch:: @ 81B5717 +Help_Text_UsingSwitch:: .string " Using “SWITCH”$" -Help_Text_UsingItem:: @ 81B5728 +Help_Text_UsingItem:: .string " Using “ITEM”$" -Help_Text_UsingBag:: @ 81B5737 +Help_Text_UsingBag:: .string " Using “BAG”$" -Help_Text_UsingAnItem:: @ 81B5744 +Help_Text_UsingAnItem:: .string " Using an item$" -Help_Text_UsingKeyItem:: @ 81B5754 +Help_Text_UsingKeyItem:: .string " Using a key item$" -Help_Text_UsingPokeBall:: @ 81B5767 +Help_Text_UsingPokeBall:: .string " Using a POKé BALL$" -Help_Text_UsingPlayer:: @ 81B577B +Help_Text_UsingPlayer:: .string " Using “{PLAYER}”$" -Help_Text_UsingSave:: @ 81B5787 +Help_Text_UsingSave:: .string " Using “SAVE”$" -Help_Text_UsingOption:: @ 81B5795 +Help_Text_UsingOption:: .string " Using “OPTION”$" -Help_Text_UsingPotion:: @ 81B57A5 +Help_Text_UsingPotion:: .string " Using a POTION$" -Help_Text_UsingTownMap:: @ 81B57B8 +Help_Text_UsingTownMap:: .string " Using the TOWN MAP$" -Help_Text_UsingTM:: @ 81B57CF +Help_Text_UsingTM:: .string " Using a TM$" -Help_Text_UsingHM:: @ 81B57DE +Help_Text_UsingHM:: .string " Using an HM$" -Help_Text_UsingMoveOutsideOfBattle:: @ 81B57EE +Help_Text_UsingMoveOutsideOfBattle:: .string "Using a move outside of battle$" -Help_Text_RidingBicycle:: @ 81B580D +Help_Text_RidingBicycle:: .string " Riding the BICYCLE$" -Help_Text_EnteringName:: @ 81B5824 +Help_Text_EnteringName:: .string "Entering a name$" -Help_Text_UsingPC:: @ 81B5834 +Help_Text_UsingPC:: .string "Using a PC$" -Help_Text_UsingBillsPC:: @ 81B583F +Help_Text_UsingBillsPC:: .string " Using “{STR_VAR_1}'S PC”$" -Help_Text_UsingWithdraw:: @ 81B5850 +Help_Text_UsingWithdraw:: .string " Using “WITHDRAW”$" -Help_Text_UsingDeposit:: @ 81B5863 +Help_Text_UsingDeposit:: .string " Using “DEPOSIT”$" -Help_Text_UsingMove:: @ 81B5875 +Help_Text_UsingMove:: .string " Using “MOVE”$" -Help_Text_MovingItems:: @ 81B5884 +Help_Text_MovingItems:: .string " Moving items$" -Help_Text_UsingPlayersPC:: @ 81B5893 +Help_Text_UsingPlayersPC:: .string " Using “{PLAYER}'s PC”$" -Help_Text_UsingWithdrawItem:: @ 81B58A4 +Help_Text_UsingWithdrawItem:: .string " Using “WITHDRAW ITEM”$" -Help_Text_UsingDepositItem:: @ 81B58BC +Help_Text_UsingDepositItem:: .string " Using “DEPOSIT ITEM”$" -Help_Text_UsingMailbox:: @ 81B58D3 +Help_Text_UsingMailbox:: .string " Using “MAILBOX”$" -Help_Text_UsingProfOaksPC:: @ 81B58E5 +Help_Text_UsingProfOaksPC:: .string " Using “PROF. OAK'S PC”$" -Help_Text_OpeningMenu:: @ 81B58FD +Help_Text_OpeningMenu:: .string "Opening the MENU$" -Help_Text_UsingFight:: @ 81B590E +Help_Text_UsingFight:: .string " Using “FIGHT”$" -Help_Text_UsingPokemon2:: @ 81B591D +Help_Text_UsingPokemon2:: .string " Using “POKéMON”$" -Help_Text_UsingShift:: @ 81B592E +Help_Text_UsingShift:: .string " Using “SHIFT”$" -Help_Text_UsingSummary2:: @ 81B593E +Help_Text_UsingSummary2:: .string " Using “SUMMARY”$" -Help_Text_UsingBag2:: @ 81B5950 +Help_Text_UsingBag2:: .string " Using “BAG”$" -Help_Text_ReadingPokedex:: @ 81B595D +Help_Text_ReadingPokedex:: .string " Reading the “POKéDEX”$" -Help_Text_UsingHomePC:: @ 81B5974 +Help_Text_UsingHomePC:: .string "Using the PC at home$" -Help_Text_UsingItemStorage:: @ 81B5989 +Help_Text_UsingItemStorage:: .string "Using the Item Storage System$" -Help_Text_UsingWithdrawItem2:: @ 81B59A7 +Help_Text_UsingWithdrawItem2:: .string " Using “WITHDRAW ITEM”$" -Help_Text_UsingDepositItem2:: @ 81B59BF +Help_Text_UsingDepositItem2:: .string " Using “DEPOSIT ITEM”$" -Help_Text_UsingMailbox2:: @ 81B59D6 +Help_Text_UsingMailbox2:: .string "Using the MAILBOX$" -Help_Text_UsingRun:: @ 81B59E8 +Help_Text_UsingRun:: .string " Using “RUN”$" -Help_Text_RegisterKeyItem:: @ 81B59F5 +Help_Text_RegisterKeyItem:: .string " “REGISTER” a key item$" -Help_Text_UsingBall:: @ 81B5A0D +Help_Text_UsingBall:: .string " Using “BALL”$" -Help_Text_UsingBait:: @ 81B5A1B +Help_Text_UsingBait:: .string " Using “BAIT”$" -Help_Text_UsingRock:: @ 81B5A29 +Help_Text_UsingRock:: .string " Using “ROCK”$" -Help_Text_UsingHallOfFame:: @ 81B5A37 +Help_Text_UsingHallOfFame:: .string " Using “HALL OF FAME”$" -Help_Text_HowToUsePokedex:: @ 81B5A4D +Help_Text_HowToUsePokedex:: .string "{CIRCLE_1} Select “POKéDEX” on the MENU.\n" .string "{CIRCLE_2} Choose POKéMON using commands such\n" .string " as “POKéMON LIST,”\n" @@ -681,13 +681,13 @@ Help_Text_HowToUsePokedex:: @ 81B5A4D .string "{CIRCLE_3} Select a POKéMON to obtain detailed\n" .string " information.$" -Help_Text_HowToUsePokemon:: @ 81B5B0C +Help_Text_HowToUsePokemon:: .string "{CIRCLE_1} Select “POKéMON” on the MENU.\n" .string "{CIRCLE_2} Choose a POKéMON in your party.\n" .string "{CIRCLE_3} Select “SUMMARY,” “SWITCH,”\n" .string " or “ITEM.”$" -Help_Text_HowToUseSummary:: @ 81B5B7D +Help_Text_HowToUseSummary:: .string "{CIRCLE_1} Select “SUMMARY.”\n" .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the information:\n" @@ -695,7 +695,7 @@ Help_Text_HowToUseSummary:: @ 81B5B7D .string " “POKéMON SKILLS”\n" .string " “KNOWN MOVES”$" -Help_Text_HowToUseSwitch:: @ 81B5C13 +Help_Text_HowToUseSwitch:: .string "{CIRCLE_1} Choose the POKéMON you want to\n" .string " switch around.\n" .string "{CIRCLE_2} Select “SWITCH.”\n" @@ -704,7 +704,7 @@ Help_Text_HowToUseSwitch:: @ 81B5C13 .string "The POKéMON at the left of the screen\n" .string "will be the first one out in a battle.$" -Help_Text_HowToUseItem:: @ 81B5CDF +Help_Text_HowToUseItem:: .string "{CIRCLE_1} Select “ITEM.”\n" .string "{CIRCLE_2} Select whether you want to “GIVE”\n" .string " an item to the POKéMON to hold,\n" @@ -712,7 +712,7 @@ Help_Text_HowToUseItem:: @ 81B5CDF .string "A POKéMON can hold no more than one\n" .string "item!$" -Help_Text_HowToUseBag:: @ 81B5D87 +Help_Text_HowToUseBag:: .string "{CIRCLE_1} Select “BAG” on the MENU.\n" .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the data headings:\n" @@ -721,7 +721,7 @@ Help_Text_HowToUseBag:: @ 81B5D87 .string " “POKé BALLS”\n" .string " Press up or down to select an item.$" -Help_Text_HowToUseAnItem:: @ 81B5E41 +Help_Text_HowToUseAnItem:: .string "{CIRCLE_1} Select the “ITEMS” POCKET.\n" .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad to select an item.\n" @@ -730,14 +730,14 @@ Help_Text_HowToUseAnItem:: @ 81B5E41 .string "Some items may not be used depending\n" .string "on the place and/or situation.$" -Help_Text_HowToUseKeyItem:: @ 81B5F10 +Help_Text_HowToUseKeyItem:: .string "{CIRCLE_1} Select the “KEY ITEMS” POCKET.\n" .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad to select a key item.\n" .string "{CIRCLE_3} Select “USE” to use the selected\n" .string " key item.$" -Help_Text_HowToUsePokeBall:: @ 81B5FA6 +Help_Text_HowToUsePokeBall:: .string "{CIRCLE_1} While battling a wild POKéMON,\n" .string " select the BAG's “POKé BALLS”\n" .string " POCKET.\n" @@ -746,7 +746,7 @@ Help_Text_HowToUsePokeBall:: @ 81B5FA6 .string "{CIRCLE_3} Select “USE” to throw the selected\n" .string " POKé BALL.$" -Help_Text_HowToUsePlayer:: @ 81B606C +Help_Text_HowToUsePlayer:: .string "{CIRCLE_1} Select “{PLAYER}” on the MENU.\n" .string "{CIRCLE_2} Your TRAINER CARD is displayed face\n" .string " up with basic information. Press the\n" @@ -754,7 +754,7 @@ Help_Text_HowToUsePlayer:: @ 81B606C .string "{CIRCLE_3} A variety of data can be found on\n" .string " the reverse side of the CARD.$" -Help_Text_HowToUseSave:: @ 81B6140 +Help_Text_HowToUseSave:: .string "{CIRCLE_1} Select “SAVE” on the MENU.\n" .string "{CIRCLE_2} Select “YES” and your progress is\n" .string " recorded in the save file.\n" @@ -762,7 +762,7 @@ Help_Text_HowToUseSave:: @ 81B6140 .string "off the game. Your game can be resumed\n" .string "from where you saved.$" -Help_Text_HowToUseOption:: @ 81B6203 +Help_Text_HowToUseOption:: .string "{CIRCLE_1} Select “OPTION” on the MENU.\n" .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad to select an optional item, then\n" @@ -771,7 +771,7 @@ Help_Text_HowToUseOption:: @ 81B6203 .string "{CIRCLE_3} Select “CANCEL” or press the\n" .string " B Button after making changes.$" -Help_Text_HowToUsePotion:: @ 81B62E4 +Help_Text_HowToUsePotion:: .string "{CIRCLE_1} Open the MENU.\n" .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad and select “BAG.”\n" @@ -780,7 +780,7 @@ Help_Text_HowToUsePotion:: @ 81B62E4 .string "{CIRCLE_4} Select “USE.”\n" .string "{CIRCLE_5} Select the POKéMON to be healed.$" -Help_Text_HowToUseTownMap:: @ 81B6397 +Help_Text_HowToUseTownMap:: .string "{CIRCLE_1} Open the MENU.\n" .string "{CIRCLE_2} Press up or down on the {PLUS} Control\n" .string " Pad and select “BAG.”\n" @@ -789,7 +789,7 @@ Help_Text_HowToUseTownMap:: @ 81B6397 .string " up or down to select “TOWN MAP.” \n" .string "{CIRCLE_4} Select “USE” to open the TOWN MAP.$" -Help_Text_HowToUseTM:: @ 81B6478 +Help_Text_HowToUseTM:: .string "{CIRCLE_1} Open the MENU.\n" .string "{CIRCLE_2} Open the “KEY ITEMS” POCKET in the\n" .string " “BAG.”\n" @@ -798,7 +798,7 @@ Help_Text_HowToUseTM:: @ 81B6478 .string "{CIRCLE_5} Select a POKéMON that can learn the\n" .string " move in the TM.$" -Help_Text_HowToUseHM:: @ 81B6525 +Help_Text_HowToUseHM:: .string "{CIRCLE_1} Open the MENU.\n" .string "{CIRCLE_2} Open the “KEY ITEMS” POCKET in the\n" .string " “BAG.”\n" @@ -807,7 +807,7 @@ Help_Text_HowToUseHM:: @ 81B6525 .string "{CIRCLE_5} Select a POKéMON that can learn it.\n" .string "HMs are hard to remove, so be careful!$" -Help_Text_HowToUseMoveOutsideOfBattle:: @ 81B65E7 +Help_Text_HowToUseMoveOutsideOfBattle:: .string "{CIRCLE_1} Open the MENU.\n" .string "{CIRCLE_2} Select “POKéMON.”\n" .string "{CIRCLE_3} Select a POKéMON that knows an\n" @@ -816,7 +816,7 @@ Help_Text_HowToUseMoveOutsideOfBattle:: @ 81B65E7 .string " use the desired move to destroy an\n" .string " obstacle, fly, surf, etc.$" -Help_Text_HowToRideBicycle:: @ 81B66BA +Help_Text_HowToRideBicycle:: .string "{CIRCLE_1} Open the MENU. Open the\n" .string " “KEY ITEMS” POCKET in the “BAG”\n" .string " and select the “BICYCLE.”\n" @@ -825,7 +825,7 @@ Help_Text_HowToRideBicycle:: @ 81B66BA .string " “REGISTER” it for instant use by\n" .string " pressing SELECT.$" -Help_Text_HowToEnterName:: @ 81B678E +Help_Text_HowToEnterName:: .string "{CIRCLE_1} Move the cursor to the letter you\n" .string " want with the {PLUS} Control Pad, then\n" .string " press the A Button to enter it.\n" @@ -834,11 +834,11 @@ Help_Text_HowToEnterName:: @ 81B678E .string " uppercase and lowercase letters.\n" .string "{CIRCLE_4} Press the A Button on “OK.”$" -Help_Text_HowToUsePC:: @ 81B6883 +Help_Text_HowToUsePC:: .string "{CIRCLE_1} Go to any POKéMON CENTER, go up\n" .string " to the PC, then press the A Button.$" -Help_Text_HowToUseBillsPC:: @ 81B68CD +Help_Text_HowToUseBillsPC:: .string "{CIRCLE_1} Select “{STR_VAR_1}'S PC” on the PC.\n" .string "{CIRCLE_2} Select from one of the top three\n" .string " MENU items to access the POKéMON\n" @@ -847,7 +847,7 @@ Help_Text_HowToUseBillsPC:: @ 81B68CD .string "six in your party, the POKéMON is sent\n" .string "automatically to a BOX in the System!$" -Help_Text_HowToUseWithdraw:: @ 81B69B9 +Help_Text_HowToUseWithdraw:: .string "{CIRCLE_1} Select a POKéMON in the open BOX\n" .string " with the {PLUS} Control Pad.\n" .string "{CIRCLE_2} Select “WITHDRAW” to remove the\n" @@ -856,7 +856,7 @@ Help_Text_HowToUseWithdraw:: @ 81B69B9 .string "You may not withdraw a POKéMON if you\n" .string "already have six POKéMON with you!$" -Help_Text_HowToUseDeposit:: @ 81B6A9A +Help_Text_HowToUseDeposit:: .string "{CIRCLE_1} Select a POKéMON in your party with\n" .string " the {PLUS} Control Pad.\n" .string "{CIRCLE_2} Select “DEPOSIT.”\n" @@ -865,7 +865,7 @@ Help_Text_HowToUseDeposit:: @ 81B6A9A .string "If you have only one POKéMON with you,\n" .string "it may not be stored!$" -Help_Text_HowToUseMove:: @ 81B6B6E +Help_Text_HowToUseMove:: .string "{CIRCLE_1} Select a POKéMON in the open BOX.\n" .string "{CIRCLE_2} Pick up the POKéMON by selecting\n" .string " “MOVE” and move it anywhere with\n" @@ -874,7 +874,7 @@ Help_Text_HowToUseMove:: @ 81B6B6E .string " and press left or right to move it\n" .string " to another BOX.$" -Help_Text_HowToMoveItems:: @ 81B6C4F +Help_Text_HowToMoveItems:: .string "{CIRCLE_1} Faintly shown POKéMON can be made\n" .string " to hold an item by selecting it and\n" .string " pressing the A Button.\n" @@ -883,7 +883,7 @@ Help_Text_HowToMoveItems:: @ 81B6C4F .string " another POKéMON, or return the item\n" .string " to the BAG with the A Button.$" -Help_Text_HowToUsePlayersPC:: @ 81B6D4A +Help_Text_HowToUsePlayersPC:: .string "{CIRCLE_1} Select “{PLAYER}'s PC” on the PC.\n" .string "{CIRCLE_2} Select either “ITEM STORAGE” or\n" .string " “MAILBOX.”\n" @@ -891,7 +891,7 @@ Help_Text_HowToUsePlayersPC:: @ 81B6D4A .string "if your BAG is full. You may also\n" .string "withdraw items stored in your PC.$" -Help_Text_HowToUseWithdrawItem:: @ 81B6E02 +Help_Text_HowToUseWithdrawItem:: .string "{CIRCLE_1} Select “WITHDRAW ITEM.”\n" .string "{CIRCLE_2} Select the item to be withdrawn.\n" .string "{CIRCLE_3} The item can be withdrawn and\n" @@ -899,7 +899,7 @@ Help_Text_HowToUseWithdrawItem:: @ 81B6E02 .string " It may also be directly given to a\n" .string " POKéMON to hold.$" -Help_Text_HowToUseDepositItem:: @ 81B6EC1 +Help_Text_HowToUseDepositItem:: .string "{CIRCLE_1} Select “DEPOSIT ITEM.”\n" .string "{CIRCLE_2} Select the item in the BAG to be\n" .string " deposited using the {PLUS} Control Pad.\n" @@ -908,7 +908,7 @@ Help_Text_HowToUseDepositItem:: @ 81B6EC1 .string " quantity with the {PLUS} Control Pad,\n" .string " then press the A Button.$" -Help_Text_HowToUseMailbox:: @ 81B6FA8 +Help_Text_HowToUseMailbox:: .string "When MAIL is taken from a POKéMON,\n" .string "it is moved to the MAILBOX. If it has\n" .string "no MAIL, the MAILBOX can't be used.\n" @@ -916,14 +916,14 @@ Help_Text_HowToUseMailbox:: @ 81B6FA8 .string "{CIRCLE_2} Select “MAILBOX” to read MAIL or\n" .string " make a POKéMON hold MAIL.$" -Help_Text_HowToUseProfOaksPC:: @ 81B7075 +Help_Text_HowToUseProfOaksPC:: .string "{CIRCLE_1} Select “PROF. OAK'S PC” on the PC.\n" .string "{CIRCLE_2} PROF. OAK will evaluate your\n" .string " POKéDEX.\n" .string "His evaluations should give you hints\n" .string "for catching more POKéMON!$" -Help_Text_HowToOpenMenu:: @ 81B7108 +Help_Text_HowToOpenMenu:: .string "{CIRCLE_1} Press START.\n" .string "{CIRCLE_2} The MENU will open on the right.\n" .string "{CIRCLE_3} Depending on the situation, the MENU\n" @@ -932,12 +932,12 @@ Help_Text_HowToOpenMenu:: @ 81B7108 .string "situations such as when talking, doing\n" .string "something, battling, etc.$" -Help_Text_HowToUseFight:: @ 81B71EA +Help_Text_HowToUseFight:: .string "{CIRCLE_1} Select “FIGHT.”\n" .string "{CIRCLE_2} Select one of the moves shown,\n" .string "and that move will be used!$" -Help_Text_HowToUsePokemon2:: @ 81B723B +Help_Text_HowToUsePokemon2:: .string "{CIRCLE_1} Select “POKéMON.”\n" .string "{CIRCLE_2} Select the POKéMON in your party\n" .string " that you want to use.\n" @@ -946,7 +946,7 @@ Help_Text_HowToUsePokemon2:: @ 81B723B .string " selecting “SHIFT.” Check POKéMON\n" .string " data by selecting “SUMMARY.”$" -Help_Text_HowToUseShift:: @ 81B7319 +Help_Text_HowToUseShift:: .string "This command switches the POKéMON in\n" .string "battle with another one in your party.\n" .string "{CIRCLE_1} Select the POKéMON to be sent out.\n" @@ -954,7 +954,7 @@ Help_Text_HowToUseShift:: @ 81B7319 .string "{CIRCLE_3} The selected POKéMON will switch\n" .string " places with the POKéMON in battle!$" -Help_Text_HowToUseSummary2:: @ 81B73E8 +Help_Text_HowToUseSummary2:: .string "{CIRCLE_1} Select “SUMMARY.”\n" .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the information:\n" @@ -962,7 +962,7 @@ Help_Text_HowToUseSummary2:: @ 81B73E8 .string " “POKéMON SKILLS”\n" .string " “KNOWN MOVES”$" -Help_Text_HowToUseBag2:: @ 81B747E +Help_Text_HowToUseBag2:: .string "{CIRCLE_1} Select “BAG.”\n" .string "{CIRCLE_2} Press left or right on the {PLUS} Control\n" .string " Pad to check the data headings:\n" @@ -971,7 +971,7 @@ Help_Text_HowToUseBag2:: @ 81B747E .string " “POKé BALLS”\n" .string " Press up or down to select an item.$" -Help_Text_HowToReadPokedex:: @ 81B752C +Help_Text_HowToReadPokedex:: .string "{CIRCLE_1} POKéMON that you have caught are\n" .string " identified by a POKé BALL mark on\n" .string " the POKéDEX list.\n" @@ -985,20 +985,20 @@ Help_Text_HowToReadPokedex:: @ 81B752C .string " TOWN MAP with its habitat(s).$" .endif -Help_Text_HowToUseHomePC:: @ 81B7611 +Help_Text_HowToUseHomePC:: .string "{CIRCLE_1} Go up to the PC at home, then press\n" .string " the A Button.\n" .string "{CIRCLE_2} The PC will turn on.\n" .string "{CIRCLE_3} Select either “ITEM STORAGE” or\n" .string " “MAILBOX.”$" -Help_Text_HowToUseItemStorage:: @ 81B7692 +Help_Text_HowToUseItemStorage:: .string "{CIRCLE_1} Select “WITHDRAW ITEM” to withdraw\n" .string " an item stored on your PC.\n" .string "{CIRCLE_2} Select “DEPOSIT ITEM” to put \n" .string " an item from your BAG into your PC.$" -Help_Text_HowToUseWithdrawItem2:: @ 81B771E +Help_Text_HowToUseWithdrawItem2:: .string "{CIRCLE_1} Select “WITHDRAW ITEM.”\n" .string "{CIRCLE_2} Select the item to be withdrawn.\n" .string "{CIRCLE_3} The item can be withdrawn and\n" @@ -1006,41 +1006,41 @@ Help_Text_HowToUseWithdrawItem2:: @ 81B771E .string " It may also be directly given to a\n" .string " POKéMON to hold.$" -Help_Text_HowToUseDepositItem2:: @ 81B77DD +Help_Text_HowToUseDepositItem2:: .string "{CIRCLE_1} Select “DEPOSIT ITEM.”\n" .string "{CIRCLE_2} Select the item in the BAG to be\n" .string " deposited using the {PLUS} Control Pad.\n" .string "{CIRCLE_3} If there is nothing in the BAG, this\n" .string " command can't be used!$" -Help_Text_HowToUseMailbox2:: @ 81B7884 +Help_Text_HowToUseMailbox2:: .string "When MAIL is taken from a POKéMON,\n" .string "it is moved to the MAILBOX. If it has\n" .string "no MAIL, the MAILBOX can't be used.\n" .string "{CIRCLE_1} Select MAIL by name to read it or\n" .string " make a POKéMON hold it.$" -Help_Text_HowToUseRun:: @ 81B7931 +Help_Text_HowToUseRun:: .string "You may not “RUN” from a TRAINER\n" .string "battle!\n" .string "{CIRCLE_1} You may “RUN” from a wild POKéMON.\n" .string "{CIRCLE_2} Your chance of escape is improved\n" .string " if your POKéMON in battle is fast.$" -Help_Text_HowToRegisterKeyItem:: @ 81B79CB +Help_Text_HowToRegisterKeyItem:: .string "You may “REGISTER” a key item for\n" .string "instant use by pressing SELECT!\n" .string "{CIRCLE_1} Open the “KEY ITEMS” POCKET.\n" .string "{CIRCLE_2} Select the key item, then select\n" .string " “REGISTER.”$" -Help_Text_HowToUseBall:: @ 81B7A60 +Help_Text_HowToUseBall:: .string "{CIRCLE_1} Select to throw the special POKé\n" .string " BALL used only in the SAFARI ZONE.\n" .string "When wild POKéMON appear, throw lots\n" .string "of SAFARI BALLS to catch them!$" -Help_Text_HowToUseBait:: @ 81B7AEE +Help_Text_HowToUseBait:: .string "{CIRCLE_1} Select to throw the special food\n" .string " used only in the SAFARI ZONE.\n" .string "It is POKéMON food rolled up into\n" @@ -1048,148 +1048,148 @@ Help_Text_HowToUseBait:: @ 81B7AEE .string "thrown, the wild POKéMON may get\n" .string "attracted by it, and may not flee!$" -Help_Text_HowToUseRock:: @ 81B7BBE +Help_Text_HowToUseRock:: .string "{CIRCLE_1} Select to throw a rock lying on\n" .string " the ground in the SAFARI ZONE.\n" .string "Throwing a rock at a POKéMON may \n" .string "make it run away, but it becomes easier\n" .string "to catch!$" -Help_Text_HowToUseHallOfFame:: @ 81B7C57 +Help_Text_HowToUseHallOfFame:: .string "{CIRCLE_1} Select “HALL OF FAME” on the PC.\n" .string "{CIRCLE_2} The POKéMON that have entered the\n" .string " HALL OF FAME can be examined.$" -Help_Text_HP:: @ 81B7CC1 +Help_Text_HP:: .string "HP$" -Help_Text_EXP:: @ 81B7CC4 +Help_Text_EXP:: .string "EXP. {LEFT_PAREN}EXP. Points{RIGHT_PAREN}$" -Help_Text_Moves:: @ 81B7CD9 +Help_Text_Moves:: .string "MOVES$" -Help_Text_Attack:: @ 81B7CDF +Help_Text_Attack:: .string "ATTACK$" -Help_Text_Defense:: @ 81B7CE6 +Help_Text_Defense:: .string "DEFENSE$" -Help_Text_SpAtk:: @ 81B7CEE +Help_Text_SpAtk:: .string "SP. ATK$" -Help_Text_SpDef:: @ 81B7CF6 +Help_Text_SpDef:: .string "SP. DEF$" -Help_Text_Speed:: @ 81B7CFE +Help_Text_Speed:: .string "SPEED$" -Help_Text_Level:: @ 81B7D04 +Help_Text_Level:: .string "Lv. {LEFT_PAREN}Level{RIGHT_PAREN}$" -Help_Text_Type:: @ 81B7D12 +Help_Text_Type:: .string "TYPE$" -Help_Text_OT:: @ 81B7D17 +Help_Text_OT:: .string "OT$" -Help_Text_Item:: @ 81B7D1A +Help_Text_Item:: .string "ITEM$" -Help_Text_Ability:: @ 81B7D1F +Help_Text_Ability:: .string "ABILITY$" -Help_Text_Money:: @ 81B7D27 +Help_Text_Money:: .string "MONEY$" -Help_Text_MoveType:: @ 81B7D2D +Help_Text_MoveType:: .string "MOVE TYPE$" -Help_Text_Nature:: @ 81B7D37 +Help_Text_Nature:: .string "NATURE$" -Help_Text_IDNo:: @ 81B7D3E +Help_Text_IDNo:: .string "ID No.$" -Help_Text_PP:: @ 81B7D45 +Help_Text_PP:: .string "PP$" -Help_Text_Power:: @ 81B7D48 +Help_Text_Power:: .string "POWER$" -Help_Text_Accuracy:: @ 81B7D4E +Help_Text_Accuracy:: .string "ACCURACY$" -Help_Text_FNT:: @ 81B7D57 +Help_Text_FNT:: .string "FNT$" -Help_Text_Items:: @ 81B7D5B +Help_Text_Items:: .string "ITEMS$" -Help_Text_KeyItems:: @ 81B7D61 +Help_Text_KeyItems:: .string "KEY ITEMS$" -Help_Text_PokeBalls:: @ 81B7D6B +Help_Text_PokeBalls:: .string "POKé BALLS$" -Help_Text_Pokedex:: @ 81B7D76 +Help_Text_Pokedex:: .string "POKéDEX$" -Help_Text_PlayTime:: @ 81B7D7E +Help_Text_PlayTime:: .string "PLAY TIME$" -Help_Text_Badges:: @ 81B7D88 +Help_Text_Badges:: .string "BADGES$" -Help_Text_TextSpeed:: @ 81B7D8F +Help_Text_TextSpeed:: .string "TEXT SPEED$" -Help_Text_BattleScene:: @ 81B7D9A +Help_Text_BattleScene:: .string "BATTLE SCENE$" -Help_Text_BattleStyle:: @ 81B7DA7 +Help_Text_BattleStyle:: .string "BATTLE STYLE$" -Help_Text_Sound:: @ 81B7DB4 +Help_Text_Sound:: .string "SOUND$" -Help_Text_ButtonMode:: @ 81B7DBA +Help_Text_ButtonMode:: .string "BUTTON MODE$" -Help_Text_Frame:: @ 81B7DC6 +Help_Text_Frame:: .string "FRAME$" -Help_Text_Cancel2:: @ 81B7DCC +Help_Text_Cancel2:: .string "CANCEL$" -Help_Text_TM:: @ 81B7DD3 +Help_Text_TM:: .string "TM$" -Help_Text_HM:: @ 81B7DD6 +Help_Text_HM:: .string "HM$" -Help_Text_HMMove:: @ 81B7DD9 +Help_Text_HMMove:: .string "HM MOVE$" -Help_Text_Evolution:: @ 81B7DE1 +Help_Text_Evolution:: .string "EVOLUTION$" -Help_Text_StatusProblem:: @ 81B7DEB +Help_Text_StatusProblem:: .string "STATUS PROBLEM$" -Help_Text_Pokemon:: @ 81B7DFA +Help_Text_Pokemon:: .string "POKéMON$" -Help_Text_IDNo2:: @ 81B7E02 +Help_Text_IDNo2:: .string "ID No.$" -Help_Text_Money2:: @ 81B7E09 +Help_Text_Money2:: .string "MONEY$" -Help_Text_Badges2:: @ 81B7E0F +Help_Text_Badges2:: .string "BADGES$" -Help_Text_DefineHP:: @ 81B7E16 +Help_Text_DefineHP:: .string "HP indicates a POKéMON's vitality.\n" .string "If a POKéMON's HP drops to zero, it\l" .string "faints and is unable to battle.\l" @@ -1198,7 +1198,7 @@ Help_Text_DefineHP:: @ 81B7E16 .string "If your POKéMON are hurt, restore their\l" .string "HP at a POKéMON CENTER or use items.$" -Help_Text_DefineEXP:: @ 81B7F0A +Help_Text_DefineEXP:: .string "EXP. Points stands for “Experience\n" .string "Points.” POKéMON gain EXP. Points by\l" .string "participating in winning battles.\l" @@ -1207,7 +1207,7 @@ Help_Text_DefineEXP:: @ 81B7F0A .string "indicates accumulated EXP. Points.\l" .string "It returns to zero upon leveling up.$" -Help_Text_DefineMoves:: @ 81B800A +Help_Text_DefineMoves:: .string "POKéMON may learn up to four different\n" .string "moves. There are many kinds of moves\l" .string "including attacks and those with\l" @@ -1216,7 +1216,7 @@ Help_Text_DefineMoves:: @ 81B800A .string "POKéMON. Some moves can be learned\l" .string "from items.$" -Help_Text_DefineAttack:: @ 81B80EC +Help_Text_DefineAttack:: .string "ATTACK indicates the power of an\n" .string "offensive move. The higher this stat,\l" .string "the more powerful the move.\l" @@ -1225,13 +1225,13 @@ Help_Text_DefineAttack:: @ 81B80EC .string "FLYING, BUG, FIGHTING, ROCK, GHOST,\l" .string "and STEEL.$" -Help_Text_DefineDefense:: @ 81B81C2 +Help_Text_DefineDefense:: .string "DEFENSE indicates the resistance a\n" .string "POKéMON has against physical attacks.\l" .string "The higher this stat, the less damage\l" .string "sustained from a foe's physical hit.$" -Help_Text_DefineSpAtk:: @ 81B8256 +Help_Text_DefineSpAtk:: .string "SP. ATK (Special Attack) indicates the\n" .string "power of a special attack move.\l" .string "The higher this stat, the more powerful\l" @@ -1240,20 +1240,20 @@ Help_Text_DefineSpAtk:: @ 81B8256 .string "types: FIRE, WATER, ELECTRIC, GRASS,\l" .string "ICE, PSYCHIC, DRAGON, and DARK.$" -Help_Text_DefineSpDef:: @ 81B8348 +Help_Text_DefineSpDef:: .string "SP. DEF (Special Defense) indicates\n" .string "the resistance a POKéMON has against\l" .string "special attacks.\l" .string "The higher this stat, the less damage\l" .string "sustained from a foe's special attack.$" -Help_Text_DefineSpeed:: @ 81B83EF +Help_Text_DefineSpeed:: .string "SPEED indicates the agility of a\n" .string "POKéMON. If this stat exceeds the foe's\l" .string "in battle, the POKéMON can make a move\l" .string "before its slower opponent.$" -Help_Text_DefineLevel:: @ 81B847B +Help_Text_DefineLevel:: .string "Lv. (Level) indicates the growth and\n" .string "strength of a POKéMON.\l" .string "In general, when a POKéMON levels up,\l" @@ -1262,7 +1262,7 @@ Help_Text_DefineLevel:: @ 81B847B .string "POKéMON may learn a new move upon\l" .string "leveling up.$" -Help_Text_DefineType:: @ 81B8550 +Help_Text_DefineType:: .string "POKéMON and moves are classified by\n" .string "type. Every type has advantageous and\l" .string "disadvantageous matchups against\l" @@ -1271,14 +1271,14 @@ Help_Text_DefineType:: @ 81B8550 .string "strong against the FIRE type and weak\l" .string "against the GRASS type.$" -Help_Text_DefineOT:: @ 81B8647 +Help_Text_DefineOT:: .string "OT stands for “Original TRAINER,”\n" .string "the first TRAINER to have caught the\l" .string "selected POKéMON.\l" .string "Even if the POKéMON is traded, the OT\l" .string "name will remain unchanged.$" -Help_Text_DefineItem:: @ 81B86E2 +Help_Text_DefineItem:: .string "All POKéMON can be made to hold one\n" .string "item each. Some items will be used by\l" .string "the POKéMON automatically in certain\l" @@ -1286,7 +1286,7 @@ Help_Text_DefineItem:: @ 81B86E2 .string "item, select the item from the BAG and\l" .string "“GIVE” it to the POKéMON.$" -Help_Text_DefineAbility:: @ 81B87B8 +Help_Text_DefineAbility:: .string "All POKéMON have a special ABILITY.\n" .string "There are many different kinds of these\l" .string "abilities, some used in battle, some\l" @@ -1294,13 +1294,13 @@ Help_Text_DefineAbility:: @ 81B87B8 .string "species to species. Some species may\l" .string "have more than one kind of ability.$" -Help_Text_DefineMoney:: @ 81B8897 +Help_Text_DefineMoney:: .string "Whenever you win a battle against a\n" .string "TRAINER, you are given prize money.\l" .string "Save up your prize money so you can\l" .string "enjoy shopping at POKéMON MARTS!$" -Help_Text_DefineMoveType:: @ 81B8924 +Help_Text_DefineMoveType:: .string "Moves are also classified by types.\n" .string "If a POKéMON of a certain type uses\l" .string "a move of the same type, the move's\l" @@ -1309,13 +1309,13 @@ Help_Text_DefineMoveType:: @ 81B8924 .string "target, its effectiveness is also\l" .string "boosted.$" -Help_Text_DefineNature:: @ 81B8A04 +Help_Text_DefineNature:: .string "All POKéMON have a personality,\n" .string "or “NATURE.” The POKéMON's\l" .string "nature appears to affect how the\l" .string "POKéMON will grow upon leveling up.$" -Help_Text_DefineIDNo:: @ 81B8A84 +Help_Text_DefineIDNo:: .string "The ID No. is a special number assigned\n" .string "specifically to you as a TRAINER.\l" .string "Together with the OT name, the ID No.\l" @@ -1324,7 +1324,7 @@ Help_Text_DefineIDNo:: @ 81B8A84 .string "The ID No. does not change even if the\l" .string "POKéMON is traded.$" -Help_Text_DefinePP:: @ 81B8B62 +Help_Text_DefinePP:: .string "PP stands for “Power Points.”\n" .string "It indicates the number of times a\l" .string "certain move can be used in battle.\l" @@ -1332,19 +1332,19 @@ Help_Text_DefinePP:: @ 81B8B62 .string "a POKéMON CENTER or using certain\l" .string "items.$" -Help_Text_DefinePower:: @ 81B8C18 +Help_Text_DefinePower:: .string "POWER indicates the strength of an\n" .string "attack. The higher this number, the\l" .string "greater the damage that can be\l" .string "inflicted on the foe!$" -Help_Text_DefineAccuracy:: @ 81B8C94 +Help_Text_DefineAccuracy:: .string "ACCURACY indicates the probability of\n" .string "the move hitting the foe.\l" .string "The higher this number, the more likely\l" .string "the move will strike the target.$" -Help_Text_DefineFNT:: @ 81B8D1D +Help_Text_DefineFNT:: .string "FNT stands for “fainted.”\n" .string "A POKéMON faints if its HP is reduced\l" .string "to zero. It becomes incapable of taking\l" @@ -1352,13 +1352,13 @@ Help_Text_DefineFNT:: @ 81B8D1D .string "Restore a fainted POKéMON at a POKéMON\l" .string "CENTER, or use an item.$" -Help_Text_DefineItems:: @ 81B8DD4 +Help_Text_DefineItems:: .string "Ordinary items bought at any POKéMON\n" .string "MART are placed in the ITEMS POCKET.\l" .string "Items may be used, given to a POKéMON\l" .string "to hold, or tossed out as garbage.$" -Help_Text_DefineKeyItems:: @ 81B8E67 +Help_Text_DefineKeyItems:: .string "Important items that you find or \n" .string "receive from people are placed in the\l" .string "KEY ITEMS POCKET.\l" @@ -1367,7 +1367,7 @@ Help_Text_DefineKeyItems:: @ 81B8E67 .string "registered, the item can be used\l" .string "without opening the MENU and BAG.$" -Help_Text_DefinePokeBalls:: @ 81B8F4D +Help_Text_DefinePokeBalls:: .string "POKé BALLS, which are used for\n" .string "catching wild POKéMON, are placed in\l" .string "the POKé BALLS POCKET.\l" @@ -1376,33 +1376,33 @@ Help_Text_DefinePokeBalls:: @ 81B8F4D .string "POKéMON to hold, or tossed out as\l" .string "garbage.$" -Help_Text_DefinePokedex:: @ 81B901B +Help_Text_DefinePokedex:: .string "This indicates the number of species of\n" .string "POKéMON you have caught and/or\l" .string "evolved to fill the POKéDEX.\l" .string "Try hard to catch all sorts of\l" .string "POKéMON!$" -Help_Text_DefinePlayTime:: @ 81B90A7 +Help_Text_DefinePlayTime:: .string "This is the total amount of time that\n" .string "you have played this game.$" -Help_Text_DefineBadges:: @ 81B90E8 +Help_Text_DefineBadges:: .string "The POKéMON LEAGUE BADGES that you\n" .string "have won are registered and shown.\l" .string "Earn BADGES by defeating GYM LEADERS\l" .string "in various cities and towns.$" -Help_Text_DefineTextSpeed:: @ 81B9170 +Help_Text_DefineTextSpeed:: .string "You can adjust how quickly the text is\n" .string "displayed. Choose one: SLOW, MID,\l" .string "or FAST.$" -Help_Text_DefineBattleScene:: @ 81B91C2 +Help_Text_DefineBattleScene:: .string "You can choose to turn the battle\n" .string "animation ON or OFF.$" -Help_Text_DefineBattleStyle:: @ 81B91F9 +Help_Text_DefineBattleStyle:: .string "You can choose whether or not a\n" .string "TRAINER can switch a POKéMON after\l" .string "it has made its foe faint.\l" @@ -1410,11 +1410,11 @@ Help_Text_DefineBattleStyle:: @ 81B91F9 .string "chance to switch a POKéMON after it\l" .string "has made its foe faint.$" -Help_Text_DefineSound:: @ 81B92B8 +Help_Text_DefineSound:: .string "You can choose between MONO and\n" .string "STEREO sound output.$" -Help_Text_DefineButtonMode:: @ 81B92ED +Help_Text_DefineButtonMode:: .string "Set to “HELP” to display help messages\n" .string "by pressing the L or R Button.\l" .string "Set to “LR” to enable the switching\l" @@ -1423,17 +1423,17 @@ Help_Text_DefineButtonMode:: @ 81B92ED .string "Set to “L=A” to make the L Button\l" .string "work the same as the A Button.$" -Help_Text_DefineFrame:: @ 81B93D8 +Help_Text_DefineFrame:: .string "You may choose the design of the frame\n" .string "around certain menus. Try them out and\l" .string "see what you like.$" -Help_Text_DefineCancel2:: @ 81B9439 +Help_Text_DefineCancel2:: .string "The settings will be changed to the\n" .string "selections shown in red, and you will\l" .string "return to the MENU.$" -Help_Text_DefineTM:: @ 81B9497 +Help_Text_DefineTM:: .string "A TM (Technical Machine) is a device\n" .string "used to teach a move to a POKéMON.\l" .string "There are many different kinds.\l" @@ -1441,7 +1441,7 @@ Help_Text_DefineTM:: @ 81B9497 .string "POKéMON capable of using them.\l" .string "A TM breaks after a single use.$" -Help_Text_DefineHM:: @ 81B9560 +Help_Text_DefineHM:: .string "An HM (Hidden Machine) is a device used\n" .string "to teach a HIDDEN move to a POKéMON.\l" .string "A HIDDEN move can be taught only to\l" @@ -1450,7 +1450,7 @@ Help_Text_DefineHM:: @ 81B9560 .string "and over. A HIDDEN move can be tough\l" .string "for a POKéMON to forget.$" -Help_Text_DefineHMMove:: @ 81B9656 +Help_Text_DefineHMMove:: .string "HIDDEN moves are those that are\n" .string "especially important for your\l" .string "adventure. To use such a move outside\l" @@ -1459,7 +1459,7 @@ Help_Text_DefineHMMove:: @ 81B9656 .string "move use it. A fainted POKéMON may use\l" .string "a HIDDEN move outside of battle.$" -Help_Text_DefineEvolution:: @ 81B9749 +Help_Text_DefineEvolution:: .string "Among POKéMON, there are some that\n" .string "undergo major changes (evolution) upon\l" .string "growing to certain levels. Evolution\l" @@ -1468,7 +1468,7 @@ Help_Text_DefineEvolution:: @ 81B9749 .string "it may learn. Some POKéMON evolve\l" .string "due to reasons other than leveling up.$" -Help_Text_DefineStatusProblem:: @ 81B984F +Help_Text_DefineStatusProblem:: .string "Status problems include:\n" .string "Sleep: Can't use moves.\l" .string "Poison: Causes steady HP loss.\l" @@ -1477,14 +1477,14 @@ Help_Text_DefineStatusProblem:: @ 81B984F .string "Freeze: Can't use moves.\l" .string "These can be healed with items, etc.$" -Help_Text_DefinePokemon:: @ 81B991C +Help_Text_DefinePokemon:: .string "POKéMON is a name given to describe\n" .string "wondrous creatures that inhabit all\l" .string "corners of this world.\l" .string "People raise POKéMON to be their pets,\l" .string "use them for battling, and so on.$" -Help_Text_DefineIDNo2:: @ 81B99C4 +Help_Text_DefineIDNo2:: .string "The ID No. is a special number assigned\n" .string "specifically to you as a TRAINER.\l" .string "Together with the OT name, the ID No.\l" @@ -1493,40 +1493,40 @@ Help_Text_DefineIDNo2:: @ 81B99C4 .string "The ID No. does not change even if the\l" .string "POKéMON is traded.$" -Help_Text_DefineMoney2:: @ 81B9AA2 +Help_Text_DefineMoney2:: .string "Whenever you win a battle against a\n" .string "TRAINER, you are given prize money.\l" .string "Save up your prize money so you can\l" .string "enjoy shopping at POKéMON MARTS!$" -Help_Text_DefineBadges2:: @ 81B9B2F +Help_Text_DefineBadges2:: .string "This indicates the number of POKéMON\n" .string "LEAGUE BADGES that you have won.\l" .string "Earn BADGES by defeating GYM LEADERS\l" .string "in various cities and towns.$" -Help_Text_TheHelpSystem:: @ 81B9BB7 +Help_Text_TheHelpSystem:: .string "The HELP System$" -Help_Text_TheGame:: @ 81B9BC7 +Help_Text_TheGame:: .string "The game$" -Help_Text_WirelessAdapter:: @ 81B9BD0 +Help_Text_WirelessAdapter:: .string "Wireless Adapter$" -Help_Text_GameFundamentals1:: @ 81B9BE1 +Help_Text_GameFundamentals1:: .string "Game fundamentals 1$" -Help_Text_GameFundamentals2:: @ 81B9BF5 +Help_Text_GameFundamentals2:: .string "Game fundamentals 2$" -Help_Text_GameFundamentals3:: @ 81B9C09 +Help_Text_GameFundamentals3:: .string "Game fundamentals 3$" -Help_Text_WhatArePokemon:: @ 81B9C1D +Help_Text_WhatArePokemon:: .string "What are POKéMON?$" -Help_Text_DescTheHelpSystem:: @ 81B9C2F +Help_Text_DescTheHelpSystem:: .string "The help messages change depending on\n" .string "how much you have progressed in the\l" .string "game. They are designed to support you\l" @@ -1534,7 +1534,7 @@ Help_Text_DescTheHelpSystem:: @ 81B9C2F .string "anything that you don't understand,\l" .string "please look up the HELP System!$" -Help_Text_DescTheGame:: @ 81B9D04 +Help_Text_DescTheGame:: .string "You become the main character to\n" .string "explore the world of POKéMON!\l" .string "By talking to people and solving\l" @@ -1542,7 +1542,7 @@ Help_Text_DescTheGame:: @ 81B9D04 .string "Strive for the goal together with your\l" .string "wonderful POKéMON!$" -Help_Text_DescWirelessAdapter:: @ 81B9DC5 +Help_Text_DescWirelessAdapter:: .string "This game communicates over a wireless\n" .string "link using the Wireless Adapter.\p" .string "Go wireless anywhere, anytime, and\n" @@ -1550,14 +1550,14 @@ Help_Text_DescWirelessAdapter:: @ 81B9DC5 .string "Try playing with the Wireless Adapter\n" .string "always attached!$" -Help_Text_DescGameFundamentals1:: @ 81B9E75 +Help_Text_DescGameFundamentals1:: .string "Visit every city and town, travel every\n" .string "road, explore every cave, and face\l" .string "every challenge as you strive to\l" .string "become the greatest TRAINER of\l" .string "POKéMON!$" -Help_Text_DescGameFundamentals2:: @ 81B9F09 +Help_Text_DescGameFundamentals2:: .string "On your adventure, you will be faced\n" .string "with many obstacles. Every obstacle\l" .string "can be overcome by doing something\l" @@ -1565,12 +1565,12 @@ Help_Text_DescGameFundamentals2:: @ 81B9F09 .string "are affected by something that happens\l" .string "far away.$" -Help_Text_DescGameFundamentals3:: @ 81B9FCE +Help_Text_DescGameFundamentals3:: .string "Some of the obstacles in your way can\n" .string "be removed once your POKéMON learn\l" .string "specific moves.$" -Help_Text_DescWhatArePokemon:: @ 81BA027 +Help_Text_DescWhatArePokemon:: .string "POKéMON are wondrous creatures that\n" .string "are shrouded in mystery. You may meet\l" .string "them all over the world…in tall\l" @@ -1578,112 +1578,112 @@ Help_Text_DescWhatArePokemon:: @ 81BA027 .string "They appear to grow obedient to the\l" .string "TRAINERS that caught them.$" -Help_Text_UsingTypeMatchupList:: @ 81BA0F1 +Help_Text_UsingTypeMatchupList:: .string "Using the Type Matchup List$" -Help_Text_OwnMoveDark:: @ 81BA10D +Help_Text_OwnMoveDark:: .string "Own move type: DARK$" -Help_Text_OwnPokemonDark:: @ 81BA121 +Help_Text_OwnPokemonDark:: .string "Own POKéMON type: DARK$" -Help_Text_OwnMoveRock:: @ 81BA138 +Help_Text_OwnMoveRock:: .string "Own move type: ROCK$" -Help_Text_OwnPokemonRock:: @ 81BA14C +Help_Text_OwnPokemonRock:: .string "Own POKéMON type: ROCK$" -Help_Text_OwnMovePsychic:: @ 81BA163 +Help_Text_OwnMovePsychic:: .string "Own move type: PSYCHIC$" -Help_Text_OwnPokemonPsychic:: @ 81BA17A +Help_Text_OwnPokemonPsychic:: .string "Own POKéMON type: PSYCHIC$" -Help_Text_OwnMoveFighting:: @ 81BA194 +Help_Text_OwnMoveFighting:: .string "Own move type: FIGHTING$" -Help_Text_OwnPokemonFighting:: @ 81BA1AC +Help_Text_OwnPokemonFighting:: .string "Own POKéMON type: FIGHTING$" -Help_Text_OwnMoveGrass:: @ 81BA1C7 +Help_Text_OwnMoveGrass:: .string "Own move type: GRASS$" -Help_Text_OwnPokemonGrass:: @ 81BA1DC +Help_Text_OwnPokemonGrass:: .string "Own POKéMON type: GRASS$" -Help_Text_OwnMoveGhost:: @ 81BA1F4 +Help_Text_OwnMoveGhost:: .string "Own move type: GHOST$" -Help_Text_OwnPokemonGhost:: @ 81BA209 +Help_Text_OwnPokemonGhost:: .string "Own POKéMON type: GHOST$" -Help_Text_OwnMoveIce:: @ 81BA221 +Help_Text_OwnMoveIce:: .string "Own move type: ICE$" -Help_Text_OwnPokemonIce:: @ 81BA234 +Help_Text_OwnPokemonIce:: .string "Own POKéMON type: ICE$" -Help_Text_OwnMoveGround:: @ 81BA24A +Help_Text_OwnMoveGround:: .string "Own move type: GROUND$" -Help_Text_OwnPokemonGround:: @ 81BA260 +Help_Text_OwnPokemonGround:: .string "Own POKéMON type: GROUND$" -Help_Text_OwnMoveElectric:: @ 81BA279 +Help_Text_OwnMoveElectric:: .string "Own move type: ELECTRIC$" -Help_Text_OwnPokemonElectric:: @ 81BA291 +Help_Text_OwnPokemonElectric:: .string "Own POKéMON type: ELECTRIC$" -Help_Text_OwnMovePoison:: @ 81BA2AC +Help_Text_OwnMovePoison:: .string "Own move type: POISON$" -Help_Text_OwnPokemonPoison:: @ 81BA2C2 +Help_Text_OwnPokemonPoison:: .string "Own POKéMON type: POISON$" -Help_Text_OwnMoveDragon:: @ 81BA2DB +Help_Text_OwnMoveDragon:: .string "Own move type: DRAGON$" -Help_Text_OwnPokemonDragon:: @ 81BA2F1 +Help_Text_OwnPokemonDragon:: .string "Own POKéMON type: DRAGON$" -Help_Text_OwnMoveNormal:: @ 81BA30A +Help_Text_OwnMoveNormal:: .string "Own move type: NORMAL$" -Help_Text_OwnPokemonNormal:: @ 81BA320 +Help_Text_OwnPokemonNormal:: .string "Own POKéMON type: NORMAL$" -Help_Text_OwnMoveSteel:: @ 81BA339 +Help_Text_OwnMoveSteel:: .string "Own move type: STEEL$" -Help_Text_OwnPokemonSteel:: @ 81BA34E +Help_Text_OwnPokemonSteel:: .string "Own POKéMON type: STEEL$" -Help_Text_OwnMoveFlying:: @ 81BA366 +Help_Text_OwnMoveFlying:: .string "Own move type: FLYING$" -Help_Text_OwnPokemonFlying:: @ 81BA37C +Help_Text_OwnPokemonFlying:: .string "Own POKéMON type: FLYING$" -Help_Text_OwnMoveFire:: @ 81BA395 +Help_Text_OwnMoveFire:: .string "Own move type: FIRE$" -Help_Text_OwnPokemonFire:: @ 81BA3A9 +Help_Text_OwnPokemonFire:: .string "Own POKéMON type: FIRE$" -Help_Text_OwnMoveWater:: @ 81BA3C0 +Help_Text_OwnMoveWater:: .string "Own move type: WATER$" -Help_Text_OwnPokemonWater:: @ 81BA3D5 +Help_Text_OwnPokemonWater:: .string "Own POKéMON type: WATER$" -Help_Text_OwnMoveBug:: @ 81BA3ED +Help_Text_OwnMoveBug:: .string "Own move type: BUG$" -Help_Text_OwnPokemonBug:: @ 81BA400 +Help_Text_OwnPokemonBug:: .string "Own POKéMON type: BUG$" -Help_Text_HowToUseTypeMatchupList:: @ 81BA416 +Help_Text_HowToUseTypeMatchupList:: .string "Depending on the matchup of the\n" .string "move type and the target POKéMON's\l" .string "type, the move's effectiveness varies:\l" @@ -1692,144 +1692,144 @@ Help_Text_HowToUseTypeMatchupList:: @ 81BA416 .string "{BIG_MULT_X}: Not effective at all\l" .string "(No changes for other matchups.)$" -Help_Text_TypeMatchupOwnMoveDark:: @ 81BA4E6 +Help_Text_TypeMatchupOwnMoveDark:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: PSYCHIC, GHOST\p" .string " {TRIANGLE}: FIGHTING, DARK, STEEL$" -Help_Text_TypeMatchupOwnPokemonDark:: @ 81BA539 +Help_Text_TypeMatchupOwnPokemonDark:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIGHTING, BUG\p" .string " {TRIANGLE}: GHOST, DARK\p" .string " {BIG_MULT_X}: PSYCHIC$" -Help_Text_TypeMatchupOwnMoveRock:: @ 81BA595 +Help_Text_TypeMatchupOwnMoveRock:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, ICE, FLYING, BUG\p" .string " {TRIANGLE}: FIGHTING, GROUND, STEEL$" -Help_Text_TypeMatchupOwnPokemonRock:: @ 81BA5F2 +Help_Text_TypeMatchupOwnPokemonRock:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: WATER, GRASS, FIGHTING,\n" .string " GROUND, STEEL\p" .string " {TRIANGLE}: NORMAL, FIRE, POISON, FLYING$" -Help_Text_TypeMatchupOwnMovePsychic:: @ 81BA66F +Help_Text_TypeMatchupOwnMovePsychic:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: FIGHTING, POISON\p" .string " {TRIANGLE}: PSYCHIC, STEEL\p" .string " {BIG_MULT_X}: DARK$" -Help_Text_TypeMatchupOwnPokemonPsychic:: @ 81BA6C9 +Help_Text_TypeMatchupOwnPokemonPsychic:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: BUG, GHOST, DARK\p" .string " {TRIANGLE}: FIGHTING, PSYCHIC$" -Help_Text_TypeMatchupOwnMoveFighting:: @ 81BA71F +Help_Text_TypeMatchupOwnMoveFighting:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: NORMAL, ICE, ROCK, DARK, STEEL\p" .string " {TRIANGLE}: POISON, FLYING, PSYCHIC, BUG\p" .string " {BIG_MULT_X}: GHOST$" -Help_Text_TypeMatchupOwnPokemonFighting:: @ 81BA796 +Help_Text_TypeMatchupOwnPokemonFighting:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FLYING, PSYCHIC\p" .string " {TRIANGLE}: BUG, ROCK, DARK$" -Help_Text_TypeMatchupOwnMoveGrass:: @ 81BA7E9 +Help_Text_TypeMatchupOwnMoveGrass:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: WATER, GROUND, ROCK\p" .string " {TRIANGLE}: FIRE, GRASS, POISON, FLYING,\n" .string " BUG, DRAGON, STEEL$" -Help_Text_TypeMatchupOwnPokemonGrass:: @ 81BA862 +Help_Text_TypeMatchupOwnPokemonGrass:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, ICE, POISON, FLYING, BUG\p" .string " {TRIANGLE}: WATER, ELECTRIC, GRASS, GROUND$" -Help_Text_TypeMatchupOwnMoveGhost:: @ 81BA8D3 +Help_Text_TypeMatchupOwnMoveGhost:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: PSYCHIC, GHOST\p" .string " {TRIANGLE}: DARK, STEEL\p" .string " {BIG_MULT_X}: NORMAL$" -Help_Text_TypeMatchupOwnPokemonGhost:: @ 81BA92A +Help_Text_TypeMatchupOwnPokemonGhost:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: GHOST, DARK\p" .string " {TRIANGLE}: POISON, BUG\p" .string " {BIG_MULT_X}: NORMAL, FIGHTING$" -Help_Text_TypeMatchupOwnMoveIce:: @ 81BA98D +Help_Text_TypeMatchupOwnMoveIce:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: GRASS, GROUND, FLYING, DRAGON\p" .string " {TRIANGLE}: FIRE, WATER, ICE, STEEL$" -Help_Text_TypeMatchupOwnPokemonIce:: @ 81BA9F1 +Help_Text_TypeMatchupOwnPokemonIce:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, FIGHTING, ROCK, STEEL\p" .string " {TRIANGLE}: ICE$" -Help_Text_TypeMatchupOwnMoveGround:: @ 81BAA44 +Help_Text_TypeMatchupOwnMoveGround:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, ELECTRIC, POISON, ROCK,\n" .string " STEEL\p" .string " {TRIANGLE}: GRASS, BUG\n" .string " {BIG_MULT_X}: FLYING$" -Help_Text_TypeMatchupOwnPokemonGround:: @ 81BAAB6 +Help_Text_TypeMatchupOwnPokemonGround:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: WATER, GRASS, ICE\p" .string " {TRIANGLE}: POISON, ROCK\p" .string " {BIG_MULT_X}: ELECTRIC$" -Help_Text_TypeMatchupOwnMoveElectric:: @ 81BAB18 +Help_Text_TypeMatchupOwnMoveElectric:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: WATER, FLYING\p" .string " {TRIANGLE}: ELECTRIC, GRASS, DRAGON\p" .string " {BIG_MULT_X}: GROUND$" -Help_Text_TypeMatchupOwnPokemonElectric:: @ 81BAB7A +Help_Text_TypeMatchupOwnPokemonElectric:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: GROUND\p" .string " {TRIANGLE}: ELECTRIC, FLYING, STEEL$" -Help_Text_TypeMatchupOwnMovePoison:: @ 81BABCC +Help_Text_TypeMatchupOwnMovePoison:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: GRASS\p" .string " {TRIANGLE}: POISON, GROUND, ROCK, GHOST\p" .string " {BIG_MULT_X}: STEEL$" -Help_Text_TypeMatchupOwnPokemonPoison:: @ 81BAC29 +Help_Text_TypeMatchupOwnPokemonPoison:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: GROUND, PSYCHIC\p" .string " {TRIANGLE}: GRASS, FIGHTING, POISON, BUG$" -Help_Text_TypeMatchupOwnMoveDragon:: @ 81BAC89 +Help_Text_TypeMatchupOwnMoveDragon:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: DRAGON\p" .string " {TRIANGLE}: STEEL$" -Help_Text_TypeMatchupOwnPokemonDragon:: @ 81BACC4 +Help_Text_TypeMatchupOwnPokemonDragon:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: ICE, DRAGON\p" .string " {TRIANGLE}: FIRE, WATER, ELECTRIC, GRASS$" -Help_Text_TypeMatchupOwnMoveNormal:: @ 81BAD20 +Help_Text_TypeMatchupOwnMoveNormal:: .string "Effect on the opposing POKéMON:\p" .string " {TRIANGLE}: ROCK, STEEL\p" .string " {BIG_MULT_X}: GHOST$" -Help_Text_TypeMatchupOwnPokemonNormal:: @ 81BAD60 +Help_Text_TypeMatchupOwnPokemonNormal:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIGHTING\p" .string " {BIG_MULT_X}: GHOST$" -Help_Text_TypeMatchupOwnMoveSteel:: @ 81BADA2 +Help_Text_TypeMatchupOwnMoveSteel:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: ICE, ROCK\p" .string " {TRIANGLE}: FIRE, WATER, ELECTRIC, STEEL$" -Help_Text_TypeMatchupOwnPokemonSteel:: @ 81BADF7 +Help_Text_TypeMatchupOwnPokemonSteel:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, FIGHTING, GROUND\n" .string " {TRIANGLE}: NORMAL, GRASS, ICE, FLYING,\l" @@ -1837,44 +1837,44 @@ Help_Text_TypeMatchupOwnPokemonSteel:: @ 81BADF7 .string " DRAGON, DARK, STEEL\l" .string " {BIG_MULT_X}: POISON$" -Help_Text_TypeMatchupOwnMoveFlying:: @ 81BAEA8 +Help_Text_TypeMatchupOwnMoveFlying:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: GRASS, FIGHTING, BUG\p" .string " {TRIANGLE}: ELECTRIC, ROCK, STEEL$" -Help_Text_TypeMatchupOwnPokemonFlying:: @ 81BAF01 +Help_Text_TypeMatchupOwnPokemonFlying:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: ELECTRIC, ICE, ROCK\p" .string " {TRIANGLE}: GRASS, FIGHTING, BUG\p" .string " {BIG_MULT_X}: GROUND$" -Help_Text_TypeMatchupOwnMoveFire:: @ 81BAF6B +Help_Text_TypeMatchupOwnMoveFire:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: GRASS, ICE, BUG, STEEL\p" .string " {TRIANGLE}: FIRE, WATER, ROCK, DRAGON$" -Help_Text_TypeMatchupOwnPokemonFire:: @ 81BAFCA +Help_Text_TypeMatchupOwnPokemonFire:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: WATER, GROUND, ROCK\p" .string " {TRIANGLE}: FIRE, GRASS, ICE, BUG, STEEL$" -Help_Text_TypeMatchupOwnMoveWater:: @ 81BB02E +Help_Text_TypeMatchupOwnMoveWater:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, GROUND, ROCK\p" .string " {TRIANGLE}: WATER, GRASS, DRAGON$" -Help_Text_TypeMatchupOwnPokemonWater:: @ 81BB084 +Help_Text_TypeMatchupOwnPokemonWater:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: ELECTRIC, GRASS\p" .string " {TRIANGLE}: FIRE, WATER, ICE, STEEL$" -Help_Text_TypeMatchupOwnMoveBug:: @ 81BB0DF +Help_Text_TypeMatchupOwnMoveBug:: .string "Effect on the opposing POKéMON:\p" .string " {CIRCLE_DOT}: GRASS, PSYCHIC, DARK\p" .string " {TRIANGLE}: FIRE, FIGHTING, POISON,\n" .string " FLYING, GHOST, STEEL$" -Help_Text_TypeMatchupOwnPokemonBug:: @ 81BB156 +Help_Text_TypeMatchupOwnPokemonBug:: .string "Effect of foe's move on own POKéMON:\p" .string " {CIRCLE_DOT}: FIRE, FLYING, ROCK\p" .string " {TRIANGLE}: GRASS, FIGHTING, GROUND$" diff --git a/data/text/ingame_trade.inc b/data/text/ingame_trade.inc index 0b84b96d6..0b800bad8 100644 --- a/data/text/ingame_trade.inc +++ b/data/text/ingame_trade.inc @@ -1,60 +1,60 @@ -Trade_Text_LookingForMonWannaTradeForMon:: @ 81A597B +Trade_Text_LookingForMonWannaTradeForMon:: .string "I'm looking for the POKéMON\n" .string "{STR_VAR_1}!\p" .string "Wanna trade one for my\n" .string "{STR_VAR_2}?$" -Trade_Text_AwwOhWell:: @ 81A59B6 +Trade_Text_AwwOhWell:: .string "Awww!\n" .string "Oh, well…$" -Trade_Text_WhatThatsNoMon:: @ 81A59C6 +Trade_Text_WhatThatsNoMon:: .string "What?\n" .string "That's no {STR_VAR_1}!$" -Trade_Text_HeyThanks:: @ 81A59DA +Trade_Text_HeyThanks:: .string "Hey, thanks!$" -Trade_Text_IsntMyOldMonGreat:: @ 81A59E7 +Trade_Text_IsntMyOldMonGreat:: .string "Isn't my old {STR_VAR_2} great?$" -Trade_Text_DoYouHaveMonWouldYouTradeForMon:: @ 81A59FE +Trade_Text_DoYouHaveMonWouldYouTradeForMon:: .string "Hello, there! Do you happen to\n" .string "have a {STR_VAR_1}?\p" .string "Would you agree to a trade for\n" .string "my {STR_VAR_2}?$" -Trade_Text_WellIfYouDontWantTo:: @ 81A5A4E +Trade_Text_WellIfYouDontWantTo:: .string "Well, if you don't want to…$" -Trade_Text_ThisIsntMon:: @ 81A5A6A +Trade_Text_ThisIsntMon:: .string "Hmmm?\n" .string "This isn't a {STR_VAR_1}.\p" .string "Think of me if you get one.$" -Trade_Text_Thanks:: @ 81A5A9D +Trade_Text_Thanks:: .string "Thanks!$" -Trade_Text_HasTradedMonGrownStronger:: @ 81A5AA5 +Trade_Text_HasTradedMonGrownStronger:: .string "The {STR_VAR_2} that I traded you,\n" .string "has it grown stronger?$" -Trade_Text_DoYouHaveMonWantToTradeForMon:: @ 81A5AD6 +Trade_Text_DoYouHaveMonWantToTradeForMon:: .string "Hi!\n" .string "Do you have a {STR_VAR_1}?\p" .string "Want to trade it for my\n" .string "{STR_VAR_2}?$" -Trade_Text_ThatsTooBad:: @ 81A5B08 +Trade_Text_ThatsTooBad:: .string "That's too bad.$" -Trade_Text_ThisIsNoMon:: @ 81A5B18 +Trade_Text_ThisIsNoMon:: .string "…This is no {STR_VAR_1}.\p" .string "If you get one, trade it with me.$" -Trade_Text_ThanksYoureAPal:: @ 81A5B4A +Trade_Text_ThanksYoureAPal:: .string "Thanks, you're a pal!$" -Trade_Text_HowIsMyOldMon:: @ 81A5B60 +Trade_Text_HowIsMyOldMon:: .string "How is my old {STR_VAR_2}?\n" .string "My {STR_VAR_1} is doing great!$" diff --git a/data/text/itemfinder.inc b/data/text/itemfinder.inc index 5c59f43ee..64ef83882 100644 --- a/data/text/itemfinder.inc +++ b/data/text/itemfinder.inc @@ -1,10 +1,10 @@ @ Unused -Text_ItemfinderResponding:: @ 81A56D2 +Text_ItemfinderResponding:: .string "おッ！　ダウジングマシンが\n" .string "はんのう　してるぞ！\p" .string "ましたに　どうぐが　うまってる！\n" .string "‥‥‥$" -Text_DugUpItemFromGround:: @ 81A5700 +Text_DugUpItemFromGround:: .string "{PLAYER} dug up one {STR_VAR_2}\n" .string "from deep in the ground.$" diff --git a/data/text/move_descriptions.inc b/data/text/move_descriptions.inc index 94a4d0ca8..ce0d91d19 100644 --- a/data/text/move_descriptions.inc +++ b/data/text/move_descriptions.inc @@ -1,1062 +1,1062 @@ gMoveDescription_Pound:: .string "A physical attack\ndelivered with a\nlong tail or a\nforeleg, etc.$" -gMoveDescription_KarateChop:: @ 8482874 +gMoveDescription_KarateChop:: .string "The foe is attacked\nwith a sharp chop.\nIt has a high\ncritical-hit ratio.$" -gMoveDescription_DoubleSlap:: @ 84828BD +gMoveDescription_DoubleSlap:: .string "The foe is slapped\nrepeatedly, back\nand forth, two to\nfive times.$" -gMoveDescription_CometPunch:: @ 84828FF +gMoveDescription_CometPunch:: .string "The foe is hit with\na flurry of punches\nthat strike two to\nfive times.$" -gMoveDescription_MegaPunch:: @ 8482946 +gMoveDescription_MegaPunch:: .string "The foe is slugged\nby a punch thrown\nwith muscle-packed\npower.$" -gMoveDescription_PayDay:: @ 8482985 +gMoveDescription_PayDay:: .string "Numerous coins are\nhurled at the foe.\nMoney is earned\nafter battle.$" -gMoveDescription_FirePunch:: @ 84829C9 +gMoveDescription_FirePunch:: .string "The foe is punched\nwith a fiery fist.\nIt may leave the\nfoe with a burn.$" -gMoveDescription_IcePunch:: @ 8482A11 +gMoveDescription_IcePunch:: .string "The foe is punched\nwith an icy fist.\nIt may leave the\nfoe frozen.$" -gMoveDescription_ThunderPunch:: @ 8482A53 +gMoveDescription_ThunderPunch:: .string "The foe is punched\nwith an electrified\nfist. It may leave\nthe foe paralyzed.$" -gMoveDescription_Scratch:: @ 8482AA0 +gMoveDescription_Scratch:: .string "Hard, pointed, and\nsharp claws rake\nthe foe.$" -gMoveDescription_ViceGrip:: @ 8482ACD +gMoveDescription_ViceGrip:: .string "Huge, impressive\npincers grip and\nsqueeze the foe.$" -gMoveDescription_Guillotine:: @ 8482B00 +gMoveDescription_Guillotine:: .string "A vicious tearing\nattack with pincers.\nThe foe will faint\nif it hits.$" -gMoveDescription_RazorWind:: @ 8482B46 +gMoveDescription_RazorWind:: .string "Blades of wind hit\nthe foe on the 2nd\nturn. It has a high\ncritical-hit ratio.$" -gMoveDescription_SwordsDance:: @ 8482B94 +gMoveDescription_SwordsDance:: .string "A frenetic dance of\nfighting. It sharply\nraises the ATTACK\nstat.$" -gMoveDescription_Cut:: @ 8482BD5 +gMoveDescription_Cut:: .string "A basic attack.\nIt can be used to\ncut down thin trees\nand grass.$" -gMoveDescription_Gust:: @ 8482C16 +gMoveDescription_Gust:: .string "Strikes the foe\nwith a gust of wind\nwhipped up by\nwings.$" -gMoveDescription_WingAttack:: @ 8482C4F +gMoveDescription_WingAttack:: .string "The foe is struck\nwith large, imposing\nwings spread wide.$" -gMoveDescription_Whirlwind:: @ 8482C89 +gMoveDescription_Whirlwind:: .string "The foe is made to\nswitch out with an\nally. In the wild,\nthe battle ends.$" -gMoveDescription_Fly:: @ 8482CD3 +gMoveDescription_Fly:: .string "A 2-turn move that\nhits on the 2nd\nturn. Use it to fly\nto any known town.$" -gMoveDescription_Bind:: @ 8482D1D +gMoveDescription_Bind:: .string "A long body or\ntentacles are used\nto bind the foe for\ntwo to five turns.$" -gMoveDescription_Slam:: @ 8482D66 +gMoveDescription_Slam:: .string "The foe is struck\nwith a long tail,\nvines, etc.$" -gMoveDescription_VineWhip:: @ 8482D96 +gMoveDescription_VineWhip:: .string "The foe is struck\nwith slender, whip-\nlike vines.$" -gMoveDescription_Stomp:: @ 8482DC8 +gMoveDescription_Stomp:: .string "The foe is stomped\nwith a big foot.\nIt may make the\nfoe flinch.$" -gMoveDescription_DoubleKick:: @ 8482E08 +gMoveDescription_DoubleKick:: .string "Two legs are used\nto quickly kick the\nfoe twice in one\nturn.$" -gMoveDescription_MegaKick:: @ 8482E45 +gMoveDescription_MegaKick:: .string "The foe is attacked\nby a kick fired\nwith muscle-packed\npower.$" -gMoveDescription_JumpKick:: @ 8482E83 +gMoveDescription_JumpKick:: .string "The user jumps up\nhigh, then kicks.\nIf it misses, the\nuser hurts itself.$" -gMoveDescription_RollingKick:: @ 8482ECC +gMoveDescription_RollingKick:: .string "A quick kick from a\nrolling spin.\nIt may make the\nfoe flinch.$" -gMoveDescription_SandAttack:: @ 8482F0A +gMoveDescription_SandAttack:: .string "A lot of sand is\nhurled in the foe's\nface, reducing its\naccuracy.$" -gMoveDescription_Headbutt:: @ 8482F4C +gMoveDescription_Headbutt:: .string "The user sticks its\nhead out and rams.\nIt may make the\nfoe flinch.$" -gMoveDescription_HornAttack:: @ 8482F8F +gMoveDescription_HornAttack:: .string "The foe is jabbed\nwith a sharply\npointed horn to\ninflict damage.$" -gMoveDescription_FuryAttack:: @ 8482FD0 +gMoveDescription_FuryAttack:: .string "The foe is jabbed\nrepeatedly with a\nhorn or beak two to\nfive times.$" -gMoveDescription_HornDrill:: @ 8483014 +gMoveDescription_HornDrill:: .string "The horn is rotated\nlike a drill to ram.\nThe foe will faint\nif it hits.$" -gMoveDescription_Tackle:: @ 848305C +gMoveDescription_Tackle:: .string "A physical attack\nin which the user\ncharges, full body,\ninto the foe.$" -gMoveDescription_BodySlam:: @ 84830A2 +gMoveDescription_BodySlam:: .string "The user drops its\nfull body on the\nfoe. It may leave\nthe foe paralyzed.$" -gMoveDescription_Wrap:: @ 84830EB +gMoveDescription_Wrap:: .string "A long body or\nvines are used to\nwrap the foe for\ntwo to five turns.$" -gMoveDescription_TakeDown:: @ 8483130 +gMoveDescription_TakeDown:: .string "A reckless, full-\nbody charge attack\nthat also hurts the\nuser a little.$" -gMoveDescription_Thrash:: @ 8483178 +gMoveDescription_Thrash:: .string "The user rampages\nabout for two to\nthree turns, then\nbecomes confused.$" -gMoveDescription_DoubleEdge:: @ 84831BF +gMoveDescription_DoubleEdge:: .string "A reckless, life-\nrisking tackle that\nalso hurts the user\na little.$" -gMoveDescription_TailWhip:: @ 8483203 +gMoveDescription_TailWhip:: .string "The user wags its\ntail cutely, making\nthe foe lower its\nDEFENSE stat.$" -gMoveDescription_PoisonSting:: @ 8483249 +gMoveDescription_PoisonSting:: .string "The foe is stabbed\nwith a toxic barb,\netc. It may poison\nthe foe.$" -gMoveDescription_Twineedle:: @ 848328B +gMoveDescription_Twineedle:: .string "The foe is stabbed\ntwice with foreleg\nstingers. It may\npoison the foe.$" -gMoveDescription_PinMissile:: @ 84832D2 +gMoveDescription_PinMissile:: .string "Sharp pins are shot\nat the foe and hit\ntwo to five times\nat once.$" -gMoveDescription_Leer:: @ 8483314 +gMoveDescription_Leer:: .string "The foe is given an\nintimidating look\nthat lowers its\nDEFENSE stat.$" -gMoveDescription_Bite:: @ 8483358 +gMoveDescription_Bite:: .string "The user bites with\nvicious fangs.\nIt may make the\nfoe flinch.$" -gMoveDescription_Growl:: @ 8483397 +gMoveDescription_Growl:: .string "The user growls in\na cute way, making\nthe foe lower its\nATTACK stat.$" -gMoveDescription_Roar:: @ 84833DC +gMoveDescription_Roar:: .string "The foe is made to\nswitch out with an\nally. In the wild,\nthe battle ends.$" -gMoveDescription_Sing:: @ 8483426 +gMoveDescription_Sing:: .string "A soothing song\nin a calming voice\nlulls the foe into\na deep slumber.$" -gMoveDescription_Supersonic:: @ 848346C +gMoveDescription_Supersonic:: .string "The user generates\nodd sound waves.\nIt may confuse the\nfoe.$" -gMoveDescription_SonicBoom:: @ 84834A8 +gMoveDescription_SonicBoom:: .string "The foe is hit with\na shock wave that\nalways inflicts 20-\nHP damage.$" -gMoveDescription_Disable:: @ 84834ED +gMoveDescription_Disable:: .string "For a few turns,\nit prevents the foe\nfrom using the move\nit last used.$" -gMoveDescription_Acid:: @ 8483534 +gMoveDescription_Acid:: .string "The foe is sprayed\nwith a harsh, hide-\nmelting acid that\nmay lower DEFENSE.$" -gMoveDescription_Ember:: @ 8483580 +gMoveDescription_Ember:: .string "The foe is attacked\nwith small flames.\nThe foe may suffer\na burn.$" -gMoveDescription_Flamethrower:: @ 84835C2 +gMoveDescription_Flamethrower:: .string "The foe is scorched\nwith intense flames.\nThe foe may suffer\na burn.$" -gMoveDescription_Mist:: @ 8483606 +gMoveDescription_Mist:: .string "The ally party is\nprotected by a\nmist that prevents\nstat reductions.$" -gMoveDescription_WaterGun:: @ 848364B +gMoveDescription_WaterGun:: .string "The foe is struck\nwith a lot of water\nexpelled forcibly\nfrom the mouth.$" -gMoveDescription_HydroPump:: @ 8483693 +gMoveDescription_HydroPump:: .string "A high volume of\nwater is blasted at\nthe foe under great\npressure.$" -gMoveDescription_Surf:: @ 84836D6 +gMoveDescription_Surf:: .string "A big wave crashes\ndown on the foe.\nCan also be used\nfor crossing water.$" -gMoveDescription_IceBeam:: @ 848371F +gMoveDescription_IceBeam:: .string "The foe is struck\nwith an icy beam.\nIt may freeze the\nfoe solid.$" -gMoveDescription_Blizzard:: @ 8483760 +gMoveDescription_Blizzard:: .string "The foe is blasted\nwith a blizzard.\nIt may freeze the\nfoe solid.$" -gMoveDescription_Psybeam:: @ 84837A1 +gMoveDescription_Psybeam:: .string "A peculiar ray is\nshot at the foe.\nIt may leave the\nfoe confused.$" -gMoveDescription_BubbleBeam:: @ 84837E3 +gMoveDescription_BubbleBeam:: .string "A spray of bubbles\nstrikes the foe.\nIt may lower the\nfoe's SPEED stat.$" -gMoveDescription_AuroraBeam:: @ 848382A +gMoveDescription_AuroraBeam:: .string "A rainbow-colored\nattack beam.\nIt may lower the\nfoe's ATTACK stat.$" -gMoveDescription_HyperBeam:: @ 848386D +gMoveDescription_HyperBeam:: .string "A severely damaging\nattack that makes\nthe user rest on\nthe next turn.$" -gMoveDescription_Peck:: @ 84838B3 +gMoveDescription_Peck:: .string "The foe is jabbed\nwith a sharply\npointed beak or\nhorn.$" -gMoveDescription_DrillPeck:: @ 84838EA +gMoveDescription_DrillPeck:: .string "A corkscrewing\nattack with the\nsharp beak acting\nas a drill.$" -gMoveDescription_Submission:: @ 8483927 +gMoveDescription_Submission:: .string "A reckless, full-\nbody throw attack\nthat also hurts the\nuser a little.$" -gMoveDescription_LowKick:: @ 848396E +gMoveDescription_LowKick:: .string "A low, tripping kick\nthat inflicts more\ndamage on heavier\nfoes.$" -gMoveDescription_Counter:: @ 84839AE +gMoveDescription_Counter:: .string "A retaliation move\nthat counters any\nphysical hit with\ndouble the damage.$" -gMoveDescription_SeismicToss:: @ 84839F8 +gMoveDescription_SeismicToss:: .string "A gravity-fed throw\nthat causes damage\nmatching the user's\nlevel.$" -gMoveDescription_Strength:: @ 8483A3A +gMoveDescription_Strength:: .string "The foe is slugged\nat maximum power.\nCan also be used\nto move boulders.$" -gMoveDescription_Absorb:: @ 8483A82 +gMoveDescription_Absorb:: .string "An attack that\nabsorbs half the\ndamage it inflicted\nto restore HP.$" -gMoveDescription_MegaDrain:: @ 8483AC5 +gMoveDescription_MegaDrain:: .string "A tough attack that\ndrains half the\ndamage it inflicted\nto restore HP.$" -gMoveDescription_LeechSeed:: @ 8483B0C +gMoveDescription_LeechSeed:: .string "A seed is planted\non the foe to steal\nsome HP for the \nuser on every turn.$" -gMoveDescription_Growth:: @ 8483B57 +gMoveDescription_Growth:: .string "The user's body is\nforced to grow,\nraising the SP.\nATK stat.$" -gMoveDescription_RazorLeaf:: @ 8483B94 +gMoveDescription_RazorLeaf:: .string "The foe is hit with\na cutting leaf.\nIt has a high\ncritical-hit ratio.$" -gMoveDescription_SolarBeam:: @ 8483BDA +gMoveDescription_SolarBeam:: .string "A 2-turn move that\nblasts the foe with\nabsorbed energy in\nthe 2nd turn.$" -gMoveDescription_PoisonPowder:: @ 8483C22 +gMoveDescription_PoisonPowder:: .string "A cloud of toxic\ndust is scattered.\nIt may poison the\nfoe.$" -gMoveDescription_StunSpore:: @ 8483C5D +gMoveDescription_StunSpore:: .string "Paralyzing dust is\nscattered wildly.\nIt may paralyze\nthe foe.$" -gMoveDescription_SleepPowder:: @ 8483C9B +gMoveDescription_SleepPowder:: .string "A sleep-inducing\ndust is scattered\nin high volume\naround a foe.$" -gMoveDescription_PetalDance:: @ 8483CDB +gMoveDescription_PetalDance:: .string "The user attacks\nwith petals for two\nto three turns,\nthen gets confused.$" -gMoveDescription_StringShot:: @ 8483D24 +gMoveDescription_StringShot:: .string "The foe is bound\nwith strings shot\nfrom the mouth to\nreduce its SPEED.$" -gMoveDescription_DragonRage:: @ 8483D6B +gMoveDescription_DragonRage:: .string "The foe is hit with\na shock wave that\nalways inflicts 40-\nHP damage.$" -gMoveDescription_FireSpin:: @ 8483DB0 +gMoveDescription_FireSpin:: .string "The foe is trapped\nin an intense spiral\nof fire that rages\ntwo to five turns.$" -gMoveDescription_ThunderShock:: @ 8483DFE +gMoveDescription_ThunderShock:: .string "An electric shock\nattack that may\nalso leave the foe\nparalyzed.$" -gMoveDescription_Thunderbolt:: @ 8483E3E +gMoveDescription_Thunderbolt:: .string "A strong electrical\nattack that may\nalso leave the foe\nparalyzed.$" -gMoveDescription_ThunderWave:: @ 8483E80 +gMoveDescription_ThunderWave:: .string "A weak electric\nshock that is sure\nto cause paralysis\nif it hits.$" -gMoveDescription_Thunder:: @ 8483EC2 +gMoveDescription_Thunder:: .string "A brutal lightning\nattack that may\nalso leave the foe\nparalyzed.$" -gMoveDescription_RockThrow:: @ 8483F03 +gMoveDescription_RockThrow:: .string "The foe is attacked\nwith a shower of\nsmall, easily\nthrown rocks.$" -gMoveDescription_Earthquake:: @ 8483F44 +gMoveDescription_Earthquake:: .string "An earthquake that\nstrikes all POKéMON\nin battle excluding\nthe user.$" -gMoveDescription_Fissure:: @ 8483F89 +gMoveDescription_Fissure:: .string "The foe is dropped\ninto a fissure.\nThe foe faints if it\nhits.$" -gMoveDescription_Dig:: @ 8483FC7 +gMoveDescription_Dig:: .string "An attack that hits\non the 2nd turn.\nCan also be used\nto exit dungeons.$" -gMoveDescription_Toxic:: @ 848400F +gMoveDescription_Toxic:: .string "A move that badly\npoisons the foe.\nIts poison damage\nworsens every turn.$" -gMoveDescription_Confusion:: @ 8484058 +gMoveDescription_Confusion:: .string "A weak telekinetic\nattack that may\nalso leave the foe\nconfused.$" -gMoveDescription_Psychic:: @ 8484098 +gMoveDescription_Psychic:: .string "A strong telekinetic\nattack. It may also\nlower the foe's\nSP. DEF stat.$" -gMoveDescription_Hypnosis:: @ 84840DF +gMoveDescription_Hypnosis:: .string "Hypnotic suggestion\nis used to make the\nfoe fall into a\ndeep sleep.$" -gMoveDescription_Meditate:: @ 8484123 +gMoveDescription_Meditate:: .string "The user meditates\nto awaken its power\nand raise its\nATTACK stat.$" -gMoveDescription_Agility:: @ 8484165 +gMoveDescription_Agility:: .string "The user relaxes\nand lightens its\nbody to sharply\nboost its SPEED.$" -gMoveDescription_QuickAttack:: @ 84841A8 +gMoveDescription_QuickAttack:: .string "An almost invisibly\nfast attack that\nis certain to strike\nfirst.$" -gMoveDescription_Rage:: @ 84841E9 +gMoveDescription_Rage:: .string "An attack that\nbecomes stronger\neach time the user\nis hit in battle.$" -gMoveDescription_Teleport:: @ 848422E +gMoveDescription_Teleport:: .string "Use it to flee from\nany wild POKéMON.\nAlso warps to the\nlast POKé CENTER.$" -gMoveDescription_NightShade:: @ 8484278 +gMoveDescription_NightShade:: .string "An attack with a\nmirage that inflicts\ndamage matching\nthe user's level.$" -gMoveDescription_Mimic:: @ 84842C0 +gMoveDescription_Mimic:: .string "The user copies the\nmove last used by\nthe foe for the\nrest of the battle.$" -gMoveDescription_Screech:: @ 848430A +gMoveDescription_Screech:: .string "An ear-splitting\nscreech is emitted\nto sharply reduce\nthe foe's DEFENSE.$" -gMoveDescription_DoubleTeam:: @ 8484353 +gMoveDescription_DoubleTeam:: .string "The user creates\nillusory copies of\nitself to raise its\nevasiveness.$" -gMoveDescription_Recover:: @ 8484398 +gMoveDescription_Recover:: .string "A self-healing move\nthat restores HP by\nup to half of the\nuser's maximum HP.$" -gMoveDescription_Harden:: @ 84843E5 +gMoveDescription_Harden:: .string "The user stiffens\nall the muscles in\nits body to raise\nits DEFENSE stat.$" -gMoveDescription_Minimize:: @ 848442E +gMoveDescription_Minimize:: .string "The user compresses\nall the cells in its\nbody to raise its\nevasiveness.$" -gMoveDescription_Smokescreen:: @ 8484476 +gMoveDescription_Smokescreen:: .string "An obscuring cloud\nof smoke or ink\nreduces the foe's\naccuracy.$" -gMoveDescription_ConfuseRay:: @ 84844B5 +gMoveDescription_ConfuseRay:: .string "The foe is exposed\nto a sinister ray\nthat triggers\nconfusion.$" -gMoveDescription_Withdraw:: @ 84844F3 +gMoveDescription_Withdraw:: .string "The user withdraws\nits body in its hard\nshell, raising its\nDEFENSE stat.$" -gMoveDescription_DefenseCurl:: @ 848453C +gMoveDescription_DefenseCurl:: .string "The user curls up\nto conceal weak\nspots and raise its\nDEFENSE stat.$" -gMoveDescription_Barrier:: @ 8484580 +gMoveDescription_Barrier:: .string "The user creates a\nsturdy wall that\nsharply raises its\nDEFENSE stat.$" -gMoveDescription_LightScreen:: @ 84845C5 +gMoveDescription_LightScreen:: .string "A wall of light\ncuts damage from\nSP. ATK attacks\nfor five turns.$" -gMoveDescription_Haze:: @ 8484606 +gMoveDescription_Haze:: .string "Eliminates all stat\nchanges among all\nPOKéMON engaged in\nbattle.$" -gMoveDescription_Reflect:: @ 8484647 +gMoveDescription_Reflect:: .string "A wall of light\ncuts damage from\nphysical attacks\nfor five turns.$" -gMoveDescription_FocusEnergy:: @ 8484689 +gMoveDescription_FocusEnergy:: .string "The user takes a\ndeep breath and\nfocuses to raise its\ncritical-hit ratio.$" -gMoveDescription_Bide:: @ 84846D3 +gMoveDescription_Bide:: .string "The user endures\nattacks for two\nturns, then strikes\nback double.$" -gMoveDescription_Metronome:: @ 8484715 +gMoveDescription_Metronome:: .string "Waggles a finger\nand stimulates the\nbrain into using any\nmove at random.$" -gMoveDescription_MirrorMove:: @ 848475E +gMoveDescription_MirrorMove:: .string "The user counters\nthe move last used\nby the foe with the\nsame move.$" -gMoveDescription_SelfDestruct:: @ 84847A2 +gMoveDescription_SelfDestruct:: .string "The user blows up\nto inflict severe\ndamage, even\nmaking itself faint.$" -gMoveDescription_EggBomb:: @ 84847E8 +gMoveDescription_EggBomb:: .string "A large egg is\nhurled with great\nforce at the foe to\ninflict damage.$" -gMoveDescription_Lick:: @ 848482D +gMoveDescription_Lick:: .string "The foe is licked\nand hit with a long\ntongue. It may\nalso paralyze.$" -gMoveDescription_Smog:: @ 8484871 +gMoveDescription_Smog:: .string "The foe is attacked\nwith exhaust gases.\nIt may also poison\nthe foe.$" -gMoveDescription_Sludge:: @ 84848B5 +gMoveDescription_Sludge:: .string "Toxic sludge is\nhurled at the foe.\nIt may poison the\ntarget.$" -gMoveDescription_BoneClub:: @ 84848F2 +gMoveDescription_BoneClub:: .string "The foe is clubbed\nwith a bone held in\nhand. It may make\nthe foe flinch.$" -gMoveDescription_FireBlast:: @ 848493B +gMoveDescription_FireBlast:: .string "The foe is hit with\nan intense flame.\nIt may leave the\ntarget with a burn.$" -gMoveDescription_Waterfall:: @ 8484986 +gMoveDescription_Waterfall:: .string "A powerful charge\nattack. It can also\nbe used to climb\na waterfall.$" -gMoveDescription_Clamp:: @ 84849CA +gMoveDescription_Clamp:: .string "The foe is clamped\nand squeezed by\nthe user's shell for\ntwo to five turns.$" -gMoveDescription_Swift:: @ 8484A15 +gMoveDescription_Swift:: .string "Star-shaped rays\nthat never miss are\nfired at all foes in\nbattle.$" -gMoveDescription_SkullBash:: @ 8484A57 +gMoveDescription_SkullBash:: .string "The user raises its\nDEFENSE in the 1st\nturn, then attacks\nin the 2nd turn.$" -gMoveDescription_SpikeCannon:: @ 8484AA2 +gMoveDescription_SpikeCannon:: .string "Sharp spikes are\nfired at the foe to\nstrike two to five\ntimes.$" -gMoveDescription_Constrict:: @ 8484AE1 +gMoveDescription_Constrict:: .string "The foe is attacked\nwith long tentacles\nor vines. It may\nlower SPEED.$" -gMoveDescription_Amnesia:: @ 8484B27 +gMoveDescription_Amnesia:: .string "Forgets about\nsomething and\nsharply raises\nSP. DEF.$" -gMoveDescription_Kinesis:: @ 8484B5B +gMoveDescription_Kinesis:: .string "The user distracts\nthe foe by bending\na spoon. It may\nlower accuracy.$" -gMoveDescription_SoftBoiled:: @ 8484BA1 +gMoveDescription_SoftBoiled:: .string "Heals the user by\nup to half its full\nHP. It can be used\nto heal an ally.$" -gMoveDescription_HiJumpKick:: @ 8484BEB +gMoveDescription_HiJumpKick:: .string "A strong jumping\nknee kick. If it\nmisses, the user is\nhurt.$" -gMoveDescription_Glare:: @ 8484C27 +gMoveDescription_Glare:: .string "The user intimidates\nthe foe with the\ndesign on its belly\nto cause paralysis.$" -gMoveDescription_DreamEater:: @ 8484C75 +gMoveDescription_DreamEater:: .string "Absorbs half the\ndamage it inflicted\non a sleeping foe\nto restore HP.$" -gMoveDescription_PoisonGas:: @ 8484CBB +gMoveDescription_PoisonGas:: .string "The foe is sprayed\nwith a cloud of\ntoxic gas that may\npoison the foe.$" -gMoveDescription_Barrage:: @ 8484D01 +gMoveDescription_Barrage:: .string "Round objects are\nhurled at the foe\nto strike two to\nfive times.$" -gMoveDescription_LeechLife:: @ 8484D42 +gMoveDescription_LeechLife:: .string "An attack that\nabsorbs half the\ndamage it inflicted\nto restore HP.$" -gMoveDescription_LovelyKiss:: @ 8484D85 +gMoveDescription_LovelyKiss:: .string "The user forces a\nkiss on the foe\nwith a scary face\nthat induces sleep.$" -gMoveDescription_SkyAttack:: @ 8484DCD +gMoveDescription_SkyAttack:: .string "A 2nd-turn attack\nmove with a high\ncritical-hit ratio.\nThe foe may flinch.$" -gMoveDescription_Transform:: @ 8484E18 +gMoveDescription_Transform:: .string "The user transforms\ninto a copy of the\nfoe with even the\nsame move set.$" -gMoveDescription_Bubble:: @ 8484E60 +gMoveDescription_Bubble:: .string "A spray of bubbles\nhits the foe.\nIt may lower the\nfoe's SPEED stat.$" -gMoveDescription_DizzyPunch:: @ 8484EA4 +gMoveDescription_DizzyPunch:: .string "The foe is hit with\na rhythmic punch\nthat may leave it\nconfused.$" -gMoveDescription_Spore:: @ 8484EE5 +gMoveDescription_Spore:: .string "The user scatters\nbursts of fine\nspores that induce\nsleep.$" -gMoveDescription_Flash:: @ 8484F20 +gMoveDescription_Flash:: .string "A blast of light\nthat cuts the foe's\naccuracy. It also\nilluminates caves.$" -gMoveDescription_Psywave:: @ 8484F6A +gMoveDescription_Psywave:: .string "The foe is attacked\nwith an odd, hot\nenergy wave that\nvaries in intensity.$" -gMoveDescription_Splash:: @ 8484FB5 +gMoveDescription_Splash:: .string "The user just flops\nand splashes around\nwithout having any\neffect.$" -gMoveDescription_AcidArmor:: @ 8484FF8 +gMoveDescription_AcidArmor:: .string "The user alters its\ncells to liquefy\nitself and sharply\nraise DEFENSE.$" -gMoveDescription_Crabhammer:: @ 848503F +gMoveDescription_Crabhammer:: .string "A large pincer is\nused to hammer the\nfoe. It has a high\ncritical-hit ratio.$" -gMoveDescription_Explosion:: @ 848508B +gMoveDescription_Explosion:: .string "The user explodes\nto inflict terrible\ndamage even while\nfainting itself.$" -gMoveDescription_FurySwipes:: @ 84850D4 +gMoveDescription_FurySwipes:: .string "The foe is raked\nwith sharp claws or\nscythes two to five\ntimes.$" -gMoveDescription_Bonemerang:: @ 8485114 +gMoveDescription_Bonemerang:: .string "The user throws a\nbone that hits the\nfoe once, then once\nagain on return.$" -gMoveDescription_Rest:: @ 848515E +gMoveDescription_Rest:: .string "The user sleeps for\ntwo turns to fully\nrestore HP and heal\nany status problem.$" -gMoveDescription_RockSlide:: @ 84851AD +gMoveDescription_RockSlide:: .string "Large boulders are\nhurled at the foe.\nIt may make the\nfoe flinch.$" -gMoveDescription_HyperFang:: @ 84851EF +gMoveDescription_HyperFang:: .string "The foe is attacked\nwith sharp fangs.\nIt may make the\nfoe flinch.$" -gMoveDescription_Sharpen:: @ 8485231 +gMoveDescription_Sharpen:: .string "The user reduces\nits polygon count\nto sharpen edges\nand raise ATTACK.$" -gMoveDescription_Conversion:: @ 8485277 +gMoveDescription_Conversion:: .string "The user changes\nits type to match\nthe type of one of\nits moves.$" -gMoveDescription_TriAttack:: @ 84852B8 +gMoveDescription_TriAttack:: .string "A simultaneous\n3-beam attack that\nmay paralyze, burn,\nor freeze the foe.$" -gMoveDescription_SuperFang:: @ 8485301 +gMoveDescription_SuperFang:: .string "The user attacks\nwith sharp fangs\nand halves the\nfoe's HP.$" -gMoveDescription_Slash:: @ 848533C +gMoveDescription_Slash:: .string "The foe is slashed\nwith claws, etc.\nIt has a high\ncritical-hit ratio.$" -gMoveDescription_Substitute:: @ 8485382 +gMoveDescription_Substitute:: .string "The user creates a\ndecoy using one-\nquarter of its full\nHP.$" -gMoveDescription_Struggle:: @ 84853BE +gMoveDescription_Struggle:: .string "An attack that is\nused only if there\nis no PP. It also\nhurts the user.$" -gMoveDescription_Sketch:: @ 8485405 +gMoveDescription_Sketch:: .string "This move copies\nthe move last used\nby the foe, then\ndisappears.$" -gMoveDescription_TripleKick:: @ 8485446 +gMoveDescription_TripleKick:: .string "A 3-kick attack\nthat becomes more\npowerful with each\nsuccessive hit.$" -gMoveDescription_Thief:: @ 848548B +gMoveDescription_Thief:: .string "An attack that may\ntake the foe's held\nitem if the user\nisn't holding one.$" -gMoveDescription_SpiderWeb:: @ 84854D6 +gMoveDescription_SpiderWeb:: .string "Ensnares the foe \nwith sticky string\nso it doesn't flee\nor switch out.$" -gMoveDescription_MindReader:: @ 848551D +gMoveDescription_MindReader:: .string "The user predicts\nthe foe's action to\nensure its next\nattack hits.$" -gMoveDescription_Nightmare:: @ 8485560 +gMoveDescription_Nightmare:: .string "A sleeping foe is\nshown a nightmare\nthat inflicts some\ndamage every turn.$" -gMoveDescription_FlameWheel:: @ 84855AA +gMoveDescription_FlameWheel:: .string "The user makes a\nfiery charge at the\nfoe. It may cause\na burn.$" -gMoveDescription_Snore:: @ 84855E9 +gMoveDescription_Snore:: .string "An attack that can\nbe used only while\nasleep. It may\ncause flinching.$" -gMoveDescription_Curse:: @ 848562F +gMoveDescription_Curse:: .string "A move that works\ndifferently for the\nGHOST-type and all\nthe other types.$" -gMoveDescription_Flail:: @ 8485679 +gMoveDescription_Flail:: .string "A desperate attack\nthat becomes more\npowerful the less\nHP the user has.$" -gMoveDescription_Conversion2:: @ 84856C1 +gMoveDescription_Conversion2:: .string "The user changes\ntype to make itself\nresistant to the\nlast attack it took.$" -gMoveDescription_Aeroblast:: @ 848570C +gMoveDescription_Aeroblast:: .string "A vortex of air is\nshot at the foe.\nIt has a high\ncritical-hit ratio.$" -gMoveDescription_CottonSpore:: @ 8485752 +gMoveDescription_CottonSpore:: .string "Cotton-like spores\ncling to the foe,\nsharply reducing\nits SPEED stat.$" -gMoveDescription_Reversal:: @ 8485798 +gMoveDescription_Reversal:: .string "An all-out attack\nthat becomes more\npowerful the less\nHP the user has.$" -gMoveDescription_Spite:: @ 84857DF +gMoveDescription_Spite:: .string "A move that cuts\n2 to 5 PP from the\nmove last used by\nthe foe.$" -gMoveDescription_PowderSnow:: @ 848581E +gMoveDescription_PowderSnow:: .string "Blasts the foe with\na snowy gust.\nIt may cause\nfreezing.$" -gMoveDescription_Protect:: @ 8485857 +gMoveDescription_Protect:: .string "Enables the user to\nevade all attacks.\nIt may fail if used\nin succession.$" -gMoveDescription_MachPunch:: @ 84858A1 +gMoveDescription_MachPunch:: .string "A punch thrown at\nblinding speed.\nIt is certain to\nstrike first.$" -gMoveDescription_ScaryFace:: @ 84858E2 +gMoveDescription_ScaryFace:: .string "Frightens the foe\nwith a scary face\nto sharply reduce\nits SPEED.$" -gMoveDescription_FaintAttack:: @ 8485923 +gMoveDescription_FaintAttack:: .string "The user draws up\nclose to the foe\ndisarmingly, then\nhits without fail.$" -gMoveDescription_SweetKiss:: @ 848596B +gMoveDescription_SweetKiss:: .string "The user kisses\nthe foe with sweet\ncuteness that\ncauses confusion.$" -gMoveDescription_BellyDrum:: @ 84859AE +gMoveDescription_BellyDrum:: .string "The user maximizes\nits ATTACK stat at\nthe cost of half\nits full HP.$" -gMoveDescription_SludgeBomb:: @ 84859F2 +gMoveDescription_SludgeBomb:: .string "Filthy sludge is\nhurled at the foe.\nIt may poison the\ntarget.$" -gMoveDescription_MudSlap:: @ 8485A30 +gMoveDescription_MudSlap:: .string "Mud is hurled in\nthe foe's face to\ninflict damage and\nlower its accuracy.$" -gMoveDescription_Octazooka:: @ 8485A7A +gMoveDescription_Octazooka:: .string "Ink is blasted in\nthe foe's face or\neyes to damage and\nlower accuracy.$" -gMoveDescription_Spikes:: @ 8485AC1 +gMoveDescription_Spikes:: .string "A trap of spikes is\nlaid around the\nfoe's party to hurt\nfoes switching in.$" -gMoveDescription_ZapCannon:: @ 8485B0C +gMoveDescription_ZapCannon:: .string "An electric blast is\nfired like a cannon\nto inflict damage\nand paralyze.$" -gMoveDescription_Foresight:: @ 8485B55 +gMoveDescription_Foresight:: .string "Completely negates\nthe foe's efforts to\nheighten its ability\nto evade.$" -gMoveDescription_DestinyBond:: @ 8485B9C +gMoveDescription_DestinyBond:: .string "If the user faints,\nthe foe delivering\nthe final hit also\nfaints.$" -gMoveDescription_PerishSong:: @ 8485BDE +gMoveDescription_PerishSong:: .string "Any battler that\nhears this faints\nin three turns\nunless it switches.$" -gMoveDescription_IcyWind:: @ 8485C24 +gMoveDescription_IcyWind:: .string "A chilling wind is\nused to attack.\nIt also lowers the\nSPEED stat.$" -gMoveDescription_Detect:: @ 8485C66 +gMoveDescription_Detect:: .string "Enables the user to\nevade all attacks.\nIt may fail if used\nin succession.$" -gMoveDescription_BoneRush:: @ 8485CB0 +gMoveDescription_BoneRush:: .string "The user strikes\nthe foe with a bone\nin hand two to five\ntimes.$" -gMoveDescription_LockOn:: @ 8485CF0 +gMoveDescription_LockOn:: .string "The user locks on\nto the foe, making\nthe next move sure\nto hit.$" -gMoveDescription_Outrage:: @ 8485D30 +gMoveDescription_Outrage:: .string "The user thrashes\nabout for two to\nthree turns, then\nbecomes confused.$" -gMoveDescription_Sandstorm:: @ 8485D77 +gMoveDescription_Sandstorm:: .string "A 5-turn sandstorm\nthat damages all\ntypes except ROCK,\nGROUND, and STEEL.$" -gMoveDescription_GigaDrain:: @ 8485DC1 +gMoveDescription_GigaDrain:: .string "A harsh attack that\nabsorbs half the\ndamage it inflicted\nto restore HP.$" -gMoveDescription_Endure:: @ 8485E09 +gMoveDescription_Endure:: .string "The user endures\nany hit with 1 HP\nleft. It may fail if\nused in succession.$" -gMoveDescription_Charm:: @ 8485E55 +gMoveDescription_Charm:: .string "The foe is charmed\nby the user's cute\nappeals, sharply\ncutting its ATTACK.$" -gMoveDescription_Rollout:: @ 8485EA0 +gMoveDescription_Rollout:: .string "A 5-turn rolling\nattack that becomes\nstronger each time\nit hits.$" -gMoveDescription_FalseSwipe:: @ 8485EE1 +gMoveDescription_FalseSwipe:: .string "A restrained attack\nthat always leaves\nthe foe with at\nleast 1 HP.$" -gMoveDescription_Swagger:: @ 8485F24 +gMoveDescription_Swagger:: .string "A move that makes\nthe foe confused,\nbut also sharply\nraises its ATTACK.$" -gMoveDescription_MilkDrink:: @ 8485F6C +gMoveDescription_MilkDrink:: .string "Heals the user by\nup to half its full\nHP. It can be used\nto heal an ally.$" -gMoveDescription_Spark:: @ 8485FB6 +gMoveDescription_Spark:: .string "An electrically\ncharged tackle that\nmay also paralyze\nthe foe.$" -gMoveDescription_FuryCutter:: @ 8485FF5 +gMoveDescription_FuryCutter:: .string "An attack that\ngrows stronger on\neach successive\nhit.$" -gMoveDescription_SteelWing:: @ 848602B +gMoveDescription_SteelWing:: .string "The foe is hit with\nwings of steel.\nIt may also raise\nthe user's DEFENSE.$" -gMoveDescription_MeanLook:: @ 8486075 +gMoveDescription_MeanLook:: .string "The foe is fixed\nwith a mean look\nthat prevents it\nfrom escaping.$" -gMoveDescription_Attract:: @ 84860B7 +gMoveDescription_Attract:: .string "If it is the other\ngender, the foe is\nmade infatuated and\nunlikely to attack.$" -gMoveDescription_SleepTalk:: @ 8486105 +gMoveDescription_SleepTalk:: .string "While asleep, the\nuser randomly uses\none of the moves it\nknows.$" -gMoveDescription_HealBell:: @ 8486145 +gMoveDescription_HealBell:: .string "A soothing bell\nchimes to heal the\nstatus problems of\nall allies.$" -gMoveDescription_Return:: @ 8486187 +gMoveDescription_Return:: .string "This attack move\ngrows more powerful\nthe more the user\nlikes its TRAINER.$" -gMoveDescription_Present:: @ 84861D1 +gMoveDescription_Present:: .string "The foe is given a\nbooby-trapped gift.\nIt restores HP\nsometimes, however.$" -gMoveDescription_Frustration:: @ 848621B +gMoveDescription_Frustration:: .string "This attack move\ngrows more powerful\nthe less the user\nlikes its TRAINER.$" -gMoveDescription_Safeguard:: @ 8486265 +gMoveDescription_Safeguard:: .string "It protects the\nuser's party from\nall status problems\nfor five turns.$" -gMoveDescription_PainSplit:: @ 84862AB +gMoveDescription_PainSplit:: .string "The user adds its\nHP to the foe's HP,\nthen equally shares\nthe total HP.$" -gMoveDescription_SacredFire:: @ 84862F3 +gMoveDescription_SacredFire:: .string "A mystical and\npowerful fire\nattack that may\ninflict a burn.$" -gMoveDescription_Magnitude:: @ 8486330 +gMoveDescription_Magnitude:: .string "A ground-shaking\nattack against all\nstanding POKéMON.\nIts power varies.$" -gMoveDescription_DynamicPunch:: @ 8486378 +gMoveDescription_DynamicPunch:: .string "The foe is punched\nwith the user's full\npower. It confuses\nthe foe if it hits.$" -gMoveDescription_Megahorn:: @ 84863C7 +gMoveDescription_Megahorn:: .string "A brutal ramming\nattack delivered\nwith a tough and\nimpressive horn.$" -gMoveDescription_DragonBreath:: @ 848640B +gMoveDescription_DragonBreath:: .string "The foe is hit with\nan incredible blast\nof breath that may\nalso paralyze.$" -gMoveDescription_BatonPass:: @ 8486455 +gMoveDescription_BatonPass:: .string "The user switches\nout, passing along\nany stat changes\nto the new battler.$" -gMoveDescription_Encore:: @ 848649F +gMoveDescription_Encore:: .string "Makes the foe use\nthe move it last\nused repeatedly for\ntwo to six turns.$" -gMoveDescription_Pursuit:: @ 84864E8 +gMoveDescription_Pursuit:: .string "An attack move that\nworks especially\nwell on a foe that\nis switching out.$" -gMoveDescription_RapidSpin:: @ 8486532 +gMoveDescription_RapidSpin:: .string "An attack that\nfrees the user from\nBIND, WRAP, LEECH\nSEED, and SPIKES.$" -gMoveDescription_SweetScent:: @ 8486579 +gMoveDescription_SweetScent:: .string "Allures the foe to\nreduce evasiveness.\nIt also attracts\nwild POKéMON.$" -gMoveDescription_IronTail:: @ 84865BF +gMoveDescription_IronTail:: .string "An attack with a\nsteel-hard tail.\nIt may lower the\nfoe's DEFENSE stat.$" -gMoveDescription_MetalClaw:: @ 8486606 +gMoveDescription_MetalClaw:: .string "The foe is attacked\nwith steel claws.\nIt may also raise\nthe user's ATTACK.$" -gMoveDescription_VitalThrow:: @ 8486651 +gMoveDescription_VitalThrow:: .string "Makes the user\nattack after the\nfoe. In return,\nit will not miss.$" -gMoveDescription_MorningSun:: @ 8486693 +gMoveDescription_MorningSun:: .string "Restores the user's\nHP. The amount of\nHP regained varies\nwith the weather.$" -gMoveDescription_Synthesis:: @ 84866DE +gMoveDescription_Synthesis:: .string "Restores the user's\nHP. The amount of\nHP regained varies\nwith the weather.$" -gMoveDescription_Moonlight:: @ 8486729 +gMoveDescription_Moonlight:: .string "Restores the user's\nHP. The amount of\nHP regained varies\nwith the weather.$" -gMoveDescription_HiddenPower:: @ 8486774 +gMoveDescription_HiddenPower:: .string "An attack that\nvaries in type and\nintensity depending\non the user.$" -gMoveDescription_CrossChop:: @ 84867B7 +gMoveDescription_CrossChop:: .string "The foe is hit with\ndouble chops.\nIt has a high\ncritical-hit ratio.$" -gMoveDescription_Twister:: @ 84867FB +gMoveDescription_Twister:: .string "A vicious twister\nattacks the foe.\nIt may make the\nfoe flinch.$" -gMoveDescription_RainDance:: @ 848683A +gMoveDescription_RainDance:: .string "A heavy rain falls\nfor five turns,\npowering up WATER-\ntype moves.$" -gMoveDescription_SunnyDay:: @ 848687C +gMoveDescription_SunnyDay:: .string "The sun blazes for\nfive turns, powering\nup FIRE-type\nmoves.$" -gMoveDescription_Crunch:: @ 84868B8 +gMoveDescription_Crunch:: .string "The foe is crunched\nwith sharp fangs.\nIt may lower the\nfoe's SP. DEF.$" -gMoveDescription_MirrorCoat:: @ 84868FE +gMoveDescription_MirrorCoat:: .string "A retaliation move\nthat pays back the\nfoe's special attack\ndouble.$" -gMoveDescription_PsychUp:: @ 8486941 +gMoveDescription_PsychUp:: .string "The user hypnotizes\nitself into copying\nany stat change\nmade by the foe.$" -gMoveDescription_ExtremeSpeed:: @ 848698A +gMoveDescription_ExtremeSpeed:: .string "A blindingly speedy\ncharge attack that\nalways goes before\nany other.$" -gMoveDescription_AncientPower:: @ 84869CF +gMoveDescription_AncientPower:: .string "An ancient power is\nused to attack. It\nmay also raise all\nthe user's stats.$" -gMoveDescription_ShadowBall:: @ 8486A1B +gMoveDescription_ShadowBall:: .string "A shadowy blob is\nhurled at the foe.\nMay also lower the\nfoe's SP. DEF.$" -gMoveDescription_FutureSight:: @ 8486A62 +gMoveDescription_FutureSight:: .string "Two turns after\nthis move is used,\nthe foe is attacked\npsychically.$" -gMoveDescription_RockSmash:: @ 8486AA6 +gMoveDescription_RockSmash:: .string "An attack that may\nalso cut DEFENSE.\nIt can also smash\ncracked boulders.$" -gMoveDescription_Whirlpool:: @ 8486AEF +gMoveDescription_Whirlpool:: .string "The foe is trapped\nin a fast, vicious\nwhirlpool for two\nto five turns.$" -gMoveDescription_BeatUp:: @ 8486B36 +gMoveDescription_BeatUp:: .string "All party POKéMON\njoin in the attack.\nThe more allies,\nthe more damage.$" -gMoveDescription_FakeOut:: @ 8486B7E +gMoveDescription_FakeOut:: .string "An attack that hits\nfirst and causes\nflinching. Usable\nonly on 1st turn.$" -gMoveDescription_Uproar:: @ 8486BC7 +gMoveDescription_Uproar:: .string "The user attacks in\nan uproar that\nprevents sleep for\ntwo to five turns.$" -gMoveDescription_Stockpile:: @ 8486C10 +gMoveDescription_Stockpile:: .string "The user charges\nup power for use\nlater. It can be\nused three times.$" -gMoveDescription_SpitUp:: @ 8486C55 +gMoveDescription_SpitUp:: .string "The power built\nusing STOCKPILE is\nreleased at once\nfor attack.$" -gMoveDescription_Swallow:: @ 8486C95 +gMoveDescription_Swallow:: .string "The energy it built\nusing STOCKPILE is\nabsorbed to restore\nHP.$" -gMoveDescription_HeatWave:: @ 8486CD4 +gMoveDescription_HeatWave:: .string "The user exhales a\nheated breath to\nattack. It may also\ninflict a burn.$" -gMoveDescription_Hail:: @ 8486D1C +gMoveDescription_Hail:: .string "A hailstorm lasting\nfive turns damages\nall POKéMON except\nthe ICE-type.$" -gMoveDescription_Torment:: @ 8486D64 +gMoveDescription_Torment:: .string "It enrages the foe,\nmaking it incapable\nof using the same\nmove successively.$" -gMoveDescription_Flatter:: @ 8486DB1 +gMoveDescription_Flatter:: .string "Flattery is used to\nconfuse the foe,\nbut its SP. ATK\nalso rises.$" -gMoveDescription_WillOWisp:: @ 8486DF2 +gMoveDescription_WillOWisp:: .string "A sinister, bluish\nwhite flame is shot\nat the foe to\ninflict a burn.$" -gMoveDescription_Memento:: @ 8486E37 +gMoveDescription_Memento:: .string "The user faints,\nbut sharply lowers\nthe foe's ATTACK\nand SP. ATK.$" -gMoveDescription_Facade:: @ 8486E79 +gMoveDescription_Facade:: .string "An attack that is\nboosted if user is\nburned, poisoned,\nor paralyzed.$" -gMoveDescription_FocusPunch:: @ 8486EBE +gMoveDescription_FocusPunch:: .string "An attack that is\nexecuted last.\nThe user flinches\nif hit beforehand.$" -gMoveDescription_SmellingSalt:: @ 8486F04 +gMoveDescription_SmellingSalt:: .string "Doubly effective on\na paralyzed foe,\nbut it also cures\nthe foe's paralysis.$" -gMoveDescription_FollowMe:: @ 8486F50 +gMoveDescription_FollowMe:: .string "The user draws\nattention to itself,\nmaking foes attack\nonly the user.$" -gMoveDescription_NaturePower:: @ 8486F96 +gMoveDescription_NaturePower:: .string "An attack that\nchanges type\ndepending on the\nuser's location.$" -gMoveDescription_Charge:: @ 8486FD4 +gMoveDescription_Charge:: .string "The user charges\npower to boost the\nELECTRIC move it\nuses next.$" -gMoveDescription_Taunt:: @ 8487014 +gMoveDescription_Taunt:: .string "The foe is taunted\ninto a rage that\nallows it to use\nonly attack moves.$" -gMoveDescription_HelpingHand:: @ 848705C +gMoveDescription_HelpingHand:: .string "A move that boosts\nthe power of the\nally's attack in a\nbattle.$" -gMoveDescription_Trick:: @ 848709B +gMoveDescription_Trick:: .string "A move that tricks\nthe foe into\ntrading held items\nwith the user.$" -gMoveDescription_RolePlay:: @ 84870DD +gMoveDescription_RolePlay:: .string "The user mimics the\nfoe completely and\ncopies the foe's\nability.$" -gMoveDescription_Wish:: @ 848711E +gMoveDescription_Wish:: .string "A self-healing move\nthat restores half\nthe full HP on the\nnext turn.$" -gMoveDescription_Assist:: @ 8487163 +gMoveDescription_Assist:: .string "The user randomly\npicks and uses a\nmove of an allied\nPOKéMON.$" -gMoveDescription_Ingrain:: @ 84871A1 +gMoveDescription_Ingrain:: .string "The user lays roots\nthat restore HP on\nevery turn.\nIt can't switch out.$" -gMoveDescription_Superpower:: @ 84871E9 +gMoveDescription_Superpower:: .string "A powerful attack,\nbut it also lowers\nthe user's ATTACK\nand DEFENSE stats.$" -gMoveDescription_MagicCoat:: @ 8487234 +gMoveDescription_MagicCoat:: .string "Reflects back the\nfoe's LEECH SEED\nand any status-\ndamaging move.$" -gMoveDescription_Recycle:: @ 8487276 +gMoveDescription_Recycle:: .string "A move that\nrecycles a used\nitem for use once\nmore.$" -gMoveDescription_Revenge:: @ 84872AA +gMoveDescription_Revenge:: .string "An attack move that\ngains in intensity if\nthe target has hurt\nthe user.$" -gMoveDescription_BrickBreak:: @ 84872F2 +gMoveDescription_BrickBreak:: .string "An attack that also\nbreaks any barrier\nlike LIGHT SCREEN\nand REFLECT.$" -gMoveDescription_Yawn:: @ 8487338 +gMoveDescription_Yawn:: .string "A huge yawn lulls\nthe foe into falling\nasleep on the next\nturn.$" -gMoveDescription_KnockOff:: @ 8487378 +gMoveDescription_KnockOff:: .string "Knocks down the\nfoe's held item to\nprevent its use\nduring the battle.$" -gMoveDescription_Endeavor:: @ 84873BE +gMoveDescription_Endeavor:: .string "Gains power the\nfewer HP the user\nhas compared with\nthe foe.$" -gMoveDescription_Eruption:: @ 84873FB +gMoveDescription_Eruption:: .string "The higher the\nuser's HP, the more\npowerful this\nattack becomes.$" -gMoveDescription_SkillSwap:: @ 848743C +gMoveDescription_SkillSwap:: .string "The user employs\nits psychic power\nto swap abilities\nwith the foe.$" -gMoveDescription_Imprison:: @ 848747F +gMoveDescription_Imprison:: .string "Prevents foes from\nusing any move\nthat is also known\nby the user.$" -gMoveDescription_Refresh:: @ 84874C1 +gMoveDescription_Refresh:: .string "A self-healing move\nthat cures the user\nof a poisoning,\nburn, or paralysis.$" -gMoveDescription_Grudge:: @ 848750D +gMoveDescription_Grudge:: .string "If the user faints,\nthis move deletes\nthe PP of the move\nthat finished it.$" -gMoveDescription_Snatch:: @ 8487558 +gMoveDescription_Snatch:: .string "Steals the effects\nof the foe's\nhealing or status-\nchanging move.$" -gMoveDescription_SecretPower:: @ 848759A +gMoveDescription_SecretPower:: .string "An attack that may\nhave an additional\neffect that varies\nwith the terrain.$" -gMoveDescription_Dive:: @ 84875E5 +gMoveDescription_Dive:: .string "The user dives\nunderwater on the\nfirst turn and\nstrikes next turn.$" -gMoveDescription_ArmThrust:: @ 8487628 +gMoveDescription_ArmThrust:: .string "A quick flurry of\nstraight-arm\npunches that hit\ntwo to five times.$" -gMoveDescription_Camouflage:: @ 848766B +gMoveDescription_Camouflage:: .string "Alters the user's\ntype depending on\nthe location's\nterrain.$" -gMoveDescription_TailGlow:: @ 84876A7 +gMoveDescription_TailGlow:: .string "The user flashes a\nlight that sharply\nraises its SP. ATK\nstat.$" -gMoveDescription_LusterPurge:: @ 84876E6 +gMoveDescription_LusterPurge:: .string "A burst of light\ninjures the foe. It\nmay also lower the\nfoe's SP. DEF.$" -gMoveDescription_MistBall:: @ 848772D +gMoveDescription_MistBall:: .string "A flurry of down\nhits the foe. It\nmay also lower the\nfoe's SP. ATK.$" -gMoveDescription_FeatherDance:: @ 8487771 +gMoveDescription_FeatherDance:: .string "The foe is covered\nwith a mass of down\nthat sharply cuts\nthe ATTACK stat.$" -gMoveDescription_TeeterDance:: @ 84877BB +gMoveDescription_TeeterDance:: .string "A wobbly dance\nthat confuses all\nthe POKéMON in\nbattle.$" -gMoveDescription_BlazeKick:: @ 84877F3 +gMoveDescription_BlazeKick:: .string "A fiery kick with a\nhigh critical-hit\nratio. It may also\nburn the foe.$" -gMoveDescription_MudSport:: @ 848783A +gMoveDescription_MudSport:: .string "Weakens ELECTRIC-\ntype attacks while\nthe user is in the\nbattle.$" -gMoveDescription_IceBall:: @ 848787A +gMoveDescription_IceBall:: .string "A 5-turn rolling\nattack that becomes\nstronger each time\nit rolls.$" -gMoveDescription_NeedleArm:: @ 84878BC +gMoveDescription_NeedleArm:: .string "An attack using\nthorny arms.\nIt may make the\nfoe flinch.$" -gMoveDescription_SlackOff:: @ 84878F5 +gMoveDescription_SlackOff:: .string "The user slacks off\nand restores its HP\nby half its full\nHP.$" -gMoveDescription_HyperVoice:: @ 8487932 +gMoveDescription_HyperVoice:: .string "The user lets loose\na horribly loud\nshout with the\npower to damage.$" -gMoveDescription_PoisonFang:: @ 8487976 +gMoveDescription_PoisonFang:: .string "The foe is bitten\nwith toxic fangs.\nIt may also badly\npoison the foe.$" -gMoveDescription_CrushClaw:: @ 84879BC +gMoveDescription_CrushClaw:: .string "The foe is attacked\nwith sharp claws.\nIt may also lower\nthe foe's DEFENSE.$" -gMoveDescription_BlastBurn:: @ 8487A07 +gMoveDescription_BlastBurn:: .string "The foe is hit with\na huge explosion.\nThe user can't move\non the next turn.$" -gMoveDescription_HydroCannon:: @ 8487A53 +gMoveDescription_HydroCannon:: .string "The foe is hit with\na watery cannon.\nThe user can't move\non the next turn.$" -gMoveDescription_MeteorMash:: @ 8487A9E +gMoveDescription_MeteorMash:: .string "The foe is hit with\na hard, fast punch.\nIt may also raise\nthe user's ATTACK.$" -gMoveDescription_Astonish:: @ 8487AEB +gMoveDescription_Astonish:: .string "An attack using a\nstartling shout.\nIt also may make\nthe foe flinch.$" -gMoveDescription_WeatherBall:: @ 8487B2F +gMoveDescription_WeatherBall:: .string "An attack that\nvaries in power and\ntype depending on\nthe weather.$" -gMoveDescription_Aromatherapy:: @ 8487B71 +gMoveDescription_Aromatherapy:: .string "A soothing scent is\nreleased to heal\nall status problems\nin the user's party.$" -gMoveDescription_FakeTears:: @ 8487BBF +gMoveDescription_FakeTears:: .string "The user feigns\ncrying to sharply\nlower the foe's\nSP. DEF stat.$" -gMoveDescription_AirCutter:: @ 8487BFF +gMoveDescription_AirCutter:: .string "The foe is hit with\nrazor-like wind.\nIt has a high\ncritical-hit ratio.$" -gMoveDescription_Overheat:: @ 8487C46 +gMoveDescription_Overheat:: .string "An intense attack\nthat also sharply\nreduces the user's\nSP. ATK stat.$" -gMoveDescription_OdorSleuth:: @ 8487C8B +gMoveDescription_OdorSleuth:: .string "Completely negates\nthe foe's efforts to\nheighten its ability\nto evade.$" -gMoveDescription_RockTomb:: @ 8487CD2 +gMoveDescription_RockTomb:: .string "Boulders are hurled\nat the foe. It also\nlowers the foe's\nSPEED if it hits.$" -gMoveDescription_SilverWind:: @ 8487D1D +gMoveDescription_SilverWind:: .string "The foe is attacked\nwith a silver dust.\nIt may raise all\nthe user's stats.$" -gMoveDescription_MetalSound:: @ 8487D68 +gMoveDescription_MetalSound:: .string "A horrible metallic\nscreech is used to\nsharply lower the\nfoe's SP. DEF.$" -gMoveDescription_GrassWhistle:: @ 8487DB0 +gMoveDescription_GrassWhistle:: .string "A pleasant melody\nis played to lull\nthe foe into a deep\nsleep.$" -gMoveDescription_Tickle:: @ 8487DEF +gMoveDescription_Tickle:: .string "The foe is made to\nlaugh, reducing its\nATTACK and DEFENSE\nstats.$" -gMoveDescription_CosmicPower:: @ 8487E30 +gMoveDescription_CosmicPower:: .string "The user absorbs a\nmystic power to\nraise its DEFENSE\nand SP. DEF.$" -gMoveDescription_WaterSpout:: @ 8487E72 +gMoveDescription_WaterSpout:: .string "The higher the\nuser's HP, the more\npowerful this\nattack becomes.$" -gMoveDescription_SignalBeam:: @ 8487EB3 +gMoveDescription_SignalBeam:: .string "The foe is hit with\na flashing beam\nthat may also\ncause confusion.$" -gMoveDescription_ShadowPunch:: @ 8487EF6 +gMoveDescription_ShadowPunch:: .string "The user throws a\npunch from the\nshadows. It cannot\nbe evaded.$" -gMoveDescription_Extrasensory:: @ 8487F35 +gMoveDescription_Extrasensory:: .string "The user attacks\nwith an odd power\nthat may make the\nfoe flinch.$" -gMoveDescription_SkyUppercut:: @ 8487F76 +gMoveDescription_SkyUppercut:: .string "The user attacks\nwith an uppercut\nthrown skywards\nwith force.$" -gMoveDescription_SandTomb:: @ 8487FB4 +gMoveDescription_SandTomb:: .string "The foe is trapped\ninside a painful\nsandstorm for two\nto five turns.$" -gMoveDescription_SheerCold:: @ 8487FF9 +gMoveDescription_SheerCold:: .string "The foe is attacked\nwith ultimate cold\nthat causes fainting\nif it hits.$" -gMoveDescription_MuddyWater:: @ 8488041 +gMoveDescription_MuddyWater:: .string "The user attacks\nwith muddy water.\nIt may also lower\nthe foe's accuracy.$" -gMoveDescription_BulletSeed:: @ 848808A +gMoveDescription_BulletSeed:: .string "The user shoots\nseeds at the foe.\nTwo to five seeds\nare shot at once.$" -gMoveDescription_AerialAce:: @ 84880D0 +gMoveDescription_AerialAce:: .string "An extremely fast\nattack against one\ntarget. It can't be\nevaded.$" -gMoveDescription_IcicleSpear:: @ 8488111 +gMoveDescription_IcicleSpear:: .string "Sharp icicles are\nfired at the foe.\nIt strikes two to\nfive times.$" -gMoveDescription_IronDefense:: @ 8488153 +gMoveDescription_IronDefense:: .string "The user hardens\nits body's surface\nto sharply raise its\nDEFENSE stat.$" -gMoveDescription_Block:: @ 848819A +gMoveDescription_Block:: .string "The user blocks the\nfoe's way with arms\nspread wide to\nprevent escape.$" -gMoveDescription_Howl:: @ 84881E1 +gMoveDescription_Howl:: .string "The user howls to\nraise its spirit and\nboost its ATTACK\nstat.$" -gMoveDescription_DragonClaw:: @ 848821F +gMoveDescription_DragonClaw:: .string "Sharp, huge claws\nhook and slash the\nfoe quickly and\nwith great power.$" -gMoveDescription_FrenzyPlant:: @ 8488266 +gMoveDescription_FrenzyPlant:: .string "The foe is hit with\nan enormous branch.\nThe user can't move\non the next turn.$" -gMoveDescription_BulkUp:: @ 84882B4 +gMoveDescription_BulkUp:: .string "The user bulks up\nits body to boost\nboth its ATTACK and\nDEFENSE stats.$" -gMoveDescription_Bounce:: @ 84882FB +gMoveDescription_Bounce:: .string "The user bounces\non the foe on the\n2nd turn. It may\nparalyze the foe.$" -gMoveDescription_MudShot:: @ 8488341 +gMoveDescription_MudShot:: .string "The user attacks by\nhurling mud.\nIt also reduces the\nfoe's SPEED.$" -gMoveDescription_PoisonTail:: @ 8488383 +gMoveDescription_PoisonTail:: .string "An attack with a\nhigh critical-hit\nratio. It may also\npoison the foe.$" -gMoveDescription_Covet:: @ 84883C9 +gMoveDescription_Covet:: .string "A cutely executed\nattack that also\nsteals the foe's\nhold item.$" -gMoveDescription_VoltTackle:: @ 8488408 +gMoveDescription_VoltTackle:: .string "The user throws an\nelectrified tackle.\nIt hurts the user\na little.$" -gMoveDescription_MagicalLeaf:: @ 848844B +gMoveDescription_MagicalLeaf:: .string "The foe is attacked\nwith a strange leaf\nthat cannot be\nevaded.$" -gMoveDescription_WaterSport:: @ 848848A +gMoveDescription_WaterSport:: .string "Weakens FIRE-type\nattacks while the\nuser is in the\nbattle.$" -gMoveDescription_CalmMind:: @ 84884C5 +gMoveDescription_CalmMind:: .string "The user focuses\nits mind to raise\nthe SP. ATK and\nSP. DEF stats.$" -gMoveDescription_LeafBlade:: @ 8488507 +gMoveDescription_LeafBlade:: .string "The foe is slashed\nwith a sharp leaf.\nIt has a high\ncritical-hit ratio.$" -gMoveDescription_DragonDance:: @ 848854F +gMoveDescription_DragonDance:: .string "A mystic, powerful\ndance that boosts\nthe user's ATTACK\nand SPEED stats.$" -gMoveDescription_RockBlast:: @ 8488597 +gMoveDescription_RockBlast:: .string "The user hurls two\nto five hard rocks\nat the foe to\nattack.$" -gMoveDescription_ShockWave:: @ 84885D3 +gMoveDescription_ShockWave:: .string "A rapid jolt of\nelectricity strikes\nthe foe. It can't\nbe evaded.$" -gMoveDescription_WaterPulse:: @ 8488614 +gMoveDescription_WaterPulse:: .string "An attack with a\npulsing blast of\nwater. It may also\nconfuse the foe.$" -gMoveDescription_DoomDesire:: @ 848865A +gMoveDescription_DoomDesire:: .string "A move that attacks\nthe foe with a\nblast of light two\nturns after use.$" -gMoveDescription_PsychoBoost:: @ 84886A1 +gMoveDescription_PsychoBoost:: .string "An intense attack\nthat also sharply\nreduces the user's\nSP. ATK stat.$" diff --git a/data/text/new_game_intro.inc b/data/text/new_game_intro.inc index 8a3696c8b..504d0675f 100644 --- a/data/text/new_game_intro.inc +++ b/data/text/new_game_intro.inc @@ -1,160 +1,160 @@ -gOtherText_NewName:: @ 81C574F +gOtherText_NewName:: .string "NEW NAME$" -gNameChoice_Green:: @ 81C5758 +gNameChoice_Green:: .string "GREEN$" -gNameChoice_Red:: @ 81C575E +gNameChoice_Red:: .string "RED$" -gNameChoice_Leaf:: @ 81C5762 +gNameChoice_Leaf:: .string "LEAF$" -gNameChoice_Fire:: @ 81C5767 +gNameChoice_Fire:: .string "FIRE$" -gNameChoice_Gary:: @ 81C576C +gNameChoice_Gary:: .string "GARY$" -gNameChoice_Kaz:: @ 81C5771 +gNameChoice_Kaz:: .string "KAZ$" -gNameChoice_Toru:: @ 81C5775 +gNameChoice_Toru:: .string "TORU$" -gNameChoice_Ash:: @ 81C577A +gNameChoice_Ash:: .string "ASH$" -gNameChoice_Kene:: @ 81C577E +gNameChoice_Kene:: .string "KENE$" -gNameChoice_Geki:: @ 81C5783 +gNameChoice_Geki:: .string "GEKI$" -gNameChoice_Jak:: @ 81C5788 +gNameChoice_Jak:: .string "JAK$" -gNameChoice_Janne:: @ 81C578C +gNameChoice_Janne:: .string "JANNE$" -gNameChoice_Jonn:: @ 81C5792 +gNameChoice_Jonn:: .string "JONN$" -gNameChoice_Kamon:: @ 81C5797 +gNameChoice_Kamon:: .string "KAMON$" -gNameChoice_Karl:: @ 81C579D +gNameChoice_Karl:: .string "KARL$" -gNameChoice_Taylor:: @ 81C57A2 +gNameChoice_Taylor:: .string "TAYLOR$" -gNameChoice_Oscar:: @ 81C57A9 +gNameChoice_Oscar:: .string "OSCAR$" -gNameChoice_Hiro:: @ 81C57AF +gNameChoice_Hiro:: .string "HIRO$" -gNameChoice_Max:: @ 81C57B4 +gNameChoice_Max:: .string "MAX$" -gNameChoice_Jon:: @ 81C57B8 +gNameChoice_Jon:: .string "JON$" -gNameChoice_Ralph:: @ 81C57BC +gNameChoice_Ralph:: .string "RALPH$" -gNameChoice_Kay:: @ 81C57C2 +gNameChoice_Kay:: .string "KAY$" -gNameChoice_Tosh:: @ 81C57C6 +gNameChoice_Tosh:: .string "TOSH$" -gNameChoice_Roak:: @ 81C57CB +gNameChoice_Roak:: .string "ROAK$" -gNameChoice_Omi:: @ 81C57D0 +gNameChoice_Omi:: .string "OMI$" -gNameChoice_Jodi:: @ 81C57D4 +gNameChoice_Jodi:: .string "JODI$" -gNameChoice_Amanda:: @ 81C57D9 +gNameChoice_Amanda:: .string "AMANDA$" -gNameChoice_Hillary:: @ 81C57E0 +gNameChoice_Hillary:: .string "HILLARY$" -gNameChoice_Makey:: @ 81C57E8 +gNameChoice_Makey:: .string "MAKEY$" -gNameChoice_Michi:: @ 81C57EE +gNameChoice_Michi:: .string "MICHI$" -gNameChoice_Paula:: @ 81C57F4 +gNameChoice_Paula:: .string "PAULA$" -gNameChoice_June:: @ 81C57FA +gNameChoice_June:: .string "JUNE$" -gNameChoice_Cassie:: @ 81C57FF +gNameChoice_Cassie:: .string "CASSIE$" -gNameChoice_Rey:: @ 81C5806 +gNameChoice_Rey:: .string "REY$" -gNameChoice_Seda:: @ 81C580A +gNameChoice_Seda:: .string "SEDA$" -gNameChoice_Kiko:: @ 81C580F +gNameChoice_Kiko:: .string "KIKO$" -gNameChoice_Mina:: @ 81C5814 +gNameChoice_Mina:: .string "MINA$" -gNameChoice_Norie:: @ 81C5819 +gNameChoice_Norie:: .string "NORIE$" -gNameChoice_Sai:: @ 81C581F +gNameChoice_Sai:: .string "SAI$" -gNameChoice_Momo:: @ 81C5823 +gNameChoice_Momo:: .string "MOMO$" -gNameChoice_Suzi:: @ 81C5828 +gNameChoice_Suzi:: .string "SUZI$" -gNewGame_HelpDocs1:: @ 81C582D +gNewGame_HelpDocs1:: .string "The various buttons will be explained in\n" .string "the order of their importance.$" -gNewGame_HelpDocs2:: @ 81C5875 +gNewGame_HelpDocs2:: .string "Moves the main character.\n" .string "Also used to choose various data\n" .string "headings.$" -gNewGame_HelpDocs3:: @ 81C58BA +gNewGame_HelpDocs3:: .string "Used to confirm a choice, check\n" .string "things, chat, and scroll text.$" -gNewGame_HelpDocs4:: @ 81C58F9 +gNewGame_HelpDocs4:: .string "Used to exit, cancel a choice,\n" .string "and cancel a mode.$" -gNewGame_HelpDocs5:: @ 81C592B +gNewGame_HelpDocs5:: .string "Press this button to open the\n" .string "MENU.$" -gNewGame_HelpDocs6:: @ 81C594F +gNewGame_HelpDocs6:: .string "Used to shift items and to use\n" .string "a registered item.$" -gNewGame_HelpDocs7:: @ 81C5981 +gNewGame_HelpDocs7:: .string "If you need help playing the\n" .string "game, or on how to do things,\n" .string "press the L or R Button.$" -gOakText_AskPlayerGender:: @ 81C59D5 +gOakText_AskPlayerGender:: .string "Now tell me. Are you a boy?\n" .string "Or are you a girl?$" @@ -186,49 +186,49 @@ gNewGameAdventureIntro3:: .string "Press the A Button, and let your\n" .string "adventure begin!$" -gOakText_WelcomeToTheWorld:: @ 81C5C78 +gOakText_WelcomeToTheWorld:: .string "Hello, there!\n" .string "Glad to meet you!\pWelcome to the world of POKéMON!\pMy name is OAK.\pPeople affectionately refer to me\n" .string "as the POKéMON PROFESSOR.\p$" -gOakText_WorldInhabited1:: @ 81C5D06 +gOakText_WorldInhabited1:: .string "This world…$" -gOakText_WorldInhabited2:: @ 81C5D12 +gOakText_WorldInhabited2:: .string "…is inhabited far and wide by\n" .string "creatures called POKéMON.\p$" -gOakText_PetsBattlingStudy:: @ 81C5D4B +gOakText_PetsBattlingStudy:: .string "For some people, POKéMON are pets.\n" .string "Others use them for battling.\pAs for myself…\pI study POKéMON as a profession.\p$" -gOakText_TellMeALittleAboutYourself:: @ 81C5DBD +gOakText_TellMeALittleAboutYourself:: .string "But first, tell me a little about\n" .string "yourself.\p$" -gOakText_AskPlayerName:: @ 81C5DEA +gOakText_AskPlayerName:: .string "Let's begin with your name.\n" .string "What is it?\p$" -gOakText_FinalizePlayerName:: @ 81C5E13 +gOakText_FinalizePlayerName:: .string "Right…\n" .string "So your name is {PLAYER}.$" -gOakText_IntroduceRival:: @ 81C5E2E +gOakText_IntroduceRival:: .string "This is my grandson.\pHe's been your rival since you both\n" .string "were babies.\p…Erm, what was his name now?$" -gOakText_AskRivalName:: @ 81C5E91 +gOakText_AskRivalName:: .string "Your rival's name, what was it now?$" -gOakText_ConfirmRivalName:: @ 81C5EB5 +gOakText_ConfirmRivalName:: .string "…Er, was it {RIVAL}?$" -gOakText_RememberRivalName:: @ 81C5EC5 +gOakText_RememberRivalName:: .string "That's right! I remember now!\n" .string "His name is {RIVAL}!\p$" -gOakText_LegendAboutToUnfold:: @ 81C5EF4 +gOakText_LegendAboutToUnfold:: .string "{PLAYER}!\pYour very own POKéMON legend is\n" .string "about to unfold!\pA world of dreams and adventures\n" .string "with POKéMON awaits! Let's go!$" diff --git a/data/text/obtain_item.inc b/data/text/obtain_item.inc index b1860f58e..8d2708166 100644 --- a/data/text/obtain_item.inc +++ b/data/text/obtain_item.inc @@ -1,47 +1,47 @@ -Text_ObtainedTheX:: @ 81A51F6 +Text_ObtainedTheX:: .string "Obtained the {STR_VAR_2}!$" -Text_BagIsFull:: @ 81A5207 +Text_BagIsFull:: .string "The BAG is full…$" -Text_PutItemAway:: @ 81A5218 +Text_PutItemAway:: .string "{PLAYER} put the {STR_VAR_2}\n" .string "in the {STR_VAR_3}.$" -Text_FoundOneItem:: @ 81A5231 +Text_FoundOneItem:: .string "{PLAYER} found one {STR_VAR_2}!$" -Text_TooBadBagFull:: @ 81A5242 +Text_TooBadBagFull:: .string "Too bad!\n" .string "The BAG is full…$" -Text_FoundXCoins:: @ 81A525C +Text_FoundXCoins:: .string "{PLAYER} found\n" .string "{STR_VAR_1} {STR_VAR_2}!$" -Text_PutCoinsAwayInCoinCase:: @ 81A526C +Text_PutCoinsAwayInCoinCase:: .string "{PLAYER} put the COINS away in\n" .string "the COIN CASE.$" -Text_CoinCaseIsFull:: @ 81A5294 +Text_CoinCaseIsFull:: .string "Too bad!\n" .string "The COIN CASE is full…$" -Text_NothingToPutThemIn:: @ 81A52B4 +Text_NothingToPutThemIn:: .string "Too bad!\n" .string "There's nothing to put them in…$" -Text_FoundXItems:: @ 81A52DD +Text_FoundXItems:: .string "{PLAYER} found\n" .string "{STR_VAR_1} {STR_VAR_2}(s)!$" -Text_ObtainedTheDecor:: @ 81A52F0 +Text_ObtainedTheDecor:: .string "Obtained the {STR_VAR_2}!$" -Text_NoRoomForAnotherDecor:: @ 81A5301 +Text_NoRoomForAnotherDecor:: .string "Too bad! There's no room left for\n" .string "another {STR_VAR_2}…$" -Text_DecorTransferredToPC:: @ 81A532F +Text_DecorTransferredToPC:: .string "The {STR_VAR_2} was transferred\n" .string "to the PC.$" diff --git a/data/text/pc.inc b/data/text/pc.inc index c39a0c61f..2bf09b343 100644 --- a/data/text/pc.inc +++ b/data/text/pc.inc @@ -1,17 +1,17 @@ -Text_BootedUpPC:: @ 81A5075 +Text_BootedUpPC:: .string "{PLAYER} booted up the PC.$" -Text_AccessWhichPC:: @ 81A508A +Text_AccessWhichPC:: .string "Which PC should be accessed?$" -Text_AccessedSomeonesPC:: @ 81A50A7 +Text_AccessedSomeonesPC:: .string "Accessed Someone's PC.$" -Text_OpenedPkmnStorage:: @ 81A50BE +Text_OpenedPkmnStorage:: .string "POKéMON Storage System opened.$" -Text_AccessedPlayersPC:: @ 81A50DD +Text_AccessedPlayersPC:: .string "Accessed {PLAYER}'s PC.$" -Text_AccessedBillsPC:: @ 81A50EF +Text_AccessedBillsPC:: .string "Accessed BILL's PC.$" diff --git a/data/text/pc_transfer.inc b/data/text/pc_transfer.inc index 3e9b99ac8..8cba666dc 100644 --- a/data/text/pc_transfer.inc +++ b/data/text/pc_transfer.inc @@ -1,39 +1,39 @@ -Text_MonSentToBoxInSomeonesPC:: @ 81A5CF1 +Text_MonSentToBoxInSomeonesPC:: .string "{STR_VAR_2} was transferred to\n" .string "Someone's PC.\p" .string "It was placed in \n" .string "BOX “{STR_VAR_1}.”$" -Text_MonSentToBoxInBillsPC:: @ 81A5D31 +Text_MonSentToBoxInBillsPC:: .string "{STR_VAR_2} was transferred to\n" .string "BILL'S PC.\p" .string "It was placed in \n" .string "BOX “{STR_VAR_1}.”$" -Text_MonSentToBoxSomeonesBoxFull:: @ 81A5D6E +Text_MonSentToBoxSomeonesBoxFull:: .string "BOX “{STR_VAR_3}” on\n" .string "Someone's PC was full.\p" .string "{STR_VAR_2} was transferred to\n" .string "BOX “{STR_VAR_1}.”$" -Text_MonSentToBoxBillsBoxFull:: @ 81A5DB1 +Text_MonSentToBoxBillsBoxFull:: .string "BOX “{STR_VAR_3}” on\n" .string "BILL'S PC was full.\p" .string "{STR_VAR_2} was transferred to\n" .string "BOX “{STR_VAR_1}.”$" -Text_PlayerObtainedTheMon:: @ 81A5DF1 +Text_PlayerObtainedTheMon:: .string "{PLAYER} obtained\n" .string "the {STR_VAR_1}!$" @ Unused. Translated below @ You cannot carry any more Pokemon, so {STR_VAR_2} was sent to PC Box {STR_VAR_1}! -Text_MonSentToBoxInPC:: @ 81A5E05 +Text_MonSentToBoxInPC:: .string "ポケモンを　もちきれないので\n" .string "パソコンの　ボックス“{STR_VAR_1}”　に\l" .string "{STR_VAR_2}を　てんそうした！$" -Text_NoMoreRoomForPokemon:: @ 81A5E31 +Text_NoMoreRoomForPokemon:: .string "There's no more room for POKéMON!\p" .string "The POKéMON BOXES are full and\n" .string "can't accept any more!$" diff --git a/data/text/poke_mart.inc b/data/text/poke_mart.inc index 1b389642b..1e1d4ac35 100644 --- a/data/text/poke_mart.inc +++ b/data/text/poke_mart.inc @@ -1,18 +1,18 @@ -Text_MayIHelpYou:: @ 81A6211 +Text_MayIHelpYou:: .string "Hi, there!\n" .string "May I help you?$" -Text_FillOutQuestionnaire:: @ 81A622C +Text_FillOutQuestionnaire:: .string "There is a questionnaire.\n" .string "Would you like to fill it out?$" -Text_QuestionnaireThankYou:: @ 81A6265 +Text_QuestionnaireThankYou:: .string "Thank you for taking the time to\n" .string "fill out our questionnaire.\p" .string "Your feedback will be used for\n" .string "future reference.$" -Text_YouKnowThoseWords:: @ 81A62D3 +Text_YouKnowThoseWords:: .string "Oh, hello!\n" .string "You know those words?\p" .string "That means you must know about\n" @@ -20,10 +20,10 @@ Text_YouKnowThoseWords:: @ 81A62D3 .string "From now on, you should be\n" .string "receiving MYSTERY GIFTS!$" -Text_YouCanAccessMysteryGift:: @ 81A6359 +Text_YouCanAccessMysteryGift:: .string "Once you save your game, you can\n" .string "access the MYSTERY GIFT.$" -Text_ThankYouForAccessingMysteryGift:: @ 81A6393 +Text_ThankYouForAccessingMysteryGift:: .string "Thank you for accessing the\n" .string "MYSTERY GIFT System.$" diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc index a31f9f171..23d9496b9 100644 --- a/data/text/pokedex_rating.inc +++ b/data/text/pokedex_rating.inc @@ -1,119 +1,119 @@ -PokedexRating_Text_HowIsPokedexComingAlong:: @ 81A6C51 +PokedexRating_Text_HowIsPokedexComingAlong:: .string "OAK: Good to see you!\n" .string "How is your POKéDEX coming along?\p" .string "Here, let me take a look.$" -PokedexRating_Text_SeenXOwnedY:: @ 81A6CA3 +PokedexRating_Text_SeenXOwnedY:: .string "The amount of progress you've made\n" .string "on your POKéDEX is:\p" .string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_2} POKéMON owned.\p" .string "{SIZE}ÁPROF. OAK's rating:$" -PokedexRating_Text_LessThan10:: @ 81A6D17 +PokedexRating_Text_LessThan10:: .string "You still have lots to do.\p" .string "Go into every patch of grass you\n" .string "see and look for POKéMON!$" -PokedexRating_Text_LessThan20:: @ 81A6D6D +PokedexRating_Text_LessThan20:: .string "It looks as if you're getting on\n" .string "the right track!\p" .string "I've given one of my AIDES a FLASH\n" .string "HM. Make sure you go get it!$" -PokedexRating_Text_LessThan30:: @ 81A6DDF +PokedexRating_Text_LessThan30:: .string "Your POKéDEX could use a bit more\n" .string "volume still!\p" .string "Try to catch other species of\n" .string "POKéMON!$" -PokedexRating_Text_LessThan40:: @ 81A6E36 +PokedexRating_Text_LessThan40:: .string "Good, it's apparent that you're\n" .string "trying hard!\p" .string "I've given one of my AIDES an\n" .string "ITEMFINDER. Be sure to collect it!$" -PokedexRating_Text_LessThan50:: @ 81A6EA4 +PokedexRating_Text_LessThan50:: .string "Your POKéDEX is coming along quite\n" .string "well!\p" .string "I've given one of my AIDES an\n" .string "AMULET COIN. Be sure to get it!$" -PokedexRating_Text_LessThan60:: @ 81A6F0B +PokedexRating_Text_LessThan60:: .string "Ah, you've finally topped 50\n" .string "species!\p" .string "I've given one of my AIDES an EXP.\n" .string "SHARE. Be sure to go get it!$" -PokedexRating_Text_LessThan70:: @ 81A6F71 +PokedexRating_Text_LessThan70:: .string "Hoho! This is turning into quite the\n" .string "respectable POKéDEX!$" -PokedexRating_Text_LessThan80:: @ 81A6FAB +PokedexRating_Text_LessThan80:: .string "Very good!\p" .string "I think you'll collect even more\n" .string "POKéMON by going fishing!$" -PokedexRating_Text_LessThan90:: @ 81A6FF1 +PokedexRating_Text_LessThan90:: .string "Wonderful! Let me guess… You\n" .string "like to collect things, don't you?$" -PokedexRating_Text_LessThan100:: @ 81A7031 +PokedexRating_Text_LessThan100:: .string "I'm impressed!\n" .string "It must have been difficult to do!$" -PokedexRating_Text_LessThan110:: @ 81A7063 +PokedexRating_Text_LessThan110:: .string "You've finally hit 100 species!\n" .string "I can't believe how good you are!$" -PokedexRating_Text_LessThan120:: @ 81A70A5 +PokedexRating_Text_LessThan120:: .string "You even have the evolved forms\n" .string "of POKéMON! Super!$" -PokedexRating_Text_LessThan130:: @ 81A70D8 +PokedexRating_Text_LessThan130:: .string "Excellent! Trade with friends to\n" .string "get some more!$" -PokedexRating_Text_LessThan140:: @ 81A7108 +PokedexRating_Text_LessThan140:: .string "Outstanding!\n" .string "You've become a real pro at this!$" -PokedexRating_Text_LessThan150:: @ 81A7137 +PokedexRating_Text_LessThan150:: .string "I have nothing left to say!\n" .string "You're the POKéMON PROFESSOR now!$" -PokedexRating_Text_Complete:: @ 81A7175 +PokedexRating_Text_Complete:: .string "Your POKéDEX is entirely complete!\n" .string "Congratulations!!$" -PokedexRating_Text_NationalDexSeenXOwnedY:: @ 81A71AA +PokedexRating_Text_NationalDexSeenXOwnedY:: .string "And your NATIONAL POKéDEX is:\p" .string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_2} POKéMON owned.$" -PokedexRating_Text_LookForwardToFilledNationalDex:: @ 81A71EE +PokedexRating_Text_LookForwardToFilledNationalDex:: .string "I'll be looking forward to seeing\n" .string "you fill the NATIONAL POKéDEX!$" -PokedexRating_Text_YouveCompletedDex:: @ 81A722F +PokedexRating_Text_YouveCompletedDex:: .string "Finally…\p" .string "You've finally completed the\n" .string "POKéDEX!\p" .string "It's magnificent!\n" .string "Truly, this is a fantastic feat!$" -PokedexRating_Text_Wroooaaarrr:: @ 81A7291 +PokedexRating_Text_Wroooaaarrr:: .string "Wroooooooaaaaaarrrr!$" -PokedexRating_Text_HaHa:: @ 81A72A6 +PokedexRating_Text_HaHa:: .string "はあ はあ‥$" -PokedexRating_Text_ThankYouMadeDreamReality:: @ 81A72AD +PokedexRating_Text_ThankYouMadeDreamReality:: .string "Thank you, {PLAYER}!\n" .string "Sincerely, thank you!\l" .string "You've made my dream a reality!$" -PokedexRating_Text_LoveSeeingYourPokedex:: @ 81A72F2 +PokedexRating_Text_LoveSeeingYourPokedex:: .string "OAK: Ah, welcome!\p" .string "Tell me, how is your POKéDEX\n" .string "coming along?\p" diff --git a/data/text/route23.inc b/data/text/route23.inc index d46313e46..7c7586cf8 100644 --- a/data/text/route23.inc +++ b/data/text/route23.inc @@ -1,18 +1,18 @@ -Text_OnlySkilledTrainersAllowedThrough:: @ 81A572A +Text_OnlySkilledTrainersAllowedThrough:: .string "Only truly skilled TRAINERS are\n" .string "allowed through.\p" .string "You don't have the {STR_VAR_1}\n" .string "yet!$" -Text_CantLetYouPass:: @ 81A5776 +Text_CantLetYouPass:: .string "Rules are rules.\n" .string "I can't let you pass.$" -Text_OhThatsBadgeGoRightAhead:: @ 81A579D +Text_OhThatsBadgeGoRightAhead:: .string "Oh! That is the {STR_VAR_1}!\n" .string "Go right ahead.$" -Text_OnlyPassWithBadgeDontHaveYet:: @ 81A57C1 +Text_OnlyPassWithBadgeDontHaveYet:: .string "You can pass here only if you have\n" .string "the {STR_VAR_1}.\p" .string "You don't have the {STR_VAR_1}\n" @@ -20,7 +20,7 @@ Text_OnlyPassWithBadgeDontHaveYet:: @ 81A57C1 .string "You have to have it to get to\n" .string "the POKéMON LEAGUE.$" -Text_OnlyPassWithBadgeOhGoAhead:: @ 81A5839 +Text_OnlyPassWithBadgeOhGoAhead:: .string "You can pass here only if you have\n" .string "the {STR_VAR_1}.\p" .string "Oh! That is the {STR_VAR_1}!{PAUSE_MUSIC}{PLAY_BGM}{MUS_LEVEL_UP}{PAUSE 0x60}{RESUME_MUSIC}\p" diff --git a/data/text/safari_zone.inc b/data/text/safari_zone.inc index 5d46de688..2d7853b62 100644 --- a/data/text/safari_zone.inc +++ b/data/text/safari_zone.inc @@ -1,20 +1,20 @@ @ The text here is a copy/paste from Hoenn's Safari Zone, and any unused text was left untranslated -SafariZone_Text_WouldYouLikeToExit:: @ 81BFBE9 +SafariZone_Text_WouldYouLikeToExit:: .string "Would you like to exit the SAFARI\n" .string "ZONE right now?$" -SafariZone_Text_TimesUp:: @ 81BFC1B +SafariZone_Text_TimesUp:: .string "PA: Ding-dong!\p" .string "Time's up!\p" .string "PA: Your SAFARI GAME is over!$" -SafariZone_Text_OutOfBalls:: @ 81BFC53 +SafariZone_Text_OutOfBalls:: .string "PA: Ding-dong!\p" .string "You are out of SAFARI BALLS!\p" .string "PA: Your SAFARI GAME is over!$" -SafariZone_Text_WelcomeToSafariZone:: @ 81BFC9D +SafariZone_Text_WelcomeToSafariZone:: .string "サファリゾーンへ　ようこそ！\p" .string "ここでは　ホウエンでは　なかなか\n" .string "みることの　できない　ポケモンを\p" @@ -26,14 +26,14 @@ SafariZone_Text_WelcomeToSafariZone:: @ 81BFC9D .string "つかまえる　ことも　できます！\p" .string "サファリゾーンを　たのしんで　いってね！$" -SafariZone_Text_WelcomeFirstTime:: @ 81BFD30 +SafariZone_Text_WelcomeFirstTime:: .string "サファリゾーンへ　ようこそ！\n" .string "サファリゾーンは　はじめて　ですか？$" -SafariZone_Text_ComeInAndEnjoy:: @ 81BFD52 +SafariZone_Text_ComeInAndEnjoy:: .string "サファリゾーンを　たのしんで　いってね！$" -SafariZone_Text_FirstTimeInfo:: @ 81BFD67 +SafariZone_Text_FirstTimeInfo:: .string "サファリゾーンでは\n" .string "30この　サファリボールを　つかって\l" .string "ポケモンを　つかまえる　ことが　できます\p" @@ -42,39 +42,39 @@ SafariZone_Text_FirstTimeInfo:: @ 81BFD67 .string "ゲームは　しゅうりょう　です\p" .string "サファリゾーンを　たのしんで　いってね！$" -SafariZone_Text_WouldYouLikeToPlay:: @ 81BFDD7 +SafariZone_Text_WouldYouLikeToPlay:: .string "サファリゾーンへ　ようこそ！\p" .string "500えんで　ポケモン　つかまえほうだい！\n" .string "サファリゲームに　さんか　しますか？$" -SafariZone_Text_PlayAnotherTime:: @ 81BFE0F +SafariZone_Text_PlayAnotherTime:: .string "そうですか\n" .string "こんど　ぜひ　さんか　してください！$" -SafariZone_Text_NotEnoughMoney:: @ 81BFE28 +SafariZone_Text_NotEnoughMoney:: .string "おかねが　たりませんよ！$" -SafariZone_Text_ThatWillBe500Please:: @ 81BFE35 +SafariZone_Text_ThatWillBe500Please:: .string "それでは　500えん　いただきます$" -SafariZone_Text_HereAreYourSafariBalls:: @ 81BFE47 +SafariZone_Text_HereAreYourSafariBalls:: .string "では　サファリボールを　どうぞ！$" -SafariZone_Text_Received30SafariBalls:: @ 81BFE58 +SafariZone_Text_Received30SafariBalls:: .string "{PLAYER}は　サファリボールを\n" .string "30こ　うけとった！$" -SafariZone_Text_PleaseEnjoyYourself:: @ 81BFE70 +SafariZone_Text_PleaseEnjoyYourself:: .string "じかんに　なりましたら\n" .string "こちらから　おしらせ　しますので\p" .string "ぞんぶんに　おたのしみ　ください！\n" .string "では　いってらっしゃい！$" -SafariZone_Text_ExcuseMeYourPCBoxIsFull:: @ 81BFEAC +SafariZone_Text_ExcuseMeYourPCBoxIsFull:: .string "Excuse me!\n" .string "Your PC BOX is full.$" -SafariZone_Text_YouNeedPokeblockCase:: @ 81BFECC +SafariZone_Text_YouNeedPokeblockCase:: .string "あ！　おきゃくさん\n" .string "ポロックケースを　おもちで　ないですね？\p" .string "サファリゾーンは　ポロックを　つかうと\n" @@ -82,86 +82,86 @@ SafariZone_Text_YouNeedPokeblockCase:: @ 81BFECC .string "ぜひ　ポロックケースを\n" .string "おもちに　なって　おこし　ください！$" -SafariZone_South_Text_StillHaveTimeExit:: @ 81BFF30 +SafariZone_South_Text_StillHaveTimeExit:: .string "まだ　じかんが　のこっていますが\n" .string "サファリゾーンを　やめますか？$" -SafariZone_South_Text_EnjoyTheRestOfYourAdventure:: @ 81BFF51 +SafariZone_South_Text_EnjoyTheRestOfYourAdventure:: .string "では　ひきつづき　おたのしみ　ください！$" -SafariZone_South_Text_ExitEarlyThankYouForPlaying:: @ 81BFF66 +SafariZone_South_Text_ExitEarlyThankYouForPlaying:: .string "わかりました\p" .string "それでは　のこりの　サファリボールを\n" .string "おあずかり　します\p" .string "おつかれさまでした\n" .string "また　ごりよう　ください$" -SafariZone_South_Text_GoodLuck:: @ 81BFFA1 +SafariZone_South_Text_GoodLuck:: .string "それでは　いってらっしゃい！\l" .string "なにか　ありましたら\n" .string "わたしに　こえを　かけて　くださいね$" -SafariZone_South_Text_Boy:: @ 81BFFCE +SafariZone_South_Text_Boy:: .string "しってた？\p" .string "あの　しかくい　はこに　ポロックを　おくと\n" .string "ポケモンが　あつまって　くるんだよ！$" -SafariZone_South_Text_Man:: @ 81BFFFD +SafariZone_South_Text_Man:: .string "この　さきに　いきたい　けど\n" .string "じてんしゃ　もって　くるの　わすれた‥‥\p" .string "おくに　めずらしい　ポケモンが\n" .string "いそうな　きが　するのに！$" -SafariZone_Southwest_Text_Woman:: @ 81C003F +SafariZone_Southwest_Text_Woman:: .string "ポケモンに　ポロックを　なげても\n" .string "しらんぷり　される　ときが　あるのよ\p" .string "ポケモンにも　すききらいが　あるのかしら？$" -SafariZone_Northwest_Text_Man:: @ 81C0079 +SafariZone_Northwest_Text_Man:: .string "ぜぇ‥‥　ぜぇ‥‥\n" .string "やっと　ここまで　きたけど‥‥\p" .string "つかれちゃって　ポケモン　つかまえる\n" .string "げんきも　のこって　ないよ‥‥$" -SafariZone_North_Text_Fisherman:: @ 81C00B6 +SafariZone_North_Text_Fisherman:: .string "ホウエンに　いない　みずポケモンを\n" .string "さがしに　きたんだけど‥‥\p" .string "みずうみは　どこにあるのか\n" .string "きみ　しってるかい？$" -SafariZone_North_Text_Man:: @ 81C00EF +SafariZone_North_Text_Man:: .string "ここで　めずらしい　ポケモンを\n" .string "たくさん　つかまえて\l" .string "ともだちと　こうかん　するんだ！$" -SafariZone_South_Text_Youngster:: @ 81C011B +SafariZone_South_Text_Youngster:: .string "ポロックおきばに　おいた　ポロックが\n" .string "いつのまにか　なくなっていた‥‥\p" .string "しらない　うちに\n" .string "ポケモンが　たべちゃったのかな？$" -Route121_SafariZoneEntrance_Text_TrainerTip:: @ 81C0159 +Route121_SafariZoneEntrance_Text_TrainerTip:: .string "サファリゾーンの　おとくな　じょうほう！\p" .string "であった　ポケモンに\n" .string "ポロックを　なげると　にげにくく　なります！$" -SafariZone_Southwest_Text_RestHouseSign:: @ 81C0190 +SafariZone_Southwest_Text_RestHouseSign:: .string "あるき　つかれたら　ちょっと　ひといき！\n" .string "‘みんなの　きゅうけいじょ'$" -SafariZone_RestHouse_Text_Youngster:: @ 81C01B4 +SafariZone_RestHouse_Text_Youngster:: .string "おれ　ポロック　もってないけど\n" .string "ポケモン　たくさん　つかまえたよ\p" .string "ちかづいて　ボールを　なげる　だけで\n" .string "けっこう　つかまえられる　もんだよ！$" -SafariZone_RestHouse_Text_PsychicM:: @ 81C01FB +SafariZone_RestHouse_Text_PsychicM:: .string "ポロックを　つかうと　いつもより\n" .string "ちょっぴり　にげにくく　なるみたい\p" .string "だから　にげにくい　ポケモンに　つかっても\n" .string "あんまり　いみが　ないかもね$" -SafariZone_RestHouse_Text_FatMan:: @ 81C0243 +SafariZone_RestHouse_Text_FatMan:: .string "ポロックおきばに　ポロック　おいて\n" .string "ポケモンを　つかまえると\p" .string "おなじ　ような　せいかくの　ポケモンが\n" diff --git a/data/text/save.inc b/data/text/save.inc index 23050f9f4..d71e03f1e 100644 --- a/data/text/save.inc +++ b/data/text/save.inc @@ -1,21 +1,21 @@ -gText_WouldYouLikeToSaveTheGame:: @ 81C55C9 +gText_WouldYouLikeToSaveTheGame:: .string "Would you like to save the game?$" -gText_AlreadySaveFile_WouldLikeToOverwrite:: @ 81C55EA +gText_AlreadySaveFile_WouldLikeToOverwrite:: .string "There is already a saved file.\n" .string "Is it okay to overwrite it?$" -gText_SavingDontTurnOffThePower:: @ 81C5625 +gText_SavingDontTurnOffThePower:: .string "SAVING…\n" .string "DON'T TURN OFF THE POWER.$" -gText_PlayerSavedTheGame:: @ 81C5647 +gText_PlayerSavedTheGame:: .string "{PLAYER} saved the game.$" gText_SaveFailed:: .string "セーブに　しっぱい　しました‥$" -gText_DifferentGameFile:: @ 81C566A +gText_DifferentGameFile:: .string "WARNING!\p" .string "There is a different game file that\n" .string "is already saved.\p" diff --git a/data/text/seagallop.inc b/data/text/seagallop.inc index 3d4d0d958..a4cc2f604 100644 --- a/data/text/seagallop.inc +++ b/data/text/seagallop.inc @@ -1,7 +1,7 @@ -Text_WhereDoYouWantToGo:: @ 81A6407 +Text_WhereDoYouWantToGo:: .string "おつかれさん！\n" .string "どこに　いきたいんだ？$" -Text_AllAboardSeagallopNum:: @ 81A641B +Text_AllAboardSeagallopNum:: .string "All right!\n" .string "All aboard SEAGALLOP HI-SPEED {STR_VAR_1}!$" diff --git a/data/text/sign_lady.inc b/data/text/sign_lady.inc index 1c6d1c8f1..deb6b97c8 100644 --- a/data/text/sign_lady.inc +++ b/data/text/sign_lady.inc @@ -1,30 +1,30 @@ @ For the NPC in Pallet Town that talks about the Trainer Tips sign -PalletTown_Text_HmmIsThatRight:: @ 81B1C8B +PalletTown_Text_HmmIsThatRight:: .string "Hmm…\n" .string "Is that right…$" -PalletTown_Text_OhLookLook:: @ 81B1C9F +PalletTown_Text_OhLookLook:: .string "Oh!\n" .string "Look, look!$" -PalletTown_Text_ReadItReadIt:: @ 81B1CAF +PalletTown_Text_ReadItReadIt:: .string "Read it, read it!$" @ Used by sign -PalletTown_Text_PressStartToOpenMenu:: @ 81B1CC1 +PalletTown_Text_PressStartToOpenMenu:: .string "TRAINER TIPS\p" .string "Press START to open the MENU!$" -PalletTown_Text_SignsAreUsefulArentThey:: @ 81B1CEC +PalletTown_Text_SignsAreUsefulArentThey:: .string "Signs are useful, aren't they?$" -PalletTown_Text_LookCopiedTrainerTipsSign:: @ 81B1D0B +PalletTown_Text_LookCopiedTrainerTipsSign:: .string "Look, look!\p" .string "I copied what it said on one of\n" .string "those TRAINER TIPS signs!$" @ Used by NPC -PalletTown_Text_PressStartToOpenMenuCopy:: @ 81B1D51 +PalletTown_Text_PressStartToOpenMenuCopy:: .string "TRAINER TIPS!\p" .string "Press START to open the MENU!$" diff --git a/data/text/surf.inc b/data/text/surf.inc index ce9d9ee50..446260427 100644 --- a/data/text/surf.inc +++ b/data/text/surf.inc @@ -1,10 +1,10 @@ -Text_WantToSurf:: @ 81A556E +Text_WantToSurf:: .string "The water is dyed a deep blue…\n" .string "Would you like to SURF?$" -Text_UsedSurf:: @ 81A55A5 +Text_UsedSurf:: .string "{STR_VAR_1} used SURF!$" -Text_CurrentTooFast:: @ 81A55B3 +Text_CurrentTooFast:: .string "The current is much too fast!\n" .string "SURF can't be used here…$" diff --git a/data/text/trainer_card.inc b/data/text/trainer_card.inc index 4a54e5b5b..b61e6100a 100644 --- a/data/text/trainer_card.inc +++ b/data/text/trainer_card.inc @@ -1,31 +1,31 @@ -CeladonCity_GameCorner_Text_TryPokemonPrinter:: @ 81B1D7D +CeladonCity_GameCorner_Text_TryPokemonPrinter:: .string "It's a POKéMON PRINTER!\p" .string "It can put a print of your POKéMON\n" .string "on the back of your TRAINER CARD.\p" .string "It costs only ¥50.\n" .string "Would you like to try it?$" -CeladonCity_GameCorner_Text_DontHaveEnoughMoney:: @ 81B1E07 +CeladonCity_GameCorner_Text_DontHaveEnoughMoney:: .string "You don't have enough money.$" -CeladonCity_GameCorner_Text_ChoosePrintType:: @ 81B1E24 +CeladonCity_GameCorner_Text_ChoosePrintType:: .string "Please choose the print type.$" -CeladonCity_GameCorner_Text_BigSmileForPhoto:: @ 81B1E42 +CeladonCity_GameCorner_Text_BigSmileForPhoto:: .string "A big smile for the photo, please!\n" .string "Three… Two… One…\p" .string "Flash!$" -CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard:: @ 81B1E7D +CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard:: .string "Your POKéMON print is ready!\n" .string "Check your TRAINER CARD.$" -FourIsland_House2_Text_WishICouldShowOffStickers:: @ 81B1EB3 +FourIsland_House2_Text_WishICouldShowOffStickers:: .string "Giggle…\n" .string "I collected a ton of STICKERS.\l" .string "I wish I could show them off…$" -FourIsland_House2_Text_GiveYouStickerIfYouBrag:: @ 81B1EF8 +FourIsland_House2_Text_GiveYouStickerIfYouBrag:: .string "Oh, excellent!\n" .string "You've come to the right place!\p" .string "Look, look! See? See?\n" @@ -38,113 +38,113 @@ FourIsland_House2_Text_GiveYouStickerIfYouBrag:: @ 81B1EF8 .string "yourself.\p" .string "What will you brag about?$" -FourIsland_House2_Text_BragAboutSomethingForMe:: @ 81B1FEF +FourIsland_House2_Text_BragAboutSomethingForMe:: .string "Brag about something for me.\n" .string "I'll give you a STICKER.$" -FourIsland_House2_Text_BragAboutWhatToday:: @ 81B2025 +FourIsland_House2_Text_BragAboutWhatToday:: .string "Oh, hi!\n" .string "Here comes the braggart.\p" .string "What are you going to brag about\n" .string "today?$" -FourIsland_House2_Text_WowHoFLowest:: @ 81B206E +FourIsland_House2_Text_WowHoFLowest:: .string "Oh, wow, you made it into the\n" .string "HALL OF FAME.\p" .string "That's pretty good, yup!\n" .string "I'll give you one of these.$" -FourIsland_House2_Text_WowHoFLow:: @ 81B20CF +FourIsland_House2_Text_WowHoFLow:: .string "Oh, wow, you've entered the\n" .string "HALL OF FAME often!\p" .string "That's impressive, yup!\n" .string "I'll give you one of these.$" -FourIsland_House2_Text_WowHoFHigh:: @ 81B2133 +FourIsland_House2_Text_WowHoFHigh:: .string "Whoa! You've made it into the\n" .string "HALL OF FAME that often?\l" .string "That's seriously incredible, yup!\p" .string "You own the POKéMON LEAGUE!\n" .string "I'll give you one of these.$" -FourIsland_House2_Text_WowHoFHighest:: @ 81B21C4 +FourIsland_House2_Text_WowHoFHighest:: .string "No way! You've gone into the\n" .string "HALL OF FAME that many times?\p" .string "You're beyond incredible, yup!\n" .string "That's it, I have to give you this.$" -FourIsland_House2_Text_HoFStickerApplied:: @ 81B2242 +FourIsland_House2_Text_HoFStickerApplied:: .string "The HALL OF FAME STICKER was\n" .string "applied to the TRAINER CARD.$" -FourIsland_House2_Text_ComeBackWithBetterStoryHoF:: @ 81B227C +FourIsland_House2_Text_ComeBackWithBetterStoryHoF:: .string "Hmm…\p" .string "Come back with a better story next\n" .string "time, okay?$" -FourIsland_House2_Text_LivingLegendHoF:: @ 81B22B0 +FourIsland_House2_Text_LivingLegendHoF:: .string "Oh, no, no can do.\p" .string "You're practically a living legend.\n" .string "I have no SITCKERS left to give.$" -FourIsland_House2_Text_WowEggsLowest:: @ 81B2308 +FourIsland_House2_Text_WowEggsLowest:: .string "Oh, wow, there are POKéMON EGGS?\n" .string "I didn't know that!\p" .string "That's pretty good, yup!\n" .string "I'll give you one of these.$" -FourIsland_House2_Text_WowEggsLow:: @ 81B2372 +FourIsland_House2_Text_WowEggsLow:: .string "You've hatched that many EGGS?\n" .string "You really must like them!\p" .string "That's impressive, yup!\n" .string "I'll give you one of these.$" -FourIsland_House2_Text_WowEggsHigh:: @ 81B23E0 +FourIsland_House2_Text_WowEggsHigh:: .string "Whoa! You've hatched a whole\n" .string "bunch of EGGS!\p" .string "You're an EGG-hatching machine!\n" .string "I'll give you one of these.$" -FourIsland_House2_Text_WowEggsHighest:: @ 81B2448 +FourIsland_House2_Text_WowEggsHighest:: .string "Wh… You hatched that many EGGS?\p" .string "What's behind your love of EGGS?\n" .string "It's beyond incredible, yup!\p" .string "You're too awesome, I tell you.\n" .string "That's it, I have to give you this.$" -FourIsland_House2_Text_EggStickerApplied:: @ 81B24EA +FourIsland_House2_Text_EggStickerApplied:: .string "The EGG STICKER was applied\n" .string "to the TRAINER CARD.$" -FourIsland_House2_Text_ComeBackWithBetterStoryEggs:: @ 81B251B +FourIsland_House2_Text_ComeBackWithBetterStoryEggs:: .string "Hmm…\p" .string "Come back with a better story next\n" .string "time, okay?$" -FourIsland_House2_Text_LivingLegendEggs:: @ 81B254F +FourIsland_House2_Text_LivingLegendEggs:: .string "Oh, no, no can do.\p" .string "You're practically a living legend.\n" .string "I have no SITCKERS left to give.$" -FourIsland_House2_Text_WowLinkWinsLowest:: @ 81B25A7 +FourIsland_House2_Text_WowLinkWinsLowest:: .string "Oh, wow, you've had success\n" .string "link battling?\p" .string "You're pretty strong, yup!\n" .string "I'll give you one of these.$" -FourIsland_House2_Text_WowLinkWinsLow:: @ 81B2609 +FourIsland_House2_Text_WowLinkWinsLow:: .string "You've beaten your friends a lot\n" .string "link battling, huh?\p" .string "You're impressively strong, yup!\n" .string "I'll give you one of these.$" -FourIsland_House2_Text_WowLinkWinsHigh:: @ 81B267B +FourIsland_House2_Text_WowLinkWinsHigh:: .string "Whoa! You've beaten your friends\n" .string "a frightful number of times.\p" .string "Have you lost friends over this?\n" .string "I'll give you one of these.$" -FourIsland_House2_Text_WowLinkWinsHighest:: @ 81B26F6 +FourIsland_House2_Text_WowLinkWinsHighest:: .string "Wh… Wickedly whoa!\n" .string "You've won mind-blowingly often!\p" .string "It just knocks me out thinking\n" @@ -152,16 +152,16 @@ FourIsland_House2_Text_WowLinkWinsHighest:: @ 81B26F6 .string "You're the stuff of nightmares!\n" .string "That's it, I have to give you this.$" -FourIsland_House2_Text_VictoryStickerApplied:: @ 81B27A6 +FourIsland_House2_Text_VictoryStickerApplied:: .string "The VICTORY STICKER was applied\n" .string "to the TRAINER CARD.$" -FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins:: @ 81B27DB +FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins:: .string "Hmm…\p" .string "Come back with a better story next\n" .string "time, okay?$" -FourIsland_House2_Text_LivingLegendLinkWins:: @ 81B280F +FourIsland_House2_Text_LivingLegendLinkWins:: .string "Oh, no, no can do.\p" .string "You're practically a living legend.\n" .string "I have no SITCKERS left to give.$" diff --git a/data/text/trainers.inc b/data/text/trainers.inc index 5be1149ae..08d0762f3 100644 --- a/data/text/trainers.inc +++ b/data/text/trainers.inc @@ -1,706 +1,706 @@ -VSSeeker_Text_BatteryNotChargedNeedXSteps:: @ 81C137C +VSSeeker_Text_BatteryNotChargedNeedXSteps:: .string "The battery isn't charged enough.\p" .string "No. of steps required to fully\n" .string "charge the battery: {STR_VAR_1}{PAUSE_UNTIL_PRESS}$" -VSSeeker_Text_NoTrainersWithinRange:: @ 81C13D6 +VSSeeker_Text_NoTrainersWithinRange:: .string "There are no TRAINERS within range\n" .string "who can battle…\p" .string "The VS SEEKER was turned off.{PAUSE_UNTIL_PRESS}$" -VSSeeker_Text_TrainersNotReady:: @ 81C1429 +VSSeeker_Text_TrainersNotReady:: .string "The other TRAINERS don't appear\n" .string "to be ready for battle.\p" .string "Let's wait till later.{PAUSE_UNTIL_PRESS}$" -Route3_Text_ColtonRematchIntro:: @ 81C147A +Route3_Text_ColtonRematchIntro:: .string "Hey!\n" .string "I saw you in VIRIDIAN FOREST!$" -Route3_Text_BenRematchIntro:: @ 81C149D +Route3_Text_BenRematchIntro:: .string "Hi! I like shorts!\n" .string "They're comfy and easy to wear!\p" .string "You should be wearing shorts, too!$" -Route3_Text_JaniceRematchIntro:: @ 81C14F3 +Route3_Text_JaniceRematchIntro:: .string "Excuse me!\n" .string "You keep looking at me, don't you?$" -Route3_Text_GregRematchIntro:: @ 81C1521 +Route3_Text_GregRematchIntro:: .string "You're a TRAINER, aren't you?\n" .string "Let's get with it right away!$" -Route3_Text_SallyRematchIntro:: @ 81C155D +Route3_Text_SallyRematchIntro:: .string "That look you give me…\n" .string "It intrigues me so!$" -Route3_Text_CalvinRematchIntro:: @ 81C1588 +Route3_Text_CalvinRematchIntro:: .string "Hey! What's wrong with you?\n" .string "You're still not wearing shorts!$" -Route3_Text_JamesRematchIntro:: @ 81C15C5 +Route3_Text_JamesRematchIntro:: .string "I'll battle you with the POKéMON\n" .string "I started raising.$" -Route3_Text_RobinRematchIntro:: @ 81C15F9 +Route3_Text_RobinRematchIntro:: .string "Eek!\n" .string "Did you push me?$" -Route4_Text_CrissyRematchIntro:: @ 81C160F +Route4_Text_CrissyRematchIntro:: .string "I always catch mushroom POKéMON\n" .string "on MT. MOON.$" -Route6_Text_RickyRematchIntro:: @ 81C163C +Route6_Text_RickyRematchIntro:: .string "Oh! You're that nosy kid who\n" .string "eavesdropped on us!$" -Route6_Text_NancyRematchIntro:: @ 81C166D +Route6_Text_NancyRematchIntro:: .string "Excuse me! Didn't I tell you that\n" .string "this is a private conversation?\p" .string "You shouldn't be listening in,\n" .string "you uncouth person!$" -Route6_Text_KeigoRematchIntro:: @ 81C16E2 +Route6_Text_KeigoRematchIntro:: .string "I'm trying to find something good\n" .string "that's not a BUG POKéMON, but…$" -Route6_Text_JeffRematchIntro:: @ 81C1723 +Route6_Text_JeffRematchIntro:: .string "Huh?\n" .string "You want to go with me again?$" -Route6_Text_IsabelleRematchIntro:: @ 81C1746 +Route6_Text_IsabelleRematchIntro:: .string "Me?\n" .string "Well, okay. I'll play this once.$" -Route6_Text_ElijahRematchIntro:: @ 81C176B +Route6_Text_ElijahRematchIntro:: .string "Hey, long time!\n" .string "Have you gotten better?$" -Route8_Text_AidanRematchIntro:: @ 81C1793 +Route8_Text_AidanRematchIntro:: .string "You are good at POKéMON, but how\n" .string "is your chemistry grade?$" -Route8_Text_StanRematchIntro:: @ 81C17CD +Route8_Text_StanRematchIntro:: .string "All right!\n" .string "Let's play another game!$" -Route8_Text_GlennRematchIntro:: @ 81C17F1 +Route8_Text_GlennRematchIntro:: .string "You need strategy to win at\n" .string "battling.\p" .string "Are you following my advice?$" -Route8_Text_PaigeRematchIntro:: @ 81C1834 +Route8_Text_PaigeRematchIntro:: .string "I've collected many NIDORAN.\n" .string "I don't want them to evolve, but…$" -Route8_Text_LeslieRematchIntro:: @ 81C1873 +Route8_Text_LeslieRematchIntro:: .string "School is fun, but I still think\n" .string "POKéMON are fun, too.$" -Route8_Text_AndreaRematchIntro:: @ 81C18AA +Route8_Text_AndreaRematchIntro:: .string "MEOWTH and PERSIAN are so cute,\n" .string "meow, meow, meow!$" -Route8_Text_MeganRematchIntro:: @ 81C18DC +Route8_Text_MeganRematchIntro:: .string "We may look silly standing here\n" .string "like this, but I can still battle.$" -Route8_Text_RichRematchIntro:: @ 81C191F +Route8_Text_RichRematchIntro:: .string "I'm a rambling, gaming dude!\n" .string "I'm on a winning streak!$" -Route8_Text_JuliaRematchIntro:: @ 81C1955 +Route8_Text_JuliaRematchIntro:: .string "What's a cute, round, and fluffy\n" .string "POKéMON?\p" .string "You already know, don't you?$" -Route8_Text_RicardoRematchIntro:: @ 81C199C +Route8_Text_RicardoRematchIntro:: .string "My bike's still acting up, man.$" -Route8_Text_JarenRematchIntro:: @ 81C19BC +Route8_Text_JarenRematchIntro:: .string "Okay, kid!\n" .string "Don't expect mercy this time!$" -Route8_Text_EliRematchIntro:: @ 81C19E5 +Route8_Text_EliRematchIntro:: .string "ELI: Our twin power became even\n" .string "better!$" -Route8_Text_AnneRematchIntro:: @ 81C1A0D +Route8_Text_AnneRematchIntro:: .string "ANNE: Our twin power powered up!$" -Route9_Text_AliciaRematchIntro:: @ 81C1A2E +Route9_Text_AliciaRematchIntro:: .string "We're to battle again?\n" .string "This time, you're mine!$" -Route9_Text_ChrisRematchIntro:: @ 81C1A5D +Route9_Text_ChrisRematchIntro:: .string "I haven't forgotten you were with\n" .string "those good-looking POKéMON.$" -Route9_Text_DrewRematchIntro:: @ 81C1A9B +Route9_Text_DrewRematchIntro:: .string "I'm taking ROCK TUNNEL to go to\n" .string "LAVENDER…\p" .string "But I keep getting stopped by\n" .string "everyone along the way…$" -Route9_Text_CaitlinRematchIntro:: @ 81C1AFB +Route9_Text_CaitlinRematchIntro:: .string "Don't you dare patronize me today!\n" .string "We're playing for keeps!$" -Route9_Text_JeremyRematchIntro:: @ 81C1B37 +Route9_Text_JeremyRematchIntro:: .string "Bwahaha!\n" .string "Great! I was bored again, eh!$" -Route9_Text_BriceRematchIntro:: @ 81C1B5E +Route9_Text_BriceRematchIntro:: .string "Hahaha!\n" .string "A little toughie, as always!$" -Route9_Text_BrentRematchIntro:: @ 81C1B83 +Route9_Text_BrentRematchIntro:: .string "I got up early every day to train\n" .string "my POKéMON from cocoons!$" -Route9_Text_AlanRematchIntro:: @ 81C1BBE +Route9_Text_AlanRematchIntro:: .string "Hahahaha!\n" .string "I'll win this time!$" -Route9_Text_ConnerRematchIntro:: @ 81C1BDC +Route9_Text_ConnerRematchIntro:: .string "Go win, my super BUG POKéMON!$" -Route10_Text_MarkRematchIntro:: @ 81C1BFA +Route10_Text_MarkRematchIntro:: .string "Wow, you came here again?\n" .string "Maybe you're a POKéMANIAC, too?\l" .string "Want to see my collection?$" -Route10_Text_ClarkRematchIntro:: @ 81C1C4F +Route10_Text_ClarkRematchIntro:: .string "Ha-hahah-ah-ha!\n" .string "I can't stop sneezing!$" -Route10_Text_HermanRematchIntro:: @ 81C1C76 +Route10_Text_HermanRematchIntro:: .string "Hi, kid!\n" .string "Did I show you my POKéMON?$" -Route10_Text_HeidiRematchIntro:: @ 81C1C9A +Route10_Text_HeidiRematchIntro:: .string "I went out to a POKéMON GYM again.\p" .string "…But I lost as usual.$" -Route10_Text_TrentRematchIntro:: @ 81C1CD3 +Route10_Text_TrentRematchIntro:: .string "Ah!\n" .string "This mountain air is delicious!\l" .string "It's so good, I can't leave!$" -Route10_Text_CarolRematchIntro:: @ 81C1D14 +Route10_Text_CarolRematchIntro:: .string "My head is starting to spin.\n" .string "I've been hiking for too long…$" -Route11_Text_HugoRematchIntro:: @ 81C1D50 +Route11_Text_HugoRematchIntro:: .string "Win, lose, or draw!\n" .string "Now for our rematch!$" -Route11_Text_JasperRematchIntro:: @ 81C1D79 +Route11_Text_JasperRematchIntro:: .string "Competing is the ultimate thrill.\n" .string "I still can't get enough!$" -Route11_Text_EddieRematchIntro:: @ 81C1DB5 +Route11_Text_EddieRematchIntro:: .string "You know, right?\n" .string "Let's go, but don't cheat!$" -Route11_Text_BraxtonRematchIntro:: @ 81C1DE1 +Route11_Text_BraxtonRematchIntro:: .string "Hi, there!\p" .string "But be careful!\n" .string "I'm still laying down some cables!$" -Route11_Text_DillonRematchIntro:: @ 81C1E1F +Route11_Text_DillonRematchIntro:: .string "I became a TRAINER a while ago.\n" .string "But, I think I can win.$" -Route11_Text_DirkRematchIntro:: @ 81C1E57 +Route11_Text_DirkRematchIntro:: .string "Fwahaha!\n" .string "I have never lost!\p" .string "…And if I did, I've forgotten all\n" .string "about it!$" -Route11_Text_DarianRematchIntro:: @ 81C1E9F +Route11_Text_DarianRematchIntro:: .string "I have never won before…\p" .string "Perhaps I am destined to remain\n" .string "that way…$" -Route11_Text_YasuRematchIntro:: @ 81C1EE2 +Route11_Text_YasuRematchIntro:: .string "I'm the best in my class.\n" .string "I train every morning and night!$" -Route11_Text_BernieRematchIntro:: @ 81C1F1D +Route11_Text_BernieRematchIntro:: .string "Keep your eyes out for live wires!$" -Route11_Text_DaveRematchIntro:: @ 81C1F40 +Route11_Text_DaveRematchIntro:: .string "I raised my POKéMON carefully.\n" .string "They should be ready by now.\l" .string "This time, they should win, too.$" -Route12_Text_NedRematchIntro:: @ 81C1F9D +Route12_Text_NedRematchIntro:: .string "Yeah!\n" .string "I got a bite, here!\l" .string "Th-this might be the real thing!$" -Route12_Text_ChipRematchIntro:: @ 81C1FD8 +Route12_Text_ChipRematchIntro:: .string "You're finally here.\n" .string "Fishing is a waiting game.$" -Route12_Text_JustinRematchIntro:: @ 81C2008 +Route12_Text_JustinRematchIntro:: .string "Still can't find a MOON STONE…\n" .string "Have you found one?$" -Route12_Text_LucaRematchIntro:: @ 81C203B +Route12_Text_LucaRematchIntro:: .string "Electricity has always been my\n" .string "specialty.\p" .string "I don't know a thing about POKéMON\n" .string "of the sea, though.$" -Route12_Text_HankRematchIntro:: @ 81C209C +Route12_Text_HankRematchIntro:: .string "The FISHING FOOL vs. POKéMON KID!\n" .string "Another round, fight!$" -Route12_Text_ElliotRematchIntro:: @ 81C20D4 +Route12_Text_ElliotRematchIntro:: .string "I love fishing, don't get me wrong.\n" .string "But, I wish I had more work…\l" .string "…It's hard to give up fishing!$" -Route12_Text_AndrewRematchIntro:: @ 81C2134 +Route12_Text_AndrewRematchIntro:: .string "What's catching?\p" .string "You'll never know unless you beat\n" .string "me!$" -Route12_Text_JesRematchIntro:: @ 81C216B +Route12_Text_JesRematchIntro:: .string "JES: I'll win here today and\n" .string "propose to my GIA.$" -Route12_Text_GiaRematchIntro:: @ 81C219B +Route12_Text_GiaRematchIntro:: .string "GIA: Hey, JES…\n" .string "I've been waiting a long time now.\p" .string "If we win today, I'll marry you!$" -Route13_Text_SebastianRematchIntro:: @ 81C21EE +Route13_Text_SebastianRematchIntro:: .string "My bird POKéMON remember you!$" -Route13_Text_SusieRematchIntro:: @ 81C220C +Route13_Text_SusieRematchIntro:: .string "I want to be the best TRAINER \n" .string "while I'm a kid!$" -Route13_Text_ValerieRematchIntro:: @ 81C223C +Route13_Text_ValerieRematchIntro:: .string "Wow!\n" .string "You got more cool BADGES!$" -Route13_Text_GwenRematchIntro:: @ 81C225B +Route13_Text_GwenRematchIntro:: .string "My cutely grown POKéMON wish to\n" .string "become reacquainted with you.$" -Route13_Text_AlmaRematchIntro:: @ 81C2299 +Route13_Text_AlmaRematchIntro:: .string "I cleaned out my savings and\n" .string "bought more CARBOS.$" -Route13_Text_PerryRematchIntro:: @ 81C22CA +Route13_Text_PerryRematchIntro:: .string "I'm not going to lose this time.\n" .string "The wind's blowing my way!$" -Route13_Text_LolaRematchIntro:: @ 81C2306 +Route13_Text_LolaRematchIntro:: .string "Oh, you're back?\p" .string "Sure, I'll play again with you,\n" .string "sweetie.$" -Route13_Text_SheilaRematchIntro:: @ 81C2340 +Route13_Text_SheilaRematchIntro:: .string "Can't you forget that you battled\n" .string "with me?$" -Route13_Text_JaredRematchIntro:: @ 81C236B +Route13_Text_JaredRematchIntro:: .string "What're you starin' at?$" -Route13_Text_RobertRematchIntro:: @ 81C2383 +Route13_Text_RobertRematchIntro:: .string "I always go with bird POKéMON.\n" .string "I've dedicated myself to them.$" -Route14_Text_CarterRematchIntro:: @ 81C23C1 +Route14_Text_CarterRematchIntro:: .string "I used TMs to teach good moves\n" .string "to my POKéMON.$" -Route14_Text_MitchRematchIntro:: @ 81C23EF +Route14_Text_MitchRematchIntro:: .string "My bird POKéMON should be ready\n" .string "for battle this time.$" -Route14_Text_BeckRematchIntro:: @ 81C2425 +Route14_Text_BeckRematchIntro:: .string "Are you using TMs on POKéMON?\n" .string "Just holding them is useless.$" -Route14_Text_MarlonRematchIntro:: @ 81C2461 +Route14_Text_MarlonRematchIntro:: .string "Have you taught your bird POKéMON\n" .string "how to FLY?\p" .string "You'll be able to soar with it into\n" .string "the sky! Give it a try.$" -Route14_Text_DonaldRematchIntro:: @ 81C24CB +Route14_Text_DonaldRematchIntro:: .string "The legend of the winged mirages…\n" .string "You've heard it, right?$" -Route14_Text_BennyRematchIntro:: @ 81C2505 +Route14_Text_BennyRematchIntro:: .string "I'm really not into it, but okay.\n" .string "Let's go!$" -Route14_Text_LukasRematchIntro:: @ 81C2531 +Route14_Text_LukasRematchIntro:: .string "Hey!\n" .string "I remember you!\p" .string "C'mon, c'mon.\n" .string "Let's go, let's go, let's go!$" -Route14_Text_IsaacRematchIntro:: @ 81C2572 +Route14_Text_IsaacRematchIntro:: .string "You're here again, huh?\n" .string "Shut up and battle.$" -Route14_Text_GeraldRematchIntro:: @ 81C259E +Route14_Text_GeraldRematchIntro:: .string "We've been riding here because of\n" .string "the wide-open spaces.$" -Route14_Text_MalikRematchIntro:: @ 81C25D6 +Route14_Text_MalikRematchIntro:: .string "POKéMON battle, right?\n" .string "Cool! Rumble!$" -Route14_Text_KiriRematchIntro:: @ 81C25FB +Route14_Text_KiriRematchIntro:: .string "KIRI: JAN, I hope we win today.$" -Route14_Text_JanRematchIntro:: @ 81C261B +Route14_Text_JanRematchIntro:: .string "JAN: KIRI, here we go!\n" .string "Let's win for sure this time!$" -Route15_Text_KindraRematchIntro:: @ 81C2650 +Route15_Text_KindraRematchIntro:: .string "I'm going to keep battling with the\n" .string "POKéMON I got in trades.$" -Route15_Text_BeckyRematchIntro:: @ 81C268D +Route15_Text_BeckyRematchIntro:: .string "You look gentle, so I think I can\n" .string "beat you.\p" .string "I'll give it one more go!$" -Route15_Text_EdwinRematchIntro:: @ 81C26D3 +Route15_Text_EdwinRematchIntro:: .string "When I whistle, bird POKéMON\n" .string "gather around.\p" .string "They're amazingly cute!$" -Route15_Text_ChesterRematchIntro:: @ 81C2717 +Route15_Text_ChesterRematchIntro:: .string "Hmm? My birds are shivering!\n" .string "Wait, aren't you that TRAINER…$" -Route15_Text_GraceRematchIntro:: @ 81C2753 +Route15_Text_GraceRematchIntro:: .string "Oh, you're a little cutie!\n" .string "So like a darling POKéMON!\l" .string "I remember you now!$" -Route15_Text_OliviaRematchIntro:: @ 81C279D +Route15_Text_OliviaRematchIntro:: .string "I raise POKéMON for protection\n" .string "because I live alone.\p" .string "That hasn't changed.$" -Route15_Text_ErnestRematchIntro:: @ 81C27E7 +Route15_Text_ErnestRematchIntro:: .string "Hey, kid! C'mon!\n" .string "I got these off some loser!$" -Route15_Text_AlexRematchIntro:: @ 81C2814 +Route15_Text_AlexRematchIntro:: .string "Fork over all your cash when you\n" .string "lose to me, kid!$" -Route15_Text_CeliaRematchIntro:: @ 81C2846 +Route15_Text_CeliaRematchIntro:: .string "What's cool and happening?\n" .string "Trading POKéMON, of course.$" -Route15_Text_YazminRematchIntro:: @ 81C287D +Route15_Text_YazminRematchIntro:: .string "Want to play with my POKéMON\n" .string "again?$" -Route15_Text_MyaRematchIntro:: @ 81C28A1 +Route15_Text_MyaRematchIntro:: .string "MYA: Hi, we keep meeting,\n" .string "don't we?\p" .string "Help me train my little brother\n" .string "again?$" -Route15_Text_RonRematchIntro:: @ 81C28EC +Route15_Text_RonRematchIntro:: .string "RON: My sister's gotten more\n" .string "powerful…$" -Route16_Text_LaoRematchIntro:: @ 81C2913 +Route16_Text_LaoRematchIntro:: .string "What do you want?$" -Route16_Text_KojiRematchIntro:: @ 81C2925 +Route16_Text_KojiRematchIntro:: .string "Nice BIKE!\n" .string "Hand it over quick!$" -Route16_Text_LukeRematchIntro:: @ 81C2944 +Route16_Text_LukeRematchIntro:: .string "Come out and play, little mouse.\n" .string "I'll treat you right!$" -Route16_Text_HideoRematchIntro:: @ 81C297B +Route16_Text_HideoRematchIntro:: .string "Hey, wait a second!\n" .string "Don't call me and then run away!$" -Route16_Text_CamronRematchIntro:: @ 81C29B0 +Route16_Text_CamronRematchIntro:: .string "I'm feeling hungry and mean!\n" .string "I really need a punching bag!$" -Route16_Text_RubenRematchIntro:: @ 81C29EB +Route16_Text_RubenRematchIntro:: .string "Hey, there!\n" .string "We'll have ourselves a good time!$" -Route16_Text_JedRematchIntro:: @ 81C2A19 +Route16_Text_JedRematchIntro:: .string "JED: Are you here to see our\n" .string "love, which knows no bounds?$" -Route16_Text_LeaRematchIntro:: @ 81C2A53 +Route16_Text_LeaRematchIntro:: .string "LEA: Sometimes, the intensity of\n" .string "our love scares me.$" -Route17_Text_RaulRematchIntro:: @ 81C2A88 +Route17_Text_RaulRematchIntro:: .string "I told you, there's no getting rich\n" .string "quick in battling kids.$" -Route17_Text_IsaiahRematchIntro:: @ 81C2AC4 +Route17_Text_IsaiahRematchIntro:: .string "I'm mighty proud of my bod, kiddo.\n" .string "Come on!$" -Route17_Text_VirgilRematchIntro:: @ 81C2AF0 +Route17_Text_VirgilRematchIntro:: .string "You out for a stroll?$" -Route17_Text_BillyRematchIntro:: @ 81C2B06 +Route17_Text_BillyRematchIntro:: .string "We're BIKERS!\n" .string "We rule the roads, man!$" -Route17_Text_NikolasRematchIntro:: @ 81C2B2C +Route17_Text_NikolasRematchIntro:: .string "VOLTORB's going to seriously\n" .string "electrify you today!$" -Route17_Text_ZeekRematchIntro:: @ 81C2B5E +Route17_Text_ZeekRematchIntro:: .string "I leveled up my POKéMON, but it\n" .string "absolutely won't evolve. Why?$" -Route17_Text_JamalRematchIntro:: @ 81C2B9C +Route17_Text_JamalRematchIntro:: .string "Gaah! I really need to exercise\n" .string "and seriously trim some flab!$" -Route17_Text_CoreyRematchIntro:: @ 81C2BDA +Route17_Text_CoreyRematchIntro:: .string "Be a rebel!$" -Route17_Text_JaxonRematchIntro:: @ 81C2BE6 +Route17_Text_JaxonRematchIntro:: .string "Yep, that's a nice BIKE!\n" .string "How's it handle?$" -Route17_Text_WilliamRematchIntro:: @ 81C2C10 +Route17_Text_WilliamRematchIntro:: .string "Get lost, kid!\n" .string "I'm bushed!$" -Route18_Text_WiltonRematchIntro:: @ 81C2C2B +Route18_Text_WiltonRematchIntro:: .string "I've been checking every grassy\n" .string "area for new POKéMON.\p" .string "But it's not always easy…$" -Route18_Text_RamiroRematchIntro:: @ 81C2C7B +Route18_Text_RamiroRematchIntro:: .string "Koorukukukoo!\n" .string "Is my birdcall getting better?$" -Route18_Text_JacobRematchIntro:: @ 81C2CA8 +Route18_Text_JacobRematchIntro:: .string "I warned you before, this is my\n" .string "turf!\p" .string "I don't want you coming around.$" -Route19_Text_RichardRematchIntro:: @ 81C2CEE +Route19_Text_RichardRematchIntro:: .string "I'm almost warmed up to go\n" .string "out for a swim.$" -Route19_Text_ReeceRematchIntro:: @ 81C2D19 +Route19_Text_ReeceRematchIntro:: .string "Wait! Slow down!\n" .string "What if you have a heart attack?$" -Route19_Text_MatthewRematchIntro:: @ 81C2D4B +Route19_Text_MatthewRematchIntro:: .string "I love swimming!\n" .string "I guess you're the surfing type.$" -Route19_Text_DouglasRematchIntro:: @ 81C2D7D +Route19_Text_DouglasRematchIntro:: .string "What's beyond the horizon?\n" .string "Have you seen?$" -Route19_Text_DavidRematchIntro:: @ 81C2DA7 +Route19_Text_DavidRematchIntro:: .string "I tried diving for POKéMON again,\n" .string "but it was a no-go like before.$" -Route19_Text_TonyRematchIntro:: @ 81C2DE9 +Route19_Text_TonyRematchIntro:: .string "I look at the sea to forget all\n" .string "the bad things that happened.\p" .string "…Like losing to you the last time!$" -Route19_Text_AnyaRematchIntro:: @ 81C2E4A +Route19_Text_AnyaRematchIntro:: .string "You always get to ride your\n" .string "POKéMON…\p" .string "It looks so relaxing.\n" .string "Can I have it if I win?$" -Route19_Text_AliceRematchIntro:: @ 81C2E9D +Route19_Text_AliceRematchIntro:: .string "Swimming's great!\n" .string "Sunburns aren't!$" -Route19_Text_AxleRematchIntro:: @ 81C2EC0 +Route19_Text_AxleRematchIntro:: .string "These waters are treacherous!\n" .string "You shouldn't come back here!$" -Route19_Text_ConnieRematchIntro:: @ 81C2EFC +Route19_Text_ConnieRematchIntro:: .string "I swam here with my friends…\n" .string "I'm tired…\l" .string "Must we really battle again?$" -Route19_Text_LiaRematchIntro:: @ 81C2F41 +Route19_Text_LiaRematchIntro:: .string "LIA: You know my brother just\n" .string "became a TRAINER, right?\p" .string "I want to make him better, so I\n" .string "need your help again.$" -Route19_Text_LucRematchIntro:: @ 81C2FAE +Route19_Text_LucRematchIntro:: .string "LUC: My big sis taught me all\n" .string "about POKéMON.\p" .string "I wonder if I'm better?$" -Route20_Text_BarryRematchIntro:: @ 81C2FF3 +Route20_Text_BarryRematchIntro:: .string "The water is shallow here.\n" .string "There are many people swimming.$" -Route20_Text_ShirleyRematchIntro:: @ 81C302E +Route20_Text_ShirleyRematchIntro:: .string "Are you jealous that I'm\n" .string "vacationing on SEAFOAM?$" -Route20_Text_TiffanyRematchIntro:: @ 81C305F +Route20_Text_TiffanyRematchIntro:: .string "I love floating with the fishes\n" .string "here among the waves.$" -Route20_Text_IreneRematchIntro:: @ 81C3095 +Route20_Text_IreneRematchIntro:: .string "Were you on vacation, too?$" -Route20_Text_DeanRematchIntro:: @ 81C30B0 +Route20_Text_DeanRematchIntro:: .string "Check out my physique!\p" .string "It's even more buff than ever\n" .string "before!$" -Route20_Text_DarrinRematchIntro:: @ 81C30ED +Route20_Text_DarrinRematchIntro:: .string "Why are you riding a POKéMON?\n" .string "Haven't you learned to swim yet?$" -Route20_Text_RogerRematchIntro:: @ 81C312C +Route20_Text_RogerRematchIntro:: .string "I rode my bird POKéMON here.$" -Route20_Text_NoraRematchIntro:: @ 81C3149 +Route20_Text_NoraRematchIntro:: .string "My boyfriend gave me big pearls.\n" .string "And, they've grown bigger!$" -Route20_Text_MissyRematchIntro:: @ 81C3185 +Route20_Text_MissyRematchIntro:: .string "I swam here from CINNABAR ISLAND.\n" .string "It wasn't easy, like I said.$" -Route20_Text_MelissaRematchIntro:: @ 81C31C4 +Route20_Text_MelissaRematchIntro:: .string "CINNABAR, in the west, has a LAB\n" .string "for POKéMON.\p" .string "My daddy works there.$" -Route21_North_Text_RonaldRematchIntro:: @ 81C3208 +Route21_North_Text_RonaldRematchIntro:: .string "You want to know if the fish are\n" .string "biting?$" -Route21_North_Text_WadeRematchIntro:: @ 81C3231 +Route21_North_Text_WadeRematchIntro:: .string "I got a big haul again!\n" .string "Wanna go for it once more?$" -Route21_North_Text_SpencerRematchIntro:: @ 81C3264 +Route21_North_Text_SpencerRematchIntro:: .string "The sea cleanses my body and soul!$" @ Unused trainer from RB that had a rematch intro added -Route21_North_Text_CueBallRematchIntro:: @ 81C3287 +Route21_North_Text_CueBallRematchIntro:: .string "きょうも　およぎに\n" .string "きちまったぜ$" -Route21_South_Text_JackRematchIntro:: @ 81C3298 +Route21_South_Text_JackRematchIntro:: .string "I caught my POKéMON at sea.\n" .string "And that's where I train them.$" -Route21_South_Text_JeromeRematchIntro:: @ 81C32D3 +Route21_South_Text_JeromeRematchIntro:: .string "Right now, I'm in another triathlon\n" .string "meet!$" -Route21_South_Text_RolandRematchIntro:: @ 81C32FD +Route21_South_Text_RolandRematchIntro:: .string "Ahh!\n" .string "Feel the sun and the wind!$" -Route21_South_Text_ClaudeRematchIntro:: @ 81C331D +Route21_South_Text_ClaudeRematchIntro:: .string "Hey, cut it out already.\n" .string "You always scare away the fish!$" -Route21_South_Text_NolanRematchIntro:: @ 81C3356 +Route21_South_Text_NolanRematchIntro:: .string "Keep me company till I get a hit.$" -Route21_North_Text_LilRematchIntro:: @ 81C3378 +Route21_North_Text_LilRematchIntro:: .string "LIL: Huh? A battle again?\n" .string "IAN, can't you do it alone?$" -Route21_North_Text_IanRematchIntro:: @ 81C33AE +Route21_North_Text_IanRematchIntro:: .string "IAN: My sis is still a slob.\n" .string "Help me get her into shape!$" -Route25_Text_JoeyRematchIntro:: @ 81C33E7 +Route25_Text_JoeyRematchIntro:: .string "I won't lose while I'm here!$" -Route25_Text_DanRematchIntro:: @ 81C3404 +Route25_Text_DanRematchIntro:: .string "Dad took me to a great party on\n" .string "the S.S. ANNE at VERMILION CITY.$" -Route25_Text_FlintRematchIntro:: @ 81C3445 +Route25_Text_FlintRematchIntro:: .string "I'm a cool guy.\n" .string "I've got a girlfriend!\p" .string "I'll show her how cool I am for\n" .string "sure this time!$" -Route25_Text_KelseyRematchIntro:: @ 81C349C +Route25_Text_KelseyRematchIntro:: .string "Hi!\n" .string "My boyfriend is cool!\l" .string "My conditioning's good today!$" -Route25_Text_ChadRematchIntro:: @ 81C34D4 +Route25_Text_ChadRematchIntro:: .string "I had this feeling…\n" .string "I knew I had to battle you again!$" -Route25_Text_HaleyRematchIntro:: @ 81C350A +Route25_Text_HaleyRematchIntro:: .string "My friend has many cute POKéMON.\n" .string "I'm so jealous!$" -Route25_Text_FranklinRematchIntro:: @ 81C353B +Route25_Text_FranklinRematchIntro:: .string "I just trained up on MT. MOON,\n" .string "but I've still got gas in the tank!$" -Route25_Text_NobRematchIntro:: @ 81C357E +Route25_Text_NobRematchIntro:: .string "A POKéMANIAC lives on the cape.\n" .string "Have you seen his collection?$" -Route25_Text_WayneRematchIntro:: @ 81C35BC +Route25_Text_WayneRematchIntro:: .string "You're going to see BILL again?\n" .string "First, we battle!$" -Route24_Text_ShaneRematchIntro:: @ 81C35EE +Route24_Text_ShaneRematchIntro:: .string "I saw your feat from the grass!$" -Route24_Text_EthanRematchIntro:: @ 81C360E +Route24_Text_EthanRematchIntro:: .string "Okay!\n" .string "I'll stomp you!$" -Route24_Text_ReliRematchIntro:: @ 81C3624 +Route24_Text_ReliRematchIntro:: .string "You always look so busy…\n" .string "Aren't you getting tired?$" -Route24_Text_TimmyRematchIntro:: @ 81C3657 +Route24_Text_TimmyRematchIntro:: .string "You really must love coming to\n" .string "NUGGET BRIDGE.$" -Route24_Text_AliRematchIntro:: @ 81C3685 +Route24_Text_AliRematchIntro:: .string "The time we battled…\p" .string "Even though I was the second in\n" .string "line, I was the best, wasn't I?$" -Route24_Text_CaleRematchIntro:: @ 81C36DA +Route24_Text_CaleRematchIntro:: .string "People call this the NUGGET\n" .string "BRIDGE!\p" .string "You've already beaten us, so you're\n" @@ -708,300 +708,300 @@ Route24_Text_CaleRematchIntro:: @ 81C36DA .string "…But, you're welcome to battle with\n" .string "us again.$" -OneIsland_TreasureBeach_Text_AmaraRematchIntro:: @ 81C3773 +OneIsland_TreasureBeach_Text_AmaraRematchIntro:: .string "Lying back, rocked by the waves…\n" .string "I don't notice time slipping by…$" -OneIsland_KindleRoad_Text_MariaRematchIntro:: @ 81C37B5 +OneIsland_KindleRoad_Text_MariaRematchIntro:: .string "The weather's gorgeous!\n" .string "I'll try not to spoil it.$" -OneIsland_KindleRoad_Text_AbigailRematchIntro:: @ 81C37E7 +OneIsland_KindleRoad_Text_AbigailRematchIntro:: .string "My sunburn is starting to hurt…$" -OneIsland_KindleRoad_Text_FinnRematchIntro:: @ 81C3807 +OneIsland_KindleRoad_Text_FinnRematchIntro:: .string "The fire bird's mountain casts\n" .string "a huge shadow…$" -OneIsland_KindleRoad_Text_GarrettRematchIntro:: @ 81C3835 +OneIsland_KindleRoad_Text_GarrettRematchIntro:: .string "I have this strong feeling that\n" .string "I can win this time!$" -OneIsland_KindleRoad_Text_TommyRematchIntro:: @ 81C386A +OneIsland_KindleRoad_Text_TommyRematchIntro:: .string "Wait! Wait a second!\n" .string "I'm sure I've hooked a big one!$" -OneIsland_KindleRoad_Text_SharonRematchIntro:: @ 81C389F +OneIsland_KindleRoad_Text_SharonRematchIntro:: .string "You'll help me out with my\n" .string "training again?$" -OneIsland_KindleRoad_Text_TanyaRematchIntro:: @ 81C38CA +OneIsland_KindleRoad_Text_TanyaRematchIntro:: .string "We haven't missed a single day of\n" .string "training yet!$" -OneIsland_KindleRoad_Text_SheaRematchIntro:: @ 81C38FA +OneIsland_KindleRoad_Text_SheaRematchIntro:: .string "Every morning, before breakfast,\n" .string "I swim around this island…\l" .string "Three times!$" -OneIsland_KindleRoad_Text_HughRematchIntro:: @ 81C3943 +OneIsland_KindleRoad_Text_HughRematchIntro:: .string "Dress appropriately for battle!\n" .string "Lose that frivolous outfit, I said!$" -OneIsland_KindleRoad_Text_BryceRematchIntro:: @ 81C3987 +OneIsland_KindleRoad_Text_BryceRematchIntro:: .string "You know, everything tastes great\n" .string "when you're out in the wild.$" -OneIsland_KindleRoad_Text_ClaireRematchIntro:: @ 81C39C6 +OneIsland_KindleRoad_Text_ClaireRematchIntro:: .string "I ate too much again, so will you\n" .string "battle us for some exercise?$" -OneIsland_KindleRoad_Text_KiaRematchIntro:: @ 81C3A05 +OneIsland_KindleRoad_Text_KiaRematchIntro:: .string "KIA: My big brother and I make\n" .string "an awesome combination!\p" .string "We won't lose this time!$" -OneIsland_KindleRoad_Text_MikRematchIntro:: @ 81C3A55 +OneIsland_KindleRoad_Text_MikRematchIntro:: .string "MIK: Together with KIA, we're\n" .string "afraid of nothing!\p" .string "We'll prove it to you this time!$" -ThreeIsland_BondBridge_Text_NikkiRematchIntro:: @ 81C3AA7 +ThreeIsland_BondBridge_Text_NikkiRematchIntro:: .string "Are we to battle again?$" -ThreeIsland_BondBridge_Text_VioletRematchIntro:: @ 81C3ABF +ThreeIsland_BondBridge_Text_VioletRematchIntro:: .string "From where have you come, and\n" .string "where are you bound?$" -ThreeIsland_BondBridge_Text_AmiraRematchIntro:: @ 81C3AF2 +ThreeIsland_BondBridge_Text_AmiraRematchIntro:: .string "I want to swim without my float\n" .string "ring soon.$" -ThreeIsland_BondBridge_Text_AlexisRematchIntro:: @ 81C3B1D +ThreeIsland_BondBridge_Text_AlexisRematchIntro:: .string "Yay, yay!\n" .string "POKéMON!$" -ThreeIsland_BondBridge_Text_TishaRematchIntro:: @ 81C3B30 +ThreeIsland_BondBridge_Text_TishaRematchIntro:: .string "Oh, no, didn't I tell you already?\n" .string "Please, stay away from me!$" -ThreeIsland_BondBridge_Text_JoyRematchIntro:: @ 81C3B6E +ThreeIsland_BondBridge_Text_JoyRematchIntro:: .string "JOY: We've gotten stronger!\n" .string "Lots and lots!$" -ThreeIsland_BondBridge_Text_MegRematchIntro:: @ 81C3B99 +ThreeIsland_BondBridge_Text_MegRematchIntro:: .string "MEG: You can't beat us today!$" -FiveIsland_WaterLabyrinth_Text_AlizeRematchIntro:: @ 81C3BB7 +FiveIsland_WaterLabyrinth_Text_AlizeRematchIntro:: .string "Oh, hello!\p" .string "Are you raising your POKéMON in a\n" .string "good environment?$" -FiveIsland_ResortGorgeous_Text_DaisyRematchIntro:: @ 81C3BF6 +FiveIsland_ResortGorgeous_Text_DaisyRematchIntro:: .string "With these hands, I will create\n" .string "my victory today.$" -FiveIsland_ResortGorgeous_Text_CelinaRematchIntro:: @ 81C3C28 +FiveIsland_ResortGorgeous_Text_CelinaRematchIntro:: .string "Must I repeat myself?\n" .string "I'm trying to paint.\l" .string "Please keep out of my sight!$" -FiveIsland_ResortGorgeous_Text_RaynaRematchIntro:: @ 81C3C70 +FiveIsland_ResortGorgeous_Text_RaynaRematchIntro:: .string "I haven't made any progress…\n" .string "I still can't get the right angle…$" -FiveIsland_ResortGorgeous_Text_JackiRematchIntro:: @ 81C3CB0 +FiveIsland_ResortGorgeous_Text_JackiRematchIntro:: .string "Oh, you will give me another\n" .string "opportunity to match wits with you?$" -FiveIsland_ResortGorgeous_Text_GillianRematchIntro:: @ 81C3CF1 +FiveIsland_ResortGorgeous_Text_GillianRematchIntro:: .string "They're almost finished making the\n" .string "pool for my POKéMON.\p" .string "You must drop in for a visit.$" -FiveIsland_ResortGorgeous_Text_DestinRematchIntro:: @ 81C3D47 +FiveIsland_ResortGorgeous_Text_DestinRematchIntro:: .string "I'm a good runner.\n" .string "I've gotten even faster!$" -FiveIsland_ResortGorgeous_Text_TobyRematchIntro:: @ 81C3D73 +FiveIsland_ResortGorgeous_Text_TobyRematchIntro:: .string "I say, friend!\n" .string "Let us enjoy our time together!$" -FiveIsland_MemorialPillar_Text_MiloRematchIntro:: @ 81C3DA2 +FiveIsland_MemorialPillar_Text_MiloRematchIntro:: .string "I'm the eldest of the BIRD\n" .string "BROTHERS. Remember me?\p" .string "That's right, I'm the one who loves\n" .string "birds for their beaks!$" -FiveIsland_MemorialPillar_Text_ChazRematchIntro:: @ 81C3E0F +FiveIsland_MemorialPillar_Text_ChazRematchIntro:: .string "I'm the middle kid of the BIRD\n" .string "BROTHERS.\p" .string "I'm the one that loves wings.\n" .string "Let's battle again!$" -FiveIsland_MemorialPillar_Text_HaroldRematchIntro:: @ 81C3E6A +FiveIsland_MemorialPillar_Text_HaroldRematchIntro:: .string "I'm the youngest of the BIRD\n" .string "BROTHERS.\p" .string "I love birds for their down.\n" .string "I didn't think I'd see you again!$" -SixIsland_OutcastIsland_Text_TylorRematchIntro:: @ 81C3ED0 +SixIsland_OutcastIsland_Text_TylorRematchIntro:: .string "I'm still having no luck at all.\n" .string "A battle'd be a change of pace!$" -SixIsland_OutcastIsland_Text_MymoRematchIntro:: @ 81C3F11 +SixIsland_OutcastIsland_Text_MymoRematchIntro:: .string "Gasp… Gasp…\p" .string "I swam here from SIX ISLAND's port\n" .string "in one go again.$" -SixIsland_OutcastIsland_Text_NicoleRematchIntro:: @ 81C3F51 +SixIsland_OutcastIsland_Text_NicoleRematchIntro:: .string "You always come along while I'm\n" .string "swimming.$" -SixIsland_OutcastIsland_Text_AvaRematchIntro:: @ 81C3F7B +SixIsland_OutcastIsland_Text_AvaRematchIntro:: .string "AVA: Let's have another\n" .string "two-on-two marine battle today!$" -SixIsland_OutcastIsland_Text_GebRematchIntro:: @ 81C3FB3 +SixIsland_OutcastIsland_Text_GebRematchIntro:: .string "GEB: My big sister and I are way\n" .string "tougher than before!$" -SixIsland_GreenPath_Text_JaclynRematchIntro:: @ 81C3FE9 +SixIsland_GreenPath_Text_JaclynRematchIntro:: .string "…Huh?\p" .string "I envision my house, but TELEPORT\n" .string "always brings me here!$" -SixIsland_WaterPath_Text_RoseRematchIntro:: @ 81C4028 +SixIsland_WaterPath_Text_RoseRematchIntro:: .string "Oh, hello.\n" .string "A pleasant breeze is blowing again.$" -SixIsland_WaterPath_Text_EdwardRematchIntro:: @ 81C4057 +SixIsland_WaterPath_Text_EdwardRematchIntro:: .string "Hehehe, I'm practicing in secret\n" .string "again.$" -SixIsland_WaterPath_Text_SamirRematchIntro:: @ 81C407F +SixIsland_WaterPath_Text_SamirRematchIntro:: .string "What, you're sick of seeing\n" .string "SWIMMERS like me?\p" .string "Aww, don't be hatin'!\n" .string "Battle with me again.$" -SixIsland_WaterPath_Text_DeniseRematchIntro:: @ 81C40D9 +SixIsland_WaterPath_Text_DeniseRematchIntro:: .string "Sigh…\n" .string "My boyfriend's busy again…$" -SixIsland_WaterPath_Text_EarlRematchIntro:: @ 81C40FA +SixIsland_WaterPath_Text_EarlRematchIntro:: .string "Come on, tell me, where are the\n" .string "mountains around these parts?$" -SixIsland_WaterPath_Text_MiuRematchIntro:: @ 81C4138 +SixIsland_WaterPath_Text_MiuRematchIntro:: .string "MIU: Hello, POKéMON!\n" .string "It's time to play again!$" -SixIsland_WaterPath_Text_MiaRematchIntro:: @ 81C4166 +SixIsland_WaterPath_Text_MiaRematchIntro:: .string "MIA: Hello, POKéMON!\n" .string "It's time to battle again!$" -SixIsland_RuinValley_Text_StanlyRematchIntro:: @ 81C4196 +SixIsland_RuinValley_Text_StanlyRematchIntro:: .string "There appear to be many secrets\n" .string "still unsolved in this world.$" -SixIsland_RuinValley_Text_FosterRematchIntro:: @ 81C41D4 +SixIsland_RuinValley_Text_FosterRematchIntro:: .string "Hi, didn't we meet before?\n" .string "What compelled you to come back?$" -SixIsland_RuinValley_Text_LarryRematchIntro:: @ 81C4210 +SixIsland_RuinValley_Text_LarryRematchIntro:: .string "It's been said that there are\n" .string "mysterious stones on this island.\p" .string "Have you discovered anything since\n" .string "we last met?$" -SixIsland_RuinValley_Text_DarylRematchIntro:: @ 81C4280 +SixIsland_RuinValley_Text_DarylRematchIntro:: .string "A rematch with you, so high up!$" -SixIsland_RuinValley_Text_HectorRematchIntro:: @ 81C42A0 +SixIsland_RuinValley_Text_HectorRematchIntro:: .string "I'm pretty familiar with the land\n" .string "around these parts.$" -SevenIsland_TrainerTower_Text_DarioRematchIntro:: @ 81C42D6 +SevenIsland_TrainerTower_Text_DarioRematchIntro:: .string "I sensed your approach.$" -SevenIsland_TrainerTower_Text_RodetteRematchIntro:: @ 81C42EE +SevenIsland_TrainerTower_Text_RodetteRematchIntro:: .string "Somewhere on this island, peculiar\n" .string "POKéMON are sleeping.$" -SevenIsland_SevaultCanyon_Entrance_Text_MiahRematchIntro:: @ 81C4327 +SevenIsland_SevaultCanyon_Entrance_Text_MiahRematchIntro:: .string "Kyahaha!\p" .string "Coming back won't change a thing.\n" .string "I'll flick you away effortlessly!$" -SevenIsland_SevaultCanyon_Entrance_Text_MasonRematchIntro:: @ 81C4374 +SevenIsland_SevaultCanyon_Entrance_Text_MasonRematchIntro:: .string "Howdy! You're a member of my\n" .string "fan club, isn't that right?$" -SevenIsland_SevaultCanyon_Entrance_Text_NicolasRematchIntro:: @ 81C43AD +SevenIsland_SevaultCanyon_Entrance_Text_NicolasRematchIntro:: .string "This island is too spread out…\n" .string "Patrolling the place is a drag…$" -SevenIsland_SevaultCanyon_Entrance_Text_MadelineRematchIntro:: @ 81C43EC +SevenIsland_SevaultCanyon_Entrance_Text_MadelineRematchIntro:: .string "I don't forgive people who abuse\n" .string "POKéMON!$" -SevenIsland_SevaultCanyon_Entrance_Text_EveRematchIntro:: @ 81C4416 +SevenIsland_SevaultCanyon_Entrance_Text_EveRematchIntro:: .string "EVE: I'll team up with JON and\n" .string "battle together again.$" -SevenIsland_SevaultCanyon_Entrance_Text_JonRematchIntro:: @ 81C444C +SevenIsland_SevaultCanyon_Entrance_Text_JonRematchIntro:: .string "JON: When I'm with EVE, it feels\n" .string "like we could never lose, not ever.$" -SevenIsland_SevaultCanyon_Text_CyndyRematchIntro:: @ 81C4491 +SevenIsland_SevaultCanyon_Text_CyndyRematchIntro:: .string "Let's have another battle.\n" .string "My conditioning's in top form!$" -SevenIsland_SevaultCanyon_Text_EvanRematchIntro:: @ 81C44CB +SevenIsland_SevaultCanyon_Text_EvanRematchIntro:: .string "It doesn't matter if you happen to\n" .string "have the strongest POKéMON…\p" .string "It doesn't mean a thing if you don't\n" .string "know how to use them properly!$" -SevenIsland_SevaultCanyon_Text_JacksonRematchIntro:: @ 81C454E +SevenIsland_SevaultCanyon_Text_JacksonRematchIntro:: .string "I work to protect the environment.\n" .string "In turn, nature protects me!$" -SevenIsland_SevaultCanyon_Text_KatelynRematchIntro:: @ 81C458E +SevenIsland_SevaultCanyon_Text_KatelynRematchIntro:: .string "Every time we meet, you have those\n" .string "snazzy shoes on.$" -SevenIsland_SevaultCanyon_Text_LeroyRematchIntro:: @ 81C45C2 +SevenIsland_SevaultCanyon_Text_LeroyRematchIntro:: .string "You must have gotten tougher.\n" .string "Let me battle you, please!$" -SevenIsland_SevaultCanyon_Text_MichelleRematchIntro:: @ 81C45FB +SevenIsland_SevaultCanyon_Text_MichelleRematchIntro:: .string "I was given the best possible\n" .string "education to become this strong.\p" .string "I won't lose this time.\n" .string "Absolutely not!$" -SevenIsland_SevaultCanyon_Text_LexRematchIntro:: @ 81C4662 +SevenIsland_SevaultCanyon_Text_LexRematchIntro:: .string "LEX: My darling NYA, together\n" .string "we will win for certain!$" -SevenIsland_SevaultCanyon_Text_NyaRematchIntro:: @ 81C4699 +SevenIsland_SevaultCanyon_Text_NyaRematchIntro:: .string "NYA: I won't drag down my mentor\n" .string "LEX! We're going to win!$" -SevenIsland_TanobyRuins_Text_BrandonRematchIntro:: @ 81C46D3 +SevenIsland_TanobyRuins_Text_BrandonRematchIntro:: .string "Have you discovered anything about\n" .string "this stone chamber?$" -SevenIsland_TanobyRuins_Text_BenjaminRematchIntro:: @ 81C470A +SevenIsland_TanobyRuins_Text_BenjaminRematchIntro:: .string "A mystic POKéMON is said to sleep\n" .string "inside here.$" -SevenIsland_TanobyRuins_Text_EdnaRematchIntro:: @ 81C4739 +SevenIsland_TanobyRuins_Text_EdnaRematchIntro:: .string "My teacher is showing me how to\n" .string "paint some more.$" -SevenIsland_TanobyRuins_Text_CliffordRematchIntro:: @ 81C476A +SevenIsland_TanobyRuins_Text_CliffordRematchIntro:: .string "Today, in addition to our lesson,\n" .string "we came to see the chamber again.$" diff --git a/data/text/white_out.inc b/data/text/white_out.inc index 347e45c4c..1d00c1e10 100644 --- a/data/text/white_out.inc +++ b/data/text/white_out.inc @@ -1,8 +1,8 @@ -Text_FirstShouldRestoreMonsHealth:: @ 81A5E89 +Text_FirstShouldRestoreMonsHealth:: .string "First, you should restore your\n" .string "POKéMON to full health.$" -Text_MonsHealedShouldBuyPotions:: @ 81A5EC0 +Text_MonsHealedShouldBuyPotions:: .string "Your POKéMON have been healed\n" .string "to perfect health.\p" .string "If your POKéMON's energy, HP,\n" @@ -12,12 +12,12 @@ Text_MonsHealedShouldBuyPotions:: @ 81A5EC0 .string "at the POKéMON MART.\p" .string "We hope you excel!$" -Text_MonsHealed:: @ 81A5F9B +Text_MonsHealed:: .string "Your POKéMON have been healed\n" .string "to perfect health.\p" .string "We hope you excel!$" -Text_HadQuiteAnExperienceTakeRest:: @ 81A5FDF +Text_HadQuiteAnExperienceTakeRest:: .string "MOM: {PLAYER}!\n" .string "Welcome home.\p" .string "It sounds like you had quite\n" @@ -25,7 +25,7 @@ Text_HadQuiteAnExperienceTakeRest:: @ 81A5FDF .string "Maybe you should take a quick\n" .string "rest.$" -Text_MomExplainHPGetPotions:: @ 81A6046 +Text_MomExplainHPGetPotions:: .string "MOM: Oh, good! You and your\n" .string "POKéMON are looking great.\p" .string "I just heard from PROF. OAK.\p" @@ -40,14 +40,14 @@ Text_MomExplainHPGetPotions:: @ 81A6046 .string "Make me proud, honey!\p" .string "Take care!$" -Text_WhitedOutLostMoney:: @ 81A6197 +Text_WhitedOutLostMoney:: .string "{PLAYER} is out of usable\n" .string "POKéMON!\p" .string "{PLAYER} panicked and lost ¥{STR_VAR_1}…\p" .string "… … … …\p" .string "{PLAYER} whited out!$" -Text_WhitedOut:: @ 81A61E5 +Text_WhitedOut:: .string "{PLAYER} is out of usable\n" .string "POKéMON!\p" .string "{PLAYER} whited out!$" diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc index 5926a88c6..adecd108e 100644 --- a/data/tilesets/graphics.inc +++ b/data/tilesets/graphics.inc @@ -1,9 +1,9 @@ .align 2 -gTilesetTiles_PalletTown:: @ 826D37C +gTilesetTiles_PalletTown:: .incbin "data/tilesets/secondary/pallet_town/tiles.4bpp.lz" .align 2 -gTilesetPalettes_PalletTown:: @ 826D7C0 +gTilesetPalettes_PalletTown:: .incbin "data/tilesets/secondary/pallet_town/palettes/00.gbapal" .incbin "data/tilesets/secondary/pallet_town/palettes/01.gbapal" .incbin "data/tilesets/secondary/pallet_town/palettes/02.gbapal" @@ -22,11 +22,11 @@ gTilesetPalettes_PalletTown:: @ 826D7C0 .incbin "data/tilesets/secondary/pallet_town/palettes/15.gbapal" .align 2 -gTilesetTiles_ViridianCity:: @ 826D9C0 +gTilesetTiles_ViridianCity:: .incbin "data/tilesets/secondary/viridian_city/tiles.4bpp.lz" .align 2 -gTilesetPalettes_ViridianCity:: @ 826DFC0 +gTilesetPalettes_ViridianCity:: .incbin "data/tilesets/secondary/viridian_city/palettes/00.gbapal" .incbin "data/tilesets/secondary/viridian_city/palettes/01.gbapal" .incbin "data/tilesets/secondary/viridian_city/palettes/02.gbapal" @@ -45,11 +45,11 @@ gTilesetPalettes_ViridianCity:: @ 826DFC0 .incbin "data/tilesets/secondary/viridian_city/palettes/15.gbapal" .align 2 -gTilesetTiles_PewterCity:: @ 826E1C0 +gTilesetTiles_PewterCity:: .incbin "data/tilesets/secondary/pewter_city/tiles.4bpp.lz" .align 2 -gTilesetPalettes_PewterCity:: @ 826EAB8 +gTilesetPalettes_PewterCity:: .incbin "data/tilesets/secondary/pewter_city/palettes/00.gbapal" .incbin "data/tilesets/secondary/pewter_city/palettes/01.gbapal" .incbin "data/tilesets/secondary/pewter_city/palettes/02.gbapal" @@ -68,11 +68,11 @@ gTilesetPalettes_PewterCity:: @ 826EAB8 .incbin "data/tilesets/secondary/pewter_city/palettes/15.gbapal" .align 2 -gTilesetTiles_CeruleanCity:: @ 826ECB8 +gTilesetTiles_CeruleanCity:: .incbin "data/tilesets/secondary/cerulean_city/tiles.4bpp.lz" .align 2 -gTilesetPalettes_CeruleanCity:: @ 826F4B8 +gTilesetPalettes_CeruleanCity:: .incbin "data/tilesets/secondary/cerulean_city/palettes/00.gbapal" .incbin "data/tilesets/secondary/cerulean_city/palettes/01.gbapal" .incbin "data/tilesets/secondary/cerulean_city/palettes/02.gbapal" @@ -91,11 +91,11 @@ gTilesetPalettes_CeruleanCity:: @ 826F4B8 .incbin "data/tilesets/secondary/cerulean_city/palettes/15.gbapal" .align 2 -gTilesetTiles_LavenderTown:: @ 826F6B8 +gTilesetTiles_LavenderTown:: .incbin "data/tilesets/secondary/lavender_town/tiles.4bpp.lz" .align 2 -gTilesetPalettes_LavenderTown:: @ 8270438 +gTilesetPalettes_LavenderTown:: .incbin "data/tilesets/secondary/lavender_town/palettes/00.gbapal" .incbin "data/tilesets/secondary/lavender_town/palettes/01.gbapal" .incbin "data/tilesets/secondary/lavender_town/palettes/02.gbapal" @@ -114,11 +114,11 @@ gTilesetPalettes_LavenderTown:: @ 8270438 .incbin "data/tilesets/secondary/lavender_town/palettes/15.gbapal" .align 2 -gTilesetTiles_VermilionCity:: @ 8270638 +gTilesetTiles_VermilionCity:: .incbin "data/tilesets/secondary/vermilion_city/tiles.4bpp.lz" .align 2 -gTilesetPalettes_VermilionCity:: @ 8270DA0 +gTilesetPalettes_VermilionCity:: .incbin "data/tilesets/secondary/vermilion_city/palettes/00.gbapal" .incbin "data/tilesets/secondary/vermilion_city/palettes/01.gbapal" .incbin "data/tilesets/secondary/vermilion_city/palettes/02.gbapal" @@ -137,11 +137,11 @@ gTilesetPalettes_VermilionCity:: @ 8270DA0 .incbin "data/tilesets/secondary/vermilion_city/palettes/15.gbapal" .align 2 -gTilesetTiles_CeladonCity:: @ 8270FA0 +gTilesetTiles_CeladonCity:: .incbin "data/tilesets/secondary/celadon_city/tiles.4bpp.lz" .align 2 -gTilesetPalettes_CeladonCity:: @ 8271C74 +gTilesetPalettes_CeladonCity:: .incbin "data/tilesets/secondary/celadon_city/palettes/00.gbapal" .incbin "data/tilesets/secondary/celadon_city/palettes/01.gbapal" .incbin "data/tilesets/secondary/celadon_city/palettes/02.gbapal" @@ -160,11 +160,11 @@ gTilesetPalettes_CeladonCity:: @ 8271C74 .incbin "data/tilesets/secondary/celadon_city/palettes/15.gbapal" .align 2 -gTilesetTiles_FuchsiaCity:: @ 8271E74 +gTilesetTiles_FuchsiaCity:: .incbin "data/tilesets/secondary/fuchsia_city/tiles.4bpp.lz" .align 2 -gTilesetPalettes_FuchsiaCity:: @ 8272A5C +gTilesetPalettes_FuchsiaCity:: .incbin "data/tilesets/secondary/fuchsia_city/palettes/00.gbapal" .incbin "data/tilesets/secondary/fuchsia_city/palettes/01.gbapal" .incbin "data/tilesets/secondary/fuchsia_city/palettes/02.gbapal" @@ -183,11 +183,11 @@ gTilesetPalettes_FuchsiaCity:: @ 8272A5C .incbin "data/tilesets/secondary/fuchsia_city/palettes/15.gbapal" .align 2 -gTilesetTiles_CinnabarIsland:: @ 8272C5C +gTilesetTiles_CinnabarIsland:: .incbin "data/tilesets/secondary/cinnabar_island/tiles.4bpp.lz" .align 2 -gTilesetPalettes_CinnabarIsland:: @ 8273358 +gTilesetPalettes_CinnabarIsland:: .incbin "data/tilesets/secondary/cinnabar_island/palettes/00.gbapal" .incbin "data/tilesets/secondary/cinnabar_island/palettes/01.gbapal" .incbin "data/tilesets/secondary/cinnabar_island/palettes/02.gbapal" @@ -206,11 +206,11 @@ gTilesetPalettes_CinnabarIsland:: @ 8273358 .incbin "data/tilesets/secondary/cinnabar_island/palettes/15.gbapal" .align 2 -gTilesetTiles_IndigoPlateau:: @ 8273558 +gTilesetTiles_IndigoPlateau:: .incbin "data/tilesets/secondary/indigo_plateau/tiles.4bpp.lz" .align 2 -gTilesetPalettes_IndigoPlateau:: @ 82742D0 +gTilesetPalettes_IndigoPlateau:: .incbin "data/tilesets/secondary/indigo_plateau/palettes/00.gbapal" .incbin "data/tilesets/secondary/indigo_plateau/palettes/01.gbapal" .incbin "data/tilesets/secondary/indigo_plateau/palettes/02.gbapal" @@ -229,11 +229,11 @@ gTilesetPalettes_IndigoPlateau:: @ 82742D0 .incbin "data/tilesets/secondary/indigo_plateau/palettes/15.gbapal" .align 2 -gTilesetTiles_SaffronCity:: @ 82744D0 +gTilesetTiles_SaffronCity:: .incbin "data/tilesets/secondary/saffron_city/tiles.4bpp.lz" .align 2 -gTilesetPalettes_SaffronCity:: @ 8275094 +gTilesetPalettes_SaffronCity:: .incbin "data/tilesets/secondary/saffron_city/palettes/00.gbapal" .incbin "data/tilesets/secondary/saffron_city/palettes/01.gbapal" .incbin "data/tilesets/secondary/saffron_city/palettes/02.gbapal" @@ -275,11 +275,11 @@ gTilesetPalettes_Building:: @ Building .incbin "data/tilesets/primary/building/palettes/15.gbapal" .align 2 -gTilesetTiles_Mart:: @ 8277894 +gTilesetTiles_Mart:: .incbin "data/tilesets/secondary/mart/tiles.4bpp.lz" .align 2 -gTilesetPalettes_Mart:: @ 8277A5C +gTilesetPalettes_Mart:: .incbin "data/tilesets/secondary/mart/palettes/00.gbapal" .incbin "data/tilesets/secondary/mart/palettes/01.gbapal" .incbin "data/tilesets/secondary/mart/palettes/02.gbapal" @@ -298,11 +298,11 @@ gTilesetPalettes_Mart:: @ 8277A5C .incbin "data/tilesets/secondary/mart/palettes/15.gbapal" .align 2 -gTilesetTiles_PokemonCenter:: @ 8277C5C +gTilesetTiles_PokemonCenter:: .incbin "data/tilesets/secondary/pokemon_center/tiles.4bpp.lz" .align 2 -gTilesetPalettes_PokemonCenter:: @ 8278CC4 +gTilesetPalettes_PokemonCenter:: .incbin "data/tilesets/secondary/pokemon_center/palettes/00.gbapal" .incbin "data/tilesets/secondary/pokemon_center/palettes/01.gbapal" .incbin "data/tilesets/secondary/pokemon_center/palettes/02.gbapal" @@ -321,11 +321,11 @@ gTilesetPalettes_PokemonCenter:: @ 8278CC4 .incbin "data/tilesets/secondary/pokemon_center/palettes/15.gbapal" .align 2 -gTilesetTiles_Cave:: @ 8278EC4 +gTilesetTiles_Cave:: .incbin "data/tilesets/secondary/cave/tiles.4bpp.lz" .align 2 -gTilesetPalettes_Cave:: @ 827A1A8 +gTilesetPalettes_Cave:: .incbin "data/tilesets/secondary/cave/palettes/00.gbapal" .incbin "data/tilesets/secondary/cave/palettes/01.gbapal" .incbin "data/tilesets/secondary/cave/palettes/02.gbapal" @@ -344,11 +344,11 @@ gTilesetPalettes_Cave:: @ 827A1A8 .incbin "data/tilesets/secondary/cave/palettes/15.gbapal" .align 2 -gTilesetTiles_Dummy1:: @ 827A3A8 +gTilesetTiles_Dummy1:: .incbin "data/tilesets/secondary/dummy_1/tiles.4bpp.lz" .align 2 -gTilesetPalettes_Dummy1:: @ 827A3B8 +gTilesetPalettes_Dummy1:: .incbin "data/tilesets/secondary/dummy_1/palettes/00.gbapal" .incbin "data/tilesets/secondary/dummy_1/palettes/01.gbapal" .incbin "data/tilesets/secondary/dummy_1/palettes/02.gbapal" @@ -367,11 +367,11 @@ gTilesetPalettes_Dummy1:: @ 827A3B8 .incbin "data/tilesets/secondary/dummy_1/palettes/15.gbapal" .align 2 -gTilesetTiles_Museum:: @ 827A5B8 +gTilesetTiles_Museum:: .incbin "data/tilesets/secondary/museum/tiles.4bpp.lz" .align 2 -gTilesetPalettes_Museum:: @ 827AE14 +gTilesetPalettes_Museum:: .incbin "data/tilesets/secondary/museum/palettes/00.gbapal" .incbin "data/tilesets/secondary/museum/palettes/01.gbapal" .incbin "data/tilesets/secondary/museum/palettes/02.gbapal" @@ -390,11 +390,11 @@ gTilesetPalettes_Museum:: @ 827AE14 .incbin "data/tilesets/secondary/museum/palettes/15.gbapal" .align 2 -gTilesetTiles_CableClub:: @ 827B014 +gTilesetTiles_CableClub:: .incbin "data/tilesets/secondary/cable_club/tiles.4bpp" .align 2 -gTilesetPalettes_CableClub:: @ 827FF14 +gTilesetPalettes_CableClub:: .incbin "data/tilesets/secondary/cable_club/palettes/00.gbapal" .incbin "data/tilesets/secondary/cable_club/palettes/01.gbapal" .incbin "data/tilesets/secondary/cable_club/palettes/02.gbapal" @@ -413,11 +413,11 @@ gTilesetPalettes_CableClub:: @ 827FF14 .incbin "data/tilesets/secondary/cable_club/palettes/15.gbapal" .align 2 -gTilesetTiles_BikeShop:: @ 8280114 +gTilesetTiles_BikeShop:: .incbin "data/tilesets/secondary/bike_shop/tiles.4bpp.lz" .align 2 -gTilesetPalettes_BikeShop:: @ 82804EC +gTilesetPalettes_BikeShop:: .incbin "data/tilesets/secondary/bike_shop/palettes/00.gbapal" .incbin "data/tilesets/secondary/bike_shop/palettes/01.gbapal" .incbin "data/tilesets/secondary/bike_shop/palettes/02.gbapal" @@ -436,11 +436,11 @@ gTilesetPalettes_BikeShop:: @ 82804EC .incbin "data/tilesets/secondary/bike_shop/palettes/15.gbapal" .align 2 -gTilesetTiles_Lab:: @ 82806EC +gTilesetTiles_Lab:: .incbin "data/tilesets/secondary/lab/tiles.4bpp.lz" .align 2 -gTilesetPalettes_Lab:: @ 8280D00 +gTilesetPalettes_Lab:: .incbin "data/tilesets/secondary/lab/palettes/00.gbapal" .incbin "data/tilesets/secondary/lab/palettes/01.gbapal" .incbin "data/tilesets/secondary/lab/palettes/02.gbapal" @@ -459,11 +459,11 @@ gTilesetPalettes_Lab:: @ 8280D00 .incbin "data/tilesets/secondary/lab/palettes/15.gbapal" .align 2 -gTilesetTiles_HoennBuilding:: @ 8280F00 +gTilesetTiles_HoennBuilding:: .incbin "data/tilesets/secondary/hoenn_building/tiles.4bpp.lz" .align 2 -gTilesetPalettes_HoennBuilding:: @ 82823A4 +gTilesetPalettes_HoennBuilding:: .incbin "data/tilesets/secondary/hoenn_building/palettes/00.gbapal" .incbin "data/tilesets/secondary/hoenn_building/palettes/01.gbapal" .incbin "data/tilesets/secondary/hoenn_building/palettes/02.gbapal" @@ -482,11 +482,11 @@ gTilesetPalettes_HoennBuilding:: @ 82823A4 .incbin "data/tilesets/secondary/hoenn_building/palettes/15.gbapal" .align 2 -gTilesetTiles_GameCorner:: @ 82825A4 +gTilesetTiles_GameCorner:: .incbin "data/tilesets/secondary/game_corner/tiles.4bpp.lz" .align 2 -gTilesetPalettes_GameCorner:: @ 8282FBC +gTilesetPalettes_GameCorner:: .incbin "data/tilesets/secondary/game_corner/palettes/00.gbapal" .incbin "data/tilesets/secondary/game_corner/palettes/01.gbapal" .incbin "data/tilesets/secondary/game_corner/palettes/02.gbapal" @@ -505,11 +505,11 @@ gTilesetPalettes_GameCorner:: @ 8282FBC .incbin "data/tilesets/secondary/game_corner/palettes/15.gbapal" .align 2 -gTilesetTiles_PewterGym:: @ 82831BC +gTilesetTiles_PewterGym:: .incbin "data/tilesets/secondary/pewter_gym/tiles.4bpp.lz" .align 2 -gTilesetPalettes_PewterGym:: @ 82839B0 +gTilesetPalettes_PewterGym:: .incbin "data/tilesets/secondary/pewter_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/pewter_gym/palettes/01.gbapal" .incbin "data/tilesets/secondary/pewter_gym/palettes/02.gbapal" @@ -528,11 +528,11 @@ gTilesetPalettes_PewterGym:: @ 82839B0 .incbin "data/tilesets/secondary/pewter_gym/palettes/15.gbapal" .align 2 -gTilesetTiles_CeruleanGym:: @ 8283BB0 +gTilesetTiles_CeruleanGym:: .incbin "data/tilesets/secondary/cerulean_gym/tiles.4bpp.lz" .align 2 -gTilesetPalettes_CeruleanGym:: @ 8283FF8 +gTilesetPalettes_CeruleanGym:: .incbin "data/tilesets/secondary/cerulean_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/cerulean_gym/palettes/01.gbapal" .incbin "data/tilesets/secondary/cerulean_gym/palettes/02.gbapal" @@ -551,11 +551,11 @@ gTilesetPalettes_CeruleanGym:: @ 8283FF8 .incbin "data/tilesets/secondary/cerulean_gym/palettes/15.gbapal" .align 2 -gTilesetTiles_VermilionGym:: @ 82841F8 +gTilesetTiles_VermilionGym:: .incbin "data/tilesets/secondary/vermilion_gym/tiles.4bpp.lz" .align 2 -gTilesetPalettes_VermilionGym:: @ 82849B8 +gTilesetPalettes_VermilionGym:: .incbin "data/tilesets/secondary/vermilion_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/vermilion_gym/palettes/01.gbapal" .incbin "data/tilesets/secondary/vermilion_gym/palettes/02.gbapal" @@ -574,11 +574,11 @@ gTilesetPalettes_VermilionGym:: @ 82849B8 .incbin "data/tilesets/secondary/vermilion_gym/palettes/15.gbapal" .align 2 -gTilesetTiles_CeladonGym:: @ 8284BB8 +gTilesetTiles_CeladonGym:: .incbin "data/tilesets/secondary/celadon_gym/tiles.4bpp.lz" .align 2 -gTilesetPalettes_CeladonGym:: @ 8285150 +gTilesetPalettes_CeladonGym:: .incbin "data/tilesets/secondary/celadon_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/celadon_gym/palettes/01.gbapal" .incbin "data/tilesets/secondary/celadon_gym/palettes/02.gbapal" @@ -597,11 +597,11 @@ gTilesetPalettes_CeladonGym:: @ 8285150 .incbin "data/tilesets/secondary/celadon_gym/palettes/15.gbapal" .align 2 -gTilesetTiles_FuchsiaGym:: @ 8285350 +gTilesetTiles_FuchsiaGym:: .incbin "data/tilesets/secondary/fuchsia_gym/tiles.4bpp.lz" .align 2 -gTilesetPalettes_FuchsiaGym:: @ 82857A4 +gTilesetPalettes_FuchsiaGym:: .incbin "data/tilesets/secondary/fuchsia_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/fuchsia_gym/palettes/01.gbapal" .incbin "data/tilesets/secondary/fuchsia_gym/palettes/02.gbapal" @@ -620,11 +620,11 @@ gTilesetPalettes_FuchsiaGym:: @ 82857A4 .incbin "data/tilesets/secondary/fuchsia_gym/palettes/15.gbapal" .align 2 -gTilesetTiles_SaffronGym:: @ 82859A4 +gTilesetTiles_SaffronGym:: .incbin "data/tilesets/secondary/saffron_gym/tiles.4bpp.lz" .align 2 -gTilesetPalettes_SaffronGym:: @ 8285D90 +gTilesetPalettes_SaffronGym:: .incbin "data/tilesets/secondary/saffron_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/saffron_gym/palettes/01.gbapal" .incbin "data/tilesets/secondary/saffron_gym/palettes/02.gbapal" @@ -643,11 +643,11 @@ gTilesetPalettes_SaffronGym:: @ 8285D90 .incbin "data/tilesets/secondary/saffron_gym/palettes/15.gbapal" .align 2 -gTilesetTiles_CinnabarGym:: @ 8285F90 +gTilesetTiles_CinnabarGym:: .incbin "data/tilesets/secondary/cinnabar_gym/tiles.4bpp.lz" .align 2 -gTilesetPalettes_CinnabarGym:: @ 82865D4 +gTilesetPalettes_CinnabarGym:: .incbin "data/tilesets/secondary/cinnabar_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/cinnabar_gym/palettes/01.gbapal" .incbin "data/tilesets/secondary/cinnabar_gym/palettes/02.gbapal" @@ -666,11 +666,11 @@ gTilesetPalettes_CinnabarGym:: @ 82865D4 .incbin "data/tilesets/secondary/cinnabar_gym/palettes/15.gbapal" .align 2 -gTilesetTiles_ViridianGym:: @ 82867D4 +gTilesetTiles_ViridianGym:: .incbin "data/tilesets/secondary/viridian_gym/tiles.4bpp.lz" .align 2 -gTilesetPalettes_ViridianGym:: @ 8286BC8 +gTilesetPalettes_ViridianGym:: .incbin "data/tilesets/secondary/viridian_gym/palettes/00.gbapal" .incbin "data/tilesets/secondary/viridian_gym/palettes/01.gbapal" .incbin "data/tilesets/secondary/viridian_gym/palettes/02.gbapal" @@ -689,11 +689,11 @@ gTilesetPalettes_ViridianGym:: @ 8286BC8 .incbin "data/tilesets/secondary/viridian_gym/palettes/15.gbapal" .align 2 -gTilesetTiles_SSAnne:: @ 8286DC8 +gTilesetTiles_SSAnne:: .incbin "data/tilesets/secondary/ss_anne/tiles.4bpp.lz" .align 2 -gTilesetPalettes_SSAnne:: @ 8287B80 +gTilesetPalettes_SSAnne:: .incbin "data/tilesets/secondary/ss_anne/palettes/00.gbapal" .incbin "data/tilesets/secondary/ss_anne/palettes/01.gbapal" .incbin "data/tilesets/secondary/ss_anne/palettes/02.gbapal" @@ -712,11 +712,11 @@ gTilesetPalettes_SSAnne:: @ 8287B80 .incbin "data/tilesets/secondary/ss_anne/palettes/15.gbapal" .align 2 -gTilesetTiles_Dummy2:: @ 8287D80 +gTilesetTiles_Dummy2:: .incbin "data/tilesets/secondary/dummy_2/tiles.4bpp.lz" .align 2 -gTilesetPalettes_Dummy2:: @ 8287D94 +gTilesetPalettes_Dummy2:: .incbin "data/tilesets/secondary/dummy_2/palettes/00.gbapal" .incbin "data/tilesets/secondary/dummy_2/palettes/01.gbapal" .incbin "data/tilesets/secondary/dummy_2/palettes/02.gbapal" @@ -735,11 +735,11 @@ gTilesetPalettes_Dummy2:: @ 8287D94 .incbin "data/tilesets/secondary/dummy_2/palettes/15.gbapal" .align 2 -gTilesetTiles_ViridianForest:: @ 8287F94 +gTilesetTiles_ViridianForest:: .incbin "data/tilesets/secondary/viridian_forest/tiles.4bpp.lz" .align 2 -gTilesetPalettes_ViridianForest:: @ 8288444 +gTilesetPalettes_ViridianForest:: .incbin "data/tilesets/secondary/viridian_forest/palettes/00.gbapal" .incbin "data/tilesets/secondary/viridian_forest/palettes/01.gbapal" .incbin "data/tilesets/secondary/viridian_forest/palettes/02.gbapal" @@ -758,11 +758,11 @@ gTilesetPalettes_ViridianForest:: @ 8288444 .incbin "data/tilesets/secondary/viridian_forest/palettes/15.gbapal" .align 2 -gTilesetTiles_UnusedGatehouse1:: @ 8288644 +gTilesetTiles_UnusedGatehouse1:: .incbin "data/tilesets/secondary/unused_gatehouse_1/tiles.4bpp.lz" .align 2 -gTilesetPalettes_UnusedGatehouse1:: @ 8288C60 +gTilesetPalettes_UnusedGatehouse1:: .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/00.gbapal" .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/01.gbapal" .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/02.gbapal" @@ -781,11 +781,11 @@ gTilesetPalettes_UnusedGatehouse1:: @ 8288C60 .incbin "data/tilesets/secondary/unused_gatehouse_1/palettes/15.gbapal" .align 2 -gTilesetTiles_RockTunnel:: @ 8288E60 +gTilesetTiles_RockTunnel:: .incbin "data/tilesets/secondary/rock_tunnel/tiles.4bpp.lz" .align 2 -gTilesetPalettes_RockTunnel:: @ 8289FC8 +gTilesetPalettes_RockTunnel:: .incbin "data/tilesets/secondary/rock_tunnel/palettes/00.gbapal" .incbin "data/tilesets/secondary/rock_tunnel/palettes/01.gbapal" .incbin "data/tilesets/secondary/rock_tunnel/palettes/02.gbapal" @@ -804,11 +804,11 @@ gTilesetPalettes_RockTunnel:: @ 8289FC8 .incbin "data/tilesets/secondary/rock_tunnel/palettes/15.gbapal" .align 2 -gTilesetTiles_DiglettsCave:: @ 828A1C8 +gTilesetTiles_DiglettsCave:: .incbin "data/tilesets/secondary/digletts_cave/tiles.4bpp.lz" .align 2 -gTilesetPalettes_DiglettsCave:: @ 828B250 +gTilesetPalettes_DiglettsCave:: .incbin "data/tilesets/secondary/digletts_cave/palettes/00.gbapal" .incbin "data/tilesets/secondary/digletts_cave/palettes/01.gbapal" .incbin "data/tilesets/secondary/digletts_cave/palettes/02.gbapal" @@ -827,11 +827,11 @@ gTilesetPalettes_DiglettsCave:: @ 828B250 .incbin "data/tilesets/secondary/digletts_cave/palettes/15.gbapal" .align 2 -gTilesetTiles_SeafoamIslands:: @ 828B450 +gTilesetTiles_SeafoamIslands:: .incbin "data/tilesets/secondary/seafoam_islands/tiles.4bpp.lz" .align 2 -gTilesetPalettes_SeafoamIslands:: @ 828CAA0 +gTilesetPalettes_SeafoamIslands:: .incbin "data/tilesets/secondary/seafoam_islands/palettes/00.gbapal" .incbin "data/tilesets/secondary/seafoam_islands/palettes/01.gbapal" .incbin "data/tilesets/secondary/seafoam_islands/palettes/02.gbapal" @@ -850,11 +850,11 @@ gTilesetPalettes_SeafoamIslands:: @ 828CAA0 .incbin "data/tilesets/secondary/seafoam_islands/palettes/15.gbapal" .align 2 -gTilesetTiles_UnusedGatehouse2:: @ 828CCA0 +gTilesetTiles_UnusedGatehouse2:: .incbin "data/tilesets/secondary/unused_gatehouse_2/tiles.4bpp.lz" .align 2 -gTilesetPalettes_UnusedGatehouse2:: @ 828D2BC +gTilesetPalettes_UnusedGatehouse2:: .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/00.gbapal" .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/01.gbapal" .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/02.gbapal" @@ -873,11 +873,11 @@ gTilesetPalettes_UnusedGatehouse2:: @ 828D2BC .incbin "data/tilesets/secondary/unused_gatehouse_2/palettes/15.gbapal" .align 2 -gTilesetTiles_CeruleanCave:: @ 828D4BC +gTilesetTiles_CeruleanCave:: .incbin "data/tilesets/secondary/cerulean_cave/tiles.4bpp.lz" .align 2 -gTilesetPalettes_CeruleanCave:: @ 828E3A4 +gTilesetPalettes_CeruleanCave:: .incbin "data/tilesets/secondary/cerulean_cave/palettes/00.gbapal" .incbin "data/tilesets/secondary/cerulean_cave/palettes/01.gbapal" .incbin "data/tilesets/secondary/cerulean_cave/palettes/02.gbapal" @@ -896,11 +896,11 @@ gTilesetPalettes_CeruleanCave:: @ 828E3A4 .incbin "data/tilesets/secondary/cerulean_cave/palettes/15.gbapal" .align 2 -gTilesetTiles_GenericBuilding2:: @ 828E5A4 +gTilesetTiles_GenericBuilding2:: .incbin "data/tilesets/secondary/generic_building_2/tiles.4bpp.lz" .align 2 -gTilesetPalettes_GenericBuilding2:: @ 828EC70 +gTilesetPalettes_GenericBuilding2:: .incbin "data/tilesets/secondary/generic_building_2/palettes/00.gbapal" .incbin "data/tilesets/secondary/generic_building_2/palettes/01.gbapal" .incbin "data/tilesets/secondary/generic_building_2/palettes/02.gbapal" @@ -919,11 +919,11 @@ gTilesetPalettes_GenericBuilding2:: @ 828EC70 .incbin "data/tilesets/secondary/generic_building_2/palettes/15.gbapal" .align 2 -gTilesetTiles_PowerPlant:: @ 828EE70 +gTilesetTiles_PowerPlant:: .incbin "data/tilesets/secondary/power_plant/tiles.4bpp.lz" .align 2 -gTilesetPalettes_PowerPlant:: @ 828F378 +gTilesetPalettes_PowerPlant:: .incbin "data/tilesets/secondary/power_plant/palettes/00.gbapal" .incbin "data/tilesets/secondary/power_plant/palettes/01.gbapal" .incbin "data/tilesets/secondary/power_plant/palettes/02.gbapal" @@ -942,11 +942,11 @@ gTilesetPalettes_PowerPlant:: @ 828F378 .incbin "data/tilesets/secondary/power_plant/palettes/15.gbapal" .align 2 -gTilesetTiles_SeaCottage:: @ 828F578 +gTilesetTiles_SeaCottage:: .incbin "data/tilesets/secondary/sea_cottage/tiles.4bpp.lz" .align 2 -gTilesetPalettes_SeaCottage:: @ 828F9D8 +gTilesetPalettes_SeaCottage:: .incbin "data/tilesets/secondary/sea_cottage/palettes/00.gbapal" .incbin "data/tilesets/secondary/sea_cottage/palettes/01.gbapal" .incbin "data/tilesets/secondary/sea_cottage/palettes/02.gbapal" @@ -965,11 +965,11 @@ gTilesetPalettes_SeaCottage:: @ 828F9D8 .incbin "data/tilesets/secondary/sea_cottage/palettes/15.gbapal" .align 2 -gTilesetTiles_SilphCo:: @ 828FBD8 +gTilesetTiles_SilphCo:: .incbin "data/tilesets/secondary/condominiums/tiles.4bpp.lz" .align 2 -gTilesetPalettes_SilphCo:: @ 8290DD0 +gTilesetPalettes_SilphCo:: .incbin "data/tilesets/secondary/condominiums/palettes/00.gbapal" .incbin "data/tilesets/secondary/condominiums/palettes/01.gbapal" .incbin "data/tilesets/secondary/condominiums/palettes/02.gbapal" @@ -988,11 +988,11 @@ gTilesetPalettes_SilphCo:: @ 8290DD0 .incbin "data/tilesets/secondary/condominiums/palettes/15.gbapal" .align 2 -gTilesetTiles_UndergroundPath:: @ 8290FD0 +gTilesetTiles_UndergroundPath:: .incbin "data/tilesets/secondary/underground_path/tiles.4bpp.lz" .align 2 -gTilesetPalettes_UndergroundPath:: @ 8291274 +gTilesetPalettes_UndergroundPath:: .incbin "data/tilesets/secondary/underground_path/palettes/00.gbapal" .incbin "data/tilesets/secondary/underground_path/palettes/01.gbapal" .incbin "data/tilesets/secondary/underground_path/palettes/02.gbapal" @@ -1011,11 +1011,11 @@ gTilesetPalettes_UndergroundPath:: @ 8291274 .incbin "data/tilesets/secondary/underground_path/palettes/15.gbapal" .align 2 -gTilesetTiles_PokemonTower:: @ 8291474 +gTilesetTiles_PokemonTower:: .incbin "data/tilesets/secondary/pokemon_tower/tiles.4bpp.lz" .align 2 -gTilesetPalettes_PokemonTower:: @ 8291AFC +gTilesetPalettes_PokemonTower:: .incbin "data/tilesets/secondary/pokemon_tower/palettes/00.gbapal" .incbin "data/tilesets/secondary/pokemon_tower/palettes/01.gbapal" .incbin "data/tilesets/secondary/pokemon_tower/palettes/02.gbapal" @@ -1034,11 +1034,11 @@ gTilesetPalettes_PokemonTower:: @ 8291AFC .incbin "data/tilesets/secondary/pokemon_tower/palettes/15.gbapal" .align 2 -gTilesetTiles_SafariZoneBuilding:: @ 8291CFC +gTilesetTiles_SafariZoneBuilding:: .incbin "data/tilesets/secondary/safari_zone_building/tiles.4bpp.lz" .align 2 -gTilesetPalettes_SafariZoneBuilding:: @ 82920F0 +gTilesetPalettes_SafariZoneBuilding:: .incbin "data/tilesets/secondary/safari_zone_building/palettes/00.gbapal" .incbin "data/tilesets/secondary/safari_zone_building/palettes/01.gbapal" .incbin "data/tilesets/secondary/safari_zone_building/palettes/02.gbapal" @@ -1057,11 +1057,11 @@ gTilesetPalettes_SafariZoneBuilding:: @ 82920F0 .incbin "data/tilesets/secondary/safari_zone_building/palettes/15.gbapal" .align 2 -gTilesetTiles_PokemonMansion:: @ 82922F0 +gTilesetTiles_PokemonMansion:: .incbin "data/tilesets/secondary/pokemon_mansion/tiles.4bpp.lz" .align 2 -gTilesetPalettes_PokemonMansion:: @ 8292FF0 +gTilesetPalettes_PokemonMansion:: .incbin "data/tilesets/secondary/pokemon_mansion/palettes/00.gbapal" .incbin "data/tilesets/secondary/pokemon_mansion/palettes/01.gbapal" .incbin "data/tilesets/secondary/pokemon_mansion/palettes/02.gbapal" @@ -1080,11 +1080,11 @@ gTilesetPalettes_PokemonMansion:: @ 8292FF0 .incbin "data/tilesets/secondary/pokemon_mansion/palettes/15.gbapal" .align 2 -gTilesetTiles_RestaurantHotel:: @ 82931F0 +gTilesetTiles_RestaurantHotel:: .incbin "data/tilesets/secondary/restaurant_hotel/tiles.4bpp.lz" .align 2 -gTilesetPalettes_RestaurantHotel:: @ 8293660 +gTilesetPalettes_RestaurantHotel:: .incbin "data/tilesets/secondary/restaurant_hotel/palettes/00.gbapal" .incbin "data/tilesets/secondary/restaurant_hotel/palettes/01.gbapal" .incbin "data/tilesets/secondary/restaurant_hotel/palettes/02.gbapal" @@ -1103,11 +1103,11 @@ gTilesetPalettes_RestaurantHotel:: @ 8293660 .incbin "data/tilesets/secondary/restaurant_hotel/palettes/15.gbapal" .align 2 -gTilesetTiles_School:: @ 8293860 +gTilesetTiles_School:: .incbin "data/tilesets/secondary/school/tiles.4bpp.lz" .align 2 -gTilesetPalettes_School:: @ 8293B0C +gTilesetPalettes_School:: .incbin "data/tilesets/secondary/school/palettes/00.gbapal" .incbin "data/tilesets/secondary/school/palettes/01.gbapal" .incbin "data/tilesets/secondary/school/palettes/02.gbapal" @@ -1126,11 +1126,11 @@ gTilesetPalettes_School:: @ 8293B0C .incbin "data/tilesets/secondary/school/palettes/15.gbapal" .align 2 -gTilesetTiles_FanClubDaycare:: @ 8293D0C +gTilesetTiles_FanClubDaycare:: .incbin "data/tilesets/secondary/fan_club_daycare/tiles.4bpp.lz" .align 2 -gTilesetPalettes_FanClubDaycare:: @ 8294144 +gTilesetPalettes_FanClubDaycare:: .incbin "data/tilesets/secondary/fan_club_daycare/palettes/00.gbapal" .incbin "data/tilesets/secondary/fan_club_daycare/palettes/01.gbapal" .incbin "data/tilesets/secondary/fan_club_daycare/palettes/02.gbapal" @@ -1149,11 +1149,11 @@ gTilesetPalettes_FanClubDaycare:: @ 8294144 .incbin "data/tilesets/secondary/fan_club_daycare/palettes/15.gbapal" .align 2 -gTilesetTiles_BurgledHouse:: @ 8294344 +gTilesetTiles_BurgledHouse:: .incbin "data/tilesets/secondary/burgled_house/tiles.4bpp.lz" .align 2 -gTilesetPalettes_BurgledHouse:: @ 8294D08 +gTilesetPalettes_BurgledHouse:: .incbin "data/tilesets/secondary/burgled_house/palettes/00.gbapal" .incbin "data/tilesets/secondary/burgled_house/palettes/01.gbapal" .incbin "data/tilesets/secondary/burgled_house/palettes/02.gbapal" @@ -1172,11 +1172,11 @@ gTilesetPalettes_BurgledHouse:: @ 8294D08 .incbin "data/tilesets/secondary/burgled_house/palettes/15.gbapal" .align 2 -gTilesetTiles_Dummy3:: @ 8294F08 +gTilesetTiles_Dummy3:: .incbin "data/tilesets/secondary/dummy_3/tiles.4bpp.lz" .align 2 -gTilesetPalettes_Dummy3:: @ 8294F18 +gTilesetPalettes_Dummy3:: .incbin "data/tilesets/secondary/dummy_3/palettes/00.gbapal" .incbin "data/tilesets/secondary/dummy_3/palettes/01.gbapal" .incbin "data/tilesets/secondary/dummy_3/palettes/02.gbapal" @@ -1195,11 +1195,11 @@ gTilesetPalettes_Dummy3:: @ 8294F18 .incbin "data/tilesets/secondary/dummy_3/palettes/15.gbapal" .align 2 -gTilesetTiles_Dummy4:: @ 8295118 +gTilesetTiles_Dummy4:: .incbin "data/tilesets/secondary/dummy_4/tiles.4bpp.lz" .align 2 -gTilesetPalettes_Dummy4:: @ 829512C +gTilesetPalettes_Dummy4:: .incbin "data/tilesets/secondary/dummy_4/palettes/00.gbapal" .incbin "data/tilesets/secondary/dummy_4/palettes/01.gbapal" .incbin "data/tilesets/secondary/dummy_4/palettes/02.gbapal" @@ -1218,11 +1218,11 @@ gTilesetPalettes_Dummy4:: @ 829512C .incbin "data/tilesets/secondary/dummy_4/palettes/15.gbapal" .align 2 -gTilesetTiles_MtEmber:: @ 829532C +gTilesetTiles_MtEmber:: .incbin "data/tilesets/secondary/mt_ember/tiles.4bpp.lz" .align 2 -gTilesetPalettes_MtEmber:: @ 82967D4 +gTilesetPalettes_MtEmber:: .incbin "data/tilesets/secondary/mt_ember/palettes/00.gbapal" .incbin "data/tilesets/secondary/mt_ember/palettes/01.gbapal" .incbin "data/tilesets/secondary/mt_ember/palettes/02.gbapal" @@ -1241,11 +1241,11 @@ gTilesetPalettes_MtEmber:: @ 82967D4 .incbin "data/tilesets/secondary/mt_ember/palettes/15.gbapal" .align 2 -gTilesetTiles_BerryForest:: @ 82969D4 +gTilesetTiles_BerryForest:: .incbin "data/tilesets/secondary/berry_forest/tiles.4bpp.lz" .align 2 -gTilesetPalettes_BerryForest:: @ 8296E90 +gTilesetPalettes_BerryForest:: .incbin "data/tilesets/secondary/berry_forest/palettes/00.gbapal" .incbin "data/tilesets/secondary/berry_forest/palettes/01.gbapal" .incbin "data/tilesets/secondary/berry_forest/palettes/02.gbapal" @@ -1264,11 +1264,11 @@ gTilesetPalettes_BerryForest:: @ 8296E90 .incbin "data/tilesets/secondary/berry_forest/palettes/15.gbapal" .align 2 -gTilesetTiles_NavelRock:: @ 8297090 +gTilesetTiles_NavelRock:: .incbin "data/tilesets/secondary/navel_rock/tiles.4bpp.lz" .align 2 -gTilesetPalettes_NavelRock:: @ 82983BC +gTilesetPalettes_NavelRock:: .incbin "data/tilesets/secondary/navel_rock/palettes/00.gbapal" .incbin "data/tilesets/secondary/navel_rock/palettes/01.gbapal" .incbin "data/tilesets/secondary/navel_rock/palettes/02.gbapal" @@ -1287,11 +1287,11 @@ gTilesetPalettes_NavelRock:: @ 82983BC .incbin "data/tilesets/secondary/navel_rock/palettes/15.gbapal" .align 2 -gTilesetTiles_TanobyRuins:: @ 82985BC +gTilesetTiles_TanobyRuins:: .incbin "data/tilesets/secondary/tanoby_ruins/tiles.4bpp.lz" .align 2 -gTilesetPalettes_TanobyRuins:: @ 8298970 +gTilesetPalettes_TanobyRuins:: .incbin "data/tilesets/secondary/tanoby_ruins/palettes/00.gbapal" .incbin "data/tilesets/secondary/tanoby_ruins/palettes/01.gbapal" .incbin "data/tilesets/secondary/tanoby_ruins/palettes/02.gbapal" @@ -1310,11 +1310,11 @@ gTilesetPalettes_TanobyRuins:: @ 8298970 .incbin "data/tilesets/secondary/tanoby_ruins/palettes/15.gbapal" .align 2 -gTilesetTiles_SeviiIslands123:: @ 8298B70 +gTilesetTiles_SeviiIslands123:: .incbin "data/tilesets/secondary/sevii_islands_123/tiles.4bpp.lz" .align 2 -gTilesetPalettes_SeviiIslands123:: @ 8299AA4 +gTilesetPalettes_SeviiIslands123:: .incbin "data/tilesets/secondary/sevii_islands_123/palettes/00.gbapal" .incbin "data/tilesets/secondary/sevii_islands_123/palettes/01.gbapal" .incbin "data/tilesets/secondary/sevii_islands_123/palettes/02.gbapal" @@ -1333,11 +1333,11 @@ gTilesetPalettes_SeviiIslands123:: @ 8299AA4 .incbin "data/tilesets/secondary/sevii_islands_123/palettes/15.gbapal" .align 2 -gTilesetTiles_SeviiIslands45:: @ 8299CA4 +gTilesetTiles_SeviiIslands45:: .incbin "data/tilesets/secondary/sevii_islands_45/tiles.4bpp.lz" .align 2 -gTilesetPalettes_SeviiIslands45:: @ 829AB04 +gTilesetPalettes_SeviiIslands45:: .incbin "data/tilesets/secondary/sevii_islands_45/palettes/00.gbapal" .incbin "data/tilesets/secondary/sevii_islands_45/palettes/01.gbapal" .incbin "data/tilesets/secondary/sevii_islands_45/palettes/02.gbapal" @@ -1356,11 +1356,11 @@ gTilesetPalettes_SeviiIslands45:: @ 829AB04 .incbin "data/tilesets/secondary/sevii_islands_45/palettes/15.gbapal" .align 2 -gTilesetTiles_SeviiIslands67:: @ 829AD04 +gTilesetTiles_SeviiIslands67:: .incbin "data/tilesets/secondary/sevii_islands_67/tiles.4bpp.lz" .align 2 -gTilesetPalettes_SeviiIslands67:: @ 829BD64 +gTilesetPalettes_SeviiIslands67:: .incbin "data/tilesets/secondary/sevii_islands_67/palettes/00.gbapal" .incbin "data/tilesets/secondary/sevii_islands_67/palettes/01.gbapal" .incbin "data/tilesets/secondary/sevii_islands_67/palettes/02.gbapal" @@ -1379,11 +1379,11 @@ gTilesetPalettes_SeviiIslands67:: @ 829BD64 .incbin "data/tilesets/secondary/sevii_islands_67/palettes/15.gbapal" .align 2 -gTilesetTiles_TrainerTower:: @ 829BF64 +gTilesetTiles_TrainerTower:: .incbin "data/tilesets/secondary/trainer_tower/tiles.4bpp.lz" .align 2 -gTilesetPalettes_TrainerTower:: @ 829CEE4 +gTilesetPalettes_TrainerTower:: .incbin "data/tilesets/secondary/trainer_tower/palettes/00.gbapal" .incbin "data/tilesets/secondary/trainer_tower/palettes/01.gbapal" .incbin "data/tilesets/secondary/trainer_tower/palettes/02.gbapal" @@ -1402,11 +1402,11 @@ gTilesetPalettes_TrainerTower:: @ 829CEE4 .incbin "data/tilesets/secondary/trainer_tower/palettes/15.gbapal" .align 2 -gTilesetTiles_IslandHarbor:: @ 829D0E4 +gTilesetTiles_IslandHarbor:: .incbin "data/tilesets/secondary/island_harbor/tiles.4bpp.lz" .align 2 -gTilesetPalettes_IslandHarbor:: @ 829D894 +gTilesetPalettes_IslandHarbor:: .incbin "data/tilesets/secondary/island_harbor/palettes/00.gbapal" .incbin "data/tilesets/secondary/island_harbor/palettes/01.gbapal" .incbin "data/tilesets/secondary/island_harbor/palettes/02.gbapal" @@ -1425,11 +1425,11 @@ gTilesetPalettes_IslandHarbor:: @ 829D894 .incbin "data/tilesets/secondary/island_harbor/palettes/15.gbapal" .align 2 -gTilesetTiles_PokemonLeague:: @ 829DA94 +gTilesetTiles_PokemonLeague:: .incbin "data/tilesets/secondary/pokemon_league/tiles.4bpp.lz" .align 2 -gTilesetPalettes_PokemonLeague:: @ 829EA50 +gTilesetPalettes_PokemonLeague:: .incbin "data/tilesets/secondary/pokemon_league/palettes/00.gbapal" .incbin "data/tilesets/secondary/pokemon_league/palettes/01.gbapal" .incbin "data/tilesets/secondary/pokemon_league/palettes/02.gbapal" @@ -1448,11 +1448,11 @@ gTilesetPalettes_PokemonLeague:: @ 829EA50 .incbin "data/tilesets/secondary/pokemon_league/palettes/15.gbapal" .align 2 -gTilesetTiles_HallOfFame:: @ 829EC50 +gTilesetTiles_HallOfFame:: .incbin "data/tilesets/secondary/hall_of_fame/tiles.4bpp.lz" .align 2 -gTilesetPalettes_HallOfFame:: @ 829F4C8 +gTilesetPalettes_HallOfFame:: .incbin "data/tilesets/secondary/hall_of_fame/palettes/00.gbapal" .incbin "data/tilesets/secondary/hall_of_fame/palettes/01.gbapal" .incbin "data/tilesets/secondary/hall_of_fame/palettes/02.gbapal" diff --git a/data/tilesets/metatiles.inc b/data/tilesets/metatiles.inc index 2fd3168c2..af9fe19a1 100644 --- a/data/tilesets/metatiles.inc +++ b/data/tilesets/metatiles.inc @@ -1,161 +1,161 @@ .align 1 -gMetatiles_General:: @ 829F6C8 +gMetatiles_General:: .incbin "data/tilesets/primary/general/metatiles.bin" .align 1 -gMetatileAttributes_General:: @ 82A1EC8 +gMetatileAttributes_General:: .incbin "data/tilesets/primary/general/metatile_attributes.bin" .align 1 -gMetatiles_PalletTown:: @ 82A28C8 +gMetatiles_PalletTown:: .incbin "data/tilesets/secondary/pallet_town/metatiles.bin" .align 1 -gMetatileAttributes_PalletTown:: @ 82A2E58 +gMetatileAttributes_PalletTown:: .incbin "data/tilesets/secondary/pallet_town/metatile_attributes.bin" .align 1 -gMetatiles_ViridianCity:: @ 82A2FBC +gMetatiles_ViridianCity:: .incbin "data/tilesets/secondary/viridian_city/metatiles.bin" .align 1 -gMetatileAttributes_ViridianCity:: @ 82A35AC +gMetatileAttributes_ViridianCity:: .incbin "data/tilesets/secondary/viridian_city/metatile_attributes.bin" .align 1 -gMetatiles_PewterCity:: @ 82A3728 +gMetatiles_PewterCity:: .incbin "data/tilesets/secondary/pewter_city/metatiles.bin" .align 1 -gMetatileAttributes_PewterCity:: @ 82A3C18 +gMetatileAttributes_PewterCity:: .incbin "data/tilesets/secondary/pewter_city/metatile_attributes.bin" .align 1 -gMetatiles_CeruleanCity:: @ 82A3D54 +gMetatiles_CeruleanCity:: .incbin "data/tilesets/secondary/cerulean_city/metatiles.bin" .align 1 -gMetatileAttributes_CeruleanCity:: @ 82A45B4 +gMetatileAttributes_CeruleanCity:: .incbin "data/tilesets/secondary/cerulean_city/metatile_attributes.bin" .align 1 -gMetatiles_LavenderTown:: @ 82A47CC +gMetatiles_LavenderTown:: .incbin "data/tilesets/secondary/lavender_town/metatiles.bin" .align 1 -gMetatileAttributes_LavenderTown:: @ 82A556C +gMetatileAttributes_LavenderTown:: .incbin "data/tilesets/secondary/lavender_town/metatile_attributes.bin" .align 1 -gMetatiles_VermilionCity:: @ 82A58D4 +gMetatiles_VermilionCity:: .incbin "data/tilesets/secondary/vermilion_city/metatiles.bin" .align 1 -gMetatileAttributes_VermilionCity:: @ 82A6354 +gMetatileAttributes_VermilionCity:: .incbin "data/tilesets/secondary/vermilion_city/metatile_attributes.bin" .align 1 -gMetatiles_CeladonCity:: @ 82A65F4 +gMetatiles_CeladonCity:: .incbin "data/tilesets/secondary/celadon_city/metatiles.bin" .align 1 -gMetatileAttributes_CeladonCity:: @ 82A74F4 +gMetatileAttributes_CeladonCity:: .incbin "data/tilesets/secondary/celadon_city/metatile_attributes.bin" .align 1 -gMetatiles_FuchsiaCity:: @ 82A78B4 +gMetatiles_FuchsiaCity:: .incbin "data/tilesets/secondary/fuchsia_city/metatiles.bin" .align 1 -gMetatileAttributes_FuchsiaCity:: @ 82A84B4 +gMetatileAttributes_FuchsiaCity:: .incbin "data/tilesets/secondary/fuchsia_city/metatile_attributes.bin" .align 1 -gMetatiles_CinnabarIsland:: @ 82A87B4 +gMetatiles_CinnabarIsland:: .incbin "data/tilesets/secondary/cinnabar_island/metatiles.bin" .align 1 -gMetatileAttributes_CinnabarIsland:: @ 82A8BB4 +gMetatileAttributes_CinnabarIsland:: .incbin "data/tilesets/secondary/cinnabar_island/metatile_attributes.bin" .align 1 -gMetatiles_IndigoPlateau:: @ 82A8CB4 +gMetatiles_IndigoPlateau:: .incbin "data/tilesets/secondary/indigo_plateau/metatiles.bin" .align 1 -gMetatileAttributes_IndigoPlateau:: @ 82A97B4 +gMetatileAttributes_IndigoPlateau:: .incbin "data/tilesets/secondary/indigo_plateau/metatile_attributes.bin" .align 1 -gMetatiles_SaffronCity:: @ 82A9A74 +gMetatiles_SaffronCity:: .incbin "data/tilesets/secondary/saffron_city/metatiles.bin" .align 1 -gMetatileAttributes_SaffronCity:: @ 82AA6F4 +gMetatileAttributes_SaffronCity:: .incbin "data/tilesets/secondary/saffron_city/metatile_attributes.bin" .align 1 -gMetatiles_PewterGym:: @ 82AAA14 +gMetatiles_PewterGym:: .incbin "data/tilesets/secondary/pewter_gym/metatiles.bin" .align 1 -gMetatileAttributes_PewterGym:: @ 82AB064 +gMetatileAttributes_PewterGym:: .incbin "data/tilesets/secondary/pewter_gym/metatile_attributes.bin" .align 1 -gMetatiles_CeruleanGym:: @ 82AB1F8 +gMetatiles_CeruleanGym:: .incbin "data/tilesets/secondary/cerulean_gym/metatiles.bin" .align 1 -gMetatileAttributes_CeruleanGym:: @ 82AB738 +gMetatileAttributes_CeruleanGym:: .incbin "data/tilesets/secondary/cerulean_gym/metatile_attributes.bin" .align 1 -gMetatiles_VermilionGym:: @ 82AB888 +gMetatiles_VermilionGym:: .incbin "data/tilesets/secondary/vermilion_gym/metatiles.bin" .align 1 -gMetatileAttributes_VermilionGym:: @ 82ABD38 +gMetatileAttributes_VermilionGym:: .incbin "data/tilesets/secondary/vermilion_gym/metatile_attributes.bin" .align 1 -gMetatiles_CeladonGym:: @ 82ABE64 +gMetatiles_CeladonGym:: .incbin "data/tilesets/secondary/celadon_gym/metatiles.bin" .align 1 -gMetatileAttributes_CeladonGym:: @ 82AC264 +gMetatileAttributes_CeladonGym:: .incbin "data/tilesets/secondary/celadon_gym/metatile_attributes.bin" .align 1 -gMetatiles_FuchsiaGym:: @ 82AC364 +gMetatiles_FuchsiaGym:: .incbin "data/tilesets/secondary/fuchsia_gym/metatiles.bin" .align 1 -gMetatileAttributes_FuchsiaGym:: @ 82AC584 +gMetatileAttributes_FuchsiaGym:: .incbin "data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin" .align 1 -gMetatiles_SaffronGym:: @ 82AC60C +gMetatiles_SaffronGym:: .incbin "data/tilesets/secondary/saffron_gym/metatiles.bin" .align 1 -gMetatileAttributes_SaffronGym:: @ 82AC8EC +gMetatileAttributes_SaffronGym:: .incbin "data/tilesets/secondary/saffron_gym/metatile_attributes.bin" .align 1 -gMetatiles_CinnabarGym:: @ 82AC9A4 +gMetatiles_CinnabarGym:: .incbin "data/tilesets/secondary/cinnabar_gym/metatiles.bin" .align 1 -gMetatileAttributes_CinnabarGym:: @ 82ACFA4 +gMetatileAttributes_CinnabarGym:: .incbin "data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin" .align 1 -gMetatiles_ViridianGym:: @ 82AD124 +gMetatiles_ViridianGym:: .incbin "data/tilesets/secondary/viridian_gym/metatiles.bin" .align 1 -gMetatileAttributes_ViridianGym:: @ 82AD664 +gMetatileAttributes_ViridianGym:: .incbin "data/tilesets/secondary/viridian_gym/metatile_attributes.bin" .align 1 @@ -167,377 +167,377 @@ gMetatileAttributes_Building:: @ Building .incbin "data/tilesets/primary/building/metatile_attributes.bin" .align 1 -gMetatiles_Dummy1:: @ 82B09B4 +gMetatiles_Dummy1:: .incbin "data/tilesets/secondary/dummy_1/metatiles.bin" .align 1 -gMetatileAttributes_Dummy1:: @ 82B09D4 +gMetatileAttributes_Dummy1:: .incbin "data/tilesets/secondary/dummy_1/metatile_attributes.bin" .align 1 -gMetatiles_HoennBuilding:: @ 82B09DC +gMetatiles_HoennBuilding:: .incbin "data/tilesets/secondary/hoenn_building/metatiles.bin" .align 1 -gMetatileAttributes_HoennBuilding:: @ 82B29DC +gMetatileAttributes_HoennBuilding:: .incbin "data/tilesets/secondary/hoenn_building/metatile_attributes.bin" .align 1 -gMetatiles_BikeShop:: @ 82B31DC +gMetatiles_BikeShop:: .incbin "data/tilesets/secondary/bike_shop/metatiles.bin" .align 1 -gMetatileAttributes_BikeShop:: @ 82B347C +gMetatileAttributes_BikeShop:: .incbin "data/tilesets/secondary/bike_shop/metatile_attributes.bin" .align 1 -gMetatiles_Mart:: @ 82B3524 +gMetatiles_Mart:: .incbin "data/tilesets/secondary/mart/metatiles.bin" .align 1 -gMetatileAttributes_Mart:: @ 82B3954 +gMetatileAttributes_Mart:: .incbin "data/tilesets/secondary/mart/metatile_attributes.bin" .align 1 -gMetatiles_PokemonCenter:: @ 82B3A60 +gMetatiles_PokemonCenter:: .incbin "data/tilesets/secondary/pokemon_center/metatiles.bin" .align 1 -gMetatileAttributes_PokemonCenter:: @ 82B4A50 +gMetatileAttributes_PokemonCenter:: .incbin "data/tilesets/secondary/pokemon_center/metatile_attributes.bin" .align 1 -gMetatiles_GenericBuilding1:: @ 82B4E4C +gMetatiles_GenericBuilding1:: .incbin "data/tilesets/secondary/generic_building_1/metatiles.bin" .align 1 -gMetatileAttributes_GenericBuilding1:: @ 82B4FCC +gMetatileAttributes_GenericBuilding1:: .incbin "data/tilesets/secondary/generic_building_1/metatile_attributes.bin" .align 1 -gMetatiles_Cave:: @ 82B502C +gMetatiles_Cave:: .incbin "data/tilesets/secondary/cave/metatiles.bin" .align 1 -gMetatileAttributes_Cave:: @ 82B5A3C +gMetatileAttributes_Cave:: .incbin "data/tilesets/secondary/cave/metatile_attributes.bin" .align 1 -gMetatiles_GameCorner:: @ 82B5CC0 +gMetatiles_GameCorner:: .incbin "data/tilesets/secondary/game_corner/metatiles.bin" .align 1 -gMetatileAttributes_GameCorner:: @ 82B6640 +gMetatileAttributes_GameCorner:: .incbin "data/tilesets/secondary/game_corner/metatile_attributes.bin" .align 1 -gMetatiles_Lab:: @ 82B68A0 +gMetatiles_Lab:: .incbin "data/tilesets/secondary/lab/metatiles.bin" .align 1 -gMetatileAttributes_Lab:: @ 82B7390 +gMetatileAttributes_Lab:: .incbin "data/tilesets/secondary/lab/metatile_attributes.bin" .align 1 -gMetatiles_SSAnne:: @ 82B764C +gMetatiles_SSAnne:: .incbin "data/tilesets/secondary/ss_anne/metatiles.bin" .align 1 -gMetatileAttributes_SSAnne:: @ 82B8B4C +gMetatileAttributes_SSAnne:: .incbin "data/tilesets/secondary/ss_anne/metatile_attributes.bin" .align 1 -gMetatiles_Dummy2:: @ 82B908C +gMetatiles_Dummy2:: .incbin "data/tilesets/secondary/dummy_2/metatiles.bin" .align 1 -gMetatileAttributes_Dummy2:: @ 82B90AC +gMetatileAttributes_Dummy2:: .incbin "data/tilesets/secondary/dummy_2/metatile_attributes.bin" .align 1 -gMetatiles_ViridianForest:: @ 82B90B4 +gMetatiles_ViridianForest:: .incbin "data/tilesets/secondary/viridian_forest/metatiles.bin" .align 1 -gMetatileAttributes_ViridianForest:: @ 82B9364 +gMetatileAttributes_ViridianForest:: .incbin "data/tilesets/secondary/viridian_forest/metatile_attributes.bin" .align 1 -gMetatiles_UnusedGatehouse1:: @ 82B9410 +gMetatiles_UnusedGatehouse1:: .incbin "data/tilesets/secondary/unused_gatehouse_1/metatiles.bin" .align 1 -gMetatileAttributes_UnusedGatehouse1:: @ 82B9B30 +gMetatileAttributes_UnusedGatehouse1:: .incbin "data/tilesets/secondary/unused_gatehouse_1/metatile_attributes.bin" .align 1 -gMetatiles_RockTunnel:: @ 82B9CF8 +gMetatiles_RockTunnel:: .incbin "data/tilesets/secondary/rock_tunnel/metatiles.bin" .align 1 -gMetatileAttributes_RockTunnel:: @ 82BA678 +gMetatileAttributes_RockTunnel:: .incbin "data/tilesets/secondary/rock_tunnel/metatile_attributes.bin" .align 1 -gMetatiles_DiglettsCave:: @ 82BA8D8 +gMetatiles_DiglettsCave:: .incbin "data/tilesets/secondary/digletts_cave/metatiles.bin" .align 1 -gMetatileAttributes_DiglettsCave:: @ 82BB2A8 +gMetatileAttributes_DiglettsCave:: .incbin "data/tilesets/secondary/digletts_cave/metatile_attributes.bin" .align 1 -gMetatiles_SeafoamIslands:: @ 82BB51C +gMetatiles_SeafoamIslands:: .incbin "data/tilesets/secondary/seafoam_islands/metatiles.bin" .align 1 -gMetatileAttributes_SeafoamIslands:: @ 82BC49C +gMetatileAttributes_SeafoamIslands:: .incbin "data/tilesets/secondary/seafoam_islands/metatile_attributes.bin" .align 1 -gMetatiles_UnusedGatehouse2:: @ 82BC87C +gMetatiles_UnusedGatehouse2:: .incbin "data/tilesets/secondary/unused_gatehouse_2/metatiles.bin" .align 1 -gMetatileAttributes_UnusedGatehouse2:: @ 82BCF9C +gMetatileAttributes_UnusedGatehouse2:: .incbin "data/tilesets/secondary/unused_gatehouse_2/metatile_attributes.bin" .align 1 -gMetatiles_CeruleanCave:: @ 82BD164 +gMetatiles_CeruleanCave:: .incbin "data/tilesets/secondary/cerulean_cave/metatiles.bin" .align 1 -gMetatileAttributes_CeruleanCave:: @ 82BD9C4 +gMetatileAttributes_CeruleanCave:: .incbin "data/tilesets/secondary/cerulean_cave/metatile_attributes.bin" .align 1 -gMetatiles_DepartmentStore:: @ 82BDBDC +gMetatiles_DepartmentStore:: .incbin "data/tilesets/secondary/department_store/metatiles.bin" .align 1 -gMetatileAttributes_DepartmentStore:: @ 82BEB3C +gMetatileAttributes_DepartmentStore:: .incbin "data/tilesets/secondary/department_store/metatile_attributes.bin" .align 1 -gMetatiles_GenericBuilding2:: @ 82BEF14 +gMetatiles_GenericBuilding2:: .incbin "data/tilesets/secondary/generic_building_2/metatiles.bin" .align 1 -gMetatileAttributes_GenericBuilding2:: @ 82BFA94 +gMetatileAttributes_GenericBuilding2:: .incbin "data/tilesets/secondary/generic_building_2/metatile_attributes.bin" .align 1 -gMetatiles_PowerPlant:: @ 82BFD74 +gMetatiles_PowerPlant:: .incbin "data/tilesets/secondary/power_plant/metatiles.bin" .align 1 -gMetatileAttributes_PowerPlant:: @ 82C0704 +gMetatileAttributes_PowerPlant:: .incbin "data/tilesets/secondary/power_plant/metatile_attributes.bin" .align 1 -gMetatiles_SeaCottage:: @ 82C0968 +gMetatiles_SeaCottage:: .incbin "data/tilesets/secondary/sea_cottage/metatiles.bin" .align 1 -gMetatileAttributes_SeaCottage:: @ 82C0D18 +gMetatileAttributes_SeaCottage:: .incbin "data/tilesets/secondary/sea_cottage/metatile_attributes.bin" .align 1 -gMetatiles_SilphCo:: @ 82C0E04 +gMetatiles_SilphCo:: .incbin "data/tilesets/secondary/silph_co/metatiles.bin" .align 1 -gMetatileAttributes_SilphCo:: @ 82C25A4 +gMetatileAttributes_SilphCo:: .incbin "data/tilesets/secondary/silph_co/metatile_attributes.bin" .align 1 -gMetatiles_UndergroundPath:: @ 82C2B8C +gMetatiles_UndergroundPath:: .incbin "data/tilesets/secondary/underground_path/metatiles.bin" .align 1 -gMetatileAttributes_UndergroundPath:: @ 82C300C +gMetatileAttributes_UndergroundPath:: .incbin "data/tilesets/secondary/underground_path/metatile_attributes.bin" .align 1 -gMetatiles_PokemonTower:: @ 82C312C +gMetatiles_PokemonTower:: .incbin "data/tilesets/secondary/pokemon_tower/metatiles.bin" .align 1 -gMetatileAttributes_PokemonTower:: @ 82C377C +gMetatileAttributes_PokemonTower:: .incbin "data/tilesets/secondary/pokemon_tower/metatile_attributes.bin" .align 1 -gMetatiles_SafariZoneBuilding:: @ 82C3910 +gMetatiles_SafariZoneBuilding:: .incbin "data/tilesets/secondary/safari_zone_building/metatiles.bin" .align 1 -gMetatileAttributes_SafariZoneBuilding:: @ 82C4110 +gMetatileAttributes_SafariZoneBuilding:: .incbin "data/tilesets/secondary/safari_zone_building/metatile_attributes.bin" .align 1 -gMetatiles_PokemonMansion:: @ 82C4310 +gMetatiles_PokemonMansion:: .incbin "data/tilesets/secondary/pokemon_mansion/metatiles.bin" .align 1 -gMetatileAttributes_PokemonMansion:: @ 82C5330 +gMetatileAttributes_PokemonMansion:: .incbin "data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin" .align 1 -gMetatiles_Museum:: @ 82C5738 +gMetatiles_Museum:: .incbin "data/tilesets/secondary/museum/metatiles.bin" .align 1 -gMetatileAttributes_Museum:: @ 82C5FA8 +gMetatileAttributes_Museum:: .incbin "data/tilesets/secondary/museum/metatile_attributes.bin" .align 1 -gMetatiles_CableClub:: @ 82C61C4 +gMetatiles_CableClub:: .incbin "data/tilesets/secondary/cable_club/metatiles.bin" .align 1 -gMetatileAttributes_CableClub:: @ 82C71C4 +gMetatileAttributes_CableClub:: .incbin "data/tilesets/secondary/cable_club/metatile_attributes.bin" .align 1 -gMetatiles_RestaurantHotel:: @ 82C75C4 +gMetatiles_RestaurantHotel:: .incbin "data/tilesets/secondary/restaurant_hotel/metatiles.bin" .align 1 -gMetatileAttributes_RestaurantHotel:: @ 82C7C44 +gMetatileAttributes_RestaurantHotel:: .incbin "data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin" .align 1 -gMetatiles_School:: @ 82C7DE4 +gMetatiles_School:: .incbin "data/tilesets/secondary/school/metatiles.bin" .align 1 -gMetatileAttributes_School:: @ 82C80C4 +gMetatileAttributes_School:: .incbin "data/tilesets/secondary/school/metatile_attributes.bin" .align 1 -gMetatiles_FanClubDaycare:: @ 82C817C +gMetatiles_FanClubDaycare:: .incbin "data/tilesets/secondary/fan_club_daycare/metatiles.bin" .align 1 -gMetatileAttributes_FanClubDaycare:: @ 82C8C1C +gMetatileAttributes_FanClubDaycare:: .incbin "data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin" .align 1 -gMetatiles_Condominiums:: @ 82C8EC4 +gMetatiles_Condominiums:: .incbin "data/tilesets/secondary/condominiums/metatiles.bin" .align 1 -gMetatileAttributes_Condominiums:: @ 82C9C34 +gMetatileAttributes_Condominiums:: .incbin "data/tilesets/secondary/condominiums/metatile_attributes.bin" .align 1 -gMetatiles_BurgledHouse:: @ 82C9F90 +gMetatiles_BurgledHouse:: .incbin "data/tilesets/secondary/burgled_house/metatiles.bin" .align 1 -gMetatileAttributes_BurgledHouse:: @ 82CA320 +gMetatileAttributes_BurgledHouse:: .incbin "data/tilesets/secondary/burgled_house/metatile_attributes.bin" .align 1 -gMetatiles_Dummy3:: @ 82CA404 +gMetatiles_Dummy3:: .incbin "data/tilesets/secondary/dummy_3/metatiles.bin" .align 1 -gMetatileAttributes_Dummy3:: @ 82CA424 +gMetatileAttributes_Dummy3:: .incbin "data/tilesets/secondary/dummy_3/metatile_attributes.bin" .align 1 -gMetatiles_Dummy4:: @ 82CA42C +gMetatiles_Dummy4:: .incbin "data/tilesets/secondary/dummy_4/metatiles.bin" .align 1 -gMetatileAttributes_Dummy4:: @ 82CA44C +gMetatileAttributes_Dummy4:: .incbin "data/tilesets/secondary/dummy_4/metatile_attributes.bin" .align 1 -gMetatiles_MtEmber:: @ 82CA454 +gMetatiles_MtEmber:: .incbin "data/tilesets/secondary/mt_ember/metatiles.bin" .align 1 -gMetatileAttributes_MtEmber:: @ 82CB274 +gMetatileAttributes_MtEmber:: .incbin "data/tilesets/secondary/mt_ember/metatile_attributes.bin" .align 1 -gMetatiles_BerryForest:: @ 82CB5FC +gMetatiles_BerryForest:: .incbin "data/tilesets/secondary/berry_forest/metatiles.bin" .align 1 -gMetatileAttributes_BerryForest:: @ 82CB89C +gMetatileAttributes_BerryForest:: .incbin "data/tilesets/secondary/berry_forest/metatile_attributes.bin" .align 1 -gMetatiles_NavelRock:: @ 82CB944 +gMetatiles_NavelRock:: .incbin "data/tilesets/secondary/navel_rock/metatiles.bin" .align 1 -gMetatileAttributes_NavelRock:: @ 82CC704 +gMetatileAttributes_NavelRock:: .incbin "data/tilesets/secondary/navel_rock/metatile_attributes.bin" .align 1 -gMetatiles_TanobyRuins:: @ 82CCA74 +gMetatiles_TanobyRuins:: .incbin "data/tilesets/secondary/tanoby_ruins/metatiles.bin" .align 1 -gMetatileAttributes_TanobyRuins:: @ 82CD054 +gMetatileAttributes_TanobyRuins:: .incbin "data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin" .align 1 -gMetatiles_SeviiIslands123:: @ 82CD1CC +gMetatiles_SeviiIslands123:: .incbin "data/tilesets/secondary/sevii_islands_123/metatiles.bin" .align 1 -gMetatileAttributes_SeviiIslands123:: @ 82CE39C +gMetatileAttributes_SeviiIslands123:: .incbin "data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin" .align 1 -gMetatiles_SeviiIslands45:: @ 82CE810 +gMetatiles_SeviiIslands45:: .incbin "data/tilesets/secondary/sevii_islands_45/metatiles.bin" .align 1 -gMetatileAttributes_SeviiIslands45:: @ 82CF190 +gMetatileAttributes_SeviiIslands45:: .incbin "data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin" .align 1 -gMetatiles_SeviiIslands67:: @ 82CF3F0 +gMetatiles_SeviiIslands67:: .incbin "data/tilesets/secondary/sevii_islands_67/metatiles.bin" .align 1 -gMetatileAttributes_SeviiIslands67:: @ 82D02F0 +gMetatileAttributes_SeviiIslands67:: .incbin "data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin" .align 1 -gMetatiles_TrainerTower:: @ 82D06B0 +gMetatiles_TrainerTower:: .incbin "data/tilesets/secondary/trainer_tower/metatiles.bin" .align 1 -gMetatileAttributes_TrainerTower:: @ 82D18B0 +gMetatileAttributes_TrainerTower:: .incbin "data/tilesets/secondary/trainer_tower/metatile_attributes.bin" .align 1 -gMetatiles_IslandHarbor:: @ 82D1D30 +gMetatiles_IslandHarbor:: .incbin "data/tilesets/secondary/island_harbor/metatiles.bin" .align 1 -gMetatileAttributes_IslandHarbor:: @ 82D2220 +gMetatileAttributes_IslandHarbor:: .incbin "data/tilesets/secondary/island_harbor/metatile_attributes.bin" .align 1 -gMetatiles_PokemonLeague:: @ 82D235C +gMetatiles_PokemonLeague:: .incbin "data/tilesets/secondary/pokemon_league/metatiles.bin" .align 1 -gMetatileAttributes_PokemonLeague:: @ 82D3B5C +gMetatileAttributes_PokemonLeague:: .incbin "data/tilesets/secondary/pokemon_league/metatile_attributes.bin" .align 1 -gMetatiles_HallOfFame:: @ 82D415C +gMetatiles_HallOfFame:: .incbin "data/tilesets/secondary/hall_of_fame/metatiles.bin" .align 1 -gMetatileAttributes_HallOfFame:: @ 82D48BC +gMetatileAttributes_HallOfFame:: .incbin "data/tilesets/secondary/hall_of_fame/metatile_attributes.bin" diff --git a/sound/music_player_table.inc b/sound/music_player_table.inc index a82eef72b..6c74a1352 100644 --- a/sound/music_player_table.inc +++ b/sound/music_player_table.inc @@ -1,5 +1,5 @@ .align 2 -gMPlayTable:: @ 84A329C +gMPlayTable:: music_player gMPlayInfo_BGM, gMPlayTrack_BGM, 10, 0 music_player gMPlayInfo_SE1, gMPlayTrack_SE1, 3, 1 music_player gMPlayInfo_SE2, gMPlayTrack_SE2, 9, 1 diff --git a/sound/programmable_wave_data.inc b/sound/programmable_wave_data.inc index bdb5cf4d2..33cfebde4 100644 --- a/sound/programmable_wave_data.inc +++ b/sound/programmable_wave_data.inc @@ -1,33 +1,33 @@ -gProgrammableWaveData_84A31EC:: @ 84A31EC +gProgrammableWaveData_84A31EC:: .incbin "sound/programmable_wave_samples/84A31EC.pcm" -gProgrammableWaveData_84A31FC:: @ 84A31FC +gProgrammableWaveData_84A31FC:: .incbin "sound/programmable_wave_samples/84A31FC.pcm" -gProgrammableWaveData_84A320C:: @ 84A320C +gProgrammableWaveData_84A320C:: .incbin "sound/programmable_wave_samples/84A320C.pcm" -gProgrammableWaveData_84A321C:: @ 84A321C +gProgrammableWaveData_84A321C:: .incbin "sound/programmable_wave_samples/84A321C.pcm" -gProgrammableWaveData_84A322C:: @ 84A322C +gProgrammableWaveData_84A322C:: .incbin "sound/programmable_wave_samples/84A322C.pcm" -gProgrammableWaveData_84A323C:: @ 84A323C +gProgrammableWaveData_84A323C:: .incbin "sound/programmable_wave_samples/84A323C.pcm" -gProgrammableWaveData_84A324C:: @ 84A324C +gProgrammableWaveData_84A324C:: .incbin "sound/programmable_wave_samples/84A324C.pcm" -gProgrammableWaveData_84A325C:: @ 84A325C +gProgrammableWaveData_84A325C:: .incbin "sound/programmable_wave_samples/84A325C.pcm" -gProgrammableWaveData_84A326C:: @ 84A326C +gProgrammableWaveData_84A326C:: .incbin "sound/programmable_wave_samples/84A326C.pcm" -gProgrammableWaveData_84A327C:: @ 84A327C +gProgrammableWaveData_84A327C:: .incbin "sound/programmable_wave_samples/84A327C.pcm" -gProgrammableWaveData_84A328C:: @ 84A328C +gProgrammableWaveData_84A328C:: .incbin "sound/programmable_wave_samples/84A328C.pcm" diff --git a/sound/song_table.inc b/sound/song_table.inc index 8c2642414..000cc41b9 100644 --- a/sound/song_table.inc +++ b/sound/song_table.inc @@ -1,4 +1,4 @@ -gSongTable:: @ 84A32CC +gSongTable:: song mus_dummy, 0, 0 song se_use_item, 1, 1 song se_pc_login, 1, 1 @@ -347,5 +347,5 @@ gSongTable:: @ 84A32CC song mus_slow_pallet, 0, 0 song mus_teachy_tv_menu, 0, 0 -dummy_song_header: @ 84A3DA4 +dummy_song_header: .byte 0, 0, 0, 0 diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc index bb49f121b..b7fae524e 100644 --- a/sound/voice_groups.inc +++ b/sound/voice_groups.inc @@ -1,8851 +1,8851 @@ .align 2 -voicegroup000:: @ 8489C8C - voice_keysplit_all voicegroup001 @ 8489C8C - voice_keysplit voicegroup003, KeySplitTable1 @ 8489C98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489CA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489CB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489CBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489CC8 - voice_square_2 60, 0, 2, 0, 0, 9, 2 @ 8489CD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489CE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489CEC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235 @ 8489CF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D4C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 8489D58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489D94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489DA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489DAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489DB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489DC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489DD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489DDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489DE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489DF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489E00 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149 @ 8489E0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489E18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489E24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489E30 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 115 @ 8489E3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489E48 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8489E54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489E60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489E6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489E78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489E84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489E90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489E9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489EA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489EB4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239 @ 8489EC0 - voice_keysplit voicegroup004, KeySplitTable2 @ 8489ECC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489ED8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489EE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489EF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489EFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F20 - voice_keysplit voicegroup005, KeySplitTable3 @ 8489F2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F68 +voicegroup000:: + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2 60, 0, 2, 0, 0, 9, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 115 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 .align 2 -voicegroup001:: @ 8489F74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489F98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489FA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489FB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489FBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489FC8 - voice_square_1 60, 0, 0, 2, 0, 1, 6, 0 @ 8489FD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489FE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8489FEC - voice_programmable_wave 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 1 @ 8489FF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A004 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A010 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A01C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A028 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A034 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A040 - voice_square_2 60, 0, 2, 0, 1, 6, 0 @ 848A04C - voice_programmable_wave 60, 0, gProgrammableWaveData_84A320C, 0, 7, 15, 1 @ 848A058 - voice_square_1 60, 0, 0, 2, 0, 1, 6, 0 @ 848A064 - voice_square_2 60, 0, 3, 0, 1, 6, 0 @ 848A070 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A07C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A088 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A094 - voice_square_1 60, 0, 0, 0, 0, 1, 6, 0 @ 848A0A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A0AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A0B8 - voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 848A0C4 +voicegroup001:: + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 1, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2 60, 0, 2, 0, 1, 6, 0 + voice_programmable_wave 60, 0, gProgrammableWaveData_84A320C, 0, 7, 15, 1 + voice_square_1 60, 0, 0, 2, 0, 1, 6, 0 + voice_square_2 60, 0, 3, 0, 1, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 0, 0, 1, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 .align 2 -voicegroup002:: @ 848A0D0 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 255, 165, 154, 127 @ 848A0D0 - voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 255, 165, 154, 127 @ 848A0DC - voice_directsound 60, 0, DirectSoundWaveData_unused_guitar_separates_power_chord, 255, 165, 206, 127 @ 848A0E8 - voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 206, 127 @ 848A0F4 - voice_directsound 60, 0, DirectSoundWaveData_unknown_snare, 255, 0, 255, 0 @ 848A100 - voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0 @ 848A10C - voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0 @ 848A118 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242 @ 848A124 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A130 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 848A13C - voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 848A148 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 848A154 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A160 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A16C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A178 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A184 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A190 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A19C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A1A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A1B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A1C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A1CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A1D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A1E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A1F0 - voice_directsound_no_resample 32, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 @ 848A1FC - voice_directsound_no_resample 60, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 235, 0, 165 @ 848A208 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A214 - voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 @ 848A220 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A22C - voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 @ 848A238 - voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 848A244 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A250 - voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 848A25C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A268 - voice_directsound_no_resample 72, 94, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 848A274 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 848A280 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 848A28C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 848A298 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 848A2A4 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 848A2B0 - voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 848A2BC - voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 848A2C8 - voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 848A2D4 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 848A2E0 - voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 848A2EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A2F8 - voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 848A304 - voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 848A310 - voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 848A31C - voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 848A328 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A334 - voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 848A340 - voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 848A34C - voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 @ 848A358 - voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 848A364 - voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 @ 848A370 - voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 848A37C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A388 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 848A394 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 848A3A0 - voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 @ 848A3AC - voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 848A3B8 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 848A3C4 - voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 848A3D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A3DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A3E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A3F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A400 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A40C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A418 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A424 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A430 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A43C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A448 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A454 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A460 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A46C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A478 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A484 - voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 848A490 - voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 848A49C - voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 @ 848A4A8 - voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 @ 848A4B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A4C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A4CC - voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 848A4D8 - voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 848A4E4 - voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 848A4F0 - voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 848A4FC +voicegroup002:: + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 255, 165, 154, 127 + voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 255, 165, 154, 127 + voice_directsound 60, 0, DirectSoundWaveData_unused_guitar_separates_power_chord, 255, 165, 206, 127 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 206, 127 + voice_directsound 60, 0, DirectSoundWaveData_unknown_snare, 255, 0, 255, 0 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 32, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 + voice_directsound_no_resample 60, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 235, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216 + voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 72, 94, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 + voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 + voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 + voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 + voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 + voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 + voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 + voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 + voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 + voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 + voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 + voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 + voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 + voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 .align 2 -voicegroup003:: @ 848A508 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_48, 255, 252, 0, 239 @ 848A508 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_60, 255, 250, 0, 221 @ 848A514 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_72, 255, 250, 0, 221 @ 848A520 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_84, 255, 247, 0, 221 @ 848A52C +voicegroup003:: + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_48, 255, 252, 0, 239 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_60, 255, 250, 0, 221 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_72, 255, 250, 0, 221 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_84, 255, 247, 0, 221 .align 2 -voicegroup004:: @ 848A538 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_60, 255, 0, 255, 196 @ 848A538 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 196 @ 848A544 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_84, 255, 0, 255, 196 @ 848A550 +voicegroup004:: + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_60, 255, 0, 255, 196 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 196 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_84, 255, 0, 255, 196 .align 2 -voicegroup005:: @ 848A55C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_60, 255, 0, 193, 127 @ 848A55C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_72, 255, 0, 193, 127 @ 848A568 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_84, 255, 0, 193, 127 @ 848A574 - voice_square_1_alt 60, 0, 38, 2, 1, 0, 0, 0 @ 848A580 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A58C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A598 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A5A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A5B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A5BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A5C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A5D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A5E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A5EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A5F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A604 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A610 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A61C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A628 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A634 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A640 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A64C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A658 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A664 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A670 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A67C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A688 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A694 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A6A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A6AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A6B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A6C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A6D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A6DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A6E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A6F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A700 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A70C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A718 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A724 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A730 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A73C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A748 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A754 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A760 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A76C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A778 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A784 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A790 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A79C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A7A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A7B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A7C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A7CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A7D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A7E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A7F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A7FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A808 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A814 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A820 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A82C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A838 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A844 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A850 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A85C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A868 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A874 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A880 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A88C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A898 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A8A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A8B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A8BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A8C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A8D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A8E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A8EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A8F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A904 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A910 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A91C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A928 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A934 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A940 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A94C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A958 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A964 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A970 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A97C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A988 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A994 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A9A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A9AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A9B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A9C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A9D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A9DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A9E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848A9F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AA9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AAA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AAB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AAC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AACC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AAD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AAE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AAF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AAFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AB08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AB14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AB20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AB2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AB38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AB44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AB50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AB5C - voice_square_1_alt 60, 0, 36, 2, 0, 1, 4, 2 @ 848AB68 - voice_square_1_alt 60, 0, 21, 2, 0, 0, 15, 2 @ 848AB74 +voicegroup005:: + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_60, 255, 0, 193, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_72, 255, 0, 193, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_84, 255, 0, 193, 127 + voice_square_1_alt 60, 0, 38, 2, 1, 0, 0, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 36, 2, 0, 1, 4, 2 + voice_square_1_alt 60, 0, 21, 2, 0, 0, 15, 2 .align 2 -voicegroup006:: @ 848AB80 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_39, 255, 0, 255, 165 @ 848AB80 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_51, 255, 0, 255, 165 @ 848AB8C +voicegroup006:: + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_39, 255, 0, 255, 165 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_51, 255, 0, 255, 165 .align 2 -voicegroup007:: @ 848AB98 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_60, 255, 0, 224, 165 @ 848AB98 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 255, 0, 218, 165 @ 848ABA4 +voicegroup007:: + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_60, 255, 0, 224, 165 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 255, 0, 218, 165 .align 2 -voicegroup008:: @ 848ABB0 - voice_keysplit_all voicegroup001 @ 848ABB0 - voice_keysplit voicegroup003, KeySplitTable1 @ 848ABBC - voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 178, 180, 165 @ 848ABC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ABD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ABE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ABEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ABF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AC04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AC10 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235 @ 848AC1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AC28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AC34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AC40 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 848AC4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AC58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AC64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AC70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AC7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AC88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AC94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ACA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ACAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ACB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ACC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ACD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ACDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ACE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ACF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AD9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ADA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ADB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ADC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ADCC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204 @ 848ADD8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 848ADE4 - voice_keysplit voicegroup004, KeySplitTable2 @ 848ADF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ADFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AE08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AE14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AE20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AE2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AE38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AE44 - voice_keysplit voicegroup005, KeySplitTable3 @ 848AE50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AE5C - voice_keysplit voicegroup006, KeySplitTable4 @ 848AE68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AE74 - voice_keysplit voicegroup007, KeySplitTable5 @ 848AE80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AE8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AE98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AEA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AEB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AEBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AEC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AED4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AEE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AEEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AEF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AF04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AF10 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 848AF1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AF28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AF34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AF40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AF4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AF58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AF64 - voice_square_2_alt 60, 0, 2, 0, 1, 7, 1 @ 848AF70 - voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1 @ 848AF7C - voice_square_2_alt 60, 0, 3, 0, 1, 7, 1 @ 848AF88 - voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1 @ 848AF94 - voice_square_2_alt 60, 0, 2, 0, 1, 4, 1 @ 848AFA0 - voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1 @ 848AFAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AFB8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 2 @ 848AFC4 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 2 @ 848AFD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848AFDC - voice_square_2 60, 0, 2, 0, 1, 4, 1 @ 848AFE8 - voice_square_1 60, 0, 0, 2, 0, 1, 4, 1 @ 848AFF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B000 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B00C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B018 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B024 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B030 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B03C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B048 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B054 - voice_square_1_alt 60, 0, 29, 2, 0, 2, 0, 0 @ 848B060 - voice_square_1_alt 60, 0, 22, 2, 0, 2, 0, 0 @ 848B06C +voicegroup008:: + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup003, KeySplitTable1 + voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 178, 180, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 0, 1, 7, 1 + voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1 + voice_square_2_alt 60, 0, 3, 0, 1, 7, 1 + voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1 + voice_square_2_alt 60, 0, 2, 0, 1, 4, 1 + voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 2 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2 60, 0, 2, 0, 1, 4, 1 + voice_square_1 60, 0, 0, 2, 0, 1, 4, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 29, 2, 0, 2, 0, 0 + voice_square_1_alt 60, 0, 22, 2, 0, 2, 0, 0 .align 2 -voicegroup009:: @ 848B078 - voice_keysplit_all voicegroup001 @ 848B078 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B084 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B090 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B09C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B0A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B0B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B0C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B0CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B0D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B0E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B0F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B0FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B108 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B114 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B120 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B12C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B138 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B144 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B150 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B15C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B168 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B174 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B180 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B18C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B198 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B1A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B1B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B1BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B1C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B1D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B1E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B1EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B1F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B204 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B210 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B21C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B228 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B234 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B240 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B24C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B258 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B264 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B270 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B27C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B288 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B294 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B2A0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 848B2AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B2B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B2C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B2D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B2DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B2E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B2F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B300 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B30C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B318 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B324 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B330 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B33C - voice_keysplit voicegroup007, KeySplitTable5 @ 848B348 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B354 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B360 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B36C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B378 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B384 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B390 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B39C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B3A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B3B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B3C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B3CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B3D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B3E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B3F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B3FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B408 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B414 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B420 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B42C - voice_square_2_alt 60, 0, 2, 0, 1, 9, 0 @ 848B438 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 0 @ 848B444 - voice_square_1_alt 60, 0, 0, 2, 0, 1, 9, 0 @ 848B450 - voice_square_2_alt 60, 0, 3, 0, 1, 7, 0 @ 848B45C - voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0 @ 848B468 +voicegroup009:: + voice_keysplit_all voicegroup001 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 0, 1, 9, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 1, 9, 0 + voice_square_2_alt 60, 0, 3, 0, 1, 7, 0 + voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0 .align 2 -voicegroup010:: @ 848B474 - voice_keysplit_all voicegroup001 @ 848B474 - voice_keysplit voicegroup003, KeySplitTable1 @ 848B480 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B48C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B498 - voice_square_2 60, 0, 2, 0, 2, 6, 1 @ 848B4A4 - voice_square_1 60, 0, 0, 2, 0, 2, 6, 1 @ 848B4B0 - voice_square_2 60, 0, 3, 0, 2, 4, 1 @ 848B4BC - voice_square_1 60, 0, 0, 3, 0, 2, 4, 1 @ 848B4C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B4D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B4E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B4EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B4F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B504 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B510 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B51C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B528 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B534 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B540 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B54C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B558 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B564 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B570 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B57C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B588 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B594 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B5A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B5AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B5B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B5C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B5D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B5DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B5E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B5F4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 848B600 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B60C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B618 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B624 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B630 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B63C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B648 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B654 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B660 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B66C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B678 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B684 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 848B690 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B69C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 848B6A8 - voice_keysplit voicegroup004, KeySplitTable2 @ 848B6B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B6C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B6CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B6D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B6E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B6F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B6FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B708 - voice_keysplit voicegroup005, KeySplitTable3 @ 848B714 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B720 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B72C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B738 - voice_keysplit voicegroup007, KeySplitTable5 @ 848B744 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B750 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B75C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B768 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B774 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B780 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B78C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B798 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B7A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B7B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B7BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B7C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B7D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B7E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B7EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B7F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B804 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B810 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B81C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B828 - voice_square_2 60, 0, 2, 0, 1, 7, 1 @ 848B834 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A320C, 0, 7, 15, 2 @ 848B840 - voice_square_1 60, 0, 0, 2, 0, 1, 7, 1 @ 848B84C - voice_square_1 60, 0, 0, 2, 0, 0, 7, 1 @ 848B858 - voice_square_2 60, 0, 3, 0, 1, 7, 1 @ 848B864 - voice_square_1 60, 0, 0, 3, 0, 1, 7, 1 @ 848B870 - voice_square_1 60, 0, 0, 3, 0, 0, 7, 1 @ 848B87C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B888 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B894 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B8A0 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 2 @ 848B8AC +voicegroup010:: + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2 60, 0, 2, 0, 2, 6, 1 + voice_square_1 60, 0, 0, 2, 0, 2, 6, 1 + voice_square_2 60, 0, 3, 0, 2, 4, 1 + voice_square_1 60, 0, 0, 3, 0, 2, 4, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2 60, 0, 2, 0, 1, 7, 1 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A320C, 0, 7, 15, 2 + voice_square_1 60, 0, 0, 2, 0, 1, 7, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 7, 1 + voice_square_2 60, 0, 3, 0, 1, 7, 1 + voice_square_1 60, 0, 0, 3, 0, 1, 7, 1 + voice_square_1 60, 0, 0, 3, 0, 0, 7, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 2 .align 2 -voicegroup011:: @ 848B8B8 - voice_keysplit_all voicegroup001 @ 848B8B8 - voice_keysplit voicegroup003, KeySplitTable1 @ 848B8C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B8D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B8DC - voice_square_2 60, 0, 0, 0, 2, 4, 1 @ 848B8E8 - voice_square_1 60, 0, 0, 0, 0, 2, 4, 1 @ 848B8F4 - voice_square_2 60, 0, 3, 0, 1, 7, 1 @ 848B900 - voice_square_1 60, 0, 0, 3, 0, 1, 7, 1 @ 848B90C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B918 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B924 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B930 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B93C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B948 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B954 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B960 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B96C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B978 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 848B984 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B990 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B99C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B9A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B9B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B9C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B9CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B9D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B9E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B9F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848B9FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA38 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 848BA44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BA98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BAA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BAB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BABC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BAC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BAD4 - voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88pro_timpani_with_snare, 255, 246, 0, 226 @ 848BAE0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 848BAEC - voice_keysplit voicegroup004, KeySplitTable2 @ 848BAF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BB04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BB10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BB1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BB28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BB34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BB40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BB4C - voice_keysplit voicegroup005, KeySplitTable3 @ 848BB58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BB64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BB70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BB7C - voice_keysplit voicegroup007, KeySplitTable5 @ 848BB88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BB94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BBA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BBAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BBB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BBC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BBD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BBDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BBE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BBF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BC00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BC0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BC18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BC24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BC30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BC3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BC48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BC54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BC60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BC6C - voice_square_2 60, 0, 2, 0, 1, 7, 1 @ 848BC78 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 2 @ 848BC84 - voice_square_1 60, 0, 0, 2, 0, 1, 7, 1 @ 848BC90 - voice_square_2 60, 0, 1, 0, 1, 9, 1 @ 848BC9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BCA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BCB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BCC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BCCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BCD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BCE4 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 2 @ 848BCF0 +voicegroup011:: + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2 60, 0, 0, 0, 2, 4, 1 + voice_square_1 60, 0, 0, 0, 0, 2, 4, 1 + voice_square_2 60, 0, 3, 0, 1, 7, 1 + voice_square_1 60, 0, 0, 3, 0, 1, 7, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88pro_timpani_with_snare, 255, 246, 0, 226 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2 60, 0, 2, 0, 1, 7, 1 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 2 + voice_square_1 60, 0, 0, 2, 0, 1, 7, 1 + voice_square_2 60, 0, 1, 0, 1, 9, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 2 .align 2 -voicegroup012:: @ 848BCFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BCFC - voice_keysplit voicegroup003, KeySplitTable1 @ 848BD08 +voicegroup012:: + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup003, KeySplitTable1 .align 2 -voicegroup127:: @ 848BD14 - voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 249, 103, 165 @ 848BD14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BD20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BD2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BD38 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0 @ 848BD44 - voice_square_1_alt 60, 0, 0, 0, 0, 2, 0, 1 @ 848BD50 - voice_square_1_alt 60, 0, 0, 2, 0, 4, 0, 1 @ 848BD5C - voice_square_1_alt 60, 0, 44, 2, 0, 4, 0, 0 @ 848BD68 - voice_square_1_alt 60, 0, 38, 0, 0, 4, 0, 0 @ 848BD74 - voice_square_1_alt 60, 0, 0, 0, 0, 7, 0, 0 @ 848BD80 - voice_square_1_alt 60, 0, 0, 2, 2, 0, 15, 0 @ 848BD8C - voice_square_1_alt 60, 0, 0, 1, 2, 0, 15, 0 @ 848BD98 - voice_square_1_alt 60, 0, 23, 1, 0, 1, 9, 0 @ 848BDA4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 165 @ 848BDB0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 165 @ 848BDBC - voice_square_1_alt 60, 0, 0, 2, 0, 6, 0, 1 @ 848BDC8 - voice_square_1_alt 60, 0, 36, 0, 0, 2, 0, 0 @ 848BDD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BDE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BDEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BDF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BE94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BEA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BEAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BEB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BEC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BED0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BEDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BEE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BEF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF3C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 848BF48 - voice_keysplit voicegroup004, KeySplitTable2 @ 848BF54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BF9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BFA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BFB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BFC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BFCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BFD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BFE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BFF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848BFFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C008 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C014 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C020 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C02C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C038 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C044 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C050 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C05C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C068 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C074 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C080 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C08C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C098 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C0A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C0B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C0BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C0C8 - voice_square_2_alt 60, 0, 3, 0, 1, 0, 1 @ 848C0D4 - voice_square_1_alt 60, 0, 0, 3, 0, 1, 0, 1 @ 848C0E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C0EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C0F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C104 - voice_square_1_alt 60, 0, 46, 2, 0, 4, 0, 0 @ 848C110 - voice_square_1_alt 60, 0, 38, 2, 0, 4, 0, 0 @ 848C11C - voice_square_1_alt 60, 0, 119, 2, 0, 0, 15, 1 @ 848C128 - voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 1 @ 848C134 - voice_square_1_alt 60, 0, 106, 2, 0, 2, 0, 0 @ 848C140 - voice_square_1_alt 60, 0, 23, 2, 0, 1, 9, 0 @ 848C14C - voice_square_1_alt 60, 0, 21, 2, 0, 1, 9, 0 @ 848C158 - voice_square_1_alt 60, 0, 0, 0, 0, 0, 15, 1 @ 848C164 - voice_square_1_alt 60, 0, 47, 2, 0, 2, 6, 0 @ 848C170 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C17C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C188 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C194 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C1A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C1AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C1B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C1C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C1D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C1DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C1E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C1F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C200 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C20C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C218 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C224 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C230 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C23C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C248 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C254 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C260 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C26C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C278 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C284 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C290 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C29C - voice_noise 60, 0, 0, 0, 7, 15, 0 @ 848C2A8 - voice_noise 60, 0, 0, 2, 7, 15, 0 @ 848C2B4 - voice_noise_alt 60, 0, 0, 2, 0, 15, 0 @ 848C2C0 - voice_noise_alt 60, 0, 1, 0, 0, 15, 0 @ 848C2CC - voice_noise_alt 60, 0, 0, 0, 0, 15, 0 @ 848C2D8 - voice_noise_alt 60, 0, 0, 0, 3, 0, 0 @ 848C2E4 - voice_noise_alt 60, 0, 0, 0, 2, 0, 0 @ 848C2F0 - voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ 848C2FC - voice_noise_alt 60, 0, 0, 0, 1, 0, 1 @ 848C308 +voicegroup127:: + voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 249, 103, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 2, 0, 1 + voice_square_1_alt 60, 0, 0, 2, 0, 4, 0, 1 + voice_square_1_alt 60, 0, 44, 2, 0, 4, 0, 0 + voice_square_1_alt 60, 0, 38, 0, 0, 4, 0, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 7, 0, 0 + voice_square_1_alt 60, 0, 0, 2, 2, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 2, 0, 15, 0 + voice_square_1_alt 60, 0, 23, 1, 0, 1, 9, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 165 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 165 + voice_square_1_alt 60, 0, 0, 2, 0, 6, 0, 1 + voice_square_1_alt 60, 0, 36, 0, 0, 2, 0, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 3, 0, 1, 0, 1 + voice_square_1_alt 60, 0, 0, 3, 0, 1, 0, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 46, 2, 0, 4, 0, 0 + voice_square_1_alt 60, 0, 38, 2, 0, 4, 0, 0 + voice_square_1_alt 60, 0, 119, 2, 0, 0, 15, 1 + voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 1 + voice_square_1_alt 60, 0, 106, 2, 0, 2, 0, 0 + voice_square_1_alt 60, 0, 23, 2, 0, 1, 9, 0 + voice_square_1_alt 60, 0, 21, 2, 0, 1, 9, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 0, 15, 1 + voice_square_1_alt 60, 0, 47, 2, 0, 2, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise 60, 0, 0, 0, 7, 15, 0 + voice_noise 60, 0, 0, 2, 7, 15, 0 + voice_noise_alt 60, 0, 0, 2, 0, 15, 0 + voice_noise_alt 60, 0, 1, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 3, 0, 0 + voice_noise_alt 60, 0, 0, 0, 2, 0, 0 + voice_noise_alt 60, 0, 0, 0, 1, 0, 0 + voice_noise_alt 60, 0, 0, 0, 1, 0, 1 .align 2 -voicegroup128:: @ 848C314 - voice_directsound_no_resample 60, 0, DirectSoundWaveData_bicycle_bell, 255, 249, 0, 165 @ 848C314 - voice_directsound_alt 60, 0, DirectSoundWaveData_bicycle_bell, 255, 0, 255, 165 @ 848C320 - voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 0, 255, 165 @ 848C32C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 242, 0, 127 @ 848C338 - voice_noise_alt 60, 0, 0, 0, 1, 0, 1 @ 848C344 - voice_noise_alt 60, 0, 1, 0, 1, 0, 1 @ 848C350 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 255, 165 @ 848C35C - voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1 @ 848C368 - voice_directsound 60, 0, DirectSoundWaveData_wave_54, 255, 0, 255, 165 @ 848C374 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 0, 255, 127 @ 848C380 - voice_directsound 60, 0, DirectSoundWaveData_wave_56, 255, 0, 255, 127 @ 848C38C - voice_noise_alt 60, 0, 1, 0, 2, 0, 0 @ 848C398 - voice_square_1 60, 0, 103, 3, 2, 7, 0, 0 @ 848C3A4 - voice_square_2 60, 0, 3, 2, 7, 0, 0 @ 848C3B0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127 @ 848C3BC - voice_directsound 60, 0, DirectSoundWaveData_wave_57, 255, 0, 255, 0 @ 848C3C8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127 @ 848C3D4 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1 @ 848C3E0 - voice_directsound 60, 0, DirectSoundWaveData_wave_58, 255, 0, 255, 127 @ 848C3EC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 @ 848C3F8 - voice_square_1 60, 0, 103, 0, 0, 7, 0, 0 @ 848C404 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 127 @ 848C410 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_wind, 255, 0, 255, 127 @ 848C41C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_bubbles, 255, 0, 255, 127 @ 848C428 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 127 @ 848C434 - voice_noise_alt 60, 0, 0, 0, 7, 15, 1 @ 848C440 - voice_directsound 60, 0, DirectSoundWaveData_wave_61, 255, 0, 255, 127 @ 848C44C - voice_noise_alt 60, 0, 1, 0, 7, 15, 1 @ 848C458 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 246, 0, 127 @ 848C464 - voice_directsound 60, 0, DirectSoundWaveData_wave_62, 255, 0, 255, 127 @ 848C470 - voice_square_1_alt 60, 0, 19, 2, 0, 2, 0, 0 @ 848C47C - voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 0, 255, 127 @ 848C488 - voice_square_1 60, 0, 103, 0, 0, 0, 15, 0 @ 848C494 - voice_directsound_alt 60, 0, DirectSoundWaveData_wave_62, 255, 0, 255, 127 @ 848C4A0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 255, 255, 127 @ 848C4AC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 0, 255, 127 @ 848C4B8 - voice_directsound 60, 0, DirectSoundWaveData_wave_64, 255, 0, 255, 127 @ 848C4C4 - voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 242, 0, 0 @ 848C4D0 - voice_directsound 60, 0, DirectSoundWaveData_wave_65, 255, 0, 255, 0 @ 848C4DC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 848C4E8 - voice_directsound 60, 0, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188 @ 848C4F4 - voice_directsound 60, 0, DirectSoundWaveData_wave_68, 255, 249, 0, 165 @ 848C500 - voice_square_1 60, 0, 0, 0, 4, 6, 0, 0 @ 848C50C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 13, 0, 255, 127 @ 848C518 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 13, 0, 255, 127 @ 848C524 - voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 0, 255, 127 @ 848C530 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 252, 0, 204 @ 848C53C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C548 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 848C554 - voice_square_1 60, 0, 0, 0, 4, 0, 15, 0 @ 848C560 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 188, 0, 0 @ 848C56C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 226, 0, 127 @ 848C578 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 26, 0, 255, 127 @ 848C584 - voice_square_1_alt 60, 0, 0, 2, 0, 1, 0, 0 @ 848C590 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 252, 0, 127 @ 848C59C - voice_square_1_alt 60, 0, 0, 1, 0, 2, 0, 0 @ 848C5A8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 127, 0, 127 @ 848C5B4 - voice_noise_alt 60, 0, 0, 1, 6, 0, 0 @ 848C5C0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 255, 255, 127 @ 848C5CC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 848C5D8 - voice_directsound 60, 0, DirectSoundWaveData_wave_72, 255, 255, 255, 127 @ 848C5E4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 11, 242, 0, 127 @ 848C5F0 - voice_square_1_alt 60, 0, 0, 2, 4, 6, 0, 0 @ 848C5FC - voice_directsound 60, 0, DirectSoundWaveData_wave_73, 255, 255, 255, 127 @ 848C608 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 848C614 - voice_directsound 60, 0, DirectSoundWaveData_unused_sc55_tom, 255, 0, 255, 165 @ 848C620 - voice_noise_alt 60, 0, 0, 5, 7, 15, 1 @ 848C62C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 128, 242, 0, 165 @ 848C638 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 165 @ 848C644 - voice_square_1 60, 0, 0, 0, 1, 5, 0, 0 @ 848C650 - voice_noise_alt 60, 0, 0, 6, 6, 0, 1 @ 848C65C - voice_noise_alt 60, 0, 0, 3, 6, 0, 1 @ 848C668 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C674 - voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 15, 127, 231, 127 @ 848C680 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C68C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C698 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C6A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C6B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C6BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C6C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C6D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C6E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C6EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C6F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C704 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C710 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C71C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C728 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C734 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C740 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C74C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C758 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C764 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C770 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C77C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C788 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C794 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C7A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C7AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C7B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C7C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C7D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C7DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C7E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C7F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C800 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C80C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C818 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C824 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C830 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C83C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C848 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C854 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C860 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C86C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C878 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C884 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C890 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C89C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C8A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C8B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C8C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C8CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C8D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C8E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C8F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848C8FC - voice_noise_alt 60, 0, 0, 0, 1, 12, 0 @ 848C908 +voicegroup128:: + voice_directsound_no_resample 60, 0, DirectSoundWaveData_bicycle_bell, 255, 249, 0, 165 + voice_directsound_alt 60, 0, DirectSoundWaveData_bicycle_bell, 255, 0, 255, 165 + voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 0, 255, 165 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 242, 0, 127 + voice_noise_alt 60, 0, 0, 0, 1, 0, 1 + voice_noise_alt 60, 0, 1, 0, 1, 0, 1 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 255, 165 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1 + voice_directsound 60, 0, DirectSoundWaveData_wave_54, 255, 0, 255, 165 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_wave_56, 255, 0, 255, 127 + voice_noise_alt 60, 0, 1, 0, 2, 0, 0 + voice_square_1 60, 0, 103, 3, 2, 7, 0, 0 + voice_square_2 60, 0, 3, 2, 7, 0, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127 + voice_directsound 60, 0, DirectSoundWaveData_wave_57, 255, 0, 255, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1 + voice_directsound 60, 0, DirectSoundWaveData_wave_58, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 + voice_square_1 60, 0, 103, 0, 0, 7, 0, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_wind, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_bubbles, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 127 + voice_noise_alt 60, 0, 0, 0, 7, 15, 1 + voice_directsound 60, 0, DirectSoundWaveData_wave_61, 255, 0, 255, 127 + voice_noise_alt 60, 0, 1, 0, 7, 15, 1 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 246, 0, 127 + voice_directsound 60, 0, DirectSoundWaveData_wave_62, 255, 0, 255, 127 + voice_square_1_alt 60, 0, 19, 2, 0, 2, 0, 0 + voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 0, 255, 127 + voice_square_1 60, 0, 103, 0, 0, 0, 15, 0 + voice_directsound_alt 60, 0, DirectSoundWaveData_wave_62, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 255, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_wave_64, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 242, 0, 0 + voice_directsound 60, 0, DirectSoundWaveData_wave_65, 255, 0, 255, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_directsound 60, 0, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188 + voice_directsound 60, 0, DirectSoundWaveData_wave_68, 255, 249, 0, 165 + voice_square_1 60, 0, 0, 0, 4, 6, 0, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 13, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 13, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 252, 0, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 + voice_square_1 60, 0, 0, 0, 4, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 188, 0, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 226, 0, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 26, 0, 255, 127 + voice_square_1_alt 60, 0, 0, 2, 0, 1, 0, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 252, 0, 127 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 0, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 127, 0, 127 + voice_noise_alt 60, 0, 0, 1, 6, 0, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 255, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_wave_72, 255, 255, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 11, 242, 0, 127 + voice_square_1_alt 60, 0, 0, 2, 4, 6, 0, 0 + voice_directsound 60, 0, DirectSoundWaveData_wave_73, 255, 255, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc55_tom, 255, 0, 255, 165 + voice_noise_alt 60, 0, 0, 5, 7, 15, 1 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 128, 242, 0, 165 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 0, 1, 5, 0, 0 + voice_noise_alt 60, 0, 0, 6, 6, 0, 1 + voice_noise_alt 60, 0, 0, 3, 6, 0, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 15, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 1, 12, 0 -gCryTable:: @ 848C914 - cry Cry_Bulbasaur @ 848C914 - cry Cry_Ivysaur @ 848C920 - cry Cry_Venusaur @ 848C92C - cry Cry_Charmander @ 848C938 - cry Cry_Charmeleon @ 848C944 - cry Cry_Charizard @ 848C950 - cry Cry_Squirtle @ 848C95C - cry Cry_Wartortle @ 848C968 - cry Cry_Blastoise @ 848C974 - cry Cry_Caterpie @ 848C980 - cry Cry_Metapod @ 848C98C - cry Cry_Butterfree @ 848C998 - cry Cry_Weedle @ 848C9A4 - cry Cry_Kakuna @ 848C9B0 - cry Cry_Beedrill @ 848C9BC - cry Cry_Pidgey @ 848C9C8 - cry Cry_Pidgeotto @ 848C9D4 - cry Cry_Pidgeot @ 848C9E0 - cry Cry_Rattata @ 848C9EC - cry Cry_Raticate @ 848C9F8 - cry Cry_Spearow @ 848CA04 - cry Cry_Fearow @ 848CA10 - cry Cry_Ekans @ 848CA1C - cry Cry_Arbok @ 848CA28 - cry Cry_Pikachu @ 848CA34 - cry Cry_Raichu @ 848CA40 - cry Cry_Sandshrew @ 848CA4C - cry Cry_Sandslash @ 848CA58 - cry Cry_NidoranF @ 848CA64 - cry Cry_Nidorina @ 848CA70 - cry Cry_Nidoqueen @ 848CA7C - cry Cry_NidoranM @ 848CA88 - cry Cry_Nidorino @ 848CA94 - cry Cry_Nidoking @ 848CAA0 - cry Cry_Clefairy @ 848CAAC - cry Cry_Clefable @ 848CAB8 - cry Cry_Vulpix @ 848CAC4 - cry Cry_Ninetales @ 848CAD0 - cry Cry_Jigglypuff @ 848CADC - cry Cry_Wigglytuff @ 848CAE8 - cry Cry_Zubat @ 848CAF4 - cry Cry_Golbat @ 848CB00 - cry Cry_Oddish @ 848CB0C - cry Cry_Gloom @ 848CB18 - cry Cry_Vileplume @ 848CB24 - cry Cry_Paras @ 848CB30 - cry Cry_Parasect @ 848CB3C - cry Cry_Venonat @ 848CB48 - cry Cry_Venomoth @ 848CB54 - cry Cry_Diglett @ 848CB60 - cry Cry_Dugtrio @ 848CB6C - cry Cry_Meowth @ 848CB78 - cry Cry_Persian @ 848CB84 - cry Cry_Psyduck @ 848CB90 - cry Cry_Golduck @ 848CB9C - cry Cry_Mankey @ 848CBA8 - cry Cry_Primeape @ 848CBB4 - cry Cry_Growlithe @ 848CBC0 - cry Cry_Arcanine @ 848CBCC - cry Cry_Poliwag @ 848CBD8 - cry Cry_Poliwhirl @ 848CBE4 - cry Cry_Poliwrath @ 848CBF0 - cry Cry_Abra @ 848CBFC - cry Cry_Kadabra @ 848CC08 - cry Cry_Alakazam @ 848CC14 - cry Cry_Machop @ 848CC20 - cry Cry_Machoke @ 848CC2C - cry Cry_Machamp @ 848CC38 - cry Cry_Bellsprout @ 848CC44 - cry Cry_Weepinbell @ 848CC50 - cry Cry_Victreebel @ 848CC5C - cry Cry_Tentacool @ 848CC68 - cry Cry_Tentacruel @ 848CC74 - cry Cry_Geodude @ 848CC80 - cry Cry_Graveler @ 848CC8C - cry Cry_Golem @ 848CC98 - cry Cry_Ponyta @ 848CCA4 - cry Cry_Rapidash @ 848CCB0 - cry Cry_Slowpoke @ 848CCBC - cry Cry_Slowbro @ 848CCC8 - cry Cry_Magnemite @ 848CCD4 - cry Cry_Magneton @ 848CCE0 - cry Cry_Farfetchd @ 848CCEC - cry Cry_Doduo @ 848CCF8 - cry Cry_Dodrio @ 848CD04 - cry Cry_Seel @ 848CD10 - cry Cry_Dewgong @ 848CD1C - cry Cry_Grimer @ 848CD28 - cry Cry_Muk @ 848CD34 - cry Cry_Shellder @ 848CD40 - cry Cry_Cloyster @ 848CD4C - cry Cry_Gastly @ 848CD58 - cry Cry_Haunter @ 848CD64 - cry Cry_Gengar @ 848CD70 - cry Cry_Onix @ 848CD7C - cry Cry_Drowzee @ 848CD88 - cry Cry_Hypno @ 848CD94 - cry Cry_Krabby @ 848CDA0 - cry Cry_Kingler @ 848CDAC - cry Cry_Voltorb @ 848CDB8 - cry Cry_Electrode @ 848CDC4 - cry Cry_Exeggcute @ 848CDD0 - cry Cry_Exeggutor @ 848CDDC - cry Cry_Cubone @ 848CDE8 - cry Cry_Marowak @ 848CDF4 - cry Cry_Hitmonlee @ 848CE00 - cry Cry_Hitmonchan @ 848CE0C - cry Cry_Lickitung @ 848CE18 - cry Cry_Koffing @ 848CE24 - cry Cry_Weezing @ 848CE30 - cry Cry_Rhyhorn @ 848CE3C - cry Cry_Rhydon @ 848CE48 - cry Cry_Chansey @ 848CE54 - cry Cry_Tangela @ 848CE60 - cry Cry_Kangaskhan @ 848CE6C - cry Cry_Horsea @ 848CE78 - cry Cry_Seadra @ 848CE84 - cry Cry_Goldeen @ 848CE90 - cry Cry_Seaking @ 848CE9C - cry Cry_Staryu @ 848CEA8 - cry Cry_Starmie @ 848CEB4 - cry Cry_MrMime @ 848CEC0 - cry Cry_Scyther @ 848CECC - cry Cry_Jynx @ 848CED8 - cry Cry_Electabuzz @ 848CEE4 - cry Cry_Magmar @ 848CEF0 - cry Cry_Pinsir @ 848CEFC - cry Cry_Tauros @ 848CF08 - cry Cry_Magikarp @ 848CF14 - cry Cry_Gyarados @ 848CF20 - cry Cry_Lapras @ 848CF2C - cry Cry_Ditto @ 848CF38 - cry Cry_Eevee @ 848CF44 - cry Cry_Vaporeon @ 848CF50 - cry Cry_Jolteon @ 848CF5C - cry Cry_Flareon @ 848CF68 - cry Cry_Porygon @ 848CF74 - cry Cry_Omanyte @ 848CF80 - cry Cry_Omastar @ 848CF8C - cry Cry_Kabuto @ 848CF98 - cry Cry_Kabutops @ 848CFA4 - cry Cry_Aerodactyl @ 848CFB0 - cry Cry_Snorlax @ 848CFBC - cry Cry_Articuno @ 848CFC8 - cry Cry_Zapdos @ 848CFD4 - cry Cry_Moltres @ 848CFE0 - cry Cry_Dratini @ 848CFEC - cry Cry_Dragonair @ 848CFF8 - cry Cry_Dragonite @ 848D004 - cry Cry_Mewtwo @ 848D010 - cry Cry_Mew @ 848D01C - cry Cry_Chikorita @ 848D028 - cry Cry_Bayleef @ 848D034 - cry Cry_Meganium @ 848D040 - cry Cry_Cyndaquil @ 848D04C - cry Cry_Quilava @ 848D058 - cry Cry_Typhlosion @ 848D064 - cry Cry_Totodile @ 848D070 - cry Cry_Croconaw @ 848D07C - cry Cry_Feraligatr @ 848D088 - cry Cry_Sentret @ 848D094 - cry Cry_Furret @ 848D0A0 - cry Cry_Hoothoot @ 848D0AC - cry Cry_Noctowl @ 848D0B8 - cry Cry_Ledyba @ 848D0C4 - cry Cry_Ledian @ 848D0D0 - cry Cry_Spinarak @ 848D0DC - cry Cry_Ariados @ 848D0E8 - cry Cry_Crobat @ 848D0F4 - cry Cry_Chinchou @ 848D100 - cry Cry_Lanturn @ 848D10C - cry Cry_Pichu @ 848D118 - cry Cry_Cleffa @ 848D124 - cry Cry_Igglybuff @ 848D130 - cry Cry_Togepi @ 848D13C - cry Cry_Togetic @ 848D148 - cry Cry_Natu @ 848D154 - cry Cry_Xatu @ 848D160 - cry Cry_Mareep @ 848D16C - cry Cry_Flaaffy @ 848D178 - cry Cry_Ampharos @ 848D184 - cry Cry_Bellossom @ 848D190 - cry Cry_Marill @ 848D19C - cry Cry_Azumarill @ 848D1A8 - cry Cry_Sudowoodo @ 848D1B4 - cry Cry_Politoed @ 848D1C0 - cry Cry_Hoppip @ 848D1CC - cry Cry_Skiploom @ 848D1D8 - cry Cry_Jumpluff @ 848D1E4 - cry Cry_Aipom @ 848D1F0 - cry Cry_Sunkern @ 848D1FC - cry Cry_Sunflora @ 848D208 - cry Cry_Yanma @ 848D214 - cry Cry_Wooper @ 848D220 - cry Cry_Quagsire @ 848D22C - cry Cry_Espeon @ 848D238 - cry Cry_Umbreon @ 848D244 - cry Cry_Murkrow @ 848D250 - cry Cry_Slowking @ 848D25C - cry Cry_Misdreavus @ 848D268 - cry Cry_Unown @ 848D274 - cry Cry_Wobbuffet @ 848D280 - cry Cry_Girafarig @ 848D28C - cry Cry_Pineco @ 848D298 - cry Cry_Forretress @ 848D2A4 - cry Cry_Dunsparce @ 848D2B0 - cry Cry_Gligar @ 848D2BC - cry Cry_Steelix @ 848D2C8 - cry Cry_Snubbull @ 848D2D4 - cry Cry_Granbull @ 848D2E0 - cry Cry_Qwilfish @ 848D2EC - cry Cry_Scizor @ 848D2F8 - cry Cry_Shuckle @ 848D304 - cry Cry_Heracross @ 848D310 - cry Cry_Sneasel @ 848D31C - cry Cry_Teddiursa @ 848D328 - cry Cry_Ursaring @ 848D334 - cry Cry_Slugma @ 848D340 - cry Cry_Magcargo @ 848D34C - cry Cry_Swinub @ 848D358 - cry Cry_Piloswine @ 848D364 - cry Cry_Corsola @ 848D370 - cry Cry_Remoraid @ 848D37C - cry Cry_Octillery @ 848D388 - cry Cry_Delibird @ 848D394 - cry Cry_Mantine @ 848D3A0 - cry Cry_Skarmory @ 848D3AC - cry Cry_Houndour @ 848D3B8 - cry Cry_Houndoom @ 848D3C4 - cry Cry_Kingdra @ 848D3D0 - cry Cry_Phanpy @ 848D3DC - cry Cry_Donphan @ 848D3E8 - cry Cry_Porygon2 @ 848D3F4 - cry Cry_Stantler @ 848D400 - cry Cry_Smeargle @ 848D40C - cry Cry_Tyrogue @ 848D418 - cry Cry_Hitmontop @ 848D424 - cry Cry_Smoochum @ 848D430 - cry Cry_Elekid @ 848D43C - cry Cry_Magby @ 848D448 - cry Cry_Miltank @ 848D454 - cry Cry_Blissey @ 848D460 - cry Cry_Raikou @ 848D46C - cry Cry_Entei @ 848D478 - cry Cry_Suicune @ 848D484 - cry Cry_Larvitar @ 848D490 - cry Cry_Pupitar @ 848D49C - cry Cry_Tyranitar @ 848D4A8 - cry Cry_Lugia @ 848D4B4 - cry Cry_HoOh @ 848D4C0 - cry Cry_Celebi @ 848D4CC - cry Cry_Kecleon @ 848D4D8 - cry Cry_Roselia @ 848D4E4 - cry Cry_Torkoal @ 848D4F0 - cry Cry_Electrike @ 848D4FC - cry Cry_Manectric @ 848D508 - cry Cry_Duskull @ 848D514 - cry Cry_Latias @ 848D520 - cry Cry_Wynaut @ 848D52C - cry Cry_Seviper @ 848D538 - cry Cry_Sharpedo @ 848D544 - cry Cry_Zangoose @ 848D550 - cry Cry_Azurill @ 848D55C - cry Cry_Swablu @ 848D568 - cry Cry_Altaria @ 848D574 - cry Cry_Unused265 @ 848D580 - cry Cry_Taillow @ 848D58C - cry Cry_Swellow @ 848D598 - cry Cry_Unused268 @ 848D5A4 - cry Cry_Spinda @ 848D5B0 - cry Cry_Torchic @ 848D5BC - cry Cry_Combusken @ 848D5C8 - cry Cry_Blaziken @ 848D5D4 - cry Cry_Treecko @ 848D5E0 - cry Cry_Grovyle @ 848D5EC - cry Cry_Sceptile @ 848D5F8 - cry Cry_Mudkip @ 848D604 - cry Cry_Marshtomp @ 848D610 - cry Cry_Swampert @ 848D61C - cry Cry_Pelipper @ 848D628 - cry Cry_Wingull @ 848D634 - cry Cry_Banette @ 848D640 - cry Cry_Shuppet @ 848D64C - cry Cry_Lotad @ 848D658 - cry Cry_Lombre @ 848D664 - cry Cry_Ludicolo @ 848D670 - cry Cry_Seedot @ 848D67C - cry Cry_Nuzleaf @ 848D688 - cry Cry_Shiftry @ 848D694 - cry Cry_Carvanha @ 848D6A0 - cry Cry_Wurmple @ 848D6AC - cry Cry_Silcoon @ 848D6B8 - cry Cry_Beautifly @ 848D6C4 - cry Cry_Cascoon @ 848D6D0 - cry Cry_Dustox @ 848D6DC - cry Cry_Ralts @ 848D6E8 - cry Cry_Kirlia @ 848D6F4 - cry Cry_Gardevoir @ 848D700 - cry Cry_Slakoth @ 848D70C - cry Cry_Vigoroth @ 848D718 - cry Cry_Slaking @ 848D724 - cry Cry_Nincada @ 848D730 - cry Cry_Ninjask @ 848D73C - cry Cry_Shedinja @ 848D748 - cry Cry_Makuhita @ 848D754 - cry Cry_Hariyama @ 848D760 - cry Cry_Nosepass @ 848D76C - cry Cry_Glalie @ 848D778 - cry Cry_Plusle @ 848D784 - cry Cry_Minun @ 848D790 - cry Cry_Surskit @ 848D79C - cry Cry_Masquerain @ 848D7A8 - cry Cry_Skitty @ 848D7B4 - cry Cry_Delcatty @ 848D7C0 - cry Cry_Gulpin @ 848D7CC - cry Cry_Swalot @ 848D7D8 - cry Cry_Numel @ 848D7E4 - cry Cry_Camerupt @ 848D7F0 - cry Cry_Barboach @ 848D7FC - cry Cry_Whiscash @ 848D808 - cry Cry_Corphish @ 848D814 - cry Cry_Crawdaunt @ 848D820 - cry Cry_Spoink @ 848D82C - cry Cry_Grumpig @ 848D838 - cry Cry_Trapinch @ 848D844 - cry Cry_Vibrava @ 848D850 - cry Cry_Flygon @ 848D85C - cry Cry_Cacnea @ 848D868 - cry Cry_Cacturne @ 848D874 - cry Cry_Baltoy @ 848D880 - cry Cry_Claydol @ 848D88C - cry Cry_Lunatone @ 848D898 - cry Cry_Solrock @ 848D8A4 - cry Cry_Feebas @ 848D8B0 - cry Cry_Milotic @ 848D8BC - cry Cry_Absol @ 848D8C8 - cry Cry_Meditite @ 848D8D4 - cry Cry_Medicham @ 848D8E0 - cry Cry_Spheal @ 848D8EC - cry Cry_Sealeo @ 848D8F8 - cry Cry_Walrein @ 848D904 - cry Cry_Clamperl @ 848D910 - cry Cry_Huntail @ 848D91C - cry Cry_Gorebyss @ 848D928 - cry Cry_Lileep @ 848D934 - cry Cry_Cradily @ 848D940 - cry Cry_Anorith @ 848D94C - cry Cry_Armaldo @ 848D958 - cry Cry_Beldum @ 848D964 - cry Cry_Metang @ 848D970 - cry Cry_Metagross @ 848D97C - cry Cry_Bagon @ 848D988 - cry Cry_Shelgon @ 848D994 - cry Cry_Regirock @ 848D9A0 - cry Cry_Regice @ 848D9AC - cry Cry_Registeel @ 848D9B8 - cry Cry_Castform @ 848D9C4 - cry Cry_Volbeat @ 848D9D0 - cry Cry_Illumise @ 848D9DC - cry Cry_Poochyena @ 848D9E8 - cry Cry_Mightyena @ 848D9F4 - cry Cry_Dusclops @ 848DA00 - cry Cry_Sableye @ 848DA0C - cry Cry_Mawile @ 848DA18 - cry Cry_Aron @ 848DA24 - cry Cry_Lairon @ 848DA30 - cry Cry_Aggron @ 848DA3C - cry Cry_Relicanth @ 848DA48 - cry Cry_Luvdisc @ 848DA54 - cry Cry_Groudon @ 848DA60 - cry Cry_Kyogre @ 848DA6C - cry Cry_Rayquaza @ 848DA78 - cry Cry_Salamence @ 848DA84 - cry Cry_Breloom @ 848DA90 - cry Cry_Shroomish @ 848DA9C - cry Cry_Linoone @ 848DAA8 - cry Cry_Tropius @ 848DAB4 - cry Cry_Wailmer @ 848DAC0 - cry Cry_Zigzagoon @ 848DACC - cry Cry_Exploud @ 848DAD8 - cry Cry_Loudred @ 848DAE4 - cry Cry_Wailord @ 848DAF0 - cry Cry_Whismur @ 848DAFC - cry Cry_Snorunt @ 848DB08 - cry Cry_Latios @ 848DB14 - cry Cry_Jirachi @ 848DB20 - cry Cry_Deoxys @ 848DB2C - cry Cry_Chimecho @ 848DB38 +gCryTable:: + cry Cry_Bulbasaur + cry Cry_Ivysaur + cry Cry_Venusaur + cry Cry_Charmander + cry Cry_Charmeleon + cry Cry_Charizard + cry Cry_Squirtle + cry Cry_Wartortle + cry Cry_Blastoise + cry Cry_Caterpie + cry Cry_Metapod + cry Cry_Butterfree + cry Cry_Weedle + cry Cry_Kakuna + cry Cry_Beedrill + cry Cry_Pidgey + cry Cry_Pidgeotto + cry Cry_Pidgeot + cry Cry_Rattata + cry Cry_Raticate + cry Cry_Spearow + cry Cry_Fearow + cry Cry_Ekans + cry Cry_Arbok + cry Cry_Pikachu + cry Cry_Raichu + cry Cry_Sandshrew + cry Cry_Sandslash + cry Cry_NidoranF + cry Cry_Nidorina + cry Cry_Nidoqueen + cry Cry_NidoranM + cry Cry_Nidorino + cry Cry_Nidoking + cry Cry_Clefairy + cry Cry_Clefable + cry Cry_Vulpix + cry Cry_Ninetales + cry Cry_Jigglypuff + cry Cry_Wigglytuff + cry Cry_Zubat + cry Cry_Golbat + cry Cry_Oddish + cry Cry_Gloom + cry Cry_Vileplume + cry Cry_Paras + cry Cry_Parasect + cry Cry_Venonat + cry Cry_Venomoth + cry Cry_Diglett + cry Cry_Dugtrio + cry Cry_Meowth + cry Cry_Persian + cry Cry_Psyduck + cry Cry_Golduck + cry Cry_Mankey + cry Cry_Primeape + cry Cry_Growlithe + cry Cry_Arcanine + cry Cry_Poliwag + cry Cry_Poliwhirl + cry Cry_Poliwrath + cry Cry_Abra + cry Cry_Kadabra + cry Cry_Alakazam + cry Cry_Machop + cry Cry_Machoke + cry Cry_Machamp + cry Cry_Bellsprout + cry Cry_Weepinbell + cry Cry_Victreebel + cry Cry_Tentacool + cry Cry_Tentacruel + cry Cry_Geodude + cry Cry_Graveler + cry Cry_Golem + cry Cry_Ponyta + cry Cry_Rapidash + cry Cry_Slowpoke + cry Cry_Slowbro + cry Cry_Magnemite + cry Cry_Magneton + cry Cry_Farfetchd + cry Cry_Doduo + cry Cry_Dodrio + cry Cry_Seel + cry Cry_Dewgong + cry Cry_Grimer + cry Cry_Muk + cry Cry_Shellder + cry Cry_Cloyster + cry Cry_Gastly + cry Cry_Haunter + cry Cry_Gengar + cry Cry_Onix + cry Cry_Drowzee + cry Cry_Hypno + cry Cry_Krabby + cry Cry_Kingler + cry Cry_Voltorb + cry Cry_Electrode + cry Cry_Exeggcute + cry Cry_Exeggutor + cry Cry_Cubone + cry Cry_Marowak + cry Cry_Hitmonlee + cry Cry_Hitmonchan + cry Cry_Lickitung + cry Cry_Koffing + cry Cry_Weezing + cry Cry_Rhyhorn + cry Cry_Rhydon + cry Cry_Chansey + cry Cry_Tangela + cry Cry_Kangaskhan + cry Cry_Horsea + cry Cry_Seadra + cry Cry_Goldeen + cry Cry_Seaking + cry Cry_Staryu + cry Cry_Starmie + cry Cry_MrMime + cry Cry_Scyther + cry Cry_Jynx + cry Cry_Electabuzz + cry Cry_Magmar + cry Cry_Pinsir + cry Cry_Tauros + cry Cry_Magikarp + cry Cry_Gyarados + cry Cry_Lapras + cry Cry_Ditto + cry Cry_Eevee + cry Cry_Vaporeon + cry Cry_Jolteon + cry Cry_Flareon + cry Cry_Porygon + cry Cry_Omanyte + cry Cry_Omastar + cry Cry_Kabuto + cry Cry_Kabutops + cry Cry_Aerodactyl + cry Cry_Snorlax + cry Cry_Articuno + cry Cry_Zapdos + cry Cry_Moltres + cry Cry_Dratini + cry Cry_Dragonair + cry Cry_Dragonite + cry Cry_Mewtwo + cry Cry_Mew + cry Cry_Chikorita + cry Cry_Bayleef + cry Cry_Meganium + cry Cry_Cyndaquil + cry Cry_Quilava + cry Cry_Typhlosion + cry Cry_Totodile + cry Cry_Croconaw + cry Cry_Feraligatr + cry Cry_Sentret + cry Cry_Furret + cry Cry_Hoothoot + cry Cry_Noctowl + cry Cry_Ledyba + cry Cry_Ledian + cry Cry_Spinarak + cry Cry_Ariados + cry Cry_Crobat + cry Cry_Chinchou + cry Cry_Lanturn + cry Cry_Pichu + cry Cry_Cleffa + cry Cry_Igglybuff + cry Cry_Togepi + cry Cry_Togetic + cry Cry_Natu + cry Cry_Xatu + cry Cry_Mareep + cry Cry_Flaaffy + cry Cry_Ampharos + cry Cry_Bellossom + cry Cry_Marill + cry Cry_Azumarill + cry Cry_Sudowoodo + cry Cry_Politoed + cry Cry_Hoppip + cry Cry_Skiploom + cry Cry_Jumpluff + cry Cry_Aipom + cry Cry_Sunkern + cry Cry_Sunflora + cry Cry_Yanma + cry Cry_Wooper + cry Cry_Quagsire + cry Cry_Espeon + cry Cry_Umbreon + cry Cry_Murkrow + cry Cry_Slowking + cry Cry_Misdreavus + cry Cry_Unown + cry Cry_Wobbuffet + cry Cry_Girafarig + cry Cry_Pineco + cry Cry_Forretress + cry Cry_Dunsparce + cry Cry_Gligar + cry Cry_Steelix + cry Cry_Snubbull + cry Cry_Granbull + cry Cry_Qwilfish + cry Cry_Scizor + cry Cry_Shuckle + cry Cry_Heracross + cry Cry_Sneasel + cry Cry_Teddiursa + cry Cry_Ursaring + cry Cry_Slugma + cry Cry_Magcargo + cry Cry_Swinub + cry Cry_Piloswine + cry Cry_Corsola + cry Cry_Remoraid + cry Cry_Octillery + cry Cry_Delibird + cry Cry_Mantine + cry Cry_Skarmory + cry Cry_Houndour + cry Cry_Houndoom + cry Cry_Kingdra + cry Cry_Phanpy + cry Cry_Donphan + cry Cry_Porygon2 + cry Cry_Stantler + cry Cry_Smeargle + cry Cry_Tyrogue + cry Cry_Hitmontop + cry Cry_Smoochum + cry Cry_Elekid + cry Cry_Magby + cry Cry_Miltank + cry Cry_Blissey + cry Cry_Raikou + cry Cry_Entei + cry Cry_Suicune + cry Cry_Larvitar + cry Cry_Pupitar + cry Cry_Tyranitar + cry Cry_Lugia + cry Cry_HoOh + cry Cry_Celebi + cry Cry_Kecleon + cry Cry_Roselia + cry Cry_Torkoal + cry Cry_Electrike + cry Cry_Manectric + cry Cry_Duskull + cry Cry_Latias + cry Cry_Wynaut + cry Cry_Seviper + cry Cry_Sharpedo + cry Cry_Zangoose + cry Cry_Azurill + cry Cry_Swablu + cry Cry_Altaria + cry Cry_Unused265 + cry Cry_Taillow + cry Cry_Swellow + cry Cry_Unused268 + cry Cry_Spinda + cry Cry_Torchic + cry Cry_Combusken + cry Cry_Blaziken + cry Cry_Treecko + cry Cry_Grovyle + cry Cry_Sceptile + cry Cry_Mudkip + cry Cry_Marshtomp + cry Cry_Swampert + cry Cry_Pelipper + cry Cry_Wingull + cry Cry_Banette + cry Cry_Shuppet + cry Cry_Lotad + cry Cry_Lombre + cry Cry_Ludicolo + cry Cry_Seedot + cry Cry_Nuzleaf + cry Cry_Shiftry + cry Cry_Carvanha + cry Cry_Wurmple + cry Cry_Silcoon + cry Cry_Beautifly + cry Cry_Cascoon + cry Cry_Dustox + cry Cry_Ralts + cry Cry_Kirlia + cry Cry_Gardevoir + cry Cry_Slakoth + cry Cry_Vigoroth + cry Cry_Slaking + cry Cry_Nincada + cry Cry_Ninjask + cry Cry_Shedinja + cry Cry_Makuhita + cry Cry_Hariyama + cry Cry_Nosepass + cry Cry_Glalie + cry Cry_Plusle + cry Cry_Minun + cry Cry_Surskit + cry Cry_Masquerain + cry Cry_Skitty + cry Cry_Delcatty + cry Cry_Gulpin + cry Cry_Swalot + cry Cry_Numel + cry Cry_Camerupt + cry Cry_Barboach + cry Cry_Whiscash + cry Cry_Corphish + cry Cry_Crawdaunt + cry Cry_Spoink + cry Cry_Grumpig + cry Cry_Trapinch + cry Cry_Vibrava + cry Cry_Flygon + cry Cry_Cacnea + cry Cry_Cacturne + cry Cry_Baltoy + cry Cry_Claydol + cry Cry_Lunatone + cry Cry_Solrock + cry Cry_Feebas + cry Cry_Milotic + cry Cry_Absol + cry Cry_Meditite + cry Cry_Medicham + cry Cry_Spheal + cry Cry_Sealeo + cry Cry_Walrein + cry Cry_Clamperl + cry Cry_Huntail + cry Cry_Gorebyss + cry Cry_Lileep + cry Cry_Cradily + cry Cry_Anorith + cry Cry_Armaldo + cry Cry_Beldum + cry Cry_Metang + cry Cry_Metagross + cry Cry_Bagon + cry Cry_Shelgon + cry Cry_Regirock + cry Cry_Regice + cry Cry_Registeel + cry Cry_Castform + cry Cry_Volbeat + cry Cry_Illumise + cry Cry_Poochyena + cry Cry_Mightyena + cry Cry_Dusclops + cry Cry_Sableye + cry Cry_Mawile + cry Cry_Aron + cry Cry_Lairon + cry Cry_Aggron + cry Cry_Relicanth + cry Cry_Luvdisc + cry Cry_Groudon + cry Cry_Kyogre + cry Cry_Rayquaza + cry Cry_Salamence + cry Cry_Breloom + cry Cry_Shroomish + cry Cry_Linoone + cry Cry_Tropius + cry Cry_Wailmer + cry Cry_Zigzagoon + cry Cry_Exploud + cry Cry_Loudred + cry Cry_Wailord + cry Cry_Whismur + cry Cry_Snorunt + cry Cry_Latios + cry Cry_Jirachi + cry Cry_Deoxys + cry Cry_Chimecho -gCryTable2:: @ 848DB44 - cry2 Cry_Bulbasaur @ 848DB44 - cry2 Cry_Ivysaur @ 848DB50 - cry2 Cry_Venusaur @ 848DB5C - cry2 Cry_Charmander @ 848DB68 - cry2 Cry_Charmeleon @ 848DB74 - cry2 Cry_Charizard @ 848DB80 - cry2 Cry_Squirtle @ 848DB8C - cry2 Cry_Wartortle @ 848DB98 - cry2 Cry_Blastoise @ 848DBA4 - cry2 Cry_Caterpie @ 848DBB0 - cry2 Cry_Metapod @ 848DBBC - cry2 Cry_Butterfree @ 848DBC8 - cry2 Cry_Weedle @ 848DBD4 - cry2 Cry_Kakuna @ 848DBE0 - cry2 Cry_Beedrill @ 848DBEC - cry2 Cry_Pidgey @ 848DBF8 - cry2 Cry_Pidgeotto @ 848DC04 - cry2 Cry_Pidgeot @ 848DC10 - cry2 Cry_Rattata @ 848DC1C - cry2 Cry_Raticate @ 848DC28 - cry2 Cry_Spearow @ 848DC34 - cry2 Cry_Fearow @ 848DC40 - cry2 Cry_Ekans @ 848DC4C - cry2 Cry_Arbok @ 848DC58 - cry2 Cry_Pikachu @ 848DC64 - cry2 Cry_Raichu @ 848DC70 - cry2 Cry_Sandshrew @ 848DC7C - cry2 Cry_Sandslash @ 848DC88 - cry2 Cry_NidoranF @ 848DC94 - cry2 Cry_Nidorina @ 848DCA0 - cry2 Cry_Nidoqueen @ 848DCAC - cry2 Cry_NidoranM @ 848DCB8 - cry2 Cry_Nidorino @ 848DCC4 - cry2 Cry_Nidoking @ 848DCD0 - cry2 Cry_Clefairy @ 848DCDC - cry2 Cry_Clefable @ 848DCE8 - cry2 Cry_Vulpix @ 848DCF4 - cry2 Cry_Ninetales @ 848DD00 - cry2 Cry_Jigglypuff @ 848DD0C - cry2 Cry_Wigglytuff @ 848DD18 - cry2 Cry_Zubat @ 848DD24 - cry2 Cry_Golbat @ 848DD30 - cry2 Cry_Oddish @ 848DD3C - cry2 Cry_Gloom @ 848DD48 - cry2 Cry_Vileplume @ 848DD54 - cry2 Cry_Paras @ 848DD60 - cry2 Cry_Parasect @ 848DD6C - cry2 Cry_Venonat @ 848DD78 - cry2 Cry_Venomoth @ 848DD84 - cry2 Cry_Diglett @ 848DD90 - cry2 Cry_Dugtrio @ 848DD9C - cry2 Cry_Meowth @ 848DDA8 - cry2 Cry_Persian @ 848DDB4 - cry2 Cry_Psyduck @ 848DDC0 - cry2 Cry_Golduck @ 848DDCC - cry2 Cry_Mankey @ 848DDD8 - cry2 Cry_Primeape @ 848DDE4 - cry2 Cry_Growlithe @ 848DDF0 - cry2 Cry_Arcanine @ 848DDFC - cry2 Cry_Poliwag @ 848DE08 - cry2 Cry_Poliwhirl @ 848DE14 - cry2 Cry_Poliwrath @ 848DE20 - cry2 Cry_Abra @ 848DE2C - cry2 Cry_Kadabra @ 848DE38 - cry2 Cry_Alakazam @ 848DE44 - cry2 Cry_Machop @ 848DE50 - cry2 Cry_Machoke @ 848DE5C - cry2 Cry_Machamp @ 848DE68 - cry2 Cry_Bellsprout @ 848DE74 - cry2 Cry_Weepinbell @ 848DE80 - cry2 Cry_Victreebel @ 848DE8C - cry2 Cry_Tentacool @ 848DE98 - cry2 Cry_Tentacruel @ 848DEA4 - cry2 Cry_Geodude @ 848DEB0 - cry2 Cry_Graveler @ 848DEBC - cry2 Cry_Golem @ 848DEC8 - cry2 Cry_Ponyta @ 848DED4 - cry2 Cry_Rapidash @ 848DEE0 - cry2 Cry_Slowpoke @ 848DEEC - cry2 Cry_Slowbro @ 848DEF8 - cry2 Cry_Magnemite @ 848DF04 - cry2 Cry_Magneton @ 848DF10 - cry2 Cry_Farfetchd @ 848DF1C - cry2 Cry_Doduo @ 848DF28 - cry2 Cry_Dodrio @ 848DF34 - cry2 Cry_Seel @ 848DF40 - cry2 Cry_Dewgong @ 848DF4C - cry2 Cry_Grimer @ 848DF58 - cry2 Cry_Muk @ 848DF64 - cry2 Cry_Shellder @ 848DF70 - cry2 Cry_Cloyster @ 848DF7C - cry2 Cry_Gastly @ 848DF88 - cry2 Cry_Haunter @ 848DF94 - cry2 Cry_Gengar @ 848DFA0 - cry2 Cry_Onix @ 848DFAC - cry2 Cry_Drowzee @ 848DFB8 - cry2 Cry_Hypno @ 848DFC4 - cry2 Cry_Krabby @ 848DFD0 - cry2 Cry_Kingler @ 848DFDC - cry2 Cry_Voltorb @ 848DFE8 - cry2 Cry_Electrode @ 848DFF4 - cry2 Cry_Exeggcute @ 848E000 - cry2 Cry_Exeggutor @ 848E00C - cry2 Cry_Cubone @ 848E018 - cry2 Cry_Marowak @ 848E024 - cry2 Cry_Hitmonlee @ 848E030 - cry2 Cry_Hitmonchan @ 848E03C - cry2 Cry_Lickitung @ 848E048 - cry2 Cry_Koffing @ 848E054 - cry2 Cry_Weezing @ 848E060 - cry2 Cry_Rhyhorn @ 848E06C - cry2 Cry_Rhydon @ 848E078 - cry2 Cry_Chansey @ 848E084 - cry2 Cry_Tangela @ 848E090 - cry2 Cry_Kangaskhan @ 848E09C - cry2 Cry_Horsea @ 848E0A8 - cry2 Cry_Seadra @ 848E0B4 - cry2 Cry_Goldeen @ 848E0C0 - cry2 Cry_Seaking @ 848E0CC - cry2 Cry_Staryu @ 848E0D8 - cry2 Cry_Starmie @ 848E0E4 - cry2 Cry_MrMime @ 848E0F0 - cry2 Cry_Scyther @ 848E0FC - cry2 Cry_Jynx @ 848E108 - cry2 Cry_Electabuzz @ 848E114 - cry2 Cry_Magmar @ 848E120 - cry2 Cry_Pinsir @ 848E12C - cry2 Cry_Tauros @ 848E138 - cry2 Cry_Magikarp @ 848E144 - cry2 Cry_Gyarados @ 848E150 - cry2 Cry_Lapras @ 848E15C - cry2 Cry_Ditto @ 848E168 - cry2 Cry_Eevee @ 848E174 - cry2 Cry_Vaporeon @ 848E180 - cry2 Cry_Jolteon @ 848E18C - cry2 Cry_Flareon @ 848E198 - cry2 Cry_Porygon @ 848E1A4 - cry2 Cry_Omanyte @ 848E1B0 - cry2 Cry_Omastar @ 848E1BC - cry2 Cry_Kabuto @ 848E1C8 - cry2 Cry_Kabutops @ 848E1D4 - cry2 Cry_Aerodactyl @ 848E1E0 - cry2 Cry_Snorlax @ 848E1EC - cry2 Cry_Articuno @ 848E1F8 - cry2 Cry_Zapdos @ 848E204 - cry2 Cry_Moltres @ 848E210 - cry2 Cry_Dratini @ 848E21C - cry2 Cry_Dragonair @ 848E228 - cry2 Cry_Dragonite @ 848E234 - cry2 Cry_Mewtwo @ 848E240 - cry2 Cry_Mew @ 848E24C - cry2 Cry_Chikorita @ 848E258 - cry2 Cry_Bayleef @ 848E264 - cry2 Cry_Meganium @ 848E270 - cry2 Cry_Cyndaquil @ 848E27C - cry2 Cry_Quilava @ 848E288 - cry2 Cry_Typhlosion @ 848E294 - cry2 Cry_Totodile @ 848E2A0 - cry2 Cry_Croconaw @ 848E2AC - cry2 Cry_Feraligatr @ 848E2B8 - cry2 Cry_Sentret @ 848E2C4 - cry2 Cry_Furret @ 848E2D0 - cry2 Cry_Hoothoot @ 848E2DC - cry2 Cry_Noctowl @ 848E2E8 - cry2 Cry_Ledyba @ 848E2F4 - cry2 Cry_Ledian @ 848E300 - cry2 Cry_Spinarak @ 848E30C - cry2 Cry_Ariados @ 848E318 - cry2 Cry_Crobat @ 848E324 - cry2 Cry_Chinchou @ 848E330 - cry2 Cry_Lanturn @ 848E33C - cry2 Cry_Pichu @ 848E348 - cry2 Cry_Cleffa @ 848E354 - cry2 Cry_Igglybuff @ 848E360 - cry2 Cry_Togepi @ 848E36C - cry2 Cry_Togetic @ 848E378 - cry2 Cry_Natu @ 848E384 - cry2 Cry_Xatu @ 848E390 - cry2 Cry_Mareep @ 848E39C - cry2 Cry_Flaaffy @ 848E3A8 - cry2 Cry_Ampharos @ 848E3B4 - cry2 Cry_Bellossom @ 848E3C0 - cry2 Cry_Marill @ 848E3CC - cry2 Cry_Azumarill @ 848E3D8 - cry2 Cry_Sudowoodo @ 848E3E4 - cry2 Cry_Politoed @ 848E3F0 - cry2 Cry_Hoppip @ 848E3FC - cry2 Cry_Skiploom @ 848E408 - cry2 Cry_Jumpluff @ 848E414 - cry2 Cry_Aipom @ 848E420 - cry2 Cry_Sunkern @ 848E42C - cry2 Cry_Sunflora @ 848E438 - cry2 Cry_Yanma @ 848E444 - cry2 Cry_Wooper @ 848E450 - cry2 Cry_Quagsire @ 848E45C - cry2 Cry_Espeon @ 848E468 - cry2 Cry_Umbreon @ 848E474 - cry2 Cry_Murkrow @ 848E480 - cry2 Cry_Slowking @ 848E48C - cry2 Cry_Misdreavus @ 848E498 - cry2 Cry_Unown @ 848E4A4 - cry2 Cry_Wobbuffet @ 848E4B0 - cry2 Cry_Girafarig @ 848E4BC - cry2 Cry_Pineco @ 848E4C8 - cry2 Cry_Forretress @ 848E4D4 - cry2 Cry_Dunsparce @ 848E4E0 - cry2 Cry_Gligar @ 848E4EC - cry2 Cry_Steelix @ 848E4F8 - cry2 Cry_Snubbull @ 848E504 - cry2 Cry_Granbull @ 848E510 - cry2 Cry_Qwilfish @ 848E51C - cry2 Cry_Scizor @ 848E528 - cry2 Cry_Shuckle @ 848E534 - cry2 Cry_Heracross @ 848E540 - cry2 Cry_Sneasel @ 848E54C - cry2 Cry_Teddiursa @ 848E558 - cry2 Cry_Ursaring @ 848E564 - cry2 Cry_Slugma @ 848E570 - cry2 Cry_Magcargo @ 848E57C - cry2 Cry_Swinub @ 848E588 - cry2 Cry_Piloswine @ 848E594 - cry2 Cry_Corsola @ 848E5A0 - cry2 Cry_Remoraid @ 848E5AC - cry2 Cry_Octillery @ 848E5B8 - cry2 Cry_Delibird @ 848E5C4 - cry2 Cry_Mantine @ 848E5D0 - cry2 Cry_Skarmory @ 848E5DC - cry2 Cry_Houndour @ 848E5E8 - cry2 Cry_Houndoom @ 848E5F4 - cry2 Cry_Kingdra @ 848E600 - cry2 Cry_Phanpy @ 848E60C - cry2 Cry_Donphan @ 848E618 - cry2 Cry_Porygon2 @ 848E624 - cry2 Cry_Stantler @ 848E630 - cry2 Cry_Smeargle @ 848E63C - cry2 Cry_Tyrogue @ 848E648 - cry2 Cry_Hitmontop @ 848E654 - cry2 Cry_Smoochum @ 848E660 - cry2 Cry_Elekid @ 848E66C - cry2 Cry_Magby @ 848E678 - cry2 Cry_Miltank @ 848E684 - cry2 Cry_Blissey @ 848E690 - cry2 Cry_Raikou @ 848E69C - cry2 Cry_Entei @ 848E6A8 - cry2 Cry_Suicune @ 848E6B4 - cry2 Cry_Larvitar @ 848E6C0 - cry2 Cry_Pupitar @ 848E6CC - cry2 Cry_Tyranitar @ 848E6D8 - cry2 Cry_Lugia @ 848E6E4 - cry2 Cry_HoOh @ 848E6F0 - cry2 Cry_Celebi @ 848E6FC - cry2 Cry_Kecleon @ 848E708 - cry2 Cry_Roselia @ 848E714 - cry2 Cry_Torkoal @ 848E720 - cry2 Cry_Electrike @ 848E72C - cry2 Cry_Manectric @ 848E738 - cry2 Cry_Duskull @ 848E744 - cry2 Cry_Latias @ 848E750 - cry2 Cry_Wynaut @ 848E75C - cry2 Cry_Seviper @ 848E768 - cry2 Cry_Sharpedo @ 848E774 - cry2 Cry_Zangoose @ 848E780 - cry2 Cry_Azurill @ 848E78C - cry2 Cry_Swablu @ 848E798 - cry2 Cry_Altaria @ 848E7A4 - cry2 Cry_Unused265 @ 848E7B0 - cry2 Cry_Taillow @ 848E7BC - cry2 Cry_Swellow @ 848E7C8 - cry2 Cry_Unused268 @ 848E7D4 - cry2 Cry_Spinda @ 848E7E0 - cry2 Cry_Torchic @ 848E7EC - cry2 Cry_Combusken @ 848E7F8 - cry2 Cry_Blaziken @ 848E804 - cry2 Cry_Treecko @ 848E810 - cry2 Cry_Grovyle @ 848E81C - cry2 Cry_Sceptile @ 848E828 - cry2 Cry_Mudkip @ 848E834 - cry2 Cry_Marshtomp @ 848E840 - cry2 Cry_Swampert @ 848E84C - cry2 Cry_Pelipper @ 848E858 - cry2 Cry_Wingull @ 848E864 - cry2 Cry_Banette @ 848E870 - cry2 Cry_Shuppet @ 848E87C - cry2 Cry_Lotad @ 848E888 - cry2 Cry_Lombre @ 848E894 - cry2 Cry_Ludicolo @ 848E8A0 - cry2 Cry_Seedot @ 848E8AC - cry2 Cry_Nuzleaf @ 848E8B8 - cry2 Cry_Shiftry @ 848E8C4 - cry2 Cry_Carvanha @ 848E8D0 - cry2 Cry_Wurmple @ 848E8DC - cry2 Cry_Silcoon @ 848E8E8 - cry2 Cry_Beautifly @ 848E8F4 - cry2 Cry_Cascoon @ 848E900 - cry2 Cry_Dustox @ 848E90C - cry2 Cry_Ralts @ 848E918 - cry2 Cry_Kirlia @ 848E924 - cry2 Cry_Gardevoir @ 848E930 - cry2 Cry_Slakoth @ 848E93C - cry2 Cry_Vigoroth @ 848E948 - cry2 Cry_Slaking @ 848E954 - cry2 Cry_Nincada @ 848E960 - cry2 Cry_Ninjask @ 848E96C - cry2 Cry_Shedinja @ 848E978 - cry2 Cry_Makuhita @ 848E984 - cry2 Cry_Hariyama @ 848E990 - cry2 Cry_Nosepass @ 848E99C - cry2 Cry_Glalie @ 848E9A8 - cry2 Cry_Plusle @ 848E9B4 - cry2 Cry_Minun @ 848E9C0 - cry2 Cry_Surskit @ 848E9CC - cry2 Cry_Masquerain @ 848E9D8 - cry2 Cry_Skitty @ 848E9E4 - cry2 Cry_Delcatty @ 848E9F0 - cry2 Cry_Gulpin @ 848E9FC - cry2 Cry_Swalot @ 848EA08 - cry2 Cry_Numel @ 848EA14 - cry2 Cry_Camerupt @ 848EA20 - cry2 Cry_Barboach @ 848EA2C - cry2 Cry_Whiscash @ 848EA38 - cry2 Cry_Corphish @ 848EA44 - cry2 Cry_Crawdaunt @ 848EA50 - cry2 Cry_Spoink @ 848EA5C - cry2 Cry_Grumpig @ 848EA68 - cry2 Cry_Trapinch @ 848EA74 - cry2 Cry_Vibrava @ 848EA80 - cry2 Cry_Flygon @ 848EA8C - cry2 Cry_Cacnea @ 848EA98 - cry2 Cry_Cacturne @ 848EAA4 - cry2 Cry_Baltoy @ 848EAB0 - cry2 Cry_Claydol @ 848EABC - cry2 Cry_Lunatone @ 848EAC8 - cry2 Cry_Solrock @ 848EAD4 - cry2 Cry_Feebas @ 848EAE0 - cry2 Cry_Milotic @ 848EAEC - cry2 Cry_Absol @ 848EAF8 - cry2 Cry_Meditite @ 848EB04 - cry2 Cry_Medicham @ 848EB10 - cry2 Cry_Spheal @ 848EB1C - cry2 Cry_Sealeo @ 848EB28 - cry2 Cry_Walrein @ 848EB34 - cry2 Cry_Clamperl @ 848EB40 - cry2 Cry_Huntail @ 848EB4C - cry2 Cry_Gorebyss @ 848EB58 - cry2 Cry_Lileep @ 848EB64 - cry2 Cry_Cradily @ 848EB70 - cry2 Cry_Anorith @ 848EB7C - cry2 Cry_Armaldo @ 848EB88 - cry2 Cry_Beldum @ 848EB94 - cry2 Cry_Metang @ 848EBA0 - cry2 Cry_Metagross @ 848EBAC - cry2 Cry_Bagon @ 848EBB8 - cry2 Cry_Shelgon @ 848EBC4 - cry2 Cry_Regirock @ 848EBD0 - cry2 Cry_Regice @ 848EBDC - cry2 Cry_Registeel @ 848EBE8 - cry2 Cry_Castform @ 848EBF4 - cry2 Cry_Volbeat @ 848EC00 - cry2 Cry_Illumise @ 848EC0C - cry2 Cry_Poochyena @ 848EC18 - cry2 Cry_Mightyena @ 848EC24 - cry2 Cry_Dusclops @ 848EC30 - cry2 Cry_Sableye @ 848EC3C - cry2 Cry_Mawile @ 848EC48 - cry2 Cry_Aron @ 848EC54 - cry2 Cry_Lairon @ 848EC60 - cry2 Cry_Aggron @ 848EC6C - cry2 Cry_Relicanth @ 848EC78 - cry2 Cry_Luvdisc @ 848EC84 - cry2 Cry_Groudon @ 848EC90 - cry2 Cry_Kyogre @ 848EC9C - cry2 Cry_Rayquaza @ 848ECA8 - cry2 Cry_Salamence @ 848ECB4 - cry2 Cry_Breloom @ 848ECC0 - cry2 Cry_Shroomish @ 848ECCC - cry2 Cry_Linoone @ 848ECD8 - cry2 Cry_Tropius @ 848ECE4 - cry2 Cry_Wailmer @ 848ECF0 - cry2 Cry_Zigzagoon @ 848ECFC - cry2 Cry_Exploud @ 848ED08 - cry2 Cry_Loudred @ 848ED14 - cry2 Cry_Wailord @ 848ED20 - cry2 Cry_Whismur @ 848ED2C - cry2 Cry_Snorunt @ 848ED38 - cry2 Cry_Latios @ 848ED44 - cry2 Cry_Jirachi @ 848ED50 - cry2 Cry_Deoxys @ 848ED5C - cry2 Cry_Chimecho @ 848ED68 +gCryTable2:: + cry2 Cry_Bulbasaur + cry2 Cry_Ivysaur + cry2 Cry_Venusaur + cry2 Cry_Charmander + cry2 Cry_Charmeleon + cry2 Cry_Charizard + cry2 Cry_Squirtle + cry2 Cry_Wartortle + cry2 Cry_Blastoise + cry2 Cry_Caterpie + cry2 Cry_Metapod + cry2 Cry_Butterfree + cry2 Cry_Weedle + cry2 Cry_Kakuna + cry2 Cry_Beedrill + cry2 Cry_Pidgey + cry2 Cry_Pidgeotto + cry2 Cry_Pidgeot + cry2 Cry_Rattata + cry2 Cry_Raticate + cry2 Cry_Spearow + cry2 Cry_Fearow + cry2 Cry_Ekans + cry2 Cry_Arbok + cry2 Cry_Pikachu + cry2 Cry_Raichu + cry2 Cry_Sandshrew + cry2 Cry_Sandslash + cry2 Cry_NidoranF + cry2 Cry_Nidorina + cry2 Cry_Nidoqueen + cry2 Cry_NidoranM + cry2 Cry_Nidorino + cry2 Cry_Nidoking + cry2 Cry_Clefairy + cry2 Cry_Clefable + cry2 Cry_Vulpix + cry2 Cry_Ninetales + cry2 Cry_Jigglypuff + cry2 Cry_Wigglytuff + cry2 Cry_Zubat + cry2 Cry_Golbat + cry2 Cry_Oddish + cry2 Cry_Gloom + cry2 Cry_Vileplume + cry2 Cry_Paras + cry2 Cry_Parasect + cry2 Cry_Venonat + cry2 Cry_Venomoth + cry2 Cry_Diglett + cry2 Cry_Dugtrio + cry2 Cry_Meowth + cry2 Cry_Persian + cry2 Cry_Psyduck + cry2 Cry_Golduck + cry2 Cry_Mankey + cry2 Cry_Primeape + cry2 Cry_Growlithe + cry2 Cry_Arcanine + cry2 Cry_Poliwag + cry2 Cry_Poliwhirl + cry2 Cry_Poliwrath + cry2 Cry_Abra + cry2 Cry_Kadabra + cry2 Cry_Alakazam + cry2 Cry_Machop + cry2 Cry_Machoke + cry2 Cry_Machamp + cry2 Cry_Bellsprout + cry2 Cry_Weepinbell + cry2 Cry_Victreebel + cry2 Cry_Tentacool + cry2 Cry_Tentacruel + cry2 Cry_Geodude + cry2 Cry_Graveler + cry2 Cry_Golem + cry2 Cry_Ponyta + cry2 Cry_Rapidash + cry2 Cry_Slowpoke + cry2 Cry_Slowbro + cry2 Cry_Magnemite + cry2 Cry_Magneton + cry2 Cry_Farfetchd + cry2 Cry_Doduo + cry2 Cry_Dodrio + cry2 Cry_Seel + cry2 Cry_Dewgong + cry2 Cry_Grimer + cry2 Cry_Muk + cry2 Cry_Shellder + cry2 Cry_Cloyster + cry2 Cry_Gastly + cry2 Cry_Haunter + cry2 Cry_Gengar + cry2 Cry_Onix + cry2 Cry_Drowzee + cry2 Cry_Hypno + cry2 Cry_Krabby + cry2 Cry_Kingler + cry2 Cry_Voltorb + cry2 Cry_Electrode + cry2 Cry_Exeggcute + cry2 Cry_Exeggutor + cry2 Cry_Cubone + cry2 Cry_Marowak + cry2 Cry_Hitmonlee + cry2 Cry_Hitmonchan + cry2 Cry_Lickitung + cry2 Cry_Koffing + cry2 Cry_Weezing + cry2 Cry_Rhyhorn + cry2 Cry_Rhydon + cry2 Cry_Chansey + cry2 Cry_Tangela + cry2 Cry_Kangaskhan + cry2 Cry_Horsea + cry2 Cry_Seadra + cry2 Cry_Goldeen + cry2 Cry_Seaking + cry2 Cry_Staryu + cry2 Cry_Starmie + cry2 Cry_MrMime + cry2 Cry_Scyther + cry2 Cry_Jynx + cry2 Cry_Electabuzz + cry2 Cry_Magmar + cry2 Cry_Pinsir + cry2 Cry_Tauros + cry2 Cry_Magikarp + cry2 Cry_Gyarados + cry2 Cry_Lapras + cry2 Cry_Ditto + cry2 Cry_Eevee + cry2 Cry_Vaporeon + cry2 Cry_Jolteon + cry2 Cry_Flareon + cry2 Cry_Porygon + cry2 Cry_Omanyte + cry2 Cry_Omastar + cry2 Cry_Kabuto + cry2 Cry_Kabutops + cry2 Cry_Aerodactyl + cry2 Cry_Snorlax + cry2 Cry_Articuno + cry2 Cry_Zapdos + cry2 Cry_Moltres + cry2 Cry_Dratini + cry2 Cry_Dragonair + cry2 Cry_Dragonite + cry2 Cry_Mewtwo + cry2 Cry_Mew + cry2 Cry_Chikorita + cry2 Cry_Bayleef + cry2 Cry_Meganium + cry2 Cry_Cyndaquil + cry2 Cry_Quilava + cry2 Cry_Typhlosion + cry2 Cry_Totodile + cry2 Cry_Croconaw + cry2 Cry_Feraligatr + cry2 Cry_Sentret + cry2 Cry_Furret + cry2 Cry_Hoothoot + cry2 Cry_Noctowl + cry2 Cry_Ledyba + cry2 Cry_Ledian + cry2 Cry_Spinarak + cry2 Cry_Ariados + cry2 Cry_Crobat + cry2 Cry_Chinchou + cry2 Cry_Lanturn + cry2 Cry_Pichu + cry2 Cry_Cleffa + cry2 Cry_Igglybuff + cry2 Cry_Togepi + cry2 Cry_Togetic + cry2 Cry_Natu + cry2 Cry_Xatu + cry2 Cry_Mareep + cry2 Cry_Flaaffy + cry2 Cry_Ampharos + cry2 Cry_Bellossom + cry2 Cry_Marill + cry2 Cry_Azumarill + cry2 Cry_Sudowoodo + cry2 Cry_Politoed + cry2 Cry_Hoppip + cry2 Cry_Skiploom + cry2 Cry_Jumpluff + cry2 Cry_Aipom + cry2 Cry_Sunkern + cry2 Cry_Sunflora + cry2 Cry_Yanma + cry2 Cry_Wooper + cry2 Cry_Quagsire + cry2 Cry_Espeon + cry2 Cry_Umbreon + cry2 Cry_Murkrow + cry2 Cry_Slowking + cry2 Cry_Misdreavus + cry2 Cry_Unown + cry2 Cry_Wobbuffet + cry2 Cry_Girafarig + cry2 Cry_Pineco + cry2 Cry_Forretress + cry2 Cry_Dunsparce + cry2 Cry_Gligar + cry2 Cry_Steelix + cry2 Cry_Snubbull + cry2 Cry_Granbull + cry2 Cry_Qwilfish + cry2 Cry_Scizor + cry2 Cry_Shuckle + cry2 Cry_Heracross + cry2 Cry_Sneasel + cry2 Cry_Teddiursa + cry2 Cry_Ursaring + cry2 Cry_Slugma + cry2 Cry_Magcargo + cry2 Cry_Swinub + cry2 Cry_Piloswine + cry2 Cry_Corsola + cry2 Cry_Remoraid + cry2 Cry_Octillery + cry2 Cry_Delibird + cry2 Cry_Mantine + cry2 Cry_Skarmory + cry2 Cry_Houndour + cry2 Cry_Houndoom + cry2 Cry_Kingdra + cry2 Cry_Phanpy + cry2 Cry_Donphan + cry2 Cry_Porygon2 + cry2 Cry_Stantler + cry2 Cry_Smeargle + cry2 Cry_Tyrogue + cry2 Cry_Hitmontop + cry2 Cry_Smoochum + cry2 Cry_Elekid + cry2 Cry_Magby + cry2 Cry_Miltank + cry2 Cry_Blissey + cry2 Cry_Raikou + cry2 Cry_Entei + cry2 Cry_Suicune + cry2 Cry_Larvitar + cry2 Cry_Pupitar + cry2 Cry_Tyranitar + cry2 Cry_Lugia + cry2 Cry_HoOh + cry2 Cry_Celebi + cry2 Cry_Kecleon + cry2 Cry_Roselia + cry2 Cry_Torkoal + cry2 Cry_Electrike + cry2 Cry_Manectric + cry2 Cry_Duskull + cry2 Cry_Latias + cry2 Cry_Wynaut + cry2 Cry_Seviper + cry2 Cry_Sharpedo + cry2 Cry_Zangoose + cry2 Cry_Azurill + cry2 Cry_Swablu + cry2 Cry_Altaria + cry2 Cry_Unused265 + cry2 Cry_Taillow + cry2 Cry_Swellow + cry2 Cry_Unused268 + cry2 Cry_Spinda + cry2 Cry_Torchic + cry2 Cry_Combusken + cry2 Cry_Blaziken + cry2 Cry_Treecko + cry2 Cry_Grovyle + cry2 Cry_Sceptile + cry2 Cry_Mudkip + cry2 Cry_Marshtomp + cry2 Cry_Swampert + cry2 Cry_Pelipper + cry2 Cry_Wingull + cry2 Cry_Banette + cry2 Cry_Shuppet + cry2 Cry_Lotad + cry2 Cry_Lombre + cry2 Cry_Ludicolo + cry2 Cry_Seedot + cry2 Cry_Nuzleaf + cry2 Cry_Shiftry + cry2 Cry_Carvanha + cry2 Cry_Wurmple + cry2 Cry_Silcoon + cry2 Cry_Beautifly + cry2 Cry_Cascoon + cry2 Cry_Dustox + cry2 Cry_Ralts + cry2 Cry_Kirlia + cry2 Cry_Gardevoir + cry2 Cry_Slakoth + cry2 Cry_Vigoroth + cry2 Cry_Slaking + cry2 Cry_Nincada + cry2 Cry_Ninjask + cry2 Cry_Shedinja + cry2 Cry_Makuhita + cry2 Cry_Hariyama + cry2 Cry_Nosepass + cry2 Cry_Glalie + cry2 Cry_Plusle + cry2 Cry_Minun + cry2 Cry_Surskit + cry2 Cry_Masquerain + cry2 Cry_Skitty + cry2 Cry_Delcatty + cry2 Cry_Gulpin + cry2 Cry_Swalot + cry2 Cry_Numel + cry2 Cry_Camerupt + cry2 Cry_Barboach + cry2 Cry_Whiscash + cry2 Cry_Corphish + cry2 Cry_Crawdaunt + cry2 Cry_Spoink + cry2 Cry_Grumpig + cry2 Cry_Trapinch + cry2 Cry_Vibrava + cry2 Cry_Flygon + cry2 Cry_Cacnea + cry2 Cry_Cacturne + cry2 Cry_Baltoy + cry2 Cry_Claydol + cry2 Cry_Lunatone + cry2 Cry_Solrock + cry2 Cry_Feebas + cry2 Cry_Milotic + cry2 Cry_Absol + cry2 Cry_Meditite + cry2 Cry_Medicham + cry2 Cry_Spheal + cry2 Cry_Sealeo + cry2 Cry_Walrein + cry2 Cry_Clamperl + cry2 Cry_Huntail + cry2 Cry_Gorebyss + cry2 Cry_Lileep + cry2 Cry_Cradily + cry2 Cry_Anorith + cry2 Cry_Armaldo + cry2 Cry_Beldum + cry2 Cry_Metang + cry2 Cry_Metagross + cry2 Cry_Bagon + cry2 Cry_Shelgon + cry2 Cry_Regirock + cry2 Cry_Regice + cry2 Cry_Registeel + cry2 Cry_Castform + cry2 Cry_Volbeat + cry2 Cry_Illumise + cry2 Cry_Poochyena + cry2 Cry_Mightyena + cry2 Cry_Dusclops + cry2 Cry_Sableye + cry2 Cry_Mawile + cry2 Cry_Aron + cry2 Cry_Lairon + cry2 Cry_Aggron + cry2 Cry_Relicanth + cry2 Cry_Luvdisc + cry2 Cry_Groudon + cry2 Cry_Kyogre + cry2 Cry_Rayquaza + cry2 Cry_Salamence + cry2 Cry_Breloom + cry2 Cry_Shroomish + cry2 Cry_Linoone + cry2 Cry_Tropius + cry2 Cry_Wailmer + cry2 Cry_Zigzagoon + cry2 Cry_Exploud + cry2 Cry_Loudred + cry2 Cry_Wailord + cry2 Cry_Whismur + cry2 Cry_Snorunt + cry2 Cry_Latios + cry2 Cry_Jirachi + cry2 Cry_Deoxys + cry2 Cry_Chimecho .align 2 -voicegroup129:: @ 848ED74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848ED74 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 848ED80 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 848ED8C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 226, 25, 0 @ 848ED98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EDA4 - voice_directsound 60, 0, DirectSoundWaveData_wave_54, 255, 0, 255, 165 @ 848EDB0 - voice_directsound 60, 0, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 848EDBC - voice_directsound 60, 0, DirectSoundWaveData_sd90_open_triangle, 255, 204, 128, 249 @ 848EDC8 - voice_directsound 60, 0, DirectSoundWaveData_register_noise, 255, 0, 255, 76 @ 848EDD4 - voice_directsound 60, 0, DirectSoundWaveData_wave_77, 255, 0, 206, 204 @ 848EDE0 - voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 206, 38 @ 848EDEC - voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 206, 0 @ 848EDF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EE88 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 @ 848EE94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EEA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EEAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EEB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EEC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EED0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EEDC - voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 848EEE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EEF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EF90 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 252, 0, 204 @ 848EF9C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 848EFA8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127 @ 848EFB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EFC0 - voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0 @ 848EFCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EFD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EFE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EFF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848EFFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F008 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F014 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F020 - voice_keysplit voicegroup006, KeySplitTable4 @ 848F02C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F038 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F044 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F050 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F05C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F068 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F074 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F080 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F08C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F098 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F0A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F0B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F0BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F0C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F0D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F0E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F0EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F0F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F104 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F110 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F11C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F128 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F134 - voice_square_1_alt 60, 0, 0, 3, 0, 0, 10, 3 @ 848F140 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F14C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F158 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F164 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F170 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F17C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F188 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F194 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F1A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F1AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F1B8 - voice_square_1_alt 60, 0, 0, 0, 0, 0, 15, 1 @ 848F1C4 - voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 6 @ 848F1D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F1DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F1E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F1F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F200 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F20C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F218 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F224 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F230 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F23C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F248 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F254 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F260 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F26C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F278 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F284 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F290 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F29C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F2A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F2B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F2C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F2CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F2D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F2E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F2F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F2FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F308 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F314 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F320 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F32C - voice_noise_alt 60, 0, 0, 0, 1, 9, 2 @ 848F338 - voice_noise_alt 60, 0, 0, 0, 4, 3, 1 @ 848F344 - voice_noise_alt 60, 0, 0, 0, 1, 12, 0 @ 848F350 - voice_noise_alt 60, 0, 1, 0, 1, 9, 0 @ 848F35C - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 848F368 +voicegroup129:: + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 226, 25, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_wave_54, 255, 0, 255, 165 + voice_directsound 60, 0, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 + voice_directsound 60, 0, DirectSoundWaveData_sd90_open_triangle, 255, 204, 128, 249 + voice_directsound 60, 0, DirectSoundWaveData_register_noise, 255, 0, 255, 76 + voice_directsound 60, 0, DirectSoundWaveData_wave_77, 255, 0, 206, 204 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 206, 38 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 206, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 252, 0, 204 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 3, 0, 0, 10, 3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 0, 15, 1 + voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 6 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 1, 9, 2 + voice_noise_alt 60, 0, 0, 0, 4, 3, 1 + voice_noise_alt 60, 0, 0, 0, 1, 12, 0 + voice_noise_alt 60, 0, 1, 0, 1, 9, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 .align 2 -voicegroup130:: @ 848F374 - voice_keysplit_all voicegroup001 @ 848F374 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F380 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F38C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F398 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F3A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F3B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F3BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F3C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F3D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F3E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F3EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F3F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F404 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F410 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F41C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F428 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F434 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F440 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F44C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F458 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F464 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion_duplicate, 255, 249, 25, 248 @ 848F470 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F47C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F488 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F494 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F4A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F4AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F4B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F4C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F4D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F4DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F4E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F4F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F500 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F50C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F518 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F524 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F530 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F53C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F548 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F554 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F560 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F56C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F578 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F584 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F590 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F59C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F5A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F5B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F5C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F5CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F5D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F5E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F5F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F5FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F608 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F614 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F620 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F62C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F638 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F644 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F650 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F65C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F668 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F674 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F680 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F68C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F698 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F6A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F6B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F6BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F6C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F6D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F6E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F6EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F6F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F704 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F710 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F71C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F728 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F734 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F740 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F74C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F758 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F764 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F770 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F77C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F788 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F794 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F7A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F7AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F7B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F7C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F7D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F7DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F7E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F7F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F800 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F80C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F818 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F824 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F830 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F83C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F848 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F854 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F860 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F86C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F878 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F884 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F890 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F89C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F8A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F8B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F8C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F8CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F8D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F8E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F8F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F8FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F908 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F914 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F920 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F92C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F938 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F944 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F950 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F95C - voice_noise_alt 60, 0, 0, 0, 1, 7, 1 @ 848F968 +voicegroup130:: + voice_keysplit_all voicegroup001 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion_duplicate, 255, 249, 25, 248 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 1, 7, 1 .align 2 -voicegroup131:: @ 848F974 - voice_keysplit_all voicegroup002 @ 848F974 - voice_keysplit voicegroup003, KeySplitTable1 @ 848F980 - voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 128, 204, 51, 242 @ 848F98C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F998 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F9A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F9B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F9BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F9C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F9D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F9E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F9EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848F9F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FA88 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 @ 848FA94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FAA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FAAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FAB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FAC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FAD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FADC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FAE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FAF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FB9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FBA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FBB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FBC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FBCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FBD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FBE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FBF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FBFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FC98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FCA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FCB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FCBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FCC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FCD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FCE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FCEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FCF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FD04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FD10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FD1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FD28 - voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 5 @ 848FD34 - voice_square_2_alt 60, 0, 3, 0, 2, 6, 5 @ 848FD40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FD4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FD58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FD64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FD70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FD7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FD88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FD94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FDA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FDAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FDB8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 9, 1 @ 848FDC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FDD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FDDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FDE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FDF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FE9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FEA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FEB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FEC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FECC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FED8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FEE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FEF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FEFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FF08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FF14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FF20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FF2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FF38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FF44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FF50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FF5C - voice_noise_alt 60, 0, 0, 0, 1, 0, 1 @ 848FF68 +voicegroup131:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 128, 204, 51, 242 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 5 + voice_square_2_alt 60, 0, 3, 0, 2, 6, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 9, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 1, 0, 1 .align 2 -voicegroup132:: @ 848FF74 - voice_keysplit_all voicegroup002 @ 848FF74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FF80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FF8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FF98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FFA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FFB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FFBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FFC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FFD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FFE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FFEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 848FFF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490004 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490010 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 @ 849001C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490028 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490034 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 118, 137 @ 8490040 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849004C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490058 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490064 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490070 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849007C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490088 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226 @ 8490094 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84900A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84900AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84900B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84900C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84900D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84900DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84900E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84900F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490100 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849010C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490118 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490124 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490130 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849013C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490148 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490154 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490160 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849016C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490178 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490184 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490190 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849019C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 165, 154, 235 @ 84901A8 - voice_keysplit voicegroup004, KeySplitTable2 @ 84901B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84901C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84901CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84901D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84901E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84901F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84901FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490208 - voice_keysplit voicegroup005, KeySplitTable3 @ 8490214 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490220 - voice_keysplit voicegroup006, KeySplitTable4 @ 849022C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490238 - voice_keysplit voicegroup007, KeySplitTable5 @ 8490244 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490250 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849025C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490268 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490274 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490280 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849028C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490298 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84902A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84902B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84902BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84902C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84902D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 84902E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84902EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84902F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490304 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490310 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849031C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490328 - voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 2 @ 8490334 - voice_square_2_alt 60, 0, 3, 0, 1, 7, 5 @ 8490340 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 4, 6, 0 @ 849034C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490358 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 4, 6, 0 @ 8490364 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490370 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849037C - voice_square_1_alt 60, 0, 0, 0, 0, 4, 2, 2 @ 8490388 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490394 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84903A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84903AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84903B8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 2, 9, 1 @ 84903C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84903D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84903DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84903E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84903F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490400 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849040C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490418 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490424 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490430 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849043C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490448 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490454 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490460 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849046C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490478 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490484 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490490 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849049C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84904A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84904B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84904C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84904CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84904D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84904E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84904F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84904FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490508 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490514 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490520 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849052C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490538 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490544 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490550 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 849055C - voice_noise_alt 60, 0, 0, 0, 1, 8, 1 @ 8490568 +voicegroup132:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 118, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 165, 154, 235 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 2 + voice_square_2_alt 60, 0, 3, 0, 1, 7, 5 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 4, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 4, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 4, 2, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 2, 9, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 8, 1 .align 2 -voicegroup133:: @ 8490574 - voice_keysplit_all voicegroup002 @ 8490574 - voice_keysplit voicegroup003, KeySplitTable1 @ 8490580 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849058C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490598 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84905A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84905B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84905BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84905C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84905D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84905E0 - voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 84905EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84905F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490604 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490610 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 849061C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490628 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490634 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137 @ 8490640 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849064C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490658 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490664 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490670 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849067C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490688 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 @ 8490694 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84906A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84906AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84906B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84906C4 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 84906D0 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 84906DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84906E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84906F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490700 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849070C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490718 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490724 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490730 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 849073C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 @ 8490748 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490754 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490760 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849076C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490778 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490784 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490790 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849079C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 @ 84907A8 - voice_keysplit voicegroup004, KeySplitTable2 @ 84907B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84907C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84907CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84907D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84907E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84907F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84907FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490808 - voice_keysplit voicegroup005, KeySplitTable3 @ 8490814 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490820 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849082C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490838 - voice_keysplit voicegroup007, KeySplitTable5 @ 8490844 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490850 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 849085C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490868 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490874 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490880 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849088C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490898 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84908A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84908B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84908BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84908C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84908D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84908E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84908EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84908F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490904 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490910 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 849091C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490928 - voice_square_1_alt 60, 0, 0, 1, 0, 1, 9, 0 @ 8490934 - voice_square_2_alt 60, 0, 3, 0, 2, 9, 1 @ 8490940 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849094C - voice_square_2_alt 60, 0, 2, 1, 0, 9, 1 @ 8490958 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490964 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490970 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849097C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 8490988 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490994 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84909A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84909AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84909B8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 15, 0 @ 84909C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84909D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84909DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84909E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84909F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490A9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490AA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490AB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490AC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490ACC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490AD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490AE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490AF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490AFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490B08 - voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 8490B14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490B20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490B2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490B38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490B44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490B50 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 8490B5C - voice_noise_alt 60, 0, 0, 0, 1, 8, 1 @ 8490B68 +voicegroup133:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 1, 9, 0 + voice_square_2_alt 60, 0, 3, 0, 2, 9, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 1, 0, 9, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 8, 1 .align 2 -voicegroup134:: @ 8490B74 - voice_keysplit_all voicegroup001 @ 8490B74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490B80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490B8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490B98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490BA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490BB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490BBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490BC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490BD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490BE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490BEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490BF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490C94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490CA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490CAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490CB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490CC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490CD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490CDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490CE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490CF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490D9C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 8490DA8 - voice_keysplit voicegroup004, KeySplitTable2 @ 8490DB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490DC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490DCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490DD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490DE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490DF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490DFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490E08 - voice_keysplit voicegroup005, KeySplitTable3 @ 8490E14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490E20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490E2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490E38 - voice_keysplit voicegroup007, KeySplitTable5 @ 8490E44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490E50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490E5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490E68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490E74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490E80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490E8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490E98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490EA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490EB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490EBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490EC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490ED4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490EE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490EEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490EF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490F04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490F10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490F1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490F28 - voice_square_2_alt 60, 0, 2, 0, 1, 7, 1 @ 8490F34 - voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1 @ 8490F40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490F4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490F58 - voice_square_2_alt 60, 0, 3, 0, 1, 7, 1 @ 8490F64 - voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1 @ 8490F70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490F7C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 1 @ 8490F88 - voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 1 @ 8490F94 - voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 1 @ 8490FA0 +voicegroup134:: + voice_keysplit_all voicegroup001 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 0, 1, 7, 1 + voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 3, 0, 1, 7, 1 + voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 1 + voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 1 + voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 1 .align 2 -voicegroup135:: @ 8490FAC - voice_keysplit_all voicegroup002 @ 8490FAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490FB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490FC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490FD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490FDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490FE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8490FF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491000 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849100C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491018 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491024 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491030 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849103C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491048 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491054 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491060 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849106C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491078 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491084 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491090 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849109C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 85, 137, 180, 204 @ 84910A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84910B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84910C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84910CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84910D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84910E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84910F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84910FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491108 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491114 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491120 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849112C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491138 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491144 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491150 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849115C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491168 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491174 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491180 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849118C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491198 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84911A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84911B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84911BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84911C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84911D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84911E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84911EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84911F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491204 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491210 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849121C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491228 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491234 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491240 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849124C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491258 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491264 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491270 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849127C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491288 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491294 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84912A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84912AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84912B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84912C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84912D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84912DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84912E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84912F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491300 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849130C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491318 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491324 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491330 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849133C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491348 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491354 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491360 - voice_square_1_alt 60, 0, 0, 2, 0, 0, 9, 0 @ 849136C - voice_square_2_alt 60, 0, 2, 0, 0, 9, 0 @ 8491378 - voice_square_1_alt 60, 0, 0, 0, 1, 2, 6, 0 @ 8491384 +voicegroup135:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 85, 137, 180, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 0, 9, 0 + voice_square_2_alt 60, 0, 2, 0, 0, 9, 0 + voice_square_1_alt 60, 0, 0, 0, 1, 2, 6, 0 .align 2 -voicegroup136:: @ 8491390 - voice_keysplit_all voicegroup002 @ 8491390 - voice_keysplit voicegroup003, KeySplitTable1 @ 849139C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84913A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84913B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84913C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84913CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84913D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84913E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84913F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84913FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491408 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491414 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491420 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849142C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491438 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491444 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491450 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849145C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491468 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491474 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491480 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849148C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491498 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84914A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84914B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84914BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84914C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84914D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84914E0 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 84914EC - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 84914F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491504 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491510 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849151C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491528 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491534 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491540 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849154C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8491558 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491564 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491570 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849157C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491588 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491594 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84915A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84915AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84915B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84915C4 - voice_keysplit voicegroup004, KeySplitTable2 @ 84915D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84915DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84915E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84915F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491600 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849160C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491618 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491624 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491630 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849163C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491648 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491654 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491660 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849166C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 8491678 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491684 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491690 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849169C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84916A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84916B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84916C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84916CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84916D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84916E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84916F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84916FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491708 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491714 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491720 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849172C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491738 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491744 - voice_square_2_alt 60, 0, 0, 0, 5, 0, 0 @ 8491750 - voice_square_1_alt 60, 0, 0, 0, 0, 5, 0, 0 @ 849175C - voice_square_1_alt 60, 0, 0, 2, 2, 4, 10, 0 @ 8491768 - voice_square_2_alt 60, 0, 0, 0, 5, 0, 0 @ 8491774 - voice_square_1_alt 60, 0, 0, 1, 0, 5, 0, 0 @ 8491780 - voice_square_2_alt 60, 0, 3, 2, 4, 10, 0 @ 849178C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 1, 5, 0, 3 @ 8491798 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 1, 5, 0, 3 @ 84917A4 - voice_square_2_alt 60, 0, 1, 0, 1, 10, 2 @ 84917B0 - voice_square_1_alt 60, 0, 0, 1, 0, 1, 10, 0 @ 84917BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84917C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84917D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84917E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84917EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84917F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491804 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491810 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849181C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491828 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491834 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491840 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849184C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491858 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491864 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491870 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849187C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491888 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491894 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84918A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84918AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84918B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84918C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84918D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84918DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84918E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84918F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491900 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849190C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491918 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491924 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491930 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849193C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491948 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491954 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491960 - voice_noise_alt 60, 0, 0, 0, 0, 15, 0 @ 849196C - voice_noise_alt 60, 0, 0, 0, 2, 4, 0 @ 8491978 - voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ 8491984 +voicegroup136:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 0, 0, 5, 0, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 5, 0, 0 + voice_square_1_alt 60, 0, 0, 2, 2, 4, 10, 0 + voice_square_2_alt 60, 0, 0, 0, 5, 0, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 5, 0, 0 + voice_square_2_alt 60, 0, 3, 2, 4, 10, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 1, 5, 0, 3 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 1, 5, 0, 3 + voice_square_2_alt 60, 0, 1, 0, 1, 10, 2 + voice_square_1_alt 60, 0, 0, 1, 0, 1, 10, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 4, 0 + voice_noise_alt 60, 0, 0, 0, 1, 0, 0 .align 2 -voicegroup137:: @ 8491990 - voice_keysplit_all voicegroup002 @ 8491990 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849199C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84919A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84919B4 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 165, 180, 165 @ 84919C0 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 137, 154, 165 @ 84919CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84919D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84919E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84919F0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 204, 51, 242 @ 84919FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A2C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8491A38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491A98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491AA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491AB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491ABC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491AC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491AD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491AE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491AEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491AF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491B94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491BA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491BAC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 @ 8491BB8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 @ 8491BC4 - voice_keysplit voicegroup004, KeySplitTable2 @ 8491BD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491BDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491BE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491BF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491C00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491C0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491C18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491C24 - voice_keysplit voicegroup005, KeySplitTable3 @ 8491C30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491C3C - voice_keysplit voicegroup006, KeySplitTable4 @ 8491C48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491C54 - voice_keysplit voicegroup007, KeySplitTable5 @ 8491C60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491C6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491C78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491C84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491C90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491C9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491CA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491CB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491CC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491CCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491CD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491CE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491CF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491CFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491D08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491D14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491D20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491D2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491D38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491D44 - voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1 @ 8491D50 - voice_square_2_alt 60, 0, 1, 1, 2, 3, 1 @ 8491D5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491D68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491D74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491D80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491D8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491D98 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 2, 4, 1 @ 8491DA4 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 2, 4, 1 @ 8491DB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491DBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491DC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491DD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491DE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491DEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491DF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491E94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491EA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491EAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491EB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491EC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491ED0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491EDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491EE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491EF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491F00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491F0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491F18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491F24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491F30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491F3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491F48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491F54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491F60 - voice_noise_alt 60, 0, 0, 0, 0, 15, 0 @ 8491F6C - voice_noise_alt 60, 0, 0, 0, 2, 4, 0 @ 8491F78 - voice_noise_alt 60, 0, 0, 0, 1, 0, 1 @ 8491F84 +voicegroup137:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 165, 180, 165 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 137, 154, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 204, 51, 242 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1 + voice_square_2_alt 60, 0, 1, 1, 2, 3, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 2, 4, 1 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 2, 4, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 4, 0 + voice_noise_alt 60, 0, 0, 0, 1, 0, 1 .align 2 -voicegroup138:: @ 8491F90 - voice_keysplit_all voicegroup002 @ 8491F90 - voice_keysplit voicegroup003, KeySplitTable1 @ 8491F9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491FA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491FB4 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 8491FC0 - voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 8491FCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491FD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491FE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491FF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8491FFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492008 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492014 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492020 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849202C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492038 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492044 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492050 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 849205C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492068 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492074 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492080 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 849208C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492098 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84920A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 84920B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84920BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84920C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84920D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84920E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84920EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84920F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492104 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492110 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849211C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492128 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492134 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492140 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849214C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492158 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492164 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492170 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849217C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492188 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492194 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84921A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84921AC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 84921B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84921C4 - voice_keysplit voicegroup004, KeySplitTable2 @ 84921D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84921DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84921E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84921F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492200 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849220C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492218 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492224 - voice_keysplit voicegroup005, KeySplitTable3 @ 8492230 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849223C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492248 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492254 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492260 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849226C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492278 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492284 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492290 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849229C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84922A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84922B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84922C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84922CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84922D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84922E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84922F0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 84922FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492308 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492314 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492320 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849232C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492338 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492344 - voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2 @ 8492350 - voice_square_2_alt 60, 0, 3, 0, 1, 6, 3 @ 849235C - voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 @ 8492368 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492374 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492380 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849238C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492398 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84923A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84923B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84923BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84923C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84923D4 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0 @ 84923E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84923EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84923F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492404 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492410 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849241C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492428 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492434 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492440 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849244C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492458 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492464 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492470 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849247C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492488 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492494 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84924A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84924AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84924B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84924C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84924D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84924DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84924E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84924F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492500 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849250C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492518 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492524 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492530 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849253C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492548 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492554 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492560 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849256C - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 8492578 - voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ 8492584 +voicegroup138:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 + voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2 + voice_square_2_alt 60, 0, 3, 0, 1, 6, 3 + voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 0 .align 2 -voicegroup139:: @ 8492590 - voice_keysplit_all voicegroup002 @ 8492590 - voice_keysplit voicegroup003, KeySplitTable1 @ 849259C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84925A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84925B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84925C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84925CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84925D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84925E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84925F0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242 @ 84925FC - voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 8492608 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492614 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492620 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 849262C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8492638 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492644 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492650 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 127, 103, 201 @ 849265C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492668 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492674 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492680 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 37, 127, 77, 165 @ 849268C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492698 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84926A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226 @ 84926B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84926BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84926C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84926D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84926E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84926EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84926F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492704 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492710 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849271C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492728 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492734 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492740 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849274C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492758 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492764 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492770 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849277C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492788 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492794 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84927A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84927AC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 226 @ 84927B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84927C4 - voice_keysplit voicegroup004, KeySplitTable2 @ 84927D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84927DC - voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1 @ 84927E8 - voice_square_2_alt 60, 0, 3, 0, 2, 7, 2 @ 84927F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492800 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849280C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492818 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492824 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492830 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849283C - voice_keysplit voicegroup006, KeySplitTable4 @ 8492848 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492854 - voice_keysplit voicegroup007, KeySplitTable5 @ 8492860 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849286C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492878 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492884 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492890 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849289C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84928A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84928B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84928C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84928CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84928D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84928E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84928F0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 84928FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492908 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492914 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492920 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849292C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 8492938 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492944 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492950 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849295C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492968 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492974 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492980 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849298C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492998 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84929A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84929B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84929BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84929C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84929D4 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 84929E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84929EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84929F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492A94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492AA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492AAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492AB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492AC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492AD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492ADC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492AE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492AF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492B00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492B0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492B18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492B24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492B30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492B3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492B48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492B54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492B60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492B6C - voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ 8492B78 - voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ 8492B84 +voicegroup139:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 127, 103, 201 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 37, 127, 77, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1 + voice_square_2_alt 60, 0, 3, 0, 2, 7, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 1 + voice_noise_alt 60, 0, 0, 0, 1, 6, 1 .align 2 -voicegroup140:: @ 8492B90 - voice_keysplit_all voicegroup001 @ 8492B90 - voice_square_1 60, 0, 0, 2, 0, 2, 3, 1 @ 8492B9C - voice_square_2_alt 60, 0, 2, 0, 2, 3, 1 @ 8492BA8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 8492BB4 +voicegroup140:: + voice_keysplit_all voicegroup001 + voice_square_1 60, 0, 0, 2, 0, 2, 3, 1 + voice_square_2_alt 60, 0, 2, 0, 2, 3, 1 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 .align 2 -voicegroup141:: @ 8492BC0 - voice_keysplit_all voicegroup002 @ 8492BC0 - voice_keysplit voicegroup003, KeySplitTable1 @ 8492BCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492BD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492BE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492BF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492BFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492C08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492C14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492C20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492C2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492C38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492C44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492C50 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 8492C5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492C68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492C74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492C80 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 8492C8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492C98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492CA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492CB0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 8492CBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492CC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492CD4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 127 @ 8492CE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492CEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492CF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492D94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492DA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492DAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492DB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492DC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492DD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492DDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492DE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492DF4 - voice_keysplit voicegroup004, KeySplitTable2 @ 8492E00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E54 - voice_keysplit voicegroup005, KeySplitTable3 @ 8492E60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492E9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492EA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492EB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492EC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492ECC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492ED8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492EE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492EF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492EFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492F08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492F14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492F20 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 8492F2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492F38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492F44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492F50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492F5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492F68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492F74 - voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2 @ 8492F80 - voice_square_2_alt 60, 0, 3, 0, 2, 7, 3 @ 8492F8C - voice_square_2_alt 60, 0, 2, 0, 2, 6, 5 @ 8492F98 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 1, 7, 0, 6 @ 8492FA4 - voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 2 @ 8492FB0 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A320C, 0, 2, 9, 0 @ 8492FBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492FC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492FD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492FE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492FEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8492FF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493004 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493010 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849301C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493028 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493034 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493040 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849304C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493058 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493064 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493070 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849307C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493088 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493094 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84930A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84930AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84930B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84930C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84930D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84930DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84930E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84930F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493100 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849310C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493118 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493124 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493130 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849313C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493148 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493154 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493160 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849316C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493178 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493184 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493190 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849319C - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 84931A8 - voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ 84931B4 +voicegroup141:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2 + voice_square_2_alt 60, 0, 3, 0, 2, 7, 3 + voice_square_2_alt 60, 0, 2, 0, 2, 6, 5 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 1, 7, 0, 6 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 2 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A320C, 0, 2, 9, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 0 .align 2 -voicegroup142:: @ 84931C0 - voice_keysplit_all voicegroup002 @ 84931C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84931CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84931D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84931E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84931F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84931FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493208 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493214 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493220 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849322C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493238 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493244 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493250 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849325C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493268 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493274 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493280 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 188, 128, 201 @ 849328C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493298 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84932A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84932B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84932BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84932C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84932D4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 195, 103, 220 @ 84932E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84932EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84932F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493304 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493310 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 195, 72, 127 @ 849331C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 85, 188, 103, 160 @ 8493328 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493334 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493340 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849334C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493358 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493364 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493370 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849337C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 128, 188, 77, 115 @ 8493388 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493394 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84933A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84933AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84933B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84933C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84933D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84933DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84933E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84933F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493400 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849340C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493418 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493424 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493430 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849343C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493448 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493454 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493460 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849346C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493478 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493484 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493490 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849349C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 175, 154, 127 @ 84934A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84934B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84934C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84934CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84934D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84934E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84934F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84934FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493508 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493514 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493520 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849352C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493538 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493544 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493550 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849355C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493568 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493574 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 4 @ 8493580 - voice_square_2_alt 60, 0, 2, 0, 2, 5, 5 @ 849358C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493598 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 7, 15, 0 @ 84935A4 +voicegroup142:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 188, 128, 201 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 195, 103, 220 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 195, 72, 127 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 85, 188, 103, 160 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 128, 188, 77, 115 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 175, 154, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 4 + voice_square_2_alt 60, 0, 2, 0, 2, 5, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 7, 15, 0 .align 2 -voicegroup143:: @ 84935B0 - voice_keysplit_all voicegroup002 @ 84935B0 - voice_keysplit voicegroup003, KeySplitTable1 @ 84935BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84935C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84935D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84935E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84935EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84935F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493604 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493610 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849361C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493628 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493634 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493640 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849364C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493658 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493664 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493670 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 160, 123, 165 @ 849367C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493688 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493694 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84936A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84936AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84936B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84936C4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 0 @ 84936D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84936DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84936E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84936F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493700 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849370C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493718 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493724 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493730 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849373C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493748 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493754 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493760 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849376C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493778 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493784 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493790 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849379C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84937A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84937B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84937C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84937CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84937D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84937E4 - voice_keysplit voicegroup004, KeySplitTable2 @ 84937F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84937FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493808 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493814 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493820 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849382C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493838 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493844 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493850 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849385C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493868 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493874 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493880 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849388C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493898 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84938A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84938B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84938BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84938C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84938D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84938E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84938EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84938F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493904 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493910 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849391C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493928 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493934 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493940 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849394C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493958 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493964 - voice_square_2_alt 60, 0, 3, 0, 2, 3, 2 @ 8493970 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1 @ 849397C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493988 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 8493994 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84939A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84939AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84939B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84939C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84939D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84939DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84939E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84939F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493A9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493AA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493AB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493AC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493ACC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493AD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493AE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493AF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493AFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493B8C - voice_noise_alt 60, 0, 0, 0, 1, 9, 0 @ 8493B98 - voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ 8493BA4 +voicegroup143:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 160, 123, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 3, 0, 2, 3, 2 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 1, 9, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 1 .align 2 -voicegroup144:: @ 8493BB0 - voice_keysplit_all voicegroup002 @ 8493BB0 - voice_keysplit voicegroup003, KeySplitTable1 @ 8493BBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493BC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493BD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493BE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493BEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493BF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493C04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493C10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493C1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493C28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493C34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493C40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493C4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493C58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493C64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493C70 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 85, 188, 92, 165 @ 8493C7C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 85, 127, 180, 165 @ 8493C88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493C94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493CA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493CAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493CB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493CC4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226 @ 8493CD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493CDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493CE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493CF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D48 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216 @ 8493D54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D6C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8493D78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493D9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493DA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493DB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493DC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493DCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493DD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493DE4 - voice_keysplit voicegroup004, KeySplitTable2 @ 8493DF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493DFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493E98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493EA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493EB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493EBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493EC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493ED4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493EE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493EEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493EF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493F04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493F10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493F1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493F28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493F34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493F40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493F4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493F58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493F64 - voice_square_2_alt 60, 0, 3, 0, 2, 4, 2 @ 8493F70 - voice_square_2_alt 60, 0, 1, 0, 2, 4, 3 @ 8493F7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493F88 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 8493F94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493FA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493FAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493FB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493FC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493FD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493FDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493FE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8493FF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494000 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849400C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494018 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494024 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494030 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849403C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494048 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494054 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494060 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849406C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494078 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494084 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494090 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849409C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84940A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84940B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84940C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84940CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84940D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84940E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84940F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84940FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494108 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494114 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494120 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849412C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494138 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494144 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494150 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849415C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494168 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494174 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494180 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849418C - voice_noise_alt 60, 0, 0, 0, 1, 9, 0 @ 8494198 - voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ 84941A4 +voicegroup144:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 85, 188, 92, 165 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 85, 127, 180, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 3, 0, 2, 4, 2 + voice_square_2_alt 60, 0, 1, 0, 2, 4, 3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 1, 9, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 0 .align 2 -voicegroup145:: @ 84941B0 - voice_keysplit_all voicegroup002 @ 84941B0 - voice_keysplit voicegroup003, KeySplitTable1 @ 84941BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84941C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84941D4 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 84941E0 - voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 84941EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84941F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494204 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494210 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849421C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494228 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494234 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494240 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849424C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494258 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494264 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494270 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 849427C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494288 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494294 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84942A0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 84942AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84942B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84942C4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 84942D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84942DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84942E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84942F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494300 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849430C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494318 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494324 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494330 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849433C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494348 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494354 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494360 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849436C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494378 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494384 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494390 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849439C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84943A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84943B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84943C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84943CC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 84943D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84943E4 - voice_keysplit voicegroup004, KeySplitTable2 @ 84943F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84943FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494408 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494414 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494420 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849442C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494438 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494444 - voice_keysplit voicegroup005, KeySplitTable3 @ 8494450 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849445C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494468 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494474 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494480 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849448C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494498 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84944A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84944B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84944BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84944C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84944D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84944E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84944EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84944F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494504 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494510 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 849451C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494528 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494534 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494540 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849454C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494558 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494564 - voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2 @ 8494570 - voice_square_2_alt 60, 0, 3, 0, 0, 9, 0 @ 849457C - voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 @ 8494588 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494594 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84945A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84945AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84945B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84945C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84945D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84945DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84945E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84945F4 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0 @ 8494600 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849460C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494618 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494624 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494630 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849463C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494648 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494654 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494660 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849466C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494678 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494684 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494690 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849469C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84946A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84946B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84946C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84946CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84946D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84946E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84946F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84946FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494708 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494714 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494720 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849472C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494738 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494744 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494750 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849475C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494768 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494774 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494780 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849478C - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 8494798 - voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ 84947A4 +voicegroup145:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 + voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2 + voice_square_2_alt 60, 0, 3, 0, 0, 9, 0 + voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 0 .align 2 -voicegroup146:: @ 84947B0 - voice_keysplit_all voicegroup002 @ 84947B0 - voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235 @ 84947BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84947C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84947D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84947E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84947EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84947F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494804 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494810 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849481C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494828 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494834 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494840 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 849484C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494858 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494864 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494870 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849487C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494888 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494894 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84948A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84948AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84948B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84948C4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 226 @ 84948D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84948DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84948E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84948F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494900 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849490C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494918 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494924 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494930 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849493C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494948 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494954 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494960 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849496C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494978 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494984 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494990 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849499C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84949A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84949B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84949C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84949CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84949D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84949E4 - voice_keysplit voicegroup004, KeySplitTable2 @ 84949F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84949FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494A98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494AA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494AB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494ABC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494AC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494AD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494AE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494AEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494AF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494B04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494B10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494B1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494B28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494B34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494B40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494B4C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 43, 76, 103, 216 @ 8494B58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494B64 - voice_square_2_alt 60, 0, 2, 0, 2, 4, 4 @ 8494B70 - voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0 @ 8494B7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494B88 - voice_square_2_alt 60, 0, 2, 0, 0, 15, 0 @ 8494B94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494BA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494BAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494BB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494BC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494BD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494BDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494BE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494BF4 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 @ 8494C00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494C9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494CA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494CB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494CC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494CCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494CD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494CE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494CF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494CFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494D8C - voice_noise_alt 60, 0, 0, 0, 1, 9, 0 @ 8494D98 - voice_noise_alt 60, 0, 0, 0, 1, 6, 2 @ 8494DA4 +voicegroup146:: + voice_keysplit_all voicegroup002 + voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 43, 76, 103, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 0, 2, 4, 4 + voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 1, 9, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 2 .align 2 -voicegroup147:: @ 8494DB0 - voice_keysplit_all voicegroup001 @ 8494DB0 - voice_keysplit voicegroup003, KeySplitTable1 @ 8494DBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494DC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494DD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494DE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494DEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494DF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494E94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494EA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494EAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494EB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494EC4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 249, 25, 226 @ 8494ED0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494EDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494EE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494EF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494F9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494FA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494FB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494FC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494FCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494FD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494FE4 - voice_keysplit voicegroup004, KeySplitTable2 @ 8494FF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8494FFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495008 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495014 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495020 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849502C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495038 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495044 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495050 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849505C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495068 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495074 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495080 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849508C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495098 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84950A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84950B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84950BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84950C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84950D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84950E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84950EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84950F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495104 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495110 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849511C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495128 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495134 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495140 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849514C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495158 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495164 - voice_square_1_alt 60, 0, 0, 2, 0, 0, 6, 1 @ 8495170 - voice_square_2_alt 60, 0, 2, 0, 0, 6, 1 @ 849517C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495188 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 2, 4, 2 @ 8495194 +voicegroup147:: + voice_keysplit_all voicegroup001 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 249, 25, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 0, 6, 1 + voice_square_2_alt 60, 0, 2, 0, 0, 6, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 2, 4, 2 .align 2 -voicegroup148:: @ 84951A0 - voice_keysplit_all voicegroup002 @ 84951A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84951AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84951B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84951C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84951D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84951DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84951E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84951F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495200 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849520C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495218 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495224 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495230 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127 @ 849523C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8495248 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495254 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495260 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849526C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495278 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495284 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495290 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849529C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84952A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84952B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84952C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84952CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84952D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84952E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84952F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84952FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495308 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495314 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495320 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849532C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495338 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495344 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495350 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849535C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495368 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 @ 8495374 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495380 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849538C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495398 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84953A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84953B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84953BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84953C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84953D4 - voice_keysplit voicegroup004, KeySplitTable2 @ 84953E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84953EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84953F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495404 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495410 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849541C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495428 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495434 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495440 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849544C - voice_keysplit voicegroup006, KeySplitTable4 @ 8495458 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495464 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495470 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849547C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495488 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495494 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84954A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84954AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84954B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84954C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84954D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84954DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84954E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84954F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495500 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849550C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495518 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495524 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495530 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849553C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495548 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495554 - voice_square_1_alt 60, 0, 0, 2, 0, 0, 12, 0 @ 8495560 - voice_square_2_alt 60, 0, 2, 0, 0, 12, 0 @ 849556C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495578 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495584 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495590 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849559C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84955A8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 84955B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84955C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84955CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84955D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84955E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84955F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84955FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495608 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495614 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495620 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849562C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495638 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495644 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495650 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849565C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495668 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495674 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495680 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849568C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495698 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84956A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84956B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84956BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84956C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84956D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84956E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84956EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84956F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495704 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495710 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849571C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495728 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495734 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495740 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849574C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495758 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495764 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495770 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849577C - voice_noise_alt 60, 0, 0, 0, 3, 5, 2 @ 8495788 - voice_noise_alt 60, 0, 0, 0, 1, 6, 5 @ 8495794 +voicegroup148:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 0, 12, 0 + voice_square_2_alt 60, 0, 2, 0, 0, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 3, 5, 2 + voice_noise_alt 60, 0, 0, 0, 1, 6, 5 .align 2 -voicegroup149:: @ 84957A0 - voice_keysplit_all voicegroup190 @ 84957A0 - voice_keysplit voicegroup003, KeySplitTable1 @ 84957AC - voice_square_1_alt 60, 0, 0, 2, 0, 0, 12, 0 @ 84957B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84957C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84957D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84957DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84957E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84957F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495800 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242 @ 849580C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495818 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495824 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495830 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 849583C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8495848 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495854 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495860 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849586C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495878 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495884 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495890 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849589C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84958A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84958B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84958C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84958CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84958D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84958E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84958F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84958FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495908 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495914 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495920 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849592C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495938 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495944 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495950 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849595C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495968 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495974 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495980 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849598C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495998 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84959A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84959B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84959BC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 84959C8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 165, 154, 153 @ 84959D4 - voice_keysplit voicegroup004, KeySplitTable2 @ 84959E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84959EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84959F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495A04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495A10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495A1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495A28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495A34 - voice_keysplit voicegroup005, KeySplitTable3 @ 8495A40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495A4C - voice_keysplit voicegroup006, KeySplitTable4 @ 8495A58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495A64 - voice_keysplit voicegroup007, KeySplitTable5 @ 8495A70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495A7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495A88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495A94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495AA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495AAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495AB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495AC4 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 43, 188, 103, 165 @ 8495AD0 - voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 43, 165, 103, 165 @ 8495ADC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495AE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495AF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495B00 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 8495B0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495B18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495B24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495B30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495B3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495B48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495B54 - voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1 @ 8495B60 - voice_square_2_alt 60, 0, 1, 0, 2, 4, 2 @ 8495B6C - voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 1 @ 8495B78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495B84 - voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1 @ 8495B90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495B9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495BA8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 8495BB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495BC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495BCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495BD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495BE4 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 @ 8495BF0 +voicegroup149:: + voice_keysplit_all voicegroup190 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1_alt 60, 0, 0, 2, 0, 0, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 165, 154, 153 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 43, 188, 103, 165 + voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 43, 165, 103, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1 + voice_square_2_alt 60, 0, 1, 0, 2, 4, 2 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 .align 2 -voicegroup150:: @ 8495BFC - voice_keysplit_all voicegroup002 @ 8495BFC - voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235 @ 8495C08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495C98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495CA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495CB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495CBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495CC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495CD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495CE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495CEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495CF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495D94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495DA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495DAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495DB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495DC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495DD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495DDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495DE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495DF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495E9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495EA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495EB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495EC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495ECC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495ED8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495EE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495EF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495EFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495F98 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 85, 204, 77, 127 @ 8495FA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495FB0 - voice_square_2_alt 60, 0, 1, 0, 1, 4, 6 @ 8495FBC - voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 5 @ 8495FC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495FD4 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 7, 15, 0 @ 8495FE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495FEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8495FF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496004 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496010 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849601C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496028 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496034 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496040 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849604C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496058 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496064 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496070 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849607C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496088 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496094 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84960A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84960AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84960B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84960C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84960D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84960DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84960E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84960F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496100 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849610C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496118 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496124 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496130 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849613C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496148 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496154 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496160 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849616C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496178 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496184 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496190 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849619C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84961A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84961B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84961C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84961CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84961D8 - voice_noise_alt 60, 0, 0, 0, 2, 4, 0 @ 84961E4 - voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ 84961F0 +voicegroup150:: + voice_keysplit_all voicegroup002 + voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 85, 204, 77, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 1, 0, 1, 4, 6 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 4, 0 + voice_noise_alt 60, 0, 0, 0, 1, 0, 0 .align 2 -voicegroup151:: @ 84961FC - voice_keysplit_all voicegroup002 @ 84961FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496208 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496214 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496220 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849622C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496238 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496244 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496250 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849625C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496268 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496274 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496280 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849628C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496298 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 84962A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84962B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84962BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84962C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84962D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84962E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84962EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84962F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496304 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496310 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849631C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496328 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496334 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496340 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849634C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496358 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496364 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496370 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849637C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496388 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496394 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84963A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84963AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84963B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84963C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84963D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84963DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84963E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84963F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496400 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849640C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496418 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496424 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 127 @ 8496430 - voice_keysplit voicegroup004, KeySplitTable2 @ 849643C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496448 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496454 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496460 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849646C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496478 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496484 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496490 - voice_keysplit voicegroup005, KeySplitTable3 @ 849649C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84964A8 - voice_keysplit voicegroup006, KeySplitTable4 @ 84964B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84964C0 - voice_keysplit voicegroup007, KeySplitTable5 @ 84964CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84964D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84964E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84964F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84964FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496508 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496514 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496520 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849652C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496538 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496544 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496550 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849655C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496568 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496574 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496580 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849658C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496598 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84965A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84965B0 - voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1 @ 84965BC - voice_square_2_alt 60, 0, 1, 0, 2, 4, 2 @ 84965C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84965D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84965E0 - voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1 @ 84965EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84965F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496604 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 8496610 +voicegroup151:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 127 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1 + voice_square_2_alt 60, 0, 1, 0, 2, 4, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 .align 2 -voicegroup152:: @ 849661C - voice_keysplit_all voicegroup002 @ 849661C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496628 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496634 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496640 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849664C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496658 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496664 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496670 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849667C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496688 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496694 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84966A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84966AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84966B8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 @ 84966C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84966D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84966DC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 160, 175, 165 @ 84966E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84966F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496700 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849670C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496718 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496724 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496730 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 @ 849673C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496748 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496754 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496760 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849676C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496778 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496784 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496790 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849679C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84967A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84967B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84967C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84967CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84967D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84967E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84967F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84967FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496808 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496814 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496820 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849682C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496838 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496844 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235 @ 8496850 - voice_keysplit voicegroup004, KeySplitTable2 @ 849685C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496868 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496874 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496880 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849688C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496898 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84968A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84968B0 - voice_keysplit voicegroup005, KeySplitTable3 @ 84968BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84968C8 - voice_keysplit voicegroup006, KeySplitTable4 @ 84968D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84968E0 - voice_keysplit voicegroup007, KeySplitTable5 @ 84968EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84968F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496904 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496910 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849691C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496928 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496934 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496940 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849694C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496958 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496964 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496970 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849697C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496988 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496994 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84969A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84969AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84969B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84969C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84969D0 - voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 1 @ 84969DC - voice_square_2_alt 60, 0, 3, 0, 1, 5, 2 @ 84969E8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 4, 6, 0 @ 84969F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496A00 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 4, 6, 0 @ 8496A0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496A18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496A24 - voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 1 @ 8496A30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496A3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496A48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496A54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496A60 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 2, 9, 1 @ 8496A6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496A78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496A84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496A90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496A9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496AA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496AB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496AC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496ACC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496AD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496AE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496AF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496AFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496B98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496BA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496BB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496BBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496BC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496BD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496BE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496BEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496BF8 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 8496C04 - voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ 8496C10 +voicegroup152:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 160, 175, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 1 + voice_square_2_alt 60, 0, 3, 0, 1, 5, 2 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 4, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 4, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 2, 9, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 1 .align 2 -voicegroup153:: @ 8496C1C - voice_keysplit_all voicegroup002 @ 8496C1C - voice_keysplit voicegroup003, KeySplitTable1 @ 8496C28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496C34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496C40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496C4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496C58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496C64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496C70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496C7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496C88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496C94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496CA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496CAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496CB8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 @ 8496CC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496CD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496CDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496CE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496CF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496D9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496DA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496DB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496DC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496DCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496DD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496DE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496DF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496DFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496E08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496E14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496E20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496E2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496E38 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 8496E44 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235 @ 8496E50 - voice_keysplit voicegroup004, KeySplitTable2 @ 8496E5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496E68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496E74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496E80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496E8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496E98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496EA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496EB0 - voice_keysplit voicegroup005, KeySplitTable3 @ 8496EBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496EC8 - voice_keysplit voicegroup006, KeySplitTable4 @ 8496ED4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496EE0 - voice_keysplit voicegroup007, KeySplitTable5 @ 8496EEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496EF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F7C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 8496F88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496F94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496FA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496FAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496FB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496FC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8496FD0 - voice_square_1_alt 60, 0, 0, 1, 0, 3, 5, 2 @ 8496FDC - voice_square_2_alt 60, 0, 3, 0, 3, 4, 2 @ 8496FE8 - voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 @ 8496FF4 - voice_square_1_alt 60, 0, 0, 0, 0, 1, 6, 2 @ 8497000 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849700C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497018 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497024 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497030 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849703C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497048 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497054 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497060 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A325C, 0, 1, 12, 0 @ 849706C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497078 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497084 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497090 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849709C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84970A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84970B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84970C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84970CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84970D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84970E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84970F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84970FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497108 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497114 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497120 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849712C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497138 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497144 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497150 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849715C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497168 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497174 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497180 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849718C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497198 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84971A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84971B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84971BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84971C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84971D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84971E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84971EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84971F8 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 8497204 - voice_noise_alt 60, 0, 0, 0, 1, 6, 2 @ 8497210 +voicegroup153:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 3, 5, 2 + voice_square_2_alt 60, 0, 3, 0, 3, 4, 2 + voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 + voice_square_1_alt 60, 0, 0, 0, 0, 1, 6, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A325C, 0, 1, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 2 .align 2 -voicegroup154:: @ 849721C - voice_keysplit_all voicegroup002 @ 849721C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497228 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497234 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497240 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 849724C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497258 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497264 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497270 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849727C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497288 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497294 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84972A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84972AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84972B8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 @ 84972C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84972D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84972DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84972E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84972F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497300 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849730C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497318 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497324 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497330 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849733C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497348 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497354 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497360 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849736C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497378 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497384 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497390 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849739C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84973A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84973B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84973C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84973CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84973D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84973E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84973F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84973FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497408 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497414 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497420 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849742C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497438 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497444 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235 @ 8497450 - voice_keysplit voicegroup004, KeySplitTable2 @ 849745C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497468 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497474 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497480 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849748C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497498 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84974A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84974B0 - voice_keysplit voicegroup005, KeySplitTable3 @ 84974BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84974C8 - voice_keysplit voicegroup006, KeySplitTable4 @ 84974D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84974E0 - voice_keysplit voicegroup007, KeySplitTable5 @ 84974EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84974F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497504 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497510 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849751C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497528 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497534 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497540 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849754C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497558 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497564 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497570 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849757C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497588 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497594 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84975A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84975AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84975B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84975C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84975D0 - voice_square_1_alt 60, 0, 0, 1, 0, 0, 10, 0 @ 84975DC - voice_square_2_alt 60, 0, 1, 0, 0, 10, 0 @ 84975E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84975F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497600 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849760C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497618 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497624 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A321C, 0, 0, 12, 0 @ 8497630 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849763C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497648 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497654 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497660 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 0, 12, 0 @ 849766C +voicegroup154:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 0, 10, 0 + voice_square_2_alt 60, 0, 1, 0, 0, 10, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A321C, 0, 0, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 0, 12, 0 .align 2 -voicegroup155:: @ 8497678 - voice_keysplit_all voicegroup002 @ 8497678 - voice_keysplit voicegroup003, KeySplitTable1 @ 8497684 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497690 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849769C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 84976A8 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 188, 103, 165 @ 84976B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84976C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84976CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84976D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84976E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84976F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84976FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497708 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497714 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8497720 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849772C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497738 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 8497744 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497750 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849775C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497768 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497774 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497780 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849778C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 8497798 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 @ 84977A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84977B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84977BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84977C8 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 84977D4 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 165, 154, 165 @ 84977E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84977EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84977F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497804 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497810 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849781C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497828 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497834 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497840 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849784C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497858 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497864 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497870 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849787C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497888 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497894 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84978A0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 84978AC - voice_keysplit voicegroup004, KeySplitTable2 @ 84978B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84978C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84978D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84978DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84978E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84978F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497900 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849790C - voice_keysplit voicegroup005, KeySplitTable3 @ 8497918 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497924 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497930 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849793C - voice_keysplit voicegroup007, KeySplitTable5 @ 8497948 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497954 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 165, 180, 165 @ 8497960 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849796C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497978 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497984 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497990 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849799C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84979A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84979B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84979C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84979CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84979D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84979E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84979F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84979FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497A08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497A14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497A20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497A2C - voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2 @ 8497A38 - voice_square_2_alt 60, 0, 3, 0, 3, 6, 2 @ 8497A44 - voice_square_2_alt 60, 0, 3, 0, 2, 6, 5 @ 8497A50 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 3, 6, 5 @ 8497A5C - voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 @ 8497A68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497A74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497A80 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A320C, 0, 7, 15, 1 @ 8497A8C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 @ 8497A98 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A327C, 0, 1, 9, 2 @ 8497AA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497AB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497ABC - voice_square_2_alt 60, 0, 2, 0, 2, 6, 3 @ 8497AC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497AD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497AE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497AEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497AF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497B94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497BA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497BAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497BB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497BC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497BD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497BDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497BE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497BF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497C00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497C0C - voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 8497C18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497C24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497C30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497C3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497C48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497C54 - voice_noise_alt 60, 0, 0, 0, 2, 6, 2 @ 8497C60 - voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ 8497C6C +voicegroup155:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 188, 103, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 165, 154, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 165, 180, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2 + voice_square_2_alt 60, 0, 3, 0, 3, 6, 2 + voice_square_2_alt 60, 0, 3, 0, 2, 6, 5 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 3, 6, 5 + voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A320C, 0, 7, 15, 1 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A327C, 0, 1, 9, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 0, 2, 6, 3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 2 + voice_noise_alt 60, 0, 0, 0, 1, 6, 0 .align 2 -voicegroup156:: @ 8497C78 - voice_keysplit_all voicegroup002 @ 8497C78 - voice_keysplit voicegroup003, KeySplitTable1 @ 8497C84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497C90 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 8497C9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497CA8 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 8497CB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497CC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497CCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497CD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497CE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497CF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497CFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497D08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497D14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497D20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497D2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497D38 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 8497D44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497D50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497D5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497D68 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 8497D74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497D80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497D8C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 @ 8497D98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497DA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497DB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497DBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497DC8 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 8497DD4 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 8497DE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497DEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497DF8 - voice_square_2_alt 60, 0, 3, 0, 4, 4, 4 @ 8497E04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497E10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497E1C - voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216 @ 8497E28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497E34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497E40 - voice_square_2_alt 60, 0, 1, 0, 1, 7, 5 @ 8497E4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497E58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497E64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497E70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497E7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497E88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497E94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497EA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497EAC - voice_keysplit voicegroup004, KeySplitTable2 @ 8497EB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497EC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497ED0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497EDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497EE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497EF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497F00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497F0C - voice_keysplit voicegroup005, KeySplitTable3 @ 8497F18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497F24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497F30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497F3C - voice_keysplit voicegroup007, KeySplitTable5 @ 8497F48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497F54 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 8497F60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497F6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497F78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497F84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497F90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497F9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497FA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497FB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497FC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497FCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497FD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497FE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497FF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8497FFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498008 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498014 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498020 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849802C - voice_square_2_alt 60, 0, 2, 0, 2, 3, 1 @ 8498038 - voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 5 @ 8498044 - voice_square_1_alt 60, 0, 0, 3, 0, 2, 6, 5 @ 8498050 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849805C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498068 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498074 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498080 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849808C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498098 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84980A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84980B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84980BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84980C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84980D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84980E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84980EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84980F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498104 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498110 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849811C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498128 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498134 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498140 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849814C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498158 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498164 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498170 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849817C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498188 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498194 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84981A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84981AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84981B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84981C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84981D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84981DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84981E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84981F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498200 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849820C - voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 8498218 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498224 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498230 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849823C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498248 - voice_noise_alt 60, 0, 0, 0, 0, 15, 0 @ 8498254 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 8498260 - voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ 849826C +voicegroup156:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 3, 0, 4, 4, 4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 1, 0, 1, 7, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 0, 2, 3, 1 + voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 5 + voice_square_1_alt 60, 0, 0, 3, 0, 2, 6, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 0 .align 2 -voicegroup157:: @ 8498278 - voice_keysplit_all voicegroup002 @ 8498278 - voice_keysplit voicegroup003, KeySplitTable1 @ 8498284 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498290 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849829C - voice_square_2_alt 60, 0, 3, 0, 2, 6, 5 @ 84982A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84982B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84982C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84982CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84982D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84982E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84982F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84982FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498308 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498314 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498320 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849832C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498338 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 190, 115 @ 8498344 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498350 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849835C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498368 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 8498374 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498380 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849838C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 @ 8498398 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84983A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84983B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84983BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84983C8 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 84983D4 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 84983E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84983EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84983F8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 8498404 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498410 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849841C - voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216 @ 8498428 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498434 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8498440 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849844C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498458 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498464 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498470 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849847C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498488 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498494 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84984A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84984AC - voice_keysplit voicegroup004, KeySplitTable2 @ 84984B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84984C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84984D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84984DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84984E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84984F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498500 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849850C - voice_keysplit voicegroup005, KeySplitTable3 @ 8498518 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498524 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498530 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849853C - voice_keysplit voicegroup007, KeySplitTable5 @ 8498548 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498554 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 @ 8498560 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849856C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498578 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498584 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498590 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849859C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84985A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84985B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84985C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84985CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84985D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84985E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84985F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84985FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498608 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498614 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498620 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849862C - voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2 @ 8498638 - voice_square_2_alt 60, 0, 3, 0, 3, 3, 0 @ 8498644 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 3, 6, 5 @ 8498650 - voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 2 @ 849865C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 @ 8498668 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498674 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498680 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 0 @ 849868C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498698 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84986A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84986B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84986BC - voice_square_2_alt 60, 0, 2, 0, 2, 6, 3 @ 84986C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84986D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84986E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84986EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84986F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498704 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498710 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849871C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498728 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498734 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498740 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849874C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498758 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498764 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498770 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849877C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498788 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498794 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84987A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84987AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84987B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84987C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84987D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84987DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84987E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84987F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498800 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849880C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498818 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498824 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498830 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849883C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498848 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498854 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 8498860 - voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ 849886C +voicegroup157:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 3, 0, 2, 6, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 190, 115 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2 + voice_square_2_alt 60, 0, 3, 0, 3, 3, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 3, 6, 5 + voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 2 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 0, 2, 6, 3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 1 .align 2 -voicegroup158:: @ 8498878 - voice_keysplit_all voicegroup002 @ 8498878 - voice_keysplit voicegroup003, KeySplitTable1 @ 8498884 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498890 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849889C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 84988A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84988B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84988C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84988CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84988D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84988E4 - voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 84988F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84988FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498908 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498914 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8498920 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849892C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498938 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137 @ 8498944 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498950 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849895C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498968 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498974 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498980 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849898C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 @ 8498998 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84989A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84989B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84989BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84989C8 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 84989D4 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 84989E0 - voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 84989EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84989F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498A04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498A10 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 8498A1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498A28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498A34 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 8498A40 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 @ 8498A4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498A58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498A64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498A70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498A7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498A88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498A94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498AA0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 @ 8498AAC - voice_keysplit voicegroup004, KeySplitTable2 @ 8498AB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498AC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498AD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498ADC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498AE8 - voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 8498AF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498B00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498B0C - voice_keysplit voicegroup005, KeySplitTable3 @ 8498B18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498B24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498B30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498B3C - voice_keysplit voicegroup007, KeySplitTable5 @ 8498B48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498B54 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188 @ 8498B60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498B6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498B78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498B84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498B90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498B9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498BA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498BB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498BC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498BCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498BD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498BE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498BF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498BFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498C08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498C14 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 8498C20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498C2C - voice_square_1_alt 60, 0, 0, 1, 0, 1, 9, 0 @ 8498C38 - voice_square_2_alt 60, 0, 3, 0, 1, 10, 1 @ 8498C44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498C50 - voice_square_2_alt 60, 0, 2, 1, 0, 9, 1 @ 8498C5C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 0 @ 8498C68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498C74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498C80 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 8498C8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498C98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498CA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498CB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498CBC - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 15, 0 @ 8498CC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498CD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498CE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498CEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498CF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498D94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498DA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498DAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498DB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498DC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498DD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498DDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498DE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498DF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E54 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 8498E60 - voice_noise_alt 60, 0, 0, 0, 1, 8, 1 @ 8498E6C +voicegroup158:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 1, 9, 0 + voice_square_2_alt 60, 0, 3, 0, 1, 10, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 1, 0, 9, 1 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 8, 1 .align 2 -voicegroup159:: @ 8498E78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498E9C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188 @ 8498EA8 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 51, 249, 0, 165 @ 8498EB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498EC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498ECC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498ED8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498EE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498EF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498EFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498F8C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 127 @ 8498F98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498FA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498FB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498FBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498FC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498FD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498FE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498FEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8498FF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499004 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499010 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849901C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499028 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499034 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499040 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849904C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499058 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499064 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499070 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849907C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499088 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499094 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84990A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84990AC - voice_keysplit voicegroup004, KeySplitTable2 @ 84990B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84990C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84990D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84990DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84990E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84990F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499100 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849910C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499118 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499124 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499130 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849913C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499148 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499154 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499160 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849916C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499178 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499184 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499190 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849919C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84991A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84991B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84991C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84991CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84991D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84991E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84991F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84991FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499208 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499214 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499220 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849922C - voice_square_1_alt 60, 0, 0, 2, 0, 7, 0, 6 @ 8499238 - voice_square_2_alt 60, 0, 1, 1, 5, 1, 6 @ 8499244 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 1, 7, 0, 6 @ 8499250 - voice_square_1_alt 60, 0, 0, 0, 1, 4, 3, 6 @ 849925C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499268 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499274 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499280 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849928C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499298 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84992A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84992B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84992BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84992C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84992D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84992E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84992EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84992F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499304 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499310 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849931C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499328 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499334 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499340 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849934C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499358 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499364 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499370 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849937C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499388 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499394 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84993A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84993AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84993B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84993C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84993D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84993DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84993E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84993F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499400 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849940C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499418 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499424 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499430 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849943C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499448 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499454 - voice_noise_alt 60, 0, 0, 0, 2, 4, 0 @ 8499460 - voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ 849946C +voicegroup159:: + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 51, 249, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 7, 0, 6 + voice_square_2_alt 60, 0, 1, 1, 5, 1, 6 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 1, 7, 0, 6 + voice_square_1_alt 60, 0, 0, 0, 1, 4, 3, 6 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 4, 0 + voice_noise_alt 60, 0, 0, 0, 1, 0, 0 .align 2 -voicegroup160:: @ 8499478 - voice_keysplit_all voicegroup001 @ 8499478 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499484 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499490 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849949C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84994A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84994B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84994C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84994CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84994D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84994E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84994F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84994FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499508 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499514 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8499520 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849952C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499538 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499544 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499550 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849955C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499568 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499574 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499580 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849958C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 8499598 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84995A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84995B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84995BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84995C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84995D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84995E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84995EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84995F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499604 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499610 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 849961C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499628 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499634 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499640 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849964C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499658 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499664 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499670 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849967C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499688 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499694 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84996A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84996AC - voice_keysplit voicegroup004, KeySplitTable2 @ 84996B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84996C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84996D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84996DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84996E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84996F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499700 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849970C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499718 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499724 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499730 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849973C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499748 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499754 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499760 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849976C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499778 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499784 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499790 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849979C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84997A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84997B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84997C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84997CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84997D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84997E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84997F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84997FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499808 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499814 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499820 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849982C - voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 1 @ 8499838 - voice_square_2_alt 60, 0, 1, 0, 2, 4, 2 @ 8499844 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499850 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849985C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499868 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499874 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499880 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 849988C +voicegroup160:: + voice_keysplit_all voicegroup001 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 1 + voice_square_2_alt 60, 0, 1, 0, 2, 4, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 .align 2 -voicegroup161:: @ 8499898 - voice_keysplit_all voicegroup002 @ 8499898 - voice_keysplit voicegroup003, KeySplitTable1 @ 84998A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84998B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84998BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84998C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84998D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84998E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84998EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84998F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499904 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499910 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849991C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499928 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499934 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8499940 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849994C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499958 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 8499964 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499970 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849997C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499988 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 8499994 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84999A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84999AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84999B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84999C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84999D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84999DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84999E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84999F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499A9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499AA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499AB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499AC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499ACC - voice_keysplit voicegroup004, KeySplitTable2 @ 8499AD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499AE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499AF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499AFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499B08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499B14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499B20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499B2C - voice_keysplit voicegroup005, KeySplitTable3 @ 8499B38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499B44 - voice_keysplit voicegroup006, KeySplitTable4 @ 8499B50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499B5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499B68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499B74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499B80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499B8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499B98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499BA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499BB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499BBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499BC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499BD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499BE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499BEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499BF8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 8499C04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499C10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499C1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499C28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499C34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499C40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499C4C - voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 4 @ 8499C58 - voice_square_2_alt 60, 0, 2, 0, 2, 6, 2 @ 8499C64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499C70 - voice_square_2_alt 60, 0, 1, 0, 2, 6, 2 @ 8499C7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499C88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499C94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499CA0 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 8499CAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499CB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499CC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499CD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499CDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499CE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499CF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499D9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499DA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499DB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499DC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499DCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499DD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499DE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499DF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499DFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499E08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499E14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499E20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499E2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499E38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499E44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499E50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499E5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499E68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499E74 - voice_noise_alt 60, 0, 0, 0, 2, 4, 0 @ 8499E80 - voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ 8499E8C +voicegroup161:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 4 + voice_square_2_alt 60, 0, 2, 0, 2, 6, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 1, 0, 2, 6, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 4, 0 + voice_noise_alt 60, 0, 0, 0, 1, 0, 0 .align 2 -voicegroup162:: @ 8499E98 - voice_keysplit_all voicegroup002 @ 8499E98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499EA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499EB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499EBC - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 64, 188, 108, 244 @ 8499EC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499ED4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499EE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499EEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499EF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499F04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499F10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499F1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499F28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499F34 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 8499F40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499F4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499F58 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 195, 92, 235 @ 8499F64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499F70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499F7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499F88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499F94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499FA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499FAC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 8499FB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499FC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499FD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499FDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499FE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 8499FF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A000 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A00C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A018 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 64, 204, 113, 235 @ 849A024 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A030 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A03C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A048 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A054 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A060 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A06C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A078 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A084 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A090 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A09C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A0A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A0B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A0C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A0CC - voice_keysplit voicegroup004, KeySplitTable2 @ 849A0D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A0E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A0F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A0FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A108 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A114 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A120 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A12C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A138 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A144 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A150 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A15C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A168 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A174 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A180 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A18C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A198 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A1A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A1B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A1BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A1C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A1D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A1E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A1EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A1F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A204 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A210 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A21C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A228 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A234 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A240 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A24C - voice_square_1_alt 60, 0, 0, 1, 0, 0, 6, 0 @ 849A258 - voice_square_2_alt 60, 0, 1, 0, 0, 6, 0 @ 849A264 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A270 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A27C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A288 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A294 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A2A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A2AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A2B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A2C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A2D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A2DC - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 849A2E8 +voicegroup162:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 64, 188, 108, 244 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 195, 92, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 64, 204, 113, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 0, 6, 0 + voice_square_2_alt 60, 0, 1, 0, 0, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 .align 2 -voicegroup163:: @ 849A2F4 - voice_keysplit_all voicegroup002 @ 849A2F4 - voice_keysplit voicegroup003, KeySplitTable1 @ 849A300 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A30C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A318 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 849A324 - voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 849A330 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A33C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A348 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A354 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A360 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A36C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A378 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A384 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A390 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A39C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A3A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A3B4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 849A3C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A3CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A3D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A3E4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 849A3F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A3FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A408 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 849A414 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A420 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A42C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A438 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A444 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A450 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A45C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A468 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A474 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A480 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A48C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A498 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A4A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A4B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A4BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A4C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A4D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A4E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A4EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A4F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A504 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A510 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 849A51C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A528 - voice_keysplit voicegroup004, KeySplitTable2 @ 849A534 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A540 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A54C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A558 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A564 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A570 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A57C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A588 - voice_keysplit voicegroup005, KeySplitTable3 @ 849A594 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A5A0 - voice_directsound 60, 0, DirectSoundWaveData_wave_77, 255, 0, 206, 204 @ 849A5AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A5B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A5C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A5D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A5DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A5E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A5F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A600 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A60C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A618 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A624 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A630 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A63C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A648 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A654 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 849A660 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A66C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A678 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A684 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A690 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A69C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A6A8 - voice_square_1_alt 60, 0, 0, 0, 0, 1, 5, 2 @ 849A6B4 - voice_square_2_alt 60, 0, 3, 0, 3, 4, 2 @ 849A6C0 - voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 @ 849A6CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A6D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A6E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A6F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A6FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A708 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A714 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A720 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A72C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A738 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 0, 12, 0 @ 849A744 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A750 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A75C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A768 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A774 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A780 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A78C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A798 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A7A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A7B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A7BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A7C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A7D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A7E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A7EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A7F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A804 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A810 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A81C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A828 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A834 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A840 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A84C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A858 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A864 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A870 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A87C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A888 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A894 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A8A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A8AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A8B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A8C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A8D0 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 849A8DC - voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ 849A8E8 +voicegroup163:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 + voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_wave_77, 255, 0, 206, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 1, 5, 2 + voice_square_2_alt 60, 0, 3, 0, 3, 4, 2 + voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 0, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 0 .align 2 -voicegroup164:: @ 849A8F4 - voice_keysplit_all voicegroup002 @ 849A8F4 - voice_keysplit voicegroup003, KeySplitTable1 @ 849A900 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A90C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A918 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 128, 180, 108, 209 @ 849A924 - voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 85, 204, 77, 246 @ 849A930 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A93C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A948 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A954 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A960 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A96C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A978 - voice_square_1_alt 60, 0, 0, 2, 0, 0, 10, 6 @ 849A984 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A990 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A99C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A9A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A9B4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 849A9C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A9CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A9D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A9E4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 849A9F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849A9FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA08 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 849AA14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AA98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AAA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AAB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AABC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AAC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AAD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AAE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AAEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AAF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AB04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AB10 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 849AB1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AB28 - voice_keysplit voicegroup004, KeySplitTable2 @ 849AB34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AB40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AB4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AB58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AB64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AB70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AB7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AB88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AB94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ABA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ABAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ABB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ABC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ABD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ABDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ABE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ABF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC54 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 849AC60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AC9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ACA8 - voice_square_2_alt 60, 0, 2, 0, 2, 6, 2 @ 849ACB4 - voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 4 @ 849ACC0 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 0, 12, 0 @ 849ACCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ACD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ACE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ACF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ACFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD38 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0 @ 849AD44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AD98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ADA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ADB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ADBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ADC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ADD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ADE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ADEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ADF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AE94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AEA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AEAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AEB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AEC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AED0 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 849AEDC - voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ 849AEE8 +voicegroup164:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 128, 180, 108, 209 + voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 85, 204, 77, 246 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 0, 10, 6 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 0, 2, 6, 2 + voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 4 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 0, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 0 .align 2 -voicegroup165:: @ 849AEF4 - voice_keysplit_all voicegroup002 @ 849AEF4 - voice_keysplit voicegroup003, KeySplitTable1 @ 849AF00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AF0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AF18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AF24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AF30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AF3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AF48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AF54 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242 @ 849AF60 - voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 849AF6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AF78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AF84 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 849AF90 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 849AF9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AFA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AFB4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 37, 165, 103, 127 @ 849AFC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AFCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AFD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AFE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AFF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849AFFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B008 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 204, 92, 226 @ 849B014 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B020 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B02C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B038 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B044 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B050 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B05C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B068 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B074 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B080 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B08C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B098 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B0A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B0B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B0BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B0C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B0D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B0E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B0EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B0F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B104 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B110 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 226 @ 849B11C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B128 - voice_keysplit voicegroup004, KeySplitTable2 @ 849B134 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B140 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 10, 1 @ 849B14C - voice_square_2_alt 60, 0, 2, 0, 2, 6, 6 @ 849B158 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B164 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B170 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B17C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B188 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B194 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B1A0 - voice_keysplit voicegroup006, KeySplitTable4 @ 849B1AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B1B8 - voice_keysplit voicegroup007, KeySplitTable5 @ 849B1C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B1D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B1DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B1E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B1F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B200 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B20C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B218 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B224 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B230 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B23C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B248 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B254 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 @ 849B260 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B26C - voice_directsound 60, 0, DirectSoundWaveData_sd90_enhanced_delay_shaku, 255, 191, 97, 165 @ 849B278 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B284 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B290 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 849B29C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B2A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B2B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B2C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B2CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B2D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B2E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B2F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B2FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B308 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B314 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B320 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B32C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B338 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 849B344 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B350 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B35C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B368 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B374 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B380 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B38C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B398 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B3A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B3B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B3BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B3C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B3D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B3E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B3EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B3F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B404 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B410 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B41C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B428 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B434 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B440 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B44C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B458 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B464 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B470 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B47C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B488 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B494 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B4A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B4AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B4B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B4C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B4D0 - voice_noise_alt 60, 0, 0, 0, 1, 9, 0 @ 849B4DC - voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ 849B4E8 +voicegroup165:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 37, 165, 103, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 204, 92, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 10, 1 + voice_square_2_alt 60, 0, 2, 0, 2, 6, 6 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_enhanced_delay_shaku, 255, 191, 97, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 1, 9, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 1 .align 2 -voicegroup166:: @ 849B4F4 - voice_keysplit_all voicegroup002 @ 849B4F4 - voice_keysplit voicegroup003, KeySplitTable1 @ 849B500 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B50C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B518 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B524 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B530 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B53C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B548 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B554 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B560 - voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 849B56C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B578 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B584 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B590 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 849B59C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B5A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B5B4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137 @ 849B5C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B5CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B5D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B5E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B5F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B5FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B608 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 @ 849B614 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B620 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B62C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B638 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B644 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 @ 849B650 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 @ 849B65C - voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 849B668 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B674 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B680 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B68C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 849B698 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B6A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B6B0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 849B6BC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 @ 849B6C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B6D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B6E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B6EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B6F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B704 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B710 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B71C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 @ 849B728 - voice_keysplit voicegroup004, KeySplitTable2 @ 849B734 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B740 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B74C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B758 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B764 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B770 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B77C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B788 - voice_keysplit voicegroup005, KeySplitTable3 @ 849B794 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B7A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B7AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B7B8 - voice_keysplit voicegroup007, KeySplitTable5 @ 849B7C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B7D0 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188 @ 849B7DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B7E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B7F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B800 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B80C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B818 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B824 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B830 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B83C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B848 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B854 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B860 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B86C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B878 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B884 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B890 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 849B89C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B8A8 - voice_square_1_alt 60, 0, 0, 3, 0, 1, 9, 0 @ 849B8B4 - voice_square_2_alt 60, 0, 3, 0, 2, 9, 1 @ 849B8C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B8CC - voice_square_2_alt 60, 0, 2, 1, 0, 9, 1 @ 849B8D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B8E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B8F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B8FC - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 849B908 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B914 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B920 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B92C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B938 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 15, 0 @ 849B944 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B950 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B95C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B968 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B974 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B980 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B98C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B998 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B9A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B9B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B9BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B9C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B9D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B9E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B9EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849B9F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BA94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BAA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BAAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BAB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BAC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BAD0 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 849BADC - voice_noise_alt 60, 0, 0, 0, 1, 8, 1 @ 849BAE8 +voicegroup166:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127 + voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 3, 0, 1, 9, 0 + voice_square_2_alt 60, 0, 3, 0, 2, 9, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 1, 0, 9, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 8, 1 .align 2 -voicegroup167:: @ 849BAF4 - voice_keysplit_all voicegroup002 @ 849BAF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BB9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BBA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BBB4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 849BBC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BBCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BBD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BBE4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 849BBF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BBFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC08 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 849BC14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BC98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BCA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BCB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BCBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BCC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BCD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BCE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BCEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BCF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BD88 - voice_keysplit voicegroup005, KeySplitTable3 @ 849BD94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BDA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BDAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BDB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BDC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BDD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BDDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BDE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BDF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BE9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BEA8 - voice_square_1_alt 60, 0, 0, 0, 0, 1, 10, 4 @ 849BEB4 - voice_square_2_alt 60, 0, 3, 0, 2, 8, 3 @ 849BEC0 - voice_square_2_alt 60, 0, 2, 0, 2, 6, 5 @ 849BECC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BED8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 0, 6, 0 @ 849BEE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BEF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BEFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BF98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BFA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BFB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BFBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BFC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BFD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BFE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BFEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849BFF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C004 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C010 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C01C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C028 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C034 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C040 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C04C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C058 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C064 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C070 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C07C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C088 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C094 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C0A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C0AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C0B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C0C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C0D0 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 849C0DC - voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ 849C0E8 +voicegroup167:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 1, 10, 4 + voice_square_2_alt 60, 0, 3, 0, 2, 8, 3 + voice_square_2_alt 60, 0, 2, 0, 2, 6, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 0, 6, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 0 .align 2 -voicegroup168:: @ 849C0F4 - voice_keysplit_all voicegroup002 @ 849C0F4 - voice_keysplit voicegroup003, KeySplitTable1 @ 849C100 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C10C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C118 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 849C124 - voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 849C130 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C13C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C148 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C154 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C160 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C16C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C178 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C184 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C190 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C19C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C1A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C1B4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 849C1C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C1CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C1D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C1E4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 849C1F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C1FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C208 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 849C214 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C220 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C22C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C238 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C244 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C250 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C25C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C268 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C274 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C280 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C28C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C298 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C2A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C2B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C2BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C2C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C2D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C2E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C2EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C2F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C304 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 849C310 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 849C31C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C328 - voice_keysplit voicegroup004, KeySplitTable2 @ 849C334 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C340 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C34C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C358 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C364 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C370 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C37C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C388 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C394 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C3A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C3AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C3B8 - voice_keysplit voicegroup007, KeySplitTable5 @ 849C3C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C3D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C3DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C3E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C3F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C400 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C40C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C418 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C424 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C430 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C43C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C448 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C454 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 849C460 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C46C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C478 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C484 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C490 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C49C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C4A8 - voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 2 @ 849C4B4 - voice_square_2_alt 60, 0, 3, 0, 2, 6, 4 @ 849C4C0 - voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 @ 849C4CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C4D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C4E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C4F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C4FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C508 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C514 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C520 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C52C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C538 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 0, 12, 0 @ 849C544 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C550 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C55C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C568 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C574 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C580 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C58C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C598 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C5A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C5B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C5BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C5C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C5D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C5E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C5EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C5F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C604 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C610 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C61C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C628 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C634 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C640 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C64C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C658 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C664 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C670 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C67C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C688 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C694 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C6A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C6AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C6B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C6C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C6D0 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 849C6DC - voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ 849C6E8 +voicegroup168:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 + voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 2 + voice_square_2_alt 60, 0, 3, 0, 2, 6, 4 + voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 0, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 0 .align 2 -voicegroup169:: @ 849C6F4 - voice_keysplit_all voicegroup001 @ 849C6F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C700 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C70C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C718 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C724 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C730 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C73C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C748 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C754 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C760 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C76C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C778 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C784 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C790 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C79C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C7A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C7B4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 @ 849C7C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C7CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C7D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C7E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C7F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C7FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C808 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C814 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C820 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C82C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C838 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C844 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C850 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C85C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C868 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C874 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C880 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C88C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 849C898 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C8A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C8B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C8BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C8C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C8D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C8E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C8EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C8F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C904 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C910 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C91C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C928 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C934 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C940 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C94C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C958 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C964 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C970 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C97C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C988 - voice_keysplit voicegroup005, KeySplitTable3 @ 849C994 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C9A0 - voice_keysplit voicegroup006, KeySplitTable4 @ 849C9AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C9B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C9C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C9D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C9DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C9E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849C9F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA6C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 7, 15, 0 @ 849CA78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CA9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CAA8 - voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1 @ 849CAB4 - voice_square_2_alt 60, 0, 2, 0, 1, 4, 1 @ 849CAC0 - voice_square_2_alt 60, 0, 0, 0, 1, 4, 1 @ 849CACC - voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1 @ 849CAD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CAE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CAF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CAFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CB98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CBA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CBB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CBBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CBC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CBD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CBE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CBEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CBF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CC94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CCA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CCAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CCB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CCC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CCD0 - voice_noise_alt 60, 0, 0, 0, 2, 4, 0 @ 849CCDC - voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ 849CCE8 +voicegroup169:: + voice_keysplit_all voicegroup001 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1 + voice_square_2_alt 60, 0, 2, 0, 1, 4, 1 + voice_square_2_alt 60, 0, 0, 0, 1, 4, 1 + voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 4, 0 + voice_noise_alt 60, 0, 0, 0, 1, 0, 0 .align 2 -voicegroup170:: @ 849CCF4 - voice_keysplit_all voicegroup001 @ 849CCF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CD9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CDA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CDB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CDC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CDCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CDD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CDE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CDF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CDFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CE98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CEA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CEB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CEBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CEC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CED4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CEE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CEEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CEF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CF04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CF10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CF1C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 849CF28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CF34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CF40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CF4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CF58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CF64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CF70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CF7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CF88 - voice_keysplit voicegroup005, KeySplitTable3 @ 849CF94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CFA0 - voice_keysplit voicegroup006, KeySplitTable4 @ 849CFAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CFB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CFC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CFD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CFDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CFE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849CFF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D000 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D00C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D018 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D024 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D030 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D03C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D048 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D054 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 849D060 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D06C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D078 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D084 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D090 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D09C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D0A8 - voice_square_2_alt 60, 0, 1, 0, 1, 7, 1 @ 849D0B4 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 1 @ 849D0C0 - voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1 @ 849D0CC - voice_square_2_alt 60, 0, 2, 0, 1, 0, 0 @ 849D0D8 +voicegroup170:: + voice_keysplit_all voicegroup001 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 1, 0, 1, 7, 1 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 1 + voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1 + voice_square_2_alt 60, 0, 2, 0, 1, 0, 0 .align 2 -voicegroup171:: @ 849D0E4 - voice_keysplit_all voicegroup001 @ 849D0E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D0F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D0FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D108 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D114 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D120 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D12C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D138 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D144 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D150 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D15C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D168 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D174 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D180 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D18C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D198 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D1A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D1B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D1BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D1C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D1D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D1E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D1EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D1F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D204 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D210 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D21C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D228 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D234 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D240 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D24C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D258 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D264 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D270 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D27C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D288 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D294 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D2A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D2AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D2B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D2C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D2D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D2DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D2E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D2F4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 849D300 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D30C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 849D318 - voice_keysplit voicegroup004, KeySplitTable2 @ 849D324 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D330 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D33C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D348 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D354 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D360 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D36C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D378 - voice_keysplit voicegroup005, KeySplitTable3 @ 849D384 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D390 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D39C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D3A8 - voice_keysplit voicegroup007, KeySplitTable5 @ 849D3B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D3C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D3CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D3D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D3E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D3F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D3FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D408 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D414 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D420 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D42C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D438 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D444 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 849D450 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D45C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D468 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D474 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D480 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D48C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D498 - voice_square_2_alt 60, 0, 2, 0, 1, 7, 0 @ 849D4A4 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 1 @ 849D4B0 - voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0 @ 849D4BC - voice_square_2_alt 60, 0, 2, 0, 2, 0, 0 @ 849D4C8 - voice_square_2_alt 60, 0, 3, 0, 1, 7, 0 @ 849D4D4 - voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0 @ 849D4E0 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0 @ 849D4EC - voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0 @ 849D4F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D504 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 0 @ 849D510 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 1 @ 849D51C +voicegroup171:: + voice_keysplit_all voicegroup001 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 0, 1, 7, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 1 + voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0 + voice_square_2_alt 60, 0, 2, 0, 2, 0, 0 + voice_square_2_alt 60, 0, 3, 0, 1, 7, 0 + voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0 + voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A323C, 0, 7, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A324C, 0, 7, 15, 1 .align 2 -voicegroup172:: @ 849D528 - voice_keysplit_all voicegroup002 @ 849D528 - voice_keysplit voicegroup003, KeySplitTable1 @ 849D534 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D540 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D54C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 849D558 - voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 @ 849D564 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D570 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D57C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D588 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D594 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D5A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D5AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D5B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D5C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D5D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D5DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D5E8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 849D5F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D600 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D60C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D618 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 849D624 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D630 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D63C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 849D648 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D654 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D660 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D66C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D678 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D684 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D690 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D69C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D6A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D6B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D6C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D6CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D6D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D6E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D6F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D6FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D708 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D714 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D720 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D72C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D738 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D744 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 849D750 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D75C - voice_keysplit voicegroup004, KeySplitTable2 @ 849D768 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D774 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D780 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D78C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D798 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D7A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D7B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D7BC - voice_keysplit voicegroup005, KeySplitTable3 @ 849D7C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D7D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D7E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D7EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D7F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D804 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D810 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D81C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D828 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D834 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D840 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D84C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D858 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D864 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D870 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D87C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D888 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 849D894 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D8A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D8AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D8B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D8C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D8D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D8DC - voice_square_1_alt 60, 0, 0, 1, 0, 2, 5, 2 @ 849D8E8 - voice_square_2_alt 60, 0, 3, 0, 2, 6, 3 @ 849D8F4 - voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 @ 849D900 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D90C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D918 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D924 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D930 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D93C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D948 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D954 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D960 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D96C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 0, 12, 0 @ 849D978 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D984 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D990 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D99C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D9A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D9B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D9C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D9CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D9D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D9E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D9F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849D9FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DA98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DAA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DAB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DABC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DAC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DAD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DAE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DAEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DAF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DB04 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 849DB10 - voice_noise_alt 60, 0, 0, 0, 1, 6, 0 @ 849DB1C +voicegroup172:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 + voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 5, 2 + voice_square_2_alt 60, 0, 3, 0, 2, 6, 3 + voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A326C, 0, 0, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 0 .align 2 -voicegroup173:: @ 849DB28 - voice_keysplit_all voicegroup002 @ 849DB28 - voice_keysplit voicegroup003, KeySplitTable1 @ 849DB34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DB40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DB4C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 849DB58 - voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 @ 849DB64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DB70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DB7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DB88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DB94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DBA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DBAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DBB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DBC4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 849DBD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DBDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DBE8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127 @ 849DBF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC3C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 849DC48 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224 @ 849DC54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DC9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DCA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DCB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DCC0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 849DCCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DCD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DCE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DCF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DCFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD5C - voice_keysplit voicegroup004, KeySplitTable2 @ 849DD68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DD98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DDA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DDB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DDBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DDC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DDD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DDE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DDEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DDF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DE88 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 849DE94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DEA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DEAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DEB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DEC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DED0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DEDC - voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 4 @ 849DEE8 - voice_square_2_alt 60, 0, 3, 0, 3, 3, 2 @ 849DEF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF6C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 849DF78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DF9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DFA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DFB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DFC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DFCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DFD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DFE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DFF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849DFFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E008 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E014 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E020 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E02C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E038 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E044 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E050 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E05C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E068 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E074 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E080 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E08C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E098 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E0A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E0B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E0BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E0C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E0D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E0E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E0EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E0F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E104 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 849E110 - voice_noise_alt 60, 0, 0, 0, 1, 3, 2 @ 849E11C +voicegroup173:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 + voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 4 + voice_square_2_alt 60, 0, 3, 0, 3, 3, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 3, 2 .align 2 -voicegroup174:: @ 849E128 - voice_keysplit_all voicegroup002 @ 849E128 - voice_keysplit voicegroup003, KeySplitTable1 @ 849E134 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E140 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E14C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E158 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 849E164 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E170 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E17C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E188 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E194 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E1A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E1AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E1B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E1C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E1D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E1DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E1E8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 @ 849E1F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E200 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E20C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E218 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 @ 849E224 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E230 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E23C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E248 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E254 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E260 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E26C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E278 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214 @ 849E284 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206 @ 849E290 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E29C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E2A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E2B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E2C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E2CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E2D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E2E4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 165 @ 849E2F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E2FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E308 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E314 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E320 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E32C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E338 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E344 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E350 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E35C - voice_keysplit voicegroup004, KeySplitTable2 @ 849E368 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E374 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E380 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E38C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E398 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E3A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E3B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E3BC - voice_keysplit voicegroup005, KeySplitTable3 @ 849E3C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E3D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E3E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E3EC - voice_keysplit voicegroup007, KeySplitTable5 @ 849E3F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E404 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209 @ 849E410 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E41C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E428 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E434 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E440 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E44C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E458 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E464 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E470 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E47C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E488 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E494 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E4A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E4AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E4B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E4C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E4D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E4DC - voice_square_1_alt 60, 0, 0, 3, 0, 2, 3, 4 @ 849E4E8 - voice_square_2_alt 60, 0, 3, 0, 2, 3, 4 @ 849E4F4 - voice_square_1_alt 60, 0, 0, 3, 0, 2, 3, 4 @ 849E500 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E50C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E518 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E524 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E530 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E53C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E548 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E554 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E560 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E56C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 7, 15, 0 @ 849E578 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E584 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E590 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E59C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E5A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E5B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E5C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E5CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E5D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E5E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E5F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E5FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E608 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E614 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E620 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E62C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E638 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E644 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E650 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E65C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E668 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E674 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E680 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E68C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E698 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E6A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E6B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E6BC - voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 849E6C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E6D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E6E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E6EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E6F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E704 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 849E710 - voice_noise_alt 60, 0, 0, 0, 1, 3, 1 @ 849E71C - voice_keysplit_all voicegroup177 @ 849E728 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 9, 1 @ 849E734 - voice_square_2_alt 60, 0, 2, 0, 2, 9, 1 @ 849E740 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 849E74C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E758 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E764 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E770 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E77C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E788 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E794 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E7A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E7AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E7B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E7C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E7D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E7DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E7E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E7F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E800 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E80C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E818 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E824 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E830 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E83C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 154, 127 @ 849E848 - voice_keysplit_all voicegroup002 @ 849E854 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1 @ 849E860 - voice_square_2_alt 60, 0, 2, 0, 2, 3, 1 @ 849E86C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 849E878 +voicegroup174:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 3, 0, 2, 3, 4 + voice_square_2_alt 60, 0, 3, 0, 2, 3, 4 + voice_square_1_alt 60, 0, 0, 3, 0, 2, 3, 4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31FC, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 3, 1 + voice_keysplit_all voicegroup177 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 9, 1 + voice_square_2_alt 60, 0, 2, 0, 2, 9, 1 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 154, 127 + voice_keysplit_all voicegroup002 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1 + voice_square_2_alt 60, 0, 2, 0, 2, 3, 1 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 .align 2 -voicegroup175:: @ 849E884 - voice_keysplit_all voicegroup177 @ 849E884 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E890 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E89C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E8A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E8B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E8C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E8CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E8D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E8E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E8F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E8FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E908 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E914 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 849E920 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E92C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E938 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E944 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E950 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E95C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E968 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E974 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E980 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E98C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E998 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 165, 154, 127 @ 849E9A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E9B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E9BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E9C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E9D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E9E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E9EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849E9F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EA94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EAA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EAAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EAB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EAC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EAD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EADC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EAE8 +voicegroup175:: + voice_keysplit_all voicegroup177 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 165, 154, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 .align 2 -voicegroup176:: @ 849EAF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EAF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EB9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EBA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EBB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EBC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EBCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EBD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EBE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EBF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EBFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EC08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EC14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EC20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EC2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EC38 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 7, 1 @ 849EC44 - voice_square_2_alt 60, 0, 2, 0, 2, 9, 1 @ 849EC50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EC5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EC68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EC74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EC80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EC8C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 @ 849EC98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ECA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ECB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ECBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ECC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ECD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ECE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ECEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ECF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED28 +voicegroup176:: + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 7, 1 + voice_square_2_alt 60, 0, 2, 0, 2, 9, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 .align 2 -voicegroup177:: @ 849ED34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849ED94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EDA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EDAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EDB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EDC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EDD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EDDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EDE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EDF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EE9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EEA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EEB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EEC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EECC - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 @ 849EED8 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 849EEE4 - voice_directsound_no_resample 67, 71, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 @ 849EEF0 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 @ 849EEFC - voice_directsound_no_resample 65, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 849EF08 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 849EF14 - voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 849EF20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EF2C - voice_directsound 68, 29, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 849EF38 - voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 849EF44 - voice_directsound 72, 64, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 849EF50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EF5C - voice_directsound 76, 39, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 849EF68 - voice_directsound 80, 89, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 @ 849EF74 - voice_directsound_no_resample 33, 10, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 849EF80 - voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 @ 849EF8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EF98 - voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 849EFA4 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 @ 849EFB0 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 @ 849EFBC - voice_directsound_no_resample 64, 64, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 849EFC8 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 @ 849EFD4 - voice_directsound_no_resample 64, 118, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 849EFE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849EFEC - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 849EFF8 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 849F004 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 @ 849F010 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 849F01C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 849F028 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 849F034 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F040 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F04C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F058 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F064 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F070 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F07C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F088 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F094 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F0A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F0AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F0B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F0C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F0D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F0DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F0E8 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 849F0F4 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 849F100 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 @ 849F10C - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 @ 849F118 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F124 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F130 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 849F13C - voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 849F148 - voice_directsound 50, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 849F154 - voice_directsound 64, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 @ 849F160 +voicegroup177:: + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 + voice_directsound_no_resample 67, 71, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242 + voice_directsound_no_resample 65, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 + voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 68, 29, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 + voice_directsound 72, 64, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 76, 39, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_directsound 80, 89, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226 + voice_directsound_no_resample 33, 10, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 + voice_directsound_no_resample 64, 118, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 + voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 + voice_directsound 50, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 + voice_directsound 64, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0 .align 2 -voicegroup178:: @ 849F16C - voice_keysplit_all voicegroup177 @ 849F16C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F178 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F184 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F190 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F19C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F1A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F1B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F1C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F1CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F1D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F1E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F1F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F1FC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 204, 103, 165 @ 849F208 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F214 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F220 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F22C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F238 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F244 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F250 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F25C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F268 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F274 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F280 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 154, 165 @ 849F28C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F298 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F2A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F2B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F2BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F2C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F2D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F2E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F2EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F2F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F304 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F310 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F31C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F328 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F334 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F340 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F34C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F358 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F364 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F370 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F37C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F388 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F394 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F3A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F3AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F3B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F3C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F3D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F3DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F3E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F3F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F400 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F40C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F418 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F424 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F430 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F43C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F448 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F454 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F460 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F46C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F478 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F484 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F490 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F49C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F4A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F4B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F4C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F4CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F4D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F4E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F4F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F4FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F508 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F514 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F520 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 7, 1 @ 849F52C - voice_square_2_alt 60, 0, 2, 0, 2, 7, 1 @ 849F538 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F544 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F550 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F55C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F568 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F574 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 0, 15, 1 @ 849F580 +voicegroup178:: + voice_keysplit_all voicegroup177 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 204, 103, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 154, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 7, 1 + voice_square_2_alt 60, 0, 2, 0, 2, 7, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 0, 15, 1 .align 2 -voicegroup179:: @ 849F58C - voice_keysplit_all voicegroup177 @ 849F58C - voice_keysplit_all voicegroup176 @ 849F598 - voice_keysplit voicegroup003, KeySplitTable1 @ 849F5A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F5B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F5BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F5C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F5D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F5E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F5EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F5F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F604 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F610 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F61C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 @ 849F628 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F634 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F640 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F64C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F658 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F664 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F670 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F67C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F688 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F694 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F6A0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 165, 154, 127 @ 849F6AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F6B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F6C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F6D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F6DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F6E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F6F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F700 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F70C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 849F718 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F724 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F730 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F73C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F748 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F754 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F760 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F76C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F778 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F784 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F790 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F79C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F7A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F7B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F7C0 - voice_keysplit voicegroup004, KeySplitTable2 @ 849F7CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F7D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F7E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F7F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F7FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F808 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F814 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F820 - voice_keysplit voicegroup005, KeySplitTable3 @ 849F82C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F838 - voice_keysplit voicegroup006, KeySplitTable4 @ 849F844 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F850 - voice_keysplit voicegroup007, KeySplitTable5 @ 849F85C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F868 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F874 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F880 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F88C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F898 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F8A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F8B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F8BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F8C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F8D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F8E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F8EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F8F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F904 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F910 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F91C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F928 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F934 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F940 - voice_square_1_alt 60, 0, 0, 3, 0, 0, 10, 0 @ 849F94C - voice_square_2_alt 60, 0, 0, 0, 1, 9, 0 @ 849F958 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F964 - voice_square_2_alt 60, 0, 3, 0, 1, 9, 0 @ 849F970 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F97C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F988 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F994 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 @ 849F9A0 +voicegroup179:: + voice_keysplit_all voicegroup177 + voice_keysplit_all voicegroup176 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 165, 154, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 3, 0, 0, 10, 0 + voice_square_2_alt 60, 0, 0, 0, 1, 9, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 3, 0, 1, 9, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 0 .align 2 -voicegroup180:: @ 849F9AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F9AC - voice_keysplit voicegroup003, KeySplitTable1 @ 849F9B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F9C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F9D0 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188 @ 849F9DC - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 @ 849F9E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849F9F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FA9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FAA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FAB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FAC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FACC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FAD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FAE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FAF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FAFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FB98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FBA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FBB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FBBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FBC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FBD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FBE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FBEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FBF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FC94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FCA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FCAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FCB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FCC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FCD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FCDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FCE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FCF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD60 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1 @ 849FD6C - voice_square_2_alt 60, 0, 2, 0, 2, 3, 1 @ 849FD78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FD9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FDA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FDB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FDC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FDCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FDD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FDE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FDF0 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 849FDFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FE98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FEA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FEB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FEBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FEC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FED4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FEE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FEEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FEF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FF88 - voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 @ 849FF94 - voice_noise_alt 60, 0, 0, 0, 1, 0, 0 @ 849FFA0 +voicegroup180:: + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1 + voice_square_2_alt 60, 0, 2, 0, 2, 3, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127 + voice_noise_alt 60, 0, 0, 0, 1, 0, 0 .align 2 -voicegroup181:: @ 849FFAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FFAC - voice_keysplit voicegroup003, KeySplitTable1 @ 849FFB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FFC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FFD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FFDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FFE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 849FFF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0000 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A000C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0018 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0024 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0030 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A003C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0048 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0054 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0060 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A006C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0078 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0084 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0090 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A009C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A00A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A00B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A00C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A00CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A00D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A00E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A00F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A00FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0108 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0114 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0120 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A012C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0138 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0144 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0150 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A015C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0168 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0174 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0180 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A018C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0198 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A01A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A01B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A01BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A01C8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 @ 84A01D4 +voicegroup181:: + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242 .align 2 -voicegroup182:: @ 84A01E0 - voice_keysplit_all voicegroup002 @ 84A01E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A01EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A01F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0204 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0210 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A021C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0228 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0234 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0240 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A024C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0258 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0264 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0270 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A027C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0288 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0294 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A02A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A02AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A02B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A02C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A02D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A02DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A02E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A02F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0300 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A030C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0318 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0324 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0330 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A033C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0348 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0354 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0360 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A036C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0378 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0384 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0390 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A039C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A03A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A03B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A03C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A03CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A03D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A03E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A03F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A03FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0408 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 76 @ 84A0414 - voice_keysplit voicegroup004, KeySplitTable2 @ 84A0420 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A042C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0438 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0444 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0450 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A045C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0468 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0474 - voice_keysplit voicegroup005, KeySplitTable3 @ 84A0480 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A048C - voice_keysplit voicegroup006, KeySplitTable4 @ 84A0498 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A04A4 - voice_keysplit voicegroup007, KeySplitTable5 @ 84A04B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A04BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A04C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A04D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A04E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A04EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A04F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0504 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0510 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A051C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0528 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0534 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0540 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A054C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0558 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0564 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0570 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A057C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0588 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0594 - voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1 @ 84A05A0 - voice_square_2_alt 60, 0, 1, 0, 2, 6, 2 @ 84A05AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A05B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A05C4 - voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1 @ 84A05D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A05DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A05E8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 84A05F4 +voicegroup182:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 76 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup006, KeySplitTable4 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1 + voice_square_2_alt 60, 0, 1, 0, 2, 6, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 .align 2 -voicegroup183:: @ 84A0600 - voice_keysplit_all voicegroup002 @ 84A0600 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A060C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0618 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0624 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0630 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A063C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0648 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0654 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0660 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A066C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0678 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0684 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0690 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A069C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A06A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A06B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A06C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A06CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A06D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A06E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A06F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A06FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0708 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0714 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 84A0720 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A072C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0738 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0744 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0750 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A075C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0768 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0774 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0780 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A078C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0798 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 84A07A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A07B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A07BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A07C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A07D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A07E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A07EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A07F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0804 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0810 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A081C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0828 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0834 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0840 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A084C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0858 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0864 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0870 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A087C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0888 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0894 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A08A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A08AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A08B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A08C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A08D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A08DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A08E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A08F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0900 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A090C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0918 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0924 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0930 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A093C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0948 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0954 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0960 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A096C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0978 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0984 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0990 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A099C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A09A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A09B4 - voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1 @ 84A09C0 - voice_square_2_alt 60, 0, 2, 0, 2, 4, 1 @ 84A09CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A09D8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 84A09E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A09F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A09FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0A98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0AA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0AB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0ABC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0AC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0AD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0AE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0AEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0AF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0B94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0BA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0BAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0BB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0BC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0BD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0BDC - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 84A0BE8 - voice_noise_alt 60, 0, 0, 0, 1, 3, 1 @ 84A0BF4 +voicegroup183:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1 + voice_square_2_alt 60, 0, 2, 0, 2, 4, 1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 3, 1 .align 2 -voicegroup184:: @ 84A0C00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C18 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 84A0C24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0C9C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 84A0CA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0CB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0CC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0CCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0CD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0CE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0CF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0CFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D68 - voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 84A0D74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0D98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0DA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0DB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0DBC - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 84A0DC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0DD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0DE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0DEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0DF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0E94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0EA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0EAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0EB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0EC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0ED0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0EDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0EE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0EF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0F9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0FA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0FB4 - voice_square_2_alt 60, 0, 3, 0, 0, 15, 0 @ 84A0FC0 - voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0FCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0FD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0FE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A0FF0 - voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 @ 84A0FFC +voicegroup184:: + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 3, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0 .align 2 -voicegroup185:: @ 84A1008 - voice_keysplit_all voicegroup002 @ 84A1008 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1014 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1020 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A102C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1038 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1044 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1050 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A105C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1068 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1074 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1080 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A108C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1098 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A10A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 84A10B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A10BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A10C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A10D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A10E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A10EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A10F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1104 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1110 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A111C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1128 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1134 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1140 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A114C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1158 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214 @ 84A1164 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206 @ 84A1170 - voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 @ 84A117C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1188 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 @ 84A1194 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A11A0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 84A11AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A11B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A11C4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 @ 84A11D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A11DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A11E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A11F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1200 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A120C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1218 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 @ 84A1224 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1230 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 @ 84A123C - voice_keysplit voicegroup004, KeySplitTable2 @ 84A1248 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1254 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1260 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A126C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1278 - voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 85, 0, 154, 165 @ 84A1284 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1290 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A129C - voice_keysplit voicegroup005, KeySplitTable3 @ 84A12A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A12B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A12C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A12CC - voice_keysplit voicegroup007, KeySplitTable5 @ 84A12D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A12E4 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209 @ 84A12F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A12FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1308 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1314 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1320 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A132C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1338 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1344 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1350 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A135C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1368 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1374 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1380 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A138C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1398 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A13A4 - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 @ 84A13B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A13BC - voice_square_2_alt 60, 0, 2, 0, 0, 15, 0 @ 84A13C8 - voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0 @ 84A13D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A13E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A13EC - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 7, 15, 0 @ 84A13F8 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A327C, 0, 7, 15, 0 @ 84A1404 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1410 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 @ 84A141C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1428 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1434 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1440 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A144C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1458 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1464 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1470 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A147C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1488 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1494 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A14A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A14AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A14B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A14C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A14D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A14DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A14E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A14F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1500 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A150C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1518 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1524 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1530 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A153C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1548 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1554 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1560 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A156C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1578 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1584 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1590 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A159C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A15A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A15B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A15C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A15CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A15D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A15E4 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 84A15F0 - voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ 84A15FC +voicegroup185:: + voice_keysplit_all voicegroup002 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206 + voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 85, 0, 154, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A328C, 0, 7, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A327C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A322C, 0, 7, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 1 .align 2 -voicegroup186:: @ 84A1608 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1608 - voice_keysplit voicegroup003, KeySplitTable1 @ 84A1614 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1620 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A162C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1638 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1644 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1650 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A165C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1668 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1674 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1680 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A168C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1698 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A16A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A16B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A16BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A16C8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A16D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A16E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A16EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A16F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1704 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1710 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A171C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1728 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1734 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1740 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A174C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1758 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1764 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1770 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A177C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1788 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1794 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A17A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A17AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A17B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A17C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A17D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A17DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A17E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A17F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1800 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A180C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1818 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1824 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1830 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A183C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1848 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1854 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1860 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A186C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1878 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1884 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1890 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A189C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A18A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A18B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A18C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A18CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A18D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A18E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A18F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A18FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1908 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1914 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1920 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A192C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1938 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1944 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1950 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A195C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1968 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1974 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1980 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A198C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1998 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A19A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A19B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A19BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A19C8 - voice_square_2_alt 60, 0, 3, 0, 0, 15, 0 @ 84A19D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A19E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A19EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A19F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1A94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1AA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1AAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1AB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1AC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1AD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1ADC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1AE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1AF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1B9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1BA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1BB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1BC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1BCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1BD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1BE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1BF0 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 84A1BFC +voicegroup186:: + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_2_alt 60, 0, 3, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 .align 2 -voicegroup187:: @ 84A1C08 - voice_keysplit_all voicegroup002 @ 84A1C08 - voice_keysplit voicegroup003, KeySplitTable1 @ 84A1C14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1C20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1C2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1C38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1C44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1C50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1C5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1C68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1C74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1C80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1C8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1C98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1CA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1CB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1CBC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1CC8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 @ 84A1CD4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1CE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1CEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1CF8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 @ 84A1D04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1D10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1D1C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 @ 84A1D28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1D34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1D40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1D4C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1D58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1D64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1D70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1D7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1D88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1D94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1DA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1DAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1DB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1DC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1DD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1DDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1DE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1DF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E24 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 @ 84A1E30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E3C - voice_keysplit voicegroup004, KeySplitTable2 @ 84A1E48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1E9C - voice_keysplit voicegroup005, KeySplitTable3 @ 84A1EA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1EB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1EC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1ECC - voice_keysplit voicegroup007, KeySplitTable5 @ 84A1ED8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1EE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1EF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1EFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F68 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 84A1F74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1F98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1FA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1FB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1FBC - voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2 @ 84A1FC8 - voice_square_2_alt 60, 0, 1, 0, 1, 7, 1 @ 84A1FD4 - voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 @ 84A1FE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1FEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A1FF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2004 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2010 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A201C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2028 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2034 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2040 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A204C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0 @ 84A2058 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2064 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2070 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A207C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2088 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2094 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A20A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A20AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A20B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A20C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A20D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A20DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A20E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A20F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2100 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A210C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2118 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2124 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2130 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A213C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2148 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2154 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2160 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A216C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2178 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2184 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2190 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A219C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A21A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A21B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A21C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A21CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A21D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A21E4 - voice_noise_alt 60, 0, 0, 0, 2, 6, 0 @ 84A21F0 - voice_noise_alt 60, 0, 0, 0, 1, 6, 1 @ 84A21FC +voicegroup187:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup005, KeySplitTable3 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup007, KeySplitTable5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2 + voice_square_2_alt 60, 0, 1, 0, 1, 7, 1 + voice_square_2_alt 60, 0, 0, 0, 2, 6, 5 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 0, 12, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 6, 0 + voice_noise_alt 60, 0, 0, 0, 1, 6, 1 .align 2 -voicegroup188:: @ 84A2208 - voice_keysplit_all voicegroup002 @ 84A2208 - voice_keysplit voicegroup003, KeySplitTable1 @ 84A2214 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2220 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A222C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 84A2238 - voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 @ 84A2244 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2250 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A225C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2268 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2274 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2280 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A228C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2298 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A22A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 84A22B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A22BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A22C8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127 @ 84A22D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A22E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A22EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A22F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2304 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2310 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A231C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 84A2328 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224 @ 84A2334 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2340 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A234C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2358 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2364 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2370 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A237C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2388 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2394 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A23A0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 84A23AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A23B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A23C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A23D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A23DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A23E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A23F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2400 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A240C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2418 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2424 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2430 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A243C - voice_keysplit voicegroup004, KeySplitTable2 @ 84A2448 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2454 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2460 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A246C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2478 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2484 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2490 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A249C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A24A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A24B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A24C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A24CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A24D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A24E4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A24F0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A24FC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2508 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2514 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2520 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A252C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2538 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2544 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2550 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A255C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2568 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 84A2574 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2580 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A258C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2598 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A25A4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A25B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A25BC - voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 1 @ 84A25C8 - voice_square_2_alt 60, 0, 3, 0, 3, 3, 2 @ 84A25D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A25E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A25EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A25F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2604 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2610 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A261C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2628 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2634 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2640 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A264C - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 2 @ 84A2658 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2664 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2670 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A267C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2688 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2694 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A26A0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A26AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A26B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A26C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A26D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A26DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A26E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A26F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2700 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A270C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2718 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2724 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2730 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A273C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2748 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2754 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2760 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A276C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2778 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2784 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2790 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A279C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A27A8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A27B4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A27C0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A27CC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A27D8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A27E4 - voice_noise_alt 60, 0, 0, 0, 2, 7, 0 @ 84A27F0 - voice_noise_alt 60, 0, 0, 0, 1, 9, 1 @ 84A27FC +voicegroup188:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 + voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 1 + voice_square_2_alt 60, 0, 3, 0, 3, 3, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 7, 0 + voice_noise_alt 60, 0, 0, 0, 1, 9, 1 .align 2 -voicegroup189:: @ 84A2808 - voice_keysplit_all voicegroup002 @ 84A2808 - voice_keysplit voicegroup003, KeySplitTable1 @ 84A2814 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2820 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A282C - voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 @ 84A2838 - voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 @ 84A2844 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2850 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A285C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2868 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2874 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2880 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A288C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2898 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A28A4 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 @ 84A28B0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A28BC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A28C8 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127 @ 84A28D4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A28E0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A28EC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A28F8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2904 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2910 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A291C - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 @ 84A2928 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224 @ 84A2934 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2940 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A294C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2958 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2964 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2970 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A297C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2988 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2994 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A29A0 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 @ 84A29AC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A29B8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A29C4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A29D0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A29DC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A29E8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A29F4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A3C - voice_keysplit voicegroup004, KeySplitTable2 @ 84A2A48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2A9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2AA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2AB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2AC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2ACC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2AD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2AE4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2AF0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2AFC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B14 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B5C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B68 - voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 @ 84A2B74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2B98 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2BA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2BB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2BBC - voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 3 @ 84A2BC8 - voice_square_2_alt 60, 0, 3, 0, 2, 7, 2 @ 84A2BD4 - voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 2 @ 84A2BE0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2BEC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2BF8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C10 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C1C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C28 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C34 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C40 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C4C +voicegroup189:: + voice_keysplit_all voicegroup002 + voice_keysplit voicegroup003, KeySplitTable1 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226 + voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_keysplit voicegroup004, KeySplitTable2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 3 + voice_square_2_alt 60, 0, 3, 0, 2, 7, 2 + voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 .align 2 -voicegroup190:: @ 84A2C58 - voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 2 @ 84A2C58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2C94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2CA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2CAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2CB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2CC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2CD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2CDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2CE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2CF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D00 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D0C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D18 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D24 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D30 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D3C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D48 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D54 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D60 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D6C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D78 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D84 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D90 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2D9C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2DA8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2DB4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2DC0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2DCC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2DD8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2DE4 - voice_noise_alt 60, 0, 0, 0, 2, 7, 0 @ 84A2DF0 - voice_noise_alt 60, 0, 0, 0, 1, 9, 1 @ 84A2DFC - voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 @ 84A2E08 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2E14 - voice_directsound_no_resample 64, 52, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 @ 84A2E20 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2E2C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2E38 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2E44 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2E50 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2E5C - voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 @ 84A2E68 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2E74 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2E80 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2E8C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2E98 - voice_directsound_no_resample 33, 104, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 84A2EA4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2EB0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2EBC - voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 84A2EC8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2ED4 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 @ 84A2EE0 - voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 @ 84A2EEC - voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 @ 84A2EF8 - voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 84A2F04 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2F10 - voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 @ 84A2F1C - voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 @ 84A2F28 - voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 @ 84A2F34 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 @ 84A2F40 - voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 84A2F4C - voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 @ 84A2F58 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2F64 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2F70 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2F7C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2F88 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2F94 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2FA0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2FAC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2FB8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2FC4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2FD0 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2FDC - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2FE8 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A2FF4 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A3000 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A300C - voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 84A3018 - voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 @ 84A3024 - voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 @ 84A3030 - voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 @ 84A303C - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A3048 - voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 @ 84A3054 - voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 @ 84A3060 - voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 @ 84A306C +voicegroup190:: + voice_programmable_wave_alt 60, 0, gProgrammableWaveData_84A31EC, 0, 7, 15, 2 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_noise_alt 60, 0, 0, 0, 2, 7, 0 + voice_noise_alt 60, 0, 0, 0, 1, 9, 1 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 52, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 33, 104, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204 + voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188 + voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242 + voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231 + voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216 + voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0 + voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 + voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 + voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188 + voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188 + voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_square_1 60, 0, 0, 2, 0, 0, 15, 0 + voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0 + voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0 diff --git a/src/crt0.s b/src/crt0.s index 7402f69e9..11e2bc9cf 100644 --- a/src/crt0.s +++ b/src/crt0.s @@ -10,29 +10,29 @@ .arm -_start: @ 8000000 +_start: b start_vector .include "asm/rom_header.inc" -@ 80000C0 + .word 0 .global GPIOPortData -GPIOPortData: @ 80000C4 +GPIOPortData: .hword 0 .global GPIOPortDirection -GPIOPortDirection: @ 80000C6 +GPIOPortDirection: .hword 0 .global GPIOPortReadEnable -GPIOPortReadEnable: @ 80000C8 +GPIOPortReadEnable: .hword 0 .space 6 -@ 80000D0 + .4byte 0xFFFFFFFF .4byte 0xFFFFFFFF @@ -47,7 +47,7 @@ GPIOPortReadEnable: @ 80000C8 .4byte 0xFFFFFFFF .4byte 0xFFFFFFFF -@ 8000100 + .global CartIdent CartIdent: .4byte GAME_VERSION diff --git a/src/libagbsyscall.s b/src/libagbsyscall.s index 360a43e67..61c23feb4 100644 --- a/src/libagbsyscall.s +++ b/src/libagbsyscall.s @@ -6,68 +6,68 @@ .text thumb_func_start ArcTan2 -ArcTan2: @ 81E3B58 +ArcTan2: svc 0xA bx lr thumb_func_end ArcTan2 thumb_func_start BgAffineSet -BgAffineSet: @ 81E3B5C +BgAffineSet: svc 0xE bx lr thumb_func_end BgAffineSet thumb_func_start CpuFastSet -CpuFastSet: @ 81E3B60 +CpuFastSet: svc 0xC bx lr thumb_func_end CpuFastSet thumb_func_start CpuSet -CpuSet: @ 81E3B64 +CpuSet: svc 0xB bx lr thumb_func_end CpuSet thumb_func_start Div -Div: @ 81E3B68 +Div: svc 0x6 bx lr thumb_func_end Div thumb_func_start LZ77UnCompVram -LZ77UnCompVram: @ 81E3B6C +LZ77UnCompVram: svc 0x12 bx lr thumb_func_end LZ77UnCompVram thumb_func_start LZ77UnCompWram -LZ77UnCompWram: @ 81E3B70 +LZ77UnCompWram: svc 0x11 bx lr thumb_func_end LZ77UnCompWram thumb_func_start MultiBoot -MultiBoot: @ 81E3B74 +MultiBoot: movs r1, 0x1 svc 0x25 bx lr thumb_func_end MultiBoot thumb_func_start ObjAffineSet -ObjAffineSet: @ 81E3B7C +ObjAffineSet: svc 0xF bx lr thumb_func_end ObjAffineSet thumb_func_start RegisterRamReset -RegisterRamReset: @ 81E3B80 +RegisterRamReset: svc 0x1 bx lr thumb_func_end RegisterRamReset thumb_func_start SoftReset -SoftReset: @ 81E3B84 +SoftReset: ldr r3, =REG_IME movs r2, 0 strb r2, [r3] @@ -79,13 +79,13 @@ SoftReset: @ 81E3B84 thumb_func_end SoftReset thumb_func_start Sqrt -Sqrt: @ 81E3B9C +Sqrt: svc 0x8 bx lr thumb_func_end Sqrt thumb_func_start VBlankIntrWait -VBlankIntrWait: @ 81E3BA0 +VBlankIntrWait: movs r2, 0 svc 0x5 bx lr diff --git a/src/libgcnmultiboot.s b/src/libgcnmultiboot.s index 91bc1890c..e6e8c8d34 100644 --- a/src/libgcnmultiboot.s +++ b/src/libgcnmultiboot.s @@ -40,7 +40,7 @@ .text thumb_func_start GameCubeMultiBoot_Hash -GameCubeMultiBoot_Hash: @ 81DCB38 +GameCubeMultiBoot_Hash: push {r4,lr} ldr r4, pool_HashVal eors r3, r1 @@ -61,7 +61,7 @@ GameCubeMultiBoot_Hash_SkipEor: thumb_func_start GameCubeMultiBoot_Main @ void GameCubeMultiBoot_Main(struct GameCubeMultiBoot *mb)@ -GameCubeMultiBoot_Main: @ 81DCB4C +GameCubeMultiBoot_Main: @ If there is no interrupt handler, skip counter manipulation ldr r1, [r0, GCMB_STRUCT_SERIAL_INTR_HANDLER] cmp r1, 0 @@ -246,7 +246,7 @@ pool_NintendoLogo: .4byte RomHeaderNintendoLogo thumb_func_start GameCubeMultiBoot_ExecuteProgram @ void GameCubeMultiBoot_ExecuteProgram(struct GameCubeMultiBoot *mb)@ -GameCubeMultiBoot_ExecuteProgram: @ 81DCC4C +GameCubeMultiBoot_ExecuteProgram: @ If there's no multiboot image ready, just return to caller ldrb r1, [r0, GCMB_STRUCT_MBPROGRESS] cmp r1, MBPROGRESS_READY_TO_BOOT @@ -265,7 +265,7 @@ GameCubeMultiBoot_ExecuteProgram_Fail: thumb_func_start GameCubeMultiBoot_Init @ void GameCubeMultiBoot_Init(struct GameCubeMultiBoot *mb)@ -GameCubeMultiBoot_Init: @ 81DCC60 +GameCubeMultiBoot_Init: ldr r3, pool_InterruptRegs @ Save IME register. @@ -336,7 +336,7 @@ GameCubeMultiBoot_Init_ClearStructLoop: non_word_aligned_thumb_func_start GameCubeMultiBoot_HandleSerialInterrupt @ void GameCubeMultiBoot_HandleSerialInterrupt(struct GameCubeMultiBoot *mb)@ -GameCubeMultiBoot_HandleSerialInterrupt: @ 81DCCAA +GameCubeMultiBoot_HandleSerialInterrupt: ldr r3, pool_SerialRegs @ Acknowledge reset/receive/send flags. @@ -400,7 +400,7 @@ GameCubeMultiBoot_BeginHandshake: .align 2, 0 -GcMbIntrHandler_CheckGameCodeSent: @ 81DCCEC +GcMbIntrHandler_CheckGameCodeSent: lsls r1, 31 bcc GcMbIntrHandler_Stop @ stop if send failed bmi GameCubeMultiBoot_CheckHandshakeResponse @ branch if receive is complete @@ -412,7 +412,7 @@ GcMbIntrHandler_CheckGameCodeSent: @ 81DCCEC .align 2, 0 -GcMbIntrHandler_CheckHandshakeResponse: @ 81DCCF8 +GcMbIntrHandler_CheckHandshakeResponse: lsrs r1, 1 @ is receive complete? bcc GcMbIntrHandler_Stop @ stop if not @@ -429,7 +429,7 @@ GameCubeMultiBoot_CheckHandshakeResponse: .align 2, 0 -GcMbIntrHandler_ReceiveKeyA: @ 81DCD0C +GcMbIntrHandler_ReceiveKeyA: lsrs r1, 1 @ is receive complete? bcc GcMbIntrHandler_Stop @ branch if not ldr r1, [r3, OFFSET_REG_JOY_RECV - 0x120] @@ -473,7 +473,7 @@ GameCubeMultiBoot_KeyBCheckEnd: .align 2, 0 -GcMbIntrHandler_CheckKeyBSent: @ 81DCD4C +GcMbIntrHandler_CheckKeyBSent: lsls r1, 31 bcc GcMbIntrHandler_Stop @ stop if send failed bmi GameCubeMultiBoot_CheckImageSizeResponse @ branch if receive is complete @@ -482,7 +482,7 @@ GcMbIntrHandler_CheckKeyBSent: @ 81DCD4C .align 2, 0 -GcMbIntrHandler_CheckImageSizeResponse: @ 81DCD58 +GcMbIntrHandler_CheckImageSizeResponse: lsrs r1, 1 @ is receive complete? bcc GcMbIntrHandler_Stop @ branch if not GameCubeMultiBoot_CheckImageSizeResponse: @@ -505,7 +505,7 @@ GcMbIntrHandler_StopIfNotEqual: .align 2, 0 -GcMbIntrHandler_CheckImageResponse: @ 81DCD7C +GcMbIntrHandler_CheckImageResponse: lsrs r1, 1 @ is receive complete? bcc GcMbIntrHandler_Stop @ branch if not ldr r2, [r0, GCMB_STRUCT_CUR_DEST_PTR] @@ -553,7 +553,7 @@ GcMbIntrHandler_StopIfSendFailed: .align 2, 0 -GcMbIntrHandler_CheckKeyCDerivationSent: @ 81DCDB8 +GcMbIntrHandler_CheckKeyCDerivationSent: lsls r1, 31 bcc GcMbIntrHandler_StopIfSendFailed @ branch if send failed bmi GameCubeMultiBoot_CheckBootKeyResponse @ branch if receive is complete @@ -562,7 +562,7 @@ GcMbIntrHandler_CheckKeyCDerivationSent: @ 81DCDB8 .align 2, 0 -GcMbIntrHandler_CheckBootKeyResponse: @ 81DCDC4 +GcMbIntrHandler_CheckBootKeyResponse: lsrs r1, 1 @ is receive complete? bcc GcMbIntrHandler_StopIfSendFailed @ branch if not @@ -580,14 +580,14 @@ GameCubeMultiBoot_CheckBootKeyResponse: .align 2, 0 -GcMbIntrHandler_StopUnconditionally: @ 81DCDD8 +GcMbIntrHandler_StopUnconditionally: b GcMbIntrHandler_Stop thumb_func_end GameCubeMultiBoot_HandleSerialInterrupt non_word_aligned_thumb_func_start GameCubeMultiBoot_Quit @ void GameCubeMultiBoot_Quit()@ -GameCubeMultiBoot_Quit: @ 81DCDDA +GameCubeMultiBoot_Quit: ldr r3, pool_InterruptRegs @ Save IME register. From f341e9bea3177bf6d18b3d0b14f7a25a0ca3b229 Mon Sep 17 00:00:00 2001 From: Kurausukun Date: Tue, 28 Jun 2022 00:14:11 -0400 Subject: [PATCH 22/64] use floats for tempo calculation --- tools/mid2agb/agb.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/mid2agb/agb.cpp b/tools/mid2agb/agb.cpp index d4d79f133..caa6f0ecd 100644 --- a/tools/mid2agb/agb.cpp +++ b/tools/mid2agb/agb.cpp @@ -18,6 +18,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. +#include #include #include #include @@ -503,7 +504,7 @@ void PrintAgbTrack(std::vector& events) ResetTrackVars(); break; case EventType::Tempo: - PrintByte("TEMPO , %u*%s_tbs/2", 60000000 / event.param2, g_asmLabel.c_str()); + PrintByte("TEMPO , %u*%s_tbs/2", static_cast(round(60000000.0f / static_cast(event.param2))), g_asmLabel.c_str()); PrintWait(event.time); break; case EventType::InstrumentChange: From 951b72145f9d68d7c2638b4d14c1c337731da502 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Sun, 3 Jul 2022 23:48:40 +0800 Subject: [PATCH 23/64] Document src/field_message_box.c --- include/field_message_box.h | 2 +- src/cable_club.c | 4 +- src/field_message_box.c | 87 ++++++++++++++++++++----------------- 3 files changed, 51 insertions(+), 42 deletions(-) diff --git a/include/field_message_box.h b/include/field_message_box.h index 54f0b0fd5..0f81efb20 100644 --- a/include/field_message_box.h +++ b/include/field_message_box.h @@ -7,7 +7,7 @@ bool8 ShowFieldMessage(const u8 *message); bool8 ShowFieldAutoScrollMessage(const u8 *message); void HideFieldMessageBox(void); bool8 IsFieldMessageBoxHidden(void); -bool8 textbox_any_visible(void); +u8 GetFieldMessageBoxType(void); void InitFieldMessageBox(void); #endif // GUARD_FIELD_MESSAGE_BOX_H diff --git a/src/cable_club.c b/src/cable_club.c index f3e4244d3..1f7415b04 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -219,7 +219,7 @@ static void Task_Linkup1(u8 taskId) static void Task_LinkupMaster_2(u8 taskId) { - if (sub_80808F0(taskId) != TRUE && sub_8080990(taskId) != TRUE && sub_80808BC(taskId) != TRUE && !textbox_any_visible()) + if (sub_80808F0(taskId) != TRUE && sub_8080990(taskId) != TRUE && sub_80808BC(taskId) != TRUE && !GetFieldMessageBoxType()) { gTasks[taskId].data[3] = 0; gTasks[taskId].func = Task_LinkupMaster_3; @@ -246,7 +246,7 @@ static void Task_LinkupMaster_3(u8 taskId) static void Task_LinkupMaster_4(u8 taskId) { - if (sub_80808F0(taskId) != TRUE && sub_8080990(taskId) != TRUE && sub_80808BC(taskId) != TRUE && !textbox_any_visible()) + if (sub_80808F0(taskId) != TRUE && sub_8080990(taskId) != TRUE && sub_80808BC(taskId) != TRUE && !GetFieldMessageBoxType()) { if (GetSavedPlayerCount() != GetLinkPlayerCount_2()) { diff --git a/src/field_message_box.c b/src/field_message_box.c index c9d54a2a9..2281ba134 100644 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -5,22 +5,30 @@ #include "script.h" #include "text_window.h" -static EWRAM_DATA u8 sMessageBoxType = 0; +enum +{ + FIELD_MESSAGE_BOX_HIDDEN, + FIELD_MESSAGE_BOX_UNUSED, + FIELD_MESSAGE_BOX_NORMAL, + FIELD_MESSAGE_BOX_AUTO_SCROLL, +}; -static void textbox_fdecode_auto_and_task_add(const u8 *str); -static void textbox_auto_and_task_add(void); +static EWRAM_DATA u8 sMessageBoxType = FIELD_MESSAGE_BOX_HIDDEN; + +static void ExpandStringAndStartDrawFieldMessageBox(const u8 *str); +static void StartDrawFieldMessageBox(void); void InitFieldMessageBox(void) { - sMessageBoxType = 0; + sMessageBoxType = FIELD_MESSAGE_BOX_HIDDEN; gTextFlags.canABSpeedUpPrint = FALSE; gTextFlags.useAlternateDownArrow = FALSE; gTextFlags.autoScroll = FALSE; } -static void Task_RunFieldMessageBoxPrinter(u8 taskId) +static void Task_DrawFieldMessageBox(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; switch (task->data[0]) { case 0: @@ -30,13 +38,9 @@ static void Task_RunFieldMessageBoxPrinter(u8 taskId) TextWindow_LoadTilesStdFrame1(0, 0x200); } else if (!IsMsgSignPost()) - { LoadStdWindowFrameGfx(); - } else - { LoadSignPostWindowFrameGfx(); - } task->data[0]++; break; case 1: @@ -46,95 +50,100 @@ static void Task_RunFieldMessageBoxPrinter(u8 taskId) case 2: if (RunTextPrinters_CheckPrinter0Active() != TRUE) { - sMessageBoxType = 0; + sMessageBoxType = FIELD_MESSAGE_BOX_HIDDEN; DestroyTask(taskId); } break; } } -static void task_add_textbox(void) +static void CreateTask_DrawFieldMessageBox(void) { - CreateTask(Task_RunFieldMessageBoxPrinter, 80); + CreateTask(Task_DrawFieldMessageBox, 80); } -static void task_del_textbox(void) +static void DestroyTask_DrawFieldMessageBox(void) { - u8 taskId = FindTaskIdByFunc(Task_RunFieldMessageBoxPrinter); + u8 taskId = FindTaskIdByFunc(Task_DrawFieldMessageBox); if (taskId != 0xFF) DestroyTask(taskId); } bool8 ShowFieldMessage(const u8 *str) { - if (sMessageBoxType != 0) + if (sMessageBoxType != FIELD_MESSAGE_BOX_HIDDEN) return FALSE; - textbox_fdecode_auto_and_task_add(str); - sMessageBoxType = 2; + ExpandStringAndStartDrawFieldMessageBox(str); + sMessageBoxType = FIELD_MESSAGE_BOX_NORMAL; return TRUE; } bool8 ShowFieldAutoScrollMessage(const u8 *str) { - if (sMessageBoxType != 0) + if (sMessageBoxType != FIELD_MESSAGE_BOX_HIDDEN) return FALSE; - sMessageBoxType = 3; - textbox_fdecode_auto_and_task_add(str); + sMessageBoxType = FIELD_MESSAGE_BOX_AUTO_SCROLL; + ExpandStringAndStartDrawFieldMessageBox(str); return TRUE; } -bool8 sub_806948C(const u8 *str) +// Unused +static bool8 ForceShowFieldAutoScrollMessage(const u8 *str) { - sMessageBoxType = 3; - textbox_fdecode_auto_and_task_add(str); + sMessageBoxType = FIELD_MESSAGE_BOX_AUTO_SCROLL; + ExpandStringAndStartDrawFieldMessageBox(str); return TRUE; } -bool8 sub_80694A4(const u8 *str) +// Unused +// Same as ShowFieldMessage, but instead of accepting a string argument, +// it just prints whatever that's already in gStringVar4 +static bool8 ShowFieldMessageFromBuffer(void) { - if (sMessageBoxType != 0) + if (sMessageBoxType != FIELD_MESSAGE_BOX_HIDDEN) return FALSE; - sMessageBoxType = 2; - textbox_auto_and_task_add(); + sMessageBoxType = FIELD_MESSAGE_BOX_NORMAL; + StartDrawFieldMessageBox(); return TRUE; } -static void textbox_fdecode_auto_and_task_add(const u8 *str) +static void ExpandStringAndStartDrawFieldMessageBox(const u8 *str) { StringExpandPlaceholders(gStringVar4, str); AddTextPrinterDiffStyle(TRUE); - task_add_textbox(); + CreateTask_DrawFieldMessageBox(); } -static void textbox_auto_and_task_add(void) +static void StartDrawFieldMessageBox(void) { AddTextPrinterDiffStyle(TRUE); - task_add_textbox(); + CreateTask_DrawFieldMessageBox(); } void HideFieldMessageBox(void) { - task_del_textbox(); + DestroyTask_DrawFieldMessageBox(); ClearDialogWindowAndFrame(0, TRUE); - sMessageBoxType = 0; + sMessageBoxType = FIELD_MESSAGE_BOX_HIDDEN; } -u8 textbox_any_visible(void) +u8 GetFieldMessageBoxType(void) { return sMessageBoxType; } bool8 IsFieldMessageBoxHidden(void) { - if (sMessageBoxType == 0) + if (sMessageBoxType == FIELD_MESSAGE_BOX_HIDDEN) return TRUE; else return FALSE; } -void sub_8069538(void) +// Unused +static void ReplaceFieldMessageWithFrame(void) { - task_del_textbox(); + DestroyTask_DrawFieldMessageBox(); DrawStdWindowFrame(0, TRUE); - sMessageBoxType = 0; + sMessageBoxType = FIELD_MESSAGE_BOX_HIDDEN; } From a4327cd0930668a5b1df7b564967fe4f7a733c31 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Mon, 4 Jul 2022 00:28:09 +0800 Subject: [PATCH 24/64] Remove use of enum when defining sMessageBoxType --- src/field_message_box.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field_message_box.c b/src/field_message_box.c index 2281ba134..5a682c382 100644 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -13,7 +13,7 @@ enum FIELD_MESSAGE_BOX_AUTO_SCROLL, }; -static EWRAM_DATA u8 sMessageBoxType = FIELD_MESSAGE_BOX_HIDDEN; +static EWRAM_DATA u8 sMessageBoxType = 0; static void ExpandStringAndStartDrawFieldMessageBox(const u8 *str); static void StartDrawFieldMessageBox(void); From 56ca6d4bccb23c932b2c1d298f430aab2eb1c993 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Wed, 13 Jul 2022 04:07:52 +0800 Subject: [PATCH 25/64] Document src/field_effect.c --- data/field_effect_scripts.s | 24 +- data/scripts/trainer_card.inc | 2 +- .../pics/deoxys_rock_fragment_bottom_left.png | Bin 0 -> 201 bytes .../deoxys_rock_fragment_bottom_right.png | Bin 0 -> 193 bytes .../pics/deoxys_rock_fragment_top_left.png | Bin 0 -> 201 bytes .../pics/deoxys_rock_fragment_top_right.png | Bin 0 -> 202 bytes .../field_move_streaks_indoors.bin} | Bin .../field_move_streaks_indoors.png} | Bin .../field_move_streaks_outdoors.bin} | Bin .../field_move_streaks_outdoors.png} | Bin .../{unk_83CB3F0.png => pics/hof_monitor.png} | Bin .../field_effects/{ => pics}/new_game_oak.png | Bin .../{pokeball.png => pics/pokeball_glow.png} | Bin .../pokemoncenter_monitor.png} | Bin graphics/field_effects/unk_83CAF70.pal | 19 - graphics/field_effects/unk_83CB3D0.pal | 19 - graphics/field_effects/unk_83CB7F0.pal | 19 - graphics/field_effects/unk_83CBB10.pal | 19 - graphics/field_effects/unk_83CBDB0.png | Bin 217 -> 0 bytes include/constants/field_effects.h | 4 +- src/data/field_effects/field_effect_objects.h | 20 +- src/field_effect.c | 1546 +++++++++-------- 22 files changed, 858 insertions(+), 814 deletions(-) create mode 100644 graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png create mode 100644 graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png create mode 100644 graphics/field_effects/pics/deoxys_rock_fragment_top_left.png create mode 100644 graphics/field_effects/pics/deoxys_rock_fragment_top_right.png rename graphics/field_effects/{unk_83CBB30.bin => pics/field_move_streaks_indoors.bin} (100%) rename graphics/field_effects/{unk_83CBA90.png => pics/field_move_streaks_indoors.png} (100%) rename graphics/field_effects/{unk_83CB810.bin => pics/field_move_streaks_outdoors.bin} (100%) rename graphics/field_effects/{unk_83CB5F0.png => pics/field_move_streaks_outdoors.png} (100%) rename graphics/field_effects/{unk_83CB3F0.png => pics/hof_monitor.png} (100%) rename graphics/field_effects/{ => pics}/new_game_oak.png (100%) rename graphics/field_effects/{pokeball.png => pics/pokeball_glow.png} (100%) rename graphics/field_effects/{unk_83CAFD0.png => pics/pokemoncenter_monitor.png} (100%) delete mode 100644 graphics/field_effects/unk_83CAF70.pal delete mode 100644 graphics/field_effects/unk_83CB3D0.pal delete mode 100644 graphics/field_effects/unk_83CB7F0.pal delete mode 100644 graphics/field_effects/unk_83CBB10.pal delete mode 100644 graphics/field_effects/unk_83CBDB0.png diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 05fe03ce6..aa08512ef 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -33,7 +33,7 @@ gFieldEffectScriptPointers:: .4byte gFldEffScript_TreeDisguise .4byte gFldEffScript_MountainDisguise .4byte gFldEffScript_NpcflyOut - .4byte gFldEffScript_UseFly + .4byte gFldEffScript_FlyOut .4byte gFldEffScript_FlyIn .4byte gFldEffScript_QuestionMarkIcon .4byte gFldEffScript_FeetInFlowingWater @@ -70,8 +70,8 @@ gFieldEffectScriptPointers:: .4byte gFldEffScript_UseVsSeeker .4byte gFldEffScript_DoubleExclMarkIcon .4byte gFldEffScript_MoveDeoxysRock - .4byte gFldEffScript_Unk44 - .4byte gFldEffScript_Unk45 + .4byte gFldEffScript_DestroyDeoxysRock + .4byte gFldEffScript_PhotoFlash gFldEffScript_ExclamationMarkIcon:: callnative FldEff_ExclamationMarkIcon1 @@ -173,7 +173,7 @@ gFldEffScript_DeepSandFootprints:: end gFldEffScript_PokecenterHeal:: - loadfadedpal gUnknown_83CBE9C + loadfadedpal gSpritePalette_PokeballGlow loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_PokecenterHeal end @@ -195,8 +195,8 @@ gFldEffScript_NpcflyOut:: callnative FldEff_NpcFlyOut end -gFldEffScript_UseFly:: - callnative FldEff_UseFly +gFldEffScript_FlyOut:: + callnative FldEff_FlyOut end gFldEffScript_FlyIn:: @@ -313,8 +313,8 @@ gFldEffScript_PcturnOn:: end gFldEffScript_HallOfFameRecord:: - loadfadedpal gUnknown_83CBE9C - loadfadedpal_callnative gUnknown_83CBEA4, FldEff_HallOfFameRecord + loadfadedpal gSpritePalette_PokeballGlow + loadfadedpal_callnative gSpritePalette_HofMonitor, FldEff_HallOfFameRecord end gFldEffScript_UseTeleport:: @@ -337,10 +337,10 @@ gFldEffScript_MoveDeoxysRock:: callnative FldEff_MoveDeoxysRock end -gFldEffScript_Unk44:: - callnative FldEff_Unk44 +gFldEffScript_DestroyDeoxysRock:: + callnative FldEff_DestroyDeoxysRock end -gFldEffScript_Unk45:: - callnative FldEff_Unk45 +gFldEffScript_PhotoFlash:: + callnative FldEff_PhotoFlash end diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index e5439a454..933d7b800 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -47,7 +47,7 @@ CeladonCity_GameCorner_EventScript_PrintPhoto:: message CeladonCity_GameCorner_Text_BigSmileForPhoto waitmessage playse MUS_PHOTO - dofieldeffect FLDEFF_UNK_45 + dofieldeffect FLDEFF_PHOTO_FLASH delay 60 special UpdateTrainerCardPhotoIcons msgbox CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png new file mode 100644 index 0000000000000000000000000000000000000000..d5e36b8d65bc54e2ef58acda9e78e898e5a6882d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U4Ea{HEjtmSN`?>!lvI6-$0X`wF zS#ypmC@2I41$B3KD<8ag9VpIN666=m;PC858j!p)9pX!C23vuyx5ppb}M27sn8e>#PSE85slwST@u)+Y4P_ p_`CZi1LxNG(|f#AWwabke<;c`cCM?#VH*o*} literal 0 HcmV?d00001 diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png new file mode 100644 index 0000000000000000000000000000000000000000..8db25e52e9bc6c6ed69722d628a9c8d468f282af GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U4Ea{HEjtmSN`?>!lvI6-$0X`wF zS#ypmC@2I41$B3KD<8ag9VpIN666=m;PC858j!SWN@goh&Hw? g5bDt9P?C^f;9bFR+bC5e6{wKG)78&qol`;+0Fy~FEdT%j literal 0 HcmV?d00001 diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png new file mode 100644 index 0000000000000000000000000000000000000000..cca7ea336dbf13470ded4935e8e36d1d03fe8356 GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U4Ea{HEjtmSN`?>!lvI6-$0X`wF zS#ypmC@2I41$B3KD<8ag9VpIN666=m;PC858j!|PRHT(bo literal 0 HcmV?d00001 diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png new file mode 100644 index 0000000000000000000000000000000000000000..2d14a96a976a2f3fdb9f88e3cd6c4a4388fecaf3 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^93afX3?$7I7w-U4Ea{HEjtmSN`?>!lvI6-$0X`wF zS#ypmC@2I41$B3KD<8ag9VpIN666=m;PC858j!8PzvZhHgRV|? zuwid-data[1] = nPokemon; - task->data[2] = 0x5d; - task->data[3] = 0x24; - task->data[4] = 0x80; - task->data[5] = 0x18; + task = &gTasks[CreateTask(Task_PokecenterHeal, 0xFF)]; + task->tNumMons = nPokemon; + task->tFirstBallX = 93; + task->tFirstBallY = 36; + task->tMonitorX = 128; + task->tMonitorY = 24; return FALSE; } static void Task_PokecenterHeal(u8 taskId) { - struct Task * task = &gTasks[taskId]; - sPokecenterHealTaskCBTable[task->data[0]](task); + struct Task *task = &gTasks[taskId]; + sPokecenterHealEffectFuncs[task->tState](task); } -static void PokecenterHealEffect_0(struct Task * task) +static void PokecenterHealEffect_Init(struct Task *task) { - task->data[0]++; - task->data[6] = CreatePokeballGlowSprite(task->data[1], task->data[2], task->data[3], TRUE); - task->data[7] = PokecenterHealEffectHelper(task->data[4], task->data[5]); + task->tState++; + task->tGlowEffectSpriteId = CreateGlowingPokeballsEffect(task->tNumMons, task->tFirstBallX, task->tFirstBallY, TRUE); + task->tMonitorSpriteId = CreatePokecenterMonitorSprite(task->tMonitorX, task->tMonitorY); } -static void PokecenterHealEffect_1(struct Task * task) +static void PokecenterHealEffect_WaitForBallPlacement(struct Task *task) { - if (gSprites[task->data[6]].data[0] > 1) + if (gSprites[task->tGlowEffectSpriteId].sState >= 2) { - gSprites[task->data[7]].data[0]++; - task->data[0]++; + gSprites[task->tMonitorSpriteId].sStartFlash++; + task->tState++; } } -static void PokecenterHealEffect_2(struct Task * task) +static void PokecenterHealEffect_WaitForBallFlashing(struct Task *task) { - if (gSprites[task->data[6]].data[0] > 4) - { - task->data[0]++; - } + if (gSprites[task->tGlowEffectSpriteId].sState > 4) + task->tState++; } -static void PokecenterHealEffect_3(struct Task * task) +static void PokecenterHealEffect_WaitForSoundAndEnd(struct Task *task) { - if (gSprites[task->data[6]].data[0] > 6) + if (gSprites[task->tGlowEffectSpriteId].sState > 6) { - DestroySprite(&gSprites[task->data[6]]); + DestroySprite(&gSprites[task->tGlowEffectSpriteId]); FieldEffectActiveListRemove(FLDEFF_POKECENTER_HEAL); DestroyTask(FindTaskIdByFunc(Task_PokecenterHeal)); } @@ -768,79 +807,86 @@ static void PokecenterHealEffect_3(struct Task * task) bool8 FldEff_HallOfFameRecord(void) { u8 nPokemon; - struct Task * task; + struct Task *task; nPokemon = CalculatePlayerPartyCount(); - task = &gTasks[CreateTask(Task_HallOfFameRecord, 0xff)]; - task->data[1] = nPokemon; - task->data[2] = 0x75; - task->data[3] = 0x3C; + task = &gTasks[CreateTask(Task_HallOfFameRecord, 0xFF)]; + task->tNumMons = nPokemon; + task->tFirstBallX = 117; + task->tFirstBallY = 60; return FALSE; } static void Task_HallOfFameRecord(u8 taskId) { - struct Task * task; + struct Task *task; task = &gTasks[taskId]; - sHallOfFameRecordTaskCBTable[task->data[0]](task); + sHallOfFameRecordEffectFuncs[task->tState](task); } -static void HallOfFameRecordEffect_0(struct Task * task) +static void HallOfFameRecordEffect_Init(struct Task *task) { u8 taskId; - task->data[0]++; - task->data[6] = CreatePokeballGlowSprite(task->data[1], task->data[2], task->data[3], FALSE); + task->tState++; + task->tGlowEffectSpriteId = CreateGlowingPokeballsEffect(task->tNumMons, task->tFirstBallX, task->tFirstBallY, FALSE); } -static void HallOfFameRecordEffect_1(struct Task * task) +static void HallOfFameRecordEffect_WaitForBallPlacement(struct Task *task) { - if (gSprites[task->data[6]].data[0] > 1) + if (gSprites[task->tGlowEffectSpriteId].sState > 1) { - HallOfFameRecordEffectHelper(0x78, 0x19); - task->data[15]++; // was this ever initialized? is this ever used? - task->data[0]++; + CreateHofMonitorSprite(120, 25); + task->data[15]++; // unused, leftover from RSE + task->tState++; } } -static void HallOfFameRecordEffect_2(struct Task * task) +static void HallOfFameRecordEffect_WaitForBallFlashing(struct Task *task) { - if (gSprites[task->data[6]].data[0] > 4) - { - task->data[0]++; - } + if (gSprites[task->tGlowEffectSpriteId].sState > 4) + task->tState++; } -static void HallOfFameRecordEffect_3(struct Task * task) +static void HallOfFameRecordEffect_WaitForSoundAndEnd(struct Task *task) { - if (gSprites[task->data[6]].data[0] > 6) + if (gSprites[task->tGlowEffectSpriteId].sState > 6) { - DestroySprite(&gSprites[task->data[6]]); + DestroySprite(&gSprites[task->tGlowEffectSpriteId]); FieldEffectActiveListRemove(FLDEFF_HALL_OF_FAME_RECORD); DestroyTask(FindTaskIdByFunc(Task_HallOfFameRecord)); } } -static u8 CreatePokeballGlowSprite(s16 duration, s16 x, s16 y, bool16 fanfare) +#undef tState +#undef tNumMons +#undef tFirstBallX +#undef tFirstBallY +#undef tMonitorX +#undef tMonitorY +#undef tGlowEffectSpriteId +#undef tMonitorSpriteId + +static u8 CreateGlowingPokeballsEffect(s16 numMons, s16 x, s16 y, bool16 playHealSe) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; spriteId = CreateInvisibleSprite(SpriteCB_PokeballGlowEffect); sprite = &gSprites[spriteId]; sprite->x2 = x; sprite->y2 = y; sprite->subpriority = 0xFF; - sprite->data[5] = fanfare; - sprite->data[6] = duration; - sprite->data[7] = spriteId; + sprite->sPlayHealSe = playHealSe; + sprite->sNumMons = numMons; + sprite->sSpriteId = spriteId; return spriteId; } -static void SpriteCB_PokeballGlowEffect(struct Sprite * sprite) +static void SpriteCB_PokeballGlowEffect(struct Sprite *sprite) { - sPokeballGlowSpriteCBTable[sprite->data[0]](sprite); + sPokeballGlowEffectFuncs[sprite->sState](sprite); } -static const struct Coords16 sUnknown_83CC010[] = { +static const struct Coords16 sPokeballCoordOffsets[] = { {0, 0}, {6, 0}, {0, 4}, @@ -849,144 +895,146 @@ static const struct Coords16 sUnknown_83CC010[] = { {6, 8} }; -static const u8 sUnknown_83CC028[] = {16, 12, 8, 0}; -static const u8 sUnknown_83CC02C[] = {16, 12, 8, 0}; -static const u8 sUnknown_83CC030[] = { 0, 0, 0, 0}; +static const u8 sPokeballGlowReds[] = {16, 12, 8, 0}; +static const u8 sPokeballGlowGreens[] = {16, 12, 8, 0}; +static const u8 sPokeballGlowBlues[] = { 0, 0, 0, 0}; -static void PokeballGlowEffect_0(struct Sprite * sprite) +static void PokeballGlowEffect_PlaceBalls(struct Sprite *sprite) { - u8 endSpriteId; - if (sprite->data[1] == 0 || (--sprite->data[1]) == 0) + u8 spriteId; + if (sprite->sTimer == 0 || (--sprite->sTimer) == 0) { - sprite->data[1] = 25; - endSpriteId = CreateSpriteAtEnd(&sUnknown_83CBF88, sUnknown_83CC010[sprite->data[2]].x + sprite->x2, sUnknown_83CC010[sprite->data[2]].y + sprite->y2, 0xFF); - gSprites[endSpriteId].oam.priority = 2; - gSprites[endSpriteId].data[0] = sprite->data[7]; - sprite->data[2]++; - sprite->data[6]--; + sprite->sTimer = 25; + spriteId = CreateSpriteAtEnd(&sSpriteTemplate_PokeballGlow, sPokeballCoordOffsets[sprite->sCounter].x + sprite->x2, sPokeballCoordOffsets[sprite->sCounter].y + sprite->y2, 0xFF); + gSprites[spriteId].oam.priority = 2; + gSprites[spriteId].sGlowEffectSpriteId = sprite->sSpriteId; + sprite->sCounter++; + sprite->sNumMons--; PlaySE(SE_BALL); } - if (sprite->data[6] == 0) + if (sprite->sNumMons == 0) { - sprite->data[1] = 32; - sprite->data[0]++; + sprite->sTimer = 32; + sprite->sState++; } } -static void PokeballGlowEffect_1(struct Sprite * sprite) +static void PokeballGlowEffect_TryPlaySe(struct Sprite *sprite) { - if ((--sprite->data[1]) == 0) + if ((--sprite->sTimer) == 0) { - sprite->data[0]++; - sprite->data[1] = 8; - sprite->data[2] = 0; - sprite->data[3] = 0; - if (sprite->data[5]) - { + sprite->sState++; + sprite->sTimer = 8; + sprite->sCounter = 0; + sprite->sNumFlashed = 0; + if (sprite->sPlayHealSe) PlayFanfare(MUS_HEAL); - } } } -static void PokeballGlowEffect_2(struct Sprite * sprite) +static void PokeballGlowEffect_FlashFirstThree(struct Sprite *sprite) { u8 phase; - if ((--sprite->data[1]) == 0) + if ((--sprite->sTimer) == 0) { - sprite->data[1] = 8; - sprite->data[2]++; - sprite->data[2] &= 3; - if (sprite->data[2] == 0) - { - sprite->data[3]++; - } + sprite->sTimer = 8; + sprite->sCounter++; + sprite->sCounter &= 3; + if (sprite->sCounter == 0) + sprite->sNumFlashed++; } - phase = (sprite->data[2] + 3) & 3; - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, sUnknown_83CC028[phase], sUnknown_83CC02C[phase], sUnknown_83CC030[phase]); - phase = (sprite->data[2] + 2) & 3; - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, sUnknown_83CC028[phase], sUnknown_83CC02C[phase], sUnknown_83CC030[phase]); - phase = (sprite->data[2] + 1) & 3; - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, sUnknown_83CC028[phase], sUnknown_83CC02C[phase], sUnknown_83CC030[phase]); - phase = sprite->data[2]; - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x105, sUnknown_83CC028[phase], sUnknown_83CC02C[phase], sUnknown_83CC030[phase]); - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x103, sUnknown_83CC028[phase], sUnknown_83CC02C[phase], sUnknown_83CC030[phase]); - if (sprite->data[3] > 2) + phase = (sprite->sCounter + 3) & 3; + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + phase = (sprite->sCounter + 2) & 3; + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + phase = (sprite->sCounter + 1) & 3; + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + phase = sprite->sCounter; + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x105, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x103, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + if (sprite->sNumFlashed >= 3) { - sprite->data[0]++; - sprite->data[1] = 8; - sprite->data[2] = 0; + sprite->sState++; + sprite->sTimer = 8; + sprite->sCounter = 0; } } -static void PokeballGlowEffect_3(struct Sprite * sprite) +static void PokeballGlowEffect_FlashLast(struct Sprite *sprite) { u8 phase; - if ((--sprite->data[1]) == 0) + if ((--sprite->sTimer) == 0) { - sprite->data[1] = 8; - sprite->data[2]++; - sprite->data[2] &= 3; - if (sprite->data[2] == 3) + sprite->sTimer = 8; + sprite->sCounter++; + sprite->sCounter &= 3; + if (sprite->sCounter == 3) { - sprite->data[0]++; - sprite->data[1] = 30; + sprite->sState++; + sprite->sTimer = 30; } } - phase = sprite->data[2]; - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, sUnknown_83CC028[phase], sUnknown_83CC02C[phase], sUnknown_83CC030[phase]); - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, sUnknown_83CC028[phase], sUnknown_83CC02C[phase], sUnknown_83CC030[phase]); - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, sUnknown_83CC028[phase], sUnknown_83CC02C[phase], sUnknown_83CC030[phase]); - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x105, sUnknown_83CC028[phase], sUnknown_83CC02C[phase], sUnknown_83CC030[phase]); - MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x103, sUnknown_83CC028[phase], sUnknown_83CC02C[phase], sUnknown_83CC030[phase]); + phase = sprite->sCounter; + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x105, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); + MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x103, sPokeballGlowReds[phase], sPokeballGlowGreens[phase], sPokeballGlowBlues[phase]); } -static void PokeballGlowEffect_4(struct Sprite * sprite) +static void PokeballGlowEffect_WaitAfterFlash(struct Sprite *sprite) { - if ((--sprite->data[1]) == 0) - { - sprite->data[0]++; - } + if ((--sprite->sTimer) == 0) + sprite->sState++; } -static void PokeballGlowEffect_5(struct Sprite * sprite) +static void PokeballGlowEffect_Dummy(struct Sprite *sprite) { - sprite->data[0]++; + sprite->sState++; } -static void PokeballGlowEffect_6(struct Sprite * sprite) +static void PokeballGlowEffect_WaitForSound(struct Sprite *sprite) { - if (sprite->data[5] == 0 || IsFanfareTaskInactive()) - { - sprite->data[0]++; - } + if (sprite->sPlayHealSe == FALSE || IsFanfareTaskInactive()) + sprite->sState++; } -static void PokeballGlowEffect_7(struct Sprite * sprite) +static void PokeballGlowEffect_Idle(struct Sprite *sprite) { } -static void SpriteCB_PokeballGlow(struct Sprite * sprite) +static void SpriteCB_PokeballGlow(struct Sprite *sprite) { - if (gSprites[sprite->data[0]].data[0] > 4) + if (gSprites[sprite->sGlowEffectSpriteId].sState > 4) FieldEffectFreeGraphicsResources(sprite); } -static u8 PokecenterHealEffectHelper(s32 x, s32 y) +#undef sState +#undef sTimer +#undef sCounter +#undef sNumFlashed +#undef sPlayHealSe +#undef sNumMons +#undef sSpriteId + +#undef sGlowEffectSpriteId + +static u8 CreatePokecenterMonitorSprite(s32 x, s32 y) { u8 spriteId; - struct Sprite * sprite; - spriteId = CreateSpriteAtEnd(&sUnknown_83CBFA0, x, y, 0); + struct Sprite *sprite; + spriteId = CreateSpriteAtEnd(&sSpriteTemplate_PokecenterMonitor, x, y, 0); sprite = &gSprites[spriteId]; sprite->oam.priority = 2; sprite->invisible = TRUE; return spriteId; } -static void SpriteCB_PokecenterMonitor(struct Sprite * sprite) +static void SpriteCB_PokecenterMonitor(struct Sprite *sprite) { - if (sprite->data[0] != 0) + if (sprite->sStartFlash != FALSE) { - sprite->data[0] = 0; + sprite->sStartFlash = FALSE; sprite->invisible = FALSE; StartSpriteAnim(sprite, 1); } @@ -994,40 +1042,42 @@ static void SpriteCB_PokecenterMonitor(struct Sprite * sprite) FieldEffectFreeGraphicsResources(sprite); } -static void HallOfFameRecordEffectHelper(s32 x, s32 y) +#undef sStartFlash + +static void CreateHofMonitorSprite(s32 x, s32 y) { - CreateSpriteAtEnd(&sUnknown_83CBFB8, x, y, 0); + CreateSpriteAtEnd(&sSpriteTemplate_HofMonitor, x, y, 0); } -static void SpriteCB_HallOfFameMonitor(struct Sprite * sprite) +static void SpriteCB_HallOfFameMonitor(struct Sprite *sprite) { if (sprite->animEnded) FieldEffectFreeGraphicsResources(sprite); } -static void FieldCallback_Fly(void); -static void Task_FlyOut(u8 taskId); -static void FieldCallback_FlyArrive(void); -static void Task_FlyIn(u8 taskId); +static void FieldCallback_UseFly(void); +static void Task_UseFly(u8 taskId); +static void FieldCallback_FlyIntoMap(void); +static void Task_FlyIntoMap(u8 taskId); void ReturnToFieldFromFlyMapSelect(void) { SetMainCallback2(CB2_ReturnToField); - gFieldCallback = FieldCallback_Fly; + gFieldCallback = FieldCallback_UseFly; } -static void FieldCallback_Fly(void) +static void FieldCallback_UseFly(void) { FadeInFromBlack(); - CreateTask(Task_FlyOut, 0); + CreateTask(Task_UseFly, 0); ScriptContext2_Enable(); FreezeObjectEvents(); gFieldCallback = NULL; } -static void Task_FlyOut(u8 taskId) +static void Task_UseFly(u8 taskId) { - struct Task * task; + struct Task *task; task = &gTasks[taskId]; if (task->data[0] == 0) { @@ -1036,44 +1086,40 @@ static void Task_FlyOut(u8 taskId) gFieldEffectArguments[0] = GetCursorSelectionMonId(); if ((int)gFieldEffectArguments[0] >= PARTY_SIZE) gFieldEffectArguments[0] = 0; - FieldEffectStart(FLDEFF_USE_FLY); + FieldEffectStart(FLDEFF_FLY_OUT); task->data[0]++; } - if (!FieldEffectActiveListContains(FLDEFF_USE_FLY)) + if (!FieldEffectActiveListContains(FLDEFF_FLY_OUT)) { Overworld_ResetStateAfterFly(); WarpIntoMap(); SetMainCallback2(CB2_LoadMap); - gFieldCallback = FieldCallback_FlyArrive; + gFieldCallback = FieldCallback_FlyIntoMap; DestroyTask(taskId); } } -static void FieldCallback_FlyArrive(void) +static void FieldCallback_FlyIntoMap(void) { Overworld_PlaySpecialMapMusic(); FadeInFromBlack(); - CreateTask(Task_FlyIn, 0); + CreateTask(Task_FlyIntoMap, 0); gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) - { ObjectEventTurn(&gObjectEvents[gPlayerAvatar.objectEventId], DIR_WEST); - } ScriptContext2_Enable(); FreezeObjectEvents(); gFieldCallback = NULL; } -static void Task_FlyIn(u8 taskId) +static void Task_FlyIntoMap(u8 taskId) { - struct Task * task; + struct Task *task; task = &gTasks[taskId]; if (task->data[0] == 0) { if (gPaletteFade.active) - { return; - } FieldEffectStart(FLDEFF_FLY_IN); task->data[0]++; } @@ -1621,40 +1667,40 @@ static bool8 waterfall_4_wait_player_move_probably(struct Task * task, struct Ob return FALSE; } -static void Task_Dive(u8 taskId); -static bool8 dive_1_lock(struct Task * task); -static bool8 dive_2_unknown(struct Task * task); -static bool8 dive_3_unknown(struct Task * task); +static void Task_UseDive(u8 taskId); +static bool8 DiveFieldEffect_Init(struct Task *task); +static bool8 DiveFieldEffect_ShowMon(struct Task *task); +static bool8 DiveFieldEffect_TryWarp(struct Task *task); -static bool8 (*const sDiveFieldEffectFuncPtrs[])(struct Task * task) = { - dive_1_lock, - dive_2_unknown, - dive_3_unknown +static bool8 (*const sDiveFieldEffectFuncs[])(struct Task *task) = +{ + DiveFieldEffect_Init, + DiveFieldEffect_ShowMon, + DiveFieldEffect_TryWarp }; u32 FldEff_UseDive(void) { - u8 taskId = CreateTask(Task_Dive, 0xFF); - gTasks[taskId].data[15] = gFieldEffectArguments[0]; - gTasks[taskId].data[14] = gFieldEffectArguments[1]; - Task_Dive(taskId); + u8 taskId = CreateTask(Task_UseDive, 0xFF); + gTasks[taskId].data[15] = gFieldEffectArguments[0]; // party index of pokemon with dive + gTasks[taskId].data[14] = gFieldEffectArguments[1]; // unused + Task_UseDive(taskId); return 0; } -static void Task_Dive(u8 taskId) +static void Task_UseDive(u8 taskId) { - while (sDiveFieldEffectFuncPtrs[gTasks[taskId].data[0]](&gTasks[taskId])) - ; + while (sDiveFieldEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId])); } -static bool8 dive_1_lock(struct Task * task) +static bool8 DiveFieldEffect_Init(struct Task *task) { gPlayerAvatar.preventStep = TRUE; task->data[0]++; return FALSE; } -static bool8 dive_2_unknown(struct Task * task) +static bool8 DiveFieldEffect_ShowMon(struct Task *task) { ScriptContext2_Enable(); gFieldEffectArguments[0] = task->data[15]; @@ -1663,14 +1709,14 @@ static bool8 dive_2_unknown(struct Task * task) return FALSE; } -static bool8 dive_3_unknown(struct Task * task) +static bool8 DiveFieldEffect_TryWarp(struct Task *task) { struct MapPosition pos; PlayerGetDestCoords(&pos.x, &pos.y); if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { dive_warp(&pos, gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior); - DestroyTask(FindTaskIdByFunc(Task_Dive)); + DestroyTask(FindTaskIdByFunc(Task_UseDive)); FieldEffectActiveListRemove(FLDEFF_USE_DIVE); } return FALSE; @@ -2010,121 +2056,131 @@ void SpriteCB_PopOutOfAsh(struct Sprite * sprite) } } -static void Task_DoEscapeRopeFieldEffect(u8 taskId); -static void EscapeRopeFieldEffect_Step0(struct Task * task); -static void EscapeRopeFieldEffect_Step1(struct Task * task); -static u8 sub_808576C(struct ObjectEvent * playerObj, s16 *a1p, s16 *a2p); -static bool32 sub_80857F0(struct ObjectEvent * playerObj, s16 *a1p, s16 *a2p); -static void FieldCallback_EscapeRopeExit(void); -static void Task_DoEscapeRopeExitFieldEffect(u8 taskId); -static void EscapeRopeExitFieldEffect_Step0(struct Task * task); -static void EscapeRopeExitFieldEffect_Step1(struct Task * task); +// Task data for Task_EscapeRopeWarpOut +#define tState data[0] +#define tSpinDelay data[1] +#define tNumTurns data[2] +#define tTimer data[3] +#define tOffscreen data[4] +#define tMovingState data[5] +#define tOffsetY data[6] +#define tDirection data[15] -static void (*const gEscapeRopeFieldEffectFuncs[])(struct Task * task) = { - EscapeRopeFieldEffect_Step0, - EscapeRopeFieldEffect_Step1 +static void Task_EscapeRopeWarpOut(u8 taskId); +static void EscapeRopeWarpOutEffect_Init(struct Task *task); +static void EscapeRopeWarpOutEffect_Spin(struct Task *task); +static u8 SpinObjectEvent(struct ObjectEvent *playerObj, s16 *timer, s16 *numTurns); +static bool32 WarpOutObjectEventUpwards(struct ObjectEvent *playerObj, s16 *movingState, s16 *offsetY); +static void FieldCallback_EscapeRopeExit(void); +static void Task_EscapeRopeWarpIn(u8 taskId); +static void EscapeRopeWarpInEffect_Init(struct Task *task); +static void EscapeRopeWarpInEffect_Spin(struct Task *task); + +static void (*const sEscapeRopeWarpOutEffectFuncs[])(struct Task *task) = +{ + EscapeRopeWarpOutEffect_Init, + EscapeRopeWarpOutEffect_Spin }; void StartEscapeRopeFieldEffect(void) { ScriptContext2_Enable(); FreezeObjectEvents(); - CreateTask(Task_DoEscapeRopeFieldEffect, 80); + CreateTask(Task_EscapeRopeWarpOut, 80); } -static void Task_DoEscapeRopeFieldEffect(u8 taskId) +static void Task_EscapeRopeWarpOut(u8 taskId) { - gEscapeRopeFieldEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); + sEscapeRopeWarpOutEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]); } -static void EscapeRopeFieldEffect_Step0(struct Task * task) +static void EscapeRopeWarpOutEffect_Init(struct Task *task) { - task->data[0]++; - task->data[13] = 64; - task->data[14] = GetPlayerFacingDirection(); - task->data[15] = 0; + task->tState++; + task->data[13] = 64; // unused + task->data[14] = GetPlayerFacingDirection(); // unused + task->tDirection = DIR_NONE; } -static void EscapeRopeFieldEffect_Step1(struct Task * task) +static void EscapeRopeWarpOutEffect_Spin(struct Task *task) { - struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; s16 *data = task->data; - sub_808576C(playerObj, &task->data[1], &task->data[2]); - if (data[3] < 60) + SpinObjectEvent(playerObj, &task->tSpinDelay, &task->tNumTurns); + if (tTimer < 60) { - data[3]++; - if (data[3] == 20) - { + tTimer++; + if (tTimer == 20) PlaySE(SE_WARP_IN); - } } - else if (data[4] == 0 && !sub_80857F0(playerObj, &task->data[5], &task->data[6])) + else if (tOffscreen == FALSE && !WarpOutObjectEventUpwards(playerObj, &task->tMovingState, &task->tOffsetY)) { TryFadeOutOldMapMusic(); WarpFadeOutScreen(); - data[4] = 1; + tOffscreen = TRUE; } - if (data[4] == 1 && !gPaletteFade.active && BGMusicStopped() == TRUE) + if (tOffscreen == TRUE && !gPaletteFade.active && BGMusicStopped() == TRUE) { - SetObjectEventDirection(playerObj, task->data[15]); + SetObjectEventDirection(playerObj, task->tDirection); // always DIR_NONE SetWarpDestinationToEscapeWarp(); WarpIntoMap(); gFieldCallback = FieldCallback_EscapeRopeExit; SetMainCallback2(CB2_LoadMap); - DestroyTask(FindTaskIdByFunc(Task_DoEscapeRopeFieldEffect)); + DestroyTask(FindTaskIdByFunc(Task_EscapeRopeWarpOut)); } } -static const u8 sUnknown_83CC0E8[] = { +static const u8 sSpinDirections[] = +{ [DIR_NONE] = DIR_SOUTH, [DIR_SOUTH] = DIR_WEST, - [DIR_WEST] = DIR_NORTH, [DIR_NORTH] = DIR_EAST, + [DIR_WEST] = DIR_NORTH, [DIR_EAST] = DIR_SOUTH, }; -static u8 sub_808576C(struct ObjectEvent * playerObj, s16 *delay_p, s16 *stage_p) +static u8 SpinObjectEvent(struct ObjectEvent *playerObj, s16 *spinDelay, s16 *numTurns) { if (!ObjectEventIsMovementOverridden(playerObj) || ObjectEventClearHeldMovementIfFinished(playerObj)) { - if (*delay_p != 0 && --(*delay_p) != 0) + if (*spinDelay != 0 && --(*spinDelay) != 0) return playerObj->facingDirection; - ObjectEventSetHeldMovement(playerObj, GetFaceDirectionMovementAction(sUnknown_83CC0E8[playerObj->facingDirection])); - if (*stage_p < 12) - (*stage_p)++; - *delay_p = 12 >> (*stage_p); // 12 >> 4 = 0 - return sUnknown_83CC0E8[playerObj->facingDirection]; + ObjectEventSetHeldMovement(playerObj, GetFaceDirectionMovementAction(sSpinDirections[playerObj->facingDirection])); + if (*numTurns < 12) + (*numTurns)++; + *spinDelay = 12 >> (*numTurns); + return sSpinDirections[playerObj->facingDirection]; } return playerObj->facingDirection; } -static bool32 sub_80857F0(struct ObjectEvent * playerObj, s16 *state_p, s16 *y_p) +static bool32 WarpOutObjectEventUpwards(struct ObjectEvent *playerObj, s16 *movingState, s16 *offsetY) { - struct Sprite * sprite = &gSprites[playerObj->spriteId]; - switch (*state_p) + struct Sprite *sprite = &gSprites[playerObj->spriteId]; + switch (*movingState) { case 0: CameraObjectReset2(); - (*state_p)++; + (*movingState)++; // fallthrough case 1: sprite->y2 -= 8; - (*y_p) -= 8; - if (*y_p <= -16) + (*offsetY) -= 8; + if (*offsetY <= -16) { playerObj->fixedPriority = TRUE; sprite->oam.priority = 1; sprite->subpriority = 0; sprite->subspriteMode = SUBSPRITES_OFF; - (*state_p)++; + (*movingState)++; } break; case 2: sprite->y2 -= 8; - (*y_p) -= 8; - if (*y_p <= -88) + (*offsetY) -= 8; + if (*offsetY <= -88) { - (*state_p)++; + (*movingState)++; return FALSE; } break; @@ -2134,48 +2190,72 @@ static bool32 sub_80857F0(struct ObjectEvent * playerObj, s16 *state_p, s16 *y_p return TRUE; } -static void (*const sEscapeRopeExitEffectFuncs[])(struct Task * task) = { - EscapeRopeExitFieldEffect_Step0, - EscapeRopeExitFieldEffect_Step1 +#undef tState +#undef tSpinDelay +#undef tNumTurns +#undef tTimer +#undef tOffscreen +#undef tMovingState +#undef tOffsetY +#undef tDirection + +// Task data for Task_EscapeRopeWarpIn +#define tState data[0] +#define tMovingState data[1] +#define tOffsetY data[2] +#define tPriority data[3] +#define tSubpriority data[4] +#define tSubspriteMode data[5] +#define tTimer data[6] +#define tSpinEnded data[7] +#define tCurrentDir data[8] +#define tSpinDelay data[9] +#define tNumTurns data[10] +#define tOriginalDir data[15] + +static void (*const sEscapeRopeWarpInEffectFuncs[])(struct Task *task) = +{ + EscapeRopeWarpInEffect_Init, + EscapeRopeWarpInEffect_Spin }; -static bool32 sub_80858A4(struct ObjectEvent * playerObj, s16 *state_p, s16 *y_p, s16 *priority_p, s16 *subpriority_p, s16 *subspriteMode_p) +static bool32 WarpInObjectEventDownwards(struct ObjectEvent *playerObj, s16 *movingState, s16 *offsetY, s16 *priority, s16 *subpriority, s16 *subspriteMode) { - struct Sprite * sprite = &gSprites[playerObj->spriteId]; - switch (*state_p) + struct Sprite *sprite = &gSprites[playerObj->spriteId]; + switch (*movingState) { case 0: CameraObjectReset2(); - *y_p = -88; + *offsetY = -88; sprite->y2 -= 88; - *priority_p = sprite->oam.priority; - *subpriority_p = sprite->subpriority; - *subspriteMode_p = sprite->subspriteMode; + *priority = sprite->oam.priority; + *subpriority = sprite->subpriority; + *subspriteMode = sprite->subspriteMode; playerObj->fixedPriority = TRUE; sprite->oam.priority = 1; sprite->subpriority = 0; sprite->subspriteMode = SUBSPRITES_OFF; - (*state_p)++; + (*movingState)++; // fallthrough case 1: sprite->y2 += 4; - (*y_p) += 4; - if (*y_p >= -16) + (*offsetY) += 4; + if (*offsetY >= -16) { - sprite->oam.priority = *priority_p; - sprite->subpriority = *subpriority_p; - sprite->subspriteMode = *subspriteMode_p; - (*state_p)++; + sprite->oam.priority = *priority; + sprite->subpriority = *subpriority; + sprite->subspriteMode = *subspriteMode; + (*movingState)++; } break; case 2: sprite->y2 += 4; - (*y_p) += 4; - if (*y_p >= 0) + (*offsetY) += 4; + if (*offsetY >= 0) { PlaySE(SE_CLICK); CameraObjectReset1(); - (*state_p)++; + (*movingState)++; return FALSE; } break; @@ -2194,49 +2274,62 @@ static void FieldCallback_EscapeRopeExit(void) FreezeObjectEvents(); gFieldCallback = NULL; gObjectEvents[gPlayerAvatar.objectEventId].invisible = TRUE; - CreateTask(Task_DoEscapeRopeExitFieldEffect, 0); + CreateTask(Task_EscapeRopeWarpIn, 0); } -static void Task_DoEscapeRopeExitFieldEffect(u8 taskId) +static void Task_EscapeRopeWarpIn(u8 taskId) { - sEscapeRopeExitEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); + sEscapeRopeWarpInEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]); } -static void EscapeRopeExitFieldEffect_Step0(struct Task * task) +static void EscapeRopeWarpInEffect_Init(struct Task *task) { if (IsWeatherNotFadingIn()) { PlaySE(SE_WARP_OUT); - task->data[15] = GetPlayerFacingDirection(); - task->data[0]++; + task->tOriginalDir = GetPlayerFacingDirection(); + task->tState++; } } -static void EscapeRopeExitFieldEffect_Step1(struct Task * task) +static void EscapeRopeWarpInEffect_Spin(struct Task *task) { s16 *data = task->data; - struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; - bool32 finished = sub_80858A4(playerObj, &data[1], &data[2], &data[3], &data[4], &data[5]); + struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + bool32 moving = WarpInObjectEventDownwards(playerObj, &tMovingState, &tOffsetY, &tPriority, &tSubpriority, &tSubspriteMode); playerObj->invisible = FALSE; - if (data[6] < 8) - data[6]++; - else if (data[7] == 0) + if (tTimer < 8) + tTimer++; + else if (tSpinEnded == FALSE) { - data[6]++; - data[8] = sub_808576C(playerObj, &data[9], &data[10]); - if (data[6] >= 50 && data[8] == data[15]) - data[7] = 1; + tTimer++; + tCurrentDir = SpinObjectEvent(playerObj, &tSpinDelay, &tNumTurns); + if (tTimer >= 50 && tCurrentDir == tOriginalDir) + tSpinEnded = TRUE; } - if (!finished && data[8] == data[15] && ObjectEventCheckHeldMovementStatus(playerObj) == TRUE) + if (!moving && tCurrentDir == tOriginalDir && ObjectEventCheckHeldMovementStatus(playerObj) == TRUE) { playerObj->invisible = FALSE; playerObj->fixedPriority = FALSE; ScriptContext2_Disable(); UnfreezeObjectEvents(); - DestroyTask(FindTaskIdByFunc(Task_DoEscapeRopeExitFieldEffect)); + DestroyTask(FindTaskIdByFunc(Task_EscapeRopeWarpIn)); } } +#undef tState +#undef tMovingState +#undef tOffsetY +#undef tPriority +#undef tSubpriority +#undef tSubspriteMode +#undef tTimer +#undef tSpinEnded +#undef tCurrentDir +#undef tSpinDelay +#undef tNumTurns +#undef tOriginalDir + static void Task_DoTeleportFieldEffect(u8 taskId); static void TeleportFieldEffectTask1(struct Task * task); static void TeleportFieldEffectTask2(struct Task * task); @@ -2530,9 +2623,9 @@ static void ShowMonEffect_Outdoors_2(struct Task * task) { u16 charbase = ((GetGpuReg(REG_OFFSET_BG0CNT) >> 2) << 14); u16 screenbase = ((GetGpuReg(REG_OFFSET_BG0CNT) >> 8) << 11); - CpuCopy16(sFieldMoveStreaksTiles, (void *)(VRAM + charbase), 0x200); + CpuCopy16(sFieldMoveStreaksOutdoors_Gfx, (void *)(VRAM + charbase), 0x200); CpuFill32(0, (void *)(VRAM + screenbase), 0x800); - LoadPalette(sFieldMoveStreaksPalette, 0xf0, 0x20); + LoadPalette(sFieldMoveStreaksOutdoors_Pal, 0xf0, 0x20); LoadFieldMoveStreaksTilemapToVram(screenbase); task->data[0]++; } @@ -2648,7 +2741,7 @@ static void LoadFieldMoveStreaksTilemapToVram(u16 screenbase) dest = (u16 *)(VRAM + (10 * 32) + screenbase); for (i = 0; i < (10 * 32); i++, dest++) { - *dest = sFieldMoveStreaksTilemap[i] | METATILE_ELEVATION_MASK; + *dest = sFieldMoveStreaksOutdoors_Tilemap[i] | METATILE_ELEVATION_MASK; } } @@ -2683,9 +2776,9 @@ static void ShowMonEffect_Indoors_2(struct Task * task) charbase = ((GetGpuReg(REG_OFFSET_BG0CNT) >> 2) << 14); screenbase = ((GetGpuReg(REG_OFFSET_BG0CNT) >> 8) << 11); task->data[12] = screenbase; - CpuCopy16(sDarknessFieldMoveStreaksTiles, (void *)(VRAM + charbase), 0x80); + CpuCopy16(sFieldMoveStreaksIndoors_Gfx, (void *)(VRAM + charbase), 0x80); CpuFill32(0, (void *)(VRAM + screenbase), 0x800); - LoadPalette(sDarknessFieldMoveStreaksPalette, 0xf0, 0x20); + LoadPalette(sFieldMoveStreaksIndoors_Pal, 0xf0, 0x20); task->data[0]++; } @@ -2783,10 +2876,10 @@ static bool8 SlideIndoorBannerOnscreen(struct Task * task) dest = (u16 *)(VRAM + 0x140 + (u16)task->data[12]); for (i = 0; i < 10; i++) { - dest[dstOffs + i * 32] = sDarknessFieldMoveStreaksTilemap[srcOffs + i * 32]; + dest[dstOffs + i * 32] = sFieldMoveStreaksIndoors_Tilemap[srcOffs + i * 32]; dest[dstOffs + i * 32] |= 0xf000; - dest[((dstOffs + 1) & 0x1f) + i * 32] = sDarknessFieldMoveStreaksTilemap[((srcOffs + 1) & 0x1f) + i * 32] | 0xf000; + dest[((dstOffs + 1) & 0x1f) + i * 32] = sFieldMoveStreaksIndoors_Tilemap[((srcOffs + 1) & 0x1f) + i * 32] | 0xf000; dest[((dstOffs + 1) & 0x1f) + i * 32] |= 0xf000; } task->data[4] += 2; @@ -3081,165 +3174,173 @@ static void SpriteCB_NPCFlyOut(struct Sprite * sprite) } } -static void Task_UseFly(u8 taskId); -static void UseFlyEffect_1(struct Task * task); -static void UseFlyEffect_2(struct Task * task); -static void UseFlyEffect_3(struct Task * task); -static void UseFlyEffect_4(struct Task * task); -static void UseFlyEffect_5(struct Task * task); -static void UseFlyEffect_6(struct Task * task); -static void UseFlyEffect_7(struct Task * task); -static void UseFlyEffect_8(struct Task * task); -static void UseFlyEffect_9(struct Task * task); +// Task data for Task_FlyOut / Task_FlyIn +#define tState data[0] +#define tMonPartyId data[1] +#define tBirdSpriteId data[1] // re-used +#define tTimer data[2] +#define tAvatarFlags data[15] + +static void Task_FlyOut(u8 taskId); +static void FlyOutFieldEffect_FieldMovePose(struct Task *task); +static void FlyOutFieldEffect_ShowMon(struct Task *task); +static void FlyOutFieldEffect_BirdLeaveBall(struct Task *task); +static void FlyOutFieldEffect_WaitBirdLeave(struct Task *task); +static void FlyOutFieldEffect_BirdSwoopDown(struct Task *task); +static void FlyOutFieldEffect_JumpOnBird(struct Task *task); +static void FlyOutFieldEffect_FlyOffWithBird(struct Task *task); +static void FlyOutFieldEffect_WaitFlyOff(struct Task *task); +static void FlyOutFieldEffect_End(struct Task *task); static u8 CreateFlyBirdSprite(void); static bool8 GetFlyBirdAnimCompleted(u8 flyBlobSpriteId); static void StartFlyBirdSwoopDown(u8 flyBlobSpriteId); static void SetFlyBirdPlayerSpriteId(u8 flyBlobSpriteId, u8 playerSpriteId); -static void SpriteCB_FlyBirdLeaveBall(struct Sprite * sprite); -static void SpriteCB_FlyBirdSwoopDown(struct Sprite * sprite); -static void sub_80877FC(struct Sprite * sprite, u8 affineAnimId); -static void sub_8087828(struct Sprite * sprite); +static void SpriteCB_FlyBirdLeaveBall(struct Sprite *sprite); +static void SpriteCB_FlyBirdSwoopDown(struct Sprite *sprite); +static void DoBirdSpriteWithPlayerAffineAnim(struct Sprite *sprite, u8 affineAnimId); +static void SpriteCB_FlyBirdWithPlayer(struct Sprite *sprite); -static void (*const sUseFlyEffectFuncs[])(struct Task * ) = { - UseFlyEffect_1, - UseFlyEffect_2, - UseFlyEffect_3, - UseFlyEffect_4, - UseFlyEffect_5, - UseFlyEffect_6, - UseFlyEffect_7, - UseFlyEffect_8, - UseFlyEffect_9 +static void (*const sFlyOutFieldEffectFuncs[])(struct Task *) = +{ + FlyOutFieldEffect_FieldMovePose, + FlyOutFieldEffect_ShowMon, + FlyOutFieldEffect_BirdLeaveBall, + FlyOutFieldEffect_WaitBirdLeave, + FlyOutFieldEffect_BirdSwoopDown, + FlyOutFieldEffect_JumpOnBird, + FlyOutFieldEffect_FlyOffWithBird, + FlyOutFieldEffect_WaitFlyOff, + FlyOutFieldEffect_End }; -u8 FldEff_UseFly(void) +u8 FldEff_FlyOut(void) { - u8 taskId = CreateTask(Task_UseFly, 0xfe); - gTasks[taskId].data[1] = gFieldEffectArguments[0]; + u8 taskId = CreateTask(Task_FlyOut, 0xFE); + gTasks[taskId].tMonPartyId = gFieldEffectArguments[0]; return 0; } -static void Task_UseFly(u8 taskId) +static void Task_FlyOut(u8 taskId) { - sUseFlyEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); + sFlyOutFieldEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]); } -static void UseFlyEffect_1(struct Task * task) +static void FlyOutFieldEffect_FieldMovePose(struct Task *task) { - struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) { - task->data[15] = gPlayerAvatar.flags; + task->tAvatarFlags = gPlayerAvatar.flags; gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); StartPlayerAvatarSummonMonForFieldMoveAnim(); ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); - task->data[0]++; + task->tState++; } } -static void UseFlyEffect_2(struct Task * task) +static void FlyOutFieldEffect_ShowMon(struct Task *task) { - struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { - task->data[0]++; - gFieldEffectArguments[0] = task->data[1]; + task->tState++; + gFieldEffectArguments[0] = task->tMonPartyId; FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT); } } -static void UseFlyEffect_3(struct Task * task) +static void FlyOutFieldEffect_BirdLeaveBall(struct Task *task) { if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) { - struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (task->data[15] & 0x08) + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING) { SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, 2); SetSurfBlob_DontSyncAnim(objectEvent->fieldEffectSpriteId, 0); } - task->data[1] = CreateFlyBirdSprite(); - task->data[0]++; + task->tBirdSpriteId = CreateFlyBirdSprite(); + task->tState++; } } -static void UseFlyEffect_4(struct Task * task) +static void FlyOutFieldEffect_WaitBirdLeave(struct Task *task) { - if (GetFlyBirdAnimCompleted(task->data[1])) + if (GetFlyBirdAnimCompleted(task->tBirdSpriteId)) { - task->data[0]++; - task->data[2] = 16; + task->tState++; + task->tTimer = 16; SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT); ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], MOVEMENT_ACTION_FACE_LEFT); } } -static void UseFlyEffect_5(struct Task * task) +static void FlyOutFieldEffect_BirdSwoopDown(struct Task *task) { - struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if ((task->data[2] == 0 || (--task->data[2]) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent)) + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((task->tTimer == 0 || (--task->tTimer) == 0) && ObjectEventClearHeldMovementIfFinished(objectEvent)) { - task->data[0]++; + task->tState++; PlaySE(SE_M_FLY); - StartFlyBirdSwoopDown(task->data[1]); + StartFlyBirdSwoopDown(task->tBirdSpriteId); } } -static void UseFlyEffect_6(struct Task * task) +static void FlyOutFieldEffect_JumpOnBird(struct Task *task) { - if ((++task->data[2]) >= 8) + if ((++task->tTimer) >= 8) { - struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE)); StartSpriteAnim(&gSprites[objectEvent->spriteId], ANIM_GET_ON_OFF_POKEMON_WEST); objectEvent->inanimate = TRUE; ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT); - task->data[0]++; - task->data[2] = 0; + task->tState++; + task->tTimer = 0; } } -static void UseFlyEffect_7(struct Task * task) +static void FlyOutFieldEffect_FlyOffWithBird(struct Task *task) { - if ((++task->data[2]) >= 10) + if ((++task->tTimer) >= 10) { - struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; ObjectEventClearHeldMovementIfActive(objectEvent); objectEvent->inanimate = FALSE; objectEvent->hasShadow = FALSE; - SetFlyBirdPlayerSpriteId(task->data[1], objectEvent->spriteId); - StartSpriteAnim(&gSprites[task->data[1]], gSaveBlock2Ptr->playerGender * 2 + 1); - sub_80877FC(&gSprites[task->data[1]], 0); - gSprites[task->data[1]].callback = sub_8087828; + SetFlyBirdPlayerSpriteId(task->tBirdSpriteId, objectEvent->spriteId); + StartSpriteAnim(&gSprites[task->tBirdSpriteId], gSaveBlock2Ptr->playerGender * 2 + 1); + DoBirdSpriteWithPlayerAffineAnim(&gSprites[task->tBirdSpriteId], 0); + gSprites[task->tBirdSpriteId].callback = SpriteCB_FlyBirdWithPlayer; CameraObjectReset2(); - task->data[0]++; + task->tState++; } } -static void UseFlyEffect_8(struct Task * task) +static void FlyOutFieldEffect_WaitFlyOff(struct Task *task) { - if (GetFlyBirdAnimCompleted(task->data[1])) + if (GetFlyBirdAnimCompleted(task->tBirdSpriteId)) { WarpFadeOutScreen(); - task->data[0]++; + task->tState++; } } -static void UseFlyEffect_9(struct Task * task) +static void FlyOutFieldEffect_End(struct Task *task) { if (!gPaletteFade.active) { - FieldEffectActiveListRemove(FLDEFF_USE_FLY); - DestroyTask(FindTaskIdByFunc(Task_UseFly)); + FieldEffectActiveListRemove(FLDEFF_FLY_OUT); + DestroyTask(FindTaskIdByFunc(Task_FlyOut)); } } static u8 CreateFlyBirdSprite(void) { u8 spriteId; - struct Sprite * sprite; - spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 0xff, 0xb4, 0x1); + struct Sprite *sprite; + spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 255, 180, 1); sprite = &gSprites[spriteId]; sprite->oam.paletteNum = 0; sprite->oam.priority = 1; @@ -3247,75 +3348,81 @@ static u8 CreateFlyBirdSprite(void) return spriteId; } -static u8 GetFlyBirdAnimCompleted(u8 spriteId) +// Sprite data for the bird sprite +#define sInitData data[0] +#define sPlayerSpriteId data[6] +#define sAnimCompleted data[7] + +static bool8 GetFlyBirdAnimCompleted(u8 spriteId) { - return gSprites[spriteId].data[7]; + return gSprites[spriteId].sAnimCompleted; } static void StartFlyBirdSwoopDown(u8 spriteId) { - struct Sprite * sprite; + struct Sprite *sprite; sprite = &gSprites[spriteId]; sprite->callback = SpriteCB_FlyBirdSwoopDown; - sprite->x = 0x78; - sprite->y = 0x00; + sprite->x = 120; + sprite->y = 0; sprite->x2 = 0; sprite->y2 = 0; memset(&sprite->data[0], 0, 8 * sizeof(u16) /* zero all data cells */); - sprite->data[6] = 0x40; + sprite->data[6] = MAX_SPRITES; } static void SetFlyBirdPlayerSpriteId(u8 flyBlobSpriteId, u8 playerSpriteId) { - gSprites[flyBlobSpriteId].data[6] = playerSpriteId; + gSprites[flyBlobSpriteId].sPlayerSpriteId = playerSpriteId; } -static const union AffineAnimCmd sUnknown_83CC19C[] = { - AFFINEANIMCMD_FRAME( 8, 8, 226, 0), +static const union AffineAnimCmd sAffineAnim_FlyBirdLeaveBall[] = +{ + AFFINEANIMCMD_FRAME( 8, 8, -30, 0), AFFINEANIMCMD_FRAME(28, 28, 0, 30), AFFINEANIMCMD_END }; -static const union AffineAnimCmd sUnknown_83CC1B4[] = { +static const union AffineAnimCmd sAffineAnim_FlyBirdReturnToBall[] = +{ AFFINEANIMCMD_FRAME(256, 256, 64, 0), AFFINEANIMCMD_FRAME(-10, -10, 0, 22), AFFINEANIMCMD_END }; -static const union AffineAnimCmd *const sUnknown_83CC1CC[] = { - sUnknown_83CC19C, - sUnknown_83CC1B4 +static const union AffineAnimCmd *const sAffineAnims_FlyBirdBall[] = +{ + sAffineAnim_FlyBirdLeaveBall, + sAffineAnim_FlyBirdReturnToBall }; -static void SpriteCB_FlyBirdLeaveBall(struct Sprite * sprite) +static void SpriteCB_FlyBirdLeaveBall(struct Sprite *sprite) { - if (sprite->data[7] == 0) + if (sprite->sAnimCompleted == FALSE) { - if (sprite->data[0] == 0) + if (sprite->sInitData == FALSE) { sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; - sprite->affineAnims = sUnknown_83CC1CC; + sprite->affineAnims = sAffineAnims_FlyBirdBall; InitSpriteAffineAnim(sprite); StartSpriteAffineAnim(sprite, 0); if (gSaveBlock2Ptr->playerGender == MALE) - sprite->x = 0x80; + sprite->x = 128; else - sprite->x = 0x76; - sprite->y = -0x30; - sprite->data[0]++; - sprite->data[1] = 0x40; - sprite->data[2] = 0x100; + sprite->x = 118; + sprite->y = -48; + sprite->sInitData++; + sprite->data[1] = 64; + sprite->data[2] = 256; } sprite->data[1] += (sprite->data[2] >> 8); - sprite->x2 = Cos(sprite->data[1], 0x78); - sprite->y2 = Sin(sprite->data[1], 0x78); - if (sprite->data[2] < 0x800) + sprite->x2 = Cos(sprite->data[1], 120); + sprite->y2 = Sin(sprite->data[1], 120); + if (sprite->data[2] < 2048) + sprite->data[2] += 96; + if (sprite->data[1] > 129) { - sprite->data[2] += 0x60; - } - if (sprite->data[1] > 0x81) - { - sprite->data[7]++; + sprite->sAnimCompleted++; sprite->oam.affineMode = ST_OAM_AFFINE_OFF; FreeOamMatrix(sprite->oam.matrixNum); CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, ST_OAM_AFFINE_OFF); @@ -3323,66 +3430,58 @@ static void SpriteCB_FlyBirdLeaveBall(struct Sprite * sprite) } } -static void SpriteCB_FlyBirdSwoopDown(struct Sprite * sprite) +static void SpriteCB_FlyBirdSwoopDown(struct Sprite *sprite) { - sprite->x2 = Cos(sprite->data[2], 0x8c); - sprite->y2 = Sin(sprite->data[2], 0x48); - sprite->data[2] = (sprite->data[2] + 4) & 0xff; - if (sprite->data[6] != MAX_SPRITES) + sprite->x2 = Cos(sprite->data[2], 140); + sprite->y2 = Sin(sprite->data[2], 72); + sprite->data[2] = (sprite->data[2] + 4) & 0xFF; + if (sprite->sPlayerSpriteId != MAX_SPRITES) { - struct Sprite * sprite1 = &gSprites[sprite->data[6]]; - sprite1->coordOffsetEnabled = FALSE; - sprite1->x = sprite->x + sprite->x2; - sprite1->y = sprite->y + sprite->y2 - 8; - sprite1->x2 = 0; - sprite1->y2 = 0; - } - if (sprite->data[2] >= 0x80) - { - sprite->data[7] = 1; + struct Sprite *playerSprite = &gSprites[sprite->sPlayerSpriteId]; + playerSprite->coordOffsetEnabled = FALSE; + playerSprite->x = sprite->x + sprite->x2; + playerSprite->y = sprite->y + sprite->y2 - 8; + playerSprite->x2 = 0; + playerSprite->y2 = 0; } + if (sprite->data[2] >= 128) + sprite->sAnimCompleted = TRUE; } -static void SpriteCB_FlyBirdReturnToBall(struct Sprite * sprite) +static void SpriteCB_FlyBirdReturnToBall(struct Sprite *sprite) { - if (sprite->data[7] == 0) + if (sprite->sAnimCompleted == FALSE) { - if (sprite->data[0] == 0) + if (sprite->sInitData == FALSE) { sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; - sprite->affineAnims = sUnknown_83CC1CC; + sprite->affineAnims = sAffineAnims_FlyBirdBall; InitSpriteAffineAnim(sprite); StartSpriteAffineAnim(sprite, 1); if (gSaveBlock2Ptr->playerGender == MALE) - sprite->x = 0x70; + sprite->x = 112; else - sprite->x = 0x64; - sprite->y = -0x20; - sprite->data[0]++; - sprite->data[1] = 0xf0; - sprite->data[2] = 0x800; - sprite->data[4] = 0x80; + sprite->x = 100; + sprite->y = -32; + sprite->sInitData++; + sprite->data[1] = 240; + sprite->data[2] = 2048; + sprite->data[4] = 128; } sprite->data[1] += sprite->data[2] >> 8; sprite->data[3] += sprite->data[2] >> 8; - sprite->data[1] &= 0xff; - sprite->x2 = Cos(sprite->data[1], 0x20); - sprite->y2 = Sin(sprite->data[1], 0x78); - if (sprite->data[2] > 0x100) - { + sprite->data[1] &= 0xFF; + sprite->x2 = Cos(sprite->data[1], 32); + sprite->y2 = Sin(sprite->data[1], 120); + if (sprite->data[2] > 256) sprite->data[2] -= sprite->data[4]; - } - if (sprite->data[4] < 0x100) - { + if (sprite->data[4] < 256) sprite->data[4] += 24; - } - if (sprite->data[2] < 0x100) - { - sprite->data[2] = 0x100; - } + if (sprite->data[2] < 256) + sprite->data[2] = 256; if (sprite->data[3] >= 60) { - sprite->data[7]++; + sprite->sAnimCompleted++; sprite->oam.affineMode = ST_OAM_AFFINE_OFF; FreeOamMatrix(sprite->oam.matrixNum); sprite->invisible = TRUE; @@ -3396,225 +3495,215 @@ static void StartFlyBirdReturnToBall(u8 spriteId) gSprites[spriteId].callback = SpriteCB_FlyBirdReturnToBall; } -static void Task_FldEffFlyIn(u8 taskId); -static void FlyInEffect_1(struct Task * task); -static void FlyInEffect_2(struct Task * task); -static void FlyInEffect_3(struct Task * task); -static void FlyInEffect_4(struct Task * task); -static void FlyInEffect_5(struct Task * task); -static void FlyInEffect_6(struct Task * task); -static void FlyInEffect_7(struct Task * task); -static void sub_80878C0(struct Sprite * sprite); +static void Task_FlyIn(u8 taskId); +static void FlyInFieldEffect_BirdSwoopDown(struct Task *task); +static void FlyInFieldEffect_FlyInWithBird(struct Task *task); +static void FlyInFieldEffect_JumpOffBird(struct Task *task); +static void FlyInFieldEffect_FieldMovePose(struct Task *task); +static void FlyInFieldEffect_BirdReturnToBall(struct Task *task); +static void FlyInFieldEffect_WaitBirdReturn(struct Task *task); +static void FlyInFieldEffect_End(struct Task *task); +static void TryChangeBirdSprite(struct Sprite *sprite); -static void (*const sFlyInEffectFuncs[])(struct Task * task) = { - FlyInEffect_1, - FlyInEffect_2, - FlyInEffect_3, - FlyInEffect_4, - FlyInEffect_5, - FlyInEffect_6, - FlyInEffect_7 +static void (*const sFlyInFieldEffectFuncs[])(struct Task *task) = +{ + FlyInFieldEffect_BirdSwoopDown, + FlyInFieldEffect_FlyInWithBird, + FlyInFieldEffect_JumpOffBird, + FlyInFieldEffect_FieldMovePose, + FlyInFieldEffect_BirdReturnToBall, + FlyInFieldEffect_WaitBirdReturn, + FlyInFieldEffect_End }; u32 FldEff_FlyIn(void) { - CreateTask(Task_FldEffFlyIn, 0xfe); + CreateTask(Task_FlyIn, 0xFE); return 0; } -static void Task_FldEffFlyIn(u8 taskId) +static void Task_FlyIn(u8 taskId) { - sFlyInEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); + sFlyInFieldEffectFuncs[gTasks[taskId].tState](&gTasks[taskId]); } -static void FlyInEffect_1(struct Task * task) +static void FlyInFieldEffect_BirdSwoopDown(struct Task *task) { - struct ObjectEvent * objectEvent; - objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent)) + struct ObjectEvent *playerObj; + playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; + if (!ObjectEventIsMovementOverridden(playerObj) || ObjectEventClearHeldMovementIfFinished(playerObj)) { - task->data[0]++; - task->data[2] = 33; - task->data[15] = gPlayerAvatar.flags; + task->tState++; + task->tTimer = 33; + task->tAvatarFlags = gPlayerAvatar.flags; gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); - if (task->data[15] & PLAYER_AVATAR_FLAG_SURFING) - { - SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, 0); - } - ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE)); + if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING) + SetSurfBlob_BobState(playerObj->fieldEffectSpriteId, 0); + ObjectEventSetGraphicsId(playerObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE)); CameraObjectReset2(); - ObjectEventTurn(objectEvent, DIR_WEST); - StartSpriteAnim(&gSprites[objectEvent->spriteId], ANIM_GET_ON_OFF_POKEMON_WEST); - objectEvent->invisible = FALSE; - task->data[1] = CreateFlyBirdSprite(); - StartFlyBirdSwoopDown(task->data[1]); - SetFlyBirdPlayerSpriteId(task->data[1], objectEvent->spriteId); - StartSpriteAnim(&gSprites[task->data[1]], gSaveBlock2Ptr->playerGender * 2 + 2); - sub_80877FC(&gSprites[task->data[1]], 1); - gSprites[task->data[1]].callback = sub_8087828; + ObjectEventTurn(playerObj, DIR_WEST); + StartSpriteAnim(&gSprites[playerObj->spriteId], ANIM_GET_ON_OFF_POKEMON_WEST); + playerObj->invisible = FALSE; + task->tBirdSpriteId = CreateFlyBirdSprite(); + StartFlyBirdSwoopDown(task->tBirdSpriteId); + SetFlyBirdPlayerSpriteId(task->tBirdSpriteId, playerObj->spriteId); + StartSpriteAnim(&gSprites[task->tBirdSpriteId], gSaveBlock2Ptr->playerGender * 2 + 2); + DoBirdSpriteWithPlayerAffineAnim(&gSprites[task->tBirdSpriteId], 1); + gSprites[task->tBirdSpriteId].callback = SpriteCB_FlyBirdWithPlayer; } } -static void FlyInEffect_2(struct Task * task) +static void FlyInFieldEffect_FlyInWithBird(struct Task *task) { - struct ObjectEvent * objectEvent; - struct Sprite * sprite; - sub_80878C0(&gSprites[task->data[1]]); - if (task->data[2] == 0 || (--task->data[2]) == 0) + struct ObjectEvent *playerObj; + struct Sprite *playerSprite; + TryChangeBirdSprite(&gSprites[task->tBirdSpriteId]); + if (task->tTimer == 0 || (--task->tTimer) == 0) { - objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - sprite = &gSprites[objectEvent->spriteId]; - SetFlyBirdPlayerSpriteId(task->data[1], 0x40); - sprite->x += sprite->x2; - sprite->y += sprite->y2; - sprite->x2 = 0; - sprite->y2 = 0; - task->data[0]++; - task->data[2] = 0; + playerObj= &gObjectEvents[gPlayerAvatar.objectEventId]; + playerSprite = &gSprites[playerObj->spriteId]; + SetFlyBirdPlayerSpriteId(task->tBirdSpriteId, MAX_SPRITES); + playerSprite->x += playerSprite->x2; + playerSprite->y += playerSprite->y2; + playerSprite->x2 = 0; + playerSprite->y2 = 0; + task->tState++; + task->tTimer = 0; } } -static void FlyInEffect_3(struct Task * task) +static void FlyInFieldEffect_JumpOffBird(struct Task *task) { - s16 gUnknown_83CC1F0[18] = { - -2, - -4, - -5, - -6, - -7, - -8, - -8, - -8, - -7, - -7, - -6, - -5, - -3, - -2, - 0, - 2, - 4, - 8 - }; - struct Sprite * sprite = &gSprites[gPlayerAvatar.spriteId]; - sprite->y2 = gUnknown_83CC1F0[task->data[2]]; - if ((++task->data[2]) >= 18) - { - task->data[0]++; - } + s16 yOffsets[18] = {-2, -4, -5, -6, -7, -8, -8, -8, -7, -7, -6, -5, -3, -2, 0, 2, 4, 8}; + struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; + sprite->y2 = yOffsets[task->tTimer]; + if ((++task->tTimer) >= 18) + task->tState++; } -static void FlyInEffect_4(struct Task * task) +static void FlyInFieldEffect_FieldMovePose(struct Task *task) { - struct ObjectEvent * objectEvent; - struct Sprite * sprite; - if (GetFlyBirdAnimCompleted(task->data[1])) + struct ObjectEvent *playerObj; + struct Sprite *playerSprite; + if (GetFlyBirdAnimCompleted(task->tBirdSpriteId)) { - objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - sprite = &gSprites[objectEvent->spriteId]; - objectEvent->inanimate = FALSE; - MoveObjectEventToMapCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y); - sprite->x2 = 0; - sprite->y2 = 0; - sprite->coordOffsetEnabled = TRUE; + playerObj= &gObjectEvents[gPlayerAvatar.objectEventId]; + playerSprite = &gSprites[playerObj->spriteId]; + playerObj->inanimate = FALSE; + MoveObjectEventToMapCoords(playerObj, playerObj->currentCoords.x, playerObj->currentCoords.y); + playerSprite->x2 = 0; + playerSprite->y2 = 0; + playerSprite->coordOffsetEnabled = TRUE; StartPlayerAvatarSummonMonForFieldMoveAnim(); - ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); - task->data[0]++; + ObjectEventSetHeldMovement(playerObj, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION); + task->tState++; } } -static void FlyInEffect_5(struct Task * task) +static void FlyInFieldEffect_BirdReturnToBall(struct Task *task) { if (ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gPlayerAvatar.objectEventId])) { - task->data[0]++; - StartFlyBirdReturnToBall(task->data[1]); + task->tState++; + StartFlyBirdReturnToBall(task->tBirdSpriteId); } } -static void FlyInEffect_6(struct Task * task) +static void FlyInFieldEffect_WaitBirdReturn(struct Task *task) { - if (GetFlyBirdAnimCompleted(task->data[1])) + if (GetFlyBirdAnimCompleted(task->tBirdSpriteId)) { - DestroySprite(&gSprites[task->data[1]]); - task->data[0]++; - task->data[1] = 0x10; + DestroySprite(&gSprites[task->tBirdSpriteId]); + task->tState++; + task->data[1] = 16; } } -static void FlyInEffect_7(struct Task * task) +static void FlyInFieldEffect_End(struct Task *task) { + struct ObjectEvent *playerObj; u8 state; - struct ObjectEvent * objectEvent; if ((--task->data[1]) == 0) { - objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; state = PLAYER_AVATAR_GFX_NORMAL; - if (task->data[15] & PLAYER_AVATAR_FLAG_SURFING) + if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING) { state = PLAYER_AVATAR_GFX_RIDE; - SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, 1); + SetSurfBlob_BobState(playerObj->fieldEffectSpriteId, 1); } - ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(state)); - ObjectEventTurn(objectEvent, DIR_SOUTH); - gPlayerAvatar.flags = task->data[15]; + ObjectEventSetGraphicsId(playerObj, GetPlayerAvatarGraphicsIdByStateId(state)); + ObjectEventTurn(playerObj, DIR_SOUTH); + gPlayerAvatar.flags = task->tAvatarFlags; gPlayerAvatar.preventStep = FALSE; FieldEffectActiveListRemove(FLDEFF_FLY_IN); - DestroyTask(FindTaskIdByFunc(Task_FldEffFlyIn)); + DestroyTask(FindTaskIdByFunc(Task_FlyIn)); } } -static const union AffineAnimCmd sUnknown_83CC214[] = { +#undef tState +#undef tMonPartyId +#undef tBirdSpriteId +#undef tTimer +#undef tAvatarFlags + +static const union AffineAnimCmd sAffineAnim_FlyBirdOutOfMap[] = +{ AFFINEANIMCMD_FRAME(24, 24, 0, 1), AFFINEANIMCMD_JUMP(0) }; -static const union AffineAnimCmd sUnknown_83CC224[] = { +static const union AffineAnimCmd sAffineAnim_FlyBirdIntoMap[] = +{ AFFINEANIMCMD_FRAME(512, 512, 0, 1), AFFINEANIMCMD_FRAME(-16, -16, 0, 1), AFFINEANIMCMD_JUMP(1) }; -static const union AffineAnimCmd *const sUnknown_83CC23C[] = { - sUnknown_83CC214, - sUnknown_83CC224 +static const union AffineAnimCmd *const sAffineAnims_FlyBirdWithPlayer[] = +{ + sAffineAnim_FlyBirdOutOfMap, + sAffineAnim_FlyBirdIntoMap }; -static void sub_80877FC(struct Sprite * sprite, u8 affineAnimId) +static void DoBirdSpriteWithPlayerAffineAnim(struct Sprite *sprite, u8 affineAnimId) { sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE; - sprite->affineAnims = sUnknown_83CC23C; + sprite->affineAnims = sAffineAnims_FlyBirdWithPlayer; InitSpriteAffineAnim(sprite); StartSpriteAffineAnim(sprite, affineAnimId); } -static void sub_8087828(struct Sprite * sprite) +static void SpriteCB_FlyBirdWithPlayer(struct Sprite *sprite) { - struct Sprite * sprite2; - sprite->x2 = Cos(sprite->data[2], 0xB4); - sprite->y2 = Sin(sprite->data[2], 0x48); - sprite->data[2] += 2; - sprite->data[2] &= 0xFF; - if (sprite->data[6] != MAX_SPRITES) + sprite->x2 = Cos(sprite->data[2], 180); + sprite->y2 = Sin(sprite->data[2], 72); + sprite->data[2] = (sprite->data[2] + 2) & 0xFF; + if (sprite->sPlayerSpriteId != MAX_SPRITES) { - sprite2 = &gSprites[sprite->data[6]]; - sprite2->coordOffsetEnabled = FALSE; - sprite2->x = sprite->x + sprite->x2; - sprite2->y = sprite->y + sprite->y2 - 8; - sprite2->x2 = 0; - sprite2->y2 = 0; + struct Sprite *playerSprite; + playerSprite = &gSprites[sprite->sPlayerSpriteId]; + playerSprite->coordOffsetEnabled = FALSE; + playerSprite->x = sprite->x + sprite->x2; + playerSprite->y = sprite->y + sprite->y2 - 8; + playerSprite->x2 = 0; + playerSprite->y2 = 0; } - if (sprite->data[2] >= 0x80) + if (sprite->data[2] >= 128) { - sprite->data[7] = 1; + sprite->sAnimCompleted = TRUE; sprite->oam.affineMode = ST_OAM_AFFINE_OFF; FreeOamMatrix(sprite->oam.matrixNum); CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, ST_OAM_AFFINE_OFF); } } -static void sub_80878C0(struct Sprite * sprite) +#undef sInitData +#undef sPlayerSpriteId +#undef sAnimCompleted + +static void TryChangeBirdSprite(struct Sprite *sprite) { if (sprite->oam.affineMode != ST_OAM_AFFINE_OFF) { @@ -3698,79 +3787,102 @@ static void Task_MoveDeoxysRock_Step(u8 taskId) static void Task_DestroyDeoxysRock(u8 taskId); static void DestroyDeoxysRockEffect_CameraShake(s16 *data, u8 taskId); static void DestroyDeoxysRockEffect_RockFragments(s16 *data, u8 taskId); -static void Unk44Effect_2(s16 *data, u8 taskId); -static void CreateDeoxysRockFragments(struct Sprite * sprite); -static void SpriteCB_FldEffUnk44(struct Sprite * sprite); +static void DestroyDeoxysRockEffect_WaitAndEnd(s16 *data, u8 taskId); +static void CreateDeoxysRockFragments(struct Sprite *sprite); +static void SpriteCB_DeoxysRockFragment(struct Sprite *sprite); -static void (*const sUnk44EffectFuncs[])(s16 *data, u8 taskId) = { +static void (*const sDestroyDeoxysRockEffectFuncs[])(s16 *data, u8 taskId) = +{ DestroyDeoxysRockEffect_CameraShake, DestroyDeoxysRockEffect_RockFragments, - Unk44Effect_2 + DestroyDeoxysRockEffect_WaitAndEnd }; -static const struct SpriteFrameImage sImages_FldEffUnk44[] = { - {sFldEffUnk44_Tiles + 0x00, 0x20}, - {sFldEffUnk44_Tiles + 0x10, 0x20}, - {sFldEffUnk44_Tiles + 0x20, 0x20}, - {sFldEffUnk44_Tiles + 0x30, 0x20} +static const struct SpriteFrameImage sImages_DeoxysRockFragment[] = +{ + {sRockFragment_TopLeft, 0x20}, + {sRockFragment_TopRight, 0x20}, + {sRockFragment_BottomLeft, 0x20}, + {sRockFragment_BottomRight, 0x20} }; -static const union AnimCmd sAnimCmd_FldEffUnk44_0[] = { +static const union AnimCmd sAnim_RockFragment_TopLeft[] = +{ ANIMCMD_FRAME(0, 0), ANIMCMD_END }; -static const union AnimCmd sAnimCmd_FldEffUnk44_1[] = { +static const union AnimCmd sAnim_RockFragment_TopRight[] = +{ ANIMCMD_FRAME(1, 0), ANIMCMD_END }; -static const union AnimCmd sAnimCmd_FldEffUnk44_2[] = { +static const union AnimCmd sAnim_RockFragment_BottomLeft[] = +{ ANIMCMD_FRAME(2, 0), ANIMCMD_END }; -static const union AnimCmd sAnimCmd_FldEffUnk44_3[] = { +static const union AnimCmd sAnim_RockFragment_BottomRight[] = +{ ANIMCMD_FRAME(3, 0), ANIMCMD_END }; -static const union AnimCmd *const sAnimCmdTable_FldEffUnk44[] = { - sAnimCmd_FldEffUnk44_0, - sAnimCmd_FldEffUnk44_1, - sAnimCmd_FldEffUnk44_2, - sAnimCmd_FldEffUnk44_3 +static const union AnimCmd *const sAnims_DeoxysRockFragment[] = +{ + sAnim_RockFragment_TopLeft, + sAnim_RockFragment_TopRight, + sAnim_RockFragment_BottomLeft, + sAnim_RockFragment_BottomRight }; -static const struct SpriteTemplate sUnknown_83CC2A0 = { +static const struct SpriteTemplate sSpriteTemplate_DeoxysRockFragment = +{ .tileTag = SPRITE_INVALID_TAG, .paletteTag = 4371, .oam = &sOamData_8x8, - .anims = sAnimCmdTable_FldEffUnk44, - .images = sImages_FldEffUnk44, + .anims = sAnims_DeoxysRockFragment, + .images = sImages_DeoxysRockFragment, .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_FldEffUnk44 + .callback = SpriteCB_DeoxysRockFragment }; -u32 FldEff_Unk44(void) +// Task data for Task_DestroyDeoxysRock +#define tState data[1] +#define tObjectEventId data[2] +#define tTimer data[3] +#define tCameraTaskId data[5] +#define tLocalId data[6] +#define tMapNum data[7] +#define tMapGroup data[8] + +u32 FldEff_DestroyDeoxysRock(void) { u8 taskId; - u8 objectEventIdBuffer; - if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer)) + u8 objectEventId; + if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventId)) { - taskId = CreateTask(Task_DestroyDeoxysRock, 0x50); - gTasks[taskId].data[2] = objectEventIdBuffer; - gTasks[taskId].data[6] = gFieldEffectArguments[0]; - gTasks[taskId].data[7] = gFieldEffectArguments[1]; - gTasks[taskId].data[8] = gFieldEffectArguments[2]; + taskId = CreateTask(Task_DestroyDeoxysRock, 80); + gTasks[taskId].data[2] = objectEventId; + gTasks[taskId].tLocalId = gFieldEffectArguments[0]; + gTasks[taskId].tMapNum = gFieldEffectArguments[1]; + gTasks[taskId].tMapGroup = gFieldEffectArguments[2]; } else - { FieldEffectActiveListRemove(FLDEFF_DESTROY_DEOXYS_ROCK); - } + return FALSE; } +// Task data for Task_DeoxysRockCameraShake +#define tShakeDelay data[0] +#define tShakeUp data[1] +#define tShake data[5] +#define tEndDelay data[6] +#define tEnding data[7] + static void Task_DeoxysRockCameraShake(u8 taskId) { s16 *data = gTasks[taskId].data; @@ -3784,21 +3896,15 @@ static void Task_DeoxysRockCameraShake(u8 taskId) } } else - { data[5] = 4; - } if (++data[0] > 1) { data[0] = 0; if (++data[1] & 1) - { SetCameraPanning(0, -data[5]); - } else - { SetCameraPanning(0, data[5]); - } } UpdateCameraPanning(); if (data[5] == 0) @@ -3810,50 +3916,64 @@ static void StartEndingDeoxysRockCameraShake(u8 taskId) gTasks[taskId].data[7] = 1; } +#undef tShakeDelay +#undef tShakeUp +#undef tShake +#undef tEndDelay +#undef tEnding + static void Task_DestroyDeoxysRock(u8 taskId) { s16 *data = gTasks[taskId].data; InstallCameraPanAheadCallback(); SetCameraPanningCallback(NULL); - sUnk44EffectFuncs[data[1]](data, taskId); + sDestroyDeoxysRockEffectFuncs[tState](data, taskId); } static void DestroyDeoxysRockEffect_CameraShake(s16 *data, u8 taskId) { u8 newTaskId = CreateTask(Task_DeoxysRockCameraShake, 90); PlaySE(SE_THUNDER2); - data[5] = newTaskId; - data[1]++; + tCameraTaskId = newTaskId; + tState++; } static void DestroyDeoxysRockEffect_RockFragments(s16 *data, u8 taskId) { - if (++data[3] > 0x78) + if (++tTimer > 120) { - struct Sprite * sprite = &gSprites[gObjectEvents[data[2]].spriteId]; - gObjectEvents[data[2]].invisible = TRUE; - BlendPalettes(0x0000FFFF, 0x10, RGB_WHITE); - BeginNormalPaletteFade(0x0000FFFF, 0, 0x10, 0, RGB_WHITE); + struct Sprite *sprite = &gSprites[gObjectEvents[tObjectEventId].spriteId]; + gObjectEvents[tObjectEventId].invisible = TRUE; + BlendPalettes(PALETTES_BG, 0x10, RGB_WHITE); + BeginNormalPaletteFade(PALETTES_BG, 0, 0x10, 0, RGB_WHITE); CreateDeoxysRockFragments(sprite); PlaySE(SE_THUNDER); - StartEndingDeoxysRockCameraShake(data[5]); - data[3] = 0; - data[1]++; + StartEndingDeoxysRockCameraShake(tCameraTaskId); + tTimer = 0; + tState++; } } -static void Unk44Effect_2(s16 *data, u8 taskId) +static void DestroyDeoxysRockEffect_WaitAndEnd(s16 *data, u8 taskId) { if (!gPaletteFade.active && !FuncIsActiveTask(Task_DeoxysRockCameraShake)) { InstallCameraPanAheadCallback(); - RemoveObjectEventByLocalIdAndMap(data[6], data[7], data[8]); + RemoveObjectEventByLocalIdAndMap(tLocalId, tMapNum, tMapGroup); FieldEffectActiveListRemove(FLDEFF_DESTROY_DEOXYS_ROCK); DestroyTask(taskId); } } -static void CreateDeoxysRockFragments(struct Sprite* sprite) +#undef tState +#undef tObjectEventId +#undef tTimer +#undef tCameraTaskId +#undef tLocalId +#undef tMapNum +#undef tMapGroup + +static void CreateDeoxysRockFragments(struct Sprite *sprite) { int i; int xPos = (s16)gTotalCameraPixelOffsetX + sprite->x + sprite->x2; @@ -3861,7 +3981,7 @@ static void CreateDeoxysRockFragments(struct Sprite* sprite) for (i = 0; i < 4; i++) { - u8 spriteId = CreateSprite(&sUnknown_83CC2A0, xPos, yPos, 0); + u8 spriteId = CreateSprite(&sSpriteTemplate_DeoxysRockFragment, xPos, yPos, 0); if (spriteId != MAX_SPRITES) { StartSpriteAnim(&gSprites[spriteId], i); @@ -3871,7 +3991,7 @@ static void CreateDeoxysRockFragments(struct Sprite* sprite) } } -static void SpriteCB_FldEffUnk44(struct Sprite* sprite) +static void SpriteCB_DeoxysRockFragment(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -3892,23 +4012,23 @@ static void SpriteCB_FldEffUnk44(struct Sprite* sprite) sprite->y += 12; break; } - if (sprite->x < -4 || sprite->x > 0xF4 || sprite->y < -4 || sprite->y > 0xA4) + if (sprite->x < -4 || sprite->x > 244 || sprite->y < -4 || sprite->y > 164) DestroySprite(sprite); } -static void Task_FldEffUnk45(u8 taskId) +static void Task_PhotoFlash(u8 taskId) { if (!gPaletteFade.active) { - FieldEffectActiveListRemove(FLDEFF_UNK_45); + FieldEffectActiveListRemove(FLDEFF_PHOTO_FLASH); DestroyTask(taskId); } } // Bug: Return value should be u32, not void -void FldEff_Unk45(void) +void FldEff_PhotoFlash(void) { - BlendPalettes(0xFFFFFFFF, 0x10, RGB_WHITE); - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x0F, 0x00, RGB_WHITE); - CreateTask(Task_FldEffUnk45, 90); + BlendPalettes(PALETTES_ALL, 0x10, RGB_WHITE); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0x0F, 0x00, RGB_WHITE); + CreateTask(Task_PhotoFlash, 90); } From 0feb0e47c922694b2de2f49dfb52db4cb1eee651 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Wed, 13 Jul 2022 06:09:56 +0800 Subject: [PATCH 26/64] Use constants and fix rock fragments' palettes --- .../pics/deoxys_rock_fragment_bottom_left.png | Bin 201 -> 201 bytes .../pics/deoxys_rock_fragment_bottom_right.png | Bin 193 -> 193 bytes .../pics/deoxys_rock_fragment_top_left.png | Bin 201 -> 201 bytes .../pics/deoxys_rock_fragment_top_right.png | Bin 202 -> 202 bytes src/field_effect.c | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png index d5e36b8d65bc54e2ef58acda9e78e898e5a6882d..ed67e8cf9a9d1009750b17d36d4896cf55ff4ff5 100644 GIT binary patch delta 55 zcmX@fc#?5~jqX_mh5tc8|If~`Hj5&nGpaSh7rvG delta 55 zcmX@ec#v^|jjn=%LQqgpcXzk)!Hd@!7#J8!g8YIR9G=}s19I3)Jbhi+pRscZ$tVcF KPdP9#GXenkBN68S diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png index cca7ea336dbf13470ded4935e8e36d1d03fe8356..af1db7882753008485660c8a301ae412ebdf217e 100644 GIT binary patch delta 55 zcmX@fc#?5~jqX_mh5tc8|If~`Hjy += 12; break; } - if (sprite->x < -4 || sprite->x > 244 || sprite->y < -4 || sprite->y > 164) + if (sprite->x < -4 || sprite->x > DISPLAY_WIDTH + 4 || sprite->y < -4 || sprite->y > DISPLAY_HEIGHT + 4) DestroySprite(sprite); } From da47b35d81a0a6e3738e2ede9328117111e71a4e Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Wed, 13 Jul 2022 16:35:10 +0800 Subject: [PATCH 27/64] Add field effect constants as comments --- data/field_effect_scripts.s | 140 ++++++++++++++++++------------------ 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index aa08512ef..f963d45b7 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -2,76 +2,76 @@ .section script_data, "aw", %progbits .align 2 gFieldEffectScriptPointers:: - .4byte gFldEffScript_ExclamationMarkIcon - .4byte gFldEffScript_UseCutOnGrass - .4byte gFldEffScript_UseCutOnTree - .4byte gFldEffScript_Shadow - .4byte gFldEffScript_TallGrass - .4byte gFldEffScript_Ripple - .4byte gFldEffScript_FieldMoveShowMon - .4byte gFldEffScript_Ash - .4byte gFldEffScript_SurfBlob - .4byte gFldEffScript_UseSurf - .4byte gFldEffScript_Dust - .4byte gFldEffScript_UseSecretPowerCave - .4byte gFldEffScript_JumpTallGrass - .4byte gFldEffScript_SandFootprints - .4byte gFldEffScript_JumpBigSplash - .4byte gFldEffScript_Splash - .4byte gFldEffScript_JumpSmallSplash - .4byte gFldEffScript_LongGrass - .4byte gFldEffScript_JumpLongGrass - .4byte gFldEffScript_Unknown19 - .4byte gFldEffScript_Unknown20 - .4byte gFldEffScript_Unknown21 - .4byte gFldEffScript_Unknown22 - .4byte gFldEffScript_BerryTreeGrowthSparkle - .4byte gFldEffScript_DeepSandFootprints - .4byte gFldEffScript_PokecenterHeal - .4byte gFldEffScript_UseSecretPowerTree - .4byte gFldEffScript_UseSecretPowerShrub - .4byte gFldEffScript_TreeDisguise - .4byte gFldEffScript_MountainDisguise - .4byte gFldEffScript_NpcflyOut - .4byte gFldEffScript_FlyOut - .4byte gFldEffScript_FlyIn - .4byte gFldEffScript_QuestionMarkIcon - .4byte gFldEffScript_FeetInFlowingWater - .4byte gFldEffScript_BikeTireTracks - .4byte gFldEffScript_SandDisguise - .4byte gFldEffScript_UseRockSmash - .4byte gFldEffScript_UseDig - .4byte gFldEffScript_SandPile - .4byte gFldEffScript_UseStrength - .4byte gFldEffScript_ShortGrass - .4byte gFldEffScript_HotSpringsWater - .4byte gFldEffScript_UseWaterfall - .4byte gFldEffScript_UseDive - .4byte gFldEffScript_Pokeball - .4byte gFldEffScript_HeartIcon - .4byte gFldEffScript_Nop47 - .4byte gFldEffScript_Nop48 - .4byte gFldEffScript_PopOutOfAsh - .4byte gFldEffScript_LavaridgeGymWarp - .4byte gFldEffScript_SweetScent - .4byte gFldEffScript_SandPillar - .4byte gFldEffScript_Bubbles - .4byte gFldEffScript_Sparkle - .4byte gFldEffScript_SecretPowerCave - .4byte gFldEffScript_SecretPowerTree - .4byte gFldEffScript_SecretPowerShrub - .4byte gFldEffScript_CutGrass - .4byte gFldEffScript_FieldMoveShowMonInit - .4byte gFldEffScript_UseFlyAncientTomb - .4byte gFldEffScript_PcturnOn - .4byte gFldEffScript_HallOfFameRecord - .4byte gFldEffScript_UseTeleport - .4byte gFldEffScript_SmileyFaceIcon - .4byte gFldEffScript_UseVsSeeker - .4byte gFldEffScript_DoubleExclMarkIcon - .4byte gFldEffScript_MoveDeoxysRock - .4byte gFldEffScript_DestroyDeoxysRock - .4byte gFldEffScript_PhotoFlash + .4byte gFldEffScript_ExclamationMarkIcon @ FLDEFF_EXCLAMATION_MARK_ICON + .4byte gFldEffScript_UseCutOnGrass @ FLDEFF_USE_CUT_ON_GRASS + .4byte gFldEffScript_UseCutOnTree @ FLDEFF_USE_CUT_ON_TREE + .4byte gFldEffScript_Shadow @ FLDEFF_SHADOW + .4byte gFldEffScript_TallGrass @ FLDEFF_TALL_GRASS + .4byte gFldEffScript_Ripple @ FLDEFF_RIPPLE + .4byte gFldEffScript_FieldMoveShowMon @ FLDEFF_FIELD_MOVE_SHOW_MON + .4byte gFldEffScript_Ash @ FLDEFF_ASH + .4byte gFldEffScript_SurfBlob @ FLDEFF_SURF_BLOB + .4byte gFldEffScript_UseSurf @ FLDEFF_USE_SURF + .4byte gFldEffScript_Dust @ FLDEFF_DUST + .4byte gFldEffScript_UseSecretPowerCave @ FLDEFF_USE_SECRET_POWER_CAVE + .4byte gFldEffScript_JumpTallGrass @ FLDEFF_JUMP_TALL_GRASS + .4byte gFldEffScript_SandFootprints @ FLDEFF_SAND_FOOTPRINTS + .4byte gFldEffScript_JumpBigSplash @ FLDEFF_JUMP_BIG_SPLASH + .4byte gFldEffScript_Splash @ FLDEFF_SPLASH + .4byte gFldEffScript_JumpSmallSplash @ FLDEFF_JUMP_SMALL_SPLASH + .4byte gFldEffScript_LongGrass @ FLDEFF_LONG_GRASS + .4byte gFldEffScript_JumpLongGrass @ FLDEFF_JUMP_LONG_GRASS + .4byte gFldEffScript_Unknown19 @ FLDEFF_UNKNOWN_19 + .4byte gFldEffScript_Unknown20 @ FLDEFF_UNKNOWN_20 + .4byte gFldEffScript_Unknown21 @ FLDEFF_UNKNOWN_21 + .4byte gFldEffScript_Unknown22 @ FLDEFF_UNKNOWN_22 + .4byte gFldEffScript_BerryTreeGrowthSparkle @ FLDEFF_BERRY_TREE_GROWTH_SPARKLE + .4byte gFldEffScript_DeepSandFootprints @ FLDEFF_DEEP_SAND_FOOTPRINTS + .4byte gFldEffScript_PokecenterHeal @ FLDEFF_POKECENTER_HEAL + .4byte gFldEffScript_UseSecretPowerTree @ FLDEFF_USE_SECRET_POWER_TREE + .4byte gFldEffScript_UseSecretPowerShrub @ FLDEFF_USE_SECRET_POWER_SHRUB + .4byte gFldEffScript_TreeDisguise @ FLDEFF_TREE_DISGUISE + .4byte gFldEffScript_MountainDisguise @ FLDEFF_MOUNTAIN_DISGUISE + .4byte gFldEffScript_NpcflyOut @ FLDEFF_NPCFLY_OUT + .4byte gFldEffScript_FlyOut @ FLDEFF_FLY_OUT + .4byte gFldEffScript_FlyIn @ FLDEFF_FLY_IN + .4byte gFldEffScript_QuestionMarkIcon @ FLDEFF_QUESTION_MARK_ICON + .4byte gFldEffScript_FeetInFlowingWater @ FLDEFF_FEET_IN_FLOWING_WATER + .4byte gFldEffScript_BikeTireTracks @ FLDEFF_BIKE_TIRE_TRACKS + .4byte gFldEffScript_SandDisguise @ FLDEFF_SAND_DISGUISE + .4byte gFldEffScript_UseRockSmash @ FLDEFF_USE_ROCK_SMASH + .4byte gFldEffScript_UseDig @ FLDEFF_USE_DIG + .4byte gFldEffScript_SandPile @ FLDEFF_SAND_PILE + .4byte gFldEffScript_UseStrength @ FLDEFF_USE_STRENGTH + .4byte gFldEffScript_ShortGrass @ FLDEFF_SHORT_GRASS + .4byte gFldEffScript_HotSpringsWater @ FLDEFF_HOT_SPRINGS_WATER + .4byte gFldEffScript_UseWaterfall @ FLDEFF_USE_WATERFALL + .4byte gFldEffScript_UseDive @ FLDEFF_USE_DIVE + .4byte gFldEffScript_Pokeball @ FLDEFF_POKEBALL + .4byte gFldEffScript_HeartIcon @ FLDEFF_X_ICON + .4byte gFldEffScript_Nop47 @ FLDEFF_NOP_47 + .4byte gFldEffScript_Nop48 @ FLDEFF_NOP_48 + .4byte gFldEffScript_PopOutOfAsh @ FLDEFF_POP_OUT_OF_ASH + .4byte gFldEffScript_LavaridgeGymWarp @ FLDEFF_LAVARIDGE_GYM_WARP + .4byte gFldEffScript_SweetScent @ FLDEFF_SWEET_SCENT + .4byte gFldEffScript_SandPillar @ FLDEFF_SAND_PILLAR + .4byte gFldEffScript_Bubbles @ FLDEFF_BUBBLES + .4byte gFldEffScript_Sparkle @ FLDEFF_SPARKLE + .4byte gFldEffScript_SecretPowerCave @ FLDEFF_SECRET_POWER_CAVE + .4byte gFldEffScript_SecretPowerTree @ FLDEFF_SECRET_POWER_TREE + .4byte gFldEffScript_SecretPowerShrub @ FLDEFF_SECRET_POWER_SHRUB + .4byte gFldEffScript_CutGrass @ FLDEFF_CUT_GRASS + .4byte gFldEffScript_FieldMoveShowMonInit @ FLDEFF_FIELD_MOVE_SHOW_MON_INIT + .4byte gFldEffScript_UseFlyAncientTomb @ FLDEFF_USE_FLY_ANCIENT_TOMB + .4byte gFldEffScript_PcturnOn @ FLDEFF_PCTURN_ON + .4byte gFldEffScript_HallOfFameRecord @ FLDEFF_HALL_OF_FAME_RECORD + .4byte gFldEffScript_UseTeleport @ FLDEFF_USE_TELEPORT + .4byte gFldEffScript_SmileyFaceIcon @ FLDEFF_SMILEY_FACE_ICON + .4byte gFldEffScript_UseVsSeeker @ FLDEFF_USE_VS_SEEKER + .4byte gFldEffScript_DoubleExclMarkIcon @ FLDEFF_DOUBLE_EXCL_MARK_ICON + .4byte gFldEffScript_MoveDeoxysRock @ FLDEFF_MOVE_DEOXYS_ROCK + .4byte gFldEffScript_DestroyDeoxysRock @ FLDEFF_DESTROY_DEOXYS_ROCK + .4byte gFldEffScript_PhotoFlash @ FLDEFF_PHOTO_FLASH gFldEffScript_ExclamationMarkIcon:: callnative FldEff_ExclamationMarkIcon1 From d6cb94895f8f14e7e6e8b9d34a3550759dce0b14 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Sun, 17 Jul 2022 04:07:09 +0800 Subject: [PATCH 28/64] Document src/overworld.c --- include/overworld.h | 32 +-- src/cable_club.c | 8 +- src/field_effect.c | 3 +- src/field_fadetransition.c | 4 +- src/item_use.c | 2 +- src/main_menu.c | 4 +- src/overworld.c | 467 ++++++++++++++++++------------------- src/region_map.c | 4 +- 8 files changed, 253 insertions(+), 271 deletions(-) diff --git a/include/overworld.h b/include/overworld.h index c61099174..90db48772 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -10,29 +10,23 @@ #define LINK_KEY_CODE_DPAD_UP 0x13 #define LINK_KEY_CODE_DPAD_LEFT 0x14 #define LINK_KEY_CODE_DPAD_RIGHT 0x15 -#define LINK_KEY_CODE_UNK_2 0x16 +#define LINK_KEY_CODE_READY 0x16 #define LINK_KEY_CODE_EXIT_ROOM 0x17 #define LINK_KEY_CODE_START_BUTTON 0x18 #define LINK_KEY_CODE_A_BUTTON 0x19 -#define LINK_KEY_CODE_UNK_4 0x1A // I'd guess this is the B button? +#define LINK_KEY_CODE_IDLE 0x1A // These two are a hack to stop user input until link stuff can be // resolved. #define LINK_KEY_CODE_HANDLE_RECV_QUEUE 0x1B #define LINK_KEY_CODE_HANDLE_SEND_QUEUE 0x1C -#define LINK_KEY_CODE_UNK_7 0x1D -#define LINK_KEY_CODE_UNK_8 0x1E + +#define LINK_KEY_CODE_EXIT_SEAT 0x1D #define MOVEMENT_MODE_FREE 0 #define MOVEMENT_MODE_FROZEN 1 #define MOVEMENT_MODE_SCRIPTED 2 -struct UnkPlayerStruct -{ - u8 player_field_0; - u8 player_field_1; -}; - struct LinkPlayerObjectEvent { u8 active; @@ -53,14 +47,14 @@ struct CreditsOverworldCmd #define MUSIC_DISABLE_STOP 1 #define MUSIC_DISABLE_KEEP 2 -extern const struct UCoords32 gDirectionToVectors[]; +extern const struct Coords32 gDirectionToVectors[]; extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4]; extern MainCallback gFieldCallback; extern struct WarpData gLastUsedWarp; -extern u8 gUnknown_2031DE0; +extern u8 gExitStairsMovementDisabled; extern u8 gFieldLinkPlayerCount; extern u8 gLocalLinkPlayerId; @@ -83,8 +77,6 @@ u8 IsMapTypeOutdoors(u8 mapType); void Overworld_ClearSavedMusic(void); bool32 Overworld_MusicCanOverrideMapMusic(u16 song); -void player_avatar_init_params_reset(void); - void Overworld_SetFlashLevel(s32 a1); u8 Overworld_GetFlashLevel(void); @@ -102,9 +94,7 @@ void CB2_ReturnToFieldContinueScriptPlayMapMusic(void); void WarpIntoMap(void); u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum); void SetWarpDestinationToMapWarp(s8 mapGroup, s8 mapNum, s8 warpNum); -void c2_load_new_map(void); void SetWarpDestinationToDynamicWarp(u8 unused); -void mapldr_default(void); u32 GetGameStat(u8 statId); void SetGameStat(u8 statId, u32 value); @@ -174,13 +164,13 @@ bool32 Overworld_RecvKeysFromLinkIsRunning(void); void OverworldWhiteOutGetMoneyLoss(void); u8 GetCurrentMapBattleScene(void); void Overworld_ResetStateAfterFly(void); -bool8 sub_8055B38(u16 metatileBehavior); +bool8 MetatileBehavior_IsSurfableInSeafoamIslands(u16 metatileBehavior); void Overworld_ResetMapMusic(void); u16 QueueExitLinkRoomKey(void); -u16 sub_8057F34(void); -u32 sub_8057EC0(void); -u16 sub_8057F70(void); -u16 sub_8057F48(void); +u16 SetInCableClubSeat(void); +u32 GetCableClubPartnersReady(void); +u16 SetStartedCableClubActivity(void); +u16 SetLinkWaitingForScript(void); void SetMainCallback1(MainCallback cb); void CB1_Overworld(void); void CB2_ReturnToFieldContinueScript(void); diff --git a/src/cable_club.c b/src/cable_club.c index 1f7415b04..e14d4366e 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -782,20 +782,20 @@ static void Task_EnterCableClubSeat(u8 taskId) case 1: if (IsFieldMessageBoxHidden()) { - sub_8057F34(); + SetInCableClubSeat(); SetLocalLinkPlayerId(gSpecialVar_0x8005); task->data[0] = 2; } break; case 2: - switch (sub_8057EC0()) + switch (GetCableClubPartnersReady()) { case 0: break; case 1: HideFieldMessageBox(); task->data[0] = 0; - sub_8057F70(); + SetStartedCableClubActivity(); SwitchTaskToFollowupFunc(taskId); break; case 2: @@ -804,7 +804,7 @@ static void Task_EnterCableClubSeat(u8 taskId) } break; case 3: - sub_8057F48(); + SetLinkWaitingForScript(); sub_80F771C(TRUE); DestroyTask(taskId); EnableBothScriptContexts(); diff --git a/src/field_effect.c b/src/field_effect.c index 5bf4c0934..e436233f4 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -1278,8 +1278,7 @@ static bool8 FallWarpEffect_7(struct Task * task) UnfreezeObjectEvents(); InstallCameraPanAheadCallback(); PlayerGetDestCoords(&x, &y); - // Seafoam Islands - if (sub_8055B38(MapGridGetMetatileBehaviorAt(x, y)) == TRUE) + if (MetatileBehavior_IsSurfableInSeafoamIslands(MapGridGetMetatileBehaviorAt(x, y)) == TRUE) { VarSet(VAR_TEMP_1, 1); SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_SURFING); diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c index dc941e936..31de46ab2 100644 --- a/src/field_fadetransition.c +++ b/src/field_fadetransition.c @@ -264,7 +264,7 @@ static void SetUpWarpExitTask(bool8 playerNotMoving) func = Task_ExitNonAnimDoor; else if (MetatileBehavior_IsDirectionalStairWarp(metatileBehavior) == TRUE) { - u8 tmp = gUnknown_2031DE0; + u8 tmp = gExitStairsMovementDisabled; func = Task_ExitNonDoor; if (!tmp) func = Task_ExitStairs; @@ -272,7 +272,7 @@ static void SetUpWarpExitTask(bool8 playerNotMoving) else func = Task_ExitNonDoor; } - gUnknown_2031DE0 = FALSE; + gExitStairsMovementDisabled = FALSE; CreateTask(func, 10); } diff --git a/src/item_use.c b/src/item_use.c index b3d9205b9..c1abecb91 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -221,7 +221,7 @@ static bool8 sub_80A1194(void) ScriptContext2_Enable(); FadeInFromBlack(); CreateTask(sub_80A11C0, 10); - gUnknown_2031DE0 = 0; + gExitStairsMovementDisabled = 0; return TRUE; } diff --git a/src/main_menu.c b/src/main_menu.c index 5adf3b6ac..8b201ff86 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -468,7 +468,7 @@ static void Task_ExecuteMainMenuSelection(u8 taskId) { default: case MAIN_MENU_NEWGAME: - gUnknown_2031DE0 = 0; + gExitStairsMovementDisabled = 0; FreeAllWindowBuffers(); DestroyTask(taskId); StartNewGameScene(); @@ -476,7 +476,7 @@ static void Task_ExecuteMainMenuSelection(u8 taskId) case MAIN_MENU_CONTINUE: gPlttBufferUnfaded[0] = RGB_BLACK; gPlttBufferFaded[0] = RGB_BLACK; - gUnknown_2031DE0 = 0; + gExitStairsMovementDisabled = 0; FreeAllWindowBuffers(); TrySetUpQuestLogScenes_ElseContinueFromSave(taskId); break; diff --git a/src/overworld.c b/src/overworld.c index fc54745a9..d0e8d1260 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -51,10 +51,10 @@ #include "constants/region_map_sections.h" #include "constants/songs.h" -#define PLAYER_TRADING_STATE_IDLE 0x80 -#define PLAYER_TRADING_STATE_BUSY 0x81 -#define PLAYER_TRADING_STATE_UNK_2 0x82 -#define PLAYER_TRADING_STATE_EXITING_ROOM 0x83 +#define PLAYER_LINK_STATE_IDLE 0x80 +#define PLAYER_LINK_STATE_BUSY 0x81 +#define PLAYER_LINK_STATE_READY 0x82 +#define PLAYER_LINK_STATE_EXITING_ROOM 0x83 #define FACING_NONE 0 #define FACING_UP 1 @@ -72,17 +72,17 @@ struct InitialPlayerAvatarState { u8 transitionFlags; u8 direction; - bool8 unk2; + bool8 hasDirectionSet; }; -struct TradeRoomPlayer +struct CableClubPlayer { u8 playerId; bool8 isLocalPlayer; - u8 c; + u8 movementMode; u8 facing; struct MapPosition pos; - u16 field_C; + u16 metatileBehavior; }; EWRAM_DATA struct WarpData gLastUsedWarp = {}; @@ -90,21 +90,17 @@ static EWRAM_DATA struct WarpData sWarpDestination = {}; static EWRAM_DATA struct WarpData sFixedDiveWarp = {}; static EWRAM_DATA struct WarpData sFixedHoleWarp = {}; -// File boundary perhaps? static EWRAM_DATA struct InitialPlayerAvatarState sInitialPlayerAvatarState = {}; -// File boundary perhaps? -EWRAM_DATA bool8 gDisableMapMusicChangeOnMapLoad = FALSE; +EWRAM_DATA bool8 gDisableMapMusicChangeOnMapLoad = MUSIC_DISABLE_OFF; static EWRAM_DATA u16 sAmbientCrySpecies = SPECIES_NONE; static EWRAM_DATA bool8 sIsAmbientCryWaterMon = FALSE; -// File boundary perhaps? -ALIGNED(4) EWRAM_DATA bool8 gUnknown_2031DE0 = FALSE; +ALIGNED(4) EWRAM_DATA bool8 gExitStairsMovementDisabled = FALSE; static EWRAM_DATA const struct CreditsOverworldCmd *sCreditsOverworld_Script = NULL; static EWRAM_DATA s16 sCreditsOverworld_CmdLength = 0; static EWRAM_DATA s16 sCreditsOverworld_CmdIndex = 0; -// File boundary perhaps? EWRAM_DATA struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4] = {}; u16 *gBGTilemapBuffers1; @@ -116,7 +112,7 @@ u16 gHeldKeyCodeToSend; u8 gLocalLinkPlayerId; u8 gFieldLinkPlayerCount; -static u8 sPlayerTradingStates[4]; +static u8 sPlayerLinkStates[MAX_LINK_PLAYERS]; static KeyInterCB sPlayerKeyInterceptCallback; static bool8 sReceivingFromLink; static u8 sRfuKeepAliveTimer; @@ -133,30 +129,30 @@ static void ChooseAmbientCrySpecies(void); static void CB2_Overworld(void); static void CB2_LoadMap2(void); -static void c2_80567AC(void); +static void CB2_LoadMapOnReturnToFieldCableClub(void); static void CB2_ReturnToFieldLocal(void); static void CB2_ReturnToFieldLink(void); static void FieldClearVBlankHBlankCallbacks(void); static void SetFieldVBlankCallback(void); static void VBlankCB_Field(void); -static bool32 map_loading_iteration_3(u8 *state); -static bool32 sub_8056CD8(u8 *state); -static bool32 map_loading_iteration_2_link(u8 *state); -static void do_load_map_stuff_loop(u8 *state); +static bool32 LoadMapInStepsLink(u8 *state); +static bool32 ReturnToFieldLocal(u8 *state); +static bool32 ReturnToFieldLink(u8 *state); +static void DoMapLoadLoop(u8 *state); static void MoveSaveBlocks_ResetHeap_(void); -static void sub_8056E80(void); -static void sub_8056F08(void); +static void ResetScreenForMapLoad(void); +static void InitViewGraphics(void); static void InitOverworldGraphicsRegisters(void); -static void ResumeMap(bool32 a0); -static void sub_8057074(void); -static void mli4_mapscripts_and_other(void); +static void ResumeMap(bool32 inLink); +static void InitObjectEventsLink(void); +static void InitObjectEventsLocal(void); static void ReloadObjectsAndRunReturnToFieldMapScript(void); -static void sub_8057114(void); +static void SetCameraToTrackPlayer(void); static void SetCameraToTrackGuestPlayer(void); static void SetCameraToTrackGuestPlayer_2(void); -static void sub_8057178(void); -static void sub_80571A8(void); +static void OffsetCameraFocusByLinkPlayerId(void); +static void SpawnLinkPlayers(void); static void CreateLinkPlayerSprites(void); static void CB2_LoadMapForQLPlayback(void); static void DoLoadMap_QLPlayback(u8 *state); @@ -171,7 +167,7 @@ static void CB1_UpdateLinkState(void); static void ResetAllMultiplayerState(void); static void ClearAllPlayerKeys(void); static void SetKeyInterceptCallback(KeyInterCB callback); -static void ResetAllTradingStates(void); +static void ResetAllLinkStates(void); static void UpdateAllLinkPlayers(u16 *linkKeys, s32 selfId); static void UpdateHeldKeyCode(u16 interceptedKeys); static u32 GetLinkSendQueueLength(void); @@ -182,18 +178,18 @@ static u16 KeyInterCB_SelfIdle(u32 linkPlayerId); static u16 KeyInterCB_DeferToEventScript(u32 linkPlayerId); static u16 KeyInterCB_DeferToRecvQueue(u32 linkPlayerId); static u16 KeyInterCB_DeferToSendQueue(u32 linkPlayerId); -static void LoadTradeRoomPlayer(s32 i, s32 selfId, struct TradeRoomPlayer * trainer); -static bool32 PlayerIsAtSouthExit(struct TradeRoomPlayer * player); -static const u8 *TryGetTileEventScript(struct TradeRoomPlayer * player); -static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer * player); -static bool32 sub_8057FEC(struct TradeRoomPlayer * player); -static bool32 sub_8058004(struct TradeRoomPlayer * player); +static void LoadCableClubPlayer(s32 i, s32 selfId, struct CableClubPlayer *player); +static bool32 PlayerIsAtSouthExit(struct CableClubPlayer *player); +static const u8 *TryGetTileEventScript(struct CableClubPlayer *player); +static const u8 *TryInteractWithPlayer(struct CableClubPlayer *player); +static bool32 IsCableClubPlayerUnfrozen(struct CableClubPlayer *player); +static bool32 CanCableClubPlayerPressStart(struct CableClubPlayer *player); static u16 GetDirectionForEventScript(const u8 *script); -static void sub_80581BC(void); +static void InitLinkPlayerQueueScript(void); static void CreateConfirmLeaveTradeRoomPrompt(void); static void InitLinkRoomStartMenuScript(void); static void InitMenuBasedScript(const u8 *script); -static void sub_80581DC(const u8 *script); +static void RunInteractLocalPlayerScript(const u8 *script); static void RunTerminateLinkScript(void); static void SpawnLinkPlayerObjectEvent(u8 i, s16 x, s16 y, u8 gender); static void InitLinkPlayerObjectEventPos(struct ObjectEvent *objEvent, s16 x, s16 y); @@ -474,7 +470,7 @@ void Overworld_SetObjEventTemplateMovementType(u8 localId, u8 movementType) // Routines related to the map layout -static void mapdata_load_assets_to_gpu_and_full_redraw(void) +static void InitMapView(void) { move_tilemap_camera_to_upper_left_corner(); CopyMapTilesetsToVram(gMapHeader.mapLayout); @@ -781,7 +777,7 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum) ShowMapNamePopup(TRUE); } -static void mli0_load_map(bool32 a1) +static void LoadMapFromWarp(bool32 unused) { bool8 isOutdoors; @@ -831,14 +827,14 @@ void ResetInitialPlayerAvatarState(void) { sInitialPlayerAvatarState.direction = DIR_SOUTH; sInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_ON_FOOT; - sInitialPlayerAvatarState.unk2 = FALSE; + sInitialPlayerAvatarState.hasDirectionSet = FALSE; } static void SetInitialPlayerAvatarStateWithDirection(u8 dirn) { sInitialPlayerAvatarState.direction = dirn; sInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_ON_FOOT; - sInitialPlayerAvatarState.unk2 = TRUE; + sInitialPlayerAvatarState.hasDirectionSet = TRUE; } void StoreInitialPlayerAvatarState(void) @@ -855,7 +851,7 @@ void StoreInitialPlayerAvatarState(void) sInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_UNDERWATER; else sInitialPlayerAvatarState.transitionFlags = PLAYER_AVATAR_FLAG_ON_FOOT; - sInitialPlayerAvatarState.unk2 = FALSE; + sInitialPlayerAvatarState.hasDirectionSet = FALSE; } struct InitialPlayerAvatarState *GetInitialPlayerAvatarState(void) @@ -866,7 +862,7 @@ struct InitialPlayerAvatarState *GetInitialPlayerAvatarState(void) u8 transitionFlags = GetAdjustedInitialTransitionFlags(&sInitialPlayerAvatarState, metatileBehavior, mapType); playerStruct.transitionFlags = transitionFlags; playerStruct.direction = GetAdjustedInitialDirection(&sInitialPlayerAvatarState, transitionFlags, metatileBehavior, mapType); - playerStruct.unk2 = FALSE; + playerStruct.hasDirectionSet = FALSE; sInitialPlayerAvatarState = playerStruct; return &sInitialPlayerAvatarState; } @@ -877,7 +873,7 @@ static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState *pla return PLAYER_AVATAR_FLAG_ON_FOOT; else if (mapType == MAP_TYPE_UNDERWATER) return PLAYER_AVATAR_FLAG_UNDERWATER; - else if (sub_8055B38(metatileBehavior) == TRUE) + else if (MetatileBehavior_IsSurfableInSeafoamIslands(metatileBehavior) == TRUE) return PLAYER_AVATAR_FLAG_ON_FOOT; else if (MetatileBehavior_IsSurfable(metatileBehavior) == TRUE) return PLAYER_AVATAR_FLAG_SURFING; @@ -891,7 +887,7 @@ static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState *pla return PLAYER_AVATAR_FLAG_ACRO_BIKE; } -bool8 sub_8055B38(u16 metatileBehavior) +bool8 MetatileBehavior_IsSurfableInSeafoamIslands(u16 metatileBehavior) { if (MetatileBehavior_IsSurfable(metatileBehavior) != TRUE) return FALSE; @@ -928,7 +924,7 @@ static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState *playerStr return playerStruct->direction; else if (MetatileBehavior_IsLadder(metatileBehavior) == TRUE) return playerStruct->direction; - else if (playerStruct->unk2) + else if (playerStruct->hasDirectionSet) return playerStruct->direction; else return DIR_SOUTH; @@ -1012,15 +1008,14 @@ void Overworld_PlaySpecialMapMusic(void) u16 music; s16 x, y; - if (gDisableMapMusicChangeOnMapLoad == 1) + if (gDisableMapMusicChangeOnMapLoad == MUSIC_DISABLE_STOP) { StopMapMusic(); return; } - if (gDisableMapMusicChangeOnMapLoad == 2) - { + if (gDisableMapMusicChangeOnMapLoad == MUSIC_DISABLE_KEEP) return; - } + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(POKEMON_LEAGUE_CHAMPIONS_ROOM) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(POKEMON_LEAGUE_CHAMPIONS_ROOM)) { PlayerGetDestCoords(&x, &y); @@ -1057,15 +1052,13 @@ static void Overworld_TryMapConnectionMusicTransition(void) u16 newMusic; u16 currentMusic; - if (gDisableMapMusicChangeOnMapLoad == 1) + if (gDisableMapMusicChangeOnMapLoad == MUSIC_DISABLE_STOP) { StopMapMusic(); return; } - if (gDisableMapMusicChangeOnMapLoad == 2) - { + if (gDisableMapMusicChangeOnMapLoad == MUSIC_DISABLE_KEEP) return; - } if (FlagGet(FLAG_DONT_TRANSITION_MUSIC) != TRUE) { @@ -1140,15 +1133,13 @@ static void PlayAmbientCry(void) pan = (Random() % 88) + 212; volume = (Random() % 30) + 50; - if (gDisableMapMusicChangeOnMapLoad == 1) + if (gDisableMapMusicChangeOnMapLoad == MUSIC_DISABLE_STOP) { StopMapMusic(); return; } - if (gDisableMapMusicChangeOnMapLoad == 2) - { + if (gDisableMapMusicChangeOnMapLoad == MUSIC_DISABLE_KEEP) return; - } PlayCry2(sAmbientCrySpecies, pan, volume, 1); } @@ -1284,16 +1275,17 @@ static const int sUnusedData[] = { 44 }; -const struct UCoords32 gDirectionToVectors[] = { - { 0u, 0u}, - { 0u, 1u}, - { 0u, -1u}, - {-1u, 0u}, - { 1u, 0u}, - {-1u, 1u}, - { 1u, 1u}, - {-1u, -1u}, - { 1u, -1u}, +const struct Coords32 gDirectionToVectors[] = +{ + [DIR_NONE] = { 0, 0}, + [DIR_SOUTH] = { 0, 1}, + [DIR_NORTH] = { 0, -1}, + [DIR_WEST] = {-1, 0}, + [DIR_EAST] = { 1, 0}, + [DIR_SOUTHWEST] = {-1, 1}, + [DIR_SOUTHEAST] = { 1, 1}, + [DIR_NORTHWEST] = {-1, -1}, + [DIR_NORTHEAST] = { 1, -1}, }; static const struct BgTemplate sOverworldBgTemplates[] = { @@ -1335,7 +1327,7 @@ static const struct BgTemplate sOverworldBgTemplates[] = { static void InitOverworldBgs(void) { MoveSaveBlocks_ResetHeap_(); - sub_8056E80(); + ResetScreenForMapLoad(); ResetBgsAndClearDma3BusyFlags(FALSE); InitBgsFromTemplates(0, sOverworldBgTemplates, NELEMS(sOverworldBgTemplates)); SetBgAttribute(1, BG_ATTR_MOSAIC, TRUE); @@ -1492,14 +1484,12 @@ void SetMainCallback1(MainCallback cb) gMain.callback1 = cb; } -static bool8 map_post_load_hook_exec(void) +static bool8 RunFieldCallback(void) { if (gFieldCallback2) { if (!gFieldCallback2()) - { return FALSE; - } else { gFieldCallback2 = NULL; @@ -1531,7 +1521,7 @@ void CB2_NewGame(void) ScriptContext2_Disable(); gFieldCallback = FieldCB_WarpExitFadeFromBlack; gFieldCallback2 = NULL; - do_load_map_stuff_loop(&gMain.state); + DoMapLoadLoop(&gMain.state); SetFieldVBlankCallback(); SetMainCallback1(CB1_Overworld); SetMainCallback2(CB2_Overworld); @@ -1552,7 +1542,7 @@ void CB2_WhiteOut(void) ScriptContext2_Disable(); gFieldCallback = FieldCB_RushInjuredPokemonToCenter; val = 0; - do_load_map_stuff_loop(&val); + DoMapLoadLoop(&val); QuestLog_CutRecording(); SetFieldVBlankCallback(); SetMainCallback1(CB1_Overworld); @@ -1572,7 +1562,7 @@ void CB2_LoadMap(void) static void CB2_LoadMap2(void) { - do_load_map_stuff_loop(&gMain.state); + DoMapLoadLoop(&gMain.state); if (QuestLog_ShouldEndSceneOnMapChange() == TRUE) { QuestLog_AdvancePlayhead_(); @@ -1589,12 +1579,12 @@ void CB2_ReturnToFieldCableClub(void) { FieldClearVBlankHBlankCallbacks(); gFieldCallback = FieldCB_ReturnToFieldWirelessLink; - SetMainCallback2(c2_80567AC); + SetMainCallback2(CB2_LoadMapOnReturnToFieldCableClub); } -static void c2_80567AC(void) +static void CB2_LoadMapOnReturnToFieldCableClub(void) { - if (map_loading_iteration_3(&gMain.state)) + if (LoadMapInStepsLink(&gMain.state)) { SetFieldVBlankCallback(); SetMainCallback1(CB1_UpdateLinkState); @@ -1618,7 +1608,7 @@ void CB2_ReturnToField(void) static void CB2_ReturnToFieldLocal(void) { - if (sub_8056CD8(&gMain.state)) + if (ReturnToFieldLocal(&gMain.state)) { SetFieldVBlankCallback(); SetMainCallback2(CB2_Overworld); @@ -1627,7 +1617,7 @@ static void CB2_ReturnToFieldLocal(void) static void CB2_ReturnToFieldLink(void) { - if (!Overworld_LinkRecvQueueLengthMoreThan2() && map_loading_iteration_2_link(&gMain.state)) + if (!Overworld_LinkRecvQueueLengthMoreThan2() && ReturnToFieldLink(&gMain.state)) SetMainCallback2(CB2_Overworld); } @@ -1697,7 +1687,7 @@ void CB2_ContinueSavedGame(void) ScriptContext1_Init(); ScriptContext2_Disable(); gFieldCallback2 = NULL; - gUnknown_2031DE0 = TRUE; + gExitStairsMovementDisabled = TRUE; if (UseContinueGameWarp() == TRUE) { ClearContinueGameWarpStatus(); @@ -1763,7 +1753,7 @@ static void InitCurrentFlashLevelScanlineEffect(void) } } -static bool32 map_loading_iteration_3(u8 *state) +static bool32 LoadMapInStepsLink(u8 *state) { switch (*state) { @@ -1774,7 +1764,7 @@ static bool32 map_loading_iteration_3(u8 *state) (*state)++; break; case 1: - mli0_load_map(TRUE); + LoadMapFromWarp(TRUE); (*state)++; break; case 2: @@ -1782,9 +1772,9 @@ static bool32 map_loading_iteration_3(u8 *state) (*state)++; break; case 3: - sub_8057178(); - sub_8057074(); - sub_80571A8(); + OffsetCameraFocusByLinkPlayerId(); + InitObjectEventsLink(); + SpawnLinkPlayers(); SetCameraToTrackGuestPlayer(); SetHelpContextForMap(); (*state)++; @@ -1830,7 +1820,7 @@ static bool32 map_loading_iteration_3(u8 *state) (*state)++; break; case 12: - if (map_post_load_hook_exec()) + if (RunFieldCallback()) (*state)++; break; case 13: @@ -1840,14 +1830,14 @@ static bool32 map_loading_iteration_3(u8 *state) return FALSE; } -static bool32 load_map_stuff(u8 *state, bool32 a1) +static bool32 LoadMapInStepsLocal(u8 *state, bool32 inLink) { switch (*state) { case 0: InitOverworldBgs(); FieldClearVBlankHBlankCallbacks(); - mli0_load_map(a1); + LoadMapFromWarp(inLink); (*state)++; break; case 1: @@ -1855,7 +1845,7 @@ static bool32 load_map_stuff(u8 *state, bool32 a1) (*state)++; break; case 2: - ResumeMap(a1); + ResumeMap(inLink); (*state)++; break; case 3: @@ -1864,8 +1854,8 @@ static bool32 load_map_stuff(u8 *state, bool32 a1) (*state)++; break; case 4: - mli4_mapscripts_and_other(); - sub_8057114(); + InitObjectEventsLocal(); + SetCameraToTrackPlayer(); if (gQuestLogState != QL_STATE_PLAYBACK) { QuestLog_CheckDepartingIndoorsMap(); @@ -1919,7 +1909,7 @@ static bool32 load_map_stuff(u8 *state, bool32 a1) (*state)++; break; case 13: - if (map_post_load_hook_exec()) + if (RunFieldCallback()) (*state)++; break; case 14: @@ -1928,7 +1918,7 @@ static bool32 load_map_stuff(u8 *state, bool32 a1) return FALSE; } -static bool32 sub_8056CD8(u8 *state) +static bool32 ReturnToFieldLocal(u8 *state) { switch (*state) { @@ -1937,19 +1927,19 @@ static bool32 sub_8056CD8(u8 *state) QuestLog_InitPalettesBackup(); ResumeMap(FALSE); ReloadObjectsAndRunReturnToFieldMapScript(); - sub_8057114(); + SetCameraToTrackPlayer(); (*state)++; break; case 1: (*state)++; break; case 2: - sub_8056F08(); + InitViewGraphics(); SetHelpContextForMap(); (*state)++; break; case 3: - if (map_post_load_hook_exec()) + if (RunFieldCallback()) (*state)++; break; case 4: @@ -1958,7 +1948,7 @@ static bool32 sub_8056CD8(u8 *state) return FALSE; } -static bool32 map_loading_iteration_2_link(u8 *state) +static bool32 ReturnToFieldLink(u8 *state) { switch (*state) { @@ -1969,7 +1959,7 @@ static bool32 map_loading_iteration_2_link(u8 *state) break; case 1: QuestLog_InitPalettesBackup(); - ResumeMap(1); + ResumeMap(TRUE); (*state)++; break; case 2: @@ -2023,7 +2013,7 @@ static bool32 map_loading_iteration_2_link(u8 *state) (*state)++; break; case 12: - if (map_post_load_hook_exec()) + if (RunFieldCallback()) (*state)++; break; case 13: @@ -2035,10 +2025,9 @@ static bool32 map_loading_iteration_2_link(u8 *state) return FALSE; } -static void do_load_map_stuff_loop(u8 *state) +static void DoMapLoadLoop(u8 *state) { - while (!load_map_stuff(state, FALSE)) - ; + while (!LoadMapInStepsLocal(state, FALSE)) ; } static void MoveSaveBlocks_ResetHeap_(void) @@ -2046,7 +2035,7 @@ static void MoveSaveBlocks_ResetHeap_(void) MoveSaveBlocks_ResetHeap(); } -static void sub_8056E80(void) +static void ResetScreenForMapLoad(void) { SetGpuReg(REG_OFFSET_DISPCNT, 0); ScanlineEffect_Stop(); @@ -2057,11 +2046,11 @@ static void sub_8056E80(void) LoadOam(); } -static void sub_8056F08(void) +static void InitViewGraphics(void) { InitCurrentFlashLevelScanlineEffect(); InitOverworldGraphicsRegisters(); - mapdata_load_assets_to_gpu_and_full_redraw(); + InitMapView(); } static void InitOverworldGraphicsRegisters(void) @@ -2096,7 +2085,7 @@ static void InitOverworldGraphicsRegisters(void) ChangeBgY(3, 0, 0); } -static void ResumeMap(u32 a1) +static void ResumeMap(bool32 inLink) { ResetTasks(); ResetSpriteData(); @@ -2105,7 +2094,7 @@ static void ResumeMap(u32 a1) ResetAllPicSprites(); ResetCameraUpdateInfo(); InstallCameraPanAheadCallback(); - if (!a1) + if (!inLink) InitObjectEventPalettes(0); else InitObjectEventPalettes(1); @@ -2113,12 +2102,12 @@ static void ResumeMap(u32 a1) FieldEffectActiveListClear(); StartWeather(); ResumePausedWeather(); - if (!a1) + if (!inLink) SetUpFieldTasks(); RunOnResumeMapScript(); } -static void sub_8057074(void) +static void InitObjectEventsLink(void) { gTotalCameraPixelOffsetX = 0; gTotalCameraPixelOffsetY = 0; @@ -2127,7 +2116,7 @@ static void sub_8057074(void) TryRunOnWarpIntoMapScript(); } -static void mli4_mapscripts_and_other(void) +static void InitObjectEventsLocal(void) { s16 x, y; struct InitialPlayerAvatarState *player; @@ -2150,7 +2139,7 @@ static void ReloadObjectsAndRunReturnToFieldMapScript(void) RunOnReturnToFieldMapScript(); } -static void sub_8057114(void) +static void SetCameraToTrackPlayer(void) { gObjectEvents[gPlayerAvatar.objectEventId].trackedByCamera = TRUE; InitCameraUpdateCallback(gPlayerAvatar.spriteId); @@ -2167,17 +2156,17 @@ static void SetCameraToTrackGuestPlayer_2(void) InitCameraUpdateCallback(GetSpriteForLinkedPlayer(gLocalLinkPlayerId)); } -static void sub_8057178(void) +static void OffsetCameraFocusByLinkPlayerId(void) { u16 x, y; GetCameraFocusCoords(&x, &y); - // This is a hack of some kind; it's undone in sub_8086B14, which is called + // This is a hack of some kind; it's undone in SpawnLinkPlayers, which is called // soon after this function. SetCameraFocusCoords(x + gLocalLinkPlayerId, y); } -static void sub_80571A8(void) +static void SpawnLinkPlayers(void) { u16 i; u16 x, y; @@ -2251,12 +2240,12 @@ static bool32 LoadMap_QLPlayback(u8 *state) sub_8111438(); if (GetQuestLogStartType() == QL_START_WARP) { - gUnknown_2031DE0 = FALSE; - mli0_load_map(FALSE); + gExitStairsMovementDisabled = FALSE; + LoadMapFromWarp(FALSE); } else { - gUnknown_2031DE0 = TRUE; + gExitStairsMovementDisabled = TRUE; sub_80559A8(); } (*state)++; @@ -2266,12 +2255,12 @@ static bool32 LoadMap_QLPlayback(u8 *state) (*state)++; break; case 2: - ResumeMap(0); + ResumeMap(FALSE); (*state)++; break; case 3: ReloadObjectsAndRunReturnToFieldMapScript(); - sub_8057114(); + SetCameraToTrackPlayer(); (*state)++; break; case 4: @@ -2308,7 +2297,7 @@ static bool32 LoadMap_QLPlayback(u8 *state) (*state)++; break; default: - if (map_post_load_hook_exec()) + if (RunFieldCallback()) return TRUE; break; } @@ -2328,7 +2317,7 @@ void CB2_EnterFieldFromQuestLog(void) InitMapFromSavedGame(); PlayTimeCounter_Start(); ScriptContext1_Init(); - gUnknown_2031DE0 = TRUE; + gExitStairsMovementDisabled = TRUE; if (UseContinueGameWarp() == TRUE) { ClearContinueGameWarpStatus(); @@ -2428,7 +2417,7 @@ static bool8 MapLdr_Credits(void) { case 0: InitOverworldBgs_NoResetHeap(); - mli0_load_map(FALSE); + LoadMapFromWarp(FALSE); (*state)++; break; case 1: @@ -2543,19 +2532,25 @@ static void Task_OvwldCredits_WaitFade(u8 taskId) // Link related -static u8 (*const sLinkPlayerMovementModes[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { - MovementEventModeCB_Normal, // MOVEMENT_MODE_FREE - MovementEventModeCB_Ignored, // MOVEMENT_MODE_FROZEN - MovementEventModeCB_Normal_2, // MOVEMENT_MODE_SCRIPTED +static u8 (*const sLinkPlayerMovementModes[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = +{ + [MOVEMENT_MODE_FREE] = MovementEventModeCB_Normal, + [MOVEMENT_MODE_FROZEN] = MovementEventModeCB_Ignored, + [MOVEMENT_MODE_SCRIPTED] = MovementEventModeCB_Normal_2, }; // These handlers return TRUE if the movement was scripted and successful, and FALSE otherwise. -static bool8 (*const sLinkPlayerFacingHandlers[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = { - FacingHandler_DoNothing, - FacingHandler_DpadMovement, - FacingHandler_DpadMovement, - FacingHandler_DpadMovement, - FacingHandler_DpadMovement, +static bool8 (*const sLinkPlayerFacingHandlers[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = +{ + [DIR_NONE] = FacingHandler_DoNothing, + [DIR_SOUTH] = FacingHandler_DpadMovement, + [DIR_NORTH] = FacingHandler_DpadMovement, + [DIR_WEST] = FacingHandler_DpadMovement, + [DIR_EAST] = FacingHandler_DpadMovement, +}; + +static bool8 (*const sUnusedLinkPlayerFacingHandlers[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *, u8) = +{ FacingHandler_DoNothing, FacingHandler_DoNothing, FacingHandler_ForcedFacingChange, @@ -2566,10 +2561,8 @@ static bool8 (*const sLinkPlayerFacingHandlers[])(struct LinkPlayerObjectEvent * // These handlers are run after an attempted movement. static void (*const sMovementStatusHandler[])(struct LinkPlayerObjectEvent *, struct ObjectEvent *) = { - // FALSE: - MovementStatusHandler_EnterFreeMode, - // TRUE: - MovementStatusHandler_TryAdvanceScript, + [FALSE] = MovementStatusHandler_EnterFreeMode, + [TRUE] = MovementStatusHandler_TryAdvanceScript, }; static void CB1_UpdateLinkState(void) @@ -2597,7 +2590,7 @@ static void CB1_UpdateLinkState(void) static void ResetAllMultiplayerState(void) { - ResetAllTradingStates(); + ResetAllLinkStates(); SetKeyInterceptCallback(KeyInterCB_SelfIdle); } @@ -2622,58 +2615,58 @@ static void CheckRfuKeepAliveTimer(void) LinkRfu_FatalError(); } -static void ResetAllTradingStates(void) +static void ResetAllLinkStates(void) { s32 i; for (i = 0; i < 4; i++) - sPlayerTradingStates[i] = PLAYER_TRADING_STATE_IDLE; + sPlayerLinkStates[i] = PLAYER_LINK_STATE_IDLE; } -// Returns true if all connected players are in tradingState. -static bool32 AreAllPlayersInTradingState(u16 tradingState) +// Returns true if all connected players are in linkState. +static bool32 AreAllPlayersInLinkState(u16 linkState) { s32 i; s32 count = gFieldLinkPlayerCount; for (i = 0; i < count; i++) - if (sPlayerTradingStates[i] != tradingState) + if (sPlayerLinkStates[i] != linkState) return FALSE; return TRUE; } -static bool32 IsAnyPlayerInTradingState(u16 tradingState) +static bool32 IsAnyPlayerInLinkState(u16 linkState) { s32 i; s32 count = gFieldLinkPlayerCount; for (i = 0; i < count; i++) - if (sPlayerTradingStates[i] == tradingState) + if (sPlayerLinkStates[i] == linkState) return TRUE; return FALSE; } -static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlayer *trainer, u16 *forceFacing) +static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct CableClubPlayer *player, u16 *forceFacing) { const u8 *script; - if (sPlayerTradingStates[playerId] == PLAYER_TRADING_STATE_IDLE) + if (sPlayerLinkStates[playerId] == PLAYER_LINK_STATE_IDLE) { - script = TryGetTileEventScript(trainer); + script = TryGetTileEventScript(player); if (script) { *forceFacing = GetDirectionForEventScript(script); - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isLocalPlayer) + sPlayerLinkStates[playerId] = PLAYER_LINK_STATE_BUSY; + if (player->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); - sub_80581DC(script); + RunInteractLocalPlayerScript(script); } return; } - if (IsAnyPlayerInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) + if (IsAnyPlayerInLinkState(PLAYER_LINK_STATE_EXITING_ROOM) == TRUE) { - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isLocalPlayer) + sPlayerLinkStates[playerId] = PLAYER_LINK_STATE_BUSY; + if (player->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); RunTerminateLinkScript(); @@ -2684,10 +2677,10 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay switch (key) { case LINK_KEY_CODE_START_BUTTON: - if (sub_8058004(trainer)) + if (CanCableClubPlayerPressStart(player)) { - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isLocalPlayer) + sPlayerLinkStates[playerId] = PLAYER_LINK_STATE_BUSY; + if (player->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); InitLinkRoomStartMenuScript(); @@ -2695,10 +2688,10 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay } break; case LINK_KEY_CODE_DPAD_DOWN: - if (PlayerIsAtSouthExit(trainer) == TRUE) + if (PlayerIsAtSouthExit(player) == TRUE) { - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isLocalPlayer) + sPlayerLinkStates[playerId] = PLAYER_LINK_STATE_BUSY; + if (player->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); CreateConfirmLeaveTradeRoomPrompt(); @@ -2706,11 +2699,11 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay } break; case LINK_KEY_CODE_A_BUTTON: - script = TryInteractWithPlayer(trainer); + script = TryInteractWithPlayer(player); if (script) { - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isLocalPlayer) + sPlayerLinkStates[playerId] = PLAYER_LINK_STATE_BUSY; + if (player->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); InitMenuBasedScript(script); @@ -2718,24 +2711,24 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay } break; case LINK_KEY_CODE_HANDLE_RECV_QUEUE: - if (sub_8057FEC(trainer)) + if (IsCableClubPlayerUnfrozen(player)) { - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isLocalPlayer) + sPlayerLinkStates[playerId] = PLAYER_LINK_STATE_BUSY; + if (player->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToRecvQueue); - sub_80581BC(); + InitLinkPlayerQueueScript(); } } break; case LINK_KEY_CODE_HANDLE_SEND_QUEUE: - if (sub_8057FEC(trainer)) + if (IsCableClubPlayerUnfrozen(player)) { - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; - if (trainer->isLocalPlayer) + sPlayerLinkStates[playerId] = PLAYER_LINK_STATE_BUSY; + if (player->isLocalPlayer) { SetKeyInterceptCallback(KeyInterCB_DeferToSendQueue); - sub_80581BC(); + InitLinkPlayerQueueScript(); } } break; @@ -2745,35 +2738,35 @@ static void HandleLinkPlayerKeyInput(u32 playerId, u16 key, struct TradeRoomPlay switch (key) { case LINK_KEY_CODE_EXIT_ROOM: - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_EXITING_ROOM; + sPlayerLinkStates[playerId] = PLAYER_LINK_STATE_EXITING_ROOM; break; - case LINK_KEY_CODE_UNK_2: - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_UNK_2; + case LINK_KEY_CODE_READY: + sPlayerLinkStates[playerId] = PLAYER_LINK_STATE_READY; break; - case LINK_KEY_CODE_UNK_4: - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_IDLE; - if (trainer->isLocalPlayer) + case LINK_KEY_CODE_IDLE: + sPlayerLinkStates[playerId] = PLAYER_LINK_STATE_IDLE; + if (player->isLocalPlayer) SetKeyInterceptCallback(KeyInterCB_SelfIdle); break; - case LINK_KEY_CODE_UNK_7: - if (sPlayerTradingStates[playerId] == PLAYER_TRADING_STATE_UNK_2) - sPlayerTradingStates[playerId] = PLAYER_TRADING_STATE_BUSY; + case LINK_KEY_CODE_EXIT_SEAT: + if (sPlayerLinkStates[playerId] == PLAYER_LINK_STATE_READY) + sPlayerLinkStates[playerId] = PLAYER_LINK_STATE_BUSY; break; } } static void UpdateAllLinkPlayers(u16 *keys, s32 selfId) { - struct TradeRoomPlayer trainer; + struct CableClubPlayer player; s32 i; for (i = 0; i < MAX_LINK_PLAYERS; i++) { u8 key = keys[i]; u16 setFacing = FACING_NONE; - LoadTradeRoomPlayer(i, selfId, &trainer); - HandleLinkPlayerKeyInput(i, key, &trainer, &setFacing); - if (sPlayerTradingStates[i] == PLAYER_TRADING_STATE_IDLE) + LoadCableClubPlayer(i, selfId, &player); + HandleLinkPlayerKeyInput(i, key, &player, &setFacing); + if (sPlayerLinkStates[i] == PLAYER_LINK_STATE_IDLE) setFacing = GetDirectionForDpadKey(key); SetPlayerFacingDirection(i, setFacing); } @@ -2781,7 +2774,7 @@ static void UpdateAllLinkPlayers(u16 *keys, s32 selfId) static void UpdateHeldKeyCode(u16 key) { - if (key >= LINK_KEY_CODE_EMPTY && key < LINK_KEY_CODE_UNK_8) + if (key >= LINK_KEY_CODE_EMPTY && key <= LINK_KEY_CODE_EXIT_SEAT) gHeldKeyCodeToSend = key; else gHeldKeyCodeToSend = LINK_KEY_CODE_EMPTY; @@ -2860,7 +2853,7 @@ static u16 KeyInterCB_SelfIdle(u32 key) return LINK_KEY_CODE_HANDLE_SEND_QUEUE; } -static u16 sub_8057D98(u32 key) +static u16 KeyInterCB_Idle(u32 key) { CheckRfuKeepAliveTimer(); return LINK_KEY_CODE_EMPTY; @@ -2877,8 +2870,8 @@ static u16 KeyInterCB_DeferToEventScript(u32 key) } else { - retVal = LINK_KEY_CODE_UNK_4; - SetKeyInterceptCallback(sub_8057D98); + retVal = LINK_KEY_CODE_IDLE; + SetKeyInterceptCallback(KeyInterCB_Idle); } return retVal; } @@ -2893,9 +2886,9 @@ static u16 KeyInterCB_DeferToRecvQueue(u32 key) } else { - retVal = LINK_KEY_CODE_UNK_4; + retVal = LINK_KEY_CODE_IDLE; ScriptContext2_Disable(); - SetKeyInterceptCallback(sub_8057D98); + SetKeyInterceptCallback(KeyInterCB_Idle); } return retVal; } @@ -2910,9 +2903,9 @@ static u16 KeyInterCB_DeferToSendQueue(u32 key) } else { - retVal = LINK_KEY_CODE_UNK_4; + retVal = LINK_KEY_CODE_IDLE; ScriptContext2_Disable(); - SetKeyInterceptCallback(sub_8057D98); + SetKeyInterceptCallback(KeyInterCB_Idle); } return retVal; } @@ -2923,14 +2916,14 @@ static u16 KeyInterCB_DoNothingAndKeepAlive(u32 key) return LINK_KEY_CODE_EMPTY; } -static u16 sub_8057E1C(u32 keyOrPlayerId) +static u16 KeyInterCB_Ready(u32 keyOrPlayerId) { - if (sPlayerTradingStates[keyOrPlayerId] == PLAYER_TRADING_STATE_UNK_2) + if (sPlayerLinkStates[keyOrPlayerId] == PLAYER_LINK_STATE_READY) { if (JOY_NEW(B_BUTTON)) { SetKeyInterceptCallback(KeyInterCB_DoNothingAndKeepAlive); - return LINK_KEY_CODE_UNK_7; + return LINK_KEY_CODE_EXIT_SEAT; } else { @@ -2944,10 +2937,10 @@ static u16 sub_8057E1C(u32 keyOrPlayerId) } } -static u16 sub_8057E58(u32 a1) +static u16 KeyInterCB_SetReady(u32 a1) { - SetKeyInterceptCallback(sub_8057E1C); - return LINK_KEY_CODE_UNK_2; + SetKeyInterceptCallback(KeyInterCB_Ready); + return LINK_KEY_CODE_READY; } static u16 KeyInterCB_SendNothing(u32 key) @@ -2960,9 +2953,9 @@ static u16 KeyInterCB_WaitForPlayersToExit(u32 keyOrPlayerId) // keyOrPlayerId could be any keycode. This callback does no sanity checking // on the size of the key. It's assuming that it is being called from // CB1_UpdateLinkState. - if (sPlayerTradingStates[keyOrPlayerId] != PLAYER_TRADING_STATE_EXITING_ROOM) + if (sPlayerLinkStates[keyOrPlayerId] != PLAYER_LINK_STATE_EXITING_ROOM) CheckRfuKeepAliveTimer(); - if (AreAllPlayersInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) + if (AreAllPlayersInLinkState(PLAYER_LINK_STATE_EXITING_ROOM) == TRUE) { ScriptContext1_SetupScript(CableClub_EventScript_DoLinkRoomExit); SetKeyInterceptCallback(KeyInterCB_SendNothing); @@ -2982,31 +2975,31 @@ static u16 KeyInterCB_SendNothing_2(u32 key) return LINK_KEY_CODE_EMPTY; } -u32 sub_8057EC0(void) +u32 GetCableClubPartnersReady(void) { - if (IsAnyPlayerInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM) == TRUE) + if (IsAnyPlayerInLinkState(PLAYER_LINK_STATE_EXITING_ROOM) == TRUE) return 2; - if (sPlayerKeyInterceptCallback == sub_8057E1C && sPlayerTradingStates[gLocalLinkPlayerId] != PLAYER_TRADING_STATE_UNK_2) + if (sPlayerKeyInterceptCallback == KeyInterCB_Ready && sPlayerLinkStates[gLocalLinkPlayerId] != PLAYER_LINK_STATE_READY) return 0; - if (sPlayerKeyInterceptCallback == KeyInterCB_DoNothingAndKeepAlive && sPlayerTradingStates[gLocalLinkPlayerId] == PLAYER_TRADING_STATE_BUSY) + if (sPlayerKeyInterceptCallback == KeyInterCB_DoNothingAndKeepAlive && sPlayerLinkStates[gLocalLinkPlayerId] == PLAYER_LINK_STATE_BUSY) return 2; - if (AreAllPlayersInTradingState(PLAYER_TRADING_STATE_UNK_2) != FALSE) + if (AreAllPlayersInLinkState(PLAYER_LINK_STATE_READY) != FALSE) return 1; return 0; } -static bool32 sub_8057F28(void) +static bool32 IsAnyPlayerExitingCableClub(void) { - return IsAnyPlayerInTradingState(PLAYER_TRADING_STATE_EXITING_ROOM); + return IsAnyPlayerInLinkState(PLAYER_LINK_STATE_EXITING_ROOM); } -u16 sub_8057F34(void) +u16 SetInCableClubSeat(void) { - SetKeyInterceptCallback(sub_8057E58); + SetKeyInterceptCallback(KeyInterCB_SetReady); return 0; } -u16 sub_8057F48(void) +u16 SetLinkWaitingForScript(void) { SetKeyInterceptCallback(KeyInterCB_DeferToEventScript); return 0; @@ -3020,58 +3013,58 @@ u16 QueueExitLinkRoomKey(void) return 0; } -u16 sub_8057F70(void) +u16 SetStartedCableClubActivity(void) { SetKeyInterceptCallback(KeyInterCB_SendNothing_2); return 0; } -static void LoadTradeRoomPlayer(s32 linkPlayerId, s32 myPlayerId, struct TradeRoomPlayer *trainer) +static void LoadCableClubPlayer(s32 linkPlayerId, s32 myPlayerId, struct CableClubPlayer *player) { s16 x, y; - trainer->playerId = linkPlayerId; - trainer->isLocalPlayer = (linkPlayerId == myPlayerId) ? TRUE : FALSE; - trainer->c = gLinkPlayerObjectEvents[linkPlayerId].movementMode; - trainer->facing = GetLinkPlayerFacingDirection(linkPlayerId); + player->playerId = linkPlayerId; + player->isLocalPlayer = (linkPlayerId == myPlayerId) ? TRUE : FALSE; + player->movementMode = gLinkPlayerObjectEvents[linkPlayerId].movementMode; + player->facing = GetLinkPlayerFacingDirection(linkPlayerId); GetLinkPlayerCoords(linkPlayerId, &x, &y); - trainer->pos.x = x; - trainer->pos.y = y; - trainer->pos.height = GetLinkPlayerElevation(linkPlayerId); - trainer->field_C = MapGridGetMetatileBehaviorAt(x, y); + player->pos.x = x; + player->pos.y = y; + player->pos.height = GetLinkPlayerElevation(linkPlayerId); + player->metatileBehavior = MapGridGetMetatileBehaviorAt(x, y); } -static bool32 sub_8057FEC(struct TradeRoomPlayer *player) +static bool32 IsCableClubPlayerUnfrozen(struct CableClubPlayer *player) { - u8 v1 = player->c; - if (v1 == MOVEMENT_MODE_SCRIPTED || v1 == MOVEMENT_MODE_FREE) + u8 mode = player->movementMode; + if (mode == MOVEMENT_MODE_SCRIPTED || mode == MOVEMENT_MODE_FREE) return TRUE; else return FALSE; } // Duplicate function. -static bool32 sub_8058004(struct TradeRoomPlayer *player) +static bool32 CanCableClubPlayerPressStart(struct CableClubPlayer *player) { - u8 v1 = player->c; - if (v1 == MOVEMENT_MODE_SCRIPTED || v1 == MOVEMENT_MODE_FREE) + u8 mode = player->movementMode; + if (mode == MOVEMENT_MODE_SCRIPTED || mode == MOVEMENT_MODE_FREE) return TRUE; else return FALSE; } -static const u8 *TryGetTileEventScript(struct TradeRoomPlayer *player) +static const u8 *TryGetTileEventScript(struct CableClubPlayer *player) { - if (player->c != MOVEMENT_MODE_SCRIPTED) + if (player->movementMode != MOVEMENT_MODE_SCRIPTED) return FACING_NONE; return GetCoordEventScriptAtMapPosition(&player->pos); } -static bool32 PlayerIsAtSouthExit(struct TradeRoomPlayer *player) +static bool32 PlayerIsAtSouthExit(struct CableClubPlayer *player) { - if (player->c != MOVEMENT_MODE_SCRIPTED && player->c != MOVEMENT_MODE_FREE) + if (player->movementMode != MOVEMENT_MODE_SCRIPTED && player->movementMode != MOVEMENT_MODE_FREE) return FALSE; - else if (!MetatileBehavior_IsSouthArrowWarp(player->field_C)) + else if (!MetatileBehavior_IsSouthArrowWarp(player->metatileBehavior)) return FALSE; else if (player->facing != DIR_SOUTH) return FALSE; @@ -3079,12 +3072,12 @@ static bool32 PlayerIsAtSouthExit(struct TradeRoomPlayer *player) return TRUE; } -static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) +static const u8 *TryInteractWithPlayer(struct CableClubPlayer *player) { struct MapPosition otherPlayerPos; u8 linkPlayerId; - if (player->c != MOVEMENT_MODE_FREE && player->c != MOVEMENT_MODE_SCRIPTED) + if (player->movementMode != MOVEMENT_MODE_FREE && player->movementMode != MOVEMENT_MODE_SCRIPTED) return FACING_NONE; otherPlayerPos = player->pos; @@ -3097,7 +3090,7 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) { if (!player->isLocalPlayer) return CableClub_EventScript_TooBusyToNotice; - else if (sPlayerTradingStates[linkPlayerId] != PLAYER_TRADING_STATE_IDLE) + else if (sPlayerLinkStates[linkPlayerId] != PLAYER_LINK_STATE_IDLE) return CableClub_EventScript_TooBusyToNotice; else if (!GetSeeingLinkPlayerCardMsg(linkPlayerId)) return CableClub_EventScript_ReadTrainerCard; @@ -3105,7 +3098,7 @@ static const u8 *TryInteractWithPlayer(struct TradeRoomPlayer *player) return CableClub_EventScript_ReadTrainerCardColored; } - return GetInteractedLinkPlayerScript(&otherPlayerPos, player->field_C, player->facing); + return GetInteractedLinkPlayerScript(&otherPlayerPos, player->metatileBehavior, player->facing); } // This returns which direction to force the player to look when one of @@ -3140,7 +3133,7 @@ static u16 GetDirectionForEventScript(const u8 *script) return FACING_NONE; } -static void sub_80581BC(void) +static void InitLinkPlayerQueueScript(void) { ScriptContext2_Enable(); } @@ -3152,7 +3145,7 @@ static void InitLinkRoomStartMenuScript(void) ScriptContext2_Enable(); } -static void sub_80581DC(const u8 *script) +static void RunInteractLocalPlayerScript(const u8 *script) { PlaySE(SE_SELECT); ScriptContext1_SetupScript(script); diff --git a/src/region_map.c b/src/region_map.c index cd42dd7bd..0189aabbe 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1416,7 +1416,7 @@ static void InitRegionMap(u8 type) } else { - gUnknown_2031DE0 = TRUE; + gExitStairsMovementDisabled = TRUE; sRegionMap->type = type; sRegionMap->mainState = 0; sRegionMap->openState = 0; @@ -1435,7 +1435,7 @@ void InitRegionMapWithExitCB(u8 type, MainCallback cb) } else { - gUnknown_2031DE0 = TRUE; + gExitStairsMovementDisabled = TRUE; sRegionMap->type = type; sRegionMap->mainState = 0; sRegionMap->openState = 0; From b3e53d255eb9deff8186e8b78edb75a16a4ccdac Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Sun, 17 Jul 2022 05:04:49 +0800 Subject: [PATCH 29/64] Use FALSE instead of 0 --- src/item_use.c | 2 +- src/main_menu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/item_use.c b/src/item_use.c index c1abecb91..990ac6d04 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -221,7 +221,7 @@ static bool8 sub_80A1194(void) ScriptContext2_Enable(); FadeInFromBlack(); CreateTask(sub_80A11C0, 10); - gExitStairsMovementDisabled = 0; + gExitStairsMovementDisabled = FALSE; return TRUE; } diff --git a/src/main_menu.c b/src/main_menu.c index 8b201ff86..ec41654d0 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -468,7 +468,7 @@ static void Task_ExecuteMainMenuSelection(u8 taskId) { default: case MAIN_MENU_NEWGAME: - gExitStairsMovementDisabled = 0; + gExitStairsMovementDisabled = FALSE; FreeAllWindowBuffers(); DestroyTask(taskId); StartNewGameScene(); @@ -476,7 +476,7 @@ static void Task_ExecuteMainMenuSelection(u8 taskId) case MAIN_MENU_CONTINUE: gPlttBufferUnfaded[0] = RGB_BLACK; gPlttBufferFaded[0] = RGB_BLACK; - gExitStairsMovementDisabled = 0; + gExitStairsMovementDisabled = FALSE; FreeAllWindowBuffers(); TrySetUpQuestLogScenes_ElseContinueFromSave(taskId); break; From 4940c4da98f279336917c16d1a289c9edeed638d Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Tue, 19 Jul 2022 00:01:57 +0800 Subject: [PATCH 30/64] Document src/field_effect_helpers.c --- data/field_effect_scripts.s | 24 ++--- include/constants/field_effects.h | 8 +- include/field_effect_helpers.h | 16 +-- src/field_effect.c | 10 +- src/field_effect_helpers.c | 156 ++++++++++++++++-------------- src/field_player_avatar.c | 2 +- src/quest_log_player.c | 2 +- 7 files changed, 117 insertions(+), 101 deletions(-) diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index f963d45b7..a2bff536f 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -21,10 +21,10 @@ gFieldEffectScriptPointers:: .4byte gFldEffScript_JumpSmallSplash @ FLDEFF_JUMP_SMALL_SPLASH .4byte gFldEffScript_LongGrass @ FLDEFF_LONG_GRASS .4byte gFldEffScript_JumpLongGrass @ FLDEFF_JUMP_LONG_GRASS - .4byte gFldEffScript_Unknown19 @ FLDEFF_UNKNOWN_19 - .4byte gFldEffScript_Unknown20 @ FLDEFF_UNKNOWN_20 - .4byte gFldEffScript_Unknown21 @ FLDEFF_UNKNOWN_21 - .4byte gFldEffScript_Unknown22 @ FLDEFF_UNKNOWN_22 + .4byte gFldEffScript_UnusedGrass @ FLDEFF_UNUSED_GRASS + .4byte gFldEffScript_UnusedGrass2 @ FLDEFF_UNUSED_GRASS_2 + .4byte gFldEffScript_UnusedSand @ FLDEFF_UNUSED_SAND + .4byte gFldEffScript_UnusedWaterSurfacing @ FLDEFF_UNUSED_WATER_SURFACING .4byte gFldEffScript_BerryTreeGrowthSparkle @ FLDEFF_BERRY_TREE_GROWTH_SPARKLE .4byte gFldEffScript_DeepSandFootprints @ FLDEFF_DEEP_SAND_FOOTPRINTS .4byte gFldEffScript_PokecenterHeal @ FLDEFF_POKECENTER_HEAL @@ -148,20 +148,20 @@ gFldEffScript_JumpLongGrass:: loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass end -gFldEffScript_Unknown19:: - loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Unknown19 +gFldEffScript_UnusedGrass:: + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass end -gFldEffScript_Unknown20:: - loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Unknown20 +gFldEffScript_UnusedGrass2:: + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass2 end -gFldEffScript_Unknown21:: - loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Unknown21 +gFldEffScript_UnusedSand:: + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_UnusedSand end -gFldEffScript_Unknown22:: - loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Unknown22 +gFldEffScript_UnusedWaterSurfacing:: + loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_UnusedWaterSurfacing end gFldEffScript_BerryTreeGrowthSparkle:: diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 4f8da64e0..edf393f98 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -20,10 +20,10 @@ #define FLDEFF_JUMP_SMALL_SPLASH 16 #define FLDEFF_LONG_GRASS 17 #define FLDEFF_JUMP_LONG_GRASS 18 -#define FLDEFF_UNKNOWN_19 19 -#define FLDEFF_UNKNOWN_20 20 -#define FLDEFF_UNKNOWN_21 21 -#define FLDEFF_UNKNOWN_22 22 +#define FLDEFF_UNUSED_GRASS 19 +#define FLDEFF_UNUSED_GRASS_2 20 +#define FLDEFF_UNUSED_SAND 21 +#define FLDEFF_UNUSED_WATER_SURFACING 22 #define FLDEFF_BERRY_TREE_GROWTH_SPARKLE 23 #define FLDEFF_DEEP_SAND_FOOTPRINTS 24 #define FLDEFF_POKECENTER_HEAL 25 diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 35c46dd78..814fb38da 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -7,15 +7,15 @@ #include "global.h" -// Exported type declarations - -// Exported RAM declarations - -// Exported ROM declarations +enum { + BOB_NONE, + BOB_PLAYER_AND_MON, + BOB_MON_ONLY, // when player has jumped / flown off +}; u8 CreateWarpArrowSprite(void); -void SetSurfBlob_BobState(u8, u8); -void SetSurfBlob_DontSyncAnim(u8, u8); +void SetSurfBlob_BobState(u8 spriteId, u8 bobState); +void SetSurfBlob_DontSyncAnim(u8 spriteId, bool8 value); void StartAshFieldEffect(s16, s16, u16, s16); void StartRevealDisguise(struct ObjectEvent *); bool8 UpdateRevealDisguise(struct ObjectEvent *); @@ -24,7 +24,7 @@ u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*); u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y); void SetSpriteInvisible(u8 spriteId); -void SetSurfBlob_PlayerOffset(u8 spriteId, u8 hasOffset, s16 offset); +void SetSurfBlob_PlayerOffset(u8 spriteId, bool8 hasOffset, s16 offset); void UpdateJumpImpactEffect(struct Sprite * sprite); void UpdateShadowFieldEffect(struct Sprite * sprite); void UpdateBubblesFieldEffect(struct Sprite * sprite); diff --git a/src/field_effect.c b/src/field_effect.c index e436233f4..6f20a8973 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -3055,7 +3055,7 @@ static void UseSurfEffect_5(struct Task * task) gPlayerAvatar.preventStep = FALSE; gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_CONTROLLABLE; ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->movementDirection)); - SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, 1); + SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, BOB_PLAYER_AND_MON); UnfreezeObjectEvents(); ScriptContext2_Disable(); FieldEffectActiveListRemove(FLDEFF_USE_SURF); @@ -3256,8 +3256,8 @@ static void FlyOutFieldEffect_BirdLeaveBall(struct Task *task) struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING) { - SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, 2); - SetSurfBlob_DontSyncAnim(objectEvent->fieldEffectSpriteId, 0); + SetSurfBlob_BobState(objectEvent->fieldEffectSpriteId, BOB_MON_ONLY); + SetSurfBlob_DontSyncAnim(objectEvent->fieldEffectSpriteId, FALSE); } task->tBirdSpriteId = CreateFlyBirdSprite(); task->tState++; @@ -3538,7 +3538,7 @@ static void FlyInFieldEffect_BirdSwoopDown(struct Task *task) gPlayerAvatar.preventStep = TRUE; SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT); if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING) - SetSurfBlob_BobState(playerObj->fieldEffectSpriteId, 0); + SetSurfBlob_BobState(playerObj->fieldEffectSpriteId, BOB_NONE); ObjectEventSetGraphicsId(playerObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_GFX_RIDE)); CameraObjectReset2(); ObjectEventTurn(playerObj, DIR_WEST); @@ -3630,7 +3630,7 @@ static void FlyInFieldEffect_End(struct Task *task) if (task->tAvatarFlags & PLAYER_AVATAR_FLAG_SURFING) { state = PLAYER_AVATAR_GFX_RIDE; - SetSurfBlob_BobState(playerObj->fieldEffectSpriteId, 1); + SetSurfBlob_BobState(playerObj->fieldEffectSpriteId, BOB_PLAYER_AND_MON); } ObjectEventSetGraphicsId(playerObj, GetPlayerAvatarGraphicsIdByStateId(state)); ObjectEventTurn(playerObj, DIR_SOUTH); diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 4fccc6402..789e0a188 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -3,6 +3,7 @@ #include "event_object_movement.h" #include "field_camera.h" #include "field_effect.h" +#include "field_effect_helpers.h" #include "field_weather.h" #include "fieldmap.h" #include "metatile_behavior.h" @@ -800,10 +801,10 @@ void UpdateHotSpringsWaterFieldEffect(struct Sprite * sprite) } } -u32 FldEff_Unknown19(void) +u32 FldEff_UnusedGrass(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); @@ -812,15 +813,15 @@ u32 FldEff_Unknown19(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data[0] = FLDEFF_UNKNOWN_19; + sprite->data[0] = FLDEFF_UNUSED_GRASS; } return 0; } -u32 FldEff_Unknown20(void) +u32 FldEff_UnusedGrass2(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_GRASS_2], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); @@ -829,15 +830,15 @@ u32 FldEff_Unknown20(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data[0] = FLDEFF_UNKNOWN_20; + sprite->data[0] = FLDEFF_UNUSED_GRASS_2; } return 0; } -u32 FldEff_Unknown21(void) +u32 FldEff_UnusedSand(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_UNUSED_SAND], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); @@ -846,15 +847,15 @@ u32 FldEff_Unknown21(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data[0] = FLDEFF_UNKNOWN_21; + sprite->data[0] = FLDEFF_UNUSED_SAND; } return 0; } -u32 FldEff_Unknown22(void) +u32 FldEff_UnusedWaterSurfacing(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_WATER_SURFACING], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); @@ -863,7 +864,7 @@ u32 FldEff_Unknown22(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->data[0] = FLDEFF_UNKNOWN_22; + sprite->data[0] = FLDEFF_UNUSED_WATER_SURFACING; } return 0; } @@ -939,20 +940,27 @@ static void UpdateAshFieldEffect_Step2(struct Sprite * sprite) FieldEffectStop(sprite, FLDEFF_ASH); } +// Sprite data for surf blob +#define sBitfield data[0] +#define sPlayerOffset data[1] +#define sPlayerObjectId data[2] +#define sBobDirection data[3] +#define sTimer data[4] + u32 FldEff_SurfBlob(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SURF_BLOB], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x96); - if (spriteId !=MAX_SPRITES) + if (spriteId != MAX_SPRITES) { sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.paletteNum = 0; - sprite->data[2] = gFieldEffectArguments[2]; - sprite->data[3] = 0; + sprite->sPlayerObjectId = gFieldEffectArguments[2]; + sprite->sBobDirection = 0; sprite->data[6] = -1; sprite->data[7] = -1; } @@ -960,51 +968,51 @@ u32 FldEff_SurfBlob(void) return spriteId; } -void SetSurfBlob_BobState(u8 spriteId, u8 value) +void SetSurfBlob_BobState(u8 spriteId, u8 bobState) { - gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF) | (value & 0xF); + gSprites[spriteId].sBitfield = (gSprites[spriteId].sBitfield & ~0xF) | (bobState & 0xF); } -void SetSurfBlob_DontSyncAnim(u8 spriteId, u8 value) +void SetSurfBlob_DontSyncAnim(u8 spriteId, bool8 value) { - gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF0) | ((value & 0xF) << 4); + gSprites[spriteId].sBitfield = (gSprites[spriteId].sBitfield & ~0xF0) | ((value & 0xF) << 4); } -void SetSurfBlob_PlayerOffset(u8 spriteId, u8 hasOffset, s16 offset) +void SetSurfBlob_PlayerOffset(u8 spriteId, bool8 hasOffset, s16 offset) { - gSprites[spriteId].data[0] = (gSprites[spriteId].data[0] & ~0xF00) | ((hasOffset & 0xF) << 8); - gSprites[spriteId].data[1] = offset; + gSprites[spriteId].sBitfield = (gSprites[spriteId].sBitfield & ~0xF00) | ((hasOffset & 0xF) << 8); + gSprites[spriteId].sPlayerOffset = offset; } -static u8 GetSurfBlob_BobState(struct Sprite * sprite) +static u8 GetSurfBlob_BobState(struct Sprite *sprite) { - return sprite->data[0] & 0xF; + return sprite->sBitfield & 0xF; } -static u8 GetSurfBlob_DontSyncAnim(struct Sprite * sprite) +static bool8 GetSurfBlob_DontSyncAnim(struct Sprite *sprite) { - return (sprite->data[0] & 0xF0) >> 4; + return (sprite->sBitfield & 0xF0) >> 4; } -static u8 GetSurfBlob_HasPlayerOffset(struct Sprite * sprite) +static bool8 GetSurfBlob_HasPlayerOffset(struct Sprite *sprite) { - return (sprite->data[0] & 0xF00) >> 8; + return (sprite->sBitfield & 0xF00) >> 8; } -void UpdateSurfBlobFieldEffect(struct Sprite * sprite) +void UpdateSurfBlobFieldEffect(struct Sprite *sprite) { - struct ObjectEvent * objectEvent; - struct Sprite * linkedSprite; + struct ObjectEvent *playerObject; + struct Sprite *playerSprite; - objectEvent = &gObjectEvents[sprite->data[2]]; - linkedSprite = &gSprites[objectEvent->spriteId]; - SynchroniseSurfAnim(objectEvent, sprite); - SynchroniseSurfPosition(objectEvent, sprite); - CreateBobbingEffect(objectEvent, linkedSprite, sprite); - sprite->oam.priority = linkedSprite->oam.priority; + playerObject = &gObjectEvents[sprite->sPlayerObjectId]; + playerSprite = &gSprites[playerObject->spriteId]; + SynchroniseSurfAnim(playerObject, sprite); + SynchroniseSurfPosition(playerObject, sprite); + CreateBobbingEffect(playerObject, playerSprite, sprite); + sprite->oam.priority = playerSprite->oam.priority; } -static void SynchroniseSurfAnim(struct ObjectEvent * objectEvent, struct Sprite * sprite) +static void SynchroniseSurfAnim(struct ObjectEvent *objectEvent, struct Sprite *sprite) { u8 surfBlobDirectionAnims[] = { [DIR_NONE] = 0, @@ -1014,62 +1022,70 @@ static void SynchroniseSurfAnim(struct ObjectEvent * objectEvent, struct Sprite [DIR_EAST] = 3 }; - if (GetSurfBlob_DontSyncAnim(sprite) == 0) + if (GetSurfBlob_DontSyncAnim(sprite) == FALSE) StartSpriteAnimIfDifferent(sprite, surfBlobDirectionAnims[objectEvent->movementDirection]); } -void SynchroniseSurfPosition(struct ObjectEvent * objectEvent, struct Sprite * sprite) +void SynchroniseSurfPosition(struct ObjectEvent *playerObject, struct Sprite *surfBlobSprite) { u8 i; - s16 x = objectEvent->currentCoords.x; - s16 y = objectEvent->currentCoords.y; - s32 spriteY = sprite->y2; + s16 x = playerObject->currentCoords.x; + s16 y = playerObject->currentCoords.y; + s32 yOffset = surfBlobSprite->y2; - if (spriteY == 0 && (x != sprite->data[6] || y != sprite->data[7])) + if (yOffset == 0 && (x != surfBlobSprite->data[6] || y != surfBlobSprite->data[7])) { - sprite->data[5] = spriteY; - sprite->data[6] = x; - sprite->data[7] = y; - for (i = DIR_SOUTH; i <= DIR_EAST; i++, x = sprite->data[6], y = sprite->data[7]) + surfBlobSprite->data[5] = yOffset; + surfBlobSprite->data[6] = x; + surfBlobSprite->data[7] = y; + for (i = DIR_SOUTH; i <= DIR_EAST; i++, x = surfBlobSprite->data[6], y = surfBlobSprite->data[7]) { MoveCoords(i, &x, &y); if (MapGridGetZCoordAt(x, y) == 3) { - sprite->data[5]++; + surfBlobSprite->data[5]++; break; } } } } -static void CreateBobbingEffect(struct ObjectEvent * objectEvent, struct Sprite * linkedSprite, struct Sprite * sprite) +static void CreateBobbingEffect(struct ObjectEvent *objectEvent, struct Sprite *playerSprite, struct Sprite *surfBlobSprite) { - u16 unk_83FECFA[] = {7, 15}; - u8 v0 = GetSurfBlob_BobState(sprite); - if (v0 != 0) + u16 intervals[] = {7, 15}; + u8 bobState = GetSurfBlob_BobState(surfBlobSprite); + if (bobState != BOB_NONE) { - if (((u16)(++ sprite->data[4]) & unk_83FECFA[sprite->data[5]]) == 0) + // the surf blob sprite never bobs since sBobDirection will always be 0 + + if (((u16)(++surfBlobSprite->sTimer) & intervals[surfBlobSprite->data[5]]) == 0) + surfBlobSprite->y2 += surfBlobSprite->sBobDirection; + + if ((surfBlobSprite->sTimer & 0x1F) == 0) + surfBlobSprite->sBobDirection = -surfBlobSprite->sBobDirection; + + if (bobState != BOB_MON_ONLY) { - sprite->y2 += sprite->data[3]; - } - if ((sprite->data[4] & 0x1F) == 0) - { - sprite->data[3] = -sprite->data[3]; - } - if (v0 != 2) - { - if (GetSurfBlob_HasPlayerOffset(sprite) == 0) - linkedSprite->y2 = sprite->y2; + if (GetSurfBlob_HasPlayerOffset(surfBlobSprite) == FALSE) + playerSprite->y2 = surfBlobSprite->y2; else - linkedSprite->y2 = sprite->data[1] + sprite->y2; - if (sprite->animCmdIndex != 0) - linkedSprite->y2++; - sprite->x = linkedSprite->x; - sprite->y = linkedSprite->y + 8; + playerSprite->y2 = surfBlobSprite->sPlayerOffset + surfBlobSprite->y2; + + if (surfBlobSprite->animCmdIndex != 0) + playerSprite->y2++; + + surfBlobSprite->x = playerSprite->x; + surfBlobSprite->y = playerSprite->y + 8; } } } +#undef sBitfield +#undef sPlayerOffset +#undef sPlayerObjectId +#undef sBobDirection +#undef sTimer + u8 StartUnderwaterSurfBlobBobbing(u8 oldSpriteId) { u8 spriteId; diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index b406a7e21..e9789560d 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1619,7 +1619,7 @@ static void Task_StopSurfingInit(u8 taskId) if (!ObjectEventClearHeldMovementIfFinished(playerObjEvent)) return; } - SetSurfBlob_BobState(playerObjEvent->fieldEffectSpriteId, 2); + SetSurfBlob_BobState(playerObjEvent->fieldEffectSpriteId, BOB_MON_ONLY); QL_TryRecordPlayerStepWithDuration0(playerObjEvent, GetJumpSpecialWithEffectMovementAction((u8)gTasks[taskId].data[0])); gTasks[taskId].func = Task_WaitStopSurfing; } diff --git a/src/quest_log_player.c b/src/quest_log_player.c index 2a6615d2e..bb7372c35 100644 --- a/src/quest_log_player.c +++ b/src/quest_log_player.c @@ -151,7 +151,7 @@ static void QL_GfxTransition_StartSurf(void) gFieldEffectArguments[2] = gPlayerAvatar.objectEventId; fieldEffectId = FieldEffectStart(FLDEFF_SURF_BLOB); objectEvent->fieldEffectSpriteId = fieldEffectId; - SetSurfBlob_BobState(fieldEffectId, 1); + SetSurfBlob_BobState(fieldEffectId, BOB_PLAYER_AND_MON); } } From 3b98289de222b5ae6fc630981506ebae21e65daf Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 27 Jul 2022 13:16:28 -0400 Subject: [PATCH 31/64] BeginNormalPaletteFade PALETTES_ALL documentation --- src/battle_controller_oak_old_man.c | 4 +-- src/battle_controller_player.c | 8 ++--- src/battle_controller_pokedude.c | 4 +-- src/battle_controller_safari.c | 2 +- src/battle_main.c | 4 +-- src/battle_records.c | 4 +-- src/battle_script_commands.c | 4 +-- src/battle_transition.c | 8 ++--- src/berry_pouch.c | 6 ++-- src/clear_save_data_screen.c | 2 +- src/credits.c | 14 ++++---- src/daycare.c | 10 +++--- src/diploma.c | 4 +-- src/dodrio_berry_picking.c | 8 ++--- src/easy_chat_2.c | 4 +-- src/evolution_scene.c | 14 ++++---- src/fame_checker.c | 4 +-- src/field_weather.c | 4 +-- src/fldeff_flash.c | 4 +-- src/hall_of_fame.c | 6 ++-- src/hof_pc.c | 4 +-- src/intro.c | 4 +-- src/item_menu.c | 8 ++--- src/item_pc.c | 6 ++-- src/learn_move.c | 12 +++---- src/link.c | 2 +- src/mail.c | 4 +-- src/main_menu.c | 12 +++---- src/mevent_show_card.c | 8 ++--- src/mevent_show_news.c | 8 ++--- src/naming_screen.c | 4 +-- src/oak_speech.c | 16 ++++----- src/option_menu.c | 4 +-- src/overworld.c | 2 +- src/party_menu.c | 6 ++-- src/party_menu_specials.c | 4 +-- src/pokedex_screen.c | 6 ++-- src/pokemon_special_anim.c | 12 +++---- src/pokemon_storage_system_3.c | 8 ++--- src/pokemon_summary_screen.c | 10 +++--- src/quest_log.c | 2 +- src/region_map.c | 12 +++---- src/seagallop.c | 2 +- src/shop.c | 4 +-- src/slot_machine.c | 4 +-- src/start_menu.c | 4 +-- src/teachy_tv.c | 4 +-- src/title_screen.c | 2 +- src/tm_case.c | 6 ++-- src/trade.c | 16 ++++----- src/trade_scene.c | 42 +++++++++++----------- src/trainer_card.c | 10 +++--- src/union_room_battle.c | 4 +-- src/union_room_chat.c | 4 +-- src/wireless_communication_status_screen.c | 4 +-- 55 files changed, 189 insertions(+), 189 deletions(-) diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c index c1ca1ff93..4ee059169 100644 --- a/src/battle_controller_oak_old_man.c +++ b/src/battle_controller_oak_old_man.c @@ -1874,7 +1874,7 @@ static void OakOldManHandleChooseItem(void) { s32 i; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem; gBattlerInMenuId = gActiveBattler; for (i = 0; i < 3; ++i) @@ -1892,7 +1892,7 @@ static void OakOldManHandleChoosePokemon(void) *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; for (i = 0; i < 3; ++i) gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i]; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerInMenuId = gActiveBattler; } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index c1e06dd1a..399fd9464 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -2263,7 +2263,7 @@ static void PlayerHandleFaintAnimation(void) static void PlayerHandlePaletteFade(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 2, 0, 16, RGB_BLACK); PlayerBufferExecCompleted(); } @@ -2449,7 +2449,7 @@ static void PlayerHandleChooseItem(void) { s32 i; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem; gBattlerInMenuId = gActiveBattler; for (i = 0; i < 3; ++i) @@ -2467,7 +2467,7 @@ static void PlayerHandleChoosePokemon(void) *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; for (i = 0; i < 3; ++i) gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i]; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerInMenuId = gActiveBattler; } @@ -2475,7 +2475,7 @@ static void PlayerHandleChoosePokemon(void) static void PlayerHandleCmd23(void) { BattleStopLowHpSound(); - BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 2, 0, 16, RGB_BLACK); PlayerBufferExecCompleted(); } diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 71d9257f3..8e27162ae 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -1610,7 +1610,7 @@ static void PokedudeHandleChooseItem(void) { s32 i; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gBattlerControllerFuncs[gActiveBattler] = OpenBagAndChooseItem; gBattlerInMenuId = gActiveBattler; for (i = 0; i < 3; ++i) @@ -1628,7 +1628,7 @@ static void PokedudeHandleChoosePokemon(void) *(&gBattleStruct->abilityPreventingSwitchout) = gBattleBufferA[gActiveBattler][3]; for (i = 0; i < 3; ++i) gBattlePartyCurrentOrder[i] = gBattleBufferA[gActiveBattler][4 + i]; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gBattlerControllerFuncs[gActiveBattler] = OpenPartyMenuToChooseMon; gBattlerInMenuId = gActiveBattler; } diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 9f1b59f91..0fd72ed10 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -461,7 +461,7 @@ static void SafariHandleChooseItem(void) { s32 i; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase; gBattlerInMenuId = gActiveBattler; } diff --git a/src/battle_main.c b/src/battle_main.c index 5e870c6e7..6eddf65d3 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1436,7 +1436,7 @@ void BattleMainCB2(void) { gSpecialVar_Result = gBattleOutcome = B_OUTCOME_DREW; ResetPaletteFadeControl(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); SetMainCallback2(CB2_QuitPokedudeBattle); } } @@ -1779,7 +1779,7 @@ static void EndLinkBattleInSteps(void) case 1: if (--gBattleCommunication[1] == 0) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); ++gBattleCommunication[MULTIUSE_STATE]; } break; diff --git a/src/battle_records.c b/src/battle_records.c index 7653561b7..2eb997717 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -127,7 +127,7 @@ static void MainCB2_SetUp(void) gMain.state++; break; case 6: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); gMain.state++; break; case 7: @@ -178,7 +178,7 @@ static void Task_WaitButton(u8 taskId) static void Task_FadeOut(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_DestroyAndReturnToField; } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a11362ab2..19ec1d615 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5009,7 +5009,7 @@ static void atk5A_yesnoboxlearnmove(void) if (gBattleCommunication[1] == 0) { HandleBattleWindow(0x17, 0x8, 0x1D, 0xD, WINDOW_CLEAR); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); ++gBattleScripting.learnMoveState; } else @@ -9173,7 +9173,7 @@ static void atkF2_displaydexinfo(void) switch (gBattleCommunication[0]) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_WHITE); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_WHITE); ++gBattleCommunication[0]; break; case 1: diff --git a/src/battle_transition.c b/src/battle_transition.c index 5dd796aa5..7b6ad2a87 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -711,7 +711,7 @@ static bool8 BT_Phase2Blur_Anim(struct Task *task) { task->tInterval = 2; if (++task->tMosaicSize == 10) - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 0x10, RGB_BLACK); // The mosaic size argument is shared by HSIZE and VSIZE SetGpuReg(REG_OFFSET_MOSAIC, (task->tMosaicSize & 0xF) + ((task->tMosaicSize & 0xF) << 4)); if (task->tMosaicSize > 14) @@ -742,7 +742,7 @@ static bool8 BT_Phase2DistortedWave_InitWave(struct Task *task) { BT_InitCtrlBlk(); ScanlineEffect_Clear(); - BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 4, 0, 0x10, RGB_BLACK); BT_LoadWaveIntoBuffer(gScanlineEffectRegBuffers[1], sTransitionStructPtr->bg123HOfs, 0, 2, 0, 160); SetVBlankCallback(VBCB_BT_Phase2DistortedWave); SetHBlankCallback(HBCB_BT_Phase2DistortedWave); @@ -788,7 +788,7 @@ static bool8 BT_Phase2HorizontalCorrugate_Init(struct Task *task) { BT_InitCtrlBlk(); ScanlineEffect_Clear(); - BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 4, 0, 0x10, RGB_BLACK); memset(gScanlineEffectRegBuffers[1], sTransitionStructPtr->bg123VOfs, 320); SetVBlankCallback(VBCB_BT_Phase2HorizontalCorrugate); SetHBlankCallback(HBCB_BT_Phase2HorizontalCorrugate); @@ -1382,7 +1382,7 @@ static bool8 BT_Phase2FullScreenWave_UpdateWave(struct Task *task) if (++task->tDelayForFade == 41) { ++task->tStartFade; - BeginNormalPaletteFade(0xFFFFFFFF, -8, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -8, 0, 0x10, RGB_BLACK); } if (task->tStartFade && !gPaletteFade.active) DestroyTask(FindTaskIdByFunc(BT_Phase2FullScreenWave)); diff --git a/src/berry_pouch.c b/src/berry_pouch.c index 96c05f18c..086dfc2f4 100644 --- a/src/berry_pouch.c +++ b/src/berry_pouch.c @@ -556,7 +556,7 @@ static bool8 RunBerryPouchInit(void) gMain.state++; break; case 18: - BeginNormalPaletteFade(0xFFFFFFFF, -2, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -2, 16, 0, RGB_BLACK); gMain.state++; break; default: @@ -570,7 +570,7 @@ static bool8 RunBerryPouchInit(void) static void AbortBerryPouchLoading(void) { - BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK); CreateTask(Task_AbortBerryPouchLoading_WaitFade, 0); SetVBlankCallback(VBlankCB_BerryPouchIdle); SetMainCallback2(CB2_BerryPouchIdle); @@ -859,7 +859,7 @@ static void BerryPouch_DestroyResources(void) void BerryPouch_StartFadeToExitCallback(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_BerryPouchFadeToExitCallback; } diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 74e48be00..4b68b49bb 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -90,7 +90,7 @@ static void Task_DrawClearSaveDataScreen(u8 taskId) switch (sClearSaveDataState->unk1) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); break; case 1: if (gPaletteFade.active) diff --git a/src/credits.c b/src/credits.c index e3d2e1fdb..ce08606e6 100644 --- a/src/credits.c +++ b/src/credits.c @@ -899,7 +899,7 @@ static s32 RollCredits(void) case CREDITSSCRCMD_THEENDGFX: sCreditsMgr->mainseqno = CREDITSSCENE_THEEND_DESTROY_ASSETS; sCreditsMgr->whichMon = sCreditsScript[sCreditsMgr->scrcmdidx].param; - BeginNormalPaletteFade(0xFFFFFFFF, 4, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 4, 0, 16, RGB_BLACK); break; case CREDITSSCRCMD_WAITBUTTON: sCreditsMgr->mainseqno = CREDITSSCENE_WAITBUTTON; @@ -1004,7 +1004,7 @@ static s32 RollCredits(void) case CREDITSSCENE_WAITBUTTON: if (JOY_NEW(A_BUTTON)) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_WHITE); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_WHITE); sCreditsMgr->mainseqno = CREDITSSCENE_TERMINATE; return 0; } @@ -1015,7 +1015,7 @@ static s32 RollCredits(void) else { sCreditsMgr->mainseqno = CREDITSSCENE_TERMINATE; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_WHITE); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_WHITE); } return 0; case CREDITSSCENE_TERMINATE: @@ -1136,7 +1136,7 @@ static bool32 DoCreditsMonScene(void) case 2: ShowBg(2); ShowBg(0); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); sCreditsMgr->creditsMonTimer = 40; sCreditsMgr->subseqno++; break; @@ -1200,7 +1200,7 @@ static bool32 DoCreditsMonScene(void) sCreditsMgr->creditsMonTimer--; else { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sCreditsMgr->subseqno++; } break; @@ -1251,9 +1251,9 @@ static bool32 DoCopyrightOrTheEndGfxScene(void) case 2: ShowBg(0); if (sCreditsMgr->whichMon != 0) - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0, RGB_BLACK); else - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); sCreditsMgr->subseqno++; break; case 3: diff --git a/src/daycare.c b/src/daycare.c index be1c125f8..a3b6b8258 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1758,7 +1758,7 @@ void EggHatch(void) { ScriptContext2_Enable(); CreateTask(Task_EggHatch, 10); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0); HelpSystem_Disable(); } @@ -1895,7 +1895,7 @@ static void CB2_EggHatch_1(void) switch (sEggHatchData->CB2_state) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK); sEggHatchData->eggSpriteID = CreateSprite(&sSpriteTemplate_EggHatch, 120, 75, 5); ShowBg(0); ShowBg(1); @@ -1977,7 +1977,7 @@ static void CB2_EggHatch_1(void) } break; case 11: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); sEggHatchData->CB2_state++; break; case 12: @@ -2087,7 +2087,7 @@ static void SpriteCB_Egg_4(struct Sprite* sprite) { s16 i; if (sprite->data[0] == 0) - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 0x10, 0xFFFF); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 0x10, 0xFFFF); if (sprite->data[0] < 4u) { for (i = 0; i <= 3; i++) @@ -2111,7 +2111,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite) StartSpriteAffineAnim(&gSprites[sEggHatchData->pokeSpriteID], 1); } if (sprite->data[0] == 8) - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, 0xFFFF); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0x10, 0, 0xFFFF); if (sprite->data[0] <= 9) gSprites[sEggHatchData->pokeSpriteID].y -= 1; if (sprite->data[0] > 40) diff --git a/src/diploma.c b/src/diploma.c index 38df40663..14ea9814d 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -138,7 +138,7 @@ static void Task_DiplomaInit(u8 taskId) CopyBgTilemapBufferToVram(1); break; case 7: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); break; case 8: SetVBlankCallback(VCBC_DiplomaOam); @@ -167,7 +167,7 @@ static void Task_WaitForExit(u8 taskId) case 1: if (JOY_NEW(A_BUTTON)) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gDiploma->state++; } break; diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 53af1f48c..377a9661e 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -333,7 +333,7 @@ static void sub_8150A84(u8 taskId) break; case 6: BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); SetVBlankCallback(sub_8152034); gUnknown_203F3E0->unk0C++; break; @@ -834,7 +834,7 @@ static void sub_81514F0(void) switch (gUnknown_203F3E0->unk10) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gUnknown_203F3E0->unk10++; break; case 1: @@ -871,7 +871,7 @@ static void sub_815159C(void) { case 0: sub_81549D4(9); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gUnknown_203F3E0->unk10++; break; case 1: @@ -903,7 +903,7 @@ static void sub_815159C(void) break; case 5: BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); gUnknown_203F3E0->unk10++; break; case 6: diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 948b7c39f..fd445d827 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -163,14 +163,14 @@ static void Task_RunEasyChat(u8 taskId) case 0: SetVBlankCallback(VBlankCallback_EasyChatScreen); BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); data[EZCHAT_TASK_STATE]++; break; case 1: action = EasyChatScreen_HandleJoypad(); if (action == 23) { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK); data[EZCHAT_TASK_STATE] = 3; } else if (action != 0) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index ffbec26ba..2dcd7f4aa 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -168,7 +168,7 @@ static void Task_BeginEvolutionScene(u8 taskId) switch (gTasks[taskId].tState) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].tState++; break; case 1: @@ -366,7 +366,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) SetVBlankCallback(VBlankCB_EvolutionScene); SetMainCallback2(CB2_EvolutionSceneUpdate); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK); ShowBg(0); ShowBg(1); @@ -450,7 +450,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gMain.state++; break; case 7: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK); InitTradeSequenceBgGpuRegs(); ShowBg(0); ShowBg(1); @@ -610,7 +610,7 @@ static void Task_EvolutionScene(u8 taskId) switch (gTasks[taskId].tState) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK); gSprites[sEvoStructPtr->preEvoSpriteId].invisible = FALSE; gTasks[taskId].tState++; ShowBg(0); @@ -755,7 +755,7 @@ static void Task_EvolutionScene(u8 taskId) } else // no move to learn { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].tState++; } } @@ -889,7 +889,7 @@ static void Task_EvolutionScene(u8 taskId) { gTasks[taskId].tLearnMoveState = gTasks[taskId].tData7; if (gTasks[taskId].tLearnMoveState == 5) - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); } } if (JOY_NEW(B_BUTTON)) @@ -1234,7 +1234,7 @@ static void Task_TradeEvolutionScene(u8 taskId) DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); gTasks[taskId].tLearnMoveState = gTasks[taskId].tData7; if (gTasks[taskId].tLearnMoveState == 5) - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); break; case 1: case -1: diff --git a/src/fame_checker.c b/src/fame_checker.c index 7e3923b5b..4164fdea3 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -695,7 +695,7 @@ static void MainCB2_LoadFameChecker(void) LoadUISpriteSheetsAndPalettes(); CreateAllFlavorTextIcons(FAMECHECKER_OAK); WipeMsgBoxAndTransfer(); - BeginNormalPaletteFade(0xFFFFFFFF,0, 16, 0, 0); + BeginNormalPaletteFade(PALETTES_ALL,0, 16, 0, 0); gMain.state++; break; case 7: @@ -1010,7 +1010,7 @@ static bool8 SetMessageSelectorIconObjMode(u8 spriteId, u8 objMode) static void Task_StartToCloseFameChecker(u8 taskId) { PlaySE(SE_M_SWIFT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0); gTasks[taskId].func = Task_DestroyAssetsAndCloseFameChecker; } diff --git a/src/field_weather.c b/src/field_weather.c index e36f1a23c..6322306c6 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -763,7 +763,7 @@ void FadeScreen(u8 mode, s8 delay) if (useWeatherPal) CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_SIZE); - BeginNormalPaletteFade(0xFFFFFFFF, delay, 0, 16, fadeColor); + BeginNormalPaletteFade(PALETTES_ALL, delay, 0, 16, fadeColor); gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; } else @@ -772,7 +772,7 @@ void FadeScreen(u8 mode, s8 delay) if (useWeatherPal) gWeatherPtr->fadeScreenCounter = 0; else - BeginNormalPaletteFade(0xFFFFFFFF, delay, 16, 0, fadeColor); + BeginNormalPaletteFade(PALETTES_ALL, delay, 16, 0, fadeColor); gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_IN; gWeatherPtr->fadeInActive = 1; diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index 067e17162..b84675009 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -443,7 +443,7 @@ static void Task_MapPreviewScreen_0(u8 taskId) case 2: if (!IsDma3ManagerBusyWithBgCopy()) { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); SetVBlankCallback((IntrCallback)GetWordTaskArg(taskId, 5)); data[0]++; } @@ -459,7 +459,7 @@ static void Task_MapPreviewScreen_0(u8 taskId) data[1]++; if (data[1] > data[2] || JOY_HELD(B_BUTTON)) { - BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_WHITE); + BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_WHITE); data[0]++; } break; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 4c2ee703a..4f3d9aff2 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -339,7 +339,7 @@ static bool8 InitHallOfFameScreen(void) if (!DrawHofBackground()) { SetVBlankCallback(VBlankCB_HofIdle); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); gMain.state++; } break; @@ -560,7 +560,7 @@ static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId) { u16 i; - BeginNormalPaletteFade(0xFFFF0000, 0, 0, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_OBJECTS, 0, 0, 0, RGB_BLACK); for (i = 0; i < PARTY_SIZE; i++) { if (gTasks[taskId].data[5 + i] != 0xFF) @@ -656,7 +656,7 @@ static void Task_Hof_ExitOnKeyPressed(u8 taskId) static void Task_Hof_HandlePaletteOnExit(u8 taskId) { CpuCopy16(gPlttBufferFaded, gPlttBufferUnfaded, PLTT_BUFFER_SIZE * sizeof(u16)); - BeginNormalPaletteFade(0xFFFFFFFF, 8, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 8, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_Hof_HandleExit; } diff --git a/src/hof_pc.c b/src/hof_pc.c index 6f21d3c32..4bbbc7bec 100644 --- a/src/hof_pc.c +++ b/src/hof_pc.c @@ -22,7 +22,7 @@ static void Task_WaitFadeAndSetCallback(u8 taskId) void HallOfFamePCBeginFade(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); ScriptContext2_Enable(); CreateTask(Task_WaitFadeAndSetCallback, 0); } @@ -39,7 +39,7 @@ static void ReshowPCMenuAfterHallOfFamePC(void) Overworld_PlaySpecialMapMusic(); CreatePCMenu(); ScriptMenu_DisplayPCStartupPrompt(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK); CreateTask(Task_WaitForPaletteFade, 10); } diff --git a/src/intro.c b/src/intro.c index c42d27350..5583d5ba7 100644 --- a/src/intro.c +++ b/src/intro.c @@ -811,7 +811,7 @@ static bool8 RunCopyrightScreen(void) ResetTasks(); ResetSpriteData(); FreeAllSpritePalettes(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0xFFFF); SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_16COLOR | BGCNT_SCREENBASE(7)); EnableInterrupts(INTR_FLAG_VBLANK); SetVBlankCallback(VBlankCB_Copyright); @@ -828,7 +828,7 @@ static bool8 RunCopyrightScreen(void) GameCubeMultiBoot_Main(&sGcmb); if (sGcmb.gcmb_field_2 != 1) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gMain.state++; } break; diff --git a/src/item_menu.c b/src/item_menu.c index 91ccdf6ec..843df277f 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -512,7 +512,7 @@ static bool8 LoadBagMenuGraphics(void) static void FadeOutOfBagMenu(void) { - BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK); CreateTask(Task_WaitFadeOutOfBagMenu, 0); SetVBlankCallback(VBlankCB_BagMenuRun); SetMainCallback2(CB2_BagMenuRun); @@ -897,7 +897,7 @@ static void DestroyBagMenuResources(void) void ItemMenu_StartFadeToExitCallback(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_ItemMenu_WaitFadeAndSwitchToExitCallback; } @@ -926,7 +926,7 @@ static void ShowBagOrBeginWin0OpenTask(void) SetGpuReg(REG_OFFSET_WININ, 0); SetGpuReg(REG_OFFSET_WINOUT, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); if (gBagMenuState.bagOpen == TRUE) { SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 240)); @@ -2144,7 +2144,7 @@ static void Task_Bag_OldManTutorial(u8 taskId) static void Task_Pokedude_FadeFromBag(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_Pokedude_WaitFadeAndExitBag; } diff --git a/src/item_pc.c b/src/item_pc.c index aaebd0b77..628e4f2f7 100644 --- a/src/item_pc.c +++ b/src/item_pc.c @@ -368,7 +368,7 @@ static bool8 ItemPc_DoGfxSetup(void) case 19: if (sListMenuState.initialized == 1) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); } else { @@ -392,7 +392,7 @@ static bool8 ItemPc_DoGfxSetup(void) static void ItemPc_FadeAndBail(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); CreateTask(Task_ItemPcWaitFadeAndBail, 0); SetVBlankCallback(ItemPc_VBlankCB); SetMainCallback2(ItemPc_MainCB); @@ -632,7 +632,7 @@ static void Task_ItemPcTurnOff1(u8 taskId) { if (sListMenuState.initialized == 1) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); } else { diff --git a/src/learn_move.c b/src/learn_move.c index b6cb6d532..9927949aa 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -368,7 +368,7 @@ void DisplayMoveTutorMenu(void) { ScriptContext2_Enable(); CreateTask(Task_InitMoveRelearnerMenu, 10); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); } static void Task_InitMoveRelearnerMenu(u8 taskId) @@ -480,7 +480,7 @@ static void MoveRelearnerStateMachine(void) switch (sMoveRelearner->state) { case MENU_STATE_FADE_TO_BLACK: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); ShowBg(0); ShowBg(1); LoadMoveInfoUI(); @@ -593,7 +593,7 @@ static void MoveRelearnerStateMachine(void) break; case MENU_STATE_PRINT_WHICH_MOVE_PROMPT: sMoveRelearner->state = 20; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); break; case MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN: if (!gPaletteFade.active) @@ -608,10 +608,10 @@ static void MoveRelearnerStateMachine(void) sMoveRelearner->state = 14; break; case 22: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); break; case MENU_STATE_FADE_AND_RETURN: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sMoveRelearner->state++; break; case MENU_STATE_RETURN_TO_FIELD: @@ -623,7 +623,7 @@ static void MoveRelearnerStateMachine(void) } break; case MENU_STATE_FADE_FROM_SUMMARY_SCREEN: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); ShowBg(0); ShowBg(1); sMoveRelearner->state++; diff --git a/src/link.c b/src/link.c index c0d1ed2c4..36279b6fe 100644 --- a/src/link.c +++ b/src/link.c @@ -449,7 +449,7 @@ void LinkTestProcessKeyInput(void) } if (JOY_NEW(L_BUTTON)) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(2, 0, 0)); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB(2, 0, 0)); } if (JOY_NEW(START_BUTTON)) { diff --git a/src/mail.c b/src/mail.c index bf4b3eba9..114a006e8 100644 --- a/src/mail.c +++ b/src/mail.c @@ -609,7 +609,7 @@ static bool8 DoInitMailView(void) ShowBg(0); ShowBg(1); ShowBg(2); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); gPaletteFade.bufferTransferDisabled = FALSE; sMailViewResources->showMailCallback = ShowMailCB_WaitFadeIn; return TRUE; @@ -707,7 +707,7 @@ static void ShowMailCB_WaitButton(void) { if (JOY_NEW(A_BUTTON | B_BUTTON)) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sMailViewResources->showMailCallback = ShowMailCB_Teardown; } } diff --git a/src/main_menu.c b/src/main_menu.c index ec41654d0..e02f557e1 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -280,7 +280,7 @@ static void PrintSaveErrorStatus(u8 taskId, const u8 *str) { PrintMessageOnWindow4(str); gTasks[taskId].func = Task_SaveErrorStatus_RunPrinterThenWaitButton; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0xFFFF); ShowBg(0); SetVBlankCallback(VBlankCB_MainMenu); } @@ -395,7 +395,7 @@ static void Task_WaitDma3AndFadeIn(u8 taskId) if (WaitDma3Request(-1) != -1) { gTasks[taskId].func = Task_UpdateVisualSelection; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0xFFFF); ShowBg(0); SetVBlankCallback(VBlankCB_MainMenu); } @@ -453,7 +453,7 @@ static void Task_ExecuteMainMenuSelection(u8 taskId) { SetStdFrame0OnBg(0); gTasks[taskId].func = Task_MysteryGiftError; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); return; } else @@ -515,7 +515,7 @@ static void Task_MysteryGiftError(u8 taskId) if (JOY_NEW(A_BUTTON | B_BUTTON)) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_ReturnToTileScreen; } break; @@ -571,13 +571,13 @@ static bool8 HandleMenuInput(u8 taskId) { PlaySE(SE_SELECT); IsWirelessAdapterConnected(); // called for its side effects only - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_ExecuteMainMenuSelection; } else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 240)); SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0, 160)); gTasks[taskId].func = Task_ReturnToTileScreen; diff --git a/src/mevent_show_card.c b/src/mevent_show_card.c index 404aba87d..3270052f7 100644 --- a/src/mevent_show_card.c +++ b/src/mevent_show_card.c @@ -170,7 +170,7 @@ s32 FadeToWonderCardMenu(void) switch(sMEventScreenData->state) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); break; case 1: if (UpdatePaletteFade()) @@ -214,7 +214,7 @@ s32 FadeToWonderCardMenu(void) ShowBg(2); gPaletteFade.bufferTransferDisabled = FALSE; sub_8146060(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); UpdatePaletteFade(); break; default: @@ -234,7 +234,7 @@ s32 FadeOutFromWonderCard(bool32 flag) switch (sMEventScreenData->state) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); break; case 1: if (UpdatePaletteFade()) @@ -264,7 +264,7 @@ s32 FadeOutFromWonderCard(bool32 flag) break; case 6: CopyBgTilemapBufferToVram(0); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); break; default: if (UpdatePaletteFade()) diff --git a/src/mevent_show_news.c b/src/mevent_show_news.c index cb7ff9dbd..91a80739c 100644 --- a/src/mevent_show_news.c +++ b/src/mevent_show_news.c @@ -105,7 +105,7 @@ s32 FadeToWonderNewsMenu(void) switch (sWork->state) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); break; case 1: if (UpdatePaletteFade()) @@ -158,7 +158,7 @@ s32 FadeToWonderNewsMenu(void) ShowBg(3); gPaletteFade.bufferTransferDisabled = FALSE; sWork->menuIndicatorsId = AddScrollIndicatorArrowPair(&sWork->scrollArrowsTemplate, &sWork->scrollOffset); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); UpdatePaletteFade(); break; default: @@ -179,7 +179,7 @@ s32 FadeOutFromWonderNews(bool32 flag) switch (sWork->state) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); break; case 1: if (UpdatePaletteFade()) @@ -223,7 +223,7 @@ s32 FadeOutFromWonderNews(bool32 flag) MG_DrawCheckerboardPattern(); CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(3); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); break; default: if (UpdatePaletteFade()) diff --git a/src/naming_screen.c b/src/naming_screen.c index b0f267c8c..a226e73d1 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -609,7 +609,7 @@ static bool8 MainState_BeginFadeIn(void) CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(3); BlendPalettes(-1, 16, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); sNamingScreenData->state++; return FALSE; } @@ -663,7 +663,7 @@ static bool8 pokemon_store(void) static bool8 MainState_BeginFadeInOut(void) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sNamingScreenData->state++; return FALSE; } diff --git a/src/oak_speech.c b/src/oak_speech.c index 1946cfd56..e48356d64 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -573,7 +573,7 @@ static void Task_OaksSpeech1(u8 taskId) BlendPalettes(0xFFFFFFFF, 0x10, 0x00); break; case 10: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON); ShowBg(0); ShowBg(1); @@ -693,7 +693,7 @@ static void Task_OakSpeech3(u8 taskId) } else { - BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, 0); + BeginNormalPaletteFade(PALETTES_ALL, 2, 0, 16, 0); gTasks[taskId].func = Task_OakSpeech5; } } @@ -752,7 +752,7 @@ static void Task_OakSpeech6(u8 taskId) gSprites[data[5]].oam.objMode = ST_OAM_OBJ_BLEND; gSprites[data[5]].oam.priority = 0; CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 0); - BeginNormalPaletteFade(0xFFFFFFFF, 2, 16, 0, 0); + BeginNormalPaletteFade(PALETTES_ALL, 2, 16, 0, 0); gTasks[taskId].func = Task_OakSpeech7; } } @@ -850,7 +850,7 @@ static void Task_OakSpeech7(u8 taskId) SetGpuReg(REG_OFFSET_WININ, 0); SetGpuReg(REG_OFFSET_WINOUT, 0); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); - BeginNormalPaletteFade(0xFFFFFFFF, 2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 2, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_OakSpeech8; } break; @@ -894,7 +894,7 @@ static void Task_OakSpeech9(u8 taskId) LoadOaksSpeechTrainerPic(OAK_PIC, 0); CreatePikaOrGrassPlatformSpriteAndLinkToCurrentTask(taskId, 1); PlayBGM(MUS_ROUTE24); - BeginNormalPaletteFade(0xFFFFFFFF, 5, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 5, 16, 0, RGB_BLACK); data[3] = 80; ShowBg(2); gTasks[taskId].func = Task_OakSpeech10; @@ -1150,7 +1150,7 @@ static void Task_OakSpeech24(u8 taskId) { if (!IsTextPrinterActive(0)) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sOakSpeechResources->hasPlayerBeenNamed = FALSE; gTasks[taskId].func = Task_OakSpeech25; } @@ -1209,7 +1209,7 @@ static void Task_OakSpeech29(u8 taskId) break; case 0: PlaySE(SE_SELECT); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0); gTasks[taskId].func = Task_OakSpeech25; break; case -1: @@ -1610,7 +1610,7 @@ static void CB2_ReturnFromNamingScreen(void) gTasks[taskId].data[15] = 1; break; case 7: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON); ShowBg(0); ShowBg(1); diff --git a/src/option_menu.c b/src/option_menu.c index 0d7d22071..94d476e68 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -361,7 +361,7 @@ static void Task_OptionMenu(u8 taskId) switch (sOptionMenuPtr->loadState) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK); OptionMenu_SetVBlankCallback(); sOptionMenuPtr->loadState++; break; @@ -394,7 +394,7 @@ static void Task_OptionMenu(u8 taskId) } break; case 3: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); sOptionMenuPtr->loadState++; break; case 4: diff --git a/src/overworld.c b/src/overworld.c index d0e8d1260..bca973ceb 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -2516,7 +2516,7 @@ static void CameraCB_CreditsPan(struct CameraObject * camera) static void Task_OvwldCredits_FadeOut(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_OvwldCredits_WaitFade; } diff --git a/src/party_menu.c b/src/party_menu.c index 56ea1fa34..e05d9a9e1 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -578,7 +578,7 @@ static bool8 ShowPartyMenu(void) ++gMain.state; break; case 22: - BeginNormalPaletteFade(0xFFFFFFFF, -2, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -2, 16, 0, RGB_BLACK); gPaletteFade.bufferTransferDisabled = FALSE; ++gMain.state; break; @@ -592,7 +592,7 @@ static bool8 ShowPartyMenu(void) static void ExitPartyMenu(void) { - BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK); CreateTask(Task_ExitPartyMenu, 0); SetVBlankCallback(VBlankCB_PartyMenu); SetMainCallback2(CB2_UpdatePartyMenu); @@ -1077,7 +1077,7 @@ static void SwapPartyPokemon(struct Pokemon *mon1, struct Pokemon *mon2) static void Task_ClosePartyMenu(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_ClosePartyMenuAndSetCB2; } diff --git a/src/party_menu_specials.c b/src/party_menu_specials.c index 03e77f52c..aaa066980 100644 --- a/src/party_menu_specials.c +++ b/src/party_menu_specials.c @@ -18,7 +18,7 @@ void ChoosePartyMon(void) ScriptContext2_Enable(); taskId = CreateTask(sub_80BF97C, 10); gTasks[taskId].data[0] = PARTY_MENU_TYPE_CHOOSE_MON; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); } void SelectMoveTutorMon(void) @@ -28,7 +28,7 @@ void SelectMoveTutorMon(void) ScriptContext2_Enable(); taskId = CreateTask(sub_80BF97C, 10); gTasks[taskId].data[0] = PARTY_MENU_TYPE_MOVE_RELEARNER; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); } static void sub_80BF97C(u8 taskId) diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index fca338e03..491db3408 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -947,7 +947,7 @@ bool8 DoClosePokedex(void) switch (gMain.state) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gMain.state++; return FALSE; case 1: @@ -1017,7 +1017,7 @@ static void Task_PokedexScreen(u8 taskId) if (gPaletteFade.bufferTransferDisabled) { gPaletteFade.bufferTransferDisabled = FALSE; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0, RGB_WHITEALPHA); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0, RGB_WHITEALPHA); } else BeginNormalPaletteFade(~0x8000, 0, 16, 0, RGB_WHITEALPHA); @@ -3355,7 +3355,7 @@ static void Task_DexScreen_RegisterMonToPokedex(u8 taskId) break; case 4: gPaletteFade.bufferTransferDisabled = 0; - BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0xffff); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0xffff); ShowBg(3); ShowBg(2); ShowBg(1); diff --git a/src/pokemon_special_anim.c b/src/pokemon_special_anim.c index f16e111e2..f319512dd 100644 --- a/src/pokemon_special_anim.c +++ b/src/pokemon_special_anim.c @@ -179,7 +179,7 @@ static void Task_UseItem_Normal(u8 taskId) case 1: if (!PokemonSpecialAnimSceneInitIsNotFinished()) { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); ptr->state++; SetVBlankCallback(VBlankCB_PSA); } @@ -249,7 +249,7 @@ static void Task_UseItem_Normal(u8 taskId) { if (CheckIfItemIsTMHMOrEvolutionStone(ptr->itemId) != 2) // evo stone { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK); ptr->state++; } else @@ -289,7 +289,7 @@ static void Task_ForgetMove(u8 taskId) case 1: if (!PokemonSpecialAnimSceneInitIsNotFinished()) { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); ptr->state++; SetVBlankCallback(VBlankCB_PSA); } @@ -398,7 +398,7 @@ static void Task_EvoStone_CantEvolve(u8 taskId) case 1: if (!PokemonSpecialAnimSceneInitIsNotFinished()) { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); ptr->state++; SetVBlankCallback(VBlankCB_PSA); } @@ -438,7 +438,7 @@ static void Task_EvoStone_CantEvolve(u8 taskId) case 8: if (JOY_NEW(A_BUTTON | B_BUTTON)) { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK); ptr->state++; } break; @@ -475,7 +475,7 @@ static void Task_UseTM_NoForget(u8 taskId) case 1: if (!PokemonSpecialAnimSceneInitIsNotFinished()) { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); ptr->state++; SetVBlankCallback(VBlankCB_PSA); } diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index e6181c797..61925475e 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -584,7 +584,7 @@ static void Cb_ReshowPSS(u8 taskId) switch (gPSSData->state) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0x10, 0, RGB_BLACK); gPSSData->state++; break; case 1: @@ -1860,7 +1860,7 @@ static void Cb_NameBox(u8 taskId) { case 0: sub_8093630(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gPSSData->state++; break; case 1: @@ -1880,7 +1880,7 @@ static void Cb_ShowMonSummary(u8 taskId) { case 0: sub_80936B8(); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gPSSData->state++; break; case 1: @@ -1899,7 +1899,7 @@ static void Cb_GiveItemFromBag(u8 taskId) switch (gPSSData->state) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gPSSData->state++; break; case 1: diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 0635d984d..98d4a4f80 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -1102,7 +1102,7 @@ static void Task_InputHandler_Info(u8 taskId) { switch (sMonSummaryScreen->state3270) { case PSS_STATE3270_FADEIN: - BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0); sMonSummaryScreen->state3270 = PSS_STATE3270_PLAYCRY; break; case PSS_STATE3270_PLAYCRY: @@ -1211,7 +1211,7 @@ static void Task_InputHandler_Info(u8 taskId) } break; case PSS_STATE3270_ATEXIT_FADEOUT: - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0); sMonSummaryScreen->state3270 = PSS_STATE3270_ATEXIT_WAITLINKDELAY; break; case PSS_STATE3270_ATEXIT_WAITLINKDELAY: @@ -1958,7 +1958,7 @@ static void CB2_SetUpPSS(void) CommitStaticWindowTilemaps(); break; case 13: - BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0); CopyWindowToVram(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME], 2); CopyWindowToVram(sMonSummaryScreen->windowIds[POKESUM_WIN_CONTROLS], 2); CopyWindowToVram(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2); @@ -3782,7 +3782,7 @@ static void Task_InputHandler_SelectOrForgetMove(u8 taskId) switch (sMonSummaryScreen->selectMoveInputHandlerState) { case 0: - BeginNormalPaletteFade(0xffffffff, 0, 16, 0, 0); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, 0); sMonSummaryScreen->selectMoveInputHandlerState++; break; case 1: @@ -3903,7 +3903,7 @@ static void Task_InputHandler_SelectOrForgetMove(u8 taskId) sMonSummaryScreen->selectMoveInputHandlerState = 2; break; case 6: - BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0); sMonSummaryScreen->selectMoveInputHandlerState++; break; default: diff --git a/src/quest_log.c b/src/quest_log.c index 0032872fd..cbeca4b72 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -852,7 +852,7 @@ static void Task_RunPlaybackCB(u8 taskId) case 0: if (++data[0] == 0x7F) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, 0); sQuestLogCurrentScene.sceneEndMode = 2; data[1]++; } diff --git a/src/region_map.c b/src/region_map.c index 0189aabbe..a87c65003 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1534,7 +1534,7 @@ static void CB2_OpenRegionMap(void) SetBg0andBg3Hidden(TRUE); break; default: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); CreateMainMapTask(); SetRegionMapVBlankCB(); break; @@ -1730,7 +1730,7 @@ static void Task_RegionMap(u8 taskId) } break; case 5: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); _080C0798: sRegionMap->mainState++; break; @@ -2811,7 +2811,7 @@ static void Task_MapOpenAnim(u8 taskId) case 3: CopyBgTilemapBufferToVram(1); BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); SetRegionMapVBlankCB(); sMapOpenCloseAnim->openState++; break; @@ -3909,7 +3909,7 @@ static void LoadMapIcons(u8 taskId) break; case 3: BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); sMapIcons->state++; break; case 4: @@ -4322,7 +4322,7 @@ static void Task_FlyMap(u8 taskId) switch (sFlyMap->state) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); InitMapIcons(GetSelectedRegionMap(), taskId, GetMainMapTask()); CreateMapCursor(0, 0); CreatePlayerIcon(1, 1); @@ -4422,7 +4422,7 @@ static void Task_FlyMap(u8 taskId) sFlyMap->state++; break; case 6: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sFlyMap->state++; break; default: diff --git a/src/seagallop.c b/src/seagallop.c index d1647438e..9133a1560 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -230,7 +230,7 @@ static void CB2_SetUpSeagallopScene(void) gMain.state++; break; case 6: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); gMain.state++; break; case 7: diff --git a/src/shop.c b/src/shop.c index 1e46a4f4e..6cfe665a2 100644 --- a/src/shop.c +++ b/src/shop.c @@ -404,7 +404,7 @@ static void CB2_InitBuyMenu(void) taskId = CreateTask(Task_BuyMenu, 8); gTasks[taskId].tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK); SetVBlankCallback(VBlankCB_BuyMenu); SetMainCallback2(CB2_BuyMenu); break; @@ -1045,7 +1045,7 @@ static void BuyMenuReturnToItemList(u8 taskId) static void ExitBuyMenu(u8 taskId) { gFieldCallback = MapPostLoadHook_ReturnToShopMenu; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_ExitBuyMenu; } diff --git a/src/slot_machine.c b/src/slot_machine.c index e67ae7f58..5ec2f1bd2 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -2016,7 +2016,7 @@ static bool8 SlotsTask_GraphicsInit(u8 * state, struct SlotMachineSetupTaskData HideBg(1); InitReelButtonTileMem(); BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_HBLANK); (*state)++; } @@ -2035,7 +2035,7 @@ static bool8 SlotsTask_FadeOut(u8 * state, struct SlotMachineSetupTaskData * ptr switch (*state) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, 0); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, 0); (*state)++; break; case 1: diff --git a/src/start_menu.c b/src/start_menu.c index e33b30e33..266e83c69 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -913,7 +913,7 @@ static void task50_after_link_battle_save(u8 taskId) DrawTextBorderOuter(0, 0x008, 0x0F); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_BOTH); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); if (gWirelessCommType != 0 && InUnionRoom()) data[0] = 5; else @@ -932,7 +932,7 @@ static void task50_after_link_battle_save(u8 taskId) } break; case 3: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); data[0] = 4; break; case 4: diff --git a/src/teachy_tv.c b/src/teachy_tv.c index b96489dcf..629174ed0 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -495,7 +495,7 @@ static void TeachyTvMainCallback(void) ScheduleBgCopyTilemapToVram(3); SetHelpContextDontCheckBattle(HELPCONTEXT_BAG); BlendPalettes(0xFFFFFFFF, 0x10, 0); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, 0); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, 0); SetVBlankCallback(TeachyTvVblankHandler); SetMainCallback2(TeachyTvCallback); break; @@ -687,7 +687,7 @@ static void TeachyTvFree(void) static void TeachyTvQuitBeginFade(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, 0); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, 0); gTasks[taskId].func = TeachyTvQuitFadeControlAndTaskDel; } diff --git a/src/title_screen.c b/src/title_screen.c index 54eeaf904..3413a19f2 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -638,7 +638,7 @@ static void SetTitleScreenScene_Restart(s16 * data) if (!gPaletteFade.active && !IsSlashSpriteHidden(data[6])) { FadeOutMapMusic(10); - BeginNormalPaletteFade(0xFFFFFFFF, 3, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 3, 0, 0x10, RGB_BLACK); SignalEndTitleScreenPaletteSomethingTask(); data[1]++; } diff --git a/src/tm_case.c b/src/tm_case.c index d5a3f0c36..de420f545 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -395,7 +395,7 @@ static bool8 DoSetUpTMCaseUI(void) gMain.state++; break; case 18: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); gMain.state++; break; default: @@ -699,7 +699,7 @@ static void DestroyTMCaseBuffers(void) static void Task_BeginFadeOutFromTMCase(u8 taskId) { - BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, RGB_BLACK); gTasks[taskId].func = Task_FadeOutAndCloseTMCase; } @@ -1268,7 +1268,7 @@ static void Task_TMCaseDude_Playback(u8 taskId) Free(sPokedudePackBackup); CpuFastCopy(gPlttBufferFaded, gPlttBufferUnfaded, 0x400); CB2_SetUpReshowBattleScreenAfterMenu(); - BeginNormalPaletteFade(0xFFFFFFFF, -2, 0, 16, 0); + BeginNormalPaletteFade(PALETTES_ALL, -2, 0, 16, 0); data[8]++; } break; diff --git a/src/trade.c b/src/trade.c index a406d87d9..207cd3b7b 100644 --- a/src/trade.c +++ b/src/trade.c @@ -954,7 +954,7 @@ static void CB2_ReturnFromLinkTrade2(void) gMain.state++; break; case 18: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); gMain.state++; break; case 19: @@ -1143,7 +1143,7 @@ void CB2_ReturnToTradeMenuFromSummary(void) case 18: gPaletteFade.bufferTransferDisabled = FALSE; BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); gMain.state++; break; case 19: @@ -1183,7 +1183,7 @@ static void TradeMenuCB_9(void) { if (++sTradeMenuResourcesPtr->loadUISpritesState >= 16) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeMenuResourcesPtr->tradeMenuCBnum = 10; } } @@ -1527,7 +1527,7 @@ static void Slave_HandleBlockReceivedStatus(u8 mpId, u8 blockReceivedFlags) switch (gBlockRecvBuffer[0][0]) { case 0xEEBB: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); PrintTradeErrorOrStatusMessage(TRADESTATMSG_WAITINGFORFRIEND); sTradeMenuResourcesPtr->tradeMenuCBnum = 11; break; @@ -1543,7 +1543,7 @@ static void Slave_HandleBlockReceivedStatus(u8 mpId, u8 blockReceivedFlags) sTradeMenuResourcesPtr->tradeMenuCBnum = 7; break; case 0xCCDD: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeMenuResourcesPtr->tradeMenuCBnum = 10; break; case 0xDDEE: @@ -1594,7 +1594,7 @@ static void Master_HandleCommunication(void) sTradeMenuResourcesPtr->linkData[0] = 0xEEBB; sTradeMenuResourcesPtr->linkData[1] = 0; ScheduleLinkTaskWithDelay(5, 0); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeMenuResourcesPtr->unk_78 = sTradeMenuResourcesPtr->unk_79 = 0; sTradeMenuResourcesPtr->tradeMenuCBnum = 11; } @@ -1737,7 +1737,7 @@ static void TradeMenuCB_0(void) } else if (sTradeMenuResourcesPtr->tradeMenuCursorPosition < 12) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeMenuResourcesPtr->tradeMenuCBnum = 2; } else if (sTradeMenuResourcesPtr->tradeMenuCursorPosition == 12) @@ -1774,7 +1774,7 @@ static void TradeMenuCB_1(void) case MENU_NOTHING_CHOSEN: break; case 0: // SUMMARY - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeMenuResourcesPtr->tradeMenuCBnum = 2; break; case 1: // Trade diff --git a/src/trade_scene.c b/src/trade_scene.c index 73ebf54c3..726fc9e51 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -881,7 +881,7 @@ void CB2_InitTradeAnim_LinkTrade(void) gMain.state++; break; case 10: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); ShowBg(0); sTradeData->monSpecies[0] = GetMonData(&gPlayerParty[gSelectedTradeMonPositions[0]], MON_DATA_SPECIES2); sTradeData->monSpecies[1] = GetMonData(&gEnemyParty[gSelectedTradeMonPositions[1] % 6], MON_DATA_SPECIES2); @@ -1322,7 +1322,7 @@ static bool8 DoTradeAnim_Cable(void) // The game waits here for the sprite to finish its animation sequence. break; case 14: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeData->state = 20; break; case 20: @@ -1335,7 +1335,7 @@ static bool8 DoTradeAnim_Cable(void) } break; case 21: - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); sTradeData->state++; break; case 22: @@ -1412,7 +1412,7 @@ static bool8 DoTradeAnim_Cable(void) } break; case 29: - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK); sTradeData->state = 30; break; case 30: @@ -1425,7 +1425,7 @@ static bool8 DoTradeAnim_Cable(void) } break; case 31: - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); sTradeData->tradeGlow1SpriteId = CreateSprite(&sGlowBallSpriteTemplate, 111, 170, 0); sTradeData->gbaScreenSpriteId = CreateSprite(&sGlowBallSpriteTemplate, 129, -10, 0); sTradeData->state++; @@ -1504,7 +1504,7 @@ static bool8 DoTradeAnim_Cable(void) gSprites[sTradeData->gbaScreenSpriteId].y2 += 3; if (gSprites[sTradeData->tradeGlow1SpriteId].y2 <= -222) { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK); sTradeData->state++; DestroySprite(&gSprites[sTradeData->tradeGlow1SpriteId]); DestroySprite(&gSprites[sTradeData->gbaScreenSpriteId]); @@ -1522,7 +1522,7 @@ static bool8 DoTradeAnim_Cable(void) } break; case 41: - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); sTradeData->state++; break; case 42: @@ -1600,7 +1600,7 @@ static bool8 DoTradeAnim_Cable(void) sTradeData->sXY = 0x8000 / sTradeData->bg2Zoom; break; case 52: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeData->state = 60; break; @@ -1615,7 +1615,7 @@ static bool8 DoTradeAnim_Cable(void) break; case 61: gPaletteFade.bufferTransferDisabled = FALSE; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); sTradeData->state++; break; case 62: @@ -1733,7 +1733,7 @@ static bool8 DoTradeAnim_Cable(void) sTradeData->state++; break; case 73: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeData->state++; break; case 74: @@ -1819,7 +1819,7 @@ static bool8 DoTradeAnim_Wireless(void) // The game waits here for the sprite to finish its animation sequence. break; case 14: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeData->state = 20; break; case 20: @@ -1832,7 +1832,7 @@ static bool8 DoTradeAnim_Wireless(void) } break; case 21: - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); sTradeData->state++; break; case 22: @@ -1914,7 +1914,7 @@ static bool8 DoTradeAnim_Wireless(void) } break; case 29: - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK); sTradeData->state = 30; break; case 30: @@ -1927,7 +1927,7 @@ static bool8 DoTradeAnim_Wireless(void) } break; case 31: - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); sTradeData->tradeGlow1SpriteId = CreateSprite(&sGlowBallSpriteTemplate, 111, 170, 0); sTradeData->gbaScreenSpriteId = CreateSprite(&sGlowBallSpriteTemplate, 129, -10, 0); sTradeData->state++; @@ -2007,7 +2007,7 @@ static bool8 DoTradeAnim_Wireless(void) gSprites[sTradeData->gbaScreenSpriteId].y2 += 3; if (gSprites[sTradeData->tradeGlow1SpriteId].y2 <= -222) { - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK); sTradeData->state++; DestroySprite(&gSprites[sTradeData->tradeGlow1SpriteId]); DestroySprite(&gSprites[sTradeData->gbaScreenSpriteId]); @@ -2028,7 +2028,7 @@ static bool8 DoTradeAnim_Wireless(void) } break; case 41: - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); sTradeData->state++; break; case 42: @@ -2121,7 +2121,7 @@ static bool8 DoTradeAnim_Wireless(void) sTradeData->sXY = 0x8000 / sTradeData->bg2Zoom; break; case 52: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeData->state = 60; break; @@ -2136,7 +2136,7 @@ static bool8 DoTradeAnim_Wireless(void) break; case 61: gPaletteFade.bufferTransferDisabled = FALSE; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); sTradeData->state++; break; case 62: @@ -2254,7 +2254,7 @@ static bool8 DoTradeAnim_Wireless(void) sTradeData->state++; break; case 73: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTradeData->state++; break; case 74: @@ -2656,7 +2656,7 @@ static void CB2_HandleTradeEnded(void) case 6: if (IsLinkTaskFinished()) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gMain.state ++; } break; @@ -2730,7 +2730,7 @@ void DoInGameTradeScene(void) { ScriptContext2_Enable(); CreateTask(Task_WaitFadeAndStartInGameTradeAnim, 10); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); HelpSystem_Disable(); } diff --git a/src/trainer_card.c b/src/trainer_card.c index 2efd575e4..a361be04c 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -533,7 +533,7 @@ static void Task_TrainerCard(u8 taskId) LoadWirelessStatusIndicatorSpriteGfx(); CreateWirelessStatusIndicatorSprite(230, 150); } - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); SetVBlankCallback(VBlankCB_TrainerCard); sTrainerCardDataPtr->mainState++; break; @@ -572,7 +572,7 @@ static void Task_TrainerCard(u8 taskId) } else { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD; } } @@ -593,7 +593,7 @@ static void Task_TrainerCard(u8 taskId) } else if (gReceivedRemoteLinkPlayers) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD; } else @@ -612,7 +612,7 @@ static void Task_TrainerCard(u8 taskId) } else { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD; } } @@ -627,7 +627,7 @@ static void Task_TrainerCard(u8 taskId) case STATE_CLOSE_CARD_LINK: if (!gReceivedRemoteLinkPlayers) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD; } break; diff --git a/src/union_room_battle.c b/src/union_room_battle.c index 1e4528c8c..e7a19bbbe 100644 --- a/src/union_room_battle.c +++ b/src/union_room_battle.c @@ -133,7 +133,7 @@ void CB2_UnionRoomBattle(void) } break; case 2: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); ShowBg(0); gMain.state++; break; @@ -158,7 +158,7 @@ void CB2_UnionRoomBattle(void) { if (gBlockRecvBuffer[0][0] == (ACTIVITY_ACCEPT | 0x40) && gBlockRecvBuffer[1][0] == (ACTIVITY_ACCEPT | 0x40)) { - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gMain.state = 50; } else diff --git a/src/union_room_chat.c b/src/union_room_chat.c index 524ce7e89..c8dead2bb 100644 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -257,7 +257,7 @@ static void CB2_LoadInterface(void) if (!UnionRoomChat_RunDisplaySubtask0()) { BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); - BeginNormalPaletteFade(0xFFFFFFFF, -1, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); SetVBlankCallback(VBlankCB_UnionRoomChatMain); gMain.state++; } @@ -887,7 +887,7 @@ static void ChatEntryRoutine_SaveAndExit(void) sWork->routineState = 12; break; case 12: - BeginNormalPaletteFade(0xFFFFFFFF, -1, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK); sWork->routineState = 13; break; case 13: diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index 936a1ed9f..f22564e47 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -269,7 +269,7 @@ static void Task_WirelessCommunicationScreen(u8 taskId) gTasks[taskId].data[0]++; break; case 1: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); ShowBg(1); CopyBgTilemapBufferToVram(0); ShowBg(0); @@ -303,7 +303,7 @@ static void Task_WirelessCommunicationScreen(u8 taskId) WCSS_CyclePalette(&gTasks[taskId].data[7], &gTasks[taskId].data[8]); break; case 4: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); gTasks[taskId].data[0]++; break; case 5: From f998a7b66158a87fbaa8811b9ded55af2476627b Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 27 Jul 2022 14:23:03 -0400 Subject: [PATCH 32/64] tData7 and tData8 --- src/evolution_scene.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 2dcd7f4aa..0f46f6b5a 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -154,8 +154,8 @@ static void CB2_BeginEvolutionScene(void) #define tBits data[3] #define tLearnsFirstMove data[4] #define tLearnMoveState data[6] -#define tData7 data[7] -#define tData8 data[8] +#define tLearnMoveYesState data[7] +#define tLearnMoveNoState data[8] #define tEvoWasStopped data[9] #define tPartyId data[10] @@ -847,8 +847,8 @@ static void Task_EvolutionScene(u8 taskId) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]); BattlePutTextOnWindow(gDisplayedStringBattle, 0); - gTasks[taskId].tData7 = 5; - gTasks[taskId].tData8 = 10; + gTasks[taskId].tLearnMoveYesState = 5; + gTasks[taskId].tLearnMoveNoState = 10; gTasks[taskId].tLearnMoveState++; } case 3: @@ -883,11 +883,11 @@ static void Task_EvolutionScene(u8 taskId) if (sEvoCursorPos != 0) { - gTasks[taskId].tLearnMoveState = gTasks[taskId].tData8; + gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState; } else { - gTasks[taskId].tLearnMoveState = gTasks[taskId].tData7; + gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveYesState; if (gTasks[taskId].tLearnMoveState == 5) BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); } @@ -896,7 +896,7 @@ static void Task_EvolutionScene(u8 taskId) { HandleBattleWindow(0x17, 8, 0x1D, 0xD, WINDOW_CLEAR); PlaySE(SE_SELECT); - gTasks[taskId].tLearnMoveState = gTasks[taskId].tData8; + gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState; } break; case 5: @@ -961,8 +961,8 @@ static void Task_EvolutionScene(u8 taskId) case 10: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]); BattlePutTextOnWindow(gDisplayedStringBattle, 0); - gTasks[taskId].tData7 = 11; - gTasks[taskId].tData8 = 0; + gTasks[taskId].tLearnMoveYesState = 11; + gTasks[taskId].tLearnMoveNoState = 0; gTasks[taskId].tLearnMoveState = 3; break; case 11: @@ -1211,8 +1211,8 @@ static void Task_TradeEvolutionScene(u8 taskId) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); - gTasks[taskId].tData7 = 5; - gTasks[taskId].tData8 = 9; + gTasks[taskId].tLearnMoveYesState = 5; + gTasks[taskId].tLearnMoveNoState = 9; gTasks[taskId].tLearnMoveState++; } case 3: @@ -1232,7 +1232,7 @@ static void Task_TradeEvolutionScene(u8 taskId) sEvoCursorPos = 0; BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); - gTasks[taskId].tLearnMoveState = gTasks[taskId].tData7; + gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveYesState; if (gTasks[taskId].tLearnMoveState == 5) BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); break; @@ -1241,7 +1241,7 @@ static void Task_TradeEvolutionScene(u8 taskId) sEvoCursorPos = 1; BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); - gTasks[taskId].tLearnMoveState = gTasks[taskId].tData8; + gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState; break; } break; @@ -1311,8 +1311,8 @@ static void Task_TradeEvolutionScene(u8 taskId) case 9: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); - gTasks[taskId].tData7 = 10; - gTasks[taskId].tData8 = 0; + gTasks[taskId].tLearnMoveYesState = 10; + gTasks[taskId].tLearnMoveNoState = 0; gTasks[taskId].tLearnMoveState = 3; break; case 10: @@ -1336,8 +1336,8 @@ static void Task_TradeEvolutionScene(u8 taskId) #undef tBits #undef tLearnsFirstMove #undef tLearnMoveState -#undef tData7 -#undef tData8 +#undef tLearnMoveYesState +#undef tLearnMoveNoState #undef tEvoWasStopped #undef tPartyId From 611112269e401ecaf1a8c46ec38cf0871ce02618 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 27 Jul 2022 14:35:19 -0400 Subject: [PATCH 33/64] StringCopy10 to StringCopy_Nickname --- include/string_util.h | 2 +- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_link_partner.c | 2 +- src/battle_controller_oak_old_man.c | 2 +- src/battle_controller_opponent.c | 2 +- src/battle_controller_player.c | 2 +- src/battle_controller_pokedude.c | 2 +- src/daycare.c | 4 ++-- src/evolution_scene.c | 8 ++++---- src/learn_move.c | 2 +- src/pokemon.c | 2 +- src/string_util.c | 4 ++-- src/trade.c | 4 ++-- src/trade_scene.c | 10 +++++----- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/string_util.h b/include/string_util.h index dd2423eed..65511b5c4 100644 --- a/include/string_util.h +++ b/include/string_util.h @@ -10,7 +10,7 @@ enum StringConvertMode STR_CONV_MODE_LEADING_ZEROS }; -u8 *StringCopy10(u8 *dest, const u8 *src); +u8 *StringCopy_Nickname(u8 *dest, const u8 *src); u8 *StringGetEnd10(u8 *str); u8 *StringCopy7(u8 *dest, const u8 *src); u8 *StringCopy(u8 *dest, const u8 *src); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index b2dc31480..ad21a7e56 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -499,7 +499,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst) battleMon.abilityNum = GetMonData(&gEnemyParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gEnemyParty[monId], MON_DATA_OT_ID); GetMonData(&gEnemyParty[monId], MON_DATA_NICKNAME, nickname); - StringCopy10(battleMon.nickname, nickname); + StringCopy_Nickname(battleMon.nickname, nickname); GetMonData(&gEnemyParty[monId], MON_DATA_OT_NAME, battleMon.otName); src = (u8 *)&battleMon; for (size = 0; size < sizeof(battleMon); ++size) diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index a98dedbb5..539532070 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -454,7 +454,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst) battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID); GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname); - StringCopy10(battleMon.nickname, nickname); + StringCopy_Nickname(battleMon.nickname, nickname); GetMonData(&gPlayerParty[monId], MON_DATA_OT_NAME, battleMon.otName); src = (u8 *)&battleMon; for (size = 0; size < sizeof(battleMon); ++size) diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c index 4ee059169..4a40d0a64 100644 --- a/src/battle_controller_oak_old_man.c +++ b/src/battle_controller_oak_old_man.c @@ -1034,7 +1034,7 @@ static u32 CopyOakOldManMonData(u8 monId, u8 *dst) battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID); GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname); - StringCopy10(battleMon.nickname, nickname); + StringCopy_Nickname(battleMon.nickname, nickname); GetMonData(&gPlayerParty[monId], MON_DATA_OT_NAME, battleMon.otName); src = (u8 *)&battleMon; for (size = 0; size < sizeof(battleMon); ++size) diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 7519ccf5b..ce6f6a1c7 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -493,7 +493,7 @@ static u32 GetOpponentMonData(u8 monId, u8 *dst) battleMon.abilityNum = GetMonData(&gEnemyParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gEnemyParty[monId], MON_DATA_OT_ID); GetMonData(&gEnemyParty[monId], MON_DATA_NICKNAME, nickname); - StringCopy10(battleMon.nickname, nickname); + StringCopy_Nickname(battleMon.nickname, nickname); GetMonData(&gEnemyParty[monId], MON_DATA_OT_NAME, battleMon.otName); src = (u8 *)&battleMon; for (size = 0; size < sizeof(battleMon); ++size) diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 399fd9464..c3bf976b4 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1551,7 +1551,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst) battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID); GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname); - StringCopy10(battleMon.nickname, nickname); + StringCopy_Nickname(battleMon.nickname, nickname); GetMonData(&gPlayerParty[monId], MON_DATA_OT_NAME, battleMon.otName); src = (u8 *)&battleMon; for (size = 0; size < sizeof(battleMon); ++size) diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 8e27162ae..5b5ee3eb0 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -782,7 +782,7 @@ static u32 CopyPokedudeMonData(u8 monId, u8 *dst) battleMon.abilityNum = GetMonData(mon, MON_DATA_ABILITY_NUM); battleMon.otId = GetMonData(mon, MON_DATA_OT_ID); GetMonData(mon, MON_DATA_NICKNAME, nickname); - StringCopy10(battleMon.nickname, nickname); + StringCopy_Nickname(battleMon.nickname, nickname); GetMonData(mon, MON_DATA_OT_NAME, battleMon.otName); src = (u8 *)&battleMon; for (size = 0; size < sizeof(battleMon); ++size) diff --git a/src/daycare.c b/src/daycare.c index a3b6b8258..f43742aca 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -356,7 +356,7 @@ static u8 *DayCare_GetMonNickname(struct Pokemon *mon, u8 *dest) u8 nickname[POKEMON_NAME_LENGTH * 2]; GetMonData(mon, MON_DATA_NICKNAME, nickname); - return StringCopy10(dest, nickname); + return StringCopy_Nickname(dest, nickname); } static u8 *DayCare_GetBoxMonNickname(struct BoxPokemon *mon, u8 *dest) @@ -364,7 +364,7 @@ static u8 *DayCare_GetBoxMonNickname(struct BoxPokemon *mon, u8 *dest) u8 nickname[POKEMON_NAME_LENGTH * 2]; GetBoxMonData(mon, MON_DATA_NICKNAME, nickname); - return StringCopy10(dest, nickname); + return StringCopy_Nickname(dest, nickname); } u8 CountPokemonInDaycare(struct DayCare *daycare) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 0f46f6b5a..eb316b141 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -246,7 +246,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, AllocateMonSpritesGfx(); GetMonData(mon, MON_DATA_NICKNAME, name); - StringCopy10(gStringVar1, name); + StringCopy_Nickname(gStringVar1, name); StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]); // preEvo sprite @@ -469,7 +469,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri u8 id; GetMonData(mon, MON_DATA_NICKNAME, name); - StringCopy10(gStringVar1, name); + StringCopy_Nickname(gStringVar1, name); StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]); gAffineAnimsDisabled = TRUE; @@ -744,7 +744,7 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tLearnsFirstMove = FALSE; gTasks[taskId].tLearnMoveState = 0; GetMonData(mon, MON_DATA_NICKNAME, text); - StringCopy10(gBattleTextBuff1, text); + StringCopy_Nickname(gBattleTextBuff1, text); if (var == MON_HAS_MAX_MOVES) gTasks[taskId].tState = 22; @@ -1120,7 +1120,7 @@ static void Task_TradeEvolutionScene(u8 taskId) gTasks[taskId].tLearnsFirstMove = FALSE; gTasks[taskId].tLearnMoveState = 0; GetMonData(mon, MON_DATA_NICKNAME, text); - StringCopy10(gBattleTextBuff1, text); + StringCopy_Nickname(gBattleTextBuff1, text); if (var == MON_HAS_MAX_MOVES) gTasks[taskId].tState = 20; diff --git a/src/learn_move.c b/src/learn_move.c index 9927949aa..3fcaca5d3 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -757,7 +757,7 @@ static void MoveRelearnerInitListMenuBuffersEtc(void) for (i = 0; i < sMoveRelearner->numLearnableMoves; i++) StringCopy(sMoveRelearner->listMenuStrbufs[i], gMoveNames[sMoveRelearner->learnableMoves[i]]); GetMonData(&gPlayerParty[sMoveRelearner->selectedPartyMember], MON_DATA_NICKNAME, nickname); - StringCopy10(gStringVar1, nickname); + StringCopy_Nickname(gStringVar1, nickname); StringCopy(sMoveRelearner->listMenuStrbufs[sMoveRelearner->numLearnableMoves], gFameCheckerText_Cancel); sMoveRelearner->numLearnableMoves++; for (i = 0; i < count; i++) diff --git a/src/pokemon.c b/src/pokemon.c index 92e9cb851..aa1667584 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3912,7 +3912,7 @@ static void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex) gBattleMons[battlerId].type2 = gBaseStats[gBattleMons[battlerId].species].type2; gBattleMons[battlerId].ability = GetAbilityBySpecies(gBattleMons[battlerId].species, gBattleMons[battlerId].abilityNum); GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, nickname); - StringCopy10(gBattleMons[battlerId].nickname, nickname); + StringCopy_Nickname(gBattleMons[battlerId].nickname, nickname); GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_NAME, gBattleMons[battlerId].otName); hpSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(battlerId)]; diff --git a/src/string_util.c b/src/string_util.c index f059ac43d..ffb51b354 100644 --- a/src/string_util.c +++ b/src/string_util.c @@ -37,10 +37,10 @@ extern u8 gExpandedPlaceholder_Groudon[]; extern u8 gExpandedPlaceholder_Red[]; extern u8 gExpandedPlaceholder_Green[]; -u8 *StringCopy10(u8 *dest, const u8 *src) +u8 *StringCopy_Nickname(u8 *dest, const u8 *src) { u8 i; - u32 limit = 10; + u32 limit = POKEMON_NAME_LENGTH; for (i = 0; i < limit; i++) { diff --git a/src/trade.c b/src/trade.c index 207cd3b7b..670ef4922 100644 --- a/src/trade.c +++ b/src/trade.c @@ -2183,7 +2183,7 @@ static u8 GetNicknameStringWidthByPartyAndMonIdx(u8 *dest, u8 whichParty, u8 par GetMonData(&gPlayerParty[partyIdx], MON_DATA_NICKNAME, nickname); else GetMonData(&gEnemyParty[partyIdx], MON_DATA_NICKNAME, nickname); - StringCopy10(dest, nickname); + StringCopy_Nickname(dest, nickname); return GetStringWidth(0, dest, GetFontAttribute(0, FONTATTR_LETTER_SPACING)); } @@ -2246,7 +2246,7 @@ static void PrintPartyNicknames(u8 whichParty) for (i = 0; i < sTradeMenuResourcesPtr->partyCounts[whichParty]; i++) { GetMonData(&party[i], MON_DATA_NICKNAME, buff); - StringCopy10(nickname, buff); + StringCopy_Nickname(nickname, buff); PrintPartyMonNickname(whichParty, i, nickname); } } diff --git a/src/trade_scene.c b/src/trade_scene.c index 726fc9e51..d7608d5ed 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -1239,17 +1239,17 @@ static void TradeBufferOTnameAndNicknames(void) mpId = GetMultiplayerId(); StringCopy(gStringVar1, gLinkPlayers[mpId ^ 1].name); GetMonData(&gEnemyParty[gSelectedTradeMonPositions[1] % 6], MON_DATA_NICKNAME, nickname); - StringCopy10(gStringVar3, nickname); + StringCopy_Nickname(gStringVar3, nickname); GetMonData(&gPlayerParty[gSelectedTradeMonPositions[0]], MON_DATA_NICKNAME, nickname); - StringCopy10(gStringVar2, nickname); + StringCopy_Nickname(gStringVar2, nickname); } else { inGameTrade = &sInGameTrades[gSpecialVar_0x8004]; StringCopy(gStringVar1, inGameTrade->otName); - StringCopy10(gStringVar3, inGameTrade->nickname); + StringCopy_Nickname(gStringVar3, inGameTrade->nickname); GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_NICKNAME, nickname); - StringCopy10(gStringVar2, nickname); + StringCopy_Nickname(gStringVar2, nickname); } } @@ -2424,7 +2424,7 @@ static void BufferInGameTradeMonName(void) u8 nickname[30]; const struct InGameTrade * inGameTrade = &sInGameTrades[gSpecialVar_0x8004]; GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_NICKNAME, nickname); - StringCopy10(gStringVar1, nickname); + StringCopy_Nickname(gStringVar1, nickname); StringCopy(gStringVar2, gSpeciesNames[inGameTrade->species]); } From 36791b994b82aaec14f5bb0dbab219581356c235 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 27 Jul 2022 14:43:07 -0400 Subject: [PATCH 34/64] speciesToEvolve -> postEvoSpecies --- src/evolution_scene.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index eb316b141..e9d5b0a09 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -159,8 +159,8 @@ static void CB2_BeginEvolutionScene(void) #define tEvoWasStopped data[9] #define tPartyId data[10] -#define TASK_BIT_CAN_STOP 0x1 -#define TASK_BIT_LEARN_MOVE 0x80 +#define TASK_BIT_CAN_STOP (1 << 0) +#define TASK_BIT_LEARN_MOVE (1 << 7) static void Task_BeginEvolutionScene(u8 taskId) { @@ -174,33 +174,33 @@ static void Task_BeginEvolutionScene(u8 taskId) case 1: if (!gPaletteFade.active) { - u16 speciesToEvolve; + u16 postEvoSpecies; bool8 canStopEvo; u8 partyId; mon = &gPlayerParty[gTasks[taskId].tPartyId]; - speciesToEvolve = gTasks[taskId].tPostEvoSpecies; + postEvoSpecies = gTasks[taskId].tPostEvoSpecies; canStopEvo = gTasks[taskId].tCanStop; partyId = gTasks[taskId].tPartyId; DestroyTask(taskId); - EvolutionScene(mon, speciesToEvolve, canStopEvo, partyId); + EvolutionScene(mon, postEvoSpecies, canStopEvo, partyId); } break; } } -void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyId) +void BeginEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u8 partyId) { u8 taskId = CreateTask(Task_BeginEvolutionScene, 0); gTasks[taskId].tState = 0; - gTasks[taskId].tPostEvoSpecies = speciesToEvolve; + gTasks[taskId].tPostEvoSpecies = postEvoSpecies; gTasks[taskId].tCanStop = canStopEvo; gTasks[taskId].tPartyId = partyId; SetMainCallback2(CB2_BeginEvolutionScene); } -void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, u8 partyId) +void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u8 partyId) { u8 name[20]; u16 currSpecies; @@ -247,7 +247,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, GetMonData(mon, MON_DATA_NICKNAME, name); StringCopy_Nickname(gStringVar1, name); - StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]); + StringCopy(gStringVar2, gSpeciesNames[postEvoSpecies]); // preEvo sprite currSpecies = GetMonData(mon, MON_DATA_SPECIES); @@ -268,13 +268,13 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, gSprites[id].invisible = TRUE; // postEvo sprite - DecompressPicFromTable(&gMonFrontPicTable[speciesToEvolve], + DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], gMonSpritesGfxPtr->sprites[3], - speciesToEvolve); - pokePal = GetMonSpritePalStructFromOtIdPersonality(speciesToEvolve, trainerId, personality); + postEvoSpecies); + pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); - SetMultiuseSpriteTemplateToPokemon(speciesToEvolve, 3); + SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 3); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[id].callback = SpriteCallbackDummy2; @@ -286,7 +286,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo, sEvoStructPtr->evoTaskId = id = CreateTask(Task_EvolutionScene, 0); gTasks[id].tState = 0; gTasks[id].tPreEvoSpecies = currSpecies; - gTasks[id].tPostEvoSpecies = speciesToEvolve; + gTasks[id].tPostEvoSpecies = postEvoSpecies; gTasks[id].tCanStop = canStopEvo; gTasks[id].tLearnsFirstMove = TRUE; gTasks[id].tEvoWasStopped = FALSE; @@ -460,7 +460,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) } } -void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteId, u8 partyId) +void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSpriteId, u8 partyId) { u8 name[20]; u16 currSpecies; @@ -470,7 +470,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri GetMonData(mon, MON_DATA_NICKNAME, name); StringCopy_Nickname(gStringVar1, name); - StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]); + StringCopy(gStringVar2, gSpeciesNames[postEvoSpecies]); gAffineAnimsDisabled = TRUE; @@ -482,14 +482,14 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri sEvoStructPtr = AllocZeroed(sizeof(struct EvoInfo)); sEvoStructPtr->preEvoSpriteId = preEvoSpriteId; - DecompressPicFromTable(&gMonFrontPicTable[speciesToEvolve], + DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], gMonSpritesGfxPtr->sprites[1], - speciesToEvolve); + postEvoSpecies); - pokePal = GetMonSpritePalStructFromOtIdPersonality(speciesToEvolve, trainerId, personality); + pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); - SetMultiuseSpriteTemplateToPokemon(speciesToEvolve, 1); + SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 1); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); @@ -502,7 +502,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri sEvoStructPtr->evoTaskId = id = CreateTask(Task_TradeEvolutionScene, 0); gTasks[id].tState = 0; gTasks[id].tPreEvoSpecies = currSpecies; - gTasks[id].tPostEvoSpecies = speciesToEvolve; + gTasks[id].tPostEvoSpecies = postEvoSpecies; gTasks[id].tLearnsFirstMove = TRUE; gTasks[id].tEvoWasStopped = FALSE; gTasks[id].tPartyId = partyId; From a81c1539e5ead139a84ca412ec2ec7e470e915fb Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 27 Jul 2022 14:45:55 -0400 Subject: [PATCH 35/64] SpriteCallbackDummy2 -> SpriteCallbackDummy_2 --- include/battle_main.h | 2 +- src/battle_main.c | 8 ++++---- src/evolution_scene.c | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/battle_main.h b/include/battle_main.h index 0410e62c2..3b83a2c33 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -71,7 +71,7 @@ void SpriteCB_VsLetterInit(struct Sprite *sprite); void CB2_InitEndLinkBattle(void); u32 GetBattleBgAttribute(u8 arrayId, u8 caseId); void SpriteCB_EnemyMon(struct Sprite *sprite); -void SpriteCallbackDummy2(struct Sprite *sprite); +void SpriteCallbackDummy_2(struct Sprite *sprite); void SpriteCB_FaintOpponentMon(struct Sprite *sprite); void SpriteCb_ShowAsMoveTarget(struct Sprite *sprite); void SpriteCb_HideAsMoveTarget(struct Sprite *sprite); diff --git a/src/battle_main.c b/src/battle_main.c index 6eddf65d3..b98fe6e2b 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1870,13 +1870,13 @@ static void SpriteCB_WildMonShowHealthbox(struct Sprite *sprite) { StartHealthboxSlideIn(sprite->sBattler); SetHealthboxSpriteVisible(gHealthboxSpriteIds[sprite->sBattler]); - sprite->callback = SpriteCallbackDummy2; + sprite->callback = SpriteCallbackDummy_2; StartSpriteAnimIfDifferent(sprite, 0); BeginNormalPaletteFade(0x20000, 0, 10, 0, RGB(8, 8, 8)); } } -void SpriteCallbackDummy2(struct Sprite *sprite) +void SpriteCallbackDummy_2(struct Sprite *sprite) { } @@ -1900,7 +1900,7 @@ static void SpriteCB_Unused_8011E28_Step(struct Sprite *sprite) if (sprite->data[3] == 0) { sprite->invisible = FALSE; - sprite->callback = SpriteCallbackDummy2; + sprite->callback = SpriteCallbackDummy_2; gUnknown_2022AE8[0] = 0; } } @@ -1991,7 +1991,7 @@ void SpriteCb_HideAsMoveTarget(struct Sprite *sprite) { sprite->invisible = sprite->data[4]; sprite->data[4] = FALSE; - sprite->callback = SpriteCallbackDummy2; + sprite->callback = SpriteCallbackDummy_2; } void SpriteCB_AllyMon(struct Sprite *sprite) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index e9d5b0a09..cb2e472bf 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -263,7 +263,7 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->preEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); - gSprites[id].callback = SpriteCallbackDummy2; + gSprites[id].callback = SpriteCallbackDummy_2; gSprites[id].oam.paletteNum = 1; gSprites[id].invisible = TRUE; @@ -277,7 +277,7 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 3); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); - gSprites[id].callback = SpriteCallbackDummy2; + gSprites[id].callback = SpriteCallbackDummy_2; gSprites[id].oam.paletteNum = 2; gSprites[id].invisible = TRUE; @@ -357,7 +357,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); - gSprites[id].callback = SpriteCallbackDummy2; + gSprites[id].callback = SpriteCallbackDummy_2; gSprites[id].oam.paletteNum = 2; SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP); @@ -434,7 +434,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); - gSprites[id].callback = SpriteCallbackDummy2; + gSprites[id].callback = SpriteCallbackDummy_2; gSprites[id].oam.paletteNum = 2; gMain.state++; LinkTradeDrawWindow(); @@ -493,7 +493,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSprit gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); - gSprites[id].callback = SpriteCallbackDummy2; + gSprites[id].callback = SpriteCallbackDummy_2; gSprites[id].oam.paletteNum = 2; gSprites[id].invisible = TRUE; From f5e9cc595bc0146eb6ca289b10b5a975199759e2 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Wed, 27 Jul 2022 18:10:52 -0400 Subject: [PATCH 36/64] Multiple changes - BATTLESTRINGS_ID_ADDER ->BATTLESTRINGS_TABLE_START - Defines for battle windows - MAIL_NONE - MON_DATA_FILLER -> MON_DATA_UNUSED_RIBBONS - Usage of BattlePutTextOnWindow with masks - PlayCry1 -> PlayCry_Normal - BlendPalettes(0xFFFFFFFF -> BlendPalettes(PALETTES_ALL - FillPalette(0 -> FillPalette(RGB_BLACK --- include/battle_main.h | 2 +- include/battle_string_ids.h | 7 +- include/constants/battle.h | 30 ++ include/constants/global.h | 4 + include/constants/items.h | 1 + include/constants/pokemon.h | 2 +- include/evolution_graphics.h | 12 +- include/pokemon.h | 2 +- include/sound.h | 2 +- include/trade_scene.h | 2 +- src/battle_bg.c | 62 +-- src/battle_controller_link_opponent.c | 4 +- src/battle_controller_link_partner.c | 4 +- src/battle_controller_oak_old_man.c | 22 +- src/battle_controller_opponent.c | 4 +- src/battle_controller_player.c | 20 +- src/battle_controller_pokedude.c | 16 +- src/battle_controller_safari.c | 12 +- src/battle_main.c | 4 +- src/battle_message.c | 6 +- src/battle_script_commands.c | 8 +- src/battle_transition.c | 8 +- src/berry_pouch.c | 2 +- src/dark.c | 8 +- src/daycare.c | 2 +- src/dodrio_berry_picking.c | 4 +- src/easy_chat_2.c | 2 +- src/evolution_graphics.c | 12 +- src/evolution_scene.c | 686 ++++++++++++++++---------- src/field_effect.c | 2 +- src/fldeff_flash.c | 2 +- src/ghost.c | 2 +- src/hall_of_fame.c | 4 +- src/intro.c | 4 +- src/item_menu.c | 2 +- src/item_pc.c | 2 +- src/link.c | 2 +- src/oak_speech.c | 4 +- src/party_menu.c | 2 +- src/pc_screen_effect.c | 4 +- src/pokemon.c | 10 +- src/pokemon_special_anim.c | 4 +- src/pokemon_storage_system_3.c | 4 +- src/region_map.c | 4 +- src/seagallop.c | 2 +- src/shop.c | 2 +- src/slot_machine.c | 6 +- src/sound.c | 2 +- src/start_menu.c | 2 +- src/teachy_tv.c | 2 +- src/title_screen.c | 2 +- src/tm_case.c | 2 +- src/trade.c | 2 +- src/trade_scene.c | 10 +- src/union_room_chat.c | 2 +- 55 files changed, 613 insertions(+), 423 deletions(-) diff --git a/include/battle_main.h b/include/battle_main.h index 3b83a2c33..8d5e1d19d 100644 --- a/include/battle_main.h +++ b/include/battle_main.h @@ -69,7 +69,7 @@ void VBlankCB_Battle(void); void SpriteCB_VsLetterDummy(struct Sprite *sprite); void SpriteCB_VsLetterInit(struct Sprite *sprite); void CB2_InitEndLinkBattle(void); -u32 GetBattleBgAttribute(u8 arrayId, u8 caseId); +u32 GetBattleBgTemplateData(u8 arrayId, u8 caseId); void SpriteCB_EnemyMon(struct Sprite *sprite); void SpriteCallbackDummy_2(struct Sprite *sprite); void SpriteCB_FaintOpponentMon(struct Sprite *sprite); diff --git a/include/battle_string_ids.h b/include/battle_string_ids.h index 0eb6b63f4..c78452622 100644 --- a/include/battle_string_ids.h +++ b/include/battle_string_ids.h @@ -1,8 +1,6 @@ #ifndef GUARD_BATTLE_STRING_IDS_H #define GUARD_BATTLE_STRING_IDS_H -#define BATTLESTRINGS_ID_ADDER 12 // all battlestrings have its ID + 12, because first 5 are reserved - #define STRINGID_INTROMSG 0 #define STRINGID_INTROSENDOUT 1 #define STRINGID_RETURNMON 2 @@ -389,4 +387,9 @@ #define BATTLESTRINGS_COUNT 374 +// This is the string id that gBattleStringsTable starts with. +// String ids before this (e.g. STRINGID_INTROMSG) are not in the table, +// and are instead handled explicitly by BufferStringBattle. +#define BATTLESTRINGS_TABLE_START STRINGID_TRAINER1LOSETEXT + #endif // GUARD_BATTLE_STRING_IDS_H diff --git a/include/constants/battle.h b/include/constants/battle.h index 3260200ae..c2efecafc 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -314,4 +314,34 @@ #define BATTLE_RUN_FORBIDDEN 1 #define BATTLE_RUN_FAILURE 2 +// Window Ids for sStandardBattleWindowTemplates +#define B_WIN_MSG 0 +#define B_WIN_ACTION_PROMPT 1 // "What will {x} do?" +#define B_WIN_ACTION_MENU 2 // "Fight/Pokémon/Bag/Run" menu +#define B_WIN_MOVE_NAME_1 3 // Top left +#define B_WIN_MOVE_NAME_2 4 // Top right +#define B_WIN_MOVE_NAME_3 5 // Bottom left +#define B_WIN_MOVE_NAME_4 6 // Bottom right +#define B_WIN_PP 7 +#define B_WIN_MOVE_TYPE 8 +#define B_WIN_PP_REMAINING 9 +#define B_WIN_DUMMY 10 +#define B_WIN_SWITCH_PROMPT 11 // "Switch which?" +#define B_WIN_YESNO 14 +#define B_WIN_VS_PLAYER 15 +#define B_WIN_VS_OPPONENT 16 +#define B_WIN_VS_MULTI_PLAYER_1 17 +#define B_WIN_VS_MULTI_PLAYER_2 18 +#define B_WIN_VS_MULTI_PLAYER_3 19 +#define B_WIN_VS_MULTI_PLAYER_4 20 +#define B_WIN_VS_OUTCOME_DRAW 21 +#define B_WIN_VS_OUTCOME_LEFT 22 +#define B_WIN_VS_OUTCOME_RIGHT 23 +#define B_WIN_OAK_OLD_MAN 24 + +#define B_TEXT_FLAG_NONE (0 << 0) +#define B_TEXT_FLAG_NPC_CONTEXT_FONT (1 << 6) +#define B_TEXT_FLAG_WINDOW_CLEAR (1 << 7) +#define B_TEXT_FLAG_BOTH (B_TEXT_FLAG_NPC_CONTEXT_FONT | B_TEXT_FLAG_WINDOW_CLEAR) + #endif // GUARD_CONSTANTS_BATTLE_H diff --git a/include/constants/global.h b/include/constants/global.h index caee324aa..fff17a8b6 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -30,6 +30,7 @@ #define GAME_LANGUAGE (LANGUAGE_ENGLISH) #endif +// capacities of various saveblock objects #define DAYCARE_MON_COUNT 2 #define PC_ITEMS_COUNT 30 #define BAG_ITEMS_COUNT 42 @@ -53,6 +54,9 @@ #define POCKET_BERRY_POUCH 5 #define NUM_BAG_POCKETS 5 +// Contests +#define CONTEST_CATEGORIES_COUNT 5 + // string lengths #define ITEM_NAME_LENGTH 14 #define POKEMON_NAME_LENGTH 10 diff --git a/include/constants/items.h b/include/constants/items.h index 8f3e82c90..fc1e008a0 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -447,6 +447,7 @@ #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY #define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) +#define MAIL_NONE 0xFF #define NUM_TECHNICAL_MACHINES 50 #define NUM_HIDDEN_MACHINES 8 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 43a3a59d4..7a9a0afcf 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -81,7 +81,7 @@ #define MON_DATA_NATIONAL_RIBBON 76 #define MON_DATA_EARTH_RIBBON 77 #define MON_DATA_WORLD_RIBBON 78 -#define MON_DATA_FILLER 79 +#define MON_DATA_UNUSED_RIBBONS 79 #define MON_DATA_EVENT_LEGAL 80 #define MON_DATA_KNOWN_MOVES 81 #define MON_DATA_RIBBON_COUNT 82 diff --git a/include/evolution_graphics.h b/include/evolution_graphics.h index e4fbf0fc0..781f26ed3 100644 --- a/include/evolution_graphics.h +++ b/include/evolution_graphics.h @@ -5,12 +5,12 @@ void LoadEvoSparkleSpriteAndPal(void); -u8 LaunchTask_PreEvoSparklesSet1(u16 arg0); -u8 LaunchTask_PreEvoSparklesSet2(void); -u8 LaunchTask_PostEvoSparklesSet1(void); -u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species); -u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species); -u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId); +u8 EvolutionSparkles_SpiralUpward(u16 arg0); +u8 EvolutionSparkles_ArcDown(void); +u8 EvolutionSparkles_CircleInward(void); +u8 EvolutionSparkles_SprayAndFlash(u16 species); +u8 EvolutionSparkles_SprayAndFlash_Trade(u16 species); +u8 CycleEvolutionMonSprite(u8 preEvoSpriteId, u8 postEvoSpriteId); #define EvoGraphicsTaskEvoStop data[8] diff --git a/include/pokemon.h b/include/pokemon.h index 6134064d0..9c24a7389 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -73,7 +73,7 @@ struct PokemonSubstruct3 /* 0x0B */ u32 nationalRibbon:1; /* 0x0B */ u32 earthRibbon:1; /* 0x0B */ u32 worldRibbon:1; // distributed during Pokémon Festa '04 and '05 to tournament winners - /* 0x0B */ u32 filler:4; + /* 0x0B */ u32 unusedRibbons:4; // discarded in Gen 4 /* 0x0B */ u32 eventLegal:1; // controls Mew & Deoxys obedience; if set, Pokémon is a fateful encounter in FRLG & Gen 4+ summary screens; set for in-game event island legendaries, some distributed events, and Pokémon from XD: Gale of Darkness. }; diff --git a/include/sound.h b/include/sound.h index 840c23865..82ec758c5 100644 --- a/include/sound.h +++ b/include/sound.h @@ -24,7 +24,7 @@ bool8 IsBGMPausedOrStopped(void); void FadeInBGM(u8 speed); void FadeOutBGM(u8 speed); bool8 IsBGMStopped(void); -void PlayCry1(u16 species, s8 pan); +void PlayCry_Normal(u16 species, s8 pan); void PlayCry2(u16 species, s8 pan, s8 volume, u8 priority); void PlayCry3(u16 species, s8 pan, u8 mode); void PlayCry4(u16 species, s8 pan, u8 mode); diff --git a/include/trade_scene.h b/include/trade_scene.h index 31679eafe..876481c8f 100644 --- a/include/trade_scene.h +++ b/include/trade_scene.h @@ -9,7 +9,7 @@ u16 GetInGameTradeSpeciesInfo(void); u16 GetTradeSpecies(void); void InitTradeSequenceBgGpuRegs(void); void LinkTradeDrawWindow(void); -void LoadTradeAnimGfx(void); +void InitTradeBg(void); extern const u16 gTradeOrHatchMonShadowTilemap[]; extern const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate; diff --git a/src/battle_bg.c b/src/battle_bg.c index 7a4aa9d12..976781fee 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -764,7 +764,7 @@ static void DrawLinkBattleVsScreenOutcomeText(void) { if (gBattleOutcome == B_OUTCOME_DREW) { - BattlePutTextOnWindow(gText_Draw, 0x15); + BattlePutTextOnWindow(gText_Draw, (B_WIN_VS_OUTCOME_DRAW | B_TEXT_FLAG_NONE)); } else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { @@ -773,20 +773,20 @@ static void DrawLinkBattleVsScreenOutcomeText(void) switch (gLinkPlayers[gBattleStruct->multiplayerId].id) { case 0: - BattlePutTextOnWindow(gText_Win, 0x16); - BattlePutTextOnWindow(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); break; case 1: - BattlePutTextOnWindow(gText_Win, 0x17); - BattlePutTextOnWindow(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); break; case 2: - BattlePutTextOnWindow(gText_Win, 0x16); - BattlePutTextOnWindow(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); break; case 3: - BattlePutTextOnWindow(gText_Win, 0x17); - BattlePutTextOnWindow(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); break; } } @@ -795,20 +795,20 @@ static void DrawLinkBattleVsScreenOutcomeText(void) switch (gLinkPlayers[gBattleStruct->multiplayerId].id) { case 0: - BattlePutTextOnWindow(gText_Win, 0x17); - BattlePutTextOnWindow(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); break; case 1: - BattlePutTextOnWindow(gText_Win, 0x16); - BattlePutTextOnWindow(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); break; case 2: - BattlePutTextOnWindow(gText_Win, 0x17); - BattlePutTextOnWindow(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); break; case 3: - BattlePutTextOnWindow(gText_Win, 0x16); - BattlePutTextOnWindow(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); break; } } @@ -817,26 +817,26 @@ static void DrawLinkBattleVsScreenOutcomeText(void) { if (gLinkPlayers[gBattleStruct->multiplayerId].id != 0) { - BattlePutTextOnWindow(gText_Win, 0x17); - BattlePutTextOnWindow(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); } else { - BattlePutTextOnWindow(gText_Win, 0x16); - BattlePutTextOnWindow(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); } } else { if (gLinkPlayers[gBattleStruct->multiplayerId].id != 0) { - BattlePutTextOnWindow(gText_Win, 0x16); - BattlePutTextOnWindow(gText_Loss, 0x17); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); } else { - BattlePutTextOnWindow(gText_Win, 0x17); - BattlePutTextOnWindow(gText_Loss, 0x16); + BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); } } } @@ -860,19 +860,19 @@ void InitLinkBattleVsScreen(u8 taskId) switch (linkPlayer->id) { case 0: - BattlePutTextOnWindow(name, 0x11); + BattlePutTextOnWindow(name, (B_WIN_VS_MULTI_PLAYER_1 | B_TEXT_FLAG_NONE)); DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 1, 2, 4); break; case 1: - BattlePutTextOnWindow(name, 0x12); + BattlePutTextOnWindow(name, (B_WIN_VS_MULTI_PLAYER_2 | B_TEXT_FLAG_NONE)); DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 2, 2, 4); break; case 2: - BattlePutTextOnWindow(name, 0x13); + BattlePutTextOnWindow(name, (B_WIN_VS_MULTI_PLAYER_3 | B_TEXT_FLAG_NONE)); DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 1, 2, 8); break; case 3: - BattlePutTextOnWindow(name, 0x14); + BattlePutTextOnWindow(name, (B_WIN_VS_MULTI_PLAYER_4 | B_TEXT_FLAG_NONE)); DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 2, 2, 8); break; } @@ -888,10 +888,10 @@ void InitLinkBattleVsScreen(u8 taskId) opponentId = playerId, playerId = opponentId_copy; name = gLinkPlayers[playerId].name; - BattlePutTextOnWindow(name, 0xF); + BattlePutTextOnWindow(name, (B_WIN_VS_PLAYER | B_TEXT_FLAG_NONE)); name = gLinkPlayers[opponentId].name; - BattlePutTextOnWindow(name, 0x10); + BattlePutTextOnWindow(name, (B_WIN_VS_OPPONENT | B_TEXT_FLAG_NONE)); DrawLinkBattleParticipantPokeballs(taskId, playerId, 1, 2, 7); DrawLinkBattleParticipantPokeballs(taskId, opponentId, 2, 2, 7); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index ad21a7e56..eb211e7c8 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1310,9 +1310,9 @@ static void LinkOpponentHandlePrintString(void) stringId = (u16 *)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); if (BattleStringShouldBeColored(*stringId)) - BattlePutTextOnWindow(gDisplayedStringBattle, 0x40); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 539532070..b46591825 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1223,9 +1223,9 @@ static void LinkPartnerHandlePrintString(void) stringId = (u16 *)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); if (BattleStringShouldBeColored(*stringId)) - BattlePutTextOnWindow(gDisplayedStringBattle, 0x40); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c index 4a40d0a64..f578c7136 100644 --- a/src/battle_controller_oak_old_man.c +++ b/src/battle_controller_oak_old_man.c @@ -651,7 +651,7 @@ static void PrintOakText_ForPetesSake(void) break; case 2: BattleStringExpandPlaceholdersToDisplayedString(gText_ForPetesSake); - BattlePutTextOnWindow(gDisplayedStringBattle, 24); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); ++gBattleStruct->simulatedInputState[0]; break; case 3: @@ -670,7 +670,7 @@ static void PrintOakText_ForPetesSake(void) if (!gPaletteFade.active) { BattleStringExpandPlaceholdersToDisplayedString(gText_TheTrainerThat); - BattlePutTextOnWindow(gDisplayedStringBattle, 24); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); ++gBattleStruct->simulatedInputState[0]; } break; @@ -690,7 +690,7 @@ static void PrintOakText_ForPetesSake(void) if (!gPaletteFade.active) { BattleStringExpandPlaceholdersToDisplayedString(gText_TryBattling); - BattlePutTextOnWindow(gDisplayedStringBattle, 24); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); ++gBattleStruct->simulatedInputState[0]; } break; @@ -774,7 +774,7 @@ static void PrintOakTextWithMainBgDarkened(const u8 *text, u8 delay) break; case 3: BattleStringExpandPlaceholdersToDisplayedString(text); - BattlePutTextOnWindow(gDisplayedStringBattle, 24); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); ++gBattleStruct->simulatedInputState[0]; break; case 4: @@ -842,7 +842,7 @@ static void PrintOakText_KeepAnEyeOnHP(void) break; case 3: BattleStringExpandPlaceholdersToDisplayedString(gText_KeepAnEyeOnHP); - BattlePutTextOnWindow(gDisplayedStringBattle, 24); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); ++gBattleStruct->simulatedInputState[0]; break; case 4: @@ -1759,9 +1759,9 @@ static void OakOldManHandlePrintString(void) { BufferStringBattle(*stringId); if (BattleStringShouldBeColored(*stringId)) - BattlePutTextOnWindow(gDisplayedStringBattle, 0x40); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) { switch (*stringId) @@ -1815,8 +1815,8 @@ static void OakOldManHandleChooseAction(void) s32 i; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattlePutTextOnWindow(gText_EmptyString3, 0); - BattlePutTextOnWindow(gText_BattleMenu, 2); + BattlePutTextOnWindow(gText_EmptyString3, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_BattleMenu, (B_WIN_ACTION_MENU | B_TEXT_FLAG_NONE)); for (i = 0; i < MAX_MON_MOVES; ++i) ActionSelectionDestroyCursorAt((u8)i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); @@ -1824,7 +1824,7 @@ static void OakOldManHandleChooseAction(void) BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo); else BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillOldManDo); - BattlePutTextOnWindow(gDisplayedStringBattle, 1); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_ACTION_PROMPT | B_TEXT_FLAG_NONE)); } static void OakOldManHandleUnknownYesNoBox(void) @@ -2060,7 +2060,7 @@ static void OakOldManHandleFaintingCry(void) { u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); - PlayCry1(species, 25); + PlayCry_Normal(species, 25); OakOldManBufferExecCompleted(); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index ce6f6a1c7..8a048fc53 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1312,9 +1312,9 @@ static void OpponentHandlePrintString(void) stringId = (u16 *)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); if (BattleStringShouldBeColored(*stringId)) - BattlePutTextOnWindow(gDisplayedStringBattle, 0x40); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) { switch (*stringId) diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index c3bf976b4..4367539d7 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -570,7 +570,7 @@ void HandleInputChooseMove(void) else gMultiUsePlayerCursor = gMoveSelectionCursor[gActiveBattler] + 1; MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27); - BattlePutTextOnWindow(gText_BattleSwitchWhich, 0xB); + BattlePutTextOnWindow(gText_BattleSwitchWhich, (B_WIN_SWITCH_PROMPT | B_TEXT_FLAG_NONE)); gBattlerControllerFuncs[gActiveBattler] = HandleMoveSwitching; } } @@ -1379,7 +1379,7 @@ static void MoveSelectionDisplayMoveNames(void) static void MoveSelectionDisplayPpString(void) { StringCopy(gDisplayedStringBattle, gText_MoveInterfacePP); - BattlePutTextOnWindow(gDisplayedStringBattle, 7); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_PP | B_TEXT_FLAG_NONE)); } static void MoveSelectionDisplayPpNumber(void) @@ -1394,7 +1394,7 @@ static void MoveSelectionDisplayPpNumber(void) txtPtr = ConvertIntToDecimalStringN(gDisplayedStringBattle, moveInfo->currentPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2); *txtPtr = CHAR_SLASH; ConvertIntToDecimalStringN(++txtPtr, moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2); - BattlePutTextOnWindow(gDisplayedStringBattle, 9); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_PP_REMAINING | B_TEXT_FLAG_NONE)); } static void MoveSelectionDisplayMoveType(void) @@ -1408,7 +1408,7 @@ static void MoveSelectionDisplayMoveType(void) *txtPtr++ = 1; txtPtr = StringCopy(txtPtr, gUnknown_83FE770); StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]); - BattlePutTextOnWindow(gDisplayedStringBattle, 8); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MOVE_TYPE | B_TEXT_FLAG_NONE)); } void MoveSelectionCreateCursorAt(u8 cursorPosition, u8 arg1) @@ -1479,7 +1479,7 @@ static void PrintLinkStandbyMsg(void) { gBattle_BG0_X = 0; gBattle_BG0_Y = 0; - BattlePutTextOnWindow(gText_LinkStandby, 0); + BattlePutTextOnWindow(gText_LinkStandby, (B_WIN_MSG | B_TEXT_FLAG_NONE)); } } @@ -2377,9 +2377,9 @@ static void PlayerHandlePrintString(void) stringId = (u16 *)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); if (BattleStringShouldBeColored(*stringId)) - BattlePutTextOnWindow(gDisplayedStringBattle, 0x40); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2; } @@ -2406,13 +2406,13 @@ static void PlayerHandleChooseAction(void) s32 i; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattlePutTextOnWindow(gText_EmptyString3, 0); - BattlePutTextOnWindow(gText_BattleMenu, 2); + BattlePutTextOnWindow(gText_EmptyString3, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_BattleMenu, (B_WIN_ACTION_MENU | B_TEXT_FLAG_NONE)); for (i = 0; i < 4; ++i) ActionSelectionDestroyCursorAt(i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo); - BattlePutTextOnWindow(gDisplayedStringBattle, 1); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_ACTION_PROMPT | B_TEXT_FLAG_NONE)); } static void PlayerHandleUnknownYesNoBox(void) diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 5b5ee3eb0..4bacb902e 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -1533,9 +1533,9 @@ static void PokedudeHandlePrintString(void) stringId = (u16 *)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); if (BattleStringShouldBeColored(*stringId)) - BattlePutTextOnWindow(gDisplayedStringBattle, 0x40); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } @@ -1564,13 +1564,13 @@ static void PokedudeHandleChooseAction(void) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattlePutTextOnWindow(gText_EmptyString3, 0); - BattlePutTextOnWindow(gText_BattleMenu, 2); + BattlePutTextOnWindow(gText_EmptyString3, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_BattleMenu, (B_WIN_ACTION_MENU | B_TEXT_FLAG_NONE)); for (i = 0; i < MAX_MON_MOVES; ++i) ActionSelectionDestroyCursorAt((u8)i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo); - BattlePutTextOnWindow(gDisplayedStringBattle, 1); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_ACTION_PROMPT | B_TEXT_FLAG_NONE)); } else { @@ -1834,7 +1834,7 @@ static void PokedudeHandleFaintingCry(void) else mon = &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]; species = GetMonData(mon, MON_DATA_SPECIES); - PlayCry1(species, 25); + PlayCry_Normal(species, 25); PokedudeBufferExecCompleted(); } @@ -2557,7 +2557,7 @@ static void PokedudeAction_PrintVoiceoverMessage(void) case 2: gBattle_BG0_Y = 0; BattleStringExpandPlaceholdersToDisplayedString(GetPokedudeText()); - BattlePutTextOnWindow(gDisplayedStringBattle, 24); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); ++gPokedudeBattlerStates[gActiveBattler]->timer; break; case 3: @@ -2618,7 +2618,7 @@ static void PokedudeAction_PrintMessageWithHealthboxPals(void) break; case 3: BattleStringExpandPlaceholdersToDisplayedString(GetPokedudeText()); - BattlePutTextOnWindow(gDisplayedStringBattle, 24); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); ++gPokedudeBattlerStates[gActiveBattler]->timer; break; case 4: diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 0fd72ed10..bb6e34296 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -409,9 +409,9 @@ static void SafariHandlePrintString(void) stringId = (u16 *)(&gBattleBufferA[gActiveBattler][2]); BufferStringBattle(*stringId); if (BattleStringShouldBeColored(*stringId)) - BattlePutTextOnWindow(gDisplayedStringBattle, 0x40); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } @@ -438,13 +438,13 @@ static void SafariHandleChooseAction(void) s32 i; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattlePutTextOnWindow(gText_EmptyString3, 0); - BattlePutTextOnWindow(gUnknown_83FE747, 2); + BattlePutTextOnWindow(gText_EmptyString3, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gUnknown_83FE747, (B_WIN_ACTION_MENU | B_TEXT_FLAG_NONE)); for (i = 0; i < 4; ++i) ActionSelectionDestroyCursorAt(i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPlayerThrow); - BattlePutTextOnWindow(gDisplayedStringBattle, 1); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_ACTION_PROMPT | B_TEXT_FLAG_NONE)); } static void SafariHandleUnknownYesNoBox(void) @@ -594,7 +594,7 @@ static void SafariHandleFaintingCry(void) { u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); - PlayCry1(species, 25); + PlayCry_Normal(species, 25); SafariBufferExecCompleted(); } diff --git a/src/battle_main.c b/src/battle_main.c index b98fe6e2b..957fac0f4 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1796,7 +1796,7 @@ static void EndLinkBattleInSteps(void) } } -u32 GetBattleBgAttribute(u8 arrayId, u8 caseId) +u32 GetBattleBgTemplateData(u8 arrayId, u8 caseId) { u32 ret = 0; @@ -1859,7 +1859,7 @@ static void SpriteCB_MoveWildMonToRight(struct Sprite *sprite) if (sprite->x2 == 0) { sprite->callback = SpriteCB_WildMonShowHealthbox; - PlayCry1(sprite->data[2], 25); + PlayCry_Normal(sprite->data[2], 25); } } } diff --git a/src/battle_message.c b/src/battle_message.c index 73735d49c..63911400d 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1701,14 +1701,14 @@ void BufferStringBattle(u16 stringId) } break; default: // load a string from the table - if (stringId >= BATTLESTRINGS_COUNT + BATTLESTRINGS_ID_ADDER) + if (stringId >= BATTLESTRINGS_COUNT + BATTLESTRINGS_TABLE_START) { gDisplayedStringBattle[0] = EOS; return; } else { - stringPtr = gBattleStringsTable[stringId - BATTLESTRINGS_ID_ADDER]; + stringPtr = gBattleStringsTable[stringId - BATTLESTRINGS_TABLE_START]; } break; } @@ -2169,7 +2169,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) { case B_BUFF_STRING: // battle string hword = T1_READ_16(&src[srcId + 1]); - StringAppend(dst, gBattleStringsTable[hword - BATTLESTRINGS_ID_ADDER]); + StringAppend(dst, gBattleStringsTable[hword - BATTLESTRINGS_TABLE_START]); srcId += 3; break; case B_BUFF_NUMBER: // int to string diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 19ec1d615..4b0a8e713 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4983,7 +4983,7 @@ static void atk5A_yesnoboxlearnmove(void) { case 0: HandleBattleWindow(0x17, 8, 0x1D, 0xD, 0); - BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xE); + BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); ++gBattleScripting.learnMoveState; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); @@ -5093,7 +5093,7 @@ static void atk5B_yesnoboxstoplearningmove(void) { case 0: HandleBattleWindow(0x17, 8, 0x1D, 0xD, 0); - BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xE); + BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); ++gBattleScripting.learnMoveState; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); @@ -5381,7 +5381,7 @@ static void atk67_yesnobox(void) { case 0: HandleBattleWindow(0x17, 8, 0x1D, 0xD, 0); - BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xE); + BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); ++gBattleCommunication[0]; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); @@ -9298,7 +9298,7 @@ static void atkF3_trygivecaughtmonnick(void) { case 0: HandleBattleWindow(0x17, 8, 0x1D, 0xD, 0); - BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xE); + BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); ++gBattleCommunication[MULTIUSE_STATE]; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); diff --git a/src/battle_transition.c b/src/battle_transition.c index 7b6ad2a87..a14cfd3e3 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1982,7 +1982,7 @@ static bool8 BT_Phase2Mugshot_ExpandWhiteBand(struct Task *task) static bool8 BT_Phase2Mugshot_StartBlackFade(struct Task *task) { sTransitionStructPtr->vblankDma = FALSE; - BlendPalettes(0xFFFFFFFF, 0x10, RGB_WHITE); + BlendPalettes(PALETTES_ALL, 0x10, RGB_WHITE); sTransitionStructPtr->bldCnt = BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN; task->tCounter = 0; ++task->tState; @@ -2310,7 +2310,7 @@ static bool8 BT_Phase2WhiteFadeInStripes_IsWhiteFadeDone(struct Task *task) sTransitionStructPtr->vblankDma = FALSE; if (sTransitionStructPtr->counter > 5) { - BlendPalettes(0xFFFFFFFF, 0x10, RGB_WHITE); + BlendPalettes(PALETTES_ALL, 0x10, RGB_WHITE); ++task->tState; } return FALSE; @@ -2658,7 +2658,7 @@ static bool8 BT_Phase1_FadeIn(struct Task *task) task->tCoeff -= task->tFadeInSpeed; if (task->tCoeff < 0) task->tCoeff = 0; - BlendPalettes(0xFFFFFFFF, task->tCoeff, RGB(11, 11, 11)); + BlendPalettes(PALETTES_ALL, task->tCoeff, RGB(11, 11, 11)); } if (task->tCoeff == 0) { @@ -2719,7 +2719,7 @@ static void BT_GetBg0TilemapAndTilesetBase(u16 **tilemapPtr, u16 **tilesetPtr) static void BT_BlendPalettesToBlack(void) { - BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK); } static void BT_LoadWaveIntoBuffer(s16 *buffer, s16 offset, s16 theta, s16 frequency, s16 amplitude, s16 bufSize) diff --git a/src/berry_pouch.c b/src/berry_pouch.c index 086dfc2f4..875f37137 100644 --- a/src/berry_pouch.c +++ b/src/berry_pouch.c @@ -552,7 +552,7 @@ static bool8 RunBerryPouchInit(void) gMain.state++; break; case 17: - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); gMain.state++; break; case 18: diff --git a/src/dark.c b/src/dark.c index 202782c55..9b12555d9 100644 --- a/src/dark.c +++ b/src/dark.c @@ -412,7 +412,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId) GetBattleAnimBg1Data(&animBg); task->data[10] = gBattle_BG1_Y; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG1); - FillPalette(0, animBg.paletteId * 16, 32); + FillPalette(RGB_BLACK, animBg.paletteId * 16, 32); scanlineParams.dmaDest = ®_BG1VOFS; var0 = WINOUT_WIN01_BG1; if (!IsContest()) @@ -422,7 +422,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId) { task->data[10] = gBattle_BG2_Y; SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG2); - FillPalette(0, 144, 32); + FillPalette(RGB_BLACK, 144, 32); scanlineParams.dmaDest = ®_BG2VOFS; var0 = WINOUT_WIN01_BG2; if (!IsContest()) @@ -542,12 +542,12 @@ void AnimTask_MoveTargetMementoShadow(u8 taskId) { GetBattleAnimBg1Data(&animBg); task->data[10] = gBattle_BG1_Y; - FillPalette(0, animBg.paletteId * 16, 32); + FillPalette(RGB_BLACK, animBg.paletteId * 16, 32); } else { task->data[10] = gBattle_BG2_Y; - FillPalette(0, 9 * 16, 32); + FillPalette(RGB_BLACK, 9 * 16, 32); } sub_80B856C(3); ++task->data[0]; diff --git a/src/daycare.c b/src/daycare.c index f43742aca..141f40db5 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1920,7 +1920,7 @@ static void CB2_EggHatch_1(void) case 3: if (gSprites[sEggHatchData->eggSpriteID].callback == SpriteCallbackDummy) { - PlayCry1(sEggHatchData->species, 0); + PlayCry_Normal(sEggHatchData->species, 0); sEggHatchData->CB2_state++; } break; diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 377a9661e..68e618bf8 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -332,7 +332,7 @@ static void sub_8150A84(u8 taskId) gUnknown_203F3E0->unk0C++; break; case 6: - BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); SetVBlankCallback(sub_8152034); gUnknown_203F3E0->unk0C++; @@ -902,7 +902,7 @@ static void sub_815159C(void) gUnknown_203F3E0->unk10++; break; case 5: - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); gUnknown_203F3E0->unk10++; break; diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index fd445d827..90d066674 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -162,7 +162,7 @@ static void Task_RunEasyChat(u8 taskId) { case 0: SetVBlankCallback(VBlankCallback_EasyChatScreen); - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); data[EZCHAT_TASK_STATE]++; break; diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index 54f378670..c1d6befac 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -259,7 +259,7 @@ void LoadEvoSparkleSpriteAndPal(void) LoadSpritePalettes(sSpritePalette_EvolutionSparkles); } -u8 LaunchTask_PreEvoSparklesSet1(u16 a0) +u8 EvolutionSparkles_SpiralUpward(u16 a0) { u8 taskId = CreateTask(EvoTask_PreEvoSparkleSet1Init, 0); gTasks[taskId].data[1] = a0; @@ -302,7 +302,7 @@ static void EvoTask_WaitForPre1SparklesToGoUp(u8 taskId) DestroyTask(taskId); } -u8 LaunchTask_PreEvoSparklesSet2(void) +u8 EvolutionSparkles_ArcDown(void) { u8 taskId = CreateTask(EvoTask_PreEvoSparkleSet2Init, 0); return taskId; @@ -339,7 +339,7 @@ static void EvoTask_PreEvoSparkleSet2Teardown(u8 taskId) DestroyTask(taskId); } -u8 LaunchTask_PostEvoSparklesSet1(void) +u8 EvolutionSparkles_CircleInward(void) { u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet1Init, 0); return taskId; @@ -385,7 +385,7 @@ static void EvoTask_PostEvoSparklesSet1Teardown(u8 taskId) DestroyTask(taskId); } -u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species) +u8 EvolutionSparkles_SprayAndFlash(u16 species) { u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet2Init, 0); gTasks[taskId].data[2] = species; @@ -436,7 +436,7 @@ static void EvoTask_PostEvoSparklesSet2Teardown(u8 taskId) DestroyTask(taskId); } -u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species) +u8 EvolutionSparkles_SprayAndFlash_Trade(u16 species) { u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet2TradeInit, 0); gTasks[taskId].data[2] = species; @@ -493,7 +493,7 @@ static void SpriteCallbackDummy_MonSprites(struct Sprite * sprite) #define tDirection data[5] #define tSpeed data[6] -u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId) +u8 CycleEvolutionMonSprite(u8 preEvoSpriteId, u8 postEvoSpriteId) { u16 i; u8 taskId; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index cb2e472bf..1229d67ba 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -23,8 +23,10 @@ #include "text_window.h" #include "trig.h" #include "battle_string_ids.h" +#include "constants/moves.h" #include "constants/songs.h" #include "constants/pokemon.h" +#include "constants/items.h" extern struct Evolution gEvolutionTable[][EVOS_PER_MON]; @@ -33,13 +35,13 @@ struct EvoInfo u8 preEvoSpriteId; u8 postEvoSpriteId; u8 evoTaskId; - u8 field_3; + u8 delayTimer; u16 savedPalette[48]; }; // EWRAM vars static EWRAM_DATA struct EvoInfo *sEvoStructPtr = NULL; -static EWRAM_DATA u16 *sEvoMovingBgPtr = NULL; +static EWRAM_DATA u16 *sBgAnimPal = NULL; // IWRAM common void (*gCB2_AfterEvolution)(void); @@ -55,10 +57,10 @@ static void CB2_TradeEvolutionSceneUpdate(void); static void EvoDummyFunc(void); static void VBlankCB_EvolutionScene(void); static void VBlankCB_TradeEvolutionScene(void); -static void DestroyMovingBackgroundTasks(void); -static void InitMovingBackgroundTask(bool8 isLink); -static void Task_MovingBackgroundPos(u8 taskId); -static void ResetBgRegsAfterMovingBackgroundCancel(void); +static void StartBgAnimation(bool8 isLink); +static void StopBgAnimation(void); +static void Task_AnimateBg(u8 taskId); +static void RestoreBgAfterAnim(void); // const data static const u16 sUnusedPal[] = INCBIN_U16("graphics/evolution_scene/unused.gbapal"); @@ -67,7 +69,7 @@ static const u32 sMovingBackgroundMap1[] = INCBIN_U32("graphics/evolution_scene/ static const u32 sMovingBackgroundMap2[] = INCBIN_U32("graphics/evolution_scene/bg2.bin.lz"); static const u16 sBlackPalette[] = INCBIN_U16("graphics/evolution_scene/gray_transition_intro.gbapal"); static const u16 sUnusedTilemap[] = INCBIN_U16("graphics/evolution_scene/unused_tilemap.bin"); -static const u16 sMovingBgPals[] = INCBIN_U16("graphics/evolution_scene/transition.gbapal"); +static const u16 sBgAnim_Pal[] = INCBIN_U16("graphics/evolution_scene/transition.gbapal"); static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン"); @@ -79,8 +81,13 @@ static const u8 unref_83F844F[][10] = { _(" \n ") }; -// start frame, stop frame, loop count, delay -static const u8 sMovingBackgroundTimers[][4] = +// The below table is used by Task_UpdateBgPalette to control the speed at which the bg color updates. +// The first two values are indexes into sBgAnim_PalIndexes (indirectly, via sBgAnimPal), and are +// the start and end of the range of colors in sBgAnim_PalIndexes it will move through incrementally +// before starting over. It will repeat this cycle x number of times, where x = the 3rd value, +// delaying each increment by y, where y = the 4th value. +// Once it has cycled x number of times, it will move to the next array in this table. +static const u8 sBgAnim_PaletteControl[][4] = { { 0, 12, 1, 6 }, { 13, 36, 5, 2 }, @@ -88,7 +95,8 @@ static const u8 sMovingBackgroundTimers[][4] = { 37, 49, 1, 6 }, }; -static const u8 sMovingBgPalIndices[][16] = { +// Indexes into sBgAnim_Pal, 0 is black, transitioning to a bright light blue (172, 213, 255) at 13 +static const u8 sBgAnim_PalIndexes[][16] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0 }, @@ -254,12 +262,12 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u trainerId = GetMonData(mon, MON_DATA_OT_ID); personality = GetMonData(mon, MON_DATA_PERSONALITY); DecompressPicFromTable(&gMonFrontPicTable[currSpecies], - gMonSpritesGfxPtr->sprites[1], + gMonSpritesGfxPtr->sprites[B_POSITION_OPPONENT_LEFT], currSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(currSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x110, 0x20); - SetMultiuseSpriteTemplateToPokemon(currSpecies, 1); + SetMultiuseSpriteTemplateToPokemon(currSpecies, B_POSITION_OPPONENT_LEFT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->preEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); @@ -269,12 +277,12 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u // postEvo sprite DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], - gMonSpritesGfxPtr->sprites[3], + gMonSpritesGfxPtr->sprites[B_POSITION_OPPONENT_RIGHT], postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); - SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 3); + SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); gSprites[id].callback = SpriteCallbackDummy_2; @@ -292,7 +300,7 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u gTasks[id].tEvoWasStopped = FALSE; gTasks[id].tPartyId = partyId; - memcpy(&sEvoStructPtr->savedPalette, &gPlttBufferUnfaded[0x20], 0x60); + memcpy(&sEvoStructPtr->savedPalette, &gPlttBufferUnfaded[0x20], sizeof(sEvoStructPtr->savedPalette)); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP); @@ -309,11 +317,11 @@ static void CB2_EvolutionSceneLoadGraphics(void) const struct CompressedSpritePalette* pokePal; u16 postEvoSpecies; u32 trainerId, personality; - struct Pokemon* Mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskId].tPartyId]; + struct Pokemon* mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskId].tPartyId]; postEvoSpecies = gTasks[sEvoStructPtr->evoTaskId].tPostEvoSpecies; - trainerId = GetMonData(Mon, MON_DATA_OT_ID); - personality = GetMonData(Mon, MON_DATA_PERSONALITY); + trainerId = GetMonData(mon, MON_DATA_OT_ID); + personality = GetMonData(mon, MON_DATA_PERSONALITY); SetHBlankCallback(NULL); SetVBlankCallback(NULL); @@ -347,13 +355,13 @@ static void CB2_EvolutionSceneLoadGraphics(void) gReservedSpritePaletteCount = 4; DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], - gMonSpritesGfxPtr->sprites[3], + gMonSpritesGfxPtr->sprites[B_POSITION_OPPONENT_RIGHT], postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); - SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 3); + SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_RIGHT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); @@ -376,7 +384,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) static void CB2_TradeEvolutionSceneLoadGraphics(void) { - struct Pokemon* Mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskId].tPartyId]; + struct Pokemon* mon = &gPlayerParty[gTasks[sEvoStructPtr->evoTaskId].tPartyId]; u16 postEvoSpecies = gTasks[sEvoStructPtr->evoTaskId].tPostEvoSpecies; switch (gMain.state) @@ -405,7 +413,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gMain.state++; break; case 2: - LoadTradeAnimGfx(); + InitTradeBg(); gMain.state++; break; case 3: @@ -416,10 +424,10 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) case 4: { const struct CompressedSpritePalette* pokePal; - u32 trainerId = GetMonData(Mon, MON_DATA_OT_ID); - u32 personality = GetMonData(Mon, MON_DATA_PERSONALITY); + u32 trainerId = GetMonData(mon, MON_DATA_OT_ID); + u32 personality = GetMonData(mon, MON_DATA_PERSONALITY); DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], - gMonSpritesGfxPtr->sprites[3], + gMonSpritesGfxPtr->sprites[B_POSITION_OPPONENT_RIGHT], postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); @@ -430,7 +438,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) { u8 id; - SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 1); + SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_LEFT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); @@ -446,7 +454,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) LoadWirelessStatusIndicatorSpriteGfx(); CreateWirelessStatusIndicatorSprite(0, 0); } - BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK); gMain.state++; break; case 7: @@ -483,13 +491,13 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, u8 preEvoSprit sEvoStructPtr->preEvoSpriteId = preEvoSpriteId; DecompressPicFromTable(&gMonFrontPicTable[postEvoSpecies], - gMonSpritesGfxPtr->sprites[1], + gMonSpritesGfxPtr->sprites[B_POSITION_OPPONENT_LEFT], postEvoSpecies); pokePal = GetMonSpritePalStructFromOtIdPersonality(postEvoSpecies, trainerId, personality); LoadCompressedPalette(pokePal->data, 0x120, 0x20); - SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, 1); + SetMultiuseSpriteTemplateToPokemon(postEvoSpecies, B_POSITION_OPPONENT_LEFT); gMultiuseSpriteTemplate.affineAnims = gDummySpriteAffineAnimTable; sEvoStructPtr->postEvoSpriteId = id = CreateSprite(&gMultiuseSpriteTemplate, 120, 64, 30); @@ -543,26 +551,26 @@ static void CB2_TradeEvolutionSceneUpdate(void) static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon) { u32 data = 0; - if (gEvolutionTable[preEvoSpecies][0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < 6) + if (gEvolutionTable[preEvoSpecies][0].method == EVO_LEVEL_NINJASK && gPlayerPartyCount < PARTY_SIZE) { s32 i; struct Pokemon* shedinja = &gPlayerParty[gPlayerPartyCount]; CopyMon(&gPlayerParty[gPlayerPartyCount], mon, sizeof(struct Pokemon)); - SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_SPECIES, (&gEvolutionTable[preEvoSpecies][1].targetSpecies)); - SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_NICKNAME, (gSpeciesNames[gEvolutionTable[preEvoSpecies][1].targetSpecies])); - SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_HELD_ITEM, (&data)); - SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_MARKINGS, (&data)); - SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_ENCRYPT_SEPARATOR, (&data)); + SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_SPECIES, &gEvolutionTable[preEvoSpecies][1].targetSpecies); + SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_NICKNAME, gSpeciesNames[gEvolutionTable[preEvoSpecies][1].targetSpecies]); + SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_HELD_ITEM, &data); + SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_MARKINGS, &data); + SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_ENCRYPT_SEPARATOR, &data); - for (i = MON_DATA_COOL_RIBBON; i < MON_DATA_COOL_RIBBON + 5; i++) - SetMonData(&gPlayerParty[gPlayerPartyCount], i, (&data)); - for (i = MON_DATA_CHAMPION_RIBBON; i <= MON_DATA_FILLER; i++) - SetMonData(&gPlayerParty[gPlayerPartyCount], i, (&data)); + for (i = MON_DATA_COOL_RIBBON; i < MON_DATA_COOL_RIBBON + CONTEST_CATEGORIES_COUNT; i++) + SetMonData(&gPlayerParty[gPlayerPartyCount], i, &data); + for (i = MON_DATA_CHAMPION_RIBBON; i <= MON_DATA_UNUSED_RIBBONS; i++) + SetMonData(&gPlayerParty[gPlayerPartyCount], i, &data); - SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_STATUS, (&data)); - data = 0xFF; - SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_MAIL, (&data)); + SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_STATUS, &data); + data = MAIL_NONE; + SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_MAIL, &data); CalculateMonStats(&gPlayerParty[gPlayerPartyCount]); CalculatePlayerPartyCount(); @@ -577,6 +585,53 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon) } } +// States for the main switch in Task_EvolutionScene +enum { + EVOSTATE_FADE_IN, + EVOSTATE_INTRO_MSG, + EVOSTATE_INTRO_MON_ANIM, + EVOSTATE_INTRO_SOUND, + EVOSTATE_START_MUSIC, + EVOSTATE_START_BG_AND_SPARKLE_SPIRAL, + EVOSTATE_SPARKLE_ARC, + EVOSTATE_CYCLE_MON_SPRITE, + EVOSTATE_WAIT_CYCLE_MON_SPRITE, + EVOSTATE_SPARKLE_CIRCLE, + EVOSTATE_SPARKLE_SPRAY, + EVOSTATE_EVO_SOUND, + EVOSTATE_RESTORE_SCREEN, + EVOSTATE_EVO_MON_ANIM, + EVOSTATE_SET_MON_EVOLVED, + EVOSTATE_TRY_LEARN_MOVE, + EVOSTATE_END, + EVOSTATE_CANCEL, + EVOSTATE_CANCEL_MON_ANIM, + EVOSTATE_CANCEL_MSG, + EVOSTATE_LEARNED_MOVE, + EVOSTATE_TRY_LEARN_ANOTHER_MOVE, + EVOSTATE_REPLACE_MOVE, +}; + +// States for the switch in EVOSTATE_REPLACE_MOVE +enum { + MVSTATE_INTRO_MSG_1, + MVSTATE_INTRO_MSG_2, + MVSTATE_INTRO_MSG_3, + MVSTATE_PRINT_YES_NO, + MVSTATE_HANDLE_YES_NO, + MVSTATE_SHOW_MOVE_SELECT, + MVSTATE_HANDLE_MOVE_SELECT, + MVSTATE_FORGET_MSG_1, + MVSTATE_FORGET_MSG_2, + MVSTATE_LEARNED_MOVE, + MVSTATE_ASK_CANCEL, + MVSTATE_CANCEL, + MVSTATE_RETRY_AFTER_HM, +}; + +// Task data from CycleEvolutionMonSprite +#define tEvoStopped data[8] + static void Task_EvolutionScene(u8 taskId) { u32 var; @@ -585,31 +640,31 @@ static void Task_EvolutionScene(u8 taskId) // Automatically cancel if the Pokemon would evolve into a species you have not // yet unlocked, such as Crobat. if (!IsNationalPokedexEnabled() - && gTasks[taskId].tState == 8 + && gTasks[taskId].tState == EVOSTATE_WAIT_CYCLE_MON_SPRITE && gTasks[taskId].tPostEvoSpecies > SPECIES_MEW) { - gTasks[taskId].tState = 17; + gTasks[taskId].tState = EVOSTATE_CANCEL; gTasks[taskId].tEvoWasStopped = TRUE; - gTasks[sEvoGraphicsTaskId].EvoGraphicsTaskEvoStop = TRUE; - DestroyMovingBackgroundTasks(); + gTasks[sEvoGraphicsTaskId].tEvoStopped = TRUE; + StopBgAnimation(); return; } // check if B Button was held, so the evolution gets stopped if (gMain.heldKeys == B_BUTTON - && gTasks[taskId].tState == 8 + && gTasks[taskId].tState == EVOSTATE_WAIT_CYCLE_MON_SPRITE && gTasks[sEvoGraphicsTaskId].isActive && gTasks[taskId].tBits & TASK_BIT_CAN_STOP) { - gTasks[taskId].tState = 17; - gTasks[sEvoGraphicsTaskId].EvoGraphicsTaskEvoStop = TRUE; - DestroyMovingBackgroundTasks(); + gTasks[taskId].tState = EVOSTATE_CANCEL; + gTasks[sEvoGraphicsTaskId].tEvoStopped = TRUE; + StopBgAnimation(); return; } switch (gTasks[taskId].tState) { - case 0: + case EVOSTATE_FADE_IN: BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK); gSprites[sEvoStructPtr->preEvoSpriteId].invisible = FALSE; gTasks[taskId].tState++; @@ -618,107 +673,108 @@ static void Task_EvolutionScene(u8 taskId) ShowBg(2); ShowBg(3); break; - case 1: // print 'whoa, poke is evolving!!!' msg + case EVOSTATE_INTRO_MSG: // print 'whoa, poke is evolving!!!' msg if (!gPaletteFade.active) { StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving); - BattlePutTextOnWindow(gStringVar4, 0); + BattlePutTextOnWindow(gStringVar4, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gTasks[taskId].tState++; } break; - case 2: // wait for string, animate mon(and play its cry) + case EVOSTATE_INTRO_MON_ANIM: // wait for string, animate mon(and play its cry) if (!IsTextPrinterActive(0)) { - PlayCry1(gTasks[taskId].tPreEvoSpecies, 0); + PlayCry_Normal(gTasks[taskId].tPreEvoSpecies, 0); gTasks[taskId].tState++; } break; - case 3: + case EVOSTATE_INTRO_SOUND: if (IsCryFinished()) // wait for animation, play tu du SE { PlaySE(MUS_EVOLUTION_INTRO); gTasks[taskId].tState++; } break; - case 4: // play evolution music and fade screen black + case EVOSTATE_START_MUSIC: // play evolution music and fade screen black if (!IsSEPlaying()) { + // Start music, fade background to black PlayNewMapMusic(MUS_EVOLUTION); gTasks[taskId].tState++; BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK); } break; - case 5: // launch moving bg task, preapre evo sparkles + case EVOSTATE_START_BG_AND_SPARKLE_SPIRAL: // launch moving bg task, preapre evo sparkles if (!gPaletteFade.active) { - InitMovingBackgroundTask(FALSE); - sEvoGraphicsTaskId = LaunchTask_PreEvoSparklesSet1(17); + StartBgAnimation(FALSE); + sEvoGraphicsTaskId = EvolutionSparkles_SpiralUpward(17); gTasks[taskId].tState++; } break; - case 6: // another set of evo sparkles + case EVOSTATE_SPARKLE_ARC: // another set of evo sparkles if (!gTasks[sEvoGraphicsTaskId].isActive) { gTasks[taskId].tState++; - sEvoStructPtr->field_3 = 1; - sEvoGraphicsTaskId = LaunchTask_PreEvoSparklesSet2(); + sEvoStructPtr->delayTimer = 1; + sEvoGraphicsTaskId = EvolutionSparkles_ArcDown(); } break; - case 7: // launch task that flashes pre evo with post evo sprites + case EVOSTATE_CYCLE_MON_SPRITE: // launch task that flashes pre evo with post evo sprites if (!gTasks[sEvoGraphicsTaskId].isActive) { - sEvoGraphicsTaskId = LaunchTask_PrePostEvoMonSprites(sEvoStructPtr->preEvoSpriteId, sEvoStructPtr->postEvoSpriteId); + sEvoGraphicsTaskId = CycleEvolutionMonSprite(sEvoStructPtr->preEvoSpriteId, sEvoStructPtr->postEvoSpriteId); gTasks[taskId].tState++; } break; - case 8: // wait for the above task to finish - if (--sEvoStructPtr->field_3 == 0) + case EVOSTATE_WAIT_CYCLE_MON_SPRITE: // wait for the above task to finish + if (--sEvoStructPtr->delayTimer == 0) { - sEvoStructPtr->field_3 = 3; + sEvoStructPtr->delayTimer = 3; if (!gTasks[sEvoGraphicsTaskId].isActive) gTasks[taskId].tState++; } break; - case 9: // post evo sparkles - sEvoGraphicsTaskId = LaunchTask_PostEvoSparklesSet1(); + case EVOSTATE_SPARKLE_CIRCLE: // post evo sparkles + sEvoGraphicsTaskId = EvolutionSparkles_CircleInward(); gTasks[taskId].tState++; break; - case 10: + case EVOSTATE_SPARKLE_SPRAY: if (!gTasks[sEvoGraphicsTaskId].isActive) { - sEvoGraphicsTaskId = LaunchTask_PostEvoSparklesSet2AndFlash(gTasks[taskId].tPostEvoSpecies); + sEvoGraphicsTaskId = EvolutionSparkles_SprayAndFlash(gTasks[taskId].tPostEvoSpecies); gTasks[taskId].tState++; } break; - case 11: // play tu du sound after evolution + case EVOSTATE_EVO_SOUND: // play tu du sound after evolution if (!gTasks[sEvoGraphicsTaskId].isActive) { PlaySE(SE_EXP); gTasks[taskId].tState++; } break; - case 12: // stop music, return screen to pre-fade state + case EVOSTATE_RESTORE_SCREEN: // stop music, return screen to pre-fade state if (IsSEPlaying()) { m4aMPlayAllStop(); - memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, 0x60); - ResetBgRegsAfterMovingBackgroundCancel(); + memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, sizeof(sEvoStructPtr->savedPalette)); + RestoreBgAfterAnim(); BeginNormalPaletteFade(0x1C, 0, 0x10, 0, RGB_BLACK); gTasks[taskId].tState++; } break; - case 13: // animate mon + case EVOSTATE_EVO_MON_ANIM: // animate mon if (!gPaletteFade.active) { - PlayCry1(gTasks[taskId].tPostEvoSpecies, 0); + PlayCry_Normal(gTasks[taskId].tPostEvoSpecies, 0); gTasks[taskId].tState++; } break; - case 14: // congratulations string and rename prompt + case EVOSTATE_SET_MON_EVOLVED: // congratulations string and rename prompt if (IsCryFinished()) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); - BattlePutTextOnWindow(gStringVar4, 0); + BattlePutTextOnWindow(gStringVar4, (B_WIN_MSG | B_TEXT_FLAG_NONE)); PlayBGM(MUS_EVOLVED); gTasks[taskId].tState++; SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskId].tPostEvoSpecies)); @@ -729,12 +785,12 @@ static void Task_EvolutionScene(u8 taskId) IncrementGameStat(GAME_STAT_EVOLVED_POKEMON); } break; - case 15: // check if it wants to learn a new move + case EVOSTATE_TRY_LEARN_MOVE: // check if it wants to learn a new move if (!IsTextPrinterActive(0)) { HelpSystem_Enable(); var = MonTryLearningNewMove(mon, gTasks[taskId].tLearnsFirstMove); - if (var != 0 && !gTasks[taskId].tEvoWasStopped) + if (var != MOVE_NONE && !gTasks[taskId].tEvoWasStopped) { u8 text[20]; @@ -742,25 +798,25 @@ static void Task_EvolutionScene(u8 taskId) Overworld_PlaySpecialMapMusic(); gTasks[taskId].tBits |= TASK_BIT_LEARN_MOVE; gTasks[taskId].tLearnsFirstMove = FALSE; - gTasks[taskId].tLearnMoveState = 0; + gTasks[taskId].tLearnMoveState = MVSTATE_INTRO_MSG_1; GetMonData(mon, MON_DATA_NICKNAME, text); StringCopy_Nickname(gBattleTextBuff1, text); - if (var == MON_HAS_MAX_MOVES) - gTasks[taskId].tState = 22; + if (var == MON_HAS_MAX_MOVES) + gTasks[taskId].tState = EVOSTATE_REPLACE_MOVE; else if (var == MON_ALREADY_KNOWS_MOVE) break; else - gTasks[taskId].tState = 20; // move has been learned + gTasks[taskId].tState = EVOSTATE_LEARNED_MOVE; } - else // no move to learn + else // no move to learn, or evolution was canceled { BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); gTasks[taskId].tState++; } } break; - case 16: // task has finished, return + case EVOSTATE_END: // task has finished, return if (!gPaletteFade.active) { if (!(gTasks[taskId].tBits & TASK_BIT_LEARN_MOVE)) @@ -773,13 +829,12 @@ static void Task_EvolutionScene(u8 taskId) DestroyTask(taskId); FreeMonSpritesGfx(); - Free(sEvoStructPtr); - sEvoStructPtr = NULL; + FREE_AND_SET_NULL(sEvoStructPtr); FreeAllWindowBuffers(); SetMainCallback2(gCB2_AfterEvolution); } break; - case 17: // evolution has been canceled, stop music and re-fade palette + case EVOSTATE_CANCEL: // evolution has been canceled, stop music and re-fade palette if (!gTasks[sEvoGraphicsTaskId].isActive) { m4aMPlayAllStop(); @@ -787,14 +842,14 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tState++; } break; - case 18: // animate pokemon trying to evolve again, evolution has been stopped + case EVOSTATE_CANCEL_MON_ANIM: // animate pokemon trying to evolve again, evolution has been stopped if (!gPaletteFade.active) { - PlayCry1(gTasks[taskId].tPreEvoSpecies, 0); + PlayCry_Normal(gTasks[taskId].tPreEvoSpecies, 0); gTasks[taskId].tState++; } break; - case 19: // after the animation, print the string 'WHOA IT DId NOT EVOLVE!!!' + case EVOSTATE_CANCEL_MSG: // after the animation, print the string 'WHOA IT DId NOT EVOLVE!!!' if (IsCryFinished()) { if (gTasks[taskId].tEvoWasStopped) @@ -802,68 +857,75 @@ static void Task_EvolutionScene(u8 taskId) else StringExpandPlaceholders(gStringVar4, gText_PkmnStoppedEvolving); - BattlePutTextOnWindow(gStringVar4, 0); + BattlePutTextOnWindow(gStringVar4, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gTasks[taskId].tEvoWasStopped = TRUE; - gTasks[taskId].tState = 15; + gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE; } break; - case 20: // pokemon learned a new move, print string and play a fanfare + case EVOSTATE_LEARNED_MOVE: // pokemon learned a new move, print string and play a fanfare if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BufferMoveToLearnIntoBattleTextBuff2(); PlayFanfare(MUS_LEVEL_UP); - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]); - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_TABLE_START]); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gTasks[taskId].tLearnsFirstMove = 0x40; // re-used as a counter gTasks[taskId].tState++; } break; - case 21: // wait a bit and check if can learn another move + case EVOSTATE_TRY_LEARN_ANOTHER_MOVE: // wait a bit and check if can learn another move if (!IsTextPrinterActive(0) && !IsSEPlaying() && --gTasks[taskId].tLearnsFirstMove == 0) - gTasks[taskId].tState = 15; + gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE; break; - case 22: // try to learn a new move + case EVOSTATE_REPLACE_MOVE: // try to learn a new move switch (gTasks[taskId].tLearnMoveState) { - case 0: + case MVSTATE_INTRO_MSG_1: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { + // "{mon} is trying to learn {move}" BufferMoveToLearnIntoBattleTextBuff2(); - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_ID_ADDER]); - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_TABLE_START]); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gTasks[taskId].tLearnMoveState++; } break; - case 1: + case MVSTATE_INTRO_MSG_2: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_ID_ADDER]); - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + // "But, {mon} can't learn more than four moves" + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_TABLE_START]); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gTasks[taskId].tLearnMoveState++; } break; - case 2: + case MVSTATE_INTRO_MSG_3: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]); - BattlePutTextOnWindow(gDisplayedStringBattle, 0); - gTasks[taskId].tLearnMoveYesState = 5; - gTasks[taskId].tLearnMoveNoState = 10; + // "Delete a move to make room for {move}?" + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_TABLE_START]); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + gTasks[taskId].tLearnMoveYesState = MVSTATE_SHOW_MOVE_SELECT; + gTasks[taskId].tLearnMoveNoState = MVSTATE_ASK_CANCEL; gTasks[taskId].tLearnMoveState++; } - case 3: + case MVSTATE_PRINT_YES_NO: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { HandleBattleWindow(0x17, 8, 0x1D, 0xD, 0); - BattlePutTextOnWindow(gText_BattleYesNoChoice, 0xE); + BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); gTasks[taskId].tLearnMoveState++; sEvoCursorPos = 0; BattleCreateYesNoCursorAt(); } break; - case 4: + case MVSTATE_HANDLE_YES_NO: + // This Yes/No is used for both the initial "delete move?" prompt + // and for the "stop learning move?" prompt + // What Yes/No do next is determined by tLearnMoveYesState / tLearnMoveNoState if (JOY_NEW(DPAD_UP) && sEvoCursorPos != 0) { + // Moved onto YES PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(); sEvoCursorPos = 0; @@ -871,6 +933,7 @@ static void Task_EvolutionScene(u8 taskId) } if (JOY_NEW(DPAD_DOWN) && sEvoCursorPos == 0) { + // Moved onto NO PlaySE(SE_SELECT); BattleDestroyYesNoCursorAt(); sEvoCursorPos = 1; @@ -883,23 +946,26 @@ static void Task_EvolutionScene(u8 taskId) if (sEvoCursorPos != 0) { + // NO gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState; } else { + // YES gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveYesState; - if (gTasks[taskId].tLearnMoveState == 5) + if (gTasks[taskId].tLearnMoveState == MVSTATE_SHOW_MOVE_SELECT) BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); } } if (JOY_NEW(B_BUTTON)) { + // Equivalent to selecting NO HandleBattleWindow(0x17, 8, 0x1D, 0xD, WINDOW_CLEAR); PlaySE(SE_SELECT); gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState; } break; - case 5: + case MVSTATE_SHOW_MOVE_SELECT: if (!gPaletteFade.active) { FreeAllWindowBuffers(); @@ -909,25 +975,29 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tLearnMoveState++; } break; - case 6: + case MVSTATE_HANDLE_MOVE_SELECT: if (!gPaletteFade.active && gMain.callback2 == CB2_EvolutionSceneUpdate) { var = GetMoveSlotToReplace(); if (var == MAX_MON_MOVES) { - gTasks[taskId].tLearnMoveState = 10; + // Didn't select move slot + gTasks[taskId].tLearnMoveState = MVSTATE_ASK_CANCEL; } else { + // Selected move to forget u16 move = GetMonData(mon, var + MON_DATA_MOVE1); if (IsHMMove2(move)) { - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_ID_ADDER]); - BattlePutTextOnWindow(gDisplayedStringBattle, 0); - gTasks[taskId].tLearnMoveState = 12; + // Can't forget HMs + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_TABLE_START]); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + gTasks[taskId].tLearnMoveState = MVSTATE_RETRY_AFTER_HM; } else { + // Forget move PREPARE_MOVE_BUFFER(gBattleTextBuff2, move) RemoveMonPPBonus(mon, var); @@ -937,48 +1007,89 @@ static void Task_EvolutionScene(u8 taskId) } } break; - case 7: - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_ID_ADDER]); - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + case MVSTATE_FORGET_MSG_1: + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_TABLE_START]); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gTasks[taskId].tLearnMoveState++; break; - case 8: + case MVSTATE_FORGET_MSG_2: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_ID_ADDER]); - BattlePutTextOnWindow(gDisplayedStringBattle, 0); + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_TABLE_START]); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); gTasks[taskId].tLearnMoveState++; } break; - case 9: + case MVSTATE_LEARNED_MOVE: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_ID_ADDER]); - BattlePutTextOnWindow(gDisplayedStringBattle, 0); - gTasks[taskId].tState = 20; + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_TABLE_START]); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + gTasks[taskId].tState = EVOSTATE_LEARNED_MOVE; } break; - case 10: - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]); - BattlePutTextOnWindow(gDisplayedStringBattle, 0); - gTasks[taskId].tLearnMoveYesState = 11; - gTasks[taskId].tLearnMoveNoState = 0; - gTasks[taskId].tLearnMoveState = 3; + case MVSTATE_ASK_CANCEL: + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_TABLE_START]); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + gTasks[taskId].tLearnMoveYesState = MVSTATE_CANCEL; + gTasks[taskId].tLearnMoveNoState = MVSTATE_INTRO_MSG_1; + gTasks[taskId].tLearnMoveState = MVSTATE_PRINT_YES_NO; break; - case 11: - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_ID_ADDER]); - BattlePutTextOnWindow(gDisplayedStringBattle, 0); - gTasks[taskId].tState = 15; + case MVSTATE_CANCEL: + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_TABLE_START]); + BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE; break; - case 12: + case MVSTATE_RETRY_AFTER_HM: if (!IsTextPrinterActive(0) && !IsSEPlaying()) - gTasks[taskId].tLearnMoveState = 5; + gTasks[taskId].tLearnMoveState = MVSTATE_SHOW_MOVE_SELECT; break; } break; } } +// States for the main switch in Task_TradeEvolutionScene +enum { + T_EVOSTATE_INTRO_MSG, + T_EVOSTATE_INTRO_CRY, + T_EVOSTATE_INTRO_SOUND, + T_EVOSTATE_START_MUSIC, + T_EVOSTATE_START_BG_AND_SPARKLE_SPIRAL, + T_EVOSTATE_SPARKLE_ARC, + T_EVOSTATE_CYCLE_MON_SPRITE, + T_EVOSTATE_WAIT_CYCLE_MON_SPRITE, + T_EVOSTATE_SPARKLE_CIRCLE, + T_EVOSTATE_SPARKLE_SPRAY, + T_EVOSTATE_EVO_SOUND, + T_EVOSTATE_EVO_MON_ANIM, + T_EVOSTATE_SET_MON_EVOLVED, + T_EVOSTATE_TRY_LEARN_MOVE, + T_EVOSTATE_END, + T_EVOSTATE_CANCEL, + T_EVOSTATE_CANCEL_MON_ANIM, + T_EVOSTATE_CANCEL_MSG, + T_EVOSTATE_LEARNED_MOVE, + T_EVOSTATE_TRY_LEARN_ANOTHER_MOVE, + T_EVOSTATE_REPLACE_MOVE, +}; + +// States for the switch in T_EVOSTATE_REPLACE_MOVE +enum { + T_MVSTATE_INTRO_MSG_1, + T_MVSTATE_INTRO_MSG_2, + T_MVSTATE_INTRO_MSG_3, + T_MVSTATE_PRINT_YES_NO, + T_MVSTATE_HANDLE_YES_NO, + T_MVSTATE_SHOW_MOVE_SELECT, + T_MVSTATE_HANDLE_MOVE_SELECT, + T_MVSTATE_FORGET_MSG, + T_MVSTATE_LEARNED_MOVE, + T_MVSTATE_ASK_CANCEL, + T_MVSTATE_CANCEL, + T_MVSTATE_RETRY_AFTER_HM, +}; + static void Task_TradeEvolutionScene(u8 taskId) { u32 var = 0; @@ -987,33 +1098,33 @@ static void Task_TradeEvolutionScene(u8 taskId) // Automatically cancel if the Pokemon would evolve into a species you have not // yet unlocked, such as Crobat. if (!IsNationalPokedexEnabled() - && gTasks[taskId].tState == 7 + && gTasks[taskId].tState == T_EVOSTATE_WAIT_CYCLE_MON_SPRITE && gTasks[taskId].tPostEvoSpecies > SPECIES_MEW) { - gTasks[taskId].tState = 15; + gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE; gTasks[taskId].tEvoWasStopped = TRUE; if (gTasks[sEvoGraphicsTaskId].isActive) { - gTasks[sEvoGraphicsTaskId].EvoGraphicsTaskEvoStop = TRUE; - DestroyMovingBackgroundTasks(); + gTasks[sEvoGraphicsTaskId].tEvoStopped = TRUE; + StopBgAnimation(); } } switch (gTasks[taskId].tState) { - case 0: + case T_EVOSTATE_INTRO_MSG: StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving); DrawTextOnTradeWindow(0, gStringVar4, 1); gTasks[taskId].tState++; break; - case 1: + case T_EVOSTATE_INTRO_CRY: if (!IsTextPrinterActive(0)) { - PlayCry1(gTasks[taskId].tPreEvoSpecies, 0); + PlayCry_Normal(gTasks[taskId].tPreEvoSpecies, 0); gTasks[taskId].tState++; } break; - case 2: + case T_EVOSTATE_INTRO_SOUND: if (IsCryFinished()) { m4aSongNumStop(MUS_EVOLUTION); @@ -1021,7 +1132,7 @@ static void Task_TradeEvolutionScene(u8 taskId) gTasks[taskId].tState++; } break; - case 3: + case T_EVOSTATE_START_MUSIC: if (!IsSEPlaying()) { PlayBGM(MUS_EVOLUTION); @@ -1029,71 +1140,71 @@ static void Task_TradeEvolutionScene(u8 taskId) BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK); } break; - case 4: + case T_EVOSTATE_START_BG_AND_SPARKLE_SPIRAL: if (!gPaletteFade.active) { - InitMovingBackgroundTask(TRUE); + StartBgAnimation(TRUE); var = gSprites[sEvoStructPtr->preEvoSpriteId].oam.paletteNum + 16; - sEvoGraphicsTaskId = LaunchTask_PreEvoSparklesSet1(var); + sEvoGraphicsTaskId = EvolutionSparkles_SpiralUpward(var); gTasks[taskId].tState++; SetGpuReg(REG_OFFSET_BG3CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(6)); } break; - case 5: + case T_EVOSTATE_SPARKLE_ARC: if (!gTasks[sEvoGraphicsTaskId].isActive) { gTasks[taskId].tState++; - sEvoStructPtr->field_3 = 1; - sEvoGraphicsTaskId = LaunchTask_PreEvoSparklesSet2(); + sEvoStructPtr->delayTimer = 1; + sEvoGraphicsTaskId = EvolutionSparkles_ArcDown(); } break; - case 6: + case T_EVOSTATE_CYCLE_MON_SPRITE: if (!gTasks[sEvoGraphicsTaskId].isActive) { - sEvoGraphicsTaskId = LaunchTask_PrePostEvoMonSprites(sEvoStructPtr->preEvoSpriteId, sEvoStructPtr->postEvoSpriteId); + sEvoGraphicsTaskId = CycleEvolutionMonSprite(sEvoStructPtr->preEvoSpriteId, sEvoStructPtr->postEvoSpriteId); gTasks[taskId].tState++; } break; - case 7: - if (--sEvoStructPtr->field_3 == 0) + case T_EVOSTATE_WAIT_CYCLE_MON_SPRITE: + if (--sEvoStructPtr->delayTimer == 0) { - sEvoStructPtr->field_3 = 3; + sEvoStructPtr->delayTimer = 3; if (!gTasks[sEvoGraphicsTaskId].isActive) gTasks[taskId].tState++; } break; - case 8: - sEvoGraphicsTaskId = LaunchTask_PostEvoSparklesSet1(); + case T_EVOSTATE_SPARKLE_CIRCLE: + sEvoGraphicsTaskId = EvolutionSparkles_CircleInward(); gTasks[taskId].tState++; break; - case 9: + case T_EVOSTATE_SPARKLE_SPRAY: if (!gTasks[sEvoGraphicsTaskId].isActive) { - sEvoGraphicsTaskId = LaunchTask_PostEvoSparklesSet2AndFlash_Trade(gTasks[taskId].tPostEvoSpecies); + sEvoGraphicsTaskId = EvolutionSparkles_SprayAndFlash_Trade(gTasks[taskId].tPostEvoSpecies); gTasks[taskId].tState++; } break; - case 10: + case T_EVOSTATE_EVO_SOUND: if (!gTasks[sEvoGraphicsTaskId].isActive) { PlaySE(SE_EXP); gTasks[taskId].tState++; } break; - case 11: + case T_EVOSTATE_EVO_MON_ANIM: /* * BUG: This check causes the evolved Pokemon's cry to play over the sfx. * Negate the below condition. */ if (IsSEPlaying()) { -// Free(sEvoMovingBgPtr); - PlayCry1(gTasks[taskId].tPostEvoSpecies, 0); - memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, 0x60); +// Free(sBgAnimPal); + PlayCry_Normal(gTasks[taskId].tPostEvoSpecies, 0); + memcpy(&gPlttBufferUnfaded[0x20], sEvoStructPtr->savedPalette, sizeof(sEvoStructPtr->savedPalette)); gTasks[taskId].tState++; } break; - case 12: + case T_EVOSTATE_SET_MON_EVOLVED: if (IsCryFinished()) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); @@ -1108,11 +1219,11 @@ static void Task_TradeEvolutionScene(u8 taskId) IncrementGameStat(GAME_STAT_EVOLVED_POKEMON); } break; - case 13: + case T_EVOSTATE_TRY_LEARN_MOVE: if (!IsTextPrinterActive(0) && IsFanfareTaskInactive() == TRUE) { var = MonTryLearningNewMove(mon, gTasks[taskId].tLearnsFirstMove); - if (var != 0 && !gTasks[taskId].tEvoWasStopped) + if (var != MOVE_NONE && !gTasks[taskId].tEvoWasStopped) { u8 text[20]; @@ -1123,11 +1234,11 @@ static void Task_TradeEvolutionScene(u8 taskId) StringCopy_Nickname(gBattleTextBuff1, text); if (var == MON_HAS_MAX_MOVES) - gTasks[taskId].tState = 20; + gTasks[taskId].tState = T_EVOSTATE_REPLACE_MOVE; else if (var == MON_ALREADY_KNOWS_MOVE) break; else - gTasks[taskId].tState = 18; + gTasks[taskId].tState = T_EVOSTATE_LEARNED_MOVE; } else { @@ -1137,17 +1248,17 @@ static void Task_TradeEvolutionScene(u8 taskId) } } break; - case 14: + case T_EVOSTATE_END: if (!IsTextPrinterActive(0)) { DestroyTask(taskId); - Free(sEvoStructPtr); + FREE_AND_SET_NULL(sEvoStructPtr); sEvoStructPtr = NULL; gTextFlags.useAlternateDownArrow = FALSE; SetMainCallback2(gCB2_AfterEvolution); } break; - case 15: + case T_EVOSTATE_CANCEL: if (!gTasks[sEvoGraphicsTaskId].isActive) { m4aMPlayAllStop(); @@ -1155,67 +1266,70 @@ static void Task_TradeEvolutionScene(u8 taskId) gTasks[taskId].tState++; } break; - case 16: + case T_EVOSTATE_CANCEL_MON_ANIM: if (!gPaletteFade.active) { - PlayCry1(gTasks[taskId].tPreEvoSpecies, 0); + PlayCry_Normal(gTasks[taskId].tPreEvoSpecies, 0); gTasks[taskId].tState++; } break; - case 17: + case T_EVOSTATE_CANCEL_MSG: if (IsCryFinished()) { StringExpandPlaceholders(gStringVar4, gText_EllipsisQuestionMark); DrawTextOnTradeWindow(0, gStringVar4, 1); gTasks[taskId].tEvoWasStopped = TRUE; - gTasks[taskId].tState = 13; + gTasks[taskId].tState = T_EVOSTATE_TRY_LEARN_MOVE; } break; - case 18: + case T_EVOSTATE_LEARNED_MOVE: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BufferMoveToLearnIntoBattleTextBuff2(); PlayFanfare(MUS_LEVEL_UP); - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_ID_ADDER]); + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); gTasks[taskId].tLearnsFirstMove = 0x40; // re-used as a counter gTasks[taskId].tState++; } break; - case 19: + case T_EVOSTATE_TRY_LEARN_ANOTHER_MOVE: if (!IsTextPrinterActive(0) && IsFanfareTaskInactive() == TRUE && --gTasks[taskId].tLearnsFirstMove == 0) - gTasks[taskId].tState = 13; + gTasks[taskId].tState = T_EVOSTATE_TRY_LEARN_MOVE; break; - case 20: + case T_EVOSTATE_REPLACE_MOVE: switch (gTasks[taskId].tLearnMoveState) { - case 0: + case T_MVSTATE_INTRO_MSG_1: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { + // "{mon} is trying to learn {move}" BufferMoveToLearnIntoBattleTextBuff2(); - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_ID_ADDER]); + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); gTasks[taskId].tLearnMoveState++; } break; - case 1: + case T_MVSTATE_INTRO_MSG_2: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_ID_ADDER]); + // "But, {mon} can't learn more than four moves" + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); gTasks[taskId].tLearnMoveState++; } break; - case 2: + case T_MVSTATE_INTRO_MSG_3: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_ID_ADDER]); + // "Delete a move to make room for {move}?" + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); - gTasks[taskId].tLearnMoveYesState = 5; - gTasks[taskId].tLearnMoveNoState = 9; + gTasks[taskId].tLearnMoveYesState = T_MVSTATE_SHOW_MOVE_SELECT; + gTasks[taskId].tLearnMoveNoState = T_MVSTATE_ASK_CANCEL; gTasks[taskId].tLearnMoveState++; } - case 3: + case T_MVSTATE_PRINT_YES_NO: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { LoadUserWindowBorderGfx(0, 0xA8, 0xE0); @@ -1225,27 +1339,27 @@ static void Task_TradeEvolutionScene(u8 taskId) sEvoCursorPos = 0; } break; - case 4: + case T_MVSTATE_HANDLE_YES_NO: switch (Menu_ProcessInputNoWrapClearOnChoose()) { - case 0: + case 0: // YES sEvoCursorPos = 0; - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]); + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveYesState; - if (gTasks[taskId].tLearnMoveState == 5) + if (gTasks[taskId].tLearnMoveState == T_MVSTATE_SHOW_MOVE_SELECT) BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); break; - case 1: - case -1: + case 1: // NO + case MENU_B_PRESSED: sEvoCursorPos = 1; - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_ID_ADDER]); + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_EMPTYSTRING3 - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); gTasks[taskId].tLearnMoveState = gTasks[taskId].tLearnMoveNoState; break; } break; - case 5: + case T_MVSTATE_SHOW_MOVE_SELECT: if (!gPaletteFade.active) { if (gWirelessCommType) @@ -1262,67 +1376,71 @@ static void Task_TradeEvolutionScene(u8 taskId) gTasks[taskId].tLearnMoveState++; } break; - case 6: + case T_MVSTATE_HANDLE_MOVE_SELECT: if (!gPaletteFade.active && gMain.callback2 == CB2_TradeEvolutionSceneUpdate) { var = GetMoveSlotToReplace(); if (var == MAX_MON_MOVES) { - gTasks[taskId].tLearnMoveState = 9; + // Didn't select move slot + gTasks[taskId].tLearnMoveState = T_MVSTATE_ASK_CANCEL; } else { + // Selected move to forget u16 move = GetMonData(mon, var + MON_DATA_MOVE1); if (IsHMMove2(move)) { - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_ID_ADDER]); + // Can't forget HMs + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); - gTasks[taskId].tLearnMoveState = 11; + gTasks[taskId].tLearnMoveState = T_MVSTATE_RETRY_AFTER_HM; } else { + // Forget move PREPARE_MOVE_BUFFER(gBattleTextBuff2, move) RemoveMonPPBonus(mon, var); SetMonMoveSlot(mon, gMoveToLearn, var); - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_ID_ADDER]); + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); gTasks[taskId].tLearnMoveState++; } } } break; - case 7: + case T_MVSTATE_FORGET_MSG: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_ID_ADDER]); + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); gTasks[taskId].tLearnMoveState++; } break; - case 8: + case T_MVSTATE_LEARNED_MOVE: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_ID_ADDER]); + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); - gTasks[taskId].tState = 18; + gTasks[taskId].tState = T_EVOSTATE_LEARNED_MOVE; } break; - case 9: - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_ID_ADDER]); + case T_MVSTATE_ASK_CANCEL: + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); - gTasks[taskId].tLearnMoveYesState = 10; - gTasks[taskId].tLearnMoveNoState = 0; - gTasks[taskId].tLearnMoveState = 3; + gTasks[taskId].tLearnMoveYesState = T_MVSTATE_CANCEL; + gTasks[taskId].tLearnMoveNoState = T_MVSTATE_INTRO_MSG_1; + gTasks[taskId].tLearnMoveState = T_MVSTATE_PRINT_YES_NO; break; - case 10: - BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_ID_ADDER]); + case T_MVSTATE_CANCEL: + BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_TABLE_START]); DrawTextOnTradeWindow(0, gDisplayedStringBattle, 1); - gTasks[taskId].tState = 13; + gTasks[taskId].tState = T_EVOSTATE_TRY_LEARN_MOVE; break; - case 11: + case T_MVSTATE_RETRY_AFTER_HM: if (!IsTextPrinterActive(0) && !IsSEPlaying()) - gTasks[taskId].tLearnMoveState = 5; + gTasks[taskId].tLearnMoveState = T_MVSTATE_SHOW_MOVE_SELECT; break; } break; @@ -1379,50 +1497,80 @@ static void VBlankCB_TradeEvolutionScene(void) ScanlineEffect_InitHBlankDmaTransfer(); } -static void Task_MovingBackgroundPalettes(u8 taskId) +#define tCycleTimer data[0] +#define tPalStage data[1] +#define tControlStage data[2] +#define tNumCycles data[3] +#define tStartTimer data[5] +#define tPaused data[6] + +// See comments above sBgAnim_PaletteControl +#define START_PAL sBgAnim_PaletteControl[tControlStage][0] +#define END_PAL sBgAnim_PaletteControl[tControlStage][1] +#define CYCLES sBgAnim_PaletteControl[tControlStage][2] +#define DELAY sBgAnim_PaletteControl[tControlStage][3] + +// Cycles the background through a set range of palettes in a series +// of stages, each stage having a different palette range and timing +static void Task_UpdateBgPalette(u8 taskId) { s16 *data = gTasks[taskId].data; - if (data[6] != 0) + if (tPaused) return; - if (data[5]++ < 20) + if (tStartTimer++ < 20) return; - if (data[0]++ > sMovingBackgroundTimers[data[2]][3]) + if (tCycleTimer++ > DELAY) { - if (sMovingBackgroundTimers[data[2]][1] == data[1]) + if (END_PAL == tPalStage) { - data[3]++; - if (data[3] == sMovingBackgroundTimers[data[2]][2]) + // Reached final palette in current stage, completed a 'cycle' + // If this is the final cycle for this stage, move to the next stage + tNumCycles++; + if (tNumCycles == CYCLES) { - data[3] = 0; - data[2]++; + tNumCycles = 0; + tControlStage++; } - data[1] = sMovingBackgroundTimers[data[2]][0]; + tPalStage = START_PAL; } else { - LoadPalette(&sEvoMovingBgPtr[data[1] * 16], 0xA0, 0x20); - data[0] = 0; - data[1]++; + // Haven't reached final palette in current stage, load the current palette + LoadPalette(&sBgAnimPal[tPalStage * 16], 0xA0, 0x20); + tCycleTimer = 0; + tPalStage++; } } - if (data[2] == 4) + if (tControlStage == (int)ARRAY_COUNT(sBgAnim_PaletteControl[0])) DestroyTask(taskId); } -static void LaunchTask_MovingBackgroundPos(bool8 isLink) +#undef tCycleTimer +#undef tPalStage +#undef tControlStage +#undef tNumCycles +#undef tStartTimer +#undef START_PAL +#undef END_PAL +#undef CYCLES +#undef DELAY + +#define tIsLink data[2] + +static void CreateBgAnimTask(bool8 isLink) { - u8 taskId = CreateTask(Task_MovingBackgroundPos, 7); + u8 taskId = CreateTask(Task_AnimateBg, 7); if (!isLink) - gTasks[taskId].data[2] = 0; + gTasks[taskId].data[2] = FALSE; else - gTasks[taskId].data[2] = 1; + gTasks[taskId].data[2] = TRUE; } -static void Task_MovingBackgroundPos(u8 taskId) +static void Task_AnimateBg(u8 taskId) { u16 *outer_X, *outer_Y; @@ -1449,7 +1597,7 @@ static void Task_MovingBackgroundPos(u8 taskId) *outer_X = Cos(gTasks[taskId].data[1], 4) + 8; *outer_Y = Sin(gTasks[taskId].data[1], 4) + 16; - if (!FuncIsActiveTask(Task_MovingBackgroundPalettes)) + if (!FuncIsActiveTask(Task_UpdateBgPalette)) { DestroyTask(taskId); @@ -1461,25 +1609,27 @@ static void Task_MovingBackgroundPos(u8 taskId) } } -static void InitMovingBgValues(u16 *movingBgs) +#undef tIsLink + +static void InitMovingBgPalette(u16 *palette) { s32 i, j; - for (i = 0; i < 50; i++) + for (i = 0; i < (int)ARRAY_COUNT(sBgAnim_PalIndexes); i++) { for (j = 0; j < 16; j++) { - movingBgs[i * 16 + j] = sMovingBgPals[sMovingBgPalIndices[i][j]]; + palette[i * 16 + j] = sBgAnim_Pal[sBgAnim_PalIndexes[i][j]]; } } } -static void InitMovingBackgroundTask(bool8 isLink) +static void StartBgAnimation(bool8 isLink) { u8 innerBgId, outerBgId; - sEvoMovingBgPtr = AllocZeroed(0x640); - InitMovingBgValues(sEvoMovingBgPtr); + sBgAnimPal = AllocZeroed(0x640); + InitMovingBgPalette(sBgAnimPal); if (!isLink) innerBgId = 1, outerBgId = 2; @@ -1513,41 +1663,43 @@ static void InitMovingBackgroundTask(bool8 isLink) SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG3_ON | DISPCNT_BG1_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP); } - CreateTask(Task_MovingBackgroundPalettes, 5); - LaunchTask_MovingBackgroundPos(isLink); + CreateTask(Task_UpdateBgPalette, 5); + CreateBgAnimTask(isLink); } void IsMovingBackgroundTaskRunning(void) // unused { - u8 taskId = FindTaskIdByFunc(Task_MovingBackgroundPalettes); + u8 taskId = FindTaskIdByFunc(Task_UpdateBgPalette); - if (taskId != 0xFF) - gTasks[taskId].data[6] = 1; + if (taskId != TASK_NONE) + gTasks[taskId].tPaused = TRUE; FillPalette(RGB_BLACK, 0xA0, 0x20); } -static void DestroyMovingBackgroundTasks(void) +#undef tPaused + +static void StopBgAnimation(void) { u8 taskId; - if ((taskId = FindTaskIdByFunc(Task_MovingBackgroundPalettes)) != 0xFF) + if ((taskId = FindTaskIdByFunc(Task_UpdateBgPalette)) != TASK_NONE) DestroyTask(taskId); - if ((taskId = FindTaskIdByFunc(Task_MovingBackgroundPos)) != 0xFF) + if ((taskId = FindTaskIdByFunc(Task_AnimateBg)) != TASK_NONE) DestroyTask(taskId); FillPalette(RGB_BLACK, 0xA0, 0x20); - ResetBgRegsAfterMovingBackgroundCancel(); + RestoreBgAfterAnim(); } -static void ResetBgRegsAfterMovingBackgroundCancel(void) +static void RestoreBgAfterAnim(void) { SetGpuReg(REG_OFFSET_BLDCNT, 0); gBattle_BG1_X = 0; gBattle_BG1_Y = 0; gBattle_BG2_X = 0; - SetBgAttribute(1, BG_ATTR_PRIORITY, GetBattleBgAttribute(1, 5)); - SetBgAttribute(2, BG_ATTR_PRIORITY, GetBattleBgAttribute(2, 5)); + SetBgAttribute(1, BG_ATTR_PRIORITY, GetBattleBgTemplateData(1, 5)); + SetBgAttribute(2, BG_ATTR_PRIORITY, GetBattleBgTemplateData(2, 5)); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG3_ON | DISPCNT_BG0_ON | DISPCNT_OBJ_1D_MAP); - Free(sEvoMovingBgPtr); + Free(sBgAnimPal); } diff --git a/src/field_effect.c b/src/field_effect.c index 6f20a8973..9a3a579d3 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2939,7 +2939,7 @@ static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite * sprite) } else { - PlayCry1(sprite->data[0], 0); + PlayCry_Normal(sprite->data[0], 0); } } } diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index b84675009..f001bf241 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -429,7 +429,7 @@ static void Task_MapPreviewScreen_0(u8 taskId) SetVBlankCallback(NULL); MapPreview_InitBgs(); MapPreview_LoadGfx(data[3]); - BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK); data[0]++; break; case 1: diff --git a/src/ghost.c b/src/ghost.c index f6afdd9dc..a531cec44 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -1418,7 +1418,7 @@ static void sub_80B6FC4(u8 taskId) break; case 3: InitBattleAnimBg(2); - FillPalette(0, 0x90, 0x20); + FillPalette(RGB_BLACK, 0x90, 0x20); SetAnimBgAttribute(2, BG_ANIM_CHAR_BASE_BLOCK, 0); task->data[1] = 12; break; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 4f3d9aff2..97eb6f5c8 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -523,7 +523,7 @@ static void Task_Hof_PlayMonCryAndPrintInfo(u8 taskId) if (gSprites[gTasks[taskId].data[5 + currMonId]].data[0]) { if (currMon->species != SPECIES_EGG) - PlayCry1(currMon->species, 0); + PlayCry_Normal(currMon->species, 0); HallOfFame_PrintMonInfo(currMon, 0, 14); gTasks[taskId].data[3] = 120; gTasks[taskId].func = Task_Hof_TryDisplayAnotherMon; @@ -874,7 +874,7 @@ static void Task_HofPC_PrintMonInfo(u8 taskId) if (currMon->species != SPECIES_EGG) { StopCryAndClearCrySongs(); - PlayCry1(currMon->species, 0); + PlayCry_Normal(currMon->species, 0); } HallOfFame_PrintMonInfo(currMon, 0, 14); diff --git a/src/intro.c b/src/intro.c index 5583d5ba7..9ca210887 100644 --- a/src/intro.c +++ b/src/intro.c @@ -916,7 +916,7 @@ static void CB2_SetUpIntro(void) if (!FreeTempTileDataBuffersIfPossible()) { StartIntroSequence(); - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); SetMainCallback2(CB2_Intro); SetVBlankCallback(VBlankCB_Intro); } @@ -1016,7 +1016,7 @@ static void IntroCB_OpenWin1ToTheaterDimensions(struct IntroSequenceData * this) break; case 1: ShowBg(3); - BlendPalettes(0xFFFFFFFF, 0x00, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0x00, RGB_BLACK); this->state++; break; case 2: diff --git a/src/item_menu.c b/src/item_menu.c index 843df277f..31463f1e4 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -925,7 +925,7 @@ static void ShowBagOrBeginWin0OpenTask(void) LoadPalette(&paldata, 0x00, 0x02); SetGpuReg(REG_OFFSET_WININ, 0); SetGpuReg(REG_OFFSET_WINOUT, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); if (gBagMenuState.bagOpen == TRUE) { diff --git a/src/item_pc.c b/src/item_pc.c index 628e4f2f7..44f8d2800 100644 --- a/src/item_pc.c +++ b/src/item_pc.c @@ -361,7 +361,7 @@ static bool8 ItemPc_DoGfxSetup(void) case 18: if (sListMenuState.initialized == 1) { - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); } gMain.state++; break; diff --git a/src/link.c b/src/link.c index 36279b6fe..55409c35b 100644 --- a/src/link.c +++ b/src/link.c @@ -1461,7 +1461,7 @@ void CB2_LinkError(void) ResetSpriteData(); FreeAllSpritePalettes(); ResetPaletteFadeControl(); - FillPalette(0, 0, 2); + FillPalette(RGB_BLACK, 0, 2); ResetTasks(); ScanlineEffect_Stop(); if (gWirelessCommType) diff --git a/src/oak_speech.c b/src/oak_speech.c index e48356d64..b2a0991f2 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -570,7 +570,7 @@ static void Task_OaksSpeech1(u8 taskId) CreateHelpDocsPage1(); gPaletteFade.bufferTransferDisabled = FALSE; gTasks[taskId].data[5] = CreateTextCursorSpriteForOakSpeech(0, 0xE6, 0x95, 0, 0); - BlendPalettes(0xFFFFFFFF, 0x10, 0x00); + BlendPalettes(PALETTES_ALL, 0x10, 0x00); break; case 10: BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); @@ -974,7 +974,7 @@ static void Task_OakSpeech13(u8 taskId) if (gTasks[taskId].data[3] == 32) { OaksSpeechPrintMessage(gOakText_WorldInhabited2, sOakSpeechResources->textSpeed); - PlayCry1(SPECIES_NIDORAN_F, 0); + PlayCry_Normal(SPECIES_NIDORAN_F, 0); } } } diff --git a/src/party_menu.c b/src/party_menu.c index e05d9a9e1..0ad2aa44c 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -574,7 +574,7 @@ static bool8 ShowPartyMenu(void) ++gMain.state; break; case 21: - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); ++gMain.state; break; case 22: diff --git a/src/pc_screen_effect.c b/src/pc_screen_effect.c index 5b5952c26..99a73d427 100644 --- a/src/pc_screen_effect.c +++ b/src/pc_screen_effect.c @@ -82,7 +82,7 @@ static void Task_PCScreenEffect_TurnOn(u8 taskId) task->tWin0Right = DISPLAY_WIDTH; SetGpuReg(REG_OFFSET_BLDY, 0); SetGpuReg(REG_OFFSET_BLDCNT, task->tBldCntBak); - BlendPalettes(0xFFFFFFFF, 0, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0, RGB_BLACK); gPlttBufferFaded[0] = 0; } SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWin0Left, task->tWin0Right)); @@ -151,7 +151,7 @@ static void Task_PCScreenEffect_TurnOff(u8 taskId) { task->tWin0Left = 120; task->tWin0Right = 120; - BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK); gPlttBufferFaded[0] = 0; } SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWin0Left, task->tWin0Right)); diff --git a/src/pokemon.c b/src/pokemon.c index aa1667584..5b774b172 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3201,8 +3201,8 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) case MON_DATA_WORLD_RIBBON: retVal = substruct3->worldRibbon; break; - case MON_DATA_FILLER: - retVal = substruct3->filler; + case MON_DATA_UNUSED_RIBBONS: + retVal = substruct3->unusedRibbons; break; case MON_DATA_EVENT_LEGAL: retVal = substruct3->eventLegal; @@ -3350,7 +3350,7 @@ void SetMonData(struct Pokemon *mon, s32 field, const void *dataArg) case MON_DATA_NATIONAL_RIBBON: case MON_DATA_EARTH_RIBBON: case MON_DATA_WORLD_RIBBON: - case MON_DATA_FILLER: + case MON_DATA_UNUSED_RIBBONS: case MON_DATA_EVENT_LEGAL: case MON_DATA_KNOWN_MOVES: case MON_DATA_RIBBON_COUNT: @@ -3604,8 +3604,8 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg) case MON_DATA_WORLD_RIBBON: SET8(substruct3->worldRibbon); break; - case MON_DATA_FILLER: - SET8(substruct3->filler); + case MON_DATA_UNUSED_RIBBONS: + SET8(substruct3->unusedRibbons); break; case MON_DATA_EVENT_LEGAL: SET8(substruct3->eventLegal); diff --git a/src/pokemon_special_anim.c b/src/pokemon_special_anim.c index f319512dd..f13732e2a 100644 --- a/src/pokemon_special_anim.c +++ b/src/pokemon_special_anim.c @@ -217,7 +217,7 @@ static void Task_UseItem_Normal(u8 taskId) ptr->cancelDisabled = TRUE; if (ptr->closeness == 3) { - PlayCry1(ptr->species, 0); + PlayCry_Normal(ptr->species, 0); } PSA_ShowMessageWindow(); ptr->state++; @@ -582,7 +582,7 @@ static void Task_CleanUp(u8 taskId) { case 0: SetVBlankCallback(VBlankCB_PSA); - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); ptr->state++; break; case 1: diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index 61925475e..f4ebe9151 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -546,12 +546,12 @@ static void Cb_InitPSS(u8 taskId) sub_808CFC4(); if (!gPSSData->isReshowingPSS) { - BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK); SetPSSCallback(Cb_ShowPSS); } else { - BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK); SetPSSCallback(Cb_ReshowPSS); } SetVBlankCallback(VblankCb_PSS); diff --git a/src/region_map.c b/src/region_map.c index a87c65003..68d9ba9a2 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -2810,7 +2810,7 @@ static void Task_MapOpenAnim(u8 taskId) break; case 3: CopyBgTilemapBufferToVram(1); - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); SetRegionMapVBlankCB(); sMapOpenCloseAnim->openState++; @@ -3908,7 +3908,7 @@ static void LoadMapIcons(u8 taskId) sMapIcons->state++; break; case 3: - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); sMapIcons->state++; break; diff --git a/src/seagallop.c b/src/seagallop.c index 9133a1560..79f837df7 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -226,7 +226,7 @@ static void CB2_SetUpSeagallopScene(void) break; case 5: LoadFerrySpriteResources(); - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); gMain.state++; break; case 6: diff --git a/src/shop.c b/src/shop.c index 6cfe665a2..df7184db1 100644 --- a/src/shop.c +++ b/src/shop.c @@ -403,7 +403,7 @@ static void CB2_InitBuyMenu(void) BuyMenuAddScrollIndicatorArrows(); taskId = CreateTask(Task_BuyMenu, 8); gTasks[taskId].tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0); - BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK); SetVBlankCallback(VBlankCB_BuyMenu); SetMainCallback2(CB2_BuyMenu); diff --git a/src/slot_machine.c b/src/slot_machine.c index 5ec2f1bd2..2eeab5335 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -1945,7 +1945,7 @@ static bool8 SlotsTask_GraphicsInit(u8 * state, struct SlotMachineSetupTaskData switch (*state) { case 0: - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); (*state)++; break; case 1: @@ -2002,7 +2002,7 @@ static bool8 SlotsTask_GraphicsInit(u8 * state, struct SlotMachineSetupTaskData CreateScoreDigitSprites(); CreateClefairySprites(); UpdateCoinsDisplay(); - BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK); SetVBlankCallback(VBlankCB_SlotMachine); SetHBlankCallback(HBlankCB_SlotMachine); (*state)++; @@ -2015,7 +2015,7 @@ static bool8 SlotsTask_GraphicsInit(u8 * state, struct SlotMachineSetupTaskData ShowBg(2); HideBg(1); InitReelButtonTileMem(); - BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); EnableInterrupts(INTR_FLAG_VBLANK | INTR_FLAG_HBLANK); (*state)++; diff --git a/src/sound.c b/src/sound.c index e14cd4c4e..04316adc0 100644 --- a/src/sound.c +++ b/src/sound.c @@ -315,7 +315,7 @@ bool8 IsBGMStopped(void) return FALSE; } -void PlayCry1(u16 species, s8 pan) +void PlayCry_Normal(u16 species, s8 pan) { m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85); PlayCryInternal(species, pan, CRY_VOLUME, 10, 0); diff --git a/src/start_menu.c b/src/start_menu.c index 266e83c69..80c9d7f59 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -874,7 +874,7 @@ bool32 DoSetUpSaveAfterLinkBattle(u8 *state) break; case 3: ShowBg(0); - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); SetVBlankCallback(VBlankCB_WhileSavingAfterLinkBattle); EnableInterrupts(INTR_FLAG_VBLANK); break; diff --git a/src/teachy_tv.c b/src/teachy_tv.c index 629174ed0..22577fc5b 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -494,7 +494,7 @@ static void TeachyTvMainCallback(void) ScheduleBgCopyTilemapToVram(2); ScheduleBgCopyTilemapToVram(3); SetHelpContextDontCheckBattle(HELPCONTEXT_BAG); - BlendPalettes(0xFFFFFFFF, 0x10, 0); + BlendPalettes(PALETTES_ALL, 0x10, 0); BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, 0); SetVBlankCallback(TeachyTvVblankHandler); SetMainCallback2(TeachyTvCallback); diff --git a/src/title_screen.c b/src/title_screen.c index 3413a19f2..80c7ce193 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -674,7 +674,7 @@ static void SetTitleScreenScene_Cry(s16 * data) case 0: if (!gPaletteFade.active) { - PlayCry1(TITLE_SPECIES, 0); + PlayCry_Normal(TITLE_SPECIES, 0); ScheduleHideSlashSprite(data[6]); data[2] = 0; data[1]++; diff --git a/src/tm_case.c b/src/tm_case.c index de420f545..1cabb5ec7 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -391,7 +391,7 @@ static bool8 DoSetUpTMCaseUI(void) gMain.state++; break; case 17: - BlendPalettes(0xFFFFFFFF, 16, 0); + BlendPalettes(PALETTES_ALL, 16, 0); gMain.state++; break; case 18: diff --git a/src/trade.c b/src/trade.c index 670ef4922..3dd540962 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1142,7 +1142,7 @@ void CB2_ReturnToTradeMenuFromSummary(void) break; case 18: gPaletteFade.bufferTransferDisabled = FALSE; - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); gMain.state++; break; diff --git a/src/trade_scene.c b/src/trade_scene.c index d7608d5ed..7a3642020 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -1294,7 +1294,7 @@ static bool8 DoTradeAnim_Cable(void) if (sTradeData->tradeSpecies[0] != SPECIES_EGG) { - PlayCry1(sTradeData->tradeSpecies[0], 0); + PlayCry_Normal(sTradeData->tradeSpecies[0], 0); } sTradeData->state = 11; @@ -1677,7 +1677,7 @@ static bool8 DoTradeAnim_Cable(void) { if (sTradeData->tradeSpecies[1] != SPECIES_EGG) { - PlayCry1(sTradeData->tradeSpecies[1], 0); + PlayCry_Normal(sTradeData->tradeSpecies[1], 0); } sTradeData->state = 267; sTradeData->timer = 0; @@ -1791,7 +1791,7 @@ static bool8 DoTradeAnim_Wireless(void) if (sTradeData->tradeSpecies[0] != SPECIES_EGG) { - PlayCry1(sTradeData->tradeSpecies[0], 0); + PlayCry_Normal(sTradeData->tradeSpecies[0], 0); } sTradeData->state = 11; @@ -2198,7 +2198,7 @@ static bool8 DoTradeAnim_Wireless(void) { if (sTradeData->tradeSpecies[1] != SPECIES_EGG) { - PlayCry1(sTradeData->tradeSpecies[1], 0); + PlayCry_Normal(sTradeData->tradeSpecies[1], 0); } sTradeData->state = 267; sTradeData->timer = 0; @@ -2756,7 +2756,7 @@ static void CheckPartnersMonForRibbons(void) FlagSet(FLAG_SYS_RIBBON_GET); } -void LoadTradeAnimGfx(void) +void InitTradeBg(void) { TradeAnimInit_LoadGfx(); } diff --git a/src/union_room_chat.c b/src/union_room_chat.c index c8dead2bb..995d2473f 100644 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -256,7 +256,7 @@ static void CB2_LoadInterface(void) UnionRoomChat_RunDisplaySubtasks(); if (!UnionRoomChat_RunDisplaySubtask0()) { - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); BeginNormalPaletteFade(PALETTES_ALL, -1, 16, 0, RGB_BLACK); SetVBlankCallback(VBlankCB_UnionRoomChatMain); gMain.state++; From 0709da58679585aca7b21b561c18cf03c8822aa1 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Thu, 28 Jul 2022 01:20:05 -0400 Subject: [PATCH 37/64] Multiple changes 2 --- asm/macros/battle_script.inc | 6 +- data/battle_scripts_1.s | 96 +- data/battle_scripts_2.s | 2 +- include/battle.h | 22 +- include/battle_controllers.h | 51 +- include/constants/battle.h | 198 +- include/constants/battle_script_commands.h | 62 +- include/constants/moves.h | 3 + include/constants/pokemon.h | 26 +- include/pokemon.h | 15 +- include/text.h | 2 +- src/battle_ai_script_commands.c | 8 +- src/battle_anim_effects_3.c | 8 +- src/battle_controller_pokedude.c | 2 +- src/battle_controllers.c | 26 +- src/battle_main.c | 52 +- src/battle_script_commands.c | 3124 ++++++++++---------- src/battle_util.c | 68 +- src/cable_club.c | 2 +- src/data/battle_moves.h | 342 +-- src/dodrio_berry_picking.c | 6 +- src/dodrio_berry_picking_2.c | 2 +- src/easy_chat_3.c | 14 +- src/evolution_scene.c | 40 +- src/item_pc.c | 2 +- src/list_menu.c | 4 +- src/map_name_popup.c | 2 +- src/naming_screen.c | 4 +- src/oak_speech.c | 2 +- src/option_menu.c | 4 +- src/party_menu.c | 8 +- src/pokedex_screen.c | 2 +- src/pokemon.c | 10 +- src/pokemon_jump.c | 22 +- src/pokemon_special_anim_scene.c | 10 +- src/pokemon_storage_system_2.c | 2 +- src/pokemon_storage_system_3.c | 10 +- src/pokemon_summary_screen.c | 68 +- src/shop.c | 18 +- src/slot_machine.c | 2 +- src/text_printer.c | 4 +- src/tm_case.c | 26 +- src/trainer_card.c | 72 +- src/trainer_tower.c | 6 +- src/union_room_chat_display.c | 20 +- 45 files changed, 2277 insertions(+), 2198 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index ca0ea59bd..1648883c9 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -183,7 +183,7 @@ .byte \battler .endm - .macro atk24 ptr:req + .macro checkteamslost ptr:req .byte 0x24 .4byte \ptr .endm @@ -503,7 +503,7 @@ .byte \battler .endm - .macro atk57 + .macro endlinkbattle .byte 0x57 .endm @@ -539,7 +539,7 @@ .4byte \addr .endm - .macro atk5E battler:req + .macro updatebattlermoves battler:req .byte 0x5e .byte \battler .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 708d7af45..9a9d30349 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -495,7 +495,7 @@ BattleScript_EffectStatUp:: BattleScript_EffectStatUpAfterAtkCanceler:: attackstring ppreduce - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_StatUpEnd + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_StatUpEnd jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_StatUpAttackAnim pause 0x20 goto BattleScript_StatUpPrintString @@ -542,7 +542,7 @@ BattleScript_EffectStatDown:: accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - statbuffchange STAT_CHANGE_BS_PTR, BattleScript_StatDownEnd + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_StatDownEnd jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 2, BattleScript_StatDownDoAnim jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 3, BattleScript_StatDownEnd pause 0x20 @@ -1503,17 +1503,17 @@ BattleScript_CurseTrySpeed:: attackanimation waitanimation setstatchanger STAT_SPEED, 1, TRUE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CurseTryAttack + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CurseTryAttack printfromtable gStatDownStringIds waitmessage 0x40 BattleScript_CurseTryAttack:: setstatchanger STAT_ATK, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CurseTryDefence + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CurseTryDefence printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_CurseTryDefence:: setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CurseEnd + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CurseEnd printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_CurseEnd:: @@ -1625,7 +1625,7 @@ BattleScript_EffectSwagger:: attackanimation waitanimation setstatchanger STAT_ATK, 2, FALSE - statbuffchange STAT_CHANGE_BS_PTR, BattleScript_SwaggerTryConfuse + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_SwaggerTryConfuse jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_SwaggerTryConfuse setgraphicalstatchangevalues playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 @@ -1820,7 +1820,7 @@ BattleScript_EffectSkullBash:: setbyte sTWOTURN_STRINGID, 2 call BattleScriptFirstChargingTurn setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_SkullBashEnd + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_SkullBashEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_SkullBashEnd setgraphicalstatchangevalues playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 @@ -2028,7 +2028,7 @@ BattleScript_EffectDefenseCurl:: ppreduce setdefensecurlbit setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_DefenseCurlDoStatUpAnim + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_DefenseCurlDoStatUpAnim jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_StatUpPrintString attackanimation waitanimation @@ -2170,7 +2170,7 @@ BattleScript_EffectFlatter:: attackanimation waitanimation setstatchanger STAT_SPATK, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR, BattleScript_FlatterTryConfuse + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_FlatterTryConfuse jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_FlatterTryConfuse setgraphicalstatchangevalues playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 @@ -2223,17 +2223,17 @@ BattleScript_EffectMemento:: waitanimation jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_MementoSubstituteInvulnerable setbyte sSTAT_ANIM_PLAYED, 0 - playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO | ATK48_ONLY_MULTIPLE - playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO + playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_MULTIPLE_STATS + playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO setstatchanger STAT_ATK, 2, TRUE - statbuffchange STAT_CHANGE_BS_PTR, BattleScript_MementoSkipStatDown1 + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MementoSkipStatDown1 jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_MementoSkipStatDown1 printfromtable gStatDownStringIds waitmessage 0x40 BattleScript_MementoSkipStatDown1:: - playstatchangeanimation BS_TARGET, BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO + playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO setstatchanger STAT_SPATK, 2, TRUE - statbuffchange STAT_CHANGE_BS_PTR, BattleScript_MementoSkipStatDown2 + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MementoSkipStatDown2 jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_MementoSkipStatDown2 printfromtable gStatDownStringIds waitmessage 0x40 @@ -2667,17 +2667,17 @@ BattleScript_TickleDoMoveAnim:: attackanimation waitanimation setbyte sSTAT_ANIM_PLAYED, 0 - playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE - playstatchangeanimation BS_TARGET, BIT_ATK, ATK48_STAT_NEGATIVE + playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS + playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE setstatchanger STAT_ATK, 1, TRUE - statbuffchange STAT_CHANGE_BS_PTR, BattleScript_TickleTryLowerDef + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleTryLowerDef jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_TickleTryLowerDef printfromtable gStatDownStringIds waitmessage 0x40 BattleScript_TickleTryLowerDef:: - playstatchangeanimation BS_TARGET, BIT_DEF, ATK48_STAT_NEGATIVE + playstatchangeanimation BS_TARGET, BIT_DEF, STAT_CHANGE_NEGATIVE setstatchanger STAT_DEF, 1, TRUE - statbuffchange STAT_CHANGE_BS_PTR, BattleScript_TickleEnd + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_TickleEnd printfromtable gStatDownStringIds waitmessage 0x40 @@ -2703,13 +2703,13 @@ BattleScript_CosmicPowerDoMoveAnim:: setbyte sSTAT_ANIM_PLAYED, 0 playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0 setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CosmicPowerTrySpDef + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CosmicPowerTrySpDef jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CosmicPowerTrySpDef printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_CosmicPowerTrySpDef:: setstatchanger STAT_SPDEF, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CosmicPowerEnd + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CosmicPowerEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CosmicPowerEnd printfromtable gStatUpStringIds waitmessage 0x40 @@ -2732,13 +2732,13 @@ BattleScript_BulkUpDoMoveAnim:: setbyte sSTAT_ANIM_PLAYED, 0 playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0 setstatchanger STAT_ATK, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_BulkUpTryDef + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_BulkUpTryDef jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_BulkUpTryDef printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_BulkUpTryDef:: setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_BulkUpEnd + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_BulkUpEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_BulkUpEnd printfromtable gStatUpStringIds waitmessage 0x40 @@ -2757,13 +2757,13 @@ BattleScript_CalmMindDoMoveAnim:: setbyte sSTAT_ANIM_PLAYED, 0 playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0 setstatchanger STAT_SPATK, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CalmMindTrySpDef + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CalmMindTrySpDef jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CalmMindTrySpDef printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_CalmMindTrySpDef:: setstatchanger STAT_SPDEF, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CalmMindEnd + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CalmMindEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CalmMindEnd printfromtable gStatUpStringIds waitmessage 0x40 @@ -2789,13 +2789,13 @@ BattleScript_DragonDanceDoMoveAnim:: setbyte sSTAT_ANIM_PLAYED, 0 playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0 setstatchanger STAT_ATK, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_DragonDanceTrySpeed + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_DragonDanceTrySpeed jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_DragonDanceTrySpeed printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_DragonDanceTrySpeed:: setstatchanger STAT_SPEED, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_DragonDanceEnd + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_DragonDanceEnd jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_DragonDanceEnd printfromtable gStatUpStringIds waitmessage 0x40 @@ -2837,7 +2837,7 @@ BattleScript_GiveExp:: end2 BattleScript_HandleFaintedMon:: - atk24 BattleScript_LinkBattleHandleFaint + checkteamslost BattleScript_LinkBattleHandleFaint jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonTryChooseAnother jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_PLAYER_FAINTED, BattleScript_FaintedMonTryChooseAnother @@ -2996,7 +2996,7 @@ BattleScript_BattleTowerLostLostSkipDouble:: BattleScript_LinkBattleWonOrLost:: printstring STRINGID_BATTLEEND waitmessage 0x40 - atk57 + endlinkbattle waitmessage 0x40 end2 @@ -3188,7 +3188,7 @@ BattleScript_DamagingWeatherLoop:: healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER tryfaintmon BS_ATTACKER, 0, NULL - atk24 BattleScript_DamagingWeatherContinuesEnd + checkteamslost BattleScript_DamagingWeatherContinuesEnd BattleScript_DamagingWeatherContinuesEnd:: jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_WeatherDamageEndedBattle addbyte gBattleCommunication, 1 @@ -3427,27 +3427,27 @@ BattleScript_AllStatsUpAtk:: setbyte sSTAT_ANIM_PLAYED, 0 playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0 setstatchanger STAT_ATK, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpDef + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpDef printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_AllStatsUpDef:: setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpSpeed + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpSpeed printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_AllStatsUpSpeed:: setstatchanger STAT_SPEED, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpSpAtk + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpSpAtk printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_AllStatsUpSpAtk:: setstatchanger STAT_SPATK, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpSpDef + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpSpDef printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_AllStatsUpSpDef:: setstatchanger STAT_SPDEF, 1, FALSE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpRet + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpRet printfromtable gStatUpStringIds waitmessage 0x40 BattleScript_AllStatsUpRet:: @@ -3499,7 +3499,7 @@ BattleScript_DoFutureAttackHit:: resultmessage waitmessage 0x40 tryfaintmon BS_TARGET, 0, NULL - atk24 BattleScript_FutureAttackEnd + checkteamslost BattleScript_FutureAttackEnd BattleScript_FutureAttackEnd:: moveendcase 0 moveendfromto 11, 14 @@ -3584,17 +3584,17 @@ BattleScript_PrintMonIsRooted:: BattleScript_AtkDefDown:: setbyte sSTAT_ANIM_PLAYED, 0 - playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, ATK48_STAT_NEGATIVE | ATK48_ONLY_MULTIPLE | ATK48_DONT_CHECK_LOWER - playstatchangeanimation BS_ATTACKER, BIT_ATK, ATK48_STAT_NEGATIVE | ATK48_DONT_CHECK_LOWER + playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS | STAT_CHANGE_CANT_PREVENT + playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT setstatchanger STAT_ATK, 1, TRUE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_AtkDefDownAtkFail + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_AtkDefDownAtkFail jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_AtkDefDownAtkFail printfromtable gStatDownStringIds waitmessage 0x40 BattleScript_AtkDefDownAtkFail:: - playstatchangeanimation BS_ATTACKER, BIT_DEF, ATK48_STAT_NEGATIVE | ATK48_DONT_CHECK_LOWER + playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT setstatchanger STAT_DEF, 1, TRUE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_AtkDefDownDefFail + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_AtkDefDownDefFail jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_AtkDefDownDefFail printfromtable gStatDownStringIds waitmessage 0x40 @@ -3627,7 +3627,7 @@ BattleScript_MagicCoatBounce:: pause 0x20 printstring STRINGID_PKMNMOVEBOUNCED waitmessage 0x40 - orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000 + orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_ALLOW_NO_PP setmagiccoattarget BS_ATTACKER return @@ -3638,7 +3638,7 @@ BattleScript_SnatchedMove:: playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL printstring STRINGID_PKMNSNATCHEDMOVE waitmessage 0x40 - orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000 + orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_ALLOW_NO_PP swapattackerwithtarget return @@ -3654,9 +3654,9 @@ BattleScript_OneHitKOMsg:: BattleScript_SAtkDown2:: setbyte sSTAT_ANIM_PLAYED, 0 - playstatchangeanimation BS_ATTACKER, BIT_SPATK, ATK48_STAT_NEGATIVE | ATK48_STAT_BY_TWO | ATK48_DONT_CHECK_LOWER + playstatchangeanimation BS_ATTACKER, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_CANT_PREVENT setstatchanger STAT_SPATK, 2, TRUE - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_SAtkDown2End + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_SAtkDown2End jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_SAtkDown2End printfromtable gStatDownStringIds waitmessage 0x40 @@ -3700,7 +3700,7 @@ BattleScript_DoTurnDmg:: healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER tryfaintmon BS_ATTACKER, 0, NULL - atk24 BattleScript_DoTurnDmgEnd + checkteamslost BattleScript_DoTurnDmgEnd BattleScript_DoTurnDmgEnd:: end2 @@ -4009,7 +4009,7 @@ BattleScript_IntimidateActivationAnimLoop:: jumpifability BS_TARGET, ABILITY_CLEAR_BODY, BattleScript_IntimidateAbilityFail jumpifability BS_TARGET, ABILITY_HYPER_CUTTER, BattleScript_IntimidateAbilityFail jumpifability BS_TARGET, ABILITY_WHITE_SMOKE, BattleScript_IntimidateAbilityFail - statbuffchange STAT_CHANGE_BS_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_IntimidateFail + statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_IntimidateFail jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_IntimidateFail setgraphicalstatchangevalues playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 @@ -4377,7 +4377,7 @@ BattleScript_BerryConfuseHealEnd2:: BattleScript_BerryStatRaiseEnd2:: playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL - statbuffchange STAT_CHANGE_BS_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_BerryStatRaiseDoStatUp + statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_BerryStatRaiseDoStatUp BattleScript_BerryStatRaiseDoStatUp:: setbyte cMULTISTRING_CHOOSER, 4 call BattleScript_StatUp diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index eab0bd225..3794f2f7a 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -99,7 +99,7 @@ BattleScript_CaughtPokemonDone:: BattleScript_OldMan_Pokedude_CaughtMessage:: printstring STRINGID_GOTCHAPKMNCAUGHT2 setbyte gBattleOutcome, B_OUTCOME_CAUGHT - atk57 + endlinkbattle finishturn BattleScript_ShakeBallThrow:: diff --git a/include/battle.h b/include/battle.h index 1a10b7c1c..32bb401b3 100644 --- a/include/battle.h +++ b/include/battle.h @@ -209,14 +209,14 @@ extern struct ProtectStruct gProtectStructs[MAX_BATTLERS_COUNT]; struct SpecialStatus { - u8 statLowered : 1; // 0x1 - u8 lightningRodRedirected : 1; // 0x2 - u8 restoredBattlerSprite: 1; // 0x4 - u8 intimidatedMon : 1; // 0x8 - u8 traced : 1; // 0x10 - u8 ppNotAffectedByPressure : 1; - u8 flag40 : 1; - u8 focusBanded : 1; + u8 statLowered:1; // 0x1 + u8 lightningRodRedirected:1; // 0x2 + u8 restoredBattlerSprite:1; // 0x4 + u8 intimidatedMon:1; // 0x8 + u8 traced:1; // 0x10 + u8 ppNotAffectedByPressure:1; + u8 faintedHasReplacement:1; + u8 focusBanded:1; u8 field1[3]; s32 dmg; s32 physicalDmg; @@ -492,7 +492,7 @@ struct BattleScripting u8 animArg1; u8 animArg2; u16 tripleKickPower; - u8 atk49_state; + u8 moveendState; u8 battlerWithAbility; u8 multihitMoveEffect; u8 battler; @@ -500,9 +500,9 @@ struct BattleScripting u8 animTargetsHit; u8 statChanger; bool8 statAnimPlayed; - u8 atk23_state; + u8 getexpState; u8 battleStyle; - u8 atk6C_state; + u8 drawlvlupboxState; u8 learnMoveState; u8 field_20; u8 reshowMainState; diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 7dacb1343..284fc84d2 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -68,21 +68,38 @@ enum REQUEST_TOUGH_RIBBON_BATTLE, }; -#define RESET_ACTION_MOVE_SELECTION 0 -#define RESET_ACTION_SELECTION 1 -#define RESET_MOVE_SELECTION 2 +// Special arguments for Battle Controller functions. -#define BALL_NO_SHAKES 0 -#define BALL_1_SHAKE 1 -#define BALL_2_SHAKES 2 -#define BALL_3_SHAKES_FAIL 3 -#define BALL_3_SHAKES_SUCCESS 4 -#define BALL_TRAINER_BLOCK 5 -#define BALL_GHOST_DODGE 6 +enum { // Values given to the emit functions to choose gBattleBufferA or gBattleBufferB + BUFFER_A, + BUFFER_B +}; + +enum { + RESET_ACTION_MOVE_SELECTION, + RESET_ACTION_SELECTION, + RESET_MOVE_SELECTION, +}; + +enum { + BALL_NO_SHAKES, + BALL_1_SHAKE, + BALL_2_SHAKES, + BALL_3_SHAKES_FAIL, + BALL_3_SHAKES_SUCCESS, + BALL_TRAINER_BLOCK, + BALL_GHOST_DODGE, +}; + +enum { + LINK_STANDBY_MSG_STOP_BOUNCE, + LINK_STANDBY_STOP_BOUNCE_ONLY, + LINK_STANDBY_MSG_ONLY, +}; #define RET_VALUE_LEVELLED_UP 11 -#define INSTANT_HP_BAR_DROP 0x7FFF +#define INSTANT_HP_BAR_DROP 32767 // Special return values in gBattleBufferB from Battle Controller functions. #define RET_VALUE_LEVELED_UP 11 @@ -149,7 +166,7 @@ enum CONTROLLER_STATUSXOR, CONTROLLER_DATATRANSFER, CONTROLLER_DMA3TRANSFER, - CONTROLLER_31, + CONTROLLER_PLAYBGM, CONTROLLER_32, CONTROLLER_TWORETURNVALUES, CONTROLLER_CHOSENMONRETURNVALUE, @@ -173,7 +190,7 @@ enum CONTROLLER_BATTLEANIMATION, CONTROLLER_LINKSTANDBYMSG, CONTROLLER_RESETACTIONMOVESELECTION, - CONTROLLER_55, + CONTROLLER_ENDLINKBATTLE, /*new controllers should go here*/ CONTROLLER_TERMINATOR_NOP, CONTROLLER_CMDS_COUNT @@ -193,7 +210,7 @@ void BtlController_EmitGetMonData(u8 bufferId, u8 requestId, u8 monToCheck); void BtlController_EmitSetMonData(u8 bufferId, u8 requestId, u8 monToCheck, u8 bytes, void *data); void BtlController_EmitLoadMonSprite(u8 bufferId); void BtlController_EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit); -void BtlController_EmitReturnMonToBall(u8 bufferId, u8 arg1); +void BtlController_EmitReturnMonToBall(u8 bufferId, bool8 skipAnim); void BtlController_EmitDrawTrainerPic(u8 bufferId); void BtlController_EmitTrainerSlide(u8 bufferId); void BtlController_EmitTrainerSlideBack(u8 bufferId); @@ -216,7 +233,7 @@ void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c); void BtlController_EmitOneReturnValue(u8 bufferId, u16 arg1); void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 b); void BtlController_EmitHitAnimation(u8 bufferId); -void BtlController_EmitCmd42(u8 bufferId); +void BtlController_EmitCantSwitch(u8 bufferId); void BtlController_EmitPlaySE(u8 bufferId, u16 songId); void BtlController_EmitPlayFanfare(u8 bufferId, u16 songId); void BtlController_EmitFaintingCry(u8 bufferId); @@ -227,9 +244,9 @@ void BtlController_EmitHidePartyStatusSummary(u8 bufferId); void BtlController_EmitEndBounceEffect(u8 bufferId); void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible); void BtlController_EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument); -void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 arg1); +void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 mode); void BtlController_EmitResetActionMoveSelection(u8 bufferId, u8 caseId); -void BtlController_EmitCmd55(u8 bufferId, u8 arg1); +void BtlController_EmitEndLinkBattle(u8 bufferId, u8 arg1); // player controller void PlayerDummy(void); diff --git a/include/constants/battle.h b/include/constants/battle.h index c2efecafc..2a3be269d 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -135,24 +135,26 @@ #define STATUS2_TORMENT 0x80000000 // Seems like per-battler statuses. Not quite sure how to categorize these -#define STATUS3_LEECHSEED_BATTLER 0x3 -#define STATUS3_LEECHSEED 0x4 -#define STATUS3_ALWAYS_HITS 0x18 // two bits -#define STATUS3_PERISH_SONG 0x20 -#define STATUS3_ON_AIR 0x40 -#define STATUS3_UNDERGROUND 0x80 -#define STATUS3_MINIMIZED 0x100 -#define STATUS3_ROOTED 0x400 -#define STATUS3_CHARGED_UP 0x200 -#define STATUS3_YAWN 0x1800 // two bits -#define STATUS3_IMPRISONED_OTHERS 0x2000 -#define STATUS3_GRUDGE 0x4000 -#define STATUS3_CANT_SCORE_A_CRIT 0x8000 -#define STATUS3_MUDSPORT 0x10000 -#define STATUS3_WATERSPORT 0x20000 -#define STATUS3_UNDERWATER 0x40000 -#define STATUS3_INTIMIDATE_POKES 0x80000 -#define STATUS3_TRACE 0x100000 +#define STATUS3_LEECHSEED_BATTLER (1 << 0 | 1 << 1) // The battler to receive HP from Leech Seed +#define STATUS3_LEECHSEED (1 << 2) +#define STATUS3_ALWAYS_HITS (1 << 3 | 1 << 4) +#define STATUS3_ALWAYS_HITS_TURN(num) (((num) << 3) & STATUS3_ALWAYS_HITS) // "Always Hits" is set as a 2 turn timer, i.e. next turn is the last turn when it's active +#define STATUS3_PERISH_SONG (1 << 5) +#define STATUS3_ON_AIR (1 << 6) +#define STATUS3_UNDERGROUND (1 << 7) +#define STATUS3_MINIMIZED (1 << 8) +#define STATUS3_CHARGED_UP (1 << 9) +#define STATUS3_ROOTED (1 << 10) +#define STATUS3_YAWN (1 << 11 | 1 << 12) // Number of turns to sleep +#define STATUS3_YAWN_TURN(num) (((num) << 11) & STATUS3_YAWN) +#define STATUS3_IMPRISONED_OTHERS (1 << 13) +#define STATUS3_GRUDGE (1 << 14) +#define STATUS3_CANT_SCORE_A_CRIT (1 << 15) +#define STATUS3_MUDSPORT (1 << 16) +#define STATUS3_WATERSPORT (1 << 17) +#define STATUS3_UNDERWATER (1 << 18) +#define STATUS3_INTIMIDATE_POKES (1 << 19) +#define STATUS3_TRACE (1 << 20) #define STATUS3_SEMI_INVULNERABLE (STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER) // Not really sure what a "hitmarker" is. @@ -175,7 +177,7 @@ #define HITMARKER_PASSIVE_DAMAGE 0x00100000 #define HITMARKER_x200000 0x00200000 #define HITMARKER_PLAYER_FAINTED 0x00400000 -#define HITMARKER_x800000 0x00800000 +#define HITMARKER_ALLOW_NO_PP 0x00800000 #define HITMARKER_GRUDGE 0x01000000 #define HITMARKER_OBEYS 0x02000000 #define HITMARKER_x4000000 0x04000000 @@ -205,87 +207,85 @@ #define MOVE_RESULT_NO_EFFECT (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED) // Battle Weather flags -#define WEATHER_RAIN_TEMPORARY (1 << 0) -#define WEATHER_RAIN_DOWNPOUR (1 << 1) // unused -#define WEATHER_RAIN_PERMANENT (1 << 2) -#define WEATHER_RAIN_ANY (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT) -#define WEATHER_SANDSTORM_TEMPORARY (1 << 3) -#define WEATHER_SANDSTORM_PERMANENT (1 << 4) -#define WEATHER_SANDSTORM_ANY (WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT) -#define WEATHER_SUN_TEMPORARY (1 << 5) -#define WEATHER_SUN_PERMANENT (1 << 6) -#define WEATHER_SUN_ANY (WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT) -#define WEATHER_HAIL (1 << 7) -#define WEATHER_HAIL_ANY (WEATHER_HAIL) -#define WEATHER_ANY (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY) +#define B_WEATHER_RAIN_TEMPORARY (1 << 0) +#define B_WEATHER_RAIN_DOWNPOUR (1 << 1) // unused +#define B_WEATHER_RAIN_PERMANENT (1 << 2) +#define B_WEATHER_RAIN (B_WEATHER_RAIN_TEMPORARY | B_WEATHER_RAIN_DOWNPOUR | B_WEATHER_RAIN_PERMANENT) +#define B_WEATHER_SANDSTORM_TEMPORARY (1 << 3) +#define B_WEATHER_SANDSTORM_PERMANENT (1 << 4) +#define B_WEATHER_SANDSTORM (B_WEATHER_SANDSTORM_TEMPORARY | B_WEATHER_SANDSTORM_PERMANENT) +#define B_WEATHER_SUN_TEMPORARY (1 << 5) +#define B_WEATHER_SUN_PERMANENT (1 << 6) +#define B_WEATHER_SUN (B_WEATHER_SUN_TEMPORARY | B_WEATHER_SUN_PERMANENT) +#define B_WEATHER_HAIL_TEMPORARY (1 << 7) +#define B_WEATHER_HAIL (B_WEATHER_HAIL_TEMPORARY) +#define WEATHER_ANY (B_WEATHER_RAIN | B_WEATHER_SANDSTORM | B_WEATHER_SUN | B_WEATHER_HAIL) // Move Effects -#define MOVE_EFFECT_NOTHING_0 0x0 -#define MOVE_EFFECT_SLEEP 0x1 -#define MOVE_EFFECT_POISON 0x2 -#define MOVE_EFFECT_BURN 0x3 -#define MOVE_EFFECT_FREEZE 0x4 -#define MOVE_EFFECT_PARALYSIS 0x5 -#define MOVE_EFFECT_TOXIC 0x6 -#define MOVE_EFFECT_CONFUSION 0x7 -#define MOVE_EFFECT_FLINCH 0x8 -#define MOVE_EFFECT_TRI_ATTACK 0x9 -#define MOVE_EFFECT_UPROAR 0xA -#define MOVE_EFFECT_PAYDAY 0xB -#define MOVE_EFFECT_CHARGING 0xC -#define MOVE_EFFECT_WRAP 0xD -#define MOVE_EFFECT_RECOIL_25 0xE -#define MOVE_EFFECT_ATK_PLUS_1 0xF -#define MOVE_EFFECT_DEF_PLUS_1 0x10 -#define MOVE_EFFECT_SPD_PLUS_1 0x11 -#define MOVE_EFFECT_SP_ATK_PLUS_1 0x12 -#define MOVE_EFFECT_SP_DEF_PLUS_1 0x13 -#define MOVE_EFFECT_ACC_PLUS_1 0x14 -#define MOVE_EFFECT_EVS_PLUS_1 0x15 -#define MOVE_EFFECT_ATK_MINUS_1 0x16 -#define MOVE_EFFECT_DEF_MINUS_1 0x17 -#define MOVE_EFFECT_SPD_MINUS_1 0x18 -#define MOVE_EFFECT_SP_ATK_MINUS_1 0x19 -#define MOVE_EFFECT_SP_DEF_MINUS_1 0x1A -#define MOVE_EFFECT_ACC_MINUS_1 0x1B -#define MOVE_EFFECT_EVS_MINUS_1 0x1C -#define MOVE_EFFECT_RECHARGE 0x1D -#define MOVE_EFFECT_RAGE 0x1E -#define MOVE_EFFECT_STEAL_ITEM 0x1F -#define MOVE_EFFECT_PREVENT_ESCAPE 0x20 -#define MOVE_EFFECT_NIGHTMARE 0x21 -#define MOVE_EFFECT_ALL_STATS_UP 0x22 -#define MOVE_EFFECT_RAPIDSPIN 0x23 -#define MOVE_EFFECT_REMOVE_PARALYSIS 0x24 -#define MOVE_EFFECT_ATK_DEF_DOWN 0x25 -#define MOVE_EFFECT_RECOIL_33 0x26 -#define MOVE_EFFECT_ATK_PLUS_2 0x27 -#define MOVE_EFFECT_DEF_PLUS_2 0x28 -#define MOVE_EFFECT_SPD_PLUS_2 0x29 -#define MOVE_EFFECT_SP_ATK_PLUS_2 0x2A -#define MOVE_EFFECT_SP_DEF_PLUS_2 0x2B -#define MOVE_EFFECT_ACC_PLUS_2 0x2C -#define MOVE_EFFECT_EVS_PLUS_2 0x2D -#define MOVE_EFFECT_ATK_MINUS_2 0x2E -#define MOVE_EFFECT_DEF_MINUS_2 0x2F -#define MOVE_EFFECT_SPD_MINUS_2 0x30 -#define MOVE_EFFECT_SP_ATK_MINUS_2 0x31 -#define MOVE_EFFECT_SP_DEF_MINUS_2 0x32 -#define MOVE_EFFECT_ACC_MINUS_2 0x33 -#define MOVE_EFFECT_EVS_MINUS_2 0x34 -#define MOVE_EFFECT_THRASH 0x35 -#define MOVE_EFFECT_KNOCK_OFF 0x36 -#define MOVE_EFFECT_NOTHING_37 0x37 -#define MOVE_EFFECT_NOTHING_38 0x38 -#define MOVE_EFFECT_NOTHING_39 0x39 -#define MOVE_EFFECT_NOTHING_3A 0x3A -#define MOVE_EFFECT_SP_ATK_TWO_DOWN 0x3B -#define MOVE_EFFECT_NOTHING_3C 0x3C -#define MOVE_EFFECT_NOTHING_3D 0x3D -#define MOVE_EFFECT_NOTHING_3E 0x3E -#define MOVE_EFFECT_NOTHING_3F 0x3F -#define MOVE_EFFECT_AFFECTS_USER 0x40 -#define MOVE_EFFECT_CERTAIN 0x80 +#define MOVE_EFFECT_SLEEP 1 +#define MOVE_EFFECT_POISON 2 +#define MOVE_EFFECT_BURN 3 +#define MOVE_EFFECT_FREEZE 4 +#define MOVE_EFFECT_PARALYSIS 5 +#define MOVE_EFFECT_TOXIC 6 +#define PRIMARY_STATUS_MOVE_EFFECT MOVE_EFFECT_TOXIC // All above move effects apply primary status +#define MOVE_EFFECT_CONFUSION 7 +#define MOVE_EFFECT_FLINCH 8 +#define MOVE_EFFECT_TRI_ATTACK 9 +#define MOVE_EFFECT_UPROAR 10 +#define MOVE_EFFECT_PAYDAY 11 +#define MOVE_EFFECT_CHARGING 12 +#define MOVE_EFFECT_WRAP 13 +#define MOVE_EFFECT_RECOIL_25 14 +#define MOVE_EFFECT_ATK_PLUS_1 15 +#define MOVE_EFFECT_DEF_PLUS_1 16 +#define MOVE_EFFECT_SPD_PLUS_1 17 +#define MOVE_EFFECT_SP_ATK_PLUS_1 18 +#define MOVE_EFFECT_SP_DEF_PLUS_1 19 +#define MOVE_EFFECT_ACC_PLUS_1 20 +#define MOVE_EFFECT_EVS_PLUS_1 21 +#define MOVE_EFFECT_ATK_MINUS_1 22 +#define MOVE_EFFECT_DEF_MINUS_1 23 +#define MOVE_EFFECT_SPD_MINUS_1 24 +#define MOVE_EFFECT_SP_ATK_MINUS_1 25 +#define MOVE_EFFECT_SP_DEF_MINUS_1 26 +#define MOVE_EFFECT_ACC_MINUS_1 27 +#define MOVE_EFFECT_EVS_MINUS_1 28 +#define MOVE_EFFECT_RECHARGE 29 +#define MOVE_EFFECT_RAGE 30 +#define MOVE_EFFECT_STEAL_ITEM 31 +#define MOVE_EFFECT_PREVENT_ESCAPE 32 +#define MOVE_EFFECT_NIGHTMARE 33 +#define MOVE_EFFECT_ALL_STATS_UP 34 +#define MOVE_EFFECT_RAPIDSPIN 35 +#define MOVE_EFFECT_REMOVE_PARALYSIS 36 +#define MOVE_EFFECT_ATK_DEF_DOWN 37 +#define MOVE_EFFECT_RECOIL_33 38 +#define MOVE_EFFECT_ATK_PLUS_2 39 +#define MOVE_EFFECT_DEF_PLUS_2 40 +#define MOVE_EFFECT_SPD_PLUS_2 41 +#define MOVE_EFFECT_SP_ATK_PLUS_2 42 +#define MOVE_EFFECT_SP_DEF_PLUS_2 43 +#define MOVE_EFFECT_ACC_PLUS_2 44 +#define MOVE_EFFECT_EVS_PLUS_2 45 +#define MOVE_EFFECT_ATK_MINUS_2 46 +#define MOVE_EFFECT_DEF_MINUS_2 47 +#define MOVE_EFFECT_SPD_MINUS_2 48 +#define MOVE_EFFECT_SP_ATK_MINUS_2 49 +#define MOVE_EFFECT_SP_DEF_MINUS_2 50 +#define MOVE_EFFECT_ACC_MINUS_2 51 +#define MOVE_EFFECT_EVS_MINUS_2 52 +#define MOVE_EFFECT_THRASH 53 +#define MOVE_EFFECT_KNOCK_OFF 54 +#define MOVE_EFFECT_NOTHING_37 55 +#define MOVE_EFFECT_NOTHING_38 56 +#define MOVE_EFFECT_NOTHING_39 57 +#define MOVE_EFFECT_NOTHING_3A 58 +#define MOVE_EFFECT_SP_ATK_TWO_DOWN 59 +#define NUM_MOVE_EFFECTS 60 + +#define MOVE_EFFECT_AFFECTS_USER (1 << 6) // 64 +#define MOVE_EFFECT_CERTAIN (1 << 7) // 128 // Battle terrain defines for gBattleTerrain. #define BATTLE_TERRAIN_GRASS 0 @@ -327,6 +327,8 @@ #define B_WIN_PP_REMAINING 9 #define B_WIN_DUMMY 10 #define B_WIN_SWITCH_PROMPT 11 // "Switch which?" +#define B_WIN_LEVEL_UP_BOX 12 +#define B_WIN_LEVEL_UP_BANNER 13 #define B_WIN_YESNO 14 #define B_WIN_VS_PLAYER 15 #define B_WIN_VS_OPPONENT 16 diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index de1b2a65e..db2a0372b 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -38,16 +38,16 @@ #define BS_ATTACKER 1 #define BS_EFFECT_BATTLER 2 #define BS_FAINTED 3 -#define BS_ATTACKER_WITH_PARTNER 4 // for atk98_updatestatusicon +#define BS_ATTACKER_WITH_PARTNER 4 // for Cmd_updatestatusicon #define BS_UNKNOWN_5 5 // for openpartyscreen #define BS_UNKNOWN_6 6 // for openpartyscreen #define BS_BATTLER_0 7 -#define BS_ATTACKER_SIDE 8 // for atk1E_jumpifability -#define BS_NOT_ATTACKER_SIDE 9 // for atk1E_jumpifability +#define BS_ATTACKER_SIDE 8 // for Cmd_jumpifability +#define BS_NOT_ATTACKER_SIDE 9 // for Cmd_jumpifability #define BS_SCRIPTING 10 #define BS_PLAYER1 11 #define BS_OPPONENT1 12 -#define BS_PLAYER2 13 // for atk98_updatestatusicon +#define BS_PLAYER2 13 // for Cmd_updatestatusicon #define BS_OPPONENT2 14 // used for openpartyscreen @@ -90,35 +90,35 @@ // atk4F, a flag used for the jumpifcantswitch command #define ATK4F_DONT_CHECK_STATUSES 0x80 -// statchange defines -#define STAT_CHANGE_BS_PTR 0x1 -#define STAT_CHANGE_NOT_PROTECT_AFFECTED 0x20 +// Cmd_statbuffchange +#define STAT_CHANGE_ALLOW_PTR (1 << 0) // If set, allow use of jumpptr. Set in every use of statbuffchange +#define STAT_CHANGE_NOT_PROTECT_AFFECTED (1 << 5) -// atk48 -#define ATK48_STAT_NEGATIVE 0x1 -#define ATK48_STAT_BY_TWO 0x2 -#define ATK48_ONLY_MULTIPLE 0x4 -#define ATK48_DONT_CHECK_LOWER 0x8 +// stat change flags for Cmd_playstatchangeanimation +#define STAT_CHANGE_NEGATIVE (1 << 0) +#define STAT_CHANGE_BY_TWO (1 << 1) +#define STAT_CHANGE_MULTIPLE_STATS (1 << 2) +#define STAT_CHANGE_CANT_PREVENT (1 << 3) -// atk49, moveend cases -#define ATK49_RAGE 0 -#define ATK49_DEFROST 1 -#define ATK49_SYNCHRONIZE_TARGET 2 -#define ATK49_MOVE_END_ABILITIES 3 -#define ATK49_STATUS_IMMUNITY_ABILITIES 4 -#define ATK49_SYNCHRONIZE_ATTACKER 5 -#define ATK49_CHOICE_MOVE 6 -#define ATK49_CHANGED_ITEMS 7 -#define ATK49_ATTACKER_INVISIBLE 8 -#define ATK49_ATTACKER_VISIBLE 9 -#define ATK49_TARGET_VISIBLE 10 -#define ATK49_ITEM_EFFECTS_ALL 11 -#define ATK49_KINGSROCK_SHELLBELL 12 -#define ATK49_SUBSTITUTE 13 -#define ATK49_UPDATE_LAST_MOVES 14 -#define ATK49_MIRROR_MOVE 15 -#define ATK49_NEXT_TARGET 16 -#define ATK49_COUNT 17 +// cases for Cmd_moveend +#define MOVEEND_RAGE 0 +#define MOVEEND_DEFROST 1 +#define MOVEEND_SYNCHRONIZE_TARGET 2 +#define MOVEEND_ON_DAMAGE_ABILITIES 3 +#define MOVEEND_IMMUNITY_ABILITIES 4 +#define MOVEEND_SYNCHRONIZE_ATTACKER 5 +#define MOVEEND_CHOICE_MOVE 6 +#define MOVEEND_CHANGED_ITEMS 7 +#define MOVEEND_ATTACKER_INVISIBLE 8 +#define MOVEEND_ATTACKER_VISIBLE 9 +#define MOVEEND_TARGET_VISIBLE 10 +#define MOVEEND_ITEM_EFFECTS_ALL 11 +#define MOVEEND_KINGSROCK_SHELLBELL 12 +#define MOVEEND_SUBSTITUTE 13 +#define MOVEEND_UPDATE_LAST_MOVES 14 +#define MOVEEND_MIRROR_MOVE 15 +#define MOVEEND_NEXT_TARGET 16 +#define MOVEEND_COUNT 17 #define BIT_HP 0x1 #define BIT_ATK 0x2 diff --git a/include/constants/moves.h b/include/constants/moves.h index 8dace5670..9d5ca3555 100644 --- a/include/constants/moves.h +++ b/include/constants/moves.h @@ -361,6 +361,9 @@ #define MOVES_COUNT 355 +// Used for checks for moves affected by Disable, Mimic, etc. +#define MOVE_UNAVAILABLE 0xFFFF + #define MOVETUTOR_MEGA_PUNCH 0 #define MOVETUTOR_SWORDS_DANCE 1 #define MOVETUTOR_MEGA_KICK 2 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 7a9a0afcf..79024cf23 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -161,17 +161,23 @@ #define NATURE_QUIRKY 24 // Pokemon Stats -#define STAT_HP 0 -#define STAT_ATK 1 -#define STAT_DEF 2 -#define STAT_SPEED 3 -#define STAT_SPATK 4 -#define STAT_SPDEF 5 -#define STAT_ACC 6 // only in battles -#define STAT_EVASION 7 // only in battles +#define STAT_HP 0 +#define STAT_ATK 1 +#define STAT_DEF 2 +#define STAT_SPEED 3 +#define STAT_SPATK 4 +#define STAT_SPDEF 5 +#define NUM_STATS 6 -#define NUM_STATS 6 -#define NUM_BATTLE_STATS 8 +#define STAT_ACC 6 // Only in battles. +#define STAT_EVASION 7 // Only in battles. + +#define NUM_NATURE_STATS (NUM_STATS - 1) // excludes HP +#define NUM_BATTLE_STATS (NUM_STATS + 2) // includes Accuracy and Evasion + +#define MIN_STAT_STAGE 0 +#define DEFAULT_STAT_STAGE 6 +#define MAX_STAT_STAGE 12 // Shiny odds #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536 diff --git a/include/pokemon.h b/include/pokemon.h index 9c24a7389..0c5657f24 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -245,12 +245,13 @@ struct BattleMove extern const struct BattleMove gBattleMoves[]; -#define FLAG_MAKES_CONTACT 0x1 -#define FLAG_PROTECT_AFFECTED 0x2 -#define FLAG_MAGICCOAT_AFFECTED 0x4 -#define FLAG_SNATCH_AFFECTED 0x8 -#define FLAG_MIRROR_MOVE_AFFECTED 0x10 -#define FLAG_KINGSROCK_AFFECTED 0x20 +// Battle move flags +#define FLAG_MAKES_CONTACT (1 << 0) +#define FLAG_PROTECT_AFFECTED (1 << 1) +#define FLAG_MAGIC_COAT_AFFECTED (1 << 2) +#define FLAG_SNATCH_AFFECTED (1 << 3) +#define FLAG_MIRROR_MOVE_AFFECTED (1 << 4) +#define FLAG_KINGS_ROCK_AFFECTED (1 << 5) struct SpindaSpot { @@ -396,7 +397,7 @@ u8 CalculatePPWithBonus(u16 move, u8 ppBonuses, u8 moveIndex); void RemoveMonPPBonus(struct Pokemon *mon, u8 moveIndex); void RemoveBattleMonPPBonus(struct BattlePokemon *mon, u8 moveIndex); bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex); -bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e); +bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, bool8 usedByAI); bool8 PokemonItemUseNoEffect(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex); u8 GetItemEffectParamOffset(u16 itemId, u8 effectByte, u8 effectBit); const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId); diff --git a/include/text.h b/include/text.h index f4236e995..e5ed4477d 100644 --- a/include/text.h +++ b/include/text.h @@ -154,7 +154,7 @@ #define NUM_TEXT_PRINTERS 32 #define TEXT_SPEED_INSTANT 0 -#define TEXT_SPEED_FF 0xFF +#define TEXT_SKIP_DRAW 0xFF enum { diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index a500d591b..e14d6e965 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -1384,13 +1384,13 @@ extern u16 gBattleWeather; static void Cmd_get_weather(void) { - if (gBattleWeather & WEATHER_RAIN_ANY) + if (gBattleWeather & B_WEATHER_RAIN) AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_RAIN; - if (gBattleWeather & WEATHER_SANDSTORM_ANY) + if (gBattleWeather & B_WEATHER_SANDSTORM) AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SANDSTORM; - if (gBattleWeather & WEATHER_SUN_ANY) + if (gBattleWeather & B_WEATHER_SUN) AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_SUNNY; - if (gBattleWeather & WEATHER_HAIL) + if (gBattleWeather & B_WEATHER_HAIL_TEMPORARY) AI_THINKING_STRUCT->funcResult = WEATHER_TYPE_HAIL; sAIScriptPtr += 1; diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index a9a118c9f..b7c1fa2cc 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -5262,13 +5262,13 @@ static void AnimRecycleStep(struct Sprite *sprite) void AnimTask_GetWeather(u8 taskId) { gBattleAnimArgs[7] = ANIM_WEATHER_NONE; - if (gWeatherMoveAnim & WEATHER_SUN_ANY) + if (gWeatherMoveAnim & B_WEATHER_SUN) gBattleAnimArgs[7] = ANIM_WEATHER_SUN; - else if (gWeatherMoveAnim & WEATHER_RAIN_ANY) + else if (gWeatherMoveAnim & B_WEATHER_RAIN) gBattleAnimArgs[7] = ANIM_WEATHER_RAIN; - else if (gWeatherMoveAnim & WEATHER_SANDSTORM_ANY) + else if (gWeatherMoveAnim & B_WEATHER_SANDSTORM) gBattleAnimArgs[7] = ANIM_WEATHER_SANDSTORM; - else if (gWeatherMoveAnim & WEATHER_HAIL_ANY) + else if (gWeatherMoveAnim & B_WEATHER_HAIL) gBattleAnimArgs[7] = ANIM_WEATHER_HAIL; DestroyAnimVisualTask(taskId); diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 4bacb902e..50a1aa3e9 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -2272,7 +2272,7 @@ static const struct PokedudeTextScriptHeader sPokedudeTextScripts_Catching[] = .callback = PokedudeAction_PrintVoiceoverMessage, }, { - .btlcmd = CONTROLLER_55, + .btlcmd = CONTROLLER_ENDLINKBATTLE, .side = B_SIDE_PLAYER, .callback = PokedudeAction_PrintVoiceoverMessage, }, diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 288e202b3..1a7670c3c 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -621,10 +621,10 @@ void BtlController_EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubs PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } -void BtlController_EmitReturnMonToBall(u8 bufferId, u8 arg1) +void BtlController_EmitReturnMonToBall(u8 bufferId, bool8 skipAnim) { sBattleBuffersTransferData[0] = CONTROLLER_RETURNMONTOBALL; - sBattleBuffersTransferData[1] = arg1; + sBattleBuffersTransferData[1] = skipAnim; PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 2); } @@ -934,16 +934,19 @@ static void BtlController_EmitDMA3Transfer(u8 bufferId, void *dst, u16 size, voi PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, size + 7); } -// not used -static void BtlController_EmitPlayBGM(u8 bufferId, u16 songId, void *unusedDumbDataParameter) +// Unused +static void BtlController_EmitPlayBGM(u8 bufferId, u16 songId, void *data) { s32 i; - sBattleBuffersTransferData[0] = CONTROLLER_31; + sBattleBuffersTransferData[0] = CONTROLLER_PLAYBGM; sBattleBuffersTransferData[1] = songId; sBattleBuffersTransferData[2] = (songId & 0xFF00) >> 8; + + // Nonsense loop using songId as a size + // Would go out of bounds for any song id after SE_RG_BAG_POCKET (253) for (i = 0; i < songId; ++i) - sBattleBuffersTransferData[3 + i] = *(u8 *)(unusedDumbDataParameter++); + sBattleBuffersTransferData[3 + i] = *(u8 *)(data++); PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, songId + 3); } @@ -1045,7 +1048,7 @@ void BtlController_EmitHitAnimation(u8 bufferId) PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } -void BtlController_EmitCmd42(u8 bufferId) +void BtlController_EmitCantSwitch(u8 bufferId) { sBattleBuffersTransferData[0] = CONTROLLER_42; sBattleBuffersTransferData[1] = CONTROLLER_42; @@ -1146,10 +1149,11 @@ void BtlController_EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } -void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 arg1) +// mode is a LINK_STANDBY_* constant +void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 mode) { sBattleBuffersTransferData[0] = CONTROLLER_LINKSTANDBYMSG; - sBattleBuffersTransferData[1] = arg1; + sBattleBuffersTransferData[1] = mode; PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 2); } @@ -1160,9 +1164,9 @@ void BtlController_EmitResetActionMoveSelection(u8 bufferId, u8 caseId) PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 2); } -void BtlController_EmitCmd55(u8 bufferId, u8 battleOutcome) +void BtlController_EmitEndLinkBattle(u8 bufferId, u8 battleOutcome) { - sBattleBuffersTransferData[0] = CONTROLLER_55; + sBattleBuffersTransferData[0] = CONTROLLER_ENDLINKBATTLE; sBattleBuffersTransferData[1] = battleOutcome; PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 2); } diff --git a/src/battle_main.c b/src/battle_main.c index 957fac0f4..2c2648e62 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2468,7 +2468,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void) u8 *ptr; s32 i; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { for (gActiveBattler = 0; gActiveBattler < gBattlersCount; ++gActiveBattler) { @@ -2554,7 +2554,7 @@ static void BattleIntroDrawPartySummaryScreens(void) s32 i; struct HpAndStatus hpStatus[PARTY_SIZE]; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { @@ -2621,7 +2621,7 @@ static void BattleIntroDrawPartySummaryScreens(void) static void BattleIntroPrintTrainerWantsToBattle(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); PrepareStringBattle(STRINGID_INTROMSG, gActiveBattler); @@ -2631,7 +2631,7 @@ static void BattleIntroPrintTrainerWantsToBattle(void) static void BattleIntroPrintWildMonAttacked(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gBattleMainFunc = BattleIntroPrintPlayerSendsOut; PrepareStringBattle(STRINGID_INTROMSG, 0); @@ -2645,7 +2645,7 @@ static void BattleIntroPrintWildMonAttacked(void) static void BattleIntroPrintOpponentSendsOut(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { PrepareStringBattle(STRINGID_INTROSENDOUT, GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)); gBattleMainFunc = BattleIntroOpponentSendsOutMonAnimation; @@ -2654,7 +2654,7 @@ static void BattleIntroPrintOpponentSendsOut(void) static void BattleIntroOpponentSendsOutMonAnimation(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { for (gActiveBattler = 0; gActiveBattler < gBattlersCount; ++gActiveBattler) { @@ -2675,7 +2675,7 @@ static void BattleIntroOpponentSendsOutMonAnimation(void) static void BattleIntroRecordMonsToDex(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { for (gActiveBattler = 0; gActiveBattler < gBattlersCount; ++gActiveBattler) if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT @@ -2693,13 +2693,13 @@ static void BattleIntroRecordMonsToDex(void) // not used static void Unused_AutoProgressToIntro(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) gBattleMainFunc = BattleIntroPrintPlayerSendsOut; } void BattleIntroPrintPlayerSendsOut(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) PrepareStringBattle(STRINGID_INTROSENDOUT, GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)); @@ -2711,7 +2711,7 @@ static void BattleIntroPlayerSendsOutMonAnimation(void) { u32 position; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { for (gActiveBattler = 0; gActiveBattler < gBattlersCount; ++gActiveBattler) { @@ -2736,7 +2736,7 @@ static void BattleIntroPlayerSendsOutMonAnimation(void) // not used static void Unused_AutoProgressToSwitchInAnims(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { for (gActiveBattler = 0; gActiveBattler < gBattlersCount; ++gActiveBattler) { @@ -2758,7 +2758,7 @@ static void TryDoEventsBeforeFirstTurn(void) s32 i, j; u8 effect = 0; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if (gBattleStruct->switchInAbilitiesCounter == 0) @@ -2819,7 +2819,7 @@ static void TryDoEventsBeforeFirstTurn(void) *(&gBattleStruct->turnEffectsBattlerId) = 0; *(&gBattleStruct->wishPerishSongState) = 0; *(&gBattleStruct->wishPerishSongBattlerId) = 0; - gBattleScripting.atk49_state = 0; + gBattleScripting.moveendState = 0; gBattleStruct->faintedActionsState = 0; gBattleStruct->turnCountersTracker = 0; gMoveResultFlags = 0; @@ -2831,7 +2831,7 @@ static void HandleEndTurn_ContinueBattle(void) { s32 i; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gBattleMainFunc = BattleTurnPassed; for (i = 0; i < BATTLE_COMMUNICATION_ENTRIES_COUNT; ++i) @@ -2875,7 +2875,7 @@ void BattleTurnPassed(void) gHitMarker &= ~(HITMARKER_PASSIVE_DAMAGE); gBattleScripting.animTurn = 0; gBattleScripting.animTargetsHit = 0; - gBattleScripting.atk49_state = 0; + gBattleScripting.moveendState = 0; gBattleMoveDamage = 0; gMoveResultFlags = 0; for (i = 0; i < 5; ++i) @@ -3254,9 +3254,9 @@ static void HandleTurnActionSelectionState(void) if (((gBattleTypeFlags & (BATTLE_TYPE_MULTI | BATTLE_TYPE_DOUBLE)) != BATTLE_TYPE_DOUBLE) || (position & BIT_FLANK) != B_FLANK_LEFT || (*(&gBattleStruct->absentBattlerFlags) & gBitTable[GetBattlerAtPosition(position ^ BIT_FLANK)])) - BtlController_EmitLinkStandbyMsg(0, 0); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_STOP_BOUNCE); else - BtlController_EmitLinkStandbyMsg(0, 1); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_STOP_BOUNCE_ONLY); MarkBattlerForControllerExec(gActiveBattler); ++gBattleCommunication[gActiveBattler]; } @@ -3309,13 +3309,13 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) if (WEATHER_HAS_EFFECT) { - if ((gBattleMons[battler1].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY) - || (gBattleMons[battler1].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY)) + if ((gBattleMons[battler1].ability == ABILITY_SWIFT_SWIM && gBattleWeather & B_WEATHER_RAIN) + || (gBattleMons[battler1].ability == ABILITY_CHLOROPHYLL && gBattleWeather & B_WEATHER_SUN)) speedMultiplierBattler1 = 2; else speedMultiplierBattler1 = 1; - if ((gBattleMons[battler2].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY) - || (gBattleMons[battler2].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY)) + if ((gBattleMons[battler2].ability == ABILITY_SWIFT_SWIM && gBattleWeather & B_WEATHER_RAIN) + || (gBattleMons[battler2].ability == ABILITY_CHLOROPHYLL && gBattleWeather & B_WEATHER_SUN)) speedMultiplierBattler2 = 2; else speedMultiplierBattler2 = 1; @@ -3751,7 +3751,7 @@ static void HandleEndTurn_FinishBattle(void) gBattleMainFunc = FreeResetData_ReturnToOvOrDoEvolutions; gCB2_AfterEvolution = BattleMainCB2; } - else if (!gBattleControllerExecFlags) + else if (gBattleControllerExecFlags == 0) { gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]](); } @@ -3847,14 +3847,14 @@ void RunBattleScriptCommands_PopCallbacksStack(void) } else { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]](); } } void RunBattleScriptCommands(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) gBattleScriptingCommandsTable[gBattlescriptCurrInstr[0]](); } @@ -4088,7 +4088,7 @@ static void HandleAction_UseItem(void) while (!(*(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) & 1)) { *(gBattleStruct->AI_itemFlags + gBattlerAttacker / 2) >>= 1; - ++gBattleCommunication[MULTISTRING_CHOOSER]; + gBattleCommunication[MULTISTRING_CHOOSER]++; } } break; @@ -4367,7 +4367,7 @@ static void HandleAction_ActionFinished(void) gLastHitByType[gBattlerAttacker] = 0; gBattleStruct->dynamicMoveType = 0; gDynamicBasePower = 0; - gBattleScripting.atk49_state = 0; + gBattleScripting.moveendState = 0; gBattleCommunication[MOVE_EFFECT_BYTE] = 0; gBattleCommunication[ACTIONS_CONFIRMED_COUNT] = 0; gBattleScripting.multihitMoveEffect = 0; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 4b0a8e713..1cb0c16df 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -38,9 +38,14 @@ #include "constants/pokemon.h" #include "constants/maps.h" +extern const u8 *const gBattleScriptsForMoveEffects[]; + #define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED)) -extern const u8 *const gBattleScriptsForMoveEffects[]; +#define LEVEL_UP_BANNER_START 416 +#define LEVEL_UP_BANNER_END 512 + +#define TAG_LVLUP_BANNER_MON_ICON 55130 static bool8 IsTwoTurnsMove(u16 move); static void TrySetDestinyBondToHappen(void); @@ -48,514 +53,514 @@ static u8 AttacksThisTurn(u8 battlerId, u16 move); // Note: returns 1 if it's a static void CheckWonderGuardAndLevitate(void); static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8, const u8 *BS_ptr); static void sub_8026480(void); -static bool8 sub_80264D0(void); +static bool8 SlideInLevelUpBanner(void); static void DrawLevelUpWindow1(void); static void DrawLevelUpWindow2(void); -static bool8 sub_8026648(void); +static bool8 SlideOutLevelUpBanner(void); static void PutMonIconOnLvlUpBox(void); -static void PutLevelAndGenderOnLvlUpBox(void); +static void DrawLevelUpBannerText(void); -static void SpriteCB_MonIconOnLvlUpBox(struct Sprite *sprite); +static void SpriteCB_MonIconOnLvlUpBanner(struct Sprite *sprite); -static void atk00_attackcanceler(void); -static void atk01_accuracycheck(void); -static void atk02_attackstring(void); -static void atk03_ppreduce(void); -static void atk04_critcalc(void); -static void atk05_damagecalc(void); -static void atk06_typecalc(void); -static void atk07_adjustnormaldamage(void); -static void atk08_adjustnormaldamage2(void); -static void atk09_attackanimation(void); -static void atk0A_waitanimation(void); -static void atk0B_healthbarupdate(void); -static void atk0C_datahpupdate(void); -static void atk0D_critmessage(void); -static void atk0E_effectivenesssound(void); -static void atk0F_resultmessage(void); -static void atk10_printstring(void); -static void atk11_printselectionstring(void); -static void atk12_waitmessage(void); -static void atk13_printfromtable(void); -static void atk14_printselectionstringfromtable(void); -static void atk15_seteffectwithchance(void); -static void atk16_seteffectprimary(void); -static void atk17_seteffectsecondary(void); -static void atk18_clearstatusfromeffect(void); -static void atk19_tryfaintmon(void); -static void atk1A_dofaintanimation(void); -static void atk1B_cleareffectsonfaint(void); -static void atk1C_jumpifstatus(void); -static void atk1D_jumpifstatus2(void); -static void atk1E_jumpifability(void); -static void atk1F_jumpifsideaffecting(void); -static void atk20_jumpifstat(void); -static void atk21_jumpifstatus3condition(void); -static void atk22_jumpiftype(void); -static void atk23_getexp(void); -static void atk24(void); -static void atk25_movevaluescleanup(void); -static void atk26_setmultihit(void); -static void atk27_decrementmultihit(void); -static void atk28_goto(void); -static void atk29_jumpifbyte(void); -static void atk2A_jumpifhalfword(void); -static void atk2B_jumpifword(void); -static void atk2C_jumpifarrayequal(void); -static void atk2D_jumpifarraynotequal(void); -static void atk2E_setbyte(void); -static void atk2F_addbyte(void); -static void atk30_subbyte(void); -static void atk31_copyarray(void); -static void atk32_copyarraywithindex(void); -static void atk33_orbyte(void); -static void atk34_orhalfword(void); -static void atk35_orword(void); -static void atk36_bicbyte(void); -static void atk37_bichalfword(void); -static void atk38_bicword(void); -static void atk39_pause(void); -static void atk3A_waitstate(void); -static void atk3B_healthbar_update(void); -static void atk3C_return(void); -static void atk3D_end(void); -static void atk3E_end2(void); -static void atk3F_end3(void); -static void atk40_jumpifaffectedbyprotect(void); -static void atk41_call(void); -static void atk42_jumpiftype2(void); -static void atk43_jumpifabilitypresent(void); -static void atk44_endselectionscript(void); -static void atk45_playanimation(void); -static void atk46_playanimation2(void); -static void atk47_setgraphicalstatchangevalues(void); -static void atk48_playstatchangeanimation(void); -static void atk49_moveend(void); -static void atk4A_typecalc2(void); -static void atk4B_returnatktoball(void); -static void atk4C_getswitchedmondata(void); -static void atk4D_switchindataupdate(void); -static void atk4E_switchinanim(void); -static void atk4F_jumpifcantswitch(void); -static void atk50_openpartyscreen(void); -static void atk51_switchhandleorder(void); -static void atk52_switchineffects(void); -static void atk53_trainerslidein(void); -static void atk54_playse(void); -static void atk55_fanfare(void); -static void atk56_playfaintcry(void); -static void atk57(void); -static void atk58_returntoball(void); -static void atk59_handlelearnnewmove(void); -static void atk5A_yesnoboxlearnmove(void); -static void atk5B_yesnoboxstoplearningmove(void); -static void atk5C_hitanimation(void); -static void atk5D_getmoneyreward(void); -static void atk5E(void); -static void atk5F_swapattackerwithtarget(void); -static void atk60_incrementgamestat(void); -static void atk61_drawpartystatussummary(void); -static void atk62_hidepartystatussummary(void); -static void atk63_jumptocalledmove(void); -static void atk64_statusanimation(void); -static void atk65_status2animation(void); -static void atk66_chosenstatusanimation(void); -static void atk67_yesnobox(void); -static void atk68_cancelallactions(void); -static void atk69_adjustsetdamage(void); -static void atk6A_removeitem(void); -static void atk6B_atknameinbuff1(void); -static void atk6C_drawlvlupbox(void); -static void atk6D_resetsentmonsvalue(void); -static void atk6E_setatktoplayer0(void); -static void atk6F_makevisible(void); -static void atk70_recordlastability(void); -static void atk71_buffermovetolearn(void); -static void atk72_jumpifplayerran(void); -static void atk73_hpthresholds(void); -static void atk74_hpthresholds2(void); -static void atk75_useitemonopponent(void); -static void atk76_various(void); -static void atk77_setprotectlike(void); -static void atk78_faintifabilitynotdamp(void); -static void atk79_setatkhptozero(void); -static void atk7A_jumpifnexttargetvalid(void); -static void atk7B_tryhealhalfhealth(void); -static void atk7C_trymirrormove(void); -static void atk7D_setrain(void); -static void atk7E_setreflect(void); -static void atk7F_setseeded(void); -static void atk80_manipulatedamage(void); -static void atk81_trysetrest(void); -static void atk82_jumpifnotfirstturn(void); -static void atk83_nop(void); -static void atk84_jumpifcantmakeasleep(void); -static void atk85_stockpile(void); -static void atk86_stockpiletobasedamage(void); -static void atk87_stockpiletohpheal(void); -static void atk88_negativedamage(void); -static void atk89_statbuffchange(void); -static void atk8A_normalisebuffs(void); -static void atk8B_setbide(void); -static void atk8C_confuseifrepeatingattackends(void); -static void atk8D_setmultihitcounter(void); -static void atk8E_initmultihitstring(void); -static void atk8F_forcerandomswitch(void); -static void atk90_tryconversiontypechange(void); -static void atk91_givepaydaymoney(void); -static void atk92_setlightscreen(void); -static void atk93_tryKO(void); -static void atk94_damagetohalftargethp(void); -static void atk95_setsandstorm(void); -static void atk96_weatherdamage(void); -static void atk97_tryinfatuating(void); -static void atk98_updatestatusicon(void); -static void atk99_setmist(void); -static void atk9A_setfocusenergy(void); -static void atk9B_transformdataexecution(void); -static void atk9C_setsubstitute(void); -static void atk9D_mimicattackcopy(void); -static void atk9E_metronome(void); -static void atk9F_dmgtolevel(void); -static void atkA0_psywavedamageeffect(void); -static void atkA1_counterdamagecalculator(void); -static void atkA2_mirrorcoatdamagecalculator(void); -static void atkA3_disablelastusedattack(void); -static void atkA4_trysetencore(void); -static void atkA5_painsplitdmgcalc(void); -static void atkA6_settypetorandomresistance(void); -static void atkA7_setalwayshitflag(void); -static void atkA8_copymovepermanently(void); -static void atkA9_trychoosesleeptalkmove(void); -static void atkAA_setdestinybond(void); -static void atkAB_trysetdestinybondtohappen(void); -static void atkAC_remaininghptopower(void); -static void atkAD_tryspiteppreduce(void); -static void atkAE_healpartystatus(void); -static void atkAF_cursetarget(void); -static void atkB0_trysetspikes(void); -static void atkB1_setforesight(void); -static void atkB2_trysetperishsong(void); -static void atkB3_rolloutdamagecalculation(void); -static void atkB4_jumpifconfusedandstatmaxed(void); -static void atkB5_furycuttercalc(void); -static void atkB6_happinesstodamagecalculation(void); -static void atkB7_presentdamagecalculation(void); -static void atkB8_setsafeguard(void); -static void atkB9_magnitudedamagecalculation(void); -static void atkBA_jumpifnopursuitswitchdmg(void); -static void atkBB_setsunny(void); -static void atkBC_maxattackhalvehp(void); -static void atkBD_copyfoestats(void); -static void atkBE_rapidspinfree(void); -static void atkBF_setdefensecurlbit(void); -static void atkC0_recoverbasedonsunlight(void); -static void atkC1_hiddenpowercalc(void); -static void atkC2_selectfirstvalidtarget(void); -static void atkC3_trysetfutureattack(void); -static void atkC4_trydobeatup(void); -static void atkC5_setsemiinvulnerablebit(void); -static void atkC6_clearsemiinvulnerablebit(void); -static void atkC7_setminimize(void); -static void atkC8_sethail(void); -static void atkC9_jumpifattackandspecialattackcannotfall(void); -static void atkCA_setforcedtarget(void); -static void atkCB_setcharge(void); -static void atkCC_callterrainattack(void); -static void atkCD_cureifburnedparalysedorpoisoned(void); -static void atkCE_settorment(void); -static void atkCF_jumpifnodamage(void); -static void atkD0_settaunt(void); -static void atkD1_trysethelpinghand(void); -static void atkD2_tryswapitems(void); -static void atkD3_trycopyability(void); -static void atkD4_trywish(void); -static void atkD5_trysetroots(void); -static void atkD6_doubledamagedealtifdamaged(void); -static void atkD7_setyawn(void); -static void atkD8_setdamagetohealthdifference(void); -static void atkD9_scaledamagebyhealthratio(void); -static void atkDA_tryswapabilities(void); -static void atkDB_tryimprison(void); -static void atkDC_trysetgrudge(void); -static void atkDD_weightdamagecalculation(void); -static void atkDE_assistattackselect(void); -static void atkDF_trysetmagiccoat(void); -static void atkE0_trysetsnatch(void); -static void atkE1_trygetintimidatetarget(void); -static void atkE2_switchoutabilities(void); -static void atkE3_jumpifhasnohp(void); -static void atkE4_getsecretpowereffect(void); -static void atkE5_pickup(void); -static void atkE6_docastformchangeanimation(void); -static void atkE7_trycastformdatachange(void); -static void atkE8_settypebasedhalvers(void); -static void atkE9_setweatherballtype(void); -static void atkEA_tryrecycleitem(void); -static void atkEB_settypetoterrain(void); -static void atkEC_pursuitrelated(void); -static void atkED_snatchsetbattlers(void); -static void atkEE_removelightscreenreflect(void); -static void atkEF_handleballthrow(void); -static void atkF0_givecaughtmon(void); -static void atkF1_trysetcaughtmondexflags(void); -static void atkF2_displaydexinfo(void); -static void atkF3_trygivecaughtmonnick(void); -static void atkF4_subattackerhpbydmg(void); -static void atkF5_removeattackerstatus1(void); -static void atkF6_finishaction(void); -static void atkF7_finishturn(void); +static void Cmd_attackcanceler(void); +static void Cmd_accuracycheck(void); +static void Cmd_attackstring(void); +static void Cmd_ppreduce(void); +static void Cmd_critcalc(void); +static void Cmd_damagecalc(void); +static void Cmd_typecalc(void); +static void Cmd_adjustnormaldamage(void); +static void Cmd_adjustnormaldamage2(void); +static void Cmd_attackanimation(void); +static void Cmd_waitanimation(void); +static void Cmd_healthbarupdate(void); +static void Cmd_datahpupdate(void); +static void Cmd_critmessage(void); +static void Cmd_effectivenesssound(void); +static void Cmd_resultmessage(void); +static void Cmd_printstring(void); +static void Cmd_printselectionstring(void); +static void Cmd_waitmessage(void); +static void Cmd_printfromtable(void); +static void Cmd_printselectionstringfromtable(void); +static void Cmd_seteffectwithchance(void); +static void Cmd_seteffectprimary(void); +static void Cmd_seteffectsecondary(void); +static void Cmd_clearstatusfromeffect(void); +static void Cmd_tryfaintmon(void); +static void Cmd_dofaintanimation(void); +static void Cmd_cleareffectsonfaint(void); +static void Cmd_jumpifstatus(void); +static void Cmd_jumpifstatus2(void); +static void Cmd_jumpifability(void); +static void Cmd_jumpifsideaffecting(void); +static void Cmd_jumpifstat(void); +static void Cmd_jumpifstatus3condition(void); +static void Cmd_jumpiftype(void); +static void Cmd_getexp(void); +static void Cmd_checkteamslost(void); +static void Cmd_movevaluescleanup(void); +static void Cmd_setmultihit(void); +static void Cmd_decrementmultihit(void); +static void Cmd_goto(void); +static void Cmd_jumpifbyte(void); +static void Cmd_jumpifhalfword(void); +static void Cmd_jumpifword(void); +static void Cmd_jumpifarrayequal(void); +static void Cmd_jumpifarraynotequal(void); +static void Cmd_setbyte(void); +static void Cmd_addbyte(void); +static void Cmd_subbyte(void); +static void Cmd_copyarray(void); +static void Cmd_copyarraywithindex(void); +static void Cmd_orbyte(void); +static void Cmd_orhalfword(void); +static void Cmd_orword(void); +static void Cmd_bicbyte(void); +static void Cmd_bichalfword(void); +static void Cmd_bicword(void); +static void Cmd_pause(void); +static void Cmd_waitstate(void); +static void Cmd_healthbar_update(void); +static void Cmd_return(void); +static void Cmd_end(void); +static void Cmd_end2(void); +static void Cmd_end3(void); +static void Cmd_jumpifaffectedbyprotect(void); +static void Cmd_call(void); +static void Cmd_jumpiftype2(void); +static void Cmd_jumpifabilitypresent(void); +static void Cmd_endselectionscript(void); +static void Cmd_playanimation(void); +static void Cmd_playanimation_var(void); +static void Cmd_setgraphicalstatchangevalues(void); +static void Cmd_playstatchangeanimation(void); +static void Cmd_moveend(void); +static void Cmd_typecalc2(void); +static void Cmd_returnatktoball(void); +static void Cmd_getswitchedmondata(void); +static void Cmd_switchindataupdate(void); +static void Cmd_switchinanim(void); +static void Cmd_jumpifcantswitch(void); +static void Cmd_openpartyscreen(void); +static void Cmd_switchhandleorder(void); +static void Cmd_switchineffects(void); +static void Cmd_trainerslidein(void); +static void Cmd_playse(void); +static void Cmd_fanfare(void); +static void Cmd_playfaintcry(void); +static void Cmd_endlinkbattle(void); +static void Cmd_returntoball(void); +static void Cmd_handlelearnnewmove(void); +static void Cmd_yesnoboxlearnmove(void); +static void Cmd_yesnoboxstoplearningmove(void); +static void Cmd_hitanimation(void); +static void Cmd_getmoneyreward(void); +static void Cmd_updatebattlermoves(void); +static void Cmd_swapattackerwithtarget(void); +static void Cmd_incrementgamestat(void); +static void Cmd_drawpartystatussummary(void); +static void Cmd_hidepartystatussummary(void); +static void Cmd_jumptocalledmove(void); +static void Cmd_statusanimation(void); +static void Cmd_status2animation(void); +static void Cmd_chosenstatusanimation(void); +static void Cmd_yesnobox(void); +static void Cmd_cancelallactions(void); +static void Cmd_adjustsetdamage(void); +static void Cmd_removeitem(void); +static void Cmd_atknameinbuff1(void); +static void Cmd_drawlvlupbox(void); +static void Cmd_resetsentmonsvalue(void); +static void Cmd_setatktoplayer0(void); +static void Cmd_makevisible(void); +static void Cmd_recordlastability(void); +static void Cmd_buffermovetolearn(void); +static void Cmd_jumpifplayerran(void); +static void Cmd_hpthresholds(void); +static void Cmd_hpthresholds2(void); +static void Cmd_useitemonopponent(void); +static void Cmd_various(void); +static void Cmd_setprotectlike(void); +static void Cmd_tryexplosion(void); +static void Cmd_setatkhptozero(void); +static void Cmd_jumpifnexttargetvalid(void); +static void Cmd_tryhealhalfhealth(void); +static void Cmd_trymirrormove(void); +static void Cmd_setrain(void); +static void Cmd_setreflect(void); +static void Cmd_setseeded(void); +static void Cmd_manipulatedamage(void); +static void Cmd_trysetrest(void); +static void Cmd_jumpifnotfirstturn(void); +static void Cmd_nop(void); +static void Cmd_jumpifcantmakeasleep(void); +static void Cmd_stockpile(void); +static void Cmd_stockpiletobasedamage(void); +static void Cmd_stockpiletohpheal(void); +static void Cmd_negativedamage(void); +static void Cmd_statbuffchange(void); +static void Cmd_normalisebuffs(void); +static void Cmd_setbide(void); +static void Cmd_confuseifrepeatingattackends(void); +static void Cmd_setmultihitcounter(void); +static void Cmd_initmultihitstring(void); +static void Cmd_forcerandomswitch(void); +static void Cmd_tryconversiontypechange(void); +static void Cmd_givepaydaymoney(void); +static void Cmd_setlightscreen(void); +static void Cmd_tryKO(void); +static void Cmd_damagetohalftargethp(void); +static void Cmd_setsandstorm(void); +static void Cmd_weatherdamage(void); +static void Cmd_tryinfatuating(void); +static void Cmd_updatestatusicon(void); +static void Cmd_setmist(void); +static void Cmd_setfocusenergy(void); +static void Cmd_transformdataexecution(void); +static void Cmd_setsubstitute(void); +static void Cmd_mimicattackcopy(void); +static void Cmd_metronome(void); +static void Cmd_dmgtolevel(void); +static void Cmd_psywavedamageeffect(void); +static void Cmd_counterdamagecalculator(void); +static void Cmd_mirrorcoatdamagecalculator(void); +static void Cmd_disablelastusedattack(void); +static void Cmd_trysetencore(void); +static void Cmd_painsplitdmgcalc(void); +static void Cmd_settypetorandomresistance(void); +static void Cmd_setalwayshitflag(void); +static void Cmd_copymovepermanently(void); +static void Cmd_trychoosesleeptalkmove(void); +static void Cmd_setdestinybond(void); +static void Cmd_trysetdestinybondtohappen(void); +static void Cmd_remaininghptopower(void); +static void Cmd_tryspiteppreduce(void); +static void Cmd_healpartystatus(void); +static void Cmd_cursetarget(void); +static void Cmd_trysetspikes(void); +static void Cmd_setforesight(void); +static void Cmd_trysetperishsong(void); +static void Cmd_rolloutdamagecalculation(void); +static void Cmd_jumpifconfusedandstatmaxed(void); +static void Cmd_furycuttercalc(void); +static void Cmd_friendshiptodamagecalculation(void); +static void Cmd_presentdamagecalculation(void); +static void Cmd_setsafeguard(void); +static void Cmd_magnitudedamagecalculation(void); +static void Cmd_jumpifnopursuitswitchdmg(void); +static void Cmd_setsunny(void); +static void Cmd_maxattackhalvehp(void); +static void Cmd_copyfoestats(void); +static void Cmd_rapidspinfree(void); +static void Cmd_setdefensecurlbit(void); +static void Cmd_recoverbasedonsunlight(void); +static void Cmd_hiddenpowercalc(void); +static void Cmd_selectfirstvalidtarget(void); +static void Cmd_trysetfutureattack(void); +static void Cmd_trydobeatup(void); +static void Cmd_setsemiinvulnerablebit(void); +static void Cmd_clearsemiinvulnerablebit(void); +static void Cmd_setminimize(void); +static void Cmd_sethail(void); +static void Cmd_trymemento(void); +static void Cmd_setforcedtarget(void); +static void Cmd_setcharge(void); +static void Cmd_callterrainattack(void); +static void Cmd_cureifburnedparalysedorpoisoned(void); +static void Cmd_settorment(void); +static void Cmd_jumpifnodamage(void); +static void Cmd_settaunt(void); +static void Cmd_trysethelpinghand(void); +static void Cmd_tryswapitems(void); +static void Cmd_trycopyability(void); +static void Cmd_trywish(void); +static void Cmd_trysetroots(void); +static void Cmd_doubledamagedealtifdamaged(void); +static void Cmd_setyawn(void); +static void Cmd_setdamagetohealthdifference(void); +static void Cmd_scaledamagebyhealthratio(void); +static void Cmd_tryswapabilities(void); +static void Cmd_tryimprison(void); +static void Cmd_trysetgrudge(void); +static void Cmd_weightdamagecalculation(void); +static void Cmd_assistattackselect(void); +static void Cmd_trysetmagiccoat(void); +static void Cmd_trysetsnatch(void); +static void Cmd_trygetintimidatetarget(void); +static void Cmd_switchoutabilities(void); +static void Cmd_jumpifhasnohp(void); +static void Cmd_getsecretpowereffect(void); +static void Cmd_pickup(void); +static void Cmd_docastformchangeanimation(void); +static void Cmd_trycastformdatachange(void); +static void Cmd_settypebasedhalvers(void); +static void Cmd_setweatherballtype(void); +static void Cmd_tryrecycleitem(void); +static void Cmd_settypetoterrain(void); +static void Cmd_pursuitdoubles(void); +static void Cmd_snatchsetbattlers(void); +static void Cmd_removelightscreenreflect(void); +static void Cmd_handleballthrow(void); +static void Cmd_givecaughtmon(void); +static void Cmd_trysetcaughtmondexflags(void); +static void Cmd_displaydexinfo(void); +static void Cmd_trygivecaughtmonnick(void); +static void Cmd_subattackerhpbydmg(void); +static void Cmd_removeattackerstatus1(void); +static void Cmd_finishaction(void); +static void Cmd_finishturn(void); void (* const gBattleScriptingCommandsTable[])(void) = { - atk00_attackcanceler, - atk01_accuracycheck, - atk02_attackstring, - atk03_ppreduce, - atk04_critcalc, - atk05_damagecalc, - atk06_typecalc, - atk07_adjustnormaldamage, - atk08_adjustnormaldamage2, - atk09_attackanimation, - atk0A_waitanimation, - atk0B_healthbarupdate, - atk0C_datahpupdate, - atk0D_critmessage, - atk0E_effectivenesssound, - atk0F_resultmessage, - atk10_printstring, - atk11_printselectionstring, - atk12_waitmessage, - atk13_printfromtable, - atk14_printselectionstringfromtable, - atk15_seteffectwithchance, - atk16_seteffectprimary, - atk17_seteffectsecondary, - atk18_clearstatusfromeffect, - atk19_tryfaintmon, - atk1A_dofaintanimation, - atk1B_cleareffectsonfaint, - atk1C_jumpifstatus, - atk1D_jumpifstatus2, - atk1E_jumpifability, - atk1F_jumpifsideaffecting, - atk20_jumpifstat, - atk21_jumpifstatus3condition, - atk22_jumpiftype, - atk23_getexp, - atk24, - atk25_movevaluescleanup, - atk26_setmultihit, - atk27_decrementmultihit, - atk28_goto, - atk29_jumpifbyte, - atk2A_jumpifhalfword, - atk2B_jumpifword, - atk2C_jumpifarrayequal, - atk2D_jumpifarraynotequal, - atk2E_setbyte, - atk2F_addbyte, - atk30_subbyte, - atk31_copyarray, - atk32_copyarraywithindex, - atk33_orbyte, - atk34_orhalfword, - atk35_orword, - atk36_bicbyte, - atk37_bichalfword, - atk38_bicword, - atk39_pause, - atk3A_waitstate, - atk3B_healthbar_update, - atk3C_return, - atk3D_end, - atk3E_end2, - atk3F_end3, - atk40_jumpifaffectedbyprotect, - atk41_call, - atk42_jumpiftype2, - atk43_jumpifabilitypresent, - atk44_endselectionscript, - atk45_playanimation, - atk46_playanimation2, - atk47_setgraphicalstatchangevalues, - atk48_playstatchangeanimation, - atk49_moveend, - atk4A_typecalc2, - atk4B_returnatktoball, - atk4C_getswitchedmondata, - atk4D_switchindataupdate, - atk4E_switchinanim, - atk4F_jumpifcantswitch, - atk50_openpartyscreen, - atk51_switchhandleorder, - atk52_switchineffects, - atk53_trainerslidein, - atk54_playse, - atk55_fanfare, - atk56_playfaintcry, - atk57, - atk58_returntoball, - atk59_handlelearnnewmove, - atk5A_yesnoboxlearnmove, - atk5B_yesnoboxstoplearningmove, - atk5C_hitanimation, - atk5D_getmoneyreward, - atk5E, - atk5F_swapattackerwithtarget, - atk60_incrementgamestat, - atk61_drawpartystatussummary, - atk62_hidepartystatussummary, - atk63_jumptocalledmove, - atk64_statusanimation, - atk65_status2animation, - atk66_chosenstatusanimation, - atk67_yesnobox, - atk68_cancelallactions, - atk69_adjustsetdamage, - atk6A_removeitem, - atk6B_atknameinbuff1, - atk6C_drawlvlupbox, - atk6D_resetsentmonsvalue, - atk6E_setatktoplayer0, - atk6F_makevisible, - atk70_recordlastability, - atk71_buffermovetolearn, - atk72_jumpifplayerran, - atk73_hpthresholds, - atk74_hpthresholds2, - atk75_useitemonopponent, - atk76_various, - atk77_setprotectlike, - atk78_faintifabilitynotdamp, - atk79_setatkhptozero, - atk7A_jumpifnexttargetvalid, - atk7B_tryhealhalfhealth, - atk7C_trymirrormove, - atk7D_setrain, - atk7E_setreflect, - atk7F_setseeded, - atk80_manipulatedamage, - atk81_trysetrest, - atk82_jumpifnotfirstturn, - atk83_nop, - atk84_jumpifcantmakeasleep, - atk85_stockpile, - atk86_stockpiletobasedamage, - atk87_stockpiletohpheal, - atk88_negativedamage, - atk89_statbuffchange, - atk8A_normalisebuffs, - atk8B_setbide, - atk8C_confuseifrepeatingattackends, - atk8D_setmultihitcounter, - atk8E_initmultihitstring, - atk8F_forcerandomswitch, - atk90_tryconversiontypechange, - atk91_givepaydaymoney, - atk92_setlightscreen, - atk93_tryKO, - atk94_damagetohalftargethp, - atk95_setsandstorm, - atk96_weatherdamage, - atk97_tryinfatuating, - atk98_updatestatusicon, - atk99_setmist, - atk9A_setfocusenergy, - atk9B_transformdataexecution, - atk9C_setsubstitute, - atk9D_mimicattackcopy, - atk9E_metronome, - atk9F_dmgtolevel, - atkA0_psywavedamageeffect, - atkA1_counterdamagecalculator, - atkA2_mirrorcoatdamagecalculator, - atkA3_disablelastusedattack, - atkA4_trysetencore, - atkA5_painsplitdmgcalc, - atkA6_settypetorandomresistance, - atkA7_setalwayshitflag, - atkA8_copymovepermanently, - atkA9_trychoosesleeptalkmove, - atkAA_setdestinybond, - atkAB_trysetdestinybondtohappen, - atkAC_remaininghptopower, - atkAD_tryspiteppreduce, - atkAE_healpartystatus, - atkAF_cursetarget, - atkB0_trysetspikes, - atkB1_setforesight, - atkB2_trysetperishsong, - atkB3_rolloutdamagecalculation, - atkB4_jumpifconfusedandstatmaxed, - atkB5_furycuttercalc, - atkB6_happinesstodamagecalculation, - atkB7_presentdamagecalculation, - atkB8_setsafeguard, - atkB9_magnitudedamagecalculation, - atkBA_jumpifnopursuitswitchdmg, - atkBB_setsunny, - atkBC_maxattackhalvehp, - atkBD_copyfoestats, - atkBE_rapidspinfree, - atkBF_setdefensecurlbit, - atkC0_recoverbasedonsunlight, - atkC1_hiddenpowercalc, - atkC2_selectfirstvalidtarget, - atkC3_trysetfutureattack, - atkC4_trydobeatup, - atkC5_setsemiinvulnerablebit, - atkC6_clearsemiinvulnerablebit, - atkC7_setminimize, - atkC8_sethail, - atkC9_jumpifattackandspecialattackcannotfall, - atkCA_setforcedtarget, - atkCB_setcharge, - atkCC_callterrainattack, - atkCD_cureifburnedparalysedorpoisoned, - atkCE_settorment, - atkCF_jumpifnodamage, - atkD0_settaunt, - atkD1_trysethelpinghand, - atkD2_tryswapitems, - atkD3_trycopyability, - atkD4_trywish, - atkD5_trysetroots, - atkD6_doubledamagedealtifdamaged, - atkD7_setyawn, - atkD8_setdamagetohealthdifference, - atkD9_scaledamagebyhealthratio, - atkDA_tryswapabilities, - atkDB_tryimprison, - atkDC_trysetgrudge, - atkDD_weightdamagecalculation, - atkDE_assistattackselect, - atkDF_trysetmagiccoat, - atkE0_trysetsnatch, - atkE1_trygetintimidatetarget, - atkE2_switchoutabilities, - atkE3_jumpifhasnohp, - atkE4_getsecretpowereffect, - atkE5_pickup, - atkE6_docastformchangeanimation, - atkE7_trycastformdatachange, - atkE8_settypebasedhalvers, - atkE9_setweatherballtype, - atkEA_tryrecycleitem, - atkEB_settypetoterrain, - atkEC_pursuitrelated, - atkED_snatchsetbattlers, - atkEE_removelightscreenreflect, - atkEF_handleballthrow, - atkF0_givecaughtmon, - atkF1_trysetcaughtmondexflags, - atkF2_displaydexinfo, - atkF3_trygivecaughtmonnick, - atkF4_subattackerhpbydmg, - atkF5_removeattackerstatus1, - atkF6_finishaction, - atkF7_finishturn, + Cmd_attackcanceler, //0x0 + Cmd_accuracycheck, //0x1 + Cmd_attackstring, //0x2 + Cmd_ppreduce, //0x3 + Cmd_critcalc, //0x4 + Cmd_damagecalc, //0x5 + Cmd_typecalc, //0x6 + Cmd_adjustnormaldamage, //0x7 + Cmd_adjustnormaldamage2, //0x8 + Cmd_attackanimation, //0x9 + Cmd_waitanimation, //0xA + Cmd_healthbarupdate, //0xB + Cmd_datahpupdate, //0xC + Cmd_critmessage, //0xD + Cmd_effectivenesssound, //0xE + Cmd_resultmessage, //0xF + Cmd_printstring, //0x10 + Cmd_printselectionstring, //0x11 + Cmd_waitmessage, //0x12 + Cmd_printfromtable, //0x13 + Cmd_printselectionstringfromtable, //0x14 + Cmd_seteffectwithchance, //0x15 + Cmd_seteffectprimary, //0x16 + Cmd_seteffectsecondary, //0x17 + Cmd_clearstatusfromeffect, //0x18 + Cmd_tryfaintmon, //0x19 + Cmd_dofaintanimation, //0x1A + Cmd_cleareffectsonfaint, //0x1B + Cmd_jumpifstatus, //0x1C + Cmd_jumpifstatus2, //0x1D + Cmd_jumpifability, //0x1E + Cmd_jumpifsideaffecting, //0x1F + Cmd_jumpifstat, //0x20 + Cmd_jumpifstatus3condition, //0x21 + Cmd_jumpiftype, //0x22 + Cmd_getexp, //0x23 + Cmd_checkteamslost, //0x24 + Cmd_movevaluescleanup, //0x25 + Cmd_setmultihit, //0x26 + Cmd_decrementmultihit, //0x27 + Cmd_goto, //0x28 + Cmd_jumpifbyte, //0x29 + Cmd_jumpifhalfword, //0x2A + Cmd_jumpifword, //0x2B + Cmd_jumpifarrayequal, //0x2C + Cmd_jumpifarraynotequal, //0x2D + Cmd_setbyte, //0x2E + Cmd_addbyte, //0x2F + Cmd_subbyte, //0x30 + Cmd_copyarray, //0x31 + Cmd_copyarraywithindex, //0x32 + Cmd_orbyte, //0x33 + Cmd_orhalfword, //0x34 + Cmd_orword, //0x35 + Cmd_bicbyte, //0x36 + Cmd_bichalfword, //0x37 + Cmd_bicword, //0x38 + Cmd_pause, //0x39 + Cmd_waitstate, //0x3A + Cmd_healthbar_update, //0x3B + Cmd_return, //0x3C + Cmd_end, //0x3D + Cmd_end2, //0x3E + Cmd_end3, //0x3F + Cmd_jumpifaffectedbyprotect, //0x40 + Cmd_call, //0x41 + Cmd_jumpiftype2, //0x42 + Cmd_jumpifabilitypresent, //0x43 + Cmd_endselectionscript, //0x44 + Cmd_playanimation, //0x45 + Cmd_playanimation_var, //0x46 + Cmd_setgraphicalstatchangevalues, //0x47 + Cmd_playstatchangeanimation, //0x48 + Cmd_moveend, //0x49 + Cmd_typecalc2, //0x4A + Cmd_returnatktoball, //0x4B + Cmd_getswitchedmondata, //0x4C + Cmd_switchindataupdate, //0x4D + Cmd_switchinanim, //0x4E + Cmd_jumpifcantswitch, //0x4F + Cmd_openpartyscreen, //0x50 + Cmd_switchhandleorder, //0x51 + Cmd_switchineffects, //0x52 + Cmd_trainerslidein, //0x53 + Cmd_playse, //0x54 + Cmd_fanfare, //0x55 + Cmd_playfaintcry, //0x56 + Cmd_endlinkbattle, //0x57 + Cmd_returntoball, //0x58 + Cmd_handlelearnnewmove, //0x59 + Cmd_yesnoboxlearnmove, //0x5A + Cmd_yesnoboxstoplearningmove, //0x5B + Cmd_hitanimation, //0x5C + Cmd_getmoneyreward, //0x5D + Cmd_updatebattlermoves, //0x5E + Cmd_swapattackerwithtarget, //0x5F + Cmd_incrementgamestat, //0x60 + Cmd_drawpartystatussummary, //0x61 + Cmd_hidepartystatussummary, //0x62 + Cmd_jumptocalledmove, //0x63 + Cmd_statusanimation, //0x64 + Cmd_status2animation, //0x65 + Cmd_chosenstatusanimation, //0x66 + Cmd_yesnobox, //0x67 + Cmd_cancelallactions, //0x68 + Cmd_adjustsetdamage, //0x69 + Cmd_removeitem, //0x6A + Cmd_atknameinbuff1, //0x6B + Cmd_drawlvlupbox, //0x6C + Cmd_resetsentmonsvalue, //0x6D + Cmd_setatktoplayer0, //0x6E + Cmd_makevisible, //0x6F + Cmd_recordlastability, //0x70 + Cmd_buffermovetolearn, //0x71 + Cmd_jumpifplayerran, //0x72 + Cmd_hpthresholds, //0x73 + Cmd_hpthresholds2, //0x74 + Cmd_useitemonopponent, //0x75 + Cmd_various, //0x76 + Cmd_setprotectlike, //0x77 + Cmd_tryexplosion, //0x78 + Cmd_setatkhptozero, //0x79 + Cmd_jumpifnexttargetvalid, //0x7A + Cmd_tryhealhalfhealth, //0x7B + Cmd_trymirrormove, //0x7C + Cmd_setrain, //0x7D + Cmd_setreflect, //0x7E + Cmd_setseeded, //0x7F + Cmd_manipulatedamage, //0x80 + Cmd_trysetrest, //0x81 + Cmd_jumpifnotfirstturn, //0x82 + Cmd_nop, //0x83 + Cmd_jumpifcantmakeasleep, //0x84 + Cmd_stockpile, //0x85 + Cmd_stockpiletobasedamage, //0x86 + Cmd_stockpiletohpheal, //0x87 + Cmd_negativedamage, //0x88 + Cmd_statbuffchange, //0x89 + Cmd_normalisebuffs, //0x8A + Cmd_setbide, //0x8B + Cmd_confuseifrepeatingattackends, //0x8C + Cmd_setmultihitcounter, //0x8D + Cmd_initmultihitstring, //0x8E + Cmd_forcerandomswitch, //0x8F + Cmd_tryconversiontypechange, //0x90 + Cmd_givepaydaymoney, //0x91 + Cmd_setlightscreen, //0x92 + Cmd_tryKO, //0x93 + Cmd_damagetohalftargethp, //0x94 + Cmd_setsandstorm, //0x95 + Cmd_weatherdamage, //0x96 + Cmd_tryinfatuating, //0x97 + Cmd_updatestatusicon, //0x98 + Cmd_setmist, //0x99 + Cmd_setfocusenergy, //0x9A + Cmd_transformdataexecution, //0x9B + Cmd_setsubstitute, //0x9C + Cmd_mimicattackcopy, //0x9D + Cmd_metronome, //0x9E + Cmd_dmgtolevel, //0x9F + Cmd_psywavedamageeffect, //0xA0 + Cmd_counterdamagecalculator, //0xA1 + Cmd_mirrorcoatdamagecalculator, //0xA2 + Cmd_disablelastusedattack, //0xA3 + Cmd_trysetencore, //0xA4 + Cmd_painsplitdmgcalc, //0xA5 + Cmd_settypetorandomresistance, //0xA6 + Cmd_setalwayshitflag, //0xA7 + Cmd_copymovepermanently, //0xA8 + Cmd_trychoosesleeptalkmove, //0xA9 + Cmd_setdestinybond, //0xAA + Cmd_trysetdestinybondtohappen, //0xAB + Cmd_remaininghptopower, //0xAC + Cmd_tryspiteppreduce, //0xAD + Cmd_healpartystatus, //0xAE + Cmd_cursetarget, //0xAF + Cmd_trysetspikes, //0xB0 + Cmd_setforesight, //0xB1 + Cmd_trysetperishsong, //0xB2 + Cmd_rolloutdamagecalculation, //0xB3 + Cmd_jumpifconfusedandstatmaxed, //0xB4 + Cmd_furycuttercalc, //0xB5 + Cmd_friendshiptodamagecalculation, //0xB6 + Cmd_presentdamagecalculation, //0xB7 + Cmd_setsafeguard, //0xB8 + Cmd_magnitudedamagecalculation, //0xB9 + Cmd_jumpifnopursuitswitchdmg, //0xBA + Cmd_setsunny, //0xBB + Cmd_maxattackhalvehp, //0xBC + Cmd_copyfoestats, //0xBD + Cmd_rapidspinfree, //0xBE + Cmd_setdefensecurlbit, //0xBF + Cmd_recoverbasedonsunlight, //0xC0 + Cmd_hiddenpowercalc, //0xC1 + Cmd_selectfirstvalidtarget, //0xC2 + Cmd_trysetfutureattack, //0xC3 + Cmd_trydobeatup, //0xC4 + Cmd_setsemiinvulnerablebit, //0xC5 + Cmd_clearsemiinvulnerablebit, //0xC6 + Cmd_setminimize, //0xC7 + Cmd_sethail, //0xC8 + Cmd_trymemento, //0xC9 + Cmd_setforcedtarget, //0xCA + Cmd_setcharge, //0xCB + Cmd_callterrainattack, //0xCC + Cmd_cureifburnedparalysedorpoisoned, //0xCD + Cmd_settorment, //0xCE + Cmd_jumpifnodamage, //0xCF + Cmd_settaunt, //0xD0 + Cmd_trysethelpinghand, //0xD1 + Cmd_tryswapitems, //0xD2 + Cmd_trycopyability, //0xD3 + Cmd_trywish, //0xD4 + Cmd_trysetroots, //0xD5 + Cmd_doubledamagedealtifdamaged, //0xD6 + Cmd_setyawn, //0xD7 + Cmd_setdamagetohealthdifference, //0xD8 + Cmd_scaledamagebyhealthratio, //0xD9 + Cmd_tryswapabilities, //0xDA + Cmd_tryimprison, //0xDB + Cmd_trysetgrudge, //0xDC + Cmd_weightdamagecalculation, //0xDD + Cmd_assistattackselect, //0xDE + Cmd_trysetmagiccoat, //0xDF + Cmd_trysetsnatch, //0xE0 + Cmd_trygetintimidatetarget, //0xE1 + Cmd_switchoutabilities, //0xE2 + Cmd_jumpifhasnohp, //0xE3 + Cmd_getsecretpowereffect, //0xE4 + Cmd_pickup, //0xE5 + Cmd_docastformchangeanimation, //0xE6 + Cmd_trycastformdatachange, //0xE7 + Cmd_settypebasedhalvers, //0xE8 + Cmd_setweatherballtype, //0xE9 + Cmd_tryrecycleitem, //0xEA + Cmd_settypetoterrain, //0xEB + Cmd_pursuitdoubles, //0xEC + Cmd_snatchsetbattlers, //0xED + Cmd_removelightscreenreflect, //0xEE + Cmd_handleballthrow, //0xEF + Cmd_givecaughtmon, //0xF0 + Cmd_trysetcaughtmondexflags, //0xF1 + Cmd_displaydexinfo, //0xF2 + Cmd_trygivecaughtmonnick, //0xF3 + Cmd_subattackerhpbydmg, //0xF4 + Cmd_removeattackerstatus1, //0xF5 + Cmd_finishaction, //0xF6 + Cmd_finishturn, //0xF7 }; struct StatFractions @@ -566,132 +571,86 @@ struct StatFractions static const struct StatFractions sAccuracyStageRatios[] = { - { 33, 100 }, // -6 - { 36, 100 }, // -5 - { 43, 100 }, // -4 - { 50, 100 }, // -3 - { 60, 100 }, // -2 - { 75, 100 }, // -1 - { 1, 1 }, // 0 - { 133, 100 }, // +1 - { 166, 100 }, // +2 - { 2, 1 }, // +3 - { 233, 100 }, // +4 - { 133, 50 }, // +5 - { 3, 1 }, // +6 + { 33, 100}, // -6 + { 36, 100}, // -5 + { 43, 100}, // -4 + { 50, 100}, // -3 + { 60, 100}, // -2 + { 75, 100}, // -1 + { 1, 1}, // 0 + {133, 100}, // +1 + {166, 100}, // +2 + { 2, 1}, // +3 + {233, 100}, // +4 + {133, 50}, // +5 + { 3, 1}, // +6 }; // The chance is 1/N for each stage. -static const u16 sCriticalHitChance[] = { 16, 8, 4, 3, 2 }; +static const u16 sCriticalHitChance[] = {16, 8, 4, 3, 2}; -static const u32 sStatusFlagsForMoveEffects[] = +static const u32 sStatusFlagsForMoveEffects[NUM_MOVE_EFFECTS] = { - 0x00000000, - STATUS1_SLEEP, - STATUS1_POISON, - STATUS1_BURN, - STATUS1_FREEZE, - STATUS1_PARALYSIS, - STATUS1_TOXIC_POISON, - STATUS2_CONFUSION, - STATUS2_FLINCHED, - 0x00000000, - STATUS2_UPROAR, - 0x00000000, - STATUS2_MULTIPLETURNS, - STATUS2_WRAPPED, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - STATUS2_RECHARGE, - 0x00000000, - 0x00000000, - STATUS2_ESCAPE_PREVENTION, - STATUS2_NIGHTMARE, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - STATUS2_LOCK_CONFUSE, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000, - 0x00000000 + [MOVE_EFFECT_SLEEP] = STATUS1_SLEEP, + [MOVE_EFFECT_POISON] = STATUS1_POISON, + [MOVE_EFFECT_BURN] = STATUS1_BURN, + [MOVE_EFFECT_FREEZE] = STATUS1_FREEZE, + [MOVE_EFFECT_PARALYSIS] = STATUS1_PARALYSIS, + [MOVE_EFFECT_TOXIC] = STATUS1_TOXIC_POISON, + [MOVE_EFFECT_CONFUSION] = STATUS2_CONFUSION, + [MOVE_EFFECT_FLINCH] = STATUS2_FLINCHED, + [MOVE_EFFECT_UPROAR] = STATUS2_UPROAR, + [MOVE_EFFECT_CHARGING] = STATUS2_MULTIPLETURNS, + [MOVE_EFFECT_WRAP] = STATUS2_WRAPPED, + [MOVE_EFFECT_RECHARGE] = STATUS2_RECHARGE, + [MOVE_EFFECT_PREVENT_ESCAPE] = STATUS2_ESCAPE_PREVENTION, + [MOVE_EFFECT_NIGHTMARE] = STATUS2_NIGHTMARE, + [MOVE_EFFECT_THRASH] = STATUS2_LOCK_CONFUSE, }; -static const u8 *const sMoveEffectBS_Ptrs[] = +static const u8* const sMoveEffectBS_Ptrs[] = { - [0] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_SLEEP] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_POISON] = BattleScript_MoveEffectPoison, - [MOVE_EFFECT_BURN] = BattleScript_MoveEffectBurn, - [MOVE_EFFECT_FREEZE] = BattleScript_MoveEffectFreeze, - [MOVE_EFFECT_PARALYSIS] = BattleScript_MoveEffectParalysis, - [MOVE_EFFECT_TOXIC] = BattleScript_MoveEffectToxic, - [MOVE_EFFECT_CONFUSION] = BattleScript_MoveEffectConfusion, - [MOVE_EFFECT_FLINCH] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_TRI_ATTACK] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_UPROAR] = BattleScript_MoveEffectUproar, - [MOVE_EFFECT_PAYDAY] = BattleScript_MoveEffectPayDay, - [MOVE_EFFECT_CHARGING] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_WRAP] = BattleScript_MoveEffectWrap, - [MOVE_EFFECT_RECOIL_25] = BattleScript_MoveEffectRecoil, - [MOVE_EFFECT_ATK_PLUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_DEF_PLUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_SPD_PLUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_SP_ATK_PLUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_SP_DEF_PLUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_ACC_PLUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_EVS_PLUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_ATK_MINUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_DEF_MINUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_SPD_MINUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_SP_ATK_MINUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_SP_DEF_MINUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_ACC_MINUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_EVS_MINUS_1] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_RECHARGE] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_RAGE] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_STEAL_ITEM] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_PREVENT_ESCAPE] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_NIGHTMARE] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_ALL_STATS_UP] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_RAPIDSPIN] = BattleScript_MoveEffectSleep, + [0] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SLEEP] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_POISON] = BattleScript_MoveEffectPoison, + [MOVE_EFFECT_BURN] = BattleScript_MoveEffectBurn, + [MOVE_EFFECT_FREEZE] = BattleScript_MoveEffectFreeze, + [MOVE_EFFECT_PARALYSIS] = BattleScript_MoveEffectParalysis, + [MOVE_EFFECT_TOXIC] = BattleScript_MoveEffectToxic, + [MOVE_EFFECT_CONFUSION] = BattleScript_MoveEffectConfusion, + [MOVE_EFFECT_FLINCH] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_TRI_ATTACK] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_UPROAR] = BattleScript_MoveEffectUproar, + [MOVE_EFFECT_PAYDAY] = BattleScript_MoveEffectPayDay, + [MOVE_EFFECT_CHARGING] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_WRAP] = BattleScript_MoveEffectWrap, + [MOVE_EFFECT_RECOIL_25] = BattleScript_MoveEffectRecoil, + [MOVE_EFFECT_ATK_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_DEF_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SPD_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_ATK_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_DEF_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ACC_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_EVS_PLUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ATK_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_DEF_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SPD_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_ATK_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_SP_DEF_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ACC_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_EVS_MINUS_1] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RECHARGE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RAGE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_STEAL_ITEM] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_PREVENT_ESCAPE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_NIGHTMARE] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_ALL_STATS_UP] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RAPIDSPIN] = BattleScript_MoveEffectSleep, [MOVE_EFFECT_REMOVE_PARALYSIS] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_ATK_DEF_DOWN] = BattleScript_MoveEffectSleep, - [MOVE_EFFECT_RECOIL_33] = BattleScript_MoveEffectRecoil, + [MOVE_EFFECT_ATK_DEF_DOWN] = BattleScript_MoveEffectSleep, + [MOVE_EFFECT_RECOIL_33] = BattleScript_MoveEffectRecoil, }; -// not used static const struct WindowTemplate sUnusedWinTemplate = { .bg = 0, @@ -700,21 +659,20 @@ static const struct WindowTemplate sUnusedWinTemplate = .width = 7, .height = 15, .paletteNum = 31, - .baseBlock = 0x3F, + .baseBlock = 0x3F }; -// not used -static const u16 sUnknownBattleboxPal[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal"); -static const u32 sUnknownBattleboxGfx[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz"); +static const u16 sLevelUpBanner_Pal[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal"); +static const u32 sLevelUpBanner_Gfx[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz"); -// not used +// unused static const u8 sRubyLevelUpStatBoxStats[] = { MON_DATA_MAX_HP, MON_DATA_SPATK, MON_DATA_ATK, MON_DATA_SPDEF, MON_DATA_DEF, MON_DATA_SPEED }; -static const struct OamData sOamData_MonIconOnLvlUpBox = +static const struct OamData sOamData_MonIconOnLvlUpBanner = { .y = 0, .affineMode = 0, @@ -731,26 +689,18 @@ static const struct OamData sOamData_MonIconOnLvlUpBox = .affineParam = 0, }; -#define MON_ICON_LVLUP_BOX_TAG 0xD75A - -static const struct SpriteTemplate sSpriteTemplate_MonIconOnLvlUpBox = +static const struct SpriteTemplate sSpriteTemplate_MonIconOnLvlUpBanner = { - .tileTag = MON_ICON_LVLUP_BOX_TAG, - .paletteTag = MON_ICON_LVLUP_BOX_TAG, - .oam = &sOamData_MonIconOnLvlUpBox, + .tileTag = TAG_LVLUP_BANNER_MON_ICON, + .paletteTag = TAG_LVLUP_BANNER_MON_ICON, + .oam = &sOamData_MonIconOnLvlUpBanner, .anims = gDummySpriteAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_MonIconOnLvlUpBox + .callback = SpriteCB_MonIconOnLvlUpBanner }; -static const u16 sProtectSuccessRates[] = -{ - USHRT_MAX, - USHRT_MAX / 2, - USHRT_MAX / 4, - USHRT_MAX / 8 -}; +static const u16 sProtectSuccessRates[] = {USHRT_MAX, USHRT_MAX / 2, USHRT_MAX / 4, USHRT_MAX / 8}; #define MIMIC_FORBIDDEN_END 0xFFFE #define METRONOME_FORBIDDEN_END 0xFFFF @@ -792,18 +742,19 @@ static const u8 sFlailHpScaleToPowerTable[] = static const u16 sNaturePowerMoves[] = { - MOVE_STUN_SPORE, - MOVE_RAZOR_LEAF, - MOVE_EARTHQUAKE, - MOVE_HYDRO_PUMP, - MOVE_SURF, - MOVE_BUBBLE_BEAM, - MOVE_ROCK_SLIDE, - MOVE_SHADOW_BALL, - MOVE_SWIFT, - MOVE_SWIFT + [BATTLE_TERRAIN_GRASS] = MOVE_STUN_SPORE, + [BATTLE_TERRAIN_LONG_GRASS] = MOVE_RAZOR_LEAF, + [BATTLE_TERRAIN_SAND] = MOVE_EARTHQUAKE, + [BATTLE_TERRAIN_UNDERWATER] = MOVE_HYDRO_PUMP, + [BATTLE_TERRAIN_WATER] = MOVE_SURF, + [BATTLE_TERRAIN_POND] = MOVE_BUBBLE_BEAM, + [BATTLE_TERRAIN_MOUNTAIN] = MOVE_ROCK_SLIDE, + [BATTLE_TERRAIN_CAVE] = MOVE_SHADOW_BALL, + [BATTLE_TERRAIN_BUILDING] = MOVE_SWIFT, + [BATTLE_TERRAIN_PLAIN] = MOVE_SWIFT }; +// format: min. weight (hectograms), base power static const u16 sWeightToDamageTable[] = { 100, 20, @@ -843,31 +794,35 @@ static const struct PickupItem sPickupItems[] = static const u8 sTerrainToType[] = { - TYPE_GRASS, // tall grass - TYPE_GRASS, // long grass - TYPE_GROUND, // sand - TYPE_WATER, // underwater - TYPE_WATER, // water - TYPE_WATER, // pond water - TYPE_ROCK, // rock - TYPE_ROCK, // cave - TYPE_NORMAL, // building - TYPE_NORMAL, // plain + [BATTLE_TERRAIN_GRASS] = TYPE_GRASS, + [BATTLE_TERRAIN_LONG_GRASS] = TYPE_GRASS, + [BATTLE_TERRAIN_SAND] = TYPE_GROUND, + [BATTLE_TERRAIN_UNDERWATER] = TYPE_WATER, + [BATTLE_TERRAIN_WATER] = TYPE_WATER, + [BATTLE_TERRAIN_POND] = TYPE_WATER, + [BATTLE_TERRAIN_MOUNTAIN] = TYPE_ROCK, + [BATTLE_TERRAIN_CAVE] = TYPE_ROCK, + [BATTLE_TERRAIN_BUILDING] = TYPE_NORMAL, + [BATTLE_TERRAIN_PLAIN] = TYPE_NORMAL, }; +// - ITEM_ULTRA_BALL skips Master Ball and ITEM_NONE static const u8 sBallCatchBonuses[] = { - 20, 15, 10, 15 // Ultra, Great, Poke, Safari + [ITEM_ULTRA_BALL - ITEM_ULTRA_BALL] = 20, + [ITEM_GREAT_BALL - ITEM_ULTRA_BALL] = 15, + [ITEM_POKE_BALL - ITEM_ULTRA_BALL] = 10, + [ITEM_SAFARI_BALL - ITEM_ULTRA_BALL] = 15 }; // not used static const u32 gUnknown_8250898 = 0xFF7EAE60; -static void atk00_attackcanceler(void) +static void Cmd_attackcanceler(void) { s32 i; - if (gBattleOutcome) + if (gBattleOutcome != 0) { gCurrentActionFuncId = B_ACTION_FINISHED; return; @@ -882,16 +837,17 @@ static void atk00_attackcanceler(void) return; if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattlerTarget, 0, 0, 0)) return; - if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & (HITMARKER_x800000 | HITMARKER_NO_ATTACKSTRING)) + if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & (HITMARKER_ALLOW_NO_PP | HITMARKER_NO_ATTACKSTRING)) && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) { gBattlescriptCurrInstr = BattleScript_NoPPForMove; gMoveResultFlags |= MOVE_RESULT_MISSED; return; } - gHitMarker &= ~(HITMARKER_x800000); - if (!(gHitMarker & HITMARKER_OBEYS) - && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) + + gHitMarker &= ~HITMARKER_ALLOW_NO_PP; + + if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) { i = IsMonDisobedient(); switch (i) @@ -906,8 +862,10 @@ static void atk00_attackcanceler(void) return; } } + gHitMarker |= HITMARKER_OBEYS; - if (gProtectStructs[gBattlerTarget].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGICCOAT_AFFECTED) + + if (gProtectStructs[gBattlerTarget].bounceMove && gBattleMoves[gCurrentMove].flags & FLAG_MAGIC_COAT_AFFECTED) { PressurePPLose(gBattlerAttacker, gBattlerTarget, MOVE_MAGIC_COAT); gProtectStructs[gBattlerTarget].bounceMove = FALSE; @@ -915,7 +873,7 @@ static void atk00_attackcanceler(void) gBattlescriptCurrInstr = BattleScript_MagicCoatBounce; return; } - for (i = 0; i < gBattlersCount; ++i) + for (i = 0; i < gBattlersCount; i++) { if ((gProtectStructs[gBattlerByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED) { @@ -936,26 +894,25 @@ static void atk00_attackcanceler(void) RecordAbilityBattle(gBattlerTarget, gLastUsedAbility); } else if (DEFENDER_IS_PROTECTED - && (gCurrentMove != MOVE_CURSE || IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_GHOST)) - && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)))) + && (gCurrentMove != MOVE_CURSE || IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_GHOST)) + && ((!IsTwoTurnsMove(gCurrentMove) || (gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)))) { CancelMultiTurnMoves(gBattlerAttacker); gMoveResultFlags |= MOVE_RESULT_MISSED; gLastLandedMoves[gBattlerTarget] = 0; gLastHitByType[gBattlerTarget] = 0; gBattleCommunication[6] = 1; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } static void JumpIfMoveFailed(u8 adder, u16 move) { const u8 *BS_ptr = gBattlescriptCurrInstr + adder; - if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT) { gLastLandedMoves[gBattlerTarget] = 0; @@ -971,7 +928,7 @@ static void JumpIfMoveFailed(u8 adder, u16 move) gBattlescriptCurrInstr = BS_ptr; } -static void atk40_jumpifaffectedbyprotect(void) +static void Cmd_jumpifaffectedbyprotect(void) { if (DEFENDER_IS_PROTECTED) { @@ -988,7 +945,6 @@ static void atk40_jumpifaffectedbyprotect(void) static bool8 JumpIfMoveAffectedByProtect(u16 move) { bool8 affected = FALSE; - if (DEFENDER_IS_PROTECTED) { gMoveResultFlags |= MOVE_RESULT_MISSED; @@ -1006,37 +962,45 @@ static bool8 AccuracyCalcHelper(u16 move) JumpIfMoveFailed(7, move); return TRUE; } + if (!(gHitMarker & HITMARKER_IGNORE_ON_AIR) && gStatuses3[gBattlerTarget] & STATUS3_ON_AIR) { gMoveResultFlags |= MOVE_RESULT_MISSED; JumpIfMoveFailed(7, move); return TRUE; } + gHitMarker &= ~HITMARKER_IGNORE_ON_AIR; + if (!(gHitMarker & HITMARKER_IGNORE_UNDERGROUND) && gStatuses3[gBattlerTarget] & STATUS3_UNDERGROUND) { gMoveResultFlags |= MOVE_RESULT_MISSED; JumpIfMoveFailed(7, move); return TRUE; } + gHitMarker &= ~HITMARKER_IGNORE_UNDERGROUND; + if (!(gHitMarker & HITMARKER_IGNORE_UNDERWATER) && gStatuses3[gBattlerTarget] & STATUS3_UNDERWATER) { gMoveResultFlags |= MOVE_RESULT_MISSED; JumpIfMoveFailed(7, move); return TRUE; } + gHitMarker &= ~HITMARKER_IGNORE_UNDERWATER; - if ((WEATHER_HAS_EFFECT && (gBattleWeather & WEATHER_RAIN_ANY) && gBattleMoves[move].effect == EFFECT_THUNDER) + + if ((WEATHER_HAS_EFFECT && (gBattleWeather & B_WEATHER_RAIN) && gBattleMoves[move].effect == EFFECT_THUNDER) || (gBattleMoves[move].effect == EFFECT_ALWAYS_HIT || gBattleMoves[move].effect == EFFECT_VITAL_THROW)) { JumpIfMoveFailed(7, move); return TRUE; } + return FALSE; } -static void atk01_accuracycheck(void) +static void Cmd_accuracycheck(void) { u16 move = T2_READ_16(gBattlescriptCurrInstr + 5); @@ -1068,7 +1032,7 @@ static void atk01_accuracycheck(void) s8 buff; u16 calc; - if (move == MOVE_NONE) + if (move == ACC_CURR_MOVE) move = gCurrentMove; GET_MOVE_TYPE(move, type); if (JumpIfMoveAffectedByProtect(move) || AccuracyCalcHelper(move)) @@ -1076,31 +1040,34 @@ static void atk01_accuracycheck(void) if (gBattleMons[gBattlerTarget].status2 & STATUS2_FORESIGHT) { u8 acc = gBattleMons[gBattlerAttacker].statStages[STAT_ACC]; - buff = acc; } else { u8 acc = gBattleMons[gBattlerAttacker].statStages[STAT_ACC]; - - buff = acc + 6 - gBattleMons[gBattlerTarget].statStages[STAT_EVASION]; + buff = acc + DEFAULT_STAT_STAGE - gBattleMons[gBattlerTarget].statStages[STAT_EVASION]; } - if (buff < 0) - buff = 0; - if (buff > 0xC) - buff = 0xC; + + if (buff < MIN_STAT_STAGE) + buff = MIN_STAT_STAGE; + if (buff > MAX_STAT_STAGE) + buff = MAX_STAT_STAGE; + moveAcc = gBattleMoves[move].accuracy; // check Thunder on sunny weather - if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY && gBattleMoves[move].effect == EFFECT_THUNDER) + if (WEATHER_HAS_EFFECT && gBattleWeather & B_WEATHER_SUN && gBattleMoves[move].effect == EFFECT_THUNDER) moveAcc = 50; + calc = sAccuracyStageRatios[buff].dividend * moveAcc; calc /= sAccuracyStageRatios[buff].divisor; + if (gBattleMons[gBattlerAttacker].ability == ABILITY_COMPOUND_EYES) calc = (calc * 130) / 100; // 1.3 compound eyes boost - if (WEATHER_HAS_EFFECT && gBattleMons[gBattlerTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY) + if (WEATHER_HAS_EFFECT && gBattleMons[gBattlerTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & B_WEATHER_SANDSTORM) calc = (calc * 80) / 100; // 1.2 sand veil loss if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && IS_TYPE_PHYSICAL(type)) calc = (calc * 80) / 100; // 1.2 hustle loss + if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY) { holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect; @@ -1111,6 +1078,7 @@ static void atk01_accuracycheck(void) holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); } + gPotentialItemEffectBattler = gBattlerTarget; if (holdEffect == HOLD_EFFECT_EVASION_UP) @@ -1119,8 +1087,8 @@ static void atk01_accuracycheck(void) if ((Random() % 100 + 1) > calc) { gMoveResultFlags |= MOVE_RESULT_MISSED; - if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE - && (gBattleMoves[move].target == MOVE_TARGET_BOTH || gBattleMoves[move].target == MOVE_TARGET_FOES_AND_ALLY)) + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && + (gBattleMoves[move].target == MOVE_TARGET_BOTH || gBattleMoves[move].target == MOVE_TARGET_FOES_AND_ALLY)) gBattleCommunication[6] = 2; else gBattleCommunication[6] = 0; @@ -1130,25 +1098,25 @@ static void atk01_accuracycheck(void) } } -static void atk02_attackstring(void) +static void Cmd_attackstring(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if (!(gHitMarker & (HITMARKER_NO_ATTACKSTRING | HITMARKER_ATTACKSTRING_PRINTED))) { PrepareStringBattle(STRINGID_USEDMOVE, gBattlerAttacker); gHitMarker |= HITMARKER_ATTACKSTRING_PRINTED; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; gBattleCommunication[MSG_DISPLAY] = 0; } } - static void atk03_ppreduce(void) +static void Cmd_ppreduce(void) { s32 ppToDeduct = 1; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if (!gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure) { @@ -1163,7 +1131,7 @@ static void atk02_attackstring(void) break; default: if (gBattlerAttacker != gBattlerTarget && gBattleMons[gBattlerTarget].ability == ABILITY_PRESSURE) - ++ppToDeduct; + ppToDeduct++; break; } } @@ -1180,16 +1148,16 @@ static void atk02_attackstring(void) && !((gDisableStructs[gBattlerAttacker].mimickedMoves) & gBitTable[gCurrMovePos])) { gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBattlerAttacker].pp[gCurrMovePos]); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBattlerAttacker].pp[gCurrMovePos]); MarkBattlerForControllerExec(gBattlerAttacker); } } gHitMarker &= ~(HITMARKER_NO_PPDEDUCT); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } -static void atk04_critcalc(void) +static void Cmd_critcalc(void) { u8 holdEffect; u16 item, critChance; @@ -1219,10 +1187,10 @@ static void atk04_critcalc(void) gCritMultiplier = 2; else gCritMultiplier = 1; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk05_damagecalc(void) +static void Cmd_damagecalc(void) { u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)]; @@ -1239,7 +1207,7 @@ static void atk05_damagecalc(void) gBattleMoveDamage *= 2; if (gProtectStructs[gBattlerAttacker].helpingHand) gBattleMoveDamage = gBattleMoveDamage * 15 / 10; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } void AI_CalcDmg(u8 attacker, u8 defender) @@ -1295,14 +1263,14 @@ void ModulateDmgByType(u8 multiplier) } } -static void atk06_typecalc(void) +static void Cmd_typecalc(void) { s32 i = 0; u8 moveType; if (gCurrentMove == MOVE_STRUGGLE) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; return; } GET_MOVE_TYPE(gCurrentMove, moveType); @@ -1359,7 +1327,7 @@ static void atk06_typecalc(void) } if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) gProtectStructs[gBattlerAttacker].targetNotAffected = 1; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } static void CheckWonderGuardAndLevitate(void) @@ -1387,6 +1355,7 @@ static void CheckWonderGuardAndLevitate(void) i += 3; continue; } + if (TYPE_EFFECT_ATK_TYPE(i) == moveType) { // check no effect @@ -1542,6 +1511,7 @@ u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility) i += 3; continue; } + if (TYPE_EFFECT_ATK_TYPE(i) == moveType) { // check type1 @@ -1561,6 +1531,7 @@ u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility) return flags; } +// Multiplies the damage by a random factor between 85% to 100% inclusive static inline void ApplyRandomDmgMultiplier(void) { u16 rand = Random(); @@ -1580,11 +1551,12 @@ static void Unused_ApplyRandomDmgMultiplier(void) ApplyRandomDmgMultiplier(); } -static void atk07_adjustnormaldamage(void) +static void Cmd_adjustnormaldamage(void) { u8 holdEffect, param; ApplyRandomDmgMultiplier(); + if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY) { holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect; @@ -1595,7 +1567,9 @@ static void atk07_adjustnormaldamage(void) holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); } + gPotentialItemEffectBattler = gBattlerTarget; + if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param) { RecordItemEffectBattle(gBattlerTarget, holdEffect); @@ -1616,15 +1590,15 @@ static void atk07_adjustnormaldamage(void) gLastUsedItem = gBattleMons[gBattlerTarget].item; } } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -// The same as 0x7 except it doesn't check for false swipe move effect. -static void atk08_adjustnormaldamage2(void) +static void Cmd_adjustnormaldamage2(void) // The same as adjustnormaldamage except it doesn't check for false swipe move effect. { u8 holdEffect, param; ApplyRandomDmgMultiplier(); + if (gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY) { holdEffect = gEnigmaBerries[gBattlerTarget].holdEffect; @@ -1635,7 +1609,9 @@ static void atk08_adjustnormaldamage2(void) holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); } + gPotentialItemEffectBattler = gBattlerTarget; + if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param) { RecordItemEffectBattle(gBattlerTarget, holdEffect); @@ -1656,12 +1632,12 @@ static void atk08_adjustnormaldamage2(void) gLastUsedItem = gBattleMons[gBattlerTarget].item; } } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk09_attackanimation(void) +static void Cmd_attackanimation(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if ((gHitMarker & HITMARKER_NO_ANIMATIONS) && (gCurrentMove != MOVE_TRANSFORM && gCurrentMove != MOVE_SUBSTITUTE)) { @@ -1677,7 +1653,7 @@ static void atk09_attackanimation(void) || gBattleMoves[gCurrentMove].target & MOVE_TARGET_DEPENDS) && gBattleScripting.animTargetsHit) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; return; } if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) @@ -1687,7 +1663,7 @@ static void atk09_attackanimation(void) ++gBattleScripting.animTurn; ++gBattleScripting.animTargetsHit; MarkBattlerForControllerExec(gBattlerAttacker); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { @@ -1698,15 +1674,15 @@ static void atk09_attackanimation(void) } } -static void atk0A_waitanimation(void) +static void Cmd_waitanimation(void) { - if (!gBattleControllerExecFlags) - ++gBattlescriptCurrInstr; + if (gBattleControllerExecFlags == 0) + gBattlescriptCurrInstr++; } -static void atk0B_healthbarupdate(void) +static void Cmd_healthbarupdate(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { @@ -1736,11 +1712,11 @@ static void atk0B_healthbarupdate(void) } } -static void atk0C_datahpupdate(void) +static void Cmd_datahpupdate(void) { u32 moveType; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if (gBattleStruct->dynamicMoveType == 0) moveType = gBattleMoves[gCurrentMove].type; @@ -1845,7 +1821,7 @@ static void atk0C_datahpupdate(void) } } gHitMarker &= ~(HITMARKER_PASSIVE_DAMAGE); - BtlController_EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp); MarkBattlerForControllerExec(gActiveBattler); } } @@ -1859,22 +1835,22 @@ static void atk0C_datahpupdate(void) } } -static void atk0D_critmessage(void) +static void Cmd_critmessage(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if (gCritMultiplier == 2 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { PrepareStringBattle(STRINGID_CRITICALHIT, gBattlerAttacker); gBattleCommunication[MSG_DISPLAY] = 1; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } -static void atk0E_effectivenesssound(void) +static void Cmd_effectivenesssound(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = gBattlerTarget; if (!(gMoveResultFlags & MOVE_RESULT_MISSED)) @@ -1882,11 +1858,11 @@ static void atk0E_effectivenesssound(void) switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED))) { case MOVE_RESULT_SUPER_EFFECTIVE: - BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE); + BtlController_EmitPlaySE(BUFFER_A, SE_SUPER_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); break; case MOVE_RESULT_NOT_VERY_EFFECTIVE: - BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE); + BtlController_EmitPlaySE(BUFFER_A, SE_NOT_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); break; case MOVE_RESULT_DOESNT_AFFECT_FOE: @@ -1899,31 +1875,31 @@ static void atk0E_effectivenesssound(void) default: if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) { - BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE); + BtlController_EmitPlaySE(BUFFER_A, SE_SUPER_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE) { - BtlController_EmitPlaySE(0, SE_NOT_EFFECTIVE); + BtlController_EmitPlaySE(BUFFER_A, SE_NOT_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED))) { - BtlController_EmitPlaySE(0, SE_EFFECTIVE); + BtlController_EmitPlaySE(BUFFER_A, SE_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); } break; } } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } -static void atk0F_resultmessage(void) +static void Cmd_resultmessage(void) { u32 stringId = 0; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if (gMoveResultFlags & MOVE_RESULT_MISSED && (!(gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) || gBattleCommunication[6] > 2)) { @@ -2002,13 +1978,13 @@ static void atk0F_resultmessage(void) } if (stringId) PrepareStringBattle(stringId, gBattlerAttacker); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } -static void atk10_printstring(void) +static void Cmd_printstring(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { u16 var = T2_READ_16(gBattlescriptCurrInstr + 1); @@ -2018,7 +1994,7 @@ static void atk10_printstring(void) } } -static void atk11_printselectionstring(void) +static void Cmd_printselectionstring(void) { gActiveBattler = gBattlerAttacker; BtlController_EmitPrintSelectionString(0, T2_READ_16(gBattlescriptCurrInstr + 1)); @@ -2027,9 +2003,9 @@ static void atk11_printselectionstring(void) gBattleCommunication[MSG_DISPLAY] = 1; } -static void atk12_waitmessage(void) +static void Cmd_waitmessage(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if (!gBattleCommunication[MSG_DISPLAY]) { @@ -2049,9 +2025,9 @@ static void atk12_waitmessage(void) } } -static void atk13_printfromtable(void) +static void Cmd_printfromtable(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { const u16 *ptr = (const u16 *) T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -2062,9 +2038,9 @@ static void atk13_printfromtable(void) } } -static void atk14_printselectionstringfromtable(void) +static void Cmd_printselectionstringfromtable(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { const u16 *ptr = (const u16 *) T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -2081,7 +2057,7 @@ u8 GetBattlerTurnOrderNum(u8 battlerId) { s32 i; - for (i = 0; i < gBattlersCount && gBattlerByTurnOrder[i] != battlerId; ++i); + for (i = 0; i < gBattlersCount && gBattlerByTurnOrder[i] != battlerId; i++); return i; } @@ -2107,7 +2083,7 @@ void SetMoveEffect(bool8 primary, u8 certain) && gBattleCommunication[MOVE_EFFECT_BYTE] != 1 && GetBattlerSide(gEffectBattler) == B_SIDE_OPPONENT) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; return; } if (gBattleMons[gEffectBattler].ability == ABILITY_SHIELD_DUST @@ -2115,7 +2091,7 @@ void SetMoveEffect(bool8 primary, u8 certain) && !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 9) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; return; } if (gSideStatuses[GET_BATTLER_SIDE(gEffectBattler)] & SIDE_STATUS_SAFEGUARD @@ -2123,23 +2099,23 @@ void SetMoveEffect(bool8 primary, u8 certain) && !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 7) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; return; } if (gBattleMons[gEffectBattler].hp == 0 && gBattleCommunication[MOVE_EFFECT_BYTE] != MOVE_EFFECT_PAYDAY && gBattleCommunication[MOVE_EFFECT_BYTE] != MOVE_EFFECT_STEAL_ITEM) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; return; } if (gBattleMons[gEffectBattler].status2 & STATUS2_SUBSTITUTE && affectsUser != MOVE_EFFECT_AFFECTS_USER) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; return; } - if (gBattleCommunication[MOVE_EFFECT_BYTE] <= 6) // status change + if (gBattleCommunication[MOVE_EFFECT_BYTE] <= PRIMARY_STATUS_MOVE_EFFECT) { switch (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]) { @@ -2237,7 +2213,7 @@ void SetMoveEffect(bool8 primary, u8 certain) statusChanged = TRUE; break; case STATUS1_FREEZE: - if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY) + if (WEATHER_HAS_EFFECT && gBattleWeather & B_WEATHER_SUN) noSunCanFreeze = FALSE; if (IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_ICE)) break; @@ -2331,7 +2307,7 @@ void SetMoveEffect(bool8 primary, u8 certain) gBattleMons[gEffectBattler].status1 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]; gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; gActiveBattler = gEffectBattler; - BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBattler].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBattler].status1); MarkBattlerForControllerExec(gActiveBattler); if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) { @@ -2355,7 +2331,7 @@ void SetMoveEffect(bool8 primary, u8 certain) } else if (statusChanged == FALSE) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } return; } @@ -2363,19 +2339,18 @@ void SetMoveEffect(bool8 primary, u8 certain) { if (gBattleMons[gEffectBattler].status2 & sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { u8 side; - switch (gBattleCommunication[MOVE_EFFECT_BYTE]) { case MOVE_EFFECT_CONFUSION: if (gBattleMons[gEffectBattler].ability == ABILITY_OWN_TEMPO - || gBattleMons[gEffectBattler].status2 & STATUS2_CONFUSION) + || gBattleMons[gEffectBattler].status2 & STATUS2_CONFUSION) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { @@ -2395,14 +2370,14 @@ void SetMoveEffect(bool8 primary, u8 certain) } else { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } else { if (GetBattlerTurnOrderNum(gEffectBattler) > gCurrentTurnActionNumber) gBattleMons[gEffectBattler].status2 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } break; case MOVE_EFFECT_UPROAR: @@ -2416,15 +2391,15 @@ void SetMoveEffect(bool8 primary, u8 certain) } else { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } break; case MOVE_EFFECT_PAYDAY: if (GET_BATTLER_SIDE(gBattlerAttacker) == B_SIDE_PLAYER) { - u16 PayDay = gPaydayMoney; + u16 payday = gPaydayMoney; gPaydayMoney += (gBattleMons[gBattlerAttacker].level * 5); - if (PayDay > gPaydayMoney) + if (payday > gPaydayMoney) gPaydayMoney = 0xFFFF; } BattleScriptPush(gBattlescriptCurrInstr + 1); @@ -2433,7 +2408,7 @@ void SetMoveEffect(bool8 primary, u8 certain) case MOVE_EFFECT_TRI_ATTACK: if (gBattleMons[gEffectBattler].status1) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { @@ -2445,12 +2420,12 @@ void SetMoveEffect(bool8 primary, u8 certain) gBattleMons[gEffectBattler].status2 |= STATUS2_MULTIPLETURNS; gLockedMoves[gEffectBattler] = gCurrentMove; gProtectStructs[gEffectBattler].chargingTurn = 1; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; break; case MOVE_EFFECT_WRAP: if (gBattleMons[gEffectBattler].status2 & STATUS2_WRAPPED) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { @@ -2460,7 +2435,7 @@ void SetMoveEffect(bool8 primary, u8 certain) *(gBattleStruct->wrappedBy + gEffectBattler) = gBattlerAttacker; BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; - for (gBattleCommunication[MULTISTRING_CHOOSER] = 0; ; ++gBattleCommunication[MULTISTRING_CHOOSER]) + for (gBattleCommunication[MULTISTRING_CHOOSER] = 0; ; gBattleCommunication[MULTISTRING_CHOOSER]++) { if (gBattleCommunication[MULTISTRING_CHOOSER] > 4 || gTrappingMoves[gBattleCommunication[MULTISTRING_CHOOSER]] == gCurrentMove) break; @@ -2486,7 +2461,7 @@ void SetMoveEffect(bool8 primary, u8 certain) affectsUser, NULL)) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { @@ -2508,7 +2483,7 @@ void SetMoveEffect(bool8 primary, u8 certain) affectsUser, NULL)) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { @@ -2530,7 +2505,7 @@ void SetMoveEffect(bool8 primary, u8 certain) affectsUser, NULL)) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { @@ -2552,7 +2527,7 @@ void SetMoveEffect(bool8 primary, u8 certain) affectsUser, NULL)) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { @@ -2566,17 +2541,17 @@ void SetMoveEffect(bool8 primary, u8 certain) gBattleMons[gEffectBattler].status2 |= STATUS2_RECHARGE; gDisableStructs[gEffectBattler].rechargeTimer = 2; gLockedMoves[gEffectBattler] = gCurrentMove; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; break; case MOVE_EFFECT_RAGE: gBattleMons[gBattlerAttacker].status2 |= STATUS2_RAGE; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; break; case MOVE_EFFECT_STEAL_ITEM: { if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; break; } side = GetBattlerSide(gBattlerAttacker); @@ -2587,7 +2562,7 @@ void SetMoveEffect(bool8 primary, u8 certain) | BATTLE_TYPE_LINK)) && gTrainerBattleOpponent_A != 0x400) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else if (!(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER @@ -2596,7 +2571,7 @@ void SetMoveEffect(bool8 primary, u8 certain) && gTrainerBattleOpponent_A != 0x400 && (gWishFutureKnock.knockedOffMons[side] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]])) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else if (gBattleMons[gBattlerTarget].item && gBattleMons[gBattlerTarget].ability == ABILITY_STICKY_HOLD) @@ -2606,11 +2581,11 @@ void SetMoveEffect(bool8 primary, u8 certain) RecordAbilityBattle(gBattlerTarget, gLastUsedAbility); } else if (gBattleMons[gBattlerAttacker].item != ITEM_NONE - || gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY - || IS_ITEM_MAIL(gBattleMons[gBattlerTarget].item) - || gBattleMons[gBattlerTarget].item == ITEM_NONE) + || gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY + || IS_ITEM_MAIL(gBattleMons[gBattlerTarget].item) + || gBattleMons[gBattlerTarget].item == ITEM_NONE) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { @@ -2618,10 +2593,10 @@ void SetMoveEffect(bool8 primary, u8 certain) gLastUsedItem = *changedItem = gBattleMons[gBattlerTarget].item; gBattleMons[gBattlerTarget].item = ITEM_NONE; gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem); MarkBattlerForControllerExec(gBattlerAttacker); gActiveBattler = gBattlerTarget; - BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattlerTarget].item); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattlerTarget].item); MarkBattlerForControllerExec(gBattlerTarget); BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_ItemSteal; @@ -2633,11 +2608,11 @@ void SetMoveEffect(bool8 primary, u8 certain) case MOVE_EFFECT_PREVENT_ESCAPE: gBattleMons[gBattlerTarget].status2 |= STATUS2_ESCAPE_PREVENTION; gDisableStructs[gBattlerTarget].battlerPreventingEscape = gBattlerAttacker; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; break; case MOVE_EFFECT_NIGHTMARE: gBattleMons[gBattlerTarget].status2 |= STATUS2_NIGHTMARE; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; break; case MOVE_EFFECT_ALL_STATS_UP: BattleScriptPush(gBattlescriptCurrInstr + 1); @@ -2650,13 +2625,13 @@ void SetMoveEffect(bool8 primary, u8 certain) case MOVE_EFFECT_REMOVE_PARALYSIS: // Smelling salts if (!(gBattleMons[gBattlerTarget].status1 & STATUS1_PARALYSIS)) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { gBattleMons[gBattlerTarget].status1 &= ~(STATUS1_PARALYSIS); gActiveBattler = gBattlerTarget; - BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_TargetPRLZHeal; @@ -2676,7 +2651,7 @@ void SetMoveEffect(bool8 primary, u8 certain) case MOVE_EFFECT_THRASH: if (gBattleMons[gEffectBattler].status2 & STATUS2_LOCK_CONFUSE) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { @@ -2690,7 +2665,7 @@ void SetMoveEffect(bool8 primary, u8 certain) { if (gBattleMons[gEffectBattler].item == ITEM_NONE) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else { @@ -2713,7 +2688,7 @@ void SetMoveEffect(bool8 primary, u8 certain) } else { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } break; case MOVE_EFFECT_SP_ATK_TWO_DOWN: // Overheat @@ -2725,7 +2700,7 @@ void SetMoveEffect(bool8 primary, u8 certain) } } -static void atk15_seteffectwithchance(void) +static void Cmd_seteffectwithchance(void) { u32 percentChance; @@ -2750,27 +2725,27 @@ static void atk15_seteffectwithchance(void) } else { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } gBattleCommunication[MOVE_EFFECT_BYTE] = 0; gBattleScripting.multihitMoveEffect = 0; } -static void atk16_seteffectprimary(void) +static void Cmd_seteffectprimary(void) { SetMoveEffect(TRUE, 0); } -static void atk17_seteffectsecondary(void) +static void Cmd_seteffectsecondary(void) { SetMoveEffect(FALSE, 0); } -static void atk18_clearstatusfromeffect(void) +static void Cmd_clearstatusfromeffect(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - if (gBattleCommunication[MOVE_EFFECT_BYTE] <= MOVE_EFFECT_TOXIC) + if (gBattleCommunication[MOVE_EFFECT_BYTE] <= PRIMARY_STATUS_MOVE_EFFECT) gBattleMons[gActiveBattler].status1 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]); else gBattleMons[gActiveBattler].status2 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]); @@ -2779,7 +2754,7 @@ static void atk18_clearstatusfromeffect(void) gBattleScripting.multihitMoveEffect = 0; } -static void atk19_tryfaintmon(void) +static void Cmd_tryfaintmon(void) { const u8 *BS_ptr; @@ -2853,7 +2828,7 @@ static void atk19_tryfaintmon(void) BattleScriptPush(gBattlescriptCurrInstr); gBattlescriptCurrInstr = BattleScript_GrudgeTakesPp; gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(0, moveIndex + REQUEST_PPMOVE1_BATTLE, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]); + BtlController_EmitSetMonData(BUFFER_A, moveIndex + REQUEST_PPMOVE1_BATTLE, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]); MarkBattlerForControllerExec(gActiveBattler); PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerAttacker].moves[moveIndex]) } @@ -2865,9 +2840,9 @@ static void atk19_tryfaintmon(void) } } -static void atk1A_dofaintanimation(void) +static void Cmd_dofaintanimation(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); BtlController_EmitFaintAnimation(0); @@ -2876,20 +2851,20 @@ static void atk1A_dofaintanimation(void) } } -static void atk1B_cleareffectsonfaint(void) +static void Cmd_cleareffectsonfaint(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); gBattleMons[gActiveBattler].status1 = 0; - BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBattler].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); FaintClearSetData(); // Effects like attractions, trapping, etc. gBattlescriptCurrInstr += 2; } } -static void atk1C_jumpifstatus(void) +static void Cmd_jumpifstatus(void) { u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2); @@ -2901,7 +2876,7 @@ static void atk1C_jumpifstatus(void) gBattlescriptCurrInstr += 10; } -static void atk1D_jumpifstatus2(void) +static void Cmd_jumpifstatus2(void) { u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2); @@ -2913,7 +2888,7 @@ static void atk1D_jumpifstatus2(void) gBattlescriptCurrInstr += 10; } -static void atk1E_jumpifability(void) +static void Cmd_jumpifability(void) { u8 battlerId; u8 ability = gBattlescriptCurrInstr[2]; @@ -2960,7 +2935,7 @@ static void atk1E_jumpifability(void) } } -static void atk1F_jumpifsideaffecting(void) +static void Cmd_jumpifsideaffecting(void) { u8 side; u16 flags; @@ -2980,7 +2955,7 @@ static void atk1F_jumpifsideaffecting(void) gBattlescriptCurrInstr += 8; } -static void atk20_jumpifstat(void) +static void Cmd_jumpifstat(void) { u8 ret = 0; u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); @@ -2990,27 +2965,27 @@ static void atk20_jumpifstat(void) { case CMP_EQUAL: if (value == gBattlescriptCurrInstr[4]) - ++ret; + ret++; break; case CMP_NOT_EQUAL: if (value != gBattlescriptCurrInstr[4]) - ++ret; + ret++; break; case CMP_GREATER_THAN: if (value > gBattlescriptCurrInstr[4]) - ++ret; + ret++; break; case CMP_LESS_THAN: if (value < gBattlescriptCurrInstr[4]) - ++ret; + ret++; break; case CMP_COMMON_BITS: if (value & gBattlescriptCurrInstr[4]) - ++ret; + ret++; break; case CMP_NO_COMMON_BITS: if (!(value & gBattlescriptCurrInstr[4])) - ++ret; + ret++; break; } if (ret) @@ -3019,7 +2994,7 @@ static void atk20_jumpifstat(void) gBattlescriptCurrInstr += 9; } -static void atk21_jumpifstatus3condition(void) +static void Cmd_jumpifstatus3condition(void) { u32 flags; const u8 *jumpPtr; @@ -3043,7 +3018,7 @@ static void atk21_jumpifstatus3condition(void) } } -static void atk22_jumpiftype(void) +static void Cmd_jumpiftype(void) { u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); u8 type = gBattlescriptCurrInstr[2]; @@ -3055,7 +3030,7 @@ static void atk22_jumpiftype(void) gBattlescriptCurrInstr += 7; } -static void atk23_getexp(void) +static void Cmd_getexp(void) { u16 item; s32 i; // also used as stringId @@ -3066,7 +3041,7 @@ static void atk23_getexp(void) gBattlerFainted = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); sentIn = gSentPokesToOpponent[(gBattlerFainted & 2) >> 1]; - switch (gBattleScripting.atk23_state) + switch (gBattleScripting.getexpState) { case 0: // check if should receive exp at all if (GetBattlerSide(gBattlerFainted) != B_SIDE_OPPONENT @@ -3077,11 +3052,11 @@ static void atk23_getexp(void) | BATTLE_TYPE_SAFARI | BATTLE_TYPE_EREADER_TRAINER))) { - gBattleScripting.atk23_state = 6; // goto last case + gBattleScripting.getexpState = 6; // goto last case } else { - ++gBattleScripting.atk23_state; + gBattleScripting.getexpState++; gBattleStruct->givenExpMons |= gBitTable[gBattlerPartyIndexes[gBattlerFainted]]; } break; @@ -3090,7 +3065,7 @@ static void atk23_getexp(void) u16 calculatedExp; s32 viaSentIn; - for (viaSentIn = 0, i = 0; i < PARTY_SIZE; ++i) + for (viaSentIn = 0, i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE && GetMonData(&gPlayerParty[i], MON_DATA_HP) != 0) { @@ -3105,12 +3080,15 @@ static void atk23_getexp(void) ++viaExpShare; } } + calculatedExp = gBaseStats[gBattleMons[gBattlerFainted].species].expYield * gBattleMons[gBattlerFainted].level / 7; + if (viaExpShare) // at least one mon is getting exp via exp share { *exp = SAFE_DIV(calculatedExp / 2, viaSentIn); if (*exp == 0) *exp = 1; + gExpShareExp = calculatedExp / 2 / viaExpShare; if (gExpShareExp == 0) gExpShareExp = 1; @@ -3122,29 +3100,32 @@ static void atk23_getexp(void) *exp = 1; gExpShareExp = 0; } - ++gBattleScripting.atk23_state; + + gBattleScripting.getexpState++; gBattleStruct->expGetterMonId = 0; gBattleStruct->sentInPokes = sentIn; } // fall through case 2: // set exp value to the poke in expgetter_id and print message - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { item = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HELD_ITEM); + if (item == ITEM_ENIGMA_BERRY) holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect; else holdEffect = ItemId_GetHoldEffect(item); + if (holdEffect != HOLD_EFFECT_EXP_SHARE && !(gBattleStruct->sentInPokes & 1)) { *(&gBattleStruct->sentInPokes) >>= 1; - gBattleScripting.atk23_state = 5; + gBattleScripting.getexpState = 5; gBattleMoveDamage = 0; // used for exp } else if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) == MAX_LEVEL) { *(&gBattleStruct->sentInPokes) >>= 1; - gBattleScripting.atk23_state = 5; + gBattleScripting.getexpState = 5; gBattleMoveDamage = 0; // used for exp } else @@ -3156,7 +3137,7 @@ static void atk23_getexp(void) { BattleStopLowHpSound(); PlayBGM(MUS_VICTORY_WILD); - ++gBattleStruct->wildVictorySong; + gBattleStruct->wildVictorySong++; } if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP)) { @@ -3197,20 +3178,22 @@ static void atk23_getexp(void) { gBattleStruct->expGetterBattlerId = 0; } + PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattleStruct->expGetterBattlerId, gBattleStruct->expGetterMonId); // buffer 'gained' or 'gained a boosted' PREPARE_STRING_BUFFER(gBattleTextBuff2, i); PREPARE_WORD_NUMBER_BUFFER(gBattleTextBuff3, 5, gBattleMoveDamage); + PrepareStringBattle(STRINGID_PKMNGAINEDEXP, gBattleStruct->expGetterBattlerId); MonGainEVs(&gPlayerParty[gBattleStruct->expGetterMonId], gBattleMons[gBattlerFainted].species); } gBattleStruct->sentInPokes >>= 1; - ++gBattleScripting.atk23_state; + gBattleScripting.getexpState++; } } break; case 3: // Set stats and give exp - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gBattleBufferB[gBattleStruct->expGetterBattlerId][0] = 0; if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP) && GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL) != MAX_LEVEL) @@ -3221,28 +3204,32 @@ static void atk23_getexp(void) gBattleResources->beforeLvlUp->stats[STAT_SPEED] = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED); gBattleResources->beforeLvlUp->stats[STAT_SPATK] = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK); gBattleResources->beforeLvlUp->stats[STAT_SPDEF] = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPDEF); + gActiveBattler = gBattleStruct->expGetterBattlerId; - BtlController_EmitExpUpdate(0, gBattleStruct->expGetterMonId, gBattleMoveDamage); + BtlController_EmitExpUpdate(BUFFER_A, gBattleStruct->expGetterMonId, gBattleMoveDamage); MarkBattlerForControllerExec(gActiveBattler); } - ++gBattleScripting.atk23_state; + gBattleScripting.getexpState++; } break; case 4: // lvl up if necessary - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = gBattleStruct->expGetterBattlerId; if (gBattleBufferB[gActiveBattler][0] == CONTROLLER_TWORETURNVALUES && gBattleBufferB[gActiveBattler][1] == RET_VALUE_LEVELED_UP) { if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId) HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); + PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gActiveBattler, gBattleStruct->expGetterMonId); PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL)); + BattleScriptPushCursor(); gLeveledUpInBattle |= gBitTable[gBattleStruct->expGetterMonId]; gBattlescriptCurrInstr = BattleScript_LevelUp; gBattleMoveDamage = (gBattleBufferB[gActiveBattler][2] | (gBattleBufferB[gActiveBattler][3] << 8)); AdjustFriendship(&gPlayerParty[gBattleStruct->expGetterMonId], FRIENDSHIP_EVENT_GROW_LEVEL); + // update battle mon structure after level up if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId && gBattleMons[0].hp) { @@ -3251,7 +3238,7 @@ static void atk23_getexp(void) gBattleMons[0].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP); gBattleMons[0].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK); gBattleMons[0].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF); - // Why is this duplicated? + // Speed is duplicated, likely due to a copy-paste error. gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED); gBattleMons[0].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED); gBattleMons[0].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK); @@ -3265,36 +3252,40 @@ static void atk23_getexp(void) gBattleMons[2].maxHP = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MAX_HP); gBattleMons[2].attack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_ATK); gBattleMons[2].defense = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_DEF); - // Duplicated again, but this time there's no Sp Defense gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED); + // Speed is duplicated again, but Special Defense is missing. +#ifdef BUGFIX + gBattleMons[2].spDefense = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPDEF); +#else gBattleMons[2].speed = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPEED); +#endif gBattleMons[2].spAttack = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPATK); } - gBattleScripting.atk23_state = 5; + gBattleScripting.getexpState = 5; } else { gBattleMoveDamage = 0; - gBattleScripting.atk23_state = 5; + gBattleScripting.getexpState = 5; } } break; case 5: // looper increment if (gBattleMoveDamage) // there is exp to give, goto case 3 that gives exp { - gBattleScripting.atk23_state = 3; + gBattleScripting.getexpState = 3; } else { - ++gBattleStruct->expGetterMonId; - if (gBattleStruct->expGetterMonId <= 5) - gBattleScripting.atk23_state = 2; // loop again + gBattleStruct->expGetterMonId++; + if (gBattleStruct->expGetterMonId < PARTY_SIZE) + gBattleScripting.getexpState = 2; // loop again else - gBattleScripting.atk23_state = 6; // we're done + gBattleScripting.getexpState = 6; // we're done } break; case 6: // increment instruction - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { // not sure why gf clears the item and ability here gBattleMons[gBattlerFainted].item = ITEM_NONE; @@ -3305,19 +3296,19 @@ static void atk23_getexp(void) } } -static void atk24(void) +static void Cmd_checkteamslost(void) { u16 HP_count = 0; s32 i; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { - for (i = 0; i < PARTY_SIZE; ++i) + for (i = 0; i < PARTY_SIZE; i++) if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)) HP_count += GetMonData(&gPlayerParty[i], MON_DATA_HP); if (HP_count == 0) gBattleOutcome |= B_OUTCOME_LOST; - for (HP_count = 0, i = 0; i < PARTY_SIZE; ++i) + for (HP_count = 0, i = 0; i < PARTY_SIZE; i++) if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES) && !GetMonData(&gEnemyParty[i], MON_DATA_IS_EGG)) HP_count += GetMonData(&gEnemyParty[i], MON_DATA_HP); if (HP_count == 0) @@ -3332,9 +3323,9 @@ static void atk24(void) u32 *ptr = &gHitMarker; u32 hitMarkerUnk = 0x10000000; - ++i; + i++; --i; - if ((hitMarkerUnk << i) & *ptr && !gSpecialStatuses[i].flag40) + if ((hitMarkerUnk << i) & *ptr && !gSpecialStatuses[i].faintedHasReplacement) ++foundPlayer; } for (foundOpponent = 0, i = 1; i < gBattlersCount; i += 2) @@ -3348,7 +3339,7 @@ static void atk24(void) ++match; --match; } - if ((hitMarkerUnk << i) & *ptr && !gSpecialStatuses[i].flag40) + if ((hitMarkerUnk << i) & *ptr && !gSpecialStatuses[i].faintedHasReplacement) ++foundOpponent; } if (gBattleTypeFlags & BATTLE_TYPE_MULTI) @@ -3384,19 +3375,19 @@ static void MoveValuesCleanUp(void) gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT); } -static void atk25_movevaluescleanup(void) +static void Cmd_movevaluescleanup(void) { MoveValuesCleanUp(); gBattlescriptCurrInstr += 1; } -static void atk26_setmultihit(void) +static void Cmd_setmultihit(void) { gMultiHitCounter = gBattlescriptCurrInstr[1]; gBattlescriptCurrInstr += 2; } -static void atk27_decrementmultihit(void) +static void Cmd_decrementmultihit(void) { if (--gMultiHitCounter == 0) gBattlescriptCurrInstr += 5; @@ -3404,12 +3395,12 @@ static void atk27_decrementmultihit(void) gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atk28_goto(void) +static void Cmd_goto(void) { gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atk29_jumpifbyte(void) +static void Cmd_jumpifbyte(void) { u8 caseID = gBattlescriptCurrInstr[1]; const u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 2); @@ -3447,7 +3438,7 @@ static void atk29_jumpifbyte(void) } } -static void atk2A_jumpifhalfword(void) +static void Cmd_jumpifhalfword(void) { u8 caseID = gBattlescriptCurrInstr[1]; const u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 2); @@ -3484,7 +3475,7 @@ static void atk2A_jumpifhalfword(void) } } -static void atk2B_jumpifword(void) +static void Cmd_jumpifword(void) { u8 caseID = gBattlescriptCurrInstr[1]; const u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 2); @@ -3521,7 +3512,7 @@ static void atk2B_jumpifword(void) } } -static void atk2C_jumpifarrayequal(void) +static void Cmd_jumpifarrayequal(void) { const u8 *mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1); const u8 *mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5); @@ -3529,7 +3520,7 @@ static void atk2C_jumpifarrayequal(void) const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); u8 i; - for (i = 0; i < size; ++i) + for (i = 0; i < size; i++) { if (*mem1 != *mem2) { @@ -3542,7 +3533,7 @@ static void atk2C_jumpifarrayequal(void) gBattlescriptCurrInstr = jumpPtr; } -static void atk2D_jumpifarraynotequal(void) +static void Cmd_jumpifarraynotequal(void) { u8 equalBytes = 0; const u8 *mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1); @@ -3551,7 +3542,7 @@ static void atk2D_jumpifarraynotequal(void) const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); u8 i; - for (i = 0; i < size; ++i) + for (i = 0; i < size; i++) { if (*mem1 == *mem2) ++equalBytes; @@ -3563,7 +3554,7 @@ static void atk2D_jumpifarraynotequal(void) gBattlescriptCurrInstr += 14; } -static void atk2E_setbyte(void) +static void Cmd_setbyte(void) { u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); @@ -3571,7 +3562,7 @@ static void atk2E_setbyte(void) gBattlescriptCurrInstr += 6; } -static void atk2F_addbyte(void) +static void Cmd_addbyte(void) { u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); @@ -3579,7 +3570,7 @@ static void atk2F_addbyte(void) gBattlescriptCurrInstr += 6; } -static void atk30_subbyte(void) +static void Cmd_subbyte(void) { u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); @@ -3587,21 +3578,21 @@ static void atk30_subbyte(void) gBattlescriptCurrInstr += 6; } -static void atk31_copyarray(void) +static void Cmd_copyarray(void) { u8 *dest = T2_READ_PTR(gBattlescriptCurrInstr + 1); const u8 *src = T2_READ_PTR(gBattlescriptCurrInstr + 5); s32 size = gBattlescriptCurrInstr[9]; s32 i; - for (i = 0; i < size; ++i) + for (i = 0; i < size; i++) { dest[i] = src[i]; } gBattlescriptCurrInstr += 10; } -static void atk32_copyarraywithindex(void) +static void Cmd_copyarraywithindex(void) { u8 *dest = T2_READ_PTR(gBattlescriptCurrInstr + 1); const u8 *src = T2_READ_PTR(gBattlescriptCurrInstr + 5); @@ -3609,21 +3600,21 @@ static void atk32_copyarraywithindex(void) s32 size = gBattlescriptCurrInstr[13]; s32 i; - for (i = 0; i < size; ++i) + for (i = 0; i < size; i++) { dest[i] = src[i + *index]; } gBattlescriptCurrInstr += 14; } -static void atk33_orbyte(void) +static void Cmd_orbyte(void) { u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); *memByte |= gBattlescriptCurrInstr[5]; gBattlescriptCurrInstr += 6; } -static void atk34_orhalfword(void) +static void Cmd_orhalfword(void) { u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1); u16 val = T2_READ_16(gBattlescriptCurrInstr + 5); @@ -3632,7 +3623,7 @@ static void atk34_orhalfword(void) gBattlescriptCurrInstr += 7; } -static void atk35_orword(void) +static void Cmd_orword(void) { u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1); u32 val = T2_READ_32(gBattlescriptCurrInstr + 5); @@ -3641,7 +3632,7 @@ static void atk35_orword(void) gBattlescriptCurrInstr += 9; } -static void atk36_bicbyte(void) +static void Cmd_bicbyte(void) { u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); @@ -3649,7 +3640,7 @@ static void atk36_bicbyte(void) gBattlescriptCurrInstr += 6; } -static void atk37_bichalfword(void) +static void Cmd_bichalfword(void) { u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1); u16 val = T2_READ_16(gBattlescriptCurrInstr + 5); @@ -3658,7 +3649,7 @@ static void atk37_bichalfword(void) gBattlescriptCurrInstr += 7; } -static void atk38_bicword(void) +static void Cmd_bicword(void) { u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1); u32 val = T2_READ_32(gBattlescriptCurrInstr + 5); @@ -3667,9 +3658,9 @@ static void atk38_bicword(void) gBattlescriptCurrInstr += 9; } -static void atk39_pause(void) +static void Cmd_pause(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { u16 value = T2_READ_16(gBattlescriptCurrInstr + 1); @@ -3681,13 +3672,13 @@ static void atk39_pause(void) } } -static void atk3A_waitstate(void) +static void Cmd_waitstate(void) { - if (!gBattleControllerExecFlags) - ++gBattlescriptCurrInstr; + if (gBattleControllerExecFlags == 0) + gBattlescriptCurrInstr++; } -static void atk3B_healthbar_update(void) +static void Cmd_healthbar_update(void) { if (gBattlescriptCurrInstr[1] == BS_TARGET) gActiveBattler = gBattlerTarget; @@ -3698,25 +3689,25 @@ static void atk3B_healthbar_update(void) gBattlescriptCurrInstr += 2; } -static void atk3C_return(void) +static void Cmd_return(void) { BattleScriptPop(); } -static void atk3D_end(void) +static void Cmd_end(void) { gMoveResultFlags = 0; gActiveBattler = 0; gCurrentActionFuncId = B_ACTION_TRY_FINISH; } -static void atk3E_end2(void) +static void Cmd_end2(void) { gActiveBattler = 0; gCurrentActionFuncId = B_ACTION_TRY_FINISH; } -static void atk3F_end3(void) // pops the main function stack +static void Cmd_end3(void) // pops the main function stack { BattleScriptPop(); if (gBattleResources->battleCallbackStack->size != 0) @@ -3724,13 +3715,13 @@ static void atk3F_end3(void) // pops the main function stack gBattleMainFunc = gBattleResources->battleCallbackStack->function[gBattleResources->battleCallbackStack->size]; } -static void atk41_call(void) +static void Cmd_call(void) { BattleScriptPush(gBattlescriptCurrInstr + 5); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atk42_jumpiftype2(void) +static void Cmd_jumpiftype2(void) { u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); @@ -3740,7 +3731,7 @@ static void atk42_jumpiftype2(void) gBattlescriptCurrInstr += 7; } -static void atk43_jumpifabilitypresent(void) +static void Cmd_jumpifabilitypresent(void) { if (AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, gBattlescriptCurrInstr[1], 0, 0)) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2); @@ -3748,12 +3739,12 @@ static void atk43_jumpifabilitypresent(void) gBattlescriptCurrInstr += 6; } -static void atk44_endselectionscript(void) +static void Cmd_endselectionscript(void) { *(gBattlerAttacker + gBattleStruct->selectionScriptFinished) = TRUE; } -static void atk45_playanimation(void) +static void Cmd_playanimation(void) { const u16 *argumentPtr; @@ -3764,7 +3755,7 @@ static void atk45_playanimation(void) || gBattlescriptCurrInstr[2] == B_ANIM_SUBSTITUTE_FADE || gBattlescriptCurrInstr[2] == B_ANIM_SILPH_SCOPED) { - BtlController_EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr); + BtlController_EmitBattleAnimation(BUFFER_A, gBattlescriptCurrInstr[2], *argumentPtr); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 7; } @@ -3778,7 +3769,7 @@ static void atk45_playanimation(void) || gBattlescriptCurrInstr[2] == B_ANIM_SANDSTORM_CONTINUES || gBattlescriptCurrInstr[2] == B_ANIM_HAIL_CONTINUES) { - BtlController_EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr); + BtlController_EmitBattleAnimation(BUFFER_A, gBattlescriptCurrInstr[2], *argumentPtr); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 7; } @@ -3788,13 +3779,13 @@ static void atk45_playanimation(void) } else { - BtlController_EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr); + BtlController_EmitBattleAnimation(BUFFER_A, gBattlescriptCurrInstr[2], *argumentPtr); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 7; } } -static void atk46_playanimation2(void) // animation Id is stored in the first pointer +static void Cmd_playanimation_var(void) // animation Id is stored in the first pointer { const u16 *argumentPtr; const u8 *animationIdPtr; @@ -3806,7 +3797,7 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po || *animationIdPtr == B_ANIM_SNATCH_MOVE || *animationIdPtr == B_ANIM_SUBSTITUTE_FADE) { - BtlController_EmitBattleAnimation(0, *animationIdPtr, *argumentPtr); + BtlController_EmitBattleAnimation(BUFFER_A, *animationIdPtr, *argumentPtr); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 10; } @@ -3819,7 +3810,7 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po || *animationIdPtr == B_ANIM_SANDSTORM_CONTINUES || *animationIdPtr == B_ANIM_HAIL_CONTINUES) { - BtlController_EmitBattleAnimation(0, *animationIdPtr, *argumentPtr); + BtlController_EmitBattleAnimation(BUFFER_A, *animationIdPtr, *argumentPtr); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 10; } @@ -3829,13 +3820,13 @@ static void atk46_playanimation2(void) // animation Id is stored in the first po } else { - BtlController_EmitBattleAnimation(0, *animationIdPtr, *argumentPtr); + BtlController_EmitBattleAnimation(BUFFER_A, *animationIdPtr, *argumentPtr); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 10; } } -static void atk47_setgraphicalstatchangevalues(void) +static void Cmd_setgraphicalstatchangevalues(void) { u8 value = 0; @@ -3856,10 +3847,10 @@ static void atk47_setgraphicalstatchangevalues(void) } gBattleScripting.animArg1 = GET_STAT_BUFF_ID(gBattleScripting.statChanger) + value - 1; gBattleScripting.animArg2 = 0; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk48_playstatchangeanimation(void) +static void Cmd_playstatchangeanimation(void) { u32 currStat = 0; u16 statAnimId = 0; @@ -3868,10 +3859,10 @@ static void atk48_playstatchangeanimation(void) gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); statsToCheck = gBattlescriptCurrInstr[2]; - if (gBattlescriptCurrInstr[3] & ATK48_STAT_NEGATIVE) // goes down + if (gBattlescriptCurrInstr[3] & STAT_CHANGE_NEGATIVE) // goes down { s16 startingStatAnimId; - if (gBattlescriptCurrInstr[3] & ATK48_STAT_BY_TWO) + if (gBattlescriptCurrInstr[3] & STAT_CHANGE_BY_TWO) startingStatAnimId = STAT_ANIM_MINUS2 - 1; else startingStatAnimId = STAT_ANIM_MINUS1 - 1; @@ -3880,12 +3871,12 @@ static void atk48_playstatchangeanimation(void) { if (statsToCheck & 1) { - if (gBattlescriptCurrInstr[3] & ATK48_DONT_CHECK_LOWER) + if (gBattlescriptCurrInstr[3] & STAT_CHANGE_CANT_PREVENT) { if (gBattleMons[gActiveBattler].statStages[currStat] > 0) { statAnimId = startingStatAnimId + currStat; - ++changeableStatsCount; + changeableStatsCount++; } } else if (!gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].mistTimer @@ -3897,17 +3888,17 @@ static void atk48_playstatchangeanimation(void) if (gBattleMons[gActiveBattler].statStages[currStat] > 0) { statAnimId = startingStatAnimId + currStat; - ++changeableStatsCount; + changeableStatsCount++; } } } statsToCheck >>= 1; - ++currStat; + currStat++; } if (changeableStatsCount > 1) // more than one stat, so the color is gray { - if (gBattlescriptCurrInstr[3] & ATK48_STAT_BY_TWO) + if (gBattlescriptCurrInstr[3] & STAT_CHANGE_BY_TWO) statAnimId = STAT_ANIM_MULTIPLE_MINUS2; else statAnimId = STAT_ANIM_MULTIPLE_MINUS1; @@ -3916,7 +3907,7 @@ static void atk48_playstatchangeanimation(void) else // goes up { s16 startingStatAnimId; - if (gBattlescriptCurrInstr[3] & ATK48_STAT_BY_TWO) + if (gBattlescriptCurrInstr[3] & STAT_CHANGE_BY_TWO) startingStatAnimId = STAT_ANIM_PLUS2 - 1; else startingStatAnimId = STAT_ANIM_PLUS1 - 1; @@ -3926,28 +3917,28 @@ static void atk48_playstatchangeanimation(void) if (statsToCheck & 1 && gBattleMons[gActiveBattler].statStages[currStat] < 0xC) { statAnimId = startingStatAnimId + currStat; - ++changeableStatsCount; + changeableStatsCount++; } statsToCheck >>= 1; - ++currStat; + currStat++; } if (changeableStatsCount > 1) // more than one stat, so the color is gray { - if (gBattlescriptCurrInstr[3] & ATK48_STAT_BY_TWO) + if (gBattlescriptCurrInstr[3] & STAT_CHANGE_BY_TWO) statAnimId = STAT_ANIM_MULTIPLE_PLUS2; else statAnimId = STAT_ANIM_MULTIPLE_PLUS1; } } - if (gBattlescriptCurrInstr[3] & ATK48_ONLY_MULTIPLE && changeableStatsCount < 2) + if (gBattlescriptCurrInstr[3] & STAT_CHANGE_MULTIPLE_STATS && changeableStatsCount < 2) { gBattlescriptCurrInstr += 4; } else if (changeableStatsCount != 0 && !gBattleScripting.statAnimPlayed) { - BtlController_EmitBattleAnimation(0, B_ANIM_STATS_CHANGE, statAnimId); + BtlController_EmitBattleAnimation(BUFFER_A, B_ANIM_STATS_CHANGE, statAnimId); MarkBattlerForControllerExec(gActiveBattler); - if (gBattlescriptCurrInstr[3] & ATK48_ONLY_MULTIPLE && changeableStatsCount > 1) + if (gBattlescriptCurrInstr[3] & STAT_CHANGE_MULTIPLE_STATS && changeableStatsCount > 1) gBattleScripting.statAnimPlayed = TRUE; gBattlescriptCurrInstr += 4; } @@ -3957,89 +3948,93 @@ static void atk48_playstatchangeanimation(void) } } -static void atk49_moveend(void) +static void Cmd_moveend(void) { s32 i; bool32 effect = FALSE; u8 moveType = 0; u8 holdEffectAtk = 0; u16 *choicedMoveAtk = NULL; - u8 arg1, arg2; + u8 endMode, endState; u16 originallyUsedMove; - if (gChosenMove == 0xFFFF) + if (gChosenMove == MOVE_UNAVAILABLE) originallyUsedMove = MOVE_NONE; else originallyUsedMove = gChosenMove; - arg1 = gBattlescriptCurrInstr[1]; - arg2 = gBattlescriptCurrInstr[2]; + + endMode = gBattlescriptCurrInstr[1]; + endState = gBattlescriptCurrInstr[2]; + if (gBattleMons[gBattlerAttacker].item == ITEM_ENIGMA_BERRY) holdEffectAtk = gEnigmaBerries[gBattlerAttacker].holdEffect; else holdEffectAtk = ItemId_GetHoldEffect(gBattleMons[gBattlerAttacker].item); + choicedMoveAtk = &gBattleStruct->choicedMove[gBattlerAttacker]; GET_MOVE_TYPE(gCurrentMove, moveType); + do { - switch (gBattleScripting.atk49_state) + switch (gBattleScripting.moveendState) { - case ATK49_RAGE: // rage check + case MOVEEND_RAGE: // rage check if (gBattleMons[gBattlerTarget].status2 & STATUS2_RAGE - && gBattleMons[gBattlerTarget].hp != 0 - && gBattlerAttacker != gBattlerTarget - && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget) - && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) - && TARGET_TURN_DAMAGED - && gBattleMoves[gCurrentMove].power - && gBattleMons[gBattlerTarget].statStages[STAT_ATK] <= 0xB) + && gBattleMons[gBattlerTarget].hp != 0 + && gBattlerAttacker != gBattlerTarget + && GetBattlerSide(gBattlerAttacker) != GetBattlerSide(gBattlerTarget) + && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) + && TARGET_TURN_DAMAGED + && gBattleMoves[gCurrentMove].power != 0 + && gBattleMons[gBattlerTarget].statStages[STAT_ATK] < MAX_STAT_STAGE) { - ++gBattleMons[gBattlerTarget].statStages[STAT_ATK]; + gBattleMons[gBattlerTarget].statStages[STAT_ATK]++; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_RageIsBuilding; effect = TRUE; } - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_DEFROST: // defrosting check + case MOVEEND_DEFROST: // defrosting check if (gBattleMons[gBattlerTarget].status1 & STATUS1_FREEZE - && gBattleMons[gBattlerTarget].hp != 0 - && gBattlerAttacker != gBattlerTarget - && gSpecialStatuses[gBattlerTarget].specialDmg - && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) - && moveType == TYPE_FIRE) + && gBattleMons[gBattlerTarget].hp != 0 + && gBattlerAttacker != gBattlerTarget + && gSpecialStatuses[gBattlerTarget].specialDmg + && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) + && moveType == TYPE_FIRE) { - gBattleMons[gBattlerTarget].status1 &= ~(STATUS1_FREEZE); + gBattleMons[gBattlerTarget].status1 &= ~STATUS1_FREEZE; gActiveBattler = gBattlerTarget; - BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBattlerTarget].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, sizeof(gBattleMons[gBattlerTarget].status1), &gBattleMons[gBattlerTarget].status1); MarkBattlerForControllerExec(gActiveBattler); BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_DefrostedViaFireMove; effect = TRUE; } - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_SYNCHRONIZE_TARGET: // target synchronize + case MOVEEND_SYNCHRONIZE_TARGET: // target synchronize if (AbilityBattleEffects(ABILITYEFFECT_SYNCHRONIZE, gBattlerTarget, 0, 0, 0)) effect = TRUE; - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_MOVE_END_ABILITIES: // Such as abilities activating on contact(Poison Spore, Rough Skin, etc.). + case MOVEEND_ON_DAMAGE_ABILITIES: // Such as abilities activating on contact(Poison Spore, Rough Skin, etc.). if (AbilityBattleEffects(ABILITYEFFECT_MOVE_END, gBattlerTarget, 0, 0, 0)) effect = TRUE; - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_STATUS_IMMUNITY_ABILITIES: // status immunities + case MOVEEND_IMMUNITY_ABILITIES: // status immunities if (AbilityBattleEffects(ABILITYEFFECT_IMMUNITY, 0, 0, 0, 0)) effect = TRUE; // it loops through all battlers, so we increment after its done with all battlers else - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_SYNCHRONIZE_ATTACKER: // attacker synchronize + case MOVEEND_SYNCHRONIZE_ATTACKER: // attacker synchronize if (AbilityBattleEffects(ABILITYEFFECT_ATK_SYNCHRONIZE, gBattlerAttacker, 0, 0, 0)) effect = TRUE; - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_CHOICE_MOVE: // update choice band move + case MOVEEND_CHOICE_MOVE: // update choice band move if (gHitMarker & HITMARKER_OBEYS && holdEffectAtk == HOLD_EFFECT_CHOICE_BAND && gChosenMove != MOVE_STRUGGLE @@ -4047,22 +4042,22 @@ static void atk49_moveend(void) { if (gChosenMove == MOVE_BATON_PASS && !(gMoveResultFlags & MOVE_RESULT_FAILED)) { - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; } *choicedMoveAtk = gChosenMove; } - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) { if (gBattleMons[gBattlerAttacker].moves[i] == *choicedMoveAtk) break; } if (i == MAX_MON_MOVES) *choicedMoveAtk = 0; - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_CHANGED_ITEMS: // changed held items - for (i = 0; i < gBattlersCount; ++i) + case MOVEEND_CHANGED_ITEMS: // changed held items + for (i = 0; i < gBattlersCount; i++) { u16 *changedItem = &gBattleStruct->changedItems[i]; @@ -4072,69 +4067,69 @@ static void atk49_moveend(void) *changedItem = 0; } } - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_ITEM_EFFECTS_ALL: // item effects for all battlers + case MOVEEND_ITEM_EFFECTS_ALL: // item effects for all battlers if (ItemBattleEffects(ITEMEFFECT_MOVE_END, 0, FALSE)) effect = TRUE; else - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_KINGSROCK_SHELLBELL: // king's rock and shell bell + case MOVEEND_KINGSROCK_SHELLBELL: // king's rock and shell bell if (ItemBattleEffects(ITEMEFFECT_KINGSROCK_SHELLBELL, 0, FALSE)) effect = TRUE; - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_ATTACKER_INVISIBLE: // make attacker sprite invisible + case MOVEEND_ATTACKER_INVISIBLE: // make attacker sprite invisible if (gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE) && gHitMarker & HITMARKER_NO_ANIMATIONS) { gActiveBattler = gBattlerAttacker; - BtlController_EmitSpriteInvisibility(0, TRUE); + BtlController_EmitSpriteInvisibility(BUFFER_A, TRUE); MarkBattlerForControllerExec(gActiveBattler); - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; return; } - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_ATTACKER_VISIBLE: // make attacker sprite visible + case MOVEEND_ATTACKER_VISIBLE: // make attacker sprite visible if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || !(gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE)) || WasUnableToUseMove(gBattlerAttacker)) { gActiveBattler = gBattlerAttacker; - BtlController_EmitSpriteInvisibility(0, FALSE); + BtlController_EmitSpriteInvisibility(BUFFER_A, FALSE); MarkBattlerForControllerExec(gActiveBattler); gStatuses3[gBattlerAttacker] &= ~(STATUS3_SEMI_INVULNERABLE); gSpecialStatuses[gBattlerAttacker].restoredBattlerSprite = 1; - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; return; } - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_TARGET_VISIBLE: // make target sprite visible + case MOVEEND_TARGET_VISIBLE: // make target sprite visible if (!gSpecialStatuses[gBattlerTarget].restoredBattlerSprite && gBattlerTarget < gBattlersCount && !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE)) { gActiveBattler = gBattlerTarget; - BtlController_EmitSpriteInvisibility(0, FALSE); + BtlController_EmitSpriteInvisibility(BUFFER_A, FALSE); MarkBattlerForControllerExec(gActiveBattler); gStatuses3[gBattlerTarget] &= ~(STATUS3_SEMI_INVULNERABLE); - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; return; } - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_SUBSTITUTE: // update substitute - for (i = 0; i < gBattlersCount; ++i) + case MOVEEND_SUBSTITUTE: // update substitute + for (i = 0; i < gBattlersCount; i++) { if (gDisableStructs[i].substituteHP == 0) gBattleMons[i].status2 &= ~(STATUS2_SUBSTITUTE); } - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_UPDATE_LAST_MOVES: + case MOVEEND_UPDATE_LAST_MOVES: if (gHitMarker & HITMARKER_SWAP_ATTACKER_TARGET) { gActiveBattler = gBattlerAttacker; @@ -4147,8 +4142,8 @@ static void atk49_moveend(void) gLastPrintedMoves[gBattlerAttacker] = gChosenMove; } if (!(gAbsentBattlerFlags & gBitTable[gBattlerAttacker]) - && !(gBattleStruct->absentBattlerFlags & gBitTable[gBattlerAttacker]) - && gBattleMoves[originallyUsedMove].effect != EFFECT_BATON_PASS) + && !(gBattleStruct->absentBattlerFlags & gBitTable[gBattlerAttacker]) + && gBattleMoves[originallyUsedMove].effect != EFFECT_BATON_PASS) { if (gHitMarker & HITMARKER_OBEYS) { @@ -4157,8 +4152,8 @@ static void atk49_moveend(void) } else { - gLastMoves[gBattlerAttacker] = 0xFFFF; - gLastResultingMoves[gBattlerAttacker] = 0xFFFF; + gLastMoves[gBattlerAttacker] = MOVE_UNAVAILABLE; + gLastResultingMoves[gBattlerAttacker] = MOVE_UNAVAILABLE; } if (!(gHitMarker & HITMARKER_FAINTED(gBattlerTarget))) @@ -4166,7 +4161,7 @@ static void atk49_moveend(void) if (gHitMarker & HITMARKER_OBEYS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - if (gChosenMove == 0xFFFF) + if (gChosenMove == MOVE_UNAVAILABLE) { gLastLandedMoves[gBattlerTarget] = gChosenMove; } @@ -4178,19 +4173,19 @@ static void atk49_moveend(void) } else { - gLastLandedMoves[gBattlerTarget] = 0xFFFF; + gLastLandedMoves[gBattlerTarget] = MOVE_UNAVAILABLE; } } - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_MIRROR_MOVE: // mirror move + case MOVEEND_MIRROR_MOVE: // mirror move if (!(gAbsentBattlerFlags & gBitTable[gBattlerAttacker]) - && !(gBattleStruct->absentBattlerFlags & gBitTable[gBattlerAttacker]) - && gBattleMoves[originallyUsedMove].flags & FLAG_MIRROR_MOVE_AFFECTED - && gHitMarker & HITMARKER_OBEYS - && gBattlerAttacker != gBattlerTarget - && !(gHitMarker & HITMARKER_FAINTED(gBattlerTarget)) - && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) + && !(gBattleStruct->absentBattlerFlags & gBitTable[gBattlerAttacker]) + && gBattleMoves[originallyUsedMove].flags & FLAG_MIRROR_MOVE_AFFECTED + && gHitMarker & HITMARKER_OBEYS + && gBattlerAttacker != gBattlerTarget + && !(gHitMarker & HITMARKER_FAINTED(gBattlerTarget)) + && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { u8 target, attacker; @@ -4203,9 +4198,9 @@ static void atk49_moveend(void) attacker = gBattlerAttacker; *(attacker * 2 + target * 8 + (gBattleStruct->lastTakenMoveFrom) + 1) = gChosenMove >> 8; } - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_NEXT_TARGET: // For moves hitting two opposing Pokemon. + case MOVEEND_NEXT_TARGET: // For moves hitting two opposing Pokemon. if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !gProtectStructs[gBattlerAttacker].chargingTurn @@ -4217,7 +4212,7 @@ static void atk49_moveend(void) { gBattlerTarget = battlerId; gHitMarker |= HITMARKER_NO_ATTACKSTRING; - gBattleScripting.atk49_state = 0; + gBattleScripting.moveendState = 0; MoveValuesCleanUp(); BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]); gBattlescriptCurrInstr = BattleScript_FlushMessageBox; @@ -4228,22 +4223,22 @@ static void atk49_moveend(void) gHitMarker |= HITMARKER_NO_ATTACKSTRING; } } - ++gBattleScripting.atk49_state; + gBattleScripting.moveendState++; break; - case ATK49_COUNT: + case MOVEEND_COUNT: break; } - if (arg1 == 1 && effect == FALSE) - gBattleScripting.atk49_state = ATK49_COUNT; - if (arg1 == 2 && arg2 == gBattleScripting.atk49_state) - gBattleScripting.atk49_state = ATK49_COUNT; + if (endMode == 1 && effect == FALSE) + gBattleScripting.moveendState = MOVEEND_COUNT; + if (endMode == 2 && endState == gBattleScripting.moveendState) + gBattleScripting.moveendState = MOVEEND_COUNT; } - while (gBattleScripting.atk49_state != ATK49_COUNT && effect == FALSE); - if (gBattleScripting.atk49_state == ATK49_COUNT && effect == FALSE) + while (gBattleScripting.moveendState != MOVEEND_COUNT && effect == FALSE); + if (gBattleScripting.moveendState == MOVEEND_COUNT && effect == FALSE) gBattlescriptCurrInstr += 3; } -static void atk4A_typecalc2(void) +static void Cmd_typecalc2(void) { u8 flags = 0; s32 i = 0; @@ -4273,6 +4268,7 @@ static void atk4A_typecalc2(void) continue; } } + if (TYPE_EFFECT_ATK_TYPE(i) == moveType) { // check type1 @@ -4296,20 +4292,20 @@ static void atk4A_typecalc2(void) if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type2) { if (gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2 - && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT) + && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NO_EFFECT) { gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE; break; } if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type2 - && gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2 - && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE) + && gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2 + && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_NOT_EFFECTIVE) { flags |= MOVE_RESULT_NOT_VERY_EFFECTIVE; } if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type2 - && gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2 - && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE) + && gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2 + && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE) { flags |= MOVE_RESULT_SUPER_EFFECTIVE; } @@ -4318,11 +4314,12 @@ static void atk4A_typecalc2(void) i += 3; } } + if (gBattleMons[gBattlerTarget].ability == ABILITY_WONDER_GUARD - && !(flags & MOVE_RESULT_NO_EFFECT) - && AttacksThisTurn(gBattlerAttacker, gCurrentMove) == 2 - && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE))) - && gBattleMoves[gCurrentMove].power) + && !(flags & MOVE_RESULT_NO_EFFECT) + && AttacksThisTurn(gBattlerAttacker, gCurrentMove) == 2 + && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE))) + && gBattleMoves[gCurrentMove].power) { gLastUsedAbility = ABILITY_WONDER_GUARD; gMoveResultFlags |= MOVE_RESULT_MISSED; @@ -4332,23 +4329,24 @@ static void atk4A_typecalc2(void) } if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) gProtectStructs[gBattlerAttacker].targetNotAffected = 1; - ++gBattlescriptCurrInstr; + + gBattlescriptCurrInstr++; } -static void atk4B_returnatktoball(void) +static void Cmd_returnatktoball(void) { gActiveBattler = gBattlerAttacker; if (!(gHitMarker & HITMARKER_FAINTED(gActiveBattler))) { - BtlController_EmitReturnMonToBall(0, 0); + BtlController_EmitReturnMonToBall(BUFFER_A, FALSE); MarkBattlerForControllerExec(gActiveBattler); } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk4C_getswitchedmondata(void) +static void Cmd_getswitchedmondata(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); gBattlerPartyIndexes[gActiveBattler] = *(gBattleStruct->monToSwitchIntoId + gActiveBattler); @@ -4358,18 +4356,18 @@ static void atk4C_getswitchedmondata(void) } } -static void atk4D_switchindataupdate(void) +static void Cmd_switchindataupdate(void) { struct BattlePokemon oldData; s32 i; u8 *monData; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); oldData = gBattleMons[gActiveBattler]; monData = (u8 *)(&gBattleMons[gActiveBattler]); - for (i = 0; i < sizeof(struct BattlePokemon); ++i) + for (i = 0; i < sizeof(struct BattlePokemon); i++) { monData[i] = gBattleBufferB[gActiveBattler][4 + i]; } @@ -4382,7 +4380,7 @@ static void atk4D_switchindataupdate(void) gBattleMons[gActiveBattler].item = 0; if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS) { - for (i = 0; i < NUM_BATTLE_STATS; ++i) + for (i = 0; i < NUM_BATTLE_STATS; i++) { gBattleMons[gActiveBattler].statStages[i] = oldData.statStages[i]; } @@ -4395,9 +4393,9 @@ static void atk4D_switchindataupdate(void) } } -static void atk4E_switchinanim(void) +static void Cmd_switchinanim(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT @@ -4416,7 +4414,7 @@ static void atk4E_switchinanim(void) } } -static void atk4F_jumpifcantswitch(void) +static void Cmd_jumpifcantswitch(void) { s32 i; s32 lastMonId; @@ -4439,7 +4437,7 @@ static void atk4F_jumpifcantswitch(void) i = 0; if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gActiveBattler)) == TRUE) i = 3; - for (lastMonId = i + 3; i < lastMonId; ++i) + for (lastMonId = i + 3; i < lastMonId; i++) { if (GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&party[i], MON_DATA_IS_EGG) @@ -4474,7 +4472,7 @@ static void atk4F_jumpifcantswitch(void) battlerIn2 = battlerIn1; party = gPlayerParty; } - for (i = 0; i < PARTY_SIZE; ++i) + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 && GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE @@ -4490,14 +4488,14 @@ static void atk4F_jumpifcantswitch(void) } } -static void sub_8024398(u8 arg0) +static void ChooseMonToSendOut(u8 arg0) { *(gBattleStruct->battlerPartyIndexes + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler]; BtlController_EmitChoosePokemon(0, PARTY_ACTION_SEND_OUT, arg0, 0, gBattleStruct->battlerPartyOrders[gActiveBattler]); MarkBattlerForControllerExec(gActiveBattler); } -static void atk50_openpartyscreen(void) +static void Cmd_openpartyscreen(void) { u32 flags; u8 hitmarkerFaintBits; @@ -4515,22 +4513,22 @@ static void atk50_openpartyscreen(void) { if (gHitMarker & HITMARKER_FAINTED(gActiveBattler)) { - if (HasNoMonsToSwitch(gActiveBattler, 6, 6)) + if (HasNoMonsToSwitch(gActiveBattler, PARTY_SIZE, PARTY_SIZE)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; - gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); - BtlController_EmitLinkStandbyMsg(0, 2); + gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); } - else if (!gSpecialStatuses[gActiveBattler].flag40) + else if (!gSpecialStatuses[gActiveBattler].faintedHasReplacement) { - sub_8024398(6); - gSpecialStatuses[gActiveBattler].flag40 = 1; + ChooseMonToSendOut(6); + gSpecialStatuses[gActiveBattler].faintedHasReplacement = TRUE; } } else { - BtlController_EmitLinkStandbyMsg(0, 2); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); } } @@ -4543,21 +4541,21 @@ static void atk50_openpartyscreen(void) if (gBitTable[0] & hitmarkerFaintBits) { gActiveBattler = 0; - if (HasNoMonsToSwitch(0, 6, 6)) + if (HasNoMonsToSwitch(gActiveBattler, PARTY_SIZE, PARTY_SIZE)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; - gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); - BtlController_EmitCmd42(0); + gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler); + BtlController_EmitCantSwitch(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); } - else if (!gSpecialStatuses[gActiveBattler].flag40) + else if (!gSpecialStatuses[gActiveBattler].faintedHasReplacement) { - sub_8024398(gBattleStruct->monToSwitchIntoId[2]); - gSpecialStatuses[gActiveBattler].flag40 = 1; + ChooseMonToSendOut(gBattleStruct->monToSwitchIntoId[2]); + gSpecialStatuses[gActiveBattler].faintedHasReplacement = TRUE; } else { - BtlController_EmitLinkStandbyMsg(0, 2); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); flags |= 1; } @@ -4565,42 +4563,42 @@ static void atk50_openpartyscreen(void) if (gBitTable[2] & hitmarkerFaintBits && !(gBitTable[0] & hitmarkerFaintBits)) { gActiveBattler = 2; - if (HasNoMonsToSwitch(2, 6, 6)) + if (HasNoMonsToSwitch(gActiveBattler, PARTY_SIZE, PARTY_SIZE)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; - gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); - BtlController_EmitCmd42(0); + gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler); + BtlController_EmitCantSwitch(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); } - else if (!gSpecialStatuses[gActiveBattler].flag40) + else if (!gSpecialStatuses[gActiveBattler].faintedHasReplacement) { - sub_8024398(gBattleStruct->monToSwitchIntoId[0]); - gSpecialStatuses[gActiveBattler].flag40 = 1; + ChooseMonToSendOut(gBattleStruct->monToSwitchIntoId[0]); + gSpecialStatuses[gActiveBattler].faintedHasReplacement = TRUE; } else if (!(flags & 1)) { - BtlController_EmitLinkStandbyMsg(0, 2); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); } } if (gBitTable[1] & hitmarkerFaintBits) { gActiveBattler = 1; - if (HasNoMonsToSwitch(1, 6, 6)) + if (HasNoMonsToSwitch(gActiveBattler, PARTY_SIZE, PARTY_SIZE)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; - gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); - BtlController_EmitCmd42(0); + gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler); + BtlController_EmitCantSwitch(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); } - else if (!gSpecialStatuses[gActiveBattler].flag40) + else if (!gSpecialStatuses[gActiveBattler].faintedHasReplacement) { - sub_8024398(gBattleStruct->monToSwitchIntoId[3]); - gSpecialStatuses[gActiveBattler].flag40 = 1; + ChooseMonToSendOut(gBattleStruct->monToSwitchIntoId[3]); + gSpecialStatuses[gActiveBattler].faintedHasReplacement = TRUE; } else { - BtlController_EmitLinkStandbyMsg(0, 2); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); flags |= 2; } @@ -4608,28 +4606,28 @@ static void atk50_openpartyscreen(void) if (gBitTable[3] & hitmarkerFaintBits && !(gBitTable[1] & hitmarkerFaintBits)) { gActiveBattler = 3; - if (HasNoMonsToSwitch(3, 6, 6)) + if (HasNoMonsToSwitch(gActiveBattler, PARTY_SIZE, PARTY_SIZE)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; - gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); - BtlController_EmitCmd42(0); + gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler); + BtlController_EmitCantSwitch(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); } - else if (!gSpecialStatuses[gActiveBattler].flag40) + else if (!gSpecialStatuses[gActiveBattler].faintedHasReplacement) { - sub_8024398(gBattleStruct->monToSwitchIntoId[1]); - gSpecialStatuses[gActiveBattler].flag40 = 1; + ChooseMonToSendOut(gBattleStruct->monToSwitchIntoId[1]); + gSpecialStatuses[gActiveBattler].faintedHasReplacement = TRUE; } else if (!(flags & 2)) { - BtlController_EmitLinkStandbyMsg(0, 2); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); } } - flag40_0 = gSpecialStatuses[0].flag40; + flag40_0 = gSpecialStatuses[0].faintedHasReplacement; if (!flag40_0) { - flag40_2 = gSpecialStatuses[2].flag40; + flag40_2 = gSpecialStatuses[2].faintedHasReplacement; if (!flag40_2 && hitmarkerFaintBits != 0) { if (gAbsentBattlerFlags & gBitTable[0]) @@ -4637,22 +4635,22 @@ static void atk50_openpartyscreen(void) else gActiveBattler = 0; - BtlController_EmitLinkStandbyMsg(0, 2); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); } } - flag40_1 = gSpecialStatuses[1].flag40; + flag40_1 = gSpecialStatuses[1].faintedHasReplacement; if (!flag40_1) { - flag40_3 = gSpecialStatuses[3].flag40; + flag40_3 = gSpecialStatuses[3].faintedHasReplacement; if (!flag40_3 && hitmarkerFaintBits != 0) { if (gAbsentBattlerFlags & gBitTable[1]) gActiveBattler = 3; else gActiveBattler = 1; - BtlController_EmitLinkStandbyMsg(0, 2); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); } } @@ -4665,37 +4663,37 @@ static void atk50_openpartyscreen(void) { if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - hitmarkerFaintBits = gHitMarker >> 0x1C; + hitmarkerFaintBits = gHitMarker >> 28; if (gBitTable[2] & hitmarkerFaintBits && gBitTable[0] & hitmarkerFaintBits) { gActiveBattler = 2; - if (HasNoMonsToSwitch(2, gBattleBufferB[0][1], 6)) + if (HasNoMonsToSwitch(gActiveBattler, gBattleBufferB[0][1], PARTY_SIZE)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; - gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); - BtlController_EmitCmd42(0); + gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler); + BtlController_EmitCantSwitch(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); } - else if (!gSpecialStatuses[gActiveBattler].flag40) + else if (!gSpecialStatuses[gActiveBattler].faintedHasReplacement) { - sub_8024398(gBattleStruct->monToSwitchIntoId[0]); - gSpecialStatuses[gActiveBattler].flag40 = 1; + ChooseMonToSendOut(gBattleStruct->monToSwitchIntoId[0]); + gSpecialStatuses[gActiveBattler].faintedHasReplacement = TRUE; } } if (gBitTable[3] & hitmarkerFaintBits && hitmarkerFaintBits & gBitTable[1]) { gActiveBattler = 3; - if (HasNoMonsToSwitch(3, gBattleBufferB[1][1], 6)) + if (HasNoMonsToSwitch(gActiveBattler, gBattleBufferB[1][1], 6)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; - gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); - BtlController_EmitCmd42(0); + gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler); + BtlController_EmitCantSwitch(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); } - else if (!gSpecialStatuses[gActiveBattler].flag40) + else if (!gSpecialStatuses[gActiveBattler].faintedHasReplacement) { - sub_8024398(gBattleStruct->monToSwitchIntoId[1]); - gSpecialStatuses[gActiveBattler].flag40 = 1; + ChooseMonToSendOut(gBattleStruct->monToSwitchIntoId[1]); + gSpecialStatuses[gActiveBattler].faintedHasReplacement = TRUE; } } gBattlescriptCurrInstr += 6; @@ -4719,7 +4717,7 @@ static void atk50_openpartyscreen(void) break; if (gBattlerFainted >= gBattlersCount) break; - ++gBattlerFainted; + gBattlerFainted++; } if (gBattlerFainted == gBattlersCount) @@ -4732,15 +4730,15 @@ static void atk50_openpartyscreen(void) else hitmarkerFaintBits = PARTY_ACTION_SEND_OUT; battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(OPEN_PARTY_ALLOW_CANCEL)); - if (gSpecialStatuses[battlerId].flag40) + if (gSpecialStatuses[battlerId].faintedHasReplacement) { gBattlescriptCurrInstr += 6; } - else if (HasNoMonsToSwitch(battlerId, 6, 6)) + else if (HasNoMonsToSwitch(battlerId, PARTY_SIZE, PARTY_SIZE)) { gActiveBattler = battlerId; gAbsentBattlerFlags |= gBitTable[gActiveBattler]; - gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); + gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler); gBattlescriptCurrInstr = jumpPtr; } else @@ -4759,7 +4757,7 @@ static void atk50_openpartyscreen(void) { if (gActiveBattler != battlerId) { - BtlController_EmitLinkStandbyMsg(0, 2); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); } } @@ -4769,24 +4767,24 @@ static void atk50_openpartyscreen(void) gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(battlerId) ^ BIT_SIDE); if (gAbsentBattlerFlags & gBitTable[gActiveBattler]) gActiveBattler ^= BIT_FLANK; - BtlController_EmitLinkStandbyMsg(0, 2); + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); } } } } -static void atk51_switchhandleorder(void) +static void Cmd_switchhandleorder(void) { s32 i; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); switch (gBattlescriptCurrInstr[2]) { case 0: - for (i = 0; i < gBattlersCount; ++i) + for (i = 0; i < gBattlersCount; i++) if (gBattleBufferB[i][0] == 0x22) *(gBattleStruct->monToSwitchIntoId + i) = gBattleBufferB[i][1]; break; @@ -4819,14 +4817,14 @@ static void atk51_switchhandleorder(void) } } -static void atk52_switchineffects(void) +static void Cmd_switchineffects(void) { s32 i; gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); UpdateSentPokesToOpponentValue(gActiveBattler); - gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); - gSpecialStatuses[gActiveBattler].flag40 = 0; + gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler); + gSpecialStatuses[gActiveBattler].faintedHasReplacement = FALSE; if (!(gSideStatuses[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES_DAMAGED) && (gSideStatuses[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES) && !IS_BATTLER_OF_TYPE(gActiveBattler, TYPE_FLYING) @@ -4853,16 +4851,17 @@ static void atk52_switchineffects(void) if (gBattleMons[gActiveBattler].ability == ABILITY_TRUANT) gDisableStructs[gActiveBattler].truantCounter = 1; if (!AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0) - && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE)) + && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE)) { - gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED); + gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~SIDE_STATUS_SPIKES_DAMAGED; - for (i = 0; i < gBattlersCount; ++i) + for (i = 0; i < gBattlersCount; i++) { if (gBattlerByTurnOrder[i] == gActiveBattler) gActionsByTurnOrder[i] = B_ACTION_CANCEL_PARTNER; } - for (i = 0; i < gBattlersCount; ++i) + + for (i = 0; i < gBattlersCount; i++) { u16 *hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(i)]; *hpOnSwitchout = gBattleMons[i].hp; @@ -4870,16 +4869,16 @@ static void atk52_switchineffects(void) if (gBattlescriptCurrInstr[1] == 5) { - u32 hitmarkerFaintBits = gHitMarker >> 0x1C; + u32 hitmarkerFaintBits = gHitMarker >> 28; - ++gBattlerFainted; + gBattlerFainted++; while (TRUE) { if (hitmarkerFaintBits & gBitTable[gBattlerFainted] && !(gAbsentBattlerFlags & gBitTable[gBattlerFainted])) break; if (gBattlerFainted >= gBattlersCount) break; - ++gBattlerFainted; + gBattlerFainted++; } } gBattlescriptCurrInstr += 2; @@ -4887,70 +4886,70 @@ static void atk52_switchineffects(void) } } -static void atk53_trainerslidein(void) +static void Cmd_trainerslidein(void) { if (!gBattlescriptCurrInstr[1]) gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); else gActiveBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); - BtlController_EmitTrainerSlide(0); + BtlController_EmitTrainerSlide(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; } -static void atk54_playse(void) +static void Cmd_playse(void) { gActiveBattler = gBattlerAttacker; - BtlController_EmitPlaySE(0, T2_READ_16(gBattlescriptCurrInstr + 1)); + BtlController_EmitPlaySE(BUFFER_A, T2_READ_16(gBattlescriptCurrInstr + 1)); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 3; } -static void atk55_fanfare(void) +static void Cmd_fanfare(void) { gActiveBattler = gBattlerAttacker; - BtlController_EmitPlayFanfare(0, T2_READ_16(gBattlescriptCurrInstr + 1)); + BtlController_EmitPlayFanfare(BUFFER_A, T2_READ_16(gBattlescriptCurrInstr + 1)); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 3; } -static void atk56_playfaintcry(void) +static void Cmd_playfaintcry(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - BtlController_EmitFaintingCry(0); + BtlController_EmitFaintingCry(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; } -static void atk57(void) +static void Cmd_endlinkbattle(void) { gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); - BtlController_EmitCmd55(0, gBattleOutcome); + BtlController_EmitEndLinkBattle(BUFFER_A, gBattleOutcome); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 1; } -static void atk58_returntoball(void) +static void Cmd_returntoball(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - BtlController_EmitReturnMonToBall(0, 1); + BtlController_EmitReturnMonToBall(BUFFER_A, TRUE); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; } -static void atk59_handlelearnnewmove(void) +static void Cmd_handlelearnnewmove(void) { - const u8 *jumpPtr1 = T1_READ_PTR(gBattlescriptCurrInstr + 1); - const u8 *jumpPtr2 = T1_READ_PTR(gBattlescriptCurrInstr + 5); - u16 ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], gBattlescriptCurrInstr[9]); + const u8 *learnedMovePtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); + const u8 *nothingToLearnPtr = T1_READ_PTR(gBattlescriptCurrInstr + 5); + u16 learnMove = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], gBattlescriptCurrInstr[9]); - while (ret == 0xFFFE) - ret = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], 0); - if (ret == 0) + while (learnMove == MON_ALREADY_KNOWS_MOVE) + learnMove = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], FALSE); + if (learnMove == MOVE_NONE) { - gBattlescriptCurrInstr = jumpPtr2; + gBattlescriptCurrInstr = nothingToLearnPtr; } - else if (ret == 0xFFFF) + else if (learnMove == MON_HAS_MAX_MOVES) { gBattlescriptCurrInstr += 10; } @@ -4958,24 +4957,24 @@ static void atk59_handlelearnnewmove(void) { gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId - && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) + && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) { - GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret); + GiveMoveToBattleMon(&gBattleMons[gActiveBattler], learnMove); } if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId - && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) + && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) { - GiveMoveToBattleMon(&gBattleMons[gActiveBattler], ret); + GiveMoveToBattleMon(&gBattleMons[gActiveBattler], learnMove); } } - gBattlescriptCurrInstr = jumpPtr1; + gBattlescriptCurrInstr = learnedMovePtr; } } -static void atk5A_yesnoboxlearnmove(void) +static void Cmd_yesnoboxlearnmove(void) { gActiveBattler = 0; @@ -5079,7 +5078,7 @@ static void atk5A_yesnoboxlearnmove(void) gBattlescriptCurrInstr += 5; break; case 5: - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gBattleScripting.learnMoveState = 2; } @@ -5087,7 +5086,7 @@ static void atk5A_yesnoboxlearnmove(void) } } -static void atk5B_yesnoboxstoplearningmove(void) +static void Cmd_yesnoboxstoplearningmove(void) { switch (gBattleScripting.learnMoveState) { @@ -5133,7 +5132,7 @@ static void atk5B_yesnoboxstoplearningmove(void) } } -static void atk5C_hitanimation(void) +static void Cmd_hitanimation(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT) @@ -5154,7 +5153,7 @@ static void atk5C_hitanimation(void) } } -static void atk5D_getmoneyreward(void) +static void Cmd_getmoneyreward(void) { u32 i = 0; u32 moneyReward; @@ -5222,7 +5221,7 @@ static void atk5D_getmoneyreward(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atk5E(void) +static void Cmd_updatebattlermoves(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); @@ -5234,12 +5233,12 @@ static void atk5E(void) ++gBattleCommunication[0]; break; case 1: - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { s32 i; struct BattlePokemon *bufferPoke = (struct BattlePokemon *) &gBattleBufferB[gActiveBattler][4]; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) { gBattleMons[gActiveBattler].moves[i] = bufferPoke->moves[i]; gBattleMons[gActiveBattler].pp[i] = bufferPoke->pp[i]; @@ -5250,32 +5249,35 @@ static void atk5E(void) } } -static void atk5F_swapattackerwithtarget(void) +static void Cmd_swapattackerwithtarget(void) { gActiveBattler = gBattlerAttacker; gBattlerAttacker = gBattlerTarget; gBattlerTarget = gActiveBattler; + if (gHitMarker & HITMARKER_SWAP_ATTACKER_TARGET) - gHitMarker &= ~(HITMARKER_SWAP_ATTACKER_TARGET); + gHitMarker &= ~HITMARKER_SWAP_ATTACKER_TARGET; else gHitMarker |= HITMARKER_SWAP_ATTACKER_TARGET; - ++gBattlescriptCurrInstr; + + gBattlescriptCurrInstr++; } -static void atk60_incrementgamestat(void) +static void Cmd_incrementgamestat(void) { if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) IncrementGameStat(gBattlescriptCurrInstr[1]); + gBattlescriptCurrInstr += 2; } -static void atk61_drawpartystatussummary(void) +static void Cmd_drawpartystatussummary(void) { s32 i; struct Pokemon *party; struct HpAndStatus hpStatuses[PARTY_SIZE]; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); @@ -5284,7 +5286,7 @@ static void atk61_drawpartystatussummary(void) else party = gEnemyParty; - for (i = 0; i < PARTY_SIZE; ++i) + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_NONE || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) @@ -5304,7 +5306,7 @@ static void atk61_drawpartystatussummary(void) } } -static void atk62_hidepartystatussummary(void) +static void Cmd_hidepartystatussummary(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); BtlController_EmitHidePartyStatusSummary(0); @@ -5312,7 +5314,7 @@ static void atk62_hidepartystatussummary(void) gBattlescriptCurrInstr += 2; } -static void atk63_jumptocalledmove(void) +static void Cmd_jumptocalledmove(void) { if (gBattlescriptCurrInstr[1]) gCurrentMove = gCalledMove; @@ -5321,9 +5323,9 @@ static void atk63_jumptocalledmove(void) gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; } -static void atk64_statusanimation(void) +static void Cmd_statusanimation(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE) @@ -5337,11 +5339,11 @@ static void atk64_statusanimation(void) } } -static void atk65_status2animation(void) +static void Cmd_status2animation(void) { u32 wantedToAnimate; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); wantedToAnimate = T1_READ_32(gBattlescriptCurrInstr + 2); @@ -5356,11 +5358,11 @@ static void atk65_status2animation(void) } } -static void atk66_chosenstatusanimation(void) +static void Cmd_chosenstatusanimation(void) { u32 wantedStatus; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); wantedStatus = T1_READ_32(gBattlescriptCurrInstr + 3); @@ -5375,7 +5377,7 @@ static void atk66_chosenstatusanimation(void) } } -static void atk67_yesnobox(void) +static void Cmd_yesnobox(void) { switch (gBattleCommunication[0]) { @@ -5406,29 +5408,29 @@ static void atk67_yesnobox(void) gBattleCommunication[CURSOR_POSITION] = 1; PlaySE(SE_SELECT); HandleBattleWindow(0x17, 8, 0x1D, 0xD, WINDOW_CLEAR); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); HandleBattleWindow(0x17, 8, 0x1D, 0xD, WINDOW_CLEAR); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } break; } } -static void atk68_cancelallactions(void) +static void Cmd_cancelallactions(void) { s32 i; - for (i = 0; i < gBattlersCount; ++i) + for (i = 0; i < gBattlersCount; i++) gActionsByTurnOrder[i] = B_ACTION_CANCEL_PARTNER; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } // The same as 0x7, except there's no random damage multiplier. -static void atk69_adjustsetdamage(void) +static void Cmd_adjustsetdamage(void) { u8 holdEffect, param; @@ -5463,10 +5465,10 @@ static void atk69_adjustsetdamage(void) gLastUsedItem = gBattleMons[gBattlerTarget].item; } } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk6A_removeitem(void) +static void Cmd_removeitem(void) { u16 *usedHeldItem; @@ -5474,39 +5476,39 @@ static void atk6A_removeitem(void) usedHeldItem = &gBattleStruct->usedHeldItems[gActiveBattler]; *usedHeldItem = gBattleMons[gActiveBattler].item; gBattleMons[gActiveBattler].item = ITEM_NONE; - BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; } -static void atk6B_atknameinbuff1(void) +static void Cmd_atknameinbuff1(void) { PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattlerPartyIndexes[gBattlerAttacker]) - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk6C_drawlvlupbox(void) +static void Cmd_drawlvlupbox(void) { - if (gBattleScripting.atk6C_state == 0) + if (gBattleScripting.drawlvlupboxState == 0) { if (IsMonGettingExpSentOut()) - gBattleScripting.atk6C_state = 3; + gBattleScripting.drawlvlupboxState = 3; else - gBattleScripting.atk6C_state = 1; + gBattleScripting.drawlvlupboxState = 1; } - switch (gBattleScripting.atk6C_state) + switch (gBattleScripting.drawlvlupboxState) { case 1: gBattle_BG2_Y = 0x60; SetBgAttribute(2, BG_ATTR_PRIORITY, 0); ShowBg(2); sub_8026480(); - gBattleScripting.atk6C_state = 2; + gBattleScripting.drawlvlupboxState = 2; break; case 2: - if (!sub_80264D0()) - gBattleScripting.atk6C_state = 3; + if (!SlideInLevelUpBanner()) + gBattleScripting.drawlvlupboxState = 3; break; case 3: gBattle_BG1_X = 0; @@ -5516,20 +5518,20 @@ static void atk6C_drawlvlupbox(void) ShowBg(0); ShowBg(1); HandleBattleWindow(18, 7, 0x1D, 0x13, WINDOW_x80); - gBattleScripting.atk6C_state = 4; + gBattleScripting.drawlvlupboxState = 4; break; case 4: DrawLevelUpWindow1(); PutWindowTilemap(12); CopyWindowToVram(12, COPYWIN_BOTH); - ++gBattleScripting.atk6C_state; + ++gBattleScripting.drawlvlupboxState; break; case 5: case 7: if (!IsDma3ManagerBusyWithBgCopy()) { gBattle_BG1_Y = 0; - ++gBattleScripting.atk6C_state; + ++gBattleScripting.drawlvlupboxState; } break; case 6: @@ -5538,7 +5540,7 @@ static void atk6C_drawlvlupbox(void) PlaySE(SE_SELECT); DrawLevelUpWindow2(); CopyWindowToVram(12, COPYWIN_GFX); - ++gBattleScripting.atk6C_state; + ++gBattleScripting.drawlvlupboxState; } break; case 8: @@ -5546,19 +5548,21 @@ static void atk6C_drawlvlupbox(void) { PlaySE(SE_SELECT); HandleBattleWindow(18, 7, 0x1D, 0x13, WINDOW_x80 | WINDOW_CLEAR); - ++gBattleScripting.atk6C_state; + ++gBattleScripting.drawlvlupboxState; } break; case 9: - if (!sub_8026648()) + if (!SlideOutLevelUpBanner()) { - ClearWindowTilemap(13); - CopyWindowToVram(13, COPYWIN_MAP); - ClearWindowTilemap(12); - CopyWindowToVram(12, COPYWIN_MAP); + ClearWindowTilemap(B_WIN_LEVEL_UP_BANNER); + CopyWindowToVram(B_WIN_LEVEL_UP_BANNER, COPYWIN_MAP); + + ClearWindowTilemap(B_WIN_LEVEL_UP_BOX); + CopyWindowToVram(B_WIN_LEVEL_UP_BOX, COPYWIN_MAP); + SetBgAttribute(2, BG_ATTR_PRIORITY, 2); ShowBg(2); - gBattleScripting.atk6C_state = 10; + gBattleScripting.drawlvlupboxState = 10; } break; case 10: @@ -5568,7 +5572,7 @@ static void atk6C_drawlvlupbox(void) SetBgAttribute(1, BG_ATTR_PRIORITY, 1); ShowBg(0); ShowBg(1); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } break; } @@ -5594,28 +5598,32 @@ static void sub_8026480(void) { gBattle_BG2_Y = 0; gBattle_BG2_X = 0x1A0; - LoadPalette(sUnknownBattleboxPal, 0x60, 0x20); - CopyToWindowPixelBuffer(13, sUnknownBattleboxGfx, 0, 0); + LoadPalette(sLevelUpBanner_Pal, 0x60, 0x20); + CopyToWindowPixelBuffer(13, sLevelUpBanner_Gfx, 0, 0); PutWindowTilemap(13); CopyWindowToVram(13, COPYWIN_BOTH); PutMonIconOnLvlUpBox(); } -static bool8 sub_80264D0(void) +static bool8 SlideInLevelUpBanner(void) { if (IsDma3ManagerBusyWithBgCopy()) return TRUE; - if (gBattle_BG2_X == 0x200) + + if (gBattle_BG2_X == LEVEL_UP_BANNER_END) return FALSE; - if (gBattle_BG2_X == 0x1A0) - PutLevelAndGenderOnLvlUpBox(); + + if (gBattle_BG2_X == LEVEL_UP_BANNER_START) + DrawLevelUpBannerText(); + gBattle_BG2_X += 8; - if (gBattle_BG2_X >= 0x200) - gBattle_BG2_X = 0x200; - return (gBattle_BG2_X != 0x200); + if (gBattle_BG2_X >= LEVEL_UP_BANNER_END) + gBattle_BG2_X = LEVEL_UP_BANNER_END; + + return (gBattle_BG2_X != LEVEL_UP_BANNER_END); } -static void PutLevelAndGenderOnLvlUpBox(void) +static void DrawLevelUpBannerText(void) { u16 monLevel; u8 monGender; @@ -5627,7 +5635,7 @@ static void PutLevelAndGenderOnLvlUpBox(void) monGender = GetMonGender(&gPlayerParty[gBattleStruct->expGetterMonId]); GetMonNickname(&gPlayerParty[gBattleStruct->expGetterMonId], gStringVar4); printerTemplate.currentChar = gStringVar4; - printerTemplate.windowId = 13; + printerTemplate.windowId = B_WIN_LEVEL_UP_BANNER; printerTemplate.fontId = 0; printerTemplate.x = 32; printerTemplate.y = 0; @@ -5666,19 +5674,21 @@ static void PutLevelAndGenderOnLvlUpBox(void) } printerTemplate.y = 10; printerTemplate.currentY = 10; - AddTextPrinter(&printerTemplate, TEXT_SPEED_FF, NULL); + AddTextPrinter(&printerTemplate, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(13, COPYWIN_GFX); } -static bool8 sub_8026648(void) +static bool8 SlideOutLevelUpBanner(void) { - if (gBattle_BG2_X == 0x1A0) + if (gBattle_BG2_X == LEVEL_UP_BANNER_START) return FALSE; - if (gBattle_BG2_X - 16 < 0x1A0) - gBattle_BG2_X = 0x1A0; + + if (gBattle_BG2_X - 16 < LEVEL_UP_BANNER_START) + gBattle_BG2_X = LEVEL_UP_BANNER_START; else gBattle_BG2_X -= 16; - return (gBattle_BG2_X != 0x1A0); + + return (gBattle_BG2_X != LEVEL_UP_BANNER_START); } #define sDestroy data[0] @@ -5696,18 +5706,18 @@ static void PutMonIconOnLvlUpBox(void) iconSheet.data = iconPtr; iconSheet.size = 0x200; - iconSheet.tag = MON_ICON_LVLUP_BOX_TAG; + iconSheet.tag = TAG_LVLUP_BANNER_MON_ICON; iconPal = GetValidMonIconPalettePtr(species); iconPalSheet.data = iconPal; - iconPalSheet.tag = MON_ICON_LVLUP_BOX_TAG; + iconPalSheet.tag = TAG_LVLUP_BANNER_MON_ICON; LoadSpriteSheet(&iconSheet); LoadSpritePalette(&iconPalSheet); - spriteId = CreateSprite(&sSpriteTemplate_MonIconOnLvlUpBox, 256, 10, 0); + spriteId = CreateSprite(&sSpriteTemplate_MonIconOnLvlUpBanner, 256, 10, 0); gSprites[spriteId].sDestroy = FALSE; gSprites[spriteId].sSavedLvlUpBoxXPosition = gBattle_BG2_X; } -static void SpriteCB_MonIconOnLvlUpBox(struct Sprite* sprite) +static void SpriteCB_MonIconOnLvlUpBanner(struct Sprite* sprite) { sprite->x2 = sprite->sSavedLvlUpBoxXPosition - gBattle_BG2_X; if (sprite->x2 != 0) @@ -5717,8 +5727,8 @@ static void SpriteCB_MonIconOnLvlUpBox(struct Sprite* sprite) else if (sprite->sDestroy) { DestroySprite(sprite); - FreeSpriteTilesByTag(MON_ICON_LVLUP_BOX_TAG); - FreeSpritePaletteByTag(MON_ICON_LVLUP_BOX_TAG); + FreeSpriteTilesByTag(TAG_LVLUP_BANNER_MON_ICON); + FreeSpritePaletteByTag(TAG_LVLUP_BANNER_MON_ICON); } } @@ -5731,28 +5741,28 @@ bool32 IsMonGettingExpSentOut(void) return FALSE; } -static void atk6D_resetsentmonsvalue(void) +static void Cmd_resetsentmonsvalue(void) { ResetSentPokesToOpponentValue(); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk6E_setatktoplayer0(void) +static void Cmd_setatktoplayer0(void) { gBattlerAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk6F_makevisible(void) +static void Cmd_makevisible(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - BtlController_EmitSpriteInvisibility(0, FALSE); + BtlController_EmitSpriteInvisibility(BUFFER_A, FALSE); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; } -static void atk70_recordlastability(void) +static void Cmd_recordlastability(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); RecordAbilityBattle(gActiveBattler, gLastUsedAbility); @@ -5764,13 +5774,13 @@ void BufferMoveToLearnIntoBattleTextBuff2(void) PREPARE_MOVE_BUFFER(gBattleTextBuff2, gMoveToLearn); } -static void atk71_buffermovetolearn(void) +static void Cmd_buffermovetolearn(void) { BufferMoveToLearnIntoBattleTextBuff2(); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk72_jumpifplayerran(void) +static void Cmd_jumpifplayerran(void) { if (TryRunFromBattle(gBattlerFainted)) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -5778,7 +5788,7 @@ static void atk72_jumpifplayerran(void) gBattlescriptCurrInstr += 5; } -static void atk73_hpthresholds(void) +static void Cmd_hpthresholds(void) { u8 opposingBattler; s32 result; @@ -5803,7 +5813,7 @@ static void atk73_hpthresholds(void) gBattlescriptCurrInstr += 2; } -static void atk74_hpthresholds2(void) +static void Cmd_hpthresholds2(void) { u8 opposingBattler; s32 result; @@ -5828,14 +5838,14 @@ static void atk74_hpthresholds2(void) gBattlescriptCurrInstr += 2; } -static void atk75_useitemonopponent(void) +static void Cmd_useitemonopponent(void) { gBattlerInMenuId = gBattlerAttacker; - PokemonUseItemEffects(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]], gLastUsedItem, gBattlerPartyIndexes[gBattlerAttacker], 0, 1); - ++gBattlescriptCurrInstr; + PokemonUseItemEffects(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]], gLastUsedItem, gBattlerPartyIndexes[gBattlerAttacker], 0, TRUE); + gBattlescriptCurrInstr++; } -static void atk76_various(void) +static void Cmd_various(void) { u8 side; s32 i; @@ -5884,7 +5894,7 @@ static void atk76_various(void) else gActiveBattler = 2; choicedMove = &gBattleStruct->choicedMove[gActiveBattler]; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) { if (gBattleMons[gActiveBattler].moves[i] == *choicedMove) break; @@ -5908,14 +5918,14 @@ static void atk76_various(void) { if (gActiveBattler < gBattlersCount && gBattleMons[gActiveBattler].hp != 0) gBattleCommunication[MULTISTRING_CHOOSER] |= gBitTable[i]; - ++i; + i++; } break; case VARIOUS_RETURN_OPPONENT_MON1: gActiveBattler = 1; if (gBattleMons[gActiveBattler].hp != 0) { - BtlController_EmitReturnMonToBall(0, 0); + BtlController_EmitReturnMonToBall(BUFFER_A, FALSE); MarkBattlerForControllerExec(gActiveBattler); } break; @@ -5925,7 +5935,7 @@ static void atk76_various(void) gActiveBattler = 3; if (gBattleMons[gActiveBattler].hp != 0) { - BtlController_EmitReturnMonToBall(0, 0); + BtlController_EmitReturnMonToBall(BUFFER_A, FALSE); MarkBattlerForControllerExec(gActiveBattler); } } @@ -5933,7 +5943,7 @@ static void atk76_various(void) case VARIOUS_CHECK_POKEFLUTE: gBattleCommunication[MULTISTRING_CHOOSER] = 0; monToCheck = 0; - for (i = 0; i < gBattlersCount; ++i) + for (i = 0; i < gBattlersCount; i++) { if (gBattleMons[i].ability != ABILITY_SOUNDPROOF) { @@ -5942,7 +5952,7 @@ static void atk76_various(void) } } - for (i = 0; i < PARTY_SIZE; ++i) + for (i = 0; i < PARTY_SIZE; i++) { species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); abilityNum = GetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM); @@ -5957,12 +5967,12 @@ static void atk76_various(void) { gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); status = 0; - BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, monToCheck, 4, &status); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, monToCheck, 4, &status); MarkBattlerForControllerExec(gActiveBattler); gBattleCommunication[MULTISTRING_CHOOSER] = 1; } monToCheck = 0; - for (i = 0; i < PARTY_SIZE; ++i) + for (i = 0; i < PARTY_SIZE; i++) { species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES2); abilityNum = GetMonData(&gEnemyParty[i], MON_DATA_ABILITY_NUM); @@ -5978,7 +5988,7 @@ static void atk76_various(void) { gActiveBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); status = 0; - BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, monToCheck, 4, &status); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, monToCheck, 4, &status); MarkBattlerForControllerExec(gActiveBattler); gBattleCommunication[5] = 1; } @@ -5991,15 +6001,17 @@ static void atk76_various(void) gBattlescriptCurrInstr += 3; } -static void atk77_setprotectlike(void) +static void Cmd_setprotectlike(void) // protect and endure { bool8 notLastTurn = TRUE; u16 lastMove = gLastResultingMoves[gBattlerAttacker]; if (lastMove != MOVE_PROTECT && lastMove != MOVE_DETECT && lastMove != MOVE_ENDURE) gDisableStructs[gBattlerAttacker].protectUses = 0; + if (gCurrentTurnActionNumber == (gBattlersCount - 1)) notLastTurn = FALSE; + if (sProtectSuccessRates[gDisableStructs[gBattlerAttacker].protectUses] >= Random() && notLastTurn) { if (gBattleMoves[gCurrentMove].effect == EFFECT_PROTECT) @@ -6012,7 +6024,7 @@ static void atk77_setprotectlike(void) gProtectStructs[gBattlerAttacker].endured = 1; gBattleCommunication[MULTISTRING_CHOOSER] = 1; } - ++gDisableStructs[gBattlerAttacker].protectUses; + gDisableStructs[gBattlerAttacker].protectUses++; } else { @@ -6020,12 +6032,13 @@ static void atk77_setprotectlike(void) gBattleCommunication[MULTISTRING_CHOOSER] = 2; gMoveResultFlags |= MOVE_RESULT_MISSED; } - ++gBattlescriptCurrInstr; + + gBattlescriptCurrInstr++; } -static void atk78_faintifabilitynotdamp(void) +static void Cmd_tryexplosion(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; ++gBattlerTarget) if (gBattleMons[gBattlerTarget].ability == ABILITY_DAMP) @@ -6036,7 +6049,7 @@ static void atk78_faintifabilitynotdamp(void) gBattleMoveDamage = gBattleMons[gActiveBattler].hp; BtlController_EmitHealthBarUpdate(0, INSTANT_HP_BAR_DROP); MarkBattlerForControllerExec(gActiveBattler); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; ++gBattlerTarget) if (gBattlerTarget != gBattlerAttacker && !(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) @@ -6051,19 +6064,19 @@ static void atk78_faintifabilitynotdamp(void) } } -static void atk79_setatkhptozero(void) +static void Cmd_setatkhptozero(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = gBattlerAttacker; gBattleMons[gActiveBattler].hp = 0; - BtlController_EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp); MarkBattlerForControllerExec(gActiveBattler); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } -static void atk7A_jumpifnexttargetvalid(void) +static void Cmd_jumpifnexttargetvalid(void) { const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -6083,7 +6096,7 @@ static void atk7A_jumpifnexttargetvalid(void) } } -static void atk7B_tryhealhalfhealth(void) +static void Cmd_tryhealhalfhealth(void) { const u8 *failPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -6099,28 +6112,31 @@ static void atk7B_tryhealhalfhealth(void) gBattlescriptCurrInstr += 6; } -static void atk7C_trymirrormove(void) +static void Cmd_trymirrormove(void) { s32 validMovesCount; s32 i; u16 move; u16 movesArray[3]; - for (i = 0; i < 3; ++i) + for (i = 0; i < 3; i++) movesArray[i] = 0; - for (validMovesCount = 0, i = 0; i < gBattlersCount; ++i) + for (validMovesCount = 0, i = 0; i < gBattlersCount; i++) { if (i != gBattlerAttacker) { move = T1_READ_16(i * 2 + gBattlerAttacker * 8 + gBattleStruct->lastTakenMoveFrom); - if (move != MOVE_NONE && move != 0xFFFF) - movesArray[validMovesCount++] = move; + if (move != MOVE_NONE && move != MOVE_UNAVAILABLE) + { + movesArray[validMovesCount] = move; + validMovesCount++; + } } } move = T1_READ_16(gBattleStruct->lastTakenMove + gBattlerAttacker * 2); move++;move--; - if (move != MOVE_NONE && move != 0xFFFF) + if (move != MOVE_NONE && move != MOVE_UNAVAILABLE) { gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gCurrentMove = move; @@ -6138,27 +6154,27 @@ static void atk7C_trymirrormove(void) else { gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure = TRUE; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } -static void atk7D_setrain(void) +static void Cmd_setrain(void) { - if (gBattleWeather & WEATHER_RAIN_ANY) + if (gBattleWeather & B_WEATHER_RAIN) { gMoveResultFlags |= MOVE_RESULT_MISSED; gBattleCommunication[MULTISTRING_CHOOSER] = 2; } else { - gBattleWeather = WEATHER_RAIN_TEMPORARY; + gBattleWeather = B_WEATHER_RAIN_TEMPORARY; gBattleCommunication[MULTISTRING_CHOOSER] = 0; gWishFutureKnock.weatherDuration = 5; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk7E_setreflect(void) +static void Cmd_setreflect(void) { if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_REFLECT) { @@ -6176,10 +6192,10 @@ static void atk7E_setreflect(void) else gBattleCommunication[MULTISTRING_CHOOSER] = 1; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk7F_setseeded(void) +static void Cmd_setseeded(void) { if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || gStatuses3[gBattlerTarget] & STATUS3_LEECHSEED) { @@ -6197,10 +6213,10 @@ static void atk7F_setseeded(void) gStatuses3[gBattlerTarget] |= STATUS3_LEECHSEED; gBattleCommunication[MULTISTRING_CHOOSER] = 0; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk80_manipulatedamage(void) +static void Cmd_manipulatedamage(void) { switch (gBattlescriptCurrInstr[1]) { @@ -6221,7 +6237,7 @@ static void atk80_manipulatedamage(void) gBattlescriptCurrInstr += 2; } -static void atk81_trysetrest(void) +static void Cmd_trysetrest(void) { const u8 *failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -6238,13 +6254,13 @@ static void atk81_trysetrest(void) else gBattleCommunication[MULTISTRING_CHOOSER] = 0; gBattleMons[gBattlerTarget].status1 = 3; - BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 5; } } -static void atk82_jumpifnotfirstturn(void) +static void Cmd_jumpifnotfirstturn(void) { const u8 *failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -6254,20 +6270,20 @@ static void atk82_jumpifnotfirstturn(void) gBattlescriptCurrInstr = failJump; } -static void atk83_nop(void) +static void Cmd_nop(void) { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } bool8 UproarWakeUpCheck(u8 battlerId) { s32 i; - for (i = 0; i < gBattlersCount; ++i) + for (i = 0; i < gBattlersCount; i++) { - if (!(gBattleMons[i].status2 & STATUS2_UPROAR) - || gBattleMons[battlerId].ability == ABILITY_SOUNDPROOF) + if (!(gBattleMons[i].status2 & STATUS2_UPROAR) || gBattleMons[battlerId].ability == ABILITY_SOUNDPROOF) continue; + gBattleScripting.battler = i; if (gBattlerTarget == 0xFF) @@ -6284,7 +6300,7 @@ bool8 UproarWakeUpCheck(u8 battlerId) return TRUE; } -static void atk84_jumpifcantmakeasleep(void) +static void Cmd_jumpifcantmakeasleep(void) { const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -6293,7 +6309,7 @@ static void atk84_jumpifcantmakeasleep(void) gBattlescriptCurrInstr = jumpPtr; } else if (gBattleMons[gBattlerTarget].ability == ABILITY_INSOMNIA - || gBattleMons[gBattlerTarget].ability == ABILITY_VITAL_SPIRIT) + || gBattleMons[gBattlerTarget].ability == ABILITY_VITAL_SPIRIT) { gLastUsedAbility = gBattleMons[gBattlerTarget].ability; gBattleCommunication[MULTISTRING_CHOOSER] = 2; @@ -6306,7 +6322,7 @@ static void atk84_jumpifcantmakeasleep(void) } } -static void atk85_stockpile(void) +static void Cmd_stockpile(void) { if (gDisableStructs[gBattlerAttacker].stockpileCounter == 3) { @@ -6315,14 +6331,16 @@ static void atk85_stockpile(void) } else { - ++gDisableStructs[gBattlerAttacker].stockpileCounter; + gDisableStructs[gBattlerAttacker].stockpileCounter++; + PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gBattlerAttacker].stockpileCounter) + gBattleCommunication[MULTISTRING_CHOOSER] = 0; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk86_stockpiletobasedamage(void) +static void Cmd_stockpiletobasedamage(void) { const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -6348,7 +6366,7 @@ static void atk86_stockpiletobasedamage(void) } } -static void atk87_stockpiletohpheal(void) +static void Cmd_stockpiletohpheal(void) { const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -6367,9 +6385,11 @@ static void atk87_stockpiletohpheal(void) else { gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / (1 << (3 - gDisableStructs[gBattlerAttacker].stockpileCounter)); + if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; gBattleMoveDamage *= -1; + gBattleScripting.animTurn = gDisableStructs[gBattlerAttacker].stockpileCounter; gDisableStructs[gBattlerAttacker].stockpileCounter = 0; gBattlescriptCurrInstr += 5; @@ -6377,12 +6397,13 @@ static void atk87_stockpiletohpheal(void) } } -static void atk88_negativedamage(void) +static void Cmd_negativedamage(void) { gBattleMoveDamage = -(gHpDealt / 2); if (gBattleMoveDamage == 0) gBattleMoveDamage = -1; - ++gBattlescriptCurrInstr; + + gBattlescriptCurrInstr++; } #define STAT_CHANGE_WORKED 0 @@ -6398,20 +6419,24 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) gActiveBattler = gBattlerAttacker; else gActiveBattler = gBattlerTarget; - flags &= ~(MOVE_EFFECT_AFFECTS_USER); + + flags &= ~MOVE_EFFECT_AFFECTS_USER; + if (flags & MOVE_EFFECT_CERTAIN) - ++certain; - flags &= ~(MOVE_EFFECT_CERTAIN); + certain++; + flags &= ~MOVE_EFFECT_CERTAIN; + if (flags & STAT_CHANGE_NOT_PROTECT_AFFECTED) - ++notProtectAffected; - flags &= ~(STAT_CHANGE_NOT_PROTECT_AFFECTED); + notProtectAffected++; + flags &= ~STAT_CHANGE_NOT_PROTECT_AFFECTED; + PREPARE_STAT_BUFFER(gBattleTextBuff1, statId) if (statValue <= -1) // Stat decrease. { if (gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].mistTimer && !certain && gCurrentMove != MOVE_CURSE) { - if (flags == STAT_CHANGE_BS_PTR) + if (flags == STAT_CHANGE_ALLOW_PTR) { if (gSpecialStatuses[gActiveBattler].statLowered) { @@ -6428,18 +6453,16 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) return STAT_CHANGE_DIDNT_WORK; } else if (gCurrentMove != MOVE_CURSE - && notProtectAffected != TRUE - && JumpIfMoveAffectedByProtect(0)) + && notProtectAffected != TRUE && JumpIfMoveAffectedByProtect(0)) { gBattlescriptCurrInstr = BattleScript_ButItFailed; return STAT_CHANGE_DIDNT_WORK; } else if ((gBattleMons[gActiveBattler].ability == ABILITY_CLEAR_BODY || gBattleMons[gActiveBattler].ability == ABILITY_WHITE_SMOKE) - && !certain - && gCurrentMove != MOVE_CURSE) + && !certain && gCurrentMove != MOVE_CURSE) { - if (flags == STAT_CHANGE_BS_PTR) + if (flags == STAT_CHANGE_ALLOW_PTR) { if (gSpecialStatuses[gActiveBattler].statLowered) { @@ -6460,7 +6483,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) else if (gBattleMons[gActiveBattler].ability == ABILITY_KEEN_EYE && !certain && statId == STAT_ACC) { - if (flags == STAT_CHANGE_BS_PTR) + if (flags == STAT_CHANGE_ALLOW_PTR) { BattleScriptPush(BS_ptr); gBattleScripting.battler = gActiveBattler; @@ -6473,7 +6496,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) else if (gBattleMons[gActiveBattler].ability == ABILITY_HYPER_CUTTER && !certain && statId == STAT_ATK) { - if (flags == STAT_CHANGE_BS_PTR) + if (flags == STAT_CHANGE_ALLOW_PTR) { BattleScriptPush(BS_ptr); gBattleScripting.battler = gActiveBattler; @@ -6535,47 +6558,47 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) gBattleMons[gActiveBattler].statStages[statId] = 0; if (gBattleMons[gActiveBattler].statStages[statId] > 0xC) gBattleMons[gActiveBattler].statStages[statId] = 0xC; - if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_CHANGE_BS_PTR) + if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_CHANGE_ALLOW_PTR) gMoveResultFlags |= MOVE_RESULT_MISSED; - if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && !(flags & STAT_CHANGE_BS_PTR)) + if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && !(flags & STAT_CHANGE_ALLOW_PTR)) return STAT_CHANGE_DIDNT_WORK; return STAT_CHANGE_WORKED; } -static void atk89_statbuffchange(void) +static void Cmd_statbuffchange(void) { const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 2); if (ChangeStatBuffs(gBattleScripting.statChanger & 0xF0, GET_STAT_BUFF_ID(gBattleScripting.statChanger), gBattlescriptCurrInstr[1], jumpPtr) == STAT_CHANGE_WORKED) gBattlescriptCurrInstr += 6; } -static void atk8A_normalisebuffs(void) // haze +static void Cmd_normalisebuffs(void) // haze { s32 i, j; - for (i = 0; i < gBattlersCount; ++i) + for (i = 0; i < gBattlersCount; i++) for (j = 0; j < NUM_BATTLE_STATS; ++j) gBattleMons[i].statStages[j] = 6; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk8B_setbide(void) +static void Cmd_setbide(void) { gBattleMons[gBattlerAttacker].status2 |= STATUS2_MULTIPLETURNS; gLockedMoves[gBattlerAttacker] = gCurrentMove; gTakenDmg[gBattlerAttacker] = 0; gBattleMons[gBattlerAttacker].status2 |= (STATUS2_BIDE - 0x100); // 2 turns - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk8C_confuseifrepeatingattackends(void) +static void Cmd_confuseifrepeatingattackends(void) { if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_LOCK_CONFUSE)) gBattleCommunication[MOVE_EFFECT_BYTE] = (MOVE_EFFECT_THRASH | MOVE_EFFECT_AFFECTS_USER); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk8D_setmultihitcounter(void) +static void Cmd_setmultihitcounter(void) { if (gBattlescriptCurrInstr[1]) { @@ -6592,10 +6615,10 @@ static void atk8D_setmultihitcounter(void) gBattlescriptCurrInstr += 2; } -static void atk8E_initmultihitstring(void) +static void Cmd_initmultihitstring(void) { PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0) - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } static bool8 TryDoForceSwitchOut(void) @@ -6621,7 +6644,7 @@ static bool8 TryDoForceSwitchOut(void) #define MON_CAN_BATTLE(mon) (((GetMonData(mon, MON_DATA_SPECIES) && GetMonData(mon, MON_DATA_IS_EGG) != TRUE && GetMonData(mon, MON_DATA_HP)))) -static void atk8F_forcerandomswitch(void) +static void Cmd_forcerandomswitch(void) { if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { @@ -6640,7 +6663,7 @@ static void atk8F_forcerandomswitch(void) val = 0; if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gBattlerTarget)) == 1) val = 3; - for (i = val; i < val + 3; ++i) + for (i = val; i < val + 3; i++) { if (GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&party[i], MON_DATA_IS_EGG) @@ -6651,7 +6674,7 @@ static void atk8F_forcerandomswitch(void) else { valid = 0; - for (i = 0; i < 6; ++i) + for (i = 0; i < 6; i++) { if (GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&party[i], MON_DATA_IS_EGG) @@ -6716,7 +6739,7 @@ static void atk8F_forcerandomswitch(void) } } -static void atk90_tryconversiontypechange(void) // randomly changes user's type to one of its moves' type +static void Cmd_tryconversiontypechange(void) // randomly changes user's type to one of its moves' type { u8 validMoves = 0; u8 moveChecked; @@ -6770,7 +6793,7 @@ static void atk90_tryconversiontypechange(void) // randomly changes user's type } } -static void atk91_givepaydaymoney(void) +static void Cmd_givepaydaymoney(void) { if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gPaydayMoney != 0) { @@ -6783,11 +6806,11 @@ static void atk91_givepaydaymoney(void) } else { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } -static void atk92_setlightscreen(void) +static void Cmd_setlightscreen(void) { if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_LIGHTSCREEN) { @@ -6804,10 +6827,10 @@ static void atk92_setlightscreen(void) else gBattleCommunication[MULTISTRING_CHOOSER] = 3; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk93_tryKO(void) +static void Cmd_tryKO(void) { u8 holdEffect, param; @@ -6892,52 +6915,52 @@ static void atk93_tryKO(void) } } -static void atk94_damagetohalftargethp(void) // super fang +static void Cmd_damagetohalftargethp(void) // super fang { gBattleMoveDamage = gBattleMons[gBattlerTarget].hp / 2; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk95_setsandstorm(void) +static void Cmd_setsandstorm(void) { - if (gBattleWeather & WEATHER_SANDSTORM_ANY) + if (gBattleWeather & B_WEATHER_SANDSTORM) { gMoveResultFlags |= MOVE_RESULT_MISSED; gBattleCommunication[MULTISTRING_CHOOSER] = 2; } else { - gBattleWeather = WEATHER_SANDSTORM_TEMPORARY; + gBattleWeather = B_WEATHER_SANDSTORM_TEMPORARY; gBattleCommunication[MULTISTRING_CHOOSER] = 3; gWishFutureKnock.weatherDuration = 5; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk96_weatherdamage(void) +static void Cmd_weatherdamage(void) { if (IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(gBattleTypeFlags) && (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT)) { gBattleMoveDamage = 0; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; return; } if (WEATHER_HAS_EFFECT) { - if (gBattleWeather & WEATHER_SANDSTORM_ANY) + if (gBattleWeather & B_WEATHER_SANDSTORM) { if (gBattleMons[gBattlerAttacker].type1 != TYPE_ROCK - && gBattleMons[gBattlerAttacker].type1 != TYPE_STEEL - && gBattleMons[gBattlerAttacker].type1 != TYPE_GROUND - && gBattleMons[gBattlerAttacker].type2 != TYPE_ROCK - && gBattleMons[gBattlerAttacker].type2 != TYPE_STEEL - && gBattleMons[gBattlerAttacker].type2 != TYPE_GROUND - && gBattleMons[gBattlerAttacker].ability != ABILITY_SAND_VEIL - && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERGROUND) - && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERWATER)) + && gBattleMons[gBattlerAttacker].type1 != TYPE_STEEL + && gBattleMons[gBattlerAttacker].type1 != TYPE_GROUND + && gBattleMons[gBattlerAttacker].type2 != TYPE_ROCK + && gBattleMons[gBattlerAttacker].type2 != TYPE_STEEL + && gBattleMons[gBattlerAttacker].type2 != TYPE_GROUND + && gBattleMons[gBattlerAttacker].ability != ABILITY_SAND_VEIL + && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERGROUND) + && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERWATER)) { gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 16; if (gBattleMoveDamage == 0) @@ -6948,11 +6971,11 @@ static void atk96_weatherdamage(void) gBattleMoveDamage = 0; } } - if (gBattleWeather & WEATHER_HAIL) + if (gBattleWeather & B_WEATHER_HAIL) { if (!IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_ICE) - && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERGROUND) - && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERWATER)) + && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERGROUND) + && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERWATER)) { gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 16; if (gBattleMoveDamage == 0) @@ -6968,12 +6991,14 @@ static void atk96_weatherdamage(void) { gBattleMoveDamage = 0; } + if (gAbsentBattlerFlags & gBitTable[gBattlerAttacker]) gBattleMoveDamage = 0; - ++gBattlescriptCurrInstr; + + gBattlescriptCurrInstr++; } -static void atk97_tryinfatuating(void) +static void Cmd_tryinfatuating(void) { struct Pokemon *monAttacker, *monTarget; u16 speciesAttacker, speciesTarget; @@ -6983,14 +7008,18 @@ static void atk97_tryinfatuating(void) monAttacker = &gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]]; else monAttacker = &gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker]]; + if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) monTarget = &gPlayerParty[gBattlerPartyIndexes[gBattlerTarget]]; else monTarget = &gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]]; + speciesAttacker = GetMonData(monAttacker, MON_DATA_SPECIES); personalityAttacker = GetMonData(monAttacker, MON_DATA_PERSONALITY); + speciesTarget = GetMonData(monTarget, MON_DATA_SPECIES); personalityTarget = GetMonData(monTarget, MON_DATA_PERSONALITY); + if (gBattleMons[gBattlerTarget].ability == ABILITY_OBLIVIOUS) { gBattlescriptCurrInstr = BattleScript_ObliviousPreventsAttraction; @@ -7000,9 +7029,9 @@ static void atk97_tryinfatuating(void) else { if (GetGenderFromSpeciesAndPersonality(speciesAttacker, personalityAttacker) == GetGenderFromSpeciesAndPersonality(speciesTarget, personalityTarget) - || gBattleMons[gBattlerTarget].status2 & STATUS2_INFATUATION - || GetGenderFromSpeciesAndPersonality(speciesAttacker, personalityAttacker) == MON_GENDERLESS - || GetGenderFromSpeciesAndPersonality(speciesTarget, personalityTarget) == MON_GENDERLESS) + || gBattleMons[gBattlerTarget].status2 & STATUS2_INFATUATION + || GetGenderFromSpeciesAndPersonality(speciesAttacker, personalityAttacker) == MON_GENDERLESS + || GetGenderFromSpeciesAndPersonality(speciesTarget, personalityTarget) == MON_GENDERLESS) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -7014,9 +7043,9 @@ static void atk97_tryinfatuating(void) } } -static void atk98_updatestatusicon(void) +static void Cmd_updatestatusicon(void) { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { if (gBattlescriptCurrInstr[1] == BS_PLAYER2) { @@ -7060,7 +7089,7 @@ static void atk98_updatestatusicon(void) } } -static void atk99_setmist(void) +static void Cmd_setmist(void) { if (gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistTimer) { @@ -7074,10 +7103,10 @@ static void atk99_setmist(void) gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_MIST; gBattleCommunication[MULTISTRING_CHOOSER] = 0; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk9A_setfocusenergy(void) +static void Cmd_setfocusenergy(void) { if (gBattleMons[gBattlerAttacker].status2 & STATUS2_FOCUS_ENERGY) { @@ -7089,13 +7118,13 @@ static void atk9A_setfocusenergy(void) gBattleMons[gBattlerAttacker].status2 |= STATUS2_FOCUS_ENERGY; gBattleCommunication[MULTISTRING_CHOOSER] = 0; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atk9B_transformdataexecution(void) +static void Cmd_transformdataexecution(void) { - gChosenMove = 0xFFFF; - ++gBattlescriptCurrInstr; + gChosenMove = MOVE_UNAVAILABLE; + gBattlescriptCurrInstr++; if (gBattleMons[gBattlerTarget].status2 & STATUS2_TRANSFORMED || gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE) { @@ -7115,9 +7144,9 @@ static void atk9B_transformdataexecution(void) PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerTarget].species) battleMonAttacker = (u8 *)(&gBattleMons[gBattlerAttacker]); battleMonTarget = (u8 *)(&gBattleMons[gBattlerTarget]); - for (i = 0; i < offsetof(struct BattlePokemon, pp); ++i) + for (i = 0; i < offsetof(struct BattlePokemon, pp); i++) battleMonAttacker[i] = battleMonTarget[i]; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) { if (gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].pp < 5) gBattleMons[gBattlerAttacker].pp[i] = gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].pp; @@ -7125,18 +7154,18 @@ static void atk9B_transformdataexecution(void) gBattleMons[gBattlerAttacker].pp[i] = 5; } gActiveBattler = gBattlerAttacker; - BtlController_EmitResetActionMoveSelection(0, RESET_MOVE_SELECTION); + BtlController_EmitResetActionMoveSelection(BUFFER_A, RESET_MOVE_SELECTION); MarkBattlerForControllerExec(gActiveBattler); gBattleCommunication[MULTISTRING_CHOOSER] = 0; } } -static void atk9C_setsubstitute(void) +static void Cmd_setsubstitute(void) { u32 hp = gBattleMons[gBattlerAttacker].maxHP / 4; - if (gBattleMons[gBattlerAttacker].maxHP / 4 == 0) hp = 1; + if (gBattleMons[gBattlerAttacker].hp <= hp) { gBattleMoveDamage = 0; @@ -7148,37 +7177,38 @@ static void atk9C_setsubstitute(void) if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; gBattleMons[gBattlerAttacker].status2 |= STATUS2_SUBSTITUTE; - gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_WRAPPED); + gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_WRAPPED; gDisableStructs[gBattlerAttacker].substituteHP = gBattleMoveDamage; gBattleCommunication[MULTISTRING_CHOOSER] = 0; gHitMarker |= HITMARKER_IGNORE_SUBSTITUTE; } - ++gBattlescriptCurrInstr; + + gBattlescriptCurrInstr++; } static bool8 IsMoveUncopyableByMimic(u16 move) { s32 i; - for (i = 0; sMovesForbiddenToCopy[i] != MIMIC_FORBIDDEN_END && sMovesForbiddenToCopy[i] != move; ++i); + for (i = 0; sMovesForbiddenToCopy[i] != MIMIC_FORBIDDEN_END && sMovesForbiddenToCopy[i] != move; i++); return (sMovesForbiddenToCopy[i] != MIMIC_FORBIDDEN_END); } -static void atk9D_mimicattackcopy(void) +static void Cmd_mimicattackcopy(void) { - gChosenMove = 0xFFFF; + gChosenMove = MOVE_UNAVAILABLE; if (IsMoveUncopyableByMimic(gLastMoves[gBattlerTarget]) || gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED - || gLastMoves[gBattlerTarget] == 0 - || gLastMoves[gBattlerTarget] == 0xFFFF) + || gLastMoves[gBattlerTarget] == MOVE_NONE + || gLastMoves[gBattlerTarget] == MOVE_UNAVAILABLE) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } else { - s32 i; + int i; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) { if (gBattleMons[gBattlerAttacker].moves[i] == gLastMoves[gBattlerTarget]) break; @@ -7190,6 +7220,7 @@ static void atk9D_mimicattackcopy(void) gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = gBattleMoves[gLastMoves[gBattlerTarget]].pp; else gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = 5; + PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattlerTarget]) gDisableStructs[gBattlerAttacker].mimickedMoves |= gBitTable[gCurrMovePos]; gBattlescriptCurrInstr += 5; @@ -7201,20 +7232,22 @@ static void atk9D_mimicattackcopy(void) } } -static void atk9E_metronome(void) +static void Cmd_metronome(void) { - while (1) + while (TRUE) { s32 i; gCurrentMove = (Random() & 0x1FF) + 1; if (gCurrentMove >= MOVES_COUNT) continue; - for (i = 0; i < MAX_MON_MOVES; ++i); // redundant + + for (i = 0; i < MAX_MON_MOVES; i++); // ? + i = -1; - while (1) + while (TRUE) { - ++i; + i++; if (sMovesForbiddenToCopy[i] == gCurrentMove) break; if (sMovesForbiddenToCopy[i] == METRONOME_FORBIDDEN_END) @@ -7222,7 +7255,7 @@ static void atk9E_metronome(void) } if (sMovesForbiddenToCopy[i] == METRONOME_FORBIDDEN_END) { - gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); + gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED; gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; gBattlerTarget = GetMoveTarget(gCurrentMove, 0); return; @@ -7230,30 +7263,31 @@ static void atk9E_metronome(void) } } -static void atk9F_dmgtolevel(void) +static void Cmd_dmgtolevel(void) { gBattleMoveDamage = gBattleMons[gBattlerAttacker].level; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkA0_psywavedamageeffect(void) +static void Cmd_psywavedamageeffect(void) { s32 randDamage; - while ((randDamage = (Random() & 0xF)) > 10); + while ((randDamage = Random() % 16) > 10); + randDamage *= 10; gBattleMoveDamage = gBattleMons[gBattlerAttacker].level * (randDamage + 50) / 100; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkA1_counterdamagecalculator(void) +static void Cmd_counterdamagecalculator(void) { u8 sideAttacker = GetBattlerSide(gBattlerAttacker); u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].physicalBattlerId); if (gProtectStructs[gBattlerAttacker].physicalDmg - && sideAttacker != sideTarget - && gBattleMons[gProtectStructs[gBattlerAttacker].physicalBattlerId].hp) + && sideAttacker != sideTarget + && gBattleMons[gProtectStructs[gBattlerAttacker].physicalBattlerId].hp) { gBattleMoveDamage = gProtectStructs[gBattlerAttacker].physicalDmg * 2; @@ -7271,8 +7305,7 @@ static void atkA1_counterdamagecalculator(void) } } -// a copy of atkA1 with the physical -> special field changes -static void atkA2_mirrorcoatdamagecalculator(void) +static void Cmd_mirrorcoatdamagecalculator(void) // a copy of Cmd with the physical -> special field changes { u8 sideAttacker = GetBattlerSide(gBattlerAttacker); u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].specialBattlerId); @@ -7280,10 +7313,12 @@ static void atkA2_mirrorcoatdamagecalculator(void) if (gProtectStructs[gBattlerAttacker].specialDmg && sideAttacker != sideTarget && gBattleMons[gProtectStructs[gBattlerAttacker].specialBattlerId].hp) { gBattleMoveDamage = gProtectStructs[gBattlerAttacker].specialDmg * 2; + if (gSideTimers[sideTarget].followmeTimer && gBattleMons[gSideTimers[sideTarget].followmeTarget].hp) gBattlerTarget = gSideTimers[sideTarget].followmeTarget; else gBattlerTarget = gProtectStructs[gBattlerAttacker].specialBattlerId; + gBattlescriptCurrInstr += 5; } else @@ -7293,11 +7328,11 @@ static void atkA2_mirrorcoatdamagecalculator(void) } } -static void atkA3_disablelastusedattack(void) +static void Cmd_disablelastusedattack(void) { s32 i; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) { if (gBattleMons[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget]) break; @@ -7306,6 +7341,7 @@ static void atkA3_disablelastusedattack(void) && i != MAX_MON_MOVES && gBattleMons[gBattlerTarget].pp[i] != 0) { PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerTarget].moves[i]) + gDisableStructs[gBattlerTarget].disabledMove = gBattleMons[gBattlerTarget].moves[i]; gDisableStructs[gBattlerTarget].disableTimer = (Random() & 3) + 2; gDisableStructs[gBattlerTarget].disableTimerStartValue = gDisableStructs[gBattlerTarget].disableTimer; // used to save the random amount of turns? @@ -7317,20 +7353,24 @@ static void atkA3_disablelastusedattack(void) } } -static void atkA4_trysetencore(void) +static void Cmd_trysetencore(void) { s32 i; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) + { if (gBattleMons[gBattlerTarget].moves[i] == gLastMoves[gBattlerTarget]) break; + } + if (gLastMoves[gBattlerTarget] == MOVE_STRUGGLE - || gLastMoves[gBattlerTarget] == MOVE_ENCORE - || gLastMoves[gBattlerTarget] == MOVE_MIRROR_MOVE) - i = 4; + || gLastMoves[gBattlerTarget] == MOVE_ENCORE + || gLastMoves[gBattlerTarget] == MOVE_MIRROR_MOVE) + { + i = MAX_MON_MOVES; + } if (gDisableStructs[gBattlerTarget].encoredMove == MOVE_NONE - && i != 4 - && gBattleMons[gBattlerTarget].pp[i] != 0) + && i != MAX_MON_MOVES && gBattleMons[gBattlerTarget].pp[i] != 0) { gDisableStructs[gBattlerTarget].encoredMove = gBattleMons[gBattlerTarget].moves[i]; gDisableStructs[gBattlerTarget].encoredMovePos = i; @@ -7344,7 +7384,7 @@ static void atkA4_trysetencore(void) } } -static void atkA5_painsplitdmgcalc(void) +static void Cmd_painsplitdmgcalc(void) { if (!(gBattleMons[gBattlerTarget].status2 & STATUS2_SUBSTITUTE)) { @@ -7366,7 +7406,7 @@ static void atkA5_painsplitdmgcalc(void) } } -static void atkA6_settypetorandomresistance(void) // conversion 2 +static void Cmd_settypetorandomresistance(void) // conversion 2 { if (gLastLandedMoves[gBattlerAttacker] == MOVE_NONE || gLastLandedMoves[gBattlerAttacker] == 0xFFFF) @@ -7382,13 +7422,13 @@ static void atkA6_settypetorandomresistance(void) // conversion 2 { s32 i, j, rands; - for (rands = 0; rands < 1000; ++rands) + for (rands = 0; rands < 1000; rands++) { - while (((i = (Random() & 0x7F)) > sizeof(gTypeEffectiveness) / 3)); + while (((i = Random() % 128) > sizeof(gTypeEffectiveness) / 3)); i *= 3; if (TYPE_EFFECT_ATK_TYPE(i) == gLastHitByType[gBattlerAttacker] - && TYPE_EFFECT_MULTIPLIER(i) <= TYPE_MUL_NOT_EFFECTIVE - && !IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_EFFECT_DEF_TYPE(i))) + && TYPE_EFFECT_MULTIPLIER(i) <= TYPE_MUL_NOT_EFFECTIVE + && !IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_EFFECT_DEF_TYPE(i))) { SET_BATTLER_TYPE(gBattlerAttacker, TYPE_EFFECT_DEF_TYPE(i)); PREPARE_TYPE_BUFFER(gBattleTextBuff1, TYPE_EFFECT_DEF_TYPE(i)); @@ -7397,6 +7437,7 @@ static void atkA6_settypetorandomresistance(void) // conversion 2 return; } } + for (j = 0, rands = 0; rands < sizeof(gTypeEffectiveness); j += 3, rands += 3) { switch (TYPE_EFFECT_ATK_TYPE(j)) @@ -7418,30 +7459,31 @@ static void atkA6_settypetorandomresistance(void) // conversion 2 break; } } + gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } } -static void atkA7_setalwayshitflag(void) +static void Cmd_setalwayshitflag(void) { - gStatuses3[gBattlerTarget] &= ~(STATUS3_ALWAYS_HITS); + gStatuses3[gBattlerTarget] &= ~STATUS3_ALWAYS_HITS; gStatuses3[gBattlerTarget] |= 0x10; gDisableStructs[gBattlerTarget].battlerWithSureHit = gBattlerAttacker; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkA8_copymovepermanently(void) // sketch +static void Cmd_copymovepermanently(void) // sketch { - gChosenMove = 0xFFFF; + gChosenMove = MOVE_UNAVAILABLE; if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) - && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE - && gLastPrintedMoves[gBattlerTarget] != 0 - && gLastPrintedMoves[gBattlerTarget] != 0xFFFF - && gLastPrintedMoves[gBattlerTarget] != MOVE_SKETCH) + && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE + && gLastPrintedMoves[gBattlerTarget] != MOVE_NONE + && gLastPrintedMoves[gBattlerTarget] != MOVE_UNAVAILABLE + && gLastPrintedMoves[gBattlerTarget] != MOVE_SKETCH) { s32 i; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) if (gBattleMons[gBattlerAttacker].moves[i] != MOVE_SKETCH && gBattleMons[gBattlerAttacker].moves[i] == gLastPrintedMoves[gBattlerTarget]) break; if (i != MAX_MON_MOVES) @@ -7455,13 +7497,13 @@ static void atkA8_copymovepermanently(void) // sketch gBattleMons[gBattlerAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBattlerTarget]; gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBattlerTarget]].pp; gActiveBattler = gBattlerAttacker; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) { movePpData.moves[i] = gBattleMons[gBattlerAttacker].moves[i]; movePpData.pp[i] = gBattleMons[gBattlerAttacker].pp[i]; } movePpData.ppBonuses = gBattleMons[gBattlerAttacker].ppBonuses; - BtlController_EmitSetMonData(0, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct MovePpInfo), &movePpData); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct MovePpInfo), &movePpData); MarkBattlerForControllerExec(gActiveBattler); PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastPrintedMoves[gBattlerTarget]) gBattlescriptCurrInstr += 5; @@ -7499,7 +7541,7 @@ static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a c { // first argument is unused if (gBattleMoves[move].effect == EFFECT_SOLARBEAM - && (gBattleWeather & WEATHER_SUN_ANY)) + && (gBattleWeather & B_WEATHER_SUN)) return 2; if (gBattleMoves[move].effect == EFFECT_SKULL_BASH || gBattleMoves[move].effect == EFFECT_RAZOR_WIND @@ -7512,12 +7554,12 @@ static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a c return 2; } -static void atkA9_trychoosesleeptalkmove(void) +static void Cmd_trychoosesleeptalkmove(void) { s32 i; u8 unusableMovesBits = 0; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) { if (IsInvalidForSleepTalkOrAssist(gBattleMons[gBattlerAttacker].moves[i]) || gBattleMons[gBattlerAttacker].moves[i] == MOVE_FOCUS_PUNCH @@ -7547,10 +7589,10 @@ static void atkA9_trychoosesleeptalkmove(void) } } -static void atkAA_setdestinybond(void) +static void Cmd_setdestinybond(void) { gBattleMons[gBattlerAttacker].status2 |= STATUS2_DESTINY_BOND; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } static void TrySetDestinyBondToHappen(void) @@ -7564,13 +7606,13 @@ static void TrySetDestinyBondToHappen(void) gHitMarker |= HITMARKER_DESTINYBOND; } -static void atkAB_trysetdestinybondtohappen(void) +static void Cmd_trysetdestinybondtohappen(void) { TrySetDestinyBondToHappen(); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkAC_remaininghptopower(void) +static void Cmd_remaininghptopower(void) { s32 i; s32 hpFraction = GetScaledHPFraction(gBattleMons[gBattlerAttacker].hp, gBattleMons[gBattlerAttacker].maxHP, 48); @@ -7581,18 +7623,22 @@ static void atkAC_remaininghptopower(void) break; } gDynamicBasePower = sFlailHpScaleToPowerTable[i + 1]; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkAD_tryspiteppreduce(void) +static void Cmd_tryspiteppreduce(void) { - if (gLastMoves[gBattlerTarget] != MOVE_NONE && gLastMoves[gBattlerTarget] != 0xFFFF) + if (gLastMoves[gBattlerTarget] != MOVE_NONE + && gLastMoves[gBattlerTarget] != MOVE_UNAVAILABLE) { s32 i; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) + { if (gLastMoves[gBattlerTarget] == gBattleMons[gBattlerTarget].moves[i]) break; + } + if (i != MAX_MON_MOVES && gBattleMons[gBattlerTarget].pp[i] > 1) { s32 ppToDeduct = (Random() & 3) + 2; @@ -7607,7 +7653,7 @@ static void atkAD_tryspiteppreduce(void) if (!(gDisableStructs[gActiveBattler].mimickedMoves & gBitTable[i]) && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) { - BtlController_EmitSetMonData(0, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]); MarkBattlerForControllerExec(gActiveBattler); } gBattlescriptCurrInstr += 5; @@ -7625,7 +7671,7 @@ static void atkAD_tryspiteppreduce(void) } } -static void atkAE_healpartystatus(void) +static void Cmd_healpartystatus(void) { u32 zero = 0; u8 toHeal = 0; @@ -7665,7 +7711,7 @@ static void atkAE_healpartystatus(void) gBattleCommunication[MULTISTRING_CHOOSER] |= 2; } } - for (i = 0; i < PARTY_SIZE; ++i) + for (i = 0; i < PARTY_SIZE; i++) { u16 species = GetMonData(&party[i], MON_DATA_SPECIES2); u8 abilityNum = GetMonData(&party[i], MON_DATA_ABILITY_NUM); @@ -7705,13 +7751,13 @@ static void atkAE_healpartystatus(void) if (toHeal) { gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, toHeal, 4, &zero); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, toHeal, 4, &zero); MarkBattlerForControllerExec(gActiveBattler); } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkAF_cursetarget(void) +static void Cmd_cursetarget(void) { if (gBattleMons[gBattlerTarget].status2 & STATUS2_CURSED) { @@ -7727,7 +7773,7 @@ static void atkAF_cursetarget(void) } } -static void atkB0_trysetspikes(void) +static void Cmd_trysetspikes(void) { u8 targetSide = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE; @@ -7744,18 +7790,18 @@ static void atkB0_trysetspikes(void) } } -static void atkB1_setforesight(void) +static void Cmd_setforesight(void) { gBattleMons[gBattlerTarget].status2 |= STATUS2_FORESIGHT; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkB2_trysetperishsong(void) +static void Cmd_trysetperishsong(void) { s32 i; s32 notAffectedCount = 0; - for (i = 0; i < gBattlersCount; ++i) + for (i = 0; i < gBattlersCount; i++) { if (gStatuses3[i] & STATUS3_PERISH_SONG || gBattleMons[i].ability == ABILITY_SOUNDPROOF) @@ -7776,7 +7822,7 @@ static void atkB2_trysetperishsong(void) gBattlescriptCurrInstr += 5; } -static void atkB3_rolloutdamagecalculation(void) +static void Cmd_rolloutdamagecalculation(void) { if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT) { @@ -7797,15 +7843,15 @@ static void atkB3_rolloutdamagecalculation(void) if (--gDisableStructs[gBattlerAttacker].rolloutTimer == 0) // last hit gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_MULTIPLETURNS); gDynamicBasePower = gBattleMoves[gCurrentMove].power; - for (i = 1; i < (5 - gDisableStructs[gBattlerAttacker].rolloutTimer); ++i) + for (i = 1; i < (5 - gDisableStructs[gBattlerAttacker].rolloutTimer); i++) gDynamicBasePower *= 2; if (gBattleMons[gBattlerAttacker].status2 & STATUS2_DEFENSE_CURL) gDynamicBasePower *= 2; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } -static void atkB4_jumpifconfusedandstatmaxed(void) +static void Cmd_jumpifconfusedandstatmaxed(void) { if (gBattleMons[gBattlerTarget].status2 & STATUS2_CONFUSION && gBattleMons[gBattlerTarget].statStages[gBattlescriptCurrInstr[1]] == 12) @@ -7814,7 +7860,7 @@ static void atkB4_jumpifconfusedandstatmaxed(void) gBattlescriptCurrInstr += 6; } -static void atkB5_furycuttercalc(void) +static void Cmd_furycuttercalc(void) { if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT) { @@ -7829,22 +7875,22 @@ static void atkB5_furycuttercalc(void) ++gDisableStructs[gBattlerAttacker].furyCutterCounter; gDynamicBasePower = gBattleMoves[gCurrentMove].power; - for (i = 1; i < gDisableStructs[gBattlerAttacker].furyCutterCounter; ++i) + for (i = 1; i < gDisableStructs[gBattlerAttacker].furyCutterCounter; i++) gDynamicBasePower *= 2; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } -static void atkB6_happinesstodamagecalculation(void) +static void Cmd_friendshiptodamagecalculation(void) { if (gBattleMoves[gCurrentMove].effect == EFFECT_RETURN) gDynamicBasePower = 10 * (gBattleMons[gBattlerAttacker].friendship) / 25; else // EFFECT_FRUSTRATION gDynamicBasePower = 10 * (255 - gBattleMons[gBattlerAttacker].friendship) / 25; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkB7_presentdamagecalculation(void) +static void Cmd_presentdamagecalculation(void) { s32 rand = Random() & 0xFF; @@ -7882,7 +7928,7 @@ static void atkB7_presentdamagecalculation(void) } } -static void atkB8_setsafeguard(void) +static void Cmd_setsafeguard(void) { if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_SAFEGUARD) { @@ -7896,10 +7942,10 @@ static void atkB8_setsafeguard(void) gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].safeguardBattlerId = gBattlerAttacker; gBattleCommunication[MULTISTRING_CHOOSER] = 5; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkB9_magnitudedamagecalculation(void) +static void Cmd_magnitudedamagecalculation(void) { s32 magnitude = Random() % 100; @@ -7942,10 +7988,10 @@ static void atkB9_magnitudedamagecalculation(void) for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; ++gBattlerTarget) if (gBattlerTarget != gBattlerAttacker && !(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) // a valid target was found break; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkBA_jumpifnopursuitswitchdmg(void) +static void Cmd_jumpifnopursuitswitchdmg(void) { if (gMultiHitCounter == 1) { @@ -7970,7 +8016,7 @@ static void atkBA_jumpifnopursuitswitchdmg(void) { s32 i; - for (i = 0; i < gBattlersCount; ++i) + for (i = 0; i < gBattlersCount; i++) if (gBattlerByTurnOrder[i] == gBattlerTarget) gActionsByTurnOrder[i] = 11; gCurrentMove = MOVE_PURSUIT; @@ -7985,23 +8031,23 @@ static void atkBA_jumpifnopursuitswitchdmg(void) } } -static void atkBB_setsunny(void) +static void Cmd_setsunny(void) { - if (gBattleWeather & WEATHER_SUN_ANY) + if (gBattleWeather & B_WEATHER_SUN) { gMoveResultFlags |= MOVE_RESULT_MISSED; gBattleCommunication[MULTISTRING_CHOOSER] = 2; } else { - gBattleWeather = WEATHER_SUN_TEMPORARY; + gBattleWeather = B_WEATHER_SUN_TEMPORARY; gBattleCommunication[MULTISTRING_CHOOSER] = 4; gWishFutureKnock.weatherDuration = 5; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkBC_maxattackhalvehp(void) // belly drum +static void Cmd_maxattackhalvehp(void) // belly drum { u32 halfHp = gBattleMons[gBattlerAttacker].maxHP / 2; @@ -8022,16 +8068,16 @@ static void atkBC_maxattackhalvehp(void) // belly drum } } -static void atkBD_copyfoestats(void) // psych up +static void Cmd_copyfoestats(void) // psych up { s32 i; - for (i = 0; i < NUM_BATTLE_STATS; ++i) + for (i = 0; i < NUM_BATTLE_STATS; i++) gBattleMons[gBattlerAttacker].statStages[i] = gBattleMons[gBattlerTarget].statStages[i]; gBattlescriptCurrInstr += 5; // Has an unused jump ptr(possibly for a failed attempt) parameter. } -static void atkBE_rapidspinfree(void) +static void Cmd_rapidspinfree(void) { if (gBattleMons[gBattlerAttacker].status2 & STATUS2_WRAPPED) { @@ -8062,24 +8108,24 @@ static void atkBE_rapidspinfree(void) } else { - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } } -static void atkBF_setdefensecurlbit(void) +static void Cmd_setdefensecurlbit(void) { gBattleMons[gBattlerAttacker].status2 |= STATUS2_DEFENSE_CURL; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkC0_recoverbasedonsunlight(void) +static void Cmd_recoverbasedonsunlight(void) { gBattlerTarget = gBattlerAttacker; if (gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP) { if (gBattleWeather == 0 || !WEATHER_HAS_EFFECT) gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2; - else if (gBattleWeather & WEATHER_SUN_ANY) + else if (gBattleWeather & B_WEATHER_SUN) gBattleMoveDamage = 20 * gBattleMons[gBattlerAttacker].maxHP / 30; else // not sunny weather gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4; @@ -8096,7 +8142,7 @@ static void atkC0_recoverbasedonsunlight(void) } } -static void atkC1_hiddenpowercalc(void) +static void Cmd_hiddenpowercalc(void) { s32 powerBits, typeBits; @@ -8117,18 +8163,18 @@ static void atkC1_hiddenpowercalc(void) if (gBattleStruct->dynamicMoveType >= TYPE_MYSTERY) ++gBattleStruct->dynamicMoveType; gBattleStruct->dynamicMoveType |= 0xC0; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkC2_selectfirstvalidtarget(void) +static void Cmd_selectfirstvalidtarget(void) { for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; ++gBattlerTarget) if (gBattlerTarget != gBattlerAttacker && !(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) break; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkC3_trysetfutureattack(void) +static void Cmd_trysetfutureattack(void) { if (gWishFutureKnock.futureSightCounter[gBattlerTarget] != 0) { @@ -8157,7 +8203,7 @@ static void atkC3_trysetfutureattack(void) } } -static void atkC4_trydobeatup(void) +static void Cmd_trydobeatup(void) { struct Pokemon *party; @@ -8201,7 +8247,7 @@ static void atkC4_trydobeatup(void) } } -static void atkC5_setsemiinvulnerablebit(void) +static void Cmd_setsemiinvulnerablebit(void) { switch (gCurrentMove) { @@ -8216,10 +8262,10 @@ static void atkC5_setsemiinvulnerablebit(void) gStatuses3[gBattlerAttacker] |= STATUS3_UNDERWATER; break; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkC6_clearsemiinvulnerablebit(void) +static void Cmd_clearsemiinvulnerablebit(void) { switch (gCurrentMove) { @@ -8234,33 +8280,33 @@ static void atkC6_clearsemiinvulnerablebit(void) gStatuses3[gBattlerAttacker] &= ~STATUS3_UNDERWATER; break; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkC7_setminimize(void) +static void Cmd_setminimize(void) { if (gHitMarker & HITMARKER_OBEYS) gStatuses3[gBattlerAttacker] |= STATUS3_MINIMIZED; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkC8_sethail(void) +static void Cmd_sethail(void) { - if (gBattleWeather & WEATHER_HAIL_ANY) + if (gBattleWeather & B_WEATHER_HAIL) { gMoveResultFlags |= MOVE_RESULT_MISSED; gBattleCommunication[MULTISTRING_CHOOSER] = 2; } else { - gBattleWeather = WEATHER_HAIL; + gBattleWeather = B_WEATHER_HAIL_TEMPORARY; gBattleCommunication[MULTISTRING_CHOOSER] = 5; gWishFutureKnock.weatherDuration = 5; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento +static void Cmd_trymemento(void) // memento { if (gBattleMons[gBattlerTarget].statStages[STAT_ATK] == 0 && gBattleMons[gBattlerTarget].statStages[STAT_SPATK] == 0 @@ -8278,38 +8324,38 @@ static void atkC9_jumpifattackandspecialattackcannotfall(void) // memento } } -static void atkCA_setforcedtarget(void) // follow me +static void Cmd_setforcedtarget(void) // follow me { gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTimer = 1; gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTarget = gBattlerAttacker; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkCB_setcharge(void) +static void Cmd_setcharge(void) { gStatuses3[gBattlerAttacker] |= STATUS3_CHARGED_UP; gDisableStructs[gBattlerAttacker].chargeTimer = 2; gDisableStructs[gBattlerAttacker].chargeTimerStartValue = 2; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkCC_callterrainattack(void) // nature power +static void Cmd_callterrainattack(void) // nature power { gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); gCurrentMove = sNaturePowerMoves[gBattleTerrain]; gBattlerTarget = GetMoveTarget(gCurrentMove, 0); BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh +static void Cmd_cureifburnedparalysedorpoisoned(void) // refresh { if (gBattleMons[gBattlerAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON)) { gBattleMons[gBattlerAttacker].status1 = 0; gBattlescriptCurrInstr += 5; gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); } else @@ -8318,7 +8364,7 @@ static void atkCD_cureifburnedparalysedorpoisoned(void) // refresh } } -static void atkCE_settorment(void) +static void Cmd_settorment(void) { if (gBattleMons[gBattlerTarget].status2 & STATUS2_TORMENT) { @@ -8331,7 +8377,7 @@ static void atkCE_settorment(void) } } -static void atkCF_jumpifnodamage(void) +static void Cmd_jumpifnodamage(void) { if (gProtectStructs[gBattlerAttacker].physicalDmg || gProtectStructs[gBattlerAttacker].specialDmg) gBattlescriptCurrInstr += 5; @@ -8339,7 +8385,7 @@ static void atkCF_jumpifnodamage(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atkD0_settaunt(void) +static void Cmd_settaunt(void) { if (gDisableStructs[gBattlerTarget].tauntTimer == 0) { @@ -8353,7 +8399,7 @@ static void atkD0_settaunt(void) } } -static void atkD1_trysethelpinghand(void) +static void Cmd_trysethelpinghand(void) { gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE @@ -8370,7 +8416,7 @@ static void atkD1_trysethelpinghand(void) } } -static void atkD2_tryswapitems(void) // trick +static void Cmd_tryswapitems(void) // trick { // opponent can't swap items with player in regular battles if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER @@ -8421,10 +8467,10 @@ static void atkD2_tryswapitems(void) // trick gBattleMons[gBattlerAttacker].item = 0; gBattleMons[gBattlerTarget].item = oldItemAtk; gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, newItemAtk); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, newItemAtk); MarkBattlerForControllerExec(gBattlerAttacker); gActiveBattler = gBattlerTarget; - BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattlerTarget].item); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattlerTarget].item); MarkBattlerForControllerExec(gBattlerTarget); *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerTarget]) + 0) = 0; *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerTarget]) + 1) = 0; @@ -8444,7 +8490,7 @@ static void atkD2_tryswapitems(void) // trick } } -static void atkD3_trycopyability(void) // role play +static void Cmd_trycopyability(void) // role play { if (gBattleMons[gBattlerTarget].ability != ABILITY_NONE && gBattleMons[gBattlerTarget].ability != ABILITY_WONDER_GUARD) { @@ -8458,7 +8504,7 @@ static void atkD3_trycopyability(void) // role play } } -static void atkD4_trywish(void) +static void Cmd_trywish(void) { switch (gBattlescriptCurrInstr[1]) { @@ -8488,7 +8534,7 @@ static void atkD4_trywish(void) } } -static void atkD5_trysetroots(void) // ingrain +static void Cmd_trysetroots(void) // ingrain { if (gStatuses3[gBattlerAttacker] & STATUS3_ROOTED) { @@ -8501,7 +8547,7 @@ static void atkD5_trysetroots(void) // ingrain } } -static void atkD6_doubledamagedealtifdamaged(void) +static void Cmd_doubledamagedealtifdamaged(void) { if ((gProtectStructs[gBattlerAttacker].physicalDmg != 0 && gProtectStructs[gBattlerAttacker].physicalBattlerId == gBattlerTarget) @@ -8510,10 +8556,10 @@ static void atkD6_doubledamagedealtifdamaged(void) { gBattleScripting.dmgMultiplier = 2; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkD7_setyawn(void) +static void Cmd_setyawn(void) { if (gStatuses3[gBattlerTarget] & STATUS3_YAWN || gBattleMons[gBattlerTarget].status1 & STATUS1_ANY) @@ -8527,7 +8573,7 @@ static void atkD7_setyawn(void) } } -static void atkD8_setdamagetohealthdifference(void) +static void Cmd_setdamagetohealthdifference(void) { if (gBattleMons[gBattlerTarget].hp <= gBattleMons[gBattlerAttacker].hp) { @@ -8540,7 +8586,7 @@ static void atkD8_setdamagetohealthdifference(void) } } -static void atkD9_scaledamagebyhealthratio(void) +static void Cmd_scaledamagebyhealthratio(void) { if (gDynamicBasePower == 0) { @@ -8550,10 +8596,10 @@ static void atkD9_scaledamagebyhealthratio(void) if (gDynamicBasePower == 0) gDynamicBasePower = 1; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkDA_tryswapabilities(void) // skill swap +static void Cmd_tryswapabilities(void) // skill swap { if ((gBattleMons[gBattlerAttacker].ability == 0 && gBattleMons[gBattlerTarget].ability == 0) @@ -8574,7 +8620,7 @@ static void atkDA_tryswapabilities(void) // skill swap } } -static void atkDB_tryimprison(void) +static void Cmd_tryimprison(void) { if ((gStatuses3[gBattlerAttacker] & STATUS3_IMPRISONED_OTHERS)) { @@ -8596,7 +8642,7 @@ static void atkDB_tryimprison(void) { s32 i; - for (i = 0; i < MAX_MON_MOVES; ++i) + for (i = 0; i < MAX_MON_MOVES; i++) { if (gBattleMons[gBattlerAttacker].moves[attackerMoveId] == gBattleMons[battlerId].moves[i] && gBattleMons[gBattlerAttacker].moves[attackerMoveId] != MOVE_NONE) @@ -8618,7 +8664,7 @@ static void atkDB_tryimprison(void) } } -static void atkDC_trysetgrudge(void) +static void Cmd_trysetgrudge(void) { if (gStatuses3[gBattlerAttacker] & STATUS3_GRUDGE) { @@ -8631,7 +8677,7 @@ static void atkDC_trysetgrudge(void) } } -static void atkDD_weightdamagecalculation(void) +static void Cmd_weightdamagecalculation(void) { s32 i; @@ -8644,10 +8690,10 @@ static void atkDD_weightdamagecalculation(void) gDynamicBasePower = sWeightToDamageTable[i + 1]; else gDynamicBasePower = 120; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkDE_assistattackselect(void) +static void Cmd_assistattackselect(void) { s32 chooseableMovesNo = 0; struct Pokemon *party; @@ -8671,7 +8717,7 @@ static void atkDE_assistattackselect(void) if (IsInvalidForSleepTalkOrAssist(move)) continue; - for (; sMovesForbiddenToCopy[i] != ASSIST_FORBIDDEN_END && move != sMovesForbiddenToCopy[i]; ++i); + for (; sMovesForbiddenToCopy[i] != ASSIST_FORBIDDEN_END && move != sMovesForbiddenToCopy[i]; i++); if (sMovesForbiddenToCopy[i] != ASSIST_FORBIDDEN_END || move == MOVE_NONE) continue; movesArray[chooseableMovesNo] = move; @@ -8691,7 +8737,7 @@ static void atkDE_assistattackselect(void) } } -static void atkDF_trysetmagiccoat(void) +static void Cmd_trysetmagiccoat(void) { gBattlerTarget = gBattlerAttacker; gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure = 1; @@ -8706,7 +8752,7 @@ static void atkDF_trysetmagiccoat(void) } } -static void atkE0_trysetsnatch(void) // snatch +static void Cmd_trysetsnatch(void) // snatch { gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure = 1; if (gCurrentTurnActionNumber == gBattlersCount - 1) // moves last turn @@ -8720,7 +8766,7 @@ static void atkE0_trysetsnatch(void) // snatch } } -static void atkE1_trygetintimidatetarget(void) +static void Cmd_trygetintimidatetarget(void) { u8 side; @@ -8736,21 +8782,21 @@ static void atkE1_trygetintimidatetarget(void) gBattlescriptCurrInstr += 5; } -static void atkE2_switchoutabilities(void) +static void Cmd_switchoutabilities(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); switch (gBattleMons[gActiveBattler].ability) { case ABILITY_NATURAL_CURE: gBattleMons[gActiveBattler].status1 = 0; - BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, gBitTable[*(gBattleStruct->battlerPartyIndexes + gActiveBattler)], 4, &gBattleMons[gActiveBattler].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, gBitTable[*(gBattleStruct->battlerPartyIndexes + gActiveBattler)], 4, &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); break; } gBattlescriptCurrInstr += 2; } -static void atkE3_jumpifhasnohp(void) +static void Cmd_jumpifhasnohp(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); @@ -8760,7 +8806,7 @@ static void atkE3_jumpifhasnohp(void) gBattlescriptCurrInstr += 6; } -static void atkE4_getsecretpowereffect(void) +static void Cmd_getsecretpowereffect(void) { switch (gBattleTerrain) { @@ -8792,17 +8838,17 @@ static void atkE4_getsecretpowereffect(void) gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_PARALYSIS; break; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkE5_pickup(void) +static void Cmd_pickup(void) { s32 i; u32 j; u16 species, heldItem; u32 ability; - for (i = 0; i < PARTY_SIZE; ++i) + for (i = 0; i < PARTY_SIZE; i++) { species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); @@ -8820,24 +8866,24 @@ static void atkE5_pickup(void) SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &sPickupItems[j]); } } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkE6_docastformchangeanimation(void) +static void Cmd_docastformchangeanimation(void) { gActiveBattler = gBattleScripting.battler; if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE) *(&gBattleStruct->formToChangeInto) |= 0x80; - BtlController_EmitBattleAnimation(0, B_ANIM_CASTFORM_CHANGE, gBattleStruct->formToChangeInto); + BtlController_EmitBattleAnimation(BUFFER_A, B_ANIM_CASTFORM_CHANGE, gBattleStruct->formToChangeInto); MarkBattlerForControllerExec(gActiveBattler); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkE7_trycastformdatachange(void) +static void Cmd_trycastformdatachange(void) { u8 form; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; form = CastformDataTypeChange(gBattleScripting.battler); if (form) { @@ -8846,7 +8892,7 @@ static void atkE7_trycastformdatachange(void) } } -static void atkE8_settypebasedhalvers(void) // water and mud sport +static void Cmd_settypebasedhalvers(void) // water and mud sport { bool8 worked = FALSE; @@ -8874,27 +8920,27 @@ static void atkE8_settypebasedhalvers(void) // water and mud sport gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } -static void atkE9_setweatherballtype(void) +static void Cmd_setweatherballtype(void) { if (WEATHER_HAS_EFFECT) { if (gBattleWeather & WEATHER_ANY) gBattleScripting.dmgMultiplier = 2; - if (gBattleWeather & WEATHER_RAIN_ANY) + if (gBattleWeather & B_WEATHER_RAIN) *(&gBattleStruct->dynamicMoveType) = TYPE_WATER | 0x80; - else if (gBattleWeather & WEATHER_SANDSTORM_ANY) + else if (gBattleWeather & B_WEATHER_SANDSTORM) *(&gBattleStruct->dynamicMoveType) = TYPE_ROCK | 0x80; - else if (gBattleWeather & WEATHER_SUN_ANY) + else if (gBattleWeather & B_WEATHER_SUN) *(&gBattleStruct->dynamicMoveType) = TYPE_FIRE | 0x80; - else if (gBattleWeather & WEATHER_HAIL_ANY) + else if (gBattleWeather & B_WEATHER_HAIL) *(&gBattleStruct->dynamicMoveType) = TYPE_ICE | 0x80; else *(&gBattleStruct->dynamicMoveType) = TYPE_NORMAL | 0x80; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkEA_tryrecycleitem(void) +static void Cmd_tryrecycleitem(void) { u16 *usedHeldItem; @@ -8905,7 +8951,7 @@ static void atkEA_tryrecycleitem(void) gLastUsedItem = *usedHeldItem; *usedHeldItem = ITEM_NONE; gBattleMons[gActiveBattler].item = gLastUsedItem; - BtlController_EmitSetMonData(0, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 5; } @@ -8915,7 +8961,7 @@ static void atkEA_tryrecycleitem(void) } } -static void atkEB_settypetoterrain(void) +static void Cmd_settypetoterrain(void) { if (!IS_BATTLER_OF_TYPE(gBattlerAttacker, sTerrainToType[gBattleTerrain])) { @@ -8929,7 +8975,7 @@ static void atkEB_settypetoterrain(void) } } -static void atkEC_pursuitrelated(void) +static void Cmd_pursuitdoubles(void) { gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK); @@ -8951,7 +8997,7 @@ static void atkEC_pursuitrelated(void) } } -static void atkED_snatchsetbattlers(void) +static void Cmd_snatchsetbattlers(void) { gEffectBattler = gBattlerAttacker; if (gBattlerAttacker == gBattlerTarget) @@ -8959,10 +9005,10 @@ static void atkED_snatchsetbattlers(void) else gBattlerTarget = gBattleScripting.battler; gBattleScripting.battler = gEffectBattler; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkEE_removelightscreenreflect(void) // brick break +static void Cmd_removelightscreenreflect(void) // brick break { u8 opposingSide = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE; @@ -8980,14 +9026,14 @@ static void atkEE_removelightscreenreflect(void) // brick break gBattleScripting.animTurn = 0; gBattleScripting.animTargetsHit = 0; } - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkEF_handleballthrow(void) +static void Cmd_handleballthrow(void) { u8 ballMultiplier = 0; - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) { gActiveBattler = gBattlerAttacker; gBattlerTarget = gBattlerAttacker ^ BIT_SIDE; @@ -9125,7 +9171,7 @@ static void atkEF_handleballthrow(void) } } -static void atkF0_givecaughtmon(void) +static void Cmd_givecaughtmon(void) { if (GiveMonToPlayer(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]]) != MON_GIVEN_TO_PARTY) { @@ -9143,14 +9189,14 @@ static void atkF0_givecaughtmon(void) gBattleCommunication[MULTISTRING_CHOOSER] = 2; } if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC)) - ++gBattleCommunication[MULTISTRING_CHOOSER]; + gBattleCommunication[MULTISTRING_CHOOSER]++; } gBattleResults.caughtMonSpecies = gBattleMons[gBattlerAttacker ^ BIT_SIDE].species; GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleResults.caughtMonNick); - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkF1_trysetcaughtmondexflags(void) +static void Cmd_trysetcaughtmondexflags(void) { u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL); u32 personality = GetMonData(&gEnemyParty[0], MON_DATA_PERSONALITY, NULL); @@ -9166,7 +9212,7 @@ static void atkF1_trysetcaughtmondexflags(void) } } -static void atkF2_displaydexinfo(void) +static void Cmd_displaydexinfo(void) { u16 species = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL); @@ -9220,7 +9266,7 @@ static void atkF2_displaydexinfo(void) break; case 5: if (!gPaletteFade.active) - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; break; } } @@ -9292,7 +9338,7 @@ void BattleDestroyYesNoCursorAt(void) CopyBgTilemapBufferToVram(0); } -static void atkF3_trygivecaughtmonnick(void) +static void Cmd_trygivecaughtmonnick(void) { switch (gBattleCommunication[MULTIUSE_STATE]) { @@ -9366,24 +9412,24 @@ static void atkF3_trygivecaughtmonnick(void) } } -static void atkF4_subattackerhpbydmg(void) +static void Cmd_subattackerhpbydmg(void) { gBattleMons[gBattlerAttacker].hp -= gBattleMoveDamage; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkF5_removeattackerstatus1(void) +static void Cmd_removeattackerstatus1(void) { gBattleMons[gBattlerAttacker].status1 = 0; - ++gBattlescriptCurrInstr; + gBattlescriptCurrInstr++; } -static void atkF6_finishaction(void) +static void Cmd_finishaction(void) { gCurrentActionFuncId = B_ACTION_FINISHED; } -static void atkF7_finishturn(void) +static void Cmd_finishturn(void) { gCurrentActionFuncId = B_ACTION_FINISHED; gCurrentTurnActionNumber = gBattlersCount; diff --git a/src/battle_util.c b/src/battle_util.c index 2b0bfccfa..4efbc7656 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -568,22 +568,22 @@ u8 DoFieldEndTurnEffects(void) ++gBattleStruct->turnCountersTracker; break; case ENDTURN_RAIN: - if (gBattleWeather & WEATHER_RAIN_ANY) + if (gBattleWeather & B_WEATHER_RAIN) { - if (!(gBattleWeather & WEATHER_RAIN_PERMANENT)) + if (!(gBattleWeather & B_WEATHER_RAIN_PERMANENT)) { if (--gWishFutureKnock.weatherDuration == 0) { - gBattleWeather &= ~WEATHER_RAIN_TEMPORARY; - gBattleWeather &= ~WEATHER_RAIN_DOWNPOUR; + gBattleWeather &= ~B_WEATHER_RAIN_TEMPORARY; + gBattleWeather &= ~B_WEATHER_RAIN_DOWNPOUR; gBattleCommunication[MULTISTRING_CHOOSER] = 2; } - else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR) + else if (gBattleWeather & B_WEATHER_RAIN_DOWNPOUR) gBattleCommunication[MULTISTRING_CHOOSER] = 1; else gBattleCommunication[MULTISTRING_CHOOSER] = 0; } - else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR) + else if (gBattleWeather & B_WEATHER_RAIN_DOWNPOUR) { gBattleCommunication[MULTISTRING_CHOOSER] = 1; } @@ -597,11 +597,11 @@ u8 DoFieldEndTurnEffects(void) ++gBattleStruct->turnCountersTracker; break; case ENDTURN_SANDSTORM: - if (gBattleWeather & WEATHER_SANDSTORM_ANY) + if (gBattleWeather & B_WEATHER_SANDSTORM) { - if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) + if (!(gBattleWeather & B_WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) { - gBattleWeather &= ~WEATHER_SANDSTORM_TEMPORARY; + gBattleWeather &= ~B_WEATHER_SANDSTORM_TEMPORARY; gBattlescriptCurrInstr = BattleScript_SandStormHailEnds; } else @@ -616,11 +616,11 @@ u8 DoFieldEndTurnEffects(void) ++gBattleStruct->turnCountersTracker; break; case ENDTURN_SUN: - if (gBattleWeather & WEATHER_SUN_ANY) + if (gBattleWeather & B_WEATHER_SUN) { - if (!(gBattleWeather & WEATHER_SUN_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) + if (!(gBattleWeather & B_WEATHER_SUN_PERMANENT) && --gWishFutureKnock.weatherDuration == 0) { - gBattleWeather &= ~WEATHER_SUN_TEMPORARY; + gBattleWeather &= ~B_WEATHER_SUN_TEMPORARY; gBattlescriptCurrInstr = BattleScript_SunlightFaded; } else @@ -633,11 +633,11 @@ u8 DoFieldEndTurnEffects(void) ++gBattleStruct->turnCountersTracker; break; case ENDTURN_HAIL: - if (gBattleWeather & WEATHER_HAIL_ANY) + if (gBattleWeather & B_WEATHER_HAIL) { if (--gWishFutureKnock.weatherDuration == 0) { - gBattleWeather &= ~WEATHER_HAIL; + gBattleWeather &= ~B_WEATHER_HAIL_TEMPORARY; gBattlescriptCurrInstr = BattleScript_SandStormHailEnds; } else @@ -1093,7 +1093,7 @@ bool8 HandleFaintedMonActions(void) ++gBattleStruct->faintedActionsState; for (i = 0; i < gBattlersCount; ++i) { - if (gAbsentBattlerFlags & gBitTable[i] && !HasNoMonsToSwitch(i, 6, 6)) + if (gAbsentBattlerFlags & gBitTable[i] && !HasNoMonsToSwitch(i, PARTY_SIZE, PARTY_SIZE)) gAbsentBattlerFlags &= ~(gBitTable[i]); } // fall through @@ -1552,22 +1552,22 @@ u8 CastformDataTypeChange(u8 battler) } if (!WEATHER_HAS_EFFECT) return CASTFORM_NO_CHANGE; - if (!(gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)) && !IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL)) + if (!(gBattleWeather & (B_WEATHER_RAIN | B_WEATHER_SUN | B_WEATHER_HAIL)) && !IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL)) { SET_BATTLER_TYPE(battler, TYPE_NORMAL); formChange = CASTFORM_TO_NORMAL; } - if (gBattleWeather & WEATHER_SUN_ANY && !IS_BATTLER_OF_TYPE(battler, TYPE_FIRE)) + if (gBattleWeather & B_WEATHER_SUN && !IS_BATTLER_OF_TYPE(battler, TYPE_FIRE)) { SET_BATTLER_TYPE(battler, TYPE_FIRE); formChange = CASTFORM_TO_FIRE; } - if (gBattleWeather & WEATHER_RAIN_ANY && !IS_BATTLER_OF_TYPE(battler, TYPE_WATER)) + if (gBattleWeather & B_WEATHER_RAIN && !IS_BATTLER_OF_TYPE(battler, TYPE_WATER)) { SET_BATTLER_TYPE(battler, TYPE_WATER); formChange = CASTFORM_TO_WATER; } - if (gBattleWeather & WEATHER_HAIL_ANY && !IS_BATTLER_OF_TYPE(battler, TYPE_ICE)) + if (gBattleWeather & B_WEATHER_HAIL && !IS_BATTLER_OF_TYPE(battler, TYPE_ICE)) { SET_BATTLER_TYPE(battler, TYPE_ICE); formChange = CASTFORM_TO_ICE; @@ -1631,27 +1631,27 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA case WEATHER_RAIN: case WEATHER_RAIN_THUNDERSTORM: case WEATHER_DOWNPOUR: - if (!(gBattleWeather & WEATHER_RAIN_ANY)) + if (!(gBattleWeather & B_WEATHER_RAIN)) { - gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT); + gBattleWeather = (B_WEATHER_RAIN_TEMPORARY | B_WEATHER_RAIN_PERMANENT); gBattleScripting.animArg1 = B_ANIM_RAIN_CONTINUES; gBattleScripting.battler = battler; ++effect; } break; case WEATHER_SANDSTORM: - if (!(gBattleWeather & WEATHER_SANDSTORM_ANY)) + if (!(gBattleWeather & B_WEATHER_SANDSTORM)) { - gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); + gBattleWeather = (B_WEATHER_SANDSTORM_PERMANENT | B_WEATHER_SANDSTORM_TEMPORARY); gBattleScripting.animArg1 = B_ANIM_SANDSTORM_CONTINUES; gBattleScripting.battler = battler; ++effect; } break; case WEATHER_DROUGHT: - if (!(gBattleWeather & WEATHER_SUN_ANY)) + if (!(gBattleWeather & B_WEATHER_SUN)) { - gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); + gBattleWeather = (B_WEATHER_SUN_PERMANENT | B_WEATHER_SUN_TEMPORARY); gBattleScripting.animArg1 = B_ANIM_SUN_CONTINUES; gBattleScripting.battler = battler; ++effect; @@ -1665,27 +1665,27 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } break; case ABILITY_DRIZZLE: - if (!(gBattleWeather & WEATHER_RAIN_PERMANENT)) + if (!(gBattleWeather & B_WEATHER_RAIN_PERMANENT)) { - gBattleWeather = (WEATHER_RAIN_PERMANENT | WEATHER_RAIN_TEMPORARY); + gBattleWeather = (B_WEATHER_RAIN_PERMANENT | B_WEATHER_RAIN_TEMPORARY); BattleScriptPushCursorAndCallback(BattleScript_DrizzleActivates); gBattleScripting.battler = battler; ++effect; } break; case ABILITY_SAND_STREAM: - if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT)) + if (!(gBattleWeather & B_WEATHER_SANDSTORM_PERMANENT)) { - gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY); + gBattleWeather = (B_WEATHER_SANDSTORM_PERMANENT | B_WEATHER_SANDSTORM_TEMPORARY); BattleScriptPushCursorAndCallback(BattleScript_SandstreamActivates); gBattleScripting.battler = battler; ++effect; } break; case ABILITY_DROUGHT: - if (!(gBattleWeather & WEATHER_SUN_PERMANENT)) + if (!(gBattleWeather & B_WEATHER_SUN_PERMANENT)) { - gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY); + gBattleWeather = (B_WEATHER_SUN_PERMANENT | B_WEATHER_SUN_TEMPORARY); BattleScriptPushCursorAndCallback(BattleScript_DroughtActivates); gBattleScripting.battler = battler; ++effect; @@ -1739,7 +1739,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA switch (gLastUsedAbility) { case ABILITY_RAIN_DISH: - if (WEATHER_HAS_EFFECT && (gBattleWeather & WEATHER_RAIN_ANY) + if (WEATHER_HAS_EFFECT && (gBattleWeather & B_WEATHER_RAIN) && gBattleMons[battler].maxHP > gBattleMons[battler].hp) { gLastUsedAbility = ABILITY_RAIN_DISH; // why @@ -2971,7 +2971,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED && (Random() % 100) < battlerHoldEffectParam - && gBattleMoves[gCurrentMove].flags & FLAG_KINGSROCK_AFFECTED + && gBattleMoves[gCurrentMove].flags & FLAG_KINGS_ROCK_AFFECTED && gBattleMons[gBattlerTarget].hp) { gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_FLINCH; @@ -3016,7 +3016,7 @@ void ClearFuryCutterDestinyBondGrudge(u8 battlerId) void HandleAction_RunBattleScript(void) // identical to RunBattleScriptCommands { - if (!gBattleControllerExecFlags) + if (gBattleControllerExecFlags == 0) gBattleScriptingCommandsTable[*gBattlescriptCurrInstr](); } diff --git a/src/cable_club.c b/src/cable_club.c index e14d4366e..ba5ff54a4 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -79,7 +79,7 @@ static void PrintNewCountOnLinkPlayerCountDisplayWindow(u16 windowId, s32 num) ConvertIntToDecimalStringN(gStringVar1, num, STR_CONV_MODE_LEFT_ALIGN, 1); SetStdWindowBorderStyle(windowId, FALSE); StringExpandPlaceholders(gStringVar4, gUnknown_841DF82); - AddTextPrinterParameterized(windowId, 2, gStringVar4, 0, 0, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(windowId, 2, gStringVar4, 0, 0, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(windowId, COPYWIN_BOTH); } diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 1fa7f75a9..ad7572c72 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -23,7 +23,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_KARATE_CHOP] = @@ -36,7 +36,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_DOUBLE_SLAP] = @@ -49,7 +49,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_COMET_PUNCH] = @@ -62,7 +62,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_MEGA_PUNCH] = @@ -75,7 +75,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_PAY_DAY] = @@ -88,7 +88,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_FIRE_PUNCH] = @@ -140,7 +140,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_VICE_GRIP] = @@ -153,7 +153,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_GUILLOTINE] = @@ -179,7 +179,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SWORDS_DANCE] = @@ -205,7 +205,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_GUST] = @@ -218,7 +218,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_WING_ATTACK] = @@ -231,7 +231,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_WHIRLWIND] = @@ -257,7 +257,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_BIND] = @@ -270,7 +270,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SLAM] = @@ -283,7 +283,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_VINE_WHIP] = @@ -296,7 +296,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_STOMP] = @@ -322,7 +322,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_MEGA_KICK] = @@ -335,7 +335,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_JUMP_KICK] = @@ -348,7 +348,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_ROLLING_KICK] = @@ -361,7 +361,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SAND_ATTACK] = @@ -374,7 +374,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_HEADBUTT] = @@ -400,7 +400,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_FURY_ATTACK] = @@ -413,7 +413,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_HORN_DRILL] = @@ -439,7 +439,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_BODY_SLAM] = @@ -465,7 +465,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_TAKE_DOWN] = @@ -478,7 +478,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_THRASH] = @@ -491,7 +491,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_DOUBLE_EDGE] = @@ -504,7 +504,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_TAIL_WHIP] = @@ -517,7 +517,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_POISON_STING] = @@ -556,7 +556,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_LEER] = @@ -569,7 +569,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_BITE] = @@ -595,7 +595,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_ROAR] = @@ -621,7 +621,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_SUPERSONIC] = @@ -634,7 +634,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_SONIC_BOOM] = @@ -647,7 +647,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_DISABLE] = @@ -725,7 +725,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_HYDRO_PUMP] = @@ -738,7 +738,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SURF] = @@ -751,7 +751,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_ICE_BEAM] = @@ -829,7 +829,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_PECK] = @@ -842,7 +842,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_DRILL_PECK] = @@ -855,7 +855,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SUBMISSION] = @@ -868,7 +868,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_LOW_KICK] = @@ -881,7 +881,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_COUNTER] = @@ -907,7 +907,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_STRENGTH] = @@ -920,7 +920,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_ABSORB] = @@ -959,7 +959,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_GROWTH] = @@ -985,7 +985,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SOLAR_BEAM] = @@ -998,7 +998,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_POISON_POWDER] = @@ -1011,7 +1011,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_STUN_SPORE] = @@ -1024,7 +1024,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_SLEEP_POWDER] = @@ -1037,7 +1037,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_PETAL_DANCE] = @@ -1050,7 +1050,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_STRING_SHOT] = @@ -1063,7 +1063,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_DRAGON_RAGE] = @@ -1076,7 +1076,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_FIRE_SPIN] = @@ -1089,7 +1089,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_THUNDER_SHOCK] = @@ -1128,7 +1128,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_THUNDER] = @@ -1154,7 +1154,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_EARTHQUAKE] = @@ -1167,7 +1167,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_FISSURE] = @@ -1193,7 +1193,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_TOXIC] = @@ -1206,7 +1206,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_CONFUSION] = @@ -1245,7 +1245,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_MEDITATE] = @@ -1284,7 +1284,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_RAGE] = @@ -1297,7 +1297,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_TELEPORT] = @@ -1323,7 +1323,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_MIMIC] = @@ -1349,7 +1349,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_DOUBLE_TEAM] = @@ -1414,7 +1414,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_CONFUSE_RAY] = @@ -1427,7 +1427,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_WITHDRAW] = @@ -1531,7 +1531,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_METRONOME] = @@ -1570,7 +1570,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_EGG_BOMB] = @@ -1583,7 +1583,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_LICK] = @@ -1661,7 +1661,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_CLAMP] = @@ -1674,7 +1674,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SWIFT] = @@ -1687,7 +1687,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SKULL_BASH] = @@ -1700,7 +1700,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SPIKE_CANNON] = @@ -1713,7 +1713,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_CONSTRICT] = @@ -1752,7 +1752,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_SOFT_BOILED] = @@ -1778,7 +1778,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_GLARE] = @@ -1791,7 +1791,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_DREAM_EATER] = @@ -1817,7 +1817,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_BARRAGE] = @@ -1830,7 +1830,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_LEECH_LIFE] = @@ -1856,7 +1856,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_SKY_ATTACK] = @@ -1869,7 +1869,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_TRANSFORM] = @@ -1921,7 +1921,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_FLASH] = @@ -1934,7 +1934,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_PSYWAVE] = @@ -1947,7 +1947,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SPLASH] = @@ -1986,7 +1986,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_EXPLOSION] = @@ -1999,7 +1999,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_FURY_SWIPES] = @@ -2012,7 +2012,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_BONEMERANG] = @@ -2025,7 +2025,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_REST] = @@ -2129,7 +2129,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SUBSTITUTE] = @@ -2155,7 +2155,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SKETCH] = @@ -2181,7 +2181,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_THIEF] = @@ -2207,7 +2207,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_MIND_READER] = @@ -2259,7 +2259,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_CURSE] = @@ -2285,7 +2285,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_CONVERSION_2] = @@ -2311,7 +2311,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_COTTON_SPORE] = @@ -2324,7 +2324,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_REVERSAL] = @@ -2337,7 +2337,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SPITE] = @@ -2389,7 +2389,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SCARY_FACE] = @@ -2402,7 +2402,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_FAINT_ATTACK] = @@ -2415,7 +2415,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SWEET_KISS] = @@ -2428,7 +2428,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_BELLY_DRUM] = @@ -2584,7 +2584,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_LOCK_ON] = @@ -2610,7 +2610,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SANDSTORM] = @@ -2662,7 +2662,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_ROLLOUT] = @@ -2675,7 +2675,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_FALSE_SWIPE] = @@ -2688,7 +2688,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SWAGGER] = @@ -2701,7 +2701,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_MILK_DRINK] = @@ -2740,7 +2740,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_STEEL_WING] = @@ -2753,7 +2753,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_MEAN_LOOK] = @@ -2766,7 +2766,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_ATTRACT] = @@ -2779,7 +2779,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_SLEEP_TALK] = @@ -2818,7 +2818,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_PRESENT] = @@ -2844,7 +2844,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SAFEGUARD] = @@ -2896,7 +2896,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_DYNAMIC_PUNCH] = @@ -2922,7 +2922,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_DRAGON_BREATH] = @@ -2935,7 +2935,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_BATON_PASS] = @@ -2987,7 +2987,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SWEET_SCENT] = @@ -3000,7 +3000,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_IRON_TAIL] = @@ -3039,7 +3039,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = -1, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_MORNING_SUN] = @@ -3091,7 +3091,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_CROSS_CHOP] = @@ -3104,7 +3104,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_TWISTER] = @@ -3117,7 +3117,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 20, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_RAIN_DANCE] = @@ -3195,7 +3195,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_ANCIENT_POWER] = @@ -3260,7 +3260,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_BEAT_UP] = @@ -3273,7 +3273,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_FAKE_OUT] = @@ -3299,7 +3299,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_STOCKPILE] = @@ -3325,7 +3325,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SWALLOW] = @@ -3390,7 +3390,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_WILL_O_WISP] = @@ -3403,7 +3403,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_MEMENTO] = @@ -3637,7 +3637,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = -4, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_BRICK_BREAK] = @@ -3650,7 +3650,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_YAWN] = @@ -3663,7 +3663,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_KNOCK_OFF] = @@ -3689,7 +3689,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_ERUPTION] = @@ -3702,7 +3702,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SKILL_SWAP] = @@ -3793,7 +3793,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_ARM_THRUST] = @@ -3806,7 +3806,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_CAMOUFLAGE] = @@ -3871,7 +3871,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_TEETER_DANCE] = @@ -3923,7 +3923,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_NEEDLE_ARM] = @@ -4001,7 +4001,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_HYDRO_CANNON] = @@ -4014,7 +4014,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_METEOR_MASH] = @@ -4027,7 +4027,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_ASTONISH] = @@ -4053,7 +4053,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_AROMATHERAPY] = @@ -4079,7 +4079,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_AIR_CUTTER] = @@ -4092,7 +4092,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_OVERHEAT] = @@ -4105,7 +4105,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_ODOR_SLEUTH] = @@ -4144,7 +4144,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_METAL_SOUND] = @@ -4157,7 +4157,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_GRASS_WHISTLE] = @@ -4170,7 +4170,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_TICKLE] = @@ -4183,7 +4183,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_COSMIC_POWER] = @@ -4222,7 +4222,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SHADOW_PUNCH] = @@ -4235,7 +4235,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_EXTRASENSORY] = @@ -4261,7 +4261,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SAND_TOMB] = @@ -4274,7 +4274,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SHEER_COLD] = @@ -4300,7 +4300,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 30, .target = MOVE_TARGET_BOTH, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_BULLET_SEED] = @@ -4313,7 +4313,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_AERIAL_ACE] = @@ -4326,7 +4326,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_ICICLE_SPEAR] = @@ -4339,7 +4339,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_IRON_DEFENSE] = @@ -4365,7 +4365,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGICCOAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MAGIC_COAT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, [MOVE_HOWL] = @@ -4391,7 +4391,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_FRENZY_PLANT] = @@ -4404,7 +4404,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_BULK_UP] = @@ -4430,7 +4430,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_MUD_SHOT] = @@ -4443,7 +4443,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_POISON_TAIL] = @@ -4456,7 +4456,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_COVET] = @@ -4482,7 +4482,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_MAGICAL_LEAF] = @@ -4495,7 +4495,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_WATER_SPORT] = @@ -4534,7 +4534,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_DRAGON_DANCE] = @@ -4560,7 +4560,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_SHOCK_WAVE] = @@ -4573,7 +4573,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_WATER_PULSE] = @@ -4586,7 +4586,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, [MOVE_DOOM_DESIRE] = @@ -4612,6 +4612,6 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, + .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED, }, }; diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 68e618bf8..0a8fe41ef 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -2379,14 +2379,14 @@ static void sub_81538D0(u8 windowId) TextWindow_SetStdFrame0_WithPal(windowId, 0x21D, 0xD0); DrawTextBorderOuter(windowId, 0x21D, 0xD); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - AddTextPrinterParameterized(windowId, 2, sUnknown_84755E8[0], 1, 1, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(windowId, 2, sUnknown_84755E8[0], 1, 1, TEXT_SKIP_DRAW, NULL); for (i = 0; i < 3; i++) { ConvertIntToDecimalStringN(strbuf, results[i], STR_CONV_MODE_LEFT_ALIGN, sUnknown_84755F8[i]); numWidth = GetStringWidth(2, strbuf, -1); - AddTextPrinterParameterized(windowId, 2, sUnknown_84755E8[i + 1], 1, sUnknown_84755FC[i][0], TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(windowId, 2, sUnknown_84755E8[i + 1], 1, sUnknown_84755FC[i][0], TEXT_SKIP_DRAW, NULL); x = 224 - numWidth; - AddTextPrinterParameterized(windowId, 2, strbuf, x, sUnknown_8475602[i][0], TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(windowId, 2, strbuf, x, sUnknown_8475602[i][0], TEXT_SKIP_DRAW, NULL); } PutWindowTilemap(windowId); } diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c index 6c38ce545..4d737dcee 100644 --- a/src/dodrio_berry_picking_2.c +++ b/src/dodrio_berry_picking_2.c @@ -1499,7 +1499,7 @@ static void sub_8155C80(void) break; case 1: FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1)); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 2, gText_SomeoneDroppedOut, 0, 6, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 2, gText_SomeoneDroppedOut, 0, 6, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX); gUnknown_203F440->state++; break; diff --git a/src/easy_chat_3.c b/src/easy_chat_3.c index b1da86beb..2230e8589 100644 --- a/src/easy_chat_3.c +++ b/src/easy_chat_3.c @@ -1321,7 +1321,7 @@ static void PrintTitleText(void) xOffset = (128 - GetStringWidth(1, titleText, 0)) / 2u; FillWindowPixelBuffer(0, PIXEL_FILL(0)); - EC_AddTextPrinterParameterized2(0, 1, titleText, xOffset, 0, TEXT_SPEED_FF, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); + EC_AddTextPrinterParameterized2(0, 1, titleText, xOffset, 0, TEXT_SKIP_DRAW, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_BOTH); } @@ -1374,10 +1374,10 @@ static void PrintECInterfaceTextById(u8 direction) FillWindowPixelBuffer(1, PIXEL_FILL(1)); if (text1) - EC_AddTextPrinterParameterized(1, 1, text1, 0, 0, TEXT_SPEED_FF, NULL); + EC_AddTextPrinterParameterized(1, 1, text1, 0, 0, TEXT_SKIP_DRAW, NULL); if (text2) - EC_AddTextPrinterParameterized(1, 1, text2, 0, 16, TEXT_SPEED_FF, NULL); + EC_AddTextPrinterParameterized(1, 1, text2, 0, 16, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(1, COPYWIN_BOTH); } @@ -1451,7 +1451,7 @@ static void PrintECFields(void) } *str = EOS; - EC_AddTextPrinterParameterized(sEasyChatGraphicsResources->windowId, 1, sEasyChatGraphicsResources->ecPrintBuffer, 0, i * 16, TEXT_SPEED_FF, NULL); + EC_AddTextPrinterParameterized(sEasyChatGraphicsResources->windowId, 1, sEasyChatGraphicsResources->ecPrintBuffer, 0, i * 16, TEXT_SKIP_DRAW, NULL); } CopyWindowToVram(sEasyChatGraphicsResources->windowId, COPYWIN_BOTH); @@ -1566,7 +1566,7 @@ static void PrintECGroupsMenu(void) return; } - EC_AddTextPrinterParameterized(2, 1, GetEasyChatWordGroupName(groupId), x * 84 + 10, y, TEXT_SPEED_FF, NULL); + EC_AddTextPrinterParameterized(2, 1, GetEasyChatWordGroupName(groupId), x * 84 + 10, y, TEXT_SKIP_DRAW, NULL); } y += 16; @@ -1578,7 +1578,7 @@ static void PrintEasyChatKeyboardText(void) u32 i; for (i = 0; i < NELEMS(sEasyChatKeyboardText); i++) - EC_AddTextPrinterParameterized(2, 1, sEasyChatKeyboardText[i], 10, 96 + i * 16, TEXT_SPEED_FF, NULL); + EC_AddTextPrinterParameterized(2, 1, sEasyChatKeyboardText[i], 10, 96 + i * 16, TEXT_SKIP_DRAW, NULL); } static void PrintECWordsMenu(void) @@ -1652,7 +1652,7 @@ static void PrintECRowsWin2(u8 row, u8 remrow) CopyEasyChatWordPadded(sEasyChatGraphicsResources->ecPaddedWordBuffer, easyChatWord, 0); - EC_AddTextPrinterParameterized(2, 1, sEasyChatGraphicsResources->ecPaddedWordBuffer, (j * 13 + 3) * 8, y_, TEXT_SPEED_FF, NULL); + EC_AddTextPrinterParameterized(2, 1, sEasyChatGraphicsResources->ecPaddedWordBuffer, (j * 13 + 3) * 8, y_, TEXT_SKIP_DRAW, NULL); } } y += 16; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 1229d67ba..2769b032a 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -673,7 +673,7 @@ static void Task_EvolutionScene(u8 taskId) ShowBg(2); ShowBg(3); break; - case EVOSTATE_INTRO_MSG: // print 'whoa, poke is evolving!!!' msg + case EVOSTATE_INTRO_MSG: if (!gPaletteFade.active) { StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving); @@ -681,7 +681,7 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tState++; } break; - case EVOSTATE_INTRO_MON_ANIM: // wait for string, animate mon(and play its cry) + case EVOSTATE_INTRO_MON_ANIM: if (!IsTextPrinterActive(0)) { PlayCry_Normal(gTasks[taskId].tPreEvoSpecies, 0); @@ -695,7 +695,7 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tState++; } break; - case EVOSTATE_START_MUSIC: // play evolution music and fade screen black + case EVOSTATE_START_MUSIC: if (!IsSEPlaying()) { // Start music, fade background to black @@ -704,7 +704,7 @@ static void Task_EvolutionScene(u8 taskId) BeginNormalPaletteFade(0x1C, 4, 0, 0x10, RGB_BLACK); } break; - case EVOSTATE_START_BG_AND_SPARKLE_SPIRAL: // launch moving bg task, preapre evo sparkles + case EVOSTATE_START_BG_AND_SPARKLE_SPIRAL: if (!gPaletteFade.active) { StartBgAnimation(FALSE); @@ -712,7 +712,7 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tState++; } break; - case EVOSTATE_SPARKLE_ARC: // another set of evo sparkles + case EVOSTATE_SPARKLE_ARC: if (!gTasks[sEvoGraphicsTaskId].isActive) { gTasks[taskId].tState++; @@ -720,14 +720,14 @@ static void Task_EvolutionScene(u8 taskId) sEvoGraphicsTaskId = EvolutionSparkles_ArcDown(); } break; - case EVOSTATE_CYCLE_MON_SPRITE: // launch task that flashes pre evo with post evo sprites + case EVOSTATE_CYCLE_MON_SPRITE: if (!gTasks[sEvoGraphicsTaskId].isActive) { sEvoGraphicsTaskId = CycleEvolutionMonSprite(sEvoStructPtr->preEvoSpriteId, sEvoStructPtr->postEvoSpriteId); gTasks[taskId].tState++; } break; - case EVOSTATE_WAIT_CYCLE_MON_SPRITE: // wait for the above task to finish + case EVOSTATE_WAIT_CYCLE_MON_SPRITE: if (--sEvoStructPtr->delayTimer == 0) { sEvoStructPtr->delayTimer = 3; @@ -735,7 +735,7 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tState++; } break; - case EVOSTATE_SPARKLE_CIRCLE: // post evo sparkles + case EVOSTATE_SPARKLE_CIRCLE: sEvoGraphicsTaskId = EvolutionSparkles_CircleInward(); gTasks[taskId].tState++; break; @@ -746,14 +746,14 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tState++; } break; - case EVOSTATE_EVO_SOUND: // play tu du sound after evolution + case EVOSTATE_EVO_SOUND: if (!gTasks[sEvoGraphicsTaskId].isActive) { PlaySE(SE_EXP); gTasks[taskId].tState++; } break; - case EVOSTATE_RESTORE_SCREEN: // stop music, return screen to pre-fade state + case EVOSTATE_RESTORE_SCREEN: if (IsSEPlaying()) { m4aMPlayAllStop(); @@ -763,14 +763,14 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tState++; } break; - case EVOSTATE_EVO_MON_ANIM: // animate mon + case EVOSTATE_EVO_MON_ANIM: if (!gPaletteFade.active) { PlayCry_Normal(gTasks[taskId].tPostEvoSpecies, 0); gTasks[taskId].tState++; } break; - case EVOSTATE_SET_MON_EVOLVED: // congratulations string and rename prompt + case EVOSTATE_SET_MON_EVOLVED: if (IsCryFinished()) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); @@ -785,7 +785,7 @@ static void Task_EvolutionScene(u8 taskId) IncrementGameStat(GAME_STAT_EVOLVED_POKEMON); } break; - case EVOSTATE_TRY_LEARN_MOVE: // check if it wants to learn a new move + case EVOSTATE_TRY_LEARN_MOVE: if (!IsTextPrinterActive(0)) { HelpSystem_Enable(); @@ -816,7 +816,7 @@ static void Task_EvolutionScene(u8 taskId) } } break; - case EVOSTATE_END: // task has finished, return + case EVOSTATE_END: if (!gPaletteFade.active) { if (!(gTasks[taskId].tBits & TASK_BIT_LEARN_MOVE)) @@ -834,7 +834,7 @@ static void Task_EvolutionScene(u8 taskId) SetMainCallback2(gCB2_AfterEvolution); } break; - case EVOSTATE_CANCEL: // evolution has been canceled, stop music and re-fade palette + case EVOSTATE_CANCEL: if (!gTasks[sEvoGraphicsTaskId].isActive) { m4aMPlayAllStop(); @@ -842,14 +842,14 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tState++; } break; - case EVOSTATE_CANCEL_MON_ANIM: // animate pokemon trying to evolve again, evolution has been stopped + case EVOSTATE_CANCEL_MON_ANIM: if (!gPaletteFade.active) { PlayCry_Normal(gTasks[taskId].tPreEvoSpecies, 0); gTasks[taskId].tState++; } break; - case EVOSTATE_CANCEL_MSG: // after the animation, print the string 'WHOA IT DId NOT EVOLVE!!!' + case EVOSTATE_CANCEL_MSG: if (IsCryFinished()) { if (gTasks[taskId].tEvoWasStopped) @@ -862,7 +862,7 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE; } break; - case EVOSTATE_LEARNED_MOVE: // pokemon learned a new move, print string and play a fanfare + case EVOSTATE_LEARNED_MOVE: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BufferMoveToLearnIntoBattleTextBuff2(); @@ -873,11 +873,11 @@ static void Task_EvolutionScene(u8 taskId) gTasks[taskId].tState++; } break; - case EVOSTATE_TRY_LEARN_ANOTHER_MOVE: // wait a bit and check if can learn another move + case EVOSTATE_TRY_LEARN_ANOTHER_MOVE: if (!IsTextPrinterActive(0) && !IsSEPlaying() && --gTasks[taskId].tLearnsFirstMove == 0) gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE; break; - case EVOSTATE_REPLACE_MOVE: // try to learn a new move + case EVOSTATE_REPLACE_MOVE: switch (gTasks[taskId].tLearnMoveState) { case MVSTATE_INTRO_MSG_1: diff --git a/src/item_pc.c b/src/item_pc.c index 44f8d2800..68290ef4a 100644 --- a/src/item_pc.c +++ b/src/item_pc.c @@ -1040,7 +1040,7 @@ static void gTask_ItemPcWaitButtonAndExitSubmenu(u8 taskId) if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); - ClearDialogWindowAndFrameToTransparent(5, 0); + ClearDialogWindowAndFrameToTransparent(5, FALSE); ClearWindowTilemap(5); PutWindowTilemap(1); ItemPc_PrintOrRemoveCursor(data[0], 1); diff --git a/src/list_menu.c b/src/list_menu.c index d1e69c2ff..8edd1805a 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -346,7 +346,7 @@ static void ListMenuPrint(struct ListMenu *list, const u8 *str, u8 x, u8 y) colors[0] = gListMenuOverride.fillValue; colors[1] = gListMenuOverride.cursorPal; colors[2] = gListMenuOverride.cursorShadowPal; - AddTextPrinterParameterized4(list->template.windowId, gListMenuOverride.fontId, x, y, gListMenuOverride.lettersSpacing, 0, colors, TEXT_SPEED_FF, str); + AddTextPrinterParameterized4(list->template.windowId, gListMenuOverride.fontId, x, y, gListMenuOverride.lettersSpacing, 0, colors, TEXT_SKIP_DRAW, str); gListMenuOverride.enabled = FALSE; } else @@ -354,7 +354,7 @@ static void ListMenuPrint(struct ListMenu *list, const u8 *str, u8 x, u8 y) colors[0] = list->template.fillValue; colors[1] = list->template.cursorPal; colors[2] = list->template.cursorShadowPal; - AddTextPrinterParameterized4(list->template.windowId, list->template.fontId, x, y, list->template.lettersSpacing, 0, colors, TEXT_SPEED_FF, str); + AddTextPrinterParameterized4(list->template.windowId, list->template.fontId, x, y, list->template.lettersSpacing, 0, colors, TEXT_SKIP_DRAW, str); } } diff --git a/src/map_name_popup.c b/src/map_name_popup.c index a7da18beb..6367757d3 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -199,7 +199,7 @@ static void MapNamePopupPrintMapNameOnWindow(u16 windowId) } xpos = (maxWidth - GetStringWidth(2, mapName, -1)) / 2; FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - AddTextPrinterParameterized(windowId, 2, mapName, xpos, 2, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(windowId, 2, mapName, xpos, 2, TEXT_SKIP_DRAW, NULL); } static u8 *MapNamePopupAppendFloorNum(u8 *dest, s8 floorNum) diff --git a/src/naming_screen.c b/src/naming_screen.c index a226e73d1..888225235 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -1666,7 +1666,7 @@ static void AddGenderIconFunc_Yes(void) StringCopy(genderSymbol, gText_FemaleSymbol); gender = FEMALE; } - AddTextPrinterParameterized3(sNamingScreenData->windows[2], 2, 0x68, 1, sGenderColors[gender], TEXT_SPEED_FF, genderSymbol); + AddTextPrinterParameterized3(sNamingScreenData->windows[2], 2, 0x68, 1, sGenderColors[gender], TEXT_SKIP_DRAW, genderSymbol); } } @@ -1799,7 +1799,7 @@ static void PrintBufferCharactersOnScreen(void) temp[1] = gExpandedPlaceholder_Empty[0]; xoff = (IsLetter(temp[0]) == TRUE) ? 2 : 0; - AddTextPrinterParameterized(sNamingScreenData->windows[2], 2, temp, i * 8 + xpos + xoff, 1, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(sNamingScreenData->windows[2], 2, temp, i * 8 + xpos + xoff, 1, TEXT_SKIP_DRAW, NULL); } CallAddGenderIconFunc(); diff --git a/src/oak_speech.c b/src/oak_speech.c index b2a0991f2..ef38732ff 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -1109,7 +1109,7 @@ static void Task_OakSpeech20(u8 taskId) static void Task_OakSpeech21(u8 taskId) { s16 * data = gTasks[taskId].data; - ClearStdWindowAndFrameToTransparent(data[13], 1); + ClearStdWindowAndFrameToTransparent(data[13], TRUE); RemoveWindow(data[13]); data[13] = 0; ClearDialogWindowAndFrame(0, 1); diff --git a/src/option_menu.c b/src/option_menu.c index 94d476e68..8994caa13 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -524,7 +524,7 @@ static void CloseAndSaveOptionMenu(u8 taskId) static void PrintOptionMenuHeader(void) { FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized(WIN_TEXT_OPTION, 2, gText_MenuOption, 8, 1, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(WIN_TEXT_OPTION, 2, gText_MenuOption, 8, 1, TEXT_SKIP_DRAW, NULL); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_BOTH); } @@ -560,7 +560,7 @@ static void LoadOptionMenuItemNames(void) FillWindowPixelBuffer(1, PIXEL_FILL(1)); for (i = 0; i < MENUITEM_COUNT; i++) { - AddTextPrinterParameterized(WIN_OPTIONS, 2, sOptionMenuItemsNames[i], 8, (u8)((i * (GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT))) + 2) - i, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(WIN_OPTIONS, 2, sOptionMenuItemsNames[i], 8, (u8)((i * (GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT))) + 2) - i, TEXT_SKIP_DRAW, NULL); } } diff --git a/src/party_menu.c b/src/party_menu.c index 0ad2aa44c..377d4b8fb 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -1550,7 +1550,7 @@ static void Task_PrintAndWaitForText(u8 taskId) { if (gTasks[taskId].tKeepOpen == FALSE) { - ClearStdWindowAndFrameToTransparent(6, 0); + ClearStdWindowAndFrameToTransparent(6, FALSE); ClearWindowTilemap(6); } DestroyTask(taskId); @@ -1577,7 +1577,7 @@ static void Task_ReturnToChooseMonAfterText(u8 taskId) { if (IsPartyMenuTextPrinterActive() != TRUE) { - ClearStdWindowAndFrameToTransparent(6, 0); + ClearStdWindowAndFrameToTransparent(6, FALSE); ClearWindowTilemap(6); if (MenuHelpers_LinkSomething() == TRUE) { @@ -2484,7 +2484,7 @@ static void PartyMenuRemoveWindow(u8 *ptr) { if (*ptr != 0xFF) { - ClearStdWindowAndFrameToTransparent(*ptr, 0); + ClearStdWindowAndFrameToTransparent(*ptr, FALSE); RemoveWindow(*ptr); *ptr = 0xFF; ScheduleBgCopyTilemapToVram(2); @@ -4595,7 +4595,7 @@ static void ShowMoveSelectWindow(u8 slot) gMoveNames[move], GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH) + GetFontAttribute(fontId, FONTATTR_LETTER_SPACING), (i * 16) + 2, - TEXT_SPEED_FF, + TEXT_SKIP_DRAW, NULL); if (move != MOVE_NONE) ++moveCount; diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index 491db3408..810992aa2 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -2881,7 +2881,7 @@ void DexScreen_PrintMonFlavorText(u8 windowId, u16 species, u8 x, u8 y) printerTemplate.currentX = x; printerTemplate.currentY = y; - AddTextPrinter(&printerTemplate, TEXT_SPEED_FF, NULL); + AddTextPrinter(&printerTemplate, TEXT_SKIP_DRAW, NULL); } } diff --git a/src/pokemon.c b/src/pokemon.c index 5b774b172..ec52955b5 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2582,7 +2582,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de // are effects of weather negated with cloud nine or air lock if (WEATHER_HAS_EFFECT2) { - if (gBattleWeather & WEATHER_RAIN_TEMPORARY) + if (gBattleWeather & B_WEATHER_RAIN_TEMPORARY) { switch (type) { @@ -2596,11 +2596,11 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de } // any weather except sun weakens solar beam - if ((gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_HAIL)) && gCurrentMove == MOVE_SOLAR_BEAM) + if ((gBattleWeather & (B_WEATHER_RAIN | B_WEATHER_SANDSTORM | B_WEATHER_HAIL_TEMPORARY)) && gCurrentMove == MOVE_SOLAR_BEAM) damage /= 2; // sunny - if (gBattleWeather & WEATHER_SUN_ANY) + if (gBattleWeather & B_WEATHER_SUN) { switch (type) { @@ -3931,7 +3931,7 @@ bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex, return PokemonUseItemEffects(mon, item, partyIndex, moveIndex, 0); } -bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e) +bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, bool8 usedByAI) { u32 data; s32 friendship; @@ -4201,7 +4201,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov } if (GetMonData(mon, MON_DATA_MAX_HP, NULL) != GetMonData(mon, MON_DATA_HP, NULL)) { - if (e == 0) + if (!usedByAI) { data = GetMonData(mon, MON_DATA_HP, NULL) + data; if (data > GetMonData(mon, MON_DATA_MAX_HP, NULL)) diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 7cd7223a2..8faa5747b 100644 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -3169,7 +3169,7 @@ static void Msg_WantToPlayAgain(void) { case 0: sPokemonJumpGfx->msgWindowId = AddMessageWindow(1, 8, 20, 2); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_WantToPlayAgain2, 0, 2, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_WantToPlayAgain2, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->mainState++; break; @@ -3196,7 +3196,7 @@ static void Msg_SavingDontTurnOff(void) { case 0: sPokemonJumpGfx->msgWindowId = AddMessageWindow(2, 7, 26, 4); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_SavingDontTurnOffPower, 0, 2, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_SavingDontTurnOffPower, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->mainState++; break; @@ -3239,7 +3239,7 @@ static void Msg_SomeoneDroppedOut(void) { case 0: sPokemonJumpGfx->msgWindowId = AddMessageWindow(2, 8, 22, 4); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_SomeoneDroppedOut2, 0, 2, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_SomeoneDroppedOut2, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->mainState++; break; @@ -3265,7 +3265,7 @@ static void Msg_CommunicationStandby(void) { case 0: sPokemonJumpGfx->msgWindowId = AddMessageWindow(7, 10, 16, 2); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_CommunicationStandby4, 0, 2, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_CommunicationStandby4, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->mainState++; break; @@ -3358,7 +3358,7 @@ static void PrintPrizeMessage(u16 itemId, u16 quantity) DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sPokemonJumpGfx->itemQuantityStr); DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_AwesomeWonF701F700); sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 8, 22, 4); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->fanfare = MUS_LEVEL_UP; sPokemonJumpGfx->msgWindowState = 0; @@ -3371,7 +3371,7 @@ static void PrintPrizeFilledBagMessage(u16 itemId) DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName); DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_FilledStorageSpace2); sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 8, 22, 4); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->fanfare = MUS_DUMMY; sPokemonJumpGfx->msgWindowState = 0; @@ -3384,7 +3384,7 @@ static void PrintNoRoomForPrizeMessage(u16 itemId) DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName); DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_CantHoldMore); sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 9, 22, 2); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->fanfare = MUS_DUMMY; sPokemonJumpGfx->msgWindowState = 0; @@ -3728,7 +3728,7 @@ static void PrintPokeJumpPlayerName(int multiplayerId, u8 bgColor, u8 fgColor, u FillWindowPixelBuffer(sPokemonJumpGfx->nameWindowIds[multiplayerId], PIXEL_FILL(0)); x = 64 - GetStringWidth(0, GetPokeJumpPlayerName(multiplayerId), -1); x /= 2; - AddTextPrinterParameterized3(sPokemonJumpGfx->nameWindowIds[multiplayerId], 0, x, 2, colors, TEXT_SPEED_FF, GetPokeJumpPlayerName(multiplayerId)); + AddTextPrinterParameterized3(sPokemonJumpGfx->nameWindowIds[multiplayerId], 0, x, 2, colors, TEXT_SKIP_DRAW, GetPokeJumpPlayerName(multiplayerId)); CopyWindowToVram(sPokemonJumpGfx->nameWindowIds[multiplayerId], COPYWIN_GFX); } @@ -4557,14 +4557,14 @@ static void PrintRecordsText(u16 windowId) TextWindow_SetStdFrame0_WithPal(windowId, 0x21D, 0xD0); DrawTextBorderOuter(windowId, 0x21D, 0xD); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - AddTextPrinterParameterized5(windowId, 2, gText_PkmnJumpRecords, 0, 0, TEXT_SPEED_FF, NULL, 1, 0); + AddTextPrinterParameterized5(windowId, 2, gText_PkmnJumpRecords, 0, 0, TEXT_SKIP_DRAW, NULL, 1, 0); for (i = 0; i < ARRAY_COUNT(sRecordsTexts); i++) { - AddTextPrinterParameterized5(windowId, 2, sRecordsTexts[i], 0, 20 + (i * 14), TEXT_SPEED_FF, NULL, 1, 0); + AddTextPrinterParameterized5(windowId, 2, sRecordsTexts[i], 0, 20 + (i * 14), TEXT_SKIP_DRAW, NULL, 1, 0); ConvertIntToDecimalStringN(strbuf, recordNums[i], STR_CONV_MODE_LEFT_ALIGN, 5); TruncateToFirstWordOnly(strbuf); x = 0xDE - GetStringWidth(2, strbuf, 0); - AddTextPrinterParameterized5(windowId, 2, strbuf, x, 20 + (i * 14), TEXT_SPEED_FF, NULL, 0, 0); + AddTextPrinterParameterized5(windowId, 2, strbuf, x, 20 + (i * 14), TEXT_SKIP_DRAW, NULL, 0, 0); } PutWindowTilemap(windowId); } diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c index dec59063e..c39c5e1e3 100644 --- a/src/pokemon_special_anim_scene.c +++ b/src/pokemon_special_anim_scene.c @@ -1508,13 +1508,13 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *beforeStats, u16 *afterStats, u8 bg for (i = 0; i < 6; i++) { - AddTextPrinterParameterized3(windowId, 2, 0, i * 15, textColor, TEXT_SPEED_FF, sLevelUpWindowStatNames[i]); + AddTextPrinterParameterized3(windowId, 2, 0, i * 15, textColor, TEXT_SKIP_DRAW, sLevelUpWindowStatNames[i]); StringCopy(textbuf, diffStats[i] >= 0 ? gUnknown_841B2DC : gUnknown_841B2E5); - AddTextPrinterParameterized3(windowId, 2, 56, i * 15, textColor, TEXT_SPEED_FF, textbuf); + AddTextPrinterParameterized3(windowId, 2, 56, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); textbuf[0] = CHAR_SPACE; x = abs(diffStats[i]) < 10 ? 12 : 6; ConvertIntToDecimalStringN(textbuf + 1, abs(diffStats[i]), STR_CONV_MODE_LEFT_ALIGN, 2); - AddTextPrinterParameterized3(windowId, 2, x + 56, i * 15, textColor, TEXT_SPEED_FF, textbuf); + AddTextPrinterParameterized3(windowId, 2, x + 56, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); } } @@ -1550,7 +1550,7 @@ void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgColor, u8 fgColor, ndigits = 1; ConvertIntToDecimalStringN(textbuf, statsRearrange[i], STR_CONV_MODE_LEFT_ALIGN, ndigits); x = 6 * (4 - ndigits); - AddTextPrinterParameterized3(windowId, 2, 0, i * 15, textColor, TEXT_SPEED_FF, sLevelUpWindowStatNames[i]); - AddTextPrinterParameterized3(windowId, 2, 56 + x, i * 15, textColor, TEXT_SPEED_FF, textbuf); + AddTextPrinterParameterized3(windowId, 2, 0, i * 15, textColor, TEXT_SKIP_DRAW, sLevelUpWindowStatNames[i]); + AddTextPrinterParameterized3(windowId, 2, 56 + x, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); } } diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index ce0c8a2a7..f5b9ca115 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -245,7 +245,7 @@ static void Task_PokemonStorageSystemPC(u8 taskId) LoadStdWindowFrameGfx(); DrawDialogueFrame(0, 0); FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, TEXT_SPEED_FF, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, TEXT_SKIP_DRAW, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_BOTH); CopyWindowToVram(task->data[15], COPYWIN_BOTH); task->data[0]++; diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index f4ebe9151..9c6543eae 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -2294,16 +2294,16 @@ static void PrintCursorMonInfo(void) { for (i = 0, y = 0; i < 3; i++, y += 14) { - AddTextPrinterParameterized(0, 2, gPSSData->cursorMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(0, 2, gPSSData->cursorMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); } - AddTextPrinterParameterized(0, 0, gPSSData->cursorMonTexts[3], 6, y + 2, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(0, 0, gPSSData->cursorMonTexts[3], 6, y + 2, TEXT_SKIP_DRAW, NULL); } else { - AddTextPrinterParameterized(0, 0, gPSSData->cursorMonTexts[3], 6, 0, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(0, 0, gPSSData->cursorMonTexts[3], 6, 0, TEXT_SKIP_DRAW, NULL); for (i = 0, y = 15; i < 3; i++, y += 14) { - AddTextPrinterParameterized(0, 2, gPSSData->cursorMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(0, 2, gPSSData->cursorMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); } } @@ -2592,7 +2592,7 @@ static void PrintStorageActionText(u8 id) DynamicPlaceholderTextUtil_ExpandPlaceholders(gPSSData->field_2190, sPCStorageActionTexts[id].text); FillWindowPixelBuffer(1, PIXEL_FILL(1)); - AddTextPrinterParameterized(1, 1, gPSSData->field_2190, 0, 2, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(1, 1, gPSSData->field_2190, 0, 2, TEXT_SKIP_DRAW, NULL); DrawTextBorderOuter(1, 2, 13); PutWindowTilemap(1); CopyWindowToVram(1, COPYWIN_GFX); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 98d4a4f80..2f57133b7 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2428,9 +2428,9 @@ static void PrintMonLevelNickOnWindow2(const u8 * str) if (!sMonSummaryScreen->isEgg) { if (sMonSummaryScreen->curPageIndex != PSS_PAGE_MOVES_INFO) - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2, 4, 2, sLevelNickTextColors[1], TEXT_SPEED_FF, sMonSummaryScreen->summary.levelStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2, 4, 2, sLevelNickTextColors[1], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.levelStrBuf); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2, 40, 2, sLevelNickTextColors[1], TEXT_SPEED_FF, sMonSummaryScreen->summary.nicknameStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2, 40, 2, sLevelNickTextColors[1], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.nicknameStrBuf); if (GetMonGender(&sMonSummaryScreen->currentMon) == MON_FEMALE) AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2, 105, 2, sLevelNickTextColors[3], 0, sMonSummaryScreen->summary.genderSymbolStrBuf); @@ -2464,14 +2464,14 @@ static void PokeSum_PrintRightPaneText(void) static void PrintInfoPage(void) { - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 19, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.speciesNameStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 19, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.speciesNameStrBuf); if (!sMonSummaryScreen->isEgg) { - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47 + sMonSkillsPrinterXpos->unk00, 5, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.dexNumStrBuf); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 49, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.otNameStrBuf); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 64, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.unk306C); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 79, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.itemNameStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47 + sMonSkillsPrinterXpos->unk00, 5, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.dexNumStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 49, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.otNameStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 64, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.unk306C); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 79, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.itemNameStrBuf); } else { @@ -2492,20 +2492,20 @@ static void PrintInfoPage(void) if (sMonSummaryScreen->isBadEgg) hatchMsgIndex = 0; - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 7, 45, sLevelNickTextColors[0], TEXT_SPEED_FF, sEggHatchTimeTexts[hatchMsgIndex]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 7, 45, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sEggHatchTimeTexts[hatchMsgIndex]); } } static void PrintSkillsPage(void) { - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 14 + sMonSkillsPrinterXpos->curHpStr, 4, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.curHpStrBuf); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->atkStr, 22, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_ATK]); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->defStr, 35, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_DEF]); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->spAStr, 48, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPA]); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->spDStr, 61, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPD]); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->speStr, 74, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPE]); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 15 + sMonSkillsPrinterXpos->expStr, 87, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.expPointsStrBuf); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 15 + sMonSkillsPrinterXpos->toNextLevel, 100, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.expToNextLevelStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 14 + sMonSkillsPrinterXpos->curHpStr, 4, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.curHpStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->atkStr, 22, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_ATK]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->defStr, 35, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_DEF]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->spAStr, 48, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPA]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->spDStr, 61, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPD]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->speStr, 74, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPE]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 15 + sMonSkillsPrinterXpos->expStr, 87, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.expPointsStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 15 + sMonSkillsPrinterXpos->toNextLevel, 100, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.expToNextLevelStrBuf); } #define GetMoveNamePrinterYpos(x) ((x) * 28 + 5) @@ -2525,7 +2525,7 @@ static void PrintMovesPage(void) else AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 3, GetMoveNamePrinterYpos(4), - sPrintMoveTextColors[0], TEXT_SPEED_FF, gFameCheckerText_Cancel); + sPrintMoveTextColors[0], TEXT_SKIP_DRAW, gFameCheckerText_Cancel); } } @@ -2540,7 +2540,7 @@ static void PokeSum_PrintMoveName(u8 i) if (i == 4) curPP = maxPP; - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 3, GetMoveNamePrinterYpos(i), sPrintMoveTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.moveNameStrBufs[i]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 3, GetMoveNamePrinterYpos(i), sPrintMoveTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveNameStrBufs[i]); if (sMonSummaryScreen->moveIds[i] == 0 || (curPP == maxPP)) colorIdx = 0; @@ -2566,14 +2566,14 @@ static void PokeSum_PrintMoveName(u8 i) colorIdx = 1; } - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 36, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SPEED_FF, + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 36, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, gText_PokeSum_PP); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 46 + sMonSkillsPrinterXpos->curPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SPEED_FF, sMonSummaryScreen->summary.moveCurPpStrBufs[i]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 46 + sMonSkillsPrinterXpos->curPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveCurPpStrBufs[i]); if (sMonSummaryScreen->moveIds[i] != MOVE_NONE) { - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 58, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SPEED_FF, gText_Slash); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 64 + sMonSkillsPrinterXpos->maxPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SPEED_FF, sMonSummaryScreen->summary.moveMaxPpStrBufs[i]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 58, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, gText_Slash); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 64 + sMonSkillsPrinterXpos->maxPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveMaxPpStrBufs[i]); } } @@ -2678,7 +2678,7 @@ static void PokeSum_PrintTrainerMemo_Mon_HeldByOT(void) } } - AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SPEED_FF, natureMetOrHatchedAtLevelStr); + AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); } static void PokeSum_PrintTrainerMemo_Mon_NotHeldByOT(void) @@ -2727,7 +2727,7 @@ static void PokeSum_PrintTrainerMemo_Mon_NotHeldByOT(void) DynamicPlaceholderTextUtil_ExpandPlaceholders(natureMetOrHatchedAtLevelStr, gText_PokeSum_MetInATrade); } - AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SPEED_FF, natureMetOrHatchedAtLevelStr); + AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); return; } @@ -2775,7 +2775,7 @@ static void PokeSum_PrintTrainerMemo_Mon_NotHeldByOT(void) } } - AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SPEED_FF, natureMetOrHatchedAtLevelStr); + AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); } static void PokeSum_PrintTrainerMemo_Mon(void) @@ -2836,19 +2836,19 @@ static void PokeSum_PrintTrainerMemo_Egg(void) if (sMonSummaryScreen->isBadEgg) chosenStrIndex = 0; - AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SPEED_FF, sEggOriginTexts[chosenStrIndex]); + AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sEggOriginTexts[chosenStrIndex]); } static void PokeSum_PrintExpPoints_NextLv(void) { AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 26, 7, - sLevelNickTextColors[0], TEXT_SPEED_FF, + sLevelNickTextColors[0], TEXT_SKIP_DRAW, gText_PokeSum_ExpPoints); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 26, 20, - sLevelNickTextColors[0], TEXT_SPEED_FF, + sLevelNickTextColors[0], TEXT_SKIP_DRAW, gText_PokeSum_NextLv); } @@ -2861,18 +2861,18 @@ static void PokeSum_PrintSelectedMoveStats(void) AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 57, 1, - sLevelNickTextColors[0], TEXT_SPEED_FF, + sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.movePowerStrBufs[sMoveSelectionCursorPos]); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 57, 15, - sLevelNickTextColors[0], TEXT_SPEED_FF, + sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveAccuracyStrBufs[sMoveSelectionCursorPos]); AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 7, 42, 0, 0, - sLevelNickTextColors[0], TEXT_SPEED_FF, + sLevelNickTextColors[0], TEXT_SKIP_DRAW, gMoveDescriptionPointers[sMonSummaryScreen->moveIds[sMoveSelectionCursorPos] - 1]); } } @@ -2900,10 +2900,10 @@ static void PokeSum_PrintAbilityNameAndDesc(void) FillWindowPixelBuffer(sMonSummaryScreen->windowIds[5], 0); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], 2, - 66, 1, sLevelNickTextColors[0], TEXT_SPEED_FF, sMonSummaryScreen->summary.abilityNameStrBuf); + 66, 1, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.abilityNameStrBuf); AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], 2, - 2, 15, sLevelNickTextColors[0], TEXT_SPEED_FF, + 2, 15, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.abilityDescStrBuf); } @@ -3895,7 +3895,7 @@ static void Task_InputHandler_SelectOrForgetMove(u8 taskId) AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 7, 42, 0, 0, - sLevelNickTextColors[0], TEXT_SPEED_FF, + sLevelNickTextColors[0], TEXT_SKIP_DRAW, gText_PokeSum_HmMovesCantBeForgotten); CopyWindowToVram(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2); CopyBgTilemapBufferToVram(0); diff --git a/src/shop.c b/src/shop.c index df7184db1..82bd6f71f 100644 --- a/src/shop.c +++ b/src/shop.c @@ -620,7 +620,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, u32 item, u8 y) while (x-- != 0) *loc++ = 0; StringExpandPlaceholders(loc, gText_PokedollarVar1); - BuyMenuPrint(windowId, 0, gStringVar4, 0x69, y, 0, 0, TEXT_SPEED_FF, 1); + BuyMenuPrint(windowId, 0, gStringVar4, 0x69, y, 0, 0, TEXT_SKIP_DRAW, 1); } } @@ -631,13 +631,13 @@ static void LoadTmHmNameInMart(s32 item) ConvertIntToDecimalStringN(gStringVar1, item - ITEM_DEVON_SCOPE, 2, 2); StringCopy(gStringVar4, gOtherText_UnkF9_08_Clear_01); StringAppend(gStringVar4, gStringVar1); - BuyMenuPrint(6, 0, gStringVar4, 0, 0, 0, 0, TEXT_SPEED_FF, 1); + BuyMenuPrint(6, 0, gStringVar4, 0, 0, 0, 0, TEXT_SKIP_DRAW, 1); StringCopy(gStringVar4, gMoveNames[ItemIdToBattleMoveId(item)]); BuyMenuPrint(6, 2, gStringVar4, 0, 0x10, 0, 0, 0, 1); } else { - BuyMenuPrint(6, 0, gText_ThreeHyphens, 0, 0, 0, 0, TEXT_SPEED_FF, 1); + BuyMenuPrint(6, 0, gText_ThreeHyphens, 0, 0, 0, 0, TEXT_SKIP_DRAW, 1); BuyMenuPrint(6, 2, gText_SevenHyphens, 0, 0x10, 0, 0, 0, 1); } } @@ -877,7 +877,7 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId) s16 *data = gTasks[taskId].data; FillWindowPixelBuffer(3, PIXEL_FILL(1)); - PrintMoneyAmount(3, 0x36, 0xA, gShopData.itemPrice, TEXT_SPEED_FF); + PrintMoneyAmount(3, 0x36, 0xA, gShopData.itemPrice, TEXT_SKIP_DRAW); ConvertIntToDecimalStringN(gStringVar1, tItemCount, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); BuyMenuPrint(3, 0, gStringVar4, 2, 0xA, 0, 0, 0, 1); @@ -962,8 +962,8 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId) { PlaySE(SE_SELECT); BuyMenuRemoveScrollIndicatorArrows(); - ClearStdWindowAndFrameToTransparent(3, 0); - ClearStdWindowAndFrameToTransparent(1, 0); + ClearStdWindowAndFrameToTransparent(3, FALSE); + ClearStdWindowAndFrameToTransparent(1, FALSE); ClearWindowTilemap(3); ClearWindowTilemap(1); PutWindowTilemap(4); @@ -976,8 +976,8 @@ static void Task_BuyHowManyDialogueHandleInput(u8 taskId) { PlaySE(SE_SELECT); BuyMenuRemoveScrollIndicatorArrows(); - ClearStdWindowAndFrameToTransparent(3, 0); - ClearStdWindowAndFrameToTransparent(1, 0); + ClearStdWindowAndFrameToTransparent(3, FALSE); + ClearStdWindowAndFrameToTransparent(1, FALSE); ClearWindowTilemap(3); ClearWindowTilemap(1); BuyMenuReturnToItemList(taskId); @@ -1029,7 +1029,7 @@ static void BuyMenuReturnToItemList(u8 taskId) { s16 *data = gTasks[taskId].data; - ClearDialogWindowAndFrameToTransparent(2, 0); + ClearDialogWindowAndFrameToTransparent(2, FALSE); BuyMenuPrintCursor(tListTaskId, 1); RecolorItemDescriptionBox(0); PutWindowTilemap(4); diff --git a/src/slot_machine.c b/src/slot_machine.c index 2eeab5335..9ceac198e 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -2265,7 +2265,7 @@ static void Slot_PrintOnWindow0(const u8 * str) FillWindowPixelBuffer(0, PIXEL_FILL(1)); PutWindowTilemap(0); DrawTextBorderOuter(0, 0x001, 15); - AddTextPrinterParameterized5(0, 2, str, 1, 2, TEXT_SPEED_FF, NULL, 1, 2); + AddTextPrinterParameterized5(0, 2, str, 1, 2, TEXT_SKIP_DRAW, NULL, 1, 2); } static void Slot_ClearWindow0(void) diff --git a/src/text_printer.c b/src/text_printer.c index 6f7cf788c..a701bd671 100644 --- a/src/text_printer.c +++ b/src/text_printer.c @@ -90,7 +90,7 @@ bool16 AddTextPrinter(struct TextPrinterTemplate *textSubPrinter, u8 speed, void sTempTextPrinter.japanese = 0; GenerateFontHalfRowLookupTable(textSubPrinter->fgColor, textSubPrinter->bgColor, textSubPrinter->shadowColor); - if (speed != TEXT_SPEED_FF && speed != 0x0) + if (speed != TEXT_SKIP_DRAW && speed != 0x0) { --sTempTextPrinter.textSpeed; sTextPrinters[textSubPrinter->windowId] = sTempTextPrinter; @@ -104,7 +104,7 @@ bool16 AddTextPrinter(struct TextPrinterTemplate *textSubPrinter, u8 speed, void break; } - if (speed != TEXT_SPEED_FF) + if (speed != TEXT_SKIP_DRAW) CopyWindowToVram(sTempTextPrinter.printerTemplate.windowId, COPYWIN_GFX); sTextPrinters[textSubPrinter->windowId].active = 0; } diff --git a/src/tm_case.c b/src/tm_case.c index 1cabb5ec7..3c0e31d60 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -830,7 +830,7 @@ static void Task_TMContextMenu_HandleInput(u8 taskId) static void TMHMContextMenuAction_Use(u8 taskId) { RemoveTMContextMenu(&sTMCaseDynamicResources->contextMenuWindowId); - ClearStdWindowAndFrameToTransparent(2, 0); + ClearStdWindowAndFrameToTransparent(2, FALSE); ClearWindowTilemap(2); PutWindowTilemap(0); ScheduleBgCopyTilemapToVram(0); @@ -852,7 +852,7 @@ static void TMHMContextMenuAction_Give(u8 taskId) s16 * data = gTasks[taskId].data; u16 itemId = BagGetItemIdByPocketPosition(POCKET_TM_CASE, data[1]); RemoveTMContextMenu(&sTMCaseDynamicResources->contextMenuWindowId); - ClearStdWindowAndFrameToTransparent(2, 0); + ClearStdWindowAndFrameToTransparent(2, FALSE); ClearWindowTilemap(2); PutWindowTilemap(1); PutWindowTilemap(4); @@ -905,7 +905,7 @@ static void Subtask_CloseContextMenuAndReturnToMain(u8 taskId) DestroyListMenuTask(data[0], &sTMCaseStaticResources.scrollOffset, &sTMCaseStaticResources.selectedRow); data[0] = ListMenuInit(&gMultiuseListMenuTemplate, sTMCaseStaticResources.scrollOffset, sTMCaseStaticResources.selectedRow); PrintListMenuCursorByID_WithColorIdx(data[0], 1); - ClearDialogWindowAndFrameToTransparent(6, 0); + ClearDialogWindowAndFrameToTransparent(6, FALSE); ClearWindowTilemap(6); PutWindowTilemap(1); PutWindowTilemap(4); @@ -920,7 +920,7 @@ static void TMHMContextMenuAction_Exit(u8 taskId) s16 * data = gTasks[taskId].data; RemoveTMContextMenu(&sTMCaseDynamicResources->contextMenuWindowId); - ClearStdWindowAndFrameToTransparent(2, 0); + ClearStdWindowAndFrameToTransparent(2, FALSE); ClearWindowTilemap(2); PutWindowTilemap(0); PrintListMenuCursorByID_WithColorIdx(data[0], 1); @@ -1009,8 +1009,8 @@ static void Task_SaleOfTMsCanceled(u8 taskId) { s16 * data = gTasks[taskId].data; - ClearStdWindowAndFrameToTransparent(8, 0); - ClearDialogWindowAndFrameToTransparent(6, 0); + ClearStdWindowAndFrameToTransparent(8, FALSE); + ClearDialogWindowAndFrameToTransparent(6, FALSE); PutWindowTilemap(0); PutWindowTilemap(1); PutWindowTilemap(3); @@ -1058,7 +1058,7 @@ static void Task_QuantitySelect_HandleInput(u8 taskId) else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); - ClearStdWindowAndFrameToTransparent(7, 0); + ClearStdWindowAndFrameToTransparent(7, FALSE); ScheduleBgCopyTilemapToVram(0); ScheduleBgCopyTilemapToVram(1); RemoveTMCaseScrollIndicatorArrowPair(); @@ -1067,9 +1067,9 @@ static void Task_QuantitySelect_HandleInput(u8 taskId) else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); - ClearStdWindowAndFrameToTransparent(7, 0); - ClearStdWindowAndFrameToTransparent(8, 0); - ClearDialogWindowAndFrameToTransparent(6, 0); + ClearStdWindowAndFrameToTransparent(7, FALSE); + ClearStdWindowAndFrameToTransparent(8, FALSE); + ClearDialogWindowAndFrameToTransparent(6, FALSE); PutWindowTilemap(3); PutWindowTilemap(0); PutWindowTilemap(1); @@ -1116,8 +1116,8 @@ static void Task_AfterSale_ReturnToList(u8 taskId) if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); - ClearStdWindowAndFrameToTransparent(8, 0); - ClearDialogWindowAndFrameToTransparent(6, 0); + ClearStdWindowAndFrameToTransparent(8, FALSE); + ClearDialogWindowAndFrameToTransparent(6, FALSE); PutWindowTilemap(1); PutWindowTilemap(3); PutWindowTilemap(4); @@ -1242,7 +1242,7 @@ static void Task_TMCaseDude_Playback(u8 taskId) { FillBG2RowWithPalette_2timesNplus1(0); BeginNormalPaletteFade(0x00000400, 0, 6, 0, 0); - ClearDialogWindowAndFrameToTransparent(6, 0); + ClearDialogWindowAndFrameToTransparent(6, FALSE); ScheduleBgCopyTilemapToVram(1); data[8]++; } diff --git a/src/trainer_card.c b/src/trainer_card.c index a361be04c..0479f9c73 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -620,7 +620,7 @@ static void Task_TrainerCard(u8 taskId) case STATE_WAIT_LINK_PARTNER: SetCloseLinkCallback(); DrawDialogueFrame(0, 1); - AddTextPrinterParameterized(0, 2, gText_WaitingTrainerFinishReading, 0, 1, TEXT_SPEED_FF, 0); + AddTextPrinterParameterized(0, 2, gText_WaitingTrainerFinishReading, 0, 1, TEXT_SKIP_DRAW, 0); CopyWindowToVram(0, COPYWIN_BOTH); sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD_LINK; break; @@ -1129,7 +1129,7 @@ static void PrintNameOnCardFront(void) StringCopy(txtPtr, sTrainerCardDataPtr->trainerCard.rse.playerName); ConvertInternationalString(txtPtr, sTrainerCardDataPtr->language); StringAppend(buffer[0], txtPtr); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardFrontNameXPositions[sTrainerCardDataPtr->cardType], sTrainerCardFrontNameYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SPEED_FF, buffer[0]); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardFrontNameXPositions[sTrainerCardDataPtr->cardType], sTrainerCardFrontNameYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SKIP_DRAW, buffer[0]); } static void PrintIdOnCard(void) @@ -1139,7 +1139,7 @@ static void PrintIdOnCard(void) txtPtr = StringCopy(buffer, gText_TrainerCardIDNo); ConvertIntToDecimalStringN(txtPtr, sTrainerCardDataPtr->trainerCard.rse.trainerId, STR_CONV_MODE_LEADING_ZEROS, 5); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardIdXPositions[sTrainerCardDataPtr->cardType], sTrainerCardIdYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SPEED_FF, buffer); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardIdXPositions[sTrainerCardDataPtr->cardType], sTrainerCardIdYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SKIP_DRAW, buffer); } static void PrintMoneyOnCard(void) @@ -1153,14 +1153,14 @@ static void PrintMoneyOnCard(void) if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE) { x = -122 - 6 * StringLength(buffer); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 20, 56, sTrainerCardTextColors, TEXT_SPEED_FF, gText_TrainerCardMoney); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], x, 56, sTrainerCardTextColors, TEXT_SPEED_FF, buffer); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 20, 56, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardMoney); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], x, 56, sTrainerCardTextColors, TEXT_SKIP_DRAW, buffer); } else { x = 118 - 6 * StringLength(buffer); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 16, 57, sTrainerCardTextColors, TEXT_SPEED_FF, gText_TrainerCardMoney); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], x, 57, sTrainerCardTextColors, TEXT_SPEED_FF, buffer); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 16, 57, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardMoney); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], x, 57, sTrainerCardTextColors, TEXT_SKIP_DRAW, buffer); } } @@ -1183,16 +1183,16 @@ static void PrintPokedexOnCard(void) if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE) { x = -120 - 6 * StringLength(buffer); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 20, 72, sTrainerCardTextColors, TEXT_SPEED_FF, gText_TrainerCardPokedex); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], x, 72, sTrainerCardTextColors, TEXT_SPEED_FF, buffer); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 138, 72, sTrainerCardTextColors, TEXT_SPEED_FF, gText_TrainerCardNull); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 20, 72, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardPokedex); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], x, 72, sTrainerCardTextColors, TEXT_SKIP_DRAW, buffer); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 138, 72, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardNull); } else { x = 120 - 6 * StringLength(buffer); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 16, 73, sTrainerCardTextColors, TEXT_SPEED_FF, gText_TrainerCardPokedex); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], x, 73, sTrainerCardTextColors, TEXT_SPEED_FF, buffer); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 138, 73, sTrainerCardTextColors, TEXT_SPEED_FF, gText_TrainerCardNull); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 16, 73, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardPokedex); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], x, 73, sTrainerCardTextColors, TEXT_SKIP_DRAW, buffer); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 138, 73, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardNull); } } } @@ -1219,18 +1219,18 @@ static void PrintTimeOnCard(void) FillWindowPixelRect(1, PIXEL_FILL(0), sTrainerCardTimeHoursXPositions[sTrainerCardDataPtr->cardType], sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], 50, 12); if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE) - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 20, 88, sTrainerCardTextColors, TEXT_SPEED_FF, gText_TrainerCardTime); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 20, 88, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardTime); else - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 16, 89, sTrainerCardTextColors, TEXT_SPEED_FF, gText_TrainerCardTime); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 16, 89, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_TrainerCardTime); ConvertIntToDecimalStringN(buffer, hours, STR_CONV_MODE_RIGHT_ALIGN, 3); AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardTimeHoursXPositions[sTrainerCardDataPtr->cardType], - sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SPEED_FF, buffer); + sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SKIP_DRAW, buffer); AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardTimeHoursYPositions[sTrainerCardDataPtr->cardType], - sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], sTimeColonTextColors[sTrainerCardDataPtr->timeColonInvisible], TEXT_SPEED_FF, gText_Colon2); + sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], sTimeColonTextColors[sTrainerCardDataPtr->timeColonInvisible], TEXT_SKIP_DRAW, gText_Colon2); ConvertIntToDecimalStringN(buffer, minutes, STR_CONV_MODE_LEADING_ZEROS, 2); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardTimeMinutesXPositions[sTrainerCardDataPtr->cardType], sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SPEED_FF, buffer); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardTimeMinutesXPositions[sTrainerCardDataPtr->cardType], sTrainerCardTimeMinutesYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SKIP_DRAW, buffer); } static void PrintProfilePhraseOnCard(void) @@ -1238,16 +1238,16 @@ static void PrintProfilePhraseOnCard(void) if (sTrainerCardDataPtr->isLink) { AddTextPrinterParameterized3(1, 2, 10, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType], - sTrainerCardTextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->easyChatProfile[0]); + sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[0]); AddTextPrinterParameterized3(1, 2, GetStringWidth(2, sTrainerCardDataPtr->easyChatProfile[0], 0) + 16, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType], - sTrainerCardTextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->easyChatProfile[1]); + sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[1]); AddTextPrinterParameterized3(1, 2, 10, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType], - sTrainerCardTextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->easyChatProfile[2]); + sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[2]); AddTextPrinterParameterized3(1, 2, GetStringWidth(2, sTrainerCardDataPtr->easyChatProfile[2], 0) + 16, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType], - sTrainerCardTextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->easyChatProfile[3]); + sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[3]); } } @@ -1268,14 +1268,14 @@ static void PrintNameOnCardBack(void) if (sTrainerCardDataPtr->cardType == CARD_TYPE_FRLG) { AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardBackNameXPositions[sTrainerCardDataPtr->cardType], - sTrainerCardBackNameYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_NAME]); + sTrainerCardBackNameYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_NAME]); } else { x = sTrainerCardBackNameXPositions[sTrainerCardDataPtr->cardType] - GetStringWidth(sTrainerCardFontIds[1], sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_NAME], GetFontAttribute(sTrainerCardFontIds[1], FONTATTR_LETTER_SPACING)); AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], x, sTrainerCardBackNameYPositions[sTrainerCardDataPtr->cardType], - sTrainerCardTextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_NAME]); + sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_NAME]); } } @@ -1301,8 +1301,8 @@ static void PrintHofDebutTimeOnCard(void) { if (sTrainerCardDataPtr->hasHofResult) { - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardHofDebutXPositions[sTrainerCardDataPtr->cardType], 35, sTrainerCardTextColors, TEXT_SPEED_FF, gText_HallOfFameDebut); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 164, 35, sTrainerCardStatColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_HOF_TIME]); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardHofDebutXPositions[sTrainerCardDataPtr->cardType], 35, sTrainerCardTextColors, TEXT_SKIP_DRAW, gText_HallOfFameDebut); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 164, 35, sTrainerCardStatColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_HOF_TIME]); } } @@ -1326,10 +1326,10 @@ static void PrintLinkBattleResultsOnCard(void) if (sTrainerCardDataPtr->hasLinkResults) { AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardHofDebutXPositions[sTrainerCardDataPtr->cardType], 51, - sTrainerCardTextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_LINK_RECORD]); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 130, 51, sTrainerCardTextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_WIN_LOSS]); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 144, 51, sTrainerCardStatColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_LINK_WINS]); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 192, 51, sTrainerCardStatColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_LINK_LOSSES]); + sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_LINK_RECORD]); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 130, 51, sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_WIN_LOSS]); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 144, 51, sTrainerCardStatColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_LINK_WINS]); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 192, 51, sTrainerCardStatColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_LINK_LOSSES]); } } @@ -1346,8 +1346,8 @@ static void PrintTradesStringOnCard(void) { if (sTrainerCardDataPtr->hasTrades) { - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardHofDebutXPositions[sTrainerCardDataPtr->cardType], 67, sTrainerCardTextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_TRADES]); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 186, 67, sTrainerCardStatColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_TRADE_COUNT]); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardHofDebutXPositions[sTrainerCardDataPtr->cardType], 67, sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_TRADES]); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 186, 67, sTrainerCardStatColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_TRADE_COUNT]); } } @@ -1364,8 +1364,8 @@ static void PrintBerryCrushStringOnCard(void) { if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE && sTrainerCardDataPtr->trainerCard.berryCrushPoints) { - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardHofDebutXPositions[sTrainerCardDataPtr->cardType], 99, sTrainerCardTextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_BERRY_CRUSH]); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 186, 99, sTrainerCardStatColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_BERRY_CRUSH_COUNT]); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardHofDebutXPositions[sTrainerCardDataPtr->cardType], 99, sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_BERRY_CRUSH]); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 186, 99, sTrainerCardStatColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_BERRY_CRUSH_COUNT]); } } @@ -1382,8 +1382,8 @@ static void PrintUnionStringOnCard(void) { if (sTrainerCardDataPtr->cardType != CARD_TYPE_RSE && sTrainerCardDataPtr->trainerCard.unionRoomNum) { - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardHofDebutXPositions[sTrainerCardDataPtr->cardType], 83, sTrainerCardTextColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_UNION_ROOM]); - AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 186, 83, sTrainerCardStatColors, TEXT_SPEED_FF, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_UNION_ROOM_NUM]); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], sTrainerCardHofDebutXPositions[sTrainerCardDataPtr->cardType], 83, sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_UNION_ROOM]); + AddTextPrinterParameterized3(1, sTrainerCardFontIds[1], 186, 83, sTrainerCardStatColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->strings[TRAINER_CARD_STRING_UNION_ROOM_NUM]); } } diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 1bfcc5dc9..210837745 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -905,15 +905,15 @@ static void ShowResultsBoard(void) windowId = AddWindow(sTimeBoardWindowTemplate); LoadStdWindowFrameGfx(); DrawStdWindowFrame(windowId, FALSE); - AddTextPrinterParameterized(windowId, 2, gText_TimeBoard, 74, 0, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(windowId, 2, gText_TimeBoard, 74, 0, TEXT_SKIP_DRAW, NULL); for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++) { PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime)); StringExpandPlaceholders(gStringVar4, gText_XMinYZSec); - AddTextPrinterParameterized(windowId, 2, gTrainerTowerChallengeTypeTexts[i - 1], 24, 36 + 20 * i, TEXT_SPEED_FF, NULL); - AddTextPrinterParameterized(windowId, 2, gStringVar4, 96, 46 + 20 * i, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(windowId, 2, gTrainerTowerChallengeTypeTexts[i - 1], 24, 36 + 20 * i, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, 2, gStringVar4, 96, 46 + 20 * i, TEXT_SKIP_DRAW, NULL); } PutWindowTilemap(windowId); diff --git a/src/union_room_chat_display.c b/src/union_room_chat_display.c index 989047d3f..040b21367 100644 --- a/src/union_room_chat_display.c +++ b/src/union_room_chat_display.c @@ -952,8 +952,8 @@ static void PlaceYesNoMenuAt(u8 left, u8 top, u8 initialCursorPos) { FillWindowPixelBuffer(sWork->yesNoMenuWinId, PIXEL_FILL(1)); PutWindowTilemap(sWork->yesNoMenuWinId); - AddTextPrinterParameterized(sWork->yesNoMenuWinId, 2, gText_Yes, 8, 2, TEXT_SPEED_FF, NULL); - AddTextPrinterParameterized(sWork->yesNoMenuWinId, 2, gText_No, 8, 16, TEXT_SPEED_FF, NULL); + AddTextPrinterParameterized(sWork->yesNoMenuWinId, 2, gText_Yes, 8, 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sWork->yesNoMenuWinId, 2, gText_No, 8, 16, TEXT_SKIP_DRAW, NULL); DrawTextBorderOuter(sWork->yesNoMenuWinId, 1, 13); Menu_InitCursor(sWork->yesNoMenuWinId, 2, 0, 2, 14, 2, initialCursorPos); } @@ -1027,7 +1027,7 @@ static void PlaceStdMessageWindow(int id, u16 bg0vofs) str, sMessageWindowInfo[id].x + 8, sMessageWindowInfo[id].y + 8, - TEXT_SPEED_FF, + TEXT_SKIP_DRAW, NULL, sMessageWindowInfo[id].letterSpacing, sMessageWindowInfo[id].lineSpacing); @@ -1041,7 +1041,7 @@ static void PlaceStdMessageWindow(int id, u16 bg0vofs) str, sMessageWindowInfo[id].x, sMessageWindowInfo[id].y, - TEXT_SPEED_FF, + TEXT_SKIP_DRAW, NULL, sMessageWindowInfo[id].letterSpacing, sMessageWindowInfo[id].lineSpacing); @@ -1090,7 +1090,7 @@ static void PrintOnWin1Parameterized(u16 x, u8 *str, u8 bgColor, u8 fgColor, u8 strbuf[1] = EXT_CTRL_CODE_MIN_LETTER_SPACING; strbuf[2] = 8; StringCopy(&strbuf[3], str); - AddTextPrinterParameterized3(1, 2, x * 8, 1, color, TEXT_SPEED_FF, strbuf); + AddTextPrinterParameterized3(1, 2, x * 8, 1, color, TEXT_SKIP_DRAW, strbuf); } static void PrintCurrentKeyboardPage(void) @@ -1124,7 +1124,7 @@ static void PrintCurrentKeyboardPage(void) return; StringCopy(&str[3], gUnionRoomKeyboardText[page][i]); - AddTextPrinterParameterized3(2, 0, left, top, color, TEXT_SPEED_FF, str); + AddTextPrinterParameterized3(2, 0, left, top, color, TEXT_SKIP_DRAW, str); } } else @@ -1135,7 +1135,7 @@ static void PrintCurrentKeyboardPage(void) str2 = UnionRoomChat_GetWorkRegisteredText(i); if (GetStringWidth(0, str2, 0) <= 40) { - AddTextPrinterParameterized3(2, 0, left, top, color, TEXT_SPEED_FF, str2); + AddTextPrinterParameterized3(2, 0, left, top, color, TEXT_SKIP_DRAW, str2); } else { @@ -1146,8 +1146,8 @@ static void PrintCurrentKeyboardPage(void) StringCopyN_Multibyte(str, str2, length); } while (GetStringWidth(0, str, 0) > 35); - AddTextPrinterParameterized3(2, 0, left, top, color, TEXT_SPEED_FF, str); - AddTextPrinterParameterized3(2, 0, left + 35, top, color, TEXT_SPEED_FF, gText_Ellipsis); + AddTextPrinterParameterized3(2, 0, left, top, color, TEXT_SKIP_DRAW, str); + AddTextPrinterParameterized3(2, 0, left + 35, top, color, TEXT_SKIP_DRAW, gText_Ellipsis); } } } @@ -1214,7 +1214,7 @@ static void PrintTextOnWin0Colorized(u16 row, u8 *str, u8 colorIdx) color[1] = colorIdx * 2 + 2; color[2] = colorIdx * 2 + 3; FillWindowPixelRect(0, PIXEL_FILL(1), 0, row * 15, 168, 15); - AddTextPrinterParameterized3(0, 2, 0, row * 15, color, TEXT_SPEED_FF, str); + AddTextPrinterParameterized3(0, 2, 0, row * 15, color, TEXT_SKIP_DRAW, str); } static void ResetGpuBgState(void) From 7f53f533bb5181f8ede8c2716e0d561655febb38 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 09:42:03 -0400 Subject: [PATCH 38/64] Synced src/battle_script_commands.c --- asm/macros/battle_script.inc | 14 +- charmap.txt | 4 +- data/battle_ai_scripts.s | 4 +- data/battle_anim_scripts.s | 64 +- data/battle_scripts_1.s | 34 +- ...{unk_battlebox.png => level_up_banner.png} | Bin graphics_file_rules.mk | 2 +- include/battle.h | 61 +- include/battle_anim.h | 4 +- include/battle_script_commands.h | 24 +- include/battle_scripts.h | 2 +- include/battle_string_ids.h | 208 +- include/battle_util.h | 44 +- include/constants/battle.h | 213 +- include/constants/battle_anim.h | 6 +- include/constants/battle_move_effects.h | 2 +- include/constants/battle_script_commands.h | 62 +- include/constants/items.h | 2 +- include/constants/pokemon.h | 51 +- include/graphics.h | 2 +- include/strings.h | 2 +- include/text.h | 7 +- include/window.h | 13 +- src/battle_ai_script_commands.c | 2 +- src/battle_anim.c | 6 +- src/battle_anim_effects_1.c | 66 +- src/battle_controller_oak_old_man.c | 2 +- src/battle_controllers.c | 2 +- src/battle_main.c | 28 +- src/battle_message.c | 41 +- src/battle_records.c | 2 +- src/battle_script_commands.c | 3152 ++++++++++------- src/battle_util.c | 18 +- src/berry_crush.c | 12 +- src/cable_club.c | 6 +- src/clear_save_data_screen.c | 2 +- src/credits.c | 2 +- src/data/battle_moves.h | 2 +- src/data/pokemon/tmhm_learnsets.h | 248 +- src/daycare.c | 4 +- src/dodrio_berry_picking.c | 2 +- src/dodrio_berry_picking_2.c | 4 +- src/easy_chat_3.c | 8 +- src/evolution_scene.c | 2 +- src/fame_checker.c | 4 +- src/field_screen_effect.c | 2 +- src/field_specials.c | 4 +- src/fldeff_flash.c | 2 +- src/graphics.c | 2 +- src/hall_of_fame.c | 14 +- src/help_system_util.c | 2 +- src/intro.c | 2 +- src/learn_move.c | 4 +- src/link.c | 6 +- src/link_rfu_2.c | 2 +- src/link_rfu_3.c | 2 +- src/mail.c | 4 +- src/main_menu.c | 6 +- src/map_name_popup.c | 2 +- src/map_preview_screen.c | 2 +- src/menu.c | 22 +- src/mevent_show_card.c | 2 +- src/mevent_show_news.c | 4 +- src/mystery_gift_menu.c | 2 +- src/naming_screen.c | 4 +- src/new_menu_helpers.c | 10 +- src/oak_speech.c | 18 +- src/option_menu.c | 6 +- src/pokemon.c | 10 +- src/pokemon_jump.c | 2 +- src/pokemon_special_anim_scene.c | 6 +- src/pokemon_storage_system_2.c | 4 +- src/pokemon_storage_system_5.c | 2 +- src/pokemon_storage_system_7.c | 2 +- src/quest_log.c | 2 +- src/region_map.c | 18 +- src/slot_machine.c | 6 +- src/start_menu.c | 2 +- src/strings.c | 82 +- src/text.c | 10 +- src/trade.c | 10 +- src/trade_scene.c | 10 +- src/trainer_card.c | 4 +- src/trainer_tower.c | 4 +- src/union_room_battle.c | 2 +- src/union_room_chat.c | 14 +- src/union_room_chat_display.c | 32 +- src/window.c | 2 +- src/window_8bpp.c | 2 +- src/wireless_communication_status_screen.c | 2 +- 90 files changed, 2734 insertions(+), 2058 deletions(-) rename graphics/battle_interface/{unk_battlebox.png => level_up_banner.png} (100%) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 1648883c9..678324275 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1259,8 +1259,8 @@ various \battler, VARIOUS_GET_MOVE_TARGET .endm - .macro various4 battler:req - various \battler, 4 + .macro getbattlerfainted battler:req + various \battler, VARIOUS_GET_BATTLER_FAINTED .endm .macro resetintimidatetracebits battler:req @@ -1271,8 +1271,8 @@ various \battler, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP .endm - .macro various7 battler:req - various \battler, 7 + .macro resetplayerfainted battler:req + various \battler, VARIOUS_RESET_PLAYER_FAINTED .endm .macro various8 battler:req @@ -1288,11 +1288,11 @@ .endm .macro checkpokeflute battler:req - various \battler, 11 + various \battler, VARIOUS_CHECK_POKEFLUTE .endm .macro waitfanfare battler:req - various \battler, 12 + various \battler, VARIOUS_WAIT_FANFARE .endm @ helpful macros @@ -1301,7 +1301,7 @@ .endm .macro setmoveeffect effect:req - setbyte cEFFECT_CHOOSER \effect + setbyte cEFFECT_CHOOSER, \effect .endm .macro chosenstatus1animation battler:req, status:req diff --git a/charmap.txt b/charmap.txt index febef44e9..020580921 100644 --- a/charmap.txt +++ b/charmap.txt @@ -427,7 +427,7 @@ HIGHLIGHT = FC 02 @ same as fc 01 SHADOW = FC 03 @ same as fc 01 COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes PALETTE = FC 05 @ used in credits -SIZE = FC 06 @ note that anything other than "SMALL" is invalid +SIZE = FC 06 @ note that anything other than "FONT_SMALL" is invalid RESET_SIZE = FC 07 PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them PAUSE_UNTIL_PRESS = FC 09 @@ -449,7 +449,7 @@ RESUME_MUSIC = FC 18 @ font sizes -SMALL = FC 06 00 +FONT_SMALL = FC 06 00 BIG = FC 06 04 @ colors diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 7dcc2f7ed..85d043d41 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -737,7 +737,7 @@ AI_CheckViability:: if_effect EFFECT_PSYCH_UP, AI_CV_PsychUp if_effect EFFECT_MIRROR_COAT, AI_CV_MirrorCoat if_effect EFFECT_SKULL_BASH, AI_CV_ChargeUpMove - if_effect EFFECT_SOLARBEAM, AI_CV_ChargeUpMove + if_effect EFFECT_SOLAR_BEAM, AI_CV_ChargeUpMove if_effect EFFECT_SEMI_INVULNERABLE, AI_CV_SemiInvulnerable if_effect EFFECT_SOFTBOILED, AI_CV_Heal if_effect EFFECT_FAKE_OUT, AI_CV_FakeOut @@ -3097,7 +3097,7 @@ AI_HPAware_DiscouragedEffectsWhenLowHP:: .byte EFFECT_BELLY_DRUM .byte EFFECT_PSYCH_UP .byte EFFECT_MIRROR_COAT - .byte EFFECT_SOLARBEAM + .byte EFFECT_SOLAR_BEAM .byte EFFECT_ERUPTION .byte EFFECT_TICKLE .byte EFFECT_COSMIC_POWER diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index c9afc9b02..4acb190f7 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -5591,46 +5591,46 @@ SolarBeamAbsorbEffect:: return SolarBeamUnleash:: - call SetSolarbeamBg + call SetSolarBeamBg panse_1B SE_M_SOLAR_BEAM, 192, 63, 2, 0 - createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5, - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 + createvisualtask AnimTask_CreateSmallSolarBeamOrbs, 5, + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 createvisualtask AnimTask_BlendSelected, 10, 4, 1, 0, 10, RGB(25, 31, 0) - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 65, 1 - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 call SolarBeamUnleash1 call SolarBeamUnleash1 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 10, 4, 1, 10, 0, RGB(25, 31, 0) - call UnsetSolarbeamBg + call UnsetSolarBeamBg goto SolarBeamEnd SolarBeamUnleash1:: - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 3 delay 4 - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 4 delay 4 - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 5 delay 4 - createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 + createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 6 delay 4 return @@ -10407,29 +10407,29 @@ UnsetSkyBg:: waitbgfadein return -SetSolarbeamBg:: +SetSolarBeamBg:: createvisualtask AnimTask_IsContest, 2, - jumpargeq 7, 1, SetSolarbeamBgContest + jumpargeq 7, 1, SetSolarBeamBgContest createvisualtask AnimTask_IsTargetPlayerSide, 2, - jumpargeq 7, 0, SetSolarbeamBgOpponent - goto SetSolarbeamBgPlayer -SetSolarbeamBgContinue:: + jumpargeq 7, 0, SetSolarBeamBgOpponent + goto SetSolarBeamBgPlayer +SetSolarBeamBgContinue:: waitbgfadein return -SetSolarbeamBgContest:: - fadetobg BG_SOLARBEAM_CONTESTS - goto SetSolarbeamBgContinue +SetSolarBeamBgContest:: + fadetobg BG_SOLAR_BEAM_CONTESTS + goto SetSolarBeamBgContinue -SetSolarbeamBgPlayer:: - fadetobg BG_SOLARBEAM_PLAYER - goto SetSolarbeamBgContinue +SetSolarBeamBgPlayer:: + fadetobg BG_SOLAR_BEAM_PLAYER + goto SetSolarBeamBgContinue -SetSolarbeamBgOpponent:: - fadetobg BG_SOLARBEAM_OPPONENT - goto SetSolarbeamBgContinue +SetSolarBeamBgOpponent:: + fadetobg BG_SOLAR_BEAM_OPPONENT + goto SetSolarBeamBgContinue -UnsetSolarbeamBg:: +UnsetSolarBeamBg:: restorebg waitbgfadein return diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 9a9d30349..cec621275 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -171,7 +171,7 @@ gBattleScriptsForMoveEffects:: .4byte BattleScript_EffectFutureSight .4byte BattleScript_EffectGust .4byte BattleScript_EffectFlinchMinimizeHit - .4byte BattleScript_EffectSolarbeam + .4byte BattleScript_EffectSolarBeam .4byte BattleScript_EffectThunder .4byte BattleScript_EffectTeleport .4byte BattleScript_EffectBeatUp @@ -1703,7 +1703,7 @@ BattleScript_EffectBatonPass:: attackcanceler attackstring ppreduce - jumpifcantswitch BS_ATTACKER | ATK4F_DONT_CHECK_STATUSES, BattleScript_ButItFailed + jumpifcantswitch BS_ATTACKER | SWITCH_IGNORE_ESCAPE_PREVENTION, BattleScript_ButItFailed attackanimation waitanimation openpartyscreen BS_ATTACKER, BattleScript_ButItFailed @@ -1908,18 +1908,18 @@ BattleScript_EffectFlinchMinimizeHit:: setbyte sDMG_MULTIPLIER, 2 goto BattleScript_FlinchEffect -BattleScript_EffectSolarbeam:: - jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarbeamDecideTurn - jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarbeamDecideTurn - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, 96, BattleScript_SolarbeamOnFirstTurn -BattleScript_SolarbeamDecideTurn:: +BattleScript_EffectSolarBeam:: + jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarBeamDecideTurn + jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarBeamDecideTurn + jumpifhalfword CMP_COMMON_BITS, gBattleWeather, 96, BattleScript_SolarBeamOnFirstTurn +BattleScript_SolarBeamDecideTurn:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn setbyte sTWOTURN_STRINGID, 1 call BattleScriptFirstChargingTurn goto BattleScript_MoveEnd -BattleScript_SolarbeamOnFirstTurn:: +BattleScript_SolarBeamOnFirstTurn:: orword gHitMarker, HITMARKER_CHARGING setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER seteffectprimary @@ -2862,7 +2862,7 @@ BattleScript_FaintedMonTryChooseAnother:: yesnobox jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 1, BattleScript_FaintedMonChooseAnother setatktoplayer0 - openpartyscreen BS_ATTACKER | OPEN_PARTY_ALLOW_CANCEL, BattleScript_FaintedMonChooseAnother + openpartyscreen BS_ATTACKER | PARTY_SCREEN_OPTIONAL, BattleScript_FaintedMonChooseAnother switchhandleorder BS_ATTACKER, 2 jumpifbyte CMP_EQUAL, gBattleCommunication, 6, BattleScript_FaintedMonChooseAnother atknameinbuff1 @@ -2892,7 +2892,7 @@ BattleScript_FaintedMonChooseAnother:: hidepartystatussummary BS_FAINTED switchinanim BS_FAINTED, 0 waitstate - various7 BS_ATTACKER + resetplayerfainted BS_ATTACKER switchineffects BS_FAINTED jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonEnd cancelallactions @@ -2900,10 +2900,10 @@ BattleScript_FaintedMonEnd:: end2 BattleScript_LinkBattleHandleFaint:: - openpartyscreen BS_UNKNOWN_5, BattleScript_LinkBattleHandleFaintStart + openpartyscreen BS_FAINTED_LINK_MULTIPLE_1, BattleScript_LinkBattleHandleFaintStart BattleScript_LinkBattleHandleFaintStart:: switchhandleorder BS_FAINTED, 0 - openpartyscreen BS_UNKNOWN_6, BattleScript_LinkBattleFaintedMonEnd + openpartyscreen BS_FAINTED_LINK_MULTIPLE_2, BattleScript_LinkBattleFaintedMonEnd switchhandleorder BS_FAINTED, 0 BattleScript_LinkBattleFaintedMonLoop:: switchhandleorder BS_FAINTED, 2 @@ -3112,7 +3112,7 @@ BattleScript_PursuitDmgOnSwitchOut:: waitmessage 0x40 tryfaintmon BS_TARGET, 0, NULL moveendfromto 3, 6 - various4 BS_TARGET + getbattlerfainted BS_TARGET jumpifbyte CMP_EQUAL, gBattleCommunication, 0, BattleScript_PursuitSwitchRivalSkip setbyte sGIVEEXP_STATE, 0 getexp BS_TARGET @@ -3182,7 +3182,7 @@ BattleScript_DamagingWeatherLoop:: jumpifword CMP_EQUAL, gBattleMoveDamage, NULL, BattleScript_DamagingWeatherContinuesEnd printfromtable gSandstormHailDmgStringIds waitmessage 0x40 - orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_GRUDGE + orword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_GRUDGE effectivenesssound hitanimation BS_ATTACKER healthbarupdate BS_ATTACKER @@ -3194,7 +3194,7 @@ BattleScript_DamagingWeatherContinuesEnd:: addbyte gBattleCommunication, 1 jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_DamagingWeatherLoop BattleScript_WeatherDamageEndedBattle:: - bicword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_GRUDGE + bicword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_GRUDGE end2 BattleScript_SandStormHailEnds:: @@ -3678,7 +3678,7 @@ BattleScript_MoveUsedIsAsleep:: goto BattleScript_MoveEnd BattleScript_MoveUsedWokeUp:: - bicword gHitMarker, HITMARKER_x10 + bicword gHitMarker, HITMARKER_WAKE_UP_CLEAR printfromtable gWokeUpStringIds waitmessage 0x40 updatestatusicon BS_ATTACKER @@ -4355,7 +4355,7 @@ BattleScript_SelectingNotAllowedMoveChoiceItem:: printselectionstring STRINGID_ITEMALLOWSONLYYMOVE endselectionscript -BattleScript_HangedOnMsg:: +BattleScript_FocusBandActivates:: playanimation BS_TARGET, B_ANIM_HANGED_ON, NULL printstring STRINGID_PKMNHUNGONWITHX waitmessage 0x40 diff --git a/graphics/battle_interface/unk_battlebox.png b/graphics/battle_interface/level_up_banner.png similarity index 100% rename from graphics/battle_interface/unk_battlebox.png rename to graphics/battle_interface/level_up_banner.png diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 8e5cd789f..7ac567281 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -153,7 +153,7 @@ $(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png $(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 5 -$(BATINTGFXDIR)/unk_battlebox.4bpp: %.4bpp: %.png +$(BATINTGFXDIR)/level_up_banner.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 $(BATINTGFXDIR)/window.gbapal: $(BATINTGFXDIR)/window1.gbapal $(BATINTGFXDIR)/window2.gbapal diff --git a/include/battle.h b/include/battle.h index 32bb401b3..7d513f934 100644 --- a/include/battle.h +++ b/include/battle.h @@ -4,6 +4,7 @@ #include #include "global.h" #include "constants/battle.h" +#include "constants/battle_script_commands.h" #include "battle_util.h" #include "battle_script_commands.h" #include "battle_main.h" @@ -23,18 +24,25 @@ #define GET_BATTLER_SIDE(battler)((GetBattlerPosition(battler) & BIT_SIDE)) #define GET_BATTLER_SIDE2(battler)((GET_BATTLER_POSITION(battler) & BIT_SIDE)) +// Used to exclude moves learned temporarily by Transform or Mimic +#define MOVE_IS_PERMANENT(battler, moveSlot) \ + (!(gBattleMons[battler].status2 & STATUS2_TRANSFORMED) \ + && !(gDisableStructs[battler].mimickedMoves & gBitTable[moveSlot])) + #define TRAINER_OPPONENT_3FE 0x3FE #define TRAINER_OPPONENT_C00 0xC00 #define TRAINER_LINK_OPPONENT 0x800 #define SECRET_BASE_OPPONENT 0x400 +// Battle Actions +// These determine what each battler will do in a turn #define B_ACTION_USE_MOVE 0 #define B_ACTION_USE_ITEM 1 #define B_ACTION_SWITCH 2 #define B_ACTION_RUN 3 #define B_ACTION_SAFARI_WATCH_CAREFULLY 4 #define B_ACTION_SAFARI_BALL 5 -#define B_ACTION_SAFARI_BAIT 6 +#define B_ACTION_SAFARI_BAIT 6 #define B_ACTION_SAFARI_GO_NEAR 7 #define B_ACTION_SAFARI_RUN 8 #define B_ACTION_OLDMAN_THROW 9 @@ -47,26 +55,17 @@ #define MAX_TRAINER_ITEMS 4 -// array entries for battle communication -#define MULTIUSE_STATE 0x0 -#define CURSOR_POSITION 0x1 -#define TASK_ID 0x1 // task Id and cursor position share the same field -#define SPRITES_INIT_STATE1 0x1 // shares the Id as well -#define SPRITES_INIT_STATE2 0x2 -#define MOVE_EFFECT_BYTE 0x3 -#define ACTIONS_CONFIRMED_COUNT 0x4 -#define MULTISTRING_CHOOSER 0x5 -#define MSG_DISPLAY 0x7 -#define BATTLE_COMMUNICATION_ENTRIES_COUNT 0x8 +#define MOVE_TARGET_SELECTED 0 +#define MOVE_TARGET_DEPENDS (1 << 0) +#define MOVE_TARGET_USER_OR_SELECTED (1 << 1) +#define MOVE_TARGET_RANDOM (1 << 2) +#define MOVE_TARGET_BOTH (1 << 3) +#define MOVE_TARGET_USER (1 << 4) +#define MOVE_TARGET_FOES_AND_ALLY (1 << 5) +#define MOVE_TARGET_OPPONENTS_FIELD (1 << 6) -#define MOVE_TARGET_SELECTED 0x0 -#define MOVE_TARGET_DEPENDS 0x1 -#define MOVE_TARGET_USER_OR_SELECTED 0x2 -#define MOVE_TARGET_RANDOM 0x4 -#define MOVE_TARGET_BOTH 0x8 -#define MOVE_TARGET_USER 0x10 -#define MOVE_TARGET_FOES_AND_ALLY 0x20 -#define MOVE_TARGET_OPPONENTS_FIELD 0x40 +// For the second argument of GetMoveTarget, when no target override is needed +#define NO_TARGET_OVERRIDE 0 struct TrainerMonNoItemDefaultMoves { @@ -159,7 +158,7 @@ struct DisableStruct /*0x16*/ u8 isFirstTurn; /*0x17*/ u8 unk17; /*0x18*/ u8 truantCounter : 1; - /*0x18*/ u8 truantSwitchInHack : 1; // unused? + /*0x18*/ u8 truantSwitchInHack : 1; // Unused here, but used in pokeemerald /*0x18*/ u8 unk18_a_2 : 2; /*0x18*/ u8 mimickedMoves : 4; /*0x19*/ u8 rechargeTimer; @@ -455,17 +454,23 @@ struct BattleStruct extern struct BattleStruct *gBattleStruct; -#define GET_MOVE_TYPE(move, typeArg) \ -{ \ - if (gBattleStruct->dynamicMoveType) \ - typeArg = gBattleStruct->dynamicMoveType & 0x3F; \ - else \ - typeArg = gBattleMoves[move].type; \ +#define F_DYNAMIC_TYPE_1 (1 << 6) +#define F_DYNAMIC_TYPE_2 (1 << 7) +#define DYNAMIC_TYPE_MASK (F_DYNAMIC_TYPE_1 - 1) + +#define GET_MOVE_TYPE(move, typeArg) \ +{ \ + if (gBattleStruct->dynamicMoveType) \ + typeArg = gBattleStruct->dynamicMoveType & DYNAMIC_TYPE_MASK; \ + else \ + typeArg = gBattleMoves[move].type; \ } #define IS_TYPE_PHYSICAL(moveType)(moveType < TYPE_MYSTERY) #define IS_TYPE_SPECIAL(moveType)(moveType > TYPE_MYSTERY) + #define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0)) + #define IS_BATTLER_OF_TYPE(battlerId, type)((gBattleMons[battlerId].type1 == type || gBattleMons[battlerId].type2 == type)) #define SET_BATTLER_TYPE(battlerId, type) \ { \ @@ -504,7 +509,7 @@ struct BattleScripting u8 battleStyle; u8 drawlvlupboxState; u8 learnMoveState; - u8 field_20; + u8 pursuitDoublesAttacker; u8 reshowMainState; u8 reshowHelperState; u8 field_23; diff --git a/include/battle_anim.h b/include/battle_anim.h index 55a7b7f77..1919ba7d0 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -165,8 +165,8 @@ extern const union AnimCmd *const gMusicNotesAnimTable[]; extern const struct SpriteTemplate gThoughtBubbleSpriteTemplate; void AnimMovePowderParticle(struct Sprite *); void AnimPowerAbsorptionOrb(struct Sprite *); -void AnimSolarbeamBigOrb(struct Sprite *); -void AnimSolarbeamSmallOrb(struct Sprite *); +void AnimSolarBeamBigOrb(struct Sprite *); +void AnimSolarBeamSmallOrb(struct Sprite *); void AnimAbsorptionOrb(struct Sprite *); void AnimHyperBeamOrb(struct Sprite *); void AnimSporeParticle(struct Sprite *); diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index ab9209d78..709e77538 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -3,23 +3,21 @@ #include "global.h" -#define STAT_CHANGE_WORKED 0 -#define STAT_CHANGE_DIDNT_WORK 1 +// Arguments for 'flags' in HandleBattleWindow +#define WINDOW_CLEAR (1 << 0) +#define WINDOW_BG1 (1 << 7) -#define WINDOW_CLEAR 0x1 -#define WINDOW_x80 0x80 - -void SetMoveEffect(bool8 primary, u8 certain); -bool8 UproarWakeUpCheck(u8 battlerId); -u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility); -u8 TypeCalc(u16 move, u8 attacker, u8 defender); void AI_CalcDmg(u8 attacker, u8 defender); -bool32 IsMonGettingExpSentOut(void); -void BattleCreateYesNoCursorAt(void); -void BattleDestroyYesNoCursorAt(void); -void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags); +u8 TypeCalc(u16 move, u8 attacker, u8 defender); +u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility); u8 GetBattlerTurnOrderNum(u8 battlerId); +void SetMoveEffect(bool8 primary, u8 certain); +bool32 IsMonGettingExpSentOut(void); +void BattleDestroyYesNoCursorAt(void); +void BattleCreateYesNoCursorAt(void); void BufferMoveToLearnIntoBattleTextBuff2(void); +void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags); +bool8 UproarWakeUpCheck(u8 battlerId); extern void (* const gBattleScriptingCommandsTable[])(void); diff --git a/include/battle_scripts.h b/include/battle_scripts.h index 080922775..ed2af35f7 100644 --- a/include/battle_scripts.h +++ b/include/battle_scripts.h @@ -197,7 +197,7 @@ extern const u8 BattleScript_BerryPPHealEnd2[]; extern const u8 BattleScript_ItemHealHP_End2[]; extern const u8 BattleScript_ItemHealHP_Ret[]; extern const u8 BattleScript_SelectingNotAllowedMoveChoiceItem[]; -extern const u8 BattleScript_HangedOnMsg[]; +extern const u8 BattleScript_FocusBandActivates[]; extern const u8 BattleScript_BerryConfuseHealEnd2[]; extern const u8 BattleScript_BerryStatRaiseEnd2[]; extern const u8 BattleScript_BerryFocusEnergyEnd2[]; diff --git a/include/battle_string_ids.h b/include/battle_string_ids.h index c78452622..76b0194fe 100644 --- a/include/battle_string_ids.h +++ b/include/battle_string_ids.h @@ -211,10 +211,10 @@ #define STRINGID_STATROSE 210 #define STRINGID_STATHARSHLY 211 #define STRINGID_STATFELL 212 -#define STRINGID_PKMNSSTATCHANGED 213 -#define STRINGID_PKMNSSTATCHANGED2 214 -#define STRINGID_PKMNSSTATCHANGED3 215 -#define STRINGID_PKMNSSTATCHANGED4 216 +#define STRINGID_ATTACKERSSTATROSE 213 +#define STRINGID_DEFENDERSSTATROSE 214 +#define STRINGID_ATTACKERSSTATFELL 215 +#define STRINGID_DEFENDERSSTATFELL 216 #define STRINGID_CRITICALHIT 217 #define STRINGID_ONEHITKO 218 #define STRINGID_123POOF 219 @@ -323,7 +323,7 @@ #define STRINGID_SOOTHINGAROMA 322 #define STRINGID_ITEMSCANTBEUSEDNOW 323 #define STRINGID_FORXCOMMAYZ 324 -#define STRINGID_USINGXTHEYOFZN 325 +#define STRINGID_USINGITEMSTATOFPKMNROSE 325 #define STRINGID_PKMNUSEDXTOGETPUMPED 326 #define STRINGID_PKMNSXMADEYUSELESS 327 #define STRINGID_PKMNTRAPPEDBYSANDTOMB 328 @@ -392,4 +392,202 @@ // and are instead handled explicitly by BufferStringBattle. #define BATTLESTRINGS_TABLE_START STRINGID_TRAINER1LOSETEXT +// The below IDs are all indexes into battle message tables, +// used to determine which of a set of messages to print. +// They are assigned to the MULTISTRING_CHOOSER byte of gBattleCommunication +// and read when e.g. the command printfromtable is used. + +// gStatUpStringIds +#define B_MSG_ATTACKER_STAT_ROSE 0 +#define B_MSG_DEFENDER_STAT_ROSE 1 +#define B_MSG_STAT_WONT_INCREASE 2 +#define B_MSG_STAT_ROSE_EMPTY 3 +#define B_MSG_STAT_ROSE_ITEM 4 +#define B_MSG_USED_DIRE_HIT 5 + +// gStatDownStringIds +#define B_MSG_ATTACKER_STAT_FELL 0 +#define B_MSG_DEFENDER_STAT_FELL 1 +#define B_MSG_STAT_WONT_DECREASE 2 +#define B_MSG_STAT_FELL_EMPTY 3 + +// gMissStringIds +#define B_MSG_MISSED 0 +#define B_MSG_PROTECTED 1 +#define B_MSG_AVOIDED_ATK 2 +#define B_MSG_AVOIDED_DMG 3 +#define B_MSG_GROUND_MISS 4 + +// gAbsorbDrainStringIds +#define B_MSG_ABSORB 0 +#define B_MSG_ABSORB_OOZE 1 + +// gLeechSeedStringIds +#define B_MSG_LEECH_SEED_SET 0 +#define B_MSG_LEECH_SEED_MISS 1 +#define B_MSG_LEECH_SEED_FAIL 2 +#define B_MSG_LEECH_SEED_DRAIN 3 +#define B_MSG_LEECH_SEED_OOZE 4 + +// gFirstTurnOfTwoStringIds +#define B_MSG_TURN1_RAZOR_WIND 0 +#define B_MSG_TURN1_SOLAR_BEAM 1 +#define B_MSG_TURN1_SKULL_BASH 2 +#define B_MSG_TURN1_SKY_ATTACK 3 +#define B_MSG_TURN1_FLY 4 +#define B_MSG_TURN1_DIG 5 +#define B_MSG_TURN1_DIVE 6 +#define B_MSG_TURN1_BOUNCE 7 + +// gMoveWeatherChangeStringIds +#define B_MSG_STARTED_RAIN 0 +#define B_MSG_STARTED_DOWNPOUR 1 +#define B_MSG_WEATHER_FAILED 2 +#define B_MSG_STARTED_SANDSTORM 3 +#define B_MSG_STARTED_SUNLIGHT 4 +#define B_MSG_STARTED_HAIL 5 + +// gRainContinuesStringIds +#define B_MSG_RAIN_CONTINUES 0 +#define B_MSG_DOWNPOUR_CONTINUES 1 +#define B_MSG_RAIN_STOPPED 2 + +// gSandStormHailContinuesStringIds / gSandStormHailDmgStringIds/ gSandStormHailEndStringIds +#define B_MSG_SANDSTORM 0 +#define B_MSG_HAIL 1 + +// gReflectLightScreenSafeguardStringIds +#define B_MSG_SIDE_STATUS_FAILED 0 +#define B_MSG_SET_REFLECT_SINGLE 1 +#define B_MSG_SET_REFLECT_DOUBLE 2 +#define B_MSG_SET_LIGHTSCREEN_SINGLE 3 +#define B_MSG_SET_LIGHTSCREEN_DOUBLE 4 +#define B_MSG_SET_SAFEGUARD 5 + +// gProtectLikeUsedStringIds +#define B_MSG_PROTECTED_ITSELF 0 +#define B_MSG_BRACED_ITSELF 1 +#define B_MSG_PROTECT_FAILED 2 + +// gRestUsedStringIds +#define B_MSG_REST 0 +#define B_MSG_REST_STATUSED 1 + +// gWokeUpStringIds +#define B_MSG_WOKE_UP 0 +#define B_MSG_WOKE_UP_UPROAR 1 + +// gUproarAwakeStringIds +#define B_MSG_CANT_SLEEP_UPROAR 0 +#define B_MSG_UPROAR_KEPT_AWAKE 1 +#define B_MSG_STAYED_AWAKE_USING 2 + +// gUproarOverTurnStringIds +#define B_MSG_UPROAR_CONTINUES 0 +#define B_MSG_UPROAR_ENDS 1 + +// gStockpileUsedStringIds +#define B_MSG_STOCKPILED 0 +#define B_MSG_CANT_STOCKPILE 1 + +// gSwallowFailStringIds +#define B_MSG_SWALLOW_FAILED 0 +#define B_MSG_SWALLOW_FULL_HP 1 + +// gKOFailedStringIds +#define B_MSG_KO_MISS 0 +#define B_MSG_KO_UNAFFECTED 1 + +// gMistUsedStringIds +#define B_MSG_SET_MIST 0 +#define B_MSG_MIST_FAILED 1 + +// gFocusEnergyUsedStringIds +#define B_MSG_GETTING_PUMPED 0 +#define B_MSG_FOCUS_ENERGY_FAILED 1 + +// gTransformUsedStringIds +#define B_MSG_TRANSFORMED 0 +#define B_MSG_TRANSFORM_FAILED 1 + +// gSubstituteUsedStringIds +#define B_MSG_SET_SUBSTITUTE 0 +#define B_MSG_SUBSTITUTE_FAILED 1 + +// gPartyStatusHealStringIds +#define B_MSG_BELL 0 +#define B_MSG_BELL_SOUNDPROOF_ATTACKER 1 +#define B_MSG_BELL_SOUNDPROOF_PARTNER 2 +#define B_MSG_BELL_BOTH_SOUNDPROOF 3 +#define B_MSG_SOOTHING_AROMA 4 + +// gFutureMoveUsedStringIds +#define B_MSG_FUTURE_SIGHT 0 +#define B_MSG_DOOM_DESIRE 1 + +// gItemSwapStringIds +#define B_MSG_ITEM_SWAP_TAKEN 0 +#define B_MSG_ITEM_SWAP_GIVEN 1 +#define B_MSG_ITEM_SWAP_BOTH 2 + +// gSportsUsedStringIds +#define B_MSG_WEAKEN_ELECTRIC 0 +#define B_MSG_WEAKEN_FIRE 1 + +// gCaughtMonStringIds +#define B_MSG_SENT_SOMEONES_PC 0 +#define B_MSG_SENT_BILLS_PC 1 +#define B_MSG_SOMEONES_BOX_FULL 2 +#define B_MSG_BILLS_BOX_FULL 3 + +// gInobedientStringIds +#define B_MSG_LOAFING 0 +#define B_MSG_WONT_OBEY 1 +#define B_MSG_TURNED_AWAY 2 +#define B_MSG_PRETEND_NOT_NOTICE 3 +#define B_MSG_INCAPABLE_OF_POWER 4 +// For randomly selecting a disobey string +// Skips the one used for Battle Palace +#define NUM_LOAF_STRINGS 4 + +// gSafariGetNearStringIds +#define B_MSG_CREPT_CLOSER 0 +#define B_MSG_CANT_GET_CLOSER 1 + +// gSafariPokeblockResultStringIds +#define B_MSG_MON_CURIOUS 0 +#define B_MSG_MON_ENTHRALLED 1 +#define B_MSG_MON_IGNORED 2 + +// gFlashFireStringIds +#define B_MSG_FLASH_FIRE_BOOST 0 +#define B_MSG_FLASH_FIRE_NO_BOOST 1 + +// gBerryEffectStringIds +#define B_MSG_CURED_PROBLEM 0 +#define B_MSG_NORMALIZED_STATUS 1 + +// gNoEscapeStringIds +#define B_MSG_CANT_ESCAPE 0 +#define B_MSG_DONT_LEAVE_BIRCH 1 +#define B_MSG_PREVENTS_ESCAPE 2 +#define B_MSG_CANT_ESCAPE_2 3 +#define B_MSG_ATTACKER_CANT_ESCAPE 4 + +// gGotPoisonedStringIds / gGotParalyzedStringIds / gFellAsleepStringIds +// gGotBurnedStringIds / gGotFrozenStringIds / gAttractUsedStringIds +#define B_MSG_STATUSED 0 +#define B_MSG_STATUSED_BY_ABILITY 1 + +// gBRNPreventionStringIds / gPRLZPreventionStringIds / gPSNPreventionStringIds +#define B_MSG_ABILITY_PREVENTS_MOVE_STATUS 0 +#define B_MSG_ABILITY_PREVENTS_ABILITY_STATUS 1 +#define B_MSG_STATUS_HAD_NO_EFFECT 2 + +// gGotDefrostedStringIds +#define B_MSG_DEFROSTED 0 +#define B_MSG_DEFROSTED_BY_MOVE 1 + +#define NUM_TRAPPING_MOVES 6 + #endif // GUARD_BATTLE_STRING_IDS_H diff --git a/include/battle_util.h b/include/battle_util.h index edec94444..cd0b1ab12 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -10,27 +10,29 @@ #define MOVE_LIMITATION_TAUNT (1 << 4) #define MOVE_LIMITATION_IMPRISON (1 << 5) -#define ABILITYEFFECT_ON_SWITCHIN 0x0 -#define ABILITYEFFECT_ENDTURN 0x1 -#define ABILITYEFFECT_MOVES_BLOCK 0x2 -#define ABILITYEFFECT_ABSORBING 0x3 -#define ABILITYEFFECT_MOVE_END 0x4 -#define ABILITYEFFECT_IMMUNITY 0x5 -#define ABILITYEFFECT_FORECAST 0x6 -#define ABILITYEFFECT_SYNCHRONIZE 0x7 -#define ABILITYEFFECT_ATK_SYNCHRONIZE 0x8 -#define ABILITYEFFECT_INTIMIDATE1 0x9 -#define ABILITYEFFECT_INTIMIDATE2 0xA -#define ABILITYEFFECT_TRACE 0xB -#define ABILITYEFFECT_CHECK_OTHER_SIDE 0xC -#define ABILITYEFFECT_CHECK_BATTLER_SIDE 0xD -#define ABILITYEFFECT_FIELD_SPORT 0xE -#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER 0xF // TODO: Is it correct? -#define ABILITYEFFECT_COUNT_OTHER_SIDE 0x10 -#define ABILITYEFFECT_COUNT_BATTLER_SIDE 0x11 -#define ABILITYEFFECT_COUNT_ON_FIELD 0x12 -#define ABILITYEFFECT_CHECK_ON_FIELD 0x13 -#define ABILITYEFFECT_SWITCH_IN_WEATHER 0xFF +#define ABILITYEFFECT_ON_SWITCHIN 0 +#define ABILITYEFFECT_ENDTURN 1 +#define ABILITYEFFECT_MOVES_BLOCK 2 +#define ABILITYEFFECT_ABSORBING 3 +#define ABILITYEFFECT_ON_DAMAGE 4 +#define ABILITYEFFECT_IMMUNITY 5 +#define ABILITYEFFECT_FORECAST 6 +#define ABILITYEFFECT_SYNCHRONIZE 7 +#define ABILITYEFFECT_ATK_SYNCHRONIZE 8 +#define ABILITYEFFECT_INTIMIDATE1 9 +#define ABILITYEFFECT_INTIMIDATE2 10 +#define ABILITYEFFECT_TRACE 11 +#define ABILITYEFFECT_CHECK_OTHER_SIDE 12 +#define ABILITYEFFECT_CHECK_BATTLER_SIDE 13 +#define ABILITYEFFECT_FIELD_SPORT 14 +#define ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER 15 +#define ABILITYEFFECT_COUNT_OTHER_SIDE 16 +#define ABILITYEFFECT_COUNT_BATTLER_SIDE 17 +#define ABILITYEFFECT_COUNT_ON_FIELD 18 +#define ABILITYEFFECT_CHECK_ON_FIELD 19 +#define ABILITYEFFECT_MUD_SPORT 253 +#define ABILITYEFFECT_WATER_SPORT 254 +#define ABILITYEFFECT_SWITCH_IN_WEATHER 255 #define ABILITY_ON_OPPOSING_FIELD(battlerId, abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, battlerId, abilityId, 0, 0)) #define ABILITY_ON_FIELD(abilityId)(AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, abilityId, 0, 0)) diff --git a/include/constants/battle.h b/include/constants/battle.h index 2a3be269d..5cc0f3ed4 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -44,39 +44,39 @@ #define BIT_FLANK 2 // Battle Type Flags -#define BATTLE_TYPE_DOUBLE 0x0001 -#define BATTLE_TYPE_LINK 0x0002 -#define BATTLE_TYPE_IS_MASTER 0x0004 // In not-link battles, it's always set. -#define BATTLE_TYPE_TRAINER 0x0008 -#define BATTLE_TYPE_FIRST_BATTLE 0x0010 -#define BATTLE_TYPE_LINK_ESTABLISHED 0x0020 // Set when the link battle setup callback finishes. -#define BATTLE_TYPE_MULTI 0x0040 -#define BATTLE_TYPE_SAFARI 0x0080 -#define BATTLE_TYPE_BATTLE_TOWER 0x0100 -#define BATTLE_TYPE_OLD_MAN_TUTORIAL 0x0200 -#define BATTLE_TYPE_ROAMER 0x0400 -#define BATTLE_TYPE_EREADER_TRAINER 0x0800 -#define BATTLE_TYPE_KYOGRE_GROUDON 0x1000 -#define BATTLE_TYPE_LEGENDARY 0x2000 -#define BATTLE_TYPE_GHOST_UNVEILED 0x2000 // Re-use of BATTLE_TYPE_LEGENDARY, when combined with BATTLE_TYPE_GHOST -#define BATTLE_TYPE_REGI 0x4000 -#define BATTLE_TYPE_GHOST 0x8000 -#define BATTLE_TYPE_POKEDUDE 0x10000 -#define BATTLE_TYPE_WILD_SCRIPTED 0x20000 -#define BATTLE_TYPE_LEGENDARY_FRLG 0x40000 -#define BATTLE_TYPE_TRAINER_TOWER 0x80000 -#define BATTLE_TYPE_x100000 0x100000 -#define BATTLE_TYPE_x200000 0x200000 -#define BATTLE_TYPE_INGAME_PARTNER 0x400000 -#define BATTLE_TYPE_x800000 0x800000 -#define BATTLE_TYPE_RECORDED 0x1000000 -#define BATTLE_TYPE_x2000000 0x2000000 -#define BATTLE_TYPE_x4000000 0x4000000 -#define BATTLE_TYPE_SECRET_BASE 0x8000000 -#define BATTLE_TYPE_GROUDON 0x10000000 -#define BATTLE_TYPE_KYOGRE 0x20000000 -#define BATTLE_TYPE_RAYQUAZA 0x40000000 -#define BATTLE_TYPE_x80000000 0x80000000 +#define BATTLE_TYPE_DOUBLE (1 << 0) +#define BATTLE_TYPE_LINK (1 << 1) +#define BATTLE_TYPE_IS_MASTER (1 << 2) // In not-link battles, it's always set. +#define BATTLE_TYPE_TRAINER (1 << 3) +#define BATTLE_TYPE_FIRST_BATTLE (1 << 4) +#define BATTLE_TYPE_LINK_IN_BATTLE (1 << 5) // Set on battle entry, cleared on exit. Checked rarely +#define BATTLE_TYPE_MULTI (1 << 6) +#define BATTLE_TYPE_SAFARI (1 << 7) +#define BATTLE_TYPE_BATTLE_TOWER (1 << 8) +#define BATTLE_TYPE_OLD_MAN_TUTORIAL (1 << 9) // Used in pokeemerald as BATTLE_TYPE_WALLY_TUTORIAL. +#define BATTLE_TYPE_ROAMER (1 << 10) +#define BATTLE_TYPE_EREADER_TRAINER (1 << 11) +#define BATTLE_TYPE_KYOGRE_GROUDON (1 << 12) +#define BATTLE_TYPE_LEGENDARY (1 << 13) +#define BATTLE_TYPE_GHOST_UNVEILED (1 << 13) // Re-use of BATTLE_TYPE_LEGENDARY, when combined with BATTLE_TYPE_GHOST +#define BATTLE_TYPE_REGI (1 << 14) +#define BATTLE_TYPE_GHOST (1 << 15) // Used in pokeemerald as BATTLE_TYPE_TWO_OPPONENTS. +#define BATTLE_TYPE_POKEDUDE (1 << 16) // Used in pokeemerald as BATTLE_TYPE_DOME. +#define BATTLE_TYPE_WILD_SCRIPTED (1 << 17) // Used in pokeemerald as BATTLE_TYPE_PALACE. +#define BATTLE_TYPE_LEGENDARY_FRLG (1 << 18) // Used in pokeemerald as BATTLE_TYPE_ARENA. +#define BATTLE_TYPE_TRAINER_TOWER (1 << 19) // Used in pokeemerald as BATTLE_TYPE_FACTORY. +#define BATTLE_TYPE_PIKE (1 << 20) // Used in pokeemerald. +#define BATTLE_TYPE_PYRAMID (1 << 21) // Used in pokeemerald. +#define BATTLE_TYPE_INGAME_PARTNER (1 << 22) +#define BATTLE_TYPE_TOWER_LINK_MULTI (1 << 23) // Used in pokeemerald. +#define BATTLE_TYPE_RECORDED (1 << 24) +#define BATTLE_TYPE_RECORDED_LINK (1 << 25) // Used in pokeemerald. +#define BATTLE_TYPE_TRAINER_HILL (1 << 26) // Used in pokeemerald. +#define BATTLE_TYPE_SECRET_BASE (1 << 27) +#define BATTLE_TYPE_GROUDON (1 << 28) +#define BATTLE_TYPE_KYOGRE (1 << 29) +#define BATTLE_TYPE_RAYQUAZA (1 << 30) +#define BATTLE_TYPE_RECORDED_IS_MASTER (1 << 31) // Used in pokeemerald. #define IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && !((flags) & BATTLE_TYPE_GHOST_UNVEILED)) #define IS_BATTLE_TYPE_GHOST_WITH_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && (flags) & BATTLE_TYPE_GHOST_UNVEILED) @@ -85,54 +85,62 @@ #define RIVAL_BATTLE_TUTORIAL 3 // Battle Outcome defines -#define B_OUTCOME_WON 0x1 -#define B_OUTCOME_LOST 0x2 -#define B_OUTCOME_DREW 0x3 -#define B_OUTCOME_RAN 0x4 -#define B_OUTCOME_PLAYER_TELEPORTED 0x5 -#define B_OUTCOME_MON_FLED 0x6 -#define B_OUTCOME_CAUGHT 0x7 -#define B_OUTCOME_NO_SAFARI_BALLS 0x8 -#define B_OUTCOME_FORFEITED 0x9 -#define B_OUTCOME_MON_TELEPORTED 0xA -#define B_OUTCOME_LINK_BATTLE_RAN 0x80 +#define B_OUTCOME_WON 1 +#define B_OUTCOME_LOST 2 +#define B_OUTCOME_DREW 3 +#define B_OUTCOME_RAN 4 +#define B_OUTCOME_PLAYER_TELEPORTED 5 +#define B_OUTCOME_MON_FLED 6 +#define B_OUTCOME_CAUGHT 7 +#define B_OUTCOME_NO_SAFARI_BALLS 8 +#define B_OUTCOME_FORFEITED 9 +#define B_OUTCOME_MON_TELEPORTED 10 +#define B_OUTCOME_LINK_BATTLE_RAN (1 << 7) // 128 // Non-volatile status conditions // These persist remain outside of battle and after switching out -#define STATUS1_NONE 0x0 -#define STATUS1_SLEEP 0x7 -#define STATUS1_POISON 0x8 -#define STATUS1_BURN 0x10 -#define STATUS1_FREEZE 0x20 -#define STATUS1_PARALYSIS 0x40 -#define STATUS1_TOXIC_POISON 0x80 -#define STATUS1_TOXIC_COUNTER 0xF00 +#define STATUS1_NONE 0 +#define STATUS1_SLEEP (1 << 0 | 1 << 1 | 1 << 2) // First 3 bits (Number of turns to sleep) +#define STATUS1_SLEEP_TURN(num) ((num) << 0) // Just for readability (or if rearranging statuses) +#define STATUS1_POISON (1 << 3) +#define STATUS1_BURN (1 << 4) +#define STATUS1_FREEZE (1 << 5) +#define STATUS1_PARALYSIS (1 << 6) +#define STATUS1_TOXIC_POISON (1 << 7) +#define STATUS1_TOXIC_COUNTER (1 << 8 | 1 << 9 | 1 << 10 | 1 << 11) +#define STATUS1_TOXIC_TURN(num) ((num) << 8) #define STATUS1_PSN_ANY (STATUS1_POISON | STATUS1_TOXIC_POISON) #define STATUS1_ANY (STATUS1_SLEEP | STATUS1_POISON | STATUS1_BURN | STATUS1_FREEZE | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON) // Volatile status ailments // These are removed after exiting the battle or switching out -#define STATUS2_CONFUSION 0x00000007 -#define STATUS2_FLINCHED 0x00000008 -#define STATUS2_UPROAR 0x00000070 -#define STATUS2_BIDE 0x00000300 // two bits 0x100, 0x200 -#define STATUS2_LOCK_CONFUSE 0x00000C00 -#define STATUS2_MULTIPLETURNS 0x00001000 -#define STATUS2_WRAPPED 0x0000E000 -#define STATUS2_INFATUATION 0x000F0000 // 4 bits, one for every battler +#define STATUS2_CONFUSION (1 << 0 | 1 << 1 | 1 << 2) +#define STATUS2_CONFUSION_TURN(num) ((num) << 0) +#define STATUS2_FLINCHED (1 << 3) +#define STATUS2_UPROAR (1 << 4 | 1 << 5 | 1 << 6) +#define STATUS2_UPROAR_TURN(num) ((num) << 4) +#define STATUS2_UNUSED (1 << 7) +#define STATUS2_BIDE (1 << 8 | 1 << 9) +#define STATUS2_BIDE_TURN(num) (((num) << 8) & STATUS2_BIDE) +#define STATUS2_LOCK_CONFUSE (1 << 10 | 1 << 11) // e.g. Thrash +#define STATUS2_LOCK_CONFUSE_TURN(num)((num) << 10) +#define STATUS2_MULTIPLETURNS (1 << 12) +#define STATUS2_WRAPPED (1 << 13 | 1 << 14 | 1 << 15) +#define STATUS2_WRAPPED_TURN(num) ((num) << 13) +#define STATUS2_INFATUATION (1 << 16 | 1 << 17 | 1 << 18 | 1 << 19) // 4 bits, one for every battler #define STATUS2_INFATUATED_WITH(battler) (gBitTable[battler] << 16) -#define STATUS2_FOCUS_ENERGY 0x00100000 -#define STATUS2_TRANSFORMED 0x00200000 -#define STATUS2_RECHARGE 0x00400000 -#define STATUS2_RAGE 0x00800000 -#define STATUS2_SUBSTITUTE 0x01000000 -#define STATUS2_DESTINY_BOND 0x02000000 -#define STATUS2_ESCAPE_PREVENTION 0x04000000 -#define STATUS2_NIGHTMARE 0x08000000 -#define STATUS2_CURSED 0x10000000 -#define STATUS2_FORESIGHT 0x20000000 -#define STATUS2_DEFENSE_CURL 0x40000000 -#define STATUS2_TORMENT 0x80000000 +#define STATUS2_FOCUS_ENERGY (1 << 20) +#define STATUS2_TRANSFORMED (1 << 21) +#define STATUS2_RECHARGE (1 << 22) +#define STATUS2_RAGE (1 << 23) +#define STATUS2_SUBSTITUTE (1 << 24) +#define STATUS2_DESTINY_BOND (1 << 25) +#define STATUS2_ESCAPE_PREVENTION (1 << 26) +#define STATUS2_NIGHTMARE (1 << 27) +#define STATUS2_CURSED (1 << 28) +#define STATUS2_FORESIGHT (1 << 29) +#define STATUS2_DEFENSE_CURL (1 << 30) +#define STATUS2_TORMENT (1 << 31) // Seems like per-battler statuses. Not quite sure how to categorize these #define STATUS3_LEECHSEED_BATTLER (1 << 0 | 1 << 1) // The battler to receive HP from Leech Seed @@ -158,32 +166,32 @@ #define STATUS3_SEMI_INVULNERABLE (STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER) // Not really sure what a "hitmarker" is. -#define HITMARKER_x10 0x00000010 -#define HITMARKER_x20 0x00000020 -#define HITMARKER_DESTINYBOND 0x00000040 -#define HITMARKER_NO_ANIMATIONS 0x00000080 -#define HITMARKER_IGNORE_SUBSTITUTE 0x00000100 -#define HITMARKER_NO_ATTACKSTRING 0x00000200 -#define HITMARKER_ATTACKSTRING_PRINTED 0x00000400 -#define HITMARKER_NO_PPDEDUCT 0x00000800 -#define HITMARKER_SWAP_ATTACKER_TARGET 0x00001000 -#define HITMARKER_IGNORE_SAFEGUARD 0x00002000 -#define HITMARKER_SYNCHRONISE_EFFECT 0x00004000 -#define HITMARKER_RUN 0x00008000 -#define HITMARKER_IGNORE_ON_AIR 0x00010000 -#define HITMARKER_IGNORE_UNDERGROUND 0x00020000 -#define HITMARKER_IGNORE_UNDERWATER 0x00040000 -#define HITMARKER_UNABLE_TO_USE_MOVE 0x00080000 -#define HITMARKER_PASSIVE_DAMAGE 0x00100000 -#define HITMARKER_x200000 0x00200000 -#define HITMARKER_PLAYER_FAINTED 0x00400000 -#define HITMARKER_ALLOW_NO_PP 0x00800000 -#define HITMARKER_GRUDGE 0x01000000 -#define HITMARKER_OBEYS 0x02000000 -#define HITMARKER_x4000000 0x04000000 -#define HITMARKER_CHARGING 0x08000000 -#define HITMARKER_FAINTED(battler) (gBitTable[battler] << 0x1C) -#define HITMARKER_FAINTED2(battler) (0x10000000 << battler) +#define HITMARKER_WAKE_UP_CLEAR (1 << 4) // Cleared when waking up. Never set or checked. +#define HITMARKER_SKIP_DMG_TRACK (1 << 5) +#define HITMARKER_DESTINYBOND (1 << 6) +#define HITMARKER_NO_ANIMATIONS (1 << 7) +#define HITMARKER_IGNORE_SUBSTITUTE (1 << 8) +#define HITMARKER_NO_ATTACKSTRING (1 << 9) +#define HITMARKER_ATTACKSTRING_PRINTED (1 << 10) +#define HITMARKER_NO_PPDEDUCT (1 << 11) +#define HITMARKER_SWAP_ATTACKER_TARGET (1 << 12) +#define HITMARKER_IGNORE_SAFEGUARD (1 << 13) +#define HITMARKER_SYNCHRONISE_EFFECT (1 << 14) +#define HITMARKER_RUN (1 << 15) +#define HITMARKER_IGNORE_ON_AIR (1 << 16) +#define HITMARKER_IGNORE_UNDERGROUND (1 << 17) +#define HITMARKER_IGNORE_UNDERWATER (1 << 18) +#define HITMARKER_UNABLE_TO_USE_MOVE (1 << 19) +#define HITMARKER_PASSIVE_DAMAGE (1 << 20) +#define HITMARKER_DISOBEDIENT_MOVE (1 << 21) +#define HITMARKER_PLAYER_FAINTED (1 << 22) +#define HITMARKER_ALLOW_NO_PP (1 << 23) +#define HITMARKER_GRUDGE (1 << 24) +#define HITMARKER_OBEYS (1 << 25) +#define HITMARKER_NEVER_SET (1 << 26) // Cleared as part of a large group. Never set or checked +#define HITMARKER_CHARGING (1 << 27) +#define HITMARKER_FAINTED(battler) (gBitTable[battler] << 28) +#define HITMARKER_FAINTED2(battler) ((1 << 28) << battler) // Per-side statuses that affect an entire party #define SIDE_STATUS_REFLECT (1 << 0) @@ -219,7 +227,7 @@ #define B_WEATHER_SUN (B_WEATHER_SUN_TEMPORARY | B_WEATHER_SUN_PERMANENT) #define B_WEATHER_HAIL_TEMPORARY (1 << 7) #define B_WEATHER_HAIL (B_WEATHER_HAIL_TEMPORARY) -#define WEATHER_ANY (B_WEATHER_RAIN | B_WEATHER_SANDSTORM | B_WEATHER_SUN | B_WEATHER_HAIL) +#define B_WEATHER_ANY (B_WEATHER_RAIN | B_WEATHER_SANDSTORM | B_WEATHER_SUN | B_WEATHER_HAIL) // Move Effects #define MOVE_EFFECT_SLEEP 1 @@ -309,6 +317,13 @@ #define BATTLE_TERRAIN_LANCE 18 #define BATTLE_TERRAIN_CHAMPION 19 +#define CASTFORM_NORMAL 0 +#define CASTFORM_FIRE 1 +#define CASTFORM_WATER 2 +#define CASTFORM_ICE 3 +#define NUM_CASTFORM_FORMS 4 +#define CASTFORM_SUBSTITUTE (1 << 7) + // Return value for IsRunningFromBattleImpossible. #define BATTLE_RUN_SUCCESS 0 #define BATTLE_RUN_FORBIDDEN 1 diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 80be08905..f8972ce31 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -342,9 +342,9 @@ #define BG_FISSURE 21 #define BG_BUG_OPPONENT 22 #define BG_BUG_PLAYER 23 -#define BG_SOLARBEAM_OPPONENT 24 -#define BG_SOLARBEAM_PLAYER 25 -#define BG_SOLARBEAM_CONTESTS 26 +#define BG_SOLAR_BEAM_OPPONENT 24 +#define BG_SOLAR_BEAM_PLAYER 25 +#define BG_SOLAR_BEAM_CONTESTS 26 // table ids for general animations #define B_ANIM_CASTFORM_CHANGE 0x0 diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index b54f01353..5555eecb9 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -152,7 +152,7 @@ #define EFFECT_FUTURE_SIGHT 148 #define EFFECT_GUST 149 #define EFFECT_FLINCH_MINIMIZE_HIT 150 // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM -#define EFFECT_SOLARBEAM 151 +#define EFFECT_SOLAR_BEAM 151 #define EFFECT_THUNDER 152 #define EFFECT_TELEPORT 153 #define EFFECT_BEAT_UP 154 diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index db2a0372b..6856f4bf8 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -30,8 +30,22 @@ #define sMULTIPLAYER_ID gBattleScripting + 0x25 #define sSPECIAL_TRAINER_BATTLE_TYPE gBattleScripting + 0x26 -#define cEFFECT_CHOOSER gBattleCommunication + 3 -#define cMULTISTRING_CHOOSER gBattleCommunication + 5 +// Array entries for battle communication +#define MULTIUSE_STATE 0 +#define CURSOR_POSITION 1 +#define TASK_ID 1 // task Id and cursor position share the same field +#define SPRITES_INIT_STATE1 1 // shares the Id as well +#define SPRITES_INIT_STATE2 2 +#define MOVE_EFFECT_BYTE 3 +#define ACTIONS_CONFIRMED_COUNT 4 +#define MULTISTRING_CHOOSER 5 +#define MISS_TYPE 6 +#define MSG_DISPLAY 7 +#define BATTLE_COMMUNICATION_ENTRIES_COUNT 8 + +#define cEFFECT_CHOOSER (gBattleCommunication + MOVE_EFFECT_BYTE) +#define cMULTISTRING_CHOOSER (gBattleCommunication + MULTISTRING_CHOOSER) +#define cMISS_TYPE (gBattleCommunication + MISS_TYPE) // Battle Script defines for getting the wanted battler #define BS_TARGET 0 @@ -39,8 +53,8 @@ #define BS_EFFECT_BATTLER 2 #define BS_FAINTED 3 #define BS_ATTACKER_WITH_PARTNER 4 // for Cmd_updatestatusicon -#define BS_UNKNOWN_5 5 // for openpartyscreen -#define BS_UNKNOWN_6 6 // for openpartyscreen +#define BS_FAINTED_LINK_MULTIPLE_1 5 // for openpartyscreen +#define BS_FAINTED_LINK_MULTIPLE_2 6 // for openpartyscreen #define BS_BATTLER_0 7 #define BS_ATTACKER_SIDE 8 // for Cmd_jumpifability #define BS_NOT_ATTACKER_SIDE 9 // for Cmd_jumpifability @@ -50,9 +64,6 @@ #define BS_PLAYER2 13 // for Cmd_updatestatusicon #define BS_OPPONENT2 14 -// used for openpartyscreen -#define OPEN_PARTY_ALLOW_CANCEL 0x80 - // atk 01, accuracy calc #define NO_ACC_CALC 0xFFFE #define NO_ACC_CALC_CHECK_LOCK_ON 0xFFFF @@ -72,23 +83,23 @@ #define VARIOUS_SET_MAGIC_COAT_TARGET 1 #define VARIOUS_IS_RUNNING_IMPOSSIBLE 2 #define VARIOUS_GET_MOVE_TARGET 3 -#define VARIOUS_CASE_4 4 +#define VARIOUS_GET_BATTLER_FAINTED 4 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS 5 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP 6 -#define VARIOUS_RESET_PLAYER_FAINTED_FLAG 7 +#define VARIOUS_RESET_PLAYER_FAINTED 7 #define VARIOUS_CASE_8 8 #define VARIOUS_RETURN_OPPONENT_MON1 9 #define VARIOUS_RETURN_OPPONENT_MON2 10 #define VARIOUS_CHECK_POKEFLUTE 11 #define VARIOUS_WAIT_FANFARE 12 -// atk80, dmg manipulation -#define ATK80_DMG_CHANGE_SIGN 0 -#define ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP 1 -#define ATK80_DMG_DOUBLED 2 +// Cmd_manipulatedmg +#define DMG_CHANGE_SIGN 0 +#define DMG_RECOIL_FROM_MISS 1 +#define DMG_DOUBLED 2 -// atk4F, a flag used for the jumpifcantswitch command -#define ATK4F_DONT_CHECK_STATUSES 0x80 +// Cmd_jumpifcantswitch +#define SWITCH_IGNORE_ESCAPE_PREVENTION (1 << 7) // Cmd_statbuffchange #define STAT_CHANGE_ALLOW_PTR (1 << 0) // If set, allow use of jumpptr. Set in every use of statbuffchange @@ -100,6 +111,18 @@ #define STAT_CHANGE_MULTIPLE_STATS (1 << 2) #define STAT_CHANGE_CANT_PREVENT (1 << 3) +// stat flags for Cmd_playstatchangeanimation +#define BIT_HP (1 << 0) +#define BIT_ATK (1 << 1) +#define BIT_DEF (1 << 2) +#define BIT_SPEED (1 << 3) +#define BIT_SPATK (1 << 4) +#define BIT_SPDEF (1 << 5) +#define BIT_ACC (1 << 6) +#define BIT_EVASION (1 << 7) + +#define PARTY_SCREEN_OPTIONAL (1 << 7) // Flag for first argument to openpartyscreen + // cases for Cmd_moveend #define MOVEEND_RAGE 0 #define MOVEEND_DEFROST 1 @@ -120,13 +143,4 @@ #define MOVEEND_NEXT_TARGET 16 #define MOVEEND_COUNT 17 -#define BIT_HP 0x1 -#define BIT_ATK 0x2 -#define BIT_DEF 0x4 -#define BIT_SPEED 0x8 -#define BIT_SPATK 0x10 -#define BIT_SPDEF 0x20 -#define BIT_ACC 0x40 -#define BIT_EVASION 0x80 - #endif // GUARD_CONSTANTS_BATTLE_SCRIPT_COMMANDS_H diff --git a/include/constants/items.h b/include/constants/items.h index fc1e008a0..4ee7e3014 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -372,7 +372,7 @@ #define ITEM_TM19_GIGA_DRAIN ITEM_TM19 #define ITEM_TM20_SAFEGUARD ITEM_TM20 #define ITEM_TM21_FRUSTRATION ITEM_TM21 -#define ITEM_TM22_SOLARBEAM ITEM_TM22 +#define ITEM_TM22_SOLAR_BEAM ITEM_TM22 #define ITEM_TM23_IRON_TAIL ITEM_TM23 #define ITEM_TM24_THUNDERBOLT ITEM_TM24 #define ITEM_TM25_THUNDER ITEM_TM25 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 79024cf23..dbea7dff5 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -134,31 +134,32 @@ #define EGG_GROUPS_PER_MON 2 // Pokemon natures -#define NATURE_HARDY 0 -#define NATURE_LONELY 1 -#define NATURE_BRAVE 2 -#define NATURE_ADAMANT 3 -#define NATURE_NAUGHTY 4 -#define NATURE_BOLD 5 -#define NATURE_DOCILE 6 -#define NATURE_RELAXED 7 -#define NATURE_IMPISH 8 -#define NATURE_LAX 9 -#define NATURE_TIMID 10 -#define NATURE_HASTY 11 -#define NATURE_SERIOUS 12 -#define NATURE_JOLLY 13 -#define NATURE_NAIVE 14 -#define NATURE_MODEST 15 -#define NATURE_MILD 16 -#define NATURE_QUIET 17 -#define NATURE_BASHFUL 18 -#define NATURE_RASH 19 -#define NATURE_CALM 20 -#define NATURE_GENTLE 21 -#define NATURE_SASSY 22 -#define NATURE_CAREFUL 23 -#define NATURE_QUIRKY 24 +#define NATURE_HARDY 0 +#define NATURE_LONELY 1 +#define NATURE_BRAVE 2 +#define NATURE_ADAMANT 3 +#define NATURE_NAUGHTY 4 +#define NATURE_BOLD 5 +#define NATURE_DOCILE 6 +#define NATURE_RELAXED 7 +#define NATURE_IMPISH 8 +#define NATURE_LAX 9 +#define NATURE_TIMID 10 +#define NATURE_HASTY 11 +#define NATURE_SERIOUS 12 +#define NATURE_JOLLY 13 +#define NATURE_NAIVE 14 +#define NATURE_MODEST 15 +#define NATURE_MILD 16 +#define NATURE_QUIET 17 +#define NATURE_BASHFUL 18 +#define NATURE_RASH 19 +#define NATURE_CALM 20 +#define NATURE_GENTLE 21 +#define NATURE_SASSY 22 +#define NATURE_CAREFUL 23 +#define NATURE_QUIRKY 24 +#define NUM_NATURES 25 // Pokemon Stats #define STAT_HP 0 diff --git a/include/graphics.h b/include/graphics.h index ded24bd7b..4ddc0deea 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4258,7 +4258,7 @@ extern const u32 gBattleAnimBgPalette_Sky[]; extern const u32 gBattleAnimBgPalette_Aurora[]; extern const u32 gBattleAnimBgPalette_Fissure[]; extern const u32 gBattleAnimBgPalette_Bug[]; -extern const u32 gBattleAnimBgPalette_Solarbeam[]; +extern const u32 gBattleAnimBgPalette_SolarBeam[]; extern const u32 gBattleAnimBgPalette_Surf[]; extern const u32 gBattleAnimBgTilemap_Dark[]; extern const u32 gBattleAnimBgTilemap_Ghost[]; diff --git a/include/strings.h b/include/strings.h index 02f773596..c7663fef9 100644 --- a/include/strings.h +++ b/include/strings.h @@ -188,7 +188,7 @@ extern const u8 gText_Ghost[]; // pokemon extern const u8 gBattleText_Rose[]; -extern const u8 gText_PkmnsStatChanged2[]; +extern const u8 gText_DefendersStatRose[]; extern const u8 gBattleText_GetPumped[]; extern const u8 gBattleText_MistShroud[]; extern const u8 gText_BadEgg[]; diff --git a/include/text.h b/include/text.h index e5ed4477d..1567c8d82 100644 --- a/include/text.h +++ b/include/text.h @@ -85,7 +85,7 @@ #define CHAR_DYNAMIC_PLACEHOLDER 0xF7 #define CHAR_KEYPAD_ICON 0xF8 -#define CHAR_EXTRA_EMOJI 0xF9 +#define CHAR_EXTRA_SYMBOL 0xF9 #define CHAR_PROMPT_SCROLL 0xFA // waits for button press and scrolls dialog #define CHAR_PROMPT_CLEAR 0xFB // waits for button press and clears dialog #define EXT_CTRL_CODE_BEGIN 0xFC // extended control code @@ -93,6 +93,9 @@ #define CHAR_NEWLINE 0xFE #define EOS 0xFF // end of string +// CHAR_EXTRA_SYMBOL chars +#define CHAR_LV_2 0x05 + #define TEXT_COLOR_TRANSPARENT 0x0 #define TEXT_COLOR_WHITE 0x1 #define TEXT_COLOR_DARK_GRAY 0x2 @@ -156,6 +159,8 @@ #define TEXT_SPEED_INSTANT 0 #define TEXT_SKIP_DRAW 0xFF +#define FONT_SMALL 0 + enum { FONTATTR_MAX_LETTER_WIDTH, diff --git a/include/window.h b/include/window.h index 1c3d9be9c..f64adce25 100644 --- a/include/window.h +++ b/include/window.h @@ -17,6 +17,14 @@ enum WINDOW_TILE_DATA }; +// Mode for CopyWindowToVram, CopyWindowRectToVram and CopyWindowToVram8Bit +enum { + COPYWIN_NONE, + COPYWIN_MAP, + COPYWIN_GFX, + COPYWIN_FULL, +}; + struct WindowTemplate { u8 bg; @@ -57,11 +65,6 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template); void RemoveWindow(u8 windowId); void FreeAllWindowBuffers(void); -// Mode parameter for funcs below -#define COPYWIN_MAP 1 -#define COPYWIN_GFX 2 -#define COPYWIN_BOTH 3 - void CopyWindowToVram(u8 windowId, u8 mode); void CopyWindowToVram8Bit(u8 windowId, u8 mode); diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index e14d6e965..eaa203a54 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -250,7 +250,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] = EFFECT_SKY_ATTACK, EFFECT_RECHARGE, EFFECT_SKULL_BASH, - EFFECT_SOLARBEAM, + EFFECT_SOLAR_BEAM, EFFECT_SPIT_UP, EFFECT_FOCUS_PUNCH, EFFECT_SUPERPOWER, diff --git a/src/battle_anim.c b/src/battle_anim.c index a77542edf..2154748df 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1723,9 +1723,9 @@ const struct BattleAnimBackground gBattleAnimBackgroundTable[] = [BG_FISSURE] = {gBattleAnimBgImage_Fissure, gBattleAnimBgPalette_Fissure, gBattleAnimBgTilemap_Fissure}, [BG_BUG_OPPONENT] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedOpponent}, [BG_BUG_PLAYER] = {gBattleAnimBgImage_Highspeed, gBattleAnimBgPalette_Bug, gBattleAnimBgTilemap_HighspeedPlayer}, - [BG_SOLARBEAM_OPPONENT] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactOpponent}, - [BG_SOLARBEAM_PLAYER] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactPlayer}, - [BG_SOLARBEAM_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_Solarbeam, gBattleAnimBgTilemap_ImpactContests}, + [BG_SOLAR_BEAM_OPPONENT] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_SolarBeam, gBattleAnimBgTilemap_ImpactOpponent}, + [BG_SOLAR_BEAM_PLAYER] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_SolarBeam, gBattleAnimBgTilemap_ImpactPlayer}, + [BG_SOLAR_BEAM_CONTESTS] = {gBattleAnimBgImage_Impact, gBattleAnimBgPalette_SolarBeam, gBattleAnimBgTilemap_ImpactContests}, }; static void (*const sScriptCmdTable[])(void) = diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 5fdaad719..7b39b7095 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -12,7 +12,7 @@ EWRAM_DATA static s16 gUnknown_203999C[4] = {0}; // Function Declarations static void AnimMovePowderParticleStep(struct Sprite *); -static void AnimSolarbeamSmallOrbStep(struct Sprite *); +static void AnimSolarBeamSmallOrbStep(struct Sprite *); static void AnimAbsorptionOrbStep(struct Sprite *); static void AnimHyperBeamOrbStep(struct Sprite *); static void AnimLeechSeedStep(struct Sprite *); @@ -137,49 +137,49 @@ const struct SpriteTemplate gPoisonPowderParticleSpriteTemplate = .callback = AnimMovePowderParticle, }; -static const union AnimCmd sSolarbeamBigOrbAnimCmds1[] = +static const union AnimCmd sSolarBeamBigOrbAnimCmds1[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd sSolarbeamBigOrbAnimCmds2[] = +static const union AnimCmd sSolarBeamBigOrbAnimCmds2[] = { ANIMCMD_FRAME(1, 1), ANIMCMD_END, }; -static const union AnimCmd sSolarbeamBigOrbAnimCmds3[] = +static const union AnimCmd sSolarBeamBigOrbAnimCmds3[] = { ANIMCMD_FRAME(2, 1), ANIMCMD_END, }; -static const union AnimCmd sSolarbeamBigOrbAnimCmds4[] = +static const union AnimCmd sSolarBeamBigOrbAnimCmds4[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END, }; -static const union AnimCmd sSolarbeamBigOrbAnimCmds5[] = +static const union AnimCmd sSolarBeamBigOrbAnimCmds5[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END, }; -static const union AnimCmd sSolarbeamBigOrbAnimCmds6[] = +static const union AnimCmd sSolarBeamBigOrbAnimCmds6[] = { ANIMCMD_FRAME(5, 1), ANIMCMD_END, }; -static const union AnimCmd sSolarbeamBigOrbAnimCmds7[] = +static const union AnimCmd sSolarBeamBigOrbAnimCmds7[] = { ANIMCMD_FRAME(6, 1), ANIMCMD_END, }; -static const union AnimCmd sSolarbeamSmallOrbAnimCms[] = +static const union AnimCmd sSolarBeamSmallOrbAnimCms[] = { ANIMCMD_FRAME(7, 1), ANIMCMD_END, @@ -191,20 +191,20 @@ static const union AnimCmd sPowerAbsorptionOrbAnimCmds[] = ANIMCMD_END, }; -static const union AnimCmd *const sSolarbeamBigOrbAnimTable[] = +static const union AnimCmd *const sSolarBeamBigOrbAnimTable[] = { - sSolarbeamBigOrbAnimCmds1, - sSolarbeamBigOrbAnimCmds2, - sSolarbeamBigOrbAnimCmds3, - sSolarbeamBigOrbAnimCmds4, - sSolarbeamBigOrbAnimCmds5, - sSolarbeamBigOrbAnimCmds6, - sSolarbeamBigOrbAnimCmds7, + sSolarBeamBigOrbAnimCmds1, + sSolarBeamBigOrbAnimCmds2, + sSolarBeamBigOrbAnimCmds3, + sSolarBeamBigOrbAnimCmds4, + sSolarBeamBigOrbAnimCmds5, + sSolarBeamBigOrbAnimCmds6, + sSolarBeamBigOrbAnimCmds7, }; -static const union AnimCmd *const sSolarbeamSmallOrbAnimTable[] = +static const union AnimCmd *const sSolarBeamSmallOrbAnimTable[] = { - sSolarbeamSmallOrbAnimCms, + sSolarBeamSmallOrbAnimCms, }; static const union AnimCmd *const sPowerAbsorptionOrbAnimTable[] = @@ -234,26 +234,26 @@ const struct SpriteTemplate gPowerAbsorptionOrbSpriteTemplate = .callback = AnimPowerAbsorptionOrb, }; -const struct SpriteTemplate gSolarbeamBigOrbSpriteTemplate = +const struct SpriteTemplate gSolarBeamBigOrbSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = sSolarbeamBigOrbAnimTable, + .anims = sSolarBeamBigOrbAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = AnimSolarbeamBigOrb, + .callback = AnimSolarBeamBigOrb, }; -const struct SpriteTemplate gSolarbeamSmallOrbSpriteTemplate = +const struct SpriteTemplate gSolarBeamSmallOrbSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = sSolarbeamSmallOrbAnimTable, + .anims = sSolarBeamSmallOrbAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = AnimSolarbeamSmallOrb, + .callback = AnimSolarBeamSmallOrb, }; static const union AffineAnimCmd sStockpileAbsorptionOrbAffineCmds[] = @@ -306,7 +306,7 @@ const struct SpriteTemplate gHyperBeamOrbSpriteTemplate = .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ORBS, .oam = &gOamData_AffineOff_ObjNormal_8x8, - .anims = sSolarbeamBigOrbAnimTable, + .anims = sSolarBeamBigOrbAnimTable, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimHyperBeamOrb, @@ -2219,7 +2219,7 @@ void AnimPowerAbsorptionOrb(struct Sprite* sprite) // arg 1: initial y pixel offset // arg 2: duration // arg 3: sprite anim number -void AnimSolarbeamBigOrb(struct Sprite* sprite) +void AnimSolarBeamBigOrb(struct Sprite* sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); StartSpriteAnim(sprite, gBattleAnimArgs[3]); @@ -2231,12 +2231,12 @@ void AnimSolarbeamBigOrb(struct Sprite* sprite) } // Moves a small orb in a wavy pattern towards the target mon. -// The small orb "circles" the big orbs in AnimSolarbeamBigOrb. +// The small orb "circles" the big orbs in AnimSolarBeamBigOrb. // arg 0: initial x pixel offset // arg 1: initial y pixel offset // arg 2: duration // arg 3: initial wave offset -void AnimSolarbeamSmallOrb(struct Sprite* sprite) +void AnimSolarBeamSmallOrb(struct Sprite* sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[2]; @@ -2246,11 +2246,11 @@ void AnimSolarbeamSmallOrb(struct Sprite* sprite) sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); InitAnimLinearTranslation(sprite); sprite->data[5] = gBattleAnimArgs[3]; - sprite->callback = AnimSolarbeamSmallOrbStep; + sprite->callback = AnimSolarBeamSmallOrbStep; sprite->callback(sprite); } -static void AnimSolarbeamSmallOrbStep(struct Sprite* sprite) +static void AnimSolarBeamSmallOrbStep(struct Sprite* sprite) { if (AnimTranslateLinear(sprite)) { @@ -2272,7 +2272,7 @@ static void AnimSolarbeamSmallOrbStep(struct Sprite* sprite) // Creates 15 small secondary orbs used in the solarbeam anim effect. // There is a 7-frame delay between each of them. // No args. -void AnimTask_CreateSmallSolarbeamOrbs(u8 taskId) +void AnimTask_CreateSmallSolarBeamOrbs(u8 taskId) { if (--gTasks[taskId].data[0] == -1) { @@ -2282,7 +2282,7 @@ void AnimTask_CreateSmallSolarbeamOrbs(u8 taskId) gBattleAnimArgs[1] = 0; gBattleAnimArgs[2] = 80; gBattleAnimArgs[3] = 0; - CreateSpriteAndAnimate(&gSolarbeamSmallOrbSpriteTemplate, 0, 0, GetBattlerSpriteSubpriority(gBattleAnimTarget) + 1); + CreateSpriteAndAnimate(&gSolarBeamSmallOrbSpriteTemplate, 0, 0, GetBattlerSpriteSubpriority(gBattleAnimTarget) + 1); } if (gTasks[taskId].data[1] == 15) diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c index f578c7136..6dfdf4213 100644 --- a/src/battle_controller_oak_old_man.c +++ b/src/battle_controller_oak_old_man.c @@ -1766,7 +1766,7 @@ static void OakOldManHandlePrintString(void) { switch (*stringId) { - case STRINGID_PKMNSSTATCHANGED4: + case STRINGID_DEFENDERSSTATFELL: if (!BtlCtrl_OakOldMan_TestState2Flag(FIRST_BATTLE_MSG_FLAG_STAT_CHG)) { BtlCtrl_OakOldMan_SetState2Flag(FIRST_BATTLE_MSG_FLAG_STAT_CHG); diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 1a7670c3c..5d13586be 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -487,7 +487,7 @@ void TryReceiveLinkBattleData(void) s32 j; u8 *recvBuffer; - if (gReceivedRemoteLinkPlayers && (gBattleTypeFlags & BATTLE_TYPE_LINK_ESTABLISHED) && (gLinkPlayers[0].linkType == 0x2211)) + if (gReceivedRemoteLinkPlayers && (gBattleTypeFlags & BATTLE_TYPE_LINK_IN_BATTLE) && (gLinkPlayers[0].linkType == 0x2211)) { LinkRfu_DestroyIdleTask(); for (i = 0; i < GetLinkPlayerCount(); ++i) diff --git a/src/battle_main.c b/src/battle_main.c index 2c2648e62..710463543 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1051,7 +1051,7 @@ static void CB2_HandleStartBattle(void) SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - gBattleTypeFlags |= BATTLE_TYPE_LINK_ESTABLISHED; + gBattleTypeFlags |= BATTLE_TYPE_LINK_IN_BATTLE; } } break; @@ -1409,7 +1409,7 @@ static void CB2_HandleStartMultiBattle(void) gMain.callback1 = BattleMainCB1; SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) - gBattleTypeFlags |= BATTLE_TYPE_LINK_ESTABLISHED; + gBattleTypeFlags |= BATTLE_TYPE_LINK_IN_BATTLE; } break; case 5: @@ -2433,7 +2433,7 @@ static void BattleIntroGetMonsData(void) { case 0: gActiveBattler = gBattleCommunication[1]; - BtlController_EmitGetMonData(0, REQUEST_ALL_BATTLE, 0); + BtlController_EmitGetMonData(BUFFER_A, REQUEST_ALL_BATTLE, 0); MarkBattlerForControllerExec(gActiveBattler); ++gBattleCommunication[MULTIUSE_STATE]; break; @@ -2742,7 +2742,7 @@ static void Unused_AutoProgressToSwitchInAnims(void) { if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { - BtlController_EmitSwitchInAnim(0, gBattlerPartyIndexes[gActiveBattler], FALSE); + BtlController_EmitSwitchInAnim(BUFFER_A, gBattlerPartyIndexes[gActiveBattler], FALSE); MarkBattlerForControllerExec(gActiveBattler); } } @@ -3098,7 +3098,7 @@ static void HandleTurnActionSelectionState(void) *(gBattleStruct->battlerPartyIndexes + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler]; if (gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION) || gStatuses3[gActiveBattler] & STATUS3_ROOTED) { - BtlController_EmitChoosePokemon(0, PARTY_ACTION_CANT_SWITCH, 6, ABILITY_NONE, gBattleStruct->battlerPartyOrders[gActiveBattler]); + BtlController_EmitChoosePokemon(BUFFER_A, PARTY_ACTION_CANT_SWITCH, 6, ABILITY_NONE, gBattleStruct->battlerPartyOrders[gActiveBattler]); } else if ((i = ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_SHADOW_TAG)) || ((i = ABILITY_ON_OPPOSING_FIELD(gActiveBattler, ABILITY_ARENA_TRAP)) @@ -3107,16 +3107,16 @@ static void HandleTurnActionSelectionState(void) || ((i = AbilityBattleEffects(ABILITYEFFECT_CHECK_FIELD_EXCEPT_BATTLER, gActiveBattler, ABILITY_MAGNET_PULL, 0, 0)) && IS_BATTLER_OF_TYPE(gActiveBattler, TYPE_STEEL))) { - BtlController_EmitChoosePokemon(0, ((i - 1) << 4) | PARTY_ACTION_ABILITY_PREVENTS, 6, gLastUsedAbility, gBattleStruct->battlerPartyOrders[gActiveBattler]); + BtlController_EmitChoosePokemon(BUFFER_A, ((i - 1) << 4) | PARTY_ACTION_ABILITY_PREVENTS, 6, gLastUsedAbility, gBattleStruct->battlerPartyOrders[gActiveBattler]); } else { if (gActiveBattler == 2 && gChosenActionByBattler[0] == B_ACTION_SWITCH) - BtlController_EmitChoosePokemon(0, PARTY_ACTION_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->battlerPartyOrders[gActiveBattler]); + BtlController_EmitChoosePokemon(BUFFER_A, PARTY_ACTION_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 0), ABILITY_NONE, gBattleStruct->battlerPartyOrders[gActiveBattler]); else if (gActiveBattler == 3 && gChosenActionByBattler[1] == B_ACTION_SWITCH) - BtlController_EmitChoosePokemon(0, PARTY_ACTION_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->battlerPartyOrders[gActiveBattler]); + BtlController_EmitChoosePokemon(BUFFER_A, PARTY_ACTION_CHOOSE_MON, *(gBattleStruct->monToSwitchIntoId + 1), ABILITY_NONE, gBattleStruct->battlerPartyOrders[gActiveBattler]); else - BtlController_EmitChoosePokemon(0, PARTY_ACTION_CHOOSE_MON, 6, ABILITY_NONE, gBattleStruct->battlerPartyOrders[gActiveBattler]); + BtlController_EmitChoosePokemon(BUFFER_A, PARTY_ACTION_CHOOSE_MON, 6, ABILITY_NONE, gBattleStruct->battlerPartyOrders[gActiveBattler]); } MarkBattlerForControllerExec(gActiveBattler); break; @@ -3874,7 +3874,7 @@ static void HandleAction_UseMove(void) gBattleStruct->atkCancellerTracker = 0; gMoveResultFlags = 0; gMultiHitCounter = 0; - gBattleCommunication[6] = 0; + gBattleCommunication[MISS_TYPE] = 0; gCurrMovePos = gChosenMovePos = *(gBattleStruct->chosenMovePositions + gBattlerAttacker); // choose move if (gProtectStructs[gBattlerAttacker].noValidMoves) @@ -4344,8 +4344,8 @@ static void HandleAction_NothingIsFainted(void) gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_PASSIVE_DAMAGE - | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT - | HITMARKER_CHARGING | HITMARKER_x4000000); + | HITMARKER_OBEYS | HITMARKER_WAKE_UP_CLEAR | HITMARKER_SYNCHRONISE_EFFECT + | HITMARKER_CHARGING | HITMARKER_NEVER_SET); } static void HandleAction_ActionFinished(void) @@ -4356,8 +4356,8 @@ static void HandleAction_ActionFinished(void) gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_PASSIVE_DAMAGE - | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT - | HITMARKER_CHARGING | HITMARKER_x4000000); + | HITMARKER_OBEYS | HITMARKER_WAKE_UP_CLEAR | HITMARKER_SYNCHRONISE_EFFECT + | HITMARKER_CHARGING | HITMARKER_NEVER_SET); gCurrentMove = MOVE_NONE; gBattleMoveDamage = 0; gMoveResultFlags = 0; diff --git a/src/battle_message.c b/src/battle_message.c index 63911400d..3dde60f49 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -302,11 +302,11 @@ static const u8 sText_StatSharply[] = _("sharply "); const u8 gBattleText_Rose[] = _("rose!"); static const u8 sText_StatHarshly[] = _("harshly "); static const u8 sText_StatFell[] = _("fell!"); -static const u8 sText_PkmnsStatChanged[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); -const u8 gText_PkmnsStatChanged2[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); -static const u8 sText_UsingXTheYOfZN[] = _("Using {B_LAST_ITEM}, the {B_BUFF1}\nof {B_SCR_ACTIVE_NAME_WITH_PREFIX} {B_BUFF2}"); -static const u8 sText_PkmnsStatChanged3[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); -static const u8 sText_PkmnsStatChanged4[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); +static const u8 sText_AttackersStatRose[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); +const u8 gText_DefendersStatRose[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); +static const u8 sText_UsingItemTheStatOfPkmnRose[] = _("Using {B_LAST_ITEM}, the {B_BUFF1}\nof {B_SCR_ACTIVE_NAME_WITH_PREFIX} {B_BUFF2}"); +static const u8 sText_AttackersStatFell[] = _("{B_ATK_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); +static const u8 sText_DefendersStatFell[] = _("{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}\n{B_BUFF2}"); static const u8 sText_StatsWontIncrease2[] = _("{B_ATK_NAME_WITH_PREFIX}'s stats won't\ngo any higher!"); static const u8 sText_StatsWontDecrease2[] = _("{B_DEF_NAME_WITH_PREFIX}'s stats won't\ngo any lower!"); static const u8 sText_CriticalHit[] = _("A critical hit!"); @@ -715,10 +715,10 @@ const u8 *const gBattleStringsTable[] = { [STRINGID_STATROSE - 12] = gBattleText_Rose, [STRINGID_STATHARSHLY - 12] = sText_StatHarshly, [STRINGID_STATFELL - 12] = sText_StatFell, - [STRINGID_PKMNSSTATCHANGED - 12] = sText_PkmnsStatChanged, - [STRINGID_PKMNSSTATCHANGED2 - 12] = gText_PkmnsStatChanged2, - [STRINGID_PKMNSSTATCHANGED3 - 12] = sText_PkmnsStatChanged3, - [STRINGID_PKMNSSTATCHANGED4 - 12] = sText_PkmnsStatChanged4, + [STRINGID_ATTACKERSSTATROSE - 12] = sText_AttackersStatRose, + [STRINGID_DEFENDERSSTATROSE - 12] = gText_DefendersStatRose, + [STRINGID_ATTACKERSSTATFELL - 12] = sText_AttackersStatFell, + [STRINGID_DEFENDERSSTATFELL - 12] = sText_DefendersStatFell, [STRINGID_CRITICALHIT - 12] = sText_CriticalHit, [STRINGID_ONEHITKO - 12] = sText_OneHitKO, [STRINGID_123POOF - 12] = sText_123Poof, @@ -827,7 +827,7 @@ const u8 *const gBattleStringsTable[] = { [STRINGID_SOOTHINGAROMA - 12] = sText_SoothingAroma, [STRINGID_ITEMSCANTBEUSEDNOW - 12] = sText_ItemsCantBeUsedNow, [STRINGID_FORXCOMMAYZ - 12] = sText_ForXCommaYZ, - [STRINGID_USINGXTHEYOFZN - 12] = sText_UsingXTheYOfZN, + [STRINGID_USINGITEMSTATOFPKMNROSE - 12] = sText_UsingItemTheStatOfPkmnRose, [STRINGID_PKMNUSEDXTOGETPUMPED - 12] = sText_PkmnUsedXToGetPumped, [STRINGID_PKMNSXMADEYUSELESS - 12] = sText_PkmnsXMadeYUseless, [STRINGID_PKMNTRAPPEDBYSANDTOMB - 12] = sText_PkmnTrappedBySandTomb, @@ -990,18 +990,19 @@ const u16 gUproarAwakeStringIds[] = { STRINGID_PKMNSTAYEDAWAKEUSING }; -const u16 gStatUpStringIds[] = { - STRINGID_PKMNSSTATCHANGED, - STRINGID_PKMNSSTATCHANGED2, - STRINGID_STATSWONTINCREASE, - STRINGID_EMPTYSTRING3, - STRINGID_USINGXTHEYOFZN, - STRINGID_PKMNUSEDXTOGETPUMPED +const u16 gStatUpStringIds[] = +{ + [B_MSG_ATTACKER_STAT_ROSE] = STRINGID_ATTACKERSSTATROSE, + [B_MSG_DEFENDER_STAT_ROSE] = STRINGID_DEFENDERSSTATROSE, + [B_MSG_STAT_WONT_INCREASE] = STRINGID_STATSWONTINCREASE, + [B_MSG_STAT_ROSE_EMPTY] = STRINGID_EMPTYSTRING3, + [B_MSG_STAT_ROSE_ITEM] = STRINGID_USINGITEMSTATOFPKMNROSE, + [B_MSG_USED_DIRE_HIT] = STRINGID_PKMNUSEDXTOGETPUMPED, }; const u16 gStatDownStringIds[] = { - STRINGID_PKMNSSTATCHANGED3, - STRINGID_PKMNSSTATCHANGED4, + STRINGID_ATTACKERSSTATFELL, + STRINGID_DEFENDERSSTATFELL, STRINGID_STATSWONTDECREASE, STRINGID_EMPTYSTRING3 }; @@ -2456,7 +2457,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) { if (!(textFlags & 0x80)) { PutWindowTilemap(windowId); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } } diff --git a/src/battle_records.c b/src/battle_records.c index 2eb997717..33fbf89f1 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -557,7 +557,7 @@ static void PrintBattleRecords(void) static void CommitWindow(u8 windowId) { PutWindowTilemap(windowId); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void LoadFrameGfxOnBg(u8 bg) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 1cb0c16df..3b45edde4 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -38,7 +38,7 @@ #include "constants/pokemon.h" #include "constants/maps.h" -extern const u8 *const gBattleScriptsForMoveEffects[]; +extern const u8* const gBattleScriptsForMoveEffects[]; #define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED)) @@ -51,16 +51,15 @@ static bool8 IsTwoTurnsMove(u16 move); static void TrySetDestinyBondToHappen(void); static u8 AttacksThisTurn(u8 battlerId, u16 move); // Note: returns 1 if it's a charging turn, otherwise 2. static void CheckWonderGuardAndLevitate(void); -static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8, const u8 *BS_ptr); -static void sub_8026480(void); +static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8, const u8* BS_ptr); +static void InitLevelUpBanner(void); static bool8 SlideInLevelUpBanner(void); +static bool8 SlideOutLevelUpBanner(void); static void DrawLevelUpWindow1(void); static void DrawLevelUpWindow2(void); -static bool8 SlideOutLevelUpBanner(void); -static void PutMonIconOnLvlUpBox(void); +static void PutMonIconOnLvlUpBanner(void); static void DrawLevelUpBannerText(void); - -static void SpriteCB_MonIconOnLvlUpBanner(struct Sprite *sprite); +static void SpriteCB_MonIconOnLvlUpBanner(struct Sprite* sprite); static void Cmd_attackcanceler(void); static void Cmd_accuracycheck(void); @@ -662,8 +661,8 @@ static const struct WindowTemplate sUnusedWinTemplate = .baseBlock = 0x3F }; -static const u16 sLevelUpBanner_Pal[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal"); -static const u32 sLevelUpBanner_Gfx[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz"); +static const u16 sLevelUpBanner_Pal[] = INCBIN_U16("graphics/battle_interface/level_up_banner.gbapal"); +static const u32 sLevelUpBanner_Gfx[] = INCBIN_U32("graphics/battle_interface/level_up_banner.4bpp.lz"); // unused static const u8 sRubyLevelUpStatBoxStats[] = @@ -815,7 +814,7 @@ static const u8 sBallCatchBonuses[] = [ITEM_SAFARI_BALL - ITEM_ULTRA_BALL] = 15 }; -// not used +// Not used. Maybe related to gBattlePalaceNatureToMoveGroupLikelihood from Emerald? static const u32 gUnknown_8250898 = 0xFF7EAE60; static void Cmd_attackcanceler(void) @@ -849,7 +848,7 @@ static void Cmd_attackcanceler(void) if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS)) { - i = IsMonDisobedient(); + i = IsMonDisobedient(); // why use the 'i' variable...? switch (i) { case 0: @@ -873,6 +872,7 @@ static void Cmd_attackcanceler(void) gBattlescriptCurrInstr = BattleScript_MagicCoatBounce; return; } + for (i = 0; i < gBattlersCount; i++) { if ((gProtectStructs[gBattlerByTurnOrder[i]].stealMove) && gBattleMoves[gCurrentMove].flags & FLAG_SNATCH_AFFECTED) @@ -885,6 +885,7 @@ static void Cmd_attackcanceler(void) return; } } + if (gSpecialStatuses[gBattlerTarget].lightningRodRedirected) { gSpecialStatuses[gBattlerTarget].lightningRodRedirected = FALSE; @@ -901,7 +902,7 @@ static void Cmd_attackcanceler(void) gMoveResultFlags |= MOVE_RESULT_MISSED; gLastLandedMoves[gBattlerTarget] = 0; gLastHitByType[gBattlerTarget] = 0; - gBattleCommunication[6] = 1; + gBattleCommunication[MISS_TYPE] = B_MSG_PROTECTED; gBattlescriptCurrInstr++; } else @@ -934,7 +935,7 @@ static void Cmd_jumpifaffectedbyprotect(void) { gMoveResultFlags |= MOVE_RESULT_MISSED; JumpIfMoveFailed(5, 0); - gBattleCommunication[6] = 1; + gBattleCommunication[MISS_TYPE] = B_MSG_PROTECTED; } else { @@ -949,7 +950,7 @@ static bool8 JumpIfMoveAffectedByProtect(u16 move) { gMoveResultFlags |= MOVE_RESULT_MISSED; JumpIfMoveFailed(7, move); - gBattleCommunication[6] = 1; + gBattleCommunication[MISS_TYPE] = B_MSG_PROTECTED; affected = TRUE; } return affected; @@ -1034,9 +1035,14 @@ static void Cmd_accuracycheck(void) if (move == ACC_CURR_MOVE) move = gCurrentMove; + GET_MOVE_TYPE(move, type); - if (JumpIfMoveAffectedByProtect(move) || AccuracyCalcHelper(move)) + + if (JumpIfMoveAffectedByProtect(move)) return; + if (AccuracyCalcHelper(move)) + return; + if (gBattleMons[gBattlerTarget].status2 & STATUS2_FORESIGHT) { u8 acc = gBattleMons[gBattlerAttacker].statStages[STAT_ACC]; @@ -1083,15 +1089,17 @@ static void Cmd_accuracycheck(void) if (holdEffect == HOLD_EFFECT_EVASION_UP) calc = (calc * (100 - param)) / 100; + // final calculation if ((Random() % 100 + 1) > calc) { gMoveResultFlags |= MOVE_RESULT_MISSED; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && (gBattleMoves[move].target == MOVE_TARGET_BOTH || gBattleMoves[move].target == MOVE_TARGET_FOES_AND_ALLY)) - gBattleCommunication[6] = 2; + gBattleCommunication[MISS_TYPE] = B_MSG_AVOIDED_ATK; else - gBattleCommunication[6] = 0; + gBattleCommunication[MISS_TYPE] = B_MSG_MISSED; + CheckWonderGuardAndLevitate(); } JumpIfMoveFailed(7, move); @@ -1100,61 +1108,64 @@ static void Cmd_accuracycheck(void) static void Cmd_attackstring(void) { - if (gBattleControllerExecFlags == 0) + if (gBattleControllerExecFlags) + return; + + if (!(gHitMarker & (HITMARKER_NO_ATTACKSTRING | HITMARKER_ATTACKSTRING_PRINTED))) { - if (!(gHitMarker & (HITMARKER_NO_ATTACKSTRING | HITMARKER_ATTACKSTRING_PRINTED))) - { - PrepareStringBattle(STRINGID_USEDMOVE, gBattlerAttacker); - gHitMarker |= HITMARKER_ATTACKSTRING_PRINTED; - } - gBattlescriptCurrInstr++; - gBattleCommunication[MSG_DISPLAY] = 0; + PrepareStringBattle(STRINGID_USEDMOVE, gBattlerAttacker); + gHitMarker |= HITMARKER_ATTACKSTRING_PRINTED; } + gBattlescriptCurrInstr++; + gBattleCommunication[MSG_DISPLAY] = 0; } static void Cmd_ppreduce(void) { s32 ppToDeduct = 1; - if (gBattleControllerExecFlags == 0) + if (gBattleControllerExecFlags) + return; + + if (!gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure) { - if (!gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure) + switch (gBattleMoves[gCurrentMove].target) { - switch (gBattleMoves[gCurrentMove].target) - { - case MOVE_TARGET_FOES_AND_ALLY: - ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBattlerAttacker, ABILITY_PRESSURE, 0, 0); - break; - case MOVE_TARGET_BOTH: - case MOVE_TARGET_OPPONENTS_FIELD: - ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattlerAttacker, ABILITY_PRESSURE, 0, 0); - break; - default: - if (gBattlerAttacker != gBattlerTarget && gBattleMons[gBattlerTarget].ability == ABILITY_PRESSURE) - ppToDeduct++; - break; - } + case MOVE_TARGET_FOES_AND_ALLY: + ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_ON_FIELD, gBattlerAttacker, ABILITY_PRESSURE, 0, 0); + break; + case MOVE_TARGET_BOTH: + case MOVE_TARGET_OPPONENTS_FIELD: + ppToDeduct += AbilityBattleEffects(ABILITYEFFECT_COUNT_OTHER_SIDE, gBattlerAttacker, ABILITY_PRESSURE, 0, 0); + break; + default: + if (gBattlerAttacker != gBattlerTarget && gBattleMons[gBattlerTarget].ability == ABILITY_PRESSURE) + ppToDeduct++; + break; } - if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBattlerAttacker].pp[gCurrMovePos]) - { - gProtectStructs[gBattlerAttacker].notFirstStrike = 1; - - if (gBattleMons[gBattlerAttacker].pp[gCurrMovePos] > ppToDeduct) - gBattleMons[gBattlerAttacker].pp[gCurrMovePos] -= ppToDeduct; - else - gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = 0; - - if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) - && !((gDisableStructs[gBattlerAttacker].mimickedMoves) & gBitTable[gCurrMovePos])) - { - gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, 1, &gBattleMons[gBattlerAttacker].pp[gCurrMovePos]); - MarkBattlerForControllerExec(gBattlerAttacker); - } - } - gHitMarker &= ~(HITMARKER_NO_PPDEDUCT); - gBattlescriptCurrInstr++; } + + if (!(gHitMarker & (HITMARKER_NO_PPDEDUCT | HITMARKER_NO_ATTACKSTRING)) && gBattleMons[gBattlerAttacker].pp[gCurrMovePos]) + { + gProtectStructs[gBattlerAttacker].notFirstStrike = 1; + + if (gBattleMons[gBattlerAttacker].pp[gCurrMovePos] > ppToDeduct) + gBattleMons[gBattlerAttacker].pp[gCurrMovePos] -= ppToDeduct; + else + gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = 0; + + if (MOVE_IS_PERMANENT(gBattlerAttacker, gCurrMovePos)) + { + gActiveBattler = gBattlerAttacker; + BtlController_EmitSetMonData(BUFFER_A, REQUEST_PPMOVE1_BATTLE + gCurrMovePos, 0, + sizeof(gBattleMons[gBattlerAttacker].pp[gCurrMovePos]), + &gBattleMons[gBattlerAttacker].pp[gCurrMovePos]); + MarkBattlerForControllerExec(gBattlerAttacker); + } + } + + gHitMarker &= ~HITMARKER_NO_PPDEDUCT; + gBattlescriptCurrInstr++; } static void Cmd_critcalc(void) @@ -1163,11 +1174,14 @@ static void Cmd_critcalc(void) u16 item, critChance; item = gBattleMons[gBattlerAttacker].item; + if (item == ITEM_ENIGMA_BERRY) holdEffect = gEnigmaBerries[gBattlerAttacker].holdEffect; else holdEffect = ItemId_GetHoldEffect(item); + gPotentialItemEffectBattler = gBattlerAttacker; + critChance = 2 * ((gBattleMons[gBattlerAttacker].status2 & STATUS2_FOCUS_ENERGY) != 0) + (gBattleMoves[gCurrentMove].effect == EFFECT_HIGH_CRITICAL) + (gBattleMoves[gCurrentMove].effect == EFFECT_SKY_ATTACK) @@ -1176,8 +1190,10 @@ static void Cmd_critcalc(void) + (holdEffect == HOLD_EFFECT_SCOPE_LENS) + 2 * (holdEffect == HOLD_EFFECT_LUCKY_PUNCH && gBattleMons[gBattlerAttacker].species == SPECIES_CHANSEY) + 2 * (holdEffect == HOLD_EFFECT_STICK && gBattleMons[gBattlerAttacker].species == SPECIES_FARFETCHD); - if (critChance >= NELEMS(sCriticalHitChance)) - critChance = NELEMS(sCriticalHitChance) - 1; + + if (critChance >= ARRAY_COUNT(sCriticalHitChance)) + critChance = ARRAY_COUNT(sCriticalHitChance) - 1; + if ((gBattleMons[gBattlerTarget].ability != ABILITY_BATTLE_ARMOR && gBattleMons[gBattlerTarget].ability != ABILITY_SHELL_ARMOR) && !(gStatuses3[gBattlerAttacker] & STATUS3_CANT_SCORE_A_CRIT) && !(gBattleTypeFlags & BATTLE_TYPE_OLD_MAN_TUTORIAL) @@ -1187,54 +1203,47 @@ static void Cmd_critcalc(void) gCritMultiplier = 2; else gCritMultiplier = 1; + gBattlescriptCurrInstr++; } static void Cmd_damagecalc(void) { u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)]; - - gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], - &gBattleMons[gBattlerTarget], - gCurrentMove, - sideStatus, - gDynamicBasePower, - gBattleStruct->dynamicMoveType, - gBattlerAttacker, - gBattlerTarget); + gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerTarget], gCurrentMove, + sideStatus, gDynamicBasePower, + gBattleStruct->dynamicMoveType, gBattlerAttacker, gBattlerTarget); gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleScripting.dmgMultiplier; + if (gStatuses3[gBattlerAttacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC) gBattleMoveDamage *= 2; if (gProtectStructs[gBattlerAttacker].helpingHand) gBattleMoveDamage = gBattleMoveDamage * 15 / 10; + gBattlescriptCurrInstr++; } void AI_CalcDmg(u8 attacker, u8 defender) { u16 sideStatus = gSideStatuses[GET_BATTLER_SIDE(defender)]; - - gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[attacker], - &gBattleMons[defender], - gCurrentMove, - sideStatus, - gDynamicBasePower, - gBattleStruct->dynamicMoveType, - attacker, - defender); + gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[attacker], &gBattleMons[defender], gCurrentMove, + sideStatus, gDynamicBasePower, + gBattleStruct->dynamicMoveType, attacker, defender); gDynamicBasePower = 0; gBattleMoveDamage = gBattleMoveDamage * gCritMultiplier * gBattleScripting.dmgMultiplier; + if (gStatuses3[attacker] & STATUS3_CHARGED_UP && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC) gBattleMoveDamage *= 2; if (gProtectStructs[attacker].helpingHand) gBattleMoveDamage = gBattleMoveDamage * 15 / 10; } -void ModulateDmgByType(u8 multiplier) +static void ModulateDmgByType(u8 multiplier) { gBattleMoveDamage = gBattleMoveDamage * multiplier / 10; - if (gBattleMoveDamage == 0 && multiplier) + if (gBattleMoveDamage == 0 && multiplier != 0) gBattleMoveDamage = 1; + switch (multiplier) { case TYPE_MUL_NO_EFFECT: @@ -1273,7 +1282,9 @@ static void Cmd_typecalc(void) gBattlescriptCurrInstr++; return; } + GET_MOVE_TYPE(gCurrentMove, moveType); + // check stab if (IS_BATTLER_OF_TYPE(gBattlerAttacker, moveType)) { @@ -1287,7 +1298,7 @@ static void Cmd_typecalc(void) gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE); gLastLandedMoves[gBattlerTarget] = 0; gLastHitByType[gBattlerTarget] = 0; - gBattleCommunication[6] = moveType; + gBattleCommunication[MISS_TYPE] = B_MSG_GROUND_MISS; RecordAbilityBattle(gBattlerTarget, gLastUsedAbility); } else @@ -1314,6 +1325,7 @@ static void Cmd_typecalc(void) i += 3; } } + if (gBattleMons[gBattlerTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattlerAttacker, gCurrentMove) == 2 && (!(gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) || ((gMoveResultFlags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE))) && gBattleMoves[gCurrentMove].power) @@ -1322,11 +1334,12 @@ static void Cmd_typecalc(void) gMoveResultFlags |= MOVE_RESULT_MISSED; gLastLandedMoves[gBattlerTarget] = 0; gLastHitByType[gBattlerTarget] = 0; - gBattleCommunication[6] = 3; + gBattleCommunication[MISS_TYPE] = B_MSG_AVOIDED_DMG; RecordAbilityBattle(gBattlerTarget, gLastUsedAbility); } if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) gProtectStructs[gBattlerAttacker].targetNotAffected = 1; + gBattlescriptCurrInstr++; } @@ -1338,14 +1351,17 @@ static void CheckWonderGuardAndLevitate(void) if (gCurrentMove == MOVE_STRUGGLE || !gBattleMoves[gCurrentMove].power) return; + GET_MOVE_TYPE(gCurrentMove, moveType); + if (gBattleMons[gBattlerTarget].ability == ABILITY_LEVITATE && moveType == TYPE_GROUND) { gLastUsedAbility = ABILITY_LEVITATE; - gBattleCommunication[6] = moveType; + gBattleCommunication[MISS_TYPE] = B_MSG_GROUND_MISS; RecordAbilityBattle(gBattlerTarget, ABILITY_LEVITATE); return; } + while (TYPE_EFFECT_ATK_TYPE(i) != TYPE_ENDTABLE) { if (TYPE_EFFECT_ATK_TYPE(i) == TYPE_FORESIGHT) @@ -1355,7 +1371,6 @@ static void CheckWonderGuardAndLevitate(void) i += 3; continue; } - if (TYPE_EFFECT_ATK_TYPE(i) == moveType) { // check no effect @@ -1372,6 +1387,7 @@ static void CheckWonderGuardAndLevitate(void) gMoveResultFlags |= MOVE_RESULT_DOESNT_AFFECT_FOE; gProtectStructs[gBattlerAttacker].targetNotAffected = 1; } + // check super effective if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 20) flags |= 1; @@ -1379,6 +1395,7 @@ static void CheckWonderGuardAndLevitate(void) && gBattleMons[gBattlerTarget].type1 != gBattleMons[gBattlerTarget].type2 && TYPE_EFFECT_MULTIPLIER(i) == TYPE_MUL_SUPER_EFFECTIVE) flags |= 1; + // check not very effective if (TYPE_EFFECT_DEF_TYPE(i) == gBattleMons[gBattlerTarget].type1 && TYPE_EFFECT_MULTIPLIER(i) == 5) flags |= 2; @@ -1389,23 +1406,24 @@ static void CheckWonderGuardAndLevitate(void) } i += 3; } + if (gBattleMons[gBattlerTarget].ability == ABILITY_WONDER_GUARD && AttacksThisTurn(gBattlerAttacker, gCurrentMove) == 2) { if (((flags & 2) || !(flags & 1)) && gBattleMoves[gCurrentMove].power) { gLastUsedAbility = ABILITY_WONDER_GUARD; - gBattleCommunication[6] = 3; + gBattleCommunication[MISS_TYPE] = B_MSG_AVOIDED_DMG; RecordAbilityBattle(gBattlerTarget, ABILITY_WONDER_GUARD); } } } -// same as ModulateDmgByType except different arguments -static void ModulateDmgByType2(u8 multiplier, u16 move, u8 *flags) +static void ModulateDmgByType2(u8 multiplier, u16 move, u8* flags) // same as ModulateDmgByType except different arguments { gBattleMoveDamage = gBattleMoveDamage * multiplier / 10; if (gBattleMoveDamage == 0 && multiplier != 0) gBattleMoveDamage = 1; + switch (multiplier) { case TYPE_MUL_NO_EFFECT: @@ -1442,7 +1460,9 @@ u8 TypeCalc(u16 move, u8 attacker, u8 defender) if (move == MOVE_STRUGGLE) return 0; + moveType = gBattleMoves[move].type; + // check stab if (IS_BATTLER_OF_TYPE(attacker, moveType)) { @@ -1479,12 +1499,14 @@ u8 TypeCalc(u16 move, u8 attacker, u8 defender) i += 3; } } - if (gBattleMons[defender].ability == ABILITY_WONDER_GUARD - && !(flags & MOVE_RESULT_MISSED) - && AttacksThisTurn(attacker, move) == 2 - && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE))) - && gBattleMoves[move].power) + + if (gBattleMons[defender].ability == ABILITY_WONDER_GUARD && !(flags & MOVE_RESULT_MISSED) + && AttacksThisTurn(attacker, move) == 2 + && (!(flags & MOVE_RESULT_SUPER_EFFECTIVE) || ((flags & (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE)) == (MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE))) + && gBattleMoves[move].power) + { flags |= MOVE_RESULT_MISSED; + } return flags; } @@ -1497,7 +1519,9 @@ u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility) if (move == MOVE_STRUGGLE) return 0; + moveType = gBattleMoves[move].type; + if (targetAbility == ABILITY_LEVITATE && moveType == TYPE_GROUND) { flags = MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE; @@ -1511,7 +1535,6 @@ u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility) i += 3; continue; } - if (TYPE_EFFECT_ATK_TYPE(i) == moveType) { // check type1 @@ -1637,39 +1660,40 @@ static void Cmd_adjustnormaldamage2(void) // The same as adjustnormaldamage exce static void Cmd_attackanimation(void) { - if (gBattleControllerExecFlags == 0) + if (gBattleControllerExecFlags) + return; + + if ((gHitMarker & HITMARKER_NO_ANIMATIONS) && (gCurrentMove != MOVE_TRANSFORM && gCurrentMove != MOVE_SUBSTITUTE)) { - if ((gHitMarker & HITMARKER_NO_ANIMATIONS) && (gCurrentMove != MOVE_TRANSFORM && gCurrentMove != MOVE_SUBSTITUTE)) + BattleScriptPush(gBattlescriptCurrInstr + 1); + gBattlescriptCurrInstr = BattleScript_Pausex20; + gBattleScripting.animTurn++; + gBattleScripting.animTargetsHit++; + } + else + { + if ((gBattleMoves[gCurrentMove].target & MOVE_TARGET_BOTH + || gBattleMoves[gCurrentMove].target & MOVE_TARGET_FOES_AND_ALLY + || gBattleMoves[gCurrentMove].target & MOVE_TARGET_DEPENDS) + && gBattleScripting.animTargetsHit) { - BattleScriptPush(gBattlescriptCurrInstr + 1); - gBattlescriptCurrInstr = BattleScript_Pausex20; - ++gBattleScripting.animTurn; - ++gBattleScripting.animTargetsHit; + gBattlescriptCurrInstr++; + return; + } + if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) + { + gActiveBattler = gBattlerAttacker; + + BtlController_EmitMoveAnimation(BUFFER_A, gCurrentMove, gBattleScripting.animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBattlerAttacker].friendship, &gDisableStructs[gBattlerAttacker]); + gBattleScripting.animTurn++; + gBattleScripting.animTargetsHit++; + MarkBattlerForControllerExec(gBattlerAttacker); + gBattlescriptCurrInstr++; } else { - if ((gBattleMoves[gCurrentMove].target & MOVE_TARGET_BOTH - || gBattleMoves[gCurrentMove].target & MOVE_TARGET_FOES_AND_ALLY - || gBattleMoves[gCurrentMove].target & MOVE_TARGET_DEPENDS) - && gBattleScripting.animTargetsHit) - { - gBattlescriptCurrInstr++; - return; - } - if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) - { - gActiveBattler = gBattlerAttacker; - BtlController_EmitMoveAnimation(0, gCurrentMove, gBattleScripting.animTurn, gBattleMovePower, gBattleMoveDamage, gBattleMons[gBattlerAttacker].friendship, &gDisableStructs[gBattlerAttacker]); - ++gBattleScripting.animTurn; - ++gBattleScripting.animTargetsHit; - MarkBattlerForControllerExec(gBattlerAttacker); - gBattlescriptCurrInstr++; - } - else - { - BattleScriptPush(gBattlescriptCurrInstr + 1); - gBattlescriptCurrInstr = BattleScript_Pausex20; - } + BattleScriptPush(gBattlescriptCurrInstr + 1); + gBattlescriptCurrInstr = BattleScript_Pausex20; } } } @@ -1682,157 +1706,164 @@ static void Cmd_waitanimation(void) static void Cmd_healthbarupdate(void) { - if (gBattleControllerExecFlags == 0) - { - if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) - { - gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + if (gBattleControllerExecFlags) + return; - if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE)) - { - PrepareStringBattle(STRINGID_SUBSTITUTEDAMAGED, gActiveBattler); - } - else - { - s16 healthValue; - s32 currDmg = gBattleMoveDamage; - s32 maxPossibleDmgValue = 10000; // not present in R/S, ensures that huge damage values don't change sign - - if (currDmg <= maxPossibleDmgValue) - healthValue = currDmg; - else - healthValue = maxPossibleDmgValue; - BtlController_EmitHealthBarUpdate(0, healthValue); - MarkBattlerForControllerExec(gActiveBattler); - if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleMoveDamage > 0) - gBattleResults.playerMonWasDamaged = TRUE; - } + if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) + { + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + + if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE)) + { + PrepareStringBattle(STRINGID_SUBSTITUTEDAMAGED, gActiveBattler); + } + else + { + s16 healthValue; + + s32 currDmg = gBattleMoveDamage; + s32 maxPossibleDmgValue = 10000; // not present in R/S, ensures that huge damage values don't change sign + + if (currDmg <= maxPossibleDmgValue) + healthValue = currDmg; + else + healthValue = maxPossibleDmgValue; + + BtlController_EmitHealthBarUpdate(BUFFER_A, healthValue); + MarkBattlerForControllerExec(gActiveBattler); + + if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER && gBattleMoveDamage > 0) + gBattleResults.playerMonWasDamaged = TRUE; } - gBattlescriptCurrInstr += 2; } + + gBattlescriptCurrInstr += 2; } static void Cmd_datahpupdate(void) { u32 moveType; - if (gBattleControllerExecFlags == 0) + if (gBattleControllerExecFlags) + return; + + if (gBattleStruct->dynamicMoveType == 0) + moveType = gBattleMoves[gCurrentMove].type; + else if (!(gBattleStruct->dynamicMoveType & F_DYNAMIC_TYPE_1)) + moveType = gBattleStruct->dynamicMoveType & DYNAMIC_TYPE_MASK; + else + moveType = gBattleMoves[gCurrentMove].type; + + if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - if (gBattleStruct->dynamicMoveType == 0) - moveType = gBattleMoves[gCurrentMove].type; - else if (!(gBattleStruct->dynamicMoveType & 0x40)) - moveType = gBattleStruct->dynamicMoveType & 0x3F; - else - moveType = gBattleMoves[gCurrentMove].type; - if (!(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE)) { - gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE && gDisableStructs[gActiveBattler].substituteHP && !(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE)) + if (gDisableStructs[gActiveBattler].substituteHP >= gBattleMoveDamage) { - if (gDisableStructs[gActiveBattler].substituteHP >= gBattleMoveDamage) + if (gSpecialStatuses[gActiveBattler].dmg == 0) + gSpecialStatuses[gActiveBattler].dmg = gBattleMoveDamage; + gDisableStructs[gActiveBattler].substituteHP -= gBattleMoveDamage; + gHpDealt = gBattleMoveDamage; + } + else + { + if (gSpecialStatuses[gActiveBattler].dmg == 0) + gSpecialStatuses[gActiveBattler].dmg = gDisableStructs[gActiveBattler].substituteHP; + gHpDealt = gDisableStructs[gActiveBattler].substituteHP; + gDisableStructs[gActiveBattler].substituteHP = 0; + } + // check substitute fading + if (gDisableStructs[gActiveBattler].substituteHP == 0) + { + gBattlescriptCurrInstr += 2; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_SubstituteFade; + return; + } + } + else + { + gHitMarker &= ~HITMARKER_IGNORE_SUBSTITUTE; + if (gBattleMoveDamage < 0) // hp goes up + { + gBattleMons[gActiveBattler].hp -= gBattleMoveDamage; + if (gBattleMons[gActiveBattler].hp > gBattleMons[gActiveBattler].maxHP) + gBattleMons[gActiveBattler].hp = gBattleMons[gActiveBattler].maxHP; + + } + else // hp goes down + { + if (gHitMarker & HITMARKER_SKIP_DMG_TRACK) { - if (gSpecialStatuses[gActiveBattler].dmg == 0) - gSpecialStatuses[gActiveBattler].dmg = gBattleMoveDamage; - gDisableStructs[gActiveBattler].substituteHP -= gBattleMoveDamage; + gHitMarker &= ~HITMARKER_SKIP_DMG_TRACK; + } + else + { + gTakenDmg[gActiveBattler] += gBattleMoveDamage; + if (gBattlescriptCurrInstr[1] == BS_TARGET) + gTakenDmgByBattler[gActiveBattler] = gBattlerAttacker; + else + gTakenDmgByBattler[gActiveBattler] = gBattlerTarget; + } + + if (gBattleMons[gActiveBattler].hp > gBattleMoveDamage) + { + gBattleMons[gActiveBattler].hp -= gBattleMoveDamage; gHpDealt = gBattleMoveDamage; } else { - if (gSpecialStatuses[gActiveBattler].dmg == 0) - gSpecialStatuses[gActiveBattler].dmg = gDisableStructs[gActiveBattler].substituteHP; - gHpDealt = gDisableStructs[gActiveBattler].substituteHP; - gDisableStructs[gActiveBattler].substituteHP = 0; + gHpDealt = gBattleMons[gActiveBattler].hp; + gBattleMons[gActiveBattler].hp = 0; } - // check substitute fading - if (gDisableStructs[gActiveBattler].substituteHP == 0) - { - gBattlescriptCurrInstr += 2; - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_SubstituteFade; - return; - } - } - else - { - gHitMarker &= ~(HITMARKER_IGNORE_SUBSTITUTE); - if (gBattleMoveDamage < 0) // hp goes up - { - gBattleMons[gActiveBattler].hp -= gBattleMoveDamage; - if (gBattleMons[gActiveBattler].hp > gBattleMons[gActiveBattler].maxHP) - gBattleMons[gActiveBattler].hp = gBattleMons[gActiveBattler].maxHP; - } - else // hp goes down + if (!gSpecialStatuses[gActiveBattler].dmg && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE)) + gSpecialStatuses[gActiveBattler].dmg = gHpDealt; + + if (IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE) && gCurrentMove != MOVE_PAIN_SPLIT) { - if (gHitMarker & HITMARKER_x20) + gProtectStructs[gActiveBattler].physicalDmg = gHpDealt; + gSpecialStatuses[gActiveBattler].physicalDmg = gHpDealt; + if (gBattlescriptCurrInstr[1] == BS_TARGET) { - gHitMarker &= ~(HITMARKER_x20); + gProtectStructs[gActiveBattler].physicalBattlerId = gBattlerAttacker; + gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerAttacker; } else { - gTakenDmg[gActiveBattler] += gBattleMoveDamage; - if (gBattlescriptCurrInstr[1] == BS_TARGET) - gTakenDmgByBattler[gActiveBattler] = gBattlerAttacker; - else - gTakenDmgByBattler[gActiveBattler] = gBattlerTarget; + gProtectStructs[gActiveBattler].physicalBattlerId = gBattlerTarget; + gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerTarget; } - - if (gBattleMons[gActiveBattler].hp > gBattleMoveDamage) + } + else if (!IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE)) + { + gProtectStructs[gActiveBattler].specialDmg = gHpDealt; + gSpecialStatuses[gActiveBattler].specialDmg = gHpDealt; + if (gBattlescriptCurrInstr[1] == BS_TARGET) { - gBattleMons[gActiveBattler].hp -= gBattleMoveDamage; - gHpDealt = gBattleMoveDamage; + gProtectStructs[gActiveBattler].specialBattlerId = gBattlerAttacker; + gSpecialStatuses[gActiveBattler].specialBattlerId = gBattlerAttacker; } else { - gHpDealt = gBattleMons[gActiveBattler].hp; - gBattleMons[gActiveBattler].hp = 0; - } - if (!gSpecialStatuses[gActiveBattler].dmg && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE)) - gSpecialStatuses[gActiveBattler].dmg = gHpDealt; - if (IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE) && gCurrentMove != MOVE_PAIN_SPLIT) - { - gProtectStructs[gActiveBattler].physicalDmg = gHpDealt; - gSpecialStatuses[gActiveBattler].physicalDmg = gHpDealt; - if (gBattlescriptCurrInstr[1] == BS_TARGET) - { - gProtectStructs[gActiveBattler].physicalBattlerId = gBattlerAttacker; - gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerAttacker; - } - else - { - gProtectStructs[gActiveBattler].physicalBattlerId = gBattlerTarget; - gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerTarget; - } - } - else if (!IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE)) - { - gProtectStructs[gActiveBattler].specialDmg = gHpDealt; - gSpecialStatuses[gActiveBattler].specialDmg = gHpDealt; - if (gBattlescriptCurrInstr[1] == BS_TARGET) - { - gProtectStructs[gActiveBattler].specialBattlerId = gBattlerAttacker; - gSpecialStatuses[gActiveBattler].specialBattlerId = gBattlerAttacker; - } - else - { - gProtectStructs[gActiveBattler].specialBattlerId = gBattlerTarget; - gSpecialStatuses[gActiveBattler].specialBattlerId = gBattlerTarget; - } + gProtectStructs[gActiveBattler].specialBattlerId = gBattlerTarget; + gSpecialStatuses[gActiveBattler].specialBattlerId = gBattlerTarget; } } - gHitMarker &= ~(HITMARKER_PASSIVE_DAMAGE); - BtlController_EmitSetMonData(BUFFER_A, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp); - MarkBattlerForControllerExec(gActiveBattler); } + gHitMarker &= ~HITMARKER_PASSIVE_DAMAGE; + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HP_BATTLE, 0, sizeof(gBattleMons[gActiveBattler].hp), &gBattleMons[gActiveBattler].hp); + MarkBattlerForControllerExec(gActiveBattler); } - else - { - gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - if (gSpecialStatuses[gActiveBattler].dmg == 0) - gSpecialStatuses[gActiveBattler].dmg = 0xFFFF; - } - gBattlescriptCurrInstr += 2; } + else + { + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + if (gSpecialStatuses[gActiveBattler].dmg == 0) + gSpecialStatuses[gActiveBattler].dmg = 0xFFFF; + } + gBattlescriptCurrInstr += 2; } static void Cmd_critmessage(void) @@ -1850,136 +1881,138 @@ static void Cmd_critmessage(void) static void Cmd_effectivenesssound(void) { - if (gBattleControllerExecFlags == 0) + if (gBattleControllerExecFlags) + return; + + gActiveBattler = gBattlerTarget; + if (!(gMoveResultFlags & MOVE_RESULT_MISSED)) { - gActiveBattler = gBattlerTarget; - if (!(gMoveResultFlags & MOVE_RESULT_MISSED)) + switch (gMoveResultFlags & (u8)(~MOVE_RESULT_MISSED)) { - switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED))) + case MOVE_RESULT_SUPER_EFFECTIVE: + BtlController_EmitPlaySE(BUFFER_A, SE_SUPER_EFFECTIVE); + MarkBattlerForControllerExec(gActiveBattler); + break; + case MOVE_RESULT_NOT_VERY_EFFECTIVE: + BtlController_EmitPlaySE(BUFFER_A, SE_NOT_EFFECTIVE); + MarkBattlerForControllerExec(gActiveBattler); + break; + case MOVE_RESULT_DOESNT_AFFECT_FOE: + case MOVE_RESULT_FAILED: + // no sound + break; + case MOVE_RESULT_FOE_ENDURED: + case MOVE_RESULT_ONE_HIT_KO: + case MOVE_RESULT_FOE_HUNG_ON: + default: + if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) { - case MOVE_RESULT_SUPER_EFFECTIVE: BtlController_EmitPlaySE(BUFFER_A, SE_SUPER_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); - break; - case MOVE_RESULT_NOT_VERY_EFFECTIVE: + } + else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE) + { BtlController_EmitPlaySE(BUFFER_A, SE_NOT_EFFECTIVE); MarkBattlerForControllerExec(gActiveBattler); - break; - case MOVE_RESULT_DOESNT_AFFECT_FOE: - case MOVE_RESULT_FAILED: - // no sound - break; - case MOVE_RESULT_FOE_ENDURED: - case MOVE_RESULT_ONE_HIT_KO: - case MOVE_RESULT_FOE_HUNG_ON: - default: - if (gMoveResultFlags & MOVE_RESULT_SUPER_EFFECTIVE) - { - BtlController_EmitPlaySE(BUFFER_A, SE_SUPER_EFFECTIVE); - MarkBattlerForControllerExec(gActiveBattler); - } - else if (gMoveResultFlags & MOVE_RESULT_NOT_VERY_EFFECTIVE) - { - BtlController_EmitPlaySE(BUFFER_A, SE_NOT_EFFECTIVE); - MarkBattlerForControllerExec(gActiveBattler); - } - else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED))) - { - BtlController_EmitPlaySE(BUFFER_A, SE_EFFECTIVE); - MarkBattlerForControllerExec(gActiveBattler); - } - break; } + else if (!(gMoveResultFlags & (MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED))) + { + BtlController_EmitPlaySE(BUFFER_A, SE_EFFECTIVE); + MarkBattlerForControllerExec(gActiveBattler); + } + break; } - gBattlescriptCurrInstr++; } + gBattlescriptCurrInstr++; } static void Cmd_resultmessage(void) { u32 stringId = 0; - if (gBattleControllerExecFlags == 0) + if (gBattleControllerExecFlags) + return; + + if (gMoveResultFlags & MOVE_RESULT_MISSED && (!(gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) || gBattleCommunication[MISS_TYPE] > B_MSG_AVOIDED_ATK)) { - if (gMoveResultFlags & MOVE_RESULT_MISSED && (!(gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) || gBattleCommunication[6] > 2)) + stringId = gMissStringIds[gBattleCommunication[MISS_TYPE]]; + gBattleCommunication[MSG_DISPLAY] = 1; + } + else + { + gBattleCommunication[MSG_DISPLAY] = 1; + switch (gMoveResultFlags & (u8)(~MOVE_RESULT_MISSED)) { - stringId = gMissStringIds[gBattleCommunication[6]]; - gBattleCommunication[MSG_DISPLAY] = 1; - } - else - { - gBattleCommunication[MSG_DISPLAY] = 1; - switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED))) + case MOVE_RESULT_SUPER_EFFECTIVE: + stringId = STRINGID_SUPEREFFECTIVE; + break; + case MOVE_RESULT_NOT_VERY_EFFECTIVE: + stringId = STRINGID_NOTVERYEFFECTIVE; + break; + case MOVE_RESULT_ONE_HIT_KO: + stringId = STRINGID_ONEHITKO; + break; + case MOVE_RESULT_FOE_ENDURED: + stringId = STRINGID_PKMNENDUREDHIT; + break; + case MOVE_RESULT_FAILED: + stringId = STRINGID_BUTITFAILED; + break; + case MOVE_RESULT_DOESNT_AFFECT_FOE: + stringId = STRINGID_ITDOESNTAFFECT; + break; + case MOVE_RESULT_FOE_HUNG_ON: + gLastUsedItem = gBattleMons[gBattlerTarget].item; + gPotentialItemEffectBattler = gBattlerTarget; + gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_FocusBandActivates; + return; + default: + if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) { - case MOVE_RESULT_SUPER_EFFECTIVE: - stringId = STRINGID_SUPEREFFECTIVE; - break; - case MOVE_RESULT_NOT_VERY_EFFECTIVE: - stringId = STRINGID_NOTVERYEFFECTIVE; - break; - case MOVE_RESULT_ONE_HIT_KO: - stringId = STRINGID_ONEHITKO; - break; - case MOVE_RESULT_FOE_ENDURED: - stringId = STRINGID_PKMNENDUREDHIT; - break; - case MOVE_RESULT_FAILED: - stringId = STRINGID_BUTITFAILED; - break; - case MOVE_RESULT_DOESNT_AFFECT_FOE: stringId = STRINGID_ITDOESNTAFFECT; - break; - case MOVE_RESULT_FOE_HUNG_ON: + } + else if (gMoveResultFlags & MOVE_RESULT_ONE_HIT_KO) + { + gMoveResultFlags &= ~MOVE_RESULT_ONE_HIT_KO; + gMoveResultFlags &= ~MOVE_RESULT_SUPER_EFFECTIVE; + gMoveResultFlags &= ~MOVE_RESULT_NOT_VERY_EFFECTIVE; + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_OneHitKOMsg; + return; + } + else if (gMoveResultFlags & MOVE_RESULT_FOE_ENDURED) + { + gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON); + BattleScriptPushCursor(); + gBattlescriptCurrInstr = BattleScript_EnduredMsg; + return; + } + else if (gMoveResultFlags & MOVE_RESULT_FOE_HUNG_ON) + { gLastUsedItem = gBattleMons[gBattlerTarget].item; gPotentialItemEffectBattler = gBattlerTarget; gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON); BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_HangedOnMsg; + gBattlescriptCurrInstr = BattleScript_FocusBandActivates; return; - default: - if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) - { - stringId = STRINGID_ITDOESNTAFFECT; - } - else if (gMoveResultFlags & MOVE_RESULT_ONE_HIT_KO) - { - gMoveResultFlags &= ~(MOVE_RESULT_ONE_HIT_KO); - gMoveResultFlags &= ~(MOVE_RESULT_SUPER_EFFECTIVE); - gMoveResultFlags &= ~(MOVE_RESULT_NOT_VERY_EFFECTIVE); - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_OneHitKOMsg; - return; - } - else if (gMoveResultFlags & MOVE_RESULT_FOE_ENDURED) - { - gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON); - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_EnduredMsg; - return; - } - else if (gMoveResultFlags & MOVE_RESULT_FOE_HUNG_ON) - { - gLastUsedItem = gBattleMons[gBattlerTarget].item; - gPotentialItemEffectBattler = gBattlerTarget; - gMoveResultFlags &= ~(MOVE_RESULT_FOE_ENDURED | MOVE_RESULT_FOE_HUNG_ON); - BattleScriptPushCursor(); - gBattlescriptCurrInstr = BattleScript_HangedOnMsg; - return; - } - else if (gMoveResultFlags & MOVE_RESULT_FAILED) - { - stringId = STRINGID_BUTITFAILED; - } - else - { - gBattleCommunication[MSG_DISPLAY] = 0; - } + } + else if (gMoveResultFlags & MOVE_RESULT_FAILED) + { + stringId = STRINGID_BUTITFAILED; + } + else + { + gBattleCommunication[MSG_DISPLAY] = 0; } } - if (stringId) - PrepareStringBattle(stringId, gBattlerAttacker); - gBattlescriptCurrInstr++; } + + if (stringId) + PrepareStringBattle(stringId, gBattlerAttacker); + + gBattlescriptCurrInstr++; } static void Cmd_printstring(void) @@ -1987,7 +2020,6 @@ static void Cmd_printstring(void) if (gBattleControllerExecFlags == 0) { u16 var = T2_READ_16(gBattlescriptCurrInstr + 1); - PrepareStringBattle(var, gBattlerAttacker); gBattlescriptCurrInstr += 3; gBattleCommunication[MSG_DISPLAY] = 1; @@ -1997,8 +2029,10 @@ static void Cmd_printstring(void) static void Cmd_printselectionstring(void) { gActiveBattler = gBattlerAttacker; - BtlController_EmitPrintSelectionString(0, T2_READ_16(gBattlescriptCurrInstr + 1)); + + BtlController_EmitPrintSelectionString(BUFFER_A, T2_READ_16(gBattlescriptCurrInstr + 1)); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 3; gBattleCommunication[MSG_DISPLAY] = 1; } @@ -2014,7 +2048,6 @@ static void Cmd_waitmessage(void) else { u16 toWait = T2_READ_16(gBattlescriptCurrInstr + 1); - if (++gPauseCounterBattle >= toWait) { gPauseCounterBattle = 0; @@ -2029,10 +2062,11 @@ static void Cmd_printfromtable(void) { if (gBattleControllerExecFlags == 0) { - const u16 *ptr = (const u16 *) T1_READ_PTR(gBattlescriptCurrInstr + 1); - + const u16* ptr = (const u16*) T1_READ_PTR(gBattlescriptCurrInstr + 1); ptr += gBattleCommunication[MULTISTRING_CHOOSER]; + PrepareStringBattle(*ptr, gBattlerAttacker); + gBattlescriptCurrInstr += 5; gBattleCommunication[MSG_DISPLAY] = 1; } @@ -2042,12 +2076,13 @@ static void Cmd_printselectionstringfromtable(void) { if (gBattleControllerExecFlags == 0) { - const u16 *ptr = (const u16 *) T1_READ_PTR(gBattlescriptCurrInstr + 1); - + const u16* ptr = (const u16*) T1_READ_PTR(gBattlescriptCurrInstr + 1); ptr += gBattleCommunication[MULTISTRING_CHOOSER]; + gActiveBattler = gBattlerAttacker; - BtlController_EmitPrintSelectionString(0, *ptr); + BtlController_EmitPrintSelectionString(BUFFER_A, *ptr); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 5; gBattleCommunication[MSG_DISPLAY] = 1; } @@ -2056,11 +2091,21 @@ static void Cmd_printselectionstringfromtable(void) u8 GetBattlerTurnOrderNum(u8 battlerId) { s32 i; - - for (i = 0; i < gBattlersCount && gBattlerByTurnOrder[i] != battlerId; i++); + for (i = 0; i < gBattlersCount; i++) + { + if (gBattlerByTurnOrder[i] == battlerId) + break; + } return i; } +// Called INCREMENT_RESET_RETURN in Emerald which adds "gBattleCommunication[MOVE_EFFECT_BYTE] = 0;" before the return. +#define INCREMENT_RETURN \ +{ \ + gBattlescriptCurrInstr++; \ + return; \ +} + void SetMoveEffect(bool8 primary, u8 certain) { bool32 statusChanged = FALSE; @@ -2070,7 +2115,7 @@ void SetMoveEffect(bool8 primary, u8 certain) if (gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_AFFECTS_USER) { gEffectBattler = gBattlerAttacker; // battlerId that effects get applied on - gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_AFFECTS_USER); + gBattleCommunication[MOVE_EFFECT_BYTE] &= ~MOVE_EFFECT_AFFECTS_USER; affectsUser = MOVE_EFFECT_AFFECTS_USER; gBattleScripting.battler = gBattlerTarget; // theoretically the attacker } @@ -2079,42 +2124,26 @@ void SetMoveEffect(bool8 primary, u8 certain) gEffectBattler = gBattlerTarget; gBattleScripting.battler = gBattlerAttacker; } - if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE - && gBattleCommunication[MOVE_EFFECT_BYTE] != 1 - && GetBattlerSide(gEffectBattler) == B_SIDE_OPPONENT) - { - gBattlescriptCurrInstr++; - return; - } - if (gBattleMons[gEffectBattler].ability == ABILITY_SHIELD_DUST - && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) - && !primary - && gBattleCommunication[MOVE_EFFECT_BYTE] <= 9) - { - gBattlescriptCurrInstr++; - return; - } - if (gSideStatuses[GET_BATTLER_SIDE(gEffectBattler)] & SIDE_STATUS_SAFEGUARD - && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) - && !primary - && gBattleCommunication[MOVE_EFFECT_BYTE] <= 7) - { - gBattlescriptCurrInstr++; - return; - } + if (gBattleTypeFlags & BATTLE_TYPE_POKEDUDE && gBattleCommunication[MOVE_EFFECT_BYTE] != 1 + && GetBattlerSide(gEffectBattler) == B_SIDE_OPPONENT) + INCREMENT_RETURN + + if (gBattleMons[gEffectBattler].ability == ABILITY_SHIELD_DUST && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) + && !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 9) + INCREMENT_RETURN + + if (gSideStatuses[GET_BATTLER_SIDE(gEffectBattler)] & SIDE_STATUS_SAFEGUARD && !(gHitMarker & HITMARKER_IGNORE_SAFEGUARD) + && !primary && gBattleCommunication[MOVE_EFFECT_BYTE] <= 7) + INCREMENT_RETURN + if (gBattleMons[gEffectBattler].hp == 0 - && gBattleCommunication[MOVE_EFFECT_BYTE] != MOVE_EFFECT_PAYDAY - && gBattleCommunication[MOVE_EFFECT_BYTE] != MOVE_EFFECT_STEAL_ITEM) - { - gBattlescriptCurrInstr++; - return; - } - if (gBattleMons[gEffectBattler].status2 & STATUS2_SUBSTITUTE - && affectsUser != MOVE_EFFECT_AFFECTS_USER) - { - gBattlescriptCurrInstr++; - return; - } + && gBattleCommunication[MOVE_EFFECT_BYTE] != MOVE_EFFECT_PAYDAY + && gBattleCommunication[MOVE_EFFECT_BYTE] != MOVE_EFFECT_STEAL_ITEM) + INCREMENT_RETURN + + if (gBattleMons[gEffectBattler].status2 & STATUS2_SUBSTITUTE && affectsUser != MOVE_EFFECT_AFFECTS_USER) + INCREMENT_RETURN + if (gBattleCommunication[MOVE_EFFECT_BYTE] <= PRIMARY_STATUS_MOVE_EFFECT) { switch (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]) @@ -2122,11 +2151,15 @@ void SetMoveEffect(bool8 primary, u8 certain) case STATUS1_SLEEP: // check active uproar if (gBattleMons[gEffectBattler].ability != ABILITY_SOUNDPROOF) + { for (gActiveBattler = 0; gActiveBattler < gBattlersCount && !(gBattleMons[gActiveBattler].status2 & STATUS2_UPROAR); - ++gActiveBattler); + gActiveBattler++) + {} + } else gActiveBattler = gBattlersCount; + if (gBattleMons[gEffectBattler].status1) break; if (gActiveBattler != gBattlersCount) @@ -2135,35 +2168,39 @@ void SetMoveEffect(bool8 primary, u8 certain) break; if (gBattleMons[gEffectBattler].ability == ABILITY_INSOMNIA) break; + CancelMultiTurnMoves(gEffectBattler); statusChanged = TRUE; break; case STATUS1_POISON: if (gBattleMons[gEffectBattler].ability == ABILITY_IMMUNITY - && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)) + && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)) { gLastUsedAbility = ABILITY_IMMUNITY; RecordAbilityBattle(gEffectBattler, ABILITY_IMMUNITY); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_PSNPrevention; + if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) { - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - gHitMarker &= ~(HITMARKER_IGNORE_SAFEGUARD); + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_ABILITY_STATUS; + gHitMarker &= ~HITMARKER_IGNORE_SAFEGUARD; } else { - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_MOVE_STATUS; } return; } if ((IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_POISON) || IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_STEEL)) - && (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) - && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)) + && (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) + && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)) { BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_PSNPrevention; - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STATUS_HAD_NO_EFFECT; return; } if (IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_POISON)) @@ -2174,34 +2211,37 @@ void SetMoveEffect(bool8 primary, u8 certain) break; if (gBattleMons[gEffectBattler].ability == ABILITY_IMMUNITY) break; + statusChanged = TRUE; break; case STATUS1_BURN: if (gBattleMons[gEffectBattler].ability == ABILITY_WATER_VEIL - && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)) + && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)) { gLastUsedAbility = ABILITY_WATER_VEIL; RecordAbilityBattle(gEffectBattler, ABILITY_WATER_VEIL); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_BRNPrevention; if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) { - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - gHitMarker &= ~(HITMARKER_IGNORE_SAFEGUARD); + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_ABILITY_STATUS; + gHitMarker &= ~HITMARKER_IGNORE_SAFEGUARD; } else { - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_MOVE_STATUS; } return; } if (IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_FIRE) - && (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) - && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)) + && (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) + && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)) { BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_BRNPrevention; - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STATUS_HAD_NO_EFFECT; return; } if (IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_FIRE)) @@ -2210,6 +2250,7 @@ void SetMoveEffect(bool8 primary, u8 certain) break; if (gBattleMons[gEffectBattler].status1) break; + statusChanged = TRUE; break; case STATUS1_FREEZE: @@ -2219,10 +2260,11 @@ void SetMoveEffect(bool8 primary, u8 certain) break; if (gBattleMons[gEffectBattler].status1) break; - if (noSunCanFreeze == 0) + if (noSunCanFreeze == FALSE) break; if (gBattleMons[gEffectBattler].ability == ABILITY_MAGMA_ARMOR) break; + CancelMultiTurnMoves(gEffectBattler); statusChanged = TRUE; break; @@ -2233,16 +2275,18 @@ void SetMoveEffect(bool8 primary, u8 certain) { gLastUsedAbility = ABILITY_LIMBER; RecordAbilityBattle(gEffectBattler, ABILITY_LIMBER); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_PRLZPrevention; + if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) { - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - gHitMarker &= ~(HITMARKER_IGNORE_SAFEGUARD); + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_ABILITY_STATUS; + gHitMarker &= ~HITMARKER_IGNORE_SAFEGUARD; } else { - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_MOVE_STATUS; } return; } @@ -2251,6 +2295,7 @@ void SetMoveEffect(bool8 primary, u8 certain) } if (gBattleMons[gEffectBattler].status1) break; + statusChanged = TRUE; break; case STATUS1_TOXIC_POISON: @@ -2258,26 +2303,29 @@ void SetMoveEffect(bool8 primary, u8 certain) { gLastUsedAbility = ABILITY_IMMUNITY; RecordAbilityBattle(gEffectBattler, ABILITY_IMMUNITY); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_PSNPrevention; + if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) { - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - gHitMarker &= ~(HITMARKER_IGNORE_SAFEGUARD); + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_ABILITY_STATUS; + gHitMarker &= ~HITMARKER_IGNORE_SAFEGUARD; } else { - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_MOVE_STATUS; } return; } if ((IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_POISON) || IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_STEEL)) - && (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) - && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)) + && (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) + && (primary == TRUE || certain == MOVE_EFFECT_CERTAIN)) { BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_PSNPrevention; - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STATUS_HAD_NO_EFFECT; return; } if (gBattleMons[gEffectBattler].status1) @@ -2286,9 +2334,10 @@ void SetMoveEffect(bool8 primary, u8 certain) { if (gBattleMons[gEffectBattler].ability == ABILITY_IMMUNITY) break; + // It's redundant, because at this point we know the status1 value is 0. - gBattleMons[gEffectBattler].status1 &= ~(STATUS1_TOXIC_POISON); - gBattleMons[gEffectBattler].status1 &= ~(STATUS1_POISON); + gBattleMons[gEffectBattler].status1 &= ~STATUS1_TOXIC_POISON; + gBattleMons[gEffectBattler].status1 &= ~STATUS1_POISON; statusChanged = TRUE; break; } @@ -2301,30 +2350,36 @@ void SetMoveEffect(bool8 primary, u8 certain) if (statusChanged == TRUE) { BattleScriptPush(gBattlescriptCurrInstr + 1); + if (sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]] == STATUS1_SLEEP) - gBattleMons[gEffectBattler].status1 |= ((Random() & 3) + 2); + gBattleMons[gEffectBattler].status1 |= STATUS1_SLEEP_TURN((Random() & 3) + 2); // 2-5 turns else gBattleMons[gEffectBattler].status1 |= sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]; + gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; + gActiveBattler = gEffectBattler; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gEffectBattler].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, sizeof(gBattleMons[gEffectBattler].status1), &gBattleMons[gEffectBattler].status1); MarkBattlerForControllerExec(gActiveBattler); + if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD) { - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - gHitMarker &= ~(HITMARKER_IGNORE_SAFEGUARD); + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STATUSED_BY_ABILITY; + gHitMarker &= ~HITMARKER_IGNORE_SAFEGUARD; } else { - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STATUSED; } + // for synchronize + if (gBattleCommunication[MOVE_EFFECT_BYTE] == MOVE_EFFECT_POISON || gBattleCommunication[MOVE_EFFECT_BYTE] == MOVE_EFFECT_TOXIC || gBattleCommunication[MOVE_EFFECT_BYTE] == MOVE_EFFECT_PARALYSIS || gBattleCommunication[MOVE_EFFECT_BYTE] == MOVE_EFFECT_BURN) { - u8 *synchronizeEffect = &gBattleStruct->synchronizeMoveEffect; + u8* synchronizeEffect = &gBattleStruct->synchronizeMoveEffect; *synchronizeEffect = gBattleCommunication[MOVE_EFFECT_BYTE]; gHitMarker |= HITMARKER_SYNCHRONISE_EFFECT; } @@ -2354,7 +2409,8 @@ void SetMoveEffect(bool8 primary, u8 certain) } else { - gBattleMons[gEffectBattler].status2 |= (((Random()) % 0x4)) + 2; + gBattleMons[gEffectBattler].status2 |= STATUS2_CONFUSION_TURN(((Random()) % 4) + 2); // 2-5 turns + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; } @@ -2385,7 +2441,8 @@ void SetMoveEffect(bool8 primary, u8 certain) { gBattleMons[gEffectBattler].status2 |= STATUS2_MULTIPLETURNS; gLockedMoves[gEffectBattler] = gCurrentMove; - gBattleMons[gEffectBattler].status2 |= ((Random() & 3) + 2) << 4; + gBattleMons[gEffectBattler].status2 |= STATUS2_UPROAR_TURN((Random() & 3) + 2); // 2-5 turns + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; } @@ -2429,15 +2486,20 @@ void SetMoveEffect(bool8 primary, u8 certain) } else { - gBattleMons[gEffectBattler].status2 |= ((Random() & 3) + 3) << 0xD; + gBattleMons[gEffectBattler].status2 |= STATUS2_WRAPPED_TURN((Random() & 3) + 3); // 3-6 turns + *(gBattleStruct->wrappedMove + gEffectBattler * 2 + 0) = gCurrentMove; *(gBattleStruct->wrappedMove + gEffectBattler * 2 + 1) = gCurrentMove >> 8; *(gBattleStruct->wrappedBy + gEffectBattler) = gBattlerAttacker; + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; + for (gBattleCommunication[MULTISTRING_CHOOSER] = 0; ; gBattleCommunication[MULTISTRING_CHOOSER]++) { - if (gBattleCommunication[MULTISTRING_CHOOSER] > 4 || gTrappingMoves[gBattleCommunication[MULTISTRING_CHOOSER]] == gCurrentMove) + if (gBattleCommunication[MULTISTRING_CHOOSER] >= NUM_TRAPPING_MOVES - 1) + break; + if (gTrappingMoves[gBattleCommunication[MULTISTRING_CHOOSER]] == gCurrentMove) break; } } @@ -2446,6 +2508,7 @@ void SetMoveEffect(bool8 primary, u8 certain) gBattleMoveDamage = (gHpDealt) / 4; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; break; @@ -2458,8 +2521,7 @@ void SetMoveEffect(bool8 primary, u8 certain) case MOVE_EFFECT_EVS_PLUS_1: if (ChangeStatBuffs(SET_STAT_BUFF_VALUE(1), gBattleCommunication[MOVE_EFFECT_BYTE] - MOVE_EFFECT_ATK_PLUS_1 + 1, - affectsUser, - NULL)) + affectsUser, 0)) { gBattlescriptCurrInstr++; } @@ -2480,8 +2542,7 @@ void SetMoveEffect(bool8 primary, u8 certain) case MOVE_EFFECT_EVS_MINUS_1: if (ChangeStatBuffs(SET_STAT_BUFF_VALUE(1) | STAT_BUFF_NEGATIVE, gBattleCommunication[MOVE_EFFECT_BYTE] - MOVE_EFFECT_ATK_MINUS_1 + 1, - affectsUser, - NULL)) + affectsUser, 0)) { gBattlescriptCurrInstr++; } @@ -2502,8 +2563,7 @@ void SetMoveEffect(bool8 primary, u8 certain) case MOVE_EFFECT_EVS_PLUS_2: if (ChangeStatBuffs(SET_STAT_BUFF_VALUE(2), gBattleCommunication[MOVE_EFFECT_BYTE] - MOVE_EFFECT_ATK_PLUS_2 + 1, - affectsUser, - NULL)) + affectsUser, 0)) { gBattlescriptCurrInstr++; } @@ -2524,8 +2584,7 @@ void SetMoveEffect(bool8 primary, u8 certain) case MOVE_EFFECT_EVS_MINUS_2: if (ChangeStatBuffs(SET_STAT_BUFF_VALUE(2) | STAT_BUFF_NEGATIVE, gBattleCommunication[MOVE_EFFECT_BYTE] - MOVE_EFFECT_ATK_MINUS_2 + 1, - affectsUser, - NULL)) + affectsUser, 0)) { gBattlescriptCurrInstr++; } @@ -2554,22 +2613,23 @@ void SetMoveEffect(bool8 primary, u8 certain) gBattlescriptCurrInstr++; break; } + side = GetBattlerSide(gBattlerAttacker); if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT - && !(gBattleTypeFlags & - (BATTLE_TYPE_EREADER_TRAINER - | BATTLE_TYPE_BATTLE_TOWER - | BATTLE_TYPE_LINK)) + && !(gBattleTypeFlags & + (BATTLE_TYPE_EREADER_TRAINER + | BATTLE_TYPE_BATTLE_TOWER + | BATTLE_TYPE_LINK)) && gTrainerBattleOpponent_A != 0x400) { gBattlescriptCurrInstr++; } else if (!(gBattleTypeFlags & - (BATTLE_TYPE_EREADER_TRAINER - | BATTLE_TYPE_BATTLE_TOWER - | BATTLE_TYPE_LINK)) - && gTrainerBattleOpponent_A != 0x400 - && (gWishFutureKnock.knockedOffMons[side] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]])) + (BATTLE_TYPE_EREADER_TRAINER + | BATTLE_TYPE_BATTLE_TOWER + | BATTLE_TYPE_LINK)) + && gTrainerBattleOpponent_A != 0x400 + && (gWishFutureKnock.knockedOffMons[side] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]])) { gBattlescriptCurrInstr++; } @@ -2589,19 +2649,23 @@ void SetMoveEffect(bool8 primary, u8 certain) } else { - u16 *changedItem = &gBattleStruct->changedItems[gBattlerAttacker]; + u16* changedItem = &gBattleStruct->changedItems[gBattlerAttacker]; gLastUsedItem = *changedItem = gBattleMons[gBattlerTarget].item; gBattleMons[gBattlerTarget].item = ITEM_NONE; + gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, &gLastUsedItem); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, sizeof(gLastUsedItem), &gLastUsedItem); MarkBattlerForControllerExec(gBattlerAttacker); + gActiveBattler = gBattlerTarget; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattlerTarget].item); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, sizeof(gBattleMons[gBattlerTarget].item), &gBattleMons[gBattlerTarget].item); MarkBattlerForControllerExec(gBattlerTarget); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_ItemSteal; - *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerTarget]) + 0) = 0; - *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerTarget]) + 1) = 0; + + *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 0) = 0; + *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 1) = 0; } } break; @@ -2629,10 +2693,12 @@ void SetMoveEffect(bool8 primary, u8 certain) } else { - gBattleMons[gBattlerTarget].status1 &= ~(STATUS1_PARALYSIS); + gBattleMons[gBattlerTarget].status1 &= ~STATUS1_PARALYSIS; + gActiveBattler = gBattlerTarget; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, sizeof(gBattleMons[gActiveBattler].status1), &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_TargetPRLZHeal; } @@ -2645,6 +2711,7 @@ void SetMoveEffect(bool8 primary, u8 certain) gBattleMoveDamage = gHpDealt / 3; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = sMoveEffectBS_Ptrs[gBattleCommunication[MOVE_EFFECT_BYTE]]; break; @@ -2657,7 +2724,7 @@ void SetMoveEffect(bool8 primary, u8 certain) { gBattleMons[gEffectBattler].status2 |= STATUS2_MULTIPLETURNS; gLockedMoves[gEffectBattler] = gCurrentMove; - gBattleMons[gEffectBattler].status2 |= (((Random() & 1) + 2) << 0xA); + gBattleMons[gEffectBattler].status2 |= STATUS2_LOCK_CONFUSE_TURN((Random() & 1) + 2); // thrash for 2-3 turns } break; case MOVE_EFFECT_KNOCK_OFF: @@ -2678,13 +2745,16 @@ void SetMoveEffect(bool8 primary, u8 certain) if (gBattleMons[gEffectBattler].item) { side = GetBattlerSide(gEffectBattler); + gLastUsedItem = gBattleMons[gEffectBattler].item; gBattleMons[gEffectBattler].item = ITEM_NONE; gWishFutureKnock.knockedOffMons[side] |= gBitTable[gBattlerPartyIndexes[gEffectBattler]]; + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_KnockedOff; - *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gEffectBattler]) + 0) = 0; - *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gEffectBattler]) + 1) = 0; + + *(u8*)((u8*)(&gBattleStruct->choicedMove[gEffectBattler]) + 0) = 0; + *(u8*)((u8*)(&gBattleStruct->choicedMove[gEffectBattler]) + 1) = 0; } else { @@ -2708,25 +2778,27 @@ static void Cmd_seteffectwithchance(void) percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance * 2; else percentChance = gBattleMoves[gCurrentMove].secondaryEffectChance; + if (gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_CERTAIN - && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) + && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { - gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_CERTAIN); - SetMoveEffect(0, MOVE_EFFECT_CERTAIN); + gBattleCommunication[MOVE_EFFECT_BYTE] &= ~MOVE_EFFECT_CERTAIN; + SetMoveEffect(FALSE, MOVE_EFFECT_CERTAIN); } else if (Random() % 100 <= percentChance - && gBattleCommunication[MOVE_EFFECT_BYTE] - && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) + && gBattleCommunication[MOVE_EFFECT_BYTE] + && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT)) { if (percentChance >= 100) - SetMoveEffect(0, MOVE_EFFECT_CERTAIN); + SetMoveEffect(FALSE, MOVE_EFFECT_CERTAIN); else - SetMoveEffect(0, 0); + SetMoveEffect(FALSE, 0); } else { gBattlescriptCurrInstr++; } + gBattleCommunication[MOVE_EFFECT_BYTE] = 0; gBattleScripting.multihitMoveEffect = 0; } @@ -2749,6 +2821,7 @@ static void Cmd_clearstatusfromeffect(void) gBattleMons[gActiveBattler].status1 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]); else gBattleMons[gActiveBattler].status2 &= (~sStatusFlagsForMoveEffects[gBattleCommunication[MOVE_EFFECT_BYTE]]); + gBattleCommunication[MOVE_EFFECT_BYTE] = 0; gBattlescriptCurrInstr += 2; gBattleScripting.multihitMoveEffect = 0; @@ -2764,9 +2837,10 @@ static void Cmd_tryfaintmon(void) if (gHitMarker & HITMARKER_FAINTED(gActiveBattler)) { BS_ptr = T1_READ_PTR(gBattlescriptCurrInstr + 3); + BattleScriptPop(); gBattlescriptCurrInstr = BS_ptr; - gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED); + gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~SIDE_STATUS_SPIKES_DAMAGED; } else { @@ -2798,20 +2872,20 @@ static void Cmd_tryfaintmon(void) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { gHitMarker |= HITMARKER_PLAYER_FAINTED; - if (gBattleResults.playerFaintCounter < 0xFF) - ++gBattleResults.playerFaintCounter; + if (gBattleResults.playerFaintCounter < 255) + gBattleResults.playerFaintCounter++; AdjustFriendshipOnBattleFaint(gActiveBattler); } else { - if (gBattleResults.opponentFaintCounter < 0xFF) - ++gBattleResults.opponentFaintCounter; + if (gBattleResults.opponentFaintCounter < 255) + gBattleResults.opponentFaintCounter++; gBattleResults.lastOpponentSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); *(u8 *)(&gBattleStruct->field_182) = gBattlerAttacker; } if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBattlerAttacker].hp != 0) { - gHitMarker &= ~(HITMARKER_DESTINYBOND); + gHitMarker &= ~HITMARKER_DESTINYBOND; BattleScriptPush(gBattlescriptCurrInstr); gBattleMoveDamage = gBattleMons[battlerId].hp; gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife; @@ -2828,8 +2902,9 @@ static void Cmd_tryfaintmon(void) BattleScriptPush(gBattlescriptCurrInstr); gBattlescriptCurrInstr = BattleScript_GrudgeTakesPp; gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(BUFFER_A, moveIndex + REQUEST_PPMOVE1_BATTLE, 0, 1, &gBattleMons[gActiveBattler].pp[moveIndex]); + BtlController_EmitSetMonData(BUFFER_A, moveIndex + REQUEST_PPMOVE1_BATTLE, 0, sizeof(gBattleMons[gActiveBattler].pp[moveIndex]), &gBattleMons[gActiveBattler].pp[moveIndex]); MarkBattlerForControllerExec(gActiveBattler); + PREPARE_MOVE_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerAttacker].moves[moveIndex]) } } @@ -2845,7 +2920,7 @@ static void Cmd_dofaintanimation(void) if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - BtlController_EmitFaintAnimation(0); + BtlController_EmitFaintAnimation(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; } @@ -2856,9 +2931,11 @@ static void Cmd_cleareffectsonfaint(void) if (gBattleControllerExecFlags == 0) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + gBattleMons[gActiveBattler].status1 = 0; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, 0x4, &gBattleMons[gActiveBattler].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, sizeof(gBattleMons[gActiveBattler].status1), &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); + FaintClearSetData(); // Effects like attractions, trapping, etc. gBattlescriptCurrInstr += 2; } @@ -2868,7 +2945,7 @@ static void Cmd_jumpifstatus(void) { u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2); - const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6); + const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6); if (gBattleMons[battlerId].status1 & flags && gBattleMons[battlerId].hp != 0) gBattlescriptCurrInstr = jumpPtr; @@ -2880,7 +2957,7 @@ static void Cmd_jumpifstatus2(void) { u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2); - const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6); + const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6); if (gBattleMons[battlerId].status2 & flags && gBattleMons[battlerId].hp != 0) gBattlescriptCurrInstr = jumpPtr; @@ -2892,7 +2969,7 @@ static void Cmd_jumpifability(void) { u8 battlerId; u8 ability = gBattlescriptCurrInstr[2]; - const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 3); + const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 3); if (gBattlescriptCurrInstr[1] == BS_ATTACKER_SIDE) { @@ -2939,7 +3016,7 @@ static void Cmd_jumpifsideaffecting(void) { u8 side; u16 flags; - const u8 *jumpPtr; + const u8* jumpPtr; if (gBattlescriptCurrInstr[1] == BS_ATTACKER) side = GET_BATTLER_SIDE(gBattlerAttacker); @@ -2988,6 +3065,7 @@ static void Cmd_jumpifstat(void) ret++; break; } + if (ret) gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 5); else @@ -2996,22 +3074,23 @@ static void Cmd_jumpifstat(void) static void Cmd_jumpifstatus3condition(void) { - u32 flags; + u32 status; const u8 *jumpPtr; gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - flags = T2_READ_32(gBattlescriptCurrInstr + 2); + status = T2_READ_32(gBattlescriptCurrInstr + 2); jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 7); + if (gBattlescriptCurrInstr[6]) { - if (gStatuses3[gActiveBattler] & flags) + if ((gStatuses3[gActiveBattler] & status) != 0) gBattlescriptCurrInstr += 11; else gBattlescriptCurrInstr = jumpPtr; } else { - if (gStatuses3[gActiveBattler] & flags) + if ((gStatuses3[gActiveBattler] & status) != 0) gBattlescriptCurrInstr = jumpPtr; else gBattlescriptCurrInstr += 11; @@ -3022,7 +3101,7 @@ static void Cmd_jumpiftype(void) { u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); u8 type = gBattlescriptCurrInstr[2]; - const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 3); + const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 3); if (IS_BATTLER_OF_TYPE(battlerId, type)) gBattlescriptCurrInstr = jumpPtr; @@ -3041,16 +3120,16 @@ static void Cmd_getexp(void) gBattlerFainted = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); sentIn = gSentPokesToOpponent[(gBattlerFainted & 2) >> 1]; + switch (gBattleScripting.getexpState) { case 0: // check if should receive exp at all - if (GetBattlerSide(gBattlerFainted) != B_SIDE_OPPONENT - || (gBattleTypeFlags & - (BATTLE_TYPE_LINK - | BATTLE_TYPE_TRAINER_TOWER - | BATTLE_TYPE_BATTLE_TOWER - | BATTLE_TYPE_SAFARI - | BATTLE_TYPE_EREADER_TRAINER))) + if (GetBattlerSide(gBattlerFainted) != B_SIDE_OPPONENT || (gBattleTypeFlags & + (BATTLE_TYPE_LINK + | BATTLE_TYPE_TRAINER_TOWER + | BATTLE_TYPE_BATTLE_TOWER + | BATTLE_TYPE_SAFARI + | BATTLE_TYPE_EREADER_TRAINER))) { gBattleScripting.getexpState = 6; // goto last case } @@ -3067,18 +3146,20 @@ static void Cmd_getexp(void) for (viaSentIn = 0, i = 0; i < PARTY_SIZE; i++) { - if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) != SPECIES_NONE && GetMonData(&gPlayerParty[i], MON_DATA_HP) != 0) - { - if (gBitTable[i] & sentIn) - ++viaSentIn; - item = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); - if (item == ITEM_ENIGMA_BERRY) - holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect; - else - holdEffect = ItemId_GetHoldEffect(item); - if (holdEffect == HOLD_EFFECT_EXP_SHARE) - ++viaExpShare; - } + if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) == SPECIES_NONE || GetMonData(&gPlayerParty[i], MON_DATA_HP) == 0) + continue; + if (gBitTable[i] & sentIn) + viaSentIn++; + + item = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); + + if (item == ITEM_ENIGMA_BERRY) + holdEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect; + else + holdEffect = ItemId_GetHoldEffect(item); + + if (holdEffect == HOLD_EFFECT_EXP_SHARE) + viaExpShare++; } calculatedExp = gBaseStats[gBattleMons[gBattlerFainted].species].expYield * gBattleMons[gBattlerFainted].level / 7; @@ -3139,12 +3220,14 @@ static void Cmd_getexp(void) PlayBGM(MUS_VICTORY_WILD); gBattleStruct->wildVictorySong++; } + if (GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_HP)) { if (gBattleStruct->sentInPokes & 1) gBattleMoveDamage = *exp; else gBattleMoveDamage = 0; + if (holdEffect == HOLD_EFFECT_EXP_SHARE) gBattleMoveDamage += gExpShareExp; if (holdEffect == HOLD_EFFECT_LUCKY_EGG) @@ -3161,10 +3244,11 @@ static void Cmd_getexp(void) { i = STRINGID_EMPTYSTRING4; } + // get exp getter battlerId if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - if (!(gBattlerPartyIndexes[2] != gBattleStruct->expGetterMonId) && !(gAbsentBattlerFlags & gBitTable[2])) + if (gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId && !(gAbsentBattlerFlags & gBitTable[2])) gBattleStruct->expGetterBattlerId = 2; else { @@ -3296,72 +3380,91 @@ static void Cmd_getexp(void) } } +// For battles that aren't BATTLE_TYPE_LINK or BATTLE_TYPE_RECORDED_LINK, the only thing this +// command does is check whether the player has won/lost by totaling each team's HP. It then +// sets gBattleOutcome accordingly, if necessary. static void Cmd_checkteamslost(void) { u16 HP_count = 0; s32 i; - if (gBattleControllerExecFlags == 0) + if (gBattleControllerExecFlags) + return; + + for (i = 0; i < PARTY_SIZE; i++) { - for (i = 0; i < PARTY_SIZE; i++) - if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)) - HP_count += GetMonData(&gPlayerParty[i], MON_DATA_HP); - if (HP_count == 0) - gBattleOutcome |= B_OUTCOME_LOST; - for (HP_count = 0, i = 0; i < PARTY_SIZE; i++) - if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES) && !GetMonData(&gEnemyParty[i], MON_DATA_IS_EGG)) - HP_count += GetMonData(&gEnemyParty[i], MON_DATA_HP); - if (HP_count == 0) - gBattleOutcome |= B_OUTCOME_WON; - if (gBattleOutcome == 0 && (gBattleTypeFlags & BATTLE_TYPE_LINK)) + if (GetMonData(&gPlayerParty[i], MON_DATA_SPECIES) && !GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG)) { - s32 foundPlayer; - s32 foundOpponent; + HP_count += GetMonData(&gPlayerParty[i], MON_DATA_HP); + } + } + if (HP_count == 0) + gBattleOutcome |= B_OUTCOME_LOST; + HP_count = 0; - for (foundPlayer = 0, i = 0; i < gBattlersCount; i += 2) - { - u32 *ptr = &gHitMarker; - u32 hitMarkerUnk = 0x10000000; - - i++; - --i; - if ((hitMarkerUnk << i) & *ptr && !gSpecialStatuses[i].faintedHasReplacement) - ++foundPlayer; - } - for (foundOpponent = 0, i = 1; i < gBattlersCount; i += 2) - { - u32 *ptr = &gHitMarker; - u32 hitMarkerUnk = 0x10000000; - - { - u8 match; + // Get total HP for the enemy's party to determine if the player has won + for (i = 0; i < PARTY_SIZE; i++) + { + if (GetMonData(&gEnemyParty[i], MON_DATA_SPECIES) && !GetMonData(&gEnemyParty[i], MON_DATA_IS_EGG)) + { + HP_count += GetMonData(&gEnemyParty[i], MON_DATA_HP); + } + } + if (HP_count == 0) + gBattleOutcome |= B_OUTCOME_WON; - ++match; - --match; - } - if ((hitMarkerUnk << i) & *ptr && !gSpecialStatuses[i].faintedHasReplacement) - ++foundOpponent; - } - if (gBattleTypeFlags & BATTLE_TYPE_MULTI) + // For link battles that haven't ended, count number of empty battler spots + // In link multi battles, jump to pointer if more than 1 spot empty + // In non-multi battles, jump to pointer if 1 spot is missing on both sides + if (gBattleOutcome == 0 && (gBattleTypeFlags & BATTLE_TYPE_LINK)) + { + s32 emptyPlayerSpots; + s32 emptyOpponentSpots; + + for (emptyPlayerSpots = 0, i = 0; i < gBattlersCount; i += 2) + { + u32 *ptr = &gHitMarker; + u32 hitMarkerUnk = 0x10000000; + + i++; + --i; + if ((hitMarkerUnk << i) & *ptr && !gSpecialStatuses[i].faintedHasReplacement) + emptyPlayerSpots++; + } + for (emptyOpponentSpots = 0, i = 1; i < gBattlersCount; i += 2) + { + u32 *ptr = &gHitMarker; + u32 hitMarkerUnk = 0x10000000; + { - if (foundOpponent + foundPlayer > 1) - gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1); - else - gBattlescriptCurrInstr += 5; + u8 match; + + ++match; + --match; } + if ((hitMarkerUnk << i) & *ptr && !gSpecialStatuses[i].faintedHasReplacement) + emptyOpponentSpots++; + } + + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) + { + if (emptyOpponentSpots + emptyPlayerSpots > 1) + gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1); else - { - if (foundOpponent != 0 && foundPlayer != 0) - gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1); - else - gBattlescriptCurrInstr += 5; - } + gBattlescriptCurrInstr += 5; } else { - gBattlescriptCurrInstr += 5; + if (emptyOpponentSpots != 0 && emptyPlayerSpots != 0) + gBattlescriptCurrInstr = T2_READ_PTR(gBattlescriptCurrInstr + 1); + else + gBattlescriptCurrInstr += 5; } } + else + { + gBattlescriptCurrInstr += 5; + } } static void MoveValuesCleanUp(void) @@ -3370,9 +3473,9 @@ static void MoveValuesCleanUp(void) gBattleScripting.dmgMultiplier = 1; gCritMultiplier = 1; gBattleCommunication[MOVE_EFFECT_BYTE] = 0; - gBattleCommunication[6] = 0; - gHitMarker &= ~(HITMARKER_DESTINYBOND); - gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT); + gBattleCommunication[MISS_TYPE] = 0; + gHitMarker &= ~HITMARKER_DESTINYBOND; + gHitMarker &= ~HITMARKER_SYNCHRONISE_EFFECT; } static void Cmd_movevaluescleanup(void) @@ -3403,9 +3506,9 @@ static void Cmd_goto(void) static void Cmd_jumpifbyte(void) { u8 caseID = gBattlescriptCurrInstr[1]; - const u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 2); + const u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 2); u8 value = gBattlescriptCurrInstr[6]; - const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 7); + const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 7); gBattlescriptCurrInstr += 11; @@ -3441,11 +3544,12 @@ static void Cmd_jumpifbyte(void) static void Cmd_jumpifhalfword(void) { u8 caseID = gBattlescriptCurrInstr[1]; - const u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 2); + const u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 2); u16 value = T2_READ_16(gBattlescriptCurrInstr + 6); - const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 8); + const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 8); gBattlescriptCurrInstr += 12; + switch (caseID) { case CMP_EQUAL: @@ -3478,11 +3582,12 @@ static void Cmd_jumpifhalfword(void) static void Cmd_jumpifword(void) { u8 caseID = gBattlescriptCurrInstr[1]; - const u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 2); + const u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 2); u32 value = T1_READ_32(gBattlescriptCurrInstr + 6); - const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); + const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); gBattlescriptCurrInstr += 14; + switch (caseID) { case CMP_EQUAL: @@ -3514,12 +3619,12 @@ static void Cmd_jumpifword(void) static void Cmd_jumpifarrayequal(void) { - const u8 *mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1); - const u8 *mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5); + const u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1); + const u8* mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5); u32 size = gBattlescriptCurrInstr[9]; - const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); - u8 i; + const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); + u8 i; for (i = 0; i < size; i++) { if (*mem1 != *mem2) @@ -3527,8 +3632,9 @@ static void Cmd_jumpifarrayequal(void) gBattlescriptCurrInstr += 14; break; } - ++mem1, ++mem2; + mem1++, mem2++; } + if (i == size) gBattlescriptCurrInstr = jumpPtr; } @@ -3536,18 +3642,19 @@ static void Cmd_jumpifarrayequal(void) static void Cmd_jumpifarraynotequal(void) { u8 equalBytes = 0; - const u8 *mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1); - const u8 *mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5); + const u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1); + const u8* mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5); u32 size = gBattlescriptCurrInstr[9]; - const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); - u8 i; + const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); + u8 i; for (i = 0; i < size; i++) { if (*mem1 == *mem2) - ++equalBytes; - ++mem1, ++mem2; + equalBytes++; + mem1++, mem2++; } + if (equalBytes != size) gBattlescriptCurrInstr = jumpPtr; else @@ -3556,67 +3663,63 @@ static void Cmd_jumpifarraynotequal(void) static void Cmd_setbyte(void) { - u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); - + u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); *memByte = gBattlescriptCurrInstr[5]; + gBattlescriptCurrInstr += 6; } static void Cmd_addbyte(void) { - u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); - + u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); *memByte += gBattlescriptCurrInstr[5]; gBattlescriptCurrInstr += 6; } static void Cmd_subbyte(void) { - u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); - + u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); *memByte -= gBattlescriptCurrInstr[5]; gBattlescriptCurrInstr += 6; } static void Cmd_copyarray(void) { - u8 *dest = T2_READ_PTR(gBattlescriptCurrInstr + 1); - const u8 *src = T2_READ_PTR(gBattlescriptCurrInstr + 5); + u8* dest = T2_READ_PTR(gBattlescriptCurrInstr + 1); + const u8* src = T2_READ_PTR(gBattlescriptCurrInstr + 5); s32 size = gBattlescriptCurrInstr[9]; - s32 i; + s32 i; for (i = 0; i < size; i++) - { dest[i] = src[i]; - } + gBattlescriptCurrInstr += 10; } static void Cmd_copyarraywithindex(void) { - u8 *dest = T2_READ_PTR(gBattlescriptCurrInstr + 1); - const u8 *src = T2_READ_PTR(gBattlescriptCurrInstr + 5); - const u8 *index = T2_READ_PTR(gBattlescriptCurrInstr + 9); + u8* dest = T2_READ_PTR(gBattlescriptCurrInstr + 1); + const u8* src = T2_READ_PTR(gBattlescriptCurrInstr + 5); + const u8* index = T2_READ_PTR(gBattlescriptCurrInstr + 9); s32 size = gBattlescriptCurrInstr[13]; - s32 i; + s32 i; for (i = 0; i < size; i++) - { dest[i] = src[i + *index]; - } + gBattlescriptCurrInstr += 14; } static void Cmd_orbyte(void) { - u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); *memByte |= gBattlescriptCurrInstr[5]; gBattlescriptCurrInstr += 6; } static void Cmd_orhalfword(void) { - u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1); u16 val = T2_READ_16(gBattlescriptCurrInstr + 5); *memHword |= val; @@ -3625,7 +3728,7 @@ static void Cmd_orhalfword(void) static void Cmd_orword(void) { - u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1); u32 val = T2_READ_32(gBattlescriptCurrInstr + 5); *memWord |= val; @@ -3634,15 +3737,14 @@ static void Cmd_orword(void) static void Cmd_bicbyte(void) { - u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); - + u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); *memByte &= ~(gBattlescriptCurrInstr[5]); gBattlescriptCurrInstr += 6; } static void Cmd_bichalfword(void) { - u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1); u16 val = T2_READ_16(gBattlescriptCurrInstr + 5); *memHword &= ~val; @@ -3651,7 +3753,7 @@ static void Cmd_bichalfword(void) static void Cmd_bicword(void) { - u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1); u32 val = T2_READ_32(gBattlescriptCurrInstr + 5); *memWord &= ~val; @@ -3663,7 +3765,6 @@ static void Cmd_pause(void) if (gBattleControllerExecFlags == 0) { u16 value = T2_READ_16(gBattlescriptCurrInstr + 1); - if (++gPauseCounterBattle >= value) { gPauseCounterBattle = 0; @@ -3684,7 +3785,8 @@ static void Cmd_healthbar_update(void) gActiveBattler = gBattlerTarget; else gActiveBattler = gBattlerAttacker; - BtlController_EmitHealthBarUpdate(0, gBattleMoveDamage); + + BtlController_EmitHealthBarUpdate(BUFFER_A, gBattleMoveDamage); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; } @@ -3746,10 +3848,11 @@ static void Cmd_endselectionscript(void) static void Cmd_playanimation(void) { - const u16 *argumentPtr; + const u16* argumentPtr; gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); argumentPtr = T2_READ_PTR(gBattlescriptCurrInstr + 3); + if (gBattlescriptCurrInstr[2] == B_ANIM_STATS_CHANGE || gBattlescriptCurrInstr[2] == B_ANIM_SNATCH_MOVE || gBattlescriptCurrInstr[2] == B_ANIM_SUBSTITUTE_FADE @@ -3785,14 +3888,16 @@ static void Cmd_playanimation(void) } } -static void Cmd_playanimation_var(void) // animation Id is stored in the first pointer +// Same as playanimation, except it takes a pointer to some animation id, instead of taking the value directly +static void Cmd_playanimation_var(void) { - const u16 *argumentPtr; - const u8 *animationIdPtr; + const u16* argumentPtr; + const u8* animationIdPtr; gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); animationIdPtr = T2_READ_PTR(gBattlescriptCurrInstr + 2); argumentPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6); + if (*animationIdPtr == B_ANIM_STATS_CHANGE || *animationIdPtr == B_ANIM_SNATCH_MOVE || *animationIdPtr == B_ANIM_SUBSTITUTE_FADE) @@ -3829,7 +3934,6 @@ static void Cmd_playanimation_var(void) // animation Id is stored in the first p static void Cmd_setgraphicalstatchangevalues(void) { u8 value = 0; - switch (GET_STAT_BUFF_VALUE2(gBattleScripting.statChanger)) { case SET_STAT_BUFF_VALUE(1): // +1 @@ -3859,6 +3963,7 @@ static void Cmd_playstatchangeanimation(void) gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); statsToCheck = gBattlescriptCurrInstr[2]; + if (gBattlescriptCurrInstr[3] & STAT_CHANGE_NEGATIVE) // goes down { s16 startingStatAnimId; @@ -3873,7 +3978,7 @@ static void Cmd_playstatchangeanimation(void) { if (gBattlescriptCurrInstr[3] & STAT_CHANGE_CANT_PREVENT) { - if (gBattleMons[gActiveBattler].statStages[currStat] > 0) + if (gBattleMons[gActiveBattler].statStages[currStat] > MIN_STAT_STAGE) { statAnimId = startingStatAnimId + currStat; changeableStatsCount++; @@ -3885,15 +3990,14 @@ static void Cmd_playstatchangeanimation(void) && !(gBattleMons[gActiveBattler].ability == ABILITY_KEEN_EYE && currStat == STAT_ACC) && !(gBattleMons[gActiveBattler].ability == ABILITY_HYPER_CUTTER && currStat == STAT_ATK)) { - if (gBattleMons[gActiveBattler].statStages[currStat] > 0) + if (gBattleMons[gActiveBattler].statStages[currStat] > MIN_STAT_STAGE) { statAnimId = startingStatAnimId + currStat; changeableStatsCount++; } } } - statsToCheck >>= 1; - currStat++; + statsToCheck >>= 1, currStat++; } if (changeableStatsCount > 1) // more than one stat, so the color is gray @@ -3914,14 +4018,14 @@ static void Cmd_playstatchangeanimation(void) while (statsToCheck != 0) { - if (statsToCheck & 1 && gBattleMons[gActiveBattler].statStages[currStat] < 0xC) + if (statsToCheck & 1 && gBattleMons[gActiveBattler].statStages[currStat] < MAX_STAT_STAGE) { statAnimId = startingStatAnimId + currStat; changeableStatsCount++; } - statsToCheck >>= 1; - currStat++; + statsToCheck >>= 1, currStat++; } + if (changeableStatsCount > 1) // more than one stat, so the color is gray { if (gBattlescriptCurrInstr[3] & STAT_CHANGE_BY_TWO) @@ -3930,6 +4034,7 @@ static void Cmd_playstatchangeanimation(void) statAnimId = STAT_ANIM_MULTIPLE_PLUS1; } } + if (gBattlescriptCurrInstr[3] & STAT_CHANGE_MULTIPLE_STATS && changeableStatsCount < 2) { gBattlescriptCurrInstr += 4; @@ -4019,7 +4124,7 @@ static void Cmd_moveend(void) gBattleScripting.moveendState++; break; case MOVEEND_ON_DAMAGE_ABILITIES: // Such as abilities activating on contact(Poison Spore, Rough Skin, etc.). - if (AbilityBattleEffects(ABILITYEFFECT_MOVE_END, gBattlerTarget, 0, 0, 0)) + if (AbilityBattleEffects(ABILITYEFFECT_ON_DAMAGE, gBattlerTarget, 0, 0, 0)) effect = TRUE; gBattleScripting.moveendState++; break; @@ -4037,8 +4142,8 @@ static void Cmd_moveend(void) case MOVEEND_CHOICE_MOVE: // update choice band move if (gHitMarker & HITMARKER_OBEYS && holdEffectAtk == HOLD_EFFECT_CHOICE_BAND - && gChosenMove != MOVE_STRUGGLE - && (*choicedMoveAtk == 0 || *choicedMoveAtk == 0xFFFF)) + && gChosenMove != MOVE_STRUGGLE + && (*choicedMoveAtk == MOVE_NONE || *choicedMoveAtk == MOVE_UNAVAILABLE)) { if (gChosenMove == MOVE_BATON_PASS && !(gMoveResultFlags & MOVE_RESULT_FAILED)) { @@ -4053,18 +4158,17 @@ static void Cmd_moveend(void) break; } if (i == MAX_MON_MOVES) - *choicedMoveAtk = 0; + *choicedMoveAtk = MOVE_NONE; gBattleScripting.moveendState++; break; case MOVEEND_CHANGED_ITEMS: // changed held items for (i = 0; i < gBattlersCount; i++) { - u16 *changedItem = &gBattleStruct->changedItems[i]; - - if (*changedItem != 0) + u16* changedItem = &gBattleStruct->changedItems[i]; + if (*changedItem != ITEM_NONE) { gBattleMons[i].item = *changedItem; - *changedItem = 0; + *changedItem = ITEM_NONE; } } gBattleScripting.moveendState++; @@ -4082,7 +4186,7 @@ static void Cmd_moveend(void) break; case MOVEEND_ATTACKER_INVISIBLE: // make attacker sprite invisible if (gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE) - && gHitMarker & HITMARKER_NO_ANIMATIONS) + && gHitMarker & HITMARKER_NO_ANIMATIONS) { gActiveBattler = gBattlerAttacker; BtlController_EmitSpriteInvisibility(BUFFER_A, TRUE); @@ -4094,13 +4198,13 @@ static void Cmd_moveend(void) break; case MOVEEND_ATTACKER_VISIBLE: // make attacker sprite visible if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT - || !(gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE)) - || WasUnableToUseMove(gBattlerAttacker)) + || !(gStatuses3[gBattlerAttacker] & (STATUS3_SEMI_INVULNERABLE)) + || WasUnableToUseMove(gBattlerAttacker)) { gActiveBattler = gBattlerAttacker; BtlController_EmitSpriteInvisibility(BUFFER_A, FALSE); MarkBattlerForControllerExec(gActiveBattler); - gStatuses3[gBattlerAttacker] &= ~(STATUS3_SEMI_INVULNERABLE); + gStatuses3[gBattlerAttacker] &= ~STATUS3_SEMI_INVULNERABLE; gSpecialStatuses[gBattlerAttacker].restoredBattlerSprite = 1; gBattleScripting.moveendState++; return; @@ -4108,14 +4212,13 @@ static void Cmd_moveend(void) gBattleScripting.moveendState++; break; case MOVEEND_TARGET_VISIBLE: // make target sprite visible - if (!gSpecialStatuses[gBattlerTarget].restoredBattlerSprite - && gBattlerTarget < gBattlersCount - && !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE)) + if (!gSpecialStatuses[gBattlerTarget].restoredBattlerSprite && gBattlerTarget < gBattlersCount + && !(gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE)) { gActiveBattler = gBattlerTarget; BtlController_EmitSpriteInvisibility(BUFFER_A, FALSE); MarkBattlerForControllerExec(gActiveBattler); - gStatuses3[gBattlerTarget] &= ~(STATUS3_SEMI_INVULNERABLE); + gStatuses3[gBattlerTarget] &= ~STATUS3_SEMI_INVULNERABLE; gBattleScripting.moveendState++; return; } @@ -4125,7 +4228,7 @@ static void Cmd_moveend(void) for (i = 0; i < gBattlersCount; i++) { if (gDisableStructs[i].substituteHP == 0) - gBattleMons[i].status2 &= ~(STATUS2_SUBSTITUTE); + gBattleMons[i].status2 &= ~STATUS2_SUBSTITUTE; } gBattleScripting.moveendState++; break; @@ -4135,7 +4238,7 @@ static void Cmd_moveend(void) gActiveBattler = gBattlerAttacker; gBattlerAttacker = gBattlerTarget; gBattlerTarget = gActiveBattler; - gHitMarker &= ~(HITMARKER_SWAP_ATTACKER_TARGET); + gHitMarker &= ~HITMARKER_SWAP_ATTACKER_TARGET; } if (gHitMarker & HITMARKER_ATTACKSTRING_PRINTED) { @@ -4191,21 +4294,21 @@ static void Cmd_moveend(void) *(gBattleStruct->lastTakenMove + gBattlerTarget * 2 + 0) = gChosenMove; *(gBattleStruct->lastTakenMove + gBattlerTarget * 2 + 1) = gChosenMove >> 8; + target = gBattlerTarget; attacker = gBattlerAttacker; - *(attacker * 2 + target * 8 + (gBattleStruct->lastTakenMoveFrom) + 0) = gChosenMove; + *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 0) = gChosenMove; + target = gBattlerTarget; attacker = gBattlerAttacker; - *(attacker * 2 + target * 8 + (gBattleStruct->lastTakenMoveFrom) + 1) = gChosenMove >> 8; + *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 1) = gChosenMove >> 8; } gBattleScripting.moveendState++; break; case MOVEEND_NEXT_TARGET: // For moves hitting two opposing Pokemon. - if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE) - && gBattleTypeFlags & BATTLE_TYPE_DOUBLE - && !gProtectStructs[gBattlerAttacker].chargingTurn - && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH - && !(gHitMarker & HITMARKER_NO_ATTACKSTRING)) + if (!(gHitMarker & HITMARKER_UNABLE_TO_USE_MOVE) && gBattleTypeFlags & BATTLE_TYPE_DOUBLE + && !gProtectStructs[gBattlerAttacker].chargingTurn && gBattleMoves[gCurrentMove].target == MOVE_TARGET_BOTH + && !(gHitMarker & HITMARKER_NO_ATTACKSTRING)) { u8 battlerId = GetBattlerAtPosition(BATTLE_PARTNER(GetBattlerPosition(gBattlerTarget))); if (gBattleMons[battlerId].hp != 0) @@ -4228,12 +4331,14 @@ static void Cmd_moveend(void) case MOVEEND_COUNT: break; } + if (endMode == 1 && effect == FALSE) gBattleScripting.moveendState = MOVEEND_COUNT; if (endMode == 2 && endState == gBattleScripting.moveendState) gBattleScripting.moveendState = MOVEEND_COUNT; - } - while (gBattleScripting.moveendState != MOVEEND_COUNT && effect == FALSE); + + } while (gBattleScripting.moveendState != MOVEEND_COUNT && effect == FALSE); + if (gBattleScripting.moveendState == MOVEEND_COUNT && effect == FALSE) gBattlescriptCurrInstr += 3; } @@ -4249,7 +4354,7 @@ static void Cmd_typecalc2(void) gLastUsedAbility = gBattleMons[gBattlerTarget].ability; gMoveResultFlags |= (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE); gLastLandedMoves[gBattlerTarget] = 0; - gBattleCommunication[6] = moveType; + gBattleCommunication[MISS_TYPE] = B_MSG_GROUND_MISS; RecordAbilityBattle(gBattlerTarget, gLastUsedAbility); } else @@ -4324,7 +4429,7 @@ static void Cmd_typecalc2(void) gLastUsedAbility = ABILITY_WONDER_GUARD; gMoveResultFlags |= MOVE_RESULT_MISSED; gLastLandedMoves[gBattlerTarget] = 0; - gBattleCommunication[6] = 3; + gBattleCommunication[MISS_TYPE] = B_MSG_AVOIDED_DMG; RecordAbilityBattle(gBattlerTarget, gLastUsedAbility); } if (gMoveResultFlags & MOVE_RESULT_DOESNT_AFFECT_FOE) @@ -4346,14 +4451,17 @@ static void Cmd_returnatktoball(void) static void Cmd_getswitchedmondata(void) { - if (gBattleControllerExecFlags == 0) - { - gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - gBattlerPartyIndexes[gActiveBattler] = *(gBattleStruct->monToSwitchIntoId + gActiveBattler); - BtlController_EmitGetMonData(0, REQUEST_ALL_BATTLE, gBitTable[gBattlerPartyIndexes[gActiveBattler]]); - MarkBattlerForControllerExec(gActiveBattler); - gBattlescriptCurrInstr += 2; - } + if (gBattleControllerExecFlags) + return; + + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + + gBattlerPartyIndexes[gActiveBattler] = *(gBattleStruct->monToSwitchIntoId + gActiveBattler); + + BtlController_EmitGetMonData(BUFFER_A, REQUEST_ALL_BATTLE, gBitTable[gBattlerPartyIndexes[gActiveBattler]]); + MarkBattlerForControllerExec(gActiveBattler); + + gBattlescriptCurrInstr += 2; } static void Cmd_switchindataupdate(void) @@ -4362,56 +4470,67 @@ static void Cmd_switchindataupdate(void) s32 i; u8 *monData; - if (gBattleControllerExecFlags == 0) + if (gBattleControllerExecFlags) + return; + + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + oldData = gBattleMons[gActiveBattler]; + monData = (u8*)(&gBattleMons[gActiveBattler]); + + for (i = 0; i < sizeof(struct BattlePokemon); i++) + monData[i] = gBattleBufferB[gActiveBattler][4 + i]; + + gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1; + gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2; + gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].abilityNum); + + // check knocked off item + i = GetBattlerSide(gActiveBattler); + if (gWishFutureKnock.knockedOffMons[i] & gBitTable[gBattlerPartyIndexes[gActiveBattler]]) { - gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - oldData = gBattleMons[gActiveBattler]; - monData = (u8 *)(&gBattleMons[gActiveBattler]); - for (i = 0; i < sizeof(struct BattlePokemon); i++) - { - monData[i] = gBattleBufferB[gActiveBattler][4 + i]; - } - gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1; - gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2; - gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].abilityNum); - // check knocked off item - i = GetBattlerSide(gActiveBattler); - if (gWishFutureKnock.knockedOffMons[i] & gBitTable[gBattlerPartyIndexes[gActiveBattler]]) - gBattleMons[gActiveBattler].item = 0; - if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS) - { - for (i = 0; i < NUM_BATTLE_STATS; i++) - { - gBattleMons[gActiveBattler].statStages[i] = oldData.statStages[i]; - } - gBattleMons[gActiveBattler].status2 = oldData.status2; - } - SwitchInClearSetData(); - gBattleScripting.battler = gActiveBattler; - PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gActiveBattler, gBattlerPartyIndexes[gActiveBattler]); - gBattlescriptCurrInstr += 2; + gBattleMons[gActiveBattler].item = ITEM_NONE; } + + if (gBattleMoves[gCurrentMove].effect == EFFECT_BATON_PASS) + { + for (i = 0; i < NUM_BATTLE_STATS; i++) + { + gBattleMons[gActiveBattler].statStages[i] = oldData.statStages[i]; + } + gBattleMons[gActiveBattler].status2 = oldData.status2; + } + + SwitchInClearSetData(); + + gBattleScripting.battler = gActiveBattler; + + PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gActiveBattler, gBattlerPartyIndexes[gActiveBattler]); + + gBattlescriptCurrInstr += 2; } static void Cmd_switchinanim(void) { - if (gBattleControllerExecFlags == 0) - { - gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT - && !(gBattleTypeFlags & - (BATTLE_TYPE_LINK - | BATTLE_TYPE_LEGENDARY - | BATTLE_TYPE_OLD_MAN_TUTORIAL - | BATTLE_TYPE_POKEDUDE - | BATTLE_TYPE_EREADER_TRAINER - | BATTLE_TYPE_GHOST))) - HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality); - gAbsentBattlerFlags &= ~(gBitTable[gActiveBattler]); - BtlController_EmitSwitchInAnim(0, gBattlerPartyIndexes[gActiveBattler], gBattlescriptCurrInstr[2]); - MarkBattlerForControllerExec(gActiveBattler); - gBattlescriptCurrInstr += 3; - } + if (gBattleControllerExecFlags) + return; + + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + + if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT + && !(gBattleTypeFlags & (BATTLE_TYPE_LINK + | BATTLE_TYPE_LEGENDARY + | BATTLE_TYPE_OLD_MAN_TUTORIAL + | BATTLE_TYPE_POKEDUDE + | BATTLE_TYPE_EREADER_TRAINER + | BATTLE_TYPE_GHOST))) + HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality); + + gAbsentBattlerFlags &= ~(gBitTable[gActiveBattler]); + + BtlController_EmitSwitchInAnim(BUFFER_A, gBattlerPartyIndexes[gActiveBattler], gBattlescriptCurrInstr[2]); + MarkBattlerForControllerExec(gActiveBattler); + + gBattlescriptCurrInstr += 3; } static void Cmd_jumpifcantswitch(void) @@ -4420,10 +4539,10 @@ static void Cmd_jumpifcantswitch(void) s32 lastMonId; struct Pokemon *party; - gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(ATK4F_DONT_CHECK_STATUSES)); - if (!(gBattlescriptCurrInstr[1] & ATK4F_DONT_CHECK_STATUSES) - && ((gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)) - || (gStatuses3[gActiveBattler] & STATUS3_ROOTED))) + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~SWITCH_IGNORE_ESCAPE_PREVENTION); + if (!(gBattlescriptCurrInstr[1] & SWITCH_IGNORE_ESCAPE_PREVENTION) + && ((gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION)) + || (gStatuses3[gActiveBattler] & STATUS3_ROOTED))) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2); } @@ -4445,6 +4564,7 @@ static void Cmd_jumpifcantswitch(void) && gBattlerPartyIndexes[gActiveBattler] != i) break; } + if (i == lastMonId) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2); else @@ -4457,41 +4577,49 @@ static void Cmd_jumpifcantswitch(void) if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT) { battlerIn1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) battlerIn2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); else battlerIn2 = battlerIn1; + party = gEnemyParty; } else { battlerIn1 = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) battlerIn2 = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); else battlerIn2 = battlerIn1; + party = gPlayerParty; } + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&party[i], MON_DATA_HP) != 0 && GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&party[i], MON_DATA_IS_EGG) - && i != gBattlerPartyIndexes[battlerIn1] - && i != gBattlerPartyIndexes[battlerIn2]) + && i != gBattlerPartyIndexes[battlerIn1] && i != gBattlerPartyIndexes[battlerIn2]) break; } - if (i == 6) + + if (i == PARTY_SIZE) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2); else gBattlescriptCurrInstr += 6; } } -static void ChooseMonToSendOut(u8 arg0) +// Opens the party screen to choose a new Pokémon to send out. +// slotId is the Pokémon to replace. +// Note that this is not used by the Switch action, only replacing fainted Pokémon or Baton Pass +static void ChooseMonToSendOut(u8 slotId) { *(gBattleStruct->battlerPartyIndexes + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler]; - BtlController_EmitChoosePokemon(0, PARTY_ACTION_SEND_OUT, arg0, 0, gBattleStruct->battlerPartyOrders[gActiveBattler]); + BtlController_EmitChoosePokemon(BUFFER_A, PARTY_ACTION_SEND_OUT, slotId, ABILITY_NONE, gBattleStruct->battlerPartyOrders[gActiveBattler]); MarkBattlerForControllerExec(gActiveBattler); } @@ -4505,11 +4633,12 @@ static void Cmd_openpartyscreen(void) battlerId = 0; flags = 0; jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 2); - if (gBattlescriptCurrInstr[1] == 5) + + if (gBattlescriptCurrInstr[1] == BS_FAINTED_LINK_MULTIPLE_1) { if ((gBattleTypeFlags & (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_MULTI)) != BATTLE_TYPE_DOUBLE) { - for (gActiveBattler = 0; gActiveBattler < gBattlersCount; ++gActiveBattler) + for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++) { if (gHitMarker & HITMARKER_FAINTED(gActiveBattler)) { @@ -4522,7 +4651,7 @@ static void Cmd_openpartyscreen(void) } else if (!gSpecialStatuses[gActiveBattler].faintedHasReplacement) { - ChooseMonToSendOut(6); + ChooseMonToSendOut(PARTY_SIZE); gSpecialStatuses[gActiveBattler].faintedHasReplacement = TRUE; } } @@ -4535,9 +4664,10 @@ static void Cmd_openpartyscreen(void) } else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - u8 flag40_0, flag40_1, flag40_2, flag40_3; + bool8 hasReplacement_0, hasReplacement_1, hasReplacement_2, hasReplacement_3; + + hitmarkerFaintBits = gHitMarker >> 28; - hitmarkerFaintBits = gHitMarker >> 0x1C; if (gBitTable[0] & hitmarkerFaintBits) { gActiveBattler = 0; @@ -4624,11 +4754,12 @@ static void Cmd_openpartyscreen(void) MarkBattlerForControllerExec(gActiveBattler); } } - flag40_0 = gSpecialStatuses[0].faintedHasReplacement; - if (!flag40_0) + + hasReplacement_0 = gSpecialStatuses[0].faintedHasReplacement; + if (!hasReplacement_0) { - flag40_2 = gSpecialStatuses[2].faintedHasReplacement; - if (!flag40_2 && hitmarkerFaintBits != 0) + hasReplacement_2 = gSpecialStatuses[2].faintedHasReplacement; + if (!hasReplacement_2 && hitmarkerFaintBits != 0) { if (gAbsentBattlerFlags & gBitTable[0]) gActiveBattler = 2; @@ -4640,16 +4771,17 @@ static void Cmd_openpartyscreen(void) } } - flag40_1 = gSpecialStatuses[1].faintedHasReplacement; - if (!flag40_1) + hasReplacement_1 = gSpecialStatuses[1].faintedHasReplacement; + if (!hasReplacement_1) { - flag40_3 = gSpecialStatuses[3].faintedHasReplacement; - if (!flag40_3 && hitmarkerFaintBits != 0) + hasReplacement_3 = gSpecialStatuses[3].faintedHasReplacement; + if (!hasReplacement_3 && hitmarkerFaintBits != 0) { if (gAbsentBattlerFlags & gBitTable[1]) gActiveBattler = 3; else gActiveBattler = 1; + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); } @@ -4657,7 +4789,7 @@ static void Cmd_openpartyscreen(void) } gBattlescriptCurrInstr += 6; } - else if (gBattlescriptCurrInstr[1] == 6) + else if (gBattlescriptCurrInstr[1] == BS_FAINTED_LINK_MULTIPLE_2) { if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) { @@ -4683,7 +4815,7 @@ static void Cmd_openpartyscreen(void) if (gBitTable[3] & hitmarkerFaintBits && hitmarkerFaintBits & gBitTable[1]) { gActiveBattler = 3; - if (HasNoMonsToSwitch(gActiveBattler, gBattleBufferB[1][1], 6)) + if (HasNoMonsToSwitch(gActiveBattler, gBattleBufferB[1][1], PARTY_SIZE)) { gAbsentBattlerFlags |= gBitTable[gActiveBattler]; gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler); @@ -4700,36 +4832,34 @@ static void Cmd_openpartyscreen(void) } else { + // Not multi or double battle gBattlescriptCurrInstr += 6; } } else { + // Multi battle gBattlescriptCurrInstr += 6; } - hitmarkerFaintBits = gHitMarker >> 0x1C; + hitmarkerFaintBits = gHitMarker >> 28; gBattlerFainted = 0; - while (1) - { - if (gBitTable[gBattlerFainted] & hitmarkerFaintBits) - break; - if (gBattlerFainted >= gBattlersCount) - break; + while (!(gBitTable[gBattlerFainted] & hitmarkerFaintBits) + && gBattlerFainted < gBattlersCount) gBattlerFainted++; - } if (gBattlerFainted == gBattlersCount) gBattlescriptCurrInstr = jumpPtr; } else { - if (gBattlescriptCurrInstr[1] & OPEN_PARTY_ALLOW_CANCEL) + if (gBattlescriptCurrInstr[1] & PARTY_SCREEN_OPTIONAL) hitmarkerFaintBits = PARTY_ACTION_CHOOSE_MON; // Used here as the caseId for the EmitChoose function. else hitmarkerFaintBits = PARTY_ACTION_SEND_OUT; - battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(OPEN_PARTY_ALLOW_CANCEL)); + + battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~PARTY_SCREEN_OPTIONAL); if (gSpecialStatuses[battlerId].faintedHasReplacement) { gBattlescriptCurrInstr += 6; @@ -4745,15 +4875,18 @@ static void Cmd_openpartyscreen(void) { gActiveBattler = battlerId; *(gBattleStruct->battlerPartyIndexes + gActiveBattler) = gBattlerPartyIndexes[gActiveBattler]; - BtlController_EmitChoosePokemon(0, hitmarkerFaintBits, *(gBattleStruct->monToSwitchIntoId + (gActiveBattler ^ 2)), 0, gBattleStruct->battlerPartyOrders[gActiveBattler]); + + BtlController_EmitChoosePokemon(BUFFER_A, hitmarkerFaintBits, *(gBattleStruct->monToSwitchIntoId + (gActiveBattler ^ 2)), 0, gBattleStruct->battlerPartyOrders[gActiveBattler]); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 6; - if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_LEFT && gBattleResults.playerSwitchesCounter < 0xFF) - ++gBattleResults.playerSwitchesCounter; + + if (GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_LEFT && gBattleResults.playerSwitchesCounter < 255) + gBattleResults.playerSwitchesCounter++; if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - for (gActiveBattler = 0; gActiveBattler < gBattlersCount; ++gActiveBattler) + for (gActiveBattler = 0; gActiveBattler < gBattlersCount; gActiveBattler++) { if (gActiveBattler != battlerId) { @@ -4767,6 +4900,7 @@ static void Cmd_openpartyscreen(void) gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(battlerId) ^ BIT_SIDE); if (gAbsentBattlerFlags & gBitTable[gActiveBattler]) gActiveBattler ^= BIT_FLANK; + BtlController_EmitLinkStandbyMsg(BUFFER_A, LINK_STANDBY_MSG_ONLY); MarkBattlerForControllerExec(gActiveBattler); } @@ -4777,44 +4911,51 @@ static void Cmd_openpartyscreen(void) static void Cmd_switchhandleorder(void) { s32 i; + if (gBattleControllerExecFlags) + return; - if (gBattleControllerExecFlags == 0) + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + + switch (gBattlescriptCurrInstr[2]) { - gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - switch (gBattlescriptCurrInstr[2]) + case 0: + for (i = 0; i < gBattlersCount; i++) { - case 0: - for (i = 0; i < gBattlersCount; i++) - if (gBattleBufferB[i][0] == 0x22) - *(gBattleStruct->monToSwitchIntoId + i) = gBattleBufferB[i][1]; - break; - case 1: - if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) - UpdatePartyOwnerOnSwitch_NonMulti(gActiveBattler); - break; - case 2: - gBattleCommunication[0] = gBattleBufferB[gActiveBattler][1]; - *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = gBattleBufferB[gActiveBattler][1]; - - if (gBattleTypeFlags & BATTLE_TYPE_MULTI) + if (gBattleBufferB[i][0] == CONTROLLER_CHOSENMONRETURNVALUE) { - *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) &= 0xF; - *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleBufferB[gActiveBattler][2] & 0xF0); - *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 1) = gBattleBufferB[gActiveBattler][3]; - *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) &= (0xF0); - *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleBufferB[gActiveBattler][2] & 0xF0) >> 4; - *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 2) = gBattleBufferB[gActiveBattler][3]; + *(gBattleStruct->monToSwitchIntoId + i) = gBattleBufferB[i][1]; } - else - { - UpdatePartyOwnerOnSwitch_NonMulti(gActiveBattler); - } - PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerAttacker].species) - PREPARE_MON_NICK_BUFFER(gBattleTextBuff2, gActiveBattler, gBattleBufferB[gActiveBattler][1]) - break; } - gBattlescriptCurrInstr += 3; + break; + case 1: + if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) + UpdatePartyOwnerOnSwitch_NonMulti(gActiveBattler); + break; + case 2: + gBattleCommunication[0] = gBattleBufferB[gActiveBattler][1]; + *(gBattleStruct->monToSwitchIntoId + gActiveBattler) = gBattleBufferB[gActiveBattler][1]; + + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) + { + *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) &= 0xF; + *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleBufferB[gActiveBattler][2] & 0xF0); + *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 1) = gBattleBufferB[gActiveBattler][3]; + + *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) &= (0xF0); + *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleBufferB[gActiveBattler][2] & 0xF0) >> 4; + *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 2) = gBattleBufferB[gActiveBattler][3]; + } + else + { + UpdatePartyOwnerOnSwitch_NonMulti(gActiveBattler); + } + PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerAttacker].species) + PREPARE_MON_NICK_BUFFER(gBattleTextBuff2, gActiveBattler, gBattleBufferB[gActiveBattler][1]) + + break; } + + gBattlescriptCurrInstr += 3; } static void Cmd_switchineffects(void) @@ -4823,22 +4964,31 @@ static void Cmd_switchineffects(void) gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); UpdateSentPokesToOpponentValue(gActiveBattler); + gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler); gSpecialStatuses[gActiveBattler].faintedHasReplacement = FALSE; + if (!(gSideStatuses[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES_DAMAGED) - && (gSideStatuses[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES) - && !IS_BATTLER_OF_TYPE(gActiveBattler, TYPE_FLYING) - && gBattleMons[gActiveBattler].ability != ABILITY_LEVITATE) + && (gSideStatuses[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES) + && !IS_BATTLER_OF_TYPE(gActiveBattler, TYPE_FLYING) + && gBattleMons[gActiveBattler].ability != ABILITY_LEVITATE) { u8 spikesDmg; gSideStatuses[GetBattlerSide(gActiveBattler)] |= SIDE_STATUS_SPIKES_DAMAGED; + + // Present in pokeemerald but not here + // gBattleMons[gActiveBattler].status2 &= ~STATUS2_DESTINY_BOND; + // gHitMarker &= ~HITMARKER_DESTINYBOND; + spikesDmg = (5 - gSideTimers[GetBattlerSide(gActiveBattler)].spikesAmount) * 2; gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / (spikesDmg); if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; + gBattleScripting.battler = gActiveBattler; BattleScriptPushCursor(); + if (gBattlescriptCurrInstr[1] == BS_TARGET) gBattlescriptCurrInstr = BattleScript_SpikesOnTarget; else if (gBattlescriptCurrInstr[1] == BS_ATTACKER) @@ -4848,8 +4998,14 @@ static void Cmd_switchineffects(void) } else { + // There is a hack here in pokeemerald to ensure the truant counter will be 0 when the battler's next turn starts. + // The truant counter is not updated in the case where a mon switches in after a lost judgement in the battle arena. if (gBattleMons[gActiveBattler].ability == ABILITY_TRUANT) + //if (gBattleMons[gActiveBattler].ability == ABILITY_TRUANT && !gDisableStructs[gActiveBattler].truantSwitchInHack) // In pokeemerald. gDisableStructs[gActiveBattler].truantCounter = 1; + + //gDisableStructs[gActiveBattler].truantSwitchInHack = 0; // In pokeemerald, otherwise unused. + if (!AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0) && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE)) { @@ -4863,11 +5019,11 @@ static void Cmd_switchineffects(void) for (i = 0; i < gBattlersCount; i++) { - u16 *hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(i)]; + u16* hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(i)]; *hpOnSwitchout = gBattleMons[i].hp; } - if (gBattlescriptCurrInstr[1] == 5) + if (gBattlescriptCurrInstr[1] == BS_FAINTED_LINK_MULTIPLE_1) { u32 hitmarkerFaintBits = gHitMarker >> 28; @@ -4894,6 +5050,7 @@ static void Cmd_trainerslidein(void) gActiveBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); BtlController_EmitTrainerSlide(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 2; } @@ -4902,6 +5059,7 @@ static void Cmd_playse(void) gActiveBattler = gBattlerAttacker; BtlController_EmitPlaySE(BUFFER_A, T2_READ_16(gBattlescriptCurrInstr + 1)); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 3; } @@ -4910,6 +5068,7 @@ static void Cmd_fanfare(void) gActiveBattler = gBattlerAttacker; BtlController_EmitPlayFanfare(BUFFER_A, T2_READ_16(gBattlescriptCurrInstr + 1)); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 3; } @@ -4918,6 +5077,7 @@ static void Cmd_playfaintcry(void) gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); BtlController_EmitFaintingCry(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 2; } @@ -4926,6 +5086,7 @@ static void Cmd_endlinkbattle(void) gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); BtlController_EmitEndLinkBattle(BUFFER_A, gBattleOutcome); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 1; } @@ -4934,6 +5095,7 @@ static void Cmd_returntoball(void) gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); BtlController_EmitReturnMonToBall(BUFFER_A, TRUE); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 2; } @@ -4941,10 +5103,11 @@ static void Cmd_handlelearnnewmove(void) { const u8 *learnedMovePtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); const u8 *nothingToLearnPtr = T1_READ_PTR(gBattlescriptCurrInstr + 5); + u16 learnMove = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], gBattlescriptCurrInstr[9]); - while (learnMove == MON_ALREADY_KNOWS_MOVE) learnMove = MonTryLearningNewMove(&gPlayerParty[gBattleStruct->expGetterMonId], FALSE); + if (learnMove == MOVE_NONE) { gBattlescriptCurrInstr = nothingToLearnPtr; @@ -4956,6 +5119,7 @@ static void Cmd_handlelearnnewmove(void) else { gActiveBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); + if (gBattlerPartyIndexes[gActiveBattler] == gBattleStruct->expGetterMonId && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) { @@ -4970,6 +5134,7 @@ static void Cmd_handlelearnnewmove(void) GiveMoveToBattleMon(&gBattleMons[gActiveBattler], learnMove); } } + gBattlescriptCurrInstr = learnedMovePtr; } } @@ -4981,9 +5146,9 @@ static void Cmd_yesnoboxlearnmove(void) switch (gBattleScripting.learnMoveState) { case 0: - HandleBattleWindow(0x17, 8, 0x1D, 0xD, 0); + HandleBattleWindow(23, 8, 29, 13, 0); BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); - ++gBattleScripting.learnMoveState; + gBattleScripting.learnMoveState++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); break; @@ -5007,9 +5172,9 @@ static void Cmd_yesnoboxlearnmove(void) PlaySE(SE_SELECT); if (gBattleCommunication[1] == 0) { - HandleBattleWindow(0x17, 0x8, 0x1D, 0xD, WINDOW_CLEAR); - BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK); - ++gBattleScripting.learnMoveState; + HandleBattleWindow(23, 8, 29, 13, WINDOW_CLEAR); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); + gBattleScripting.learnMoveState++; } else { @@ -5027,15 +5192,14 @@ static void Cmd_yesnoboxlearnmove(void) { FreeAllWindowBuffers(); ShowSelectMovePokemonSummaryScreen(gPlayerParty, gBattleStruct->expGetterMonId, gPlayerPartyCount - 1, ReshowBattleScreenAfterMenu, gMoveToLearn); - ++gBattleScripting.learnMoveState; + gBattleScripting.learnMoveState++; } break; case 3: if (!gPaletteFade.active && gMain.callback2 == BattleMainCB2) { u8 movePosition = GetMoveSlotToReplace(); - - if (movePosition == 4) + if (movePosition == MAX_MON_MOVES) { gBattleScripting.learnMoveState = 4; } @@ -5051,20 +5215,20 @@ static void Cmd_yesnoboxlearnmove(void) else { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); + PREPARE_MOVE_BUFFER(gBattleTextBuff2, moveId) + RemoveMonPPBonus(&gPlayerParty[gBattleStruct->expGetterMonId], movePosition); SetMonMoveSlot(&gPlayerParty[gBattleStruct->expGetterMonId], gMoveToLearn, movePosition); - if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId - && !(gBattleMons[0].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[0].mimickedMoves & gBitTable[movePosition])) + + if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId && MOVE_IS_PERMANENT(0, movePosition)) { RemoveBattleMonPPBonus(&gBattleMons[0], movePosition); SetBattleMonMoveSlot(&gBattleMons[0], gMoveToLearn, movePosition); } if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE - && gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId - && !(gBattleMons[2].status2 & STATUS2_TRANSFORMED) - && !(gDisableStructs[2].mimickedMoves & gBitTable[movePosition])) + && gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId + && MOVE_IS_PERMANENT(2, movePosition)) { RemoveBattleMonPPBonus(&gBattleMons[2], movePosition); SetBattleMonMoveSlot(&gBattleMons[2], gMoveToLearn, movePosition); @@ -5074,7 +5238,7 @@ static void Cmd_yesnoboxlearnmove(void) } break; case 4: - HandleBattleWindow(0x17, 8, 0x1D, 0xD, WINDOW_CLEAR); + HandleBattleWindow(23, 8, 29, 13, WINDOW_CLEAR); gBattlescriptCurrInstr += 5; break; case 5: @@ -5091,9 +5255,9 @@ static void Cmd_yesnoboxstoplearningmove(void) switch (gBattleScripting.learnMoveState) { case 0: - HandleBattleWindow(0x17, 8, 0x1D, 0xD, 0); + HandleBattleWindow(23, 8, 29, 13, 0); BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); - ++gBattleScripting.learnMoveState; + gBattleScripting.learnMoveState++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); break; @@ -5120,13 +5284,14 @@ static void Cmd_yesnoboxstoplearningmove(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); else gBattlescriptCurrInstr += 5; - HandleBattleWindow(0x17, 0x8, 0x1D, 0xD, WINDOW_CLEAR); + + HandleBattleWindow(23, 8, 29, 13, WINDOW_CLEAR); } else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); - HandleBattleWindow(0x17, 0x8, 0x1D, 0xD, WINDOW_CLEAR); + HandleBattleWindow(23, 8, 29, 13, WINDOW_CLEAR); } break; } @@ -5135,15 +5300,14 @@ static void Cmd_yesnoboxstoplearningmove(void) static void Cmd_hitanimation(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT) { gBattlescriptCurrInstr += 2; } - else if (!(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE) - || !(gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE) - || gDisableStructs[gActiveBattler].substituteHP == 0) + else if (!(gHitMarker & HITMARKER_IGNORE_SUBSTITUTE) || !(gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE) || gDisableStructs[gActiveBattler].substituteHP == 0) { - BtlController_EmitHitAnimation(0); + BtlController_EmitHitAnimation(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 2; } @@ -5221,6 +5385,7 @@ static void Cmd_getmoneyreward(void) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } +// Command is never used static void Cmd_updatebattlermoves(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); @@ -5228,16 +5393,15 @@ static void Cmd_updatebattlermoves(void) switch (gBattleCommunication[0]) { case 0: - BtlController_EmitGetMonData(0, REQUEST_ALL_BATTLE, 0); + BtlController_EmitGetMonData(BUFFER_A, REQUEST_ALL_BATTLE, 0); MarkBattlerForControllerExec(gActiveBattler); - ++gBattleCommunication[0]; + gBattleCommunication[0]++; break; case 1: if (gBattleControllerExecFlags == 0) { s32 i; - struct BattlePokemon *bufferPoke = (struct BattlePokemon *) &gBattleBufferB[gActiveBattler][4]; - + struct BattlePokemon *bufferPoke = (struct BattlePokemon*) &gBattleBufferB[gActiveBattler][4]; for (i = 0; i < MAX_MON_MOVES; i++) { gBattleMons[gActiveBattler].moves[i] = bufferPoke->moves[i]; @@ -5277,40 +5441,43 @@ static void Cmd_drawpartystatussummary(void) struct Pokemon *party; struct HpAndStatus hpStatuses[PARTY_SIZE]; - if (gBattleControllerExecFlags == 0) + if (gBattleControllerExecFlags) + return; + + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + + if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) + party = gPlayerParty; + else + party = gEnemyParty; + + for (i = 0; i < PARTY_SIZE; i++) { - gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - - if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) - party = gPlayerParty; - else - party = gEnemyParty; - - for (i = 0; i < PARTY_SIZE; i++) + if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_NONE + || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) { - if (GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_NONE - || GetMonData(&party[i], MON_DATA_SPECIES2) == SPECIES_EGG) - { - hpStatuses[i].hp = 0xFFFF; - hpStatuses[i].status = 0; - } - else - { - hpStatuses[i].hp = GetMonData(&party[i], MON_DATA_HP); - hpStatuses[i].status = GetMonData(&party[i], MON_DATA_STATUS); - } + hpStatuses[i].hp = 0xFFFF; + hpStatuses[i].status = 0; + } + else + { + hpStatuses[i].hp = GetMonData(&party[i], MON_DATA_HP); + hpStatuses[i].status = GetMonData(&party[i], MON_DATA_STATUS); } - BtlController_EmitDrawPartyStatusSummary(0, hpStatuses, 1); - MarkBattlerForControllerExec(gActiveBattler); - gBattlescriptCurrInstr += 2; } + + BtlController_EmitDrawPartyStatusSummary(BUFFER_A, hpStatuses, 1); + MarkBattlerForControllerExec(gActiveBattler); + + gBattlescriptCurrInstr += 2; } static void Cmd_hidepartystatussummary(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - BtlController_EmitHidePartyStatusSummary(0); + BtlController_EmitHidePartyStatusSummary(BUFFER_A); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 2; } @@ -5320,6 +5487,7 @@ static void Cmd_jumptocalledmove(void) gCurrentMove = gCalledMove; else gChosenMove = gCurrentMove = gCalledMove; + gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; } @@ -5329,10 +5497,10 @@ static void Cmd_statusanimation(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE) - && gDisableStructs[gActiveBattler].substituteHP == 0 - && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) + && gDisableStructs[gActiveBattler].substituteHP == 0 + && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) { - BtlController_EmitStatusAnimation(0, FALSE, gBattleMons[gActiveBattler].status1); + BtlController_EmitStatusAnimation(BUFFER_A, FALSE, gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); } gBattlescriptCurrInstr += 2; @@ -5348,10 +5516,10 @@ static void Cmd_status2animation(void) gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); wantedToAnimate = T1_READ_32(gBattlescriptCurrInstr + 2); if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE) - && gDisableStructs[gActiveBattler].substituteHP == 0 - && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) + && gDisableStructs[gActiveBattler].substituteHP == 0 + && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) { - BtlController_EmitStatusAnimation(0, TRUE, gBattleMons[gActiveBattler].status2 & wantedToAnimate); + BtlController_EmitStatusAnimation(BUFFER_A, TRUE, gBattleMons[gActiveBattler].status2 & wantedToAnimate); MarkBattlerForControllerExec(gActiveBattler); } gBattlescriptCurrInstr += 6; @@ -5367,10 +5535,10 @@ static void Cmd_chosenstatusanimation(void) gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); wantedStatus = T1_READ_32(gBattlescriptCurrInstr + 3); if (!(gStatuses3[gActiveBattler] & STATUS3_SEMI_INVULNERABLE) - && gDisableStructs[gActiveBattler].substituteHP == 0 - && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) + && gDisableStructs[gActiveBattler].substituteHP == 0 + && !(gHitMarker & HITMARKER_NO_ANIMATIONS)) { - BtlController_EmitStatusAnimation(0, gBattlescriptCurrInstr[2], wantedStatus); + BtlController_EmitStatusAnimation(BUFFER_A, gBattlescriptCurrInstr[2], wantedStatus); MarkBattlerForControllerExec(gActiveBattler); } gBattlescriptCurrInstr += 7; @@ -5382,9 +5550,9 @@ static void Cmd_yesnobox(void) switch (gBattleCommunication[0]) { case 0: - HandleBattleWindow(0x17, 8, 0x1D, 0xD, 0); + HandleBattleWindow(23, 8, 29, 13, 0); BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); - ++gBattleCommunication[0]; + gBattleCommunication[0]++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); break; @@ -5407,13 +5575,13 @@ static void Cmd_yesnobox(void) { gBattleCommunication[CURSOR_POSITION] = 1; PlaySE(SE_SELECT); - HandleBattleWindow(0x17, 8, 0x1D, 0xD, WINDOW_CLEAR); + HandleBattleWindow(23, 8, 29, 13, WINDOW_CLEAR); gBattlescriptCurrInstr++; } else if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); - HandleBattleWindow(0x17, 8, 0x1D, 0xD, WINDOW_CLEAR); + HandleBattleWindow(23, 8, 29, 13, WINDOW_CLEAR); gBattlescriptCurrInstr++; } break; @@ -5426,11 +5594,11 @@ static void Cmd_cancelallactions(void) for (i = 0; i < gBattlersCount; i++) gActionsByTurnOrder[i] = B_ACTION_CANCEL_PARTNER; + gBattlescriptCurrInstr++; } -// The same as 0x7, except there's no random damage multiplier. -static void Cmd_adjustsetdamage(void) +static void Cmd_adjustsetdamage(void) // The same as adjustnormaldamage, except there's no random damage multiplier. { u8 holdEffect, param; @@ -5444,7 +5612,9 @@ static void Cmd_adjustsetdamage(void) holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); } + gPotentialItemEffectBattler = gBattlerTarget; + if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param) { RecordItemEffectBattle(gBattlerTarget, holdEffect); @@ -5470,20 +5640,24 @@ static void Cmd_adjustsetdamage(void) static void Cmd_removeitem(void) { - u16 *usedHeldItem; + u16* usedHeldItem; gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + usedHeldItem = &gBattleStruct->usedHeldItems[gActiveBattler]; *usedHeldItem = gBattleMons[gActiveBattler].item; gBattleMons[gActiveBattler].item = ITEM_NONE; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item); + + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, sizeof(gBattleMons[gActiveBattler].item), &gBattleMons[gActiveBattler].item); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 2; } static void Cmd_atknameinbuff1(void) { PREPARE_MON_NICK_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattlerPartyIndexes[gBattlerAttacker]) + gBattlescriptCurrInstr++; } @@ -5491,6 +5665,9 @@ static void Cmd_drawlvlupbox(void) { if (gBattleScripting.drawlvlupboxState == 0) { + // If the Pokémon getting exp is not in-battle then + // slide out a banner with their name and icon on it. + // Otherwise skip ahead. if (IsMonGettingExpSentOut()) gBattleScripting.drawlvlupboxState = 3; else @@ -5500,10 +5677,11 @@ static void Cmd_drawlvlupbox(void) switch (gBattleScripting.drawlvlupboxState) { case 1: - gBattle_BG2_Y = 0x60; + // Start level up banner + gBattle_BG2_Y = 96; SetBgAttribute(2, BG_ATTR_PRIORITY, 0); ShowBg(2); - sub_8026480(); + InitLevelUpBanner(); gBattleScripting.drawlvlupboxState = 2; break; case 2: @@ -5511,44 +5689,49 @@ static void Cmd_drawlvlupbox(void) gBattleScripting.drawlvlupboxState = 3; break; case 3: + // Init level up box gBattle_BG1_X = 0; - gBattle_BG1_Y = 0x100; + gBattle_BG1_Y = 256; SetBgAttribute(0, BG_ATTR_PRIORITY, 1); SetBgAttribute(1, BG_ATTR_PRIORITY, 0); ShowBg(0); ShowBg(1); - HandleBattleWindow(18, 7, 0x1D, 0x13, WINDOW_x80); + HandleBattleWindow(18, 7, 29, 19, WINDOW_BG1); gBattleScripting.drawlvlupboxState = 4; break; case 4: + // Draw page 1 of level up box DrawLevelUpWindow1(); - PutWindowTilemap(12); - CopyWindowToVram(12, COPYWIN_BOTH); - ++gBattleScripting.drawlvlupboxState; + PutWindowTilemap(B_WIN_LEVEL_UP_BOX); + CopyWindowToVram(B_WIN_LEVEL_UP_BOX, COPYWIN_FULL); + gBattleScripting.drawlvlupboxState++; break; case 5: case 7: + // Wait for draw after each page if (!IsDma3ManagerBusyWithBgCopy()) { gBattle_BG1_Y = 0; - ++gBattleScripting.drawlvlupboxState; + gBattleScripting.drawlvlupboxState++; } break; case 6: - if (gMain.newKeys) + if (gMain.newKeys != 0) { + // Draw page 2 of level up box PlaySE(SE_SELECT); DrawLevelUpWindow2(); - CopyWindowToVram(12, COPYWIN_GFX); - ++gBattleScripting.drawlvlupboxState; + CopyWindowToVram(B_WIN_LEVEL_UP_BOX, COPYWIN_GFX); + gBattleScripting.drawlvlupboxState++; } break; case 8: - if (gMain.newKeys) + if (gMain.newKeys != 0) { + // Close level up box PlaySE(SE_SELECT); - HandleBattleWindow(18, 7, 0x1D, 0x13, WINDOW_x80 | WINDOW_CLEAR); - ++gBattleScripting.drawlvlupboxState; + HandleBattleWindow(18, 7, 29, 19, WINDOW_BG1 | WINDOW_CLEAR); + gBattleScripting.drawlvlupboxState++; } break; case 9: @@ -5562,6 +5745,7 @@ static void Cmd_drawlvlupbox(void) SetBgAttribute(2, BG_ATTR_PRIORITY, 2); ShowBg(2); + gBattleScripting.drawlvlupboxState = 10; } break; @@ -5583,7 +5767,7 @@ static void DrawLevelUpWindow1(void) u16 currStats[NUM_STATS]; GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], currStats); - DrawLevelUpWindowPg1(12, gBattleResources->beforeLvlUp->stats, currStats, 0xE, 0xD, 0xF); + DrawLevelUpWindowPg1(B_WIN_LEVEL_UP_BOX, gBattleResources->beforeLvlUp->stats, currStats, TEXT_DYNAMIC_COLOR_5, TEXT_DYNAMIC_COLOR_4, TEXT_DYNAMIC_COLOR_6); } static void DrawLevelUpWindow2(void) @@ -5591,18 +5775,20 @@ static void DrawLevelUpWindow2(void) u16 currStats[NUM_STATS]; GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], currStats); - DrawLevelUpWindowPg2(12, currStats, 0xE, 0xD, 0xF); + DrawLevelUpWindowPg2(B_WIN_LEVEL_UP_BOX, currStats, TEXT_DYNAMIC_COLOR_5, TEXT_DYNAMIC_COLOR_4, TEXT_DYNAMIC_COLOR_6); } -static void sub_8026480(void) +static void InitLevelUpBanner(void) { gBattle_BG2_Y = 0; - gBattle_BG2_X = 0x1A0; + gBattle_BG2_X = LEVEL_UP_BANNER_START; + LoadPalette(sLevelUpBanner_Pal, 0x60, 0x20); - CopyToWindowPixelBuffer(13, sLevelUpBanner_Gfx, 0, 0); - PutWindowTilemap(13); - CopyWindowToVram(13, COPYWIN_BOTH); - PutMonIconOnLvlUpBox(); + CopyToWindowPixelBuffer(B_WIN_LEVEL_UP_BANNER, sLevelUpBanner_Gfx, 0, 0); + PutWindowTilemap(B_WIN_LEVEL_UP_BANNER); + CopyWindowToVram(B_WIN_LEVEL_UP_BANNER, COPYWIN_FULL); + + PutMonIconOnLvlUpBanner(); } static bool8 SlideInLevelUpBanner(void) @@ -5634,9 +5820,10 @@ static void DrawLevelUpBannerText(void) monLevel = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_LEVEL); monGender = GetMonGender(&gPlayerParty[gBattleStruct->expGetterMonId]); GetMonNickname(&gPlayerParty[gBattleStruct->expGetterMonId], gStringVar4); + printerTemplate.currentChar = gStringVar4; printerTemplate.windowId = B_WIN_LEVEL_UP_BANNER; - printerTemplate.fontId = 0; + printerTemplate.fontId = FONT_SMALL; printerTemplate.x = 32; printerTemplate.y = 0; printerTemplate.currentX = 32; @@ -5647,10 +5834,12 @@ static void DrawLevelUpBannerText(void) printerTemplate.fgColor = TEXT_COLOR_WHITE; printerTemplate.bgColor = TEXT_COLOR_TRANSPARENT; printerTemplate.shadowColor = TEXT_COLOR_DARK_GRAY; - AddTextPrinter(&printerTemplate, 0xFF, NULL); + + AddTextPrinter(&printerTemplate, TEXT_SKIP_DRAW, NULL); + txtPtr = gStringVar4; - gStringVar4[0] = 0xF9; - *++txtPtr = 5; + gStringVar4[0] = CHAR_EXTRA_SYMBOL; + *++txtPtr = CHAR_LV_2; *++txtPtr = 0; txtPtr2 = txtPtr + 1; txtPtr = ConvertIntToDecimalStringN(++txtPtr, monLevel, STR_CONV_MODE_LEFT_ALIGN, 3); @@ -5660,22 +5849,24 @@ static void DrawLevelUpBannerText(void) { if (monGender == MON_MALE) { - txtPtr = WriteColorChangeControlCode(txtPtr, 0, 0xC); - txtPtr = WriteColorChangeControlCode(txtPtr, 1, 0xD); + txtPtr = WriteColorChangeControlCode(txtPtr, 0, TEXT_DYNAMIC_COLOR_3); + txtPtr = WriteColorChangeControlCode(txtPtr, 1, TEXT_DYNAMIC_COLOR_4); *(txtPtr++) = CHAR_MALE; } else { - txtPtr = WriteColorChangeControlCode(txtPtr, 0, 0xE); - txtPtr = WriteColorChangeControlCode(txtPtr, 1, 0xF); + txtPtr = WriteColorChangeControlCode(txtPtr, 0, TEXT_DYNAMIC_COLOR_5); + txtPtr = WriteColorChangeControlCode(txtPtr, 1, TEXT_DYNAMIC_COLOR_6); *(txtPtr++) = CHAR_FEMALE; } *(txtPtr++) = EOS; } + printerTemplate.y = 10; printerTemplate.currentY = 10; AddTextPrinter(&printerTemplate, TEXT_SKIP_DRAW, NULL); - CopyWindowToVram(13, COPYWIN_GFX); + + CopyWindowToVram(B_WIN_LEVEL_UP_BANNER, COPYWIN_GFX); } static bool8 SlideOutLevelUpBanner(void) @@ -5691,35 +5882,40 @@ static bool8 SlideOutLevelUpBanner(void) return (gBattle_BG2_X != LEVEL_UP_BANNER_START); } -#define sDestroy data[0] -#define sSavedLvlUpBoxXPosition data[1] +#define sDestroy data[0] +#define sXOffset data[1] -static void PutMonIconOnLvlUpBox(void) +static void PutMonIconOnLvlUpBanner(void) { u8 spriteId; - const u16 *iconPal; + const u16* iconPal; struct SpriteSheet iconSheet; struct SpritePalette iconPalSheet; + u16 species = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPECIES); u32 personality = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_PERSONALITY); - const u8 *iconPtr = GetMonIconPtr(species, personality, 1); + const u8* iconPtr = GetMonIconPtr(species, personality, 1); iconSheet.data = iconPtr; iconSheet.size = 0x200; iconSheet.tag = TAG_LVLUP_BANNER_MON_ICON; + iconPal = GetValidMonIconPalettePtr(species); iconPalSheet.data = iconPal; iconPalSheet.tag = TAG_LVLUP_BANNER_MON_ICON; + LoadSpriteSheet(&iconSheet); LoadSpritePalette(&iconPalSheet); + spriteId = CreateSprite(&sSpriteTemplate_MonIconOnLvlUpBanner, 256, 10, 0); gSprites[spriteId].sDestroy = FALSE; - gSprites[spriteId].sSavedLvlUpBoxXPosition = gBattle_BG2_X; + gSprites[spriteId].sXOffset = gBattle_BG2_X; } static void SpriteCB_MonIconOnLvlUpBanner(struct Sprite* sprite) { - sprite->x2 = sprite->sSavedLvlUpBoxXPosition - gBattle_BG2_X; + sprite->x2 = sprite->sXOffset - gBattle_BG2_X; + if (sprite->x2 != 0) { sprite->sDestroy = TRUE; @@ -5732,12 +5928,16 @@ static void SpriteCB_MonIconOnLvlUpBanner(struct Sprite* sprite) } } +#undef sDestroy +#undef sXOffset + bool32 IsMonGettingExpSentOut(void) { if (gBattlerPartyIndexes[0] == gBattleStruct->expGetterMonId) return TRUE; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && gBattlerPartyIndexes[2] == gBattleStruct->expGetterMonId) return TRUE; + return FALSE; } @@ -5766,7 +5966,13 @@ static void Cmd_recordlastability(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); RecordAbilityBattle(gActiveBattler, gLastUsedAbility); - gBattlescriptCurrInstr += 1; // UB: Should be + 2, one byte for command and one byte for battlerId argument. + +#ifdef BUGFIX + // This command occupies two bytes (one for the command id, and one for the battler id parameter). + gBattlescriptCurrInstr += 2; +#else + gBattlescriptCurrInstr += 1; +#endif } void BufferMoveToLearnIntoBattleTextBuff2(void) @@ -5801,6 +6007,7 @@ static void Cmd_hpthresholds(void) result = gBattleMons[opposingBattler].hp * 100 / gBattleMons[opposingBattler].maxHP; if (result == 0) result = 1; + if (result > 69 || !gBattleMons[opposingBattler].hp) gBattleStruct->hpScale = 0; else if (result > 39) @@ -5810,6 +6017,7 @@ static void Cmd_hpthresholds(void) else gBattleStruct->hpScale = 3; } + gBattlescriptCurrInstr += 2; } @@ -5835,6 +6043,7 @@ static void Cmd_hpthresholds2(void) else gBattleStruct->hpScale = 3; } + gBattlescriptCurrInstr += 2; } @@ -5872,13 +6081,13 @@ static void Cmd_various(void) gBattleCommunication[0] = IsRunningFromBattleImpossible(); break; case VARIOUS_GET_MOVE_TARGET: - gBattlerTarget = GetMoveTarget(gCurrentMove, 0); + gBattlerTarget = GetMoveTarget(gCurrentMove, NO_TARGET_OVERRIDE); break; - case VARIOUS_CASE_4: + case VARIOUS_GET_BATTLER_FAINTED: if (gHitMarker & HITMARKER_FAINTED(gActiveBattler)) - gBattleCommunication[0] = 1; + gBattleCommunication[0] = TRUE; else - gBattleCommunication[0] = 0; + gBattleCommunication[0] = FALSE; break; case VARIOUS_RESET_INTIMIDATE_TRACE_BITS: gSpecialStatuses[gActiveBattler].intimidatedMon = 0; @@ -5893,7 +6102,9 @@ static void Cmd_various(void) gActiveBattler = 0; else gActiveBattler = 2; + choicedMove = &gBattleStruct->choicedMove[gActiveBattler]; + for (i = 0; i < MAX_MON_MOVES; i++) { if (gBattleMons[gActiveBattler].moves[i] == *choicedMove) @@ -5903,12 +6114,14 @@ static void Cmd_various(void) *choicedMove = MOVE_NONE; } break; - case VARIOUS_RESET_PLAYER_FAINTED_FLAG: + case VARIOUS_RESET_PLAYER_FAINTED: if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE)) - && gBattleTypeFlags & BATTLE_TYPE_TRAINER - && gBattleMons[0].hp != 0 - && gBattleMons[1].hp != 0) - gHitMarker &= ~(HITMARKER_PLAYER_FAINTED); + && gBattleTypeFlags & BATTLE_TYPE_TRAINER + && gBattleMons[0].hp != 0 + && gBattleMons[1].hp != 0) + { + gHitMarker &= ~HITMARKER_PLAYER_FAINTED; + } break; case VARIOUS_CASE_8: i = 0; // redundant @@ -5998,6 +6211,7 @@ static void Cmd_various(void) return; break; } + gBattlescriptCurrInstr += 3; } @@ -6017,19 +6231,19 @@ static void Cmd_setprotectlike(void) // protect and endure if (gBattleMoves[gCurrentMove].effect == EFFECT_PROTECT) { gProtectStructs[gBattlerAttacker].protected = 1; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_PROTECTED_ITSELF; } if (gBattleMoves[gCurrentMove].effect == EFFECT_ENDURE) { gProtectStructs[gBattlerAttacker].endured = 1; - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_BRACED_ITSELF; } gDisableStructs[gBattlerAttacker].protectUses++; } else { gDisableStructs[gBattlerAttacker].protectUses = 0; - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_PROTECT_FAILED; gMoveResultFlags |= MOVE_RESULT_MISSED; } @@ -6038,42 +6252,54 @@ static void Cmd_setprotectlike(void) // protect and endure static void Cmd_tryexplosion(void) { - if (gBattleControllerExecFlags == 0) - { - for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; ++gBattlerTarget) - if (gBattleMons[gBattlerTarget].ability == ABILITY_DAMP) - break; - if (gBattlerTarget == gBattlersCount) - { - gActiveBattler = gBattlerAttacker; - gBattleMoveDamage = gBattleMons[gActiveBattler].hp; - BtlController_EmitHealthBarUpdate(0, INSTANT_HP_BAR_DROP); - MarkBattlerForControllerExec(gActiveBattler); - gBattlescriptCurrInstr++; + if (gBattleControllerExecFlags) + return; - for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; ++gBattlerTarget) - if (gBattlerTarget != gBattlerAttacker && !(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) - break; - } - else + // Explosion can only fail if any battler has Damp + for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++) + { + if (gBattleMons[gBattlerTarget].ability == ABILITY_DAMP) + break; + } + + if (gBattlerTarget == gBattlersCount) + { + // Success, no battlers with Damp. Drop user's HP bar to 0 + gActiveBattler = gBattlerAttacker; + gBattleMoveDamage = gBattleMons[gActiveBattler].hp; + BtlController_EmitHealthBarUpdate(BUFFER_A, INSTANT_HP_BAR_DROP); + MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr++; + + // Find first target + for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++) { - gLastUsedAbility = ABILITY_DAMP; - RecordAbilityBattle(gBattlerTarget, gBattleMons[gBattlerTarget].ability); - gBattlescriptCurrInstr = BattleScript_DampStopsExplosion; + if (gBattlerTarget == gBattlerAttacker) + continue; + if (!(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) + break; } } + else + { + // Failed, a battler has Damp + gLastUsedAbility = ABILITY_DAMP; + RecordAbilityBattle(gBattlerTarget, gBattleMons[gBattlerTarget].ability); + gBattlescriptCurrInstr = BattleScript_DampStopsExplosion; + } } static void Cmd_setatkhptozero(void) { - if (gBattleControllerExecFlags == 0) - { - gActiveBattler = gBattlerAttacker; - gBattleMons[gActiveBattler].hp = 0; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp); - MarkBattlerForControllerExec(gActiveBattler); - gBattlescriptCurrInstr++; - } + if (gBattleControllerExecFlags) + return; + + gActiveBattler = gBattlerAttacker; + gBattleMons[gActiveBattler].hp = 0; + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HP_BATTLE, 0, sizeof(gBattleMons[gActiveBattler].hp), &gBattleMons[gActiveBattler].hp); + MarkBattlerForControllerExec(gActiveBattler); + + gBattlescriptCurrInstr++; } static void Cmd_jumpifnexttargetvalid(void) @@ -6082,9 +6308,14 @@ static void Cmd_jumpifnexttargetvalid(void) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { - for (++gBattlerTarget; ; ++gBattlerTarget) - if (gBattlerTarget != gBattlerAttacker && !(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) + for (gBattlerTarget++; ; gBattlerTarget++) + { + if (gBattlerTarget == gBattlerAttacker) + continue; + if (!(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) break; + } + if (gBattlerTarget >= gBattlersCount) gBattlescriptCurrInstr += 5; else @@ -6098,14 +6329,16 @@ static void Cmd_jumpifnexttargetvalid(void) static void Cmd_tryhealhalfhealth(void) { - const u8 *failPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); + const u8* failPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); if (gBattlescriptCurrInstr[5] == BS_ATTACKER) gBattlerTarget = gBattlerAttacker; + gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 2; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; gBattleMoveDamage *= -1; + if (gBattleMons[gBattlerTarget].hp == gBattleMons[gBattlerTarget].maxHP) gBattlescriptCurrInstr = failPtr; else @@ -6117,41 +6350,44 @@ static void Cmd_trymirrormove(void) s32 validMovesCount; s32 i; u16 move; - u16 movesArray[3]; + u16 validMoves[MAX_BATTLERS_COUNT - 1]; + + for (i = 0; i < (MAX_BATTLERS_COUNT - 1); i++) // -1 to exclude the user + validMoves[i] = MOVE_NONE; - for (i = 0; i < 3; i++) - movesArray[i] = 0; for (validMovesCount = 0, i = 0; i < gBattlersCount; i++) { - if (i != gBattlerAttacker) { move = T1_READ_16(i * 2 + gBattlerAttacker * 8 + gBattleStruct->lastTakenMoveFrom); + if (move != MOVE_NONE && move != MOVE_UNAVAILABLE) { - movesArray[validMovesCount] = move; + validMoves[validMovesCount] = move; validMovesCount++; } } } + move = T1_READ_16(gBattleStruct->lastTakenMove + gBattlerAttacker * 2); - move++;move--; + move++;move--; // why? + if (move != MOVE_NONE && move != MOVE_UNAVAILABLE) { - gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); + gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED; gCurrentMove = move; - gBattlerTarget = GetMoveTarget(gCurrentMove, 0); + gBattlerTarget = GetMoveTarget(gCurrentMove, NO_TARGET_OVERRIDE); gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; } else if (validMovesCount != 0) { - gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); + gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED; i = Random() % validMovesCount; - gCurrentMove = movesArray[i]; - gBattlerTarget = GetMoveTarget(gCurrentMove, 0); + gCurrentMove = validMoves[i]; + gBattlerTarget = GetMoveTarget(gCurrentMove, NO_TARGET_OVERRIDE); gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; } - else + else // no valid moves found { gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure = TRUE; gBattlescriptCurrInstr++; @@ -6163,12 +6399,12 @@ static void Cmd_setrain(void) if (gBattleWeather & B_WEATHER_RAIN) { gMoveResultFlags |= MOVE_RESULT_MISSED; - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEATHER_FAILED; } else { gBattleWeather = B_WEATHER_RAIN_TEMPORARY; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STARTED_RAIN; gWishFutureKnock.weatherDuration = 5; } gBattlescriptCurrInstr++; @@ -6179,7 +6415,7 @@ static void Cmd_setreflect(void) if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_REFLECT) { gMoveResultFlags |= MOVE_RESULT_MISSED; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SIDE_STATUS_FAILED; } else { @@ -6188,9 +6424,9 @@ static void Cmd_setreflect(void) gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].reflectBattlerId = gBattlerAttacker; if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMonsInBattle(BATTLE_ALIVE_ATK_SIDE) == 2) - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SET_REFLECT_DOUBLE; else - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SET_REFLECT_SINGLE; } gBattlescriptCurrInstr++; } @@ -6200,19 +6436,20 @@ static void Cmd_setseeded(void) if (gMoveResultFlags & MOVE_RESULT_NO_EFFECT || gStatuses3[gBattlerTarget] & STATUS3_LEECHSEED) { gMoveResultFlags |= MOVE_RESULT_MISSED; - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_LEECH_SEED_MISS; } else if (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_GRASS)) { gMoveResultFlags |= MOVE_RESULT_MISSED; - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_LEECH_SEED_FAIL; } else { gStatuses3[gBattlerTarget] |= gBattlerAttacker; gStatuses3[gBattlerTarget] |= STATUS3_LEECHSEED; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_LEECH_SEED_SET; } + gBattlescriptCurrInstr++; } @@ -6220,29 +6457,30 @@ static void Cmd_manipulatedamage(void) { switch (gBattlescriptCurrInstr[1]) { - case ATK80_DMG_CHANGE_SIGN: + case DMG_CHANGE_SIGN: gBattleMoveDamage *= -1; break; - case ATK80_DMG_HALF_BY_TWO_NOT_MORE_THAN_HALF_MAX_HP: + case DMG_RECOIL_FROM_MISS: gBattleMoveDamage /= 2; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; if ((gBattleMons[gBattlerTarget].maxHP / 2) < gBattleMoveDamage) gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 2; break; - case ATK80_DMG_DOUBLED: + case DMG_DOUBLED: gBattleMoveDamage *= 2; break; } + gBattlescriptCurrInstr += 2; } static void Cmd_trysetrest(void) { const u8 *failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1); - gActiveBattler = gBattlerTarget = gBattlerAttacker; gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP * (-1); + if (gBattleMons[gBattlerTarget].hp == gBattleMons[gBattlerTarget].maxHP) { gBattlescriptCurrInstr = failJump; @@ -6250,11 +6488,12 @@ static void Cmd_trysetrest(void) else { if (gBattleMons[gBattlerTarget].status1 & ((u8)(~STATUS1_SLEEP))) - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_REST_STATUSED; else - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - gBattleMons[gBattlerTarget].status1 = 3; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1); + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_REST; + + gBattleMons[gBattlerTarget].status1 = STATUS1_SLEEP_TURN(3); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, sizeof(gBattleMons[gActiveBattler].status1), &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 5; } @@ -6262,7 +6501,7 @@ static void Cmd_trysetrest(void) static void Cmd_jumpifnotfirstturn(void) { - const u8 *failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1); + const u8* failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1); if (gDisableStructs[gBattlerAttacker].isFirstTurn) gBattlescriptCurrInstr += 5; @@ -6289,11 +6528,13 @@ bool8 UproarWakeUpCheck(u8 battlerId) if (gBattlerTarget == 0xFF) gBattlerTarget = i; else if (gBattlerTarget == i) - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CANT_SLEEP_UPROAR; else - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_UPROAR_KEPT_AWAKE; + break; } + if (i == gBattlersCount) return FALSE; else @@ -6312,7 +6553,7 @@ static void Cmd_jumpifcantmakeasleep(void) || gBattleMons[gBattlerTarget].ability == ABILITY_VITAL_SPIRIT) { gLastUsedAbility = gBattleMons[gBattlerTarget].ability; - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STAYED_AWAKE_USING; gBattlescriptCurrInstr = jumpPtr; RecordAbilityBattle(gBattlerTarget, gLastUsedAbility); } @@ -6327,7 +6568,7 @@ static void Cmd_stockpile(void) if (gDisableStructs[gBattlerAttacker].stockpileCounter == 3) { gMoveResultFlags |= MOVE_RESULT_MISSED; - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_CANT_STOCKPILE; } else { @@ -6335,22 +6576,21 @@ static void Cmd_stockpile(void) PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 1, gDisableStructs[gBattlerAttacker].stockpileCounter) - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STOCKPILED; } gBattlescriptCurrInstr++; } static void Cmd_stockpiletobasedamage(void) { - const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); - + const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); if (gDisableStructs[gBattlerAttacker].stockpileCounter == 0) { gBattlescriptCurrInstr = jumpPtr; } else { - if (gBattleCommunication[6] != 1) + if (gBattleCommunication[MISS_TYPE] != B_MSG_PROTECTED) { gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerTarget], gCurrentMove, gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)], 0, @@ -6361,6 +6601,7 @@ static void Cmd_stockpiletobasedamage(void) if (gProtectStructs[gBattlerAttacker].helpingHand) gBattleMoveDamage = gBattleMoveDamage * 15 / 10; } + gDisableStructs[gBattlerAttacker].stockpileCounter = 0; gBattlescriptCurrInstr += 5; } @@ -6368,19 +6609,19 @@ static void Cmd_stockpiletobasedamage(void) static void Cmd_stockpiletohpheal(void) { - const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); + const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); if (gDisableStructs[gBattlerAttacker].stockpileCounter == 0) { gBattlescriptCurrInstr = jumpPtr; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWALLOW_FAILED; } else if (gBattleMons[gBattlerAttacker].maxHP == gBattleMons[gBattlerAttacker].hp) { gDisableStructs[gBattlerAttacker].stockpileCounter = 0; gBattlescriptCurrInstr = jumpPtr; gBattlerTarget = gBattlerAttacker; - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SWALLOW_FULL_HP; } else { @@ -6431,6 +6672,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) flags &= ~STAT_CHANGE_NOT_PROTECT_AFFECTED; PREPARE_STAT_BUFFER(gBattleTextBuff1, statId) + if (statValue <= -1) // Stat decrease. { if (gSideTimers[GET_BATTLER_SIDE(gActiveBattler)].mistTimer @@ -6506,7 +6748,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) } return STAT_CHANGE_DIDNT_WORK; } - else if (gBattleMons[gActiveBattler].ability == ABILITY_SHIELD_DUST && !flags) + else if (gBattleMons[gActiveBattler].ability == ABILITY_SHIELD_DUST && flags == 0) { return STAT_CHANGE_DIDNT_WORK; } @@ -6522,14 +6764,18 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) gBattleTextBuff2[3] = STRINGID_STATHARSHLY >> 8; index = 4; } - gBattleTextBuff2[index++] = B_BUFF_STRING; - gBattleTextBuff2[index++] = STRINGID_STATFELL; - gBattleTextBuff2[index++] = STRINGID_STATFELL >> 8; + gBattleTextBuff2[index] = B_BUFF_STRING; + index++; + gBattleTextBuff2[index] = STRINGID_STATFELL; + index++; + gBattleTextBuff2[index] = STRINGID_STATFELL >> 8; + index++; gBattleTextBuff2[index] = B_BUFF_EOS; - if (gBattleMons[gActiveBattler].statStages[statId] == 0) - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + + if (gBattleMons[gActiveBattler].statStages[statId] == MIN_STAT_STAGE) + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STAT_WONT_DECREASE; else - gBattleCommunication[MULTISTRING_CHOOSER] = (gBattlerTarget == gActiveBattler); + gBattleCommunication[MULTISTRING_CHOOSER] = (gBattlerTarget == gActiveBattler); // B_MSG_ATTACKER_STAT_FELL or B_MSG_DEFENDER_STAT_FELL } } else // stat increase @@ -6544,30 +6790,38 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) gBattleTextBuff2[3] = STRINGID_STATSHARPLY >> 8; index = 4; } - gBattleTextBuff2[index++] = B_BUFF_STRING; - gBattleTextBuff2[index++] = STRINGID_STATROSE; - gBattleTextBuff2[index++] = STRINGID_STATROSE >> 8; + gBattleTextBuff2[index] = B_BUFF_STRING; + index++; + gBattleTextBuff2[index] = STRINGID_STATROSE; + index++; + gBattleTextBuff2[index] = STRINGID_STATROSE >> 8; + index++; gBattleTextBuff2[index] = B_BUFF_EOS; - if (gBattleMons[gActiveBattler].statStages[statId] == 0xC) - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + + if (gBattleMons[gActiveBattler].statStages[statId] == MAX_STAT_STAGE) + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STAT_WONT_INCREASE; else - gBattleCommunication[MULTISTRING_CHOOSER] = (gBattlerTarget == gActiveBattler); + gBattleCommunication[MULTISTRING_CHOOSER] = (gBattlerTarget == gActiveBattler); // B_MSG_ATTACKER_STAT_ROSE or B_MSG_DEFENDER_STAT_ROSE } + gBattleMons[gActiveBattler].statStages[statId] += statValue; - if (gBattleMons[gActiveBattler].statStages[statId] < 0) - gBattleMons[gActiveBattler].statStages[statId] = 0; - if (gBattleMons[gActiveBattler].statStages[statId] > 0xC) - gBattleMons[gActiveBattler].statStages[statId] = 0xC; - if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && flags & STAT_CHANGE_ALLOW_PTR) + if (gBattleMons[gActiveBattler].statStages[statId] < MIN_STAT_STAGE) + gBattleMons[gActiveBattler].statStages[statId] = MIN_STAT_STAGE; + if (gBattleMons[gActiveBattler].statStages[statId] > MAX_STAT_STAGE) + gBattleMons[gActiveBattler].statStages[statId] = MAX_STAT_STAGE; + + if (gBattleCommunication[MULTISTRING_CHOOSER] == B_MSG_STAT_WONT_INCREASE && flags & STAT_CHANGE_ALLOW_PTR) gMoveResultFlags |= MOVE_RESULT_MISSED; - if (gBattleCommunication[MULTISTRING_CHOOSER] == 2 && !(flags & STAT_CHANGE_ALLOW_PTR)) + + if (gBattleCommunication[MULTISTRING_CHOOSER] == B_MSG_STAT_WONT_INCREASE && !(flags & STAT_CHANGE_ALLOW_PTR)) return STAT_CHANGE_DIDNT_WORK; + return STAT_CHANGE_WORKED; } static void Cmd_statbuffchange(void) { - const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 2); + const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 2); if (ChangeStatBuffs(gBattleScripting.statChanger & 0xF0, GET_STAT_BUFF_ID(gBattleScripting.statChanger), gBattlescriptCurrInstr[1], jumpPtr) == STAT_CHANGE_WORKED) gBattlescriptCurrInstr += 6; } @@ -6577,8 +6831,11 @@ static void Cmd_normalisebuffs(void) // haze s32 i, j; for (i = 0; i < gBattlersCount; i++) - for (j = 0; j < NUM_BATTLE_STATS; ++j) - gBattleMons[i].statStages[j] = 6; + { + for (j = 0; j < NUM_BATTLE_STATS; j++) + gBattleMons[i].statStages[j] = DEFAULT_STAT_STAGE; + } + gBattlescriptCurrInstr++; } @@ -6587,7 +6844,8 @@ static void Cmd_setbide(void) gBattleMons[gBattlerAttacker].status2 |= STATUS2_MULTIPLETURNS; gLockedMoves[gBattlerAttacker] = gCurrentMove; gTakenDmg[gBattlerAttacker] = 0; - gBattleMons[gBattlerAttacker].status2 |= (STATUS2_BIDE - 0x100); // 2 turns + gBattleMons[gBattlerAttacker].status2 |= STATUS2_BIDE_TURN(2); + gBattlescriptCurrInstr++; } @@ -6595,6 +6853,7 @@ static void Cmd_confuseifrepeatingattackends(void) { if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_LOCK_CONFUSE)) gBattleCommunication[MOVE_EFFECT_BYTE] = (MOVE_EFFECT_THRASH | MOVE_EFFECT_AFFECTS_USER); + gBattlescriptCurrInstr++; } @@ -6612,12 +6871,14 @@ static void Cmd_setmultihitcounter(void) else gMultiHitCounter += 2; } + gBattlescriptCurrInstr += 2; } static void Cmd_initmultihitstring(void) { PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0) + gBattlescriptCurrInstr++; } @@ -6630,7 +6891,6 @@ static bool8 TryDoForceSwitchOut(void) else { u16 random = Random() & 0xFF; - if ((u32)((random * (gBattleMons[gBattlerAttacker].level + gBattleMons[gBattlerTarget].level) >> 8) + 1) <= (gBattleMons[gBattlerTarget].level / 4)) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -6638,6 +6898,7 @@ static bool8 TryDoForceSwitchOut(void) } *(gBattleStruct->battlerPartyIndexes + gBattlerTarget) = gBattlerPartyIndexes[gBattlerTarget]; } + gBattlescriptCurrInstr = BattleScript_SuccessForceOut; return TRUE; } @@ -6730,7 +6991,7 @@ static void Cmd_forcerandomswitch(void) if (!IsMultiBattle()) UpdatePartyOwnerOnSwitch_NonMulti(gBattlerTarget); SwitchPartyOrderLinkMulti(gBattlerTarget, i, 0); - SwitchPartyOrderLinkMulti(gBattlerTarget ^ 2, i, 1); + SwitchPartyOrderLinkMulti(gBattlerTarget ^ BIT_FLANK, i, 1); } } else @@ -6749,11 +7010,14 @@ static void Cmd_tryconversiontypechange(void) // randomly changes user's type to { if (gBattleMons[gBattlerAttacker].moves[validMoves] == MOVE_NONE) break; - ++validMoves; + + validMoves++; } - for (moveChecked = 0; moveChecked < validMoves; ++moveChecked) + + for (moveChecked = 0; moveChecked < validMoves; moveChecked++) { moveType = gBattleMoves[gBattleMons[gBattlerAttacker].moves[moveChecked]].type; + if (moveType == TYPE_MYSTERY) { if (IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_GHOST)) @@ -6767,6 +7031,7 @@ static void Cmd_tryconversiontypechange(void) // randomly changes user's type to break; } } + if (moveChecked == validMoves) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -6775,8 +7040,10 @@ static void Cmd_tryconversiontypechange(void) // randomly changes user's type to { do { - while ((moveChecked = Random() & 3) >= validMoves); + while ((moveChecked = Random() & (MAX_MON_MOVES - 1)) >= validMoves); + moveType = gBattleMoves[gBattleMons[gBattlerAttacker].moves[moveChecked]].type; + if (moveType == TYPE_MYSTERY) { if (IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_GHOST)) @@ -6785,10 +7052,11 @@ static void Cmd_tryconversiontypechange(void) // randomly changes user's type to moveType = TYPE_NORMAL; } } - while (moveType == gBattleMons[gBattlerAttacker].type1 - || moveType == gBattleMons[gBattlerAttacker].type2); + while (moveType == gBattleMons[gBattlerAttacker].type1 || moveType == gBattleMons[gBattlerAttacker].type2); + SET_BATTLER_TYPE(gBattlerAttacker, moveType); PREPARE_TYPE_BUFFER(gBattleTextBuff1, moveType); + gBattlescriptCurrInstr += 5; } } @@ -6798,9 +7066,10 @@ static void Cmd_givepaydaymoney(void) if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gPaydayMoney != 0) { u32 bonusMoney = gPaydayMoney * gBattleStruct->moneyMultiplier; - AddMoney(&gSaveBlock1Ptr->money, bonusMoney); + PREPARE_HWORD_NUMBER_BUFFER(gBattleTextBuff1, 5, bonusMoney) + BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_PrintPayDayMoneyString; } @@ -6815,18 +7084,20 @@ static void Cmd_setlightscreen(void) if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_LIGHTSCREEN) { gMoveResultFlags |= MOVE_RESULT_MISSED; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SIDE_STATUS_FAILED; } else { gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_LIGHTSCREEN; gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].lightscreenTimer = 5; gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].lightscreenBattlerId = gBattlerAttacker; + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && CountAliveMonsInBattle(BATTLE_ALIVE_ATK_SIDE) == 2) - gBattleCommunication[MULTISTRING_CHOOSER] = 4; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SET_LIGHTSCREEN_DOUBLE; else - gBattleCommunication[MULTISTRING_CHOOSER] = 3; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SET_LIGHTSCREEN_SINGLE; } + gBattlescriptCurrInstr++; } @@ -6844,7 +7115,9 @@ static void Cmd_tryKO(void) holdEffect = ItemId_GetHoldEffect(gBattleMons[gBattlerTarget].item); param = ItemId_GetHoldEffectParam(gBattleMons[gBattlerTarget].item); } + gPotentialItemEffectBattler = gBattlerTarget; + if (holdEffect == HOLD_EFFECT_FOCUS_BAND && (Random() % 100) < param) { RecordItemEffectBattle(gBattlerTarget, HOLD_EFFECT_FOCUS_BAND); @@ -6861,7 +7134,6 @@ static void Cmd_tryKO(void) else { u16 chance; - if (!(gStatuses3[gBattlerTarget] & STATUS3_ALWAYS_HITS)) { chance = gBattleMoves[gCurrentMove].accuracy + (gBattleMons[gBattlerAttacker].level - gBattleMons[gBattlerTarget].level); @@ -6907,9 +7179,9 @@ static void Cmd_tryKO(void) { gMoveResultFlags |= MOVE_RESULT_MISSED; if (gBattleMons[gBattlerAttacker].level >= gBattleMons[gBattlerTarget].level) - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_KO_MISS; else - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_KO_UNAFFECTED; gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } } @@ -6920,6 +7192,7 @@ static void Cmd_damagetohalftargethp(void) // super fang gBattleMoveDamage = gBattleMons[gBattlerTarget].hp / 2; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; + gBattlescriptCurrInstr++; } @@ -6928,12 +7201,12 @@ static void Cmd_setsandstorm(void) if (gBattleWeather & B_WEATHER_SANDSTORM) { gMoveResultFlags |= MOVE_RESULT_MISSED; - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEATHER_FAILED; } else { gBattleWeather = B_WEATHER_SANDSTORM_TEMPORARY; - gBattleCommunication[MULTISTRING_CHOOSER] = 3; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STARTED_SANDSTORM; gWishFutureKnock.weatherDuration = 5; } gBattlescriptCurrInstr++; @@ -7045,47 +7318,47 @@ static void Cmd_tryinfatuating(void) static void Cmd_updatestatusicon(void) { - if (gBattleControllerExecFlags == 0) + if (gBattleControllerExecFlags) + return; + + if (gBattlescriptCurrInstr[1] == BS_PLAYER2) { - if (gBattlescriptCurrInstr[1] == BS_PLAYER2) + for (gActiveBattler = gBattleControllerExecFlags; gActiveBattler < gBattlersCount; gActiveBattler++) { - for (gActiveBattler = gBattleControllerExecFlags; gActiveBattler < gBattlersCount; ++gActiveBattler) - { - if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler])) - { - BtlController_EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2); - MarkBattlerForControllerExec(gActiveBattler); - } - } - gBattlescriptCurrInstr += 2; - } - else if (gBattlescriptCurrInstr[1] == BS_ATTACKER_WITH_PARTNER) - { - gActiveBattler = gBattlerAttacker; if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler])) { - BtlController_EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2); + BtlController_EmitStatusIconUpdate(BUFFER_A, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2); MarkBattlerForControllerExec(gActiveBattler); } - if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) - { - gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK); - if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler])) - { - BtlController_EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2); - MarkBattlerForControllerExec(gActiveBattler); - } - } - gBattlescriptCurrInstr += 2; } - else + gBattlescriptCurrInstr += 2; + } + else if (gBattlescriptCurrInstr[1] == BS_ATTACKER_WITH_PARTNER) + { + gActiveBattler = gBattlerAttacker; + if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler])) { - - gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); - BtlController_EmitStatusIconUpdate(0, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2); + BtlController_EmitStatusIconUpdate(BUFFER_A, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2); MarkBattlerForControllerExec(gActiveBattler); - gBattlescriptCurrInstr += 2; } + if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE)) + { + gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK); + if (!(gAbsentBattlerFlags & gBitTable[gActiveBattler])) + { + BtlController_EmitStatusIconUpdate(BUFFER_A, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2); + MarkBattlerForControllerExec(gActiveBattler); + } + } + gBattlescriptCurrInstr += 2; + } + else + { + + gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + BtlController_EmitStatusIconUpdate(BUFFER_A, gBattleMons[gActiveBattler].status1, gBattleMons[gActiveBattler].status2); + MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 2; } } @@ -7094,14 +7367,14 @@ static void Cmd_setmist(void) if (gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistTimer) { gMoveResultFlags |= MOVE_RESULT_FAILED; - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_MIST_FAILED; } else { gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistTimer = 5; gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].mistBattlerId = gBattlerAttacker; gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_MIST; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SET_MIST; } gBattlescriptCurrInstr++; } @@ -7111,12 +7384,12 @@ static void Cmd_setfocusenergy(void) if (gBattleMons[gBattlerAttacker].status2 & STATUS2_FOCUS_ENERGY) { gMoveResultFlags |= MOVE_RESULT_FAILED; - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_FOCUS_ENERGY_FAILED; } else { gBattleMons[gBattlerAttacker].status2 |= STATUS2_FOCUS_ENERGY; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_GETTING_PUMPED; } gBattlescriptCurrInstr++; } @@ -7129,7 +7402,7 @@ static void Cmd_transformdataexecution(void) || gStatuses3[gBattlerTarget] & STATUS3_SEMI_INVULNERABLE) { gMoveResultFlags |= MOVE_RESULT_FAILED; - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_TRANSFORM_FAILED; } else { @@ -7141,11 +7414,15 @@ static void Cmd_transformdataexecution(void) gDisableStructs[gBattlerAttacker].disableTimer = 0; gDisableStructs[gBattlerAttacker].transformedMonPersonality = gBattleMons[gBattlerTarget].personality; gDisableStructs[gBattlerAttacker].mimickedMoves = 0; + PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerTarget].species) - battleMonAttacker = (u8 *)(&gBattleMons[gBattlerAttacker]); - battleMonTarget = (u8 *)(&gBattleMons[gBattlerTarget]); + + battleMonAttacker = (u8*)(&gBattleMons[gBattlerAttacker]); + battleMonTarget = (u8*)(&gBattleMons[gBattlerTarget]); + for (i = 0; i < offsetof(struct BattlePokemon, pp); i++) battleMonAttacker[i] = battleMonTarget[i]; + for (i = 0; i < MAX_MON_MOVES; i++) { if (gBattleMoves[gBattleMons[gBattlerAttacker].moves[i]].pp < 5) @@ -7153,10 +7430,11 @@ static void Cmd_transformdataexecution(void) else gBattleMons[gBattlerAttacker].pp[i] = 5; } + gActiveBattler = gBattlerAttacker; BtlController_EmitResetActionMoveSelection(BUFFER_A, RESET_MOVE_SELECTION); MarkBattlerForControllerExec(gActiveBattler); - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_TRANSFORMED; } } @@ -7169,17 +7447,18 @@ static void Cmd_setsubstitute(void) if (gBattleMons[gBattlerAttacker].hp <= hp) { gBattleMoveDamage = 0; - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SUBSTITUTE_FAILED; } else { gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4; // one bit value will only work for pokemon which max hp can go to 1020(which is more than possible in games) if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; + gBattleMons[gBattlerAttacker].status2 |= STATUS2_SUBSTITUTE; gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_WRAPPED; gDisableStructs[gBattlerAttacker].substituteHP = gBattleMoveDamage; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SET_SUBSTITUTE; gHitMarker |= HITMARKER_IGNORE_SUBSTITUTE; } @@ -7189,14 +7468,16 @@ static void Cmd_setsubstitute(void) static bool8 IsMoveUncopyableByMimic(u16 move) { s32 i; + for (i = 0; sMovesForbiddenToCopy[i] != MIMIC_FORBIDDEN_END + && sMovesForbiddenToCopy[i] != move; i++); - for (i = 0; sMovesForbiddenToCopy[i] != MIMIC_FORBIDDEN_END && sMovesForbiddenToCopy[i] != move; i++); return (sMovesForbiddenToCopy[i] != MIMIC_FORBIDDEN_END); } static void Cmd_mimicattackcopy(void) { gChosenMove = MOVE_UNAVAILABLE; + if (IsMoveUncopyableByMimic(gLastMoves[gBattlerTarget]) || gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED || gLastMoves[gBattlerTarget] == MOVE_NONE @@ -7213,6 +7494,7 @@ static void Cmd_mimicattackcopy(void) if (gBattleMons[gBattlerAttacker].moves[i] == gLastMoves[gBattlerTarget]) break; } + if (i == MAX_MON_MOVES) { gBattleMons[gBattlerAttacker].moves[gCurrMovePos] = gLastMoves[gBattlerTarget]; @@ -7222,6 +7504,7 @@ static void Cmd_mimicattackcopy(void) gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = 5; PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattlerTarget]) + gDisableStructs[gBattlerAttacker].mimickedMoves |= gBitTable[gCurrMovePos]; gBattlescriptCurrInstr += 5; } @@ -7253,11 +7536,12 @@ static void Cmd_metronome(void) if (sMovesForbiddenToCopy[i] == METRONOME_FORBIDDEN_END) break; } + if (sMovesForbiddenToCopy[i] == METRONOME_FORBIDDEN_END) { gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED; gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]; - gBattlerTarget = GetMoveTarget(gCurrentMove, 0); + gBattlerTarget = GetMoveTarget(gCurrentMove, NO_TARGET_OVERRIDE); return; } } @@ -7369,6 +7653,7 @@ static void Cmd_trysetencore(void) { i = MAX_MON_MOVES; } + if (gDisableStructs[gBattlerTarget].encoredMove == MOVE_NONE && i != MAX_MON_MOVES && gBattleMons[gBattlerTarget].pp[i] != 0) { @@ -7390,14 +7675,16 @@ static void Cmd_painsplitdmgcalc(void) { s32 hpDiff = (gBattleMons[gBattlerAttacker].hp + gBattleMons[gBattlerTarget].hp) / 2; s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - hpDiff; - u8 *storeLoc = (void *)(&gBattleScripting.painSplitHp); + u8* storeLoc = (void*)(&gBattleScripting.painSplitHp); storeLoc[0] = (painSplitHp); storeLoc[1] = (painSplitHp & 0x0000FF00) >> 8; storeLoc[2] = (painSplitHp & 0x00FF0000) >> 16; storeLoc[3] = (painSplitHp & 0xFF000000) >> 24; + gBattleMoveDamage = gBattleMons[gBattlerAttacker].hp - hpDiff; gSpecialStatuses[gBattlerTarget].dmg = 0xFFFF; + gBattlescriptCurrInstr += 5; } else @@ -7409,12 +7696,12 @@ static void Cmd_painsplitdmgcalc(void) static void Cmd_settypetorandomresistance(void) // conversion 2 { if (gLastLandedMoves[gBattlerAttacker] == MOVE_NONE - || gLastLandedMoves[gBattlerAttacker] == 0xFFFF) + || gLastLandedMoves[gBattlerAttacker] == MOVE_UNAVAILABLE) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } else if (IsTwoTurnsMove(gLastLandedMoves[gBattlerAttacker]) - && gBattleMons[gLastHitBy[gBattlerAttacker]].status2 & STATUS2_MULTIPLETURNS) + && gBattleMons[gLastHitBy[gBattlerAttacker]].status2 & STATUS2_MULTIPLETURNS) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -7425,7 +7712,9 @@ static void Cmd_settypetorandomresistance(void) // conversion 2 for (rands = 0; rands < 1000; rands++) { while (((i = Random() % 128) > sizeof(gTypeEffectiveness) / 3)); + i *= 3; + if (TYPE_EFFECT_ATK_TYPE(i) == gLastHitByType[gBattlerAttacker] && TYPE_EFFECT_MULTIPLIER(i) <= TYPE_MUL_NOT_EFFECTIVE && !IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_EFFECT_DEF_TYPE(i))) @@ -7467,7 +7756,7 @@ static void Cmd_settypetorandomresistance(void) // conversion 2 static void Cmd_setalwayshitflag(void) { gStatuses3[gBattlerTarget] &= ~STATUS3_ALWAYS_HITS; - gStatuses3[gBattlerTarget] |= 0x10; + gStatuses3[gBattlerTarget] |= STATUS3_ALWAYS_HITS_TURN(2); gDisableStructs[gBattlerTarget].battlerWithSureHit = gBattlerAttacker; gBattlescriptCurrInstr++; } @@ -7475,6 +7764,7 @@ static void Cmd_setalwayshitflag(void) static void Cmd_copymovepermanently(void) // sketch { gChosenMove = MOVE_UNAVAILABLE; + if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_TRANSFORMED) && gLastPrintedMoves[gBattlerTarget] != MOVE_STRUGGLE && gLastPrintedMoves[gBattlerTarget] != MOVE_NONE @@ -7484,8 +7774,13 @@ static void Cmd_copymovepermanently(void) // sketch s32 i; for (i = 0; i < MAX_MON_MOVES; i++) - if (gBattleMons[gBattlerAttacker].moves[i] != MOVE_SKETCH && gBattleMons[gBattlerAttacker].moves[i] == gLastPrintedMoves[gBattlerTarget]) + { + if (gBattleMons[gBattlerAttacker].moves[i] == MOVE_SKETCH) + continue; + if (gBattleMons[gBattlerAttacker].moves[i] == gLastPrintedMoves[gBattlerTarget]) break; + } + if (i != MAX_MON_MOVES) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -7497,15 +7792,19 @@ static void Cmd_copymovepermanently(void) // sketch gBattleMons[gBattlerAttacker].moves[gCurrMovePos] = gLastPrintedMoves[gBattlerTarget]; gBattleMons[gBattlerAttacker].pp[gCurrMovePos] = gBattleMoves[gLastPrintedMoves[gBattlerTarget]].pp; gActiveBattler = gBattlerAttacker; + for (i = 0; i < MAX_MON_MOVES; i++) { movePpData.moves[i] = gBattleMons[gBattlerAttacker].moves[i]; movePpData.pp[i] = gBattleMons[gBattlerAttacker].pp[i]; } movePpData.ppBonuses = gBattleMons[gBattlerAttacker].ppBonuses; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_MOVES_PP_BATTLE, 0, sizeof(struct MovePpInfo), &movePpData); + + BtlController_EmitSetMonData(BUFFER_A, REQUEST_MOVES_PP_BATTLE, 0, sizeof(movePpData), &movePpData); MarkBattlerForControllerExec(gActiveBattler); + PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastPrintedMoves[gBattlerTarget]) + gBattlescriptCurrInstr += 5; } } @@ -7520,7 +7819,7 @@ static bool8 IsTwoTurnsMove(u16 move) if (gBattleMoves[move].effect == EFFECT_SKULL_BASH || gBattleMoves[move].effect == EFFECT_RAZOR_WIND || gBattleMoves[move].effect == EFFECT_SKY_ATTACK - || gBattleMoves[move].effect == EFFECT_SOLARBEAM + || gBattleMoves[move].effect == EFFECT_SOLAR_BEAM || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE || gBattleMoves[move].effect == EFFECT_BIDE) return TRUE; @@ -7530,8 +7829,11 @@ static bool8 IsTwoTurnsMove(u16 move) static bool8 IsInvalidForSleepTalkOrAssist(u16 move) { - if (move == MOVE_NONE || move == MOVE_SLEEP_TALK || move == MOVE_ASSIST - || move == MOVE_MIRROR_MOVE || move == MOVE_METRONOME) + if (move == MOVE_NONE + || move == MOVE_SLEEP_TALK + || move == MOVE_ASSIST + || move == MOVE_MIRROR_MOVE + || move == MOVE_METRONOME) return TRUE; else return FALSE; @@ -7540,17 +7842,20 @@ static bool8 IsInvalidForSleepTalkOrAssist(u16 move) static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a charging turn, otherwise 2 { // first argument is unused - if (gBattleMoves[move].effect == EFFECT_SOLARBEAM - && (gBattleWeather & B_WEATHER_SUN)) + if (gBattleMoves[move].effect == EFFECT_SOLAR_BEAM + && (gBattleWeather & B_WEATHER_SUN)) return 2; + if (gBattleMoves[move].effect == EFFECT_SKULL_BASH || gBattleMoves[move].effect == EFFECT_RAZOR_WIND || gBattleMoves[move].effect == EFFECT_SKY_ATTACK - || gBattleMoves[move].effect == EFFECT_SOLARBEAM + || gBattleMoves[move].effect == EFFECT_SOLAR_BEAM || gBattleMoves[move].effect == EFFECT_SEMI_INVULNERABLE || gBattleMoves[move].effect == EFFECT_BIDE) + { if ((gHitMarker & HITMARKER_CHARGING)) return 1; + } return 2; } @@ -7562,15 +7867,16 @@ static void Cmd_trychoosesleeptalkmove(void) for (i = 0; i < MAX_MON_MOVES; i++) { if (IsInvalidForSleepTalkOrAssist(gBattleMons[gBattlerAttacker].moves[i]) - || gBattleMons[gBattlerAttacker].moves[i] == MOVE_FOCUS_PUNCH - || gBattleMons[gBattlerAttacker].moves[i] == MOVE_UPROAR - || IsTwoTurnsMove(gBattleMons[gBattlerAttacker].moves[i])) + || gBattleMons[gBattlerAttacker].moves[i] == MOVE_FOCUS_PUNCH + || gBattleMons[gBattlerAttacker].moves[i] == MOVE_UPROAR + || IsTwoTurnsMove(gBattleMons[gBattlerAttacker].moves[i])) { unusableMovesBits |= gBitTable[i]; } } - unusableMovesBits = CheckMoveLimitations(gBattlerAttacker, unusableMovesBits, ~(MOVE_LIMITATION_PP)); - if (unusableMovesBits == 0xF) // all 4 moves cannot be chosen + + unusableMovesBits = CheckMoveLimitations(gBattlerAttacker, unusableMovesBits, ~MOVE_LIMITATION_PP); + if (unusableMovesBits == (1 << MAX_MON_MOVES) - 1) // all 4 moves cannot be chosen { gBattlescriptCurrInstr += 5; } @@ -7579,12 +7885,14 @@ static void Cmd_trychoosesleeptalkmove(void) u32 movePosition; do - movePosition = Random() & 3; - while ((gBitTable[movePosition] & unusableMovesBits)); + { + movePosition = Random() & (MAX_MON_MOVES - 1); + } while ((gBitTable[movePosition] & unusableMovesBits)); + gCalledMove = gBattleMons[gBattlerAttacker].moves[movePosition]; gCurrMovePos = movePosition; - gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); - gBattlerTarget = GetMoveTarget(gCalledMove, 0); + gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED; + gBattlerTarget = GetMoveTarget(gCalledMove, NO_TARGET_OVERRIDE); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } } @@ -7599,11 +7907,12 @@ static void TrySetDestinyBondToHappen(void) { u8 sideAttacker = GetBattlerSide(gBattlerAttacker); u8 sideTarget = GetBattlerSide(gBattlerTarget); - if (gBattleMons[gBattlerTarget].status2 & STATUS2_DESTINY_BOND - && sideAttacker != sideTarget - && !(gHitMarker & HITMARKER_GRUDGE)) + && sideAttacker != sideTarget + && !(gHitMarker & HITMARKER_GRUDGE)) + { gHitMarker |= HITMARKER_DESTINYBOND; + } } static void Cmd_trysetdestinybondtohappen(void) @@ -7617,11 +7926,12 @@ static void Cmd_remaininghptopower(void) s32 i; s32 hpFraction = GetScaledHPFraction(gBattleMons[gBattlerAttacker].hp, gBattleMons[gBattlerAttacker].maxHP, 48); - for (i = 0; i < (s32)sizeof(sFlailHpScaleToPowerTable); i += 2) + for (i = 0; i < (s32) sizeof(sFlailHpScaleToPowerTable); i += 2) { if (hpFraction <= sFlailHpScaleToPowerTable[i]) break; } + gDynamicBasePower = sFlailHpScaleToPowerTable[i + 1]; gBattlescriptCurrInstr++; } @@ -7642,21 +7952,28 @@ static void Cmd_tryspiteppreduce(void) if (i != MAX_MON_MOVES && gBattleMons[gBattlerTarget].pp[i] > 1) { s32 ppToDeduct = (Random() & 3) + 2; - if (gBattleMons[gBattlerTarget].pp[i] < ppToDeduct) ppToDeduct = gBattleMons[gBattlerTarget].pp[i]; + PREPARE_MOVE_BUFFER(gBattleTextBuff1, gLastMoves[gBattlerTarget]) - ConvertIntToDecimalStringN(gBattleTextBuff2, ppToDeduct, 0, 1); + + ConvertIntToDecimalStringN(gBattleTextBuff2, ppToDeduct, STR_CONV_MODE_LEFT_ALIGN, 1); + PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 1, ppToDeduct) + gBattleMons[gBattlerTarget].pp[i] -= ppToDeduct; gActiveBattler = gBattlerTarget; + + // if (MOVE_IS_PERMANENT(gActiveBattler, i)), but backwards if (!(gDisableStructs[gActiveBattler].mimickedMoves & gBitTable[i]) - && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) + && !(gBattleMons[gActiveBattler].status2 & STATUS2_TRANSFORMED)) { - BtlController_EmitSetMonData(BUFFER_A, REQUEST_PPMOVE1_BATTLE + i, 0, 1, &gBattleMons[gActiveBattler].pp[i]); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_PPMOVE1_BATTLE + i, 0, sizeof(gBattleMons[gActiveBattler].pp[i]), &gBattleMons[gActiveBattler].pp[i]); MarkBattlerForControllerExec(gActiveBattler); } + gBattlescriptCurrInstr += 5; + if (gBattleMons[gBattlerTarget].pp[i] == 0) CancelMultiTurnMoves(gBattlerTarget); } @@ -7681,36 +7998,43 @@ static void Cmd_healpartystatus(void) struct Pokemon *party; s32 i; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_BELL; + if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) party = gPlayerParty; else party = gEnemyParty; + if (gBattleMons[gBattlerAttacker].ability != ABILITY_SOUNDPROOF) { gBattleMons[gBattlerAttacker].status1 = 0; - gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE); + gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_NIGHTMARE; } else { RecordAbilityBattle(gBattlerAttacker, gBattleMons[gBattlerAttacker].ability); - gBattleCommunication[MULTISTRING_CHOOSER] |= 1; + gBattleCommunication[MULTISTRING_CHOOSER] |= B_MSG_BELL_SOUNDPROOF_ATTACKER; } + gActiveBattler = gBattleScripting.battler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK); + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE - && !(gAbsentBattlerFlags & gBitTable[gActiveBattler])) + && !(gAbsentBattlerFlags & gBitTable[gActiveBattler])) { if (gBattleMons[gActiveBattler].ability != ABILITY_SOUNDPROOF) { gBattleMons[gActiveBattler].status1 = 0; - gBattleMons[gActiveBattler].status2 &= ~(STATUS2_NIGHTMARE); + gBattleMons[gActiveBattler].status2 &= ~STATUS2_NIGHTMARE; } else { RecordAbilityBattle(gActiveBattler, gBattleMons[gActiveBattler].ability); - gBattleCommunication[MULTISTRING_CHOOSER] |= 2; + gBattleCommunication[MULTISTRING_CHOOSER] |= B_MSG_BELL_SOUNDPROOF_PARTNER; } } + + // Because the above MULTISTRING_CHOOSER are ORd, if both are set then it will be B_MSG_BELL_BOTH_SOUNDPROOF + for (i = 0; i < PARTY_SIZE; i++) { u16 species = GetMonData(&party[i], MON_DATA_SPECIES2); @@ -7723,11 +8047,12 @@ static void Cmd_healpartystatus(void) if (gBattlerPartyIndexes[gBattlerAttacker] == i) ability = gBattleMons[gBattlerAttacker].ability; else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE - && gBattlerPartyIndexes[gActiveBattler] == i - && !(gAbsentBattlerFlags & gBitTable[gActiveBattler])) + && gBattlerPartyIndexes[gActiveBattler] == i + && !(gAbsentBattlerFlags & gBitTable[gActiveBattler])) ability = gBattleMons[gActiveBattler].ability; else ability = GetAbilityBySpecies(species, abilityNum); + if (ability != ABILITY_SOUNDPROOF) toHeal |= (1 << i); } @@ -7735,25 +8060,29 @@ static void Cmd_healpartystatus(void) } else // Aromatherapy { - gBattleCommunication[MULTISTRING_CHOOSER] = 4; - toHeal = 0x3F; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SOOTHING_AROMA; + toHeal = (1 << PARTY_SIZE) - 1; + gBattleMons[gBattlerAttacker].status1 = 0; - gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE); + gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_NIGHTMARE; + gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE - && !(gAbsentBattlerFlags & gBitTable[gActiveBattler])) + && !(gAbsentBattlerFlags & gBitTable[gActiveBattler])) { gBattleMons[gActiveBattler].status1 = 0; - gBattleMons[gActiveBattler].status2 &= ~(STATUS2_NIGHTMARE); + gBattleMons[gActiveBattler].status2 &= ~STATUS2_NIGHTMARE; } } + if (toHeal) { gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, toHeal, 4, &zero); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, toHeal, sizeof(zero), &zero); MarkBattlerForControllerExec(gActiveBattler); } + gBattlescriptCurrInstr++; } @@ -7769,6 +8098,7 @@ static void Cmd_cursetarget(void) gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; + gBattlescriptCurrInstr += 5; } } @@ -7785,7 +8115,7 @@ static void Cmd_trysetspikes(void) else { gSideStatuses[targetSide] |= SIDE_STATUS_SPIKES; - ++gSideTimers[targetSide].spikesAmount; + gSideTimers[targetSide].spikesAmount++; gBattlescriptCurrInstr += 5; } } @@ -7804,9 +8134,9 @@ static void Cmd_trysetperishsong(void) for (i = 0; i < gBattlersCount; i++) { if (gStatuses3[i] & STATUS3_PERISH_SONG - || gBattleMons[i].ability == ABILITY_SOUNDPROOF) + || gBattleMons[i].ability == ABILITY_SOUNDPROOF) { - ++notAffectedCount; + notAffectedCount++; } else { @@ -7815,7 +8145,9 @@ static void Cmd_trysetperishsong(void) gDisableStructs[i].perishSongTimerStartValue = 3; } } + PressurePPLoseOnUsingPerishSong(gBattlerAttacker); + if (notAffectedCount == gBattlersCount) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); else @@ -7841,12 +8173,18 @@ static void Cmd_rolloutdamagecalculation(void) gLockedMoves[gBattlerAttacker] = gCurrentMove; } if (--gDisableStructs[gBattlerAttacker].rolloutTimer == 0) // last hit - gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_MULTIPLETURNS); + { + gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_MULTIPLETURNS; + } + gDynamicBasePower = gBattleMoves[gCurrentMove].power; + for (i = 1; i < (5 - gDisableStructs[gBattlerAttacker].rolloutTimer); i++) gDynamicBasePower *= 2; + if (gBattleMons[gBattlerAttacker].status2 & STATUS2_DEFENSE_CURL) gDynamicBasePower *= 2; + gBattlescriptCurrInstr++; } } @@ -7854,7 +8192,7 @@ static void Cmd_rolloutdamagecalculation(void) static void Cmd_jumpifconfusedandstatmaxed(void) { if (gBattleMons[gBattlerTarget].status2 & STATUS2_CONFUSION - && gBattleMons[gBattlerTarget].statStages[gBattlescriptCurrInstr[1]] == 12) + && gBattleMons[gBattlerTarget].statStages[gBattlescriptCurrInstr[1]] == MAX_STAT_STAGE) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2); else gBattlescriptCurrInstr += 6; @@ -7872,11 +8210,13 @@ static void Cmd_furycuttercalc(void) s32 i; if (gDisableStructs[gBattlerAttacker].furyCutterCounter != 5) - ++gDisableStructs[gBattlerAttacker].furyCutterCounter; + gDisableStructs[gBattlerAttacker].furyCutterCounter++; + gDynamicBasePower = gBattleMoves[gCurrentMove].power; for (i = 1; i < gDisableStructs[gBattlerAttacker].furyCutterCounter; i++) gDynamicBasePower *= 2; + gBattlescriptCurrInstr++; } } @@ -7887,6 +8227,7 @@ static void Cmd_friendshiptodamagecalculation(void) gDynamicBasePower = 10 * (gBattleMons[gBattlerAttacker].friendship) / 25; else // EFFECT_FRUSTRATION gDynamicBasePower = 10 * (255 - gBattleMons[gBattlerAttacker].friendship) / 25; + gBattlescriptCurrInstr++; } @@ -7895,17 +8236,11 @@ static void Cmd_presentdamagecalculation(void) s32 rand = Random() & 0xFF; if (rand < 102) - { gDynamicBasePower = 40; - } else if (rand < 178) - { gDynamicBasePower = 80; - } else if (rand < 204) - { gDynamicBasePower = 120; - } else { gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 4; @@ -7914,16 +8249,12 @@ static void Cmd_presentdamagecalculation(void) gBattleMoveDamage *= -1; } if (rand < 204) - { gBattlescriptCurrInstr = BattleScript_HitFromCritCalc; - } else if (gBattleMons[gBattlerTarget].maxHP == gBattleMons[gBattlerTarget].hp) - { gBattlescriptCurrInstr = BattleScript_AlreadyAtFullHp; - } else { - gMoveResultFlags &= ~(MOVE_RESULT_DOESNT_AFFECT_FOE); + gMoveResultFlags &= ~MOVE_RESULT_DOESNT_AFFECT_FOE; gBattlescriptCurrInstr = BattleScript_PresentHealTarget; } } @@ -7933,15 +8264,16 @@ static void Cmd_setsafeguard(void) if (gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] & SIDE_STATUS_SAFEGUARD) { gMoveResultFlags |= MOVE_RESULT_MISSED; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SIDE_STATUS_FAILED; } else { gSideStatuses[GET_BATTLER_SIDE(gBattlerAttacker)] |= SIDE_STATUS_SAFEGUARD; gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].safeguardTimer = 5; gSideTimers[GET_BATTLER_SIDE(gBattlerAttacker)].safeguardBattlerId = gBattlerAttacker; - gBattleCommunication[MULTISTRING_CHOOSER] = 5; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SET_SAFEGUARD; } + gBattlescriptCurrInstr++; } @@ -7984,10 +8316,17 @@ static void Cmd_magnitudedamagecalculation(void) gDynamicBasePower = 150; magnitude = 10; } + PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff1, 2, magnitude) - for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; ++gBattlerTarget) - if (gBattlerTarget != gBattlerAttacker && !(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) // a valid target was found + + for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++) + { + if (gBattlerTarget == gBattlerAttacker) + continue; + if (!(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) // a valid target was found break; + } + gBattlescriptCurrInstr++; } @@ -8007,23 +8346,27 @@ static void Cmd_jumpifnopursuitswitchdmg(void) else gBattlerTarget = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); } + if (gChosenActionByBattler[gBattlerTarget] == B_ACTION_USE_MOVE - && gBattlerAttacker == *(gBattleStruct->moveTarget + gBattlerTarget) - && !(gBattleMons[gBattlerTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE)) - && gBattleMons[gBattlerAttacker].hp - && !gDisableStructs[gBattlerTarget].truantCounter - && gChosenMoveByBattler[gBattlerTarget] == MOVE_PURSUIT) + && gBattlerAttacker == *(gBattleStruct->moveTarget + gBattlerTarget) + && !(gBattleMons[gBattlerTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE)) + && gBattleMons[gBattlerAttacker].hp + && !gDisableStructs[gBattlerTarget].truantCounter + && gChosenMoveByBattler[gBattlerTarget] == MOVE_PURSUIT) { s32 i; for (i = 0; i < gBattlersCount; i++) + { if (gBattlerByTurnOrder[i] == gBattlerTarget) - gActionsByTurnOrder[i] = 11; + gActionsByTurnOrder[i] = B_ACTION_TRY_FINISH; + } + gCurrentMove = MOVE_PURSUIT; gCurrMovePos = gChosenMovePos = *(gBattleStruct->chosenMovePositions + gBattlerTarget); gBattlescriptCurrInstr += 5; gBattleScripting.animTurn = 1; - gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); + gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED; } else { @@ -8036,14 +8379,15 @@ static void Cmd_setsunny(void) if (gBattleWeather & B_WEATHER_SUN) { gMoveResultFlags |= MOVE_RESULT_MISSED; - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEATHER_FAILED; } else { gBattleWeather = B_WEATHER_SUN_TEMPORARY; - gBattleCommunication[MULTISTRING_CHOOSER] = 4; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STARTED_SUNLIGHT; gWishFutureKnock.weatherDuration = 5; } + gBattlescriptCurrInstr++; } @@ -8053,13 +8397,15 @@ static void Cmd_maxattackhalvehp(void) // belly drum if (!(gBattleMons[gBattlerAttacker].maxHP / 2)) halfHp = 1; - if (gBattleMons[gBattlerAttacker].statStages[STAT_ATK] < 12 - && gBattleMons[gBattlerAttacker].hp > halfHp) + + if (gBattleMons[gBattlerAttacker].statStages[STAT_ATK] < MAX_STAT_STAGE + && gBattleMons[gBattlerAttacker].hp > halfHp) { - gBattleMons[gBattlerAttacker].statStages[STAT_ATK] = 12; + gBattleMons[gBattlerAttacker].statStages[STAT_ATK] = MAX_STAT_STAGE; gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; + gBattlescriptCurrInstr += 5; } else @@ -8073,7 +8419,10 @@ static void Cmd_copyfoestats(void) // psych up s32 i; for (i = 0; i < NUM_BATTLE_STATS; i++) + { gBattleMons[gBattlerAttacker].statStages[i] = gBattleMons[gBattlerTarget].statStages[i]; + } + gBattlescriptCurrInstr += 5; // Has an unused jump ptr(possibly for a failed attempt) parameter. } @@ -8082,26 +8431,28 @@ static void Cmd_rapidspinfree(void) if (gBattleMons[gBattlerAttacker].status2 & STATUS2_WRAPPED) { gBattleScripting.battler = gBattlerTarget; - gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_WRAPPED); + gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_WRAPPED; gBattlerTarget = *(gBattleStruct->wrappedBy + gBattlerAttacker); + gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN; gBattleTextBuff1[1] = B_BUFF_MOVE; gBattleTextBuff1[2] = *(gBattleStruct->wrappedMove + gBattlerAttacker * 2 + 0); gBattleTextBuff1[3] = *(gBattleStruct->wrappedMove + gBattlerAttacker * 2 + 1); gBattleTextBuff1[4] = B_BUFF_EOS; + BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_WrapFree; } else if (gStatuses3[gBattlerAttacker] & STATUS3_LEECHSEED) { - gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED); - gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED_BATTLER); + gStatuses3[gBattlerAttacker] &= ~STATUS3_LEECHSEED; + gStatuses3[gBattlerAttacker] &= ~STATUS3_LEECHSEED_BATTLER; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_LeechSeedFree; } else if (gSideStatuses[GetBattlerSide(gBattlerAttacker)] & SIDE_STATUS_SPIKES) { - gSideStatuses[GetBattlerSide(gBattlerAttacker)] &= ~(SIDE_STATUS_SPIKES); + gSideStatuses[GetBattlerSide(gBattlerAttacker)] &= ~SIDE_STATUS_SPIKES; gSideTimers[GetBattlerSide(gBattlerAttacker)].spikesAmount = 0; BattleScriptPushCursor(); gBattlescriptCurrInstr = BattleScript_SpikesFree; @@ -8121,6 +8472,7 @@ static void Cmd_setdefensecurlbit(void) static void Cmd_recoverbasedonsunlight(void) { gBattlerTarget = gBattlerAttacker; + if (gBattleMons[gBattlerAttacker].hp != gBattleMons[gBattlerAttacker].maxHP) { if (gBattleWeather == 0 || !WEATHER_HAS_EFFECT) @@ -8158,19 +8510,28 @@ static void Cmd_hiddenpowercalc(void) | ((gBattleMons[gBattlerAttacker].speedIV & 1) << 3) | ((gBattleMons[gBattlerAttacker].spAttackIV & 1) << 4) | ((gBattleMons[gBattlerAttacker].spDefenseIV & 1) << 5); + gDynamicBasePower = (40 * powerBits) / 63 + 30; - gBattleStruct->dynamicMoveType = (15 * typeBits) / 63 + 1; + + // Subtract 3 instead of 1 below because 2 types are excluded (TYPE_NORMAL and TYPE_MYSTERY) + // The final + 1 skips past Normal, and the following conditional skips TYPE_MYSTERY + gBattleStruct->dynamicMoveType = ((NUMBER_OF_MON_TYPES - 3) * typeBits) / 63 + 1; if (gBattleStruct->dynamicMoveType >= TYPE_MYSTERY) - ++gBattleStruct->dynamicMoveType; - gBattleStruct->dynamicMoveType |= 0xC0; + gBattleStruct->dynamicMoveType++; + gBattleStruct->dynamicMoveType |= F_DYNAMIC_TYPE_1 | F_DYNAMIC_TYPE_2; + gBattlescriptCurrInstr++; } static void Cmd_selectfirstvalidtarget(void) { - for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; ++gBattlerTarget) - if (gBattlerTarget != gBattlerAttacker && !(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) + for (gBattlerTarget = 0; gBattlerTarget < gBattlersCount; gBattlerTarget++) + { + if (gBattlerTarget == gBattlerAttacker) + continue; + if (!(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) break; + } gBattlescriptCurrInstr++; } @@ -8185,20 +8546,18 @@ static void Cmd_trysetfutureattack(void) gWishFutureKnock.futureSightMove[gBattlerTarget] = gCurrentMove; gWishFutureKnock.futureSightAttacker[gBattlerTarget] = gBattlerAttacker; gWishFutureKnock.futureSightCounter[gBattlerTarget] = 3; - gWishFutureKnock.futureSightDmg[gBattlerTarget] = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], - &gBattleMons[gBattlerTarget], - gCurrentMove, - gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)], - 0, - 0, - gBattlerAttacker, - gBattlerTarget); + gWishFutureKnock.futureSightDmg[gBattlerTarget] = CalculateBaseDamage(&gBattleMons[gBattlerAttacker], &gBattleMons[gBattlerTarget], gCurrentMove, + gSideStatuses[GET_BATTLER_SIDE(gBattlerTarget)], 0, + 0, gBattlerAttacker, gBattlerTarget); + if (gProtectStructs[gBattlerAttacker].helpingHand) gWishFutureKnock.futureSightDmg[gBattlerTarget] = gWishFutureKnock.futureSightDmg[gBattlerTarget] * 15 / 10; + if (gCurrentMove == MOVE_DOOM_DESIRE) - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_DOOM_DESIRE; else - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_FUTURE_SIGHT; + gBattlescriptCurrInstr += 5; } } @@ -8211,6 +8570,7 @@ static void Cmd_trydobeatup(void) party = gPlayerParty; else party = gEnemyParty; + if (gBattleMons[gBattlerTarget].hp == 0) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -8218,19 +8578,20 @@ static void Cmd_trydobeatup(void) else { u8 beforeLoop = gBattleCommunication[0]; - - for (;gBattleCommunication[0] < 6; ++gBattleCommunication[0]) + for (;gBattleCommunication[0] < PARTY_SIZE; gBattleCommunication[0]++) { if (GetMonData(&party[gBattleCommunication[0]], MON_DATA_HP) - && GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES2) - && GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES2) != SPECIES_EGG - && !GetMonData(&party[gBattleCommunication[0]], MON_DATA_STATUS)) + && GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES2) + && GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES2) != SPECIES_EGG + && !GetMonData(&party[gBattleCommunication[0]], MON_DATA_STATUS)) break; } - if (gBattleCommunication[0] < 6) + if (gBattleCommunication[0] < PARTY_SIZE) { PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattlerAttacker, gBattleCommunication[0]) + gBattlescriptCurrInstr += 9; + gBattleMoveDamage = gBaseStats[GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES)].baseAttack; gBattleMoveDamage *= gBattleMoves[gCurrentMove].power; gBattleMoveDamage *= (GetMonData(&party[gBattleCommunication[0]], MON_DATA_LEVEL) * 2 / 5 + 2); @@ -8238,7 +8599,8 @@ static void Cmd_trydobeatup(void) gBattleMoveDamage = (gBattleMoveDamage / 50) + 2; if (gProtectStructs[gBattlerAttacker].helpingHand) gBattleMoveDamage = gBattleMoveDamage * 15 / 10; - ++gBattleCommunication[0]; + + gBattleCommunication[0]++; } else if (beforeLoop != 0) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); @@ -8262,6 +8624,7 @@ static void Cmd_setsemiinvulnerablebit(void) gStatuses3[gBattlerAttacker] |= STATUS3_UNDERWATER; break; } + gBattlescriptCurrInstr++; } @@ -8280,6 +8643,7 @@ static void Cmd_clearsemiinvulnerablebit(void) gStatuses3[gBattlerAttacker] &= ~STATUS3_UNDERWATER; break; } + gBattlescriptCurrInstr++; } @@ -8287,6 +8651,7 @@ static void Cmd_setminimize(void) { if (gHitMarker & HITMARKER_OBEYS) gStatuses3[gBattlerAttacker] |= STATUS3_MINIMIZED; + gBattlescriptCurrInstr++; } @@ -8295,30 +8660,33 @@ static void Cmd_sethail(void) if (gBattleWeather & B_WEATHER_HAIL) { gMoveResultFlags |= MOVE_RESULT_MISSED; - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEATHER_FAILED; } else { gBattleWeather = B_WEATHER_HAIL_TEMPORARY; - gBattleCommunication[MULTISTRING_CHOOSER] = 5; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STARTED_HAIL; gWishFutureKnock.weatherDuration = 5; } + gBattlescriptCurrInstr++; } -static void Cmd_trymemento(void) // memento +static void Cmd_trymemento(void) { - if (gBattleMons[gBattlerTarget].statStages[STAT_ATK] == 0 - && gBattleMons[gBattlerTarget].statStages[STAT_SPATK] == 0 - && gBattleCommunication[6] != 1) + if (gBattleMons[gBattlerTarget].statStages[STAT_ATK] == MIN_STAT_STAGE + && gBattleMons[gBattlerTarget].statStages[STAT_SPATK] == MIN_STAT_STAGE + && gBattleCommunication[MISS_TYPE] != B_MSG_PROTECTED) { + // Failed, unprotected target already has minimum Attack and Special Attack. gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } else { + // Success, drop user's HP bar to 0 gActiveBattler = gBattlerAttacker; gBattleMoveDamage = gBattleMons[gActiveBattler].hp; - BtlController_EmitHealthBarUpdate(0, INSTANT_HP_BAR_DROP); + BtlController_EmitHealthBarUpdate(BUFFER_A, INSTANT_HP_BAR_DROP); MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr += 5; } @@ -8341,9 +8709,9 @@ static void Cmd_setcharge(void) static void Cmd_callterrainattack(void) // nature power { - gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); + gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED; gCurrentMove = sNaturePowerMoves[gBattleTerrain]; - gBattlerTarget = GetMoveTarget(gCurrentMove, 0); + gBattlerTarget = GetMoveTarget(gCurrentMove, NO_TARGET_OVERRIDE); BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]); gBattlescriptCurrInstr++; } @@ -8355,7 +8723,7 @@ static void Cmd_cureifburnedparalysedorpoisoned(void) // refresh gBattleMons[gBattlerAttacker].status1 = 0; gBattlescriptCurrInstr += 5; gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, 0, sizeof(gBattleMons[gActiveBattler].status1), &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); } else @@ -8402,10 +8770,11 @@ static void Cmd_settaunt(void) static void Cmd_trysethelpinghand(void) { gBattlerTarget = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK); + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE - && !(gAbsentBattlerFlags & gBitTable[gBattlerTarget]) - && !gProtectStructs[gBattlerAttacker].helpingHand - && !gProtectStructs[gBattlerTarget].helpingHand) + && !(gAbsentBattlerFlags & gBitTable[gBattlerTarget]) + && !gProtectStructs[gBattlerAttacker].helpingHand + && !gProtectStructs[gBattlerTarget].helpingHand) { gProtectStructs[gBattlerTarget].helpingHand = 1; gBattlescriptCurrInstr += 5; @@ -8420,9 +8789,11 @@ static void Cmd_tryswapitems(void) // trick { // opponent can't swap items with player in regular battles if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER - || (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT - && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER)) - && gTrainerBattleOpponent_A != TRAINER_SECRET_BASE)) + || (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT + && !(gBattleTypeFlags & (BATTLE_TYPE_LINK + | BATTLE_TYPE_BATTLE_TOWER + | BATTLE_TYPE_EREADER_TRAINER)) + && gTrainerBattleOpponent_A != TRAINER_SECRET_BASE)) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -8432,20 +8803,22 @@ static void Cmd_tryswapitems(void) // trick u8 sideTarget = GetBattlerSide(gBattlerTarget); // you can't swap items if they were knocked off in regular battles - if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER)) - && gTrainerBattleOpponent_A != TRAINER_SECRET_BASE - && (gWishFutureKnock.knockedOffMons[sideAttacker] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]] - || gWishFutureKnock.knockedOffMons[sideTarget] & gBitTable[gBattlerPartyIndexes[gBattlerTarget]])) + if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK + | BATTLE_TYPE_BATTLE_TOWER + | BATTLE_TYPE_EREADER_TRAINER)) + && gTrainerBattleOpponent_A != TRAINER_SECRET_BASE + && (gWishFutureKnock.knockedOffMons[sideAttacker] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]] + || gWishFutureKnock.knockedOffMons[sideTarget] & gBitTable[gBattlerPartyIndexes[gBattlerTarget]])) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } // can't swap if two pokemon don't have an item // or if either of them is an enigma berry or a mail - else if ((gBattleMons[gBattlerAttacker].item == 0 && gBattleMons[gBattlerTarget].item == 0) - || gBattleMons[gBattlerAttacker].item == ITEM_ENIGMA_BERRY - || gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY - || IS_ITEM_MAIL(gBattleMons[gBattlerAttacker].item) - || IS_ITEM_MAIL(gBattleMons[gBattlerTarget].item)) + else if ((gBattleMons[gBattlerAttacker].item == ITEM_NONE && gBattleMons[gBattlerTarget].item == ITEM_NONE) + || gBattleMons[gBattlerAttacker].item == ITEM_ENIGMA_BERRY + || gBattleMons[gBattlerTarget].item == ITEM_ENIGMA_BERRY + || IS_ITEM_MAIL(gBattleMons[gBattlerAttacker].item) + || IS_ITEM_MAIL(gBattleMons[gBattlerTarget].item)) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -8464,35 +8837,43 @@ static void Cmd_tryswapitems(void) // trick newItemAtk = &gBattleStruct->changedItems[gBattlerAttacker]; oldItemAtk = gBattleMons[gBattlerAttacker].item; *newItemAtk = gBattleMons[gBattlerTarget].item; - gBattleMons[gBattlerAttacker].item = 0; - gBattleMons[gBattlerTarget].item = oldItemAtk; - gActiveBattler = gBattlerAttacker; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, newItemAtk); - MarkBattlerForControllerExec(gBattlerAttacker); - gActiveBattler = gBattlerTarget; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gBattlerTarget].item); - MarkBattlerForControllerExec(gBattlerTarget); - *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerTarget]) + 0) = 0; - *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerTarget]) + 1) = 0; - *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerAttacker]) + 0) = 0; - *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerAttacker]) + 1) = 0; + gBattleMons[gBattlerAttacker].item = ITEM_NONE; + gBattleMons[gBattlerTarget].item = oldItemAtk; + + gActiveBattler = gBattlerAttacker; + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, sizeof(*newItemAtk), newItemAtk); + MarkBattlerForControllerExec(gBattlerAttacker); + + gActiveBattler = gBattlerTarget; + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, sizeof(gBattleMons[gBattlerTarget].item), &gBattleMons[gBattlerTarget].item); + MarkBattlerForControllerExec(gBattlerTarget); + + *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 0) = 0; + *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 1) = 0; + + *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerAttacker]) + 0) = 0; + *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerAttacker]) + 1) = 0; + gBattlescriptCurrInstr += 5; + PREPARE_ITEM_BUFFER(gBattleTextBuff1, *newItemAtk) PREPARE_ITEM_BUFFER(gBattleTextBuff2, oldItemAtk) + if (oldItemAtk != ITEM_NONE && *newItemAtk != ITEM_NONE) - gBattleCommunication[MULTISTRING_CHOOSER] = 2; // attacker's item -> <- target's item + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ITEM_SWAP_BOTH; // attacker's item -> <- target's item else if (oldItemAtk == ITEM_NONE && *newItemAtk != ITEM_NONE) - gBattleCommunication[MULTISTRING_CHOOSER] = 0; // nothing -> <- target's item + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ITEM_SWAP_TAKEN; // nothing -> <- target's item else - gBattleCommunication[MULTISTRING_CHOOSER] = 1; // attacker's item -> <- nothing + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ITEM_SWAP_GIVEN; // attacker's item -> <- nothing } } } static void Cmd_trycopyability(void) // role play { - if (gBattleMons[gBattlerTarget].ability != ABILITY_NONE && gBattleMons[gBattlerTarget].ability != ABILITY_WONDER_GUARD) + if (gBattleMons[gBattlerTarget].ability != ABILITY_NONE + && gBattleMons[gBattlerTarget].ability != ABILITY_WONDER_GUARD) { gBattleMons[gBattlerAttacker].ability = gBattleMons[gBattlerTarget].ability; gLastUsedAbility = gBattleMons[gBattlerTarget].ability; @@ -8522,14 +8903,17 @@ static void Cmd_trywish(void) break; case 1: // heal effect PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, gBattlerTarget, gWishFutureKnock.wishMonId[gBattlerTarget]) + gBattleMoveDamage = gBattleMons[gBattlerTarget].maxHP / 2; if (gBattleMoveDamage == 0) gBattleMoveDamage = 1; gBattleMoveDamage *= -1; + if (gBattleMons[gBattlerTarget].hp == gBattleMons[gBattlerTarget].maxHP) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 2); else gBattlescriptCurrInstr += 6; + break; } } @@ -8550,25 +8934,26 @@ static void Cmd_trysetroots(void) // ingrain static void Cmd_doubledamagedealtifdamaged(void) { if ((gProtectStructs[gBattlerAttacker].physicalDmg != 0 - && gProtectStructs[gBattlerAttacker].physicalBattlerId == gBattlerTarget) - || (gProtectStructs[gBattlerAttacker].specialDmg != 0 - && gProtectStructs[gBattlerAttacker].specialBattlerId == gBattlerTarget)) + && gProtectStructs[gBattlerAttacker].physicalBattlerId == gBattlerTarget) + || (gProtectStructs[gBattlerAttacker].specialDmg != 0 + && gProtectStructs[gBattlerAttacker].specialBattlerId == gBattlerTarget)) { gBattleScripting.dmgMultiplier = 2; } + gBattlescriptCurrInstr++; } static void Cmd_setyawn(void) { if (gStatuses3[gBattlerTarget] & STATUS3_YAWN - || gBattleMons[gBattlerTarget].status1 & STATUS1_ANY) + || gBattleMons[gBattlerTarget].status1 & STATUS1_ANY) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } else { - gStatuses3[gBattlerTarget] |= 0x1000; + gStatuses3[gBattlerTarget] |= STATUS3_YAWN_TURN(2); gBattlescriptCurrInstr += 5; } } @@ -8591,7 +8976,6 @@ static void Cmd_scaledamagebyhealthratio(void) if (gDynamicBasePower == 0) { u8 power = gBattleMoves[gCurrentMove].power; - gDynamicBasePower = gBattleMons[gBattlerAttacker].hp * power / gBattleMons[gBattlerAttacker].maxHP; if (gDynamicBasePower == 0) gDynamicBasePower = 1; @@ -8601,8 +8985,8 @@ static void Cmd_scaledamagebyhealthratio(void) static void Cmd_tryswapabilities(void) // skill swap { - if ((gBattleMons[gBattlerAttacker].ability == 0 - && gBattleMons[gBattlerTarget].ability == 0) + if ((gBattleMons[gBattlerAttacker].ability == ABILITY_NONE + && gBattleMons[gBattlerTarget].ability == ABILITY_NONE) || gBattleMons[gBattlerAttacker].ability == ABILITY_WONDER_GUARD || gBattleMons[gBattlerTarget].ability == ABILITY_WONDER_GUARD || gMoveResultFlags & MOVE_RESULT_NO_EFFECT) @@ -8612,7 +8996,6 @@ static void Cmd_tryswapabilities(void) // skill swap else { u8 abilityAtk = gBattleMons[gBattlerAttacker].ability; - gBattleMons[gBattlerAttacker].ability = gBattleMons[gBattlerTarget].ability; gBattleMons[gBattlerTarget].ability = abilityAtk; @@ -8632,20 +9015,18 @@ static void Cmd_tryimprison(void) sideAttacker = GetBattlerSide(gBattlerAttacker); PressurePPLoseOnUsingImprison(gBattlerAttacker); - for (battlerId = 0; battlerId < gBattlersCount; ++battlerId) + for (battlerId = 0; battlerId < gBattlersCount; battlerId++) { if (sideAttacker != GetBattlerSide(battlerId)) { s32 attackerMoveId; - - for (attackerMoveId = 0; attackerMoveId < MAX_MON_MOVES; ++attackerMoveId) + for (attackerMoveId = 0; attackerMoveId < MAX_MON_MOVES; attackerMoveId++) { s32 i; - for (i = 0; i < MAX_MON_MOVES; i++) { if (gBattleMons[gBattlerAttacker].moves[attackerMoveId] == gBattleMons[battlerId].moves[i] - && gBattleMons[gBattlerAttacker].moves[attackerMoveId] != MOVE_NONE) + && gBattleMons[gBattlerAttacker].moves[attackerMoveId] != MOVE_NONE) break; } if (i != MAX_MON_MOVES) @@ -8680,55 +9061,65 @@ static void Cmd_trysetgrudge(void) static void Cmd_weightdamagecalculation(void) { s32 i; - for (i = 0; sWeightToDamageTable[i] != 0xFFFF; i += 2) { if (sWeightToDamageTable[i] > GetPokedexHeightWeight(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), 1)) break; } + if (sWeightToDamageTable[i] != 0xFFFF) gDynamicBasePower = sWeightToDamageTable[i + 1]; else gDynamicBasePower = 120; + gBattlescriptCurrInstr++; } static void Cmd_assistattackselect(void) { s32 chooseableMovesNo = 0; - struct Pokemon *party; + struct Pokemon* party; s32 monId, moveId; - u16 *movesArray = gBattleStruct->assistPossibleMoves; + u16* validMoves = gBattleStruct->assistPossibleMoves; if (GET_BATTLER_SIDE(gBattlerAttacker) != B_SIDE_PLAYER) party = gEnemyParty; else party = gPlayerParty; - for (monId = 0; monId < PARTY_SIZE; ++monId) + + for (monId = 0; monId < PARTY_SIZE; monId++) { - if (monId == gBattlerPartyIndexes[gBattlerAttacker] - || GetMonData(&party[monId], MON_DATA_SPECIES2) == SPECIES_NONE - || GetMonData(&party[monId], MON_DATA_SPECIES2) == SPECIES_EGG) + if (monId == gBattlerPartyIndexes[gBattlerAttacker]) continue; - for (moveId = 0; moveId < MAX_MON_MOVES; ++moveId) + if (GetMonData(&party[monId], MON_DATA_SPECIES2) == SPECIES_NONE) + continue; + if (GetMonData(&party[monId], MON_DATA_SPECIES2) == SPECIES_EGG) + continue; + + for (moveId = 0; moveId < MAX_MON_MOVES; moveId++) { s32 i = 0; u16 move = GetMonData(&party[monId], MON_DATA_MOVE1 + moveId); if (IsInvalidForSleepTalkOrAssist(move)) continue; + for (; sMovesForbiddenToCopy[i] != ASSIST_FORBIDDEN_END && move != sMovesForbiddenToCopy[i]; i++); - if (sMovesForbiddenToCopy[i] != ASSIST_FORBIDDEN_END || move == MOVE_NONE) + + if (sMovesForbiddenToCopy[i] != ASSIST_FORBIDDEN_END) continue; - movesArray[chooseableMovesNo] = move; - ++chooseableMovesNo; + if (move == MOVE_NONE) + continue; + + validMoves[chooseableMovesNo] = move; + chooseableMovesNo++; } } if (chooseableMovesNo) { - gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED); - gCalledMove = movesArray[((Random() & 0xFF) * chooseableMovesNo) >> 8]; - gBattlerTarget = GetMoveTarget(gCalledMove, 0); + gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED; + gCalledMove = validMoves[((Random() & 0xFF) * chooseableMovesNo) >> 8]; + gBattlerTarget = GetMoveTarget(gCalledMove, NO_TARGET_OVERRIDE); gBattlescriptCurrInstr += 5; } else @@ -8747,7 +9138,7 @@ static void Cmd_trysetmagiccoat(void) } else { - gProtectStructs[gBattlerAttacker].bounceMove = 1; + gProtectStructs[gBattlerAttacker].bounceMove = TRUE; gBattlescriptCurrInstr += 5; } } @@ -8772,10 +9163,17 @@ static void Cmd_trygetintimidatetarget(void) gBattleScripting.battler = gBattleStruct->intimidateBattler; side = GetBattlerSide(gBattleScripting.battler); + PREPARE_ABILITY_BUFFER(gBattleTextBuff1, gBattleMons[gBattleScripting.battler].ability) - for (;gBattlerTarget < gBattlersCount; ++gBattlerTarget) - if (GetBattlerSide(gBattlerTarget) != side && !(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) + + for (;gBattlerTarget < gBattlersCount; gBattlerTarget++) + { + if (GetBattlerSide(gBattlerTarget) == side) + continue; + if (!(gAbsentBattlerFlags & gBitTable[gBattlerTarget])) break; + } + if (gBattlerTarget >= gBattlersCount) gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); else @@ -8785,14 +9183,19 @@ static void Cmd_trygetintimidatetarget(void) static void Cmd_switchoutabilities(void) { gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); + switch (gBattleMons[gActiveBattler].ability) { case ABILITY_NATURAL_CURE: gBattleMons[gActiveBattler].status1 = 0; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, gBitTable[*(gBattleStruct->battlerPartyIndexes + gActiveBattler)], 4, &gBattleMons[gActiveBattler].status1); + BtlController_EmitSetMonData(BUFFER_A, REQUEST_STATUS_BATTLE, + gBitTable[*(gBattleStruct->battlerPartyIndexes + gActiveBattler)], + sizeof(gBattleMons[gActiveBattler].status1), + &gBattleMons[gActiveBattler].status1); MarkBattlerForControllerExec(gActiveBattler); break; } + gBattlescriptCurrInstr += 2; } @@ -8872,10 +9275,13 @@ static void Cmd_pickup(void) static void Cmd_docastformchangeanimation(void) { gActiveBattler = gBattleScripting.battler; + if (gBattleMons[gActiveBattler].status2 & STATUS2_SUBSTITUTE) - *(&gBattleStruct->formToChangeInto) |= 0x80; + *(&gBattleStruct->formToChangeInto) |= CASTFORM_SUBSTITUTE; + BtlController_EmitBattleAnimation(BUFFER_A, B_ANIM_CASTFORM_CHANGE, gBattleStruct->formToChangeInto); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr++; } @@ -8901,7 +9307,7 @@ static void Cmd_settypebasedhalvers(void) // water and mud sport if (!(gStatuses3[gBattlerAttacker] & STATUS3_MUDSPORT)) { gStatuses3[gBattlerAttacker] |= STATUS3_MUDSPORT; - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEAKEN_ELECTRIC; worked = TRUE; } } @@ -8910,10 +9316,11 @@ static void Cmd_settypebasedhalvers(void) // water and mud sport if (!(gStatuses3[gBattlerAttacker] & STATUS3_WATERSPORT)) { gStatuses3[gBattlerAttacker] |= STATUS3_WATERSPORT; - gBattleCommunication[MULTISTRING_CHOOSER] = 1; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEAKEN_FIRE; worked = TRUE; } } + if (worked) gBattlescriptCurrInstr += 5; else @@ -8924,19 +9331,20 @@ static void Cmd_setweatherballtype(void) { if (WEATHER_HAS_EFFECT) { - if (gBattleWeather & WEATHER_ANY) + if (gBattleWeather & B_WEATHER_ANY) gBattleScripting.dmgMultiplier = 2; if (gBattleWeather & B_WEATHER_RAIN) - *(&gBattleStruct->dynamicMoveType) = TYPE_WATER | 0x80; + *(&gBattleStruct->dynamicMoveType) = TYPE_WATER | F_DYNAMIC_TYPE_2; else if (gBattleWeather & B_WEATHER_SANDSTORM) - *(&gBattleStruct->dynamicMoveType) = TYPE_ROCK | 0x80; + *(&gBattleStruct->dynamicMoveType) = TYPE_ROCK | F_DYNAMIC_TYPE_2; else if (gBattleWeather & B_WEATHER_SUN) - *(&gBattleStruct->dynamicMoveType) = TYPE_FIRE | 0x80; + *(&gBattleStruct->dynamicMoveType) = TYPE_FIRE | F_DYNAMIC_TYPE_2; else if (gBattleWeather & B_WEATHER_HAIL) - *(&gBattleStruct->dynamicMoveType) = TYPE_ICE | 0x80; + *(&gBattleStruct->dynamicMoveType) = TYPE_ICE | F_DYNAMIC_TYPE_2; else - *(&gBattleStruct->dynamicMoveType) = TYPE_NORMAL | 0x80; + *(&gBattleStruct->dynamicMoveType) = TYPE_NORMAL | F_DYNAMIC_TYPE_2; } + gBattlescriptCurrInstr++; } @@ -8951,8 +9359,10 @@ static void Cmd_tryrecycleitem(void) gLastUsedItem = *usedHeldItem; *usedHeldItem = ITEM_NONE; gBattleMons[gActiveBattler].item = gLastUsedItem; - BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, 2, &gBattleMons[gActiveBattler].item); + + BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, sizeof(gBattleMons[gActiveBattler].item), &gBattleMons[gActiveBattler].item); MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr += 5; } else @@ -8967,6 +9377,7 @@ static void Cmd_settypetoterrain(void) { SET_BATTLER_TYPE(gBattlerAttacker, sTerrainToType[gBattleTerrain]); PREPARE_TYPE_BUFFER(gBattleTextBuff1, sTerrainToType[gBattleTerrain]); + gBattlescriptCurrInstr += 5; } else @@ -8975,20 +9386,21 @@ static void Cmd_settypetoterrain(void) } } +// Unused static void Cmd_pursuitdoubles(void) { gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK); if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE - && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]) - && gChosenActionByBattler[gActiveBattler] == 0 - && gChosenMoveByBattler[gActiveBattler] == MOVE_PURSUIT) + && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]) + && gChosenActionByBattler[gActiveBattler] == B_ACTION_USE_MOVE + && gChosenMoveByBattler[gActiveBattler] == MOVE_PURSUIT) { - gActionsByTurnOrder[gActiveBattler] = 11; + gActionsByTurnOrder[gActiveBattler] = B_ACTION_TRY_FINISH; gCurrentMove = MOVE_PURSUIT; gBattlescriptCurrInstr += 5; gBattleScripting.animTurn = 1; - gBattleScripting.field_20 = gBattlerAttacker; + gBattleScripting.pursuitDoublesAttacker = gBattlerAttacker; gBattlerAttacker = gActiveBattler; } else @@ -9000,10 +9412,12 @@ static void Cmd_pursuitdoubles(void) static void Cmd_snatchsetbattlers(void) { gEffectBattler = gBattlerAttacker; + if (gBattlerAttacker == gBattlerTarget) gBattlerAttacker = gBattlerTarget = gBattleScripting.battler; else gBattlerTarget = gBattleScripting.battler; + gBattleScripting.battler = gEffectBattler; gBattlescriptCurrInstr++; } @@ -9014,8 +9428,8 @@ static void Cmd_removelightscreenreflect(void) // brick break if (gSideTimers[opposingSide].reflectTimer || gSideTimers[opposingSide].lightscreenTimer) { - gSideStatuses[opposingSide] &= ~(SIDE_STATUS_REFLECT); - gSideStatuses[opposingSide] &= ~(SIDE_STATUS_LIGHTSCREEN); + gSideStatuses[opposingSide] &= ~SIDE_STATUS_REFLECT; + gSideStatuses[opposingSide] &= ~SIDE_STATUS_LIGHTSCREEN; gSideTimers[opposingSide].reflectTimer = 0; gSideTimers[opposingSide].lightscreenTimer = 0; gBattleScripting.animTurn = 1; @@ -9026,6 +9440,7 @@ static void Cmd_removelightscreenreflect(void) // brick break gBattleScripting.animTurn = 0; gBattleScripting.animTargetsHit = 0; } + gBattlescriptCurrInstr++; } @@ -9033,139 +9448,151 @@ static void Cmd_handleballthrow(void) { u8 ballMultiplier = 0; - if (gBattleControllerExecFlags == 0) - { - gActiveBattler = gBattlerAttacker; - gBattlerTarget = gBattlerAttacker ^ BIT_SIDE; - if (gBattleTypeFlags & BATTLE_TYPE_GHOST) - { - BtlController_EmitBallThrowAnim(0, BALL_GHOST_DODGE); - MarkBattlerForControllerExec(gActiveBattler); - gBattlescriptCurrInstr = BattleScript_GhostBallDodge; - } - else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) - { - BtlController_EmitBallThrowAnim(0, BALL_TRAINER_BLOCK); - MarkBattlerForControllerExec(gActiveBattler); - gBattlescriptCurrInstr = BattleScript_TrainerBallBlock; - } - else if (gBattleTypeFlags & (BATTLE_TYPE_POKEDUDE | BATTLE_TYPE_OLD_MAN_TUTORIAL)) - { - BtlController_EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS); - MarkBattlerForControllerExec(gActiveBattler); - gBattlescriptCurrInstr = BattleScript_OldMan_Pokedude_CaughtMessage; - } - else - { - u32 odds; - u8 catchRate; + if (gBattleControllerExecFlags) + return; - if (gLastUsedItem == ITEM_SAFARI_BALL) - catchRate = gBattleStruct->safariCatchFactor * 1275 / 100; - else - catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate; - if (gLastUsedItem > ITEM_SAFARI_BALL) + gActiveBattler = gBattlerAttacker; + gBattlerTarget = gBattlerAttacker ^ BIT_SIDE; + + if (gBattleTypeFlags & BATTLE_TYPE_GHOST) + { + BtlController_EmitBallThrowAnim(BUFFER_A, BALL_GHOST_DODGE); + MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr = BattleScript_GhostBallDodge; + } + else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) + { + BtlController_EmitBallThrowAnim(BUFFER_A, BALL_TRAINER_BLOCK); + MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr = BattleScript_TrainerBallBlock; + } + else if (gBattleTypeFlags & (BATTLE_TYPE_POKEDUDE | BATTLE_TYPE_OLD_MAN_TUTORIAL)) + { + BtlController_EmitBallThrowAnim(BUFFER_A, BALL_3_SHAKES_SUCCESS); + MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr = BattleScript_OldMan_Pokedude_CaughtMessage; + } + else + { + u32 odds; + u8 catchRate; + + if (gLastUsedItem == ITEM_SAFARI_BALL) + catchRate = gBattleStruct->safariCatchFactor * 1275 / 100; + else + catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate; + + if (gLastUsedItem > ITEM_SAFARI_BALL) + { + switch (gLastUsedItem) { - switch (gLastUsedItem) - { - case ITEM_NET_BALL: - if (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_WATER) || IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_BUG)) - ballMultiplier = 30; - else - ballMultiplier = 10; - break; - case ITEM_DIVE_BALL: - if (GetCurrentMapType() == MAP_TYPE_UNDERWATER) - ballMultiplier = 35; - else - ballMultiplier = 10; - break; - case ITEM_NEST_BALL: - if (gBattleMons[gBattlerTarget].level < 40) - { - ballMultiplier = 40 - gBattleMons[gBattlerTarget].level; - if (ballMultiplier <= 9) - ballMultiplier = 10; - } - else - { - ballMultiplier = 10; - } - break; - case ITEM_REPEAT_BALL: - if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), FLAG_GET_CAUGHT)) - ballMultiplier = 30; - else - ballMultiplier = 10; - break; - case ITEM_TIMER_BALL: - ballMultiplier = gBattleResults.battleTurnCounter + 10; - if (ballMultiplier > 40) - ballMultiplier = 40; - break; - case ITEM_LUXURY_BALL: - case ITEM_PREMIER_BALL: + case ITEM_NET_BALL: + if (IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_WATER) || IS_BATTLER_OF_TYPE(gBattlerTarget, TYPE_BUG)) + ballMultiplier = 30; + else ballMultiplier = 10; - break; - } - } - else - ballMultiplier = sBallCatchBonuses[gLastUsedItem - 2]; - odds = (catchRate * ballMultiplier / 10) - * (gBattleMons[gBattlerTarget].maxHP * 3 - gBattleMons[gBattlerTarget].hp * 2) - / (3 * gBattleMons[gBattlerTarget].maxHP); - if (gBattleMons[gBattlerTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE)) - odds *= 2; - if (gBattleMons[gBattlerTarget].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON)) - odds = (odds * 15) / 10; - if (gLastUsedItem != ITEM_SAFARI_BALL) - { - if (gLastUsedItem == ITEM_MASTER_BALL) + break; + case ITEM_DIVE_BALL: + if (GetCurrentMapType() == MAP_TYPE_UNDERWATER) + ballMultiplier = 35; + else + ballMultiplier = 10; + break; + case ITEM_NEST_BALL: + if (gBattleMons[gBattlerTarget].level < 40) { - gBattleResults.usedMasterBall = TRUE; + ballMultiplier = 40 - gBattleMons[gBattlerTarget].level; + if (ballMultiplier <= 9) + ballMultiplier = 10; } else { - if (gBattleResults.catchAttempts[gLastUsedItem - ITEM_ULTRA_BALL] < 0xFF) - ++gBattleResults.catchAttempts[gLastUsedItem - ITEM_ULTRA_BALL]; + ballMultiplier = 10; } + break; + case ITEM_REPEAT_BALL: + if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBattlerTarget].species), FLAG_GET_CAUGHT)) + ballMultiplier = 30; + else + ballMultiplier = 10; + break; + case ITEM_TIMER_BALL: + ballMultiplier = gBattleResults.battleTurnCounter + 10; + if (ballMultiplier > 40) + ballMultiplier = 40; + break; + case ITEM_LUXURY_BALL: + case ITEM_PREMIER_BALL: + ballMultiplier = 10; + break; } - if (odds > 254) // mon caught + } + else + ballMultiplier = sBallCatchBonuses[gLastUsedItem - ITEM_ULTRA_BALL]; + + odds = (catchRate * ballMultiplier / 10) + * (gBattleMons[gBattlerTarget].maxHP * 3 - gBattleMons[gBattlerTarget].hp * 2) + / (3 * gBattleMons[gBattlerTarget].maxHP); + + if (gBattleMons[gBattlerTarget].status1 & (STATUS1_SLEEP | STATUS1_FREEZE)) + odds *= 2; + if (gBattleMons[gBattlerTarget].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON)) + odds = (odds * 15) / 10; + + if (gLastUsedItem != ITEM_SAFARI_BALL) + { + if (gLastUsedItem == ITEM_MASTER_BALL) + { + gBattleResults.usedMasterBall = TRUE; + } + else + { + if (gBattleResults.catchAttempts[gLastUsedItem - ITEM_ULTRA_BALL] < 255) + gBattleResults.catchAttempts[gLastUsedItem - ITEM_ULTRA_BALL]++; + } + } + + if (odds > 254) // mon caught + { + BtlController_EmitBallThrowAnim(BUFFER_A, BALL_3_SHAKES_SUCCESS); + MarkBattlerForControllerExec(gActiveBattler); + gBattlescriptCurrInstr = BattleScript_SuccessBallThrow; + SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], MON_DATA_POKEBALL, &gLastUsedItem); + + if (CalculatePlayerPartyCount() == PARTY_SIZE) + gBattleCommunication[MULTISTRING_CHOOSER] = 0; + else + gBattleCommunication[MULTISTRING_CHOOSER] = 1; + } + else // mon may be caught, calculate shakes + { + u8 shakes; + + odds = Sqrt(Sqrt(16711680 / odds)); + odds = 1048560 / odds; + + for (shakes = 0; shakes < BALL_3_SHAKES_SUCCESS && Random() < odds; shakes++); + + if (gLastUsedItem == ITEM_MASTER_BALL) + shakes = BALL_3_SHAKES_SUCCESS; // why calculate the shakes before that check? + + BtlController_EmitBallThrowAnim(BUFFER_A, shakes); + MarkBattlerForControllerExec(gActiveBattler); + + if (shakes == BALL_3_SHAKES_SUCCESS) // mon caught, copy of the code above { - BtlController_EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS); - MarkBattlerForControllerExec(gActiveBattler); gBattlescriptCurrInstr = BattleScript_SuccessBallThrow; SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], MON_DATA_POKEBALL, &gLastUsedItem); - if (CalculatePlayerPartyCount() == 6) + + if (CalculatePlayerPartyCount() == PARTY_SIZE) gBattleCommunication[MULTISTRING_CHOOSER] = 0; else gBattleCommunication[MULTISTRING_CHOOSER] = 1; } - else // mon may be caught, calculate shakes + else // not caught { - u8 shakes; - - odds = Sqrt(Sqrt(16711680 / odds)); - odds = 1048560 / odds; - for (shakes = 0; shakes < 4 && Random() < odds; ++shakes); - if (gLastUsedItem == ITEM_MASTER_BALL) - shakes = BALL_3_SHAKES_SUCCESS; // why calculate the shakes before that check? - BtlController_EmitBallThrowAnim(0, shakes); - MarkBattlerForControllerExec(gActiveBattler); - if (shakes == BALL_3_SHAKES_SUCCESS) // mon caught, copy of the code above - { - gBattlescriptCurrInstr = BattleScript_SuccessBallThrow; - SetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerTarget]], MON_DATA_POKEBALL, &gLastUsedItem); - if (CalculatePlayerPartyCount() == 6) - gBattleCommunication[MULTISTRING_CHOOSER] = 0; - else - gBattleCommunication[MULTISTRING_CHOOSER] = 1; - } - else // not caught - { - gBattleCommunication[MULTISTRING_CHOOSER] = shakes; - gBattlescriptCurrInstr = BattleScript_ShakeBallThrow; - } + gBattleCommunication[MULTISTRING_CHOOSER] = shakes; + gBattlescriptCurrInstr = BattleScript_ShakeBallThrow; } } } @@ -9177,7 +9604,7 @@ static void Cmd_givecaughtmon(void) { if (!ShouldShowBoxWasFullMessage()) { - gBattleCommunication[MULTISTRING_CHOOSER] = 0; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SENT_SOMEONES_PC; StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON))); GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2); } @@ -9186,13 +9613,17 @@ static void Cmd_givecaughtmon(void) StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON))); // box the mon was sent to GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gStringVar2); StringCopy(gStringVar3, GetBoxNamePtr(GetPCBoxToSendMon())); //box the mon was going to be sent to - gBattleCommunication[MULTISTRING_CHOOSER] = 2; + gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SOMEONES_BOX_FULL; } + + // Change to B_MSG_SENT_BILLS_PC or B_MSG_BILLS_BOX_FULL if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC)) gBattleCommunication[MULTISTRING_CHOOSER]++; } + gBattleResults.caughtMonSpecies = gBattleMons[gBattlerAttacker ^ BIT_SIDE].species; GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleResults.caughtMonNick); + gBattlescriptCurrInstr++; } @@ -9219,15 +9650,15 @@ static void Cmd_displaydexinfo(void) switch (gBattleCommunication[0]) { case 0: - BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_WHITE); - ++gBattleCommunication[0]; + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_WHITE); + gBattleCommunication[0]++; break; case 1: if (!gPaletteFade.active) { FreeAllWindowBuffers(); gBattleCommunication[TASK_ID] = DexScreen_RegisterMonToPokedex(species); - ++gBattleCommunication[0]; + gBattleCommunication[0]++; } break; case 2: @@ -9237,14 +9668,14 @@ static void Cmd_displaydexinfo(void) { CpuFill32(0, (void *)VRAM, VRAM_SIZE); SetVBlankCallback(VBlankCB_Battle); - ++gBattleCommunication[0]; + gBattleCommunication[0]++; } break; case 3: InitBattleBgsVideo(); LoadBattleTextboxAndBackground(); - gBattle_BG3_X = 0x100; - ++gBattleCommunication[0]; + gBattle_BG3_X = 256; + gBattleCommunication[0]++; break; case 4: if (!IsDma3ManagerBusyWithBgCopy()) @@ -9258,10 +9689,10 @@ static void Cmd_displaydexinfo(void) 0, 0xFFFF); CpuFill32(0, gPlttBufferFaded, BG_PLTT_SIZE); - BeginNormalPaletteFade(0x1FFFF, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(0x1FFFF, 0, 16, 0, RGB_BLACK); ShowBg(0); ShowBg(3); - ++gBattleCommunication[0]; + gBattleCommunication[0]++; } break; case 5: @@ -9276,9 +9707,9 @@ void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags) s32 destY, destX; u16 var = 0; - for (destY = yStart; destY <= yEnd; ++destY) + for (destY = yStart; destY <= yEnd; destY++) { - for (destX = xStart; destX <= xEnd; ++destX) + for (destX = xStart; destX <= xEnd; destX++) { if (destY == yStart) { @@ -9307,9 +9738,11 @@ void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags) else var = 0x1026; } + if (flags & WINDOW_CLEAR) var = 0; - if (flags & WINDOW_x80) + + if (flags & WINDOW_BG1) CopyToBgTilemapBufferRect_ChangePalette(1, &var, destX, destY, 1, 1, 0x11); else CopyToBgTilemapBufferRect_ChangePalette(0, &var, destX, destY, 1, 1, 0x11); @@ -9321,7 +9754,6 @@ void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags) void BattleCreateYesNoCursorAt(void) { u16 src[2]; - src[0] = 1; src[1] = 2; CopyToBgTilemapBufferRect_ChangePalette(0, src, 0x18, 9 + (2 * gBattleCommunication[1]), 1, 2, 0x11); @@ -9331,9 +9763,9 @@ void BattleCreateYesNoCursorAt(void) void BattleDestroyYesNoCursorAt(void) { u16 src[2]; - src[0] = 32; src[1] = 32; + CopyToBgTilemapBufferRect_ChangePalette(0, src, 0x18, 9 + (2 * gBattleCommunication[1]), 1, 2, 0x11); CopyBgTilemapBufferToVram(0); } @@ -9343,9 +9775,9 @@ static void Cmd_trygivecaughtmonnick(void) switch (gBattleCommunication[MULTIUSE_STATE]) { case 0: - HandleBattleWindow(0x17, 8, 0x1D, 0xD, 0); + HandleBattleWindow(23, 8, 29, 13, 0); BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); - ++gBattleCommunication[MULTIUSE_STATE]; + gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); break; @@ -9369,7 +9801,7 @@ static void Cmd_trygivecaughtmonnick(void) PlaySE(SE_SELECT); if (gBattleCommunication[CURSOR_POSITION] == 0) { - ++gBattleCommunication[MULTIUSE_STATE]; + gBattleCommunication[MULTIUSE_STATE]++; BeginFastPaletteFade(3); } else @@ -9388,12 +9820,14 @@ static void Cmd_trygivecaughtmonnick(void) { GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_NICKNAME, gBattleStruct->caughtMonNick); FreeAllWindowBuffers(); + DoNamingScreen(NAMING_SCREEN_CAUGHT_MON, gBattleStruct->caughtMonNick, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_SPECIES), GetMonGender(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]]), GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattlerAttacker ^ BIT_SIDE]], MON_DATA_PERSONALITY, NULL), BattleMainCB2); - ++gBattleCommunication[MULTIUSE_STATE]; + + gBattleCommunication[MULTIUSE_STATE]++; } break; case 3: diff --git a/src/battle_util.c b/src/battle_util.c index 4efbc7656..383a8fc0e 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -687,7 +687,7 @@ u8 DoBattlerEndTurnEffects(void) { u8 effect = 0; - gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); + gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK); while (gBattleStruct->turnEffectsBattlerId < gBattlersCount && gBattleStruct->turnEffectsTracker <= ENDTURN_BATTLER_COUNT) { gActiveBattler = gBattlerAttacker = gBattlerByTurnOrder[gBattleStruct->turnEffectsBattlerId]; @@ -1000,13 +1000,13 @@ u8 DoBattlerEndTurnEffects(void) return effect; } } - gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_x20); + gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK); return 0; } bool8 HandleWishPerishSongOnTurnEnd(void) { - gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20); + gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK); switch (gBattleStruct->wishPerishSongState) { case 0: @@ -1073,7 +1073,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void) } break; } - gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_x20); + gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK); return FALSE; } @@ -1874,7 +1874,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA } } break; - case ABILITYEFFECT_MOVE_END: // Think contact abilities. + case ABILITYEFFECT_ON_DAMAGE: // Think contact abilities. switch (gLastUsedAbility) { case ABILITY_COLOR_CHANGE: @@ -2234,12 +2234,12 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA case ABILITYEFFECT_FIELD_SPORT: // 14 switch (gLastUsedAbility) { - case 0xFD: + case ABILITYEFFECT_MUD_SPORT: for (i = 0; i < gBattlersCount; ++i) if (gStatuses3[i] & STATUS3_MUDSPORT) effect = i + 1; break; - case 0xFE: + case ABILITYEFFECT_WATER_SPORT: for (i = 0; i < gBattlersCount; ++i) if (gStatuses3[i] & STATUS3_WATERSPORT) effect = i + 1; @@ -2976,7 +2976,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn) { gBattleCommunication[MOVE_EFFECT_BYTE] = MOVE_EFFECT_FLINCH; BattleScriptPushCursor(); - SetMoveEffect(0, 0); + SetMoveEffect(FALSE, 0); BattleScriptPop(); } break; @@ -3158,7 +3158,7 @@ u8 IsMonDisobedient(void) gCalledMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos]; gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove; gBattlerTarget = GetMoveTarget(gCalledMove, 0); - gHitMarker |= HITMARKER_x200000; + gHitMarker |= HITMARKER_DISOBEDIENT_MOVE; return 2; } } diff --git a/src/berry_crush.c b/src/berry_crush.c index a52b7516c..254bd170f 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -1274,7 +1274,7 @@ static u32 Cmd_PrintMessage(struct BerryCrushGame * game, u8 *args) { AddTextPrinterParameterized2(0, 2, sMessages[bMsgId], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); break; case 1: if (!IsTextPrinterActive(0)) @@ -2223,7 +2223,7 @@ static u32 Cmd_SaveGame(struct BerryCrushGame * game, u8 *args) return 0; DrawDialogueFrame(0, FALSE); AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); CreateTask(Task_LinkSave, 0); break; case 3: @@ -2370,7 +2370,7 @@ static u32 Cmd_StopGame(struct BerryCrushGame * game, UNUSED u8 *args) AddTextPrinterParameterized2(0, 2, sMessages[MSG_NO_BERRIES], game->textSpeed, NULL, 2, 1, 3); else AddTextPrinterParameterized2(0, 2, sMessages[MSG_DROPPED], game->textSpeed, NULL, 2, 1, 3); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); break; case 1: if (IsTextPrinterActive(0)) @@ -3073,7 +3073,7 @@ static bool32 OpenResultsWindow(struct BerryCrushGame * game, struct BerryCrushG printCrushingResults(game); break; case 5: - CopyWindowToVram(spriteManager->resultsWindowId, COPYWIN_BOTH); + CopyWindowToVram(spriteManager->resultsWindowId, COPYWIN_FULL); spriteManager->resultsState = 0; return TRUE; } @@ -3166,7 +3166,7 @@ static void Task_ShowBerryCrushRankings(u8 taskId) yPos += 14; score = 0; } - CopyWindowToVram(tWindowId, COPYWIN_BOTH); + CopyWindowToVram(tWindowId, COPYWIN_FULL); break; case 2: if (JOY_NEW(A_BUTTON | B_BUTTON)) @@ -3263,7 +3263,7 @@ static void DrawPlayerNameWindows(struct BerryCrushGame * game) game->players[i].name ); } - CopyWindowToVram(game->gfx.nameWindowIds[i], COPYWIN_BOTH); + CopyWindowToVram(game->gfx.nameWindowIds[i], COPYWIN_FULL); } CopyBgTilemapBufferToVram(0); } diff --git a/src/cable_club.c b/src/cable_club.c index ba5ff54a4..da1bfffcb 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -80,13 +80,13 @@ static void PrintNewCountOnLinkPlayerCountDisplayWindow(u16 windowId, s32 num) SetStdWindowBorderStyle(windowId, FALSE); StringExpandPlaceholders(gStringVar4, gUnknown_841DF82); AddTextPrinterParameterized(windowId, 2, gStringVar4, 0, 0, TEXT_SKIP_DRAW, NULL); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void DestroyLinkPlayerCountDisplayWindow(u16 windowId) { ClearStdWindowAndFrame(windowId, FALSE); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void UpdateLinkPlayerCountDisplay(u8 taskId, u8 num) @@ -723,7 +723,7 @@ static void sub_8081624(void) void CB2_ReturnFromCableClubBattle(void) { - gBattleTypeFlags &= (u16)~BATTLE_TYPE_LINK_ESTABLISHED; + gBattleTypeFlags &= (u16)~BATTLE_TYPE_LINK_IN_BATTLE; Overworld_ResetMapMusic(); LoadPlayerParty(); SavePlayerBag(); diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 4b68b49bb..75e671445 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -139,7 +139,7 @@ static void Task_HandleYesNoMenu(u8 taskId) PlaySE(SE_SELECT); FillWindowPixelBuffer(1, PIXEL_FILL(1)); AddTextPrinterParameterized4(1, 2, 0, 3, 1, 1, sTextColor, 0, gUnknown_841B6B9); - CopyWindowToVram(1, COPYWIN_BOTH); + CopyWindowToVram(1, COPYWIN_FULL); ClearSaveData(); break; case MENU_NOTHING_CHOSEN: diff --git a/src/credits.c b/src/credits.c index ce08606e6..d9dde1c2c 100644 --- a/src/credits.c +++ b/src/credits.c @@ -761,7 +761,7 @@ static void CreateCreditsWindow(void) sCreditsMgr->windowId = AddWindow(&sCreditsWindowTemplate); FillWindowPixelBuffer(sCreditsMgr->windowId, PIXEL_FILL(0)); PutWindowTilemap(sCreditsMgr->windowId); - CopyWindowToVram(sCreditsMgr->windowId, COPYWIN_BOTH); + CopyWindowToVram(sCreditsMgr->windowId, COPYWIN_FULL); sCreditsMgr->windowIsActive = TRUE; } diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index ad7572c72..c6457675d 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -990,7 +990,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT] = [MOVE_SOLAR_BEAM] = { - .effect = EFFECT_SOLARBEAM, + .effect = EFFECT_SOLAR_BEAM, .power = 120, .type = TYPE_GRASS, .accuracy = 100, diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index 1e3e347ca..0aa21e85b 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -15,7 +15,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -35,7 +35,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -57,7 +57,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) @@ -239,7 +239,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM30_SHADOW_BALL) @@ -264,7 +264,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM31_BRICK_BREAK) | TMHM(TM32_DOUBLE_TEAM) @@ -758,7 +758,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -794,7 +794,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -867,7 +867,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM27_RETURN) @@ -901,7 +901,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM27_RETURN) @@ -974,7 +974,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -992,7 +992,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -1011,7 +1011,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -1029,7 +1029,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -1052,7 +1052,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -1073,7 +1073,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM32_DOUBLE_TEAM) @@ -1093,7 +1093,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM32_DOUBLE_TEAM) @@ -1607,7 +1607,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -1626,7 +1626,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -1646,7 +1646,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -1778,7 +1778,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM17_PROTECT) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) @@ -1797,7 +1797,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM15_HYPER_BEAM) | TMHM(TM17_PROTECT) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) @@ -2348,7 +2348,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM32_DOUBLE_TEAM) @@ -2372,7 +2372,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM32_DOUBLE_TEAM) @@ -2495,7 +2495,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -2647,7 +2647,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -2680,7 +2680,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -2706,7 +2706,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -2872,7 +2872,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM27_RETURN) @@ -3021,7 +3021,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -3198,7 +3198,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -3356,7 +3356,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM26_EARTHQUAKE) @@ -3560,7 +3560,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -3608,7 +3608,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -3655,7 +3655,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) @@ -3676,7 +3676,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) @@ -3700,7 +3700,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) @@ -3874,7 +3874,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM27_RETURN) @@ -3903,7 +3903,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -3976,7 +3976,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM31_BRICK_BREAK) @@ -4000,7 +4000,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM31_BRICK_BREAK) @@ -4020,7 +4020,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM29_PSYCHIC) @@ -4040,7 +4040,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM29_PSYCHIC) @@ -4151,7 +4151,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) @@ -4177,7 +4177,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM29_PSYCHIC) @@ -4202,7 +4202,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM30_SHADOW_BALL) @@ -4229,7 +4229,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM30_SHADOW_BALL) @@ -4258,7 +4258,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM30_SHADOW_BALL) @@ -4284,7 +4284,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM30_SHADOW_BALL) @@ -4373,7 +4373,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -4493,7 +4493,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM40_AERIAL_ACE) @@ -4510,7 +4510,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM40_AERIAL_ACE) @@ -4528,7 +4528,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM40_AERIAL_ACE) @@ -4547,7 +4547,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -4577,7 +4577,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -4598,7 +4598,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -4615,7 +4615,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM30_SHADOW_BALL) @@ -4855,7 +4855,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) @@ -4877,7 +4877,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) @@ -4901,7 +4901,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -4982,7 +4982,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM26_EARTHQUAKE) @@ -5017,7 +5017,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -5455,7 +5455,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM17_PROTECT) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM27_RETURN) | TMHM(TM30_SHADOW_BALL) @@ -5481,7 +5481,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM15_HYPER_BEAM) | TMHM(TM17_PROTECT) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM27_RETURN) | TMHM(TM30_SHADOW_BALL) @@ -5568,7 +5568,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -5593,7 +5593,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -5731,7 +5731,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -5766,7 +5766,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -5826,7 +5826,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) @@ -6003,7 +6003,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM26_EARTHQUAKE) @@ -6039,7 +6039,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM30_SHADOW_BALL) @@ -6114,7 +6114,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) @@ -6140,7 +6140,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) @@ -6169,7 +6169,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) @@ -6450,7 +6450,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM30_SHADOW_BALL) @@ -6473,7 +6473,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) | TMHM(TM30_SHADOW_BALL) @@ -6499,7 +6499,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -6522,7 +6522,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM31_BRICK_BREAK) | TMHM(TM32_DOUBLE_TEAM) @@ -6552,7 +6552,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM31_BRICK_BREAK) | TMHM(TM32_DOUBLE_TEAM) @@ -6575,7 +6575,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM30_SHADOW_BALL) @@ -6595,7 +6595,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM30_SHADOW_BALL) @@ -6621,7 +6621,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM30_SHADOW_BALL) @@ -6646,7 +6646,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM30_SHADOW_BALL) @@ -6666,7 +6666,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM30_SHADOW_BALL) @@ -6688,7 +6688,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) | TMHM(TM30_SHADOW_BALL) @@ -6745,7 +6745,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -6767,7 +6767,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM27_RETURN) | TMHM(TM31_BRICK_BREAK) @@ -6866,7 +6866,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM30_SHADOW_BALL) | TMHM(TM32_DOUBLE_TEAM) @@ -6888,7 +6888,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM30_SHADOW_BALL) | TMHM(TM32_DOUBLE_TEAM) @@ -6960,7 +6960,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -6987,7 +6987,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -7014,7 +7014,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -7048,7 +7048,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) @@ -7073,7 +7073,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) @@ -7383,7 +7383,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) @@ -7404,7 +7404,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM28_DIG) @@ -7428,7 +7428,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) @@ -7660,7 +7660,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM37_SANDSTORM) @@ -7680,7 +7680,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM37_SANDSTORM) @@ -7769,7 +7769,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM29_PSYCHIC) @@ -7906,7 +7906,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM31_BRICK_BREAK) | TMHM(TM32_DOUBLE_TEAM) @@ -7982,7 +7982,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM40_AERIAL_ACE) @@ -8005,7 +8005,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) @@ -8085,7 +8085,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM30_SHADOW_BALL) | TMHM(TM32_DOUBLE_TEAM) @@ -8108,7 +8108,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM27_RETURN) @@ -8140,7 +8140,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM26_EARTHQUAKE) @@ -8174,7 +8174,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM26_EARTHQUAKE) @@ -8204,7 +8204,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM30_SHADOW_BALL) | TMHM(TM32_DOUBLE_TEAM) @@ -8229,7 +8229,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM30_SHADOW_BALL) | TMHM(TM32_DOUBLE_TEAM) @@ -8253,7 +8253,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM19_GIGA_DRAIN) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) @@ -8279,7 +8279,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM30_SHADOW_BALL) | TMHM(TM32_DOUBLE_TEAM) @@ -8302,7 +8302,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM30_SHADOW_BALL) @@ -8332,7 +8332,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM30_SHADOW_BALL) @@ -8538,7 +8538,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -8649,7 +8649,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -8683,7 +8683,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM27_RETURN) @@ -8710,7 +8710,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM27_RETURN) @@ -8736,7 +8736,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM27_RETURN) @@ -8759,7 +8759,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM36_SLUDGE_BOMB) @@ -8777,7 +8777,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM26_EARTHQUAKE) | TMHM(TM27_RETURN) | TMHM(TM32_DOUBLE_TEAM) @@ -9160,7 +9160,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -9196,7 +9196,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM17_PROTECT) | TMHM(TM18_RAIN_DANCE) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM23_IRON_TAIL) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) @@ -9234,7 +9234,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM26_EARTHQUAKE) @@ -9272,7 +9272,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM26_EARTHQUAKE) @@ -9337,7 +9337,7 @@ static const u32 sTMHMLearnsets[][2] = | TMHM(TM18_RAIN_DANCE) | TMHM(TM20_SAFEGUARD) | TMHM(TM21_FRUSTRATION) - | TMHM(TM22_SOLARBEAM) + | TMHM(TM22_SOLAR_BEAM) | TMHM(TM24_THUNDERBOLT) | TMHM(TM25_THUNDER) | TMHM(TM27_RETURN) diff --git a/src/daycare.c b/src/daycare.c index 141f40db5..5d65d199d 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -1542,7 +1542,7 @@ void ShowDaycareLevelMenu(void) menuTemplate.windowId = windowId; listMenuTaskId = ListMenuInit(&menuTemplate, 0, 0); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); daycareMenuTaskId = CreateTask(Task_HandleDaycareLevelMenuInput, 3); gTasks[daycareMenuTaskId].tMenuListTaskId = listMenuTaskId; @@ -1937,7 +1937,7 @@ static void CB2_EggHatch_1(void) PlayFanfare(MUS_EVOLVED); sEggHatchData->CB2_state++; PutWindowTilemap(sEggHatchData->windowId); - CopyWindowToVram(sEggHatchData->windowId, COPYWIN_BOTH); + CopyWindowToVram(sEggHatchData->windowId, COPYWIN_FULL); break; case 6: if (IsFanfareTaskInactive()) diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 0a8fe41ef..75ea3a52d 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -2341,7 +2341,7 @@ static void Task_ShowDodrioBerryPickingRecords(u8 taskId) case 0: data[1] = AddWindow(&sUnknown_84755E0); sub_81538D0(data[1]); - CopyWindowToVram(data[1], COPYWIN_BOTH); + CopyWindowToVram(data[1], COPYWIN_FULL); data[0]++; break; case 1: diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c index 4d737dcee..f032945d6 100644 --- a/src/dodrio_berry_picking_2.c +++ b/src/dodrio_berry_picking_2.c @@ -1370,7 +1370,7 @@ static void sub_81556E0(void) AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_Yes, 8, 2, -1, NULL); AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_No, 8, 16, -1, NULL); AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_SelectorArrow2, 0, y == 1 ? 2 : 16, -1, NULL); - CopyWindowToVram(gUnknown_203F440->unk3008[1], COPYWIN_BOTH); + CopyWindowToVram(gUnknown_203F440->unk3008[1], COPYWIN_FULL); // Increment state only if A or B button have been pressed. if (JOY_NEW(A_BUTTON)) { @@ -1425,7 +1425,7 @@ static void sub_8155A78(void) gUnknown_203F440->state++; break; case 1: - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); gUnknown_203F440->state++; break; case 2: diff --git a/src/easy_chat_3.c b/src/easy_chat_3.c index 2230e8589..e02a93905 100644 --- a/src/easy_chat_3.c +++ b/src/easy_chat_3.c @@ -1323,7 +1323,7 @@ static void PrintTitleText(void) FillWindowPixelBuffer(0, PIXEL_FILL(0)); EC_AddTextPrinterParameterized2(0, 1, titleText, xOffset, 0, TEXT_SKIP_DRAW, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); PutWindowTilemap(0); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); } static void EC_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16)) @@ -1379,7 +1379,7 @@ static void PrintECInterfaceTextById(u8 direction) if (text2) EC_AddTextPrinterParameterized(1, 1, text2, 0, 16, TEXT_SKIP_DRAW, NULL); - CopyWindowToVram(1, COPYWIN_BOTH); + CopyWindowToVram(1, COPYWIN_FULL); } static void EC_CreateYesNoMenuWithInitialCursorPos(u8 initialCursorPos) @@ -1435,7 +1435,7 @@ static void PrintECFields(void) ecWord++; for (k = 0; k < 7; k++) { - *str++ = CHAR_EXTRA_EMOJI; + *str++ = CHAR_EXTRA_SYMBOL; *str++ = 9; } @@ -1454,7 +1454,7 @@ static void PrintECFields(void) EC_AddTextPrinterParameterized(sEasyChatGraphicsResources->windowId, 1, sEasyChatGraphicsResources->ecPrintBuffer, 0, i * 16, TEXT_SKIP_DRAW, NULL); } - CopyWindowToVram(sEasyChatGraphicsResources->windowId, COPYWIN_BOTH); + CopyWindowToVram(sEasyChatGraphicsResources->windowId, COPYWIN_FULL); } static void DrawECFrameInTilemapBuffer(u16 *tilemap) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 2769b032a..9a02b091f 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -912,7 +912,7 @@ static void Task_EvolutionScene(u8 taskId) case MVSTATE_PRINT_YES_NO: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { - HandleBattleWindow(0x17, 8, 0x1D, 0xD, 0); + HandleBattleWindow(23, 8, 29, 13, 0); BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); gTasks[taskId].tLearnMoveState++; sEvoCursorPos = 0; diff --git a/src/fame_checker.c b/src/fame_checker.c index 4164fdea3..e44ff2371 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -994,7 +994,7 @@ static void Setup_DrawMsgAndListBoxes(void) static void FC_PutWindowTilemapAndCopyWindowToVramMode3(u8 windowId) { PutWindowTilemap(windowId); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static bool8 SetMessageSelectorIconObjMode(u8 spriteId, u8 objMode) @@ -1578,7 +1578,7 @@ static u8 FC_PopulateListMenu(void) static void FC_PutWindowTilemapAndCopyWindowToVramMode3_2(u8 windowId) { PutWindowTilemap(windowId); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void FC_CreateScrollIndicatorArrowPair(void) diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 8e0e76488..4519bb27e 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -396,7 +396,7 @@ static void Task_RushInjuredPokemonToCenter(u8 taskId) Menu_LoadStdPalAt(0xF0); FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); PutWindowTilemap(windowId); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); loc = GetHealLocation(1); if (gSaveBlock1Ptr->lastHealLocation.mapGroup == loc->group && gSaveBlock1Ptr->lastHealLocation.mapNum == loc->map diff --git a/src/field_specials.c b/src/field_specials.c index fdb26e9e7..c8107febf 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1103,7 +1103,7 @@ void DrawElevatorCurrentFloorWindow(void) strwidth = GetStringWidth(2, floorname, 0); AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, floorname, 56 - strwidth, 16, 0xFF, NULL); PutWindowTilemap(sElevatorCurrentFloorWindowId); - CopyWindowToVram(sElevatorCurrentFloorWindowId, COPYWIN_BOTH); + CopyWindowToVram(sElevatorCurrentFloorWindowId, COPYWIN_FULL); } } @@ -1364,7 +1364,7 @@ static void Task_CreateScriptListMenu(u8 taskId) Task_CreateMenuRemoveScrollIndicatorArrowPair(taskId); task->data[14] = ListMenuInit(&sFieldSpecialsListMenuTemplate, task->data[7], task->data[8]); PutWindowTilemap(task->data[13]); - CopyWindowToVram(task->data[13], COPYWIN_BOTH); + CopyWindowToVram(task->data[13], COPYWIN_FULL); gTasks[taskId].func = Task_ListMenuHandleInput; } diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index f001bf241..8129a1a54 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -436,7 +436,7 @@ static void Task_MapPreviewScreen_0(u8 taskId) if (!MapPreview_IsGfxLoadFinished()) { data[4] = MapPreview_CreateMapNameWindow(data[3]); - CopyWindowToVram(data[4], COPYWIN_BOTH); + CopyWindowToVram(data[4], COPYWIN_FULL); data[0]++; } break; diff --git a/src/graphics.c b/src/graphics.c index 03986a03f..b1266dc90 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1033,7 +1033,7 @@ const u32 gBattleAnimBgTilemap_Ghost[] = INCBIN_U32("graphics/battle_anims/backg const u32 gBattleAnimSpritePal_WhipHit[] = INCBIN_U32("graphics/battle_anims/sprites/whip_hit.gbapal.lz"); -const u32 gBattleAnimBgPalette_Solarbeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/solarbeam.gbapal.lz"); +const u32 gBattleAnimBgPalette_SolarBeam[] = INCBIN_U32("graphics/battle_anims/backgrounds/solarbeam.gbapal.lz"); const u32 gFile_graphics_unknown_unknown_E7CFB0_tilemap[] = INCBIN_U32("graphics/unknown/unknown_E7CFB0.bin.lz"); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 97eb6f5c8..3b7f6708c 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -453,7 +453,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) DrawDialogueFrame(0, 0); AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, 2, 1, 3); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_Hof_TrySaveData; } @@ -591,7 +591,7 @@ static void Task_Hof_ApplauseAndConfetti(u8 taskId) } BeginNormalPaletteFade(sSelectedPaletteIndices, 0, 12, 12, HALL_OF_FAME_BG_PAL); FillWindowPixelBuffer(0, PIXEL_FILL(0)); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].data[3] = 7; gTasks[taskId].func = Task_Hof_WaitBorderFadeAway; } @@ -639,7 +639,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId) HallOfFame_PrintPlayerInfo(1, 2); DrawDialogueFrame(0, 0); AddTextPrinterParameterized2(0, 2, gText_LeagueChamp, 0, NULL, 2, 1, 3); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_Hof_ExitOnKeyPressed; } } @@ -969,7 +969,7 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId) TopBarWindowPrintString(gText_ABUTTONExit, 8, TRUE); DrawDialogueFrame(0, 0); AddTextPrinterParameterized2(0, 2, gText_HOFCorrupted, 0, NULL, 2, 1, 3); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_HofPC_ExitOnButtonPress; } @@ -985,7 +985,7 @@ static void HallOfFame_PrintWelcomeText(u8 not, u8 used) FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); AddTextPrinterParameterized3(0, 2, x, 1, sTextColors[0], 0, gText_WelcomeToHOF); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); } static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u8 unused2) @@ -1072,7 +1072,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u AddTextPrinterParameterized3(0, 2, 0x60, 0x11, sTextColors[0], 0, text); } - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); } static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2) @@ -1115,7 +1115,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2) AddTextPrinterParameterized3(1, 2, textWidth - 36, 32, sTextColors[1], 0, text); - CopyWindowToVram(1, COPYWIN_BOTH); + CopyWindowToVram(1, COPYWIN_FULL); } static void ClearVramOamPltt_LoadHofPal(void) diff --git a/src/help_system_util.c b/src/help_system_util.c index f23bbbcff..fc74662f7 100644 --- a/src/help_system_util.c +++ b/src/help_system_util.c @@ -522,7 +522,7 @@ void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 wid BlitBitmapRect4Bit(&srcBlit, &destBlit, 0, 0, x, y, GetKeypadIconWidth(curChar), GetKeypadIconHeight(curChar), 0); x += GetKeypadIconWidth(curChar); break; - case CHAR_EXTRA_EMOJI: + case CHAR_EXTRA_SYMBOL: curChar = *src + 0x100; src++; //fallthrough diff --git a/src/intro.c b/src/intro.c index 9ca210887..bee854379 100644 --- a/src/intro.c +++ b/src/intro.c @@ -991,7 +991,7 @@ static void IntroCB_Init(struct IntroSequenceData * this) FillWindowPixelBuffer(0, PIXEL_FILL(0)); BlitBitmapToWindow(0, this->gamefreakTextBitmap, 0, 40, 144, 16); PutWindowTilemap(0); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); this->state++; break; case 1: diff --git a/src/learn_move.c b/src/learn_move.c index 3fcaca5d3..9c00245fc 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -690,7 +690,7 @@ static void PrintTeachWhichMoveToStrVar1(bool8 onInit) StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToMon); PrintTextOnWindow(7, gStringVar4, 0, 2, 0, 2); PutWindowTilemap(7); - CopyWindowToVram(7, COPYWIN_BOTH); + CopyWindowToVram(7, COPYWIN_FULL); } } @@ -880,7 +880,7 @@ static void PrintMoveInfoHandleCancel_CopyToVram(void) CopyWindowToVram(2, COPYWIN_GFX); CopyWindowToVram(2, COPYWIN_GFX); CopyWindowToVram(5, COPYWIN_GFX); - CopyWindowToVram(7, COPYWIN_BOTH); + CopyWindowToVram(7, COPYWIN_FULL); } static void MoveRelearnerMenu_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list) diff --git a/src/link.c b/src/link.c index 55409c35b..0b85e2f35 100644 --- a/src/link.c +++ b/src/link.c @@ -1369,7 +1369,7 @@ static void LinkCB_WaitAckCommand5FFF(void) } if (count == linkPlayerCount) { - gBattleTypeFlags &= ~(BATTLE_TYPE_LINK_ESTABLISHED | 0xFFFF0000); + gBattleTypeFlags &= ~(BATTLE_TYPE_LINK_IN_BATTLE | 0xFFFF0000); gLinkVSyncDisabled = TRUE; CloseLink(); gLinkCallback = NULL; @@ -1513,7 +1513,7 @@ void sub_800AE1C(void) PutWindowTilemap(0); PutWindowTilemap(2); CopyWindowToVram(0, 0); - CopyWindowToVram(2, COPYWIN_BOTH); + CopyWindowToVram(2, COPYWIN_FULL); ShowBg(0); ShowBg(1); } @@ -1526,7 +1526,7 @@ void sub_800AED0(void) PutWindowTilemap(1); PutWindowTilemap(2); CopyWindowToVram(1, 0); - CopyWindowToVram(2, COPYWIN_BOTH); + CopyWindowToVram(2, COPYWIN_FULL); ShowBg(0); } diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index d2c605d7b..b8e79fc7b 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -1373,7 +1373,7 @@ static void WaitAllReadyToCloseLink(void) } if (count == playerCount) { - gBattleTypeFlags &= ~(BATTLE_TYPE_LINK_ESTABLISHED | 0xFFFF0000); + gBattleTypeFlags &= ~(BATTLE_TYPE_LINK_IN_BATTLE | 0xFFFF0000); if (Rfu.parent_child == MODE_CHILD) { Rfu.errorState = 3; diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c index 1eadc35f4..de0a63490 100644 --- a/src/link_rfu_3.c +++ b/src/link_rfu_3.c @@ -199,7 +199,7 @@ static const u8 sWireless_RSEtoASCIITable[] = { 0x20, 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, [CHAR_DYNAMIC_PLACEHOLDER] = ' ', [CHAR_KEYPAD_ICON] = ' ', - [CHAR_EXTRA_EMOJI] = ' ', + [CHAR_EXTRA_SYMBOL] = ' ', [CHAR_PROMPT_SCROLL] = ' ', [CHAR_PROMPT_CLEAR] = ' ', [EXT_CTRL_CODE_BEGIN] = ' ', diff --git a/src/mail.c b/src/mail.c index 114a006e8..0b77b5a2f 100644 --- a/src/mail.c +++ b/src/mail.c @@ -676,8 +676,8 @@ static void AddMailMessagePrinters(void) width = GetStringWidth(1, gText_From, 0); AddTextPrinterParameterized3(1, 1, sMailViewResources->nameX, sMailViewResources->messageLayout->nameY, sTextColor, 0, gText_From); AddTextPrinterParameterized3(1, 1, sMailViewResources->nameX + width, sMailViewResources->messageLayout->nameY, sTextColor, 0, sMailViewResources->authorNameBuffer); - CopyWindowToVram(0, COPYWIN_BOTH); - CopyWindowToVram(1, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); + CopyWindowToVram(1, COPYWIN_FULL); } static void VBlankCB_ShowMail(void) diff --git a/src/main_menu.c b/src/main_menu.c index e02f557e1..2959966a9 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -352,7 +352,7 @@ static void Task_PrintMainMenuText(u8 taskId) AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME_ONLY, 2, 2, 2, sTextColor1, -1, gText_NewGame); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME_ONLY]); PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME_ONLY); - CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME_ONLY, COPYWIN_BOTH); + CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME_ONLY, COPYWIN_FULL); break; case MAIN_MENU_CONTINUE: FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10)); @@ -365,7 +365,7 @@ static void Task_PrintMainMenuText(u8 taskId) PutWindowTilemap(MAIN_MENU_WINDOW_CONTINUE); PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME); CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, COPYWIN_GFX); - CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, COPYWIN_BOTH); + CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, COPYWIN_FULL); break; case MAIN_MENU_MYSTERYGIFT: FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10)); @@ -384,7 +384,7 @@ static void Task_PrintMainMenuText(u8 taskId) PutWindowTilemap(MAIN_MENU_WINDOW_MYSTERYGIFT); CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, COPYWIN_GFX); CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, COPYWIN_GFX); - CopyWindowToVram(MAIN_MENU_WINDOW_MYSTERYGIFT, COPYWIN_BOTH); + CopyWindowToVram(MAIN_MENU_WINDOW_MYSTERYGIFT, COPYWIN_FULL); break; } gTasks[taskId].func = Task_WaitDma3AndFadeIn; diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 6367757d3..6a2918030 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -182,7 +182,7 @@ static u16 MapNamePopupCreateWindow(bool32 palintoFadedBuffer) DrawTextBorderOuter(windowId, r6, 0xD); PutWindowTilemap(windowId); MapNamePopupPrintMapNameOnWindow(windowId); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); return windowId; } diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c index 0490f23e0..100db712a 100644 --- a/src/map_preview_screen.c +++ b/src/map_preview_screen.c @@ -484,7 +484,7 @@ static void Task_RunMapPreviewScreenForest(u8 taskId) case 0: if (!MapPreview_IsGfxLoadFinished() && !IsDma3ManagerBusyWithBgCopy()) { - CopyWindowToVram(data[11], COPYWIN_BOTH); + CopyWindowToVram(data[11], COPYWIN_FULL); data[0]++; } break; diff --git a/src/menu.c b/src/menu.c index a245f0743..328497259 100644 --- a/src/menu.c +++ b/src/menu.c @@ -44,7 +44,7 @@ void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } // not used @@ -56,7 +56,7 @@ static void DrawDialogFrameWithCustomTile(u8 windowId, bool8 copyToVram, u16 til FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) @@ -96,7 +96,7 @@ void ClearDialogWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram) FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) @@ -112,7 +112,7 @@ void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 bas FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } // not used @@ -124,7 +124,7 @@ static void DrawStdFrameWithCustomTile(u8 windowId, bool8 copyToVram, u16 baseTi FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) @@ -145,7 +145,7 @@ void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram) FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) @@ -195,7 +195,7 @@ void TopBarWindowPrintString(const u8 *string, u8 unused, bool8 copyToVram) width = GetStringWidth(0, string, 0); AddTextPrinterParameterized3(sTopBarWindowId, 0, -20 - width, 1, gUnknown_8456618, 0, string); if (copyToVram) - CopyWindowToVram(sTopBarWindowId, COPYWIN_BOTH); + CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL); } } @@ -228,7 +228,7 @@ void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgCo } AddTextPrinterParameterized4(sTopBarWindowId, 1, 4, 1, 0, 0, color, 0, string); if (copyToVram) - CopyWindowToVram(sTopBarWindowId, COPYWIN_BOTH); + CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL); } } @@ -236,7 +236,7 @@ void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgCo static void CopyTopBarWindowToVram(void) { if (sTopBarWindowId != 0xFF) - CopyWindowToVram(sTopBarWindowId, COPYWIN_BOTH); + CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL); } void ClearTopBarWindow(void) @@ -244,7 +244,7 @@ void ClearTopBarWindow(void) if (sTopBarWindowId != 0xFF) { FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(15)); - CopyWindowToVram(sTopBarWindowId, COPYWIN_BOTH); + CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL); } } @@ -254,7 +254,7 @@ void DestroyTopBarWindow(void) { FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(0)); ClearWindowTilemap(sTopBarWindowId); - CopyWindowToVram(sTopBarWindowId, COPYWIN_BOTH); + CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL); RemoveWindow(sTopBarWindowId); sTopBarWindowId = 0xFF; } diff --git a/src/mevent_show_card.c b/src/mevent_show_card.c index 3270052f7..bf2fe23b5 100644 --- a/src/mevent_show_card.c +++ b/src/mevent_show_card.c @@ -396,7 +396,7 @@ static void sub_8145D18(u8 whichWindow) } break; } - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void sub_8146060(void) diff --git a/src/mevent_show_news.c b/src/mevent_show_news.c index 91a80739c..e874a93c2 100644 --- a/src/mevent_show_news.c +++ b/src/mevent_show_news.c @@ -326,8 +326,8 @@ static void sub_8146A30(void) { AddTextPrinterParameterized3(sWork->windowIds[1], 3, 0, 16 * i + 2, sTextPals[sWork->bgSpec->textPal2], 0, sWork->messages[i]); } - CopyWindowToVram(sWork->windowIds[0], COPYWIN_BOTH); - CopyWindowToVram(sWork->windowIds[1], COPYWIN_BOTH); + CopyWindowToVram(sWork->windowIds[0], COPYWIN_FULL); + CopyWindowToVram(sWork->windowIds[1], COPYWIN_FULL); } static void sub_8146B58(void) diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index 8290930d7..4db94d60a 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -530,7 +530,7 @@ void AddTextPrinterToWindow1(const u8 *str) AddTextPrinterParameterized4(1, 2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4); DrawTextBorderOuter(1, 0x001, 0xF); PutWindowTilemap(1); - CopyWindowToVram(1, COPYWIN_BOTH); + CopyWindowToVram(1, COPYWIN_FULL); } void ClearTextWindow(void) diff --git a/src/naming_screen.c b/src/naming_screen.c index 888225235..a3d15126f 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -707,7 +707,7 @@ static void pokemon_transfer_to_pc_with_message(void) DrawDialogueFrame(0, FALSE); gTextFlags.canABSpeedUpPrint = TRUE; AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); } static bool8 sub_809E1D4(void) @@ -1886,7 +1886,7 @@ static void sub_809FAE4(void) FillWindowPixelBuffer(sNamingScreenData->windows[4], PIXEL_FILL(15)); AddTextPrinterParameterized3(sNamingScreenData->windows[4], 0, 236 - strwidth, 0, color, 0, gText_MoveOkBack); PutWindowTilemap(sNamingScreenData->windows[4]); - CopyWindowToVram(sNamingScreenData->windows[4], COPYWIN_BOTH); + CopyWindowToVram(sNamingScreenData->windows[4], COPYWIN_FULL); } static void sub_809FB70(void) diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c index 2d7e8c4b4..22f559f8a 100644 --- a/src/new_menu_helpers.c +++ b/src/new_menu_helpers.c @@ -471,7 +471,7 @@ void DrawDialogueFrame(u8 windowId, bool8 copyToVram) FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } void DrawStdWindowFrame(u8 windowId, bool8 copyToVram) @@ -480,7 +480,7 @@ void DrawStdWindowFrame(u8 windowId, bool8 copyToVram) FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); PutWindowTilemap(windowId); if (copyToVram == TRUE) - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram) @@ -489,7 +489,7 @@ void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram) FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); if (gQuestLogState == QL_STATE_PLAYBACK) CommitQuestLogWindow1(); } @@ -500,7 +500,7 @@ void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram) FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); ClearWindowTilemap(windowId); if (copyToVram == TRUE) - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void WindowFunc_DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum) @@ -644,7 +644,7 @@ void DisplayItemMessageOnField(u8 taskId, u8 textSpeed, const u8 *string, TaskFu { LoadStdWindowFrameGfx(); DisplayMessageAndContinueTask(taskId, 0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM, textSpeed, GetTextSpeedSetting(), string, callback); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); } void DisplayYesNoMenuDefaultYes(void) diff --git a/src/oak_speech.c b/src/oak_speech.c index ef38732ff..f23905fd7 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -594,7 +594,7 @@ static void CreateHelpDocsPage1(void) PutWindowTilemap(sOakSpeechResources->unk_0014[0]); FillWindowPixelBuffer(sOakSpeechResources->unk_0014[0], 0x00); AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[0], 2, 2, 0, 1, 1, sTextColor_HelpSystem, 0, gNewGame_HelpDocs1); - CopyWindowToVram(sOakSpeechResources->unk_0014[0], COPYWIN_BOTH); + CopyWindowToVram(sOakSpeechResources->unk_0014[0], COPYWIN_FULL); FillBgTilemapBufferRect_Palette0(1, 0x3000, 1, 3, 5, 16); CopyBgTilemapBufferToVram(1); } @@ -616,7 +616,7 @@ static void Task_OakSpeech4(u8 taskId) PutWindowTilemap(sOakSpeechResources->unk_0014[i]); FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00); AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[i], 2, 6, 0, 1, 1, sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]); - CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_BOTH); + CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_FULL); } if (sOakSpeechResources->unk_0012 == 1) @@ -685,7 +685,7 @@ static void Task_OakSpeech3(u8 taskId) { FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00); ClearWindowTilemap(sOakSpeechResources->unk_0014[i]); - CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_BOTH); + CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_FULL); RemoveWindow(sOakSpeechResources->unk_0014[i]); sOakSpeechResources->unk_0014[i] = 0; } @@ -709,7 +709,7 @@ static void Task_OakSpeech5(u8 taskId) { FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00); ClearWindowTilemap(sOakSpeechResources->unk_0014[i]); - CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_BOTH); + CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_FULL); RemoveWindow(sOakSpeechResources->unk_0014[i]); sOakSpeechResources->unk_0014[i] = 0; } @@ -743,7 +743,7 @@ static void Task_OakSpeech6(u8 taskId) data[14] = AddWindow(&sNewGameAdventureIntroWindowTemplates[0]); PutWindowTilemap(data[14]); FillWindowPixelBuffer(data[14], 0x00); - CopyWindowToVram(data[14], COPYWIN_BOTH); + CopyWindowToVram(data[14], COPYWIN_FULL); sOakSpeechResources->unk_0012 = 0; gMain.state = 0; data[15] = 16; @@ -866,7 +866,7 @@ static void Task_OakSpeech8(u8 taskId) DestroyTopBarWindow(); FillWindowPixelBuffer(data[14], 0x00); ClearWindowTilemap(data[14]); - CopyWindowToVram(data[14], COPYWIN_BOTH); + CopyWindowToVram(data[14], COPYWIN_FULL); RemoveWindow(data[14]); data[14] = 0; FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20); @@ -912,7 +912,7 @@ static void Task_OakSpeech9(u8 taskId) { \ AddTextPrinterParameterized2(0, 4, str, speed, NULL, 2, 1, 3); \ } \ - CopyWindowToVram(0, COPYWIN_BOTH); \ + CopyWindowToVram(0, COPYWIN_FULL); \ }) static void Task_OakSpeech10(u8 taskId) @@ -1082,7 +1082,7 @@ static void Task_OakSpeech19(u8 taskId) sOakSpeechResources->textColor[2] = 3; AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 17, sOakSpeechResources->textColor, 0, gText_Girl); Menu_InitCursor(gTasks[taskId].data[13], 2, 0, 1, GetFontAttribute(2, 1) + 2, 2, 0); - CopyWindowToVram(gTasks[taskId].data[13], COPYWIN_BOTH); + CopyWindowToVram(gTasks[taskId].data[13], COPYWIN_FULL); gTasks[taskId].func = Task_OakSpeech20; } } @@ -1881,7 +1881,7 @@ static void PrintNameChoiceOptions(u8 taskId, u8 hasPlayerBeenNamed) AddTextPrinterParameterized(data[13], 2, textPtrs[i], 8, 16 * (i + 1) + 1, 0, NULL); } Menu_InitCursor(data[13], 2, 0, 1, 16, 5, 0); - CopyWindowToVram(data[13], COPYWIN_BOTH); + CopyWindowToVram(data[13], COPYWIN_FULL); } static void GetDefaultName(u8 hasPlayerBeenNamed, u8 rivalNameChoice) diff --git a/src/option_menu.c b/src/option_menu.c index 8994caa13..53b0da882 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -320,7 +320,7 @@ static void OptionMenu_PickSwitchCancel(void) FillWindowPixelBuffer(2, PIXEL_FILL(15)); AddTextPrinterParameterized3(2, 0, x, 0, sOptionMenuPickSwitchCancelTextColor, 0, gText_PickSwitchCancel); PutWindowTilemap(2); - CopyWindowToVram(2, COPYWIN_BOTH); + CopyWindowToVram(2, COPYWIN_FULL); } static void OptionMenu_ResetSpriteData(void) @@ -502,7 +502,7 @@ static void BufferOptionMenuString(u8 selection) break; } PutWindowTilemap(1); - CopyWindowToVram(1, COPYWIN_BOTH); + CopyWindowToVram(1, COPYWIN_FULL); } static void CloseAndSaveOptionMenu(u8 taskId) @@ -526,7 +526,7 @@ static void PrintOptionMenuHeader(void) FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized(WIN_TEXT_OPTION, 2, gText_MenuOption, 8, 1, TEXT_SKIP_DRAW, NULL); PutWindowTilemap(0); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); } static void DrawOptionMenuBg(void) diff --git a/src/pokemon.c b/src/pokemon.c index ec52955b5..82b5bf596 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2475,9 +2475,9 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de attack = (150 * attack) / 100; if (defender->ability == ABILITY_MARVEL_SCALE && defender->status1) defense = (150 * defense) / 100; - if (type == TYPE_ELECTRIC && AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, 0, 0xFD, 0)) + if (type == TYPE_ELECTRIC && AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, 0, ABILITYEFFECT_MUD_SPORT, 0)) gBattleMovePower /= 2; - if (type == TYPE_FIRE && AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, 0, 0xFE, 0)) + if (type == TYPE_FIRE && AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, 0, ABILITYEFFECT_WATER_SPORT, 0)) gBattleMovePower /= 2; if (type == TYPE_GRASS && attacker->ability == ABILITY_OVERGROW && attacker->hp <= (attacker->maxHP / 3)) gBattleMovePower = (150 * gBattleMovePower) / 100; @@ -4217,7 +4217,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov // I have to re-use this variable to match. r5 = gActiveBattler; gActiveBattler = battleMonId; - BtlController_EmitGetMonData(0, 0, 0); + BtlController_EmitGetMonData(BUFFER_A, 0, 0); MarkBattlerForControllerExec(gActiveBattler); gActiveBattler = r5; } @@ -4845,7 +4845,7 @@ static void BufferStatRoseMessage(int stat) gBattlerTarget = gBattlerInMenuId; StringCopy(gBattleTextBuff1, gStatNamesTable[sStatsToRaise[stat]]); StringCopy(gBattleTextBuff2, gBattleText_Rose); - BattleStringExpandPlaceholdersToDisplayedString(gText_PkmnsStatChanged2); + BattleStringExpandPlaceholdersToDisplayedString(gText_DefendersStatRose); } const u8 *Battle_PrintStatBoosterEffectMessage(u16 itemId) @@ -5987,7 +5987,7 @@ static u16 GetDeoxysStat(struct Pokemon *mon, s32 statId) u16 statValue; u8 nature; - if (gBattleTypeFlags & BATTLE_TYPE_LINK_ESTABLISHED || GetMonData(mon, MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS) + if (gBattleTypeFlags & BATTLE_TYPE_LINK_IN_BATTLE || GetMonData(mon, MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS) { return statValue = 0; } diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 8faa5747b..1287bbab5 100644 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -4515,7 +4515,7 @@ static void Task_ShowPokemonJumpRecords(u8 taskId) case 0: tWindowId = AddWindow(&sWindowTemplate_Records); PrintRecordsText(tWindowId); - CopyWindowToVram(tWindowId, COPYWIN_BOTH); + CopyWindowToVram(tWindowId, COPYWIN_FULL); tState++; break; case 1: diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c index c39c5e1e3..8da24dd06 100644 --- a/src/pokemon_special_anim_scene.c +++ b/src/pokemon_special_anim_scene.c @@ -341,7 +341,7 @@ void InitPokemonSpecialAnimScene(struct PokemonSpecialAnimScene * buffer, u16 an LoadBgGfxByAnimType(animType); FillWindowPixelBuffer(0, PIXEL_FILL(0)); TextWindow_SetUserSelectedFrame(0, 0x000, 0xe0); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); ShowBg(0); ShowBg(3); HideBg(1); @@ -370,7 +370,7 @@ void PSA_ShowMessageWindow(void) PutWindowTilemap(0); FillWindowPixelBuffer(0, PIXEL_FILL(1)); DrawTextBorderOuter(0, 0x001, 0xE); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); } void PSA_HideMessageWindow(void) @@ -612,7 +612,7 @@ UNUSED void PSA_DrawLevelUpWindowPg1(u16 *statsBefore, u16 *statsAfter) DrawTextBorderOuter(1, 0x001, 0xE); DrawLevelUpWindowPg1(1, statsBefore, statsAfter, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); PutWindowTilemap(1); - CopyWindowToVram(1, COPYWIN_BOTH); + CopyWindowToVram(1, COPYWIN_FULL); } UNUSED void PSA_DrawLevelUpWindowPg2(u16 *currStats) { diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index f5b9ca115..fb6c61db4 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -246,8 +246,8 @@ static void Task_PokemonStorageSystemPC(u8 taskId) DrawDialogueFrame(0, 0); FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, TEXT_SKIP_DRAW, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); - CopyWindowToVram(0, COPYWIN_BOTH); - CopyWindowToVram(task->data[15], COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); + CopyWindowToVram(task->data[15], COPYWIN_FULL); task->data[0]++; break; case 1: diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c index bd1aba0ef..fdc32d388 100644 --- a/src/pokemon_storage_system_5.c +++ b/src/pokemon_storage_system_5.c @@ -1127,7 +1127,7 @@ static void SetCursorMonData(void *pokemon, u8 mode) *(txtPtr++) = TEXT_COLOR_WHITE; *(txtPtr++) = TEXT_COLOR_LIGHT_GRAY; *(txtPtr++) = CHAR_SPACE; - *(txtPtr++) = CHAR_EXTRA_EMOJI; + *(txtPtr++) = CHAR_EXTRA_SYMBOL; *(txtPtr++) = 5; // LV_2 txtPtr = ConvertIntToDecimalStringN(txtPtr, gPSSData->cursorMonLevel, STR_CONV_MODE_LEFT_ALIGN, 3); diff --git a/src/pokemon_storage_system_7.c b/src/pokemon_storage_system_7.c index a9b538cae..95d199172 100644 --- a/src/pokemon_storage_system_7.c +++ b/src/pokemon_storage_system_7.c @@ -127,7 +127,7 @@ static bool8 sub_8095138(void) sub_80956A4(sMoveMonsPtr->fromRow, sMoveMonsPtr->fromColumn); SetBgAttribute(0, BG_ATTR_PALETTEMODE, 1); PutWindowTilemap(gPSSData->field_2200); - CopyWindowToVram8Bit(gPSSData->field_2200, COPYWIN_BOTH); + CopyWindowToVram8Bit(gPSSData->field_2200, COPYWIN_FULL); BlendPalettes(0x3F00, 8, RGB_WHITE); sub_8094D14(2); SetGpuRegBits(REG_OFFSET_BG0CNT, BGCNT_256COLOR); diff --git a/src/quest_log.c b/src/quest_log.c index cbeca4b72..a950b9014 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -501,7 +501,7 @@ void DrawPreviouslyOnQuestHeader(u8 sceneNum) PutWindowTilemap(sQuestLogHeaderWindowIds[1]); CopyWindowToVram(sQuestLogHeaderWindowIds[0], COPYWIN_GFX); CopyWindowToVram(sQuestLogHeaderWindowIds[2], COPYWIN_GFX); - CopyWindowToVram(sQuestLogHeaderWindowIds[1], COPYWIN_BOTH); + CopyWindowToVram(sQuestLogHeaderWindowIds[1], COPYWIN_FULL); } void CommitQuestLogWindow1(void) diff --git a/src/region_map.c b/src/region_map.c index 68d9ba9a2..2f73db580 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1920,16 +1920,16 @@ static void DisplayCurrentDungeonName(void) StringCopy(sRegionMap->dungeonName, sMapNames[descOffset]); AddTextPrinterParameterized3(WIN_DUNGEON_NAME, 2, 12, 2, sTextColorTable[GetSelectedMapsecType(LAYER_DUNGEON) - 2], 0, sRegionMap->dungeonName); PutWindowTilemap(WIN_DUNGEON_NAME); - CopyWindowToVram(WIN_DUNGEON_NAME, COPYWIN_BOTH); + CopyWindowToVram(WIN_DUNGEON_NAME, COPYWIN_FULL); } } static void ClearMapsecNameText(void) { FillWindowPixelBuffer(WIN_MAP_NAME, PIXEL_FILL(0)); - CopyWindowToVram(WIN_MAP_NAME, COPYWIN_BOTH); + CopyWindowToVram(WIN_MAP_NAME, COPYWIN_FULL); FillWindowPixelBuffer(WIN_DUNGEON_NAME, PIXEL_FILL(0)); - CopyWindowToVram(WIN_DUNGEON_NAME, COPYWIN_BOTH); + CopyWindowToVram(WIN_DUNGEON_NAME, COPYWIN_FULL); } static void BufferRegionMapBg(u8 bg, u16 *map) @@ -2492,7 +2492,7 @@ static void Task_DrawDungeonMapPreviewFlavorText(u8 taskId) break; case 2: FillWindowPixelBuffer(WIN_MAP_PREVIEW, PIXEL_FILL(0)); - CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_BOTH); + CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_FULL); PutWindowTilemap(WIN_MAP_PREVIEW); sDungeonMapPreview->drawState++; break; @@ -2502,7 +2502,7 @@ static void Task_DrawDungeonMapPreviewFlavorText(u8 taskId) { AddTextPrinterParameterized3(WIN_MAP_PREVIEW, 2, 4, 0, sTextColor_Green, -1, GetDungeonName(GetDungeonMapsecUnderCursor())); AddTextPrinterParameterized3(WIN_MAP_PREVIEW, 2, 2, 14, sTextColor_White, -1, GetDungeonFlavorText(GetDungeonMapsecUnderCursor())); - CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_BOTH); + CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_FULL); sDungeonMapPreview->drawState++; } // Tint image @@ -2521,7 +2521,7 @@ static void Task_DrawDungeonMapPreviewFlavorText(u8 taskId) if (JOY_NEW(B_BUTTON) || JOY_NEW(A_BUTTON)) { FillWindowPixelBuffer(WIN_MAP_PREVIEW, PIXEL_FILL(0)); - CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_BOTH); + CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_FULL); sDungeonMapPreview->mainState++; sDungeonMapPreview->drawState++; } @@ -3001,8 +3001,8 @@ static void Task_MapCloseAnim(u8 taskId) { case 0: ClearOrDrawTopBar(TRUE); - CopyWindowToVram(WIN_TOPBAR_LEFT, COPYWIN_BOTH); - CopyWindowToVram(WIN_TOPBAR_RIGHT, COPYWIN_BOTH); + CopyWindowToVram(WIN_TOPBAR_LEFT, COPYWIN_FULL); + CopyWindowToVram(WIN_TOPBAR_RIGHT, COPYWIN_FULL); sMapOpenCloseAnim->closeState++; break; case 1: @@ -4294,7 +4294,7 @@ static void PrintTopBarTextRight(const u8 *str) else FillWindowPixelBuffer(WIN_TOPBAR_RIGHT, PIXEL_FILL(15)); AddTextPrinterParameterized3(WIN_TOPBAR_RIGHT, 0, 0, 0, sTextColors, 0, str); - CopyWindowToVram(WIN_TOPBAR_RIGHT, COPYWIN_BOTH); + CopyWindowToVram(WIN_TOPBAR_RIGHT, COPYWIN_FULL); } static void ClearOrDrawTopBar(bool8 clear) diff --git a/src/slot_machine.c b/src/slot_machine.c index 9ceac198e..24a728046 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -2119,7 +2119,7 @@ static bool8 SlotsTask_MessageOutOfCoins(u8 * state, struct SlotMachineSetupTask { case 0: Slot_PrintOnWindow0(gString_OutOfCoins); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); (*state)++; break; case 1: @@ -2137,7 +2137,7 @@ static bool8 SlotsTask_AskQuitPlaying(u8 * state, struct SlotMachineSetupTaskDat case 0: Slot_PrintOnWindow0(gString_QuitPlaying); Slot_CreateYesNoMenu(0); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); (*state)++; break; case 1: @@ -2155,7 +2155,7 @@ static bool8 SlotsTask_DestroyYesNoMenu(u8 * state, struct SlotMachineSetupTaskD case 0: Slot_ClearWindow0(); Slot_DestroyYesNoMenu(); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); (*state)++; break; case 1: diff --git a/src/start_menu.c b/src/start_menu.c index 80c9d7f59..2c0de8245 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -912,7 +912,7 @@ static void task50_after_link_battle_save(u8 taskId) AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0xFF, NULL, 2, 1, 3); DrawTextBorderOuter(0, 0x008, 0x0F); PutWindowTilemap(0); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); if (gWirelessCommType != 0 && InUnionRoom()) data[0] = 5; diff --git a/src/strings.c b/src/strings.c index 0855152f5..b8b989b80 100644 --- a/src/strings.c +++ b/src/strings.c @@ -215,7 +215,7 @@ const u8 gText_TheBerryPouchWillBePutAway[] = _("The BERRY POUCH will be\nput aw const u8 gText_ShopBuy[] = _("BUY"); const u8 gText_ShopSell[] = _("SELL"); const u8 gText_ShopQuit[] = _("SEE YA!"); -const u8 gText_InBagVar1[] = _("IN BAG:{SMALL} {STR_VAR_1}"); +const u8 gText_InBagVar1[] = _("IN BAG:{FONT_SMALL} {STR_VAR_1}"); const u8 gText_QuitShopping[] = _("Quit shopping."); const u8 gText_Var1CertainlyHowMany[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); const u8 gText_Var1AndYouWantedVar2[] = _("{STR_VAR_1}, and you want {STR_VAR_2}.\nThat will be ¥{STR_VAR_3}. Okay?"); @@ -419,11 +419,11 @@ const u8 gText_DoubleBattle[] = _("DOUBLE BATTLE"); const u8 gText_MultiBattle[] = _("MULTI BATTLE"); const u8 gText_MakeAChallenge[] = _("Make a challenge."); const u8 gText_Info_2[] = _("INFO"); -const u8 gText_FreshWater_200[] = _("FRESH WATER{CLEAR_TO 0x57}{SMALL}¥200"); -const u8 gText_SodaPop_300[] = _("SODA POP{CLEAR_TO 0x57}{SMALL}¥300"); -const u8 gText_Lemonade_350[] = _("LEMONADE{CLEAR_TO 0x57}{SMALL}¥350"); -const u8 gText_50Coins_1000[] = _("{SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000"); -const u8 gText_500Coins_10000[] = _("{SMALL}500 COINS{CLEAR_TO 0x40}¥10,000"); +const u8 gText_FreshWater_200[] = _("FRESH WATER{CLEAR_TO 0x57}{FONT_SMALL}¥200"); +const u8 gText_SodaPop_300[] = _("SODA POP{CLEAR_TO 0x57}{FONT_SMALL}¥300"); +const u8 gText_Lemonade_350[] = _("LEMONADE{CLEAR_TO 0x57}{FONT_SMALL}¥350"); +const u8 gText_50Coins_1000[] = _("{FONT_SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000"); +const u8 gText_500Coins_10000[] = _("{FONT_SMALL}500 COINS{CLEAR_TO 0x40}¥10,000"); const u8 gText_Excellent[] = _("Excellent"); const u8 gText_NotSoBad[] = _("Not so bad"); const u8 gText_RedShard[] = _("RED SHARD"); @@ -433,11 +433,11 @@ const u8 gText_GreenShard[] = _("GREEN SHARD"); const u8 gUnknown_8417A30[] = _("バトルタワ-"); const u8 gText_Right[] = _("Right"); const u8 gText_Left[] = _("Left"); -const u8 gText_Tm13_4000Coins[] = _("TM13{CLEAR_TO 0x48}{SMALL}4,000 COINS"); -const u8 gText_Tm23_3500Coins[] = _("TM23{CLEAR_TO 0x48}{SMALL}3,500 COINS"); -const u8 gText_Tm24_4000Coins[] = _("TM24{CLEAR_TO 0x48}{SMALL}4,000 COINS"); -const u8 gText_Tm30_4500Coins[] = _("TM30{CLEAR_TO 0x48}{SMALL}4,500 COINS"); -const u8 gText_Tm35_4000Coins[] = _("TM35{CLEAR_TO 0x48}{SMALL}4,000 COINS"); +const u8 gText_Tm13_4000Coins[] = _("TM13{CLEAR_TO 0x48}{FONT_SMALL}4,000 COINS"); +const u8 gText_Tm23_3500Coins[] = _("TM23{CLEAR_TO 0x48}{FONT_SMALL}3,500 COINS"); +const u8 gText_Tm24_4000Coins[] = _("TM24{CLEAR_TO 0x48}{FONT_SMALL}4,000 COINS"); +const u8 gText_Tm30_4500Coins[] = _("TM30{CLEAR_TO 0x48}{FONT_SMALL}4,500 COINS"); +const u8 gText_Tm35_4000Coins[] = _("TM35{CLEAR_TO 0x48}{FONT_SMALL}4,000 COINS"); const u8 gText_1F_2[] = _("1F"); const u8 gText_2F_2[] = _("2F"); const u8 gText_3F_2[] = _("3F"); @@ -485,18 +485,18 @@ const u8 gText_FreshWater[] = _("FRESH WATER"); const u8 gText_SodaPop[] = _("SODA POP"); const u8 gText_Lemonade[] = _("LEMONADE"); const u8 gText_Coins_2[] = _("COINS"); -const u8 gText_Bicycle_1000000[] = _("BICYCLE{CLEAR_TO 0x49}{SMALL}¥1,000,000"); +const u8 gText_Bicycle_1000000[] = _("BICYCLE{CLEAR_TO 0x49}{FONT_SMALL}¥1,000,000"); const u8 gText_NoThanks[] = _("NO THANKS"); -const u8 gText_Abra_180Coins[] = _("ABRA{CLEAR_TO 0x55}{SMALL} 180 COINS"); -const u8 gText_Clefairy_500Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{SMALL} 500 COINS"); -const u8 gText_Dratini_2800Coins[] = _("DRATINI{CLEAR_TO 0x4B}{SMALL} 2,800 COINS"); -const u8 gText_Scyther_5500Coins[] = _("SCYTHER{CLEAR_TO 0x4B}{SMALL} 5,500 COINS"); -const u8 gText_Porygon_9999Coins[] = _("PORYGON{CLEAR_TO 0x4B}{SMALL} 9,999 COINS"); -const u8 gText_Abra_120Coins[] = _("ABRA{CLEAR_TO 0x55}{SMALL} 120 COINS"); -const u8 gText_Clefairy_750Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{SMALL} 750 COINS"); -const u8 gText_Pinsir_2500Coins[] = _("PINSIR{CLEAR_TO 0x4B}{SMALL} 2,500 COINS"); -const u8 gText_Dratini_4600Coins[] = _("DRATINI{CLEAR_TO 0x4B}{SMALL} 4,600 COINS"); -const u8 gText_Porygon_6500Coins[] = _("PORYGON{CLEAR_TO 0x4B}{SMALL} 6,500 COINS"); +const u8 gText_Abra_180Coins[] = _("ABRA{CLEAR_TO 0x55}{FONT_SMALL} 180 COINS"); +const u8 gText_Clefairy_500Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{FONT_SMALL} 500 COINS"); +const u8 gText_Dratini_2800Coins[] = _("DRATINI{CLEAR_TO 0x4B}{FONT_SMALL} 2,800 COINS"); +const u8 gText_Scyther_5500Coins[] = _("SCYTHER{CLEAR_TO 0x4B}{FONT_SMALL} 5,500 COINS"); +const u8 gText_Porygon_9999Coins[] = _("PORYGON{CLEAR_TO 0x4B}{FONT_SMALL} 9,999 COINS"); +const u8 gText_Abra_120Coins[] = _("ABRA{CLEAR_TO 0x55}{FONT_SMALL} 120 COINS"); +const u8 gText_Clefairy_750Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{FONT_SMALL} 750 COINS"); +const u8 gText_Pinsir_2500Coins[] = _("PINSIR{CLEAR_TO 0x4B}{FONT_SMALL} 2,500 COINS"); +const u8 gText_Dratini_4600Coins[] = _("DRATINI{CLEAR_TO 0x4B}{FONT_SMALL} 4,600 COINS"); +const u8 gText_Porygon_6500Coins[] = _("PORYGON{CLEAR_TO 0x4B}{FONT_SMALL} 6,500 COINS"); const u8 gText_NoThanks_2[] = _("NO THANKS"); const u8 gText_HelixFossil[] = _("HELIX FOSSIL"); const u8 gText_DomeFossil[] = _("DOME FOSSIL"); @@ -532,11 +532,11 @@ const u8 gText_1BigMushroom[] = _("1 BIG MUSHROOM"); const u8 gText_SeviiIslands[] = _("SEVII ISLANDS"); const u8 gText_NavelRock[] = _("NAVEL ROCK"); const u8 gText_BirthIsland[] = _("BIRTH ISLAND"); -const u8 gText_MiracleSeed_1000Coins[] = _("MIRACLE SEED{CLEAR_TO 0x50}{SMALL}1,000 COINS"); -const u8 gText_Charcoal_1000Coins[] = _("CHARCOAL{CLEAR_TO 0x50}{SMALL}1,000 COINS"); -const u8 gText_MysticWater_1000Coins[] = _("MYSTIC WATER{CLEAR_TO 0x50}{SMALL}1,000 COINS"); -const u8 gText_YellowFlute_1600Coins[] = _("YELLOW FLUTE{CLEAR_TO 0x50}{SMALL}1,600 COINS"); -const u8 gText_SmokeBall_800Coins[] = _("SMOKE BALL{CLEAR_TO 0x5A}{SMALL}800 COINS"); +const u8 gText_MiracleSeed_1000Coins[] = _("MIRACLE SEED{CLEAR_TO 0x50}{FONT_SMALL}1,000 COINS"); +const u8 gText_Charcoal_1000Coins[] = _("CHARCOAL{CLEAR_TO 0x50}{FONT_SMALL}1,000 COINS"); +const u8 gText_MysticWater_1000Coins[] = _("MYSTIC WATER{CLEAR_TO 0x50}{FONT_SMALL}1,000 COINS"); +const u8 gText_YellowFlute_1600Coins[] = _("YELLOW FLUTE{CLEAR_TO 0x50}{FONT_SMALL}1,600 COINS"); +const u8 gText_SmokeBall_800Coins[] = _("SMOKE BALL{CLEAR_TO 0x5A}{FONT_SMALL}800 COINS"); const u8 gText_Dummy_8417F67[] = _(""); const u8 gText_Dummy_8417F68[] = _(""); const u8 gText_BecomeLeader[] = _("BECOME LEADER"); @@ -582,17 +582,17 @@ const u8 gText_NowOn[] = _("Now on:"); const u8 gText_LinkedGamePlay[] = _("LINKED GAME PLAY"); const u8 gText_DirectCorner[] = _("DIRECT CORNER"); const u8 gText_UnionRoom[] = _("UNION ROOM"); -const u8 gText_Energypowder_50[] = _("ENERGYPOWDER{CLEAR_TO 0x74}{SMALL}50"); -const u8 gText_EnergyRoot_80[] = _("ENERGY ROOT{CLEAR_TO 0x74}{SMALL}80"); -const u8 gText_HealPowder_50[] = _("HEAL POWDER{CLEAR_TO 0x74}{SMALL}50"); -const u8 gText_RevivalHerb_300[] = _("REVIVAL HERB{CLEAR_TO 0x6F}{SMALL}300"); -const u8 gText_Protein_1000[] = _("PROTEIN{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_Iron_1000[] = _("IRON{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_Carbos_1000[] = _("CARBOS{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_Calcium_1000[] = _("CALCIUM{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_Zinc_1000[] = _("ZINC{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_HpUp_1000[] = _("HP UP{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_PpUp_3000[] = _("PP UP{CLEAR_TO 0x65}{SMALL}3,000"); +const u8 gText_Energypowder_50[] = _("ENERGYPOWDER{CLEAR_TO 0x74}{FONT_SMALL}50"); +const u8 gText_EnergyRoot_80[] = _("ENERGY ROOT{CLEAR_TO 0x74}{FONT_SMALL}80"); +const u8 gText_HealPowder_50[] = _("HEAL POWDER{CLEAR_TO 0x74}{FONT_SMALL}50"); +const u8 gText_RevivalHerb_300[] = _("REVIVAL HERB{CLEAR_TO 0x6F}{FONT_SMALL}300"); +const u8 gText_Protein_1000[] = _("PROTEIN{CLEAR_TO 0x65}{FONT_SMALL}1,000"); +const u8 gText_Iron_1000[] = _("IRON{CLEAR_TO 0x65}{FONT_SMALL}1,000"); +const u8 gText_Carbos_1000[] = _("CARBOS{CLEAR_TO 0x65}{FONT_SMALL}1,000"); +const u8 gText_Calcium_1000[] = _("CALCIUM{CLEAR_TO 0x65}{FONT_SMALL}1,000"); +const u8 gText_Zinc_1000[] = _("ZINC{CLEAR_TO 0x65}{FONT_SMALL}1,000"); +const u8 gText_HpUp_1000[] = _("HP UP{CLEAR_TO 0x65}{FONT_SMALL}1,000"); +const u8 gText_PpUp_3000[] = _("PP UP{CLEAR_TO 0x65}{FONT_SMALL}3,000"); const u8 gString_BattleRecords_PlayersBattleResults[] = _("{PLAYER}'s BATTLE RESULTS"); const u8 gString_BattleRecords_TotalRecord[] = _("TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}"); const u8 gString_BattleRecords_ColumnHeaders[] = _("WIN{CLEAR_TO 0x30}LOSE{CLEAR_TO 0x60}DRAW"); @@ -911,14 +911,14 @@ const u8 gUnknown_841B285[] = _(" was used on\n"); const u8 gUnknown_841B293[] = _("."); const u8 gUnknown_841B295[] = _("'s level rose to\n"); const u8 gUnknown_841B2A7[] = _("."); -const u8 gUnknown_841B2A9[] = _("{SMALL}MAX.{SIZE 0x02} HP"); +const u8 gUnknown_841B2A9[] = _("{FONT_SMALL}MAX.{SIZE 0x02} HP"); const u8 gUnknown_841B2B7[] = _("ATTACK"); const u8 gUnknown_841B2BE[] = _("DEFENSE"); const u8 gUnknown_841B2C6[] = _("SPEED"); const u8 gUnknown_841B2CC[] = _("SP. ATK"); const u8 gUnknown_841B2D4[] = _("SP. DEF"); -const u8 gUnknown_841B2DC[] = _("{SMALL}{PLUS}{SIZE 0x02}"); -const u8 gUnknown_841B2E5[] = _("{SMALL}-{SIZE 0x02}"); +const u8 gUnknown_841B2DC[] = _("{FONT_SMALL}{PLUS}{SIZE 0x02}"); +const u8 gUnknown_841B2E5[] = _("{FONT_SMALL}-{SIZE 0x02}"); const u8 gUnknown_841B2ED[] = _("1, "); const u8 gUnknown_841B2F1[] = _("2, and ‥ ‥ ‥ "); const u8 gUnknown_841B2FF[] = _("Poof!\p"); diff --git a/src/text.c b/src/text.c index acf5bb7ec..248802a5f 100644 --- a/src/text.c +++ b/src/text.c @@ -785,7 +785,7 @@ u16 RenderText(struct TextPrinter *textPrinter) textPrinter->state = 3; TextPrinterInitDownArrowCounters(textPrinter); return 3; - case CHAR_EXTRA_EMOJI: + case CHAR_EXTRA_SYMBOL: currChar = *textPrinter->printerTemplate.currentChar | 0x100; textPrinter->printerTemplate.currentChar++; break; @@ -971,7 +971,7 @@ s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) case CHAR_PROMPT_CLEAR: break; case CHAR_KEYPAD_ICON: - case CHAR_EXTRA_EMOJI: + case CHAR_EXTRA_SYMBOL: ++strPos; default: ++width; @@ -1121,8 +1121,8 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) } break; case CHAR_KEYPAD_ICON: - case CHAR_EXTRA_EMOJI: - if (*str == CHAR_EXTRA_EMOJI) + case CHAR_EXTRA_SYMBOL: + if (*str == CHAR_EXTRA_SYMBOL) glyphWidth = func(*++str | 0x100, isJapanese); else glyphWidth = GetKeypadIconWidth(*++str); @@ -1241,7 +1241,7 @@ u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str, int a3, int a4, int a5, int a break; case CHAR_DYNAMIC_PLACEHOLDER: case CHAR_KEYPAD_ICON: - case CHAR_EXTRA_EMOJI: + case CHAR_EXTRA_SYMBOL: case PLACEHOLDER_BEGIN: ++strPos; break; diff --git a/src/trade.c b/src/trade.c index 3dd540962..96aae81c1 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1732,7 +1732,7 @@ static void TradeMenuCB_0(void) UnionRoomAndTradeMenuPrintOptions(1, 3, 16, 2, sMenuAction_SummaryTrade); Menu_InitCursor(1, 3, 0, 0, 16, 2, 0); PutWindowTilemap(1); - CopyWindowToVram(1, COPYWIN_BOTH); + CopyWindowToVram(1, COPYWIN_FULL); sTradeMenuResourcesPtr->tradeMenuCBnum = 1; } else if (sTradeMenuResourcesPtr->tradeMenuCursorPosition < 12) @@ -2164,9 +2164,9 @@ static void HandleRedrawTradeMenuOnSide(u8 side) BuildMovesString(movesString, whichParty, partyIdx); AddTextPrinterParameterized4((side * 2) + 15, 1, 0, 0, 0, 0, sTextColor_PartyMonNickname, 0, movesString); PutWindowTilemap((side * 2) + 14); - CopyWindowToVram((side * 2) + 14, COPYWIN_BOTH); + CopyWindowToVram((side * 2) + 14, COPYWIN_FULL); PutWindowTilemap((side * 2) + 15); - CopyWindowToVram((side * 2) + 15, COPYWIN_BOTH); + CopyWindowToVram((side * 2) + 15, COPYWIN_FULL); sTradeMenuResourcesPtr->menuRedrawState[side]++; break; case 4: @@ -2234,7 +2234,7 @@ static void PrintPartyMonNickname(u8 whichParty, u8 windowId, const u8 *str) xPos = (64u - GetStringWidth(0, str, GetFontAttribute(0, FONTATTR_LETTER_SPACING))) / 2; AddTextPrinterParameterized3(windowId, 0, xPos, 4, sTextColor_PartyMonNickname, speed, str); PutWindowTilemap(windowId); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void PrintPartyNicknames(u8 whichParty) @@ -2445,7 +2445,7 @@ static void PrintTradeErrorOrStatusMessage(u8 idx) AddTextPrinterParameterized(0, 3, sTradeErrorOrStatusMessagePtrs[idx], 0, 2, 0xFF, NULL); DrawTextBorderOuter(0, 0x014, 12); PutWindowTilemap(0); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); } static bool8 LoadUISprites(void) diff --git a/src/trade_scene.c b/src/trade_scene.c index 7a3642020..d3db122dd 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -922,7 +922,7 @@ void LinkTradeDrawWindow(void) { FillWindowPixelBuffer(0, PIXEL_FILL(15)); PutWindowTilemap(0); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); } static void TradeAnimInit_LoadGfx(void) @@ -999,7 +999,7 @@ static void CB2_InitTradeAnim_InGameTrade(void) LoadTradeMonPic(1, 1); FillWindowPixelBuffer(0, PIXEL_FILL(15)); PutWindowTilemap(0); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); gMain.state++; break; case 9: @@ -1330,7 +1330,7 @@ static bool8 DoTradeAnim_Cable(void) { SetTradeSequenceBgGpuRegs(4); FillWindowPixelBuffer(0, PIXEL_FILL(15)); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); sTradeData->state++; } break; @@ -1827,7 +1827,7 @@ static bool8 DoTradeAnim_Wireless(void) { SetTradeSequenceBgGpuRegs(4); FillWindowPixelBuffer(0, PIXEL_FILL(15)); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); sTradeData->state++; } break; @@ -2768,7 +2768,7 @@ void DrawTextOnTradeWindow(u8 windowId, const u8 *str, s8 speed) sTradeData->textColor[1] = 1; sTradeData->textColor[2] = 6; AddTextPrinterParameterized4(windowId, 2, 0, 2, 0, 2, sTradeData->textColor, speed, str); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static void Task_AnimateWirelessSignal(u8 taskId) diff --git a/src/trainer_card.c b/src/trainer_card.c index 0479f9c73..bf56915ff 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -621,7 +621,7 @@ static void Task_TrainerCard(u8 taskId) SetCloseLinkCallback(); DrawDialogueFrame(0, 1); AddTextPrinterParameterized(0, 2, gText_WaitingTrainerFinishReading, 0, 1, TEXT_SKIP_DRAW, 0); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD_LINK; break; case STATE_CLOSE_CARD_LINK: @@ -1464,7 +1464,7 @@ static void LoadStickerGfx(void) static void DrawTrainerCardWindow(u8 windowId) { PutWindowTilemap(windowId); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); } static bool8 SetTrainerCardBgsAndPals(void) diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 210837745..a589dcbef 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -917,7 +917,7 @@ static void ShowResultsBoard(void) } PutWindowTilemap(windowId); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); VarSet(VAR_TEMP_1, windowId); } @@ -1070,7 +1070,7 @@ void PrintTrainerTowerRecords(void) } PutWindowTilemap(windowId); - CopyWindowToVram(windowId, COPYWIN_BOTH); + CopyWindowToVram(windowId, COPYWIN_FULL); FreeTrainerTowerDataStruct(); } diff --git a/src/union_room_battle.c b/src/union_room_battle.c index e7a19bbbe..11307891c 100644 --- a/src/union_room_battle.c +++ b/src/union_room_battle.c @@ -78,7 +78,7 @@ static bool32 UnionRoomBattle_PrintTextOnWindow0(s16 * state, const u8 * str, s3 DrawTextBorderOuter(0, 0x001, 0xD); UnionRoomBattle_CreateTextPrinter(0, str, 0, 2, speed); PutWindowTilemap(0); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); (*state)++; break; case 1: diff --git a/src/union_room_chat.c b/src/union_room_chat.c index 995d2473f..191201ec0 100644 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -972,7 +972,7 @@ static void AppendCharacterToChatMessageBuffer(void) charsStr = gUnionRoomKeyboardText[sWork->currentPage][sWork->currentRow]; for (i = 0; i < sWork->currentCol; i++) { - if (*charsStr == CHAR_EXTRA_EMOJI) + if (*charsStr == CHAR_EXTRA_SYMBOL) charsStr++; charsStr++; } @@ -995,7 +995,7 @@ static void AppendCharacterToChatMessageBuffer(void) str = GetEndOfUnk1A(); while (--strLength != -1 && sWork->bufferCursorPos < MESSAGE_BUFFER_NCHAR) { - if (*charsStr == CHAR_EXTRA_EMOJI) + if (*charsStr == CHAR_EXTRA_SYMBOL) { *str = *charsStr; charsStr++; @@ -1030,7 +1030,7 @@ static void ToggleCaseOfLastCharacterInChatMessageBuffer(void) sWork->lastBufferCursorPos = sWork->bufferCursorPos - 1; str = GetPtrToLastCharOfUnk1A(); - if (*str != CHAR_EXTRA_EMOJI) + if (*str != CHAR_EXTRA_SYMBOL) { character = sCaseToggleTable[*str]; if (character) @@ -1088,7 +1088,7 @@ static u8 *GetPtrToLastCharOfUnk1A(void) while (*str != EOS) { str2 = str; - if (*str == CHAR_EXTRA_EMOJI) + if (*str == CHAR_EXTRA_SYMBOL) str++; str++; } @@ -1109,7 +1109,7 @@ static u16 GetNumCharsInMessageEntryBuffer(void) strLength -= 10; for (i = 0; i < strLength; i++) { - if (*str == CHAR_EXTRA_EMOJI) + if (*str == CHAR_EXTRA_SYMBOL) str++; str++; @@ -1250,7 +1250,7 @@ u8 *UnionRoomChat_GetEndOfMessageEntryBuffer(void) u8 *str = sWork->messageEntryBuffer; for (i = 0; i < numChars; i++) { - if (*str == CHAR_EXTRA_EMOJI) + if (*str == CHAR_EXTRA_SYMBOL) str++; str++; @@ -1268,7 +1268,7 @@ u16 UnionRoomChat_GetNumCharsInMessageEntryBuffer(void) u8 *str = sWork->messageEntryBuffer; for (count = 0, i = 0; i < numChars; count++, i++) { - if (*str == CHAR_EXTRA_EMOJI) + if (*str == CHAR_EXTRA_SYMBOL) str++; str++; diff --git a/src/union_room_chat_display.c b/src/union_room_chat_display.c index 040b21367..e06bd8aa0 100644 --- a/src/union_room_chat_display.c +++ b/src/union_room_chat_display.c @@ -488,7 +488,7 @@ static bool32 DisplaySubtask_PrintWin3(u8 *state) { case 0: PrintKeyboardSwapTextsOnWin3(); - CopyWindowToVram(3, COPYWIN_BOTH); + CopyWindowToVram(3, COPYWIN_FULL); break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -504,7 +504,7 @@ static bool32 DisplaySubtask_HideWin3(u8 *state) { case 0: ClearWin3(); - CopyWindowToVram(3, COPYWIN_BOTH); + CopyWindowToVram(3, COPYWIN_FULL); break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -557,7 +557,7 @@ static bool32 DisplaySubtask_ShowQuitChattingDialog(u8 *state) case 0: PlaceStdMessageWindow(STDMESSAGE_QUIT_CHATTING, 0); PlaceYesNoMenuAt(23, 11, 1); - CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH); + CopyWindowToVram(sWork->messageWindowId, COPYWIN_FULL); break; case 1: return IsDma3ManagerBusyWithBgCopy(); @@ -636,7 +636,7 @@ static bool32 DisplaySubtask_PrintRegisterWhere(u8 *state) if (!IsDma3ManagerBusyWithBgCopy()) { PlaceStdMessageWindow(STDMESSAGE_REGISTER_WHERE, 16); - CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH); + CopyWindowToVram(sWork->messageWindowId, COPYWIN_FULL); } else { @@ -677,7 +677,7 @@ static bool32 DisplaySubtask_CancelRegister(u8 *state) if (!IsDma3ManagerBusyWithBgCopy()) { HideStdMessageWindow(); - CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH); + CopyWindowToVram(sWork->messageWindowId, COPYWIN_FULL); } else { @@ -800,7 +800,7 @@ static bool32 DisplaySubtask_PrintInputText(u8 *state) { case 0: PlaceStdMessageWindow(STDMESSAGE_INPUT_TEXT, 16); - CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH); + CopyWindowToVram(sWork->messageWindowId, COPYWIN_FULL); (*state)++; break; case 1: @@ -816,7 +816,7 @@ static bool32 DisplaySubtask_PrintExitingChat(u8 *state) { case 0: PlaceStdMessageWindow(STDMESSAGE_EXITING_CHAT, 0); - CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH); + CopyWindowToVram(sWork->messageWindowId, COPYWIN_FULL); (*state)++; break; case 1: @@ -837,7 +837,7 @@ static bool32 DisplaySubtask_PrintLeaderLeft(u8 *state) str = UnionRoomChat_GetNameOfPlayerWhoDisbandedChat(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, str); PlaceStdMessageWindow(STDMESSAGE_LEADER_LEFT, 0); - CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH); + CopyWindowToVram(sWork->messageWindowId, COPYWIN_FULL); (*state)++; break; case 1: @@ -854,7 +854,7 @@ static bool32 DisplaySubtask_AskSave(u8 *state) case 0: PlaceStdMessageWindow(STDMESSAGE_ASK_SAVE, 0); PlaceYesNoMenuAt(23, 10, 1); - CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH); + CopyWindowToVram(sWork->messageWindowId, COPYWIN_FULL); (*state)++; break; case 1: @@ -871,7 +871,7 @@ static bool32 DisplaySubtask_AskOverwriteSave(u8 *state) case 0: PlaceStdMessageWindow(STDMESSAGE_ASK_OVERWRITE, 0); PlaceYesNoMenuAt(23, 10, 1); - CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH); + CopyWindowToVram(sWork->messageWindowId, COPYWIN_FULL); (*state)++; break; case 1: @@ -887,7 +887,7 @@ static bool32 DisplaySubtask_PrintSavingDontTurnOffPower(u8 *state) { case 0: PlaceStdMessageWindow(STDMESSAGE_SAVING_NO_OFF, 0); - CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH); + CopyWindowToVram(sWork->messageWindowId, COPYWIN_FULL); (*state)++; break; case 1: @@ -905,7 +905,7 @@ static bool32 DisplaySubtask_PrintSavedTheGame(u8 *state) DynamicPlaceholderTextUtil_Reset(); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gSaveBlock2Ptr->playerName); PlaceStdMessageWindow(STDMESSAGE_SAVED_THE_GAME, 0); - CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH); + CopyWindowToVram(sWork->messageWindowId, COPYWIN_FULL); (*state)++; break; case 1: @@ -922,7 +922,7 @@ static bool32 DisplaySubtask_ShowConfirmLeaderLeaveDialog(u8 *state) case 0: PlaceStdMessageWindow(STDMESSAGE_WARN_LEADER_LEAVE, 0); PlaceYesNoMenuAt(23, 10, 1); - CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH); + CopyWindowToVram(sWork->messageWindowId, COPYWIN_FULL); (*state)++; break; case 1: @@ -1287,21 +1287,21 @@ static void LoadWin0(void) LoadPalette(sWin0PalF, 0xF0, 0x20); PutWindowTilemap(0); FillWindowPixelBuffer(0, PIXEL_FILL(1)); - CopyWindowToVram(0, COPYWIN_BOTH); + CopyWindowToVram(0, COPYWIN_FULL); } static void LoadWin2(void) { PutWindowTilemap(2); PrintCurrentKeyboardPage(); - CopyWindowToVram(2, COPYWIN_BOTH); + CopyWindowToVram(2, COPYWIN_FULL); } static void LoadWin1(void) { FillWindowPixelBuffer(1, PIXEL_FILL(0)); PutWindowTilemap(1); - CopyWindowToVram(1, COPYWIN_BOTH); + CopyWindowToVram(1, COPYWIN_FULL); } static void LoadWin3(void) diff --git a/src/window.c b/src/window.c index 1828202a6..076f4fe07 100644 --- a/src/window.c +++ b/src/window.c @@ -233,7 +233,7 @@ void CopyWindowToVram(u8 windowId, u8 mode) case COPYWIN_GFX: LoadBgTiles(windowLocal.window.bg, windowLocal.tileData, windowSize, windowLocal.window.baseBlock); break; - case COPYWIN_BOTH: + case COPYWIN_FULL: LoadBgTiles(windowLocal.window.bg, windowLocal.tileData, windowSize, windowLocal.window.baseBlock); CopyBgTilemapBufferToVram(windowLocal.window.bg); break; diff --git a/src/window_8bpp.c b/src/window_8bpp.c index a96785339..77bddf2c7 100644 --- a/src/window_8bpp.c +++ b/src/window_8bpp.c @@ -107,7 +107,7 @@ void CopyWindowToVram8Bit(u8 windowId, u8 mode) case COPYWIN_GFX: LoadBgTiles(sWindowPtr->window.bg, sWindowPtr->tileData, sWindowSize, sWindowPtr->window.baseBlock); break; - case COPYWIN_BOTH: + case COPYWIN_FULL: LoadBgTiles(sWindowPtr->window.bg, sWindowPtr->tileData, sWindowSize, sWindowPtr->window.baseBlock); CopyBgTilemapBufferToVram(sWindowPtr->window.bg); break; diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index f22564e47..026654e81 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -292,7 +292,7 @@ static void Task_WirelessCommunicationScreen(u8 taskId) WCSS_AddTextPrinterParameterized(2, 3, gStringVar4, 4, 100, 2); } PutWindowTilemap(2); - CopyWindowToVram(2, COPYWIN_BOTH); + CopyWindowToVram(2, COPYWIN_FULL); } if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) { From 53fc50229f293aaaf6ed316ec7648fdc97407271 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 10:21:59 -0400 Subject: [PATCH 39/64] Review changes from pokeemerald #1719 --- src/battle_script_commands.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 3b45edde4..8f9c081f2 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3213,7 +3213,7 @@ static void Cmd_getexp(void) { // music change in wild battle after fainting a poke if (!(gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_POKEDUDE)) - && gBattleMons[0].hp + && gBattleMons[0].hp != 0 && !gBattleStruct->wildVictorySong) { BattleStopLowHpSound(); @@ -4123,7 +4123,7 @@ static void Cmd_moveend(void) effect = TRUE; gBattleScripting.moveendState++; break; - case MOVEEND_ON_DAMAGE_ABILITIES: // Such as abilities activating on contact(Poison Spore, Rough Skin, etc.). + case MOVEEND_ON_DAMAGE_ABILITIES: // Such as abilities activating on contact (Effect Spore, Rough Skin, etc.). if (AbilityBattleEffects(ABILITYEFFECT_ON_DAMAGE, gBattlerTarget, 0, 0, 0)) effect = TRUE; gBattleScripting.moveendState++; @@ -6008,7 +6008,7 @@ static void Cmd_hpthresholds(void) if (result == 0) result = 1; - if (result > 69 || !gBattleMons[opposingBattler].hp) + if (result > 69 || !gBattleMons[opposingBattler].hp == 0) gBattleStruct->hpScale = 0; else if (result > 39) gBattleStruct->hpScale = 1; From 94fc3ca044b1c5120b733c207dbdd0bc51ab21fb Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 10:30:12 -0400 Subject: [PATCH 40/64] Fixed check --- src/battle_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 8f9c081f2..49912a916 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6008,7 +6008,7 @@ static void Cmd_hpthresholds(void) if (result == 0) result = 1; - if (result > 69 || !gBattleMons[opposingBattler].hp == 0) + if (result > 69 || gBattleMons[opposingBattler].hp == 0) gBattleStruct->hpScale = 0; else if (result > 39) gBattleStruct->hpScale = 1; From 4998b976e142bcff848ab306c069b90490ea47b4 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 10:35:48 -0400 Subject: [PATCH 41/64] Standarized use of star in pointer types --- include/battle_controllers.h | 2 +- include/battle_message.h | 18 ++--- include/fieldmap.h | 2 +- include/global.h | 2 +- include/item.h | 2 +- include/money.h | 10 +-- include/save.h | 4 +- include/start_menu.h | 2 +- include/text.h | 2 +- include/text_window.h | 8 +- src/battle_anim_effects_1.c | 2 +- src/battle_anim_effects_2.c | 2 +- src/battle_interface.c | 4 +- src/battle_message.c | 18 ++--- src/battle_script_commands.c | 140 ++++++++++++++++----------------- src/bg.c | 14 ++-- src/daycare.c | 6 +- src/decompress.c | 4 +- src/event_object_movement.c | 34 ++++---- src/field_effect.c | 2 +- src/fieldmap.c | 6 +- src/help_message.c | 4 +- src/image_processing_effects.c | 26 +++--- src/isagbprn.c | 2 +- src/librfu_intr.c | 32 ++++---- src/librfu_stwi.c | 2 +- src/link_rfu_2.c | 12 +-- src/m4a.c | 2 +- src/money.c | 10 +-- src/option_menu.c | 2 +- src/overworld.c | 2 +- src/pokedex_screen.c | 8 +- src/pokemon.c | 4 +- src/pokemon_storage_system_2.c | 4 +- src/pokemon_storage_system_5.c | 6 +- src/save.c | 12 +-- src/script.c | 2 +- src/shop.c | 8 +- src/teachy_tv.c | 2 +- src/text.c | 18 ++--- src/trainer_card.c | 16 ++-- src/union_room.c | 2 +- src/window.c | 14 ++-- src/window_8bpp.c | 4 +- 44 files changed, 239 insertions(+), 239 deletions(-) diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 284fc84d2..53e935b44 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -222,7 +222,7 @@ void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringId); void BtlController_EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2); void BtlController_EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData); void BtlController_EmitChooseItem(u8 bufferId, u8 *arg1); -void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4); +void BtlController_EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8 *arg4); void BtlController_EmitHealthBarUpdate(u8 bufferId, u16 hpValue); void BtlController_EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints); void BtlController_EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2); diff --git a/include/battle_message.h b/include/battle_message.h index 04c5b1839..49d05b07d 100644 --- a/include/battle_message.h +++ b/include/battle_message.h @@ -208,12 +208,12 @@ struct BattleMsgData }; void BufferStringBattle(u16 stringID); -u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src); -u32 BattleStringExpandPlaceholders(const u8* src, u8* dst); -void BattleHandleAddTextPrinter(const u8* text, u8 arg1); +u32 BattleStringExpandPlaceholdersToDisplayedString(const u8 *src); +u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst); +void BattleHandleAddTextPrinter(const u8 *text, u8 arg1); void SetPpNumbersPaletteInMoveSelection(void); u8 GetCurrentPpToMaxPpState(u8 currentPp, u8 maxPp); -void BattlePutTextOnWindow(const u8* text, u8 windowId_flags); +void BattlePutTextOnWindow(const u8 *text, u8 windowId_flags); bool8 BattleStringShouldBeColored(u16); extern struct BattleMsgData *gBattleMsgDataPtr; @@ -225,11 +225,11 @@ extern u8 gBattleTextBuff1[TEXT_BUFF_ARRAY_COUNT]; extern u8 gBattleTextBuff2[TEXT_BUFF_ARRAY_COUNT]; extern u8 gBattleTextBuff3[TEXT_BUFF_ARRAY_COUNT]; -extern const u8* const gBattleStringsTable[]; -extern const u8* const gStatNamesTable[]; -extern const u8* const gPokeblockWasTooXStringTable[]; -extern const u8* const gRefereeStringsTable[]; -extern const u8* const gStatNamesTable2[]; +extern const u8 *const gBattleStringsTable[]; +extern const u8 *const gStatNamesTable[]; +extern const u8 *const gPokeblockWasTooXStringTable[]; +extern const u8 *const gRefereeStringsTable[]; +extern const u8 *const gStatNamesTable2[]; extern const u16 gMissStringIds[]; extern const u16 gTrappingMoves[]; diff --git a/include/fieldmap.h b/include/fieldmap.h index 4568c7258..1dcc5d793 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -21,7 +21,7 @@ u8 MapGridGetMetatileLayerTypeAt(s16 x, s16 y); void MapGridSetMetatileIdAt(s32, s32, u16); void MapGridSetMetatileEntryAt(s32, s32, u16); u8 MapGridGetZCoordAt(s32 x, s32 y); -void GetCameraCoords(u16*, u16*); +void GetCameraCoords(u16 *, u16 *); bool8 MapGridIsImpassableAt(s32, s32); s32 GetMapBorderIdAt(s32, s32); bool32 CanCameraMoveInDirection(s32); diff --git a/include/global.h b/include/global.h index 533b54a4d..03fcc1a16 100644 --- a/include/global.h +++ b/include/global.h @@ -100,7 +100,7 @@ #define T1_READ_8(ptr) ((ptr)[0]) #define T1_READ_16(ptr) ((ptr)[0] | ((ptr)[1] << 8)) #define T1_READ_32(ptr) ((ptr)[0] | ((ptr)[1] << 8) | ((ptr)[2] << 16) | ((ptr)[3] << 24)) -#define T1_READ_PTR(ptr) (u8*) T1_READ_32(ptr) +#define T1_READ_PTR(ptr) (u8 *) T1_READ_32(ptr) // T2_READ_8 is a duplicate to remain consistent with each group. #define T2_READ_8(ptr) ((ptr)[0]) diff --git a/include/item.h b/include/item.h index 1050752dd..5496bc869 100644 --- a/include/item.h +++ b/include/item.h @@ -32,7 +32,7 @@ struct BagPocket extern const struct Item gItems[]; extern struct BagPocket gBagPockets[]; -void GetBerryCountString(u8* dst, const u8* berryName, u32 quantity); +void GetBerryCountString(u8 *dst, const u8 *berryName, u32 quantity); void CopyItemName(u16 itemId, u8 *string); void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity); bool8 IsBagPocketNonEmpty(u8 pocket); diff --git a/include/money.h b/include/money.h index 5bcef18d4..31e925c0b 100644 --- a/include/money.h +++ b/include/money.h @@ -3,11 +3,11 @@ #include "global.h" -u32 GetMoney(u32* moneyPtr); -void SetMoney(u32* moneyPtr, u32 newValue); -bool8 IsEnoughMoney(u32* moneyPtr, u32 cost); -void AddMoney(u32* moneyPtr, u32 toAdd); -void RemoveMoney(u32* moneyPtr, u32 toSub); +u32 GetMoney(u32 *moneyPtr); +void SetMoney(u32 *moneyPtr, u32 newValue); +bool8 IsEnoughMoney(u32 *moneyPtr, u32 cost); +void AddMoney(u32 *moneyPtr, u32 toAdd); +void RemoveMoney(u32 *moneyPtr, u32 toSub); bool8 IsEnoughForCostInVar0x8005(void); void SubtractMoneyFromVar0x8005(void); void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed); diff --git a/include/save.h b/include/save.h index b49442193..f1357bd27 100644 --- a/include/save.h +++ b/include/save.h @@ -112,8 +112,8 @@ u8 sub_80DA434(void); u8 sub_80DA45C(void); bool8 sub_80DA4A0(void); u8 Save_LoadGameData(u8 saveType); -u32 TryCopySpecialSaveSection(u8 sector, u8* dst); -u32 TryWriteSpecialSaveSection(u8 sector, u8* src); +u32 TryCopySpecialSaveSection(u8 sector, u8 *dst); +u32 TryWriteSpecialSaveSection(u8 sector, u8 *src); void Task_LinkSave(u8 taskId); #endif // GUARD_SAVE_H diff --git a/include/start_menu.h b/include/start_menu.h index 90fe7109a..1759f03cb 100644 --- a/include/start_menu.h +++ b/include/start_menu.h @@ -3,7 +3,7 @@ #include "global.h" -void AppendToList(u8* list, u8* pos, u8 newEntry); +void AppendToList(u8 *list, u8 *pos, u8 newEntry); void Task_StartMenuHandleInput(u8 taskId); void SetUpReturnToStartMenu(void); void ShowStartMenu(void); diff --git a/include/text.h b/include/text.h index 1567c8d82..f80ed01d7 100644 --- a/include/text.h +++ b/include/text.h @@ -195,7 +195,7 @@ struct TextPrinterSubStruct struct TextPrinterTemplate // TODO: Better name { - const u8* currentChar; + const u8 *currentChar; u8 windowId; u8 fontId; u8 x; diff --git a/include/text_window.h b/include/text_window.h index 2e42558bf..ad5d68918 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -5,13 +5,13 @@ struct TilesPal { - u32* tiles; - u16* pal; + u32 *tiles; + u16 *pal; }; void rbox_fill_rectangle(u8 windowId); -const u16* stdpal_get(u8 id); -const u16* GetOverworldTextboxPalettePtr(void); +const u16 *stdpal_get(u8 id); +const u16 *GetOverworldTextboxPalettePtr(void); void TextWindow_LoadResourcesStdFrame0(u8 windowId, u16 tileStart, u8 palette); void TextWindow_SetStdFrame0_WithPal(u8 windowId, u16 tileStart, u8 palette); void TextWindow_SetUserSelectedFrame(u8 windowId, u16 tileStart, u8 palette); diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 7b39b7095..99a50c3c1 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -5294,7 +5294,7 @@ void AnimWavyMusicNotes(struct Sprite* sprite) sprite->callback = AnimWavyMusicNotesStep; } -static void AnimWavyMusicNotesGetNextPos(s16 a, s16 b, s16* c, s16* d, s8 e) +static void AnimWavyMusicNotesGetNextPos(s16 a, s16 b, s16 *c, s16 *d, s8 e) { int f; int g; diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index ce4fcd508..5974491f1 100644 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1780,7 +1780,7 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite) { int i; u16 rand; - s16* ptr; + s16 *ptr; PlaySE12WithPanning(SE_M_HORN_ATTACK, BattleAnimAdjustPanning(SOUND_PAN_TARGET)); sprite->x += sprite->x2; diff --git a/src/battle_interface.c b/src/battle_interface.c index 14ebae8b3..bf27ec734 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -2148,7 +2148,7 @@ static const struct WindowTemplate sHealthboxWindowTemplate = { }; -static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y, u32 *windowId) +static u8 *AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y, u32 *windowId) { u16 winId; u8 color[3]; @@ -2164,7 +2164,7 @@ static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y, AddTextPrinterParameterized4(winId, 0, x, y, 0, 0, color, -1, str); *windowId = winId; - return (u8*)(GetWindowAttribute(winId, WINDOW_TILE_DATA)); + return (u8 *)(GetWindowAttribute(winId, WINDOW_TILE_DATA)); } static void RemoveWindowOnHealthbox(u32 windowId) diff --git a/src/battle_message.c b/src/battle_message.c index 3dde60f49..cb12b532a 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1717,17 +1717,17 @@ void BufferStringBattle(u16 stringId) BattleStringExpandPlaceholdersToDisplayedString(stringPtr); } -u32 BattleStringExpandPlaceholdersToDisplayedString(const u8* src) +u32 BattleStringExpandPlaceholdersToDisplayedString(const u8 *src) { BattleStringExpandPlaceholders(src, gDisplayedStringBattle); } -static const u8* TryGetStatusString(u8 *src) +static const u8 *TryGetStatusString(u8 *src) { u32 i; u8 status[] = _("$$$$$$$"); u32 chars1, chars2; - u8* statusPtr; + u8 *statusPtr; statusPtr = status; for (i = 0; i < 8; i++) @@ -1739,13 +1739,13 @@ static const u8* TryGetStatusString(u8 *src) statusPtr++; } - chars1 = *(u32*)(&status[0]); - chars2 = *(u32*)(&status[4]); + chars1 = *(u32 *)(&status[0]); + chars2 = *(u32 *)(&status[4]); for (i = 0; i < NELEMS(gStatusConditionStringsTable); i++) { - if (chars1 == *(u32*)(&gStatusConditionStringsTable[i][0][0]) - && chars2 == *(u32*)(&gStatusConditionStringsTable[i][0][4])) + if (chars1 == *(u32 *)(&gStatusConditionStringsTable[i][0][0]) + && chars2 == *(u32 *)(&gStatusConditionStringsTable[i][0][4])) return gStatusConditionStringsTable[i][1]; } return NULL; @@ -2274,7 +2274,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) // unused, since the value loaded into the buffer is not read; it loaded one of // two particles (either "は" or "の") which works in tandem with ChooseTypeOfMoveUsedString // below to effect changes in the meaning of the line. -static void ChooseMoveUsedParticle(u8* textBuff) +static void ChooseMoveUsedParticle(u8 *textBuff) { s32 counter = 0; u32 i = 0; @@ -2314,7 +2314,7 @@ static void ChooseMoveUsedParticle(u8* textBuff) // // sText_ExclamationMark5 was " こうげき！" This resulted in a translation of // "'s attack!". -static void ChooseTypeOfMoveUsedString(u8* dst) +static void ChooseTypeOfMoveUsedString(u8 *dst) { s32 counter = 0; s32 i = 0; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 49912a916..a0355805c 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -38,7 +38,7 @@ #include "constants/pokemon.h" #include "constants/maps.h" -extern const u8* const gBattleScriptsForMoveEffects[]; +extern const u8 *const gBattleScriptsForMoveEffects[]; #define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED)) @@ -51,7 +51,7 @@ static bool8 IsTwoTurnsMove(u16 move); static void TrySetDestinyBondToHappen(void); static u8 AttacksThisTurn(u8 battlerId, u16 move); // Note: returns 1 if it's a charging turn, otherwise 2. static void CheckWonderGuardAndLevitate(void); -static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8, const u8* BS_ptr); +static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8, const u8 *BS_ptr); static void InitLevelUpBanner(void); static bool8 SlideInLevelUpBanner(void); static bool8 SlideOutLevelUpBanner(void); @@ -607,7 +607,7 @@ static const u32 sStatusFlagsForMoveEffects[NUM_MOVE_EFFECTS] = [MOVE_EFFECT_THRASH] = STATUS2_LOCK_CONFUSE, }; -static const u8* const sMoveEffectBS_Ptrs[] = +static const u8 *const sMoveEffectBS_Ptrs[] = { [0] = BattleScript_MoveEffectSleep, [MOVE_EFFECT_SLEEP] = BattleScript_MoveEffectSleep, @@ -1418,7 +1418,7 @@ static void CheckWonderGuardAndLevitate(void) } } -static void ModulateDmgByType2(u8 multiplier, u16 move, u8* flags) // same as ModulateDmgByType except different arguments +static void ModulateDmgByType2(u8 multiplier, u16 move, u8 *flags) // same as ModulateDmgByType except different arguments { gBattleMoveDamage = gBattleMoveDamage * multiplier / 10; if (gBattleMoveDamage == 0 && multiplier != 0) @@ -2062,7 +2062,7 @@ static void Cmd_printfromtable(void) { if (gBattleControllerExecFlags == 0) { - const u16* ptr = (const u16*) T1_READ_PTR(gBattlescriptCurrInstr + 1); + const u16 *ptr = (const u16 *) T1_READ_PTR(gBattlescriptCurrInstr + 1); ptr += gBattleCommunication[MULTISTRING_CHOOSER]; PrepareStringBattle(*ptr, gBattlerAttacker); @@ -2076,7 +2076,7 @@ static void Cmd_printselectionstringfromtable(void) { if (gBattleControllerExecFlags == 0) { - const u16* ptr = (const u16*) T1_READ_PTR(gBattlescriptCurrInstr + 1); + const u16 *ptr = (const u16 *) T1_READ_PTR(gBattlescriptCurrInstr + 1); ptr += gBattleCommunication[MULTISTRING_CHOOSER]; gActiveBattler = gBattlerAttacker; @@ -2379,7 +2379,7 @@ void SetMoveEffect(bool8 primary, u8 certain) || gBattleCommunication[MOVE_EFFECT_BYTE] == MOVE_EFFECT_PARALYSIS || gBattleCommunication[MOVE_EFFECT_BYTE] == MOVE_EFFECT_BURN) { - u8* synchronizeEffect = &gBattleStruct->synchronizeMoveEffect; + u8 *synchronizeEffect = &gBattleStruct->synchronizeMoveEffect; *synchronizeEffect = gBattleCommunication[MOVE_EFFECT_BYTE]; gHitMarker |= HITMARKER_SYNCHRONISE_EFFECT; } @@ -2649,7 +2649,7 @@ void SetMoveEffect(bool8 primary, u8 certain) } else { - u16* changedItem = &gBattleStruct->changedItems[gBattlerAttacker]; + u16 *changedItem = &gBattleStruct->changedItems[gBattlerAttacker]; gLastUsedItem = *changedItem = gBattleMons[gBattlerTarget].item; gBattleMons[gBattlerTarget].item = ITEM_NONE; @@ -2664,8 +2664,8 @@ void SetMoveEffect(bool8 primary, u8 certain) BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_ItemSteal; - *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 0) = 0; - *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 1) = 0; + *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerTarget]) + 0) = 0; + *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerTarget]) + 1) = 0; } } break; @@ -2753,8 +2753,8 @@ void SetMoveEffect(bool8 primary, u8 certain) BattleScriptPush(gBattlescriptCurrInstr + 1); gBattlescriptCurrInstr = BattleScript_KnockedOff; - *(u8*)((u8*)(&gBattleStruct->choicedMove[gEffectBattler]) + 0) = 0; - *(u8*)((u8*)(&gBattleStruct->choicedMove[gEffectBattler]) + 1) = 0; + *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gEffectBattler]) + 0) = 0; + *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gEffectBattler]) + 1) = 0; } else { @@ -2945,7 +2945,7 @@ static void Cmd_jumpifstatus(void) { u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2); - const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6); + const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6); if (gBattleMons[battlerId].status1 & flags && gBattleMons[battlerId].hp != 0) gBattlescriptCurrInstr = jumpPtr; @@ -2957,7 +2957,7 @@ static void Cmd_jumpifstatus2(void) { u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); u32 flags = T2_READ_32(gBattlescriptCurrInstr + 2); - const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6); + const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 6); if (gBattleMons[battlerId].status2 & flags && gBattleMons[battlerId].hp != 0) gBattlescriptCurrInstr = jumpPtr; @@ -2969,7 +2969,7 @@ static void Cmd_jumpifability(void) { u8 battlerId; u8 ability = gBattlescriptCurrInstr[2]; - const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 3); + const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 3); if (gBattlescriptCurrInstr[1] == BS_ATTACKER_SIDE) { @@ -3016,7 +3016,7 @@ static void Cmd_jumpifsideaffecting(void) { u8 side; u16 flags; - const u8* jumpPtr; + const u8 *jumpPtr; if (gBattlescriptCurrInstr[1] == BS_ATTACKER) side = GET_BATTLER_SIDE(gBattlerAttacker); @@ -3101,7 +3101,7 @@ static void Cmd_jumpiftype(void) { u8 battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); u8 type = gBattlescriptCurrInstr[2]; - const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 3); + const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 3); if (IS_BATTLER_OF_TYPE(battlerId, type)) gBattlescriptCurrInstr = jumpPtr; @@ -3506,9 +3506,9 @@ static void Cmd_goto(void) static void Cmd_jumpifbyte(void) { u8 caseID = gBattlescriptCurrInstr[1]; - const u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 2); + const u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 2); u8 value = gBattlescriptCurrInstr[6]; - const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 7); + const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 7); gBattlescriptCurrInstr += 11; @@ -3544,9 +3544,9 @@ static void Cmd_jumpifbyte(void) static void Cmd_jumpifhalfword(void) { u8 caseID = gBattlescriptCurrInstr[1]; - const u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 2); + const u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 2); u16 value = T2_READ_16(gBattlescriptCurrInstr + 6); - const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 8); + const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 8); gBattlescriptCurrInstr += 12; @@ -3582,9 +3582,9 @@ static void Cmd_jumpifhalfword(void) static void Cmd_jumpifword(void) { u8 caseID = gBattlescriptCurrInstr[1]; - const u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 2); + const u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 2); u32 value = T1_READ_32(gBattlescriptCurrInstr + 6); - const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); + const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); gBattlescriptCurrInstr += 14; @@ -3619,10 +3619,10 @@ static void Cmd_jumpifword(void) static void Cmd_jumpifarrayequal(void) { - const u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1); - const u8* mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5); + const u8 *mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1); + const u8 *mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5); u32 size = gBattlescriptCurrInstr[9]; - const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); + const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); u8 i; for (i = 0; i < size; i++) @@ -3642,10 +3642,10 @@ static void Cmd_jumpifarrayequal(void) static void Cmd_jumpifarraynotequal(void) { u8 equalBytes = 0; - const u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1); - const u8* mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5); + const u8 *mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1); + const u8 *mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5); u32 size = gBattlescriptCurrInstr[9]; - const u8* jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); + const u8 *jumpPtr = T2_READ_PTR(gBattlescriptCurrInstr + 10); u8 i; for (i = 0; i < size; i++) @@ -3663,7 +3663,7 @@ static void Cmd_jumpifarraynotequal(void) static void Cmd_setbyte(void) { - u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); *memByte = gBattlescriptCurrInstr[5]; gBattlescriptCurrInstr += 6; @@ -3671,22 +3671,22 @@ static void Cmd_setbyte(void) static void Cmd_addbyte(void) { - u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); *memByte += gBattlescriptCurrInstr[5]; gBattlescriptCurrInstr += 6; } static void Cmd_subbyte(void) { - u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); *memByte -= gBattlescriptCurrInstr[5]; gBattlescriptCurrInstr += 6; } static void Cmd_copyarray(void) { - u8* dest = T2_READ_PTR(gBattlescriptCurrInstr + 1); - const u8* src = T2_READ_PTR(gBattlescriptCurrInstr + 5); + u8 *dest = T2_READ_PTR(gBattlescriptCurrInstr + 1); + const u8 *src = T2_READ_PTR(gBattlescriptCurrInstr + 5); s32 size = gBattlescriptCurrInstr[9]; s32 i; @@ -3698,9 +3698,9 @@ static void Cmd_copyarray(void) static void Cmd_copyarraywithindex(void) { - u8* dest = T2_READ_PTR(gBattlescriptCurrInstr + 1); - const u8* src = T2_READ_PTR(gBattlescriptCurrInstr + 5); - const u8* index = T2_READ_PTR(gBattlescriptCurrInstr + 9); + u8 *dest = T2_READ_PTR(gBattlescriptCurrInstr + 1); + const u8 *src = T2_READ_PTR(gBattlescriptCurrInstr + 5); + const u8 *index = T2_READ_PTR(gBattlescriptCurrInstr + 9); s32 size = gBattlescriptCurrInstr[13]; s32 i; @@ -3712,14 +3712,14 @@ static void Cmd_copyarraywithindex(void) static void Cmd_orbyte(void) { - u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); *memByte |= gBattlescriptCurrInstr[5]; gBattlescriptCurrInstr += 6; } static void Cmd_orhalfword(void) { - u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1); u16 val = T2_READ_16(gBattlescriptCurrInstr + 5); *memHword |= val; @@ -3728,7 +3728,7 @@ static void Cmd_orhalfword(void) static void Cmd_orword(void) { - u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1); u32 val = T2_READ_32(gBattlescriptCurrInstr + 5); *memWord |= val; @@ -3737,14 +3737,14 @@ static void Cmd_orword(void) static void Cmd_bicbyte(void) { - u8* memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u8 *memByte = T2_READ_PTR(gBattlescriptCurrInstr + 1); *memByte &= ~(gBattlescriptCurrInstr[5]); gBattlescriptCurrInstr += 6; } static void Cmd_bichalfword(void) { - u16* memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u16 *memHword = T2_READ_PTR(gBattlescriptCurrInstr + 1); u16 val = T2_READ_16(gBattlescriptCurrInstr + 5); *memHword &= ~val; @@ -3753,7 +3753,7 @@ static void Cmd_bichalfword(void) static void Cmd_bicword(void) { - u32* memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1); + u32 *memWord = T2_READ_PTR(gBattlescriptCurrInstr + 1); u32 val = T2_READ_32(gBattlescriptCurrInstr + 5); *memWord &= ~val; @@ -3848,7 +3848,7 @@ static void Cmd_endselectionscript(void) static void Cmd_playanimation(void) { - const u16* argumentPtr; + const u16 *argumentPtr; gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); argumentPtr = T2_READ_PTR(gBattlescriptCurrInstr + 3); @@ -3891,8 +3891,8 @@ static void Cmd_playanimation(void) // Same as playanimation, except it takes a pointer to some animation id, instead of taking the value directly static void Cmd_playanimation_var(void) { - const u16* argumentPtr; - const u8* animationIdPtr; + const u16 *argumentPtr; + const u8 *animationIdPtr; gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); animationIdPtr = T2_READ_PTR(gBattlescriptCurrInstr + 2); @@ -4164,7 +4164,7 @@ static void Cmd_moveend(void) case MOVEEND_CHANGED_ITEMS: // changed held items for (i = 0; i < gBattlersCount; i++) { - u16* changedItem = &gBattleStruct->changedItems[i]; + u16 *changedItem = &gBattleStruct->changedItems[i]; if (*changedItem != ITEM_NONE) { gBattleMons[i].item = *changedItem; @@ -4297,11 +4297,11 @@ static void Cmd_moveend(void) target = gBattlerTarget; attacker = gBattlerAttacker; - *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 0) = gChosenMove; + *(attacker * 2 + target * 8 + (u8 *)(gBattleStruct->lastTakenMoveFrom) + 0) = gChosenMove; target = gBattlerTarget; attacker = gBattlerAttacker; - *(attacker * 2 + target * 8 + (u8*)(gBattleStruct->lastTakenMoveFrom) + 1) = gChosenMove >> 8; + *(attacker * 2 + target * 8 + (u8 *)(gBattleStruct->lastTakenMoveFrom) + 1) = gChosenMove >> 8; } gBattleScripting.moveendState++; break; @@ -4475,7 +4475,7 @@ static void Cmd_switchindataupdate(void) gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); oldData = gBattleMons[gActiveBattler]; - monData = (u8*)(&gBattleMons[gActiveBattler]); + monData = (u8 *)(&gBattleMons[gActiveBattler]); for (i = 0; i < sizeof(struct BattlePokemon); i++) monData[i] = gBattleBufferB[gActiveBattler][4 + i]; @@ -4937,9 +4937,9 @@ static void Cmd_switchhandleorder(void) if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) &= 0xF; - *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleBufferB[gActiveBattler][2] & 0xF0); - *(gActiveBattler * 3 + (u8*)(gBattleStruct->battlerPartyOrders) + 1) = gBattleBufferB[gActiveBattler][3]; + *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) &= 0xF; + *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleBufferB[gActiveBattler][2] & 0xF0); + *(gActiveBattler * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 1) = gBattleBufferB[gActiveBattler][3]; *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) &= (0xF0); *((gActiveBattler ^ BIT_FLANK) * 3 + (u8 *)(gBattleStruct->battlerPartyOrders) + 0) |= (gBattleBufferB[gActiveBattler][2] & 0xF0) >> 4; @@ -5019,7 +5019,7 @@ static void Cmd_switchineffects(void) for (i = 0; i < gBattlersCount; i++) { - u16* hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(i)]; + u16 *hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(i)]; *hpOnSwitchout = gBattleMons[i].hp; } @@ -5640,7 +5640,7 @@ static void Cmd_adjustsetdamage(void) // The same as adjustnormaldamage, except static void Cmd_removeitem(void) { - u16* usedHeldItem; + u16 *usedHeldItem; gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); @@ -5888,14 +5888,14 @@ static bool8 SlideOutLevelUpBanner(void) static void PutMonIconOnLvlUpBanner(void) { u8 spriteId; - const u16* iconPal; + const u16 *iconPal; struct SpriteSheet iconSheet; struct SpritePalette iconPalSheet; u16 species = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_SPECIES); u32 personality = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_PERSONALITY); - const u8* iconPtr = GetMonIconPtr(species, personality, 1); + const u8 *iconPtr = GetMonIconPtr(species, personality, 1); iconSheet.data = iconPtr; iconSheet.size = 0x200; iconSheet.tag = TAG_LVLUP_BANNER_MON_ICON; @@ -6329,7 +6329,7 @@ static void Cmd_jumpifnexttargetvalid(void) static void Cmd_tryhealhalfhealth(void) { - const u8* failPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); + const u8 *failPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); if (gBattlescriptCurrInstr[5] == BS_ATTACKER) gBattlerTarget = gBattlerAttacker; @@ -6501,7 +6501,7 @@ static void Cmd_trysetrest(void) static void Cmd_jumpifnotfirstturn(void) { - const u8* failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1); + const u8 *failJump = T1_READ_PTR(gBattlescriptCurrInstr + 1); if (gDisableStructs[gBattlerAttacker].isFirstTurn) gBattlescriptCurrInstr += 5; @@ -6583,7 +6583,7 @@ static void Cmd_stockpile(void) static void Cmd_stockpiletobasedamage(void) { - const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); + const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); if (gDisableStructs[gBattlerAttacker].stockpileCounter == 0) { gBattlescriptCurrInstr = jumpPtr; @@ -6609,7 +6609,7 @@ static void Cmd_stockpiletobasedamage(void) static void Cmd_stockpiletohpheal(void) { - const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); + const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 1); if (gDisableStructs[gBattlerAttacker].stockpileCounter == 0) { @@ -6821,7 +6821,7 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) static void Cmd_statbuffchange(void) { - const u8* jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 2); + const u8 *jumpPtr = T1_READ_PTR(gBattlescriptCurrInstr + 2); if (ChangeStatBuffs(gBattleScripting.statChanger & 0xF0, GET_STAT_BUFF_ID(gBattleScripting.statChanger), gBattlescriptCurrInstr[1], jumpPtr) == STAT_CHANGE_WORKED) gBattlescriptCurrInstr += 6; } @@ -7417,8 +7417,8 @@ static void Cmd_transformdataexecution(void) PREPARE_SPECIES_BUFFER(gBattleTextBuff1, gBattleMons[gBattlerTarget].species) - battleMonAttacker = (u8*)(&gBattleMons[gBattlerAttacker]); - battleMonTarget = (u8*)(&gBattleMons[gBattlerTarget]); + battleMonAttacker = (u8 *)(&gBattleMons[gBattlerAttacker]); + battleMonTarget = (u8 *)(&gBattleMons[gBattlerTarget]); for (i = 0; i < offsetof(struct BattlePokemon, pp); i++) battleMonAttacker[i] = battleMonTarget[i]; @@ -7675,7 +7675,7 @@ static void Cmd_painsplitdmgcalc(void) { s32 hpDiff = (gBattleMons[gBattlerAttacker].hp + gBattleMons[gBattlerTarget].hp) / 2; s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - hpDiff; - u8* storeLoc = (void*)(&gBattleScripting.painSplitHp); + u8 *storeLoc = (void*)(&gBattleScripting.painSplitHp); storeLoc[0] = (painSplitHp); storeLoc[1] = (painSplitHp & 0x0000FF00) >> 8; @@ -8849,11 +8849,11 @@ static void Cmd_tryswapitems(void) // trick BtlController_EmitSetMonData(BUFFER_A, REQUEST_HELDITEM_BATTLE, 0, sizeof(gBattleMons[gBattlerTarget].item), &gBattleMons[gBattlerTarget].item); MarkBattlerForControllerExec(gBattlerTarget); - *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 0) = 0; - *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerTarget]) + 1) = 0; + *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerTarget]) + 0) = 0; + *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerTarget]) + 1) = 0; - *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerAttacker]) + 0) = 0; - *(u8*)((u8*)(&gBattleStruct->choicedMove[gBattlerAttacker]) + 1) = 0; + *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerAttacker]) + 0) = 0; + *(u8 *)((u8 *)(&gBattleStruct->choicedMove[gBattlerAttacker]) + 1) = 0; gBattlescriptCurrInstr += 5; @@ -9080,7 +9080,7 @@ static void Cmd_assistattackselect(void) s32 chooseableMovesNo = 0; struct Pokemon* party; s32 monId, moveId; - u16* validMoves = gBattleStruct->assistPossibleMoves; + u16 *validMoves = gBattleStruct->assistPossibleMoves; if (GET_BATTLER_SIDE(gBattlerAttacker) != B_SIDE_PLAYER) party = gEnemyParty; diff --git a/src/bg.c b/src/bg.c index b20186029..e6ede6e76 100644 --- a/src/bg.c +++ b/src/bg.c @@ -883,7 +883,7 @@ void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 wi { for (destX16 = destX; destX16 < (destX + width); destX16++) { - ((u16*)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *(srcCopy)++; + ((u16 *)sGpuBgConfigs2[bg].tilemap)[((destY16 * 0x20) + destX16)] = *(srcCopy)++; } } break; @@ -896,7 +896,7 @@ void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 wi { for (destX16 = destX; destX16 < (destX + width); destX16++) { - ((u8*)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *(srcCopy)++; + ((u8 *)sGpuBgConfigs2[bg].tilemap)[((destY16 * mode) + destX16)] = *(srcCopy)++; } } break; @@ -944,7 +944,7 @@ void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 { for (j = destX; j < (destX + rectWidth); j++) { - *(u8*)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8*)(srcPtr) + tileOffset; + *(u8 *)(sGpuBgConfigs2[bg].tilemap + ((var * i) + j)) = *(u8 *)(srcPtr) + tileOffset; srcPtr++; } srcPtr += (srcWidth - rectWidth); @@ -969,7 +969,7 @@ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, { for (x16 = x; x16 < (x + width); x16++) { - ((u16*)sGpuBgConfigs2[bg].tilemap)[((y16 * 0x20) + x16)] = tileNum; + ((u16 *)sGpuBgConfigs2[bg].tilemap)[((y16 * 0x20) + x16)] = tileNum; } } break; @@ -979,7 +979,7 @@ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, { for (x16 = x; x16 < (x + width); x16++) { - ((u8*)sGpuBgConfigs2[bg].tilemap)[((y16 * mode) + x16)] = tileNum; + ((u8 *)sGpuBgConfigs2[bg].tilemap)[((y16 * mode) + x16)] = tileNum; } } break; @@ -1014,7 +1014,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt { for (x16 = x; x16 < (x + width); x16++) { - CopyTileMapEntry(&firstTileNum, &((u16*)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0); + CopyTileMapEntry(&firstTileNum, &((u16 *)sGpuBgConfigs2[bg].tilemap)[(u16)GetTileMapIndexFromCoords(x16, y16, attribute, mode, mode2)], paletteSlot, 0, 0); firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF); } } @@ -1025,7 +1025,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt { for (x16 = x; x16 < (x + width); x16++) { - ((u8*)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum; + ((u8 *)sGpuBgConfigs2[bg].tilemap)[(y16 * mode3) + x16] = firstTileNum; firstTileNum = (firstTileNum & 0xFC00) + ((firstTileNum + tileNumDelta) & 0x3FF); } } diff --git a/src/daycare.c b/src/daycare.c index 5d65d199d..54b06751d 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -67,7 +67,7 @@ static void SpriteCB_Egg_3(struct Sprite* sprite); static void SpriteCB_Egg_4(struct Sprite* sprite); static void SpriteCB_Egg_5(struct Sprite* sprite); static void SpriteCB_EggShard(struct Sprite* sprite); -static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed); +static void EggHatchPrintMessage(u8 windowId, u8 *string, u8 x, u8 y, u8 speed); static void CreateRandomEggShardSprite(void); static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 spriteAnimIndex); @@ -1710,7 +1710,7 @@ bool8 DaycareMonReceivedMail(void) extern const struct CompressedSpriteSheet gMonFrontPicTable[]; -static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID, u16* speciesLoc) +static u8 EggHatchCreateMonSprite(u8 a0, u8 switchID, u8 pokeID, u16 *speciesLoc) { u8 r4 = 0; u8 spriteID = 0; // r7 @@ -2153,7 +2153,7 @@ static void CreateEggShardSprite(u8 x, u8 y, s16 data1, s16 data2, s16 data3, u8 StartSpriteAnim(&gSprites[spriteID], spriteAnimIndex); } -static void EggHatchPrintMessage(u8 windowId, u8* string, u8 x, u8 y, u8 speed) +static void EggHatchPrintMessage(u8 windowId, u8 *string, u8 x, u8 y, u8 speed) { FillWindowPixelBuffer(windowId, 0xFF); sEggHatchData->textColor[0] = 0; diff --git a/src/decompress.c b/src/decompress.c index 3af15cfc8..f12d0b6a3 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -265,7 +265,7 @@ bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet* src struct SpriteSheet dest; void* buffer; - buffer = AllocZeroed(*((u32*)src->data) >> 8); + buffer = AllocZeroed(*((u32 *)src->data) >> 8); if (!buffer) return TRUE; LZ77UnCompWram(src->data, buffer); @@ -282,7 +282,7 @@ bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette struct SpritePalette dest; void* buffer; - buffer = AllocZeroed(*((u32*)src->data) >> 8); + buffer = AllocZeroed(*((u32 *)src->data) >> 8); if (!buffer) return TRUE; LZ77UnCompWram(src->data, buffer); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 099211d4c..758ea6cd5 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -33,20 +33,20 @@ static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *, s16, s16); static void CalcWhetherObjectIsOffscreen(struct ObjectEvent *, struct Sprite *); static void UpdateObjEventSpriteVisibility(struct ObjectEvent *, struct Sprite *); static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent*); -static void GetGroundEffectFlags_Reflection(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_SandHeap(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_HotSprings(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_Tracks(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_Puddle(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_Ripple(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_Seaweed(struct ObjectEvent*, u32*); -static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent*, u32*); +static void GetGroundEffectFlags_Reflection(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_SandHeap(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_HotSprings(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_Tracks(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_Puddle(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_Ripple(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_Seaweed(struct ObjectEvent*, u32 *); +static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent*, u32 *); static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent*); static u8 GetReflectionTypeByMetatileBehavior(u32); static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z); @@ -2081,9 +2081,9 @@ void ShowOrHideObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 stat void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup) { - *(u8*)(localId) = objectEvent->localId; - *(u8*)(mapNum) = objectEvent->mapNum; - *(u8*)(mapGroup) = objectEvent->mapGroup; + *(u8 *)(localId) = objectEvent->localId; + *(u8 *)(mapNum) = objectEvent->mapNum; + *(u8 *)(mapGroup) = objectEvent->mapGroup; } void EnableObjectGroundEffectsByXY(s16 x, s16 y) diff --git a/src/field_effect.c b/src/field_effect.c index 9a3a579d3..cb8191459 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -2605,7 +2605,7 @@ static void ShowMonEffect_Outdoors_1(struct Task * task) { task->data[11] = GetGpuReg(REG_OFFSET_WININ); task->data[12] = GetGpuReg(REG_OFFSET_WINOUT); - StoreWordInTwoHalfwords((u16*)&task->data[13], (u32)gMain.vblankCallback); + StoreWordInTwoHalfwords((u16 *)&task->data[13], (u32)gMain.vblankCallback); task->data[1] = WIN_RANGE(0xF0, 0xF1); task->data[2] = WIN_RANGE(0x50, 0x51); task->data[3] = WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR; diff --git a/src/fieldmap.c b/src/fieldmap.c index 21166cc81..33a1d82cc 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -889,17 +889,17 @@ static void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u1 if (tileset->isSecondary == FALSE) { LoadPalette(&black, destOffset, 2); - LoadPalette(((u16*)tileset->palettes) + 1, destOffset + 1, size - 2); + LoadPalette(((u16 *)tileset->palettes) + 1, destOffset + 1, size - 2); Fieldmap_ApplyGlobalTintToPaletteEntries(destOffset + 1, (size - 2) >> 1); } else if (tileset->isSecondary == TRUE) { - LoadPalette(((u16*)tileset->palettes) + (NUM_PALS_IN_PRIMARY * 16), destOffset, size); + LoadPalette(((u16 *)tileset->palettes) + (NUM_PALS_IN_PRIMARY * 16), destOffset, size); Fieldmap_ApplyGlobalTintToPaletteEntries(destOffset, size >> 1); } else { - LoadCompressedPalette((u32*)tileset->palettes, destOffset, size); + LoadCompressedPalette((u32 *)tileset->palettes, destOffset, size); Fieldmap_ApplyGlobalTintToPaletteEntries(destOffset, size >> 1); } } diff --git a/src/help_message.c b/src/help_message.c index d47642a85..d59e9ea40 100644 --- a/src/help_message.c +++ b/src/help_message.c @@ -49,8 +49,8 @@ void DestroyHelpMessageWindow(u8 a0) void sub_8112F18(u8 windowId) { - const u8* ptr = gUnknown_84566A8; - u8* buffer; + const u8 *ptr = gUnknown_84566A8; + u8 *buffer; u8 i, j; u8 width, height; u8 k; diff --git a/src/image_processing_effects.c b/src/image_processing_effects.c index fdd62f7a5..01364c354 100644 --- a/src/image_processing_effects.c +++ b/src/image_processing_effects.c @@ -26,14 +26,14 @@ static void ApplyImageEffect_PersonalityColor(u8); static void ApplyImageEffect_RedChannelGrayscale(u8); static void ApplyImageEffect_RedChannelGrayscaleHighlight(u8); static void AddPointillismPoints(u16); -static u16 ConvertColorToGrayscale(u16*); -static u16 QuantizePixel_Blur(u16*, u16*, u16*); -static u16 QuantizePixel_PersonalityColor(u16*, u8); -static u16 QuantizePixel_BlackAndWhite(u16*); -static u16 QuantizePixel_BlackOutline(u16*, u16*); -static u16 QuantizePixel_Invert(u16*); -static u16 QuantizePixel_BlurHard(u16*, u16*, u16*); -static u16 QuantizePixel_MotionBlur(u16*, u16*); +static u16 ConvertColorToGrayscale(u16 *); +static u16 QuantizePixel_Blur(u16 *, u16 *, u16 *); +static u16 QuantizePixel_PersonalityColor(u16 *, u8); +static u16 QuantizePixel_BlackAndWhite(u16 *); +static u16 QuantizePixel_BlackOutline(u16 *, u16 *); +static u16 QuantizePixel_Invert(u16 *); +static u16 QuantizePixel_BlurHard(u16 *, u16 *, u16 *); +static u16 QuantizePixel_MotionBlur(u16 *, u16 *); static u16 GetColorFromPersonality(u8); static void QuantizePalette_Standard(bool8); static void SetPresetPalette_PrimaryColors(void); @@ -44,10 +44,10 @@ static void SetPresetPalette_GrayscaleSmall(void); static void QuantizePalette_GrayscaleSmall(void); static void SetPresetPalette_BlackAndWhite(void); static void QuantizePalette_BlackAndWhite(void); -static u16 QuantizePixel_Standard(u16*); -static u16 QuantizePixel_GrayscaleSmall(u16*); -static u16 QuantizePixel_Grayscale(u16*); -static u16 QuantizePixel_PrimaryColors(u16*); +static u16 QuantizePixel_Standard(u16 *); +static u16 QuantizePixel_GrayscaleSmall(u16 *); +static u16 QuantizePixel_Grayscale(u16 *); +static u16 QuantizePixel_PrimaryColors(u16 *); static const u8 sPointillismPoints[][3] = { {0x00, 0x1d, 0x1c}, @@ -4288,7 +4288,7 @@ static u16 QuantizePixel_Standard(u16 *pixel) return RGB2(red, green, blue); } -static u16 QuantizePixel_PrimaryColors(u16* color) +static u16 QuantizePixel_PrimaryColors(u16 *color) { u16 red = *color & 0x1F; u16 green = (*color >> 5) & 0x1F; diff --git a/src/isagbprn.c b/src/isagbprn.c index d6f547c1f..46195f72f 100644 --- a/src/isagbprn.c +++ b/src/isagbprn.c @@ -160,7 +160,7 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP /* void NoCashGBAPrint(const char *pBuf) { - *(volatile u32*)NOCASHGBAPRINTADDR2 = (u32)pBuf; + *(volatile u32 *)NOCASHGBAPRINTADDR2 = (u32)pBuf; } void NoCashGBAPrintf(const char *pBuf, ...) diff --git a/src/librfu_intr.c b/src/librfu_intr.c index 4c2f2573a..c63ef5a94 100644 --- a/src/librfu_intr.c +++ b/src/librfu_intr.c @@ -40,7 +40,7 @@ static void sio32intr_clock_master(void) { if (gSTWIStatus->reqNext <= gSTWIStatus->reqLength) { - REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket->rfuPacket8.data)[gSTWIStatus->reqNext]; + REG_SIODATA32 = ((u32 *)gSTWIStatus->txPacket->rfuPacket8.data)[gSTWIStatus->reqNext]; gSTWIStatus->reqNext++; } else @@ -61,7 +61,7 @@ static void sio32intr_clock_master(void) if ((regSIODATA32 & 0xFFFF0000) == 0x99660000) { gSTWIStatus->ackNext = 0; - ((u32*)gSTWIStatus->rxPacket)[gSTWIStatus->ackNext] = regSIODATA32; + ((u32 *)gSTWIStatus->rxPacket)[gSTWIStatus->ackNext] = regSIODATA32; gSTWIStatus->ackNext++; gSTWIStatus->ackActiveCommand = regSIODATA32; gSTWIStatus->ackLength = ackLen = regSIODATA32 >> 8; @@ -84,7 +84,7 @@ static void sio32intr_clock_master(void) } else if (gSTWIStatus->state == 2) // master receive ack { - ((u32*)gSTWIStatus->rxPacket)[gSTWIStatus->ackNext] = regSIODATA32; + ((u32 *)gSTWIStatus->rxPacket)[gSTWIStatus->ackNext] = regSIODATA32; gSTWIStatus->ackNext++; if (gSTWIStatus->ackLength < gSTWIStatus->ackNext) gSTWIStatus->state = 3; // master done ack @@ -157,7 +157,7 @@ static void sio32intr_clock_slave(void) regSIODATA32 = REG_SIODATA32; if (gSTWIStatus->state == 5) // slave receive req init { - ((u32*)gSTWIStatus->rxPacket)[0] = regSIODATA32; + ((u32 *)gSTWIStatus->rxPacket)[0] = regSIODATA32; gSTWIStatus->reqNext = 1; r0 = 0x99660000; // variable reuse required @@ -178,24 +178,24 @@ static void sio32intr_clock_slave(void) ) { gSTWIStatus->ackActiveCommand = gSTWIStatus->reqActiveCommand + 0x80; - ((u32*)gSTWIStatus->txPacket)[0] = 0x99660000 + gSTWIStatus->ackActiveCommand; + ((u32 *)gSTWIStatus->txPacket)[0] = 0x99660000 + gSTWIStatus->ackActiveCommand; gSTWIStatus->ackLength = 0; } else { - ((u32*)gSTWIStatus->txPacket)[0] = 0x996601EE; + ((u32 *)gSTWIStatus->txPacket)[0] = 0x996601EE; if (gSTWIStatus->reqActiveCommand >= 0x10 && gSTWIStatus->reqActiveCommand <= 0x3D) { - ((u32*)gSTWIStatus->txPacket)[1] = 1; + ((u32 *)gSTWIStatus->txPacket)[1] = 1; } else { - ((u32*)gSTWIStatus->txPacket)[1] = 2; + ((u32 *)gSTWIStatus->txPacket)[1] = 2; } gSTWIStatus->ackLength = 1; gSTWIStatus->error = ERR_REQ_CMD_ACK_REJECTION; } - REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket)[0]; + REG_SIODATA32 = ((u32 *)gSTWIStatus->txPacket)[0]; gSTWIStatus->ackNext = 1; gSTWIStatus->state = 7; // slave send ack } @@ -215,7 +215,7 @@ static void sio32intr_clock_slave(void) } else if (gSTWIStatus->state == 6) // slave receive req { - ((u32*)gSTWIStatus->rxPacket)[gSTWIStatus->reqNext] = regSIODATA32; + ((u32 *)gSTWIStatus->rxPacket)[gSTWIStatus->reqNext] = regSIODATA32; gSTWIStatus->reqNext++; if (gSTWIStatus->reqLength < gSTWIStatus->reqNext) { @@ -226,24 +226,24 @@ static void sio32intr_clock_slave(void) ) { gSTWIStatus->ackActiveCommand = gSTWIStatus->reqActiveCommand + 0x80; - ((u32*)gSTWIStatus->txPacket)[0] = 0x99660000 | gSTWIStatus->ackActiveCommand; + ((u32 *)gSTWIStatus->txPacket)[0] = 0x99660000 | gSTWIStatus->ackActiveCommand; gSTWIStatus->ackLength = 0; } else { - ((u32*)gSTWIStatus->txPacket)[0] = 0x996601EE; + ((u32 *)gSTWIStatus->txPacket)[0] = 0x996601EE; if (gSTWIStatus->reqActiveCommand >= 0x10 && gSTWIStatus->reqActiveCommand <= 0x3D) { - ((u32*)gSTWIStatus->txPacket)[1] = 1; + ((u32 *)gSTWIStatus->txPacket)[1] = 1; } else { - ((u32*)gSTWIStatus->txPacket)[1] = 2; + ((u32 *)gSTWIStatus->txPacket)[1] = 2; } gSTWIStatus->ackLength = 1; gSTWIStatus->error = ERR_REQ_CMD_ACK_REJECTION; } - REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket)[0]; + REG_SIODATA32 = ((u32 *)gSTWIStatus->txPacket)[0]; gSTWIStatus->ackNext = 1; gSTWIStatus->state = 7; // slave send ack } @@ -262,7 +262,7 @@ static void sio32intr_clock_slave(void) } else { - REG_SIODATA32 = ((u32*)gSTWIStatus->txPacket)[gSTWIStatus->ackNext]; + REG_SIODATA32 = ((u32 *)gSTWIStatus->txPacket)[gSTWIStatus->ackNext]; gSTWIStatus->ackNext++; } } diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c index 0287b358a..43f291826 100644 --- a/src/librfu_stwi.c +++ b/src/librfu_stwi.c @@ -235,7 +235,7 @@ void STWI_send_SystemConfigREQ(u16 availSlotFlag, u8 maxMFrame, u8 mcTimer) packetBytes += sizeof(u32); *packetBytes++ = mcTimer; *packetBytes++ = maxMFrame; - *(u16*)packetBytes = availSlotFlag; + *(u16 *)packetBytes = availSlotFlag; STWI_start_Command(); } } diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index b8e79fc7b..104125b7d 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -280,7 +280,7 @@ static void Task_LinkLeaderSearchForChildren(u8 taskId) case 1: break; case 2: - rfu_LMAN_establishConnection(Rfu.parent_child, 0, 240, (u16*)sAcceptedSerialNos); + rfu_LMAN_establishConnection(Rfu.parent_child, 0, 240, (u16 *)sAcceptedSerialNos); Rfu.state = 3; gTasks[taskId].data[1] = 6; break; @@ -371,7 +371,7 @@ static void Task_JoinGroupSearchForParent(u8 taskId) case 1: break; case 6: - rfu_LMAN_establishConnection(Rfu.parent_child, 0, 240, (u16*)sAcceptedSerialNos); + rfu_LMAN_establishConnection(Rfu.parent_child, 0, 240, (u16 *)sAcceptedSerialNos); Rfu.state = 7; gTasks[taskId].data[1] = 7; break; @@ -456,7 +456,7 @@ static void Task_LinkRfu_UnionRoomListen(u8 taskId) case 1: break; case 17: - rfu_LMAN_establishConnection(MODE_P_C_SWITCH, 0, 240, (u16*)sAcceptedSerialNos); + rfu_LMAN_establishConnection(MODE_P_C_SWITCH, 0, 240, (u16 *)sAcceptedSerialNos); rfu_LMAN_setMSCCallback(MscCallback_Child); Rfu.state = 18; break; @@ -501,7 +501,7 @@ static void Task_LinkRfu_UnionRoomListen(u8 taskId) void LinkRfu_CreateConnectionAsParent(void) { - rfu_LMAN_establishConnection(MODE_PARENT, 0, 240, (u16*)sAcceptedSerialNos); + rfu_LMAN_establishConnection(MODE_PARENT, 0, 240, (u16 *)sAcceptedSerialNos); } void LinkRfu_StopManagerBeforeEnteringChat(void) @@ -2647,7 +2647,7 @@ static void Task_RfuReconnectWithParent(u8 taskId) if (ContactedByParentAttemptingToReconnect()) { - u8 id = GetPartnerIndexByNameAndTrainerID((u8*)data, ReadU16(&data[8])); + u8 id = GetPartnerIndexByNameAndTrainerID((u8 *)data, ReadU16(&data[8])); if (id != 0xFF) { if (gRfuLinkStatus->partner[id].slot != 0xFF) @@ -2692,7 +2692,7 @@ void CreateTask_RfuReconnectWithParent(const u8 *trainerName, u16 trainerId) Rfu.status = RFU_STATUS_OK; taskId = CreateTask(Task_RfuReconnectWithParent, 3); data = gTasks[taskId].data; - StringCopy((u8*)(data), trainerName); + StringCopy((u8 *)(data), trainerName); data[8] = trainerId; } diff --git a/src/m4a.c b/src/m4a.c index b159e3873..365e7f6aa 100644 --- a/src/m4a.c +++ b/src/m4a.c @@ -1178,7 +1178,7 @@ void CgbSound(void) *nrx3ptr = channels->frequency; else *nrx3ptr = (*nrx3ptr & 0x08) | channels->frequency; - channels->n4 = (channels->n4 & 0xC0) + (*((u8*)(&channels->frequency) + 1)); + channels->n4 = (channels->n4 & 0xC0) + (*((u8 *)(&channels->frequency) + 1)); *nrx4ptr = (s8)(channels->n4 & mask); } diff --git a/src/money.c b/src/money.c index 4fdb1311d..2fb151709 100644 --- a/src/money.c +++ b/src/money.c @@ -9,17 +9,17 @@ EWRAM_DATA static u8 sMoneyBoxWindowId = 0; -u32 GetMoney(u32* moneyPtr) +u32 GetMoney(u32 *moneyPtr) { return *moneyPtr ^ gSaveBlock2Ptr->encryptionKey; } -void SetMoney(u32* moneyPtr, u32 newValue) +void SetMoney(u32 *moneyPtr, u32 newValue) { *moneyPtr = gSaveBlock2Ptr->encryptionKey ^ newValue; } -bool8 IsEnoughMoney(u32* moneyPtr, u32 cost) +bool8 IsEnoughMoney(u32 *moneyPtr, u32 cost) { if (GetMoney(moneyPtr) >= cost) return TRUE; @@ -27,7 +27,7 @@ bool8 IsEnoughMoney(u32* moneyPtr, u32 cost) return FALSE; } -void AddMoney(u32* moneyPtr, u32 toAdd) +void AddMoney(u32 *moneyPtr, u32 toAdd) { u32 toSet = GetMoney(moneyPtr); @@ -47,7 +47,7 @@ void AddMoney(u32* moneyPtr, u32 toAdd) SetMoney(moneyPtr, toSet); } -void RemoveMoney(u32* moneyPtr, u32 toSub) +void RemoveMoney(u32 *moneyPtr, u32 toSub) { u32 toSet = GetMoney(moneyPtr); diff --git a/src/option_menu.c b/src/option_menu.c index 53b0da882..aefae3f52 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -411,7 +411,7 @@ static void Task_OptionMenu(u8 taskId) static u8 OptionMenu_ProcessInput(void) { u16 current; - u16* curr; + u16 *curr; if (JOY_REPT(DPAD_RIGHT)) { current = sOptionMenuPtr->option[(sOptionMenuPtr->cursorPos)]; diff --git a/src/overworld.c b/src/overworld.c index bca973ceb..3e4e1b0bf 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -3261,7 +3261,7 @@ static void ZeroObjectEvent(struct ObjectEvent *objEvent) // conflict with the usual Event Object struct, thus the definitions. #define linkGender(obj) obj->singleMovementActive // not even one can reference *byte* aligned bitfield members... -#define linkDirection(obj) ((u8*)obj)[offsetof(typeof(*obj), fieldEffectSpriteId) - 1] // -> rangeX +#define linkDirection(obj) ((u8 *)obj)[offsetof(typeof(*obj), fieldEffectSpriteId) - 1] // -> rangeX static void SpawnLinkPlayerObjectEvent(u8 linkPlayerId, s16 x, s16 y, u8 gender) { diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index 810992aa2..d7223749e 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -885,10 +885,10 @@ void DexScreen_LoadResources(void) ScanlineEffect_Stop(); ResetBgsAndClearDma3BusyFlags(TRUE); InitBgsFromTemplates(0, sBgTemplates, NELEMS(sBgTemplates)); - SetBgTilemapBuffer(3, (u16*)Alloc(BG_SCREEN_SIZE)); - SetBgTilemapBuffer(2, (u16*)Alloc(BG_SCREEN_SIZE)); - SetBgTilemapBuffer(1, (u16*)Alloc(BG_SCREEN_SIZE)); - SetBgTilemapBuffer(0, (u16*)Alloc(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(3, (u16 *)Alloc(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(2, (u16 *)Alloc(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(1, (u16 *)Alloc(BG_SCREEN_SIZE)); + SetBgTilemapBuffer(0, (u16 *)Alloc(BG_SCREEN_SIZE)); if (natDex) DecompressAndLoadBgGfxUsingHeap(3, (void*)sNatDexTiles, BG_SCREEN_SIZE, 0, 0); else diff --git a/src/pokemon.c b/src/pokemon.c index 82b5bf596..2e83f5076 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -2869,7 +2869,7 @@ static union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 perso return substruct; } -u32 GetMonData(struct Pokemon *mon, s32 field, u8* data) +u32 GetMonData(struct Pokemon *mon, s32 field, u8 *data) { u32 ret; @@ -3873,7 +3873,7 @@ void RemoveBattleMonPPBonus(struct BattlePokemon *mon, u8 moveIndex) static void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex) { - u16* hpSwitchout; + u16 *hpSwitchout; s32 i; u8 nickname[POKEMON_NAME_LENGTH * 2]; // Why is the nickname array here longer in FR/LG? diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index fb6c61db4..60c22aa3e 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -59,7 +59,7 @@ void DrawTextWindowAndBufferTiles(const u8 *string, void *dst, u8 zero1, u8 zero winTemplate.height = 2; windowId = AddWindow(&winTemplate); FillWindowPixelBuffer(windowId, PIXEL_FILL(zero2)); - tileData1 = (u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA); + tileData1 = (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA); tileData2 = (winTemplate.width * 32) + tileData1; if (!zero1) @@ -106,7 +106,7 @@ static void PrintStringToBufferCopyNow(const u8 *string, void *dst, u16 rise, u8 var = winTemplate.width * 32; windowId = AddWindow(&winTemplate); FillWindowPixelBuffer(windowId, PIXEL_FILL(bgClr)); - tileData1 = (u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA); + tileData1 = (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA); tileData2 = (winTemplate.width * 32) + tileData1; txtColor[0] = bgClr; txtColor[1] = fgClr; diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c index fdc32d388..7d5da65e9 100644 --- a/src/pokemon_storage_system_5.c +++ b/src/pokemon_storage_system_5.c @@ -750,7 +750,7 @@ void InitCanReleaseMonVars(void) gPSSData->field_2176[0] = MOVE_SURF; gPSSData->field_2176[1] = MOVE_DIVE; gPSSData->field_2176[2] = MOVES_COUNT; - knownIdx = GetMonData(&gPSSData->field_2108, MON_DATA_KNOWN_MOVES, (u8*)gPSSData->field_2176); + knownIdx = GetMonData(&gPSSData->field_2108, MON_DATA_KNOWN_MOVES, (u8 *)gPSSData->field_2176); gPSSData->isSurfMon = knownIdx & 1; gPSSData->isDiveMon = (knownIdx >> 1) & 1; if (gPSSData->isSurfMon || gPSSData->isDiveMon) @@ -781,7 +781,7 @@ s8 RunCanReleaseMon(void) { if (gPSSData->field_2170 != TOTAL_BOXES_COUNT || gPSSData->field_2171 != i) { - knownMoves = GetMonData(gPlayerParty + i, MON_DATA_KNOWN_MOVES, (u8*)gPSSData->field_2176); + knownMoves = GetMonData(gPlayerParty + i, MON_DATA_KNOWN_MOVES, (u8 *)gPSSData->field_2176); if (knownMoves & 1) gPSSData->isSurfMon = FALSE; if (knownMoves & 2) @@ -803,7 +803,7 @@ s8 RunCanReleaseMon(void) case 1: for (i = 0; i < 5; i++) { - knownMoves = GetAndCopyBoxMonDataAt(gPSSData->field_216E, gPSSData->field_216F, MON_DATA_KNOWN_MOVES, (u8*)gPSSData->field_2176); + knownMoves = GetAndCopyBoxMonDataAt(gPSSData->field_216E, gPSSData->field_216F, MON_DATA_KNOWN_MOVES, (u8 *)gPSSData->field_2176); if (knownMoves != 0 && !(gPSSData->field_2170 == gPSSData->field_216E && gPSSData->field_2171 == gPSSData->field_216F)) { diff --git a/src/save.c b/src/save.c index 6d8a14871..16efea88c 100644 --- a/src/save.c +++ b/src/save.c @@ -801,16 +801,16 @@ u8 Save_LoadGameData(u8 saveType) return result; } -u32 TryCopySpecialSaveSection(u8 sector, u8* dst) +u32 TryCopySpecialSaveSection(u8 sector, u8 *dst) { s32 i; s32 size; - u8* savData; + u8 *savData; if (sector != SECTOR_TTOWER(0) && sector != SECTOR_TTOWER(1)) return 0xFF; ReadFlash(sector, 0, (u8 *)&gSaveDataBuffer, sizeof(struct SaveSection)); - if (*(u32*)(&gSaveDataBuffer.data[0]) != 0xB39D) + if (*(u32 *)(&gSaveDataBuffer.data[0]) != 0xB39D) return 0xFF; // copies whole save section except u32 counter i = 0; @@ -821,18 +821,18 @@ u32 TryCopySpecialSaveSection(u8 sector, u8* dst) return 1; } -u32 TryWriteSpecialSaveSection(u8 sector, u8* src) +u32 TryWriteSpecialSaveSection(u8 sector, u8 *src) { s32 i; s32 size; - u8* savData; + u8 *savData; void* savDataBuffer; if (sector != SECTOR_TTOWER(0) && sector != SECTOR_TTOWER(1)) return 0xFF; savDataBuffer = &gSaveDataBuffer; - *(u32*)(savDataBuffer) = 0xB39D; + *(u32 *)(savDataBuffer) = 0xB39D; // copies whole save section except u32 counter i = 0; diff --git a/src/script.c b/src/script.c index 23973be9c..08ae42deb 100644 --- a/src/script.c +++ b/src/script.c @@ -457,7 +457,7 @@ void TryRunOnWarpIntoMapScript(void) u32 CalculateRamScriptChecksum(void) { - return CalcCRC16WithTable((u8*)(&gSaveBlock1Ptr->ramScript.data), sizeof(gSaveBlock1Ptr->ramScript.data)); + return CalcCRC16WithTable((u8 *)(&gSaveBlock1Ptr->ramScript.data), sizeof(gSaveBlock1Ptr->ramScript.data)); } void ClearRamScript(void) diff --git a/src/shop.c b/src/shop.c index 82bd6f71f..802ec7c45 100644 --- a/src/shop.c +++ b/src/shop.c @@ -115,7 +115,7 @@ static void BuyMenuDecompressBgGraphics(void); static void RecolorItemDescriptionBox(bool32 a0); static void BuyMenuDrawGraphics(void); static bool8 BuyMenuBuildListMenuTemplate(void); -static void PokeMartWriteNameAndIdAt(struct ListMenuItem *list, u16 index, u8* dst); +static void PokeMartWriteNameAndIdAt(struct ListMenuItem *list, u16 index, u8 *dst); static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, struct ListMenu *list); static void BuyMenuPrintPriceInList(u8 windowId, u32 itemId, u8 y); static void LoadTmHmNameInMart(s32 item); @@ -568,7 +568,7 @@ bool8 BuyMenuBuildListMenuTemplate(void) return TRUE; } -static void PokeMartWriteNameAndIdAt(struct ListMenuItem *list, u16 index, u8* dst) +static void PokeMartWriteNameAndIdAt(struct ListMenuItem *list, u16 index, u8 *dst) { CopyItemName(index, dst); list->label = dst; @@ -752,11 +752,11 @@ static void BuyMenuDrawMapBg(void) if (metatile < NUM_METATILES_IN_PRIMARY) { - BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType); + BuyMenuDrawMapMetatile(i, j, (u16 *)mapLayout->primaryTileset->metatiles + metatile * 8, metatileLayerType); } else { - BuyMenuDrawMapMetatile(i, j, (u16*)mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType); + BuyMenuDrawMapMetatile(i, j, (u16 *)mapLayout->secondaryTileset->metatiles + ((metatile - NUM_METATILES_IN_PRIMARY) * 8), metatileLayerType); } } } diff --git a/src/teachy_tv.c b/src/teachy_tv.c index 22577fc5b..f18fe056d 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -1292,7 +1292,7 @@ static void TeachyTvLoadMapTilesetToBuffer(struct Tileset *ts, u8 *dstBuffer, u1 static void TeachyTvPushBackNewMapPalIndexArrayEntry(const struct MapLayout *mStruct, u16 *buf1, u8 *palIndexArray, u16 mapEntry, u16 offset) { - u16 * metaTileEntryAddr = mapEntry < 0x280 ? &((u16*)(mStruct->primaryTileset->metatiles))[8 * mapEntry] : &((u16*)(mStruct->secondaryTileset->metatiles))[8 * (mapEntry - 0x280)]; + u16 * metaTileEntryAddr = mapEntry < 0x280 ? &((u16 *)(mStruct->primaryTileset->metatiles))[8 * mapEntry] : &((u16 *)(mStruct->secondaryTileset->metatiles))[8 * (mapEntry - 0x280)]; buf1[0] = (TeachyTvComputePalIndexArrayEntryByMetaTile(palIndexArray, metaTileEntryAddr[0]) << 12) + 4 * offset; buf1[1] = (TeachyTvComputePalIndexArrayEntryByMetaTile(palIndexArray, metaTileEntryAddr[1]) << 12) + 4 * offset + 1; buf1[32] = (TeachyTvComputePalIndexArrayEntryByMetaTile(palIndexArray, metaTileEntryAddr[2]) << 12) + 4 * offset + 2; diff --git a/src/text.c b/src/text.c index 248802a5f..3b5cc3204 100644 --- a/src/text.c +++ b/src/text.c @@ -461,7 +461,7 @@ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter) { if (subStruct->downArrowDelay != 0) { - subStruct->downArrowDelay = ((*(u32*)&textPrinter->subUnion.sub) << 19 >> 27) - 1; // convoluted way of getting field_1, necessary to match + subStruct->downArrowDelay = ((*(u32 *)&textPrinter->subUnion.sub) << 19 >> 27) - 1; // convoluted way of getting field_1, necessary to match } else { @@ -498,7 +498,7 @@ void TextPrinterDrawDownArrow(struct TextPrinter *textPrinter) CopyWindowToVram(textPrinter->printerTemplate.windowId, 0x2); subStruct->downArrowDelay = 0x8; - subStruct->downArrowYPosIdx = (*(u32*)subStruct << 17 >> 30) + 1; + subStruct->downArrowYPosIdx = (*(u32 *)subStruct << 17 >> 30) + 1; } } } @@ -1345,7 +1345,7 @@ u8 GetKeypadIconHeight(u8 keypadIconId) void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese) { - const u16* glyphs; + const u16 *glyphs; if (isJapanese == 1) { @@ -1375,7 +1375,7 @@ s32 GetGlyphWidthFont0(u16 glyphId, bool32 isJapanese) void DecompressGlyphFont1(u16 glyphId, bool32 isJapanese) { - const u16* glyphs; + const u16 *glyphs; if (isJapanese == TRUE) { @@ -1408,7 +1408,7 @@ s32 GetGlyphWidthFont1(u16 glyphId, bool32 isJapanese) void DecompressGlyphFont2(u16 glyphId, bool32 isJapanese) { - const u16* glyphs; + const u16 *glyphs; int i; u8 lastColor; @@ -1481,7 +1481,7 @@ s32 GetGlyphWidthFont2(u16 glyphId, bool32 isJapanese) static void DecompressGlyphFont3(u16 glyphId, bool32 isJapanese) { - const u16* glyphs; + const u16 *glyphs; int i; u8 lastColor; @@ -1524,7 +1524,7 @@ s32 GetGlyphWidthFont3(u16 glyphId, bool32 isJapanese) static void DecompressGlyphFont4(u16 glyphId, bool32 isJapanese) { - const u16* glyphs; + const u16 *glyphs; int i; u8 lastColor; @@ -1595,7 +1595,7 @@ s32 GetGlyphWidthFont4(u16 glyphId, bool32 isJapanese) void DecompressGlyphFont5(u16 glyphId, bool32 isJapanese) { - const u16* glyphs; + const u16 *glyphs; int i; u8 lastColor; @@ -1666,7 +1666,7 @@ s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese) void DecompressGlyphFont9(u16 glyphId) { - const u16* glyphs = sFont9JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF)); + const u16 *glyphs = sFont9JapaneseGlyphs + (0x100 * (glyphId >> 0x4)) + (0x8 * (glyphId & 0xF)); DecompressGlyphTile(glyphs, (u16 *)gGlyphInfo.pixels); DecompressGlyphTile(glyphs + 0x80, (u16 *)(gGlyphInfo.pixels + 0x40)); gGlyphInfo.width = 8; diff --git a/src/trainer_card.c b/src/trainer_card.c index bf56915ff..401a6366d 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -133,8 +133,8 @@ static void PrintStickersOnCard(void); static void LoadStickerGfx(void); static void DrawTrainerCardWindow(u8 windowId); static bool8 SetTrainerCardBgsAndPals(void); -static void DrawCardScreenBackground(const u16* ptr); -static void DrawCardFrontOrBack(const u16* ptr); +static void DrawCardScreenBackground(const u16 *ptr); +static void DrawCardFrontOrBack(const u16 *ptr); static void DrawStarsAndBadgesOnCard(void); static void DrawCardBackStats(void); static void BlinkTimeColon(void); @@ -1122,7 +1122,7 @@ static void BufferTextForCardBack(void) static void PrintNameOnCardFront(void) { u8 buffer[2][32]; - u8* txtPtr; + u8 *txtPtr; txtPtr = StringCopy(buffer[0], gText_TrainerCardName); txtPtr = buffer[1]; @@ -1135,7 +1135,7 @@ static void PrintNameOnCardFront(void) static void PrintIdOnCard(void) { u8 buffer[32]; - u8* txtPtr; + u8 *txtPtr; txtPtr = StringCopy(buffer, gText_TrainerCardIDNo); ConvertIntToDecimalStringN(txtPtr, sTrainerCardDataPtr->trainerCard.rse.trainerId, STR_CONV_MODE_LEADING_ZEROS, 5); @@ -1145,7 +1145,7 @@ static void PrintIdOnCard(void) static void PrintMoneyOnCard(void) { u8 buffer[10]; - u8* txtPtr; + u8 *txtPtr; u8 x; txtPtr = StringCopy(buffer, gText_TrainerCardYen); @@ -1282,7 +1282,7 @@ static void PrintNameOnCardBack(void) static void BufferHofDebutTime(void) { u8 buffer[10]; - u8* txtPtr; + u8 *txtPtr; if (sTrainerCardDataPtr->hasHofResult) { @@ -1513,7 +1513,7 @@ static bool8 SetTrainerCardBgsAndPals(void) return FALSE; } -static void DrawCardScreenBackground(const u16* ptr) +static void DrawCardScreenBackground(const u16 *ptr) { s16 i, j; u16 *dst = sTrainerCardDataPtr->bgTilemapBuffer; @@ -1532,7 +1532,7 @@ static void DrawCardScreenBackground(const u16* ptr) CopyBgTilemapBufferToVram(2); } -static void DrawCardFrontOrBack(const u16* ptr) +static void DrawCardFrontOrBack(const u16 *ptr) { s16 i, j; u16 *dst = sTrainerCardDataPtr->cardTilemapBuffer; diff --git a/src/union_room.c b/src/union_room.c index 74e540bf2..ebed07124 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -2009,7 +2009,7 @@ static void Task_StartActivity(u8 taskId) static void Task_RunScriptAndFadeToActivity(u8 taskId) { s16 *data = gTasks[taskId].data; - u16 *sendBuff = (u16*)(gBlockSendBuffer); + u16 *sendBuff = (u16 *)(gBlockSendBuffer); switch (data[0]) { diff --git a/src/window.c b/src/window.c index 076f4fe07..1b1d347a0 100644 --- a/src/window.c +++ b/src/window.c @@ -22,7 +22,7 @@ bool16 InitWindows(const struct WindowTemplate *templates) int j; u8 bgLayer; u16 bgSize; - u8* allocatedTilemapBuffer; + u8 *allocatedTilemapBuffer; int allocatedBaseBlock; for (i = 0; i < 4; ++i) @@ -323,7 +323,7 @@ void BlitBitmapRectToWindow(u8 windowId, const u8 *pixels, u16 srcX, u16 srcY, u struct Bitmap sourceRect; struct Bitmap destRect; - sourceRect.pixels = (u8*)pixels; + sourceRect.pixels = (u8 *)pixels; sourceRect.width = srcWidth; sourceRect.height = srcHeight; @@ -339,7 +339,7 @@ void BlitBitmapRectToWindowWithColorKey(u8 windowId, const u8 *pixels, u16 srcX, struct Bitmap sourceRect; struct Bitmap destRect; - sourceRect.pixels = (u8*)pixels; + sourceRect.pixels = (u8 *)pixels; sourceRect.width = srcWidth; sourceRect.height = srcHeight; @@ -380,9 +380,9 @@ void FillWindowPixelBuffer(u8 windowId, u8 fillValue) destOffset = i + (a); \ srcOffset = i + (((width * (distanceLoop & ~7)) | (distanceLoop & 7)) * 4); \ if (srcOffset < size) \ - *(u32*)(tileData + destOffset) = *(u32*)(tileData + srcOffset); \ + *(u32 *)(tileData + destOffset) = *(u32 *)(tileData + srcOffset); \ else \ - *(u32*)(tileData + destOffset) = fillValue32; \ + *(u32 *)(tileData + destOffset) = fillValue32; \ distanceLoop++; \ } @@ -391,9 +391,9 @@ void FillWindowPixelBuffer(u8 windowId, u8 fillValue) destOffset = i + (a); \ srcOffset = i + (((width * (distanceLoop & ~7)) | (distanceLoop & 7)) * 4); \ if (srcOffset < size) \ - *(u32*)(tileData - destOffset) = *(u32*)(tileData - srcOffset); \ + *(u32 *)(tileData - destOffset) = *(u32 *)(tileData - srcOffset); \ else \ - *(u32*)(tileData - destOffset) = fillValue32; \ + *(u32 *)(tileData - destOffset) = fillValue32; \ distanceLoop++; \ } diff --git a/src/window_8bpp.c b/src/window_8bpp.c index 77bddf2c7..b27452cc0 100644 --- a/src/window_8bpp.c +++ b/src/window_8bpp.c @@ -13,7 +13,7 @@ static void nullsub_9(void) u16 AddWindow8Bit(const struct WindowTemplate *template) { u16 windowId; - u8* memAddress; + u8 *memAddress; u8 bgLayer; for (windowId = 0; windowId < WINDOWS_MAX; windowId++) @@ -83,7 +83,7 @@ void BlitBitmapRectToWindow4BitTo8Bit(u8 windowId, const u8 *pixels, u16 srcX, u struct Bitmap sourceRect; struct Bitmap destRect; - sourceRect.pixels = (u8*)pixels; + sourceRect.pixels = (u8 *)pixels; sourceRect.width = srcWidth; sourceRect.height = srcHeight; From 4c9e831a05820dfc7a415ff02aba3ae2e7e08a53 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 11:20:00 -0400 Subject: [PATCH 42/64] Standarized use of star in void and struct pointers --- include/battle.h | 4 +-- include/bg.h | 8 ++--- include/decompress.h | 6 ++-- include/field_effect_helpers.h | 4 +-- include/gba/isagbprint.h | 8 ++--- include/global.h | 2 +- src/battle_anim.c | 12 +++---- src/battle_anim_effects_1.c | 2 +- src/battle_bg.c | 4 +-- src/battle_interface.c | 66 +++++++++++++++++----------------- src/battle_message.c | 4 +-- src/battle_script_commands.c | 4 +-- src/bg.c | 14 ++++---- src/cable_club.c | 4 +-- src/decompress.c | 10 +++--- src/event_object_movement.c | 48 ++++++++++++------------- src/evolution_scene.c | 6 ++-- src/hall_of_fame.c | 4 +-- src/load_save.c | 6 ++-- src/menu_helpers.c | 6 ++-- src/pokeball.c | 2 +- src/pokedex_screen.c | 4 +-- src/pokemon_storage_system_4.c | 2 +- src/pokemon_storage_system_6.c | 2 +- src/pokemon_storage_system_8.c | 2 +- src/save.c | 8 ++--- src/shop.c | 2 +- src/union_room.c | 24 ++++++------- src/water.c | 8 ++--- 29 files changed, 138 insertions(+), 138 deletions(-) diff --git a/include/battle.h b/include/battle.h index 7d513f934..ce764923f 100644 --- a/include/battle.h +++ b/include/battle.h @@ -610,8 +610,8 @@ extern u8 *gLinkBattleRecvBuffer; struct MonSpritesGfx { - void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon - void* sprites[MAX_BATTLERS_COUNT]; + void *firstDecompressed; // ptr to the decompressed sprite of the first pokemon + void *sprites[MAX_BATTLERS_COUNT]; struct SpriteTemplate templates[MAX_BATTLERS_COUNT]; struct SpriteFrameImage images[MAX_BATTLERS_COUNT][4]; u8 field_F4[0x80]; // unused diff --git a/include/bg.h b/include/bg.h index ca6264ca8..8030ab805 100644 --- a/include/bg.h +++ b/include/bg.h @@ -89,7 +89,7 @@ void ResetBgsAndClearDma3BusyFlags(bool32 enableWindowTileAutoAlloc); void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numTemplates); void InitBgFromTemplate(const struct BgTemplate *template); void SetBgMode(u8 bgMode); -u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset); +u16 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset); u16 LoadBgTilemap(u8 bg, const void *src, u16 size, u16 destOffset); u16 Unused_LoadBgPalette(u8 bg, const void *src, u16 size, u16 destOffset); bool8 IsDma3ManagerBusyWithBgCopy(void); @@ -106,12 +106,12 @@ void SetBgAffine(u8 bg, u32 srcCenterX, u32 srcCenterY, s16 dispCenterX, s16 dis u8 AdjustBgMosaic(u8 value, u8 mode); void SetBgTilemapBuffer(u8 bg, void *tilemap); void UnsetBgTilemapBuffer(u8 bg); -void* GetBgTilemapBuffer(u8 bg); +void *GetBgTilemapBuffer(u8 bg); void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset); void CopyBgTilemapBufferToVram(u8 bg); -void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height); +void CopyToBgTilemapBufferRect(u8 bg, const void *src, u8 destX, u8 destY, u8 width, u8 height); void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); -void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, s16 tileOffset, s16 palette2); +void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, s16 tileOffset, s16 palette2); void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height); void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, s16 tileNumDelta); diff --git a/include/decompress.h b/include/decompress.h index 3f3a02d7b..4079dd251 100644 --- a/include/decompress.h +++ b/include/decompress.h @@ -18,9 +18,9 @@ void LoadCompressedSpritePalette(const struct CompressedSpritePalette *src); void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePalette *a, void *buffer); bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette *src); -void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffer, s32 species); -void DecompressPicFromTable_2(const struct CompressedSpriteSheet *src, void* buffer, s32 species); -void DecompressPicFromTable_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void* buffer, s32 species); +void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void *buffer, s32 species); +void DecompressPicFromTable_2(const struct CompressedSpriteSheet *src, void *buffer, s32 species); +void DecompressPicFromTable_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *buffer, s32 species); void HandleLoadSpecialPokePic(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality); void HandleLoadSpecialPokePic_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *dest, s32 species, u32 personality); diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index 814fb38da..fa42aef9a 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -19,8 +19,8 @@ void SetSurfBlob_DontSyncAnim(u8 spriteId, bool8 value); void StartAshFieldEffect(s16, s16, u16, s16); void StartRevealDisguise(struct ObjectEvent *); bool8 UpdateRevealDisguise(struct ObjectEvent *); -void SetUpReflection(struct ObjectEvent*, struct Sprite*, u8); -u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent*); +void SetUpReflection(struct ObjectEvent *, struct Sprite *, u8); +u32 StartFieldEffectForObjectEvent(u8, struct ObjectEvent *); u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y); void SetSpriteInvisible(u8 spriteId); diff --git a/include/gba/isagbprint.h b/include/gba/isagbprint.h index 8a64b8223..7808b174c 100644 --- a/include/gba/isagbprint.h +++ b/include/gba/isagbprint.h @@ -23,14 +23,14 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP #ifdef NDEBUG #define AGB_ASSERT(exp) #else -#define AGB_ASSERT(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 1); +#define AGB_ASSERT(exp) (exp) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #exp, 1); #endif #undef AGB_WARNING #ifdef NDEBUG #define AGB_WARNING(exp) #else -#define AGB_WARNING(exp) (exp) ? ((void*)0) : AGBAssert(__FILE__, __LINE__, #exp, 0); +#define AGB_WARNING(exp) (exp) ? ((void *)0) : AGBAssert(__FILE__, __LINE__, #exp, 0); #endif // for matching purposes @@ -42,13 +42,13 @@ void AGBAssert(const char *pFile, int nLine, const char *pExpression, int nStopP #ifdef NDEBUG #define AGB_ASSERT_EX(exp, file, line) #else -#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 1); +#define AGB_ASSERT_EX(exp, file, line) (exp) ? ((void *)0) : AGBAssert(file, line, #exp, 1); #endif #ifdef NDEBUG #define AGB_WARNING_EX(exp, file, line) #else -#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void*)0) : AGBAssert(file, line, #exp, 0); +#define AGB_WARNING_EX(exp, file, line) (exp) ? ((void *)0) : AGBAssert(file, line, #exp, 0); #endif #endif diff --git a/include/global.h b/include/global.h index 03fcc1a16..ce8f050f5 100644 --- a/include/global.h +++ b/include/global.h @@ -106,7 +106,7 @@ #define T2_READ_8(ptr) ((ptr)[0]) #define T2_READ_16(ptr) ((ptr)[0] + ((ptr)[1] << 8)) #define T2_READ_32(ptr) ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24)) -#define T2_READ_PTR(ptr) (void*) T2_READ_32(ptr) +#define T2_READ_PTR(ptr) (void *) T2_READ_32(ptr) // This macro is required to prevent the compiler from optimizing // a dpad up/down check in sub_812CAD8 (fame_checker.c). diff --git a/src/battle_anim.c b/src/battle_anim.c index 2154748df..fe3fe2952 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -2257,8 +2257,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2) if (!toBG_2) { - RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(8)), 0x2000, DMA3_32BIT); - RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(28)), 0x1000, DMA3_32BIT); + RequestDma3Fill(0, (void *)(BG_SCREEN_ADDR(8)), 0x2000, DMA3_32BIT); + RequestDma3Fill(0, (void *)(BG_SCREEN_ADDR(28)), 0x1000, DMA3_32BIT); GetBattleAnimBg1Data(&animBg); CpuFill16(toBG_2, animBg.bgTiles, 0x1000); CpuFill16(toBG_2, animBg.bgTilemap, 0x800); @@ -2276,15 +2276,15 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2) SetGpuReg(REG_OFFSET_BG1VOFS, gBattle_BG1_Y); LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], animBg.paletteId * 16, 0x20); - CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + animBg.paletteId * 32), 0x20); + CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void *)(BG_PLTT + animBg.paletteId * 32), 0x20); CopyBattlerSpriteToBg(1, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles, animBg.bgTilemap, animBg.tilesOffset); } else { - RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(12)), 0x2000, DMA3_32BIT); - RequestDma3Fill(0, (void*)(BG_SCREEN_ADDR(30)), 0x1000, DMA3_32BIT); + RequestDma3Fill(0, (void *)(BG_SCREEN_ADDR(12)), 0x2000, DMA3_32BIT); + RequestDma3Fill(0, (void *)(BG_SCREEN_ADDR(30)), 0x1000, DMA3_32BIT); GetBattleAnimBgData(&animBg, 2); CpuFill16(0, animBg.bgTiles + 0x1000, 0x1000); CpuFill16(0, animBg.bgTilemap + 0x400, 0x800); @@ -2301,7 +2301,7 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2) SetGpuReg(REG_OFFSET_BG2VOFS, gBattle_BG2_Y); LoadPalette(&gPlttBufferUnfaded[0x100 + battlerId * 16], 0x90, 0x20); - CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void*)(BG_PLTT + 0x120), 0x20); + CpuCopy32(&gPlttBufferUnfaded[0x100 + battlerId * 16], (void *)(BG_PLTT + 0x120), 0x20); CopyBattlerSpriteToBg(2, 0, 0, GetBattlerPosition(battlerId), animBg.paletteId, animBg.bgTiles + 0x1000, animBg.bgTilemap + 0x400, animBg.tilesOffset); diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 99a50c3c1..2d1a6f3cf 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -4995,7 +4995,7 @@ void AnimTask_FadeScreenBlue(u8 taskId) gTasks[taskId].data[9] = 15; b = SelectBattlerSpritePalettes(1, 1, 1, 1); c = a | b; - StorePointerInVars(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void*)c); + StorePointerInVars(&gTasks[taskId].data[14], &gTasks[taskId].data[15], (void *)c); b = b | (0x10000 << IndexOfSpritePaletteTag(ANIM_TAG_MOON)); d = IndexOfSpritePaletteTag(ANIM_TAG_GREEN_SPARKLE); BeginNormalPaletteFade((0x10000 << d) | b, 0, 0, 16, RGB(27, 29, 31)); diff --git a/src/battle_bg.c b/src/battle_bg.c index 976781fee..df30a2dea 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -953,8 +953,8 @@ void DrawBattleEntryBackground(void) { if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - LZDecompressVram(gFile_graphics_battle_transitions_vs_frame_sheet, (void*)(BG_CHAR_ADDR(1))); - LZDecompressVram(gVsLettersGfx, (void*)(VRAM + 0x10000)); + LZDecompressVram(gFile_graphics_battle_transitions_vs_frame_sheet, (void *)(BG_CHAR_ADDR(1))); + LZDecompressVram(gVsLettersGfx, (void *)(VRAM + 0x10000)); LoadCompressedPalette(gFile_graphics_battle_transitions_vs_frame_palette, 0x60, 0x20); SetBgAttribute(1, BG_ATTR_SCREENSIZE, 1); SetGpuReg(REG_OFFSET_BG1CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(1) | BGCNT_16COLOR | BGCNT_SCREENBASE(28) | BGCNT_TXT512x256); diff --git a/src/battle_interface.c b/src/battle_interface.c index bf27ec734..43358e6a2 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -744,7 +744,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl) if (GetBattlerSide(gSprites[healthboxSpriteId].hMain_Battler) == B_SIDE_PLAYER) { - objVram = (void*)(OBJ_VRAM0); + objVram = (void *)(OBJ_VRAM0); if (!IsDoubleBattle()) objVram += spriteTileNum + 0x820; else @@ -752,7 +752,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl) } else { - objVram = (void*)(OBJ_VRAM0); + objVram = (void *)(OBJ_VRAM0); objVram += spriteTileNum + 0x400; } TextIntoHealthboxObject(objVram, windowTileData, 3); @@ -774,7 +774,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent) ConvertIntToDecimalStringN(text, value, STR_CONV_MODE_RIGHT_ALIGN, 3); windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 0, 5, &windowId); spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum; - TextIntoHealthboxObject( (void*)(OBJ_VRAM0) + spriteTileNum * TILE_SIZE_4BPP + 0xA40, windowTileData, 2); + TextIntoHealthboxObject( (void *)(OBJ_VRAM0) + spriteTileNum * TILE_SIZE_4BPP + 0xA40, windowTileData, 2); RemoveWindowOnHealthbox(windowId); } else // singles, current @@ -825,7 +825,7 @@ void UpdateHpTextInHealthbox(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent) for (i = 0; i < 3; i++) { CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[i * 64 + 32], - (void*)((OBJ_VRAM0) + TILE_SIZE_4BPP * (gSprites[healthboxSpriteId].oam.tileNum + var + i)), + (void *)((OBJ_VRAM0) + TILE_SIZE_4BPP * (gSprites[healthboxSpriteId].oam.tileNum + var + i)), 0x20); } } @@ -866,13 +866,13 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 if (i < 3) { CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[((i - var) * 64) + 32], - (void*)((OBJ_VRAM0) + 32 * (1 + gSprites[r7].oam.tileNum + i)), + (void *)((OBJ_VRAM0) + 32 * (1 + gSprites[r7].oam.tileNum + i)), 0x20); } else { CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[((i - var) * 64) + 32], - (void*)((OBJ_VRAM0 + 0x20) + 32 * (i + gSprites[r7].oam.tileNum)), + (void *)((OBJ_VRAM0 + 0x20) + 32 * (i + gSprites[r7].oam.tileNum)), 0x20); } } @@ -880,16 +880,16 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 if (maxOrCurrent == HP_CURRENT) { CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[224], - (void*)((OBJ_VRAM0) + ((gSprites[r7].oam.tileNum + 4) * TILE_SIZE_4BPP)), + (void *)((OBJ_VRAM0) + ((gSprites[r7].oam.tileNum + 4) * TILE_SIZE_4BPP)), 0x20); - CpuFill32(0, (void*)((OBJ_VRAM0) + (gSprites[r7].oam.tileNum * TILE_SIZE_4BPP)), 0x20); + CpuFill32(0, (void *)((OBJ_VRAM0) + (gSprites[r7].oam.tileNum * TILE_SIZE_4BPP)), 0x20); } else { if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) // Impossible to reach part, because the battlerId is from the opponent's side. { CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_116), - (void*)(OBJ_VRAM0) + ((gSprites[healthboxSpriteId].oam.tileNum + 52) * TILE_SIZE_4BPP), + (void *)(OBJ_VRAM0) + ((gSprites[healthboxSpriteId].oam.tileNum + 52) * TILE_SIZE_4BPP), 0x20); } } @@ -927,11 +927,11 @@ static void PrintSafariMonInfo(u8 healthboxSpriteId, struct Pokemon *mon) for (j = 1; j < var + 1; j++) { spriteTileNum = (gSprites[healthboxSpriteId].oam.tileNum + (j - (j / 8 * 8)) + (j / 8 * 64)) * TILE_SIZE_4BPP; - CpuCopy32(barFontGfx, (void*)(OBJ_VRAM0) + (spriteTileNum), 0x20); + CpuCopy32(barFontGfx, (void *)(OBJ_VRAM0) + (spriteTileNum), 0x20); barFontGfx += 0x20; spriteTileNum = (8 + gSprites[healthboxSpriteId].oam.tileNum + (j - (j / 8 * 8)) + (j / 8 * 64)) * TILE_SIZE_4BPP; - CpuCopy32(barFontGfx, (void*)(OBJ_VRAM0) + (spriteTileNum), 0x20); + CpuCopy32(barFontGfx, (void *)(OBJ_VRAM0) + (spriteTileNum), 0x20); barFontGfx += 0x20; } @@ -948,13 +948,13 @@ static void PrintSafariMonInfo(u8 healthboxSpriteId, struct Pokemon *mon) if (j <= 1) { CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[0x40 * j + 0x20], - (void*)(OBJ_VRAM0) + (gSprites[healthBarSpriteId].oam.tileNum + 2 + j) * TILE_SIZE_4BPP, + (void *)(OBJ_VRAM0) + (gSprites[healthBarSpriteId].oam.tileNum + 2 + j) * TILE_SIZE_4BPP, 32); } else { CpuCopy32(&gMonSpritesGfxPtr->barFontGfx[0x40 * j + 0x20], - (void*)(OBJ_VRAM0 + 0xC0) + (j + gSprites[healthBarSpriteId].oam.tileNum) * TILE_SIZE_4BPP, + (void *)(OBJ_VRAM0 + 0xC0) + (j + gSprites[healthBarSpriteId].oam.tileNum) * TILE_SIZE_4BPP, 32); } } @@ -986,7 +986,7 @@ void SwapHpBarsWithHpText(void) { healthBarSpriteId = gSprites[gHealthboxSpriteIds[i]].hMain_HealthBarSpriteId; - CpuFill32(0, (void*)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * TILE_SIZE_4BPP), 0x100); + CpuFill32(0, (void *)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * TILE_SIZE_4BPP), 0x100); UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_HP), HP_CURRENT); UpdateHpTextInHealthboxInDoubles(gHealthboxSpriteIds[i], GetMonData(&gPlayerParty[gBattlerPartyIndexes[i]], MON_DATA_MAX_HP), HP_MAX); } @@ -994,7 +994,7 @@ void SwapHpBarsWithHpText(void) { UpdateStatusIconInHealthbox(gHealthboxSpriteIds[i]); UpdateHealthboxAttribute(gHealthboxSpriteIds[i], &gPlayerParty[gBattlerPartyIndexes[i]], HEALTHBOX_HEALTH_BAR); - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_117), (void*)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * TILE_SIZE_4BPP), 32); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_117), (void *)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * TILE_SIZE_4BPP), 32); } } else @@ -1507,8 +1507,8 @@ void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon) if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER) { - TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x40 + spriteTileNum), windowTileData, 6); - ptr = (void*)(OBJ_VRAM0); + TextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x40 + spriteTileNum), windowTileData, 6); + ptr = (void *)(OBJ_VRAM0); if (!IsDoubleBattle()) ptr += spriteTileNum + 0x800; else @@ -1517,7 +1517,7 @@ void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon) } else { - TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x20 + spriteTileNum), windowTileData, 7); + TextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x20 + spriteTileNum), windowTileData, 7); } RemoveWindowOnHealthbox(windowId); @@ -1543,9 +1543,9 @@ void TryAddPokeballIconToHealthbox(u8 healthboxSpriteId, bool8 noStatus) healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; if (noStatus) - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_70), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_70), (void *)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32); else - CpuFill32(0, (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32); + CpuFill32(0, (void *)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32); } enum @@ -1620,7 +1620,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) statusGfxPtr = GetHealthboxElementGfxPtr(HEALTHBOX_GFX_39); for (i = 0; i < 3; i++) - CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder + i) * TILE_SIZE_4BPP), 32); + CpuCopy32(statusGfxPtr, (void *)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder + i) * TILE_SIZE_4BPP), 32); if (!gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars) CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_1), (void *)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * TILE_SIZE_4BPP), 64); @@ -1633,14 +1633,14 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) pltAdder += battlerId + 12; FillPalette(sStatusIconColors[statusPalId], pltAdder + 0x100, 2); - CpuCopy16(gPlttBufferUnfaded + 0x100 + pltAdder, (void*)(OBJ_PLTT + pltAdder * 2), 2); - CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * TILE_SIZE_4BPP), 96); + CpuCopy16(gPlttBufferUnfaded + 0x100 + pltAdder, (void *)(OBJ_PLTT + pltAdder * 2), 2); + CpuCopy32(statusGfxPtr, (void *)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * TILE_SIZE_4BPP), 96); if (IsDoubleBattle() == TRUE || GetBattlerSide(battlerId) == B_SIDE_OPPONENT) { if (!gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars) { - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_0), (void*)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * TILE_SIZE_4BPP), 32); - CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_65), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 1) * TILE_SIZE_4BPP), 32); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_0), (void *)(OBJ_VRAM0 + gSprites[healthBarSpriteId].oam.tileNum * TILE_SIZE_4BPP), 32); + CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_65), (void *)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 1) * TILE_SIZE_4BPP), 32); } } TryAddPokeballIconToHealthbox(healthboxSpriteId, FALSE); @@ -1713,8 +1713,8 @@ static void UpdateSafariBallsTextOnHealthbox(u8 healthboxSpriteId) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(gText_SafariBalls, 0, 3, &windowId); spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP; - TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x40) + spriteTileNum, windowTileData, 6); - TextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x800) + spriteTileNum, windowTileData + 0xC0, 2); + TextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x40) + spriteTileNum, windowTileData, 6); + TextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x800) + spriteTileNum, windowTileData + 0xC0, 2); RemoveWindowOnHealthbox(windowId); } @@ -1730,8 +1730,8 @@ static void UpdateLeftNoOfBallsTextOnHealthbox(u8 healthboxSpriteId) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, GetStringRightAlignXOffset(0, text, 0x2F), 3, &windowId); spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP; - SafariTextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0x2C0) + spriteTileNum, windowTileData, 2); - SafariTextIntoHealthboxObject((void*)(OBJ_VRAM0 + 0xA00) + spriteTileNum, windowTileData + 0x40, 4); + SafariTextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x2C0) + spriteTileNum, windowTileData, 2); + SafariTextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0xA00) + spriteTileNum, windowTileData + 0x40, 4); RemoveWindowOnHealthbox(windowId); } @@ -1875,10 +1875,10 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar) u8 healthbarSpriteId = gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].hMain_HealthBarSpriteId; if (i < 2) CpuCopy32(GetHealthboxElementGfxPtr(barElementId) + array[i] * 32, - (void*)(OBJ_VRAM0 + (gSprites[healthbarSpriteId].oam.tileNum + 2 + i) * TILE_SIZE_4BPP), 32); + (void *)(OBJ_VRAM0 + (gSprites[healthbarSpriteId].oam.tileNum + 2 + i) * TILE_SIZE_4BPP), 32); else CpuCopy32(GetHealthboxElementGfxPtr(barElementId) + array[i] * 32, - (void*)(OBJ_VRAM0 + 64 + (i + gSprites[healthbarSpriteId].oam.tileNum) * TILE_SIZE_4BPP), 32); + (void *)(OBJ_VRAM0 + 64 + (i + gSprites[healthbarSpriteId].oam.tileNum) * TILE_SIZE_4BPP), 32); } break; case EXP_BAR: @@ -1897,10 +1897,10 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar) { if (i < 4) CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_12) + array[i] * 32, - (void*)(OBJ_VRAM0 + (gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].oam.tileNum + 0x24 + i) * TILE_SIZE_4BPP), 32); + (void *)(OBJ_VRAM0 + (gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].oam.tileNum + 0x24 + i) * TILE_SIZE_4BPP), 32); else CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_12) + array[i] * 32, - (void*)(OBJ_VRAM0 + 0xB80 + (i + gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].oam.tileNum) * TILE_SIZE_4BPP), 32); + (void *)(OBJ_VRAM0 + 0xB80 + (i + gSprites[gBattleSpritesDataPtr->battleBars[battlerId].healthboxSpriteId].oam.tileNum) * TILE_SIZE_4BPP), 32); } break; } diff --git a/src/battle_message.c b/src/battle_message.c index cb12b532a..52f0d2e27 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1466,7 +1466,7 @@ void BufferStringBattle(u16 stringId) s32 i; const u8 *stringPtr = NULL; - sBattleMsgDataPtr = (struct BattleMsgData*)(&gBattleBufferA[gActiveBattler][4]); + sBattleMsgDataPtr = (struct BattleMsgData *)(&gBattleBufferA[gActiveBattler][4]); gLastUsedItem = sBattleMsgDataPtr->lastItem; gLastUsedAbility = sBattleMsgDataPtr->lastAbility; gBattleScripting.battler = sBattleMsgDataPtr->scrActive; @@ -2470,7 +2470,7 @@ bool8 BattleStringShouldBeColored(u16 stringId) void SetPpNumbersPaletteInMoveSelection(void) { - struct ChooseMoveStruct *chooseMoveStruct = (struct ChooseMoveStruct*)(&gBattleBufferA[gActiveBattler][4]); + struct ChooseMoveStruct *chooseMoveStruct = (struct ChooseMoveStruct *)(&gBattleBufferA[gActiveBattler][4]); const u16 *palPtr = gUnknown_8D2FBB4; u8 var = GetCurrentPpToMaxPpState(chooseMoveStruct->currentPp[gMoveSelectionCursor[gActiveBattler]], chooseMoveStruct->maxPp[gMoveSelectionCursor[gActiveBattler]]); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a0355805c..3690bfe9c 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5401,7 +5401,7 @@ static void Cmd_updatebattlermoves(void) if (gBattleControllerExecFlags == 0) { s32 i; - struct BattlePokemon *bufferPoke = (struct BattlePokemon*) &gBattleBufferB[gActiveBattler][4]; + struct BattlePokemon *bufferPoke = (struct BattlePokemon *) &gBattleBufferB[gActiveBattler][4]; for (i = 0; i < MAX_MON_MOVES; i++) { gBattleMons[gActiveBattler].moves[i] = bufferPoke->moves[i]; @@ -7675,7 +7675,7 @@ static void Cmd_painsplitdmgcalc(void) { s32 hpDiff = (gBattleMons[gBattlerAttacker].hp + gBattleMons[gBattlerTarget].hp) / 2; s32 painSplitHp = gBattleMoveDamage = gBattleMons[gBattlerTarget].hp - hpDiff; - u8 *storeLoc = (void*)(&gBattleScripting.painSplitHp); + u8 *storeLoc = (void *)(&gBattleScripting.painSplitHp); storeLoc[0] = (painSplitHp); storeLoc[1] = (painSplitHp & 0x0000FF00) >> 8; diff --git a/src/bg.c b/src/bg.c index e6ede6e76..287569fa6 100644 --- a/src/bg.c +++ b/src/bg.c @@ -33,7 +33,7 @@ struct BgConfig2 u32 basePalette:4; u32 unk_3:18; - void* tilemap; + void *tilemap; u32 bg_x; u32 bg_y; }; @@ -181,7 +181,7 @@ u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode) offset = destOffset + offset; - cursor = RequestDma3Copy(src, (void*)(offset + BG_VRAM), size, DMA3_16BIT); + cursor = RequestDma3Copy(src, (void *)(offset + BG_VRAM), size, DMA3_16BIT); if (cursor == -1) { @@ -418,7 +418,7 @@ void InitBgFromTemplate(const struct BgTemplate *template) } } -u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset) +u16 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset) { u16 tileOffset; u8 cursor; @@ -473,7 +473,7 @@ u16 Unused_LoadBgPalette(u8 bg, const void *src, u16 size, u16 destOffset) if (IsInvalidBg32(bg) == FALSE) { paletteOffset = (sGpuBgConfigs2[bg].basePalette * 0x20) + (destOffset * 2); - cursor = RequestDma3Copy(src, (void*)(paletteOffset + BG_PLTT), size, DMA3_16BIT); + cursor = RequestDma3Copy(src, (void *)(paletteOffset + BG_PLTT), size, DMA3_16BIT); if (cursor == -1) { @@ -820,7 +820,7 @@ void UnsetBgTilemapBuffer(u8 bg) } } -void* GetBgTilemapBuffer(u8 bg) +void *GetBgTilemapBuffer(u8 bg) { if (IsInvalidBg32(bg) != FALSE) return NULL; @@ -866,7 +866,7 @@ void CopyBgTilemapBufferToVram(u8 bg) } } -void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height) +void CopyToBgTilemapBufferRect(u8 bg, const void *src, u8 destX, u8 destY, u8 width, u8 height) { u16 destX16; u16 destY16; @@ -1207,7 +1207,7 @@ bool32 IsInvalidBg32(u8 bg) bool32 IsTileMapOutsideWram(u8 bg) { - if (sGpuBgConfigs2[bg].tilemap > (void*)IWRAM_END) + if (sGpuBgConfigs2[bg].tilemap > (void *)IWRAM_END) return TRUE; if (sGpuBgConfigs2[bg].tilemap == 0x0) return TRUE; diff --git a/src/cable_club.c b/src/cable_club.c index da1bfffcb..fabbaf00a 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -316,7 +316,7 @@ static void Task_LinkupSlave_2(u8 taskId) gFieldLinkPlayerCount = GetLinkPlayerCount_2(); gLocalLinkPlayerId = GetMultiplayerId(); sub_800A900(gFieldLinkPlayerCount); - TrainerCard_GenerateCardForLinkPlayer((void*)gBlockSendBuffer); + TrainerCard_GenerateCardForLinkPlayer((void *)gBlockSendBuffer); gTasks[taskId].func = Task_Linkup_6a; } } @@ -367,7 +367,7 @@ static void Task_LinkupMaster_6(u8 taskId) gFieldLinkPlayerCount = GetLinkPlayerCount_2(); gLocalLinkPlayerId = GetMultiplayerId(); sub_800A900(gFieldLinkPlayerCount); - TrainerCard_GenerateCardForLinkPlayer((void*)gBlockSendBuffer); + TrainerCard_GenerateCardForLinkPlayer((void *)gBlockSendBuffer); gTasks[taskId].func = Task_Linkup_6a; Link_PrepareCmd0xCCCC_Rfu0xA100(2); } diff --git a/src/decompress.c b/src/decompress.c index f12d0b6a3..ea61482d0 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -45,7 +45,7 @@ void LoadCompressedSpritePalette(const struct CompressedSpritePalette *src) struct SpritePalette dest; LZ77UnCompWram(src->data, gDecompressionBuffer); - dest.data = (void*) gDecompressionBuffer; + dest.data = (void *) gDecompressionBuffer; dest.tag = src->tag; LoadSpritePalette(&dest); } @@ -60,7 +60,7 @@ void LoadCompressedSpritePaletteOverrideBuffer(const struct CompressedSpritePale LoadSpritePalette(&dest); } -void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void* buffer, s32 species) +void DecompressPicFromTable(const struct CompressedSpriteSheet *src, void *buffer, s32 species) { if (species > NUM_SPECIES) LZ77UnCompWram(gMonFrontPicTable[0].data, buffer); @@ -263,7 +263,7 @@ static void sub_800EDDC(s32 object_size, s32 object_count, u8 *src_tiles, u8 *de bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet* src) { struct SpriteSheet dest; - void* buffer; + void *buffer; buffer = AllocZeroed(*((u32 *)src->data) >> 8); if (!buffer) @@ -280,7 +280,7 @@ bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet* src bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette *src) { struct SpritePalette dest; - void* buffer; + void *buffer; buffer = AllocZeroed(*((u32 *)src->data) >> 8); if (!buffer) @@ -305,7 +305,7 @@ u32 GetDecompressedDataSize(const u8 *ptr) return ptr32[0]; } -void DecompressPicFromTable_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void* buffer, s32 species) +void DecompressPicFromTable_DontHandleDeoxys(const struct CompressedSpriteSheet *src, void *buffer, s32 species) { if (species > NUM_SPECIES) LZ77UnCompWram(gMonFrontPicTable[0].data, buffer); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 758ea6cd5..23b39c807 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -32,32 +32,32 @@ static bool8 IsMetatileDirectionallyImpassable(struct ObjectEvent *, s16, s16, u static bool8 DoesObjectCollideWithObjectAt(struct ObjectEvent *, s16, s16); static void CalcWhetherObjectIsOffscreen(struct ObjectEvent *, struct Sprite *); static void UpdateObjEventSpriteVisibility(struct ObjectEvent *, struct Sprite *); -static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent*); -static void GetGroundEffectFlags_Reflection(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_SandHeap(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_HotSprings(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_Tracks(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_Puddle(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_Ripple(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_Seaweed(struct ObjectEvent*, u32 *); -static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent*, u32 *); -static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent*); +static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent *); +static void GetGroundEffectFlags_Reflection(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_LongGrassOnSpawn(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_SandHeap(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_ShallowFlowingWater(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_ShortGrass(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_HotSprings(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_LongGrassOnBeginStep(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Tracks(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Puddle(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Ripple(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_Seaweed(struct ObjectEvent *, u32 *); +static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *, u32 *); +static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent *); static u8 GetReflectionTypeByMetatileBehavior(u32); static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z); -static void ObjectEventUpdateSubpriority(struct ObjectEvent*, struct Sprite*); -static void DoTracksGroundEffect_None(struct ObjectEvent*, struct Sprite*, u8); -static void DoTracksGroundEffect_Footprints(struct ObjectEvent*, struct Sprite*, u8); -static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent*, struct Sprite*, u8); -static void DoRippleFieldEffect(struct ObjectEvent*, struct Sprite*); -static void DoGroundEffects_OnSpawn(struct ObjectEvent*, struct Sprite*); -static void DoGroundEffects_OnBeginStep(struct ObjectEvent*, struct Sprite*); -static void DoGroundEffects_OnFinishStep(struct ObjectEvent*, struct Sprite*); +static void ObjectEventUpdateSubpriority(struct ObjectEvent *, struct Sprite *); +static void DoTracksGroundEffect_None(struct ObjectEvent *, struct Sprite *, u8); +static void DoTracksGroundEffect_Footprints(struct ObjectEvent *, struct Sprite *, u8); +static void DoTracksGroundEffect_BikeTireTracks(struct ObjectEvent *, struct Sprite *, u8); +static void DoRippleFieldEffect(struct ObjectEvent *, struct Sprite *); +static void DoGroundEffects_OnSpawn(struct ObjectEvent *, struct Sprite *); +static void DoGroundEffects_OnBeginStep(struct ObjectEvent *, struct Sprite *); +static void DoGroundEffects_OnFinishStep(struct ObjectEvent *, struct Sprite *); static void CreateReflectionEffectSprites(void); static u8 GetObjectEventIdByLocalId(u8); static u8 GetObjectEventIdByLocalIdAndMapInternal(u8, u8, u8); diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 9a02b091f..3cffa68e4 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -218,7 +218,7 @@ void EvolutionScene(struct Pokemon* mon, u16 postEvoSpecies, bool8 canStopEvo, u SetHBlankCallback(NULL); SetVBlankCallback(NULL); - CpuFill32(0, (void*)(VRAM), VRAM_SIZE); + CpuFill32(0, (void *)(VRAM), VRAM_SIZE); SetGpuReg(REG_OFFSET_MOSAIC, 0); SetGpuReg(REG_OFFSET_WIN0H, 0); @@ -325,7 +325,7 @@ static void CB2_EvolutionSceneLoadGraphics(void) SetHBlankCallback(NULL); SetVBlankCallback(NULL); - CpuFill32(0, (void*)(VRAM), VRAM_SIZE); + CpuFill32(0, (void *)(VRAM), VRAM_SIZE); SetGpuReg(REG_OFFSET_MOSAIC, 0); SetGpuReg(REG_OFFSET_WIN0H, 0); @@ -777,7 +777,7 @@ static void Task_EvolutionScene(u8 taskId) BattlePutTextOnWindow(gStringVar4, (B_WIN_MSG | B_TEXT_FLAG_NONE)); PlayBGM(MUS_EVOLVED); gTasks[taskId].tState++; - SetMonData(mon, MON_DATA_SPECIES, (void*)(&gTasks[taskId].tPostEvoSpecies)); + SetMonData(mon, MON_DATA_SPECIES, (void *)(&gTasks[taskId].tPostEvoSpecies)); CalculateMonStats(mon); EvolutionRenameMon(mon, gTasks[taskId].tPreEvoSpecies, gTasks[taskId].tPostEvoSpecies); GetSetPokedexFlag(SpeciesToNationalPokedexNum(gTasks[taskId].tPostEvoSpecies), FLAG_SET_SEEN); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 3b7f6708c..75658a28e 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -440,8 +440,8 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) } if (i >= HALL_OF_FAME_MAX_TEAMS) { - struct HallofFameTeam *afterTeam = (struct HallofFameTeam*)(gDecompressionBuffer); - struct HallofFameTeam *beforeTeam = (struct HallofFameTeam*)(gDecompressionBuffer); + struct HallofFameTeam *afterTeam = (struct HallofFameTeam *)(gDecompressionBuffer); + struct HallofFameTeam *beforeTeam = (struct HallofFameTeam *)(gDecompressionBuffer); afterTeam++; for (i = 0; i < HALL_OF_FAME_MAX_TEAMS - 1; i++, beforeTeam++, afterTeam++) { diff --git a/src/load_save.c b/src/load_save.c index 09e282e2c..49c2cec88 100644 --- a/src/load_save.c +++ b/src/load_save.c @@ -72,9 +72,9 @@ void SetSaveBlocksPointers(void) offset = (Random()) & ((SAVEBLOCK_MOVE_RANGE - 1) & ~3); - gSaveBlock2Ptr = (void*)(&gSaveBlock2) + offset; - *sav1_LocalVar = (void*)(&gSaveBlock1) + offset; - gPokemonStoragePtr = (void*)(&gPokemonStorage) + offset; + gSaveBlock2Ptr = (void *)(&gSaveBlock2) + offset; + *sav1_LocalVar = (void *)(&gSaveBlock1) + offset; + gPokemonStoragePtr = (void *)(&gPokemonStorage) + offset; SetBagPocketsPointers(); SetQuestLogRecordAndPlaybackPointers(oldSave); diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 11d26f204..9a534dd4b 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -149,9 +149,9 @@ void SetVBlankHBlankCallbacksToNull(void) void ResetVramOamAndBgCntRegs(void) { ResetAllBgsCoordinatesAndBgCntRegs(); - CpuFill16(0, (void*) VRAM, VRAM_SIZE); - CpuFill32(0, (void*) OAM, OAM_SIZE); - CpuFill16(0, (void*) PLTT, PLTT_SIZE); + CpuFill16(0, (void *) VRAM, VRAM_SIZE); + CpuFill32(0, (void *) OAM, OAM_SIZE); + CpuFill16(0, (void *) PLTT, PLTT_SIZE); } void ResetAllBgsCoordinatesAndBgCntRegs(void) diff --git a/src/pokeball.c b/src/pokeball.c index 4a55756c3..fec1866cc 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -668,7 +668,7 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) u8 state2 = gTasks[taskId].data[2]; s8 pan = gTasks[taskId].tCryTaskPan; u16 species = gTasks[taskId].tCryTaskSpecies; - struct Pokemon *mon = (void*)(u32)((u32)(gTasks[taskId].tCryTaskMonPtr1 << 0x10) | ((u16)gTasks[taskId].tCryTaskMonPtr2)); + struct Pokemon *mon = (void *)(u32)((u32)(gTasks[taskId].tCryTaskMonPtr1 << 0x10) | ((u16)gTasks[taskId].tCryTaskMonPtr2)); switch (gTasks[taskId].tCryTaskState) { diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index d7223749e..780a59698 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -890,9 +890,9 @@ void DexScreen_LoadResources(void) SetBgTilemapBuffer(1, (u16 *)Alloc(BG_SCREEN_SIZE)); SetBgTilemapBuffer(0, (u16 *)Alloc(BG_SCREEN_SIZE)); if (natDex) - DecompressAndLoadBgGfxUsingHeap(3, (void*)sNatDexTiles, BG_SCREEN_SIZE, 0, 0); + DecompressAndLoadBgGfxUsingHeap(3, (void *)sNatDexTiles, BG_SCREEN_SIZE, 0, 0); else - DecompressAndLoadBgGfxUsingHeap(3, (void*)sKantoDexTiles, BG_SCREEN_SIZE, 0, 0); + DecompressAndLoadBgGfxUsingHeap(3, (void *)sKantoDexTiles, BG_SCREEN_SIZE, 0, 0); InitWindows(sWindowTemplates); DeactivateAllTextPrinters(); m4aSoundVSyncOn(); diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 467346bac..4a1b99ece 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -921,7 +921,7 @@ static u16 sub_80911D4(u16 species) gPSSData->field_B58[i] = species; gPSSData->field_B08[i]++; var = 16 * i; - CpuCopy32(GetMonIconTiles(species, TRUE), (void*)(OBJ_VRAM0) + var * 32, 0x200); + CpuCopy32(GetMonIconTiles(species, TRUE), (void *)(OBJ_VRAM0) + var * 32, 0x200); return var; } diff --git a/src/pokemon_storage_system_6.c b/src/pokemon_storage_system_6.c index a1d3af8f2..9f40adc06 100644 --- a/src/pokemon_storage_system_6.c +++ b/src/pokemon_storage_system_6.c @@ -90,7 +90,7 @@ void AddMenu(void) gPSSData->field_CB0 = AddWindow(&gPSSData->menuWindow); ClearWindowTilemap(gPSSData->field_CB0); DrawStdFrameWithCustomTileAndPalette(gPSSData->field_CB0, FALSE, 0x00b, 14); - PrintTextArray(gPSSData->field_CB0, 1, 8, 2, 16, gPSSData->menuItemsCount, (void*)gPSSData->menuItems); + PrintTextArray(gPSSData->field_CB0, 1, 8, 2, 16, gPSSData->menuItemsCount, (void *)gPSSData->menuItems); Menu_InitCursor(gPSSData->field_CB0, 1, 0, 2, 16, gPSSData->menuItemsCount, 0); ScheduleBgCopyTilemapToVram(0); gPSSData->field_CAE = 0; diff --git a/src/pokemon_storage_system_8.c b/src/pokemon_storage_system_8.c index 27594e6ff..52c172505 100644 --- a/src/pokemon_storage_system_8.c +++ b/src/pokemon_storage_system_8.c @@ -126,7 +126,7 @@ void sub_8095B5C(void) { spriteSheet.tag = TAG_TILE_7 + i; LoadCompressedSpriteSheet(&spriteSheet); - gPSSData->itemIconSprites[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * 32 + (void*)(OBJ_VRAM0); + gPSSData->itemIconSprites[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * 32 + (void *)(OBJ_VRAM0); gPSSData->itemIconSprites[i].palIndex = AllocSpritePalette(TAG_PAL_DACB + i); gPSSData->itemIconSprites[i].palIndex *= 16; gPSSData->itemIconSprites[i].palIndex += 0x100; diff --git a/src/save.c b/src/save.c index 16efea88c..33ea7ccfd 100644 --- a/src/save.c +++ b/src/save.c @@ -621,18 +621,18 @@ void UpdateSaveAddresses(void) { int i = 0; - gRamSaveSectionLocations[i].data = (void*)(gSaveBlock2Ptr) + gSaveSectionOffsets[i].toAdd; + gRamSaveSectionLocations[i].data = (void *)(gSaveBlock2Ptr) + gSaveSectionOffsets[i].toAdd; gRamSaveSectionLocations[i].size = gSaveSectionOffsets[i].size; for (i = 1; i < 5; i++) { - gRamSaveSectionLocations[i].data = (void*)(gSaveBlock1Ptr) + gSaveSectionOffsets[i].toAdd; + gRamSaveSectionLocations[i].data = (void *)(gSaveBlock1Ptr) + gSaveSectionOffsets[i].toAdd; gRamSaveSectionLocations[i].size = gSaveSectionOffsets[i].size; } for (i = 5; i < 14; i++) { - gRamSaveSectionLocations[i].data = (void*)(gPokemonStoragePtr) + gSaveSectionOffsets[i].toAdd; + gRamSaveSectionLocations[i].data = (void *)(gPokemonStoragePtr) + gSaveSectionOffsets[i].toAdd; gRamSaveSectionLocations[i].size = gSaveSectionOffsets[i].size; i++;i--; // needed to match @@ -826,7 +826,7 @@ u32 TryWriteSpecialSaveSection(u8 sector, u8 *src) s32 i; s32 size; u8 *savData; - void* savDataBuffer; + void *savDataBuffer; if (sector != SECTOR_TTOWER(0) && sector != SECTOR_TTOWER(1)) return 0xFF; diff --git a/src/shop.c b/src/shop.c index 802ec7c45..f9c190a49 100644 --- a/src/shop.c +++ b/src/shop.c @@ -473,7 +473,7 @@ static void BuyMenuInitBgs(void) static void BuyMenuDecompressBgGraphics(void) { - void* pal; + void *pal; DecompressAndCopyTileDataToVram(1, gBuyMenuFrame_Gfx, 0x480, 0x3DC, 0); if ((gShopData.martType) != MART_TYPE_TMHM) diff --git a/src/union_room.c b/src/union_room.c index ebed07124..0477cc9fd 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -726,7 +726,7 @@ void TryBecomeLinkLeader(void) struct UnkStruct_Leader * dataPtr; taskId = CreateTask(Task_TryBecomeLinkLeader, 0); - sUnionRoomMain.leader = dataPtr = (void*)(gTasks[taskId].data); + sUnionRoomMain.leader = dataPtr = (void *)(gTasks[taskId].data); sLeader = dataPtr; dataPtr->state = 0; @@ -1273,7 +1273,7 @@ void TryJoinLinkGroup(void) struct UnkStruct_Group * dataPtr; taskId = CreateTask(Task_TryJoinLinkGroup, 0); - sUnionRoomMain.group = dataPtr = (void*)(gTasks[taskId].data); + sUnionRoomMain.group = dataPtr = (void *)(gTasks[taskId].data); sGroup = dataPtr; dataPtr->state = 0; @@ -1570,7 +1570,7 @@ u8 CreateTask_ListenToWireless(void) struct UnkStruct_Group * dataPtr; taskId = CreateTask(Task_ListenToWireless, 0); - sUnionRoomMain.group = dataPtr = (void*)(gTasks[taskId].data); + sUnionRoomMain.group = dataPtr = (void *)(gTasks[taskId].data); dataPtr->state = 0; dataPtr->textState = 0; @@ -1761,7 +1761,7 @@ static void Task_StartUnionRoomTrade(u8 taskId) case 1: if (GetBlockReceivedStatus() == 3) { - gEnemyParty[0] = *(struct Pokemon*)(gBlockRecvBuffer[GetMultiplayerId() ^ 1]); + gEnemyParty[0] = *(struct Pokemon *)(gBlockRecvBuffer[GetMultiplayerId() ^ 1]); IncrementGameStat(GAME_STAT_NUM_UNION_ROOM_BATTLES); ResetBlockReceivedFlags(); gTasks[taskId].data[0]++; @@ -2059,7 +2059,7 @@ void MEvent_CreateTask_Leader(u32 activity) struct UnkStruct_Leader * dataPtr; taskId = CreateTask(Task_MEvent_Leader, 0); - sUnionRoomMain.leader = dataPtr = (void*)(gTasks[taskId].data); + sUnionRoomMain.leader = dataPtr = (void *)(gTasks[taskId].data); dataPtr->state = 0; dataPtr->textState = 0; @@ -2268,7 +2268,7 @@ void MEvent_CreateTask_CardOrNewsWithFriend(u32 activity) struct UnkStruct_Group * dataPtr; taskId = CreateTask(Task_CardOrNewsWithFriend, 0); - sUnionRoomMain.group = dataPtr = (void*)(gTasks[taskId].data); + sUnionRoomMain.group = dataPtr = (void *)(gTasks[taskId].data); sGroup = dataPtr; dataPtr->state = 0; @@ -2434,7 +2434,7 @@ void MEvent_CreateTask_CardOrNewsOverWireless(u32 activity) struct UnkStruct_Group * dataPtr; taskId = CreateTask(Task_CardOrNewsOverWireless, 0); - sUnionRoomMain.group = dataPtr = (void*)(gTasks[taskId].data); + sUnionRoomMain.group = dataPtr = (void *)(gTasks[taskId].data); sGroup = dataPtr; dataPtr->state = 0; @@ -3652,7 +3652,7 @@ static void Task_SearchForChildOrParent(u8 taskId) { s32 i, j; struct UnionGnameUnamePair gname_uname; - struct UnkStruct_Main4 ** ptr = (void*) gTasks[taskId].data; + struct UnkStruct_Main4 ** ptr = (void *) gTasks[taskId].data; bool8 parent_child; for (i = 0; i < RFU_CHILD_MAX; i++) @@ -3699,7 +3699,7 @@ static u8 CreateTask_SearchForChildOrParent(struct UnkStruct_Main4 * main4_paren static void Task_ListenForPartnersWithCompatibleSerialNos(u8 taskId) { s32 i, j; - struct UnkStruct_Main4 ** ptr = (void*) gTasks[taskId].data; + struct UnkStruct_Main4 ** ptr = (void *) gTasks[taskId].data; for (i = 0; i < RFU_CHILD_MAX; i++) { @@ -3752,7 +3752,7 @@ static bool32 GetGnameWonderFlagByLinkGroup(struct GFtgtGname * gname, s16 linkG static void Task_ListenForPartnersWithSerial7F7D(u8 taskId) { s32 i; - struct UnkStruct_Main4 ** ptr = (void*) gTasks[taskId].data; + struct UnkStruct_Main4 ** ptr = (void *) gTasks[taskId].data; for (i = 0; i < RFU_CHILD_MAX; i++) { @@ -3767,7 +3767,7 @@ static void Task_ListenForPartnersWithSerial7F7D(u8 taskId) static u8 CreateTask_ListenForPartnersWithCompatibleSerialNos(struct UnkStruct_Main4 * main4, u32 linkGroup) { u8 taskId = CreateTask(Task_ListenForPartnersWithCompatibleSerialNos, 0); - struct UnkStruct_Main4 ** ptr = (void*) gTasks[taskId].data; + struct UnkStruct_Main4 ** ptr = (void *) gTasks[taskId].data; ptr[0] = main4; gTasks[taskId].data[2] = linkGroup; return taskId; @@ -3776,7 +3776,7 @@ static u8 CreateTask_ListenForPartnersWithCompatibleSerialNos(struct UnkStruct_M static u8 CreateTask_ListenForPartnersWithSerial7F7D(struct UnkStruct_Main4 * main4, u32 linkGroup) { u8 taskId = CreateTask(Task_ListenForPartnersWithSerial7F7D, 0); - struct UnkStruct_Main4 ** ptr = (void*) gTasks[taskId].data; + struct UnkStruct_Main4 ** ptr = (void *) gTasks[taskId].data; ptr[0] = main4; gTasks[taskId].data[2] = linkGroup; return taskId; diff --git a/src/water.c b/src/water.c index 0b4098c92..75ea6c7fa 100644 --- a/src/water.c +++ b/src/water.c @@ -49,11 +49,11 @@ static void AnimTask_SurfWaveScanlineEffect(u8); static void AnimTask_WaterSpoutLaunch_Step(u8); static void AnimTask_WaterSpoutRain_Step(u8); static u8 GetWaterSpoutPowerForAnim(void); -static void CreateWaterSpoutLaunchDroplets(struct Task*, u8); -static void CreateWaterSpoutRainDroplet(struct Task*, u8); +static void CreateWaterSpoutLaunchDroplets(struct Task *, u8); +static void CreateWaterSpoutRainDroplet(struct Task *, u8); static void AnimTask_WaterSport_Step(u8); -static void CreateWaterSportDroplet(struct Task*); -static void CreateWaterPulseRingBubbles(struct Sprite*, s32, s32); +static void CreateWaterSportDroplet(struct Task *); +static void CreateWaterPulseRingBubbles(struct Sprite *, s32, s32); // Both unused? Comment copied from pokeemerald static const u8 gUnknown_83E44F4[] = INCBIN_U8("graphics/battle_anims/unk_83E44F4.4bpp"); From c97e88b437fbb881a30dcfbda2d53703bd5035a8 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 16:57:13 -0400 Subject: [PATCH 43/64] Review changes --- include/battle_controllers.h | 2 +- include/constants/battle.h | 14 --- include/trade_scene.h | 2 +- src/battle_bg.c | 62 +++++++------- src/battle_controller_link_opponent.c | 2 +- src/battle_controller_link_partner.c | 2 +- src/battle_controller_oak_old_man.c | 18 ++-- src/battle_controller_opponent.c | 2 +- src/battle_controller_player.c | 18 ++-- src/battle_controller_pokedude.c | 12 +-- src/battle_controller_safari.c | 8 +- src/battle_controllers.c | 2 +- src/battle_message.c | 2 +- src/battle_script_commands.c | 119 ++++++++++++++++---------- src/evolution_scene.c | 30 +++---- src/trade_scene.c | 2 +- 16 files changed, 154 insertions(+), 143 deletions(-) diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 53e935b44..d9ba222d4 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -246,7 +246,7 @@ void BtlController_EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible); void BtlController_EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument); void BtlController_EmitLinkStandbyMsg(u8 bufferId, u8 mode); void BtlController_EmitResetActionMoveSelection(u8 bufferId, u8 caseId); -void BtlController_EmitEndLinkBattle(u8 bufferId, u8 arg1); +void BtlController_EmitEndLinkBattle(u8 bufferId, u8 battleOutcome); // player controller void PlayerDummy(void); diff --git a/include/constants/battle.h b/include/constants/battle.h index 5cc0f3ed4..c318f3cde 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -65,18 +65,6 @@ #define BATTLE_TYPE_WILD_SCRIPTED (1 << 17) // Used in pokeemerald as BATTLE_TYPE_PALACE. #define BATTLE_TYPE_LEGENDARY_FRLG (1 << 18) // Used in pokeemerald as BATTLE_TYPE_ARENA. #define BATTLE_TYPE_TRAINER_TOWER (1 << 19) // Used in pokeemerald as BATTLE_TYPE_FACTORY. -#define BATTLE_TYPE_PIKE (1 << 20) // Used in pokeemerald. -#define BATTLE_TYPE_PYRAMID (1 << 21) // Used in pokeemerald. -#define BATTLE_TYPE_INGAME_PARTNER (1 << 22) -#define BATTLE_TYPE_TOWER_LINK_MULTI (1 << 23) // Used in pokeemerald. -#define BATTLE_TYPE_RECORDED (1 << 24) -#define BATTLE_TYPE_RECORDED_LINK (1 << 25) // Used in pokeemerald. -#define BATTLE_TYPE_TRAINER_HILL (1 << 26) // Used in pokeemerald. -#define BATTLE_TYPE_SECRET_BASE (1 << 27) -#define BATTLE_TYPE_GROUDON (1 << 28) -#define BATTLE_TYPE_KYOGRE (1 << 29) -#define BATTLE_TYPE_RAYQUAZA (1 << 30) -#define BATTLE_TYPE_RECORDED_IS_MASTER (1 << 31) // Used in pokeemerald. #define IS_BATTLE_TYPE_GHOST_WITHOUT_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && !((flags) & BATTLE_TYPE_GHOST_UNVEILED)) #define IS_BATTLE_TYPE_GHOST_WITH_SCOPE(flags) ((flags) & BATTLE_TYPE_GHOST && (flags) & BATTLE_TYPE_GHOST_UNVEILED) @@ -356,9 +344,7 @@ #define B_WIN_VS_OUTCOME_RIGHT 23 #define B_WIN_OAK_OLD_MAN 24 -#define B_TEXT_FLAG_NONE (0 << 0) #define B_TEXT_FLAG_NPC_CONTEXT_FONT (1 << 6) #define B_TEXT_FLAG_WINDOW_CLEAR (1 << 7) -#define B_TEXT_FLAG_BOTH (B_TEXT_FLAG_NPC_CONTEXT_FONT | B_TEXT_FLAG_WINDOW_CLEAR) #endif // GUARD_CONSTANTS_BATTLE_H diff --git a/include/trade_scene.h b/include/trade_scene.h index 876481c8f..31679eafe 100644 --- a/include/trade_scene.h +++ b/include/trade_scene.h @@ -9,7 +9,7 @@ u16 GetInGameTradeSpeciesInfo(void); u16 GetTradeSpecies(void); void InitTradeSequenceBgGpuRegs(void); void LinkTradeDrawWindow(void); -void InitTradeBg(void); +void LoadTradeAnimGfx(void); extern const u16 gTradeOrHatchMonShadowTilemap[]; extern const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate; diff --git a/src/battle_bg.c b/src/battle_bg.c index df30a2dea..dd9666499 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -764,7 +764,7 @@ static void DrawLinkBattleVsScreenOutcomeText(void) { if (gBattleOutcome == B_OUTCOME_DREW) { - BattlePutTextOnWindow(gText_Draw, (B_WIN_VS_OUTCOME_DRAW | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Draw, B_WIN_VS_OUTCOME_DRAW); } else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { @@ -773,20 +773,20 @@ static void DrawLinkBattleVsScreenOutcomeText(void) switch (gLinkPlayers[gBattleStruct->multiplayerId].id) { case 0: - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_LEFT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_RIGHT); break; case 1: - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_RIGHT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_LEFT); break; case 2: - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_LEFT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_RIGHT); break; case 3: - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_RIGHT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_LEFT); break; } } @@ -795,20 +795,20 @@ static void DrawLinkBattleVsScreenOutcomeText(void) switch (gLinkPlayers[gBattleStruct->multiplayerId].id) { case 0: - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_RIGHT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_LEFT); break; case 1: - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_LEFT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_RIGHT); break; case 2: - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_RIGHT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_LEFT); break; case 3: - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_LEFT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_RIGHT); break; } } @@ -817,26 +817,26 @@ static void DrawLinkBattleVsScreenOutcomeText(void) { if (gLinkPlayers[gBattleStruct->multiplayerId].id != 0) { - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_RIGHT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_LEFT); } else { - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_LEFT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_RIGHT); } } else { if (gLinkPlayers[gBattleStruct->multiplayerId].id != 0) { - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_LEFT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_RIGHT); } else { - BattlePutTextOnWindow(gText_Win, (B_WIN_VS_OUTCOME_RIGHT | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_Loss, (B_WIN_VS_OUTCOME_LEFT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_Win, B_WIN_VS_OUTCOME_RIGHT); + BattlePutTextOnWindow(gText_Loss, B_WIN_VS_OUTCOME_LEFT); } } } @@ -860,19 +860,19 @@ void InitLinkBattleVsScreen(u8 taskId) switch (linkPlayer->id) { case 0: - BattlePutTextOnWindow(name, (B_WIN_VS_MULTI_PLAYER_1 | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(name, B_WIN_VS_MULTI_PLAYER_1); DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 1, 2, 4); break; case 1: - BattlePutTextOnWindow(name, (B_WIN_VS_MULTI_PLAYER_2 | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(name, B_WIN_VS_MULTI_PLAYER_2); DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 2, 2, 4); break; case 2: - BattlePutTextOnWindow(name, (B_WIN_VS_MULTI_PLAYER_3 | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(name, B_WIN_VS_MULTI_PLAYER_3); DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 1, 2, 8); break; case 3: - BattlePutTextOnWindow(name, (B_WIN_VS_MULTI_PLAYER_4 | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(name, B_WIN_VS_MULTI_PLAYER_4); DrawLinkBattleParticipantPokeballs(taskId, linkPlayer->id, 2, 2, 8); break; } @@ -888,10 +888,10 @@ void InitLinkBattleVsScreen(u8 taskId) opponentId = playerId, playerId = opponentId_copy; name = gLinkPlayers[playerId].name; - BattlePutTextOnWindow(name, (B_WIN_VS_PLAYER | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(name, B_WIN_VS_PLAYER); name = gLinkPlayers[opponentId].name; - BattlePutTextOnWindow(name, (B_WIN_VS_OPPONENT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(name, B_WIN_VS_OPPONENT); DrawLinkBattleParticipantPokeballs(taskId, playerId, 1, 2, 7); DrawLinkBattleParticipantPokeballs(taskId, opponentId, 2, 2, 7); diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index eb211e7c8..e5fd5678a 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1312,7 +1312,7 @@ static void LinkOpponentHandlePrintString(void) if (BattleStringShouldBeColored(*stringId)) BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index b46591825..09d2d198e 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1225,7 +1225,7 @@ static void LinkPartnerHandlePrintString(void) if (BattleStringShouldBeColored(*stringId)) BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c index 6dfdf4213..16083b6c3 100644 --- a/src/battle_controller_oak_old_man.c +++ b/src/battle_controller_oak_old_man.c @@ -651,7 +651,7 @@ static void PrintOakText_ForPetesSake(void) break; case 2: BattleStringExpandPlaceholdersToDisplayedString(gText_ForPetesSake); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_OAK_OLD_MAN); ++gBattleStruct->simulatedInputState[0]; break; case 3: @@ -670,7 +670,7 @@ static void PrintOakText_ForPetesSake(void) if (!gPaletteFade.active) { BattleStringExpandPlaceholdersToDisplayedString(gText_TheTrainerThat); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_OAK_OLD_MAN); ++gBattleStruct->simulatedInputState[0]; } break; @@ -690,7 +690,7 @@ static void PrintOakText_ForPetesSake(void) if (!gPaletteFade.active) { BattleStringExpandPlaceholdersToDisplayedString(gText_TryBattling); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_OAK_OLD_MAN); ++gBattleStruct->simulatedInputState[0]; } break; @@ -774,7 +774,7 @@ static void PrintOakTextWithMainBgDarkened(const u8 *text, u8 delay) break; case 3: BattleStringExpandPlaceholdersToDisplayedString(text); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_OAK_OLD_MAN); ++gBattleStruct->simulatedInputState[0]; break; case 4: @@ -842,7 +842,7 @@ static void PrintOakText_KeepAnEyeOnHP(void) break; case 3: BattleStringExpandPlaceholdersToDisplayedString(gText_KeepAnEyeOnHP); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_OAK_OLD_MAN); ++gBattleStruct->simulatedInputState[0]; break; case 4: @@ -1761,7 +1761,7 @@ static void OakOldManHandlePrintString(void) if (BattleStringShouldBeColored(*stringId)) BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) { switch (*stringId) @@ -1815,8 +1815,8 @@ static void OakOldManHandleChooseAction(void) s32 i; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattlePutTextOnWindow(gText_EmptyString3, (B_WIN_MSG | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_BattleMenu, (B_WIN_ACTION_MENU | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_EmptyString3, B_WIN_MSG); + BattlePutTextOnWindow(gText_BattleMenu, B_WIN_ACTION_MENU); for (i = 0; i < MAX_MON_MOVES; ++i) ActionSelectionDestroyCursorAt((u8)i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); @@ -1824,7 +1824,7 @@ static void OakOldManHandleChooseAction(void) BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo); else BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillOldManDo); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_ACTION_PROMPT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_ACTION_PROMPT); } static void OakOldManHandleUnknownYesNoBox(void) diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 8a048fc53..93c420aed 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1314,7 +1314,7 @@ static void OpponentHandlePrintString(void) if (BattleStringShouldBeColored(*stringId)) BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) { switch (*stringId) diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 4367539d7..05b0ad224 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -570,7 +570,7 @@ void HandleInputChooseMove(void) else gMultiUsePlayerCursor = gMoveSelectionCursor[gActiveBattler] + 1; MoveSelectionCreateCursorAt(gMultiUsePlayerCursor, 27); - BattlePutTextOnWindow(gText_BattleSwitchWhich, (B_WIN_SWITCH_PROMPT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_BattleSwitchWhich, B_WIN_SWITCH_PROMPT); gBattlerControllerFuncs[gActiveBattler] = HandleMoveSwitching; } } @@ -1379,7 +1379,7 @@ static void MoveSelectionDisplayMoveNames(void) static void MoveSelectionDisplayPpString(void) { StringCopy(gDisplayedStringBattle, gText_MoveInterfacePP); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_PP | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_PP); } static void MoveSelectionDisplayPpNumber(void) @@ -1394,7 +1394,7 @@ static void MoveSelectionDisplayPpNumber(void) txtPtr = ConvertIntToDecimalStringN(gDisplayedStringBattle, moveInfo->currentPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2); *txtPtr = CHAR_SLASH; ConvertIntToDecimalStringN(++txtPtr, moveInfo->maxPp[gMoveSelectionCursor[gActiveBattler]], STR_CONV_MODE_RIGHT_ALIGN, 2); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_PP_REMAINING | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_PP_REMAINING); } static void MoveSelectionDisplayMoveType(void) @@ -1408,7 +1408,7 @@ static void MoveSelectionDisplayMoveType(void) *txtPtr++ = 1; txtPtr = StringCopy(txtPtr, gUnknown_83FE770); StringCopy(txtPtr, gTypeNames[gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].type]); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MOVE_TYPE | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_TYPE); } void MoveSelectionCreateCursorAt(u8 cursorPosition, u8 arg1) @@ -1479,7 +1479,7 @@ static void PrintLinkStandbyMsg(void) { gBattle_BG0_X = 0; gBattle_BG0_Y = 0; - BattlePutTextOnWindow(gText_LinkStandby, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_LinkStandby, B_WIN_MSG); } } @@ -2379,7 +2379,7 @@ static void PlayerHandlePrintString(void) if (BattleStringShouldBeColored(*stringId)) BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter2; } @@ -2406,13 +2406,13 @@ static void PlayerHandleChooseAction(void) s32 i; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattlePutTextOnWindow(gText_EmptyString3, (B_WIN_MSG | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_BattleMenu, (B_WIN_ACTION_MENU | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_EmptyString3, B_WIN_MSG); + BattlePutTextOnWindow(gText_BattleMenu, B_WIN_ACTION_MENU); for (i = 0; i < 4; ++i) ActionSelectionDestroyCursorAt(i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_ACTION_PROMPT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_ACTION_PROMPT); } static void PlayerHandleUnknownYesNoBox(void) diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 50a1aa3e9..68c1642eb 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -1535,7 +1535,7 @@ static void PokedudeHandlePrintString(void) if (BattleStringShouldBeColored(*stringId)) BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } @@ -1564,13 +1564,13 @@ static void PokedudeHandleChooseAction(void) if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattlePutTextOnWindow(gText_EmptyString3, (B_WIN_MSG | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gText_BattleMenu, (B_WIN_ACTION_MENU | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_EmptyString3, B_WIN_MSG); + BattlePutTextOnWindow(gText_BattleMenu, B_WIN_ACTION_MENU); for (i = 0; i < MAX_MON_MOVES; ++i) ActionSelectionDestroyCursorAt((u8)i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPkmnDo); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_ACTION_PROMPT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_ACTION_PROMPT); } else { @@ -2557,7 +2557,7 @@ static void PokedudeAction_PrintVoiceoverMessage(void) case 2: gBattle_BG0_Y = 0; BattleStringExpandPlaceholdersToDisplayedString(GetPokedudeText()); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_OAK_OLD_MAN); ++gPokedudeBattlerStates[gActiveBattler]->timer; break; case 3: @@ -2618,7 +2618,7 @@ static void PokedudeAction_PrintMessageWithHealthboxPals(void) break; case 3: BattleStringExpandPlaceholdersToDisplayedString(GetPokedudeText()); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_OAK_OLD_MAN | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_OAK_OLD_MAN); ++gPokedudeBattlerStates[gActiveBattler]->timer; break; case 4: diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index bb6e34296..6e7b1ee9a 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -411,7 +411,7 @@ static void SafariHandlePrintString(void) if (BattleStringShouldBeColored(*stringId)) BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NPC_CONTEXT_FONT)); else - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gBattlerControllerFuncs[gActiveBattler] = CompleteOnInactiveTextPrinter; } @@ -438,13 +438,13 @@ static void SafariHandleChooseAction(void) s32 i; gBattlerControllerFuncs[gActiveBattler] = HandleChooseActionAfterDma3; - BattlePutTextOnWindow(gText_EmptyString3, (B_WIN_MSG | B_TEXT_FLAG_NONE)); - BattlePutTextOnWindow(gUnknown_83FE747, (B_WIN_ACTION_MENU | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_EmptyString3, B_WIN_MSG); + BattlePutTextOnWindow(gUnknown_83FE747, B_WIN_ACTION_MENU); for (i = 0; i < 4; ++i) ActionSelectionDestroyCursorAt(i); ActionSelectionCreateCursorAt(gActionSelectionCursor[gActiveBattler], 0); BattleStringExpandPlaceholdersToDisplayedString(gText_WhatWillPlayerThrow); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_ACTION_PROMPT | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_ACTION_PROMPT); } static void SafariHandleUnknownYesNoBox(void) diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 5d13586be..89975500b 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -944,7 +944,7 @@ static void BtlController_EmitPlayBGM(u8 bufferId, u16 songId, void *data) sBattleBuffersTransferData[2] = (songId & 0xFF00) >> 8; // Nonsense loop using songId as a size - // Would go out of bounds for any song id after SE_RG_BAG_POCKET (253) + // Would go out of bounds for any song id after SE_DEOXYS_MOVE (253) for (i = 0; i < songId; ++i) sBattleBuffersTransferData[3 + i] = *(u8 *)(data++); PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, songId + 3); diff --git a/src/battle_message.c b/src/battle_message.c index 52f0d2e27..074073be1 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -997,7 +997,7 @@ const u16 gStatUpStringIds[] = [B_MSG_STAT_WONT_INCREASE] = STRINGID_STATSWONTINCREASE, [B_MSG_STAT_ROSE_EMPTY] = STRINGID_EMPTYSTRING3, [B_MSG_STAT_ROSE_ITEM] = STRINGID_USINGITEMSTATOFPKMNROSE, - [B_MSG_USED_DIRE_HIT] = STRINGID_PKMNUSEDXTOGETPUMPED, + [B_MSG_USED_DIRE_HIT] = STRINGID_PKMNUSEDXTOGETPUMPED, }; const u16 gStatDownStringIds[] = { diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 3690bfe9c..98b9a3eee 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -814,7 +814,7 @@ static const u8 sBallCatchBonuses[] = [ITEM_SAFARI_BALL - ITEM_ULTRA_BALL] = 15 }; -// Not used. Maybe related to gBattlePalaceNatureToMoveGroupLikelihood from Emerald? +// not used static const u32 gUnknown_8250898 = 0xFF7EAE60; static void Cmd_attackcanceler(void) @@ -1094,8 +1094,8 @@ static void Cmd_accuracycheck(void) if ((Random() % 100 + 1) > calc) { gMoveResultFlags |= MOVE_RESULT_MISSED; - if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && - (gBattleMoves[move].target == MOVE_TARGET_BOTH || gBattleMoves[move].target == MOVE_TARGET_FOES_AND_ALLY)) + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE + && (gBattleMoves[move].target == MOVE_TARGET_BOTH || gBattleMoves[move].target == MOVE_TARGET_FOES_AND_ALLY)) gBattleCommunication[MISS_TYPE] = B_MSG_AVOIDED_ATK; else gBattleCommunication[MISS_TYPE] = B_MSG_MISSED; @@ -1418,7 +1418,8 @@ static void CheckWonderGuardAndLevitate(void) } } -static void ModulateDmgByType2(u8 multiplier, u16 move, u8 *flags) // same as ModulateDmgByType except different arguments +// Same as ModulateDmgByType except different arguments +static void ModulateDmgByType2(u8 multiplier, u16 move, u8 *flags) { gBattleMoveDamage = gBattleMoveDamage * multiplier / 10; if (gBattleMoveDamage == 0 && multiplier != 0) @@ -1616,7 +1617,8 @@ static void Cmd_adjustnormaldamage(void) gBattlescriptCurrInstr++; } -static void Cmd_adjustnormaldamage2(void) // The same as adjustnormaldamage except it doesn't check for false swipe move effect. +// The same as adjustnormaldamage except it doesn't check for false swipe move effect. +static void Cmd_adjustnormaldamage2(void) { u8 holdEffect, param; @@ -2617,18 +2619,18 @@ void SetMoveEffect(bool8 primary, u8 certain) side = GetBattlerSide(gBattlerAttacker); if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT && !(gBattleTypeFlags & - (BATTLE_TYPE_EREADER_TRAINER - | BATTLE_TYPE_BATTLE_TOWER - | BATTLE_TYPE_LINK)) - && gTrainerBattleOpponent_A != 0x400) + (BATTLE_TYPE_EREADER_TRAINER + | BATTLE_TYPE_BATTLE_TOWER + | BATTLE_TYPE_LINK)) + && gTrainerBattleOpponent_A != TRAINER_SECRET_BASE) { gBattlescriptCurrInstr++; } else if (!(gBattleTypeFlags & - (BATTLE_TYPE_EREADER_TRAINER - | BATTLE_TYPE_BATTLE_TOWER - | BATTLE_TYPE_LINK)) - && gTrainerBattleOpponent_A != 0x400 + (BATTLE_TYPE_EREADER_TRAINER + | BATTLE_TYPE_BATTLE_TOWER + | BATTLE_TYPE_LINK)) + && gTrainerBattleOpponent_A != TRAINER_SECRET_BASE && (gWishFutureKnock.knockedOffMons[side] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]])) { gBattlescriptCurrInstr++; @@ -3380,7 +3382,7 @@ static void Cmd_getexp(void) } } -// For battles that aren't BATTLE_TYPE_LINK or BATTLE_TYPE_RECORDED_LINK, the only thing this +// For battles that aren't BATTLE_TYPE_LINK, the only thing this // command does is check whether the player has won/lost by totaling each team's HP. It then // sets gBattleOutcome accordingly, if necessary. static void Cmd_checkteamslost(void) @@ -3809,7 +3811,8 @@ static void Cmd_end2(void) gCurrentActionFuncId = B_ACTION_TRY_FINISH; } -static void Cmd_end3(void) // pops the main function stack +// Pops the main function stack +static void Cmd_end3(void) { BattleScriptPop(); if (gBattleResources->battleCallbackStack->size != 0) @@ -5147,7 +5150,7 @@ static void Cmd_yesnoboxlearnmove(void) { case 0: HandleBattleWindow(23, 8, 29, 13, 0); - BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO); gBattleScripting.learnMoveState++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); @@ -5256,7 +5259,7 @@ static void Cmd_yesnoboxstoplearningmove(void) { case 0: HandleBattleWindow(23, 8, 29, 13, 0); - BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO); gBattleScripting.learnMoveState++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); @@ -5551,7 +5554,7 @@ static void Cmd_yesnobox(void) { case 0: HandleBattleWindow(23, 8, 29, 13, 0); - BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO); gBattleCommunication[0]++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); @@ -5598,7 +5601,8 @@ static void Cmd_cancelallactions(void) gBattlescriptCurrInstr++; } -static void Cmd_adjustsetdamage(void) // The same as adjustnormaldamage, except there's no random damage multiplier. +// The same as adjustnormaldamage, except there's no random damage multiplier. +static void Cmd_adjustsetdamage(void) { u8 holdEffect, param; @@ -6215,7 +6219,8 @@ static void Cmd_various(void) gBattlescriptCurrInstr += 3; } -static void Cmd_setprotectlike(void) // protect and endure + // Protect and Endure +static void Cmd_setprotectlike(void) { bool8 notLastTurn = TRUE; u16 lastMove = gLastResultingMoves[gBattlerAttacker]; @@ -6826,7 +6831,8 @@ static void Cmd_statbuffchange(void) gBattlescriptCurrInstr += 6; } -static void Cmd_normalisebuffs(void) // haze +// Haze +static void Cmd_normalisebuffs(void) { s32 i, j; @@ -6918,13 +6924,14 @@ static void Cmd_forcerandomswitch(void) party = gPlayerParty; else party = gEnemyParty; + if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { valid = 0; val = 0; if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gBattlerTarget)) == 1) - val = 3; - for (i = val; i < val + 3; i++) + val = PARTY_SIZE / 2; + for (i = val; i < val + (PARTY_SIZE / 2); i++) { if (GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&party[i], MON_DATA_IS_EGG) @@ -6935,7 +6942,7 @@ static void Cmd_forcerandomswitch(void) else { valid = 0; - for (i = 0; i < 6; i++) + for (i = 0; i < PARTY_SIZE; i++) { if (GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE && !GetMonData(&party[i], MON_DATA_IS_EGG) @@ -6944,6 +6951,7 @@ static void Cmd_forcerandomswitch(void) } } + // Fails if there's only 1 mon left in single battle or there's less than 3 left in non-multi double battle. if ((valid < 2 && (gBattleTypeFlags & (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_MULTI)) != BATTLE_TYPE_DOUBLE) || (valid < 3 && (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))) { @@ -6955,9 +6963,9 @@ static void Cmd_forcerandomswitch(void) { do { - val = Random() % 3; + val = Random() % (PARTY_SIZE / 2); if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gBattlerTarget)) == 1) - i = val + 3; + i = val + (PARTY_SIZE / 2); else i = val; } @@ -6971,7 +6979,7 @@ static void Cmd_forcerandomswitch(void) { do { - i = Random() % 6; + i = Random() % PARTY_SIZE; } while (i == gBattlerPartyIndexes[gBattlerTarget] || i == gBattlerPartyIndexes[gBattlerTarget ^ 2] @@ -6981,7 +6989,7 @@ static void Cmd_forcerandomswitch(void) { do { - i = Random() % 6; + i = Random() % PARTY_SIZE; } while (i == gBattlerPartyIndexes[gBattlerTarget] || !MON_CAN_BATTLE(&party[i])); @@ -7000,7 +7008,8 @@ static void Cmd_forcerandomswitch(void) } } -static void Cmd_tryconversiontypechange(void) // randomly changes user's type to one of its moves' type +// Randomly changes user's type to one of its moves' type +static void Cmd_tryconversiontypechange(void) { u8 validMoves = 0; u8 moveChecked; @@ -7187,7 +7196,8 @@ static void Cmd_tryKO(void) } } -static void Cmd_damagetohalftargethp(void) // super fang +// Super Fang +static void Cmd_damagetohalftargethp(void) { gBattleMoveDamage = gBattleMons[gBattlerTarget].hp / 2; if (gBattleMoveDamage == 0) @@ -7589,7 +7599,8 @@ static void Cmd_counterdamagecalculator(void) } } -static void Cmd_mirrorcoatdamagecalculator(void) // a copy of Cmd with the physical -> special field changes +// A copy of Cmd_counterdamagecalculator with the physical -> special field changes +static void Cmd_mirrorcoatdamagecalculator(void) { u8 sideAttacker = GetBattlerSide(gBattlerAttacker); u8 sideTarget = GetBattlerSide(gProtectStructs[gBattlerAttacker].specialBattlerId); @@ -7693,7 +7704,8 @@ static void Cmd_painsplitdmgcalc(void) } } -static void Cmd_settypetorandomresistance(void) // conversion 2 +// Conversion 2 +static void Cmd_settypetorandomresistance(void) { if (gLastLandedMoves[gBattlerAttacker] == MOVE_NONE || gLastLandedMoves[gBattlerAttacker] == MOVE_UNAVAILABLE) @@ -7761,7 +7773,8 @@ static void Cmd_setalwayshitflag(void) gBattlescriptCurrInstr++; } -static void Cmd_copymovepermanently(void) // sketch +// Sketch +static void Cmd_copymovepermanently(void) { gChosenMove = MOVE_UNAVAILABLE; @@ -8391,7 +8404,8 @@ static void Cmd_setsunny(void) gBattlescriptCurrInstr++; } -static void Cmd_maxattackhalvehp(void) // belly drum +// Belly Drum +static void Cmd_maxattackhalvehp(void) { u32 halfHp = gBattleMons[gBattlerAttacker].maxHP / 2; @@ -8414,7 +8428,8 @@ static void Cmd_maxattackhalvehp(void) // belly drum } } -static void Cmd_copyfoestats(void) // psych up +// Psych Up +static void Cmd_copyfoestats(void) { s32 i; @@ -8692,7 +8707,8 @@ static void Cmd_trymemento(void) } } -static void Cmd_setforcedtarget(void) // follow me +// Follow Me +static void Cmd_setforcedtarget(void) { gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTimer = 1; gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTarget = gBattlerAttacker; @@ -8707,7 +8723,8 @@ static void Cmd_setcharge(void) gBattlescriptCurrInstr++; } -static void Cmd_callterrainattack(void) // nature power +// Nature Power +static void Cmd_callterrainattack(void) { gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED; gCurrentMove = sNaturePowerMoves[gBattleTerrain]; @@ -8716,7 +8733,8 @@ static void Cmd_callterrainattack(void) // nature power gBattlescriptCurrInstr++; } -static void Cmd_cureifburnedparalysedorpoisoned(void) // refresh +// Refresh +static void Cmd_cureifburnedparalysedorpoisoned(void) { if (gBattleMons[gBattlerAttacker].status1 & (STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON)) { @@ -8785,7 +8803,8 @@ static void Cmd_trysethelpinghand(void) } } -static void Cmd_tryswapitems(void) // trick +// Trick +static void Cmd_tryswapitems(void) { // opponent can't swap items with player in regular battles if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER @@ -8870,7 +8889,8 @@ static void Cmd_tryswapitems(void) // trick } } -static void Cmd_trycopyability(void) // role play +// Role Play +static void Cmd_trycopyability(void) { if (gBattleMons[gBattlerTarget].ability != ABILITY_NONE && gBattleMons[gBattlerTarget].ability != ABILITY_WONDER_GUARD) @@ -8918,7 +8938,8 @@ static void Cmd_trywish(void) } } -static void Cmd_trysetroots(void) // ingrain +// Ingrain +static void Cmd_trysetroots(void) { if (gStatuses3[gBattlerAttacker] & STATUS3_ROOTED) { @@ -8983,7 +9004,8 @@ static void Cmd_scaledamagebyhealthratio(void) gBattlescriptCurrInstr++; } -static void Cmd_tryswapabilities(void) // skill swap +// Skill Swap +static void Cmd_tryswapabilities(void) { if ((gBattleMons[gBattlerAttacker].ability == ABILITY_NONE && gBattleMons[gBattlerTarget].ability == ABILITY_NONE) @@ -9143,7 +9165,8 @@ static void Cmd_trysetmagiccoat(void) } } -static void Cmd_trysetsnatch(void) // snatch +// Snatch +static void Cmd_trysetsnatch(void) { gSpecialStatuses[gBattlerAttacker].ppNotAffectedByPressure = 1; if (gCurrentTurnActionNumber == gBattlersCount - 1) // moves last turn @@ -9298,7 +9321,8 @@ static void Cmd_trycastformdatachange(void) } } -static void Cmd_settypebasedhalvers(void) // water and mud sport +// Water and Mud Sport +static void Cmd_settypebasedhalvers(void) { bool8 worked = FALSE; @@ -9311,7 +9335,7 @@ static void Cmd_settypebasedhalvers(void) // water and mud sport worked = TRUE; } } - else // water sport + else // Water Sport { if (!(gStatuses3[gBattlerAttacker] & STATUS3_WATERSPORT)) { @@ -9422,7 +9446,8 @@ static void Cmd_snatchsetbattlers(void) gBattlescriptCurrInstr++; } -static void Cmd_removelightscreenreflect(void) // brick break +// Brick Break +static void Cmd_removelightscreenreflect(void) { u8 opposingSide = GetBattlerSide(gBattlerAttacker) ^ BIT_SIDE; @@ -9776,7 +9801,7 @@ static void Cmd_trygivecaughtmonnick(void) { case 0: HandleBattleWindow(23, 8, 29, 13, 0); - BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO); gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[CURSOR_POSITION] = 0; BattleCreateYesNoCursorAt(); diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 3cffa68e4..67745b803 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -413,7 +413,7 @@ static void CB2_TradeEvolutionSceneLoadGraphics(void) gMain.state++; break; case 2: - InitTradeBg(); + LoadTradeAnimGfx(); gMain.state++; break; case 3: @@ -677,7 +677,7 @@ static void Task_EvolutionScene(u8 taskId) if (!gPaletteFade.active) { StringExpandPlaceholders(gStringVar4, gText_PkmnIsEvolving); - BattlePutTextOnWindow(gStringVar4, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gStringVar4, B_WIN_MSG); gTasks[taskId].tState++; } break; @@ -774,7 +774,7 @@ static void Task_EvolutionScene(u8 taskId) if (IsCryFinished()) { StringExpandPlaceholders(gStringVar4, gText_CongratsPkmnEvolved); - BattlePutTextOnWindow(gStringVar4, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gStringVar4, B_WIN_MSG); PlayBGM(MUS_EVOLVED); gTasks[taskId].tState++; SetMonData(mon, MON_DATA_SPECIES, (void *)(&gTasks[taskId].tPostEvoSpecies)); @@ -857,7 +857,7 @@ static void Task_EvolutionScene(u8 taskId) else StringExpandPlaceholders(gStringVar4, gText_PkmnStoppedEvolving); - BattlePutTextOnWindow(gStringVar4, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gStringVar4, B_WIN_MSG); gTasks[taskId].tEvoWasStopped = TRUE; gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE; } @@ -868,7 +868,7 @@ static void Task_EvolutionScene(u8 taskId) BufferMoveToLearnIntoBattleTextBuff2(); PlayFanfare(MUS_LEVEL_UP); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_TABLE_START]); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gTasks[taskId].tLearnsFirstMove = 0x40; // re-used as a counter gTasks[taskId].tState++; } @@ -886,7 +886,7 @@ static void Task_EvolutionScene(u8 taskId) // "{mon} is trying to learn {move}" BufferMoveToLearnIntoBattleTextBuff2(); BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_TABLE_START]); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gTasks[taskId].tLearnMoveState++; } break; @@ -895,7 +895,7 @@ static void Task_EvolutionScene(u8 taskId) { // "But, {mon} can't learn more than four moves" BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_TABLE_START]); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gTasks[taskId].tLearnMoveState++; } break; @@ -904,7 +904,7 @@ static void Task_EvolutionScene(u8 taskId) { // "Delete a move to make room for {move}?" BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_TABLE_START]); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gTasks[taskId].tLearnMoveYesState = MVSTATE_SHOW_MOVE_SELECT; gTasks[taskId].tLearnMoveNoState = MVSTATE_ASK_CANCEL; gTasks[taskId].tLearnMoveState++; @@ -913,7 +913,7 @@ static void Task_EvolutionScene(u8 taskId) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { HandleBattleWindow(23, 8, 29, 13, 0); - BattlePutTextOnWindow(gText_BattleYesNoChoice, (B_WIN_YESNO | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO); gTasks[taskId].tLearnMoveState++; sEvoCursorPos = 0; BattleCreateYesNoCursorAt(); @@ -992,7 +992,7 @@ static void Task_EvolutionScene(u8 taskId) { // Can't forget HMs BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_TABLE_START]); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gTasks[taskId].tLearnMoveState = MVSTATE_RETRY_AFTER_HM; } else @@ -1009,14 +1009,14 @@ static void Task_EvolutionScene(u8 taskId) break; case MVSTATE_FORGET_MSG_1: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_123POOF - BATTLESTRINGS_TABLE_START]); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gTasks[taskId].tLearnMoveState++; break; case MVSTATE_FORGET_MSG_2: if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_TABLE_START]); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gTasks[taskId].tLearnMoveState++; } break; @@ -1024,20 +1024,20 @@ static void Task_EvolutionScene(u8 taskId) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_ANDELLIPSIS - BATTLESTRINGS_TABLE_START]); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gTasks[taskId].tState = EVOSTATE_LEARNED_MOVE; } break; case MVSTATE_ASK_CANCEL: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_TABLE_START]); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gTasks[taskId].tLearnMoveYesState = MVSTATE_CANCEL; gTasks[taskId].tLearnMoveNoState = MVSTATE_INTRO_MSG_1; gTasks[taskId].tLearnMoveState = MVSTATE_PRINT_YES_NO; break; case MVSTATE_CANCEL: BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_TABLE_START]); - BattlePutTextOnWindow(gDisplayedStringBattle, (B_WIN_MSG | B_TEXT_FLAG_NONE)); + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MSG); gTasks[taskId].tState = EVOSTATE_TRY_LEARN_MOVE; break; case MVSTATE_RETRY_AFTER_HM: diff --git a/src/trade_scene.c b/src/trade_scene.c index d3db122dd..07edfe8c0 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -2756,7 +2756,7 @@ static void CheckPartnersMonForRibbons(void) FlagSet(FLAG_SYS_RIBBON_GET); } -void InitTradeBg(void) +void LoadTradeAnimGfx(void) { TradeAnimInit_LoadGfx(); } From e0010b9205d341c9835b5eca5a6f88a148e52bd1 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 17:04:04 -0400 Subject: [PATCH 44/64] Reverted FONT_SMALL --- charmap.txt | 4 +- include/text.h | 2 - src/battle_script_commands.c | 2 +- src/strings.c | 82 ++++++++++++++++++------------------ 4 files changed, 44 insertions(+), 46 deletions(-) diff --git a/charmap.txt b/charmap.txt index 020580921..febef44e9 100644 --- a/charmap.txt +++ b/charmap.txt @@ -427,7 +427,7 @@ HIGHLIGHT = FC 02 @ same as fc 01 SHADOW = FC 03 @ same as fc 01 COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes PALETTE = FC 05 @ used in credits -SIZE = FC 06 @ note that anything other than "FONT_SMALL" is invalid +SIZE = FC 06 @ note that anything other than "SMALL" is invalid RESET_SIZE = FC 07 PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them PAUSE_UNTIL_PRESS = FC 09 @@ -449,7 +449,7 @@ RESUME_MUSIC = FC 18 @ font sizes -FONT_SMALL = FC 06 00 +SMALL = FC 06 00 BIG = FC 06 04 @ colors diff --git a/include/text.h b/include/text.h index f80ed01d7..6d31b16c7 100644 --- a/include/text.h +++ b/include/text.h @@ -159,8 +159,6 @@ #define TEXT_SPEED_INSTANT 0 #define TEXT_SKIP_DRAW 0xFF -#define FONT_SMALL 0 - enum { FONTATTR_MAX_LETTER_WIDTH, diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 98b9a3eee..7c1b00875 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5827,7 +5827,7 @@ static void DrawLevelUpBannerText(void) printerTemplate.currentChar = gStringVar4; printerTemplate.windowId = B_WIN_LEVEL_UP_BANNER; - printerTemplate.fontId = FONT_SMALL; + printerTemplate.fontId = 0; printerTemplate.x = 32; printerTemplate.y = 0; printerTemplate.currentX = 32; diff --git a/src/strings.c b/src/strings.c index b8b989b80..0855152f5 100644 --- a/src/strings.c +++ b/src/strings.c @@ -215,7 +215,7 @@ const u8 gText_TheBerryPouchWillBePutAway[] = _("The BERRY POUCH will be\nput aw const u8 gText_ShopBuy[] = _("BUY"); const u8 gText_ShopSell[] = _("SELL"); const u8 gText_ShopQuit[] = _("SEE YA!"); -const u8 gText_InBagVar1[] = _("IN BAG:{FONT_SMALL} {STR_VAR_1}"); +const u8 gText_InBagVar1[] = _("IN BAG:{SMALL} {STR_VAR_1}"); const u8 gText_QuitShopping[] = _("Quit shopping."); const u8 gText_Var1CertainlyHowMany[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); const u8 gText_Var1AndYouWantedVar2[] = _("{STR_VAR_1}, and you want {STR_VAR_2}.\nThat will be ¥{STR_VAR_3}. Okay?"); @@ -419,11 +419,11 @@ const u8 gText_DoubleBattle[] = _("DOUBLE BATTLE"); const u8 gText_MultiBattle[] = _("MULTI BATTLE"); const u8 gText_MakeAChallenge[] = _("Make a challenge."); const u8 gText_Info_2[] = _("INFO"); -const u8 gText_FreshWater_200[] = _("FRESH WATER{CLEAR_TO 0x57}{FONT_SMALL}¥200"); -const u8 gText_SodaPop_300[] = _("SODA POP{CLEAR_TO 0x57}{FONT_SMALL}¥300"); -const u8 gText_Lemonade_350[] = _("LEMONADE{CLEAR_TO 0x57}{FONT_SMALL}¥350"); -const u8 gText_50Coins_1000[] = _("{FONT_SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000"); -const u8 gText_500Coins_10000[] = _("{FONT_SMALL}500 COINS{CLEAR_TO 0x40}¥10,000"); +const u8 gText_FreshWater_200[] = _("FRESH WATER{CLEAR_TO 0x57}{SMALL}¥200"); +const u8 gText_SodaPop_300[] = _("SODA POP{CLEAR_TO 0x57}{SMALL}¥300"); +const u8 gText_Lemonade_350[] = _("LEMONADE{CLEAR_TO 0x57}{SMALL}¥350"); +const u8 gText_50Coins_1000[] = _("{SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000"); +const u8 gText_500Coins_10000[] = _("{SMALL}500 COINS{CLEAR_TO 0x40}¥10,000"); const u8 gText_Excellent[] = _("Excellent"); const u8 gText_NotSoBad[] = _("Not so bad"); const u8 gText_RedShard[] = _("RED SHARD"); @@ -433,11 +433,11 @@ const u8 gText_GreenShard[] = _("GREEN SHARD"); const u8 gUnknown_8417A30[] = _("バトルタワ-"); const u8 gText_Right[] = _("Right"); const u8 gText_Left[] = _("Left"); -const u8 gText_Tm13_4000Coins[] = _("TM13{CLEAR_TO 0x48}{FONT_SMALL}4,000 COINS"); -const u8 gText_Tm23_3500Coins[] = _("TM23{CLEAR_TO 0x48}{FONT_SMALL}3,500 COINS"); -const u8 gText_Tm24_4000Coins[] = _("TM24{CLEAR_TO 0x48}{FONT_SMALL}4,000 COINS"); -const u8 gText_Tm30_4500Coins[] = _("TM30{CLEAR_TO 0x48}{FONT_SMALL}4,500 COINS"); -const u8 gText_Tm35_4000Coins[] = _("TM35{CLEAR_TO 0x48}{FONT_SMALL}4,000 COINS"); +const u8 gText_Tm13_4000Coins[] = _("TM13{CLEAR_TO 0x48}{SMALL}4,000 COINS"); +const u8 gText_Tm23_3500Coins[] = _("TM23{CLEAR_TO 0x48}{SMALL}3,500 COINS"); +const u8 gText_Tm24_4000Coins[] = _("TM24{CLEAR_TO 0x48}{SMALL}4,000 COINS"); +const u8 gText_Tm30_4500Coins[] = _("TM30{CLEAR_TO 0x48}{SMALL}4,500 COINS"); +const u8 gText_Tm35_4000Coins[] = _("TM35{CLEAR_TO 0x48}{SMALL}4,000 COINS"); const u8 gText_1F_2[] = _("1F"); const u8 gText_2F_2[] = _("2F"); const u8 gText_3F_2[] = _("3F"); @@ -485,18 +485,18 @@ const u8 gText_FreshWater[] = _("FRESH WATER"); const u8 gText_SodaPop[] = _("SODA POP"); const u8 gText_Lemonade[] = _("LEMONADE"); const u8 gText_Coins_2[] = _("COINS"); -const u8 gText_Bicycle_1000000[] = _("BICYCLE{CLEAR_TO 0x49}{FONT_SMALL}¥1,000,000"); +const u8 gText_Bicycle_1000000[] = _("BICYCLE{CLEAR_TO 0x49}{SMALL}¥1,000,000"); const u8 gText_NoThanks[] = _("NO THANKS"); -const u8 gText_Abra_180Coins[] = _("ABRA{CLEAR_TO 0x55}{FONT_SMALL} 180 COINS"); -const u8 gText_Clefairy_500Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{FONT_SMALL} 500 COINS"); -const u8 gText_Dratini_2800Coins[] = _("DRATINI{CLEAR_TO 0x4B}{FONT_SMALL} 2,800 COINS"); -const u8 gText_Scyther_5500Coins[] = _("SCYTHER{CLEAR_TO 0x4B}{FONT_SMALL} 5,500 COINS"); -const u8 gText_Porygon_9999Coins[] = _("PORYGON{CLEAR_TO 0x4B}{FONT_SMALL} 9,999 COINS"); -const u8 gText_Abra_120Coins[] = _("ABRA{CLEAR_TO 0x55}{FONT_SMALL} 120 COINS"); -const u8 gText_Clefairy_750Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{FONT_SMALL} 750 COINS"); -const u8 gText_Pinsir_2500Coins[] = _("PINSIR{CLEAR_TO 0x4B}{FONT_SMALL} 2,500 COINS"); -const u8 gText_Dratini_4600Coins[] = _("DRATINI{CLEAR_TO 0x4B}{FONT_SMALL} 4,600 COINS"); -const u8 gText_Porygon_6500Coins[] = _("PORYGON{CLEAR_TO 0x4B}{FONT_SMALL} 6,500 COINS"); +const u8 gText_Abra_180Coins[] = _("ABRA{CLEAR_TO 0x55}{SMALL} 180 COINS"); +const u8 gText_Clefairy_500Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{SMALL} 500 COINS"); +const u8 gText_Dratini_2800Coins[] = _("DRATINI{CLEAR_TO 0x4B}{SMALL} 2,800 COINS"); +const u8 gText_Scyther_5500Coins[] = _("SCYTHER{CLEAR_TO 0x4B}{SMALL} 5,500 COINS"); +const u8 gText_Porygon_9999Coins[] = _("PORYGON{CLEAR_TO 0x4B}{SMALL} 9,999 COINS"); +const u8 gText_Abra_120Coins[] = _("ABRA{CLEAR_TO 0x55}{SMALL} 120 COINS"); +const u8 gText_Clefairy_750Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{SMALL} 750 COINS"); +const u8 gText_Pinsir_2500Coins[] = _("PINSIR{CLEAR_TO 0x4B}{SMALL} 2,500 COINS"); +const u8 gText_Dratini_4600Coins[] = _("DRATINI{CLEAR_TO 0x4B}{SMALL} 4,600 COINS"); +const u8 gText_Porygon_6500Coins[] = _("PORYGON{CLEAR_TO 0x4B}{SMALL} 6,500 COINS"); const u8 gText_NoThanks_2[] = _("NO THANKS"); const u8 gText_HelixFossil[] = _("HELIX FOSSIL"); const u8 gText_DomeFossil[] = _("DOME FOSSIL"); @@ -532,11 +532,11 @@ const u8 gText_1BigMushroom[] = _("1 BIG MUSHROOM"); const u8 gText_SeviiIslands[] = _("SEVII ISLANDS"); const u8 gText_NavelRock[] = _("NAVEL ROCK"); const u8 gText_BirthIsland[] = _("BIRTH ISLAND"); -const u8 gText_MiracleSeed_1000Coins[] = _("MIRACLE SEED{CLEAR_TO 0x50}{FONT_SMALL}1,000 COINS"); -const u8 gText_Charcoal_1000Coins[] = _("CHARCOAL{CLEAR_TO 0x50}{FONT_SMALL}1,000 COINS"); -const u8 gText_MysticWater_1000Coins[] = _("MYSTIC WATER{CLEAR_TO 0x50}{FONT_SMALL}1,000 COINS"); -const u8 gText_YellowFlute_1600Coins[] = _("YELLOW FLUTE{CLEAR_TO 0x50}{FONT_SMALL}1,600 COINS"); -const u8 gText_SmokeBall_800Coins[] = _("SMOKE BALL{CLEAR_TO 0x5A}{FONT_SMALL}800 COINS"); +const u8 gText_MiracleSeed_1000Coins[] = _("MIRACLE SEED{CLEAR_TO 0x50}{SMALL}1,000 COINS"); +const u8 gText_Charcoal_1000Coins[] = _("CHARCOAL{CLEAR_TO 0x50}{SMALL}1,000 COINS"); +const u8 gText_MysticWater_1000Coins[] = _("MYSTIC WATER{CLEAR_TO 0x50}{SMALL}1,000 COINS"); +const u8 gText_YellowFlute_1600Coins[] = _("YELLOW FLUTE{CLEAR_TO 0x50}{SMALL}1,600 COINS"); +const u8 gText_SmokeBall_800Coins[] = _("SMOKE BALL{CLEAR_TO 0x5A}{SMALL}800 COINS"); const u8 gText_Dummy_8417F67[] = _(""); const u8 gText_Dummy_8417F68[] = _(""); const u8 gText_BecomeLeader[] = _("BECOME LEADER"); @@ -582,17 +582,17 @@ const u8 gText_NowOn[] = _("Now on:"); const u8 gText_LinkedGamePlay[] = _("LINKED GAME PLAY"); const u8 gText_DirectCorner[] = _("DIRECT CORNER"); const u8 gText_UnionRoom[] = _("UNION ROOM"); -const u8 gText_Energypowder_50[] = _("ENERGYPOWDER{CLEAR_TO 0x74}{FONT_SMALL}50"); -const u8 gText_EnergyRoot_80[] = _("ENERGY ROOT{CLEAR_TO 0x74}{FONT_SMALL}80"); -const u8 gText_HealPowder_50[] = _("HEAL POWDER{CLEAR_TO 0x74}{FONT_SMALL}50"); -const u8 gText_RevivalHerb_300[] = _("REVIVAL HERB{CLEAR_TO 0x6F}{FONT_SMALL}300"); -const u8 gText_Protein_1000[] = _("PROTEIN{CLEAR_TO 0x65}{FONT_SMALL}1,000"); -const u8 gText_Iron_1000[] = _("IRON{CLEAR_TO 0x65}{FONT_SMALL}1,000"); -const u8 gText_Carbos_1000[] = _("CARBOS{CLEAR_TO 0x65}{FONT_SMALL}1,000"); -const u8 gText_Calcium_1000[] = _("CALCIUM{CLEAR_TO 0x65}{FONT_SMALL}1,000"); -const u8 gText_Zinc_1000[] = _("ZINC{CLEAR_TO 0x65}{FONT_SMALL}1,000"); -const u8 gText_HpUp_1000[] = _("HP UP{CLEAR_TO 0x65}{FONT_SMALL}1,000"); -const u8 gText_PpUp_3000[] = _("PP UP{CLEAR_TO 0x65}{FONT_SMALL}3,000"); +const u8 gText_Energypowder_50[] = _("ENERGYPOWDER{CLEAR_TO 0x74}{SMALL}50"); +const u8 gText_EnergyRoot_80[] = _("ENERGY ROOT{CLEAR_TO 0x74}{SMALL}80"); +const u8 gText_HealPowder_50[] = _("HEAL POWDER{CLEAR_TO 0x74}{SMALL}50"); +const u8 gText_RevivalHerb_300[] = _("REVIVAL HERB{CLEAR_TO 0x6F}{SMALL}300"); +const u8 gText_Protein_1000[] = _("PROTEIN{CLEAR_TO 0x65}{SMALL}1,000"); +const u8 gText_Iron_1000[] = _("IRON{CLEAR_TO 0x65}{SMALL}1,000"); +const u8 gText_Carbos_1000[] = _("CARBOS{CLEAR_TO 0x65}{SMALL}1,000"); +const u8 gText_Calcium_1000[] = _("CALCIUM{CLEAR_TO 0x65}{SMALL}1,000"); +const u8 gText_Zinc_1000[] = _("ZINC{CLEAR_TO 0x65}{SMALL}1,000"); +const u8 gText_HpUp_1000[] = _("HP UP{CLEAR_TO 0x65}{SMALL}1,000"); +const u8 gText_PpUp_3000[] = _("PP UP{CLEAR_TO 0x65}{SMALL}3,000"); const u8 gString_BattleRecords_PlayersBattleResults[] = _("{PLAYER}'s BATTLE RESULTS"); const u8 gString_BattleRecords_TotalRecord[] = _("TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}"); const u8 gString_BattleRecords_ColumnHeaders[] = _("WIN{CLEAR_TO 0x30}LOSE{CLEAR_TO 0x60}DRAW"); @@ -911,14 +911,14 @@ const u8 gUnknown_841B285[] = _(" was used on\n"); const u8 gUnknown_841B293[] = _("."); const u8 gUnknown_841B295[] = _("'s level rose to\n"); const u8 gUnknown_841B2A7[] = _("."); -const u8 gUnknown_841B2A9[] = _("{FONT_SMALL}MAX.{SIZE 0x02} HP"); +const u8 gUnknown_841B2A9[] = _("{SMALL}MAX.{SIZE 0x02} HP"); const u8 gUnknown_841B2B7[] = _("ATTACK"); const u8 gUnknown_841B2BE[] = _("DEFENSE"); const u8 gUnknown_841B2C6[] = _("SPEED"); const u8 gUnknown_841B2CC[] = _("SP. ATK"); const u8 gUnknown_841B2D4[] = _("SP. DEF"); -const u8 gUnknown_841B2DC[] = _("{FONT_SMALL}{PLUS}{SIZE 0x02}"); -const u8 gUnknown_841B2E5[] = _("{FONT_SMALL}-{SIZE 0x02}"); +const u8 gUnknown_841B2DC[] = _("{SMALL}{PLUS}{SIZE 0x02}"); +const u8 gUnknown_841B2E5[] = _("{SMALL}-{SIZE 0x02}"); const u8 gUnknown_841B2ED[] = _("1, "); const u8 gUnknown_841B2F1[] = _("2, and ‥ ‥ ‥ "); const u8 gUnknown_841B2FF[] = _("Poof!\p"); From 65baf962c56db8dde7cb5c47e332a888d0b8788d Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 17:07:26 -0400 Subject: [PATCH 45/64] Forgot to include this fix --- src/battle_script_commands.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 7c1b00875..f9b00d0a9 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6769,12 +6769,9 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) gBattleTextBuff2[3] = STRINGID_STATHARSHLY >> 8; index = 4; } - gBattleTextBuff2[index] = B_BUFF_STRING; - index++; - gBattleTextBuff2[index] = STRINGID_STATFELL; - index++; - gBattleTextBuff2[index] = STRINGID_STATFELL >> 8; - index++; + gBattleTextBuff2[index++] = B_BUFF_STRING; + gBattleTextBuff2[index++] = STRINGID_STATFELL; + gBattleTextBuff2[index++] = STRINGID_STATFELL >> 8; gBattleTextBuff2[index] = B_BUFF_EOS; if (gBattleMons[gActiveBattler].statStages[statId] == MIN_STAT_STAGE) @@ -6795,12 +6792,9 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr) gBattleTextBuff2[3] = STRINGID_STATSHARPLY >> 8; index = 4; } - gBattleTextBuff2[index] = B_BUFF_STRING; - index++; - gBattleTextBuff2[index] = STRINGID_STATROSE; - index++; - gBattleTextBuff2[index] = STRINGID_STATROSE >> 8; - index++; + gBattleTextBuff2[index++] = B_BUFF_STRING; + gBattleTextBuff2[index++] = STRINGID_STATROSE; + gBattleTextBuff2[index++] = STRINGID_STATROSE >> 8; gBattleTextBuff2[index] = B_BUFF_EOS; if (gBattleMons[gActiveBattler].statStages[statId] == MAX_STAT_STAGE) From 78e3780fa4e2aaea949252fac3b554d193ea01da Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 17:09:04 -0400 Subject: [PATCH 46/64] And this one --- include/battle_controllers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/battle_controllers.h b/include/battle_controllers.h index d9ba222d4..12e786fc9 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -99,7 +99,7 @@ enum { #define RET_VALUE_LEVELLED_UP 11 -#define INSTANT_HP_BAR_DROP 32767 +#define INSTANT_HP_BAR_DROP 0x7FFF // Special return values in gBattleBufferB from Battle Controller functions. #define RET_VALUE_LEVELED_UP 11 From dfe6c6885cd77956533df687821356ab6cf950e5 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 16:17:40 -0400 Subject: [PATCH 47/64] Synced sound.c --- asm/macros/music_voice.inc | 2 +- data/battle_anim_scripts.s | 5 +- data/event_scripts.s | 1 + data/maps/BirthIsland_Exterior/scripts.inc | 2 +- data/maps/CeladonCity/scripts.inc | 2 +- .../CeladonCity_Condominiums_1F/scripts.inc | 6 +- data/maps/CeruleanCave_B1F/scripts.inc | 2 +- .../FourIsland_IcefallCave_Back/scripts.inc | 2 +- .../FourIsland_PokemonDayCare/scripts.inc | 4 +- data/maps/LavenderTown_House1/scripts.inc | 2 +- .../scripts.inc | 4 +- data/maps/MtEmber_Summit/scripts.inc | 2 +- data/maps/NavelRock_Base/scripts.inc | 2 +- data/maps/NavelRock_Summit/scripts.inc | 2 +- data/maps/PewterCity_House1/scripts.inc | 2 +- data/maps/PokemonTower_6F/scripts.inc | 2 +- data/maps/PowerPlant/scripts.inc | 6 +- data/maps/Route12/scripts.inc | 2 +- data/maps/Route16/scripts.inc | 2 +- data/maps/Route16_House/scripts.inc | 2 +- data/maps/SSAnne_1F_Room3/scripts.inc | 2 +- data/maps/SSAnne_B1F_Room5/scripts.inc | 2 +- data/maps/SaffronCity/scripts.inc | 2 +- .../SaffronCity_CopycatsHouse_1F/scripts.inc | 2 +- .../SaffronCity_CopycatsHouse_2F/scripts.inc | 2 +- data/maps/SaffronCity_House/scripts.inc | 2 +- data/maps/SeafoamIslands_B4F/scripts.inc | 2 +- .../scripts.inc | 2 +- data/maps/ThreeIsland/scripts.inc | 2 +- data/maps/ThreeIsland_BerryForest/scripts.inc | 2 +- data/maps/VermilionCity/scripts.inc | 2 +- data/maps/VermilionCity_House3/scripts.inc | 2 +- .../VermilionCity_PokemonFanClub/scripts.inc | 4 +- data/maps/ViridianCity_House1/scripts.inc | 2 +- data/scripts/day_care.inc | 4 +- include/constants/fanfares.h | 22 - include/constants/songs.h | 2 + include/constants/sound.h | 44 + include/gba/m4a_internal.h | 2 + include/sound.h | 10 +- sound/voice_groups.inc | 778 +++++++++--------- src/battle_anim.c | 4 +- src/battle_anim_sound_tasks.c | 19 +- src/battle_controller_link_opponent.c | 7 +- src/battle_controller_link_partner.c | 3 +- src/battle_controller_opponent.c | 7 +- src/battle_controller_player.c | 9 +- src/battle_script_commands.c | 4 +- src/credits.c | 3 +- src/diploma.c | 4 +- src/dodrio_berry_picking.c | 6 +- src/field_effect.c | 3 +- src/hall_of_fame.c | 4 +- src/help_system_util.c | 4 +- src/intro.c | 3 +- src/item_use.c | 4 +- src/overworld.c | 3 +- src/party_menu.c | 3 +- src/pokeball.c | 15 +- src/pokedex_screen.c | 9 +- src/pokemon_summary_screen.c | 5 +- src/save_failed_screen.c | 4 +- src/scrcmd.c | 5 +- src/sound.c | 168 ++-- 64 files changed, 643 insertions(+), 599 deletions(-) delete mode 100644 include/constants/fanfares.h create mode 100644 include/constants/sound.h diff --git a/asm/macros/music_voice.inc b/asm/macros/music_voice.inc index 64dd38214..ff87c56d6 100644 --- a/asm/macros/music_voice.inc +++ b/asm/macros/music_voice.inc @@ -145,7 +145,7 @@ .byte 0xff, 0, 0xff, 0 .endm - .macro cry2 sample:req + .macro cry_reverse sample:req .byte 0x30, 60, 0, 0 .4byte \sample .byte 0xff, 0, 0xff, 0 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 4acb190f7..a111d52b3 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1,6 +1,7 @@ #include "constants/battle.h" #include "constants/battle_anim.h" #include "constants/songs.h" +#include "constants/sound.h" #include "constants/moves.h" .include "asm/macros.inc" .include "asm/macros/battle_anim_script.inc" @@ -5068,7 +5069,7 @@ Move_ROAR:: monbg ANIM_ATTACKER monbgprio_28 0 setalpha 8, 8 - createvisualtask SoundTask_PlayDoubleCry, 2, 0, 2 + createvisualtask SoundTask_PlayDoubleCry, 2, 0, DOUBLE_CRY_ROAR createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, 0, 1 call RoarEffect delay 20 @@ -5093,7 +5094,7 @@ RoarEffect:: Move_GROWL:: loadspritegfx ANIM_TAG_NOISE_LINE - createvisualtask SoundTask_PlayDoubleCry, 2, 0, 255 + createvisualtask SoundTask_PlayDoubleCry, 2, 0, DOUBLE_CRY_GROWL call RoarEffect delay 10 createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 9, 1 diff --git a/data/event_scripts.s b/data/event_scripts.s index e14eb7465..8d00495a7 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -10,6 +10,7 @@ #include "constants/pokemon.h" #include "constants/moves.h" #include "constants/songs.h" +#include "constants/sound.h" #include "constants/species.h" #include "constants/vars.h" #include "constants/battle.h" diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 7577fda82..9c42fd3c1 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -80,7 +80,7 @@ BirthIsland_Exterior_EventScript_Deoxys:: applymovement LOCALID_DEOXYS, Movement_DeoxysApproach waitmovement 0 waitse - playmoncry SPECIES_DEOXYS, 2 + playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER delay 40 waitmoncry setvar VAR_LAST_TALKED, LOCALID_DEOXYS diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc index f69192788..505e8b95f 100644 --- a/data/maps/CeladonCity/scripts.inc +++ b/data/maps/CeladonCity/scripts.inc @@ -45,7 +45,7 @@ CeladonCity_EventScript_Poliwrath:: lock faceplayer waitse - playmoncry SPECIES_POLIWRATH, 0 + playmoncry SPECIES_POLIWRATH, CRY_MODE_NORMAL msgbox CeladonCity_Text_Poliwrath closemessage waitmoncry diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc index 39731ff8d..088efff72 100644 --- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc +++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc @@ -32,7 +32,7 @@ CeladonCity_Condominiums_1F_EventScript_Meowth:: lock faceplayer waitse - playmoncry SPECIES_MEOWTH, 0 + playmoncry SPECIES_MEOWTH, CRY_MODE_NORMAL msgbox CeladonCity_Condominiums_1F_Text_Meowth waitmoncry release @@ -42,7 +42,7 @@ CeladonCity_Condominiums_1F_EventScript_Clefairy:: lock faceplayer waitse - playmoncry SPECIES_CLEFAIRY, 0 + playmoncry SPECIES_CLEFAIRY, CRY_MODE_NORMAL msgbox CeladonCity_Condominiums_1F_Text_Clefairy waitmoncry release @@ -52,7 +52,7 @@ CeladonCity_Condominiums_1F_EventScript_Nidoran:: lock faceplayer waitse - playmoncry SPECIES_NIDORAN_F, 0 + playmoncry SPECIES_NIDORAN_F, CRY_MODE_NORMAL msgbox CeladonCity_Condominiums_1F_Text_Nidoran waitmoncry release diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index 29ec277e8..2963e9228 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -28,7 +28,7 @@ CeruleanCave_B1F_EventScript_Mewtwo:: lock faceplayer waitse - playmoncry SPECIES_MEWTWO, 2 + playmoncry SPECIES_MEWTWO, CRY_MODE_ENCOUNTER message CeruleanCave_B1F_Text_Mew waitmessage waitmoncry diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc index e7fb4e9ee..b0ef13da6 100644 --- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc +++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc @@ -62,7 +62,7 @@ FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou waitmessage waitse - playmoncry SPECIES_LAPRAS, 2 + playmoncry SPECIES_LAPRAS, CRY_MODE_ENCOUNTER waitbuttonpress waitmoncry applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat diff --git a/data/maps/FourIsland_PokemonDayCare/scripts.inc b/data/maps/FourIsland_PokemonDayCare/scripts.inc index 89a384a2f..aef24b72b 100644 --- a/data/maps/FourIsland_PokemonDayCare/scripts.inc +++ b/data/maps/FourIsland_PokemonDayCare/scripts.inc @@ -36,7 +36,7 @@ FourIsland_PokemonDayCare_GiveMonToRaise:: goto_if_eq FourIsland_PokemonDayCare_OnlyOneAliveMonInParty specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies waitse - playmoncry VAR_0x8005, 0 + playmoncry VAR_0x8005, CRY_MODE_NORMAL msgbox DayCare_Text_WellRaiseYourMon waitmoncry special StoreSelectedPokemonInDaycare @@ -137,7 +137,7 @@ FourIsland_PokemonDayCare_RetrieveMon:: playse SE_RS_SHOP msgbox DayCare_Text_HeresYourMon waitse - playmoncry VAR_RESULT, 0 + playmoncry VAR_RESULT, CRY_MODE_NORMAL textcolor 3 msgbox DayCare_Text_TookBackMon call EventScript_RestorePrevTextColor diff --git a/data/maps/LavenderTown_House1/scripts.inc b/data/maps/LavenderTown_House1/scripts.inc index 9c15c485a..58486f961 100644 --- a/data/maps/LavenderTown_House1/scripts.inc +++ b/data/maps/LavenderTown_House1/scripts.inc @@ -18,7 +18,7 @@ LavenderTown_House1_EventScript_Cubone:: lock faceplayer waitse - playmoncry SPECIES_CUBONE, 0 + playmoncry SPECIES_CUBONE, CRY_MODE_NORMAL msgbox LavenderTown_House1_Text_Cubone waitmoncry release diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc index e55c045b8..1fe10e416 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/scripts.inc @@ -54,7 +54,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_Nidorino:: lock faceplayer waitse - playmoncry SPECIES_NIDORINO, 0 + playmoncry SPECIES_NIDORINO, CRY_MODE_NORMAL msgbox LavenderTown_VolunteerPokemonHouse_Text_Nidorino waitmoncry release @@ -64,7 +64,7 @@ LavenderTown_VolunteerPokemonHouse_EventScript_Psyduck:: lock faceplayer waitse - playmoncry SPECIES_PSYDUCK, 0 + playmoncry SPECIES_PSYDUCK, CRY_MODE_NORMAL msgbox LavenderTown_VolunteerPokemonHouse_Text_Psyduck waitmoncry release diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index 174ceff80..3c3757e63 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -29,7 +29,7 @@ MtEmber_Summit_EventScript_Moltres:: faceplayer setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE waitse - playmoncry SPECIES_MOLTRES, 2 + playmoncry SPECIES_MOLTRES, CRY_MODE_ENCOUNTER message Text_Gyaoo waitmessage waitmoncry diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 6271ad61c..b63ac1fd7 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -53,7 +53,7 @@ NavelRock_Base_EventScript_Lugia:: delay 30 delay 50 waitse - playmoncry SPECIES_LUGIA, 2 + playmoncry SPECIES_LUGIA, CRY_MODE_ENCOUNTER waitmoncry delay 20 setvar VAR_0x8004, SPECIES_LUGIA diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index 88abd253e..1f01b72eb 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -49,7 +49,7 @@ NavelRock_Summit_EventScript_HoOh:: setweather 0 doweather waitse - playmoncry SPECIES_HO_OH, 2 + playmoncry SPECIES_HO_OH, CRY_MODE_ENCOUNTER delay 30 waitmoncry delay 60 diff --git a/data/maps/PewterCity_House1/scripts.inc b/data/maps/PewterCity_House1/scripts.inc index a76180f29..56e9c623f 100644 --- a/data/maps/PewterCity_House1/scripts.inc +++ b/data/maps/PewterCity_House1/scripts.inc @@ -26,7 +26,7 @@ PewterCity_House1_EventScript_Nidoran:: PewterCity_House1_EventScript_DoNidoranCry:: textcolor 3 waitse - playmoncry SPECIES_NIDORAN_M, 0 + playmoncry SPECIES_NIDORAN_M, CRY_MODE_NORMAL msgbox PewterCity_House1_Text_Nidoran waitmoncry call EventScript_RestorePrevTextColor diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index d24c42336..e5c33b9af 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -21,7 +21,7 @@ PokemonTower_6F_EventScript_DefeatedMarowakGhost:: message PokemonTower_6F_Text_GhostWasCubonesMother waitmessage waitse - playmoncry SPECIES_MAROWAK, 0 + playmoncry SPECIES_MAROWAK, CRY_MODE_NORMAL waitbuttonpress waitmoncry msgbox PokemonTower_6F_Text_MothersSpiritWasCalmed diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 76641a299..0be023701 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -40,7 +40,7 @@ PowerPlant_EventScript_Zapdos:: faceplayer setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE waitse - playmoncry SPECIES_ZAPDOS, 2 + playmoncry SPECIES_ZAPDOS, CRY_MODE_ENCOUNTER message Text_Gyaoo waitmessage waitmoncry @@ -78,7 +78,7 @@ PowerPlant_EventScript_Electrode1:: faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE waitse - playmoncry SPECIES_ELECTRODE, 2 + playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER delay 40 waitmoncry setflag FLAG_SYS_SPECIAL_WILD_BATTLE @@ -107,7 +107,7 @@ PowerPlant_EventScript_Electrode2:: faceplayer setwildbattle SPECIES_ELECTRODE, 34, ITEM_NONE waitse - playmoncry SPECIES_ELECTRODE, 2 + playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER delay 40 waitmoncry setflag FLAG_SYS_SPECIAL_WILD_BATTLE diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 7a5c9c5a3..e6a1bc440 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -22,7 +22,7 @@ Route12_EventScript_Snorlax:: call EventScript_AwakenSnorlax setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse - playmoncry SPECIES_SNORLAX, 2 + playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER delay 40 waitmoncry setflag FLAG_HIDE_ROUTE_12_SNORLAX diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 132dcd280..c1cd5e8a8 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -41,7 +41,7 @@ Route16_EventScript_Snorlax:: call EventScript_AwakenSnorlax setwildbattle SPECIES_SNORLAX, 30, ITEM_NONE waitse - playmoncry SPECIES_SNORLAX, 2 + playmoncry SPECIES_SNORLAX, CRY_MODE_ENCOUNTER delay 40 waitmoncry setflag FLAG_HIDE_ROUTE_16_SNORLAX diff --git a/data/maps/Route16_House/scripts.inc b/data/maps/Route16_House/scripts.inc index 8deed78a9..373259698 100644 --- a/data/maps/Route16_House/scripts.inc +++ b/data/maps/Route16_House/scripts.inc @@ -29,7 +29,7 @@ Route16_House_EventScript_Fearow:: lock faceplayer waitse - playmoncry SPECIES_FEAROW, 0 + playmoncry SPECIES_FEAROW, CRY_MODE_NORMAL msgbox Route16_House_Text_Fearow waitmoncry release diff --git a/data/maps/SSAnne_1F_Room3/scripts.inc b/data/maps/SSAnne_1F_Room3/scripts.inc index 67fc9ba93..3f3beb86c 100644 --- a/data/maps/SSAnne_1F_Room3/scripts.inc +++ b/data/maps/SSAnne_1F_Room3/scripts.inc @@ -13,7 +13,7 @@ SSAnne_1F_Room3_EventScript_Wigglytuff:: lock faceplayer waitse - playmoncry SPECIES_WIGGLYTUFF, 0 + playmoncry SPECIES_WIGGLYTUFF, CRY_MODE_NORMAL msgbox SSAnne_1F_Room3_Text_Wigglytuff waitmoncry release diff --git a/data/maps/SSAnne_B1F_Room5/scripts.inc b/data/maps/SSAnne_B1F_Room5/scripts.inc index f2358c179..8cd94e4ea 100644 --- a/data/maps/SSAnne_B1F_Room5/scripts.inc +++ b/data/maps/SSAnne_B1F_Room5/scripts.inc @@ -9,7 +9,7 @@ SSAnne_B1F_Room5_EventScript_Machoke:: lock faceplayer waitse - playmoncry SPECIES_MACHOKE, 0 + playmoncry SPECIES_MACHOKE, CRY_MODE_NORMAL msgbox SSAnne_B1F_Room5_Text_Machoke waitmoncry release diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc index 085c0e37a..44dba429b 100644 --- a/data/maps/SaffronCity/scripts.inc +++ b/data/maps/SaffronCity/scripts.inc @@ -76,7 +76,7 @@ SaffronCity_EventScript_Pidgeot:: lock faceplayer waitse - playmoncry SPECIES_PIDGEOT, 0 + playmoncry SPECIES_PIDGEOT, CRY_MODE_NORMAL msgbox SaffronCity_Text_Pidgeot waitmoncry release diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc index 4dfd950e0..86b012e28 100644 --- a/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc +++ b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc @@ -13,7 +13,7 @@ SaffronCity_CopycatsHouse_1F_EventScript_Chansey:: lock faceplayer waitse - playmoncry SPECIES_CHANSEY, 0 + playmoncry SPECIES_CHANSEY, CRY_MODE_NORMAL msgbox SaffronCity_CopycatsHouse_1F_Text_Chansey waitmoncry release diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc index b29cff36d..e30cb601b 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc +++ b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc @@ -5,7 +5,7 @@ SaffronCity_CopycatsHouse_2F_EventScript_Doduo:: lock faceplayer waitse - playmoncry SPECIES_DODUO, 0 + playmoncry SPECIES_DODUO, CRY_MODE_NORMAL msgbox SaffronCity_CopycatsHouse_2F_Text_Doduo waitmoncry release diff --git a/data/maps/SaffronCity_House/scripts.inc b/data/maps/SaffronCity_House/scripts.inc index 8401002fa..898f2d863 100644 --- a/data/maps/SaffronCity_House/scripts.inc +++ b/data/maps/SaffronCity_House/scripts.inc @@ -13,7 +13,7 @@ SaffronCity_House_EventScript_Pidgey:: lock faceplayer waitse - playmoncry SPECIES_PIDGEY, 0 + playmoncry SPECIES_PIDGEY, CRY_MODE_NORMAL msgbox SaffronCity_House_Text_Pidgey waitmoncry release diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 31cb2fe30..342c46759 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -164,7 +164,7 @@ SeafoamIslands_B4F_EventScript_Articuno:: faceplayer setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE waitse - playmoncry SPECIES_ARTICUNO, 2 + playmoncry SPECIES_ARTICUNO, CRY_MODE_ENCOUNTER message Text_Gyaoo waitmessage waitmoncry diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 4b33397aa..e070f409d 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -76,7 +76,7 @@ SevenIsland_SevaultCanyon_House_EventScript_Chansey:: lock faceplayer waitse - playmoncry SPECIES_CHANSEY, 0 + playmoncry SPECIES_CHANSEY, CRY_MODE_NORMAL msgbox SevenIsland_SevaultCanyon_House_Text_Chansey waitmoncry release diff --git a/data/maps/ThreeIsland/scripts.inc b/data/maps/ThreeIsland/scripts.inc index 7293d0bab..f75505ea2 100644 --- a/data/maps/ThreeIsland/scripts.inc +++ b/data/maps/ThreeIsland/scripts.inc @@ -404,7 +404,7 @@ ThreeIsland_EventScript_Doduo:: lock faceplayer waitse - playmoncry SPECIES_DODUO, 0 + playmoncry SPECIES_DODUO, CRY_MODE_NORMAL msgbox ThreeIsland_Text_Doduo waitmoncry release diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index 35134b0b3..8f5210dec 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -21,7 +21,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: msgbox ThreeIsland_BerryForest_Text_HereItComesAgain goto_if_questlog EventScript_ReleaseEnd waitse - playmoncry SPECIES_HYPNO, 2 + playmoncry SPECIES_HYPNO, CRY_MODE_ENCOUNTER waitmoncry setwildbattle SPECIES_HYPNO, 30, ITEM_NONE dowildbattle diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 2d1e95944..128850f03 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -249,7 +249,7 @@ VermilionCity_EventScript_Machop:: lock faceplayer waitse - playmoncry SPECIES_MACHOP, 0 + playmoncry SPECIES_MACHOP, CRY_MODE_NORMAL msgbox VermilionCity_Text_Machop waitmoncry msgbox VermilionCity_Text_MachopStompingLandFlat diff --git a/data/maps/VermilionCity_House3/scripts.inc b/data/maps/VermilionCity_House3/scripts.inc index aeeb8b77c..2bc76d614 100644 --- a/data/maps/VermilionCity_House3/scripts.inc +++ b/data/maps/VermilionCity_House3/scripts.inc @@ -13,7 +13,7 @@ VermilionCity_House3_EventScript_Pidgey:: lock faceplayer waitse - playmoncry SPECIES_PIDGEY, 0 + playmoncry SPECIES_PIDGEY, CRY_MODE_NORMAL msgbox VermilionCity_House3_Text_Pidgey waitmoncry release diff --git a/data/maps/VermilionCity_PokemonFanClub/scripts.inc b/data/maps/VermilionCity_PokemonFanClub/scripts.inc index 9310eff12..6c0efe151 100644 --- a/data/maps/VermilionCity_PokemonFanClub/scripts.inc +++ b/data/maps/VermilionCity_PokemonFanClub/scripts.inc @@ -99,7 +99,7 @@ VermilionCity_PokemonFanClub_EventScript_Pikachu:: lock faceplayer waitse - playmoncry SPECIES_PIKACHU, 0 + playmoncry SPECIES_PIKACHU, CRY_MODE_NORMAL msgbox VermilionCity_PokemonFanClub_Text_Pikachu waitmoncry release @@ -109,7 +109,7 @@ VermilionCity_PokemonFanClub_EventScript_Seel:: lock faceplayer waitse - playmoncry SPECIES_SEEL, 0 + playmoncry SPECIES_SEEL, CRY_MODE_NORMAL msgbox VermilionCity_PokemonFanClub_Text_Seel waitmoncry release diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc index 20b7b06d6..0ef2732aa 100644 --- a/data/maps/ViridianCity_House1/scripts.inc +++ b/data/maps/ViridianCity_House1/scripts.inc @@ -13,7 +13,7 @@ ViridianCity_House1_EventScript_Speary:: lock faceplayer waitse - playmoncry SPECIES_SPEAROW, 0 + playmoncry SPECIES_SPEAROW, CRY_MODE_NORMAL msgbox ViridianCity_House1_Text_Speary waitmoncry release diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 9fa631bbc..febf7aa28 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -31,7 +31,7 @@ Route5_PokemonDayCare_EventScript_TryGiveMon:: specialvar VAR_0x8005, GetSelectedMonNicknameAndSpecies msgbox Route5_PokemonDayCare_Text_LookAfterMonForAWhile waitse - playmoncry VAR_0x8005, 0 + playmoncry VAR_0x8005, CRY_MODE_NORMAL msgbox Route5_PokemonDayCare_Text_ComeSeeMeInAWhile waitmoncry special PutMonInRoute5Daycare @@ -100,7 +100,7 @@ Route5_PokemonDayCare_EventScript_RetrieveMon:: msgbox Route5_PokemonDayCare_Text_ThankYouHeresMon textcolor 3 waitse - playmoncry VAR_RESULT, 0 + playmoncry VAR_RESULT, CRY_MODE_NORMAL msgbox Route5_PokemonDayCare_Text_PlayerGotMonBack call EventScript_RestorePrevTextColor waitmoncry diff --git a/include/constants/fanfares.h b/include/constants/fanfares.h deleted file mode 100644 index 21d3af79c..000000000 --- a/include/constants/fanfares.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef GUARD_CONSTANTS_FANFARES_H -#define GUARD_CONSTANTS_FANFARES_H - -enum Fanfares -{ - FANFARE_00, - FANFARE_01, - FANFARE_02, - FANFARE_03, - FANFARE_04, - FANFARE_05, - FANFARE_06, - FANFARE_07, - FANFARE_08, - FANFARE_09, - FANFARE_10, - FANFARE_POKEFLUTE, - FANFARE_KEY_ITEM, - FANFARE_DEX_EVAL -}; - -#endif //GUARD_CONSTANTS_FANFARES_H diff --git a/include/constants/songs.h b/include/constants/songs.h index 1c8f46844..7addf89ec 100644 --- a/include/constants/songs.h +++ b/include/constants/songs.h @@ -353,4 +353,6 @@ #define MUS_SLOW_PALLET 345 // MUS_RG_SLOWMASARA #define MUS_TEACHY_TV_MENU 346 // MUS_RG_TVNOIZE +#define MUS_NONE 0xFFFF + #endif // GUARD_CONSTANTS_SONGS_H diff --git a/include/constants/sound.h b/include/constants/sound.h new file mode 100644 index 000000000..0890f4290 --- /dev/null +++ b/include/constants/sound.h @@ -0,0 +1,44 @@ +#ifndef GUARD_CONSTANTS_SOUND_H +#define GUARD_CONSTANTS_SOUND_H + +#define FANFARE_LEVEL_UP 0 +#define FANFARE_OBTAIN_ITEM 1 +#define FANFARE_EVOLVED 2 +#define FANFARE_OBTAIN_TMHM 3 +#define FANFARE_HEAL 4 +#define FANFARE_OBTAIN_BADGE 5 +#define FANFARE_MOVE_DELETED 6 +#define FANFARE_OBTAIN_BERRY 7 +#define FANFARE_SLOTS_JACKPOT 8 +#define FANFARE_SLOTS_WIN 9 +#define FANFARE_TOO_BAD 10 +#define FANFARE_POKE_FLUTE 11 +#define FANFARE_KEY_ITEM 12 +#define FANFARE_DEX_EVAL 13 + +#define CRY_MODE_NORMAL 0 // Default +#define CRY_MODE_DOUBLES 1 // Shortened cry for double battles +#define CRY_MODE_ENCOUNTER 2 // Used when starting a static encounter, or when a Pokémon is "aggressive" +#define CRY_MODE_HIGH_PITCH 3 // Highest pitch mode, used exclusively by the move Howl +#define CRY_MODE_ECHO_START 4 // For 1st half of cry used by the move Hyper Voice. Played in reverse +#define CRY_MODE_FAINT 5 // Used when a Pokémon faints +#define CRY_MODE_ECHO_END 6 // For 2nd half of cry used by the move Hyper Voice +#define CRY_MODE_ROAR_1 7 // For 1st cry used by the move Roar +#define CRY_MODE_ROAR_2 8 // For 2nd cry used by the move Roar +#define CRY_MODE_GROWL_1 9 // For 1st cry used by the move Growl. Played in reverse +#define CRY_MODE_GROWL_2 10 // For 2nd cry used by the move Growl +#define CRY_MODE_WEAK 11 // Used when a Pokémon is unhealthy +#define CRY_MODE_WEAK_DOUBLES 12 // Equivalent to CRY_MODE_DOUBLES for CRY_MODE_WEAK + +// Given to SoundTask_PlayDoubleCry to determine which cry mode to use. Values are arbitrary +#define DOUBLE_CRY_ROAR 2 +#define DOUBLE_CRY_GROWL 255 + +#define CRY_PRIORITY_NORMAL 10 +#define CRY_PRIORITY_AMBIENT 1 + +// Cry volume was changed from 125 in R/S to 120 for FRLG/Em, but was (accidentally?) not updated outside of sound.c +#define CRY_VOLUME 120 +#define CRY_VOLUME_RS 125 + +#endif //GUARD_CONSTANTS_SOUND_H diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index 2ccbb18f5..eeb79391b 100644 --- a/include/gba/m4a_internal.h +++ b/include/gba/m4a_internal.h @@ -313,6 +313,8 @@ struct MusicPlayerTrack #define MAX_MUSICPLAYER_TRACKS 16 +#define TRACKS_ALL 0xFFFF + #define TEMPORARY_FADE 0x0001 #define FADE_IN 0x0002 #define FADE_VOL_MAX 64 diff --git a/include/sound.h b/include/sound.h index 82ec758c5..79dd64c54 100644 --- a/include/sound.h +++ b/include/sound.h @@ -25,12 +25,10 @@ void FadeInBGM(u8 speed); void FadeOutBGM(u8 speed); bool8 IsBGMStopped(void); void PlayCry_Normal(u16 species, s8 pan); -void PlayCry2(u16 species, s8 pan, s8 volume, u8 priority); -void PlayCry3(u16 species, s8 pan, u8 mode); -void PlayCry4(u16 species, s8 pan, u8 mode); -void PlayCry5(u16 species, u8 mode); -void PlayCry6(u16 species, s8 pan, u8 mode); -void PlayCry7(u16 species, u8 mode); +void PlayCry_NormalNoDucking(u16 species, s8 pan, s8 volume, u8 priority); +void PlayCry_ByMode(u16 species, s8 pan, u8 mode); +void PlayCry_ReleaseDouble(u16 species, s8 pan, u8 mode); +void PlayCry_Script(u16 species, u8 mode); void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode); bool8 IsCryFinished(void); void StopCryAndClearCrySongs(void); diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc index b7fae524e..00bb2cbb0 100644 --- a/sound/voice_groups.inc +++ b/sound/voice_groups.inc @@ -1383,395 +1383,395 @@ gCryTable:: cry Cry_Deoxys cry Cry_Chimecho -gCryTable2:: - cry2 Cry_Bulbasaur - cry2 Cry_Ivysaur - cry2 Cry_Venusaur - cry2 Cry_Charmander - cry2 Cry_Charmeleon - cry2 Cry_Charizard - cry2 Cry_Squirtle - cry2 Cry_Wartortle - cry2 Cry_Blastoise - cry2 Cry_Caterpie - cry2 Cry_Metapod - cry2 Cry_Butterfree - cry2 Cry_Weedle - cry2 Cry_Kakuna - cry2 Cry_Beedrill - cry2 Cry_Pidgey - cry2 Cry_Pidgeotto - cry2 Cry_Pidgeot - cry2 Cry_Rattata - cry2 Cry_Raticate - cry2 Cry_Spearow - cry2 Cry_Fearow - cry2 Cry_Ekans - cry2 Cry_Arbok - cry2 Cry_Pikachu - cry2 Cry_Raichu - cry2 Cry_Sandshrew - cry2 Cry_Sandslash - cry2 Cry_NidoranF - cry2 Cry_Nidorina - cry2 Cry_Nidoqueen - cry2 Cry_NidoranM - cry2 Cry_Nidorino - cry2 Cry_Nidoking - cry2 Cry_Clefairy - cry2 Cry_Clefable - cry2 Cry_Vulpix - cry2 Cry_Ninetales - cry2 Cry_Jigglypuff - cry2 Cry_Wigglytuff - cry2 Cry_Zubat - cry2 Cry_Golbat - cry2 Cry_Oddish - cry2 Cry_Gloom - cry2 Cry_Vileplume - cry2 Cry_Paras - cry2 Cry_Parasect - cry2 Cry_Venonat - cry2 Cry_Venomoth - cry2 Cry_Diglett - cry2 Cry_Dugtrio - cry2 Cry_Meowth - cry2 Cry_Persian - cry2 Cry_Psyduck - cry2 Cry_Golduck - cry2 Cry_Mankey - cry2 Cry_Primeape - cry2 Cry_Growlithe - cry2 Cry_Arcanine - cry2 Cry_Poliwag - cry2 Cry_Poliwhirl - cry2 Cry_Poliwrath - cry2 Cry_Abra - cry2 Cry_Kadabra - cry2 Cry_Alakazam - cry2 Cry_Machop - cry2 Cry_Machoke - cry2 Cry_Machamp - cry2 Cry_Bellsprout - cry2 Cry_Weepinbell - cry2 Cry_Victreebel - cry2 Cry_Tentacool - cry2 Cry_Tentacruel - cry2 Cry_Geodude - cry2 Cry_Graveler - cry2 Cry_Golem - cry2 Cry_Ponyta - cry2 Cry_Rapidash - cry2 Cry_Slowpoke - cry2 Cry_Slowbro - cry2 Cry_Magnemite - cry2 Cry_Magneton - cry2 Cry_Farfetchd - cry2 Cry_Doduo - cry2 Cry_Dodrio - cry2 Cry_Seel - cry2 Cry_Dewgong - cry2 Cry_Grimer - cry2 Cry_Muk - cry2 Cry_Shellder - cry2 Cry_Cloyster - cry2 Cry_Gastly - cry2 Cry_Haunter - cry2 Cry_Gengar - cry2 Cry_Onix - cry2 Cry_Drowzee - cry2 Cry_Hypno - cry2 Cry_Krabby - cry2 Cry_Kingler - cry2 Cry_Voltorb - cry2 Cry_Electrode - cry2 Cry_Exeggcute - cry2 Cry_Exeggutor - cry2 Cry_Cubone - cry2 Cry_Marowak - cry2 Cry_Hitmonlee - cry2 Cry_Hitmonchan - cry2 Cry_Lickitung - cry2 Cry_Koffing - cry2 Cry_Weezing - cry2 Cry_Rhyhorn - cry2 Cry_Rhydon - cry2 Cry_Chansey - cry2 Cry_Tangela - cry2 Cry_Kangaskhan - cry2 Cry_Horsea - cry2 Cry_Seadra - cry2 Cry_Goldeen - cry2 Cry_Seaking - cry2 Cry_Staryu - cry2 Cry_Starmie - cry2 Cry_MrMime - cry2 Cry_Scyther - cry2 Cry_Jynx - cry2 Cry_Electabuzz - cry2 Cry_Magmar - cry2 Cry_Pinsir - cry2 Cry_Tauros - cry2 Cry_Magikarp - cry2 Cry_Gyarados - cry2 Cry_Lapras - cry2 Cry_Ditto - cry2 Cry_Eevee - cry2 Cry_Vaporeon - cry2 Cry_Jolteon - cry2 Cry_Flareon - cry2 Cry_Porygon - cry2 Cry_Omanyte - cry2 Cry_Omastar - cry2 Cry_Kabuto - cry2 Cry_Kabutops - cry2 Cry_Aerodactyl - cry2 Cry_Snorlax - cry2 Cry_Articuno - cry2 Cry_Zapdos - cry2 Cry_Moltres - cry2 Cry_Dratini - cry2 Cry_Dragonair - cry2 Cry_Dragonite - cry2 Cry_Mewtwo - cry2 Cry_Mew - cry2 Cry_Chikorita - cry2 Cry_Bayleef - cry2 Cry_Meganium - cry2 Cry_Cyndaquil - cry2 Cry_Quilava - cry2 Cry_Typhlosion - cry2 Cry_Totodile - cry2 Cry_Croconaw - cry2 Cry_Feraligatr - cry2 Cry_Sentret - cry2 Cry_Furret - cry2 Cry_Hoothoot - cry2 Cry_Noctowl - cry2 Cry_Ledyba - cry2 Cry_Ledian - cry2 Cry_Spinarak - cry2 Cry_Ariados - cry2 Cry_Crobat - cry2 Cry_Chinchou - cry2 Cry_Lanturn - cry2 Cry_Pichu - cry2 Cry_Cleffa - cry2 Cry_Igglybuff - cry2 Cry_Togepi - cry2 Cry_Togetic - cry2 Cry_Natu - cry2 Cry_Xatu - cry2 Cry_Mareep - cry2 Cry_Flaaffy - cry2 Cry_Ampharos - cry2 Cry_Bellossom - cry2 Cry_Marill - cry2 Cry_Azumarill - cry2 Cry_Sudowoodo - cry2 Cry_Politoed - cry2 Cry_Hoppip - cry2 Cry_Skiploom - cry2 Cry_Jumpluff - cry2 Cry_Aipom - cry2 Cry_Sunkern - cry2 Cry_Sunflora - cry2 Cry_Yanma - cry2 Cry_Wooper - cry2 Cry_Quagsire - cry2 Cry_Espeon - cry2 Cry_Umbreon - cry2 Cry_Murkrow - cry2 Cry_Slowking - cry2 Cry_Misdreavus - cry2 Cry_Unown - cry2 Cry_Wobbuffet - cry2 Cry_Girafarig - cry2 Cry_Pineco - cry2 Cry_Forretress - cry2 Cry_Dunsparce - cry2 Cry_Gligar - cry2 Cry_Steelix - cry2 Cry_Snubbull - cry2 Cry_Granbull - cry2 Cry_Qwilfish - cry2 Cry_Scizor - cry2 Cry_Shuckle - cry2 Cry_Heracross - cry2 Cry_Sneasel - cry2 Cry_Teddiursa - cry2 Cry_Ursaring - cry2 Cry_Slugma - cry2 Cry_Magcargo - cry2 Cry_Swinub - cry2 Cry_Piloswine - cry2 Cry_Corsola - cry2 Cry_Remoraid - cry2 Cry_Octillery - cry2 Cry_Delibird - cry2 Cry_Mantine - cry2 Cry_Skarmory - cry2 Cry_Houndour - cry2 Cry_Houndoom - cry2 Cry_Kingdra - cry2 Cry_Phanpy - cry2 Cry_Donphan - cry2 Cry_Porygon2 - cry2 Cry_Stantler - cry2 Cry_Smeargle - cry2 Cry_Tyrogue - cry2 Cry_Hitmontop - cry2 Cry_Smoochum - cry2 Cry_Elekid - cry2 Cry_Magby - cry2 Cry_Miltank - cry2 Cry_Blissey - cry2 Cry_Raikou - cry2 Cry_Entei - cry2 Cry_Suicune - cry2 Cry_Larvitar - cry2 Cry_Pupitar - cry2 Cry_Tyranitar - cry2 Cry_Lugia - cry2 Cry_HoOh - cry2 Cry_Celebi - cry2 Cry_Kecleon - cry2 Cry_Roselia - cry2 Cry_Torkoal - cry2 Cry_Electrike - cry2 Cry_Manectric - cry2 Cry_Duskull - cry2 Cry_Latias - cry2 Cry_Wynaut - cry2 Cry_Seviper - cry2 Cry_Sharpedo - cry2 Cry_Zangoose - cry2 Cry_Azurill - cry2 Cry_Swablu - cry2 Cry_Altaria - cry2 Cry_Unused265 - cry2 Cry_Taillow - cry2 Cry_Swellow - cry2 Cry_Unused268 - cry2 Cry_Spinda - cry2 Cry_Torchic - cry2 Cry_Combusken - cry2 Cry_Blaziken - cry2 Cry_Treecko - cry2 Cry_Grovyle - cry2 Cry_Sceptile - cry2 Cry_Mudkip - cry2 Cry_Marshtomp - cry2 Cry_Swampert - cry2 Cry_Pelipper - cry2 Cry_Wingull - cry2 Cry_Banette - cry2 Cry_Shuppet - cry2 Cry_Lotad - cry2 Cry_Lombre - cry2 Cry_Ludicolo - cry2 Cry_Seedot - cry2 Cry_Nuzleaf - cry2 Cry_Shiftry - cry2 Cry_Carvanha - cry2 Cry_Wurmple - cry2 Cry_Silcoon - cry2 Cry_Beautifly - cry2 Cry_Cascoon - cry2 Cry_Dustox - cry2 Cry_Ralts - cry2 Cry_Kirlia - cry2 Cry_Gardevoir - cry2 Cry_Slakoth - cry2 Cry_Vigoroth - cry2 Cry_Slaking - cry2 Cry_Nincada - cry2 Cry_Ninjask - cry2 Cry_Shedinja - cry2 Cry_Makuhita - cry2 Cry_Hariyama - cry2 Cry_Nosepass - cry2 Cry_Glalie - cry2 Cry_Plusle - cry2 Cry_Minun - cry2 Cry_Surskit - cry2 Cry_Masquerain - cry2 Cry_Skitty - cry2 Cry_Delcatty - cry2 Cry_Gulpin - cry2 Cry_Swalot - cry2 Cry_Numel - cry2 Cry_Camerupt - cry2 Cry_Barboach - cry2 Cry_Whiscash - cry2 Cry_Corphish - cry2 Cry_Crawdaunt - cry2 Cry_Spoink - cry2 Cry_Grumpig - cry2 Cry_Trapinch - cry2 Cry_Vibrava - cry2 Cry_Flygon - cry2 Cry_Cacnea - cry2 Cry_Cacturne - cry2 Cry_Baltoy - cry2 Cry_Claydol - cry2 Cry_Lunatone - cry2 Cry_Solrock - cry2 Cry_Feebas - cry2 Cry_Milotic - cry2 Cry_Absol - cry2 Cry_Meditite - cry2 Cry_Medicham - cry2 Cry_Spheal - cry2 Cry_Sealeo - cry2 Cry_Walrein - cry2 Cry_Clamperl - cry2 Cry_Huntail - cry2 Cry_Gorebyss - cry2 Cry_Lileep - cry2 Cry_Cradily - cry2 Cry_Anorith - cry2 Cry_Armaldo - cry2 Cry_Beldum - cry2 Cry_Metang - cry2 Cry_Metagross - cry2 Cry_Bagon - cry2 Cry_Shelgon - cry2 Cry_Regirock - cry2 Cry_Regice - cry2 Cry_Registeel - cry2 Cry_Castform - cry2 Cry_Volbeat - cry2 Cry_Illumise - cry2 Cry_Poochyena - cry2 Cry_Mightyena - cry2 Cry_Dusclops - cry2 Cry_Sableye - cry2 Cry_Mawile - cry2 Cry_Aron - cry2 Cry_Lairon - cry2 Cry_Aggron - cry2 Cry_Relicanth - cry2 Cry_Luvdisc - cry2 Cry_Groudon - cry2 Cry_Kyogre - cry2 Cry_Rayquaza - cry2 Cry_Salamence - cry2 Cry_Breloom - cry2 Cry_Shroomish - cry2 Cry_Linoone - cry2 Cry_Tropius - cry2 Cry_Wailmer - cry2 Cry_Zigzagoon - cry2 Cry_Exploud - cry2 Cry_Loudred - cry2 Cry_Wailord - cry2 Cry_Whismur - cry2 Cry_Snorunt - cry2 Cry_Latios - cry2 Cry_Jirachi - cry2 Cry_Deoxys - cry2 Cry_Chimecho +gCryTable_Reverse:: + cry_reverse Cry_Bulbasaur + cry_reverse Cry_Ivysaur + cry_reverse Cry_Venusaur + cry_reverse Cry_Charmander + cry_reverse Cry_Charmeleon + cry_reverse Cry_Charizard + cry_reverse Cry_Squirtle + cry_reverse Cry_Wartortle + cry_reverse Cry_Blastoise + cry_reverse Cry_Caterpie + cry_reverse Cry_Metapod + cry_reverse Cry_Butterfree + cry_reverse Cry_Weedle + cry_reverse Cry_Kakuna + cry_reverse Cry_Beedrill + cry_reverse Cry_Pidgey + cry_reverse Cry_Pidgeotto + cry_reverse Cry_Pidgeot + cry_reverse Cry_Rattata + cry_reverse Cry_Raticate + cry_reverse Cry_Spearow + cry_reverse Cry_Fearow + cry_reverse Cry_Ekans + cry_reverse Cry_Arbok + cry_reverse Cry_Pikachu + cry_reverse Cry_Raichu + cry_reverse Cry_Sandshrew + cry_reverse Cry_Sandslash + cry_reverse Cry_NidoranF + cry_reverse Cry_Nidorina + cry_reverse Cry_Nidoqueen + cry_reverse Cry_NidoranM + cry_reverse Cry_Nidorino + cry_reverse Cry_Nidoking + cry_reverse Cry_Clefairy + cry_reverse Cry_Clefable + cry_reverse Cry_Vulpix + cry_reverse Cry_Ninetales + cry_reverse Cry_Jigglypuff + cry_reverse Cry_Wigglytuff + cry_reverse Cry_Zubat + cry_reverse Cry_Golbat + cry_reverse Cry_Oddish + cry_reverse Cry_Gloom + cry_reverse Cry_Vileplume + cry_reverse Cry_Paras + cry_reverse Cry_Parasect + cry_reverse Cry_Venonat + cry_reverse Cry_Venomoth + cry_reverse Cry_Diglett + cry_reverse Cry_Dugtrio + cry_reverse Cry_Meowth + cry_reverse Cry_Persian + cry_reverse Cry_Psyduck + cry_reverse Cry_Golduck + cry_reverse Cry_Mankey + cry_reverse Cry_Primeape + cry_reverse Cry_Growlithe + cry_reverse Cry_Arcanine + cry_reverse Cry_Poliwag + cry_reverse Cry_Poliwhirl + cry_reverse Cry_Poliwrath + cry_reverse Cry_Abra + cry_reverse Cry_Kadabra + cry_reverse Cry_Alakazam + cry_reverse Cry_Machop + cry_reverse Cry_Machoke + cry_reverse Cry_Machamp + cry_reverse Cry_Bellsprout + cry_reverse Cry_Weepinbell + cry_reverse Cry_Victreebel + cry_reverse Cry_Tentacool + cry_reverse Cry_Tentacruel + cry_reverse Cry_Geodude + cry_reverse Cry_Graveler + cry_reverse Cry_Golem + cry_reverse Cry_Ponyta + cry_reverse Cry_Rapidash + cry_reverse Cry_Slowpoke + cry_reverse Cry_Slowbro + cry_reverse Cry_Magnemite + cry_reverse Cry_Magneton + cry_reverse Cry_Farfetchd + cry_reverse Cry_Doduo + cry_reverse Cry_Dodrio + cry_reverse Cry_Seel + cry_reverse Cry_Dewgong + cry_reverse Cry_Grimer + cry_reverse Cry_Muk + cry_reverse Cry_Shellder + cry_reverse Cry_Cloyster + cry_reverse Cry_Gastly + cry_reverse Cry_Haunter + cry_reverse Cry_Gengar + cry_reverse Cry_Onix + cry_reverse Cry_Drowzee + cry_reverse Cry_Hypno + cry_reverse Cry_Krabby + cry_reverse Cry_Kingler + cry_reverse Cry_Voltorb + cry_reverse Cry_Electrode + cry_reverse Cry_Exeggcute + cry_reverse Cry_Exeggutor + cry_reverse Cry_Cubone + cry_reverse Cry_Marowak + cry_reverse Cry_Hitmonlee + cry_reverse Cry_Hitmonchan + cry_reverse Cry_Lickitung + cry_reverse Cry_Koffing + cry_reverse Cry_Weezing + cry_reverse Cry_Rhyhorn + cry_reverse Cry_Rhydon + cry_reverse Cry_Chansey + cry_reverse Cry_Tangela + cry_reverse Cry_Kangaskhan + cry_reverse Cry_Horsea + cry_reverse Cry_Seadra + cry_reverse Cry_Goldeen + cry_reverse Cry_Seaking + cry_reverse Cry_Staryu + cry_reverse Cry_Starmie + cry_reverse Cry_MrMime + cry_reverse Cry_Scyther + cry_reverse Cry_Jynx + cry_reverse Cry_Electabuzz + cry_reverse Cry_Magmar + cry_reverse Cry_Pinsir + cry_reverse Cry_Tauros + cry_reverse Cry_Magikarp + cry_reverse Cry_Gyarados + cry_reverse Cry_Lapras + cry_reverse Cry_Ditto + cry_reverse Cry_Eevee + cry_reverse Cry_Vaporeon + cry_reverse Cry_Jolteon + cry_reverse Cry_Flareon + cry_reverse Cry_Porygon + cry_reverse Cry_Omanyte + cry_reverse Cry_Omastar + cry_reverse Cry_Kabuto + cry_reverse Cry_Kabutops + cry_reverse Cry_Aerodactyl + cry_reverse Cry_Snorlax + cry_reverse Cry_Articuno + cry_reverse Cry_Zapdos + cry_reverse Cry_Moltres + cry_reverse Cry_Dratini + cry_reverse Cry_Dragonair + cry_reverse Cry_Dragonite + cry_reverse Cry_Mewtwo + cry_reverse Cry_Mew + cry_reverse Cry_Chikorita + cry_reverse Cry_Bayleef + cry_reverse Cry_Meganium + cry_reverse Cry_Cyndaquil + cry_reverse Cry_Quilava + cry_reverse Cry_Typhlosion + cry_reverse Cry_Totodile + cry_reverse Cry_Croconaw + cry_reverse Cry_Feraligatr + cry_reverse Cry_Sentret + cry_reverse Cry_Furret + cry_reverse Cry_Hoothoot + cry_reverse Cry_Noctowl + cry_reverse Cry_Ledyba + cry_reverse Cry_Ledian + cry_reverse Cry_Spinarak + cry_reverse Cry_Ariados + cry_reverse Cry_Crobat + cry_reverse Cry_Chinchou + cry_reverse Cry_Lanturn + cry_reverse Cry_Pichu + cry_reverse Cry_Cleffa + cry_reverse Cry_Igglybuff + cry_reverse Cry_Togepi + cry_reverse Cry_Togetic + cry_reverse Cry_Natu + cry_reverse Cry_Xatu + cry_reverse Cry_Mareep + cry_reverse Cry_Flaaffy + cry_reverse Cry_Ampharos + cry_reverse Cry_Bellossom + cry_reverse Cry_Marill + cry_reverse Cry_Azumarill + cry_reverse Cry_Sudowoodo + cry_reverse Cry_Politoed + cry_reverse Cry_Hoppip + cry_reverse Cry_Skiploom + cry_reverse Cry_Jumpluff + cry_reverse Cry_Aipom + cry_reverse Cry_Sunkern + cry_reverse Cry_Sunflora + cry_reverse Cry_Yanma + cry_reverse Cry_Wooper + cry_reverse Cry_Quagsire + cry_reverse Cry_Espeon + cry_reverse Cry_Umbreon + cry_reverse Cry_Murkrow + cry_reverse Cry_Slowking + cry_reverse Cry_Misdreavus + cry_reverse Cry_Unown + cry_reverse Cry_Wobbuffet + cry_reverse Cry_Girafarig + cry_reverse Cry_Pineco + cry_reverse Cry_Forretress + cry_reverse Cry_Dunsparce + cry_reverse Cry_Gligar + cry_reverse Cry_Steelix + cry_reverse Cry_Snubbull + cry_reverse Cry_Granbull + cry_reverse Cry_Qwilfish + cry_reverse Cry_Scizor + cry_reverse Cry_Shuckle + cry_reverse Cry_Heracross + cry_reverse Cry_Sneasel + cry_reverse Cry_Teddiursa + cry_reverse Cry_Ursaring + cry_reverse Cry_Slugma + cry_reverse Cry_Magcargo + cry_reverse Cry_Swinub + cry_reverse Cry_Piloswine + cry_reverse Cry_Corsola + cry_reverse Cry_Remoraid + cry_reverse Cry_Octillery + cry_reverse Cry_Delibird + cry_reverse Cry_Mantine + cry_reverse Cry_Skarmory + cry_reverse Cry_Houndour + cry_reverse Cry_Houndoom + cry_reverse Cry_Kingdra + cry_reverse Cry_Phanpy + cry_reverse Cry_Donphan + cry_reverse Cry_Porygon2 + cry_reverse Cry_Stantler + cry_reverse Cry_Smeargle + cry_reverse Cry_Tyrogue + cry_reverse Cry_Hitmontop + cry_reverse Cry_Smoochum + cry_reverse Cry_Elekid + cry_reverse Cry_Magby + cry_reverse Cry_Miltank + cry_reverse Cry_Blissey + cry_reverse Cry_Raikou + cry_reverse Cry_Entei + cry_reverse Cry_Suicune + cry_reverse Cry_Larvitar + cry_reverse Cry_Pupitar + cry_reverse Cry_Tyranitar + cry_reverse Cry_Lugia + cry_reverse Cry_HoOh + cry_reverse Cry_Celebi + cry_reverse Cry_Kecleon + cry_reverse Cry_Roselia + cry_reverse Cry_Torkoal + cry_reverse Cry_Electrike + cry_reverse Cry_Manectric + cry_reverse Cry_Duskull + cry_reverse Cry_Latias + cry_reverse Cry_Wynaut + cry_reverse Cry_Seviper + cry_reverse Cry_Sharpedo + cry_reverse Cry_Zangoose + cry_reverse Cry_Azurill + cry_reverse Cry_Swablu + cry_reverse Cry_Altaria + cry_reverse Cry_Unused265 + cry_reverse Cry_Taillow + cry_reverse Cry_Swellow + cry_reverse Cry_Unused268 + cry_reverse Cry_Spinda + cry_reverse Cry_Torchic + cry_reverse Cry_Combusken + cry_reverse Cry_Blaziken + cry_reverse Cry_Treecko + cry_reverse Cry_Grovyle + cry_reverse Cry_Sceptile + cry_reverse Cry_Mudkip + cry_reverse Cry_Marshtomp + cry_reverse Cry_Swampert + cry_reverse Cry_Pelipper + cry_reverse Cry_Wingull + cry_reverse Cry_Banette + cry_reverse Cry_Shuppet + cry_reverse Cry_Lotad + cry_reverse Cry_Lombre + cry_reverse Cry_Ludicolo + cry_reverse Cry_Seedot + cry_reverse Cry_Nuzleaf + cry_reverse Cry_Shiftry + cry_reverse Cry_Carvanha + cry_reverse Cry_Wurmple + cry_reverse Cry_Silcoon + cry_reverse Cry_Beautifly + cry_reverse Cry_Cascoon + cry_reverse Cry_Dustox + cry_reverse Cry_Ralts + cry_reverse Cry_Kirlia + cry_reverse Cry_Gardevoir + cry_reverse Cry_Slakoth + cry_reverse Cry_Vigoroth + cry_reverse Cry_Slaking + cry_reverse Cry_Nincada + cry_reverse Cry_Ninjask + cry_reverse Cry_Shedinja + cry_reverse Cry_Makuhita + cry_reverse Cry_Hariyama + cry_reverse Cry_Nosepass + cry_reverse Cry_Glalie + cry_reverse Cry_Plusle + cry_reverse Cry_Minun + cry_reverse Cry_Surskit + cry_reverse Cry_Masquerain + cry_reverse Cry_Skitty + cry_reverse Cry_Delcatty + cry_reverse Cry_Gulpin + cry_reverse Cry_Swalot + cry_reverse Cry_Numel + cry_reverse Cry_Camerupt + cry_reverse Cry_Barboach + cry_reverse Cry_Whiscash + cry_reverse Cry_Corphish + cry_reverse Cry_Crawdaunt + cry_reverse Cry_Spoink + cry_reverse Cry_Grumpig + cry_reverse Cry_Trapinch + cry_reverse Cry_Vibrava + cry_reverse Cry_Flygon + cry_reverse Cry_Cacnea + cry_reverse Cry_Cacturne + cry_reverse Cry_Baltoy + cry_reverse Cry_Claydol + cry_reverse Cry_Lunatone + cry_reverse Cry_Solrock + cry_reverse Cry_Feebas + cry_reverse Cry_Milotic + cry_reverse Cry_Absol + cry_reverse Cry_Meditite + cry_reverse Cry_Medicham + cry_reverse Cry_Spheal + cry_reverse Cry_Sealeo + cry_reverse Cry_Walrein + cry_reverse Cry_Clamperl + cry_reverse Cry_Huntail + cry_reverse Cry_Gorebyss + cry_reverse Cry_Lileep + cry_reverse Cry_Cradily + cry_reverse Cry_Anorith + cry_reverse Cry_Armaldo + cry_reverse Cry_Beldum + cry_reverse Cry_Metang + cry_reverse Cry_Metagross + cry_reverse Cry_Bagon + cry_reverse Cry_Shelgon + cry_reverse Cry_Regirock + cry_reverse Cry_Regice + cry_reverse Cry_Registeel + cry_reverse Cry_Castform + cry_reverse Cry_Volbeat + cry_reverse Cry_Illumise + cry_reverse Cry_Poochyena + cry_reverse Cry_Mightyena + cry_reverse Cry_Dusclops + cry_reverse Cry_Sableye + cry_reverse Cry_Mawile + cry_reverse Cry_Aron + cry_reverse Cry_Lairon + cry_reverse Cry_Aggron + cry_reverse Cry_Relicanth + cry_reverse Cry_Luvdisc + cry_reverse Cry_Groudon + cry_reverse Cry_Kyogre + cry_reverse Cry_Rayquaza + cry_reverse Cry_Salamence + cry_reverse Cry_Breloom + cry_reverse Cry_Shroomish + cry_reverse Cry_Linoone + cry_reverse Cry_Tropius + cry_reverse Cry_Wailmer + cry_reverse Cry_Zigzagoon + cry_reverse Cry_Exploud + cry_reverse Cry_Loudred + cry_reverse Cry_Wailord + cry_reverse Cry_Whismur + cry_reverse Cry_Snorunt + cry_reverse Cry_Latios + cry_reverse Cry_Jirachi + cry_reverse Cry_Deoxys + cry_reverse Cry_Chimecho .align 2 voicegroup129:: diff --git a/src/battle_anim.c b/src/battle_anim.c index fe3fe2952..3b466329c 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1857,7 +1857,7 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo { if (tableId == gMovesWithQuietBGM[i]) { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 128); break; } } @@ -2127,7 +2127,7 @@ static void ScriptCmd_end(void) if (!continuousAnim) { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256); ResetSpritePriorityOfAllVisibleBattlers(); UpdateOamPriorityInAllHealthboxes(1); gAnimScriptActive = FALSE; diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c index 44deed318..b05819e70 100644 --- a/src/battle_anim_sound_tasks.c +++ b/src/battle_anim_sound_tasks.c @@ -4,6 +4,7 @@ #include "battle_anim.h" #include "task.h" #include "constants/battle_anim.h" +#include "constants/sound.h" static void sub_80DCE78(u8 taskId); static void sub_80DCEE4(u8 taskId); @@ -142,7 +143,7 @@ void SoundTask_PlayCryHighPitch(u8 taskId) else species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES); if (species != SPECIES_NONE) - PlayCry3(species, pan, 3); + PlayCry_ByMode(species, pan, CRY_MODE_HIGH_PITCH); DestroyAnimVisualTask(taskId); } @@ -177,10 +178,10 @@ void SoundTask_PlayDoubleCry(u8 taskId) gTasks[taskId].data[2] = pan; if (species != SPECIES_NONE) { - if (gBattleAnimArgs[1] == TAIL_SENTINEL) - PlayCry3(species, pan, 9); - else - PlayCry3(species, pan, 7); + if (gBattleAnimArgs[1] == DOUBLE_CRY_GROWL) + PlayCry_ByMode(species, pan, CRY_MODE_GROWL_1); + else // DOUBLE_CRY_ROAR + PlayCry_ByMode(species, pan, CRY_MODE_ROAR_1); gTasks[taskId].func = sub_80DD270; } else @@ -202,13 +203,13 @@ static void sub_80DD270(u8 taskId) { if (!IsCryPlaying()) { - PlayCry3(species, pan, 10); + PlayCry_ByMode(species, pan, CRY_MODE_GROWL_2); DestroyAnimVisualTask(taskId); } } else if (!IsCryPlaying()) { - PlayCry3(species, pan, 8); + PlayCry_ByMode(species, pan, CRY_MODE_ROAR_2); DestroyAnimVisualTask(taskId); } } @@ -232,7 +233,7 @@ void sub_80DD334(u8 taskId) gTasks[taskId].data[2] = pan; if (species != SPECIES_NONE) { - PlayCry3(species, pan, 4); + PlayCry_ByMode(species, pan, CRY_MODE_ECHO_START); gTasks[taskId].func = sub_80DD390; } else @@ -253,7 +254,7 @@ static void sub_80DD390(u8 taskId) u16 species = gTasks[taskId].data[1]; s8 pan = gTasks[taskId].data[2]; - PlayCry3(species, pan, 6); + PlayCry_ByMode(species, pan, CRY_MODE_ECHO_END); DestroyAnimVisualTask(taskId); } } diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index e5fd5678a..8901cb219 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -13,6 +13,7 @@ #include "battle_message.h" #include "constants/battle_anim.h" #include "constants/songs.h" +#include "constants/sound.h" #include "constants/trainers.h" static void LinkOpponentHandleGetMonData(void); @@ -231,7 +232,7 @@ static void Intro_WaitForShinyAnimAndHealthbox(void) } else { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256); } gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].introEndDelay = 3; gBattlerControllerFuncs[gActiveBattler] = Intro_DelayAndEnd; @@ -366,7 +367,7 @@ static void SwitchIn_HandleSoundAndEnd(void) { if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs()) { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100); LinkOpponentBufferExecCompleted(); } } @@ -1512,7 +1513,7 @@ static void LinkOpponentHandleFaintingCry(void) { u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); - PlayCry3(species, 25, 5); + PlayCry_ByMode(species, 25, CRY_MODE_FAINT); LinkOpponentBufferExecCompleted(); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 09d2d198e..6fa7282e0 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -12,6 +12,7 @@ #include "battle_message.h" #include "constants/battle_anim.h" #include "constants/songs.h" +#include "constants/sound.h" static void LinkPartnerHandleGetMonData(void); static void LinkPartnerHandleGetRawMonData(void); @@ -1425,7 +1426,7 @@ static void LinkPartnerHandleFaintingCry(void) { u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); - PlayCry3(species, -25, 5); + PlayCry_ByMode(species, -25, CRY_MODE_FAINT); LinkPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 93c420aed..3fa84eee8 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -19,6 +19,7 @@ #include "constants/battle_anim.h" #include "constants/moves.h" #include "constants/songs.h" +#include "constants/sound.h" static void OpponentHandleGetMonData(void); static void OpponentHandleGetRawMonData(void); @@ -233,7 +234,7 @@ static void Intro_WaitForShinyAnimAndHealthbox(void) if (gBattleTypeFlags & BATTLE_TYPE_MULTI) m4aMPlayContinue(&gMPlayInfo_BGM); else - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256); gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].introEndDelay = 3; gBattlerControllerFuncs[gActiveBattler] = Intro_DelayAndEnd; } @@ -372,7 +373,7 @@ static void SwitchIn_HandleSoundAndEnd(void) { if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs()) { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100); OpponentBufferExecCompleted(); } } @@ -1611,7 +1612,7 @@ static void OpponentHandleFaintingCry(void) { u16 species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES); - PlayCry3(species, 25, 5); + PlayCry_ByMode(species, 25, CRY_MODE_FAINT); OpponentBufferExecCompleted(); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 05b0ad224..0d54be29e 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -22,6 +22,7 @@ #include "constants/items.h" #include "constants/moves.h" #include "constants/songs.h" +#include "constants/sound.h" static void PlayerHandleGetMonData(void); static void PlayerHandleSetMonData(void); @@ -898,7 +899,7 @@ static void Intro_WaitForShinyAnimAndHealthbox(void) if (gBattleTypeFlags & BATTLE_TYPE_MULTI) m4aMPlayContinue(&gMPlayInfo_BGM); else - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256); HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); if (IsDoubleBattle()) HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]], gActiveBattler ^ BIT_FLANK); @@ -955,7 +956,7 @@ static void SwitchIn_HandleSoundAndEnd(void) if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs()) { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100); HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], gActiveBattler); PlayerBufferExecCompleted(); } @@ -984,7 +985,7 @@ void Task_PlayerController_RestoreBgmAfterCry(u8 taskId) { if (!IsCryPlayingOrClearCrySongs()) { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100); DestroyTask(taskId); } } @@ -2687,7 +2688,7 @@ static void PlayerHandlePlayFanfare(void) static void PlayerHandleFaintingCry(void) { - PlayCry3(GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES), -25, 5); + PlayCry_ByMode(GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES), -25, CRY_MODE_FAINT); PlayerBufferExecCompleted(); } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index f9b00d0a9..ee69a4785 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3214,9 +3214,7 @@ static void Cmd_getexp(void) else { // music change in wild battle after fainting a poke - if (!(gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_POKEDUDE)) - && gBattleMons[0].hp != 0 - && !gBattleStruct->wildVictorySong) + if (!(gBattleTypeFlags & (BATTLE_TYPE_TRAINER | BATTLE_TYPE_POKEDUDE)) && gBattleMons[0].hp != 0 && !gBattleStruct->wildVictorySong) { BattleStopLowHpSound(); PlayBGM(MUS_VICTORY_WILD); diff --git a/src/credits.c b/src/credits.c index d9dde1c2c..5b92c9c99 100644 --- a/src/credits.c +++ b/src/credits.c @@ -14,6 +14,7 @@ #include "quest_log.h" #include "constants/maps.h" #include "constants/field_weather.h" +#include "constants/sound.h" #if defined(FIRERED) #define TITLE_TEXT gString_PokemonFireRed_Staff @@ -1190,7 +1191,7 @@ static bool32 DoCreditsMonScene(void) { HideBg(2); ShowBg(1); - PlayCry2(GetCreditsMonSpecies(sCreditsMgr->whichMon), 0, 125, 10); + PlayCry_NormalNoDucking(GetCreditsMonSpecies(sCreditsMgr->whichMon), 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL); sCreditsMgr->creditsMonTimer = 128; sCreditsMgr->subseqno++; } diff --git a/src/diploma.c b/src/diploma.c index 14ea9814d..0304c7ae3 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -8,7 +8,7 @@ #include "scanline_effect.h" #include "strings.h" #include "task.h" -#include "constants/fanfares.h" +#include "constants/sound.h" struct Diploma { @@ -148,7 +148,7 @@ static void Task_DiplomaInit(u8 taskId) { break; } - PlayFanfareByFanfareNum(FANFARE_05); + PlayFanfareByFanfareNum(FANFARE_OBTAIN_BADGE); gTasks[taskId].func = Task_WaitForExit; } gDiploma->callbackStep++; diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 75ea3a52d..8ad1256f1 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -13,7 +13,7 @@ #include "task.h" #include "text_window.h" #include "constants/songs.h" -#include "constants/fanfares.h" +#include "constants/sound.h" #include "constants/items.h" struct DodrioStruct @@ -1204,7 +1204,7 @@ static void sub_8151D98(void) } else if (gUnknown_203F3E0->unk154 == 1) { - PlayFanfareByFanfareNum(FANFARE_10); // MUS_TOO_BAD + PlayFanfareByFanfareNum(FANFARE_TOO_BAD); gUnknown_203F3E0->unk154 = 2; } } @@ -1262,7 +1262,7 @@ static void sub_8151E94(void) } else if (gUnknown_203F3E0->unk154 == 1) { - PlayFanfareByFanfareNum(FANFARE_10); // MUS_TOO_BAD + PlayFanfareByFanfareNum(FANFARE_TOO_BAD); gUnknown_203F3E0->unk154 = 2; } } diff --git a/src/field_effect.c b/src/field_effect.c index cb8191459..f2bfa3976 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -27,6 +27,7 @@ #include "constants/event_object_movement.h" #include "constants/metatile_behaviors.h" #include "constants/songs.h" +#include "constants/sound.h" extern struct CompressedSpritePalette gMonPaletteTable[]; // Intentionally declared (incorrectly) without const in order to match extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; @@ -2935,7 +2936,7 @@ static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite * sprite) sprite->callback = SpriteCB_FieldMoveMonWaitAfterCry; if (sprite->data[6]) { - PlayCry2(sprite->data[0], 0, 0x7d, 0xa); + PlayCry_NormalNoDucking(sprite->data[0], 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL); } else { diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 75658a28e..849fd2352 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -907,7 +907,7 @@ static void Task_HofPC_HandleInput(u8 taskId) if (IsCryPlayingOrClearCrySongs()) { StopCryAndClearCrySongs(); - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100); } gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit; } @@ -917,7 +917,7 @@ static void Task_HofPC_HandleInput(u8 taskId) if (IsCryPlayingOrClearCrySongs()) { StopCryAndClearCrySongs(); - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100); } gTasks[taskId].func = Task_HofPC_HandlePaletteOnExit; } diff --git a/src/help_system_util.c b/src/help_system_util.c index fc74662f7..ed7aa6b78 100644 --- a/src/help_system_util.c +++ b/src/help_system_util.c @@ -60,7 +60,7 @@ u8 RunHelpSystemCallback(void) m4aMPlayStop(&gMPlayInfo_SE2); PlaySE(SE_HELP_OPEN); if (!gDisableHelpSystemVolumeReduce) - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x80); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x80); SaveCallbacks(); sInHelpSystem = 1; sVideoState.state = 1; @@ -122,7 +122,7 @@ u8 RunHelpSystemCallback(void) break; case 7: if (!gDisableHelpSystemVolumeReduce) - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100); RestoreMapTextColors(); RestoreGPURegs(); sVideoState.state = 8; diff --git a/src/intro.c b/src/intro.c index bee854379..9466301d2 100644 --- a/src/intro.c +++ b/src/intro.c @@ -14,6 +14,7 @@ #include "util.h" #include "trig.h" #include "constants/songs.h" +#include "constants/sound.h" struct IntroSequenceData; @@ -2205,7 +2206,7 @@ static void SpriteCB_NidorinoRearsUp(struct Sprite * sprite) } break; case 1: - PlayCry3(SPECIES_NIDORINO, 0x3F, 1); + PlayCry_ByMode(SPECIES_NIDORINO, 0x3F, CRY_MODE_DOUBLES); sprite->data[1] = 0; sprite->data[0]++; break; diff --git a/src/item_use.c b/src/item_use.c index 990ac6d04..cdafef34f 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -31,7 +31,7 @@ #include "teachy_tv.h" #include "tm_case.h" #include "vs_seeker.h" -#include "constants/fanfares.h" +#include "constants/sound.h" #include "constants/items.h" #include "constants/maps.h" #include "constants/moves.h" @@ -386,7 +386,7 @@ void FieldUseFunc_PokeFlute(u8 taskId) static void sub_80A1648(u8 taskId) { - PlayFanfareByFanfareNum(FANFARE_POKEFLUTE); + PlayFanfareByFanfareNum(FANFARE_POKE_FLUTE); gTasks[taskId].func = sub_80A1674; } diff --git a/src/overworld.c b/src/overworld.c index 3e4e1b0bf..a1b169e1f 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -50,6 +50,7 @@ #include "constants/maps.h" #include "constants/region_map_sections.h" #include "constants/songs.h" +#include "constants/sound.h" #define PLAYER_LINK_STATE_IDLE 0x80 #define PLAYER_LINK_STATE_BUSY 0x81 @@ -1141,7 +1142,7 @@ static void PlayAmbientCry(void) if (gDisableMapMusicChangeOnMapLoad == MUSIC_DISABLE_KEEP) return; - PlayCry2(sAmbientCrySpecies, pan, volume, 1); + PlayCry_NormalNoDucking(sAmbientCrySpecies, pan, volume, CRY_PRIORITY_AMBIENT); } void UpdateAmbientCry(s16 *state, u16 *delayCounter) diff --git a/src/party_menu.c b/src/party_menu.c index 377d4b8fb..4bceaea7d 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -67,6 +67,7 @@ #include "constants/pokemon.h" #include "constants/quest_log.h" #include "constants/songs.h" +#include "constants/sound.h" #define PARTY_PAL_SELECTED (1 << 0) #define PARTY_PAL_FAINTED (1 << 1) @@ -5083,7 +5084,7 @@ static void ItemUseCB_RareCandyStep(u8 taskId, UNUSED TaskFunc func) GetMonLevelUpWindowStats(mon, &ptr->data[NUM_STATS]); gPartyMenuUseExitCallback = TRUE; ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, mon, gSpecialVar_ItemId, 0xFFFF); - PlayFanfareByFanfareNum(0); + PlayFanfareByFanfareNum(FANFARE_LEVEL_UP); UpdateMonDisplayInfoAfterRareCandy(gPartyMenu.slotId, mon); RemoveBagItem(gSpecialVar_ItemId, 1); GetMonNickname(mon, gStringVar1); diff --git a/src/pokeball.c b/src/pokeball.c index fec1866cc..6434b72cd 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -12,6 +12,7 @@ #include "link.h" #include "battle_gfx_sfx_util.h" #include "constants/songs.h" +#include "constants/sound.h" #define tFrames data[0] #define tPan data[1] @@ -681,9 +682,9 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) break; case 1: if (ShouldPlayNormalPokeCry(mon) == TRUE) - PlayCry3(species, pan, 0); + PlayCry_ByMode(species, pan, CRY_MODE_NORMAL); else - PlayCry3(species, pan, 11); + PlayCry_ByMode(species, pan, CRY_MODE_WEAK); DestroyTask(taskId); break; @@ -696,9 +697,9 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) if (gTasks[taskId].tCryTaskFrames == 0) { if (ShouldPlayNormalPokeCry(mon) == TRUE) - PlayCry4(species, pan, 1); + PlayCry_ReleaseDouble(species, pan, 1); else - PlayCry4(species, pan, 12); + PlayCry_ReleaseDouble(species, pan, 12); DestroyTask(taskId); } @@ -734,9 +735,9 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) } if (ShouldPlayNormalPokeCry(mon) == TRUE) - PlayCry4(species, pan, 0); + PlayCry_ReleaseDouble(species, pan, 0); else - PlayCry4(species, pan, 11); + PlayCry_ReleaseDouble(species, pan, 11); DestroyTask(taskId); break; @@ -784,7 +785,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite) } else { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 128); } } diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index 780a59698..1e5768f5a 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -17,6 +17,7 @@ #include "trainer_pokemon_sprites.h" #include "decompress.h" #include "constants/songs.h" +#include "constants/sound.h" #include "pokedex_area_markers.h" #include "field_specials.h" @@ -1751,7 +1752,7 @@ static void Task_DexScreen_CategorySubmenu(u8 taskId) CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(0); - PlayCry2(sPokedexScreenData->dexSpecies, 0, 125, 10); + PlayCry_NormalNoDucking(sPokedexScreenData->dexSpecies, 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL); sPokedexScreenData->data[0] = 0; sPokedexScreenData->state = 17; } @@ -1927,7 +1928,7 @@ static void Task_DexScreen_ShowMonPage(u8 taskId) CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(0); - PlayCry2(sPokedexScreenData->dexSpecies, 0, 125, 10); + PlayCry_NormalNoDucking(sPokedexScreenData->dexSpecies, 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL); sPokedexScreenData->state = 4; break; case 4: @@ -3295,7 +3296,7 @@ static u8 DexScreen_PageNumberToRenderablePages(u16 page) void DexScreen_InputHandler_StartToCry(void) { if (JOY_NEW(START_BUTTON)) - PlayCry2(sPokedexScreenData->dexSpecies, 0, 125, 10); + PlayCry_NormalNoDucking(sPokedexScreenData->dexSpecies, 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL); } u8 DexScreen_RegisterMonToPokedex(u16 species) @@ -3413,7 +3414,7 @@ static void Task_DexScreen_RegisterMonToPokedex(u8 taskId) CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(0); - PlayCry2(sPokedexScreenData->dexSpecies, 0, 125, 10); + PlayCry_NormalNoDucking(sPokedexScreenData->dexSpecies, 0, CRY_VOLUME_RS, CRY_PRIORITY_NORMAL); sPokedexScreenData->data[0] = 0; sPokedexScreenData->state = 11; } diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 2f57133b7..61dffc7c4 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -33,6 +33,7 @@ #include "battle_interface.h" #include "mon_markings.h" #include "pokemon_storage_system.h" +#include "constants/sound.h" // needs conflicting header to match (curIndex is s8 in the function, but has to be defined as u8 here) extern s16 SeekToNextMonInBox(struct BoxPokemon * boxMons, u8 curIndex, u8 maxIndex, u8 flags); @@ -5181,9 +5182,9 @@ static void PokeSum_TryPlayMonCry(void) if (!GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_IS_EGG)) { if (ShouldPlayNormalPokeCry(&sMonSummaryScreen->currentMon) == TRUE) - PlayCry3(GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_SPECIES2), 0, 0); + PlayCry_ByMode(GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_SPECIES2), 0, CRY_MODE_NORMAL); else - PlayCry3(GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_SPECIES2), 0, 11); + PlayCry_ByMode(GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_SPECIES2), 0, CRY_MODE_WEAK); } } diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 7fd2f0f9f..e570b7fa4 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -40,7 +40,7 @@ bool32 RunSaveFailedScreen(void) case 0: if (!sIsInSaveFailedScreen) return FALSE; - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 128); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 128); SaveCallbacks(); sSaveFailedScreenState = 1; break; @@ -95,7 +95,7 @@ bool32 RunSaveFailedScreen(void) sSaveFailedScreenState = 8; break; case 8: - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256); RestoreMapTextColors(); RestoreGPURegs(); RestoreCallbacks(); diff --git a/src/scrcmd.c b/src/scrcmd.c index 224da3ef4..523523548 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -34,6 +34,7 @@ #include "fieldmap.h" #include "field_door.h" #include "constants/event_objects.h" +#include "constants/sound.h" extern u16 (*const gSpecials[])(void); extern u16 (*const gSpecialsEnd[])(void); @@ -1523,7 +1524,7 @@ bool8 ScrCmd_showmonpic(struct ScriptContext * ctx) u8 y = ScriptReadByte(ctx); ScriptMenu_ShowPokemonPic(species, x, y); - PlayCry7(species, 0); + PlayCry_Script(species, CRY_MODE_NORMAL); return FALSE; } @@ -2085,7 +2086,7 @@ bool8 ScrCmd_playmoncry(struct ScriptContext * ctx) u16 species = VarGet(ScriptReadHalfword(ctx)); u16 mode = VarGet(ScriptReadHalfword(ctx)); - PlayCry7(species, mode); + PlayCry_Script(species, mode); return FALSE; } diff --git a/src/sound.c b/src/sound.c index 04316adc0..636f88bb3 100644 --- a/src/sound.c +++ b/src/sound.c @@ -5,7 +5,7 @@ #include "quest_log.h" #include "m4a.h" #include "constants/songs.h" -#include "constants/fanfares.h" +#include "constants/sound.h" #include "task.h" struct Fanfare @@ -38,24 +38,7 @@ extern struct MusicPlayerInfo gMPlayInfo_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_SE3; extern struct ToneData gCryTable[]; -extern struct ToneData gCryTable2[]; - -static const struct Fanfare sFanfares[] = { - [FANFARE_00] = { MUS_LEVEL_UP, 80 }, - [FANFARE_01] = { MUS_OBTAIN_ITEM, 160 }, - [FANFARE_02] = { MUS_EVOLVED, 220 }, - [FANFARE_03] = { MUS_OBTAIN_TMHM, 220 }, - [FANFARE_04] = { MUS_HEAL, 160 }, - [FANFARE_05] = { MUS_OBTAIN_BADGE, 340 }, - [FANFARE_06] = { MUS_MOVE_DELETED, 180 }, - [FANFARE_07] = { MUS_OBTAIN_BERRY, 120 }, - [FANFARE_08] = { MUS_SLOTS_JACKPOT, 250 }, - [FANFARE_09] = { MUS_SLOTS_WIN, 150 }, - [FANFARE_10] = { MUS_TOO_BAD, 160 }, - [FANFARE_POKEFLUTE] = { MUS_POKE_FLUTE, 450 }, - [FANFARE_KEY_ITEM] = { MUS_OBTAIN_KEY_ITEM, 170 }, - [FANFARE_DEX_EVAL] = { MUS_DEX_RATING, 196 } -}; +extern struct ToneData gCryTable_Reverse[]; extern u16 SpeciesToCryId(u16); @@ -64,7 +47,22 @@ static void CreateFanfareTask(void); static void Task_DuckBGMForPokemonCry(u8 taskId); static void RestoreBGMVolumeAfterPokemonCry(void); -#define CRY_VOLUME 120 // was 125 in R/S +static const struct Fanfare sFanfares[] = { + [FANFARE_LEVEL_UP] = { MUS_LEVEL_UP, 80 }, + [FANFARE_OBTAIN_ITEM] = { MUS_OBTAIN_ITEM, 160 }, + [FANFARE_EVOLVED] = { MUS_EVOLVED, 220 }, + [FANFARE_OBTAIN_TMHM] = { MUS_OBTAIN_TMHM, 220 }, + [FANFARE_HEAL] = { MUS_HEAL, 160 }, + [FANFARE_OBTAIN_BADGE] = { MUS_OBTAIN_BADGE, 340 }, + [FANFARE_MOVE_DELETED] = { MUS_MOVE_DELETED, 180 }, + [FANFARE_OBTAIN_BERRY] = { MUS_OBTAIN_BERRY, 120 }, + [FANFARE_SLOTS_JACKPOT] = { MUS_SLOTS_JACKPOT, 250 }, + [FANFARE_SLOTS_WIN] = { MUS_SLOTS_WIN, 150 }, + [FANFARE_TOO_BAD] = { MUS_TOO_BAD, 160 }, + [FANFARE_POKE_FLUTE] = { MUS_POKE_FLUTE, 450 }, + [FANFARE_KEY_ITEM] = { MUS_OBTAIN_KEY_ITEM, 170 }, + [FANFARE_DEX_EVAL] = { MUS_DEX_RATING, 196 } +}; void InitMapMusic(void) { @@ -168,6 +166,7 @@ void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed) sMapMusicFadeInSpeed = fadeInSpeed; } +// Unused static void FadeInNewMapMusic(u16 songNum, u8 speed) { FadeInNewBGM(songNum, speed); @@ -191,7 +190,6 @@ bool8 IsNotWaitingForBGMStop(void) void PlayFanfareByFanfareNum(u8 fanfareNum) { u16 songNum; - if(gQuestLogState == QL_STATE_PLAYBACK) { sFanfareCounter = 0xFF; @@ -223,6 +221,7 @@ bool8 WaitFanfare(bool8 stop) } } +// Unused void StopFanfareByFanfareNum(u8 fanfareNum) { m4aSongNumStop(sFanfares[fanfareNum].songNum); @@ -231,7 +230,7 @@ void StopFanfareByFanfareNum(u8 fanfareNum) void PlayFanfare(u16 songNum) { s32 i; - for (i = 0; (u32)i < 14; i++) + for (i = 0; (u32)i < ARRAY_COUNT(sFanfares); i++) { if (sFanfares[i].songNum == songNum) { @@ -241,6 +240,8 @@ void PlayFanfare(u16 songNum) } } + // songNum is not in sFanfares + // Play first fanfare in table instead PlayFanfareByFanfareNum(0); CreateFanfareTask(); } @@ -275,11 +276,11 @@ void FadeInNewBGM(u16 songNum, u8 speed) { if (gDisableMusic) songNum = 0; - if (songNum == 0xFFFF) + if (songNum == MUS_NONE) songNum = 0; m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlayInfo_BGM); - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0); m4aSongNumStop(songNum); m4aMPlayFadeIn(&gMPlayInfo_BGM, speed); } @@ -317,54 +318,54 @@ bool8 IsBGMStopped(void) void PlayCry_Normal(u16 species, s8 pan) { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85); - PlayCryInternal(species, pan, CRY_VOLUME, 10, 0); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 85); + PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, CRY_MODE_NORMAL); gPokemonCryBGMDuckingCounter = 2; RestoreBGMVolumeAfterPokemonCry(); } -void PlayCry2(u16 species, s8 pan, s8 volume, u8 priority) +void PlayCry_NormalNoDucking(u16 species, s8 pan, s8 volume, u8 priority) { - PlayCryInternal(species, pan, volume, priority, 0); + PlayCryInternal(species, pan, volume, priority, CRY_MODE_NORMAL); } -void PlayCry3(u16 species, s8 pan, u8 mode) +// Assuming it's not CRY_MODE_DOUBLES, this is equivalent to PlayCry_Normal except it allows other modes. +void PlayCry_ByMode(u16 species, s8 pan, u8 mode) { - if (mode == 1) + if (mode == CRY_MODE_DOUBLES) { - PlayCryInternal(species, pan, CRY_VOLUME, 10, 1); + PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode); } else { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85); - PlayCryInternal(species, pan, CRY_VOLUME, 10, mode); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 85); + PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode); gPokemonCryBGMDuckingCounter = 2; RestoreBGMVolumeAfterPokemonCry(); } } -void PlayCry4(u16 species, s8 pan, u8 mode) +// Used when releasing multiple Pokémon at once in battle. +void PlayCry_ReleaseDouble(u16 species, s8 pan, u8 mode) { - if (mode == 1) + if (mode == CRY_MODE_DOUBLES) { - PlayCryInternal(species, pan, CRY_VOLUME, 10, 1); + PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode); } else { if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85); - PlayCryInternal(species, pan, CRY_VOLUME, 10, mode); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 85); + PlayCryInternal(species, pan, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode); } } -// PlayCry5 and 6 are not in FR/LG. - -void PlayCry7(u16 species, u8 mode) // exclusive to FR/LG +void PlayCry_Script(u16 species, u8 mode) { - if (!QL_IS_PLAYBACK_STATE) + if (!QL_IS_PLAYBACK_STATE) // This check is exclusive to FR/LG { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 85); - PlayCryInternal(species, 0, CRY_VOLUME, 10, mode); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 85); + PlayCryInternal(species, 0, CRY_VOLUME, CRY_PRIORITY_NORMAL, mode); } gPokemonCryBGMDuckingCounter = 2; RestoreBGMVolumeAfterPokemonCry(); @@ -372,7 +373,7 @@ void PlayCry7(u16 species, u8 mode) // exclusive to FR/LG void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode) { - bool32 v0; + bool32 reverse; u32 release; u32 length; u32 pitch; @@ -381,76 +382,80 @@ void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode) u8 table; species--; + + // Set default values + // May be overridden depending on mode. length = 140; - v0 = FALSE; + reverse = FALSE; release = 0; pitch = 15360; chorus = 0; switch (mode) { - case 0: + case CRY_MODE_NORMAL: break; - case 1: + case CRY_MODE_DOUBLES: length = 20; release = 225; break; - case 2: + case CRY_MODE_ENCOUNTER: release = 225; pitch = 15600; chorus = 20; volume = 90; break; - case 3: + case CRY_MODE_HIGH_PITCH: length = 50; release = 200; pitch = 15800; chorus = 20; volume = 90; break; - case 4: + case CRY_MODE_ECHO_START: length = 25; - v0 = TRUE; + reverse = TRUE; release = 100; pitch = 15600; chorus = 192; volume = 90; break; - case 5: + case CRY_MODE_FAINT: release = 200; pitch = 14440; break; - case 6: // _08072044 + case CRY_MODE_ECHO_END: release = 220; pitch = 15555; chorus = 192; volume = 90; // FR/LG changed this from 70 to 90 break; - case 7: + case CRY_MODE_ROAR_1: length = 10; release = 100; pitch = 14848; break; - case 8: + case CRY_MODE_ROAR_2: length = 60; release = 225; pitch = 15616; break; - case 9: + case CRY_MODE_GROWL_1: length = 15; - v0 = TRUE; + reverse = TRUE; release = 125; pitch = 15200; break; - case 10: + case CRY_MODE_GROWL_2: length = 100; release = 225; pitch = 15200; break; - case 12: + case CRY_MODE_WEAK_DOUBLES: length = 20; release = 225; - case 11: + // fallthrough + case CRY_MODE_WEAK: pitch = 15000; break; } @@ -469,28 +474,29 @@ void PlayCryInternal(u16 species, s8 pan, s8 volume, u8 priority, u8 mode) // If you wish to expand pokemon, you need to // append new cases to the switch. species = SpeciesToCryId(species); - index = species & 0x7F; + index = species % 128; table = species / 128; + #define GET_CRY(speciesIndex, tableId, reversed) \ + ((reversed) ? &gCryTable_Reverse[(128 * (tableId)) + (speciesIndex)] : &gCryTable[(128 * (tableId)) + (speciesIndex)]) + switch (table) { case 0: - gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &gCryTable2[(128 * 0) + index] : &gCryTable[(128 * 0) + index]); + gMPlay_PokemonCry = SetPokemonCryTone(GET_CRY(index, 0, reverse)); break; case 1: - gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &gCryTable2[(128 * 1) + index] : &gCryTable[(128 * 1) + index]); + gMPlay_PokemonCry = SetPokemonCryTone(GET_CRY(index, 1, reverse)); break; case 2: - gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &gCryTable2[(128 * 2) + index] : &gCryTable[(128 * 2) + index]); + gMPlay_PokemonCry = SetPokemonCryTone(GET_CRY(index, 2, reverse)); break; case 3: - gMPlay_PokemonCry = SetPokemonCryTone( - v0 ? &gCryTable2[(128 * 3) + index] : &gCryTable[(128 * 3) + index]); + gMPlay_PokemonCry = SetPokemonCryTone(GET_CRY(index, 3, reverse)); break; } + + #undef GET_CRY } bool8 IsCryFinished(void) @@ -548,7 +554,7 @@ static void Task_DuckBGMForPokemonCry(u8 taskId) if (!IsPokemonCryPlaying(gMPlay_PokemonCry)) { - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256); DestroyTask(taskId); } } @@ -563,14 +569,14 @@ void PlayBGM(u16 songNum) { if (gDisableMusic) songNum = 0; - if (songNum == 0xFFFF) + if (songNum == MUS_NONE) songNum = 0; m4aSongNumStart(songNum); } void PlaySE(u16 songNum) { - if(gDisableMapMusicChangeOnMapLoad == 0 && gQuestLogState != QL_STATE_PLAYBACK) + if (gDisableMapMusicChangeOnMapLoad == 0 && gQuestLogState != QL_STATE_PLAYBACK) m4aSongNumStart(songNum); } @@ -579,28 +585,28 @@ void PlaySE12WithPanning(u16 songNum, s8 pan) m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlayInfo_SE1); m4aMPlayImmInit(&gMPlayInfo_SE2); - m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan); - m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan); + m4aMPlayPanpotControl(&gMPlayInfo_SE1, TRACKS_ALL, pan); + m4aMPlayPanpotControl(&gMPlayInfo_SE2, TRACKS_ALL, pan); } void PlaySE1WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlayInfo_SE1); - m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan); + m4aMPlayPanpotControl(&gMPlayInfo_SE1, TRACKS_ALL, pan); } void PlaySE2WithPanning(u16 songNum, s8 pan) { m4aSongNumStart(songNum); m4aMPlayImmInit(&gMPlayInfo_SE2); - m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan); + m4aMPlayPanpotControl(&gMPlayInfo_SE2, TRACKS_ALL, pan); } void SE12PanpotControl(s8 pan) { - m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan); - m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan); + m4aMPlayPanpotControl(&gMPlayInfo_SE1, TRACKS_ALL, pan); + m4aMPlayPanpotControl(&gMPlayInfo_SE2, TRACKS_ALL, pan); } bool8 IsSEPlaying(void) @@ -633,11 +639,11 @@ bool8 IsSpecialSEPlaying(void) void SetBGMVolume_SuppressHelpSystemReduction(u16 volume) { gDisableHelpSystemVolumeReduce = TRUE; - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, volume); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, volume); } void BGMVolumeMax_EnableHelpSystemReduction(void) { gDisableHelpSystemVolumeReduce = FALSE; - m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 256); + m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 256); } From c40791fd4ef2fb2e56df778cb6e5969a3a10cb69 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 18:37:43 -0400 Subject: [PATCH 48/64] SPRITE_INVALID_TAG -> TAG_NONE --- include/sprite.h | 2 +- src/battle_anim_status_effects.c | 2 +- src/battle_transition.c | 6 +- src/data/field_effects/field_effect_objects.h | 90 ++--- .../object_event_graphics_info.h | 308 +++++++++--------- src/event_object_movement.c | 14 +- src/field_effect.c | 14 +- src/list_menu.c | 2 +- src/menu_indicators.c | 24 +- src/pokeball.c | 2 +- src/pokemon.c | 24 +- src/pokemon_icon.c | 2 +- 12 files changed, 245 insertions(+), 245 deletions(-) diff --git a/include/sprite.h b/include/sprite.h index 228e186e6..9fa6280dc 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -4,7 +4,7 @@ #include "global.h" #define MAX_SPRITES 64 -#define SPRITE_INVALID_TAG 0xFFFF +#define TAG_NONE 0xFFFF struct SpriteSheet { diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c index 366023449..4abcb083a 100644 --- a/src/battle_anim_status_effects.c +++ b/src/battle_anim_status_effects.c @@ -355,7 +355,7 @@ void AnimTask_FrozenIceCube(u8 taskId) SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); spriteId = CreateSprite(&sUnknown_83BF55C, x, y, 4); - if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == SPRITE_INVALID_TAG) + if (GetSpriteTileStartByTag(ANIM_TAG_ICE_CUBE) == TAG_NONE) gSprites[spriteId].invisible = TRUE; SetSubspriteTables(&gSprites[spriteId], sUnknown_83BF554); diff --git a/src/battle_transition.c b/src/battle_transition.c index a14cfd3e3..0682cfaaa 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -466,7 +466,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_SlidingPokeball[] static const struct SpriteTemplate sSpriteTemplate_SlidingPokeball = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0x1009, .oam = &gObjectEventBaseOam_32x32, .anims = sSpriteAnimTable_SlidingPokeball, @@ -519,7 +519,7 @@ static const union AnimCmd *const sSpriteAnimTable_Unused[] = { sSpriteAnim_Unus static const struct SpriteTemplate sSpriteTemplateTable_Unused[] = { { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0x100A, .oam = &sOamData_Unused, .anims = sSpriteAnimTable_Unused, @@ -528,7 +528,7 @@ static const struct SpriteTemplate sSpriteTemplateTable_Unused[] = .callback = SpriteCB_BT_Phase2Mugshots, }, { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0x100A, .oam = &sOamData_Unused, .anims = sSpriteAnimTable_Unused, diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index 00c40f75b..780ef92f8 100644 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -19,8 +19,8 @@ static const struct SpriteFrameImage sPicTable_ShadowExtraLarge[] = { obj_frame_ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = { - .tileTag = SPRITE_INVALID_TAG, - .paletteTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &gObjectEventBaseOam_8x8, .anims = sAnimTable_Shadow, .images = sPicTable_ShadowSmall, @@ -30,8 +30,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = { - .tileTag = SPRITE_INVALID_TAG, - .paletteTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &gObjectEventBaseOam_16x8, .anims = sAnimTable_Shadow, .images = sPicTable_ShadowMedium, @@ -41,8 +41,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = { - .tileTag = SPRITE_INVALID_TAG, - .paletteTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &gObjectEventBaseOam_32x8, .anims = sAnimTable_Shadow, .images = sPicTable_ShadowLarge, @@ -52,8 +52,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = { - .tileTag = SPRITE_INVALID_TAG, - .paletteTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &gObjectEventBaseOam_64x32, .anims = sAnimTable_Shadow, .images = sPicTable_ShadowExtraLarge, @@ -87,7 +87,7 @@ static const union AnimCmd *const sAnimTable_TallGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_TallGrass, @@ -125,7 +125,7 @@ static const union AnimCmd *const sAnimTable_Ripple[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_Ripple, @@ -160,7 +160,7 @@ static const union AnimCmd *const sAnimTable_Ash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_Ash, @@ -217,8 +217,8 @@ static const union AnimCmd *const sAnimTable_SurfBlob[] = const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = { - .tileTag = SPRITE_INVALID_TAG, - .paletteTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &gObjectEventBaseOam_32x32, .anims = sAnimTable_SurfBlob, .images = sPicTable_SurfBlob, @@ -276,8 +276,8 @@ static const union AnimCmd *const sAnimTable_Arrow[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = { - .tileTag = SPRITE_INVALID_TAG, - .paletteTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_Arrow, .images = sPicTable_Arrow, @@ -307,7 +307,7 @@ static const union AnimCmd *const sAnimTable_GroundImpactDust[] = const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, .anims = sAnimTable_GroundImpactDust, @@ -340,7 +340,7 @@ static const union AnimCmd *const sAnimTable_JumpTallGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x8, .anims = sAnimTable_JumpTallGrass, @@ -390,7 +390,7 @@ static const union AnimCmd *const sAnimTable_SandFootprints[] = const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_SandFootprints, @@ -440,7 +440,7 @@ static const union AnimCmd *const sAnimTable_DeepSandFootprints[] = const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_DeepSandFootprints, @@ -520,7 +520,7 @@ static const union AnimCmd *const sAnimTable_BikeTireTracks[] = const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_BikeTireTracks, @@ -553,7 +553,7 @@ static const union AnimCmd *const sAnimTable_JumpBigSplash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_JumpBigSplash, @@ -596,7 +596,7 @@ static const union AnimCmd *const sAnimTable_Splash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, .anims = sAnimTable_Splash, @@ -627,7 +627,7 @@ static const union AnimCmd *const sAnimTable_JumpSmallSplash[] = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, .anims = sAnimTable_JumpSmallSplash, @@ -663,7 +663,7 @@ static const union AnimCmd *const sAnimTable_LongGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_LongGrass, @@ -700,7 +700,7 @@ static const union AnimCmd *const sAnimTable_JumpLongGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_JumpLongGrass, @@ -743,7 +743,7 @@ static const union AnimCmd *const sAnimTable_UnusedGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_UnusedGrass, @@ -778,7 +778,7 @@ static const union AnimCmd *const sAnimTable_UnusedGrass2[] = const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_UnusedGrass2, @@ -811,7 +811,7 @@ static const union AnimCmd *const sAnimTable_UnusedSand[] = const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_UnusedSand, @@ -842,7 +842,7 @@ static const union AnimCmd *const sAnimTable_SandPile[] = const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x8, .anims = sAnimTable_SandPile, @@ -877,7 +877,7 @@ static const union AnimCmd *const sAnimTable_WaterSurfacing[] = const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_WaterSurfacing, @@ -923,7 +923,7 @@ const union AffineAnimCmd *const sAffineAnims_ReflectionDistortion[] = const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = { .tileTag = 0x0, - .paletteTag = SPRITE_INVALID_TAG, + .paletteTag = TAG_NONE, .oam = &gDummyOamData, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1019,8 +1019,8 @@ static const union AnimCmd *const sAnimTable_TreeDisguise[] = const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = { - .tileTag = SPRITE_INVALID_TAG, - .paletteTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &gObjectEventBaseOam_16x32, .anims = sAnimTable_TreeDisguise, .images = sPicTable_TreeDisguise, @@ -1065,8 +1065,8 @@ static const union AnimCmd *const sAnimTable_MountainDisguise[] = const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = { - .tileTag = SPRITE_INVALID_TAG, - .paletteTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &gObjectEventBaseOam_16x32, .anims = sAnimTable_MountainDisguise, .images = sPicTable_MountainDisguise, @@ -1087,8 +1087,8 @@ static const struct SpriteFrameImage sPicTable_SandDisguisePlaceholder[] = const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = { - .tileTag = SPRITE_INVALID_TAG, - .paletteTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &gObjectEventBaseOam_16x32, .anims = sAnimTable_TreeDisguise, .images = sPicTable_SandDisguisePlaceholder, @@ -1146,8 +1146,8 @@ static const union AnimCmd *const sAnimTable_Bird[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = { - .tileTag = SPRITE_INVALID_TAG, - .paletteTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &gObjectEventBaseOam_64x64, .anims = sAnimTable_Bird, .images = sPicTable_Bird, @@ -1175,7 +1175,7 @@ static const union AnimCmd *const sAnimTable_ShortGrass[] = const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_ShortGrass, @@ -1202,7 +1202,7 @@ static const union AnimCmd *const sAnimTable_HotSpringsWater[] = const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_1, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_HotSpringsWater, @@ -1237,7 +1237,7 @@ static const union AnimCmd *const sAnimTable_AshPuff[] = const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_ASH, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_AshPuff, @@ -1274,7 +1274,7 @@ static const union AnimCmd *const sAnimTable_AshLaunch[] = const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_ASH, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_AshLaunch, @@ -1315,7 +1315,7 @@ static const union AnimCmd *const sAnimTable_Bubbles[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, .oam = &gObjectEventBaseOam_16x32, .anims = sAnimTable_Bubbles, @@ -1345,7 +1345,7 @@ static const union AnimCmd *const sAnimTable_SmallSparkle[] = const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = FLDEFF_PAL_TAG_SMALL_SPARKLE, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_SmallSparkle, diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h index 3cf2686ab..03632fc16 100644 --- a/src/data/object_events/object_event_graphics_info.h +++ b/src/data/object_events/object_event_graphics_info.h @@ -1,154 +1,154 @@ -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenNormal, sPicTable_RedNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_RedBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenSurf, sPicTable_RedSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenFieldMove, sPicTable_RedItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Policeman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Policeman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSBrendan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RSBrendan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSMay = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RSMay, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_LittleBoy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_LittleGirl, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SittingBoy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SittingBoy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Lass, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Youngster, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Woman1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Woman3, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Boy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_BattleGirl, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_BugCatcher, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_FatMan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaldingMan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_BaldingMan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Woman2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan1 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_OldMan1, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_WorkerM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_WorkerF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Beauty, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chef = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Chef, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan2 = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_OldMan2, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_OldWoman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Camper, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Picnicker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_CooltrainerM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_CooltrainerF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SuperNerd, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Channeler = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Channeler, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RocketF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerMWater, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerFWater, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerMLand, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerFLand, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Blackbelt, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Scientist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Gentleman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Sailor, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Captain = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Captain, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisher = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Fisher, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TeachyTVHost = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_TeachyTVHost, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWoman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_UnusedWoman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_TuberF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMWater = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_TuberMWater, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMLand = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_TuberMLand, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Hiker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Biker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Biker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymGuy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_GymGuy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Nurse, sPicTable_Nurse, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMaleReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_UnusedMaleReceptionist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_ItemBall, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfOak = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_ProfOak, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Man, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rocker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Rocker, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrFuji = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_MrFuji, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bruno = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Bruno, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldManLyingDown = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_OldManLyingDown, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CutTree = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_CutTree, sPicTable_CutTree, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clerk = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Clerk, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MGDeliveryman = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_MGDeliveryman, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTowerDude = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_TrainerTowerDude, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableClubReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_CableClubReceptionist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomReceptionist = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_UnionRoomReceptionist, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RockSmashRock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_RockSmashRock, sPicTable_RockSmashRock, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_StrengthBoulder = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_StrengthBoulder, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenNormal, sPicTable_GreenNormal, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_GreenBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenSurf, sPicTable_GreenSurf, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenFieldMove, sPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBikeAlt = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_RedBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RocketM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celio = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Celio, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Agatha = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Agatha, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brock = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Brock, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Misty = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Misty, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LtSurge = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_LtSurge, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Erika = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Erika, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Koga = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Koga, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giovanni = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Giovanni, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blaine = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Blaine, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sabrina = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Sabrina, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bill = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Bill, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Daisy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Daisy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lorelei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Lorelei, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lance = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Lance, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blue = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Blue, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenFish, sPicTable_RedFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenFish, sPicTable_GreenFish, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenVSSeeker, sPicTable_RedItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenVSSeekerBike, sPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenVSSeeker, sPicTable_GreenItem, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenVSSeekerBike, sPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TownMap = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 32, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_TownMap, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pokedex = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Pokedex, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_GBAKid, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Snorlax = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Snorlax, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Fossil, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Ruby = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Ruby, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sapphire = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Sapphire, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldAmber = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_OldAmber, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymSign = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Inanimate, sPicTable_GymSign, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sign = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Sign, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTips = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_WoodenSign, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clipboard = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Clipboard, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meteorite = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_METEORITE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Inanimate, sPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LaprasDoll = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Inanimate, sPicTable_LaprasDoll, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spearow = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Spearow, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Omanyte = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Omanyte, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kangaskhan = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Kangaskhan, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Psyduck = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Psyduck, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranF = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_NidoranF, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranM = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_NidoranM, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nidorino = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Nidorino, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meowth = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Meowth, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seel = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Seel, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Voltorb = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Voltorb, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowpoke = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Slowpoke, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowbro = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Slowbro, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Machop, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wigglytuff = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Wigglytuff, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Doduo = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Doduo, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fearow = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Fearow, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lapras = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Lapras, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zapdos = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Zapdos, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Moltres = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Moltres, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Articuno = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Articuno, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysD = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_DeoxysD, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysA = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_DeoxysA, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysN = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_DeoxysN, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mewtwo = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Mewtwo, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Mew, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Entei = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Entei, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Raikou = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Raikou, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Suicune = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Suicune, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Lugia, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_HoOh, sPicTable_HoOh, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celebi = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Celebi, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cubone = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Cubone, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machoke = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Machoke, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kabuto = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Kabuto, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poliwrath = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Poliwrath, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgeot = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Pidgeot, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chansey = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Chansey, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Pikachu, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Jigglypuff = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Jigglypuff, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgey = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Pidgey, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clefairy = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Clefairy, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Mom, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seagallop = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_SEAGALLOP, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, sAnimTable_Standard, sPicTable_Seagallop, gDummySpriteAffineAnimTable}; -const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSAnne = {SPRITE_INVALID_TAG, OBJ_EVENT_PAL_TAG_SS_ANNE, OBJ_EVENT_PAL_TAG_NONE, 4096, 128, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_128x64, sAnimTable_Standard, sPicTable_SSAnne, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedNormal = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenNormal, sPicTable_RedNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedSurf = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenSurf, sPicTable_RedSurf, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFieldMove = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenFieldMove, sPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Policeman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Policeman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSBrendan = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RSBrendan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RSMay = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RSMay, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_LittleBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_LittleGirl, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SittingBoy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SittingBoy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Lass, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Youngster, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Woman1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Woman3, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Boy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_BattleGirl, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_BugCatcher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_FatMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaldingMan = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_BaldingMan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Woman2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan1 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_OldMan1, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_WorkerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_WorkerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Beauty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chef = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Chef, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan2 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_OldMan2, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_OldWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Camper, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Picnicker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_CooltrainerM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_CooltrainerF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SuperNerd, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Channeler = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Channeler, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RocketF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMWater = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerMWater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFWater = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerFWater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerMLand = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerMLand, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFLand = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerFLand, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Blackbelt, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Scientist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Gentleman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Sailor, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Captain = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Captain, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisher = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Fisher, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TeachyTVHost = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_TeachyTVHost, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWoman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_UnusedWoman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_TuberF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMWater = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_TuberMWater, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMLand = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_TuberMLand, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Hiker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Biker = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Biker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymGuy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_GymGuy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Nurse, sPicTable_Nurse, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMaleReceptionist = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_UnusedMaleReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_ItemBall, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfOak = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_ProfOak, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Man, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rocker = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Rocker, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrFuji = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_MrFuji, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bruno = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Bruno, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldManLyingDown = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_OldManLyingDown, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CutTree = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_CutTree, sPicTable_CutTree, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clerk = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Clerk, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MGDeliveryman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_MGDeliveryman, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTowerDude = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_TrainerTowerDude, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableClubReceptionist = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_CableClubReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomReceptionist = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_UnionRoomReceptionist, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RockSmashRock = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_RockSmashRock, sPicTable_RockSmashRock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_StrengthBoulder = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_StrengthBoulder, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenNormal = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenNormal, sPicTable_GreenNormal, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_GreenBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenSurf = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenSurf, sPicTable_GreenSurf, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFieldMove = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenFieldMove, sPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedBikeAlt = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_RedBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_RocketM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celio = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Celio, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Agatha = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Agatha, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brock = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Brock, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Misty = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Misty, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LtSurge = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_LtSurge, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Erika = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Erika, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Koga = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Koga, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giovanni = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Giovanni, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blaine = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Blaine, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sabrina = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Sabrina, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bill = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Bill, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Daisy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Daisy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lorelei = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Lorelei, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lance = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Lance, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blue = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Blue, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedFish = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenFish, sPicTable_RedFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenFish = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_GREEN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenFish, sPicTable_GreenFish, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeeker = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenVSSeeker, sPicTable_RedItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RedVSSeekerBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenVSSeekerBike, sPicTable_RedVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeeker = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_RedGreenVSSeeker, sPicTable_GreenItem, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GreenVSSeekerBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_RED, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_RedGreenVSSeekerBike, sPicTable_GreenVSSeekerBike, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TownMap = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 32, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_TownMap, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pokedex = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Pokedex, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_GBAKid, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Snorlax = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Snorlax, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Fossil, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Ruby = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Ruby, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sapphire = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Sapphire, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldAmber = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_OldAmber, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GymSign = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Inanimate, sPicTable_GymSign, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sign = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Sign, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TrainerTips = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_WoodenSign, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clipboard = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Inanimate, sPicTable_Clipboard, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meteorite = {TAG_NONE, OBJ_EVENT_PAL_TAG_METEORITE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Inanimate, sPicTable_BirthIslandStone, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LaprasDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Inanimate, sPicTable_LaprasDoll, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spearow = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Spearow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Omanyte = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Omanyte, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kangaskhan = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Kangaskhan, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Psyduck = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Psyduck, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_NidoranF, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NidoranM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_NidoranM, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nidorino = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Nidorino, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Meowth = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Meowth, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seel = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Seel, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Voltorb = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Voltorb, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowpoke = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Slowpoke, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Slowbro = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Slowbro, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machop = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Machop, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wigglytuff = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Wigglytuff, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Doduo = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Doduo, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fearow = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Fearow, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lapras = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Lapras, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zapdos = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Zapdos, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Moltres = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Moltres, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Articuno = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Articuno, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysD = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_DeoxysD, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysA = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_DeoxysA, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DeoxysN = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_DeoxysN, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mewtwo = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Mewtwo, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Mew, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Entei = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Entei, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Raikou = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Raikou, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Suicune = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Suicune, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_Standard, sPicTable_Lugia, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, gObjectEventSpriteOamTables_32x32, sAnimTable_HoOh, sPicTable_HoOh, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Celebi = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_GREEN, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Celebi, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cubone = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_WHITE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Cubone, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Machoke = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Machoke, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kabuto = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Kabuto, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poliwrath = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Poliwrath, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgeot = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Pidgeot, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Chansey = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Chansey, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Pikachu, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Jigglypuff = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Jigglypuff, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pidgey = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Pidgey, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Clefairy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_PINK, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, gObjectEventSpriteOamTables_16x16, sAnimTable_Standard, sPicTable_Clefairy, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_BLUE, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, gObjectEventSpriteOamTables_16x32, sAnimTable_Standard, sPicTable_Mom, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Seagallop = {TAG_NONE, OBJ_EVENT_PAL_TAG_SEAGALLOP, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, gObjectEventSpriteOamTables_64x64, sAnimTable_Standard, sPicTable_Seagallop, gDummySpriteAffineAnimTable}; +const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSAnne = {TAG_NONE, OBJ_EVENT_PAL_TAG_SS_ANNE, OBJ_EVENT_PAL_TAG_NONE, 4096, 128, 64, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, gObjectEventSpriteOamTables_128x64, sAnimTable_Standard, sPicTable_SSAnne, gDummySpriteAffineAnimTable}; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 23b39c807..2a91bb38b 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -181,7 +181,7 @@ const u8 gReflectionEffectPaletteMap[16] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11 static const struct SpriteTemplate gCameraSpriteTemplate = { .tileTag = 0, - .paletteTag = SPRITE_INVALID_TAG, + .paletteTag = TAG_NONE, .oam = &gDummyOamData, .anims = gDummySpriteAnimTable, .images = NULL, @@ -1571,7 +1571,7 @@ static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTempl if (objectEvent->movementType == MOVEMENT_TYPE_INVISIBLE) objectEvent->invisible = TRUE; - *(u16 *)&spriteTemplate->paletteTag = SPRITE_INVALID_TAG; + *(u16 *)&spriteTemplate->paletteTag = TAG_NONE; spriteId = CreateSprite(spriteTemplate, 0, 0, 0); if (spriteId == MAX_SPRITES) { @@ -1702,7 +1702,7 @@ u8 AddPseudoObjectEvent(u16 graphicsId, SpriteCallback callback, s16 x, s16 y, u u8 spriteId; MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, callback, &spriteTemplate, &subspriteTables); - if (spriteTemplate.paletteTag != SPRITE_INVALID_TAG) + if (spriteTemplate.paletteTag != TAG_NONE) { LoadObjectEventPalette(spriteTemplate.paletteTag); } @@ -1725,7 +1725,7 @@ u8 sprite_new(u8 graphicsId, u8 a1, s16 x, s16 y, u8 z, u8 direction) graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, UpdateObjectEventSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables); - *(u16 *)&spriteTemplate.paletteTag = SPRITE_INVALID_TAG; + *(u16 *)&spriteTemplate.paletteTag = TAG_NONE; x += 7; y += 7; SetSpritePosToOffsetMapCoords(&x, &y, 8, 16); @@ -1767,7 +1767,7 @@ u8 sub_805EB44(u8 graphicsId, u8 a1, s16 x, s16 y) graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, SpriteCallbackDummy, &spriteTemplate, &subspriteTables); - *(u16 *)&spriteTemplate.paletteTag = SPRITE_INVALID_TAG; + *(u16 *)&spriteTemplate.paletteTag = TAG_NONE; spriteId = CreateSpriteAtEnd(&spriteTemplate, x, y, 0); if (spriteId != MAX_SPRITES) @@ -1899,7 +1899,7 @@ static void ReloadMapObjectWithOffset(u8 objectEventId, s16 x, s16 y) spriteFrameImage.size = graphicsInfo->size; MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objectEvent->graphicsId, objectEvent->movementType, &spriteTemplate, &subspriteTables); spriteTemplate.images = &spriteFrameImage; - *(u16 *)&spriteTemplate.paletteTag = SPRITE_INVALID_TAG; + *(u16 *)&spriteTemplate.paletteTag = TAG_NONE; if (graphicsInfo->paletteSlot == 0) { LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); @@ -1908,7 +1908,7 @@ static void ReloadMapObjectWithOffset(u8 objectEventId, s16 x, s16 y) { LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot); } - *(u16 *)&spriteTemplate.paletteTag = SPRITE_INVALID_TAG; + *(u16 *)&spriteTemplate.paletteTag = TAG_NONE; spriteId = CreateSprite(&spriteTemplate, 0, 0, 0); if (spriteId != MAX_SPRITES) { diff --git a/src/field_effect.c b/src/field_effect.c index f2bfa3976..5b2f5cdc3 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -160,7 +160,7 @@ static const union AnimCmd *const sNewGameOakAnimTable[] = { }; static const struct SpriteTemplate sNewGameOakObjectTemplate = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 4102, .oam = &sNewGameOakOamAttributes, .anims = sNewGameOakAnimTable, @@ -324,7 +324,7 @@ static const union AnimCmd *const sAnims_HofMonitor[] = { }; static const struct SpriteTemplate sSpriteTemplate_PokeballGlow = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 4103, .oam = &sOamData_8x8, .anims = sAnims_Flicker, @@ -334,7 +334,7 @@ static const struct SpriteTemplate sSpriteTemplate_PokeballGlow = { }; static const struct SpriteTemplate sSpriteTemplate_PokecenterMonitor = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 4103, .oam = &sOamData_32x16, .anims = sAnims_Flicker, @@ -344,7 +344,7 @@ static const struct SpriteTemplate sSpriteTemplate_PokecenterMonitor = { }; static const struct SpriteTemplate sSpriteTemplate_HofMonitor = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 4112, .oam = &sOamData_16x16, .anims = sAnims_HofMonitor, @@ -504,7 +504,7 @@ static void FieldEffectFreeTilesIfUnused(u16 tileStart) { u8 i; u16 tileTag = GetSpriteTileTagByTileStart(tileStart); - if (tileTag == SPRITE_INVALID_TAG) + if (tileTag == TAG_NONE) return; for (i = 0; i < MAX_SPRITES; i++) { @@ -518,7 +518,7 @@ static void FieldEffectFreePaletteIfUnused(u8 paletteNum) { u8 i; u16 paletteTag = GetSpritePaletteTagByPaletteNum(paletteNum); - if (paletteTag == SPRITE_INVALID_TAG) + if (paletteTag == TAG_NONE) return; for (i = 0; i < MAX_SPRITES; i++) { @@ -3840,7 +3840,7 @@ static const union AnimCmd *const sAnims_DeoxysRockFragment[] = static const struct SpriteTemplate sSpriteTemplate_DeoxysRockFragment = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 4371, .oam = &sOamData_8x8, .anims = sAnims_DeoxysRockFragment, diff --git a/src/list_menu.c b/src/list_menu.c index 8edd1805a..a914f8bc9 100644 --- a/src/list_menu.c +++ b/src/list_menu.c @@ -413,7 +413,7 @@ static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind) cursor.rowWidth = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8 + 2; cursor.rowHeight = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + 2; cursor.tileTag = 0x4000; - cursor.palTag = SPRITE_INVALID_TAG; + cursor.palTag = TAG_NONE; cursor.palNum = 15; return ListMenuAddCursorObjectInternal(&cursor, cursorKind); } diff --git a/src/menu_indicators.c b/src/menu_indicators.c index 8cc442147..b7027a8d5 100644 --- a/src/menu_indicators.c +++ b/src/menu_indicators.c @@ -331,7 +331,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 spriteSheet.size = 0x100; spriteSheet.tag = arrowInfo->tileTag; LoadCompressedSpriteSheet(&spriteSheet); - if (arrowInfo->palTag == SPRITE_INVALID_TAG) + if (arrowInfo->palTag == TAG_NONE) { LoadPalette(sRedArrowPal, (16 * arrowInfo->palNum) + 0x100, 0x20); } @@ -353,7 +353,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16 data->topSpriteId = AddScrollIndicatorArrowObject(arrowInfo->firstArrowType, arrowInfo->firstX, arrowInfo->firstY, arrowInfo->tileTag, arrowInfo->palTag); data->bottomSpriteId = AddScrollIndicatorArrowObject(arrowInfo->secondArrowType, arrowInfo->secondX, arrowInfo->secondY, arrowInfo->tileTag, arrowInfo->palTag); - if (arrowInfo->palTag == SPRITE_INVALID_TAG) + if (arrowInfo->palTag == TAG_NONE) { gSprites[data->topSpriteId].oam.paletteNum = arrowInfo->palNum; gSprites[data->bottomSpriteId].oam.paletteNum = arrowInfo->palNum; @@ -410,9 +410,9 @@ void RemoveScrollIndicatorArrowPair(u8 taskId) { struct ScrollIndicatorPair *data = (struct ScrollIndicatorPair *)gTasks[taskId].data; - if (data->tileTag != SPRITE_INVALID_TAG) + if (data->tileTag != TAG_NONE) FreeSpriteTilesByTag(data->tileTag); - if (data->palTag != SPRITE_INVALID_TAG) + if (data->palTag != TAG_NONE) FreeSpritePaletteByTag(data->palTag); DestroySprite(&gSprites[data->topSpriteId]); DestroySprite(&gSprites[data->bottomSpriteId]); @@ -537,7 +537,7 @@ u8 ListMenuAddRedOutlineCursorObject(const struct CursorStruct *cursor) spriteSheet.size = 0x100; spriteSheet.tag = cursor->tileTag; LoadCompressedSpriteSheet(&spriteSheet); - if (cursor->palTag == SPRITE_INVALID_TAG) + if (cursor->palTag == TAG_NONE) { LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20); } @@ -562,7 +562,7 @@ u8 ListMenuAddRedOutlineCursorObject(const struct CursorStruct *cursor) gSprites[data->spriteId].oam.priority = 0; gSprites[data->spriteId].subpriority = 0; gSprites[data->spriteId].subspriteTableNum = 0; - if (cursor->palTag == SPRITE_INVALID_TAG) + if (cursor->palTag == TAG_NONE) gSprites[data->spriteId].oam.paletteNum = cursor->palNum; return taskId; } @@ -580,9 +580,9 @@ void ListMenuRemoveRedOutlineCursorObject(u8 taskId) struct RedOutlineCursor *data = (struct RedOutlineCursor *)gTasks[taskId].data; Free(data->subspritesPtr); - if (data->tileTag != SPRITE_INVALID_TAG) + if (data->tileTag != TAG_NONE) FreeSpriteTilesByTag(data->tileTag); - if (data->palTag != SPRITE_INVALID_TAG) + if (data->palTag != TAG_NONE) FreeSpritePaletteByTag(data->palTag); DestroySprite(&gSprites[data->spriteId]); DestroyTask(taskId); @@ -610,7 +610,7 @@ static u8 ListMenuAddRedArrowCursorObject(const struct CursorStruct *cursor) spriteSheet.size = 0x80; spriteSheet.tag = cursor->tileTag; LoadCompressedSpriteSheet(&spriteSheet); - if (cursor->palTag == SPRITE_INVALID_TAG) + if (cursor->palTag == TAG_NONE) { LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20); } @@ -630,7 +630,7 @@ static u8 ListMenuAddRedArrowCursorObject(const struct CursorStruct *cursor) data->spriteId = CreateSprite(&spriteTemplate, cursor->left, cursor->top, 0); gSprites[data->spriteId].x2 = 8; gSprites[data->spriteId].y2 = 8; - if (cursor->palTag == SPRITE_INVALID_TAG) + if (cursor->palTag == TAG_NONE) gSprites[data->spriteId].oam.paletteNum = cursor->palNum; return taskId; } @@ -647,9 +647,9 @@ static void ListMenuRemoveRedArrowCursorObject(u8 taskId) { struct RedArrowCursor *data = (struct RedArrowCursor *)gTasks[taskId].data; - if (data->tileTag != SPRITE_INVALID_TAG) + if (data->tileTag != TAG_NONE) FreeSpriteTilesByTag(data->tileTag); - if (data->palTag != SPRITE_INVALID_TAG) + if (data->palTag != TAG_NONE) FreeSpritePaletteByTag(data->palTag); DestroySprite(&gSprites[data->spriteId]); DestroyTask(taskId); diff --git a/src/pokeball.c b/src/pokeball.c index 6434b72cd..9dbdfd0d1 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -1237,7 +1237,7 @@ void LoadBallGfx(u8 ballId) { u16 var; - if (GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag) == SPRITE_INVALID_TAG) + if (GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag) == TAG_NONE) { LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[ballId]); LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[ballId]); diff --git a/src/pokemon.c b/src/pokemon.c index 2e83f5076..fcfd678f4 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1469,7 +1469,7 @@ static const u8 sHoldEffectToType[][2] = const struct SpriteTemplate gSpriteTemplates_Battlers[] = { [B_POSITION_PLAYER_LEFT] = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0, .oam = &gOamData_BattlerPlayer, .anims = NULL, @@ -1478,7 +1478,7 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] = .callback = SpriteCB_AllyMon, }, [B_POSITION_OPPONENT_LEFT] = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0, .oam = &gOamData_BattlerOpponent, .anims = NULL, @@ -1487,7 +1487,7 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] = .callback = SpriteCB_EnemyMon, }, [B_POSITION_PLAYER_RIGHT] = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0, .oam = &gOamData_BattlerPlayer, .anims = NULL, @@ -1496,7 +1496,7 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] = .callback = SpriteCB_AllyMon, }, [B_POSITION_OPPONENT_RIGHT] = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0, .oam = &gOamData_BattlerOpponent, .anims = NULL, @@ -1509,7 +1509,7 @@ const struct SpriteTemplate gSpriteTemplates_Battlers[] = const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] = { { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0, .oam = &gOamData_BattlerPlayer, .anims = NULL, @@ -1518,7 +1518,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] = .callback = SpriteCB_AllyMon, }, { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0, .oam = &gOamData_BattlerPlayer, .anims = NULL, @@ -1527,7 +1527,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] = .callback = SpriteCB_AllyMon, }, { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0, .oam = &gOamData_BattlerPlayer, .anims = NULL, @@ -1536,7 +1536,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] = .callback = SpriteCB_AllyMon, }, { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0, .oam = &gOamData_BattlerPlayer, .anims = NULL, @@ -1545,7 +1545,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] = .callback = SpriteCB_AllyMon, }, { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0, .oam = &gOamData_BattlerPlayer, .anims = NULL, @@ -1554,7 +1554,7 @@ const struct SpriteTemplate gSpriteTemplates_TrainerBackpics[] = .callback = SpriteCB_AllyMon, }, { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = 0, .oam = &gOamData_BattlerPlayer, .anims = NULL, @@ -1680,8 +1680,8 @@ static const struct OamData sOakSpeechNidoranFDummyOamData = static const struct SpriteTemplate sOakSpeechNidoranFDummyTemplate = { - .tileTag = SPRITE_INVALID_TAG, - .paletteTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, + .paletteTag = TAG_NONE, .oam = &sOakSpeechNidoranFDummyOamData, .anims = gDummySpriteAnimTable, .images = NULL, diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 2ca312ae0..d9d2c4b6f 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -1252,7 +1252,7 @@ static u8 CreateMonIconSprite(const struct MonIconSpriteTemplate * iconTemplate, struct SpriteTemplate spriteTemplate = { - .tileTag = SPRITE_INVALID_TAG, + .tileTag = TAG_NONE, .paletteTag = iconTemplate->paletteTag, .oam = iconTemplate->oam, .anims = iconTemplate->anims, From dcb9d9de1eaaaa35382ddbfa01c2338a4501ce8e Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 21:39:25 -0400 Subject: [PATCH 49/64] Synced src/pokeball.c --- data/battle_anim_scripts.s | 278 ++++++------- include/battle.h | 22 +- include/battle_anim.h | 2 +- include/battle_gfx_sfx_util.h | 2 +- include/constants/battle.h | 2 +- include/graphics.h | 48 +-- include/librfu.h | 2 +- include/pokeball.h | 10 +- src/battle_anim_special.c | 46 +-- src/battle_controller_link_opponent.c | 4 +- src/battle_controller_link_partner.c | 4 +- src/battle_controller_oak_old_man.c | 4 +- src/battle_controller_opponent.c | 4 +- src/battle_controller_player.c | 16 +- src/battle_controller_pokedude.c | 4 +- src/battle_controllers.c | 2 +- src/battle_gfx_sfx_util.c | 7 +- src/battle_script_commands.c | 2 +- src/battle_setup.c | 4 +- src/battle_transition.c | 6 +- src/data/graphics/interface_pokeballs.h | 48 +-- src/data/party_menu.h | 8 +- src/daycare.c | 4 +- src/fldeff_strength.c | 2 +- src/librfu_stwi.c | 2 +- src/mail_data.c | 2 +- src/menu_indicators.c | 4 +- src/pokeball.c | 512 +++++++++++++----------- src/pokemon.c | 2 +- src/pokemon_jump.c | 10 +- src/pokemon_summary_screen.c | 5 +- src/trainer_see.c | 2 +- 32 files changed, 575 insertions(+), 495 deletions(-) diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index a111d52b3..936e58a35 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -1001,9 +1001,9 @@ Move_MEGA_PUNCH:: SetImpactBackground:: delay 2 - createvisualtask AnimTask_IsContest, 2, + createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, SetImpactContestsBG - createvisualtask AnimTask_IsTargetPlayerSide, 2, + createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, SetImpactOpponentBG jumpargeq 7, 1, SetImpactPlayerBG SetImpactBackgroundRet:: @@ -1474,12 +1474,12 @@ Move_FURY_CUTTER:: monbg 1 setalpha 12, 8 playsewithpan SE_M_RAZOR_WIND, 63 - createvisualtask AnimTask_IsFuryCutterHitRight, 2, + createvisualtask AnimTask_IsFuryCutterHitRight, 2, jumpargeq 7, 0, FuryCutterLeft goto FuryCutterRight FuryCutterContinue:: - createvisualtask AnimTask_GetFuryCutterHitCount, 2, + createvisualtask AnimTask_GetFuryCutterHitCount, 2, jumpargeq 7, 1, FuryCutterContinue2 jumpargeq 7, 2, FuryCutterMedium jumpargeq 7, 3, FuryCutterStrong @@ -1719,7 +1719,7 @@ Move_DEFENSE_CURL:: loadspritegfx ANIM_TAG_ECLIPSING_ORB loopsewithpan SE_M_TRI_ATTACK, 192, 18, 3 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 0 - createvisualtask AnimTask_DefenseCurlDeformMon, 5, + createvisualtask AnimTask_DefenseCurlDeformMon, 5, waitforvisualfinish createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1 waitforvisualfinish @@ -1757,7 +1757,7 @@ Move_FRUSTRATION:: loadspritegfx ANIM_TAG_ANGER monbg ANIM_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_GetFrustrationPowerLevel, 1, + createvisualtask AnimTask_GetFrustrationPowerLevel, 1, jumpargeq 7, 0, Frustration_Strongest jumpargeq 7, 1, Frustration_Strong jumpargeq 7, 2, Frustration_Medium @@ -1815,7 +1815,7 @@ Frustration_Strong:: createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 waitforvisualfinish delay 5 - createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5, + createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5, delay 7 playsewithpan SE_M_COMET_PUNCH, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1 @@ -1866,11 +1866,11 @@ Move_SAFEGUARD:: monbg ANIM_ATK_PARTNER setalpha 8, 8 playsewithpan SE_M_MILK_DRINK, 192 - createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, delay 4 - createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, delay 4 - createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish playsewithpan SE_SHINY, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 10, 0, 2, 0, 10, RGB_WHITE @@ -1955,7 +1955,7 @@ Move_PAY_DAY:: waitforvisualfinish playsewithpan SE_M_PAY_DAY, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 1, 0, 0, 1, 2 - createsprite gFallingCoinSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gFallingCoinSpriteTemplate, ANIM_ATTACKER, 2, createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 6, 1 waitforvisualfinish clearmonbg 1 @@ -2070,7 +2070,7 @@ Move_ATTRACT:: createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31 waitforvisualfinish waitplaysewithpan SE_M_ATTRACT2, 0, 15 - createvisualtask AnimTask_HeartsBackground, 5, + createvisualtask AnimTask_HeartsBackground, 5, createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 16, 256, 0 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 224, 240, 15 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 126, 272, 30 @@ -2137,7 +2137,7 @@ Move_CONFUSE_RAY:: Move_LOCK_ON:: loadspritegfx ANIM_TAG_LOCK_ON - createsprite gLockOnTargetSpriteTemplate, ANIM_ATTACKER, 40, + createsprite gLockOnTargetSpriteTemplate, ANIM_ATTACKER, 40, createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 1 createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 2 createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 3 @@ -2154,7 +2154,7 @@ Move_MEAN_LOOK:: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, 0 loopsewithpan SE_M_CONFUSE_RAY, 63, 15, 4 waitplaysewithpan SE_M_LEER, 63, 85 - createsprite gMeanLookEyeSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gMeanLookEyeSpriteTemplate, ANIM_ATTACKER, 2, delay 120 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, 0 delay 30 @@ -2336,7 +2336,7 @@ Move_SMOKESCREEN:: playsewithpan SE_M_DOUBLE_TEAM, 192 createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish - createvisualtask AnimTask_SmokescreenImpact, 2, + createvisualtask AnimTask_SmokescreenImpact, 2, delay 2 playsewithpan SE_M_SAND_ATTACK, 63 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 104, 0, 75 @@ -2399,7 +2399,7 @@ Move_CONVERSION:: playsewithpan SE_M_BARRIER, 192 createvisualtask AnimTask_FlashAnimTagWithColor, 2, 10018, 1, 1, 14335, 12, 0, 0 delay 6 - createvisualtask AnimTask_ConversionAlphaBlend, 5, + createvisualtask AnimTask_ConversionAlphaBlend, 5, waitforvisualfinish delay 1 clearmonbg ANIM_ATK_PARTNER @@ -2429,7 +2429,7 @@ Move_CONVERSION_2:: createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, -8, 24, 125 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 8, 24, 130 createsprite gConversion2SpriteTemplate, ANIM_ATTACKER, 2, 24, 24, 135 - createvisualtask AnimTask_Conversion2AlphaBlend, 5, + createvisualtask AnimTask_Conversion2AlphaBlend, 5, delay 60 playsewithpan SE_M_SWIFT, 63 delay 10 @@ -2601,8 +2601,8 @@ HornDrillInContest:: Move_THRASH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET - createvisualtask AnimTask_ThrashMoveMonHorizontal, 2, - createvisualtask AnimTask_ThrashMoveMonVertical, 2, + createvisualtask AnimTask_ThrashMoveMonHorizontal, 2, + createvisualtask AnimTask_ThrashMoveMonVertical, 2, createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 4, 0, 7, 1 playsewithpan SE_M_COMET_PUNCH, 63 @@ -2619,7 +2619,7 @@ Move_THRASH:: Move_SING:: loadspritegfx ANIM_TAG_MUSIC_NOTES monbg ANIM_DEF_PARTNER - createvisualtask AnimTask_MusicNotesRainbowBlend, 2, + createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish panse_1B SE_M_SING, 192, 63, 2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 0, 12 @@ -2648,7 +2648,7 @@ Move_SING:: delay 4 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER - createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, + createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, waitforvisualfinish end @@ -2840,7 +2840,7 @@ Move_RAGE:: Move_TELEPORT:: call SetPsychicBackground - createvisualtask AnimTask_Teleport, 2 + createvisualtask AnimTask_Teleport, 2 playsewithpan SE_M_TELEPORT, 192 delay 15 call UnsetPsychicBg @@ -2850,7 +2850,7 @@ Move_TELEPORT:: Move_DOUBLE_TEAM:: monbg ANIM_ATK_PARTNER setalpha 12, 8 - createvisualtask AnimTask_DoubleTeam, 2, + createvisualtask AnimTask_DoubleTeam, 2, playsewithpan SE_M_DOUBLE_TEAM, 192 delay 32 playsewithpan SE_M_DOUBLE_TEAM, 192 @@ -2876,7 +2876,7 @@ Move_DOUBLE_TEAM:: Move_MINIMIZE:: setalpha 10, 8 - createvisualtask AnimTask_Minimize, 2, + createvisualtask AnimTask_Minimize, 2, loopsewithpan SE_M_MINIMIZE, 192, 34, 3 waitforvisualfinish blendoff @@ -2934,7 +2934,7 @@ Move_AMNESIA:: loadspritegfx ANIM_TAG_AMNESIA call SetPsychicBackground delay 8 - createsprite gQuestionMarkSpriteTemplate, ANIM_ATTACKER, 20 + createsprite gQuestionMarkSpriteTemplate, ANIM_ATTACKER, 20 playsewithpan SE_M_METRONOME, 192 delay 54 loopsewithpan SE_M_METRONOME, 192, 16, 3 @@ -2971,7 +2971,7 @@ Move_GLARE:: waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 - createvisualtask AnimTask_ScaryFace, 5, + createvisualtask AnimTask_ScaryFace, 5, playsewithpan SE_M_LEER, 192 delay 2 createvisualtask AnimTask_ShakeTargetInPattern, 3, 20, 1, 0 @@ -2981,7 +2981,7 @@ Move_GLARE:: Move_BARRAGE:: loadspritegfx ANIM_TAG_RED_BALL - createvisualtask AnimTask_BarrageBall, 3, + createvisualtask AnimTask_BarrageBall, 3, playsewithpan SE_M_SWAGGER, 192 delay 24 createsprite gShakeMonOrTerrainSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 40, 1 @@ -3086,7 +3086,7 @@ Move_ACID_ARMOR:: Move_SHARPEN:: loadspritegfx ANIM_TAG_SPHERE_TO_CUBE - createsprite gSharpenSphereSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gSharpenSphereSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish end @@ -3101,7 +3101,7 @@ Move_SUPER_FANG:: delay 20 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 - createsprite gSuperFangSpriteTemplate, ANIM_TARGET, 2, + createsprite gSuperFangSpriteTemplate, ANIM_TARGET, 2, playsewithpan SE_M_BITE, 63 delay 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 2143, 14, RGB_WHITE, 14 @@ -3143,7 +3143,7 @@ Move_SKETCH:: loadspritegfx ANIM_TAG_PENCIL monbg 1 createvisualtask AnimTask_SketchDrawMon, 2 - createsprite gPencilSpriteTemplate, ANIM_TARGET, 2, + createsprite gPencilSpriteTemplate, ANIM_TARGET, 2, waitforvisualfinish clearmonbg 1 createvisualtask AnimTask_Splash, 2, 0, 2 @@ -3206,7 +3206,7 @@ Move_MACH_PUNCH:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg ANIM_ATK_PARTNER - createvisualtask AnimTask_GetAttackerSide, 2, + createvisualtask AnimTask_GetAttackerSide, 2, jumpargeq 7, 1, MachPunchOnPlayer fadetobg BG_HIGHSPEED_OPPONENT @@ -3334,7 +3334,7 @@ Move_ROLLOUT:: Move_FALSE_SWIPE:: loadspritegfx ANIM_TAG_SLASH_2 loadspritegfx ANIM_TAG_IMPACT - createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2, + createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2, playsewithpan SE_M_VITAL_THROW, 63 delay 16 createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 0 @@ -3361,10 +3361,10 @@ Move_FALSE_SWIPE:: Move_SWAGGER:: loadspritegfx ANIM_TAG_BREATH loadspritegfx ANIM_TAG_ANGER - createvisualtask AnimTask_GrowAndShrink, 2, + createvisualtask AnimTask_GrowAndShrink, 2, playsewithpan SE_M_SWAGGER, 192 waitforvisualfinish - createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, loopsewithpan SE_M_SWAGGER, 192, 4, 2 waitforvisualfinish delay 24 @@ -3381,7 +3381,7 @@ Move_MILK_DRINK:: loadspritegfx ANIM_TAG_THIN_RING loadspritegfx ANIM_TAG_BLUE_STAR monbg 1 - createsprite gMilkBottleSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gMilkBottleSpriteTemplate, ANIM_ATTACKER, 2, delay 40 playsewithpan SE_M_CRABHAMMER, 192 delay 12 @@ -3398,7 +3398,7 @@ Move_MILK_DRINK:: end Move_MAGNITUDE:: - createvisualtask AnimTask_IsPowerOver99, 2, + createvisualtask AnimTask_IsPowerOver99, 2, waitforvisualfinish jumpargeq 15, 0, MagnitudeRegular jumpargeq 15, 1, MagnitudeIntense @@ -3461,7 +3461,7 @@ Move_MOONLIGHT:: delay 30 createsprite gMoonlightSparkleSpriteTemplate, ANIM_ATTACKER, 40, 10, 0 delay 20 - createvisualtask AnimTask_FadeScreenBlue, 2, + createvisualtask AnimTask_FadeScreenBlue, 2, waitforvisualfinish call HealingEffect waitforvisualfinish @@ -3470,7 +3470,7 @@ Move_MOONLIGHT:: Move_EXTREME_SPEED:: loadspritegfx ANIM_TAG_SPEED_DUST loadspritegfx ANIM_TAG_IMPACT - createvisualtask AnimTask_GetAttackerSide, 2, + createvisualtask AnimTask_GetAttackerSide, 2, jumpargeq 7, 1, ExtremeSpeedOnPlayer fadetobg BG_HIGHSPEED_OPPONENT @@ -3486,7 +3486,7 @@ ExtremeSpeedContinue:: monbg ANIM_TARGET setalpha 12, 8 delay 18 - createvisualtask AnimTask_ExtremeSpeedImpact, 2, + createvisualtask AnimTask_ExtremeSpeedImpact, 2, delay 2 playsewithpan SE_M_COMET_PUNCH, 63 createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, 1, 0, -12, 3 @@ -3497,9 +3497,9 @@ ExtremeSpeedContinue:: playsewithpan SE_M_VITAL_THROW2, 63 createsprite gMonEdgeHitSplatSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, 3 waitforvisualfinish - createvisualtask AnimTask_SpeedDust, 2, + createvisualtask AnimTask_SpeedDust, 2, delay 10 - createvisualtask AnimTask_ExtremeSpeedMonReappear, 2, + createvisualtask AnimTask_ExtremeSpeedMonReappear, 2, loopsewithpan SE_M_DOUBLE_TEAM, 192, 8, 4 waitforvisualfinish restorebg @@ -3571,7 +3571,7 @@ Move_HAIL:: loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_BlendSelected, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish - createvisualtask AnimTask_Hail1, 5, + createvisualtask AnimTask_Hail1, 5, loopsewithpan SE_M_HAIL, 0, 8, 10 waitforvisualfinish createvisualtask AnimTask_BlendSelected, 10, 1, 3, 6, 0, RGB_BLACK @@ -3580,7 +3580,7 @@ Move_HAIL:: Move_TORMENT:: loadspritegfx ANIM_TAG_ANGER loadspritegfx ANIM_TAG_THOUGHT_BUBBLE - createvisualtask AnimTask_TormentAttacker, 2, + createvisualtask AnimTask_TormentAttacker, 2, waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, 1, 31, 10, 1, 1 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 @@ -3600,7 +3600,7 @@ Move_MEMENTO:: delay 48 playsewithpan SE_M_PSYBEAM2, 192 waitforvisualfinish - createvisualtask sub_80B8664, 2, + createvisualtask sub_80B8664, 2, delay 12 setalpha 0, 16 delay 1 @@ -3703,7 +3703,7 @@ Move_TAUNT:: Move_HELPING_HAND:: loadspritegfx ANIM_TAG_TAG_HAND - createvisualtask AnimTask_HelpingHandAttackerMovement, 5, + createvisualtask AnimTask_HelpingHandAttackerMovement, 5, createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0 createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1 delay 19 @@ -3758,7 +3758,7 @@ Move_SUPERPOWER:: delay 8 createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 60, 288, 3, 88 delay 74 - createsprite gSuperpowerFireballSpriteTemplate, ANIM_TARGET, 3, 0 + createsprite gSuperpowerFireballSpriteTemplate, ANIM_TARGET, 3, 0 playsewithpan SE_M_SWAGGER, 192 delay 16 createvisualtask AnimTask_ShakeMon2, 2, 1, 8, 0, 16, 1 @@ -3774,7 +3774,7 @@ Move_RECYCLE:: monbg ANIM_ATTACKER setalpha 0, 16 delay 1 - createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2, loopsewithpan SE_M_TAKE_DOWN, 192, 24, 3 waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 5, 0, RGB_WHITE, 12, 2, 1 @@ -3999,7 +3999,7 @@ Move_LUSTER_PURGE:: loadspritegfx ANIM_TAG_IMPACT fadetobg 3 waitbgfadeout - createvisualtask AnimTask_FadeScreenToWhite, 5, + createvisualtask AnimTask_FadeScreenToWhite, 5, waitbgfadein monbg ANIM_ATTACKER setalpha 12, 8 @@ -4049,7 +4049,7 @@ Move_MIST_BALL:: createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, 32279, 16, RGB_WHITE, 16 delay 0 playsewithpan SE_M_HAZE, 0 - createvisualtask AnimTask_LoadMistTiles, 5, + createvisualtask AnimTask_LoadMistTiles, 5, createvisualtask AnimTask_BlendSelected, 10, 4, 3, 0, 16, RGB_WHITE delay 8 createvisualtask AnimTask_ShakeMon, 2, 1, 4, 0, 70, 0 @@ -4082,7 +4082,7 @@ Move_FEATHER_DANCE:: Move_TEETER_DANCE:: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_DUCK - createvisualtask AnimTask_TeeterDanceMovement, 5, + createvisualtask AnimTask_TeeterDanceMovement, 5, createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, -2 playsewithpan SE_M_TEETER_DANCE, 192 delay 24 @@ -4305,7 +4305,7 @@ Move_AIR_CUTTER:: Move_ODOR_SLEUTH:: monbg 1 - createvisualtask AnimTask_OdorSleuthMovement, 5, + createvisualtask AnimTask_OdorSleuthMovement, 5, delay 24 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 playsewithpan SE_M_SWAGGER, 192 @@ -4323,7 +4323,7 @@ Move_GRASS_WHISTLE:: loadspritegfx ANIM_TAG_MUSIC_NOTES createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 13298 waitforvisualfinish - createvisualtask AnimTask_MusicNotesRainbowBlend, 2, + createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish panse_1B SE_M_GRASSWHISTLE, 192, 63, 2, 0 createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 7, 1, 0 @@ -4351,7 +4351,7 @@ Move_GRASS_WHISTLE:: createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 5, 1, 0 delay 4 waitforvisualfinish - createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, + createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 4, 0, 13298 waitforvisualfinish end @@ -4379,13 +4379,13 @@ Move_WATER_SPOUT:: loadspritegfx ANIM_TAG_WATER_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_WaterSpoutLaunch, 5, + createvisualtask AnimTask_WaterSpoutLaunch, 5, playsewithpan SE_M_HEADBUTT, 192 delay 44 playsewithpan SE_M_DIVE, 192 waitforvisualfinish delay 16 - createvisualtask AnimTask_WaterSpoutRain, 5, + createvisualtask AnimTask_WaterSpoutRain, 5, playsewithpan SE_M_SURF, 63 clearmonbg ANIM_DEF_PARTNER blendoff @@ -4459,7 +4459,7 @@ Move_IRON_DEFENSE:: Move_BLOCK:: loadspritegfx ANIM_TAG_X_SIGN - createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66, + createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66, playsewithpan SE_M_SWAGGER, 63 end @@ -4475,10 +4475,10 @@ Move_HOWL:: Move_BULK_UP:: loadspritegfx ANIM_TAG_BREATH - createvisualtask AnimTask_GrowAndShrink, 2, + createvisualtask AnimTask_GrowAndShrink, 2, playsewithpan SE_M_SWAGGER, 192 waitforvisualfinish - createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2, loopsewithpan SE_M_SWAGGER, 192, 4, 2 waitforvisualfinish end @@ -4549,7 +4549,7 @@ Move_VOLT_TACKLE:: Move_WATER_SPORT:: loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB - createvisualtask AnimTask_WaterSport, 5, + createvisualtask AnimTask_WaterSport, 5, delay 8 playsewithpan SE_M_SURF, 192 delay 44 @@ -4587,7 +4587,7 @@ Move_CALM_MIND:: Move_LEAF_BLADE:: loadspritegfx ANIM_TAG_LEAF loadspritegfx ANIM_TAG_CROSS_IMPACT - createvisualtask AnimTask_LeafBlade, 5, + createvisualtask AnimTask_LeafBlade, 5, delay 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 playsewithpan SE_M_CUT, 63 @@ -4672,7 +4672,7 @@ Move_HARDEN:: Move_BELLY_DRUM:: loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE - createvisualtask AnimTask_MusicNotesRainbowBlend, 2, + createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish call BellyDrumRight createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0 @@ -4698,7 +4698,7 @@ Move_BELLY_DRUM:: createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 3, 0 playsewithpan SE_M_BELLY_DRUM, 192 waitforvisualfinish - createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, + createvisualtask AnimTask_MusicNotesClearRainbowBlend, 2, waitforvisualfinish end @@ -4719,7 +4719,7 @@ Move_MIND_READER:: monbg 4 playsewithpan SE_M_CONFUSE_RAY, 63 createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0, 0, 1, 0 - createsprite gWhiteHaloSpriteTemplate, ANIM_ATTACKER, 5, + createsprite gWhiteHaloSpriteTemplate, ANIM_ATTACKER, 5, delay 40 playsewithpan SE_M_LEER, 63 createvisualtask AnimTask_CurseBlendEffect, 2, 1, 1, 2, 0, 10, 0 @@ -5078,7 +5078,7 @@ Move_ROAR:: clearmonbg ANIM_ATTACKER blendoff waitforvisualfinish - createvisualtask SoundTask_WaitForCry, 5, + createvisualtask SoundTask_WaitForCry, 5, waitforvisualfinish end @@ -5100,7 +5100,7 @@ Move_GROWL:: createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 9, 1 createvisualtask AnimTask_ShakeMon2, 2, 3, 1, 0, 9, 1 waitforvisualfinish - createvisualtask SoundTask_WaitForCry, 5, + createvisualtask SoundTask_WaitForCry, 5, waitforvisualfinish end @@ -5270,7 +5270,7 @@ Move_FAINT_ATTACK:: clearmonbg ANIM_ATTACKER invisible 0 delay 1 - createvisualtask AnimTask_SetAttackerInvisibleWaitForSignal, 2, + createvisualtask AnimTask_SetAttackerInvisibleWaitForSignal, 2, monbg 1 setalpha 12, 8 delay 1 @@ -5501,7 +5501,7 @@ IceBeamCreateCrystals:: Move_WITHDRAW:: playsewithpan SE_M_HEADBUTT, 192 - createvisualtask AnimTask_Withdraw, 5, + createvisualtask AnimTask_Withdraw, 5, waitforvisualfinish end @@ -5594,7 +5594,7 @@ SolarBeamAbsorbEffect:: SolarBeamUnleash:: call SetSolarBeamBg panse_1B SE_M_SOLAR_BEAM, 192, 63, 2, 0 - createvisualtask AnimTask_CreateSmallSolarBeamOrbs, 5, + createvisualtask AnimTask_CreateSmallSolarBeamOrbs, 5, createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 delay 4 createsprite gSolarBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 @@ -5638,7 +5638,7 @@ SolarBeamUnleash1:: Move_BLIZZARD:: loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg ANIM_DEF_PARTNER - createvisualtask AnimTask_GetAttackerSide, 2, + createvisualtask AnimTask_GetAttackerSide, 2, jumpargeq 7, 1, BlizzardOnPlayer fadetobg BG_HIGHSPEED_OPPONENT @@ -6892,7 +6892,7 @@ Move_SPORE:: loadspritegfx ANIM_TAG_SPORE monbg ANIM_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_SporeDoubleBattle, 2, + createvisualtask AnimTask_SporeDoubleBattle, 2, loopsewithpan SE_M_POISON_POWDER, 63, 16, 11 call CreateSpore call CreateSpore @@ -7067,7 +7067,7 @@ MistCloud:: Move_HAZE:: waitforvisualfinish playsewithpan SE_M_HAZE, 0 - createvisualtask AnimTask_Haze1, 5, + createvisualtask AnimTask_Haze1, 5, delay 30 createvisualtask AnimTask_BlendSelected, 10, 0 | (0xF << 7), 2, 0, 16, RGB_BLACK delay 90 @@ -7624,7 +7624,7 @@ Move_SPIDER_WEB:: call SpiderWebThread waitforvisualfinish playsewithpan SE_M_STRING_SHOT2, 63 - createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish clearmonbg ANIM_DEF_PARTNER delay 1 @@ -7683,7 +7683,7 @@ Move_DISABLE:: playsewithpan SE_M_DETECT, 192 createsprite gSpriteTemplate_83BF480, ANIM_ATTACKER, 13, 24, -16 waitforvisualfinish - createvisualtask AnimTask_GrowAndGreyscale, 5, + createvisualtask AnimTask_GrowAndGreyscale, 5, loopsewithpan SE_M_BIND, 63, 15, 4 waitforvisualfinish delay 1 @@ -7806,7 +7806,7 @@ CurseStats:: CurseStats1:: playsewithpan SE_M_DRAGON_RAGE, 192 - createvisualtask AnimTask_SetUpCurseBackground, 5, + createvisualtask AnimTask_SetUpCurseBackground, 5, createvisualtask AnimTask_CurseBlendEffect, 5, 2, 4, 2, 0, 10, 31 return @@ -7888,7 +7888,7 @@ HealBellRing:: Move_FAKE_OUT:: playsewithpan SE_M_FLATTER, 0 - createvisualtask AnimTask_FakeOut, 5, + createvisualtask AnimTask_FakeOut, 5, waitforvisualfinish playsewithpan SE_M_SKETCH, 63 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 @@ -7904,7 +7904,7 @@ Move_SCARY_FACE:: waitforvisualfinish delay 10 playsewithpan SE_M_LEER, 192 - createvisualtask AnimTask_ScaryFace, 5, + createvisualtask AnimTask_ScaryFace, 5, delay 13 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 @@ -7994,7 +7994,7 @@ Move_INGRAIN:: Move_PRESENT:: loadspritegfx ANIM_TAG_ITEM_BAG - createvisualtask AnimTask_IsHealingMove, 2, + createvisualtask AnimTask_IsHealingMove, 2, createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 playsewithpan SE_M_TAIL_WHIP, 192 delay 14 @@ -8056,7 +8056,7 @@ Move_BATON_PASS:: loadspritegfx ANIM_TAG_POKEBALL playsewithpan SE_M_BATON_PASS, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 31, 1, 2, 0, 11, 31455 - createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2, + createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2, end Move_PERISH_SONG:: @@ -8127,14 +8127,14 @@ Move_HYPER_FANG:: playsewithpan SE_M_BITE, 63 delay 1 delay 2 - createvisualtask AnimTask_IsContest, 2, + createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, HyperFangInContest - createvisualtask AnimTask_IsTargetPlayerSide, 2, + createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, HyperFangOnOpponent goto HyperFangOnPlayer HyperFangContinue:: waitbgfadeout - createsprite gFangSpriteTemplate, ANIM_TARGET, 2, + createsprite gFangSpriteTemplate, ANIM_TARGET, 2, waitbgfadein createvisualtask AnimTask_ShakeMon, 3, 1, 0, 10, 10, 1 playsewithpan SE_M_LEER, 63 @@ -8239,7 +8239,7 @@ Move_WILL_O_WISP:: Move_ENCORE:: loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_TAG_HAND - createvisualtask AnimTask_CreateSpotlight, 2, + createvisualtask AnimTask_CreateSpotlight, 2, createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE waitforvisualfinish createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8 @@ -8253,7 +8253,7 @@ Move_ENCORE:: waitforvisualfinish createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE waitforvisualfinish - createvisualtask AnimTask_RemoveSpotlight, 2, + createvisualtask AnimTask_RemoveSpotlight, 2, end Move_TRICK:: @@ -8263,7 +8263,7 @@ Move_TRICK:: createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 208 delay 16 playsewithpan SE_M_SKETCH, 0 - createvisualtask AnimTask_StretchTargetUp, 3, + createvisualtask AnimTask_StretchTargetUp, 3, createvisualtask AnimTask_StretchAttackerUp, 3 delay 30 playsewithpan SE_M_DOUBLE_TEAM, 0 @@ -8290,7 +8290,7 @@ Move_WISH:: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 waitforvisualfinish panse_27 SE_M_REFLECT, 63, 192, 253, 0 - createsprite gWishStarSpriteTemplate, ANIM_ATTACKER, 40, + createsprite gWishStarSpriteTemplate, ANIM_ATTACKER, 40, waitforvisualfinish delay 60 loopsewithpan SE_M_HEAL_BELL, 192, 16, 3 @@ -8304,7 +8304,7 @@ Move_STOCKPILE:: loadspritegfx ANIM_TAG_GRAY_ORB playsewithpan SE_M_MEGA_KICK, 192 createvisualtask AnimTask_CurseBlendEffect, 2, 2, 8, 1, 0, 12, RGB_WHITE - createvisualtask AnimTask_StockpileDeformMon, 5, + createvisualtask AnimTask_StockpileDeformMon, 5, call StockpileAbsorb call StockpileAbsorb waitforvisualfinish @@ -8334,7 +8334,7 @@ Move_SPIT_UP:: loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_M_TAKE_DOWN, 192 - createvisualtask AnimTask_SpitUpDeformMon, 5, + createvisualtask AnimTask_SpitUpDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 delay 45 playsewithpan SE_M_SPIT_UP, 192 @@ -8383,7 +8383,7 @@ Move_SWALLOW:: loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_M_TAKE_DOWN, 192 - createvisualtask AnimTask_SwallowDeformMon, 5, + createvisualtask AnimTask_SwallowDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 delay 38 playsewithpan SE_M_SPIT_UP, 192 @@ -8430,7 +8430,7 @@ Move_TRANSFORM:: Move_MORNING_SUN:: loadspritegfx ANIM_TAG_GREEN_STAR loadspritegfx ANIM_TAG_BLUE_STAR - createvisualtask AnimTask_MorningSunLightBeam, 5, + createvisualtask AnimTask_MorningSunLightBeam, 5, delay 8 createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 8, 0, 12, RGB_WHITE delay 14 @@ -8545,8 +8545,8 @@ Move_HYPER_BEAM:: end HyperBeamOrbs:: - createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2, - createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2, + createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2, + createsprite gHyperBeamOrbSpriteTemplate, ANIM_TARGET, 2, delay 1 return @@ -8554,7 +8554,7 @@ Move_FLATTER:: loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_CONFETTI createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, 63 - createvisualtask AnimTask_CreateSpotlight, 2, + createvisualtask AnimTask_CreateSpotlight, 2, createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE waitforvisualfinish createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80 @@ -8588,7 +8588,7 @@ Move_FLATTER:: waitforvisualfinish createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE waitforvisualfinish - createvisualtask AnimTask_RemoveSpotlight, 2, + createvisualtask AnimTask_RemoveSpotlight, 2, end CreateFlatterConfetti:: @@ -8603,7 +8603,7 @@ Move_ROLE_PLAY:: waitforvisualfinish playsewithpan SE_M_TRI_ATTACK, 192 waitplaysewithpan SE_M_DETECT, 192, 30 - createvisualtask AnimTask_RolePlaySilhouette, 2, + createvisualtask AnimTask_RolePlaySilhouette, 2, waitforvisualfinish clearmonbg ANIM_ATK_PARTNER createvisualtask AnimTask_BlendSelected, 10, 4, 2, 16, 0, RGB_WHITE @@ -8663,7 +8663,7 @@ HyperVoiceEffect:: createvisualtask AnimTask_ShakeMon2, 2, 1, 1, 0, 6, 1 createvisualtask AnimTask_ShakeMon2, 2, 3, 1, 0, 6, 1 createvisualtask AnimTask_ShakeBattleTerrain, 2, 1, 0, 6, 1 - createvisualtask SoundTask_WaitForCry, 5, + createvisualtask SoundTask_WaitForCry, 5, return Move_SAND_TOMB:: @@ -8924,7 +8924,7 @@ Move_POISON_FANG:: loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_M_BITE, 63 - createsprite gFangSpriteTemplate, ANIM_TARGET, 2, + createsprite gFangSpriteTemplate, ANIM_TARGET, 2, delay 10 createvisualtask AnimTask_ShakeMon, 3, 1, 3, 0, 10, 1 waitforvisualfinish @@ -8935,7 +8935,7 @@ Move_POISON_FANG:: Move_SUBSTITUTE:: playsewithpan SE_M_ATTRACT, 192 - createvisualtask AnimTask_MonToSubstitute, 2, + createvisualtask AnimTask_MonToSubstitute, 2, end Move_FRENZY_PLANT:: @@ -9029,9 +9029,9 @@ FocusPunch:: loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_HANDS_AND_FEET delay 1 - createvisualtask AnimTask_IsContest, 2, + createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, FocusPunchInContest - createvisualtask AnimTask_IsTargetPlayerSide, 2, + createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, FocusPunchOnOpponent jumpargeq 7, 1, FocusPunchOnPlayer FocusPunchContinue:: @@ -9075,7 +9075,7 @@ Move_RETURN:: loadspritegfx ANIM_TAG_IMPACT monbg ANIM_DEF_PARTNER setalpha 12, 8 - createvisualtask AnimTask_GetReturnPowerLevel, 2, + createvisualtask AnimTask_GetReturnPowerLevel, 2, delay 2 jumpargeq 7, 0, ReturnWeak jumpargeq 7, 1, ReturnMedium @@ -9324,7 +9324,7 @@ Move_SILVER_WIND:: monbgprio_29 delay 0 createvisualtask AnimTask_BlendExcept, 10, 1, 0, 0, 4, 0 - createvisualtask AnimTask_GetTargetSide, 2, + createvisualtask AnimTask_GetTargetSide, 2, jumpargeq 7, 1, SilverWindOnPlayer fadetobg BG_BUG_OPPONENT waitbgfadeout @@ -9532,7 +9532,7 @@ Move_HYDRO_CANNON:: monbg ANIM_DEF_PARTNER setalpha 12, 8 playsewithpan SE_M_SURF, 192 - createsprite gHydroCannonChargeSpriteTemplate, ANIM_TARGET, 2, + createsprite gHydroCannonChargeSpriteTemplate, ANIM_TARGET, 2, delay 10 createvisualtask AnimTask_InvertScreenColor, 2, 257, 257, 257 delay 30 @@ -9578,7 +9578,7 @@ Move_ASTONISH:: playsewithpan SE_M_SKETCH, 63 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 - createvisualtask AnimTask_StretchTargetUp, 3, + createvisualtask AnimTask_StretchTargetUp, 3, waitforvisualfinish end @@ -9589,7 +9589,7 @@ Move_SEISMIC_TOSS:: monbg ANIM_DEF_PARTNER setalpha 12, 8 waitforvisualfinish - createvisualtask AnimTask_GetSeismicTossDamageLevel, 3, + createvisualtask AnimTask_GetSeismicTossDamageLevel, 3, delay 1 fadetobg 17 waitbgfadeout @@ -9700,7 +9700,7 @@ Move_PSYCHO_BOOST:: monbg ANIM_ATK_PARTNER fadetobg 3 waitbgfadeout - createvisualtask AnimTask_FadeScreenToWhite, 5, + createvisualtask AnimTask_FadeScreenToWhite, 5, waitbgfadein delay 6 createvisualtask AnimTask_CurseBlendEffect, 2, 1, 2, 8, 0, 10, 0 @@ -9765,7 +9765,7 @@ Move_DOOM_DESIRE:: createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish delay 10 - createvisualtask AnimTask_DoomDesireLightBeam, 5, + createvisualtask AnimTask_DoomDesireLightBeam, 5, delay 5 playsewithpan SE_M_CONFUSE_RAY, 192 delay 10 @@ -9838,7 +9838,7 @@ Move_SKY_UPPERCUT:: end Move_SECRET_POWER:: - createvisualtask AnimTask_GetBattleTerrain, 5, + createvisualtask AnimTask_GetBattleTerrain, 5, jumpargeq 0, 0, Move_NEEDLE_ARM jumpargeq 0, 1, Move_MAGICAL_LEAF jumpargeq 0, 2, Move_MUD_SHOT @@ -10049,7 +10049,7 @@ Move_WEATHER_BALL:: playsewithpan SE_M_DETECT, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 waitforvisualfinish - createvisualtask AnimTask_GetWeather, 2, + createvisualtask AnimTask_GetWeather, 2, delay 1 jumpargeq 7, 0, WeatherBallNormal jumpargeq 7, 1, WeatherBallFire @@ -10375,7 +10375,7 @@ ConfusionEffect:: SetPsychicBackground:: fadetobg 3 waitbgfadeout - createvisualtask AnimTask_SetPsychicBackground, 5, + createvisualtask AnimTask_SetPsychicBackground, 5, waitbgfadein return @@ -10409,9 +10409,9 @@ UnsetSkyBg:: return SetSolarBeamBg:: - createvisualtask AnimTask_IsContest, 2, + createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, SetSolarBeamBgContest - createvisualtask AnimTask_IsTargetPlayerSide, 2, + createvisualtask AnimTask_IsTargetPlayerSide, 2, jumpargeq 7, 0, SetSolarBeamBgOpponent goto SetSolarBeamBgPlayer SetSolarBeamBgContinue:: @@ -10492,7 +10492,7 @@ Status_Freeze:: monbg ANIM_DEF_PARTNER monbgprio_28 1 waitplaysewithpan SE_M_HAIL, 63, 17 - createvisualtask AnimTask_FrozenIceCube, 2, + createvisualtask AnimTask_FrozenIceCube, 2, waitforvisualfinish clearmonbg ANIM_DEF_PARTNER end @@ -10501,7 +10501,7 @@ Status_Curse:: loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg ANIM_DEF_PARTNER playsewithpan SE_M_NIGHTMARE, 63 - createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2, + createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2, createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 14, 1 waitforvisualfinish clearmonbg ANIM_DEF_PARTNER @@ -10518,7 +10518,7 @@ Status_Nightmare:: end General_CastformChange:: - createvisualtask AnimTask_IsMonInvisible, 2, + createvisualtask AnimTask_IsMonInvisible, 2, jumpargeq 7, 1, CastformChangeSkipAnim goto CastformChangeContinue @@ -10536,7 +10536,7 @@ CastformChangeSkipAnim:: end General_StatsChange:: - createvisualtask AnimTask_StatsChange, 5, + createvisualtask AnimTask_StatsChange, 5, waitforvisualfinish end @@ -10554,12 +10554,12 @@ General_SubstituteFade:: end General_SubstituteAppear:: - createvisualtask AnimTask_MonToSubstitute, 2, + createvisualtask AnimTask_MonToSubstitute, 2, end General_BaitThrow:: createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 0 - createvisualtask AnimTask_LoadBaitGfx, 2, + createvisualtask AnimTask_LoadBaitGfx, 2, delay 0 waitplaysewithpan SE_M_JUMP_KICK, 192, 22 createsprite gSafariBaitSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32 @@ -10567,16 +10567,16 @@ General_BaitThrow:: loopsewithpan SE_M_TAIL_WHIP, 63, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, 1 waitforvisualfinish - createvisualtask AnimTask_FreeBaitGfx, 2, + createvisualtask AnimTask_FreeBaitGfx, 2, end General_ItemKnockoff:: loadspritegfx ANIM_TAG_ITEM_BAG - createsprite gKnockOffItemSpriteTemplate, ANIM_TARGET, 2, + createsprite gKnockOffItemSpriteTemplate, ANIM_TARGET, 2, end General_TurnTrap:: - createvisualtask AnimTask_GetTrappedMoveAnimId, 5, + createvisualtask AnimTask_GetTrappedMoveAnimId, 5, jumpargeq 0, 1, Status_FireSpin jumpargeq 0, 2, Status_Whirlpool jumpargeq 0, 3, Status_Clamp @@ -10749,7 +10749,7 @@ General_Hail:: goto Move_HAIL General_LeechSeedDrain:: - createvisualtask AnimTask_GetBattlersFromArg, 5, + createvisualtask AnimTask_GetBattlersFromArg, 5, delay 0 goto Move_ABSORB @@ -10768,7 +10768,7 @@ General_MonHit:: General_ItemSteal:: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_SetAnimAttackerAndTargetForEffectAtk, 2 - createvisualtask AnimTask_TargetToEffectBattler, 2, + createvisualtask AnimTask_TargetToEffectBattler, 2, delay 1 createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 end @@ -10780,7 +10780,7 @@ General_SnatchMove:: delay 1 createvisualtask AnimTask_SwayMon, 2, 0, 5, 5120, 4, 1 waitforvisualfinish - createvisualtask AnimTask_IsTargetSameSide, 2, + createvisualtask AnimTask_IsTargetSameSide, 2, jumpargeq 7, 0, SnatchOpposingMonMove goto SnatchPartnerMonMove @@ -10791,12 +10791,12 @@ SnatchMoveContinue:: SnatchOpposingMonMove:: playsewithpan SE_M_DOUBLE_TEAM, 192 - createvisualtask AnimTask_SnatchOpposingMonMove, 2, + createvisualtask AnimTask_SnatchOpposingMonMove, 2, goto SnatchMoveContinue SnatchPartnerMonMove:: playsewithpan SE_M_DOUBLE_TEAM, 192 - createvisualtask AnimTask_SnatchPartnerMove, 2, + createvisualtask AnimTask_SnatchPartnerMove, 2, goto SnatchMoveContinue General_FutureSightHit:: @@ -10820,12 +10820,12 @@ General_FutureSightHit:: end General_DoomDesireHit:: - createvisualtask AnimTask_SetAnimTargetToBattlerTarget, 2, + createvisualtask AnimTask_SetAnimTargetToBattlerTarget, 2, loadspritegfx ANIM_TAG_EXPLOSION createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish delay 10 - createvisualtask AnimTask_DoomDesireLightBeam, 5, + createvisualtask AnimTask_DoomDesireLightBeam, 5, delay 9 playsewithpan SE_M_CONFUSE_RAY, 192 delay 9 @@ -10909,7 +10909,7 @@ General_MonScared:: playsewithpan SE_M_SKETCH, 63 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 - createvisualtask AnimTask_StretchTargetUp, 3, + createvisualtask AnimTask_StretchTargetUp, 3, waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 10, 0, 26336 waitforvisualfinish @@ -10921,7 +10921,7 @@ General_GhostGetOut:: fadetobg 2 waitbgfadeout monbg_22 0 - createvisualtask sub_80B6BBC, 2, + createvisualtask sub_80B6BBC, 2, waitbgfadein loopsewithpan SE_M_PSYBEAM, 63, 20, 3 waitforvisualfinish @@ -10932,7 +10932,7 @@ General_GhostGetOut:: createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 - createvisualtask AnimTask_StretchTargetUp, 3, + createvisualtask AnimTask_StretchTargetUp, 3, waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, -1, 6, 0, 27349 waitforvisualfinish @@ -10971,7 +10971,7 @@ General_SafariRockThrow:: end General_SafariReaction:: - createvisualtask AnimTask_SafariGetReaction, 2, + createvisualtask AnimTask_SafariGetReaction, 2, waitforvisualfinish jumpargeq 7, 0, SafariReaction_WatchingCarefully jumpargeq 7, 1, SafariReaction_Angry @@ -11005,7 +11005,7 @@ SafariReaction_Eating:: end SnatchMoveTrySwapFromSubstitute:: - createvisualtask AnimTask_IsAttackerBehindSubstitute, 2, + createvisualtask AnimTask_IsAttackerBehindSubstitute, 2, jumpargeq 7, 1, SnatchMoveSwapSubstituteForMon SnatchMoveTrySwapFromSubstituteEnd:: @@ -11018,7 +11018,7 @@ SnatchMoveSwapSubstituteForMon:: goto SnatchMoveTrySwapFromSubstituteEnd SnatchMoveTrySwapToSubstitute:: - createvisualtask AnimTask_IsAttackerBehindSubstitute, 2, + createvisualtask AnimTask_IsAttackerBehindSubstitute, 2, jumpargeq 7, 1, SnatchMoveSwapMonForSubstitute SnatchMoveTrySwapToSubstituteEnd:: @@ -11046,9 +11046,9 @@ Special_SwitchOutPlayerMon:: end Special_SwitchOutOpponentMon:: - createvisualtask AnimTask_SwitchOutBallEffect, 2, + createvisualtask AnimTask_SwitchOutBallEffect, 2, delay 10 - createvisualtask AnimTask_SwitchOutShrinkMon, 2, + createvisualtask AnimTask_SwitchOutShrinkMon, 2, end Special_BallThrow:: @@ -11056,8 +11056,8 @@ Special_BallThrow:: delay 0 playsewithpan SE_BALL_THROW, 0 createvisualtask AnimTask_ThrowBall, 2 - createvisualtask AnimTask_IsBallBlockedByTrainerOrDodged, 2, - jumpargeq 7, -1, BallThrowTrainerBlock + createvisualtask AnimTask_IsBallBlockedByTrainerOrDodged, 2, + jumpargeq 7, -1, BallThrowTrainerBlock jumpargeq 7, -2, BallThrowGhostDodged BallThrowEnd:: waitforvisualfinish @@ -11086,11 +11086,11 @@ BallThrowGhostDodged:: goto BallThrowEnd Special_SafariBallThrow:: - createvisualtask AnimTask_LoadBallGfx, 2, + createvisualtask AnimTask_LoadBallGfx, 2, delay 0 createvisualtask AnimTask_ThrowBallSpecial, 2 waitforvisualfinish - createvisualtask AnimTask_FreeBallGfx, 2, + createvisualtask AnimTask_FreeBallGfx, 2, end Special_SubstituteToMon:: diff --git a/include/battle.h b/include/battle.h index ce764923f..b581190d6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -55,6 +55,12 @@ #define MAX_TRAINER_ITEMS 4 +enum { + BATTLER_AFFINE_NORMAL, + BATTLER_AFFINE_EMERGE, + BATTLER_AFFINE_RETURN, +}; + #define MOVE_TARGET_SELECTED 0 #define MOVE_TARGET_DEPENDS (1 << 0) #define MOVE_TARGET_USER_OR_SELECTED (1 << 1) @@ -545,15 +551,15 @@ struct BattleAnimationInfo u8 field_6; u8 field_7; u8 ballThrowCaseId; - u8 healthboxSlideInStarted : 1; - u8 field_9_x2 : 1; - u8 field_9_x1C : 3; - u8 field_9_x20 : 1; - u8 field_9_x40 : 1; - u8 field_9_x80 : 1; - u8 field_A; + u8 introAnimActive:1; + u8 wildMonInvisible:1; + u8 field_9_x1C:3; + u8 field_9_x20:1; + u8 field_9_x40:1; + u8 field_9_x80:1; + u8 numBallParticles; u8 field_B; - s16 field_C; + s16 ballSubpx; u8 field_E; u8 field_F; }; diff --git a/include/battle_anim.h b/include/battle_anim.h index 1919ba7d0..fc40e1373 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -317,7 +317,7 @@ void AnimRecycle(struct Sprite *); // battle_anim_special.c void TryShinyAnimation(u8 battler, struct Pokemon *mon); u8 ItemIdToBallId(u16 itemId); -u8 LaunchBallStarsTask(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId); +u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId); u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 battlerId, u32 arg2, u8 ballId); void DoLoadHealthboxPalsForLevelUp(u8 *, u8 *, u8 battlerId); void DoFreeHealthboxPalsForLevelUp(u8 batterId); diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h index c77686e17..9d4f9c549 100644 --- a/include/battle_gfx_sfx_util.h +++ b/include/battle_gfx_sfx_util.h @@ -40,6 +40,6 @@ void BattleInterfaceSetWindowPals(void); void ClearTemporarySpeciesSpriteData(u8 battlerId, bool8 dontClearSubstitute); void AllocateMonSpritesGfx(void); void FreeMonSpritesGfx(void); -bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon); +bool32 ShouldPlayNormalMonCry(struct Pokemon *mon); #endif // GUARD_BATTLE_GFX_SFX_UTIL_H diff --git a/include/constants/battle.h b/include/constants/battle.h index c318f3cde..822675837 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -312,7 +312,7 @@ #define NUM_CASTFORM_FORMS 4 #define CASTFORM_SUBSTITUTE (1 << 7) -// Return value for IsRunningFromBattleImpossible. +// Return value for IsRunningFromBattleImpossible. #define BATTLE_RUN_SUCCESS 0 #define BATTLE_RUN_FORBIDDEN 1 #define BATTLE_RUN_FAILURE 2 diff --git a/include/graphics.h b/include/graphics.h index 4ddc0deea..dc72466c8 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3,30 +3,30 @@ #include "global.h" -extern const u32 gInterfaceGfx_PokeBall[]; -extern const u32 gInterfacePal_PokeBall[]; -extern const u32 gInterfaceGfx_GreatBall[]; -extern const u32 gInterfacePal_GreatBall[]; -extern const u32 gInterfaceGfx_SafariBall[]; -extern const u32 gInterfacePal_SafariBall[]; -extern const u32 gInterfaceGfx_UltraBall[]; -extern const u32 gInterfacePal_UltraBall[]; -extern const u32 gInterfaceGfx_MasterBall[]; -extern const u32 gInterfacePal_MasterBall[]; -extern const u32 gInterfaceGfx_NetBall[]; -extern const u32 gInterfacePal_NetBall[]; -extern const u32 gInterfaceGfx_DiveBall[]; -extern const u32 gInterfacePal_DiveBall[]; -extern const u32 gInterfaceGfx_NestBall[]; -extern const u32 gInterfacePal_NestBall[]; -extern const u32 gInterfaceGfx_RepeatBall[]; -extern const u32 gInterfacePal_RepeatBall[]; -extern const u32 gInterfaceGfx_TimerBall[]; -extern const u32 gInterfacePal_TimerBall[]; -extern const u32 gInterfaceGfx_LuxuryBall[]; -extern const u32 gInterfacePal_LuxuryBall[]; -extern const u32 gInterfaceGfx_PremierBall[]; -extern const u32 gInterfacePal_PremierBall[]; +extern const u32 gBallGfx_Poke[]; +extern const u32 gBallPal_Poke[]; +extern const u32 gBallGfx_Great[]; +extern const u32 gBallPal_Great[]; +extern const u32 gBallGfx_Safari[]; +extern const u32 gBallPal_Safari[]; +extern const u32 gBallGfx_Ultra[]; +extern const u32 gBallPal_Ultra[]; +extern const u32 gBallGfx_Master[]; +extern const u32 gBallPal_Master[]; +extern const u32 gBallGfx_Net[]; +extern const u32 gBallPal_Net[]; +extern const u32 gBallGfx_Dive[]; +extern const u32 gBallPal_Dive[]; +extern const u32 gBallGfx_Nest[]; +extern const u32 gBallPal_Nest[]; +extern const u32 gBallGfx_Repeat[]; +extern const u32 gBallPal_Repeat[]; +extern const u32 gBallGfx_Timer[]; +extern const u32 gBallPal_Timer[]; +extern const u32 gBallGfx_Luxury[]; +extern const u32 gBallPal_Luxury[]; +extern const u32 gBallGfx_Premier[]; +extern const u32 gBallPal_Premier[]; extern const u32 gOpenPokeballGfx[]; // pokemon gfx diff --git a/include/librfu.h b/include/librfu.h index 88e77acbd..886db0561 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -324,7 +324,7 @@ struct STWIStatus vu8 sending; }; -// This struct is used as u8 array in SDK. +// This struct is used as u8 array in SDK. struct RfuIntrStruct { union RfuPacket rxPacketAlloc; diff --git a/include/pokeball.h b/include/pokeball.h index 19467e7a7..0ef6d4357 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -20,6 +20,14 @@ enum POKEBALL_COUNT }; +enum { + BALL_AFFINE_ANIM_0, + BALL_ROTATE_RIGHT, + BALL_ROTATE_LEFT, + BALL_AFFINE_ANIM_3, + BALL_AFFINE_ANIM_4 +}; + extern const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT]; extern const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT]; extern const struct SpriteTemplate gBallSpriteTemplates[]; @@ -34,6 +42,6 @@ void DoHitAnimHealthboxEffect(u8 bank); void LoadBallGfx(u8 ballId); void FreeBallGfx(u8 ballId); void StartHealthboxSlideIn(u8 battler); -void DestroySpriteAndFreeResources2(struct Sprite *sprite); +void DestroySpriteAndFreeResources_Ball(struct Sprite *sprite); #endif // GUARD_POKEBALL_H diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index 28ed918f2..238e0b3bd 100644 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -659,7 +659,7 @@ void AnimTask_SwitchOutBallEffect(u8 taskId) y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y); priority = gSprites[spriteId].oam.priority; subpriority = gSprites[spriteId].subpriority; - gTasks[taskId].data[10] = LaunchBallStarsTask(x, y + 32, priority, subpriority, ballId); + gTasks[taskId].data[10] = AnimateBallOpenParticles(x, y + 32, priority, subpriority, ballId); selectedPalettes = SelectBattleAnimSpriteAndBgPalettes(1, 0, 0, 0, 0, 0, 0); gTasks[taskId].data[11] = LaunchBallFadeMonTask(0, gBattleAnimAttacker, selectedPalettes, ballId); gTasks[taskId].data[0]++; @@ -748,7 +748,7 @@ void AnimTask_ThrowBall(u8 taskId) gSprites[spriteId].data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X); gSprites[spriteId].data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) - 16; gSprites[spriteId].callback = SpriteCB_ThrowBall_Init; - gBattleSpritesDataPtr->animationData->field_9_x2 = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible; + gBattleSpritesDataPtr->animationData->wildMonInvisible = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible; gTasks[taskId].data[0] = spriteId; gTasks[taskId].func = AnimTask_ThrowBall_WaitAnimObjComplete; } @@ -860,7 +860,7 @@ static void SpriteCB_ThrowBall_ArcFlight(struct Sprite *sprite) switch (ballId) { case 0 ... POKEBALL_COUNT - 1: - LaunchBallStarsTask(sprite->x, sprite->y - 5, 1, 28, ballId); + AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 28, ballId); LaunchBallFadeMonTask(0, gBattleAnimTarget, 14, ballId); break; } @@ -1015,7 +1015,7 @@ static void SpriteCB_ThrowBall_InitShake(struct Sprite *sprite) sprite->data[3] = 0; sprite->affineAnimPaused = TRUE; StartSpriteAffineAnim(sprite, 1); - gBattleSpritesDataPtr->animationData->field_C = 0; + gBattleSpritesDataPtr->animationData->ballSubpx = 0; sprite->callback = SpriteCB_ThrowBall_DoShake; PlaySE(SE_BALL); } @@ -1029,14 +1029,14 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite) switch (sprite->data[3] & 0xFF) { case 0: - if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) + if (gBattleSpritesDataPtr->animationData->ballSubpx > 0xFF) { sprite->x2 += sprite->data[4]; - gBattleSpritesDataPtr->animationData->field_C &= 0xFF; + gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF; } else { - gBattleSpritesDataPtr->animationData->field_C += 0xB0; + gBattleSpritesDataPtr->animationData->ballSubpx += 0xB0; } sprite->data[5]++; @@ -1044,7 +1044,7 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite) var0 = sprite->data[5] + 7; if (var0 > 14) { - gBattleSpritesDataPtr->animationData->field_C = 0; + gBattleSpritesDataPtr->animationData->ballSubpx = 0; sprite->data[3]++; sprite->data[5] = 0; } @@ -1067,14 +1067,14 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite) } break; case 2: - if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) + if (gBattleSpritesDataPtr->animationData->ballSubpx > 0xFF) { sprite->x2 += sprite->data[4]; - gBattleSpritesDataPtr->animationData->field_C &= 0xFF; + gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF; } else { - gBattleSpritesDataPtr->animationData->field_C += 0xB0; + gBattleSpritesDataPtr->animationData->ballSubpx += 0xB0; } sprite->data[5]++; @@ -1082,7 +1082,7 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite) var0 = sprite->data[5] + 12; if (var0 > 24) { - gBattleSpritesDataPtr->animationData->field_C = 0; + gBattleSpritesDataPtr->animationData->ballSubpx = 0; sprite->data[3]++; sprite->data[5] = 0; } @@ -1104,14 +1104,14 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite) ChangeSpriteAffineAnim(sprite, 1); // fall through case 4: - if (gBattleSpritesDataPtr->animationData->field_C > 0xFF) + if (gBattleSpritesDataPtr->animationData->ballSubpx > 0xFF) { sprite->x2 += sprite->data[4]; - gBattleSpritesDataPtr->animationData->field_C &= 0xFF; + gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF; } else { - gBattleSpritesDataPtr->animationData->field_C += 0xB0; + gBattleSpritesDataPtr->animationData->ballSubpx += 0xB0; } sprite->data[5]++; @@ -1119,7 +1119,7 @@ static void SpriteCB_ThrowBall_DoShake(struct Sprite *sprite) var0 = sprite->data[5] + 4; if (var0 > 8) { - gBattleSpritesDataPtr->animationData->field_C = 0; + gBattleSpritesDataPtr->animationData->ballSubpx = 0; sprite->data[3]++; sprite->data[5] = 0; sprite->data[4] = -sprite->data[4]; @@ -1319,7 +1319,7 @@ static void SpriteCB_ThrowBall_BeginBreakOut(struct Sprite *sprite) switch (ballId) { case 0 ... POKEBALL_COUNT - 1: - LaunchBallStarsTask(sprite->x, sprite->y - 5, 1, 28, ballId); + AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 28, ballId); LaunchBallFadeMonTask(1, gBattleAnimTarget, 14, ballId); break; } @@ -1351,7 +1351,7 @@ static void SpriteCB_ThrowBall_RunBreakOut(struct Sprite *sprite) if (sprite->animEnded && next) { gSprites[gBattlerSpriteIds[gBattleAnimTarget]].y2 = 0; - gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = gBattleSpritesDataPtr->animationData->field_9_x2; + gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = gBattleSpritesDataPtr->animationData->wildMonInvisible; sprite->data[0] = 0; sprite->callback = BattleAnimObj_SignalEnd; gDoingBattleAnim = FALSE; @@ -1430,7 +1430,7 @@ static void LoadBallParticleGfx(u8 ballId) } } -u8 LaunchBallStarsTask(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId) +u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId) { u8 taskId; @@ -1448,7 +1448,7 @@ u8 LaunchBallStarsTask(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId) static void IncrementBattleParticleCounter(void) { if (gMain.inBattle) - gBattleSpritesDataPtr->animationData->field_A++; + gBattleSpritesDataPtr->animationData->numBallParticles++; } static void PokeBallOpenParticleAnimation(u8 taskId) @@ -1850,8 +1850,8 @@ static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) } else { - gBattleSpritesDataPtr->animationData->field_A--; - if (gBattleSpritesDataPtr->animationData->field_A == 0) + gBattleSpritesDataPtr->animationData->numBallParticles--; + if (gBattleSpritesDataPtr->animationData->numBallParticles == 0) { for (j = 0; j < POKEBALL_COUNT; j++) { @@ -2097,7 +2097,7 @@ static void AnimTask_ShinySparkles(u8 taskId) return; } - if (gBattleSpritesDataPtr->animationData->field_A) + if (gBattleSpritesDataPtr->animationData->numBallParticles) return; counter = gTasks[taskId].data[10]++; diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 8901cb219..839a230ad 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -271,7 +271,7 @@ static void Intro_TryShinyAnimShowHealthbox(void) StartHealthboxSlideIn(gActiveBattler); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES)); - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 0; + gBattleSpritesDataPtr->animationData->introAnimActive = FALSE; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox; } } @@ -1538,7 +1538,7 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void) gTasks[taskId].data[0] = gActiveBattler; if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 1; + gBattleSpritesDataPtr->animationData->introAnimActive = TRUE; gBattlerControllerFuncs[gActiveBattler] = LinkOpponentDummy; } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 6fa7282e0..7dbfbde65 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -236,7 +236,7 @@ static void Intro_ShowHealthbox(void) HEALTHBOX_ALL); StartHealthboxSlideIn(gActiveBattler); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 0; + gBattleSpritesDataPtr->animationData->introAnimActive = FALSE; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForHealthbox; } } @@ -1464,7 +1464,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void) gTasks[taskId].data[0] = gActiveBattler; if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 1; + gBattleSpritesDataPtr->animationData->introAnimActive = TRUE; gBattlerControllerFuncs[gActiveBattler] = LinkPartnerDummy; } diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c index 16083b6c3..b2c8341ef 100644 --- a/src/battle_controller_oak_old_man.c +++ b/src/battle_controller_oak_old_man.c @@ -427,7 +427,7 @@ static void Intro_TryShinyAnimShowHealthbox(void) HEALTHBOX_ALL); StartHealthboxSlideIn(gActiveBattler); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 0; + gBattleSpritesDataPtr->animationData->introAnimActive = FALSE; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox; } } @@ -2093,7 +2093,7 @@ static void OakOldManHandleIntroTrainerBallThrow(void) gTasks[taskId].data[0] = gActiveBattler; if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 1; + gBattleSpritesDataPtr->animationData->introAnimActive = TRUE; gBattlerControllerFuncs[gActiveBattler] = PlayerDummy; } else diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 3fa84eee8..3aa20e0f3 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -265,7 +265,7 @@ static void Intro_TryShinyAnimShowHealthbox(void) StartHealthboxSlideIn(gActiveBattler); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); SetBattlerShadowSpriteCallback(gActiveBattler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES)); - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = FALSE; + gBattleSpritesDataPtr->animationData->introAnimActive = FALSE; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox; } } @@ -1638,7 +1638,7 @@ static void OpponentHandleIntroTrainerBallThrow(void) gTasks[taskId].data[0] = gActiveBattler; if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = TRUE; + gBattleSpritesDataPtr->animationData->introAnimActive = TRUE; gBattlerControllerFuncs[gActiveBattler] = OpponentDummy; } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 0d54be29e..16c812fb0 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -931,7 +931,7 @@ static void Intro_TryShinyAnimShowHealthbox(void) HEALTHBOX_ALL); StartHealthboxSlideIn(gActiveBattler); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 0; + gBattleSpritesDataPtr->animationData->introAnimActive = FALSE; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox; } } @@ -2719,7 +2719,7 @@ static void PlayerHandleIntroTrainerBallThrow(void) gTasks[taskId].data[0] = gActiveBattler; if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 1; + gBattleSpritesDataPtr->animationData->introAnimActive = TRUE; gBattlerControllerFuncs[gActiveBattler] = PlayerDummy; } @@ -2912,8 +2912,8 @@ static void PreviewDeterminativeMoveTargets(void) break; case MOVE_TARGET_BOTH: case MOVE_TARGET_OPPONENTS_FIELD: - bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)] - | gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16; + bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)] + | gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16; startY = 8; break; case MOVE_TARGET_USER: @@ -2935,8 +2935,8 @@ static void PreviewDeterminativeMoveTargets(void) case MOVE_MIST: case MOVE_HEAL_BELL: case MOVE_AROMATHERAPY: - bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)] - | gBitTable[GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)]) << 16; + bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_PLAYER_LEFT)] + | gBitTable[GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)]) << 16; break; case MOVE_HELPING_HAND: bitMask = (gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)]) << 16; @@ -2948,8 +2948,8 @@ static void PreviewDeterminativeMoveTargets(void) startY = 8; break; case MOVE_TARGET_FOES_AND_ALLY: - bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)] - | gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] + bitMask = (gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)] + | gBitTable[GetBattlerAtPosition(GetBattlerPosition(gActiveBattler) ^ BIT_FLANK)] | gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)]) << 16; startY = 8; break; diff --git a/src/battle_controller_pokedude.c b/src/battle_controller_pokedude.c index 68c1642eb..9f27cd1c3 100644 --- a/src/battle_controller_pokedude.c +++ b/src/battle_controller_pokedude.c @@ -408,7 +408,7 @@ static void Intro_TryShinyAnimShowHealthbox(void) HEALTHBOX_ALL); StartHealthboxSlideIn(gActiveBattler); SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 0; + gBattleSpritesDataPtr->animationData->introAnimActive = FALSE; gBattlerControllerFuncs[gActiveBattler] = Intro_WaitForShinyAnimAndHealthbox; } } @@ -1865,7 +1865,7 @@ static void PokedudeHandleIntroTrainerBallThrow(void) gTasks[taskId].data[0] = gActiveBattler; if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].partyStatusSummaryShown) gTasks[gBattlerStatusSummaryTaskId[gActiveBattler]].func = Task_HidePartyStatusSummary; - gBattleSpritesDataPtr->animationData->healthboxSlideInStarted = 1; + gBattleSpritesDataPtr->animationData->introAnimActive = TRUE; gBattlerControllerFuncs[gActiveBattler] = PokedudeDummy; } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 89975500b..f259903e7 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -800,7 +800,7 @@ void BtlController_EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2) } // not used -static void BtlController_EmitUnknownYesNoBox(u8 bufferId, u32 arg1) // TODO: Does the function name make sense for pokefirered? +static void BtlController_EmitUnknownYesNoBox(u8 bufferId, u32 arg1) // TODO: Does the function name make sense for pokefirered? { sBattleBuffersTransferData[0] = CONTROLLER_UNKNOWNYESNOBOX; sBattleBuffersTransferData[1] = arg1; diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 5c6be1bbe..88334ba9c 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -663,7 +663,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, u8 transformType) { const void *src; void *dst; - + position = GetBattlerPosition(battlerAtk); targetSpecies = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerAtk]], MON_DATA_SPECIES); personalityValue = GetMonData(&gEnemyParty[gBattlerPartyIndexes[battlerAtk]], MON_DATA_PERSONALITY); @@ -1042,17 +1042,20 @@ void FreeMonSpritesGfx(void) FREE_AND_SET_NULL(gMonSpritesGfxPtr); } -bool32 ShouldPlayNormalPokeCry(struct Pokemon *mon) +bool32 ShouldPlayNormalMonCry(struct Pokemon *mon) { s16 hp, maxHP; s32 barLevel; if (GetMonData(mon, MON_DATA_STATUS) & (STATUS1_ANY | STATUS1_TOXIC_COUNTER)) return FALSE; + hp = GetMonData(mon, MON_DATA_HP); maxHP = GetMonData(mon, MON_DATA_MAX_HP); + barLevel = GetHPBarLevel(hp, maxHP); if (barLevel <= HP_BAR_YELLOW) return FALSE; + return TRUE; } diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index ee69a4785..b42a51dea 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -676,7 +676,7 @@ static const struct OamData sOamData_MonIconOnLvlUpBanner = .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, + .mosaic = FALSE, .bpp = 0, .shape = SPRITE_SHAPE(32x32), .x = 0, diff --git a/src/battle_setup.c b/src/battle_setup.c index 6b87edd69..31d0f068a 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -181,7 +181,7 @@ static void Task_BattleStart(u8 taskId) case 0: if (!FldEffPoison_IsActive()) { - HelpSystem_Disable(); + HelpSystem_Disable(); BT_StartOnField(tTransition); ++tState; } @@ -189,7 +189,7 @@ static void Task_BattleStart(u8 taskId) case 1: if (BT_IsDone() == TRUE) { - HelpSystem_Enable(); + HelpSystem_Enable(); CleanupOverworldWindowsAndTilemaps(); SetMainCallback2(CB2_InitBattle); RestartWildEncounterImmunitySteps(); diff --git a/src/battle_transition.c b/src/battle_transition.c index 0682cfaaa..21d732aa5 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -394,7 +394,7 @@ static const TransitionStateFunc sBT_Phase2WhiteFadeInStripesFuncs[] = }; static const u16 sWhiteStripeDelay[] = { 0, 9, 15, 6, 12, 3 }; - + static const TransitionStateFunc sBT_Phase2GridSquaresFuncs[] = { BT_Phase2GridSquares_LoadGfx, @@ -480,7 +480,7 @@ static const struct OamData sOamData_Unused = .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, + .mosaic = FALSE, .bpp = 0, .shape = SPRITE_SHAPE(64x64), .x = 0, @@ -1022,7 +1022,7 @@ static void VBCB_BT_Phase2BigPokeball2(void) #undef tTheta #undef tAmplitude -// TODO: Document this effect after knowing more about field effects. +// TODO: Document this effect after knowing more about field effects. static void BT_Phase2SlidingPokeballs(u8 taskId) { while (sBT_Phase2SlidingPokeballsFuncs[gTasks[taskId].tState](&gTasks[taskId])); diff --git a/src/data/graphics/interface_pokeballs.h b/src/data/graphics/interface_pokeballs.h index fe9a4e5be..69d09d51f 100644 --- a/src/data/graphics/interface_pokeballs.h +++ b/src/data/graphics/interface_pokeballs.h @@ -1,37 +1,37 @@ -const u32 gInterfaceGfx_PokeBall[] = INCBIN_U32("graphics/interface/ball/poke.4bpp.lz"); -const u32 gInterfacePal_PokeBall[] = INCBIN_U32("graphics/interface/ball/poke.gbapal.lz"); +const u32 gBallGfx_Poke[] = INCBIN_U32("graphics/interface/ball/poke.4bpp.lz"); +const u32 gBallPal_Poke[] = INCBIN_U32("graphics/interface/ball/poke.gbapal.lz"); -const u32 gInterfaceGfx_GreatBall[] = INCBIN_U32("graphics/interface/ball/great.4bpp.lz"); -const u32 gInterfacePal_GreatBall[] = INCBIN_U32("graphics/interface/ball/great.gbapal.lz"); +const u32 gBallGfx_Great[] = INCBIN_U32("graphics/interface/ball/great.4bpp.lz"); +const u32 gBallPal_Great[] = INCBIN_U32("graphics/interface/ball/great.gbapal.lz"); -const u32 gInterfaceGfx_SafariBall[] = INCBIN_U32("graphics/interface/ball/safari.4bpp.lz"); -const u32 gInterfacePal_SafariBall[] = INCBIN_U32("graphics/interface/ball/safari.gbapal.lz"); +const u32 gBallGfx_Safari[] = INCBIN_U32("graphics/interface/ball/safari.4bpp.lz"); +const u32 gBallPal_Safari[] = INCBIN_U32("graphics/interface/ball/safari.gbapal.lz"); -const u32 gInterfaceGfx_UltraBall[] = INCBIN_U32("graphics/interface/ball/ultra.4bpp.lz"); -const u32 gInterfacePal_UltraBall[] = INCBIN_U32("graphics/interface/ball/ultra.gbapal.lz"); +const u32 gBallGfx_Ultra[] = INCBIN_U32("graphics/interface/ball/ultra.4bpp.lz"); +const u32 gBallPal_Ultra[] = INCBIN_U32("graphics/interface/ball/ultra.gbapal.lz"); -const u32 gInterfaceGfx_MasterBall[] = INCBIN_U32("graphics/interface/ball/master.4bpp.lz"); -const u32 gInterfacePal_MasterBall[] = INCBIN_U32("graphics/interface/ball/master.gbapal.lz"); +const u32 gBallGfx_Master[] = INCBIN_U32("graphics/interface/ball/master.4bpp.lz"); +const u32 gBallPal_Master[] = INCBIN_U32("graphics/interface/ball/master.gbapal.lz"); -const u32 gInterfaceGfx_NetBall[] = INCBIN_U32("graphics/interface/ball/net.4bpp.lz"); -const u32 gInterfacePal_NetBall[] = INCBIN_U32("graphics/interface/ball/net.gbapal.lz"); +const u32 gBallGfx_Net[] = INCBIN_U32("graphics/interface/ball/net.4bpp.lz"); +const u32 gBallPal_Net[] = INCBIN_U32("graphics/interface/ball/net.gbapal.lz"); -const u32 gInterfaceGfx_DiveBall[] = INCBIN_U32("graphics/interface/ball/dive.4bpp.lz"); -const u32 gInterfacePal_DiveBall[] = INCBIN_U32("graphics/interface/ball/dive.gbapal.lz"); +const u32 gBallGfx_Dive[] = INCBIN_U32("graphics/interface/ball/dive.4bpp.lz"); +const u32 gBallPal_Dive[] = INCBIN_U32("graphics/interface/ball/dive.gbapal.lz"); -const u32 gInterfaceGfx_NestBall[] = INCBIN_U32("graphics/interface/ball/nest.4bpp.lz"); -const u32 gInterfacePal_NestBall[] = INCBIN_U32("graphics/interface/ball/nest.gbapal.lz"); +const u32 gBallGfx_Nest[] = INCBIN_U32("graphics/interface/ball/nest.4bpp.lz"); +const u32 gBallPal_Nest[] = INCBIN_U32("graphics/interface/ball/nest.gbapal.lz"); -const u32 gInterfaceGfx_RepeatBall[] = INCBIN_U32("graphics/interface/ball/repeat.4bpp.lz"); -const u32 gInterfacePal_RepeatBall[] = INCBIN_U32("graphics/interface/ball/repeat.gbapal.lz"); +const u32 gBallGfx_Repeat[] = INCBIN_U32("graphics/interface/ball/repeat.4bpp.lz"); +const u32 gBallPal_Repeat[] = INCBIN_U32("graphics/interface/ball/repeat.gbapal.lz"); -const u32 gInterfaceGfx_TimerBall[] = INCBIN_U32("graphics/interface/ball/timer.4bpp.lz"); -const u32 gInterfacePal_TimerBall[] = INCBIN_U32("graphics/interface/ball/timer.gbapal.lz"); +const u32 gBallGfx_Timer[] = INCBIN_U32("graphics/interface/ball/timer.4bpp.lz"); +const u32 gBallPal_Timer[] = INCBIN_U32("graphics/interface/ball/timer.gbapal.lz"); -const u32 gInterfaceGfx_LuxuryBall[] = INCBIN_U32("graphics/interface/ball/luxury.4bpp.lz"); -const u32 gInterfacePal_LuxuryBall[] = INCBIN_U32("graphics/interface/ball/luxury.gbapal.lz"); +const u32 gBallGfx_Luxury[] = INCBIN_U32("graphics/interface/ball/luxury.4bpp.lz"); +const u32 gBallPal_Luxury[] = INCBIN_U32("graphics/interface/ball/luxury.gbapal.lz"); -const u32 gInterfaceGfx_PremierBall[] = INCBIN_U32("graphics/interface/ball/premier.4bpp.lz"); -const u32 gInterfacePal_PremierBall[] = INCBIN_U32("graphics/interface/ball/premier.gbapal.lz"); +const u32 gBallGfx_Premier[] = INCBIN_U32("graphics/interface/ball/premier.4bpp.lz"); +const u32 gBallPal_Premier[] = INCBIN_U32("graphics/interface/ball/premier.gbapal.lz"); const u32 gOpenPokeballGfx[] = INCBIN_U32("graphics/interface/ball_open.4bpp.lz"); diff --git a/src/data/party_menu.h b/src/data/party_menu.h index 084062b50..689ee6da5 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -711,7 +711,7 @@ static const struct OamData sOamData_HeldItem = .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, + .mosaic = FALSE, .bpp = 0, .shape = SPRITE_SHAPE(8x8), .x = 0, @@ -767,7 +767,7 @@ static const struct OamData sOamData_MenuPokeball = .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, + .mosaic = FALSE, .bpp = 0, .shape = SPRITE_SHAPE(32x32), .x = 0, @@ -824,7 +824,7 @@ static const struct OamData sOamData_MenuPokeballSmall = .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, + .mosaic = FALSE, .bpp = 0, .shape = SPRITE_SHAPE(16x16), .x = 0, @@ -905,7 +905,7 @@ static const struct OamData sOamData_StatusCondition = .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, + .mosaic = FALSE, .bpp = 0, .shape = SPRITE_SHAPE(32x8), .x = 0, diff --git a/src/daycare.c b/src/daycare.c index 54b06751d..a7bd7f7ac 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -143,7 +143,7 @@ static const struct OamData sOamData_EggHatch = .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, + .mosaic = FALSE, .bpp = 0, .shape = SPRITE_SHAPE(32x32), .x = 0, @@ -223,7 +223,7 @@ static const struct OamData sOamData_EggShard = .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, + .mosaic = FALSE, .bpp = 0, .shape = SPRITE_SHAPE(8x8), .x = 0, diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index c9a0fd1d5..c5dbfa6cd 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -15,7 +15,7 @@ bool8 SetUpFieldMove_Strength(void) { if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING) || CheckObjectGraphicsInFrontOfPlayer(OBJ_EVENT_GFX_PUSHABLE_BOULDER) != TRUE) { - return FALSE; + return FALSE; } else { diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c index 43f291826..fb90cb452 100644 --- a/src/librfu_stwi.c +++ b/src/librfu_stwi.c @@ -118,7 +118,7 @@ void STWI_init_Callback_S(void) STWI_set_Callback_S(NULL); } -// The callback can take 2 or 3 arguments. +// The callback can take 2 or 3 arguments. void STWI_set_Callback_M(void *callbackM) { gSTWIStatus->callbackM = callbackM; diff --git a/src/mail_data.c b/src/mail_data.c index 3dd75f8c0..bb5fa6581 100644 --- a/src/mail_data.c +++ b/src/mail_data.c @@ -54,7 +54,7 @@ u8 GiveMailToMon(struct Pokemon *mon, u16 itemId) for (i = 0; i < PLAYER_NAME_LENGTH && gSaveBlock2Ptr->playerName[i] != EOS; i++) gSaveBlock1Ptr->mail[id].playerName[i] = gSaveBlock2Ptr->playerName[i]; for (; i <= 5; i++) - gSaveBlock1Ptr->mail[id].playerName[i] = CHAR_SPACE; + gSaveBlock1Ptr->mail[id].playerName[i] = CHAR_SPACE; gSaveBlock1Ptr->mail[id].playerName[i] = EOS; for (i = 0; i < 4; i++) gSaveBlock1Ptr->mail[id].trainerId[i] = gSaveBlock2Ptr->playerTrainerId[i]; diff --git a/src/menu_indicators.c b/src/menu_indicators.c index b7027a8d5..33f95705d 100644 --- a/src/menu_indicators.c +++ b/src/menu_indicators.c @@ -84,7 +84,7 @@ static const struct OamData sOamData_ScrollArrowIndicator = .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, + .mosaic = FALSE, .bpp = 0, .shape = SPRITE_SHAPE(16x16), .x = 0, @@ -224,7 +224,7 @@ static const struct OamData sOamData_RedArrowCursor = .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, + .mosaic = FALSE, .bpp = 0, .shape = SPRITE_SHAPE(16x16), .x = 0, diff --git a/src/pokeball.c b/src/pokeball.c index 9dbdfd0d1..a77401d44 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -14,13 +14,34 @@ #include "constants/songs.h" #include "constants/sound.h" -#define tFrames data[0] -#define tPan data[1] -#define tThrowId data[2] -#define tBattler data[3] -#define tOpponentBattler data[4] +static void Task_DoPokeballSendOutAnim(u8 taskId); +static void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite); +static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite); +static void SpriteCB_OpponentMonSendOut(struct Sprite *sprite); +static void SpriteCB_BallThrow(struct Sprite *sprite); +static void SpriteCB_BallThrow_ReachMon(struct Sprite *sprite); +static void SpriteCB_BallThrow_StartShrinkMon(struct Sprite *sprite); +static void SpriteCB_BallThrow_ShrinkMon(struct Sprite *sprite); +static void SpriteCB_BallThrow_Close(struct Sprite *sprite); +static void SpriteCB_BallThrow_FallToGround(struct Sprite *sprite); +static void SpriteCB_BallThrow_StartShakes(struct Sprite *sprite); +static void SpriteCB_BallThrow_Shake(struct Sprite *sprite); +static void SpriteCB_BallThrow_StartCaptureMon(struct Sprite *sprite); +static void SpriteCB_BallThrow_CaptureMon(struct Sprite *sprite); +static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite); +static void SpriteCB_ReleaseMon2FromBall(struct Sprite *sprite); +static void HandleBallAnimEnd(struct Sprite *sprite); +static void SpriteCB_PokeballReleaseMon(struct Sprite *sprite); +static void SpriteCB_ReleasedMonFlyOut(struct Sprite *sprite); +static void SpriteCB_TradePokeball(struct Sprite *sprite); +static void SpriteCB_TradePokeballSendOff(struct Sprite *sprite); +static void SpriteCB_TradePokeballEnd(struct Sprite *sprite); +static void SpriteCB_HealthboxSlideInDelayed(struct Sprite *sprite); +static void SpriteCB_HealthboxSlideIn(struct Sprite *sprite); +static void SpriteCB_HitAnimHealthoxEffect(struct Sprite *sprite); +static u16 GetBattlerPokeballItemId(u8 battlerId); -#define sBattler data[6] +// rom const data #define GFX_TAG_POKE_BALL 55000 #define GFX_TAG_GREAT_BALL 55001 @@ -35,68 +56,36 @@ #define GFX_TAG_LUXURY_BALL 55010 #define GFX_TAG_PREMIER_BALL 55011 -// Function Declarations -static void Task_DoPokeballSendOutAnim(u8 taskId); -static void SpriteCB_TestBallThrow(struct Sprite *sprite); -static void SpriteCB_BallThrow_ReachMon(struct Sprite *sprite); -static void SpriteCB_BallThrow_StartShrinkMon(struct Sprite *sprite); -static void SpriteCB_BallThrow_ShrinkMon(struct Sprite *sprite); -static void SpriteCB_BallThrow_Close(struct Sprite *sprite); -static void SpriteCB_BallThrow_FallToGround(struct Sprite *sprite); -static void SpriteCB_BallThrow_StartShakes(struct Sprite *sprite); -static void SpriteCB_BallThrow_Shake(struct Sprite *sprite); -static void Task_PlayCryWhenReleasedFromBall(u8 taskId); -static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite); -static void SpriteCB_BallThrow_StartCaptureMon(struct Sprite *sprite); -static void HandleBallAnimEnd(struct Sprite *sprite); -static void SpriteCB_BallThrow_CaptureMon(struct Sprite *sprite); -static void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite); -static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite); -static void SpriteCB_ReleaseMon2FromBall(struct Sprite *sprite); -static void SpriteCB_OpponentMonSendOut(struct Sprite *sprite); -static u8 LaunchBallStarsTaskForPokeball(u8 x, u8 y, u8 kindOfStars, u8 d); -static u8 LaunchBallFadeMonTaskForPokeball(bool8 unFadeLater, u8 battlerId, u32 arg2); -static void SpriteCB_PokeballReleaseMon(struct Sprite *sprite); -static void SpriteCB_ReleasedMonFlyOut(struct Sprite *sprite); -static void SpriteCB_TradePokeball(struct Sprite *sprite); -static void SpriteCB_TradePokeballSendOff(struct Sprite *sprite); -static void SpriteCB_TradePokeballEnd(struct Sprite *sprite); -static void SpriteCB_HealthboxSlideInDelayed(struct Sprite *sprite); -static void SpriteCB_HealthboxSlideIn(struct Sprite *sprite); -static void SpriteCB_HitAnimHealthoxEffect(struct Sprite *sprite); -static u16 GetBattlerPokeballItemId(u8 battlerId); - -// Data const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] = { - {gInterfaceGfx_PokeBall, 384, GFX_TAG_POKE_BALL}, - {gInterfaceGfx_GreatBall, 384, GFX_TAG_GREAT_BALL}, - {gInterfaceGfx_SafariBall, 384, GFX_TAG_SAFARI_BALL}, - {gInterfaceGfx_UltraBall, 384, GFX_TAG_ULTRA_BALL}, - {gInterfaceGfx_MasterBall, 384, GFX_TAG_MASTER_BALL}, - {gInterfaceGfx_NetBall, 384, GFX_TAG_NET_BALL}, - {gInterfaceGfx_DiveBall, 384, GFX_TAG_DIVE_BALL}, - {gInterfaceGfx_NestBall, 384, GFX_TAG_NEST_BALL}, - {gInterfaceGfx_RepeatBall, 384, GFX_TAG_REPEAT_BALL}, - {gInterfaceGfx_TimerBall, 384, GFX_TAG_TIMER_BALL}, - {gInterfaceGfx_LuxuryBall, 384, GFX_TAG_LUXURY_BALL}, - {gInterfaceGfx_PremierBall, 384, GFX_TAG_PREMIER_BALL}, + [BALL_POKE] = {gBallGfx_Poke, 384, GFX_TAG_POKE_BALL}, + [BALL_GREAT] = {gBallGfx_Great, 384, GFX_TAG_GREAT_BALL}, + [BALL_SAFARI] = {gBallGfx_Safari, 384, GFX_TAG_SAFARI_BALL}, + [BALL_ULTRA] = {gBallGfx_Ultra, 384, GFX_TAG_ULTRA_BALL}, + [BALL_MASTER] = {gBallGfx_Master, 384, GFX_TAG_MASTER_BALL}, + [BALL_NET] = {gBallGfx_Net, 384, GFX_TAG_NET_BALL}, + [BALL_DIVE] = {gBallGfx_Dive, 384, GFX_TAG_DIVE_BALL}, + [BALL_NEST] = {gBallGfx_Nest, 384, GFX_TAG_NEST_BALL}, + [BALL_REPEAT] = {gBallGfx_Repeat, 384, GFX_TAG_REPEAT_BALL}, + [BALL_TIMER] = {gBallGfx_Timer, 384, GFX_TAG_TIMER_BALL}, + [BALL_LUXURY] = {gBallGfx_Luxury, 384, GFX_TAG_LUXURY_BALL}, + [BALL_PREMIER] = {gBallGfx_Premier, 384, GFX_TAG_PREMIER_BALL}, }; const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] = { - {gInterfacePal_PokeBall, GFX_TAG_POKE_BALL}, - {gInterfacePal_GreatBall, GFX_TAG_GREAT_BALL}, - {gInterfacePal_SafariBall, GFX_TAG_SAFARI_BALL}, - {gInterfacePal_UltraBall, GFX_TAG_ULTRA_BALL}, - {gInterfacePal_MasterBall, GFX_TAG_MASTER_BALL}, - {gInterfacePal_NetBall, GFX_TAG_NET_BALL}, - {gInterfacePal_DiveBall, GFX_TAG_DIVE_BALL}, - {gInterfacePal_NestBall, GFX_TAG_NEST_BALL}, - {gInterfacePal_RepeatBall, GFX_TAG_REPEAT_BALL}, - {gInterfacePal_TimerBall, GFX_TAG_TIMER_BALL}, - {gInterfacePal_LuxuryBall, GFX_TAG_LUXURY_BALL}, - {gInterfacePal_PremierBall, GFX_TAG_PREMIER_BALL}, + [BALL_POKE] = {gBallPal_Poke, GFX_TAG_POKE_BALL}, + [BALL_GREAT] = {gBallPal_Great, GFX_TAG_GREAT_BALL}, + [BALL_SAFARI] = {gBallPal_Safari, GFX_TAG_SAFARI_BALL}, + [BALL_ULTRA] = {gBallPal_Ultra, GFX_TAG_ULTRA_BALL}, + [BALL_MASTER] = {gBallPal_Master, GFX_TAG_MASTER_BALL}, + [BALL_NET] = {gBallPal_Net, GFX_TAG_NET_BALL}, + [BALL_DIVE] = {gBallPal_Dive, GFX_TAG_DIVE_BALL}, + [BALL_NEST] = {gBallPal_Nest, GFX_TAG_NEST_BALL}, + [BALL_REPEAT] = {gBallPal_Repeat, GFX_TAG_REPEAT_BALL}, + [BALL_TIMER] = {gBallPal_Timer, GFX_TAG_TIMER_BALL}, + [BALL_LUXURY] = {gBallPal_Luxury, GFX_TAG_LUXURY_BALL}, + [BALL_PREMIER] = {gBallPal_Premier, GFX_TAG_PREMIER_BALL}, }; static const struct OamData sBallOamData = @@ -171,171 +160,192 @@ static const union AnimCmd *const sBallAnimSequences[] = sBallAnimSeq6, }; -static const union AffineAnimCmd sBallAffineAnimSeq0[] = +static const union AffineAnimCmd sAffineAnim_BallRotate_0[] = { AFFINEANIMCMD_FRAME(0, 0, 0, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd sBallAffineAnimSeq1[] = +static const union AffineAnimCmd sAffineAnim_BallRotate_Right[] = { AFFINEANIMCMD_FRAME(0, 0, -3, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd sBallAffineAnimSeq2[] = +static const union AffineAnimCmd sAffineAnim_BallRotate_Left[] = { AFFINEANIMCMD_FRAME(0, 0, 3, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd sBallAffineAnimSeq3[] = +static const union AffineAnimCmd sAffineAnim_BallRotate_3[] = { AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd sBallAffineAnimSeq4[] = +static const union AffineAnimCmd sAffineAnim_BallRotate_4[] = { AFFINEANIMCMD_FRAME(0, 0, 25, 1), AFFINEANIMCMD_JUMP(0), }; -static const union AffineAnimCmd *const sBallAffineAnimSequences[] = +static const union AffineAnimCmd *const sAffineAnim_BallRotate[] = { - sBallAffineAnimSeq0, - sBallAffineAnimSeq1, - sBallAffineAnimSeq2, - sBallAffineAnimSeq3, - sBallAffineAnimSeq4, + [BALL_AFFINE_ANIM_0] = sAffineAnim_BallRotate_0, + [BALL_ROTATE_RIGHT] = sAffineAnim_BallRotate_Right, + [BALL_ROTATE_LEFT] = sAffineAnim_BallRotate_Left, + [BALL_AFFINE_ANIM_3] = sAffineAnim_BallRotate_3, + [BALL_AFFINE_ANIM_4] = sAffineAnim_BallRotate_4, }; const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = { + [BALL_POKE] = { .tileTag = GFX_TAG_POKE_BALL, .paletteTag = GFX_TAG_POKE_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, + [BALL_GREAT] = { .tileTag = GFX_TAG_GREAT_BALL, .paletteTag = GFX_TAG_GREAT_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, + [BALL_SAFARI] = { .tileTag = GFX_TAG_SAFARI_BALL, .paletteTag = GFX_TAG_SAFARI_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, + [BALL_ULTRA] = { .tileTag = GFX_TAG_ULTRA_BALL, .paletteTag = GFX_TAG_ULTRA_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, + [BALL_MASTER] = { .tileTag = GFX_TAG_MASTER_BALL, .paletteTag = GFX_TAG_MASTER_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, + [BALL_NET] = { .tileTag = GFX_TAG_NET_BALL, .paletteTag = GFX_TAG_NET_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, + [BALL_DIVE] = { .tileTag = GFX_TAG_DIVE_BALL, .paletteTag = GFX_TAG_DIVE_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, + [BALL_NEST] = { .tileTag = GFX_TAG_NEST_BALL, .paletteTag = GFX_TAG_NEST_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, + [BALL_REPEAT] = { .tileTag = GFX_TAG_REPEAT_BALL, .paletteTag = GFX_TAG_REPEAT_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, + [BALL_TIMER] = { .tileTag = GFX_TAG_TIMER_BALL, .paletteTag = GFX_TAG_TIMER_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, + [BALL_LUXURY] = { .tileTag = GFX_TAG_LUXURY_BALL, .paletteTag = GFX_TAG_LUXURY_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, + [BALL_PREMIER] = { .tileTag = GFX_TAG_PREMIER_BALL, .paletteTag = GFX_TAG_PREMIER_BALL, .oam = &sBallOamData, .anims = sBallAnimSequences, .images = NULL, - .affineAnims = sBallAffineAnimSequences, - .callback = SpriteCB_TestBallThrow, + .affineAnims = sAffineAnim_BallRotate, + .callback = SpriteCB_BallThrow, }, }; -// Functions +#define tFrames data[0] +#define tPan data[1] +#define tThrowId data[2] +#define tBattler data[3] +#define tOpponentBattler data[4] + u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow) { u8 taskId; - + gDoingBattleAnim = TRUE; gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive = TRUE; + taskId = CreateTask(Task_DoPokeballSendOutAnim, 5); gTasks[taskId].tPan = pan; gTasks[taskId].tThrowId = kindOfThrow; gTasks[taskId].tBattler = gActiveBattler; + return 0; } +#define sBattler data[6] + static void Task_DoPokeballSendOutAnim(u8 taskId) { u16 throwCaseId; @@ -362,12 +372,12 @@ static void Task_DoPokeballSendOutAnim(u8 taskId) ballId = ItemIdToBallId(itemId); LoadBallGfx(ballId); - + if (gBattleTypeFlags & BATTLE_TYPE_LINK) gender = gLinkPlayers[GetBattlerMultiplayerId(battlerId)].gender; else gender = gSaveBlock2Ptr->playerGender; - + ballSpriteId = CreateSprite(&gBallSpriteTemplates[ballId], 32, 80, 29); gSprites[ballSpriteId].data[0] = 0x80; gSprites[ballSpriteId].data[1] = 0; @@ -387,7 +397,7 @@ static void Task_DoPokeballSendOutAnim(u8 taskId) x = 48; y = 70; } - + gBattlerTarget = battlerId; gSprites[ballSpriteId].x = x; gSprites[ballSpriteId].y = y; @@ -425,7 +435,10 @@ static void Task_DoPokeballSendOutAnim(u8 taskId) PlaySE(SE_BALL_THROW); } -static void SpriteCB_TestBallThrow(struct Sprite *sprite) +// This sequence of functions is very similar to those that get run when +// a Pokéball gets thrown at a wild Pokémon, starting at SpriteCB_Ball_Arc. +// These do not seem to get run. +static void SpriteCB_BallThrow(struct Sprite *sprite) { if (TranslateAnimHorizontalArc(sprite)) { @@ -442,7 +455,7 @@ static void SpriteCB_TestBallThrow(struct Sprite *sprite) sprite->y2 = 0; sprite->data[5] = 0; ballId = ItemIdToBallId(GetBattlerPokeballItemId(opponentBattler)); - LaunchBallStarsTask(sprite->x, sprite->y - 5, 1, 0x1C, ballId); + AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 28, ballId); sprite->data[0] = LaunchBallFadeMonTask(FALSE, opponentBattler, 14, ballId); sprite->sBattler = opponentBattler; sprite->data[7] = noOfShakes; @@ -468,7 +481,7 @@ static void SpriteCB_BallThrow_StartShrinkMon(struct Sprite *sprite) { sprite->data[5] = 0; sprite->callback = SpriteCB_BallThrow_ShrinkMon; - StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[sprite->sBattler]], 2); + StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[sprite->sBattler]], BATTLER_AFFINE_RETURN); AnimateSprite(&gSprites[gBattlerSpriteIds[sprite->sBattler]]); gSprites[gBattlerSpriteIds[sprite->sBattler]].data[1] = 0; } @@ -479,7 +492,7 @@ static void SpriteCB_BallThrow_ShrinkMon(struct Sprite *sprite) sprite->data[5]++; if (sprite->data[5] == 11) PlaySE(SE_BALL_TRADE); - + if (gSprites[gBattlerSpriteIds[sprite->sBattler]].affineAnimEnded) { StartSpriteAnim(sprite, 2); @@ -649,7 +662,7 @@ static void SpriteCB_BallThrow_Shake(struct Sprite *sprite) StartSpriteAffineAnim(sprite, 2); else StartSpriteAffineAnim(sprite, 1); - + PlaySE(SE_BALL); } break; @@ -666,10 +679,10 @@ static void SpriteCB_BallThrow_Shake(struct Sprite *sprite) static void Task_PlayCryWhenReleasedFromBall(u8 taskId) { - u8 state2 = gTasks[taskId].data[2]; + u8 wantedCry = gTasks[taskId].tCryTaskWantedCry; s8 pan = gTasks[taskId].tCryTaskPan; u16 species = gTasks[taskId].tCryTaskSpecies; - struct Pokemon *mon = (void *)(u32)((u32)(gTasks[taskId].tCryTaskMonPtr1 << 0x10) | ((u16)gTasks[taskId].tCryTaskMonPtr2)); + struct Pokemon *mon = (void *)(u32)((gTasks[taskId].tCryTaskMonPtr1 << 16) | (u16)(gTasks[taskId].tCryTaskMonPtr2)); switch (gTasks[taskId].tCryTaskState) { @@ -678,14 +691,15 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) if (gTasks[taskId].data[8] < 3) gTasks[taskId].data[8]++; else - gTasks[taskId].tCryTaskState = state2 + 1; + gTasks[taskId].tCryTaskState = wantedCry + 1; break; case 1: - if (ShouldPlayNormalPokeCry(mon) == TRUE) + // Play single cry + if (ShouldPlayNormalMonCry(mon) == TRUE) PlayCry_ByMode(species, pan, CRY_MODE_NORMAL); else PlayCry_ByMode(species, pan, CRY_MODE_WEAK); - + DestroyTask(taskId); break; case 2: @@ -696,10 +710,11 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) case 20: if (gTasks[taskId].tCryTaskFrames == 0) { - if (ShouldPlayNormalPokeCry(mon) == TRUE) - PlayCry_ReleaseDouble(species, pan, 1); + // Play first doubles cry + if (ShouldPlayNormalMonCry(mon) == TRUE) + PlayCry_ReleaseDouble(species, pan, CRY_MODE_DOUBLES); else - PlayCry_ReleaseDouble(species, pan, 12); + PlayCry_ReleaseDouble(species, pan, CRY_MODE_WEAK_DOUBLES); DestroyTask(taskId); } @@ -719,6 +734,7 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) break; } gTasks[taskId].tCryTaskState++; + // fall through case 31: if (!IsCryPlayingOrClearCrySongs()) { @@ -733,11 +749,11 @@ static void Task_PlayCryWhenReleasedFromBall(u8 taskId) gTasks[taskId].tCryTaskFrames--; break; } - - if (ShouldPlayNormalPokeCry(mon) == TRUE) - PlayCry_ReleaseDouble(species, pan, 0); + // Play second doubles cry + if (ShouldPlayNormalMonCry(mon) == TRUE) + PlayCry_ReleaseDouble(species, pan, CRY_MODE_NORMAL); else - PlayCry_ReleaseDouble(species, pan, 11); + PlayCry_ReleaseDouble(species, pan, CRY_MODE_WEAK); DestroyTask(taskId); break; @@ -751,8 +767,8 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite) StartSpriteAnim(sprite, 1); ballId = ItemIdToBallId(GetBattlerPokeballItemId(battlerId)); - LaunchBallStarsTask(sprite->x, sprite->y - 5, 1, 0x1C, ballId); - sprite->data[0] = LaunchBallFadeMonTask(1, sprite->sBattler, 14, ballId); + AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 28, ballId); + sprite->data[0] = LaunchBallFadeMonTask(TRUE, sprite->sBattler, 14, ballId); sprite->callback = HandleBallAnimEnd; if (gMain.inBattle) @@ -776,7 +792,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite) species = GetMonData(mon, MON_DATA_SPECIES); if ((battlerId == GetBattlerAtPosition(B_POSITION_PLAYER_LEFT) || battlerId == GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)) - && IsDoubleBattle() && gBattleSpritesDataPtr->animationData->healthboxSlideInStarted) + && IsDoubleBattle() && gBattleSpritesDataPtr->animationData->introAnimActive) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { @@ -789,23 +805,23 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite) } } - if (!IsDoubleBattle() || !gBattleSpritesDataPtr->animationData->healthboxSlideInStarted) + if (!IsDoubleBattle() || !gBattleSpritesDataPtr->animationData->introAnimActive) wantedCryCase = 0; else if (battlerId == GetBattlerAtPosition(B_POSITION_PLAYER_LEFT) || battlerId == GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)) wantedCryCase = 1; else wantedCryCase = 2; - + taskId = CreateTask(Task_PlayCryWhenReleasedFromBall, 3); gTasks[taskId].tCryTaskSpecies = species; gTasks[taskId].tCryTaskPan = pan; gTasks[taskId].tCryTaskWantedCry = wantedCryCase; - gTasks[taskId].tCryTaskMonPtr1 = (u32)(mon) >> 0x10; + gTasks[taskId].tCryTaskMonPtr1 = (u32)(mon) >> 16; gTasks[taskId].tCryTaskMonPtr2 = (u32)(mon); gTasks[taskId].tCryTaskState = 0; } - StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[sprite->sBattler]], 1); + StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[sprite->sBattler]], BATTLER_AFFINE_EMERGE); AnimateSprite(&gSprites[gBattlerSpriteIds[sprite->sBattler]]); gSprites[gBattlerSpriteIds[sprite->sBattler]].data[1] = 0x1000; } @@ -837,7 +853,7 @@ static void HandleBallAnimEnd(struct Sprite *sprite) sprite->invisible = TRUE; if (gSprites[gBattlerSpriteIds[battlerId]].affineAnimEnded) { - StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[battlerId]], 0); + StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[battlerId]], BATTLER_AFFINE_NORMAL); affineAnimEnded = TRUE; } else @@ -857,7 +873,7 @@ static void HandleBallAnimEnd(struct Sprite *sprite) for (doneBattlers = 0, i = 0; i < MAX_BATTLERS_COUNT; i++) { - if (!gBattleSpritesDataPtr->healthBoxesData[i].ballAnimActive) + if (gBattleSpritesDataPtr->healthBoxesData[i].ballAnimActive == FALSE) doneBattlers++; } if (doneBattlers == MAX_BATTLERS_COUNT) @@ -896,8 +912,8 @@ static void SpriteCB_BallThrow_CaptureMon(struct Sprite *sprite) static void SpriteCB_PlayerMonSendOut_1(struct Sprite *sprite) { sprite->data[0] = 25; - sprite->data[2] = GetBattlerSpriteCoord(sprite->sBattler, 2); - sprite->data[4] = GetBattlerSpriteCoord(sprite->sBattler, 3) + 24; + sprite->data[2] = GetBattlerSpriteCoord(sprite->sBattler, BATTLER_COORD_X_2); + sprite->data[4] = GetBattlerSpriteCoord(sprite->sBattler, BATTLER_COORD_Y_PIC_OFFSET) + 24; sprite->data[5] = -30; sprite->oam.affineParam = sprite->sBattler; InitAnimArcTranslation(sprite); @@ -946,11 +962,12 @@ static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite) { sprite->x += sprite->x2; sprite->y += sprite->y2; - sprite->x2 = sprite->y2 = 0; + sprite->y2 = 0; + sprite->x2 = 0; sprite->sBattler = sprite->oam.affineParam & 0xFF; sprite->data[0] = 0; - if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->healthboxSlideInStarted + if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->introAnimActive && sprite->sBattler == GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT)) sprite->callback = SpriteCB_ReleaseMon2FromBall; else @@ -976,7 +993,7 @@ static void SpriteCB_OpponentMonSendOut(struct Sprite *sprite) if (sprite->data[0] > 15) { sprite->data[0] = 0; - if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->healthboxSlideInStarted + if (IsDoubleBattle() && gBattleSpritesDataPtr->animationData->introAnimActive && sprite->sBattler == GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)) sprite->callback = SpriteCB_ReleaseMon2FromBall; else @@ -986,121 +1003,144 @@ static void SpriteCB_OpponentMonSendOut(struct Sprite *sprite) #undef sBattler -static u8 LaunchBallStarsTaskForPokeball(u8 x, u8 y, u8 kindOfStars, u8 d) +static u8 AnimateBallOpenParticlesForPokeball(u8 x, u8 y, u8 kindOfStars, u8 subpriority) { - return LaunchBallStarsTask(x, y, kindOfStars, d, BALL_POKE); + return AnimateBallOpenParticles(x, y, kindOfStars, subpriority, BALL_POKE); } -static u8 LaunchBallFadeMonTaskForPokeball(bool8 unFadeLater, u8 battlerId, u32 arg2) +static u8 LaunchBallFadeMonTaskForPokeball(bool8 unFadeLater, u8 spritePalNum, u32 selectedPalettes) { - return LaunchBallFadeMonTask(unFadeLater, battlerId, arg2, BALL_POKE); + return LaunchBallFadeMonTask(unFadeLater, spritePalNum, selectedPalettes, BALL_POKE); } -void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 battlerId, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h) +// Sprite data for the pokeball +#define sMonSpriteId data[0] +#define sDelay data[1] +#define sMonPalNum data[2] +#define sFadePalsLo data[3] +#define sFadePalsHi data[4] +#define sFinalMonX data[5] +#define sFinalMonY data[6] +#define sTrigIdx data[7] + +// Pokeball in Oak intro, and when receiving via trade +void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 monPalNum, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 delay, u32 fadePalettes) { u8 spriteId; - LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[0]); - LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[0]); - spriteId = CreateSprite(&gBallSpriteTemplates[0], x, y, subpriortiy); - gSprites[spriteId].data[0] = monSpriteId; - gSprites[spriteId].data[5] = gSprites[monSpriteId].x; - gSprites[spriteId].data[6] = gSprites[monSpriteId].y; + LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[BALL_POKE]); + LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[BALL_POKE]); + spriteId = CreateSprite(&gBallSpriteTemplates[BALL_POKE], x, y, subpriortiy); + + gSprites[spriteId].sMonSpriteId = monSpriteId; + gSprites[spriteId].sFinalMonX = gSprites[monSpriteId].x; + gSprites[spriteId].sFinalMonY = gSprites[monSpriteId].y; + gSprites[monSpriteId].x = x; gSprites[monSpriteId].y = y; - gSprites[spriteId].data[1] = g; - gSprites[spriteId].data[2] = battlerId; - gSprites[spriteId].data[3] = h; - gSprites[spriteId].data[4] = h >> 0x10; + + gSprites[spriteId].sDelay = delay; + gSprites[spriteId].sMonPalNum = monPalNum; + gSprites[spriteId].sFadePalsLo = fadePalettes; + gSprites[spriteId].sFadePalsHi = fadePalettes >> 16; gSprites[spriteId].oam.priority = oamPriority; gSprites[spriteId].callback = SpriteCB_PokeballReleaseMon; + gSprites[monSpriteId].invisible = TRUE; } static void SpriteCB_PokeballReleaseMon(struct Sprite *sprite) { - if (sprite->data[1] == 0) + if (sprite->sDelay == 0) { - u8 r5; - u8 r7 = sprite->data[0]; - u8 battlerId = sprite->data[2]; - u32 r4 = (u16)sprite->data[3] | ((u16)sprite->data[4] << 16); + u8 subpriority; + u8 spriteId = sprite->sMonSpriteId; + u8 monPalNum = sprite->sMonPalNum; + u32 selectedPalettes = (u16)sprite->sFadePalsLo | ((u16)sprite->sFadePalsHi << 16); if (sprite->subpriority != 0) - r5 = sprite->subpriority - 1; + subpriority = sprite->subpriority - 1; else - r5 = 0; + subpriority = 0; StartSpriteAnim(sprite, 1); - LaunchBallStarsTaskForPokeball(sprite->x, sprite->y - 5, sprite->oam.priority, r5); - sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, battlerId, r4); + AnimateBallOpenParticlesForPokeball(sprite->x, sprite->y - 5, sprite->oam.priority, subpriority); + // sDelay re-used to store task id but never read + sprite->sDelay = LaunchBallFadeMonTaskForPokeball(TRUE, monPalNum, selectedPalettes); sprite->callback = SpriteCB_ReleasedMonFlyOut; - gSprites[r7].invisible = FALSE; - StartSpriteAffineAnim(&gSprites[r7], 1); - AnimateSprite(&gSprites[r7]); - gSprites[r7].data[1] = 0x1000; - sprite->data[7] = 0; + gSprites[spriteId].invisible = FALSE; + StartSpriteAffineAnim(&gSprites[spriteId], BATTLER_AFFINE_EMERGE); + AnimateSprite(&gSprites[spriteId]); + gSprites[spriteId].data[1] = 0x1000; + sprite->sTrigIdx = 0; } else { - sprite->data[1]--; + sprite->sDelay--; } } static void SpriteCB_ReleasedMonFlyOut(struct Sprite *sprite) { - bool8 r12 = FALSE; - bool8 r6 = FALSE; - u8 monSpriteId = sprite->data[0]; - u16 var1; - u16 var2; + bool8 emergeAnimFinished = FALSE; + bool8 atFinalPosition = FALSE; + u8 monSpriteId = sprite->sMonSpriteId; + u16 x, y; if (sprite->animEnded) sprite->invisible = TRUE; - + if (gSprites[monSpriteId].affineAnimEnded) { - StartSpriteAffineAnim(&gSprites[monSpriteId], 0); - r12 = TRUE; + StartSpriteAffineAnim(&gSprites[monSpriteId], BATTLER_AFFINE_NORMAL); + emergeAnimFinished = TRUE; } - - var1 = (sprite->data[5] - sprite->x) * sprite->data[7] / 128 + sprite->x; - var2 = (sprite->data[6] - sprite->y) * sprite->data[7] / 128 + sprite->y; - gSprites[monSpriteId].x = var1; - gSprites[monSpriteId].y = var2; - if (sprite->data[7] < 128) - { - s16 sine = -(gSineTable[(u8)sprite->data[7]] / 8); - sprite->data[7] += 4; + x = (sprite->sFinalMonX - sprite->x) * sprite->sTrigIdx / 128 + sprite->x; + y = (sprite->sFinalMonY - sprite->y) * sprite->sTrigIdx / 128 + sprite->y; + gSprites[monSpriteId].x = x; + gSprites[monSpriteId].y = y; + + if (sprite->sTrigIdx < 128) + { + s16 sine = -(gSineTable[(u8)sprite->sTrigIdx] / 8); + + sprite->sTrigIdx += 4; gSprites[monSpriteId].x2 = sine; gSprites[monSpriteId].y2 = sine; } else { - gSprites[monSpriteId].x = sprite->data[5]; - gSprites[monSpriteId].y = sprite->data[6]; + gSprites[monSpriteId].x = sprite->sFinalMonX; + gSprites[monSpriteId].y = sprite->sFinalMonY; gSprites[monSpriteId].x2 = 0; gSprites[monSpriteId].y2 = 0; - r6 = TRUE; + atFinalPosition = TRUE; } - - if (sprite->animEnded && r12 && r6) + if (sprite->animEnded && emergeAnimFinished && atFinalPosition) + { DestroySpriteAndFreeResources(sprite); + } } -u8 CreateTradePokeballSprite(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h) +#undef sFinalMonX +#undef sFinalMonY +#undef sTrigIdx + +#define sTimer data[5] + +u8 CreateTradePokeballSprite(u8 monSpriteId, u8 monPalNum, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 delay, u32 fadePalettes) { u8 spriteId; - LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[0]); - LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[0]); - spriteId = CreateSprite(&gBallSpriteTemplates[0], x, y, subPriority); - gSprites[spriteId].data[0] = a; - gSprites[spriteId].data[1] = g; - gSprites[spriteId].data[2] = b; - gSprites[spriteId].data[3] = h; - gSprites[spriteId].data[4] = h >> 16; + LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[BALL_POKE]); + LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[BALL_POKE]); + spriteId = CreateSprite(&gBallSpriteTemplates[BALL_POKE], x, y, subPriority); + gSprites[spriteId].sMonSpriteId = monSpriteId; + gSprites[spriteId].sDelay = delay; + gSprites[spriteId].sMonPalNum = monPalNum; + gSprites[spriteId].sFadePalsLo = fadePalettes; + gSprites[spriteId].sFadePalsHi = fadePalettes >> 16; gSprites[spriteId].oam.priority = oamPriority; gSprites[spriteId].callback = SpriteCB_TradePokeball; return spriteId; @@ -1108,29 +1148,35 @@ u8 CreateTradePokeballSprite(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPrior static void SpriteCB_TradePokeball(struct Sprite *sprite) { - if (sprite->data[1] == 0) + if (sprite->sDelay == 0) { - u8 r6; - u8 r7 = sprite->data[0]; - u8 r8 = sprite->data[2]; - u32 r5 = (u16)sprite->data[3] | ((u16)sprite->data[4] << 16); + u8 subpriority; + u8 monSpriteId = sprite->sMonSpriteId; + u8 monPalNum = sprite->sMonPalNum; + u32 selectedPalettes = (u16)sprite->sFadePalsLo | ((u16)sprite->sFadePalsHi << 16); if (sprite->subpriority != 0) - r6 = sprite->subpriority - 1; + subpriority = sprite->subpriority - 1; else - r6 = 0; + subpriority = 0; StartSpriteAnim(sprite, 1); - LaunchBallStarsTaskForPokeball(sprite->x, sprite->y - 5, sprite->oam.priority, r6); - sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, r8, r5); + AnimateBallOpenParticlesForPokeball(sprite->x, sprite->y - 5, sprite->oam.priority, subpriority); + // sDelay re-used to store task id but never read + sprite->sDelay = LaunchBallFadeMonTaskForPokeball(TRUE, monPalNum, selectedPalettes); sprite->callback = SpriteCB_TradePokeballSendOff; - StartSpriteAffineAnim(&gSprites[r7], 2); - AnimateSprite(&gSprites[r7]); - gSprites[r7].data[1] = 0; +#ifdef BUGFIX + // FIX: If this is used on a sprite that has previously had an affine animation, it will not + // play the shrink anim properly due to being paused. + gSprites[monSpriteId].affineAnimPaused = FALSE; +#endif // BUGFIX + StartSpriteAffineAnim(&gSprites[monSpriteId], BATTLER_AFFINE_RETURN); + AnimateSprite(&gSprites[monSpriteId]); + gSprites[monSpriteId].data[1] = 0; } else { - sprite->data[1]--; + sprite->sDelay--; } } @@ -1138,16 +1184,16 @@ static void SpriteCB_TradePokeballSendOff(struct Sprite *sprite) { u8 monSpriteId; - sprite->data[5]++; - if (sprite->data[5] == 11) + sprite->sTimer++; + if (sprite->sTimer == 11) PlaySE(SE_BALL_TRADE); - - monSpriteId = sprite->data[0]; + + monSpriteId = sprite->sMonSpriteId; if (gSprites[monSpriteId].affineAnimEnded) { StartSpriteAnim(sprite, 2); gSprites[monSpriteId].invisible = TRUE; - sprite->data[5] = 0; + sprite->sTimer = 0; sprite->callback = SpriteCB_TradePokeballEnd; } else @@ -1163,28 +1209,40 @@ static void SpriteCB_TradePokeballEnd(struct Sprite *sprite) sprite->callback = SpriteCallbackDummy; } -void DestroySpriteAndFreeResources2(struct Sprite *sprite) +#undef sMonSpriteId +#undef sDelay +#undef sMonPalNum +#undef sFadePalsLo +#undef sFadePalsHi +#undef sTimer + +// Unreferenced in RSE, but used here, possibly by mistake. +void DestroySpriteAndFreeResources_Ball(struct Sprite *sprite) { DestroySpriteAndFreeResources(sprite); } +#define sSpeedX data[0] +#define sSpeedY data[1] + +#define sDelayTimer data[1] + void StartHealthboxSlideIn(u8 battlerId) { struct Sprite *healthboxSprite = &gSprites[gHealthboxSpriteIds[battlerId]]; - healthboxSprite->data[0] = 5; - healthboxSprite->data[1] = 0; + healthboxSprite->sSpeedX = 5; + healthboxSprite->sSpeedY = 0; healthboxSprite->x2 = 0x73; healthboxSprite->y2 = 0; healthboxSprite->callback = SpriteCB_HealthboxSlideIn; if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) { - healthboxSprite->data[0] = -healthboxSprite->data[0]; - healthboxSprite->data[1] = -healthboxSprite->data[1]; + healthboxSprite->sSpeedX = -healthboxSprite->sSpeedX; + healthboxSprite->sSpeedY = -healthboxSprite->sSpeedY; healthboxSprite->x2 = -healthboxSprite->x2; healthboxSprite->y2 = -healthboxSprite->y2; } - gSprites[healthboxSprite->data[5]].callback(&gSprites[healthboxSprite->data[5]]); if (GetBattlerPosition(battlerId) == B_POSITION_PLAYER_RIGHT) healthboxSprite->callback = SpriteCB_HealthboxSlideInDelayed; @@ -1192,22 +1250,26 @@ void StartHealthboxSlideIn(u8 battlerId) static void SpriteCB_HealthboxSlideInDelayed(struct Sprite *sprite) { - sprite->data[1]++; - if (sprite->data[1] == 20) + sprite->sDelayTimer++; + if (sprite->sDelayTimer == 20) { - sprite->data[1] = 0; + sprite->sDelayTimer = 0; sprite->callback = SpriteCB_HealthboxSlideIn; } } static void SpriteCB_HealthboxSlideIn(struct Sprite *sprite) { - sprite->x2 -= sprite->data[0]; - sprite->y2 -= sprite->data[1]; + sprite->x2 -= sprite->sSpeedX; + sprite->y2 -= sprite->sSpeedY; if (sprite->x2 == 0 && sprite->y2 == 0) sprite->callback = SpriteCallbackDummy; } +#undef sSpeedX +#undef sSpeedY +#undef sDelayTimer + void DoHitAnimHealthboxEffect(u8 battlerId) { u8 spriteId; @@ -1242,7 +1304,7 @@ void LoadBallGfx(u8 ballId) LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[ballId]); LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[ballId]); } - + switch (ballId) { case BALL_DIVE: @@ -1251,7 +1313,7 @@ void LoadBallGfx(u8 ballId) break; default: var = GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag); - LZDecompressVram(gOpenPokeballGfx, (void *)(VRAM + 0x10100 + var * 32)); + LZDecompressVram(gOpenPokeballGfx, (void *)(OBJ_VRAM0 + 0x100 + var * 32)); break; } } diff --git a/src/pokemon.c b/src/pokemon.c index fcfd678f4..e2bfb20cf 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1667,7 +1667,7 @@ static const struct OamData sOakSpeechNidoranFDummyOamData = .y = 0, .affineMode = 0, .objMode = 0, - .mosaic = 0, + .mosaic = FALSE, .bpp = 0, .shape = 0, .x = 0, diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 1287bbab5..b345de9bf 100644 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -3859,7 +3859,7 @@ static const struct OamData sOamData_JumpMon = .y = 0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, + .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), .x = 0, @@ -3876,7 +3876,7 @@ static const struct OamData sOamData_Vine16x32 = .y = 0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, + .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(16x32), .x = 0, @@ -3893,7 +3893,7 @@ static const struct OamData sOamData_Vine32x32 = .y = 0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, + .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x32), .x = 0, @@ -3910,7 +3910,7 @@ static const struct OamData sOamData_Vine32x16 = .y = 0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, + .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x16), .x = 0, @@ -4064,7 +4064,7 @@ static const struct OamData sOamData_Star = .y = 0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, + .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(16x16), .x = 0, diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 61dffc7c4..da4df9eff 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -4133,7 +4133,8 @@ static void ShowOrHideBallIconObj(u8 invisible) static void DestroyBallIconObj(void) { - DestroySpriteAndFreeResources2(&gSprites[sMonSummaryScreen->ballIconSpriteId]); + // Redundant, as DestroySpriteAndFreeResources could've been used. + DestroySpriteAndFreeResources_Ball(&gSprites[sMonSummaryScreen->ballIconSpriteId]); } static void PokeSum_CreateMonIconSprite(void) @@ -5181,7 +5182,7 @@ static void PokeSum_TryPlayMonCry(void) { if (!GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_IS_EGG)) { - if (ShouldPlayNormalPokeCry(&sMonSummaryScreen->currentMon) == TRUE) + if (ShouldPlayNormalMonCry(&sMonSummaryScreen->currentMon) == TRUE) PlayCry_ByMode(GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_SPECIES2), 0, CRY_MODE_NORMAL); else PlayCry_ByMode(GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_SPECIES2), 0, CRY_MODE_WEAK); diff --git a/src/trainer_see.c b/src/trainer_see.c index d1c97e9af..e884d6104 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -566,7 +566,7 @@ static const struct OamData sOamData_Emoticons = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, .objMode = ST_OAM_OBJ_NORMAL, - .mosaic = 0, + .mosaic = FALSE, .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(16x16), .x = 0, From 4a60396428be7f1b0c69a1bbf2a91d23b05da0af Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Fri, 29 Jul 2022 22:49:52 -0400 Subject: [PATCH 50/64] Colors --- src/berry_crush.c | 4 ++-- src/fame_checker.c | 8 ++++---- src/hall_of_fame.c | 6 +++--- src/help_system_util.c | 10 +++++----- src/menu_helpers.c | 2 +- src/new_menu_helpers.c | 10 +++++----- src/oak_speech.c | 4 ++-- src/party_menu.c | 8 ++++---- src/script_menu.c | 8 ++++---- src/start_menu.c | 2 +- src/text.c | 2 +- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/berry_crush.c b/src/berry_crush.c index 254bd170f..2b4a5ed55 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -2367,9 +2367,9 @@ static u32 Cmd_StopGame(struct BerryCrushGame * game, UNUSED u8 *args) case 0: DrawDialogueFrame(0, FALSE); if (game->playAgainState == PLAY_AGAIN_NO_BERRIES) - AddTextPrinterParameterized2(0, 2, sMessages[MSG_NO_BERRIES], game->textSpeed, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, sMessages[MSG_NO_BERRIES], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); else - AddTextPrinterParameterized2(0, 2, sMessages[MSG_DROPPED], game->textSpeed, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, sMessages[MSG_DROPPED], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); break; case 1: diff --git a/src/fame_checker.c b/src/fame_checker.c index e44ff2371..f0e359bed 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -822,7 +822,7 @@ static bool8 TryExitPickMode(u8 taskId) static void MessageBoxPrintEmptyText(void) { - AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gFameCheckerText_ClearTextbox, 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gFameCheckerText_ClearTextbox, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } static void Task_EnterPickMode(u8 taskId) @@ -962,7 +962,7 @@ static void GetPickModeText(void) if (HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE) whichText = NUM_FAMECHECKER_PERSONS; StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[who] + whichText]); - AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3); + AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } } @@ -973,7 +973,7 @@ static void PrintSelectedNameInBrightGreen(u8 taskId) u16 cursorPos = FameCheckerGetCursorY(); FillWindowPixelRect(FCWINDOWID_MSGBOX, PIXEL_FILL(1), 0, 0, 0xd0, 0x20); StringExpandPlaceholders(gStringVar4, sFameCheckerFlavorTextPointers[sFameCheckerData->unlockedPersons[cursorPos] * 6 + data[1]]); - AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3); + AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } @@ -1513,7 +1513,7 @@ static void Task_SwitchToPickMode(u8 taskId) static void PrintCancelDescription(void) { FillWindowPixelRect(FCWINDOWID_MSGBOX, PIXEL_FILL(1), 0, 0, 0xd0, 0x20); - AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gFameCheckerText_FameCheckerWillBeClosed, 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gFameCheckerText_FameCheckerWillBeClosed, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 849fd2352..68494d9cf 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -452,7 +452,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) *lastSavedTeam = *sHofMonPtr; DrawDialogueFrame(0, 0); - AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_Hof_TrySaveData; } @@ -638,7 +638,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId) FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); HallOfFame_PrintPlayerInfo(1, 2); DrawDialogueFrame(0, 0); - AddTextPrinterParameterized2(0, 2, gText_LeagueChamp, 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, gText_LeagueChamp, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_Hof_ExitOnKeyPressed; } @@ -968,7 +968,7 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId) { TopBarWindowPrintString(gText_ABUTTONExit, 8, TRUE); DrawDialogueFrame(0, 0); - AddTextPrinterParameterized2(0, 2, gText_HOFCorrupted, 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, gText_HOFCorrupted, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_HofPC_ExitOnButtonPress; } diff --git a/src/help_system_util.c b/src/help_system_util.c index ed7aa6b78..49554acf8 100644 --- a/src/help_system_util.c +++ b/src/help_system_util.c @@ -574,27 +574,27 @@ void DecompressAndRenderGlyph(u8 font, u16 glyph, struct Bitmap *srcBlit, struct void HelpSystem_PrintTextInTopLeftCorner(const u8 * str) { - GenerateFontHalfRowLookupTable(1, 15, 2); + GenerateFontHalfRowLookupTable(TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_DARK_GRAY); HelpSystemRenderText(5, gDecompressionBuffer + 0x3D00, str, 6, 2, 7, 2); } void HelpSystem_PrintTextRightAlign_Row52(const u8 * str) { s32 left = 0x7C - GetStringWidth(0, str, 0); - GenerateFontHalfRowLookupTable(1, 15, 2); + GenerateFontHalfRowLookupTable(TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_DARK_GRAY); HelpSystemRenderText(0, gDecompressionBuffer + 0x3400, str, left, 2, 16, 2); } void HelpSystem_PrintTextAt(const u8 * str, u8 x, u8 y) { - GenerateFontHalfRowLookupTable(1, 15, 2); + GenerateFontHalfRowLookupTable(TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_DARK_GRAY); HelpSystemRenderText(2, gDecompressionBuffer + 0x0000, str, x, y, 26, 16); } void HelpSystem_PrintQuestionAndAnswerPair(const u8 * question, const u8 * answer) { CpuFill16(0xEEEE, gDecompressionBuffer + 0x0000, 0x3400); - GenerateFontHalfRowLookupTable(1, 14, 2); + GenerateFontHalfRowLookupTable(TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_5, TEXT_COLOR_DARK_GRAY); HelpSystemRenderText(2, gDecompressionBuffer + 0x0000, question, 0, 0, 26, 16); HelpSystemRenderText(2, gDecompressionBuffer + 0x09C0, answer, 0, 0, 26, 13); } @@ -602,7 +602,7 @@ void HelpSystem_PrintQuestionAndAnswerPair(const u8 * question, const u8 * answe void HelpSystem_PrintTopicMouseoverDescription(const u8 * str) { CpuFill16(0x1111, gDecompressionBuffer + 0x23C0, 0x1040); - GenerateFontHalfRowLookupTable(2, 1, 3); + GenerateFontHalfRowLookupTable(TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); HelpSystemRenderText(2, gDecompressionBuffer + 0x23C0, str, 2, 6, 26, 5); } diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 9a534dd4b..5e4e39763 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -27,7 +27,7 @@ void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 palet StringExpandPlaceholders(gStringVar4, string); gTextFlags.canABSpeedUpPrint = 1; - AddTextPrinterParameterized2(windowId, fontId, gStringVar4, textSpeed, NULL, 2, 1, 3); + AddTextPrinterParameterized2(windowId, fontId, gStringVar4, textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); gUnknown_20399CC = taskFunc; gTasks[taskId].func = Task_ContinueTaskAfterMessagePrints; } diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c index 22f559f8a..0dfeffa46 100644 --- a/src/new_menu_helpers.c +++ b/src/new_menu_helpers.c @@ -431,23 +431,23 @@ void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress) gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; result = ContextNpcGetTextColor(); if (result == 0) - AddTextPrinterParameterized2(0, 4, gStringVar4, GetTextSpeedSetting(), nptr, 8, 1, 3); + AddTextPrinterParameterized2(0, 4, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_BLUE, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); else if (result == 1) - AddTextPrinterParameterized2(0, 5, gStringVar4, GetTextSpeedSetting(), nptr, 4, 1, 3); + AddTextPrinterParameterized2(0, 5, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_RED, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); else - AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), nptr, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress) { gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; - AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed) { gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; - AddTextPrinterParameterized2(0, 2, gStringVar4, speed, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } void LoadStdWindowFrameGfx(void) diff --git a/src/oak_speech.c b/src/oak_speech.c index f23905fd7..b0e3e1a6f 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -906,11 +906,11 @@ static void Task_OakSpeech9(u8 taskId) if (str != gStringVar4) \ { \ StringExpandPlaceholders(gStringVar4, str); \ - AddTextPrinterParameterized2(0, 4, gStringVar4, speed, NULL, 2, 1, 3); \ + AddTextPrinterParameterized2(0, 4, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); \ } \ else \ { \ - AddTextPrinterParameterized2(0, 4, str, speed, NULL, 2, 1, 3); \ + AddTextPrinterParameterized2(0, 4, str, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); \ } \ CopyWindowToVram(0, COPYWIN_FULL); \ }) diff --git a/src/party_menu.c b/src/party_menu.c index 4bceaea7d..d1679b695 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2596,7 +2596,7 @@ static void PartyMenuPrintText(const u8 *text) { DrawStdFrameWithCustomTileAndPalette(6, FALSE, 0x4F, 13); gTextFlags.canABSpeedUpPrint = TRUE; - AddTextPrinterParameterized2(6, 2, text, GetTextSpeedSetting(), 0, 2, 1, 3); + AddTextPrinterParameterized2(6, 2, text, GetTextSpeedSetting(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } static void PartyMenuDisplayYesNoMenu(void) @@ -2621,7 +2621,7 @@ static void PartyMenu_Oak_PrintText(u8 windowId, const u8 *str) { StringExpandPlaceholders(gStringVar4, str); gTextFlags.canABSpeedUpPrint = TRUE; - AddTextPrinterParameterized2(windowId, 4, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3); + AddTextPrinterParameterized2(windowId, 4, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } static bool8 FirstBattleEnterParty_CreateWindowAndMsg1Printer(void) @@ -5134,7 +5134,7 @@ static void DisplayLevelUpStatsPg1(u8 taskId) s16 *arrayPtr = sPartyMenuInternal->data; arrayPtr[12] = CreateLevelUpStatsWindow(); - DrawLevelUpWindowPg1(arrayPtr[12], arrayPtr, &arrayPtr[6], 1, 2, 3); + DrawLevelUpWindowPg1(arrayPtr[12], arrayPtr, &arrayPtr[6], TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(arrayPtr[12], COPYWIN_GFX); ScheduleBgCopyTilemapToVram(2); } @@ -5143,7 +5143,7 @@ static void DisplayLevelUpStatsPg2(u8 taskId) { s16 *arrayPtr = sPartyMenuInternal->data; - DrawLevelUpWindowPg2(arrayPtr[12], &arrayPtr[6], 1, 2, 3); + DrawLevelUpWindowPg2(arrayPtr[12], &arrayPtr[6], TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(arrayPtr[12], COPYWIN_GFX); ScheduleBgCopyTilemapToVram(2); } diff --git a/src/script_menu.c b/src/script_menu.c index 6a59fc8d4..0f17a2bd8 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -827,15 +827,15 @@ static void MultiChoicePrintHelpDescription(u8 mcId) { case 39: FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_CableClub_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_CableClub_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); break; case 47: FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); break; case 50: FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_WirelessCenter_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_WirelessCenter_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); break; } } @@ -1003,7 +1003,7 @@ static void CreatePCMenuWindow(void) void ScriptMenu_DisplayPCStartupPrompt(void) { sub_80F7768(0, TRUE); - AddTextPrinterParameterized2(0, 2, Text_AccessWhichPC, 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, Text_AccessWhichPC, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } static void Task_ScriptShowMonPic(u8 taskId) diff --git a/src/start_menu.c b/src/start_menu.c index 2c0de8245..4dba3ce92 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -909,7 +909,7 @@ static void task50_after_link_battle_save(u8 taskId) { case 0: FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0xFF, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0xFF, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); DrawTextBorderOuter(0, 0x008, 0x0F); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); diff --git a/src/text.c b/src/text.c index 3b5cc3204..a29906052 100644 --- a/src/text.c +++ b/src/text.c @@ -1181,7 +1181,7 @@ u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str, int a3, int a4, int a5, int a bgColor = 0; shadowColor = 3; - GenerateFontHalfRowLookupTable(1, 0, 3); + GenerateFontHalfRowLookupTable(TEXT_COLOR_WHITE, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GRAY); strLocal = str; strPos = 0; From 60ce72fa5aa369af691cfb04306d4a62a4572dcb Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 30 Jul 2022 02:22:59 -0400 Subject: [PATCH 51/64] Synced src/mon_markings.c and partly synced PSS --- include/box_party_pokemon_dropdown.h | 4 +- include/ereader_helpers.h | 2 +- include/event_object_movement.h | 4 +- include/field_effect.h | 6 +- include/field_effect_helpers.h | 30 +- include/field_player_avatar.h | 2 +- include/graphics.h | 6 +- include/item_menu_icons.h | 2 +- include/link.h | 2 +- include/link_rfu.h | 2 +- include/map_preview_screen.h | 6 +- include/mevent.h | 6 +- include/mevent_server.h | 24 +- include/mon_markings.h | 34 +- include/new_menu_helpers.h | 2 +- include/pokedex_area_markers.h | 2 +- include/pokemon_icon.h | 4 +- include/pokemon_special_anim_internal.h | 4 +- include/pokemon_storage_system.h | 1 + include/pokemon_storage_system_internal.h | 217 ++++--- include/quest_log.h | 2 +- include/text_window_graphics.h | 6 +- src/AgbRfu_LinkManager.c | 2 +- src/battle_anim_mon_movement.c | 36 +- src/battle_interface.c | 14 +- src/battle_records.c | 6 +- src/berry_crush.c | 20 +- src/berry_fix_program.c | 2 +- src/box_party_pokemon_dropdown.c | 12 +- src/cereader_tool.c | 4 +- src/dodrio_berry_picking_2.c | 44 +- src/easy_chat_3.c | 28 +- src/ereader_helpers.c | 8 +- src/event_object_movement.c | 20 +- src/evolution_graphics.c | 14 +- src/fame_checker.c | 10 +- src/field_effect.c | 124 ++-- src/field_effect_helpers.c | 150 ++--- src/field_player_avatar.c | 6 +- src/fldeff_cut.c | 12 +- src/graphics.c | 4 +- src/hall_of_fame.c | 8 +- src/intro.c | 76 +-- src/item_menu.c | 2 +- src/item_menu_icons.c | 20 +- src/itemfinder.c | 16 +- src/learn_move.c | 4 +- src/link_rfu_2.c | 4 +- src/m4a_tables.c | 2 +- src/mail.c | 6 +- src/main_menu.c | 4 +- src/mevent.c | 6 +- src/mevent_client.c | 2 +- src/mevent_server.c | 10 +- src/mevent_server_helpers.c | 6 +- src/minigame_countdown.c | 6 +- src/mon_markings.c | 758 ++++++++++++---------- src/naming_screen.c | 20 +- src/oak_speech.c | 8 +- src/option_menu.c | 10 +- src/overworld.c | 2 +- src/pokedex_screen.c | 2 +- src/pokemon_icon.c | 12 +- src/pokemon_special_anim_scene.c | 70 +- src/pokemon_storage_system_2.c | 244 ++++--- src/pokemon_storage_system_3.c | 154 ++--- src/pokemon_storage_system_4.c | 368 +++++------ src/pokemon_storage_system_5.c | 366 +++++------ src/pokemon_storage_system_6.c | 16 +- src/pokemon_storage_system_8.c | 24 +- src/pokemon_storage_system_9.c | 18 +- src/pokemon_summary_screen.c | 38 +- src/psychic.c | 2 +- src/quest_log.c | 16 +- src/region_map.c | 16 +- src/seagallop.c | 12 +- src/slot_machine.c | 14 +- src/smokescreen.c | 2 +- src/ss_anne.c | 8 +- src/teachy_tv.c | 6 +- src/text_printer.c | 2 +- src/text_window_graphics.c | 2 +- src/title_screen.c | 10 +- src/tm_case.c | 14 +- src/trade_scene.c | 40 +- src/trainer_see.c | 2 +- src/union_room_chat_objects.c | 4 +- tools/gbagfx/huff.c | 16 +- 88 files changed, 1742 insertions(+), 1590 deletions(-) diff --git a/include/box_party_pokemon_dropdown.h b/include/box_party_pokemon_dropdown.h index 52e620956..795a22e67 100644 --- a/include/box_party_pokemon_dropdown.h +++ b/include/box_party_pokemon_dropdown.h @@ -14,8 +14,8 @@ enum void AllocBoxPartyPokemonDropdowns(u8 num); void FreeBoxPartyPokemonDropdowns(void); void CopyAllBoxPartyPokemonDropdownsToVram(void); -void SetBoxPartyPokemonDropdownMap2(u8 idx, u8 bgId, const void * src, u16 width, u16 height); -void SetBoxPartyPokemonDropdownMap1Tiles(u8 idx, const void * src); +void SetBoxPartyPokemonDropdownMap2(u8 idx, u8 bgId, const void *src, u16 width, u16 height); +void SetBoxPartyPokemonDropdownMap1Tiles(u8 idx, const void *src); void SetBoxPartyPokemonDropdownMap2Pos(u8 idx, u16 x, u16 y); void SetBoxPartyPokemonDropdownMap2Rect(u8 idx, u16 x, u16 y, u16 width, u16 height); void AdjustBoxPartyPokemonDropdownPos(u8 a0, u8 a1, s8 a2); diff --git a/include/ereader_helpers.h b/include/ereader_helpers.h index dab97470a..d6f3d13bb 100644 --- a/include/ereader_helpers.h +++ b/include/ereader_helpers.h @@ -31,6 +31,6 @@ void EReaderHelper_Timer3Callback(void); void EReaderHelper_SaveRegsState(void); void EReaderHelper_ClearsSendRecvMgr(void); void EReaderHelper_RestoreRegsState(void); -u16 EReaderHandleTransfer(u8 mode, size_t size, const void * src, void * dest); +u16 EReaderHandleTransfer(u8 mode, size_t size, const void *src, void *dest); #endif //GUARD_EREADER_HELPERS_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index d167699d9..10ee23172 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -156,14 +156,14 @@ bool32 RfuUnionObjectIsWarping(u8 objectEventId); u8 GetJumpSpecialMovementAction(u32 direction); void EnableObjectGroundEffectsByXY(s16 x, s16 y); void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y); -u8 CreateCopySpriteAt(struct Sprite * sprite, s16 x, s16 y, u8 subpriority); +u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority); u16 GetObjectPaletteTag(u8 paletteIndex); void SetSpritePosToMapCoords(s16 x, s16 y, s16 *x2, s16 *y2); void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible); bool8 AreZCoordsCompatible(u8, u8); u8 ZCoordToPriority(u8 z); void ObjectEventUpdateZCoord(struct ObjectEvent *pObject); -void SetObjectSubpriorityByZCoord(u8 z, struct Sprite * sprite, u8 offset); +void SetObjectSubpriorityByZCoord(u8 z, struct Sprite *sprite, u8 offset); bool8 IsZCoordMismatchAt(u8, s16, s16); void MakeObjectTemplateFromObjectEventGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *spriteTemplate, const struct SubspriteTable **subspriteTables); u8 AddCameraObject(u8 trackedSpriteId); diff --git a/include/field_effect.h b/include/field_effect.h index a4246655b..23f309fe5 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -20,12 +20,12 @@ void StartEscalatorWarp(u8 metatileBehavior, u8 priority); void StartLavaridgeGymB1FWarp(u8 a0); void StartLavaridgeGym1FWarp(u8 a0); void ApplyGlobalFieldPaletteTint(u8 paletteIdx); -void FreeResourcesAndDestroySprite(struct Sprite * sprite, u8 spriteId); +void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId); u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused); void ReturnToFieldFromFlyMapSelect(void); void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); -void SpriteCB_PopOutOfAsh(struct Sprite * sprite); -void SpriteCB_AshLaunch(struct Sprite * sprite); +void SpriteCB_PopOutOfAsh(struct Sprite *sprite); +void SpriteCB_AshLaunch(struct Sprite *sprite); void FieldEffectActiveListClear(void); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index fa42aef9a..9347483c6 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -25,20 +25,20 @@ u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y); void SetSpriteInvisible(u8 spriteId); void SetSurfBlob_PlayerOffset(u8 spriteId, bool8 hasOffset, s16 offset); -void UpdateJumpImpactEffect(struct Sprite * sprite); -void UpdateShadowFieldEffect(struct Sprite * sprite); -void UpdateBubblesFieldEffect(struct Sprite * sprite); -void UpdateSparkleFieldEffect(struct Sprite * sprite); -void UpdateTallGrassFieldEffect(struct Sprite * sprite); -void WaitFieldEffectSpriteAnim(struct Sprite * sprite); -void UpdateAshFieldEffect(struct Sprite * sprite); -void UpdateSurfBlobFieldEffect(struct Sprite * sprite); -void UpdateFootprintsTireTracksFieldEffect(struct Sprite * sprite); -void UpdateSplashFieldEffect(struct Sprite * sprite); -void UpdateShortGrassFieldEffect(struct Sprite * sprite); -void UpdateLongGrassFieldEffect(struct Sprite * sprite); -void UpdateSandPileFieldEffect(struct Sprite * sprite); -void UpdateDisguiseFieldEffect(struct Sprite * sprite); -void UpdateHotSpringsWaterFieldEffect(struct Sprite * sprite); +void UpdateJumpImpactEffect(struct Sprite *sprite); +void UpdateShadowFieldEffect(struct Sprite *sprite); +void UpdateBubblesFieldEffect(struct Sprite *sprite); +void UpdateSparkleFieldEffect(struct Sprite *sprite); +void UpdateTallGrassFieldEffect(struct Sprite *sprite); +void WaitFieldEffectSpriteAnim(struct Sprite *sprite); +void UpdateAshFieldEffect(struct Sprite *sprite); +void UpdateSurfBlobFieldEffect(struct Sprite *sprite); +void UpdateFootprintsTireTracksFieldEffect(struct Sprite *sprite); +void UpdateSplashFieldEffect(struct Sprite *sprite); +void UpdateShortGrassFieldEffect(struct Sprite *sprite); +void UpdateLongGrassFieldEffect(struct Sprite *sprite); +void UpdateSandPileFieldEffect(struct Sprite *sprite); +void UpdateDisguiseFieldEffect(struct Sprite *sprite); +void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite); #endif //GUARD_FIELD_EFFECT_HELPERS_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index a970385db..9f726cf99 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -13,7 +13,7 @@ u8 GetPlayerMovementDirection(void); u8 PlayerGetCopyableMovement(void); void MovePlayerNotOnBike(u8 direction, u16 heldKeys); -void MovementType_Player(struct Sprite * sprite); +void MovementType_Player(struct Sprite *sprite); void HandleEnforcedLookDirectionOnPlayerStopMoving(void); void StopPlayerAvatar(void); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); diff --git a/include/graphics.h b/include/graphics.h index dc72466c8..add2653d4 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -2980,7 +2980,7 @@ extern const u8 gFile_graphics_items_icon_palettes_soda_pop_palette[]; extern const u8 gFile_graphics_items_icons_lemonade_sheet[]; extern const u8 gFile_graphics_items_icon_palettes_lemonade_palette[]; extern const u8 gFile_graphics_items_icons_moomoo_milk_sheet[]; -extern const u8 gFile_graphics_items_icon_palettes_moomoo_milk_palette[];; +extern const u8 gFile_graphics_items_icon_palettes_moomoo_milk_palette[]; extern const u8 gFile_graphics_items_icon_palettes_energy_powder_palette[]; extern const u8 gFile_graphics_items_icons_energy_root_sheet[]; extern const u8 gFile_graphics_items_icon_palettes_energy_root_palette[]; @@ -4829,8 +4829,8 @@ extern const u16 gTradeButtons_Gfx[]; extern const u16 gTradeMenuMonBox_Tilemap[]; // mon_markings -extern const u16 gUnknown_8E9CBBC[]; -extern const u16 gUnknown_8E9CB9C[]; +extern const u16 gMonMarkingsMenu_Gfx[]; +extern const u16 gMonMarkingsMenu_Pal[]; // hall_of_fame extern const u32 gFile_graphics_misc_confetti_sheet[]; diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h index ef3bda923..01e481080 100644 --- a/include/item_menu_icons.h +++ b/include/item_menu_icons.h @@ -22,7 +22,7 @@ void ItemMenuIcons_MoveInsertIndicatorBar(s16 x, u16 y); void ItemMenuIcons_ToggleInsertIndicatorBarVisibility(bool8 invisible); void SetBagVisualPocketId(u8); void ShakeBagSprite(void); -const void * GetItemIconGfxPtr(u16 itemId, u8 ptrId); +const void *GetItemIconGfxPtr(u16 itemId, u8 ptrId); void CreateBagOrSatchelSprite(u8 animNum); #endif // GUARD_ITEM_MENU_ICONS diff --git a/include/link.h b/include/link.h index e7dafadf6..47f85bb9d 100644 --- a/include/link.h +++ b/include/link.h @@ -190,7 +190,7 @@ struct Link struct BlockRequest { - void * address; + void *address; u32 size; }; diff --git a/include/link_rfu.h b/include/link_rfu.h index 7dac12fbb..1792781ff 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -221,7 +221,7 @@ void DestroyWirelessStatusIndicatorSprite(void); void MEvent_CreateTask_CardOrNewsWithFriend(u32 arg0); void MEvent_CreateTask_CardOrNewsOverWireless(u32 arg0); void MEvent_CreateTask_Leader(u32 arg0); -void Rfu_SendPacket(void * data); +void Rfu_SendPacket(void *data); u8 CreateTask_ListenToWireless(void); void LinkRfu_DestroyIdleTask(void); void InitRFUAPI(void); diff --git a/include/map_preview_screen.h b/include/map_preview_screen.h index 228d37d54..7fbcc675e 100644 --- a/include/map_preview_screen.h +++ b/include/map_preview_screen.h @@ -43,9 +43,9 @@ struct MapPreviewScreen u8 mapsec; u8 type; u16 flagId; - const void * tilesptr; - const void * tilemapptr; - const void * palptr; + const void *tilesptr; + const void *tilemapptr; + const void *palptr; }; u16 MapPreview_CreateMapNameWindow(u8 id); diff --git a/include/mevent.h b/include/mevent.h index 28920b118..3dc1621b0 100644 --- a/include/mevent.h +++ b/include/mevent.h @@ -25,7 +25,7 @@ struct MEvent_Str_1 { u16 status; size_t size; - const void * data; + const void *data; }; struct MEvent_Str_2 @@ -63,8 +63,8 @@ void MEvent_WonderCardResetUnk08_6(struct WonderCard * buffer); bool32 MEvent_ReceiveDistributionMon(const u16 * data); void BuildMEventClientHeader(struct MEventClientHeaderStruct * data); bool32 ValidateMEventClientHeader(const struct MEventClientHeaderStruct * data); -u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused); -u32 MEvent_CanPlayerReceiveDistributionMon(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused); +u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void *unused); +u32 MEvent_CanPlayerReceiveDistributionMon(const u16 * a0, const struct MEventClientHeaderStruct * a1, void *unused); bool32 sub_8144474(const struct MEventClientHeaderStruct * a0, const u16 * a1); u16 sub_81444B0(const struct MEventClientHeaderStruct * a0, u32 command); bool32 InitWonderCardResources(struct WonderCard * r5, struct WonderCardMetadata * r6); diff --git a/include/mevent_server.h b/include/mevent_server.h index 17ece2f26..9560fe25f 100644 --- a/include/mevent_server.h +++ b/include/mevent_server.h @@ -18,8 +18,8 @@ struct mevent_srv_sub u16 sendCounter; u16 sendCRC; u16 sendSize; - void * recvBfr; - const void * sendBfr; + void *recvBfr; + const void *sendBfr; u32 (*recvFunc)(struct mevent_srv_sub *); u32 (*sendFunc)(struct mevent_srv_sub *); }; @@ -59,10 +59,10 @@ struct mevent_client u32 mainseqno; u32 flag; u32 cmdidx; - void * sendBuffer; - void * recvBuffer; + void *sendBuffer; + void *recvBuffer; struct mevent_client_cmd * cmdBuffer; - void * buffer; + void *buffer; struct mevent_srv_sub manager; }; @@ -70,7 +70,7 @@ struct mevent_server_cmd { u32 instr; bool32 flag; - void * parameter; + void *parameter; }; // Server commands @@ -99,13 +99,13 @@ struct mevent_srv_common u32 mainseqno; u32 cmdidx; const struct mevent_server_cmd * cmdBuffer; - void * recvBuffer; + void *recvBuffer; struct WonderCard * card; struct WonderNews * news; struct MEventClientHeaderStruct * mevent_unk1442cc; - void * sendBuffer1; + void *sendBuffer1; u32 sendBuffer1Size; - void * sendBuffer2; + void *sendBuffer2; u32 sendBuffer2Size; u32 sendWord; struct mevent_srv_sub manager; @@ -114,13 +114,13 @@ struct mevent_srv_common u32 mevent_srv_sub_recv(struct mevent_srv_sub * svr); u32 mevent_srv_sub_send(struct mevent_srv_sub * svr); void mevent_srv_sub_init(struct mevent_srv_sub * svr, u32 sendPlayerNo, u32 recvPlayerNo); -void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void * src, u32 size); -void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void * dest); +void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void *src, u32 size); +void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void *dest); void mevent_client_do_init(void); u32 mevent_client_do_exec(u16 * a0); void mevent_client_inc_flag(void); -void * mevent_client_get_buffer(void); +void *mevent_client_get_buffer(void); void mevent_client_set_param(u32 a0); void mevent_srv_init_wnews(void); void mevent_srv_new_wcard(void); diff --git a/include/mon_markings.h b/include/mon_markings.h index ddda73931..d52a1d745 100644 --- a/include/mon_markings.h +++ b/include/mon_markings.h @@ -1,33 +1,35 @@ #ifndef GUARD_MON_MARKINGS_H #define GUARD_MON_MARKINGS_H -struct PokemonMarkMenu +#define NUM_MON_MARKINGS 4 + +struct MonMarkingsMenu { /*0x0000*/ u16 baseTileTag; /*0x0002*/ u16 basePaletteTag; /*0x0004*/ u8 markings; // bit flags /*0x0005*/ s8 cursorPos; - /*0x0006*/ bool8 markingsArray[4]; + /*0x0006*/ bool8 markingsArray[NUM_MON_MARKINGS]; /*0x000A*/ u8 cursorBaseY; /*0x000B*/ bool8 spriteSheetLoadRequired; - /*0x000C*/ struct Sprite * menuWindowSprites[2]; // upper and lower halves of menu window - /*0x0014*/ struct Sprite * menuMarkingSprites[4]; - /*0x0024*/ struct Sprite * unkSprite; - /*0x0028*/ struct Sprite * menuTextSprite; + /*0x000C*/ struct Sprite *windowSprites[2]; // upper and lower halves of menu window + /*0x0014*/ struct Sprite *markingSprites[NUM_MON_MARKINGS]; + /*0x0024*/ struct Sprite *cursorSprite; + /*0x0028*/ struct Sprite *textSprite; /*0x002C*/ const u8 *frameTiles; /*0x0030*/ const u16 *framePalette; - /*0x0034*/ u8 menuWindowSpriteTiles[0x1000]; - /*0x1034*/ u8 filler1034[0x80]; + /*0x0034*/ u8 windowSpriteTiles[0x1000]; + /*0x1034*/ u8 unused[0x80]; /*0x10B4*/ u8 tileLoadState; }; // 10b8 -void SetMonMarkingsMenuPointer(struct PokemonMarkMenu * markMenu); -void LoadMonMarkingsFrameGfx(void); -void DrawMonMarkingsMenu(u8 markings, s16 x, s16 y); -void TeardownMonMarkingsMenu(void); -bool8 MonMarkingsHandleInput(void); -struct Sprite * CreateMonMarkingSprite_SelectCombo(u16 tileTag, u16 paletteTag, const u16 *palette); -struct Sprite * CreateMonMarkingSprite_AllOff(u16 tileTag, u16 paletteTag, const u16 *palette); -void RequestDma3LoadMonMarking(u8 markings, void * dest); +void InitMonMarkingsMenu(struct MonMarkingsMenu *ptr); +void BufferMonMarkingsMenuTiles(void); +void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y); +void FreeMonMarkingsMenu(void); +bool8 HandleMonMarkingsMenuInput(void); +struct Sprite *CreateMonMarkingAllCombosSprite(u16 tileTag, u16 paletteTag, const u16 *palette); +struct Sprite *CreateMonMarkingComboSprite(u16 tileTag, u16 paletteTag, const u16 *palette); +void UpdateMonMarkingTiles(u8 markings, void *dest); #endif //GUARD_MON_MARKINGS_H diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 5fd03151f..3af2074ba 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -14,7 +14,7 @@ void *DecompressAndCopyTileDataToVram(u8 bgId, const void *src, u32 size, u16 of void *DecompressAndCopyTileDataToVram2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); -void * MallocAndDecompress(const void * src, u32 * size); +void *MallocAndDecompress(const void *src, u32 * size); void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void CopyToBufferFromBgTilemap(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height); void ResetBgPositions(void); diff --git a/include/pokedex_area_markers.h b/include/pokedex_area_markers.h index a9669a80a..c0b1978cc 100644 --- a/include/pokedex_area_markers.h +++ b/include/pokedex_area_markers.h @@ -4,7 +4,7 @@ struct PAM_TaskData { struct SubspriteTable subsprites; - void * buffer; + void *buffer; u8 unk_0C; u8 spr_id; u16 tilesTag; diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h index 76b787137..20650dfc4 100644 --- a/include/pokemon_icon.h +++ b/include/pokemon_icon.h @@ -19,10 +19,10 @@ void DestroyMonIcon(struct Sprite *); u16 GetUnownLetterByPersonality(u32 personality); void SpriteCB_MonIcon(struct Sprite *); u8 CreateMonIcon(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra); -u8 UpdateMonIconFrame(struct Sprite * sprite); +u8 UpdateMonIconFrame(struct Sprite *sprite); void LoadMonIconPalette(u16 iconId); void FreeMonIconPalette(u16 iconId); -void SetPartyHPBarSprite(struct Sprite * sprite, u8 animNum); +void SetPartyHPBarSprite(struct Sprite *sprite, u8 animNum); u8 GetMonIconPaletteIndexFromSpecies(u16 species); u16 GetIconSpecies(u16 species, u32 personality); void LoadMonIconPalettesAt(u16 offset); diff --git a/include/pokemon_special_anim_internal.h b/include/pokemon_special_anim_internal.h index e9df6f985..707c40002 100644 --- a/include/pokemon_special_anim_internal.h +++ b/include/pokemon_special_anim_internal.h @@ -25,8 +25,8 @@ struct PokemonSpecialAnimScene u16 monSpriteY1; u16 monSpriteY2; u8 lastCloseness; - struct Sprite * monSprite; - struct Sprite * itemIconSprite; + struct Sprite *monSprite; + struct Sprite *itemIconSprite; u8 textBuf[0x900]; u8 field_0914[BG_SCREEN_SIZE]; u8 field_1114[BG_SCREEN_SIZE]; diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 7422b4522..f111796d8 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -26,6 +26,7 @@ enum WALLPAPER_PLAIN, WALLPAPER_COUNT }; +#define MAX_DEFAULT_WALLPAPER WALLPAPER_SAVANNA u8 *GetBoxNamePtr(u8 boxNumber); struct BoxPokemon *GetBoxedMonPtr(u8 boxId, u8 monPosition); diff --git a/include/pokemon_storage_system_internal.h b/include/pokemon_storage_system_internal.h index 4e1bf0557..2358347fb 100644 --- a/include/pokemon_storage_system_internal.h +++ b/include/pokemon_storage_system_internal.h @@ -7,8 +7,15 @@ #define IN_BOX_COLUMNS 5 #define IN_BOX_ROWS 6 -#define MAX_MON_ICONS 40 +// The maximum number of Pokémon icons that can appear on-screen. +// By default the limit is 40 (though in practice only 37 can be). +#define MAX_MON_ICONS (IN_BOX_COUNT + PARTY_SIZE + 1 >= 40 ? IN_BOX_COUNT + PARTY_SIZE + 1 : 40) + +// The maximum number of item icons that can appear on-screen while +// moving held items. 1 in the cursor, and 2 more while switching +// between 2 Pokémon with held items #define MAX_ITEM_ICONS 3 + #define MAX_MENU_ITEMS 7 enum @@ -167,19 +174,19 @@ struct StorageAction u8 format; }; -struct UnkPSSStruct_2002370 +struct ChooseBoxMenu { - struct Sprite *unk_0000; - struct Sprite *unk_0004[4]; - u32 unk_0014[3]; // unused - struct Sprite *unk_0020[2]; + struct Sprite *menuSprite; + struct Sprite *menuSideSprites[4]; + u32 unused1[3]; + struct Sprite *arrowSprites[2]; u8 buffer[0x200]; // passed but not used u8 strbuf[20]; - bool32 loadPal; - u16 tilesTag; + bool32 loadedPalette; + u16 tileTag; u16 paletteTag; u8 curBox; - u8 unk_0245; // unused + u8 unused3; u8 subpriority; }; @@ -189,19 +196,19 @@ struct StorageMenu int textId; }; -struct UnkStruct_2000028 +struct UnkUtilData { const u8 *unk_00; u8 *unk_04; u16 unk_08; u16 unk_0a; u16 newField; - void (*unk_0c)(struct UnkStruct_2000028 *data); + void (*unk_0c)(struct UnkUtilData *data); }; -struct UnkStruct_2000020 +struct UnkUtil { - struct UnkStruct_2000028 *unk_00; + struct UnkUtilData *unk_00; u8 unk_04; u8 unk_05; }; @@ -231,115 +238,115 @@ struct PokemonStorageSystemData u8 screenChangeType; bool8 isReshowingPSS; u8 taskId; - struct UnkStruct_2000020 unk_0020; - struct UnkStruct_2000028 unk_0028[8]; - u16 field_B0[528 / 2]; - u16 field_2C0; - u16 field_2C2; - u8 field_2C4; - u8 field_2C5; + struct UnkUtil unkUtil; + struct UnkUtilData unkUtilData[8]; + u16 partyMenuTilemapBuffer[0x108]; + u16 partyMenuUnused1; // Never read + u16 partyMenuY; + u8 partyMenuUnused2; // Unused + u8 partyMenuMoveTimer; u8 showPartyMenuState; - bool8 unk_02C7; - u8 unk_02C8; - bool8 unk_02C9; + bool8 closeBoxFlashing; + u8 closeBoxFlashTimer; + bool8 closeBoxFlashState; s16 newCurrBoxId; u16 bg2_X; - s16 field_2CE; - u16 field_2D0; - u8 field_2D2; - u8 field_2D3; - u8 field_2D4; - u16 field_2D6; - s16 field_2D8; - u16 field_2DA; - u16 field_2DC; - u16 field_2DE; - u16 field_2E0; - u8 filler[22]; + s16 scrollSpeed; + u16 scrollTimer; + u8 wallpaperOffset; + u8 scrollUnused1; // Never read + u8 scrollToBoxIdUnused; // Never read + u16 scrollUnused2; // Never read + s16 scrollDirectionUnused; // Never read. + u16 scrollUnused3; // Never read + u16 scrollUnused4; // Never read + u16 scrollUnused5; // Never read + u16 scrollUnused6; // Never read + u8 filler1[22]; u8 field_2F8[512]; u8 field_4F8[512]; - u8 field_6F8; - u8 field_6F9; - u8 field_6FA; - s8 field_6FB; - u16 field_6FC[16]; - u16 field_71C; - u16 field_71E; - struct Sprite *field_720[2]; - struct Sprite *field_728[2]; - struct Sprite *field_730[2]; - u32 field_738; - u8 field_73C[80]; - u16 field_78C; + u8 boxTitleCycleId; + u8 wallpaperLoadState; // Written to, but never read. + u8 wallpaperLoadBoxId; + s8 wallpaperLoadDir; + u16 boxTitlePal[16]; + u16 boxTitlePalOffset; + u16 boxTitleAltPalOffset; + struct Sprite *curBoxTitleSprites[2]; + struct Sprite *nextBoxTitleSprites[2]; + struct Sprite *arrowSprites[2]; + u32 wallpaperPalBits; + u8 filler2[80]; // Unused + u16 unkUnused1; // Never read. s16 wallpaperSetId; s16 wallpaperId; - u16 field_792[360]; + u16 wallpaperTilemap[360]; u8 wallpaperChangeState; - u8 field_A63; - u8 field_A64; - s8 field_A65; + u8 scrollState; + u8 scrollToBoxId; + s8 scrollDirection; // u8 *wallpaperTiles; // used only in Emerald for Walda /* 0a68 */ struct Sprite *movingMonSprite; /* 0a6c */ struct Sprite *partySprites[PARTY_SIZE]; /* 0a84 */ struct Sprite *boxMonsSprites[IN_BOX_COUNT]; - /* 0afc */ struct Sprite **field_B00; - /* 0b00 */ struct Sprite **field_B04; - /* 0b04 */ u16 field_B08[MAX_MON_ICONS]; - /* 0b54 */ u16 field_B58[MAX_MON_ICONS]; + /* 0afc */ struct Sprite **shiftMonSpritePtr; + /* 0b00 */ struct Sprite **releaseMonSpritePtr; + /* 0b04 */ u16 numIconsPerSpecies[MAX_MON_ICONS]; + /* 0b54 */ u16 iconSpeciesList[MAX_MON_ICONS]; /* 0ba4 */ u16 boxSpecies[IN_BOX_COUNT]; /* 0be0 */ u32 boxPersonalities[IN_BOX_COUNT]; - /* 0c58 */ u8 field_C5C; - /* 0c59 */ u8 field_C5D; - /* 0c5a */ u8 field_C5E; - /* 0c5c */ u16 field_C60; - /* 0c5e */ s16 field_C62; - /* 0c60 */ s16 field_C64; - /* 0c62 */ u16 field_C66; - /* 0c64 */ u8 field_C68; - /* 0c65 */ s8 field_C69; - /* 0c66 */ u8 field_C6A; - /* 0c67 */ u8 field_C6B; + /* 0c58 */ u8 incomingBoxId; + /* 0c59 */ u8 shiftTimer; + /* 0c5a */ u8 numPartyToCompact; + /* 0c5c */ u16 iconScrollDistance; + /* 0c5e */ s16 iconScrollPos; + /* 0c60 */ s16 iconScrollSpeed; + /* 0c62 */ u16 iconScrollNumIncoming; + /* 0c64 */ u8 iconScrollCurColumn; + /* 0c65 */ s8 iconScrollDirection; // Unnecessary duplicate of scrollDirection + /* 0c66 */ u8 iconScrollState; + /* 0c67 */ u8 iconScrollToBoxId; // Unused duplicate of scrollToBoxId /* 0c68 */ struct WindowTemplate menuWindow; /* 0c70 */ struct StorageMenu menuItems[MAX_MENU_ITEMS]; /* 0ca8 */ u8 menuItemsCount; /* 0ca9 */ u8 menuWidth; - /* 0caa */ u8 field_CAE; - /* 0cac */ u16 field_CB0; - /* 0cb0 */ struct Sprite *field_CB4; - /* 0cb4 */ struct Sprite *field_CB8; - /* 0cb8 */ s32 field_CBC; - /* 0cbc */ s32 field_CC0; - /* 0cc0 */ u32 field_CC4; - /* 0cc4 */ u32 field_CC8; - /* 0cc8 */ s16 field_CCC; - /* 0cca */ s16 field_CCE; - /* 0ccc */ u16 field_CD0; - /* 0cce */ s8 field_CD2; - /* 0ccf */ s8 field_CD3; - /* 0cd0 */ u8 field_CD4; - /* 0cd1 */ u8 field_CD5; - /* 0cd2 */ u8 field_CD6; - /* 0cd3 */ u8 field_CD7; - /* 0cd4 */ u8 field_CD8[2]; - /* 0cd8 */ const u32 *cursorMonPalette; - /* 0cdc */ u32 cursorMonPersonality; - /* 0ce0 */ u16 cursorMonSpecies; - /* 0ce2 */ u16 cursorMonItem; - /* 0ce4 */ u16 field_CE8; + /* 0caa */ u8 menuUnusedField; // Never read. + /* 0cac */ u16 menuWindowId; + /* 0cb0 */ struct Sprite *cursorSprite; + /* 0cb4 */ struct Sprite *cursorShadowSprite; + /* 0cb8 */ s32 cursorNewX; + /* 0cbc */ s32 cursorNewY; + /* 0cc0 */ u32 cursorSpeedX; + /* 0cc4 */ u32 cursorSpeedY; + /* 0cc8 */ s16 cursorTargetX; + /* 0cca */ s16 cursorTargetY; + /* 0ccc */ u16 cursorMoveSteps; + /* 0cce */ s8 cursorVerticalWrap; + /* 0ccf */ s8 cursorHorizontalWrap; + /* 0cd0 */ u8 newCursorArea; + /* 0cd1 */ u8 newCursorPosition; + /* 0cd2 */ u8 cursorPrevHorizPos; + /* 0cd3 */ u8 cursorFlipTimer; + /* 0cd4 */ u8 cursorPalNums[2]; + /* 0cd8 */ const u32 *displayMonPalette; + /* 0cdc */ u32 displayMonPersonality; + /* 0ce0 */ u16 displayMonSpecies; + /* 0ce2 */ u16 displayMonItemId; + /* 0ce4 */ u16 displayUnusedVar; /* 0ce6 */ bool8 setMosaic; - /* 0ce7 */ u8 cursorMonMarkings; - /* 0ce8 */ u8 cursorMonLevel; - /* 0ce9 */ bool8 cursorMonIsEgg; - /* 0cea */ u8 cursorMonNick[POKEMON_NAME_LENGTH + 1]; - /* 0cf5 */ u8 cursorMonTexts[4][36]; + /* 0ce7 */ u8 displayMonMarkings; + /* 0ce8 */ u8 displayMonLevel; + /* 0ce9 */ bool8 displayMonIsEgg; + /* 0cea */ u8 displayMonName[POKEMON_NAME_LENGTH + 1]; + /* 0cf5 */ u8 displayMonTexts[4][36]; /* 0d88 */ bool8 (*monPlaceChangeFunc)(void); /* 0d8c */ u8 monPlaceChangeState; - /* 0d8d */ u8 field_D91; - /* 0d90 */ struct Sprite *monMarkingSprite; - /* 0d94 */ struct Sprite *field_D98[2]; - /* 0d9c */ u16 *monMarkingSpriteTileStart; - /* 0da0 */ struct PokemonMarkMenu field_DA4; - /* 1e58 */ struct UnkPSSStruct_2002370 field_1E5C; + /* 0d8d */ u8 shiftBoxId; + /* 0d90 */ struct Sprite *markingComboSprite; + /* 0d94 */ struct Sprite *waveformSprites[2]; + /* 0d9c */ u16 *markingComboTilesPtr; + /* 0da0 */ struct MonMarkingsMenu markMenu; + /* 1e58 */ struct ChooseBoxMenu field_1E5C; /* 20a0 */ struct Pokemon movingMon; /* 2104 */ struct Pokemon field_2108; /* 2168 */ u8 field_216C; @@ -392,12 +399,12 @@ void SetCurrentBox(u8 boxId); void BoxMonAtToMon(u8 boxId, u8 boxPosition, struct Pokemon * dst); void SetBoxMonAt(u8 boxId, u8 boxPosition, struct BoxPokemon * src); -void Cb2_ExitPSS(void); +void CB2_ExitPokeStorage(void); void FreeBoxSelectionPopupSpriteGfx(void); void sub_808C940(u8 curBox); void sub_808C950(void); u8 HandleBoxChooseSelectionInput(void); -void LoadBoxSelectionPopupSpriteGfx(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3, bool32 loadPal); +void LoadChooseBoxMenuGfx(struct ChooseBoxMenu *a0, u16 tileTag, u16 palTag, u8 a3, bool32 loadPal); void SetCurrentBoxMonData(u8 boxPosition, s32 request, const void *value); u32 GetCurrentBoxMonData(u8 boxPosition, s32 request); u32 GetAndCopyBoxMonDataAt(u8 boxId, u8 boxPosition, s32 request, void *dst); @@ -438,7 +445,7 @@ const u8 *GetMovingItemName(void); void sub_80966F4(void); bool8 sub_8096728(void); bool8 sub_80967C0(void); -void sub_8096BE4(struct UnkStruct_2000020 *arg0, struct UnkStruct_2000028 *arg1, u32 arg2); +void sub_8096BE4(struct UnkUtil *arg0, struct UnkUtilData *arg1, u32 arg2); void sub_8096BF8(void); void AddMenu(void); bool8 CanMovePartyMon(void); @@ -475,7 +482,7 @@ bool8 IsCursorOnBox(void); bool8 IsCursorInBox(void); void sub_808FFAC(void); -struct Sprite * CreateMonIconSprite(u16 species, u32 pid, s16 x, s16 y, u8 priority, u8 subpriority); +struct Sprite *CreateMonIconSprite(u16 species, u32 pid, s16 x, s16 y, u8 priority, u8 subpriority); void CreatePartyMonsSprites(bool8 species); void sub_80909F4(void); bool8 sub_8090A60(void); diff --git a/include/quest_log.h b/include/quest_log.h index 295f942f2..21801e45a 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -85,7 +85,7 @@ void sub_81113E4(void); void sub_8111438(void); void StartRecordingQuestLogEntry(u16 eventId); bool8 WillCommandOfSizeFitInSav1Record(u16 *cursor, size_t size); -bool8 sub_8110944(const void * a0, size_t cmdSize); +bool8 sub_8110944(const void *a0, size_t cmdSize); void sub_8113BD8(void); void ResetUnk203B044(void); diff --git a/include/text_window_graphics.h b/include/text_window_graphics.h index e2b351de9..c57143661 100644 --- a/include/text_window_graphics.h +++ b/include/text_window_graphics.h @@ -3,8 +3,8 @@ struct TextWindowGraphics { - const void * tiles; - const void * palette; + const void *tiles; + const void *palette; }; extern const u16 gUnknown_8470B0C[]; @@ -14,6 +14,6 @@ extern const u16 gUnknown_8471DEC[][16]; extern const struct TextWindowGraphics gUserFrames[]; -const struct TextWindowGraphics * GetUserFrameGraphicsInfo(u8 idx); +const struct TextWindowGraphics *GetWindowFrameTilesPal(u8 idx); #endif //GUARD_TEXT_WINDOW_GRAPHICS_H diff --git a/src/AgbRfu_LinkManager.c b/src/AgbRfu_LinkManager.c index 35ac45d5f..558b19514 100644 --- a/src/AgbRfu_LinkManager.c +++ b/src/AgbRfu_LinkManager.c @@ -918,7 +918,7 @@ static void rfu_LMAN_REQ_callback(u16 reqCommandId, u16 reqResult) { lman.reserveDisconnectSlot_flag = 0; lman.acceptCount = 0; - lman.acceptSlot_flag = 0;; + lman.acceptSlot_flag = 0; lman.parent_child = MODE_NEUTRAL; rfu_LMAN_managerChangeAgbClockMaster(); if (reqCommandId == ID_STOP_MODE_REQ) diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c index 996f5cd38..2ee4697ac 100644 --- a/src/battle_anim_mon_movement.c +++ b/src/battle_anim_mon_movement.c @@ -12,15 +12,15 @@ static void AnimTask_ShakeMon2Step(u8 taskId); static void AnimTask_ShakeMonInPlaceStep(u8 taskId); static void AnimTask_ShakeAndSinkMonStep(u8 taskId); static void AnimTask_TranslateMonEllipticalStep(u8 taskId); -static void DoHorizontalLunge(struct Sprite * sprite); -static void ReverseHorizontalLungeDirection(struct Sprite * sprite); -static void DoVerticalDip(struct Sprite * sprite); -static void ReverseVerticalDipDirection(struct Sprite * sprite); -static void SlideMonToOriginalPos(struct Sprite * sprite); -static void SlideMonToOriginalPosStep(struct Sprite * sprite); -static void SlideMonToOffset(struct Sprite * sprite); -static void sub_8099394(struct Sprite * sprite); -static void sub_809946C(struct Sprite * sprite); +static void DoHorizontalLunge(struct Sprite *sprite); +static void ReverseHorizontalLungeDirection(struct Sprite *sprite); +static void DoVerticalDip(struct Sprite *sprite); +static void ReverseVerticalDipDirection(struct Sprite *sprite); +static void SlideMonToOriginalPos(struct Sprite *sprite); +static void SlideMonToOriginalPosStep(struct Sprite *sprite); +static void SlideMonToOffset(struct Sprite *sprite); +static void sub_8099394(struct Sprite *sprite); +static void sub_809946C(struct Sprite *sprite); static void AnimTask_WindUpLungePart1(u8 taskId); static void AnimTask_WindUpLungePart2(u8 taskId); static void sub_80996B8(u8 taskId); @@ -383,7 +383,7 @@ void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId) // horizontally, and then moves back in the opposite direction. // arg 0: duration of single lunge direction // arg 1: x pixel delta that is applied each frame -static void DoHorizontalLunge(struct Sprite * sprite) +static void DoHorizontalLunge(struct Sprite *sprite) { sprite->invisible = TRUE; if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) @@ -398,7 +398,7 @@ static void DoHorizontalLunge(struct Sprite * sprite) sprite->callback = TranslateMonSpriteLinear; } -static void ReverseHorizontalLungeDirection(struct Sprite * sprite) +static void ReverseHorizontalLungeDirection(struct Sprite *sprite) { sprite->data[0] = sprite->data[4]; sprite->data[1] = -sprite->data[1]; @@ -411,7 +411,7 @@ static void ReverseHorizontalLungeDirection(struct Sprite * sprite) // arg 0: duration of single dip direction // arg 1: y pixel delta that is applied each frame // arg 2: battler -static void DoVerticalDip(struct Sprite * sprite) +static void DoVerticalDip(struct Sprite *sprite) { u8 spriteId; sprite->invisible = TRUE; @@ -425,7 +425,7 @@ static void DoVerticalDip(struct Sprite * sprite) sprite->callback = TranslateMonSpriteLinear; } -static void ReverseVerticalDipDirection(struct Sprite * sprite) +static void ReverseVerticalDipDirection(struct Sprite *sprite) { sprite->data[0] = sprite->data[4]; sprite->data[2] = -sprite->data[2]; @@ -438,7 +438,7 @@ static void ReverseVerticalDipDirection(struct Sprite * sprite) // arg 0: 1 = target or 0 = attacker // arg 1: direction (0 = horizontal and vertical, 1 = horizontal only, 2 = vertical only) // arg 2: duration -static void SlideMonToOriginalPos(struct Sprite * sprite) +static void SlideMonToOriginalPos(struct Sprite *sprite) { u8 spriteId; if (gBattleAnimArgs[0] == 0) @@ -465,7 +465,7 @@ static void SlideMonToOriginalPos(struct Sprite * sprite) sprite->callback = SlideMonToOriginalPosStep; } -static void SlideMonToOriginalPosStep(struct Sprite * sprite) +static void SlideMonToOriginalPosStep(struct Sprite *sprite) { u8 data7 = sprite->data[7]; struct Sprite *otherSprite = &gSprites[sprite->data[7] >> 8]; @@ -495,7 +495,7 @@ static void SlideMonToOriginalPosStep(struct Sprite * sprite) // arg 2: target y pixel offset // arg 3: mirror vertical translation for opposite battle side // arg 4: duration -static void SlideMonToOffset(struct Sprite * sprite) +static void SlideMonToOffset(struct Sprite *sprite) { u8 battlerId; u8 spriteId; @@ -524,7 +524,7 @@ static void SlideMonToOffset(struct Sprite * sprite) sprite->callback = TranslateMonSpriteLinearFixedPoint; } -static void sub_8099394(struct Sprite * sprite) +static void sub_8099394(struct Sprite *sprite) { u8 battlerId; u8 spriteId; @@ -557,7 +557,7 @@ static void sub_8099394(struct Sprite * sprite) sprite->callback = TranslateMonSpriteLinearFixedPoint; } -static void sub_809946C(struct Sprite * sprite) +static void sub_809946C(struct Sprite *sprite) { gSprites[sprite->data[5]].x2 = 0; gSprites[sprite->data[5]].y2 = 0; diff --git a/src/battle_interface.c b/src/battle_interface.c index 43358e6a2..2f7625f21 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -151,19 +151,19 @@ enum HEALTHBOX_GFX_117, //unknown_D1300C }; -static void SpriteCB_HealthBoxOther(struct Sprite * sprite); -static void SpriteCB_HealthBar(struct Sprite * sprite); +static void SpriteCB_HealthBoxOther(struct Sprite *sprite); +static void SpriteCB_HealthBar(struct Sprite *sprite); static const u8 *GetHealthboxElementGfxPtr(u8 which); static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8 maxOrCurrent); static void sub_8049388(u8 taskId); static void sub_80493E4(u8 taskId); -static void sub_8049568(struct Sprite * sprite); -static void sub_8049630(struct Sprite * sprite); +static void sub_8049568(struct Sprite *sprite); +static void sub_8049630(struct Sprite *sprite); static void sub_804948C(u8 taskId); -static void SpriteCB_StatusSummaryBallsOnSwitchout(struct Sprite * sprite); +static void SpriteCB_StatusSummaryBallsOnSwitchout(struct Sprite *sprite); static void UpdateStatusIconInHealthbox(u8 spriteId); -static void SpriteCB_StatusSummaryBar(struct Sprite * sprite); -static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite * sprite); +static void SpriteCB_StatusSummaryBar(struct Sprite *sprite); +static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite); static u8 GetStatusIconForBattlerId(u8 statusElementId, u8 battlerId); static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar); static u8 GetScaledExpFraction(s32 oldValue, s32 receivedValue, s32 maxValue, u8 scale); diff --git a/src/battle_records.c b/src/battle_records.c index 33fbf89f1..991767140 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -205,19 +205,19 @@ static void ClearWindowCommitAndRemove(u8 windowId) static void ResetGpu(void) { { - void * dest = (void *)VRAM; + void *dest = (void *)VRAM; u32 size = VRAM_SIZE; DmaClearLarge16(3, dest, size, 0x1000); } { - void * dest = (void *)OAM; + void *dest = (void *)OAM; u32 size = OAM_SIZE; DmaClear32(3, dest, size); } { - void * dest = (void *)PLTT; + void *dest = (void *)PLTT; u32 size = PLTT_SIZE; DmaClear16(3, dest, size); } diff --git a/src/berry_crush.c b/src/berry_crush.c index 2b4a5ed55..259b36a6f 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -387,10 +387,10 @@ static void DrawPlayerNameWindows(struct BerryCrushGame * game); static void CopyPlayerNameWindowGfxToBg(struct BerryCrushGame * game); static void CreateGameSprites(struct BerryCrushGame * game); static void DestroyGameSprites(struct BerryCrushGame * game); -static void SpriteCB_Impact(struct Sprite * sprite); -static void SpriteCB_Sparkle_End(struct Sprite * sprite); -static void SpriteCB_Sparkle(struct Sprite * sprite); -static void SpriteCB_Sparkle_Init(struct Sprite * sprite); +static void SpriteCB_Impact(struct Sprite *sprite); +static void SpriteCB_Sparkle_End(struct Sprite *sprite); +static void SpriteCB_Sparkle(struct Sprite *sprite); +static void SpriteCB_Sparkle_Init(struct Sprite *sprite); static struct BerryCrushGame *GetBerryCrushGame(void); static u32 QuitBerryCrush(MainCallback callback); static void ChooseBerry(void); @@ -410,7 +410,7 @@ static bool32 OpenResultsWindow(struct BerryCrushGame *game, struct BerryCrushGa static void CloseResultsWindow(struct BerryCrushGame *game); static void ResetCrusherPos(struct BerryCrushGame *game); static void HideTimer(struct BerryCrushGame_Gfx *gfx); -static void SpriteCB_DropBerryIntoCrusher(struct Sprite * sprite); +static void SpriteCB_DropBerryIntoCrusher(struct Sprite *sprite); static const u8 sBitTable[] = { 1 << 0, @@ -2728,7 +2728,7 @@ static void CreateBerrySprites(struct BerryCrushGame * game, struct BerryCrushGa } } -static void SpriteCB_DropBerryIntoCrusher(struct Sprite * sprite) +static void SpriteCB_DropBerryIntoCrusher(struct Sprite *sprite) { s16 *data = sprite->data; @@ -3387,7 +3387,7 @@ static void DestroyGameSprites(struct BerryCrushGame * game) DestroySprite(game->gfx.coreSprite); } -static void SpriteCB_Impact(struct Sprite * sprite) +static void SpriteCB_Impact(struct Sprite *sprite) { if (sprite->animEnded) { @@ -3396,7 +3396,7 @@ static void SpriteCB_Impact(struct Sprite * sprite) } } -static void SpriteCB_Sparkle_End(struct Sprite * sprite) +static void SpriteCB_Sparkle_End(struct Sprite *sprite) { u8 r1 = 0; SpriteCallback r5 = SpriteCallbackDummy; @@ -3425,7 +3425,7 @@ static void SpriteCB_Sparkle_End(struct Sprite * sprite) #define MASK_TARGET_Y 0x7FFF #define F_MOVE_HORIZ 0x8000 -static void SpriteCB_Sparkle(struct Sprite * sprite) +static void SpriteCB_Sparkle(struct Sprite *sprite) { s16 *data = sprite->data; @@ -3447,7 +3447,7 @@ static void SpriteCB_Sparkle(struct Sprite * sprite) sprite->callback = SpriteCB_Sparkle_End; } -static void SpriteCB_Sparkle_Init(struct Sprite * sprite) +static void SpriteCB_Sparkle_Init(struct Sprite *sprite) { s16 *data = sprite->data; s16 xMult, var; diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c index 2e0bf8256..5eb053ec5 100644 --- a/src/berry_fix_program.c +++ b/src/berry_fix_program.c @@ -20,7 +20,7 @@ typedef struct { // Static RAM declarations -const void * gUnknown_3005EF0; +const void *gUnknown_3005EF0; int gUnknown_3005EF4; size_t gUnknown_3005EF8; struct MultiBootParam gUnknown_3005F00; diff --git a/src/box_party_pokemon_dropdown.c b/src/box_party_pokemon_dropdown.c index b194777f3..09767f3d9 100644 --- a/src/box_party_pokemon_dropdown.c +++ b/src/box_party_pokemon_dropdown.c @@ -17,8 +17,8 @@ struct BPPD_Struct { struct BPPD_MapRect map1Rect; struct BPPD_MapRect map2Rect; - const void * src1; - const void * src2; + const void *src1; + const void *src2; u16 src1Height; u16 src1Width; u16 src2Width; @@ -80,7 +80,7 @@ void CopyAllBoxPartyPokemonDropdownsToVram(void) } } -void SetBoxPartyPokemonDropdownMap2(u8 idx, u8 bgId, const void * src, u16 width, u16 height) +void SetBoxPartyPokemonDropdownMap2(u8 idx, u8 bgId, const void *src, u16 width, u16 height) { u16 screenSize; u16 bgType; @@ -112,7 +112,7 @@ void SetBoxPartyPokemonDropdownMap2(u8 idx, u8 bgId, const void * src, u16 width } } -void SetBoxPartyPokemonDropdownMap1Tiles(u8 idx, const void * src) +void SetBoxPartyPokemonDropdownMap1Tiles(u8 idx, const void *src) { if (idx < sBoxPartyPokemonDropdownCount) { @@ -191,7 +191,7 @@ static void PushMap1(u8 idx) { int i; int run = sBoxPartyPokemonDropdownPtr[idx].mapSize * sBoxPartyPokemonDropdownPtr[idx].src1Height; - const void * addr = sBoxPartyPokemonDropdownPtr[idx].src1 + run * sBoxPartyPokemonDropdownPtr[idx].map1Rect.destY2 + sBoxPartyPokemonDropdownPtr[idx].map1Rect.destX2 * sBoxPartyPokemonDropdownPtr[idx].mapSize; + const void *addr = sBoxPartyPokemonDropdownPtr[idx].src1 + run * sBoxPartyPokemonDropdownPtr[idx].map1Rect.destY2 + sBoxPartyPokemonDropdownPtr[idx].map1Rect.destX2 * sBoxPartyPokemonDropdownPtr[idx].mapSize; for (i = 0; i < sBoxPartyPokemonDropdownPtr[idx].map1Rect.height; i++) { CopyToBgTilemapBufferRect(sBoxPartyPokemonDropdownPtr[idx].bgId, addr, sBoxPartyPokemonDropdownPtr[idx].map1Rect.destX2, sBoxPartyPokemonDropdownPtr[idx].map1Rect.destY2 + i, sBoxPartyPokemonDropdownPtr[idx].map1Rect.width, 1); @@ -203,7 +203,7 @@ static void PushMap2(u8 idx) { int i; int run = sBoxPartyPokemonDropdownPtr[idx].mapSize * sBoxPartyPokemonDropdownPtr[idx].src2Width; - const void * addr = sBoxPartyPokemonDropdownPtr[idx].src2 + run * sBoxPartyPokemonDropdownPtr[idx].map2Rect.destY + sBoxPartyPokemonDropdownPtr[idx].map2Rect.destX * sBoxPartyPokemonDropdownPtr[idx].mapSize; + const void *addr = sBoxPartyPokemonDropdownPtr[idx].src2 + run * sBoxPartyPokemonDropdownPtr[idx].map2Rect.destY + sBoxPartyPokemonDropdownPtr[idx].map2Rect.destX * sBoxPartyPokemonDropdownPtr[idx].mapSize; for (i = 0; i < sBoxPartyPokemonDropdownPtr[idx].map2Rect.height; i++) { CopyToBgTilemapBufferRect(sBoxPartyPokemonDropdownPtr[idx].bgId, addr, sBoxPartyPokemonDropdownPtr[idx].map2Rect.destX2, sBoxPartyPokemonDropdownPtr[idx].map2Rect.destY2 + i, sBoxPartyPokemonDropdownPtr[idx].map2Rect.width, 1); diff --git a/src/cereader_tool.c b/src/cereader_tool.c index cb8c48f7a..d00caffd8 100644 --- a/src/cereader_tool.c +++ b/src/cereader_tool.c @@ -64,7 +64,7 @@ bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerTowerSet * ttdata) return result; } -static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerTowerSet * ttdata, void * buffer) +static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerTowerSet * ttdata, void *buffer) { if (TryCopySpecialSaveSection(SECTOR_TTOWER(0), buffer) != 1) return FALSE; @@ -81,7 +81,7 @@ static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerTowerSet * tt bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerTowerSet * ttdata) { - void * buffer = AllocZeroed(0x1000); + void *buffer = AllocZeroed(0x1000); bool32 success = CEReaderTool_LoadTrainerTower_r(ttdata, buffer); Free(buffer); return success; diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c index f032945d6..2fcc0a682 100644 --- a/src/dodrio_berry_picking_2.c +++ b/src/dodrio_berry_picking_2.c @@ -29,13 +29,13 @@ static EWRAM_DATA u16 *gUnknown_203F42C[4] = {NULL}; static EWRAM_DATA struct DodrioStruct_2022CF4 * gUnknown_203F43C = NULL; static EWRAM_DATA struct DodrioSubstruct_0160 * gUnknown_203F440 = NULL; -static void sub_8153B9C(struct Sprite * sprite); -static u32 sub_8153C30(struct Sprite * sprite); -static u32 sub_8153CA0(struct Sprite * sprite); +static void sub_8153B9C(struct Sprite *sprite); +static u32 sub_8153C30(struct Sprite *sprite); +static u32 sub_8153CA0(struct Sprite *sprite); static void sub_8153D48(bool8 a0, u8 a1); -static void nullsub_97(struct Sprite * sprite); +static void nullsub_97(struct Sprite *sprite); static void sub_8154324(bool8 a0); -static void sub_81543E8(struct Sprite * sprite); +static void sub_81543E8(struct Sprite *sprite); static s16 sub_8154608(u8 a0, u8 a1); static void sub_8154A08(u8 taskId); static void sub_8154A2C(void); @@ -304,7 +304,7 @@ void sub_8153AFC(struct DodrioSubstruct_318C * arg0, u8 arg1, u8 id, u8 arg3) sub_8153D48(TRUE, id); } -static void sub_8153B9C(struct Sprite * sprite) +static void sub_8153B9C(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -321,7 +321,7 @@ static void sub_8153B9C(struct Sprite * sprite) void sub_8153BC0(u8 unused) { - struct Sprite * sprite = &gSprites[*gUnknown_203F3E4[GetMultiplayerId()]]; + struct Sprite *sprite = &gSprites[*gUnknown_203F3E4[GetMultiplayerId()]]; sprite->data[0] = 1; sprite->data[1] = 0; sprite->data[2] = 0; @@ -331,7 +331,7 @@ void sub_8153BC0(u8 unused) void sub_8153BF8(u8 unused) { - struct Sprite * sprite = &gSprites[*gUnknown_203F3E4[GetMultiplayerId()]]; + struct Sprite *sprite = &gSprites[*gUnknown_203F3E4[GetMultiplayerId()]]; sprite->data[0] = 2; sprite->data[1] = 0; sprite->data[2] = 0; @@ -339,7 +339,7 @@ void sub_8153BF8(u8 unused) sprite->data[4] = 0; } -static u32 sub_8153C30(struct Sprite * sprite) +static u32 sub_8153C30(struct Sprite *sprite) { s8 var; u8 mod = (++sprite->data[1] / 2) % 4; @@ -368,7 +368,7 @@ static u32 sub_8153C30(struct Sprite * sprite) return 0; } -static u32 sub_8153CA0(struct Sprite * sprite) +static u32 sub_8153CA0(struct Sprite *sprite) { u8 mod = (++sprite->data[1] / 13) % 4; @@ -388,7 +388,7 @@ void sub_8153D08(u8 count) u8 i; for (i = 0; i < count; i++) { - struct Sprite * sprite = &gSprites[*gUnknown_203F3E4[i]]; + struct Sprite *sprite = &gSprites[*gUnknown_203F3E4[i]]; if (sprite != NULL) DestroySpriteAndFreeResources(sprite); // Memory should be freed here but is not. @@ -412,7 +412,7 @@ void sub_8153DA8(u8 id, u8 frameNum) StartSpriteAnim(&gSprites[*gUnknown_203F3E4[id]], frameNum); } -static void nullsub_97(struct Sprite * sprite) +static void nullsub_97(struct Sprite *sprite) { } @@ -422,7 +422,7 @@ void sub_8153DD8(void) u8 i; for (i = 0; i < 10; i++) { - struct Sprite * sprite = &gSprites[gUnknown_203F43C->unk2A[i]]; + struct Sprite *sprite = &gSprites[gUnknown_203F43C->unk2A[i]]; sprite->x = (i * 16) + 48; sprite->y = -8 - (i * 8); gUnknown_203F43C->unkC[i] = 0; @@ -466,7 +466,7 @@ void sub_8153ED8(void) u8 i; for (i = 0; i < 10; i++) { - struct Sprite * sprite = &gSprites[gUnknown_203F43C->unk2A[i]]; + struct Sprite *sprite = &gSprites[gUnknown_203F43C->unk2A[i]]; if (sprite != NULL) DestroySpriteAndFreeResources(sprite); } @@ -479,7 +479,7 @@ bool32 sub_8153F1C(void) bool32 r3 = FALSE; for (i = 0; i < 10; i++) { - struct Sprite * sprite = &gSprites[gUnknown_203F43C->unk2A[i]]; + struct Sprite *sprite = &gSprites[gUnknown_203F43C->unk2A[i]]; gUnknown_203F43C->unk16[i] = 2; if (gUnknown_203F43C->unkC[i] != 0 && sprite->y == 8) continue; @@ -621,7 +621,7 @@ void sub_815417C(void) void sub_8154274(void) { - struct Sprite * sprite; + struct Sprite *sprite; u8 i; for (i = 0; i < 11; i++) @@ -677,7 +677,7 @@ static void sub_81543C4(u8 spriteId) #define sKeepPosX data[10] #endif // BUGFIX -static void sub_81543E8(struct Sprite * sprite) +static void sub_81543E8(struct Sprite *sprite) { u8 i; static const u8 array[] = {30, 20}; @@ -735,7 +735,7 @@ void sub_81544F0(void) u8 i; for (i = 0; i < 2; i++) { - struct Sprite * sprite = &gSprites[*gUnknown_203F3F8[i]]; + struct Sprite *sprite = &gSprites[*gUnknown_203F3F8[i]]; sprite->sKeepPosX = TRUE; sprite->x = gUnknown_8478E0E[i][0]; sprite->y = gUnknown_8478E0E[i][1]; @@ -747,7 +747,7 @@ void sub_8154540(void) u8 i; for (i = 0; i < 2; i++) { - struct Sprite * sprite = &gSprites[*gUnknown_203F3F8[i]]; + struct Sprite *sprite = &gSprites[*gUnknown_203F3F8[i]]; sprite->sKeepPosX = FALSE; } } @@ -757,7 +757,7 @@ void sub_8154578(void) u8 i; for (i = 0; i < 2; i++) { - struct Sprite * sprite = &gSprites[*gUnknown_203F3F8[i]]; + struct Sprite *sprite = &gSprites[*gUnknown_203F3F8[i]]; if (sprite) DestroySprite(sprite); FREE_AND_SET_NULL(gUnknown_203F3F8[i]); @@ -833,8 +833,8 @@ void sub_81546C0(void) static void sub_81546EC(u8 frameId) { - LoadBgTiles(0, GetUserFrameGraphicsInfo(frameId)->tiles, 0x120, 1); - LoadPalette(GetUserFrameGraphicsInfo(frameId)->palette, 0xA0, 0x20); + LoadBgTiles(0, GetWindowFrameTilesPal(frameId)->tiles, 0x120, 1); + LoadPalette(GetWindowFrameTilesPal(frameId)->palette, 0xA0, 0x20); } static void sub_8154720(void) diff --git a/src/easy_chat_3.c b/src/easy_chat_3.c index e02a93905..393020674 100644 --- a/src/easy_chat_3.c +++ b/src/easy_chat_3.c @@ -23,16 +23,16 @@ struct ECWork u16 bg2ScrollRow; int tgtBgY; int deltaBgY; - struct Sprite * selectDestFieldCursorSprite; - struct Sprite * rectCursorSpriteRight; - struct Sprite * rectCursorSpriteLeft; - struct Sprite * selectWordCursorSprite; - struct Sprite * selectGroupHelpSprite; - struct Sprite * modeIconsSprite; - struct Sprite * upTriangleCursorSprite; - struct Sprite * downTriangleCursorSprite; - struct Sprite * startPgUpButtonSprite; - struct Sprite * selectPgDnButtonSprite; + struct Sprite *selectDestFieldCursorSprite; + struct Sprite *rectCursorSpriteRight; + struct Sprite *rectCursorSpriteLeft; + struct Sprite *selectWordCursorSprite; + struct Sprite *selectGroupHelpSprite; + struct Sprite *modeIconsSprite; + struct Sprite *upTriangleCursorSprite; + struct Sprite *downTriangleCursorSprite; + struct Sprite *startPgUpButtonSprite; + struct Sprite *selectPgDnButtonSprite; u16 bg1TilemapBuffer[BG_SCREEN_SIZE / 2]; u16 bg3TilemapBuffer[BG_SCREEN_SIZE / 2]; }; @@ -104,7 +104,7 @@ static int GetBg2ScrollRow(void); static void SetRegWin0Coords(u8 left, u8 top, u8 right, u8 bottom); static void LoadSpriteGfx(void); static void CreateSelectDestFieldCursorSprite(void); -static void SpriteCB_BounceCursor(struct Sprite * sprite); +static void SpriteCB_BounceCursor(struct Sprite *sprite); static void SetSelectDestFieldCursorSpritePosAndResetAnim(u8 x, u8 y); static void FreezeSelectDestFieldCursorSprite(void); static void UnfreezeSelectDestFieldCursorSprite(void); @@ -114,7 +114,7 @@ static void EC_MoveCursor(void); static void MoveCursor_Group(s8 a0, s8 a1); static void MoveCursor_Alpha(s8 a0, s8 a1); static void CreateSelectWordCursorSprite(void); -static void SpriteCB_SelectWordCursorSprite(struct Sprite * sprite); +static void SpriteCB_SelectWordCursorSprite(struct Sprite *sprite); static void SetSelectWordCursorSpritePos(void); static void SetSelectWordCursorSpritePosExplicit(u8 x, u8 y); static void DestroySelectWordCursorSprite(void); @@ -1933,7 +1933,7 @@ static void CreateSelectDestFieldCursorSprite(void) gSprites[spriteId].data[1] = 1; } -static void SpriteCB_BounceCursor(struct Sprite * sprite) +static void SpriteCB_BounceCursor(struct Sprite *sprite) { if (sprite->data[1]) { @@ -2076,7 +2076,7 @@ static void CreateSelectWordCursorSprite(void) SetSelectWordCursorSpritePos(); } -static void SpriteCB_SelectWordCursorSprite(struct Sprite * sprite) +static void SpriteCB_SelectWordCursorSprite(struct Sprite *sprite) { if (++sprite->data[0] > 2) { diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c index df1b1c279..cee90fc09 100644 --- a/src/ereader_helpers.c +++ b/src/ereader_helpers.c @@ -34,7 +34,7 @@ static u16 sSavedTm3Cnt; static u16 sSavedSioCnt; static u16 sSavedRCnt; -int EReader_Send(size_t size, const void * src) +int EReader_Send(size_t size, const void *src) { int result; EReaderHelper_SaveRegsState(); @@ -73,7 +73,7 @@ int EReader_Send(size_t size, const void * src) return result; } -int EReader_Recv(void * dest) +int EReader_Recv(void *dest) { int result; EReaderHelper_SaveRegsState(); @@ -147,7 +147,7 @@ static void OpenSerial32(void) sCounter2 = 0; } -u16 EReaderHandleTransfer(u8 mode, size_t size, const void * data, void * recvBuffer) +u16 EReaderHandleTransfer(u8 mode, size_t size, const void *data, void *recvBuffer) { switch (sSendRecvMgr.state) { @@ -240,7 +240,7 @@ static bool16 DetermineSendRecvState(u8 mode) return resp; } -static void SetUpTransferManager(size_t size, const void * data, void * recvBuffer) +static void SetUpTransferManager(size_t size, const void *data, void *recvBuffer) { if (sSendRecvMgr.master_slave) { diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 2a91bb38b..f3ba2133b 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -94,7 +94,7 @@ static u8 MovementType_VsSeeker4D_Callback(struct ObjectEvent *, struct Sprite * static u8 MovementType_VsSeeker4E_Callback(struct ObjectEvent *, struct Sprite *); static u8 MovementType_VsSeeker4F_Callback(struct ObjectEvent *, struct Sprite *); static void sub_8064544(struct ObjectEvent *, struct Sprite *); -static void DoObjectUnionRoomWarpYDisplacement(struct Sprite * sprite); +static void DoObjectUnionRoomWarpYDisplacement(struct Sprite *sprite); static void MovementType_None(struct Sprite *); static void MovementType_LookAround(struct Sprite *); static void MovementType_WanderAround(struct Sprite *); @@ -8840,37 +8840,37 @@ void UnfreezeObjectEvents(void) #define tSpeed data[4] #define tStepNo data[5] -static void little_step(struct Sprite * sprite, u8 direction) +static void little_step(struct Sprite *sprite, u8 direction) { sprite->x += sDirectionToVectors[direction].x; sprite->y += sDirectionToVectors[direction].y; } -static void double_little_steps(struct Sprite * sprite, u8 direction) +static void double_little_steps(struct Sprite *sprite, u8 direction) { sprite->x += 2 * (u16)sDirectionToVectors[direction].x; sprite->y += 2 * (u16)sDirectionToVectors[direction].y; } -static void triple_little_steps(struct Sprite * sprite, u8 direction) +static void triple_little_steps(struct Sprite *sprite, u8 direction) { sprite->x += 2 * (u16)sDirectionToVectors[direction].x + (u16)sDirectionToVectors[direction].x; sprite->y += 2 * (u16)sDirectionToVectors[direction].y + (u16)sDirectionToVectors[direction].y; } -static void quad_little_steps(struct Sprite * sprite, u8 direction) +static void quad_little_steps(struct Sprite *sprite, u8 direction) { sprite->x += 4 * (u16)sDirectionToVectors[direction].x; sprite->y += 4 * (u16)sDirectionToVectors[direction].y; } -static void oct_little_steps(struct Sprite * sprite, u8 direction) +static void oct_little_steps(struct Sprite *sprite, u8 direction) { sprite->x += 8 * (u16)sDirectionToVectors[direction].x; sprite->y += 8 * (u16)sDirectionToVectors[direction].y; } -void SetSpriteDataForNormalStep(struct Sprite * sprite, u8 direction, u8 speed) +void SetSpriteDataForNormalStep(struct Sprite *sprite, u8 direction, u8 speed) { sprite->tDirection = direction; sprite->tSpeed = speed; @@ -9322,7 +9322,7 @@ void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo) } } -static void DoObjectUnionRoomWarpYDisplacementUpwards(struct Sprite * sprite) +static void DoObjectUnionRoomWarpYDisplacementUpwards(struct Sprite *sprite) { switch (sprite->tUnionRoomWarpAnimState) { @@ -9342,7 +9342,7 @@ static void DoObjectUnionRoomWarpYDisplacementUpwards(struct Sprite * sprite) } } -static void DoObjectUnionRoomWarpYDisplacementDownwards(struct Sprite * sprite) +static void DoObjectUnionRoomWarpYDisplacementDownwards(struct Sprite *sprite) { switch (sprite->tUnionRoomWarpAnimState) { @@ -9360,7 +9360,7 @@ static void DoObjectUnionRoomWarpYDisplacementDownwards(struct Sprite * sprite) } } -static void DoObjectUnionRoomWarpYDisplacement(struct Sprite * sprite) +static void DoObjectUnionRoomWarpYDisplacement(struct Sprite *sprite) { switch (sprite->tUnionRoomWarpAnimNo) { diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c index c1d6befac..e0ec9197e 100644 --- a/src/evolution_graphics.c +++ b/src/evolution_graphics.c @@ -8,7 +8,7 @@ #include "evolution_graphics.h" #include "constants/songs.h" -static void SpriteCallbackDummy_EvoSparkles(struct Sprite * sprite); +static void SpriteCallbackDummy_EvoSparkles(struct Sprite *sprite); static void EvoTask_PreEvoSparkleSet1Init(u8 taskId); static void EvoTask_CreatePreEvoSparkleSet1(u8 taskId); static void EvoTask_WaitForPre1SparklesToGoUp(u8 taskId); @@ -90,7 +90,7 @@ static const s16 sUnref_841EF28[][2] = { { 4, 0x10} }; -static void SpriteCallbackDummy_EvoSparkles(struct Sprite * sprite) +static void SpriteCallbackDummy_EvoSparkles(struct Sprite *sprite) { } @@ -102,7 +102,7 @@ static void SetEvoSparklesMatrices(void) SetOamMatrix(i + 20, sEvolutionSparkleMatrixScales[i], 0, 0, sEvolutionSparkleMatrixScales[i]); } -static void SpriteCB_PreEvoSparkleSet1(struct Sprite * sprite) +static void SpriteCB_PreEvoSparkleSet1(struct Sprite *sprite) { u8 mnum; if (sprite->y > 8) @@ -143,7 +143,7 @@ static void CreatePreEvoSparkleSet1(u8 a0) } } -static void SpriteCB_PreEvoSparkleSet2(struct Sprite * sprite) +static void SpriteCB_PreEvoSparkleSet2(struct Sprite *sprite) { if (sprite->y < 88) { @@ -174,7 +174,7 @@ static void CreatePreEvoSparkleSet2(u8 a0) } } -static void SpriteCB_PostEvoSparkleSet1(struct Sprite * sprite) +static void SpriteCB_PostEvoSparkleSet1(struct Sprite *sprite) { if (sprite->data[5] > 8) { @@ -205,7 +205,7 @@ static void CreatePostEvoSparkleSet1(u8 a0, u8 a1) } } -static void SpriteCB_PostEvoSparkleSet2(struct Sprite * sprite) +static void SpriteCB_PostEvoSparkleSet2(struct Sprite *sprite) { u8 mnum; if ((sprite->data[7] & 3) == 0) @@ -481,7 +481,7 @@ static void EvoTask_CreatePostEvoSparklesSet2Trade(u8 taskId) } } -static void SpriteCallbackDummy_MonSprites(struct Sprite * sprite) +static void SpriteCallbackDummy_MonSprites(struct Sprite *sprite) { } diff --git a/src/fame_checker.c b/src/fame_checker.c index f0e359bed..6bad8f81b 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -100,7 +100,7 @@ static void DestroyPersonPicSprite(u8 taskId, u16 who); static void UpdateIconDescriptionBox(u8 whichText); static void UpdateIconDescriptionBoxOff(void); static void FC_CreateListMenu(void); -static void SpriteCB_FCSpinningPokeball(struct Sprite * sprite); +static void SpriteCB_FCSpinningPokeball(struct Sprite *sprite); static void InitListMenuTemplate(void); static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu * list); static void Task_SwitchToPickMode(u8 taskId); @@ -1164,7 +1164,7 @@ void FullyUnlockFameChecker(void) static void FCSetup_ClearVideoRegisters(void) { - void * vram = (void *)VRAM; + void *vram = (void *)VRAM; DmaClearLarge16(3, vram, VRAM_SIZE, 0x1000); DmaClear32(3, OAM, OAM_SIZE); DmaClear16(3, PLTT, PLTT_SIZE); @@ -1268,7 +1268,7 @@ static u8 CreateFlavorTextIconSelectorCursorSprite(s16 where) return CreateSprite(&sSpriteTemplate_SelectorCursor, x, y, 0); } -static void SpriteCB_DestroyFlavorTextIconSelectorCursor(struct Sprite * sprite) +static void SpriteCB_DestroyFlavorTextIconSelectorCursor(struct Sprite *sprite) { DestroySprite(sprite); } @@ -1297,7 +1297,7 @@ static u8 CreateSpinningPokeballSprite(void) return CreateSprite(&sSpinningPokeballSpriteTemplate, 0xe2, 0x42, 0); } -static void SpriteCB_DestroySpinningPokeball(struct Sprite * sprite) +static void SpriteCB_DestroySpinningPokeball(struct Sprite *sprite) { FreeSpriteOamMatrix(sprite); DestroySprite(sprite); @@ -1311,7 +1311,7 @@ static void FreeNonTrainerPicTiles(void) FreeSpriteTilesByTag(SPRITETAG_BILL); } -static void SpriteCB_FCSpinningPokeball(struct Sprite * sprite) +static void SpriteCB_FCSpinningPokeball(struct Sprite *sprite) { if (sprite->data[0] == 1) { diff --git a/src/field_effect.c b/src/field_effect.c index 5b2f5cdc3..cbcc4b1d8 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -485,7 +485,7 @@ static void FieldEffectScript_CallNative(const u8 **script, u32 *result) *script += sizeof(u32); } -static void FieldEffectFreeGraphicsResources(struct Sprite * sprite) +static void FieldEffectFreeGraphicsResources(struct Sprite *sprite) { u16 tileStart = sprite->sheetTileStart; u8 paletteNum = sprite->oam.paletteNum; @@ -494,7 +494,7 @@ static void FieldEffectFreeGraphicsResources(struct Sprite * sprite) FieldEffectFreePaletteIfUnused(paletteNum); } -void FieldEffectStop(struct Sprite * sprite, u8 fldeff) +void FieldEffectStop(struct Sprite *sprite, u8 fldeff) { FieldEffectFreeGraphicsResources(sprite); FieldEffectActiveListRemove(fldeff); @@ -625,7 +625,7 @@ static u8 CreateMonSprite_FieldMove(u16 species, u32 otId, u32 personality, s16 return spriteId; } -void FreeResourcesAndDestroySprite(struct Sprite * sprite, u8 spriteId) +void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId) { ResetPreservedPalettesInWeather(); if (sprite->oam.affineMode != ST_OAM_AFFINE_OFF) @@ -1172,7 +1172,7 @@ static void Task_FallWarpFieldEffect(u8 taskId) static bool8 FallWarpEffect_1(struct Task * task) { struct ObjectEvent * playerObject; - struct Sprite * playerSprite; + struct Sprite *playerSprite; playerObject = &gObjectEvents[gPlayerAvatar.objectEventId]; playerSprite = &gSprites[gPlayerAvatar.spriteId]; CameraObjectReset2(); @@ -1198,7 +1198,7 @@ static bool8 FallWarpEffect_2(struct Task * task) static bool8 FallWarpEffect_3(struct Task * task) { - struct Sprite * sprite; + struct Sprite *sprite; s16 centerToCornerVecY; sprite = &gSprites[gPlayerAvatar.spriteId]; centerToCornerVecY = -(sprite->centerToCornerVecY << 1); @@ -1214,7 +1214,7 @@ static bool8 FallWarpEffect_3(struct Task * task) static bool8 FallWarpEffect_4(struct Task * task) { struct ObjectEvent * objectEvent; - struct Sprite * sprite; + struct Sprite *sprite; objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; sprite = &gSprites[gPlayerAvatar.spriteId]; @@ -1402,7 +1402,7 @@ static bool8 EscalatorWarpEffect_6(struct Task * task) static void Escalator_AnimatePlayerGoingDown(struct Task * task) { - struct Sprite * sprite; + struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->x2 = Cos(0x84, task->data[2]); sprite->y2 = Sin(0x94, task->data[2]); @@ -1415,7 +1415,7 @@ static void Escalator_AnimatePlayerGoingDown(struct Task * task) static void Escalator_AnimatePlayerGoingUp(struct Task * task) { - struct Sprite * sprite; + struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->x2 = Cos(0x7c, task->data[2]); sprite->y2 = Sin(0x76, task->data[2]); @@ -1499,7 +1499,7 @@ static bool8 EscalatorWarpInEffect_1(struct Task * task) static bool8 EscalatorWarpInEffect_2(struct Task * task) { - struct Sprite * sprite; + struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->x2 = Cos(0x84, task->data[1]); sprite->y2 = Sin(0x94, task->data[1]); @@ -1509,7 +1509,7 @@ static bool8 EscalatorWarpInEffect_2(struct Task * task) static bool8 EscalatorWarpInEffect_3(struct Task * task) { - struct Sprite * sprite; + struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->x2 = Cos(0x84, task->data[1]); sprite->y2 = Sin(0x94, task->data[1]); @@ -1530,7 +1530,7 @@ static bool8 EscalatorWarpInEffect_3(struct Task * task) static bool8 EscalatorWarpInEffect_4(struct Task * task) { - struct Sprite * sprite; + struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->x2 = Cos(0x7c, task->data[1]); sprite->y2 = Sin(0x76, task->data[1]); @@ -1540,7 +1540,7 @@ static bool8 EscalatorWarpInEffect_4(struct Task * task) static bool8 EscalatorWarpInEffect_5(struct Task * task) { - struct Sprite * sprite; + struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; sprite->x2 = Cos(0x7c, task->data[1]); sprite->y2 = Sin(0x76, task->data[1]); @@ -1723,20 +1723,20 @@ static bool8 DiveFieldEffect_TryWarp(struct Task *task) } static void Task_LavaridgeGymB1FWarp(u8 taskId); -static bool8 LavaridgeGymB1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGymB1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGymB1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGymB1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGymB1FWarpEffect_6(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); +static bool8 LavaridgeGymB1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpEffect_6(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static void FieldCB_LavaridgeGymB1FWarpExit(void); static void Task_LavaridgeGymB1FWarpExit(u8 taskId); -static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); +static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 (*const sLavaridgeGymB1FWarpEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) = { +static bool8 (*const sLavaridgeGymB1FWarpEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { LavaridgeGymB1FWarpEffect_1, LavaridgeGymB1FWarpEffect_2, LavaridgeGymB1FWarpEffect_3, @@ -1755,7 +1755,7 @@ static void Task_LavaridgeGymB1FWarp(u8 taskId) while (sLavaridgeGymB1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 LavaridgeGymB1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGymB1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { FreezeObjectEvents(); CameraObjectReset2(); @@ -1767,7 +1767,7 @@ static bool8 LavaridgeGymB1FWarpEffect_1(struct Task * task, struct ObjectEvent return TRUE; } -static bool8 LavaridgeGymB1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGymB1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { SetCameraPanning(0, task->data[1]); task->data[1] = -task->data[1]; @@ -1780,7 +1780,7 @@ static bool8 LavaridgeGymB1FWarpEffect_2(struct Task * task, struct ObjectEvent return FALSE; } -static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { sprite->y2 = 0; task->data[3] = 1; @@ -1794,7 +1794,7 @@ static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent return TRUE; } -static bool8 LavaridgeGymB1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGymB1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { s16 centerToCornerVecY; SetCameraPanning(0, task->data[1]); @@ -1837,7 +1837,7 @@ static bool8 LavaridgeGymB1FWarpEffect_4(struct Task * task, struct ObjectEvent return FALSE; } -static bool8 LavaridgeGymB1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGymB1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { TryFadeOutOldMapMusic(); WarpFadeOutScreen(); @@ -1845,7 +1845,7 @@ static bool8 LavaridgeGymB1FWarpEffect_5(struct Task * task, struct ObjectEvent return FALSE; } -static bool8 LavaridgeGymB1FWarpEffect_6(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGymB1FWarpEffect_6(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -1857,7 +1857,7 @@ static bool8 LavaridgeGymB1FWarpEffect_6(struct Task * task, struct ObjectEvent return FALSE; } -static bool8 (*const sLavaridgeGymB1FWarpExitEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) = { +static bool8 (*const sLavaridgeGymB1FWarpExitEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { LavaridgeGymB1FWarpExitEffect_1, LavaridgeGymB1FWarpExitEffect_2, LavaridgeGymB1FWarpExitEffect_3, @@ -1879,7 +1879,7 @@ static void Task_LavaridgeGymB1FWarpExit(u8 taskId) while (sLavaridgeGymB1FWarpExitEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { CameraObjectReset2(); FreezeObjectEvents(); @@ -1889,7 +1889,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task * task, struct ObjectEv return FALSE; } -static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (IsWeatherNotFadingIn()) { @@ -1903,7 +1903,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task * task, struct ObjectEv return FALSE; } -static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { sprite = &gSprites[task->data[1]]; if (sprite->animCmdIndex > 1) @@ -1917,7 +1917,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEv return FALSE; } -static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { @@ -1930,13 +1930,13 @@ static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task * task, struct ObjectEv } static void Task_LavaridgeGym1FWarp(u8 taskId); -static bool8 LavaridgeGym1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGym1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGym1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); -static bool8 LavaridgeGym1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite); +static bool8 LavaridgeGym1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGym1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGym1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGym1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 (*const sLavaridgeGym1FWarpEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) = { +static bool8 (*const sLavaridgeGym1FWarpEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { LavaridgeGym1FWarpEffect_1, LavaridgeGym1FWarpEffect_2, LavaridgeGym1FWarpEffect_3, @@ -1955,7 +1955,7 @@ u8 FldEff_LavaridgeGymWarp(void) return spriteId; } -void SpriteCB_AshLaunch(struct Sprite * sprite) +void SpriteCB_AshLaunch(struct Sprite *sprite) { if (sprite->animEnded) { @@ -1973,7 +1973,7 @@ static void Task_LavaridgeGym1FWarp(u8 taskId) while(sLavaridgeGym1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 LavaridgeGym1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGym1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { FreezeObjectEvents(); CameraObjectReset2(); @@ -1983,7 +1983,7 @@ static bool8 LavaridgeGym1FWarpEffect_1(struct Task * task, struct ObjectEvent * return FALSE; } -static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { @@ -2005,7 +2005,7 @@ static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent * return FALSE; } -static bool8 LavaridgeGym1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGym1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (gSprites[task->data[1]].animCmdIndex == 2) { @@ -2015,7 +2015,7 @@ static bool8 LavaridgeGym1FWarpEffect_3(struct Task * task, struct ObjectEvent * return FALSE; } -static bool8 LavaridgeGym1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGym1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { @@ -2026,7 +2026,7 @@ static bool8 LavaridgeGym1FWarpEffect_4(struct Task * task, struct ObjectEvent * return FALSE; } -static bool8 LavaridgeGym1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite * sprite) +static bool8 LavaridgeGym1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -2048,7 +2048,7 @@ u8 FldEff_PopOutOfAsh(void) return spriteId; } -void SpriteCB_PopOutOfAsh(struct Sprite * sprite) +void SpriteCB_PopOutOfAsh(struct Sprite *sprite) { if (sprite->animEnded) { @@ -2397,7 +2397,7 @@ static void TeleportFieldEffectTask3(struct Task * task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - struct Sprite * sprite = &gSprites[gPlayerAvatar.spriteId]; + struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((--task->data[1]) <= 0) { task->data[1] = 4; @@ -2462,7 +2462,7 @@ static void Task_DoTeleportInFieldEffect(u8 taskId) static void TeleportInFieldEffectTask1(struct Task * task) { - struct Sprite * sprite; + struct Sprite *sprite; s16 centerToCornerVecY; if (IsWeatherNotFadingIn()) { @@ -2483,7 +2483,7 @@ static void TeleportInFieldEffectTask2(struct Task * task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; - struct Sprite * sprite = &gSprites[gPlayerAvatar.spriteId]; + struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId]; if ((sprite->y2 += task->data[1]) >= -8) { if (task->data[13] == 0) @@ -2559,9 +2559,9 @@ static void AnimateIndoorShowMonBg(struct Task * task); static bool8 SlideIndoorBannerOnscreen(struct Task * task); static bool8 SlideIndoorBannerOffscreen(struct Task * task); static u8 InitFieldMoveMonSprite(u32 species, u32 otId, u32 personality); -static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite * sprite); -static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite * sprite); -static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite * sprite); +static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite *sprite); +static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite *sprite); +static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite *sprite); static void (*const sShowMonOutdoorsEffectFuncs[])(struct Task * task) = { ShowMonEffect_Outdoors_1, @@ -2915,7 +2915,7 @@ static u8 InitFieldMoveMonSprite(u32 species, u32 otId, u32 personality) { bool16 playCry; u8 monSprite; - struct Sprite * sprite; + struct Sprite *sprite; playCry = (species & 0x80000000) >> 16; species &= 0x7fffffff; monSprite = CreateMonSprite_FieldMove(species, otId, personality, 0x140, 0x50, 0); @@ -2927,7 +2927,7 @@ static u8 InitFieldMoveMonSprite(u32 species, u32 otId, u32 personality) return monSprite; } -static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite * sprite) +static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite *sprite) { if ((sprite->x -= 20) <= 0x78) { @@ -2945,7 +2945,7 @@ static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite * sprite) } } -static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite * sprite) +static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite *sprite) { if ((--sprite->data[1]) == 0) { @@ -2953,7 +2953,7 @@ static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite * sprite) } } -static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite * sprite) +static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite *sprite) { if (sprite->x < -0x40) { @@ -3137,12 +3137,12 @@ static void UseVsSeekerEffect_4(struct Task * task) } } -static void SpriteCB_NPCFlyOut(struct Sprite * sprite); +static void SpriteCB_NPCFlyOut(struct Sprite *sprite); u8 FldEff_NpcFlyOut(void) { u8 spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIRD], 0x78, 0, 1); - struct Sprite * sprite = &gSprites[spriteId]; + struct Sprite *sprite = &gSprites[spriteId]; sprite->oam.paletteNum = 0; sprite->oam.priority = 1; @@ -3152,9 +3152,9 @@ u8 FldEff_NpcFlyOut(void) return spriteId; } -static void SpriteCB_NPCFlyOut(struct Sprite * sprite) +static void SpriteCB_NPCFlyOut(struct Sprite *sprite) { - struct Sprite * npcSprite; + struct Sprite *npcSprite; sprite->x2 = Cos(sprite->data[2], 0x8c); sprite->y2 = Sin(sprite->data[2], 0x48); @@ -3748,7 +3748,7 @@ u32 FldEff_MoveDeoxysRock(void) static void Task_MoveDeoxysRock_Step(u8 taskId) { s16 *data = gTasks[taskId].data; - struct Sprite * sprite = &gSprites[data[1]]; + struct Sprite *sprite = &gSprites[data[1]]; struct ObjectEvent * objectEvent; switch (data[0]) { diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 789e0a188..342ff9e8b 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -13,26 +13,26 @@ #define OBJ_EVENT_PAL_TAG_NONE 0x11FF // duplicate of define in event_object_movement.c -static void UpdateObjectReflectionSprite(struct Sprite * sprite); -static void LoadObjectReflectionPalette(struct ObjectEvent * objectEvent, struct Sprite * sprite); +static void UpdateObjectReflectionSprite(struct Sprite *sprite); +static void LoadObjectReflectionPalette(struct ObjectEvent * objectEvent, struct Sprite *sprite); static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent * objectEvent, u8 paletteNum); static void LoadObjectRegularReflectionPalette(struct ObjectEvent * objectEvent, u8 paletteNum); -static void UpdateGrassFieldEffectSubpriority(struct Sprite * sprite, u8 z, u8 offset); -static void FadeFootprintsTireTracks_Step0(struct Sprite * sprite); -static void FadeFootprintsTireTracks_Step1(struct Sprite * sprite); -static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite * sprite); -static void UpdateAshFieldEffect_Step0(struct Sprite * sprite); -static void UpdateAshFieldEffect_Step1(struct Sprite * sprite); -static void UpdateAshFieldEffect_Step2(struct Sprite * sprite); -static void SynchroniseSurfAnim(struct ObjectEvent * objectEvent, struct Sprite * sprite); -static void SynchroniseSurfPosition(struct ObjectEvent * objectEvent, struct Sprite * sprite); -static void CreateBobbingEffect(struct ObjectEvent * objectEvent, struct Sprite * linkedSprite, struct Sprite * sprite); -static void SpriteCB_UnderwaterSurfBlob(struct Sprite * sprite); +static void UpdateGrassFieldEffectSubpriority(struct Sprite *sprite, u8 z, u8 offset); +static void FadeFootprintsTireTracks_Step0(struct Sprite *sprite); +static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite); +static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite); +static void UpdateAshFieldEffect_Step0(struct Sprite *sprite); +static void UpdateAshFieldEffect_Step1(struct Sprite *sprite); +static void UpdateAshFieldEffect_Step2(struct Sprite *sprite); +static void SynchroniseSurfAnim(struct ObjectEvent * objectEvent, struct Sprite *sprite); +static void SynchroniseSurfPosition(struct ObjectEvent * objectEvent, struct Sprite *sprite); +static void CreateBobbingEffect(struct ObjectEvent * objectEvent, struct Sprite *linkedSprite, struct Sprite *sprite); +static void SpriteCB_UnderwaterSurfBlob(struct Sprite *sprite); static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum); -void SetUpReflection(struct ObjectEvent * objectEvent, struct Sprite * sprite, bool8 stillReflection) +void SetUpReflection(struct ObjectEvent * objectEvent, struct Sprite *sprite, bool8 stillReflection) { - struct Sprite * reflectionSprite; + struct Sprite *reflectionSprite; reflectionSprite = &gSprites[CreateCopySpriteAt(sprite, sprite->x, sprite->y, 0x98)]; reflectionSprite->callback = UpdateObjectReflectionSprite; @@ -58,7 +58,7 @@ static s16 GetReflectionVerticalOffset(struct ObjectEvent * objectEvent) return GetObjectEventGraphicsInfo(objectEvent->graphicsId)->height - 2; } -static void LoadObjectReflectionPalette(struct ObjectEvent * objectEvent, struct Sprite * sprite) +static void LoadObjectReflectionPalette(struct ObjectEvent * objectEvent, struct Sprite *sprite) { u8 bridgeType; u16 bridgeReflectionVerticalOffsets[] = { 12, 28, 44 }; @@ -111,10 +111,10 @@ static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent * objectEve } } -static void UpdateObjectReflectionSprite(struct Sprite * reflectionSprite) +static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) { struct ObjectEvent * objectEvent; - struct Sprite * mainSprite; + struct Sprite *mainSprite; objectEvent = &gObjectEvents[reflectionSprite->data[0]]; mainSprite = &gSprites[objectEvent->spriteId]; @@ -164,7 +164,7 @@ extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[]; u8 CreateWarpArrowSprite(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_ARROW], 0, 0, 0x52); if (spriteId != MAX_SPRITES) @@ -186,7 +186,7 @@ void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y) { s16 x2; s16 y2; - struct Sprite * sprite; + struct Sprite *sprite; sprite = &gSprites[spriteId]; if (sprite->invisible || sprite->data[0] != x || sprite->data[1] != y) @@ -236,11 +236,11 @@ u32 FldEff_Shadow(void) return 0; } -void UpdateShadowFieldEffect(struct Sprite * sprite) +void UpdateShadowFieldEffect(struct Sprite *sprite) { u8 objectEventId; struct ObjectEvent * objectEvent; - struct Sprite * linkedSprite; + struct Sprite *linkedSprite; if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId)) { @@ -270,7 +270,7 @@ u32 FldEff_TallGrass(void) s16 x; s16 y; u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; x = gFieldEffectArguments[0]; y = gFieldEffectArguments[1]; @@ -295,7 +295,7 @@ u32 FldEff_TallGrass(void) return 0; } -void UpdateTallGrassFieldEffect(struct Sprite * sprite) +void UpdateTallGrassFieldEffect(struct Sprite *sprite) { u8 mapNum; u8 mapGroup; @@ -339,7 +339,7 @@ void UpdateTallGrassFieldEffect(struct Sprite * sprite) u32 FldEff_JumpTallGrass(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_TALL_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); @@ -356,7 +356,7 @@ u32 FldEff_JumpTallGrass(void) u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y) { - struct Sprite * sprite; + struct Sprite *sprite; u8 i; for (i = 0; i < MAX_SPRITES; i++) @@ -377,7 +377,7 @@ u32 FldEff_LongGrass(void) s16 x; s16 y; u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; x = gFieldEffectArguments[0]; y = gFieldEffectArguments[1]; @@ -402,7 +402,7 @@ u32 FldEff_LongGrass(void) return 0; } -void UpdateLongGrassFieldEffect(struct Sprite * sprite) +void UpdateLongGrassFieldEffect(struct Sprite *sprite) { u8 mapNum; u8 mapGroup; @@ -442,7 +442,7 @@ void UpdateLongGrassFieldEffect(struct Sprite * sprite) u32 FldEff_JumpLongGrass(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_LONG_GRASS], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); @@ -462,7 +462,7 @@ u32 FldEff_ShortGrass(void) u8 objectEventId; struct ObjectEvent * objectEvent; u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEvent = &gObjectEvents[objectEventId]; @@ -481,13 +481,13 @@ u32 FldEff_ShortGrass(void) return 0; } -void UpdateShortGrassFieldEffect(struct Sprite * sprite) +void UpdateShortGrassFieldEffect(struct Sprite *sprite) { u8 objectEventId; s16 x; s16 y; const struct ObjectEventGraphicsInfo * graphicsInfo; - struct Sprite * linkedSprite; + struct Sprite *linkedSprite; if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShortGrass) { @@ -520,7 +520,7 @@ void UpdateShortGrassFieldEffect(struct Sprite * sprite) u32 FldEff_SandFootprints(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SAND_FOOTPRINTS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); @@ -538,7 +538,7 @@ u32 FldEff_SandFootprints(void) u32 FldEff_DeepSandFootprints(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_DEEP_SAND_FOOTPRINTS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); @@ -556,7 +556,7 @@ u32 FldEff_DeepSandFootprints(void) u32 FldEff_BikeTireTracks(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BIKE_TIRE_TRACKS], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); @@ -571,17 +571,17 @@ u32 FldEff_BikeTireTracks(void) return spriteId; } -void (*const gFadeFootprintsTireTracksFuncs[])(struct Sprite * sprite) = { +void (*const gFadeFootprintsTireTracksFuncs[])(struct Sprite *sprite) = { FadeFootprintsTireTracks_Step0, FadeFootprintsTireTracks_Step1 }; -void UpdateFootprintsTireTracksFieldEffect(struct Sprite * sprite) +void UpdateFootprintsTireTracksFieldEffect(struct Sprite *sprite) { gFadeFootprintsTireTracksFuncs[sprite->data[0]](sprite); } -static void FadeFootprintsTireTracks_Step0(struct Sprite * sprite) +static void FadeFootprintsTireTracks_Step0(struct Sprite *sprite) { // Wait 40 frames before the flickering starts. if (++sprite->data[1] > 40) @@ -590,7 +590,7 @@ static void FadeFootprintsTireTracks_Step0(struct Sprite * sprite) UpdateObjectEventSpriteVisibility(sprite, FALSE); } -static void FadeFootprintsTireTracks_Step1(struct Sprite * sprite) +static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite) { sprite->invisible ^= 1; sprite->data[1]++; @@ -606,9 +606,9 @@ u32 FldEff_Splash(void) u8 objectEventId; struct ObjectEvent * objectEvent; u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; const struct ObjectEventGraphicsInfo * graphicsInfo; - struct Sprite * linkedSprite; + struct Sprite *linkedSprite; objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEvent = &gObjectEvents[objectEventId]; @@ -629,7 +629,7 @@ u32 FldEff_Splash(void) return 0; } -void UpdateSplashFieldEffect(struct Sprite * sprite) +void UpdateSplashFieldEffect(struct Sprite *sprite) { u8 objectEventId; @@ -648,7 +648,7 @@ void UpdateSplashFieldEffect(struct Sprite * sprite) u32 FldEff_JumpSmallSplash(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_SMALL_SPLASH], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); @@ -666,7 +666,7 @@ u32 FldEff_JumpSmallSplash(void) u32 FldEff_JumpBigSplash(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 8); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_JUMP_BIG_SPLASH], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); @@ -686,7 +686,7 @@ u32 FldEff_FeetInFlowingWater(void) u8 objectEventId; struct ObjectEvent * objectEvent; u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; const struct ObjectEventGraphicsInfo * graphicsInfo; objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); @@ -710,10 +710,10 @@ u32 FldEff_FeetInFlowingWater(void) return 0; } -static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite * sprite) +static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite) { u8 objectEventId; - struct Sprite * linkedSprite; + struct Sprite *linkedSprite; struct ObjectEvent * objectEvent; if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inShallowFlowingWater) @@ -743,7 +743,7 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite * sprite) u32 FldEff_Ripple(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_RIPPLE], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); if (spriteId != MAX_SPRITES) @@ -761,7 +761,7 @@ u32 FldEff_HotSpringsWater(void) u8 objectEventId; struct ObjectEvent * objectEvent; u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); objectEvent = &gObjectEvents[objectEventId]; @@ -780,11 +780,11 @@ u32 FldEff_HotSpringsWater(void) return 0; } -void UpdateHotSpringsWaterFieldEffect(struct Sprite * sprite) +void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite) { u8 objectEventId; const struct ObjectEventGraphicsInfo * graphicsInfo; - struct Sprite * linkedSprite; + struct Sprite *linkedSprite; if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &objectEventId) || !gObjectEvents[objectEventId].inHotSprings) { @@ -885,7 +885,7 @@ u32 FldEff_Ash(void) s16 x; s16 y; u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; x = gFieldEffectArguments[0]; y = gFieldEffectArguments[1]; @@ -904,18 +904,18 @@ u32 FldEff_Ash(void) return 0; } -void (*const gAshFieldEffectFuncs[])(struct Sprite * sprite) = { +void (*const gAshFieldEffectFuncs[])(struct Sprite *sprite) = { UpdateAshFieldEffect_Step0, UpdateAshFieldEffect_Step1, UpdateAshFieldEffect_Step2 }; -void UpdateAshFieldEffect(struct Sprite * sprite) +void UpdateAshFieldEffect(struct Sprite *sprite) { gAshFieldEffectFuncs[sprite->data[0]](sprite); } -static void UpdateAshFieldEffect_Step0(struct Sprite * sprite) +static void UpdateAshFieldEffect_Step0(struct Sprite *sprite) { sprite->invisible = TRUE; sprite->animPaused = TRUE; @@ -923,7 +923,7 @@ static void UpdateAshFieldEffect_Step0(struct Sprite * sprite) sprite->data[0] = 1; } -static void UpdateAshFieldEffect_Step1(struct Sprite * sprite) +static void UpdateAshFieldEffect_Step1(struct Sprite *sprite) { sprite->invisible = FALSE; sprite->animPaused = FALSE; @@ -933,7 +933,7 @@ static void UpdateAshFieldEffect_Step1(struct Sprite * sprite) sprite->data[0] = 2; } -static void UpdateAshFieldEffect_Step2(struct Sprite * sprite) +static void UpdateAshFieldEffect_Step2(struct Sprite *sprite) { UpdateObjectEventSpriteVisibility(sprite, FALSE); if (sprite->animEnded) @@ -1089,7 +1089,7 @@ static void CreateBobbingEffect(struct ObjectEvent *objectEvent, struct Sprite * u8 StartUnderwaterSurfBlobBobbing(u8 oldSpriteId) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; spriteId = CreateSpriteAtEnd(&gDummySpriteTemplate, 0, 0, -1); sprite = &gSprites[spriteId]; @@ -1100,9 +1100,9 @@ u8 StartUnderwaterSurfBlobBobbing(u8 oldSpriteId) return spriteId; } -static void SpriteCB_UnderwaterSurfBlob(struct Sprite * sprite) +static void SpriteCB_UnderwaterSurfBlob(struct Sprite *sprite) { - struct Sprite * oldSprite; + struct Sprite *oldSprite; oldSprite = &gSprites[sprite->data[0]]; if (((sprite->data[2]++) & 0x03) == 0) @@ -1118,7 +1118,7 @@ static void SpriteCB_UnderwaterSurfBlob(struct Sprite * sprite) u32 FldEff_Dust(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 12); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_GROUND_IMPACT_DUST], gFieldEffectArguments[0], gFieldEffectArguments[1], 0); @@ -1138,7 +1138,7 @@ u32 FldEff_SandPile(void) u8 objectEventId; struct ObjectEvent * objectEvent; u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; const struct ObjectEventGraphicsInfo * graphicsInfo; objectEventId = GetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); @@ -1161,7 +1161,7 @@ u32 FldEff_SandPile(void) return 0; } -void UpdateSandPileFieldEffect(struct Sprite * sprite) +void UpdateSandPileFieldEffect(struct Sprite *sprite) { u8 objectEventId; s16 x; @@ -1194,7 +1194,7 @@ void UpdateSandPileFieldEffect(struct Sprite * sprite) u32 FldEff_Bubbles(void) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 0); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_BUBBLES], gFieldEffectArguments[0], gFieldEffectArguments[1], 0x52); @@ -1207,7 +1207,7 @@ u32 FldEff_Bubbles(void) return 0; } -void UpdateBubblesFieldEffect(struct Sprite * sprite) +void UpdateBubblesFieldEffect(struct Sprite *sprite) { sprite->data[0] += 0x80; sprite->data[0] &= 0x100; @@ -1222,7 +1222,7 @@ void UpdateBubblesFieldEffect(struct Sprite * sprite) u32 FldEff_BerryTreeGrowthSparkle(void) { /*u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; SetSpritePosToOffsetMapCoords((s16 *)&gFieldEffectArguments[0], (s16 *)&gFieldEffectArguments[1], 8, 4); spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPARKLE], gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]); @@ -1255,7 +1255,7 @@ u32 ShowSandDisguiseFieldEffect(void) static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; if (TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId)) { @@ -1276,11 +1276,11 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum) return spriteId; } -void UpdateDisguiseFieldEffect(struct Sprite * sprite) +void UpdateDisguiseFieldEffect(struct Sprite *sprite) { u8 objectEventId; const struct ObjectEventGraphicsInfo * graphicsInfo; - struct Sprite * linkedSprite; + struct Sprite *linkedSprite; if (TryGetObjectEventIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &objectEventId)) { @@ -1318,7 +1318,7 @@ void StartRevealDisguise(struct ObjectEvent * objectEvent) bool8 UpdateRevealDisguise(struct ObjectEvent * objectEvent) { - struct Sprite * sprite; + struct Sprite *sprite; if (objectEvent->directionSequenceIndex == 2) { @@ -1354,7 +1354,7 @@ u32 FldEff_Sparkle(void) return 0; } -void UpdateSparkleFieldEffect(struct Sprite * sprite) +void UpdateSparkleFieldEffect(struct Sprite *sprite) { if (sprite->data[0] == 0) { @@ -1372,7 +1372,7 @@ void UpdateSparkleFieldEffect(struct Sprite * sprite) FieldEffectStop(sprite, FLDEFF_SPARKLE); } -void UpdateJumpImpactEffect(struct Sprite * sprite) +void UpdateJumpImpactEffect(struct Sprite *sprite) { if (sprite->animEnded) { @@ -1385,7 +1385,7 @@ void UpdateJumpImpactEffect(struct Sprite * sprite) } } -void WaitFieldEffectSpriteAnim(struct Sprite * sprite) +void WaitFieldEffectSpriteAnim(struct Sprite *sprite) { if (sprite->animEnded) FieldEffectStop(sprite, sprite->data[0]); @@ -1393,12 +1393,12 @@ void WaitFieldEffectSpriteAnim(struct Sprite * sprite) UpdateObjectEventSpriteVisibility(sprite, FALSE); } -static void UpdateGrassFieldEffectSubpriority(struct Sprite * sprite, u8 z, u8 offset) +static void UpdateGrassFieldEffectSubpriority(struct Sprite *sprite, u8 z, u8 offset) { u8 i; s16 var, xhi, lyhi, yhi, ylo; const struct ObjectEventGraphicsInfo * graphicsInfo; // Unused Variable - struct Sprite * linkedSprite; + struct Sprite *linkedSprite; SetObjectSubpriorityByZCoord(z, sprite, offset); for (i = 0; i < OBJECT_EVENTS_COUNT; i++) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index e9789560d..a5be40b5c 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -32,7 +32,7 @@ static EWRAM_DATA u8 sTeleportSavedFacingDirection = DIR_NONE; EWRAM_DATA struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT] = {}; EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {}; -static u8 ObjectEventCB2_NoMovement2(struct ObjectEvent * object, struct Sprite * sprite); +static u8 ObjectEventCB2_NoMovement2(struct ObjectEvent * object, struct Sprite *sprite); static bool8 TryUpdatePlayerSpinDirection(void); static bool8 TryInterruptObjectEventSpecialAnim(struct ObjectEvent * playerObjEvent, u8 direction); static void npc_clear_strange_bits(struct ObjectEvent * playerObjEvent); @@ -128,7 +128,7 @@ void MovementType_Player(struct Sprite *sprite) UpdateObjectEventCurrentMovement(&gObjectEvents[sprite->data[0]], sprite, ObjectEventCB2_NoMovement2); } -static u8 ObjectEventCB2_NoMovement2(struct ObjectEvent * object, struct Sprite * sprite) +static u8 ObjectEventCB2_NoMovement2(struct ObjectEvent * object, struct Sprite *sprite) { return 0; } @@ -1952,7 +1952,7 @@ static bool8 Fishing16(struct Task *task) #undef tFrameCounter #undef tFishingRod -void AlignFishingAnimationFrames(struct Sprite * playerSprite) +void AlignFishingAnimationFrames(struct Sprite *playerSprite) { u8 animCmdIndex; u8 animType; diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index faa076a6c..e6029448c 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -28,9 +28,9 @@ static void FieldCallback_CutGrass(void); static void FieldCallback_CutTree(void); static void FieldMoveCallback_CutGrass(void); static void SetCutGrassMetatileAt(s16 x, s16 y); -static void SpriteCallback_CutGrass_Init(struct Sprite * sprite); -static void SpriteCallback_CutGrass_Run(struct Sprite * sprite); -static void SpriteCallback_CutGrass_Cleanup(struct Sprite * sprite); +static void SpriteCallback_CutGrass_Init(struct Sprite *sprite); +static void SpriteCallback_CutGrass_Run(struct Sprite *sprite); +static void SpriteCallback_CutGrass_Cleanup(struct Sprite *sprite); static void FieldMoveCallback_CutTree(void); static const u16 sCutGrassMetatileMapping[][2] = { @@ -251,7 +251,7 @@ static void SetCutGrassMetatileAt(s16 x, s16 y) } } -static void SpriteCallback_CutGrass_Init(struct Sprite * sprite) +static void SpriteCallback_CutGrass_Init(struct Sprite *sprite) { sprite->data[0] = 8; sprite->data[1] = 0; @@ -259,7 +259,7 @@ static void SpriteCallback_CutGrass_Init(struct Sprite * sprite) sprite->callback = SpriteCallback_CutGrass_Run; } -static void SpriteCallback_CutGrass_Run(struct Sprite * sprite) +static void SpriteCallback_CutGrass_Run(struct Sprite *sprite) { sprite->x2 = Sin(sprite->data[2], sprite->data[0]); sprite->y2 = Cos(sprite->data[2], sprite->data[0]); @@ -274,7 +274,7 @@ static void SpriteCallback_CutGrass_Run(struct Sprite * sprite) sprite->callback = SpriteCallback_CutGrass_Cleanup; } -static void SpriteCallback_CutGrass_Cleanup(struct Sprite * sprite) +static void SpriteCallback_CutGrass_Cleanup(struct Sprite *sprite) { u8 i; for (i = 1; i < CUT_GRASS_SPRITE_COUNT; i++) diff --git a/src/graphics.c b/src/graphics.c index b1266dc90..e8c2a96e1 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1255,8 +1255,8 @@ const u32 gPSSMenu_Gfx[] = INCBIN_U32("graphics/interface/box_tiles.4bpp.lz"); const u32 gUnknown_8E9CAEC[] = INCBIN_U32("graphics/unknown/unknown_E9CAEC.bin.lz"); -const u16 gUnknown_8E9CB9C[] = INCBIN_U16("graphics/misc/markings2.gbapal"); -const u16 gUnknown_8E9CBBC[] = INCBIN_U16("graphics/misc/markings2.4bpp"); +const u16 gMonMarkingsMenu_Pal[] = INCBIN_U16("graphics/misc/markings2.gbapal"); +const u16 gMonMarkingsMenu_Gfx[] = INCBIN_U16("graphics/misc/markings2.4bpp"); const u16 gTradeMenu_Pal[] = INCBIN_U16("graphics/trade/menu.gbapal"); const u16 gTradeButtons_Pal[] = INCBIN_U16("graphics/trade/unknown_DDB444.gbapal"); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 68494d9cf..9b7e1f7af 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -87,8 +87,8 @@ static void ClearVramOamPltt_LoadHofPal(void); static void HofInit_ResetGpuBuffersAndLoadConfettiGfx(void); static void Hof_InitBgs(void); static bool8 DrawHofBackground(void); -static void SpriteCB_GetOnScreen(struct Sprite * sprite); -static void SpriteCB_Confetti(struct Sprite * sprite); +static void SpriteCB_GetOnScreen(struct Sprite *sprite); +static void SpriteCB_Confetti(struct Sprite *sprite); static bool8 Hof_SpawnConfetti(void); static const struct BgTemplate sHof_BgTemplates[] = { @@ -1213,12 +1213,12 @@ static bool8 DrawHofBackground(void) return TRUE; } -static void SpriteCB_EndGetOnScreen(struct Sprite * sprite) +static void SpriteCB_EndGetOnScreen(struct Sprite *sprite) { } -static void SpriteCB_GetOnScreen(struct Sprite * sprite) +static void SpriteCB_GetOnScreen(struct Sprite *sprite) { if (sprite->x != sprite->data[1] || sprite->y != sprite->data[2]) diff --git a/src/intro.c b/src/intro.c index 9466301d2..fd6875eee 100644 --- a/src/intro.c +++ b/src/intro.c @@ -27,12 +27,12 @@ struct IntroSequenceData u8 taskId; bool8 gengarAttackLanded; u16 data[6]; - struct Sprite * gameFreakLogoArtSprite; - struct Sprite * nidorinoAnimSprite; - struct Sprite * gengarStaticSprite; - struct Sprite * nidorinoStaticSprite; - struct Sprite * grassSprite; - struct Sprite * gengarBackSpriteArray[4]; + struct Sprite *gameFreakLogoArtSprite; + struct Sprite *nidorinoAnimSprite; + struct Sprite *gengarStaticSprite; + struct Sprite *nidorinoStaticSprite; + struct Sprite *grassSprite; + struct Sprite *gengarBackSpriteArray[4]; u8 filler_0038[0x4]; u8 gamefreakLogoArtSpriteTiles[0x400]; u8 gamefreakTextBitmap[0x400]; @@ -85,7 +85,7 @@ static void IntroCB_FightScene3(struct IntroSequenceData * ptr); static void FightScene3_StartBg1Scroll(void); static void Task_FightScene3_ForestBgScroll(u8 taskId); static void CreateGrassSprite(struct IntroSequenceData * ptr); -static void SpriteCB_Grass(struct Sprite * sprite); +static void SpriteCB_Grass(struct Sprite *sprite); static void IntroCB_FightScene4(struct IntroSequenceData * ptr); static void CreateGengarBackSprite(struct IntroSequenceData * ptr); static void FightScene4_StartNidorinoAffineAnim(struct IntroSequenceData * ptr); @@ -96,31 +96,31 @@ static void GameFreakScene_StartTrailingSparkleSpawner(void); static void Task_GameFreakScene_TrailingSparkleSpawner(u8 taskId); static void GameFreakScene_StartRevealGameFreakTextSparklesSpawner(void); static void Task_RevealGameFreakTextSparklesSpawner(u8 taskId); -static struct Sprite * CreateGameFreakLogoArtSprite(void); +static struct Sprite *CreateGameFreakLogoArtSprite(void); static void FightScene4_StartGengarAttack(struct IntroSequenceData * ptr); static void Task_FightScene4_GengarAttack(u8 taskId); static void FightScene4_CreateGengarSwipeSprites(void); -static void SpriteCB_GengarSwipe(struct Sprite * sprite); +static void SpriteCB_GengarSwipe(struct Sprite *sprite); static void Task_FightScene3_Bg0Scroll(u8 taskId); -static void SpriteCB_LargeStar(struct Sprite * sprite); -static void SpriteCB_TrailingSparkles(struct Sprite * sprite); -static void SpriteCB_TrailingSparkles2(struct Sprite * sprite); -static void SpriteCB_RevealGameFreakTextSparkles(struct Sprite * sprite); +static void SpriteCB_LargeStar(struct Sprite *sprite); +static void SpriteCB_TrailingSparkles(struct Sprite *sprite); +static void SpriteCB_TrailingSparkles2(struct Sprite *sprite); +static void SpriteCB_RevealGameFreakTextSparkles(struct Sprite *sprite); static void CreateNidorinoAnimSprite(struct IntroSequenceData * ptr); -static void StartNidorinoAnimSpriteSlideIn(struct Sprite * sprite, s16 x0, s16 x1, u16 speed); -static void SpriteCB_NidorinoAnimSpriteSlideIn(struct Sprite * sprite); +static void StartNidorinoAnimSpriteSlideIn(struct Sprite *sprite, s16 x0, s16 x1, u16 speed); +static void SpriteCB_NidorinoAnimSpriteSlideIn(struct Sprite *sprite); static bool32 IsNidorinoAnimSpriteSlideInRunning(struct IntroSequenceData * ptr); static void FightScene4_NidorinoRearsUp(struct IntroSequenceData * ptr); -static void SpriteCB_NidorinoRearsUp(struct Sprite * sprite); +static void SpriteCB_NidorinoRearsUp(struct Sprite *sprite); static void FightScene4_StartNidorinoRecoilAnim(struct IntroSequenceData * ptr); -static void SpriteCB_NidorinoRecoil(struct Sprite * sprite); +static void SpriteCB_NidorinoRecoil(struct Sprite *sprite); static bool8 FightScene4_NidorinoAnimIsRunning(struct IntroSequenceData * ptr); static void CreateNidorinoRecoilDustSprites(s16 a1, s16 a2, s16 a3); -static void SpriteCB_NidorinoRecoilDust(struct Sprite * sprite); -static void StartSpriteHopToPosAnim(struct Sprite * sprite, u16 a1, s16 a2, u8 a3); -static void SpriteCB_HopToPos(struct Sprite * sprite); +static void SpriteCB_NidorinoRecoilDust(struct Sprite *sprite); +static void StartSpriteHopToPosAnim(struct Sprite *sprite, u16 a1, s16 a2, u8 a3); +static void SpriteCB_HopToPos(struct Sprite *sprite); static void StartNidorinoAnim_LaunchSelfAtGengarAnim(struct IntroSequenceData * ptr); -static void SpriteCB_NidorinoAnim_LaunchSelfAtGengar(struct Sprite * sprite); +static void SpriteCB_NidorinoAnim_LaunchSelfAtGengar(struct Sprite *sprite); static void LoadFightSceneSpriteTilesAndPals(void); #if REVISION >= 1 static void Rev1_GameFreakScene_CreatePresentsText(void); @@ -1524,7 +1524,7 @@ static void CreateGrassSprite(struct IntroSequenceData * this) this->grassSprite = NULL; } -static void SpriteCB_Grass(struct Sprite * sprite) +static void SpriteCB_Grass(struct Sprite *sprite) { s16 * data = sprite->data; @@ -1695,7 +1695,7 @@ static void IntroCB_FightScene4(struct IntroSequenceData * this) } } -static void FightScene_CalcCenterToCornerVec(struct Sprite * sprite) +static void FightScene_CalcCenterToCornerVec(struct Sprite *sprite) { CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode); } @@ -1730,7 +1730,7 @@ static void FightScene4_StartNidorinoAffineAnim(struct IntroSequenceData * this) StartSpriteAffineAnim(this->nidorinoAnimSprite, 1); } -static void SpriteCB_DummyButNotDummy(struct Sprite * sprite) +static void SpriteCB_DummyButNotDummy(struct Sprite *sprite) { } @@ -1889,7 +1889,7 @@ static void Task_RevealGameFreakTextSparklesSpawner(u8 taskId) data[0] = 0; } -static struct Sprite * CreateGameFreakLogoArtSprite(void) +static struct Sprite *CreateGameFreakLogoArtSprite(void) { u8 spriteId = CreateSprite(&sSpriteTemplate_GameFreakLogoArt, 120, 70, 4); return &gSprites[spriteId]; @@ -2009,7 +2009,7 @@ static void FightScene4_CreateGengarSwipeSprites(void) } } -static void SpriteCB_GengarSwipe(struct Sprite * sprite) +static void SpriteCB_GengarSwipe(struct Sprite *sprite) { sprite->invisible ^= TRUE; if (sprite->animEnded) @@ -2043,7 +2043,7 @@ static void Task_FightScene3_Bg0Scroll(u8 taskId) } } -static void SpriteCB_LargeStar(struct Sprite * sprite) +static void SpriteCB_LargeStar(struct Sprite *sprite) { unsigned v; sprite->data[0] -= sprite->data[2]; @@ -2065,7 +2065,7 @@ static void SpriteCB_LargeStar(struct Sprite * sprite) DestroySprite(sprite); } -static void SpriteCB_TrailingSparkles(struct Sprite * sprite) +static void SpriteCB_TrailingSparkles(struct Sprite *sprite) { u32 v; @@ -2088,7 +2088,7 @@ static void SpriteCB_TrailingSparkles(struct Sprite * sprite) DestroySprite(sprite); } -static void SpriteCB_TrailingSparkles2(struct Sprite * sprite) +static void SpriteCB_TrailingSparkles2(struct Sprite *sprite) { if (sprite->data[2]) { @@ -2137,7 +2137,7 @@ static void SpriteCB_TrailingSparkles2(struct Sprite * sprite) } } -static void SpriteCB_RevealGameFreakTextSparkles(struct Sprite * sprite) +static void SpriteCB_RevealGameFreakTextSparkles(struct Sprite *sprite) { if (sprite->animEnded) DestroySprite(sprite); @@ -2149,7 +2149,7 @@ static void CreateNidorinoAnimSprite(struct IntroSequenceData * this) this->nidorinoAnimSprite = &gSprites[spriteId]; } -static void StartNidorinoAnimSpriteSlideIn(struct Sprite * sprite, s16 x0, s16 x1, u16 speed) +static void StartNidorinoAnimSpriteSlideIn(struct Sprite *sprite, s16 x0, s16 x1, u16 speed) { sprite->data[0] = x0 << 4; sprite->data[1] = ((x1 - x0) << 4) / speed; @@ -2161,7 +2161,7 @@ static void StartNidorinoAnimSpriteSlideIn(struct Sprite * sprite, s16 x0, s16 x sprite->callback = SpriteCB_NidorinoAnimSpriteSlideIn; } -static void SpriteCB_NidorinoAnimSpriteSlideIn(struct Sprite * sprite) +static void SpriteCB_NidorinoAnimSpriteSlideIn(struct Sprite *sprite) { sprite->data[4]++; if (sprite->data[4] >= 40) @@ -2192,7 +2192,7 @@ static void FightScene4_NidorinoRearsUp(struct IntroSequenceData * ptr) ptr->nidorinoAnimSprite->callback = SpriteCB_NidorinoRearsUp; } -static void SpriteCB_NidorinoRearsUp(struct Sprite * sprite) +static void SpriteCB_NidorinoRearsUp(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -2244,7 +2244,7 @@ static void FightScene4_StartNidorinoRecoilAnim(struct IntroSequenceData * ptr) ptr->nidorinoAnimSprite->callback = SpriteCB_NidorinoRecoil; } -static void SpriteCB_NidorinoRecoil(struct Sprite * sprite) +static void SpriteCB_NidorinoRecoil(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -2326,7 +2326,7 @@ static void CreateNidorinoRecoilDustSprites(s16 x, s16 y, s16 seed) } } -static void SpriteCB_NidorinoRecoilDust(struct Sprite * sprite) +static void SpriteCB_NidorinoRecoilDust(struct Sprite *sprite) { s16 * data = sprite->data; @@ -2354,7 +2354,7 @@ static void SpriteCB_NidorinoRecoilDust(struct Sprite * sprite) } } -static void StartSpriteHopToPosAnim(struct Sprite * sprite, u16 a1, s16 a2, u8 a3) +static void StartSpriteHopToPosAnim(struct Sprite *sprite, u16 a1, s16 a2, u8 a3) { sprite->data[0] = 0; sprite->data[1] = a1; @@ -2368,7 +2368,7 @@ static void StartSpriteHopToPosAnim(struct Sprite * sprite, u16 a1, s16 a2, u8 a sprite->callback = SpriteCB_HopToPos; } -static void SpriteCB_HopToPos(struct Sprite * sprite) +static void SpriteCB_HopToPos(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -2434,7 +2434,7 @@ static void StartNidorinoAnim_LaunchSelfAtGengarAnim(struct IntroSequenceData * ptr->nidorinoAnimSprite->callback = SpriteCB_NidorinoAnim_LaunchSelfAtGengar; } -static void SpriteCB_NidorinoAnim_LaunchSelfAtGengar(struct Sprite * sprite) +static void SpriteCB_NidorinoAnim_LaunchSelfAtGengar(struct Sprite *sprite) { switch (sprite->data[0]) { diff --git a/src/item_menu.c b/src/item_menu.c index 31463f1e4..88ebd1e17 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -64,7 +64,7 @@ struct BagSlots EWRAM_DATA struct BagStruct gBagMenuState = {}; static EWRAM_DATA struct BagMenuAlloc * sBagMenuDisplay = NULL; -static EWRAM_DATA void * sBagBgTilemapBuffer = NULL; +static EWRAM_DATA void *sBagBgTilemapBuffer = NULL; static EWRAM_DATA struct ListMenuItem * sListMenuItems = NULL; static EWRAM_DATA u8 (*sListMenuItemStrings)[19] = NULL; static EWRAM_DATA u8 sContextMenuItemsBuffer[4] = {}; diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 4df80761f..09fe4675d 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -6,11 +6,11 @@ #include "constants/items.h" static EWRAM_DATA u8 sItemMenuIconSpriteIds[12] = {0}; -static EWRAM_DATA void * sItemIconTilesBuffer = NULL; -static EWRAM_DATA void * sItemIconTilesBufferPadded = NULL; +static EWRAM_DATA void *sItemIconTilesBuffer = NULL; +static EWRAM_DATA void *sItemIconTilesBufferPadded = NULL; -static void SpriteCB_BagVisualSwitchingPockets(struct Sprite * sprite); -static void SpriteCB_ShakeBagSprite(struct Sprite * sprite); +static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite); +static void SpriteCB_ShakeBagSprite(struct Sprite *sprite); static const struct OamData sOamData_BagOrSatchel = { .affineMode = ST_OAM_AFFINE_NORMAL, @@ -561,13 +561,13 @@ void CreateBagOrSatchelSprite(u8 animNum) void SetBagVisualPocketId(u8 animNum) { - struct Sprite * sprite = &gSprites[sItemMenuIconSpriteIds[0]]; + struct Sprite *sprite = &gSprites[sItemMenuIconSpriteIds[0]]; sprite->y2 = -5; sprite->callback = SpriteCB_BagVisualSwitchingPockets; StartSpriteAnim(sprite, animNum); } -static void SpriteCB_BagVisualSwitchingPockets(struct Sprite * sprite) +static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite) { if (sprite->y2 != 0) sprite->y2++; @@ -577,7 +577,7 @@ static void SpriteCB_BagVisualSwitchingPockets(struct Sprite * sprite) void ShakeBagSprite(void) { - struct Sprite * sprite = &gSprites[sItemMenuIconSpriteIds[0]]; + struct Sprite *sprite = &gSprites[sItemMenuIconSpriteIds[0]]; if (sprite->affineAnimEnded) { StartSpriteAffineAnim(sprite, 1); @@ -585,7 +585,7 @@ void ShakeBagSprite(void) } } -static void SpriteCB_ShakeBagSprite(struct Sprite * sprite) +static void SpriteCB_ShakeBagSprite(struct Sprite *sprite) { if (sprite->affineAnimEnded) { @@ -658,7 +658,7 @@ static bool8 TryAllocItemIconTilesBuffers(void) return TRUE; } -void CopyItemIconPicTo4x4Buffer(const void * src, void * dest) +void CopyItemIconPicTo4x4Buffer(const void *src, void *dest) { u8 i; @@ -760,7 +760,7 @@ void DestroyItemMenuIcon(u8 idx) } } -const void * GetItemIconGfxPtr(u16 itemId, u8 attrId) +const void *GetItemIconGfxPtr(u16 itemId, u8 attrId) { if (itemId > ITEM_N_A) itemId = ITEM_NONE; diff --git a/src/itemfinder.c b/src/itemfinder.c index 5627582be..8e8736bf1 100644 --- a/src/itemfinder.c +++ b/src/itemfinder.c @@ -28,11 +28,11 @@ static void Task_ItemfinderUnderfootDigUpItem(u8 taskId); static void DestroyArrowAndStarTiles(void); static void LoadArrowAndStarTiles(void); static void CreateArrowSprite(u8 animNum, u8 direction); -static void SpriteCallback_Arrow(struct Sprite * sprite); -static void SpriteCallback_DestroyArrow(struct Sprite * sprite); +static void SpriteCallback_Arrow(struct Sprite *sprite); +static void SpriteCallback_DestroyArrow(struct Sprite *sprite); static u8 CreateStarSprite(void); -static void SpriteCallback_Star(struct Sprite * sprite); -static void SpriteCallback_DestroyStar(struct Sprite * sprite); +static void SpriteCallback_Star(struct Sprite *sprite); +static void SpriteCallback_DestroyStar(struct Sprite *sprite); #define ARROW_TILE_TAG 2000 @@ -592,7 +592,7 @@ static void CreateArrowSprite(u8 animNum, u8 direction) } } -static void SpriteCallback_Arrow(struct Sprite * sprite) +static void SpriteCallback_Arrow(struct Sprite *sprite) { s16 x, y; sprite->spCurX += sprite->spDeltaX; @@ -606,7 +606,7 @@ static void SpriteCallback_Arrow(struct Sprite * sprite) sprite->callback = SpriteCallback_DestroyArrow; } -static void SpriteCallback_DestroyArrow(struct Sprite * sprite) +static void SpriteCallback_DestroyArrow(struct Sprite *sprite) { FreeSpriteOamMatrix(sprite); DestroySprite(sprite); @@ -629,7 +629,7 @@ static u8 CreateStarSprite(void) return spriteId; } -static void SpriteCallback_Star(struct Sprite * sprite) +static void SpriteCallback_Star(struct Sprite *sprite) { s16 x, y; sprite->spCurX += sprite->spDeltaX; @@ -643,7 +643,7 @@ static void SpriteCallback_Star(struct Sprite * sprite) sprite->callback = SpriteCallback_DestroyStar; } -static void SpriteCallback_DestroyStar(struct Sprite * sprite) +static void SpriteCallback_DestroyStar(struct Sprite *sprite) { DestroySprite(sprite); } diff --git a/src/learn_move.c b/src/learn_move.c index 9c00245fc..12fa40b65 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -159,7 +159,7 @@ static void MoveRelearnerStateMachine(void); static void DrawTextBorderOnWindows6and7(void); static void PrintTeachWhichMoveToStrVar1(bool8 onInit); static void InitMoveRelearnerStateVariables(void); -static void SpriteCB_ListMenuScrollIndicators(struct Sprite * sprite); +static void SpriteCB_ListMenuScrollIndicators(struct Sprite *sprite); static void SpawnListMenuScrollIndicatorSprites(void); static void MoveRelearnerInitListMenuBuffersEtc(void); static void MoveRelearnerMenuHandleInput(void); @@ -711,7 +711,7 @@ static void InitMoveRelearnerStateVariables(void) sMoveRelearner->learnableMoves[i] = MOVE_NONE; } -static void SpriteCB_ListMenuScrollIndicators(struct Sprite * sprite) +static void SpriteCB_ListMenuScrollIndicators(struct Sprite *sprite) { s16 abcissa = (sprite->data[1] * 10) & 0xFF; switch (sprite->data[0]) diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index 104125b7d..2cac8210a 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -61,7 +61,7 @@ static void UpdateChildStatuses(void); static s32 GetRfuRecvStatus(void); static void sub_80FA834(u8 taskId); static void ClearSelectedLinkPlayerIds(u16 disconnectMask); -static void ValidateAndReceivePokemonSioInfo(void * a0); +static void ValidateAndReceivePokemonSioInfo(void *a0); static void Task_ExchangeLinkPlayers(u8 taskId); static void sub_80FACF0(u8 taskId); static void GetLinkmanErrorParams(u32 msg); @@ -1220,7 +1220,7 @@ static void RfuPrepareSendBuffer(u16 command) } } -void Rfu_SendPacket(void * data) +void Rfu_SendPacket(void *data) { if (IsSendCmdComplete() && !RfuHasErrored()) { diff --git a/src/m4a_tables.c b/src/m4a_tables.c index 9a4ea32e6..55eae171f 100644 --- a/src/m4a_tables.c +++ b/src/m4a_tables.c @@ -3,7 +3,7 @@ // Some of these functions have different signatures, so we need to make this // an array of void pointers or a struct. It's simpler to just make it an array // for now. -void * const gMPlayJumpTableTemplate[] = +void *const gMPlayJumpTableTemplate[] = { ply_fine, ply_goto, diff --git a/src/mail.c b/src/mail.c index 0b77b5a2f..aae5b93a5 100644 --- a/src/mail.c +++ b/src/mail.c @@ -45,9 +45,9 @@ struct MailAttrStruct struct MailGfxData { - const void * pal; - const void * tiles; - const void * map; + const void *pal; + const void *tiles; + const void *map; u32 size; u16 textpals[2]; }; diff --git a/src/main_menu.c b/src/main_menu.c index 2959966a9..5c3b888a2 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -677,8 +677,8 @@ static void PrintBadgeCount(void) static void LoadUserFrameToBg(u8 bgId) { - LoadBgTiles(bgId, GetUserFrameGraphicsInfo(gSaveBlock2Ptr->optionsWindowFrameType)->tiles, 0x120, 0x1B1); - LoadPalette(GetUserFrameGraphicsInfo(gSaveBlock2Ptr->optionsWindowFrameType)->palette, 0x20, 0x20); + LoadBgTiles(bgId, GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->tiles, 0x120, 0x1B1); + LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->palette, 0x20, 0x20); MainMenu_EraseWindow(&sWindowTemplate[MAIN_MENU_WINDOW_ERROR]); } diff --git a/src/mevent.c b/src/mevent.c index dde22bfd8..68b3cd610 100644 --- a/src/mevent.c +++ b/src/mevent.c @@ -75,7 +75,7 @@ struct MEvent_Str_1 sMEventSendToEReaderManager; static EWRAM_DATA bool32 sReceivedWonderCardIsValid = FALSE; -void SendUnknownSerialData_Init(struct MEvent_Str_1 *mgr, size_t size, const void * data) +void SendUnknownSerialData_Init(struct MEvent_Str_1 *mgr, size_t size, const void *data) { vu16 imeBak = REG_IME; REG_IME = 0; @@ -799,7 +799,7 @@ bool32 ValidateMEventClientHeader(const struct MEventClientHeaderStruct * data) return TRUE; } -u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused) +u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void *unused) { if (a1->id == 0) return 0; @@ -808,7 +808,7 @@ u32 sub_8144418(const u16 * a0, const struct MEventClientHeaderStruct * a1, void return 2; } -u32 MEvent_CanPlayerReceiveDistributionMon(const u16 * a0, const struct MEventClientHeaderStruct * a1, void * unused) +u32 MEvent_CanPlayerReceiveDistributionMon(const u16 * a0, const struct MEventClientHeaderStruct * a1, void *unused) { s32 numSpaces = a1->maxDistributionMons - CountReceivedDistributionMons(&a1->unk_20, a1->maxDistributionMons); if (numSpaces == 0) diff --git a/src/mevent_client.c b/src/mevent_client.c index 5346a4e82..3838558df 100644 --- a/src/mevent_client.c +++ b/src/mevent_client.c @@ -43,7 +43,7 @@ void mevent_client_inc_flag(void) s_mevent_client_ptr->flag++; } -void * mevent_client_get_buffer(void) +void *mevent_client_get_buffer(void) { return s_mevent_client_ptr->buffer; } diff --git a/src/mevent_server.c b/src/mevent_server.c index ea639314c..b304fa09b 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -41,7 +41,7 @@ u32 mevent_srv_common_do_exec(u16 * a0) return result; } -static void mevent_srv_init_common(struct mevent_srv_common * svr, const void * cmdBuffer, u32 sendPlayerNo, u32 recvPlayerNo) +static void mevent_srv_init_common(struct mevent_srv_common * svr, const void *cmdBuffer, u32 sendPlayerNo, u32 recvPlayerNo) { svr->unk_00 = 0; svr->mainseqno = 0; @@ -62,13 +62,13 @@ static void mevent_srv_free_resources(struct mevent_srv_common * svr) Free(svr->mevent_unk1442cc); } -static void mevent_srv_common_init_send(struct mevent_srv_common * svr, u32 ident, const void * src, u32 size) +static void mevent_srv_common_init_send(struct mevent_srv_common * svr, u32 ident, const void *src, u32 size) { AGB_ASSERT_EX(size <= ME_SEND_BUF_SIZE, ABSPATH("mevent_server.c"), 257); mevent_srv_sub_init_send(&svr->manager, ident, src, size); } -static void * mevent_first_if_not_null_else_second(void * a0, void * a1) +static void *mevent_first_if_not_null_else_second(void *a0, void *a1) { if (a0 != NULL) return a0; @@ -76,7 +76,7 @@ static void * mevent_first_if_not_null_else_second(void * a0, void * a1) return a1; } -static u32 mevent_compare_pointers(void * a0, void * a1) +static u32 mevent_compare_pointers(void *a0, void *a1) { if (a1 < a0) return 0; @@ -119,7 +119,7 @@ static u32 common_mainseq_4(struct mevent_srv_common * svr) { // process command const struct mevent_server_cmd * cmd = &svr->cmdBuffer[svr->cmdidx]; - void * ptr; + void *ptr; svr->cmdidx++; switch (cmd->instr) diff --git a/src/mevent_server_helpers.c b/src/mevent_server_helpers.c index 234064afc..33148d539 100644 --- a/src/mevent_server_helpers.c +++ b/src/mevent_server_helpers.c @@ -34,7 +34,7 @@ void mevent_srv_sub_init(struct mevent_srv_sub * svr, u32 sendPlayerNo, u32 recv svr->recvFunc = mevent_receive_func; } -void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void * src, u32 size) +void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void *src, u32 size) { svr->seqno = 0; svr->sendIdent = ident; @@ -47,7 +47,7 @@ void mevent_srv_sub_init_send(struct mevent_srv_sub * svr, u32 ident, const void svr->sendBfr = src; } -void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void * dest) +void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void *dest) { svr->seqno = 0; svr->recvIdent = ident; @@ -57,7 +57,7 @@ void mevent_srv_sub_init_recv(struct mevent_srv_sub * svr, u32 ident, void * des svr->recvBfr = dest; } -static void mevent_recv_block(u32 recv_idx, void * dest, size_t size) +static void mevent_recv_block(u32 recv_idx, void *dest, size_t size) { memcpy(dest, gBlockRecvBuffer[recv_idx], size); } diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c index 45048dea1..278a0c0de 100644 --- a/src/minigame_countdown.c +++ b/src/minigame_countdown.c @@ -9,7 +9,7 @@ static void Task_MinigameCountdown(u8 taskId); static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId); static void StartStartGraphic(u8 spriteId1, u8 spriteId2, u8 spriteId3); static bool32 IsStartGraphicAnimRunning(u8 spriteId); -static void SpriteCB_Start(struct Sprite * sprite); +static void SpriteCB_Start(struct Sprite *sprite); static void Load321StartGfx(u16 tilesTag, u16 palTag); static u8 CreateNumberSprite(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority); static void CreateStartSprite(u16 tilesTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 * spriteId2_p, s16 * spriteId3_p); @@ -75,7 +75,7 @@ static void Task_MinigameCountdown(u8 taskId) static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId) { - struct Sprite * sprite = &gSprites[spriteId]; + struct Sprite *sprite = &gSprites[spriteId]; switch (sprite->data[0]) { @@ -160,7 +160,7 @@ static bool32 IsStartGraphicAnimRunning(u8 spriteId) return gSprites[spriteId].callback == SpriteCB_Start; } -static void SpriteCB_Start(struct Sprite * sprite) +static void SpriteCB_Start(struct Sprite *sprite) { s16 * data = sprite->data; s32 y; diff --git a/src/mon_markings.c b/src/mon_markings.c index b9f1ebe96..d444538e5 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -5,510 +5,606 @@ #include "graphics.h" #include "constants/songs.h" -static EWRAM_DATA struct PokemonMarkMenu * sMenu = NULL; +#define ANIM_CURSOR (NUM_MON_MARKINGS * 2) +#define ANIM_TEXT (ANIM_CURSOR + 1) -static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 tilesTag, u16 paletteTag); -static void nullsub_62(struct Sprite * sprite); -static void SpriteCB_MarkingIcon(struct Sprite * sprite); -static void SpriteCB_Cursor(struct Sprite * sprite); -static struct Sprite * CreateMonMarkingSprite(u16 tilesTag, u16 paletteTag, const u16 *palette, u16 size); +#define SELECTION_OK NUM_MON_MARKINGS +#define SELECTION_CANCEL (SELECTION_OK + 1) + +static void CreateMonMarkingsMenuSprites(s16, s16, u16, u16); +static void SpriteCB_Dummy(struct Sprite *); +static void SpriteCB_Marking(struct Sprite *); +static void SpriteCB_Cursor(struct Sprite *); +static struct Sprite *CreateMarkingComboSprite(u16, u16, const u16 *, u16); static const u16 sMonMarkingsPal[] = INCBIN_U16("graphics/misc/mon_markings.gbapal"); -static const u16 sMonMarkingsTiles[] = INCBIN_U16("graphics/misc/mon_markings.4bpp"); +static const u16 sMonMarkings_Gfx[] = INCBIN_U16("graphics/misc/mon_markings.4bpp"); static const u8 sUnref_83EE828[] = {0x09, 0x50, 0x13, 0x02, 0xFF}; -static const struct OamData sOamData_64x64 = { - .shape = SPRITE_SHAPE(64x64), - .size = SPRITE_SIZE(64x64) -}; - -static const struct OamData sOamData_8x8 = { - .shape = SPRITE_SHAPE(8x8), - .size = SPRITE_SIZE(8x8) -}; - -static const union AnimCmd sAnimCmd_MenuMark_CircleOff[] = { - ANIMCMD_FRAME(0x0, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MenuMark_CircleOn[] = { - ANIMCMD_FRAME(0x1, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MenuMark_SquareOff[] = { - ANIMCMD_FRAME(0x2, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MenuMark_SquareOn[] = { - ANIMCMD_FRAME(0x3, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MenuMark_TriangleOff[] = { - ANIMCMD_FRAME(0x4, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MenuMark_TriangleOn[] = { - ANIMCMD_FRAME(0x5, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MenuMark_HeartOff[] = { - ANIMCMD_FRAME(0x6, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MenuMark_HeartOn[] = { - ANIMCMD_FRAME(0x7, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MenuMark_Cursor[] = { - ANIMCMD_FRAME(0x8, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MenuMark_Blank[] = { - ANIMCMD_FRAME(0x9, 5), - ANIMCMD_END -}; - -static const union AnimCmd *const sSpriteAnimTable_MenuMark[] = { - sAnimCmd_MenuMark_CircleOff, - sAnimCmd_MenuMark_CircleOn, - sAnimCmd_MenuMark_SquareOff, - sAnimCmd_MenuMark_SquareOn, - sAnimCmd_MenuMark_TriangleOff, - sAnimCmd_MenuMark_TriangleOn, - sAnimCmd_MenuMark_HeartOff, - sAnimCmd_MenuMark_HeartOn, - sAnimCmd_MenuMark_Cursor, - sAnimCmd_MenuMark_Blank -}; - -static const union AnimCmd sAnimCmd_Frame_0[] = { - ANIMCMD_FRAME(0x0, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_Frame_1[] = { - ANIMCMD_FRAME(0x40, 5), - ANIMCMD_END -}; - -static const union AnimCmd *const sSpriteAnimTable_Frame[] = { - sAnimCmd_Frame_0, - sAnimCmd_Frame_1 -}; - -static const struct OamData sOamData_32x8 = { - .shape = SPRITE_SHAPE(32x8), - .size = SPRITE_SIZE(32x8) -}; - -static const union AnimCmd sAnimCmd_MonMark_0000[] = { - ANIMCMD_FRAME(0x0, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_1000[] = { - ANIMCMD_FRAME(0x4, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_0100[] = { - ANIMCMD_FRAME(0x8, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_1100[] = { - ANIMCMD_FRAME(0xc, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_0010[] = { - ANIMCMD_FRAME(0x10, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_1010[] = { - ANIMCMD_FRAME(0x14, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_0110[] = { - ANIMCMD_FRAME(0x18, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_1110[] = { - ANIMCMD_FRAME(0x1c, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_0001[] = { - ANIMCMD_FRAME(0x20, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_1001[] = { - ANIMCMD_FRAME(0x24, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_0101[] = { - ANIMCMD_FRAME(0x28, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_1101[] = { - ANIMCMD_FRAME(0x2c, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_0011[] = { - ANIMCMD_FRAME(0x30, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_1011[] = { - ANIMCMD_FRAME(0x34, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_0111[] = { - ANIMCMD_FRAME(0x38, 5), - ANIMCMD_END -}; - -static const union AnimCmd sAnimCmd_MonMark_1111[] = { - ANIMCMD_FRAME(0x3c, 5), - ANIMCMD_END -}; - -static const union AnimCmd *const sSpriteAnimTable_MonMarkSet[] = { - sAnimCmd_MonMark_0000, - sAnimCmd_MonMark_1000, - sAnimCmd_MonMark_0100, - sAnimCmd_MonMark_1100, - sAnimCmd_MonMark_0010, - sAnimCmd_MonMark_1010, - sAnimCmd_MonMark_0110, - sAnimCmd_MonMark_1110, - sAnimCmd_MonMark_0001, - sAnimCmd_MonMark_1001, - sAnimCmd_MonMark_0101, - sAnimCmd_MonMark_1101, - sAnimCmd_MonMark_0011, - sAnimCmd_MonMark_1011, - sAnimCmd_MonMark_0111, - sAnimCmd_MonMark_1111 -}; - -void SetMonMarkingsMenuPointer(struct PokemonMarkMenu * markMenu) +static const struct OamData sOamData_MenuWindow = { - sMenu = markMenu; + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(64x64), + .x = 0, + .matrixNum = 0, + .size = SPRITE_SIZE(64x64), + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0, +}; + +// Used for the markings, OK/Cancel text, and cursor sprites +static const struct OamData sOamData_8x8 = +{ + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(8x8), + .x = 0, + .matrixNum = 0, + .size = SPRITE_SIZE(8x8), + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0, +}; + +static const union AnimCmd sAnim_Marking_CircleOff[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_Marking_CircleOn[] = +{ + ANIMCMD_FRAME(1, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_Marking_SquareOff[] = +{ + ANIMCMD_FRAME(2, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_Marking_SquareOn[] = +{ + ANIMCMD_FRAME(3, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_Marking_TriangleOff[] = +{ + ANIMCMD_FRAME(4, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_Marking_TriangleOn[] = +{ + ANIMCMD_FRAME(5, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_Marking_HeartOff[] = +{ + ANIMCMD_FRAME(6, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_Marking_HeartOn[] = +{ + ANIMCMD_FRAME(7, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_Cursor[] = +{ + ANIMCMD_FRAME(8, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_OKCancelText[] = +{ + ANIMCMD_FRAME(9, 5), + ANIMCMD_END, +}; + +static const union AnimCmd *const sAnims_MenuSprite[] = +{ + sAnim_Marking_CircleOff, + sAnim_Marking_CircleOn, + sAnim_Marking_SquareOff, + sAnim_Marking_SquareOn, + sAnim_Marking_TriangleOff, + sAnim_Marking_TriangleOn, + sAnim_Marking_HeartOff, + sAnim_Marking_HeartOn, + [ANIM_CURSOR] = sAnim_Cursor, + [ANIM_TEXT] = sAnim_OKCancelText, +}; + +static const union AnimCmd sAnim_MenuWindow_UpperHalf[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MenuWindow_LowerHalf[] = +{ + ANIMCMD_FRAME(64, 5), + ANIMCMD_END, +}; + +static const union AnimCmd *const sAnims_MenuWindow[] = +{ + sAnim_MenuWindow_UpperHalf, + sAnim_MenuWindow_LowerHalf, +}; + +static const struct OamData sOamData_MarkingCombo = +{ + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .mosaic = FALSE, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(32x8), + .x = 0, + .matrixNum = 0, + .size = SPRITE_SIZE(32x8), + .tileNum = 0, + .priority = 0, + .paletteNum = 0, + .affineParam = 0, +}; + +static const union AnimCmd sAnim_MarkingCombo_AllOff[] = +{ + ANIMCMD_FRAME(0, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_Circle[] = +{ + ANIMCMD_FRAME(4, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_Square[] = +{ + ANIMCMD_FRAME(8, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_CircleSquare[] = +{ + ANIMCMD_FRAME(12, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_Triangle[] = +{ + ANIMCMD_FRAME(16, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_CircleTriangle[] = +{ + ANIMCMD_FRAME(20, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_SquareTriangle[] = +{ + ANIMCMD_FRAME(24, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_CircleSquareTriangle[] = +{ + ANIMCMD_FRAME(28, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_Heart[] = +{ + ANIMCMD_FRAME(32, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_CircleHeart[] = +{ + ANIMCMD_FRAME(36, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_SquareHeart[] = +{ + ANIMCMD_FRAME(40, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_CircleSquareHeart[] = +{ + ANIMCMD_FRAME(44, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_TriangleHeart[] = +{ + ANIMCMD_FRAME(48, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_CircleTriangleHeart[] = +{ + ANIMCMD_FRAME(52, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_SquareTriangleHeart[] = +{ + ANIMCMD_FRAME(56, 5), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_MarkingCombo_AllOn[] = +{ + ANIMCMD_FRAME(60, 5), + ANIMCMD_END, +}; + +static const union AnimCmd *const sAnims_MarkingCombo[] = +{ + sAnim_MarkingCombo_AllOff, + sAnim_MarkingCombo_Circle, + sAnim_MarkingCombo_Square, + sAnim_MarkingCombo_CircleSquare, + sAnim_MarkingCombo_Triangle, + sAnim_MarkingCombo_CircleTriangle, + sAnim_MarkingCombo_SquareTriangle, + sAnim_MarkingCombo_CircleSquareTriangle, + sAnim_MarkingCombo_Heart, + sAnim_MarkingCombo_CircleHeart, + sAnim_MarkingCombo_SquareHeart, + sAnim_MarkingCombo_CircleSquareHeart, + sAnim_MarkingCombo_TriangleHeart, + sAnim_MarkingCombo_CircleTriangleHeart, + sAnim_MarkingCombo_SquareTriangleHeart, + sAnim_MarkingCombo_AllOn, +}; + +static EWRAM_DATA struct MonMarkingsMenu *sMenu = NULL; + +void InitMonMarkingsMenu(struct MonMarkingsMenu *ptr) +{ + sMenu = ptr; } -static void GetUserFrameForMonMarkings(void) +static void BufferMenuWindowTiles(void) { - const struct TextWindowGraphics * frame = GetUserFrameGraphicsInfo(gSaveBlock2Ptr->optionsWindowFrameType); + const struct TextWindowGraphics *frame = GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType); sMenu->frameTiles = frame->tiles; sMenu->framePalette = frame->palette; sMenu->tileLoadState = 0; - CpuFill16(0, sMenu->menuWindowSpriteTiles, sizeof(sMenu->menuWindowSpriteTiles)); + CpuFill16(0, sMenu->windowSpriteTiles, sizeof(sMenu->windowSpriteTiles)); } -static bool8 DoLoadMonMarkingsFrameGfx(void) +static bool8 BufferMenuFrameTiles(void) { u16 i; - u8 *menuWindowSpriteTiles = &sMenu->menuWindowSpriteTiles[256 * sMenu->tileLoadState]; + u8 *dest = sMenu->windowSpriteTiles + sMenu->tileLoadState * 0x100; + switch (sMenu->tileLoadState) { case 0: - CpuFastCopy(sMenu->frameTiles + 0x00, menuWindowSpriteTiles, 0x20); + CpuFastCopy(sMenu->frameTiles, dest, TILE_SIZE_4BPP); for (i = 0; i < 6; i++) - CpuFastCopy(sMenu->frameTiles + 0x20, menuWindowSpriteTiles + 0x20 * (i + 1), 0x20); - CpuFastCopy(sMenu->frameTiles + 0x40, menuWindowSpriteTiles + 0x20 * 7, 0x20); + CpuFastCopy(sMenu->frameTiles + TILE_SIZE_4BPP, dest + TILE_SIZE_4BPP * (i + 1), TILE_SIZE_4BPP); + + CpuFastCopy(sMenu->frameTiles + TILE_SIZE_4BPP * 2, dest + TILE_SIZE_4BPP * 7, TILE_SIZE_4BPP); sMenu->tileLoadState++; break; default: - CpuFastCopy(sMenu->frameTiles + 0x60, menuWindowSpriteTiles + 0x00, 0x20); + CpuFastCopy(sMenu->frameTiles + TILE_SIZE_4BPP * 3, dest, TILE_SIZE_4BPP); for (i = 0; i < 6; i++) - CpuFastCopy(sMenu->frameTiles + 0x80, menuWindowSpriteTiles + 0x20 * (i + 1), 0x20); - CpuFastCopy(sMenu->frameTiles + 0xA0, menuWindowSpriteTiles + 0x20 * 7, 0x20); + CpuFastCopy(sMenu->frameTiles + TILE_SIZE_4BPP * 4, dest + TILE_SIZE_4BPP * (i + 1), TILE_SIZE_4BPP); + + CpuFastCopy(sMenu->frameTiles + TILE_SIZE_4BPP * 5, dest + TILE_SIZE_4BPP * 7, TILE_SIZE_4BPP); sMenu->tileLoadState++; break; case 13: - CpuFastCopy(sMenu->frameTiles + 0xC0, menuWindowSpriteTiles + 0x00, 0x20); + CpuFastCopy(sMenu->frameTiles + TILE_SIZE_4BPP * 6, dest, TILE_SIZE_4BPP); for (i = 0; i < 6; i++) - CpuFastCopy(sMenu->frameTiles + 0xE0, menuWindowSpriteTiles + 0x20 * (i + 1), 0x20); - CpuFastCopy(sMenu->frameTiles + 0x100, menuWindowSpriteTiles + 0x20 * 7, 0x20); + CpuFastCopy(sMenu->frameTiles + TILE_SIZE_4BPP * 7, dest + TILE_SIZE_4BPP * (i + 1), TILE_SIZE_4BPP); + + CpuFastCopy(sMenu->frameTiles + TILE_SIZE_4BPP * 8, dest + TILE_SIZE_4BPP * 7, TILE_SIZE_4BPP); sMenu->tileLoadState++; return FALSE; case 14: return FALSE; } + return TRUE; } -void LoadMonMarkingsFrameGfx(void) +void BufferMonMarkingsMenuTiles(void) { - GetUserFrameForMonMarkings(); - while (DoLoadMonMarkingsFrameGfx()) - {} + BufferMenuWindowTiles(); + while (BufferMenuFrameTiles()); } -void DrawMonMarkingsMenu(u8 markings, s16 x, s16 y) +void OpenMonMarkingsMenu(u8 markings, s16 x, s16 y) { u16 i; sMenu->cursorPos = 0; sMenu->markings = markings; - for (i = 0; i < 4; i++) - { + for (i = 0; i < NUM_MON_MARKINGS; i++) sMenu->markingsArray[i] = (sMenu->markings >> i) & 1; - } - CreateMonMarkingsMenuSprites(x, y, sMenu->baseTileTag, sMenu->basePaletteTag);; + CreateMonMarkingsMenuSprites(x, y, sMenu->baseTileTag, sMenu->basePaletteTag); } -void TeardownMonMarkingsMenu(void) +void FreeMonMarkingsMenu(void) { u16 i; + for (i = 0; i < 3; i++) + { FreeSpriteTilesByTag(sMenu->baseTileTag + i); + } FreeSpritePaletteByTag(sMenu->basePaletteTag); FreeSpritePaletteByTag(sMenu->basePaletteTag + 1); - for (i = 0; i < 2; i++) + for (i = 0; i < ARRAY_COUNT(sMenu->windowSprites); i++) { - if (sMenu->menuWindowSprites[i] == NULL) + if (sMenu->windowSprites[i] == NULL) return; // break; - DestroySprite(sMenu->menuWindowSprites[i]); + DestroySprite(sMenu->windowSprites[i]); } - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_MON_MARKINGS; i++) { - if (sMenu->menuMarkingSprites[i] == NULL) + if (sMenu->markingSprites[i] == NULL) return; // break; - DestroySprite(sMenu->menuMarkingSprites[i]); + DestroySprite(sMenu->markingSprites[i]); } - if (sMenu->unkSprite != NULL) - DestroySprite(sMenu->unkSprite); - if (sMenu->menuTextSprite != NULL) - DestroySprite(sMenu->menuTextSprite); + if (sMenu->cursorSprite != NULL) + DestroySprite(sMenu->cursorSprite); + if (sMenu->textSprite != NULL) + DestroySprite(sMenu->textSprite); } -bool8 MonMarkingsHandleInput(void) +bool8 HandleMonMarkingsMenuInput(void) { u16 i; + if (JOY_NEW(DPAD_UP)) { + s8 pos; PlaySE(SE_SELECT); - if (--sMenu->cursorPos < 0) - sMenu->cursorPos = 5; + pos = --sMenu->cursorPos; + if (pos < 0) + sMenu->cursorPos = SELECTION_CANCEL; return TRUE; } + if (JOY_NEW(DPAD_DOWN)) { + s8 pos; PlaySE(SE_SELECT); - if (++sMenu->cursorPos > 5) + pos = ++sMenu->cursorPos; + if (pos > SELECTION_CANCEL) sMenu->cursorPos = 0; return TRUE; } + if (JOY_NEW(A_BUTTON)) { PlaySE(SE_SELECT); + switch (sMenu->cursorPos) { - case 4: + case SELECTION_OK: sMenu->markings = 0; - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_MON_MARKINGS; i++) sMenu->markings |= sMenu->markingsArray[i] << i; return FALSE; - case 5: + case SELECTION_CANCEL: return FALSE; } - sMenu->markingsArray[sMenu->cursorPos] = sMenu->markingsArray[sMenu->cursorPos] ? FALSE : TRUE; + + sMenu->markingsArray[sMenu->cursorPos] = !sMenu->markingsArray[sMenu->cursorPos]; return TRUE; } + if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); return FALSE; } + return TRUE; } -static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 tilesTag, u16 paletteTag) +#define sMarkingId data[0] +#define sCursorYOffset data[0] + +static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 basePaletteTag) { u16 i; u8 spriteId; - struct SpriteSheet sheets[] = { - { - .data = sMenu->menuWindowSpriteTiles, - .size = 0x1000, - .tag = tilesTag - }, { - .data = gUnknown_8E9CBBC, - .size = 0x320, - .tag = tilesTag + 1 - }, {} + + struct SpriteSheet sheets[] = + { + { sMenu->windowSpriteTiles, 0x1000, baseTileTag }, + { gMonMarkingsMenu_Gfx, 0x320, baseTileTag + 1 }, + {} }; - struct SpritePalette palettes[] = { - { - .data = sMenu->framePalette, - .tag = paletteTag - }, { - .data = gUnknown_8E9CB9C, - .tag = paletteTag + 1 - }, {} + + struct SpritePalette palettes[] = + { + { sMenu->framePalette, basePaletteTag }, + { gMonMarkingsMenu_Pal, basePaletteTag + 1}, + {} }; - struct SpriteTemplate sprTemplate = { - .tileTag = tilesTag, - .paletteTag = paletteTag, - .oam = &sOamData_64x64, - .anims = sSpriteAnimTable_Frame, + + struct SpriteTemplate template = + { + .tileTag = baseTileTag, + .paletteTag = basePaletteTag, + .oam = &sOamData_MenuWindow, + .anims = sAnims_MenuWindow, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = nullsub_62 + .callback = SpriteCB_Dummy, }; + LoadSpriteSheets(sheets); LoadSpritePalettes(palettes); - for (i = 0; i < 2; i++) + // Create window sprites + for (i = 0; i < ARRAY_COUNT(sMenu->windowSprites); i++) { - spriteId = CreateSprite(&sprTemplate, x + 32, y + 32, 1); + spriteId = CreateSprite(&template, x + 32, y + 32, 1); if (spriteId != MAX_SPRITES) { - sMenu->menuWindowSprites[i] = &gSprites[spriteId]; + sMenu->windowSprites[i] = &gSprites[spriteId]; StartSpriteAnim(&gSprites[spriteId], i); } else { - sMenu->menuWindowSprites[i] = NULL; + sMenu->windowSprites[i] = NULL; return; } } + sMenu->windowSprites[1]->y = y + 96; - sMenu->menuWindowSprites[1]->y = y + 96; - - sprTemplate.tileTag++; - sprTemplate.paletteTag++; - sprTemplate.anims = sSpriteAnimTable_MenuMark; - sprTemplate.callback = SpriteCB_MarkingIcon; - sprTemplate.oam = &sOamData_8x8; - - for (i = 0; i < 4; i++) + // Create marking sprites + template.tileTag++; + template.paletteTag++; + template.anims = sAnims_MenuSprite; + template.callback = SpriteCB_Marking; + template.oam = &sOamData_8x8; + for (i = 0; i < NUM_MON_MARKINGS; i++) { - spriteId = CreateSprite(&sprTemplate, x + 32, y + 16 + 16 * i, 0); + spriteId = CreateSprite(&template, x + 32, y + 16 + 16 * i, 0); if (spriteId != MAX_SPRITES) { - sMenu->menuMarkingSprites[i] = &gSprites[spriteId]; - gSprites[spriteId].data[0] = i; + sMenu->markingSprites[i] = &gSprites[spriteId]; + gSprites[spriteId].sMarkingId = i; } else { - sMenu->menuMarkingSprites[i] = NULL; + sMenu->markingSprites[i] = NULL; return; } } - sprTemplate.callback = SpriteCallbackDummy; - - spriteId = CreateSprite(&sprTemplate, 0, 0, 0); - + // Create OK/Cancel text sprite + template.callback = SpriteCallbackDummy; + spriteId = CreateSprite(&template, 0, 0, 0); if (spriteId != MAX_SPRITES) { - sMenu->menuTextSprite = &gSprites[spriteId]; - sMenu->menuTextSprite->oam.shape = ST_OAM_SQUARE; - sMenu->menuTextSprite->oam.size = 2; - StartSpriteAnim(sMenu->menuTextSprite, 9); - sMenu->menuTextSprite->x = x + 32; - sMenu->menuTextSprite->y = y + 80; - CalcCenterToCornerVec(sMenu->menuTextSprite, 1, 2, 0); + sMenu->textSprite = &gSprites[spriteId]; + sMenu->textSprite->oam.shape = SPRITE_SHAPE(32x32); + sMenu->textSprite->oam.size = SPRITE_SIZE(32x32); + StartSpriteAnim(sMenu->textSprite, ANIM_TEXT); + sMenu->textSprite->x = x + 32; + sMenu->textSprite->y = y + 80; + CalcCenterToCornerVec(sMenu->textSprite, SPRITE_SHAPE(32x16), SPRITE_SIZE(32x16), ST_OAM_AFFINE_OFF); } else { - sMenu->menuTextSprite = NULL; + sMenu->textSprite = NULL; } - sprTemplate.callback = SpriteCB_Cursor; - - spriteId = CreateSprite(&sprTemplate, x + 12, 0, 0); - + // Create cursor sprite + template.callback = SpriteCB_Cursor; + spriteId = CreateSprite(&template, x + 12, 0, 0); if (spriteId != MAX_SPRITES) { - sMenu->unkSprite = &gSprites[spriteId]; - sMenu->unkSprite->data[0] = y + 16; - StartSpriteAnim(sMenu->unkSprite, 8); + sMenu->cursorSprite = &gSprites[spriteId]; + sMenu->cursorSprite->sCursorYOffset = y + 16; + StartSpriteAnim(sMenu->cursorSprite, ANIM_CURSOR); } else { - sMenu->unkSprite = NULL; + sMenu->cursorSprite = NULL; } } -static void nullsub_62(struct Sprite * sprite) -{} - -static void SpriteCB_MarkingIcon(struct Sprite * sprite) +static void SpriteCB_Dummy(struct Sprite *sprite) { - if (sMenu->markingsArray[sprite->data[0]]) - StartSpriteAnim(sprite, 2 * sprite->data[0] + 1); +} + +static void SpriteCB_Marking(struct Sprite *sprite) +{ + if (sMenu->markingsArray[sprite->sMarkingId]) + StartSpriteAnim(sprite, 2 * sprite->sMarkingId + 1); // Set marking 'on' else - StartSpriteAnim(sprite, 2 * sprite->data[0] + 0); + StartSpriteAnim(sprite, 2 * sprite->sMarkingId); // Set marking 'off' } -static void SpriteCB_Cursor(struct Sprite * sprite) +#undef sMarkingId + +static void SpriteCB_Cursor(struct Sprite *sprite) { - sprite->y = 16 * sMenu->cursorPos + sprite->data[0]; + sprite->y = (16 * sMenu->cursorPos) + sprite->sCursorYOffset; } -struct Sprite * CreateMonMarkingSprite_SelectCombo(u16 tileTag, u16 paletteTag, const u16 *palette) +#undef sCursorYOffset + +// Creates a mon marking combination sprite with a spritesheet that holds every possible combination, used by the summary screen / Pokénav +struct Sprite *CreateMonMarkingAllCombosSprite(u16 tileTag, u16 paletteTag, const u16 *palette) { if (palette == NULL) palette = sMonMarkingsPal; - return CreateMonMarkingSprite(tileTag, paletteTag, palette, 16); + return CreateMarkingComboSprite(tileTag, paletteTag, palette, 1 << NUM_MON_MARKINGS); } -struct Sprite * CreateMonMarkingSprite_AllOff(u16 tileTag, u16 paletteTag, const u16 *palette) +// Creates a mon marking combination sprite with a spritesheet that holds only one combination, used for the currently selected PC mon +struct Sprite *CreateMonMarkingComboSprite(u16 tileTag, u16 paletteTag, const u16 *palette) { if (palette == NULL) palette = sMonMarkingsPal; - return CreateMonMarkingSprite(tileTag, paletteTag, palette, 1); + return CreateMarkingComboSprite(tileTag, paletteTag, palette, 1); } -static struct Sprite * CreateMonMarkingSprite(u16 tileTag, u16 paletteTag, const u16 *palette, u16 size) +static struct Sprite *CreateMarkingComboSprite(u16 tileTag, u16 paletteTag, const u16 *palette, u16 size) { u8 spriteId; - struct SpriteTemplate sprTemplate; - struct SpriteSheet sheet = { sMonMarkingsTiles, 0x80, tileTag }; + struct SpriteTemplate template; + struct SpriteSheet sheet = { sMonMarkings_Gfx, 0x80, tileTag }; struct SpritePalette sprPalette = { palette, paletteTag }; - sprTemplate.tileTag = tileTag; - sprTemplate.paletteTag = paletteTag; - sprTemplate.oam = &sOamData_32x8; - sprTemplate.anims = sSpriteAnimTable_MonMarkSet; - sprTemplate.images = NULL; - sprTemplate.affineAnims = gDummySpriteAffineAnimTable; - sprTemplate.callback = nullsub_62; + template.tileTag = tileTag; + template.paletteTag = paletteTag; + template.oam = &sOamData_MarkingCombo; + template.anims = sAnims_MarkingCombo; + template.images = NULL; + template.affineAnims = gDummySpriteAffineAnimTable; + template.callback = SpriteCB_Dummy; sheet.size = size * 0x80; LoadSpriteSheet(&sheet); LoadSpritePalette(&sprPalette); - spriteId = CreateSprite(&sprTemplate, 0, 0, 0); + spriteId = CreateSprite(&template, 0, 0, 0); if (spriteId != MAX_SPRITES) return &gSprites[spriteId]; else return NULL; } -void RequestDma3LoadMonMarking(u8 markings, void * dest) +// Update what combination is shown, used for sprites created with CreateMonMarkingComboSprite +void UpdateMonMarkingTiles(u8 markings, void *dest) { - RequestDma3Copy(&sMonMarkingsTiles[64 * markings], dest, 0x80, DMA3_32BIT); + RequestDma3Copy(&sMonMarkings_Gfx[64 * markings], dest, 0x80, DMA3_32BIT); } diff --git a/src/naming_screen.c b/src/naming_screen.c index a3d15126f..8e7165469 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -139,9 +139,9 @@ static void Task_809E58C(u8 taskId); static u16 sub_809E644(u8 tag); static void sub_809E6B8(u8 a0); static void sub_809E6E0(struct Task * task, u8 a1, u8 a2); -static void sub_809E700(struct Sprite * sprite); -static void sub_809E7F0(struct Sprite * sprite); -static void sub_809E83C(struct Sprite * sprite); +static void sub_809E700(struct Sprite *sprite); +static void sub_809E7F0(struct Sprite *sprite); +static void sub_809E83C(struct Sprite *sprite); static void sub_809E898(void); static void CursorInit(void); static void SetCursorPos(s16 x, s16 y); @@ -153,11 +153,11 @@ static bool8 IsCursorAnimFinished(void); static u8 GetCurrentPageColumnCount(void); static void CreatePageSwitcherSprites(void); static void sub_809EC20(void); -static bool8 PageSwapSpritesCB_Init(struct Sprite * sprite); -static bool8 PageSwapSpritesCB_Idle(struct Sprite * sprite); -static bool8 PageSwapSpritesCB_SwapHide(struct Sprite * sprite); -static bool8 PageSwapSpritesCB_SwapShow(struct Sprite * sprite); -static void sub_809ED88(u8 a0, struct Sprite * spr1, struct Sprite * spr2); +static bool8 PageSwapSpritesCB_Init(struct Sprite *sprite); +static bool8 PageSwapSpritesCB_Idle(struct Sprite *sprite); +static bool8 PageSwapSpritesCB_SwapHide(struct Sprite *sprite); +static bool8 PageSwapSpritesCB_SwapShow(struct Sprite *sprite); +static void sub_809ED88(u8 a0, struct Sprite *spr1, struct Sprite *spr2); static void CreateBackOkSprites(void); static void CreateUnderscoreSprites(void); static void CreateInputTargetIcon(void); @@ -1163,7 +1163,7 @@ static void sub_809EC20(void) sprite->data[1] = sNamingScreenData->currentPage; } -static bool8 (*const sPageSwapSpritesCBs[])(struct Sprite * sprite) = { +static bool8 (*const sPageSwapSpritesCBs[])(struct Sprite *sprite) = { PageSwapSpritesCB_Init, PageSwapSpritesCB_Idle, PageSwapSpritesCB_SwapHide, @@ -1230,7 +1230,7 @@ static bool8 PageSwapSpritesCB_SwapShow(struct Sprite *sprite) static const u16 gUnknown_83E2388[] = {1, 3, 2}; static const u16 gUnknown_83E238E[] = {4, 6, 5}; -static void sub_809ED88(u8 page, struct Sprite * sprite1, struct Sprite * sprite2) +static void sub_809ED88(u8 page, struct Sprite *sprite1, struct Sprite *sprite2) { sprite2->oam.paletteNum = IndexOfSpritePaletteTag(gUnknown_83E2388[page]); sprite1->sheetTileStart = GetSpriteTileStartByTag(gUnknown_83E238E[page]); diff --git a/src/oak_speech.c b/src/oak_speech.c index b0e3e1a6f..4d0d23841 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -19,9 +19,9 @@ struct OakSpeechResources { - void * solidColorsGfx; - void * trainerPicTilemapBuffer; - void * unk_0008; + void *solidColorsGfx; + void *trainerPicTilemapBuffer; + void *unk_0008; u8 filler_000C[4]; u16 hasPlayerBeenNamed; u16 unk_0012; @@ -1639,7 +1639,7 @@ static void CreateNidoranFSprite(u8 taskId) gTasks[taskId].data[4] = spriteId; } -static void SpriteCB_PikaSync(struct Sprite * sprite) +static void SpriteCB_PikaSync(struct Sprite *sprite) { sprite->y2 = gSprites[sprite->data[0]].animCmdIndex; } diff --git a/src/option_menu.c b/src/option_menu.c index aefae3f52..42002795d 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -286,7 +286,7 @@ static void SetOptionMenuTask(void) static void InitOptionMenuBg(void) { - void * dest = (void *)VRAM; + void *dest = (void *)VRAM; DmaClearLarge16(3, dest, VRAM_SIZE, 0x1000); DmaClear32(3, (void *)OAM, OAM_SIZE); DmaClear16(3, (void *)PLTT, PLTT_SIZE); @@ -337,10 +337,10 @@ static bool8 LoadOptionMenuPalette(void) switch (sOptionMenuPtr->loadPaletteState) { case 0: - LoadBgTiles(1, GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->tiles, 0x120, 0x1AA); + LoadBgTiles(1, GetWindowFrameTilesPal(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->tiles, 0x120, 0x1AA); break; case 1: - LoadPalette(GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->palette, 0x20, 0x20); + LoadPalette(GetWindowFrameTilesPal(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->palette, 0x20, 0x20); break; case 2: LoadPalette(sOptionMenuPalette, 0x10, 0x20); @@ -381,8 +381,8 @@ static void Task_OptionMenu(u8 taskId) sOptionMenuPtr->loadState++; break; case 2: - LoadBgTiles(1, GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->tiles, 0x120, 0x1AA); - LoadPalette(GetUserFrameGraphicsInfo(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->palette, 0x20, 0x20); + LoadBgTiles(1, GetWindowFrameTilesPal(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->tiles, 0x120, 0x1AA); + LoadPalette(GetWindowFrameTilesPal(sOptionMenuPtr->option[MENUITEM_FRAMETYPE])->palette, 0x20, 0x20); BufferOptionMenuString(sOptionMenuPtr->cursorPos); break; case 3: diff --git a/src/overworld.c b/src/overworld.c index a1b169e1f..e010de6b1 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -210,7 +210,7 @@ static void MovementStatusHandler_EnterFreeMode(struct LinkPlayerObjectEvent *, static void MovementStatusHandler_TryAdvanceScript(struct LinkPlayerObjectEvent *, struct ObjectEvent *); static u8 FlipVerticalAndClearForced(u8 newFacing, u8 oldFacing); static u8 LinkPlayerDetectCollision(u8 selfObjEventId, u8 a2, s16 x, s16 y); -static void SpriteCB_LinkPlayer(struct Sprite * sprite); +static void SpriteCB_LinkPlayer(struct Sprite *sprite); extern const struct MapLayout * gMapLayouts[]; extern const struct MapHeader *const *gMapGroups[]; diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index 1e5768f5a..4b1e2df8c 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -941,7 +941,7 @@ void CB2_OpenPokedexFromStartMenu(void) SetHelpContext(HELPCONTEXT_POKEDEX); } -#define FREE_IF_NOT_NULL(ptr0) ({ void * ptr = (ptr0); if (ptr) Free(ptr); }) +#define FREE_IF_NOT_NULL(ptr0) ({ void *ptr = (ptr0); if (ptr) Free(ptr); }) bool8 DoClosePokedex(void) { diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index d9d2c4b6f..6385fe420 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -17,7 +17,7 @@ struct MonIconSpriteTemplate }; static u8 CreateMonIconSprite(const struct MonIconSpriteTemplate * template, s16 x, s16 y, u8 subpriority); -static void DestroyMonIconInternal(struct Sprite * sprite); +static void DestroyMonIconInternal(struct Sprite *sprite); const u16 gMonIconPalettes[][16] = { INCBIN_U16("graphics/pokemon/icon_palettes/icon_palette_0.gbapal"), @@ -1118,7 +1118,7 @@ const u8 *GetMonIconPtr(u16 species, u32 personality, bool32 extra) return GetMonIconTiles(GetIconSpecies(species, personality), extra); } -void DestroyMonIcon(struct Sprite * sprite) +void DestroyMonIcon(struct Sprite *sprite) { DestroyMonIconInternal(sprite); } @@ -1171,7 +1171,7 @@ void FreeMonIconPalette(u16 species) FreeSpritePaletteByTag(gMonIconPaletteTable[palIndex].tag); } -void SpriteCB_MonIcon(struct Sprite * sprite) +void SpriteCB_MonIcon(struct Sprite *sprite) { UpdateMonIconFrame(sprite); } @@ -1208,7 +1208,7 @@ u8 GetMonIconPaletteIndexFromSpecies(u16 species) return gMonIconPaletteIndices[species]; } -u8 UpdateMonIconFrame(struct Sprite * sprite) +u8 UpdateMonIconFrame(struct Sprite *sprite) { u8 result = 0; @@ -1268,14 +1268,14 @@ static u8 CreateMonIconSprite(const struct MonIconSpriteTemplate * iconTemplate, return spriteId; } -static void DestroyMonIconInternal(struct Sprite * sprite) +static void DestroyMonIconInternal(struct Sprite *sprite) { struct SpriteFrameImage image = { NULL, sSpriteImageSizes[sprite->oam.shape][sprite->oam.size] }; sprite->images = ℑ DestroySprite(sprite); } -void SetPartyHPBarSprite(struct Sprite * sprite, u8 animNum) +void SetPartyHPBarSprite(struct Sprite *sprite, u8 animNum) { sprite->animNum = animNum; sprite->animDelayCounter = 0; diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c index 8da24dd06..51fd15416 100644 --- a/src/pokemon_special_anim_scene.c +++ b/src/pokemon_special_anim_scene.c @@ -15,38 +15,38 @@ static void LoadBgGfxByAnimType(u16 animType); static void Task_ZoomAnim(u8 taskId); -static void SetSpriteWithCloseness(struct Sprite * sprite, u8 closeness); -static bool8 IsZoomSpriteCBActive(struct Sprite * sprite); -static void MonSpriteZoom_UpdateYPos(struct Sprite * sprite, u8 closeness); -static void ItemSpriteZoom_UpdateYPos(struct Sprite * sprite, u8 closeness); +static void SetSpriteWithCloseness(struct Sprite *sprite, u8 closeness); +static bool8 IsZoomSpriteCBActive(struct Sprite *sprite); +static void MonSpriteZoom_UpdateYPos(struct Sprite *sprite, u8 closeness); +static void ItemSpriteZoom_UpdateYPos(struct Sprite *sprite, u8 closeness); static void StartMonWiggleAnim(struct PokemonSpecialAnimScene * scene, u8 frameLen, u8 niter, u8 amplitude); static void StopMonWiggleAnim(struct PokemonSpecialAnimScene * scene); -static void SpriteCallback_MonSpriteWiggle(struct Sprite * sprite); +static void SpriteCallback_MonSpriteWiggle(struct Sprite *sprite); static void LoadMonSpriteGraphics(u16 *tilees, u16 *palette); -static struct Sprite * PSA_CreateItemIconObject(u16 itemId); +static struct Sprite *PSA_CreateItemIconObject(u16 itemId); static u16 GetBlendColorByItemId(u16 itemId); static void Task_ItemUseOnMonAnim(u8 taskId); -static void CreateSprites_UseItem_OutwardSpiralDots(u8 taskId, s16 *data, struct Sprite * sprite); -static void SpriteCB_OutwardSpiralDots(struct Sprite * sprite); -static void InitItemIconSpriteState(struct PokemonSpecialAnimScene * scene, struct Sprite * sprite, u8 closeness); +static void CreateSprites_UseItem_OutwardSpiralDots(u8 taskId, s16 *data, struct Sprite *sprite); +static void SpriteCB_OutwardSpiralDots(struct Sprite *sprite); +static void InitItemIconSpriteState(struct PokemonSpecialAnimScene * scene, struct Sprite *sprite, u8 closeness); static void MachineSetWobbleInit(void); -static void MachineSetWobble_SetCB(struct Sprite * sprite); +static void MachineSetWobble_SetCB(struct Sprite *sprite); static bool8 MachineSetWobbleCBIsRunning(void); -static void SpriteCB_MachineSetWobble(struct Sprite * sprite); +static void SpriteCB_MachineSetWobble(struct Sprite *sprite); static void StartZoomOutAnimForUseTM(u8 closeness); static void CreateStarSprites(struct PokemonSpecialAnimScene * scene); static bool8 AnyStarSpritesActive(void); -static void SpriteCB_Star(struct Sprite * sprite); +static void SpriteCB_Star(struct Sprite *sprite); static void PSAScene_SeedRandomInTask(struct PokemonSpecialAnimScene * scene); static void StopMakingOutwardSpiralDots(void); static void Task_UseItem_OutwardSpiralDots(u8 taskId); static u16 PSAScene_RandomFromTask(u8 taskId); -static void SpriteCallback_UseItem_OutwardSpiralDots(struct Sprite * sprite); +static void SpriteCallback_UseItem_OutwardSpiralDots(struct Sprite *sprite); static void LoadOutwardSpiralDotsGfx(void); static bool32 IsOutwardSpiralDotsTaskRunning(void); static void Task_LevelUpVerticalSprites(u8 taskId); static void CreateLevelUpVerticalSprite(u8 taskId, s16 *data); -static void SpriteCB_LevelUpVertical(struct Sprite * sprite); +static void SpriteCB_LevelUpVertical(struct Sprite *sprite); static const u16 sBgPals_PSA_Any[] = INCBIN_U16("graphics/pokemon_special_anim/unk_845963C.gbapal"); static const u16 sBgPals_PSA_Anim4[] = INCBIN_U16("graphics/pokemon_special_anim/unk_845965C.gbapal"); @@ -642,9 +642,9 @@ void PSA_CreateMonSpriteAtCloseness(u8 closeness) u16 species = GetMonData(pokemon, MON_DATA_SPECIES); u32 personality = GetMonData(pokemon, MON_DATA_PERSONALITY); u8 r1 = Menu2_GetMonSpriteAnchorCoord(species, personality, 2); - void * r6; - void * r9; - void * r4; + void *r6; + void *r9; + void *r4; u8 spriteId; if (r1 != 0xFF) @@ -717,7 +717,7 @@ bool8 PSA_IsZoomTaskActive(void) static void Task_ZoomAnim(u8 taskId) { s16 *data = gTasks[taskId].data; - struct Sprite * sprite = (void *)GetWordTaskArg(taskId, tOff_MonSprite); + struct Sprite *sprite = (void *)GetWordTaskArg(taskId, tOff_MonSprite); switch (tState) { case 0: @@ -754,14 +754,14 @@ static void Task_ZoomAnim(u8 taskId) } } -static void SetSpriteWithCloseness(struct Sprite * sprite, u8 closeness) +static void SetSpriteWithCloseness(struct Sprite *sprite, u8 closeness) { sprite->data[0] = 0; sprite->data[1] = 0; sprite->data[2] = closeness; } -static bool8 IsZoomSpriteCBActive(struct Sprite * sprite) +static bool8 IsZoomSpriteCBActive(struct Sprite *sprite) { return sprite->callback != SpriteCallbackDummy; } @@ -779,7 +779,7 @@ static u16 GetYPosByScale(u16 pos) return v += scene->monSpriteY1; } -static void MonSpriteZoom_UpdateYPos(struct Sprite * sprite, u8 closeness) +static void MonSpriteZoom_UpdateYPos(struct Sprite *sprite, u8 closeness) { if (closeness > 3) closeness = 3; @@ -788,7 +788,7 @@ static void MonSpriteZoom_UpdateYPos(struct Sprite * sprite, u8 closeness) sprite->y = GetYPosByScale(sAffineScales[closeness]); } -static void ItemSpriteZoom_UpdateYPos(struct Sprite * sprite, u8 closeness) +static void ItemSpriteZoom_UpdateYPos(struct Sprite *sprite, u8 closeness) { MonSpriteZoom_UpdateYPos(sprite, closeness); sprite->x2 = GetSpriteOffsetByScale(sprite->data[6] - 32, closeness); @@ -811,7 +811,7 @@ static void StopMonWiggleAnim(struct PokemonSpecialAnimScene * scene) scene->monSprite->callback = SpriteCallbackDummy; } -static void SpriteCallback_MonSpriteWiggle(struct Sprite * sprite) +static void SpriteCallback_MonSpriteWiggle(struct Sprite *sprite) { sprite->data[7]++; if (sprite->data[7] > sprite->data[0]) @@ -901,10 +901,10 @@ void CreateItemIconSpriteAtMaxCloseness(u16 itemId) } } -static struct Sprite * PSA_CreateItemIconObject(u16 itemId) +static struct Sprite *PSA_CreateItemIconObject(u16 itemId) { u8 spriteId; - struct Sprite * sprite; + struct Sprite *sprite; spriteId = AddItemIconObject(1, 1, itemId); if (spriteId == MAX_SPRITES) return NULL; @@ -925,7 +925,7 @@ bool8 PSA_IsItemUseOnMonAnimActive(void) static void Task_ItemUseOnMonAnim(u8 taskId) { s16 *data = gTasks[taskId].data; - struct Sprite * sprite = (void *)GetWordTaskArg(taskId, tOff_ItemSprite); + struct Sprite *sprite = (void *)GetWordTaskArg(taskId, tOff_ItemSprite); switch (tState) { case 0: @@ -987,7 +987,7 @@ static void Task_ItemUseOnMonAnim(u8 taskId) } } -static void CreateSprites_UseItem_OutwardSpiralDots(u8 taskId, s16 *data, struct Sprite * sprite) +static void CreateSprites_UseItem_OutwardSpiralDots(u8 taskId, s16 *data, struct Sprite *sprite) { int x = sprite->x + sprite->x2 - 4; int y = sprite->y + sprite->y2 - 4; @@ -1008,7 +1008,7 @@ static void CreateSprites_UseItem_OutwardSpiralDots(u8 taskId, s16 *data, struct } } -static void SpriteCB_OutwardSpiralDots(struct Sprite * sprite) +static void SpriteCB_OutwardSpiralDots(struct Sprite *sprite) { s16 *data = sprite->data; if (data[0] < 16) @@ -1036,7 +1036,7 @@ void PSA_UseItem_CleanUpForCancel(void) } } -static void InitItemIconSpriteState(struct PokemonSpecialAnimScene * scene, struct Sprite * sprite, u8 closeness) +static void InitItemIconSpriteState(struct PokemonSpecialAnimScene * scene, struct Sprite *sprite, u8 closeness) { u16 species, x, y; u32 personality; @@ -1103,7 +1103,7 @@ static void MachineSetWobbleInit(void) MachineSetWobble_SetCB(scene->itemIconSprite); } -static void MachineSetWobble_SetCB(struct Sprite * sprite) +static void MachineSetWobble_SetCB(struct Sprite *sprite) { sprite->data[0] = 0; sprite->data[1] = 0; @@ -1116,7 +1116,7 @@ static bool8 MachineSetWobbleCBIsRunning(void) return scene->monSprite->callback != SpriteCallbackDummy; } -static void SpriteCB_MachineSetWobble(struct Sprite * sprite) +static void SpriteCB_MachineSetWobble(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -1206,7 +1206,7 @@ static u8 AnyStarSpritesActive(void) return PSA_GetSceneWork()->field_0002; } -static void SpriteCB_Star(struct Sprite * sprite) +static void SpriteCB_Star(struct Sprite *sprite) { sprite->data[0]++; if (sprite->data[0] < 10) @@ -1266,7 +1266,7 @@ static void Task_UseItem_OutwardSpiralDots(u8 taskId) if (tTimer == 0) { u32 spriteId, x, y, x2, y2, ampl; - struct Sprite * sprite = PSA_GetSceneWork()->itemIconSprite; + struct Sprite *sprite = PSA_GetSceneWork()->itemIconSprite; x = sprite->x + sprite->x2; y = sprite->y + sprite->y2; ampl = (PSAScene_RandomFromTask(taskId) % 21) + 70; @@ -1308,7 +1308,7 @@ static u16 PSAScene_RandomFromTask(u8 taskId) return state >> 16; } -static void SpriteCallback_UseItem_OutwardSpiralDots(struct Sprite * sprite) +static void SpriteCallback_UseItem_OutwardSpiralDots(struct Sprite *sprite) { int x; int y; @@ -1448,7 +1448,7 @@ static void CreateLevelUpVerticalSprite(u8 taskId, s16 *data) } } -static void SpriteCB_LevelUpVertical(struct Sprite * sprite) +static void SpriteCB_LevelUpVertical(struct Sprite *sprite) { sprite->tsYsubpixel -= sprite->tsSpeed; sprite->y2 = sprite->tsYsubpixel >> 4; diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index 60c22aa3e..3bb940566 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -15,14 +15,18 @@ #include "constants/field_weather.h" #include "constants/help_system.h" -struct PSS_MenuStringPtrs -{ - const u8 *text; - const u8 *desc; +// PC main menu options +enum { + OPTION_WITHDRAW, + OPTION_DEPOSIT, + OPTION_MOVE_MONS, + OPTION_MOVE_ITEMS, + OPTION_EXIT, + OPTIONS_COUNT }; static EWRAM_DATA u8 sPreviousBoxOption = 0; -static EWRAM_DATA struct UnkPSSStruct_2002370 *sBoxSelectionPopupSpriteManager = NULL; +static EWRAM_DATA struct ChooseBoxMenu *sBoxSelectionPopupSpriteManager = NULL; static void PSS_CreatePCMenu(u8 whichMenu, s16 *windowIdPtr); static void sub_808C9C4(u8 curBox); @@ -31,7 +35,7 @@ static void UpdateBoxNameAndCountSprite_WraparoundRight(void); static void UpdateBoxNameAndCountSprite_WraparoundLeft(void); static void PrintBoxNameAndCountToSprite(void); static void PrintToSpriteWithTagUnk0240(const u8 *a0, u16 x, u16 y); -static void sub_808CD64(struct Sprite * sprite); +static void sub_808CD64(struct Sprite *sprite); // Forward declarations @@ -39,12 +43,15 @@ static const u16 sBoxSelectionPopupPalette[]; static const u16 sBoxSelectionPopupCenterTiles[]; static const u16 sBoxSelectionPopupSidesTiles[]; -static const struct PSS_MenuStringPtrs sUnknown_83CDA20[] = { - {gText_WithdrawPokemon, gText_WithdrawMonDescription}, - {gText_DepositPokemon, gText_DepositMonDescription }, - {gText_MovePokemon, gText_MoveMonDescription }, - {gText_MoveItems, gText_MoveItemsDescription }, - {gText_SeeYa, gText_SeeYaDescription } +struct { + const u8 *text; + const u8 *desc; +} static const sMainMenuTexts[OPTIONS_COUNT] = { + [OPTION_WITHDRAW] = {gText_WithdrawPokemon, gText_WithdrawMonDescription}, + [OPTION_DEPOSIT] = {gText_DepositPokemon, gText_DepositMonDescription}, + [OPTION_MOVE_MONS] = {gText_MovePokemon, gText_MoveMonDescription}, + [OPTION_MOVE_ITEMS] = {gText_MoveItems, gText_MoveItemsDescription}, + [OPTION_EXIT] = {gText_SeeYa, gText_SeeYaDescription} }; void DrawTextWindowAndBufferTiles(const u8 *string, void *dst, u8 zero1, u8 zero2, u8 *buffer, s32 bytesToBuffer) @@ -60,7 +67,7 @@ void DrawTextWindowAndBufferTiles(const u8 *string, void *dst, u8 zero1, u8 zero windowId = AddWindow(&winTemplate); FillWindowPixelBuffer(windowId, PIXEL_FILL(zero2)); tileData1 = (u8 *)GetWindowAttribute(windowId, WINDOW_TILE_DATA); - tileData2 = (winTemplate.width * 32) + tileData1; + tileData2 = (winTemplate.width * TILE_SIZE_4BPP) + tileData1; if (!zero1) txtColor[0] = TEXT_COLOR_TRANSPARENT; @@ -223,7 +230,8 @@ static void sub_808C25C(u16 *dest, u16 dest_left, u16 dest_top, const u16 *src, } } -static void sub_808C2D8(u16 *dest, u16 dest_left, u16 dest_top, u16 width, u16 height) +// Unused +static void UnusedWriteRectDma(u16 *dest, u16 dest_left, u16 dest_top, u16 width, u16 height) { u16 i; @@ -233,109 +241,138 @@ static void sub_808C2D8(u16 *dest, u16 dest_left, u16 dest_top, u16 width, u16 h Dma3FillLarge16_(0, dest, width); } -static void Task_PokemonStorageSystemPC(u8 taskId) + +//------------------------------------------------------------------------------ +// SECTION: Main menu +// +// The below functions generally handle the PC main menu where the main +// options can be selected (Withdraw, Deposit, etc.), as well as exiting +// Pokémon Storage back to this menu. +//------------------------------------------------------------------------------ + + +enum { + STATE_LOAD, + STATE_FADE_IN, + STATE_HANDLE_INPUT, + STATE_ERROR_MSG, + STATE_ENTER_PC, +}; + +#define tState data[0] +#define tSelectedOption data[1] +#define tInput data[2] +#define tNextOption data[3] +#define tWindowId data[15] + +static void Task_PCMainMenu(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { - case 0: + case STATE_LOAD: SetHelpContext(HELPCONTEXT_BILLS_PC); - PSS_CreatePCMenu(task->data[1], &task->data[15]); + PSS_CreatePCMenu(task->tSelectedOption, &task->tWindowId); LoadStdWindowFrameGfx(); - DrawDialogueFrame(0, 0); + DrawDialogueFrame(0, FALSE); FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, TEXT_SKIP_DRAW, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, 2, sMainMenuTexts[task->tSelectedOption].desc, TEXT_SKIP_DRAW, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); - CopyWindowToVram(task->data[15], COPYWIN_FULL); - task->data[0]++; + CopyWindowToVram(task->tWindowId, COPYWIN_FULL); + task->tState++; break; - case 1: + case STATE_FADE_IN: if (IsWeatherNotFadingIn()) { - task->data[0]++; + task->tState++; } break; - case 2: - task->data[2] = Menu_ProcessInput(); - switch(task->data[2]) + case STATE_HANDLE_INPUT: + task->tInput = Menu_ProcessInput(); + switch(task->tInput) { case MENU_NOTHING_CHOSEN: - task->data[3] = task->data[1]; - if (JOY_NEW(DPAD_UP) && --task->data[3] < 0) - task->data[3] = 4; + task->tNextOption = task->tSelectedOption; + if (JOY_NEW(DPAD_UP) && --task->tNextOption < 0) + task->tNextOption = OPTIONS_COUNT - 1; + if (JOY_NEW(DPAD_DOWN) && ++task->tNextOption > OPTIONS_COUNT - 1) + task->tNextOption = 0; - if (JOY_NEW(DPAD_DOWN) && ++task->data[3] > 4) - task->data[3] = 0; - if (task->data[1] != task->data[3]) + if (task->tSelectedOption != task->tNextOption) { - task->data[1] = task->data[3]; + task->tSelectedOption = task->tNextOption; FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, 2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } break; case MENU_B_PRESSED: - case 4: + case OPTION_EXIT: ClearStdWindowAndFrame(0, TRUE); - ClearStdWindowAndFrame(task->data[15], TRUE); + ClearStdWindowAndFrame(task->tWindowId, TRUE); ScriptContext2_Disable(); EnableBothScriptContexts(); DestroyTask(taskId); break; default: - if (task->data[2] == 0 && CountPartyMons() == PARTY_SIZE) + if (task->tInput == 0 && CountPartyMons() == PARTY_SIZE) { + // Can't withdraw FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 2, gText_PartyFull, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); - task->data[0] = 3; + task->tState = 3; } - else if (task->data[2] == 1 && CountPartyMons() == 1) + else if (task->tInput == 1 && CountPartyMons() == 1) { + // Can't deposit FillWindowPixelBuffer(0, PIXEL_FILL(1)); AddTextPrinterParameterized2(0, 2, gText_JustOnePkmn, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); - task->data[0] = 3; + task->tState = STATE_ERROR_MSG; } else { + // Enter PC FadeScreen(FADE_TO_BLACK, 0); - task->data[0] = 4; + task->tState = STATE_ENTER_PC; } break; } break; - case 3: + case STATE_ERROR_MSG: + // Printed "can't do PC option message" + // Wait for new input after message if (JOY_NEW(A_BUTTON | B_BUTTON)) { FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); - task->data[0] = 2; + AddTextPrinterParameterized2(0, 2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + task->tState = STATE_HANDLE_INPUT; } else if (JOY_NEW(DPAD_UP)) { - if (--task->data[1] < 0) - task->data[1] = 4; + if (--task->tSelectedOption < 0) + task->tSelectedOption = 4; Menu_MoveCursor(-1); - task->data[1] = Menu_GetCursorPos(); + task->tSelectedOption = Menu_GetCursorPos(); FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); - task->data[0] = 2; + AddTextPrinterParameterized2(0, 2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + task->tState = STATE_HANDLE_INPUT; } else if (JOY_NEW(DPAD_DOWN)) { - if (++task->data[1] > 3) - task->data[1] = 0; + if (++task->tSelectedOption > 3) + task->tSelectedOption = 0; Menu_MoveCursor(1); - task->data[1] = Menu_GetCursorPos(); + task->tSelectedOption = Menu_GetCursorPos(); FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); - task->data[0] = 2; + AddTextPrinterParameterized2(0, 2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + task->tState = STATE_HANDLE_INPUT; } break; - case 4: + case STATE_ENTER_PC: if (!gPaletteFade.active) { CleanupOverworldWindowsAndTilemaps(); - Cb2_EnterPSS(task->data[2]); + Cb2_EnterPSS(task->tInput); DestroyTask(taskId); } break; @@ -344,22 +381,22 @@ static void Task_PokemonStorageSystemPC(u8 taskId) void ShowPokemonStorageSystemPC(void) { - u8 taskId = CreateTask(Task_PokemonStorageSystemPC, 80); - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[1] = 0; + u8 taskId = CreateTask(Task_PCMainMenu, 80); + gTasks[taskId].tState = 0; + gTasks[taskId].tSelectedOption = 0; ScriptContext2_Enable(); } -static void FieldCb_ReturnToPcMenu(void) +static void FieldTask_ReturnToPcMenu(void) { u8 taskId; MainCallback vblankCb = gMain.vblankCallback; SetVBlankCallback(NULL); - taskId = CreateTask(Task_PokemonStorageSystemPC, 80); - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[1] = sPreviousBoxOption; - Task_PokemonStorageSystemPC(taskId); + taskId = CreateTask(Task_PCMainMenu, 80); + gTasks[taskId].tState = 0; + gTasks[taskId].tSelectedOption = sPreviousBoxOption; + Task_PCMainMenu(taskId); SetVBlankCallback(vblankCb); FadeInFromBlack(); } @@ -380,15 +417,15 @@ static void PSS_CreatePCMenu(u8 whichMenu, s16 *windowIdPtr) windowId = AddWindow(&sUnknown_83CDA48); DrawStdWindowFrame(windowId, FALSE); - PrintTextArray(windowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, 16, NELEMS(sUnknown_83CDA20), (void *)sUnknown_83CDA20); - Menu_InitCursor(windowId, 2, 0, 2, 16, NELEMS(sUnknown_83CDA20), whichMenu); + PrintTextArray(windowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, 16, NELEMS(sMainMenuTexts), (void *)sMainMenuTexts); + Menu_InitCursor(windowId, 2, 0, 2, 16, NELEMS(sMainMenuTexts), whichMenu); *windowIdPtr = windowId; } -void Cb2_ExitPSS(void) +void CB2_ExitPokeStorage(void) { sPreviousBoxOption = GetCurrentBoxOption(); - gFieldCallback = FieldCb_ReturnToPcMenu; + gFieldCallback = FieldTask_ReturnToPcMenu; SetMainCallback2(CB2_ReturnToField); } @@ -407,13 +444,22 @@ void ResetPokemonStorageSystem(void) u8 *dest = StringCopy(GetBoxNamePtr(boxId), gText_Box); ConvertIntToDecimalStringN(dest, boxId + 1, STR_CONV_MODE_LEFT_ALIGN, 2); } + for (boxId = 0; boxId < TOTAL_BOXES_COUNT; boxId++) - { - SetBoxWallpaper(boxId, boxId % 4); - } + SetBoxWallpaper(boxId, boxId % (MAX_DEFAULT_WALLPAPER + 1)); } -void LoadBoxSelectionPopupSpriteGfx(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3, bool32 loadPal) + +//------------------------------------------------------------------------------ +// SECTION: Choose Box menu +// +// The below functions handle the popup menu that allows the player to cycle +// through the boxes and select one. Used when storing Pokémon in Deposit mode +// and for the Jump feature. +//------------------------------------------------------------------------------ + + +void LoadChooseBoxMenuGfx(struct ChooseBoxMenu *a0, u16 tileTag, u16 palTag, u8 a3, bool32 loadPal) { struct SpritePalette palette = { sBoxSelectionPopupPalette, palTag @@ -429,18 +475,18 @@ void LoadBoxSelectionPopupSpriteGfx(struct UnkPSSStruct_2002370 *a0, u16 tileTag LoadSpriteSheets(sheets); sBoxSelectionPopupSpriteManager = a0; - a0->tilesTag = tileTag; + a0->tileTag = tileTag; a0->paletteTag = palTag; a0->subpriority = a3; - a0->loadPal = loadPal; + a0->loadedPalette = loadPal; } void FreeBoxSelectionPopupSpriteGfx(void) { - if (sBoxSelectionPopupSpriteManager->loadPal) + if (sBoxSelectionPopupSpriteManager->loadedPalette) FreeSpritePaletteByTag(sBoxSelectionPopupSpriteManager->paletteTag); - FreeSpriteTilesByTag(sBoxSelectionPopupSpriteManager->tilesTag); - FreeSpriteTilesByTag(sBoxSelectionPopupSpriteManager->tilesTag + 1); + FreeSpriteTilesByTag(sBoxSelectionPopupSpriteManager->tileTag); + FreeSpriteTilesByTag(sBoxSelectionPopupSpriteManager->tileTag + 1); } void sub_808C940(u8 curBox) @@ -529,43 +575,43 @@ static void sub_808C9C4(u8 curBox) const u8 gUnknown_83CDA94[] = _("/30"); sBoxSelectionPopupSpriteManager->curBox = curBox; - template.tileTag = sBoxSelectionPopupSpriteManager->tilesTag; + template.tileTag = sBoxSelectionPopupSpriteManager->tileTag; template.paletteTag = sBoxSelectionPopupSpriteManager->paletteTag; spriteId = CreateSprite(&template, 160, 96, 0); - sBoxSelectionPopupSpriteManager->unk_0000 = gSprites + spriteId; + sBoxSelectionPopupSpriteManager->menuSprite = gSprites + spriteId; // Manual subsprites oamData.shape = SPRITE_SHAPE(8x32); oamData.size = SPRITE_SIZE(8x32); - template.tileTag = sBoxSelectionPopupSpriteManager->tilesTag + 1; + template.tileTag = sBoxSelectionPopupSpriteManager->tileTag + 1; template.anims = gUnknown_83CDA70; for (i = 0; i < 4; i++) { u16 r5; spriteId = CreateSprite(&template, 124, 80, sBoxSelectionPopupSpriteManager->subpriority); - sBoxSelectionPopupSpriteManager->unk_0004[i] = gSprites + spriteId; + sBoxSelectionPopupSpriteManager->menuSideSprites[i] = gSprites + spriteId; r5 = 0; if (i & 2) { - sBoxSelectionPopupSpriteManager->unk_0004[i]->x = 196; + sBoxSelectionPopupSpriteManager->menuSideSprites[i]->x = 196; r5 = 2; } if (i & 1) { - sBoxSelectionPopupSpriteManager->unk_0004[i]->y = 112; - sBoxSelectionPopupSpriteManager->unk_0004[i]->oam.size = SPRITE_SIZE(8x16); + sBoxSelectionPopupSpriteManager->menuSideSprites[i]->y = 112; + sBoxSelectionPopupSpriteManager->menuSideSprites[i]->oam.size = SPRITE_SIZE(8x16); r5++; } - StartSpriteAnim(sBoxSelectionPopupSpriteManager->unk_0004[i], r5); + StartSpriteAnim(sBoxSelectionPopupSpriteManager->menuSideSprites[i], r5); } for (i = 0; i < 2; i++) { - sBoxSelectionPopupSpriteManager->unk_0020[i] = sub_809223C(72 * i + 0x7c, 0x58, i, 0, sBoxSelectionPopupSpriteManager->subpriority); - if (sBoxSelectionPopupSpriteManager->unk_0020[i]) + sBoxSelectionPopupSpriteManager->arrowSprites[i] = sub_809223C(72 * i + 0x7c, 0x58, i, 0, sBoxSelectionPopupSpriteManager->subpriority); + if (sBoxSelectionPopupSpriteManager->arrowSprites[i]) { - sBoxSelectionPopupSpriteManager->unk_0020[i]->data[0] = (i == 0 ? -1 : 1); - sBoxSelectionPopupSpriteManager->unk_0020[i]->callback = sub_808CD64; + sBoxSelectionPopupSpriteManager->arrowSprites[i]->data[0] = (i == 0 ? -1 : 1); + sBoxSelectionPopupSpriteManager->arrowSprites[i]->callback = sub_808CD64; } } PrintBoxNameAndCountToSprite(); @@ -576,23 +622,23 @@ static void sub_808C9C4(u8 curBox) static void sub_808CBA4(void) { u16 i; - if (sBoxSelectionPopupSpriteManager->unk_0000) + if (sBoxSelectionPopupSpriteManager->menuSprite) { - DestroySprite(sBoxSelectionPopupSpriteManager->unk_0000); - sBoxSelectionPopupSpriteManager->unk_0000 = NULL; + DestroySprite(sBoxSelectionPopupSpriteManager->menuSprite); + sBoxSelectionPopupSpriteManager->menuSprite = NULL; } for (i = 0; i < 4; i++) { - if (sBoxSelectionPopupSpriteManager->unk_0004[i]) + if (sBoxSelectionPopupSpriteManager->menuSideSprites[i]) { - DestroySprite(sBoxSelectionPopupSpriteManager->unk_0004[i]); - sBoxSelectionPopupSpriteManager->unk_0004[i] = NULL; + DestroySprite(sBoxSelectionPopupSpriteManager->menuSideSprites[i]); + sBoxSelectionPopupSpriteManager->menuSideSprites[i] = NULL; } } for (i = 0; i < 2; i++) { - if (sBoxSelectionPopupSpriteManager->unk_0020[i]) - DestroySprite(sBoxSelectionPopupSpriteManager->unk_0020[i]); + if (sBoxSelectionPopupSpriteManager->arrowSprites[i]) + DestroySprite(sBoxSelectionPopupSpriteManager->arrowSprites[i]); } } @@ -627,7 +673,7 @@ static void PrintBoxNameAndCountToSprite(void) static void PrintToSpriteWithTagUnk0240(const u8 *str, u16 x, u16 y) { - u16 tileStart = GetSpriteTileStartByTag(sBoxSelectionPopupSpriteManager->tilesTag); + u16 tileStart = GetSpriteTileStartByTag(sBoxSelectionPopupSpriteManager->tileTag); PrintStringToBufferCopyNow(str, (void *)(OBJ_VRAM0 + tileStart * 32 + 256 * y + 32 * x), 0x100, TEXT_COLOR_RED, TEXT_DYNAMIC_COLOR_6, TEXT_DYNAMIC_COLOR_5, sBoxSelectionPopupSpriteManager->buffer); } diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index 9c6543eae..fdcd726fb 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -76,7 +76,7 @@ static void PSS_CreateMonMarkingSprite(void); static void CreateWaveformSprites(void); static void RefreshCursorMonData(void); static void BoxSetMosaic(void); -static void SpriteCB_CursorMon_Mosaic(struct Sprite * sprite); +static void SpriteCB_CursorMon_Mosaic(struct Sprite *sprite); static bool8 BoxGetMosaic(void); static void LoadCursorMonSprite(void); static void LoadCursorMonGfx(u16 species, u32 pid); @@ -370,7 +370,7 @@ void Cb2_EnterPSS(u8 boxOption) sCurrentBoxOption = boxOption; gPSSData = Alloc(sizeof(struct PokemonStorageSystemData)); if (gPSSData == NULL) - SetMainCallback2(Cb2_ExitPSS); + SetMainCallback2(CB2_ExitPokeStorage); else { gPSSData->boxOption = boxOption; @@ -389,7 +389,7 @@ void Cb2_ReturnToPSS(void) ResetTasks(); gPSSData = Alloc(sizeof(struct PokemonStorageSystemData)); if (gPSSData == NULL) - SetMainCallback2(Cb2_ExitPSS); + SetMainCallback2(CB2_ExitPokeStorage); else { gPSSData->boxOption = sCurrentBoxOption; @@ -421,13 +421,13 @@ static void sub_808CF10(void) FreeAllSpritePalettes(); ClearDma3Requests(); gReservedSpriteTileCount = 0x280; - sub_8096BE4(&gPSSData->unk_0020, gPSSData->unk_0028, 8); + sub_8096BE4(&gPSSData->unkUtil, gPSSData->unkUtilData, 8); gKeyRepeatStartDelay = 20; ClearScheduledBgCopiesToVram(); AllocBoxPartyPokemonDropdowns(3); SetBoxPartyPokemonDropdownMap2(0, 1, gUnknown_83CE6F8, 8, 4); SetBoxPartyPokemonDropdownMap2Pos(0, 1, 0); - gPSSData->unk_02C7 = FALSE; + gPSSData->closeBoxFlashing = FALSE; } static void sub_808CF94(void) @@ -531,10 +531,10 @@ static void Cb_InitPSS(u8 taskId) if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) { - gPSSData->field_DA4.baseTileTag = TAG_TILE_D; - gPSSData->field_DA4.basePaletteTag = TAG_PAL_DACE; - SetMonMarkingsMenuPointer(&gPSSData->field_DA4); - LoadMonMarkingsFrameGfx(); + gPSSData->markMenu.baseTileTag = TAG_TILE_D; + gPSSData->markMenu.basePaletteTag = TAG_PAL_DACE; + InitMonMarkingsMenu(&gPSSData->markMenu); + BufferMonMarkingsMenuTiles(); } else { @@ -622,7 +622,7 @@ static void Cb_MainPSS(u8 taskId) case 6: if (gPSSData->boxOption == BOX_OPTION_MOVE_MONS) { - if (IsMonBeingMoved() && ItemIsMail(gPSSData->cursorMonItem)) + if (IsMonBeingMoved() && ItemIsMail(gPSSData->displayMonItemId)) gPSSData->state = 5; else SetPSSCallback(Cb_HidePartyPokemon); @@ -680,7 +680,7 @@ static void Cb_MainPSS(u8 taskId) case 11: if (!CanMovePartyMon()) { - if (ItemIsMail(gPSSData->cursorMonItem)) + if (ItemIsMail(gPSSData->displayMonItemId)) { gPSSData->state = 5; } @@ -911,7 +911,7 @@ static void Cb_OnSelectedMon(u8 taskId) PlaySE(SE_SELECT); if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) PrintStorageActionText(PC_TEXT_IS_SELECTED); - else if (IsActiveItemMoving() || gPSSData->cursorMonItem != 0) + else if (IsActiveItemMoving() || gPSSData->displayMonItemId != 0) PrintStorageActionText(PC_TEXT_IS_SELECTED2); else PrintStorageActionText(PC_TEXT_GIVE_TO_MON); @@ -971,7 +971,7 @@ static void Cb_OnSelectedMon(u8 taskId) { gPSSData->state = 3; } - else if (ItemIsMail(gPSSData->cursorMonItem)) + else if (ItemIsMail(gPSSData->displayMonItemId)) { gPSSData->state = 4; } @@ -987,11 +987,11 @@ static void Cb_OnSelectedMon(u8 taskId) { gPSSData->state = 3; } - else if (gPSSData->cursorMonIsEgg) + else if (gPSSData->displayMonIsEgg) { gPSSData->state = 5; // Cannot release an Egg. } - else if (ItemIsMail(gPSSData->cursorMonItem)) + else if (ItemIsMail(gPSSData->displayMonItemId)) { gPSSData->state = 4; } @@ -1177,7 +1177,7 @@ static void Cb_DepositMenu(u8 taskId) { case 0: PrintStorageActionText(PC_TEXT_DEPOSIT_IN_WHICH_BOX); - LoadBoxSelectionPopupSpriteGfx(&gPSSData->field_1E5C, TAG_TILE_A, TAG_PAL_DAC7, 3, FALSE); + LoadChooseBoxMenuGfx(&gPSSData->field_1E5C, TAG_TILE_A, TAG_PAL_DAC7, 3, FALSE); sub_808C940(gUnknown_20397B6); gPSSData->state++; break; @@ -1372,16 +1372,16 @@ static void Cb_ShowMarkMenu(u8 taskId) { case 0: PrintStorageActionText(PC_TEXT_MARK_POKE); - gPSSData->field_DA4.markings = gPSSData->cursorMonMarkings; - DrawMonMarkingsMenu(gPSSData->cursorMonMarkings, 0xb0, 0x10); + gPSSData->markMenu.markings = gPSSData->displayMonMarkings; + OpenMonMarkingsMenu(gPSSData->displayMonMarkings, 0xb0, 0x10); gPSSData->state++; break; case 1: - if (!MonMarkingsHandleInput()) + if (!HandleMonMarkingsMenuInput()) { - TeardownMonMarkingsMenu(); + FreeMonMarkingsMenu(); ClearBottomWindow(); - SetMonMarkings(gPSSData->field_DA4.markings); + SetMonMarkings(gPSSData->markMenu.markings); RefreshCursorMonData(); SetPSSCallback(Cb_MainPSS); } @@ -1394,7 +1394,7 @@ static void Cb_TakeItemForMoving(u8 taskId) switch (gPSSData->state) { case 0: - if (!ItemIsMail(gPSSData->cursorMonItem)) + if (!ItemIsMail(gPSSData->displayMonItemId)) { ClearBottomWindow(); gPSSData->state++; @@ -1468,7 +1468,7 @@ static void Cb_ItemToBag(u8 taskId) switch (gPSSData->state) { case 0: - if (!AddBagItem(gPSSData->cursorMonItem, 1)) + if (!AddBagItem(gPSSData->displayMonItemId, 1)) { PlaySE(SE_FAILURE); PrintStorageActionText(PC_TEXT_BAG_FULL); @@ -1516,7 +1516,7 @@ static void Cb_SwitchSelectedItem(u8 taskId) switch (gPSSData->state) { case 0: - if (!ItemIsMail(gPSSData->cursorMonItem)) + if (!ItemIsMail(gPSSData->displayMonItemId)) { ClearBottomWindow(); gPSSData->state++; @@ -1814,7 +1814,7 @@ static void Cb_JumpBox(u8 taskId) { case 0: PrintStorageActionText(PC_TEXT_JUMP_TO_WHICH_BOX); - LoadBoxSelectionPopupSpriteGfx(&gPSSData->field_1E5C, TAG_TILE_A, TAG_PAL_DAC7, 3, FALSE); + LoadChooseBoxMenuGfx(&gPSSData->field_1E5C, TAG_TILE_A, TAG_PAL_DAC7, 3, FALSE); sub_808C940(StorageGetCurrentBox()); gPSSData->state++; break; @@ -2051,7 +2051,7 @@ static void Cb_ChangeScreen(u8 taskId) case SCREEN_CHANGE_EXIT_BOX: default: FreePSSData(); - SetMainCallback2(Cb2_ExitPSS); + SetMainCallback2(CB2_ExitPokeStorage); break; case SCREEN_CHANGE_SUMMARY_SCREEN: partyMon = gPSSData->field_218C.mon; @@ -2163,12 +2163,12 @@ static void sub_808F078(void) static void PSS_CreateMonMarkingSprite(void) { - gPSSData->monMarkingSprite = CreateMonMarkingSprite_AllOff(TAG_TILE_10, TAG_PAL_DAC8, NULL); - gPSSData->monMarkingSprite->oam.priority = 1; - gPSSData->monMarkingSprite->subpriority = 1; - gPSSData->monMarkingSprite->x = 40; - gPSSData->monMarkingSprite->y = 150; - gPSSData->monMarkingSpriteTileStart = (void *)OBJ_VRAM0 + 32 * GetSpriteTileStartByTag(TAG_TILE_10); + gPSSData->markingComboSprite = CreateMonMarkingComboSprite(TAG_TILE_10, TAG_PAL_DAC8, NULL); + gPSSData->markingComboSprite->oam.priority = 1; + gPSSData->markingComboSprite->subpriority = 1; + gPSSData->markingComboSprite->x = 40; + gPSSData->markingComboSprite->y = 150; + gPSSData->markingComboTilesPtr = (void *)OBJ_VRAM0 + 32 * GetSpriteTileStartByTag(TAG_TILE_10); } static void CreateWaveformSprites(void) @@ -2180,13 +2180,13 @@ static void CreateWaveformSprites(void) for (i = 0; i < 2; i++) { u8 spriteId = CreateSprite(&sSpriteTemplate_Waveform, i * 63 + 8, 9, 2); - gPSSData->field_D98[i] = &gSprites[spriteId]; + gPSSData->waveformSprites[i] = &gSprites[spriteId]; } } static void RefreshCursorMonData(void) { - LoadCursorMonGfx(gPSSData->cursorMonSpecies, gPSSData->cursorMonPersonality); + LoadCursorMonGfx(gPSSData->displayMonSpecies, gPSSData->displayMonPersonality); PrintCursorMonInfo(); sub_808F5E8(); ScheduleBgCopyTilemapToVram(0); @@ -2274,7 +2274,7 @@ static void LoadCursorMonGfx(u16 species, u32 pid) if (species != SPECIES_NONE) { HandleLoadSpecialPokePic(&gMonFrontPicTable[species], gPSSData->field_22C4, species, pid); - LZ77UnCompWram(gPSSData->cursorMonPalette, gPSSData->field_2244); + LZ77UnCompWram(gPSSData->displayMonPalette, gPSSData->field_2244); CpuCopy32(gPSSData->field_22C4, gPSSData->field_223C, 0x800); LoadPalette(gPSSData->field_2244, gPSSData->field_223A, 0x20); gPSSData->cursorMonSprite->invisible = FALSE; @@ -2294,28 +2294,28 @@ static void PrintCursorMonInfo(void) { for (i = 0, y = 0; i < 3; i++, y += 14) { - AddTextPrinterParameterized(0, 2, gPSSData->cursorMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(0, 2, gPSSData->displayMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); } - AddTextPrinterParameterized(0, 0, gPSSData->cursorMonTexts[3], 6, y + 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(0, 0, gPSSData->displayMonTexts[3], 6, y + 2, TEXT_SKIP_DRAW, NULL); } else { - AddTextPrinterParameterized(0, 0, gPSSData->cursorMonTexts[3], 6, 0, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(0, 0, gPSSData->displayMonTexts[3], 6, 0, TEXT_SKIP_DRAW, NULL); for (i = 0, y = 15; i < 3; i++, y += 14) { - AddTextPrinterParameterized(0, 2, gPSSData->cursorMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(0, 2, gPSSData->displayMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); } } CopyWindowToVram(0, COPYWIN_GFX); - if (gPSSData->cursorMonSpecies != SPECIES_NONE) + if (gPSSData->displayMonSpecies != SPECIES_NONE) { - RequestDma3LoadMonMarking(gPSSData->cursorMonMarkings, gPSSData->monMarkingSpriteTileStart); - gPSSData->monMarkingSprite->invisible = FALSE; + UpdateMonMarkingTiles(gPSSData->displayMonMarkings, gPSSData->markingComboTilesPtr); + gPSSData->markingComboSprite->invisible = FALSE; } else { - gPSSData->monMarkingSprite->invisible = TRUE; + gPSSData->markingComboSprite->invisible = TRUE; } } @@ -2323,17 +2323,17 @@ static void sub_808F5E8(void) { u16 i; - if (gPSSData->cursorMonSpecies != SPECIES_NONE) + if (gPSSData->displayMonSpecies != SPECIES_NONE) { SetBoxPartyPokemonDropdownMap2Rect(0, 0, 0, 8, 2); for (i = 0; i < 2; i++) - StartSpriteAnimIfDifferent(gPSSData->field_D98[i], i * 2 + 1); + StartSpriteAnimIfDifferent(gPSSData->waveformSprites[i], i * 2 + 1); } else { SetBoxPartyPokemonDropdownMap2Rect(0, 0, 2, 8, 2); for (i = 0; i < 2; i++) - StartSpriteAnim(gPSSData->field_D98[i], i * 2); + StartSpriteAnim(gPSSData->waveformSprites[i], i * 2); } CopyBoxPartyPokemonDropdownToBgTilemapBuffer(0); @@ -2342,9 +2342,9 @@ static void sub_808F5E8(void) static void sub_808F68C(void) { - LZ77UnCompWram(gUnknown_8E9CAEC, gPSSData->field_B0); + LZ77UnCompWram(gUnknown_8E9CAEC, gPSSData->partyMenuTilemapBuffer); LoadPalette(gPSSMenu_Pal, 0x10, 0x20); - SetBoxPartyPokemonDropdownMap2(1, 1, gPSSData->field_B0, 12, 22); + SetBoxPartyPokemonDropdownMap2(1, 1, gPSSData->partyMenuTilemapBuffer, 12, 22); SetBoxPartyPokemonDropdownMap2(2, 1, gUnknown_83CE778, 9, 4); SetBoxPartyPokemonDropdownMap2Pos(1, 10, 0); SetBoxPartyPokemonDropdownMap2Pos(2, 21, 0); @@ -2365,29 +2365,29 @@ static void sub_808F68C(void) } ScheduleBgCopyTilemapToVram(1); - gPSSData->unk_02C7 = FALSE; + gPSSData->closeBoxFlashing = FALSE; } static void SetUpShowPartyMenu(void) { - gPSSData->field_2C0 = 20; - gPSSData->field_2C2 = 2; - gPSSData->field_2C5 = 0; + gPSSData->partyMenuUnused1 = 20; + gPSSData->partyMenuY = 2; + gPSSData->partyMenuMoveTimer = 0; CreatePartyMonsSprites(FALSE); } static bool8 ShowPartyMenu(void) { - if (gPSSData->field_2C5 == 20) + if (gPSSData->partyMenuMoveTimer == 20) return FALSE; - gPSSData->field_2C0--; - gPSSData->field_2C2++; + gPSSData->partyMenuUnused1--; + gPSSData->partyMenuY++; AdjustBoxPartyPokemonDropdownPos(1, 3, 1); CopyBoxPartyPokemonDropdownToBgTilemapBuffer(1); ScheduleBgCopyTilemapToVram(1); sub_8090B98(8); - if (++gPSSData->field_2C5 == 20) + if (++gPSSData->partyMenuMoveTimer == 20) { sInPartyMenu = TRUE; return FALSE; @@ -2400,24 +2400,24 @@ static bool8 ShowPartyMenu(void) static void SetUpHidePartyMenu(void) { - gPSSData->field_2C0 = 0; - gPSSData->field_2C2 = 22; - gPSSData->field_2C5 = 0; + gPSSData->partyMenuUnused1 = 0; + gPSSData->partyMenuY = 22; + gPSSData->partyMenuMoveTimer = 0; if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) sub_80960C0(); } static bool8 HidePartyMenu(void) { - if (gPSSData->field_2C5 != 20) + if (gPSSData->partyMenuMoveTimer != 20) { - gPSSData->field_2C0++; - gPSSData->field_2C2--; + gPSSData->partyMenuUnused1++; + gPSSData->partyMenuY--; AdjustBoxPartyPokemonDropdownPos(1, 3, -1); CopyBoxPartyPokemonDropdownToBgTilemapBuffer(1); - FillBgTilemapBufferRect_Palette0(1, 0x100, 10, gPSSData->field_2C2, 12, 1); + FillBgTilemapBufferRect_Palette0(1, 0x100, 10, gPSSData->partyMenuY, 12, 1); sub_8090B98(-8); - if (++gPSSData->field_2C5 != 20) + if (++gPSSData->partyMenuMoveTimer != 20) { ScheduleBgCopyTilemapToVram(1); return TRUE; @@ -2450,27 +2450,27 @@ static void sub_808F90C(bool8 arg0) static void sub_808F948(void) { - gPSSData->unk_02C7 = TRUE; - gPSSData->unk_02C8 = 30; - gPSSData->unk_02C9 = TRUE; + gPSSData->closeBoxFlashing = TRUE; + gPSSData->closeBoxFlashTimer = 30; + gPSSData->closeBoxFlashState = TRUE; } static void sub_808F974(void) { - if (gPSSData->unk_02C7) + if (gPSSData->closeBoxFlashing) { - gPSSData->unk_02C7 = FALSE; + gPSSData->closeBoxFlashing = FALSE; sub_808F90C(TRUE); } } static void sub_808F99C(void) { - if (gPSSData->unk_02C7 && ++gPSSData->unk_02C8 > 30) + if (gPSSData->closeBoxFlashing && ++gPSSData->closeBoxFlashTimer > 30) { - gPSSData->unk_02C8 = 0; - gPSSData->unk_02C9 = (gPSSData->unk_02C9 == FALSE); - sub_808F90C(gPSSData->unk_02C9); + gPSSData->closeBoxFlashTimer = 0; + gPSSData->closeBoxFlashState = (gPSSData->closeBoxFlashState == FALSE); + sub_808F90C(gPSSData->closeBoxFlashState); } } @@ -2502,7 +2502,7 @@ static void sub_808FA30(u8 pos, bool8 isPartyMon) { for (j = 0; j < 4; j++) { - gPSSData->field_B0[index + j] = data[j]; + gPSSData->partyMenuTilemapBuffer[index + j] = data[j]; } data += 4; index += 12; @@ -2569,7 +2569,7 @@ static void PrintStorageActionText(u8 id) case PC_TEXT_FMT_MON_NAME_1: case PC_TEXT_FMT_MON_NAME_2: case PC_TEXT_FMT_MON_NAME_3: - DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gPSSData->cursorMonNick); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gPSSData->displayMonName); break; case PC_TEXT_FMT_MON_NAME_4: case PC_TEXT_FMT_MON_NAME_5: @@ -2580,7 +2580,7 @@ static void PrintStorageActionText(u8 id) if (IsActiveItemMoving()) txtPtr = StringCopy(gPSSData->itemName, GetMovingItemName()); else - txtPtr = StringCopy(gPSSData->itemName, gPSSData->cursorMonTexts[3]); + txtPtr = StringCopy(gPSSData->itemName, gPSSData->displayMonTexts[3]); while (*(txtPtr - 1) == CHAR_SPACE) txtPtr--; @@ -2680,7 +2680,7 @@ static void sub_808FE54(u8 action) { u16 event; u8 fromBox = sub_8094D34(); - u16 species = gPSSData->cursorMonSpecies; + u16 species = gPSSData->displayMonSpecies; u16 species2; u8 toBox; struct PssQuestLogBuffer * qlogBuffer; diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 4a1b99ece..9041c277a 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -9,12 +9,12 @@ #include "task.h" #include "trig.h" -static void sub_8090324(struct Sprite * sprite); +static void sub_8090324(struct Sprite *sprite); static void SetBoxSpeciesAndPersonalities(u8 boxId); -static void sub_8090A74(struct Sprite * sprite, u16 idx); -static void sub_8090AE0(struct Sprite * sprite); -static void DestroyBoxMonIcon(struct Sprite * sprite); -static void sub_80911B0(struct Sprite * sprite); +static void sub_8090A74(struct Sprite *sprite, u16 idx); +static void sub_8090AE0(struct Sprite *sprite); +static void DestroyBoxMonIcon(struct Sprite *sprite); +static void sub_80911B0(struct Sprite *sprite); static void sub_8091420(u8 taskId); static s8 sub_80916F4(u8 boxId); static void LoadWallpaperGfx(u8 wallpaperId, s8 direction); @@ -23,15 +23,15 @@ static void sub_8091984(void *buffer, const void *buffer2, s8 direction, u8 base static void sub_8091A24(void *buffer); static void sub_8091A94(u8 wallpaperId); static void sub_8091C48(u8 wallpaperId, s8 direction); -static void sub_8091E84(struct Sprite * sprite); -static void sub_8091EB8(struct Sprite * sprite); +static void sub_8091E84(struct Sprite *sprite); +static void sub_8091EB8(struct Sprite *sprite); static s16 sub_8091F60(const u8 *boxName); static void sub_8091E34(void); static void sub_8091EF0(void); static void sub_8091F80(void); static void sub_809200C(s8 direction); static void sub_80920AC(void); -static void sub_8092164(struct Sprite * sprite); +static void sub_8092164(struct Sprite *sprite); static const struct OamData gUnknown_83CEC08; @@ -259,16 +259,16 @@ void sub_808FFAC(void) LoadMonIconPalettes(); for (i = 0; i < MAX_MON_ICONS; i++) - gPSSData->field_B08[i] = 0; + gPSSData->numIconsPerSpecies[i] = 0; for (i = 0; i < MAX_MON_ICONS; i++) - gPSSData->field_B58[i] = 0; + gPSSData->iconSpeciesList[i] = 0; for (i = 0; i < PARTY_SIZE; i++) gPSSData->partySprites[i] = NULL; for (i = 0; i < IN_BOX_COUNT; i++) gPSSData->boxMonsSprites[i] = NULL; gPSSData->movingMonSprite = NULL; - gPSSData->field_78C = 0; + gPSSData->unkUnused1 = 0; } static u8 sub_8090058(void) @@ -364,7 +364,7 @@ static void sub_80902E0(struct Sprite *sprite) } else { - gPSSData->field_C66--; + gPSSData->iconScrollNumIncoming--; sprite->x = sprite->data[3]; sprite->callback = SpriteCallbackDummy; } @@ -448,7 +448,7 @@ static u8 sub_80903A4(u8 row, u16 times, s16 xDelta) gPSSData->boxMonsSprites[boxPosition]->data[2] = xDelta; gPSSData->boxMonsSprites[boxPosition]->data[3] = xDest; gPSSData->boxMonsSprites[boxPosition]->callback = sub_80902E0; - if (GetBoxMonDataAt(gPSSData->field_C5C, boxPosition, MON_DATA_HELD_ITEM) == 0) + if (GetBoxMonDataAt(gPSSData->incomingBoxId, boxPosition, MON_DATA_HELD_ITEM) == 0) gPSSData->boxMonsSprites[boxPosition]->oam.objMode = ST_OAM_OBJ_BLEND; count++; } @@ -463,56 +463,56 @@ static u8 sub_80903A4(u8 row, u16 times, s16 xDelta) static void sub_8090574(u8 boxId, s8 direction) { - gPSSData->field_C6A = 0; - gPSSData->field_C6B = boxId; - gPSSData->field_C69 = direction; - gPSSData->field_C60 = 32; - gPSSData->field_C64 = -(6 * direction); - gPSSData->field_C66 = 0; + gPSSData->iconScrollState = 0; + gPSSData->iconScrollToBoxId = boxId; + gPSSData->iconScrollDirection = direction; + gPSSData->iconScrollDistance = 32; + gPSSData->iconScrollSpeed = -(6 * direction); + gPSSData->iconScrollNumIncoming = 0; SetBoxSpeciesAndPersonalities(boxId); if (direction > 0) - gPSSData->field_C68 = 0; + gPSSData->iconScrollCurColumn = 0; else - gPSSData->field_C68 = IN_BOX_ROWS - 1; + gPSSData->iconScrollCurColumn = IN_BOX_ROWS - 1; - gPSSData->field_C62 = (24 * gPSSData->field_C68) + 100; - sub_809029C(gPSSData->field_C64); + gPSSData->iconScrollPos = (24 * gPSSData->iconScrollCurColumn) + 100; + sub_809029C(gPSSData->iconScrollSpeed); } static bool8 sub_809062C(void) { - if (gPSSData->field_C60 != 0) - gPSSData->field_C60--; + if (gPSSData->iconScrollDistance != 0) + gPSSData->iconScrollDistance--; - switch (gPSSData->field_C6A) + switch (gPSSData->iconScrollState) { case 0: - gPSSData->field_C62 += gPSSData->field_C64; - if (gPSSData->field_C62 <= 64 || gPSSData->field_C62 >= 252) + gPSSData->iconScrollPos += gPSSData->iconScrollSpeed; + if (gPSSData->iconScrollPos <= 64 || gPSSData->iconScrollPos >= 252) { - DestroyAllIconsInRow(gPSSData->field_C68); - gPSSData->field_C62 += gPSSData->field_C69 * 24; - gPSSData->field_C6A++; + DestroyAllIconsInRow(gPSSData->iconScrollCurColumn); + gPSSData->iconScrollPos += gPSSData->iconScrollDirection * 24; + gPSSData->iconScrollState++; } break; case 1: - gPSSData->field_C62 += gPSSData->field_C64; - gPSSData->field_C66 += sub_80903A4(gPSSData->field_C68, gPSSData->field_C60, gPSSData->field_C64); - if ((gPSSData->field_C69 > 0 && gPSSData->field_C68 == IN_BOX_ROWS - 1) - || (gPSSData->field_C69 < 0 && gPSSData->field_C68 == 0)) + gPSSData->iconScrollPos += gPSSData->iconScrollSpeed; + gPSSData->iconScrollNumIncoming += sub_80903A4(gPSSData->iconScrollCurColumn, gPSSData->iconScrollDistance, gPSSData->iconScrollSpeed); + if ((gPSSData->iconScrollDirection > 0 && gPSSData->iconScrollCurColumn == IN_BOX_ROWS - 1) + || (gPSSData->iconScrollDirection < 0 && gPSSData->iconScrollCurColumn == 0)) { - gPSSData->field_C6A++; + gPSSData->iconScrollState++; } else { - gPSSData->field_C68 += gPSSData->field_C69; - gPSSData->field_C6A = 0; + gPSSData->iconScrollCurColumn += gPSSData->iconScrollDirection; + gPSSData->iconScrollState = 0; } break; case 2: - if (gPSSData->field_C66 == 0) + if (gPSSData->iconScrollNumIncoming == 0) { - gPSSData->field_C60++; + gPSSData->iconScrollDistance++; return FALSE; } break; @@ -539,7 +539,7 @@ static void SetBoxSpeciesAndPersonalities(u8 boxId) } } - gPSSData->field_C5C = boxId; + gPSSData->incomingBoxId = boxId; } void DestroyBoxMonIconAtPosition(u8 boxPosition) @@ -605,7 +605,7 @@ void sub_80909F4(void) { u16 i, count; - gPSSData->field_C5E = 0; + gPSSData->numPartyToCompact = 0; for (i = 0, count = 0; i < PARTY_SIZE; i++) { if (gPSSData->partySprites[i] != NULL) @@ -614,7 +614,7 @@ void sub_80909F4(void) { sub_8090A74(gPSSData->partySprites[i], count); gPSSData->partySprites[i] = NULL; - gPSSData->field_C5E++; + gPSSData->numPartyToCompact++; } count++; } @@ -623,7 +623,7 @@ void sub_80909F4(void) u8 sub_8090A60(void) { - return gPSSData->field_C5E; + return gPSSData->numPartyToCompact; } static void sub_8090A74(struct Sprite *sprite, u16 partyId) @@ -668,7 +668,7 @@ static void sub_8090AE0(struct Sprite *sprite) } sprite->callback = SpriteCallbackDummy; gPSSData->partySprites[sprite->data[1]] = sprite; - gPSSData->field_C5E--; + gPSSData->numPartyToCompact--; } } @@ -774,44 +774,44 @@ void sub_8090D58(u8 boxId, u8 position) void sub_8090E08(u8 boxId, u8 position) { if (boxId == TOTAL_BOXES_COUNT) // party mon - gPSSData->field_B00 = &gPSSData->partySprites[position]; + gPSSData->shiftMonSpritePtr = &gPSSData->partySprites[position]; else - gPSSData->field_B00 = &gPSSData->boxMonsSprites[position]; + gPSSData->shiftMonSpritePtr = &gPSSData->boxMonsSprites[position]; gPSSData->movingMonSprite->callback = SpriteCallbackDummy; - gPSSData->field_C5D = 0; + gPSSData->shiftTimer = 0; } bool8 sub_8090E74(void) { - if (gPSSData->field_C5D == 16) + if (gPSSData->shiftTimer == 16) return FALSE; - gPSSData->field_C5D++; - if (gPSSData->field_C5D & 1) + gPSSData->shiftTimer++; + if (gPSSData->shiftTimer & 1) { - (*gPSSData->field_B00)->y--; + (*gPSSData->shiftMonSpritePtr)->y--; gPSSData->movingMonSprite->y++; } - (*gPSSData->field_B00)->x2 = gSineTable[gPSSData->field_C5D * 8] / 16; - gPSSData->movingMonSprite->x2 = -(gSineTable[gPSSData->field_C5D * 8] / 16); - if (gPSSData->field_C5D == 8) + (*gPSSData->shiftMonSpritePtr)->x2 = gSineTable[gPSSData->shiftTimer * 8] / 16; + gPSSData->movingMonSprite->x2 = -(gSineTable[gPSSData->shiftTimer * 8] / 16); + if (gPSSData->shiftTimer == 8) { - gPSSData->movingMonSprite->oam.priority = (*gPSSData->field_B00)->oam.priority; - gPSSData->movingMonSprite->subpriority = (*gPSSData->field_B00)->subpriority; - (*gPSSData->field_B00)->oam.priority = sub_8090058(); - (*gPSSData->field_B00)->subpriority = 7; + gPSSData->movingMonSprite->oam.priority = (*gPSSData->shiftMonSpritePtr)->oam.priority; + gPSSData->movingMonSprite->subpriority = (*gPSSData->shiftMonSpritePtr)->subpriority; + (*gPSSData->shiftMonSpritePtr)->oam.priority = sub_8090058(); + (*gPSSData->shiftMonSpritePtr)->subpriority = 7; } - if (gPSSData->field_C5D == 16) + if (gPSSData->shiftTimer == 16) { struct Sprite *sprite = gPSSData->movingMonSprite; - gPSSData->movingMonSprite = (*gPSSData->field_B00); - *gPSSData->field_B00 = sprite; + gPSSData->movingMonSprite = (*gPSSData->shiftMonSpritePtr); + *gPSSData->shiftMonSpritePtr = sprite; gPSSData->movingMonSprite->callback = sub_80911B0; - (*gPSSData->field_B00)->callback = SpriteCallbackDummy; + (*gPSSData->shiftMonSpritePtr)->callback = SpriteCallbackDummy; } return TRUE; @@ -822,64 +822,64 @@ void sub_8090FC4(u8 mode, u8 position) switch (mode) { case MODE_PARTY: - gPSSData->field_B04 = &gPSSData->partySprites[position]; + gPSSData->releaseMonSpritePtr = &gPSSData->partySprites[position]; break; case MODE_BOX: - gPSSData->field_B04 = &gPSSData->boxMonsSprites[position]; + gPSSData->releaseMonSpritePtr = &gPSSData->boxMonsSprites[position]; break; case MODE_2: - gPSSData->field_B04 = &gPSSData->movingMonSprite; + gPSSData->releaseMonSpritePtr = &gPSSData->movingMonSprite; break; default: return; } - if (*gPSSData->field_B04 != NULL) + if (*gPSSData->releaseMonSpritePtr != NULL) { - InitSpriteAffineAnim(*gPSSData->field_B04); - (*gPSSData->field_B04)->oam.affineMode = ST_OAM_AFFINE_NORMAL; - (*gPSSData->field_B04)->affineAnims = gUnknown_83CEC38; - StartSpriteAffineAnim(*gPSSData->field_B04, 0); + InitSpriteAffineAnim(*gPSSData->releaseMonSpritePtr); + (*gPSSData->releaseMonSpritePtr)->oam.affineMode = ST_OAM_AFFINE_NORMAL; + (*gPSSData->releaseMonSpritePtr)->affineAnims = gUnknown_83CEC38; + StartSpriteAffineAnim(*gPSSData->releaseMonSpritePtr, 0); } } bool8 sub_8091084(void) { - if (*gPSSData->field_B04 == NULL || (*gPSSData->field_B04)->invisible) + if (*gPSSData->releaseMonSpritePtr == NULL || (*gPSSData->releaseMonSpritePtr)->invisible) return FALSE; - if ((*gPSSData->field_B04)->affineAnimEnded) - (*gPSSData->field_B04)->invisible = TRUE; + if ((*gPSSData->releaseMonSpritePtr)->affineAnimEnded) + (*gPSSData->releaseMonSpritePtr)->invisible = TRUE; return TRUE; } void sub_80910CC(void) { - if (*gPSSData->field_B04 != NULL) + if (*gPSSData->releaseMonSpritePtr != NULL) { - FreeOamMatrix((*gPSSData->field_B04)->oam.matrixNum); - DestroyBoxMonIcon(*gPSSData->field_B04); - *gPSSData->field_B04 = NULL; + FreeOamMatrix((*gPSSData->releaseMonSpritePtr)->oam.matrixNum); + DestroyBoxMonIcon(*gPSSData->releaseMonSpritePtr); + *gPSSData->releaseMonSpritePtr = NULL; } } void sub_8091114(void) { - if (*gPSSData->field_B04 != NULL) + if (*gPSSData->releaseMonSpritePtr != NULL) { - (*gPSSData->field_B04)->invisible = FALSE; - StartSpriteAffineAnim(*gPSSData->field_B04, 1); + (*gPSSData->releaseMonSpritePtr)->invisible = FALSE; + StartSpriteAffineAnim(*gPSSData->releaseMonSpritePtr, 1); } } bool8 sub_8091150(void) { - if (gPSSData->field_B04 == NULL) + if (gPSSData->releaseMonSpritePtr == NULL) return FALSE; - if ((*gPSSData->field_B04)->affineAnimEnded) - gPSSData->field_B04 = NULL; + if ((*gPSSData->releaseMonSpritePtr)->affineAnimEnded) + gPSSData->releaseMonSpritePtr = NULL; return TRUE; } @@ -891,8 +891,8 @@ void SetMovingMonPriority(u8 priority) static void sub_80911B0(struct Sprite *sprite) { - sprite->x = gPSSData->field_CB4->x; - sprite->y = gPSSData->field_CB4->y + gPSSData->field_CB4->y2 + 4; + sprite->x = gPSSData->cursorSprite->x; + sprite->y = gPSSData->cursorSprite->y + gPSSData->cursorSprite->y2 + 4; } static u16 sub_80911D4(u16 species) @@ -902,7 +902,7 @@ static u16 sub_80911D4(u16 species) // Find the currently-allocated slot for (i = 0; i < MAX_MON_ICONS; i++) { - if (gPSSData->field_B58[i] == species) + if (gPSSData->iconSpeciesList[i] == species) break; } @@ -911,15 +911,15 @@ static u16 sub_80911D4(u16 species) // Find the first empty slot for (i = 0; i < MAX_MON_ICONS; i++) { - if (gPSSData->field_B58[i] == SPECIES_NONE) + if (gPSSData->iconSpeciesList[i] == SPECIES_NONE) break; } if (i == MAX_MON_ICONS) return 0xFFFF; } - gPSSData->field_B58[i] = species; - gPSSData->field_B08[i]++; + gPSSData->iconSpeciesList[i] = species; + gPSSData->numIconsPerSpecies[i]++; var = 16 * i; CpuCopy32(GetMonIconTiles(species, TRUE), (void *)(OBJ_VRAM0) + var * 32, 0x200); @@ -932,10 +932,10 @@ static void sub_8091290(u16 species) for (i = 0; i < MAX_MON_ICONS; i++) { - if (gPSSData->field_B58[i] == species) + if (gPSSData->iconSpeciesList[i] == species) { - if (--gPSSData->field_B08[i] == 0) - gPSSData->field_B58[i] = 0; + if (--gPSSData->numIconsPerSpecies[i] == 0) + gPSSData->iconSpeciesList[i] = 0; break; } } @@ -991,7 +991,7 @@ static void sub_8091420(u8 taskId) switch (task->data[0]) { case 0: - gPSSData->field_2D2 = 0; + gPSSData->wallpaperOffset = 0; gPSSData->bg2_X = 0; task->data[1] = RequestDma3Fill(0, gPSSData->field_4AC4, 0x1000, DMA3_32BIT); break; @@ -1029,44 +1029,44 @@ void SetUpScrollToBox(u8 boxId) { s8 direction = sub_80916F4(boxId); - gPSSData->field_2CE = (direction > 0) ? 6 : -6; - gPSSData->field_2D3 = (direction > 0) ? 1 : 2; - gPSSData->field_2D0 = 32; - gPSSData->field_2D4 = boxId; - gPSSData->field_2D6 = (direction <= 0) ? 5 : 0; - gPSSData->field_2D8 = direction; - gPSSData->field_2DA = (direction > 0) ? 264 : 56; - gPSSData->field_2DC = (direction <= 0) ? 5 : 0; - gPSSData->field_2DE = 0; - gPSSData->field_2E0 = 2; - gPSSData->field_A64 = boxId; - gPSSData->field_A65 = direction; - gPSSData->field_A63 = 0; + gPSSData->scrollSpeed = (direction > 0) ? 6 : -6; + gPSSData->scrollUnused1 = (direction > 0) ? 1 : 2; + gPSSData->scrollTimer = 32; + gPSSData->scrollToBoxIdUnused = boxId; + gPSSData->scrollUnused2 = (direction <= 0) ? 5 : 0; + gPSSData->scrollDirectionUnused = direction; + gPSSData->scrollUnused3 = (direction > 0) ? 264 : 56; + gPSSData->scrollUnused4 = (direction <= 0) ? 5 : 0; + gPSSData->scrollUnused5 = 0; + gPSSData->scrollUnused6 = 2; + gPSSData->scrollToBoxId = boxId; + gPSSData->scrollDirection = direction; + gPSSData->scrollState = 0; } bool8 ScrollToBox(void) { bool8 var; - switch (gPSSData->field_A63) + switch (gPSSData->scrollState) { case 0: - LoadWallpaperGfx(gPSSData->field_A64, gPSSData->field_A65); - gPSSData->field_A63++; + LoadWallpaperGfx(gPSSData->scrollToBoxId, gPSSData->scrollDirection); + gPSSData->scrollState++; case 1: if (!WaitForWallpaperGfxLoad()) return TRUE; - sub_8090574(gPSSData->field_A64, gPSSData->field_A65); - sub_8091C48(gPSSData->field_A64, gPSSData->field_A65); - sub_809200C(gPSSData->field_A65); + sub_8090574(gPSSData->scrollToBoxId, gPSSData->scrollDirection); + sub_8091C48(gPSSData->scrollToBoxId, gPSSData->scrollDirection); + sub_809200C(gPSSData->scrollDirection); break; case 2: var = sub_809062C(); - if (gPSSData->field_2D0 != 0) + if (gPSSData->scrollTimer != 0) { - gPSSData->bg2_X += gPSSData->field_2CE; - if (--gPSSData->field_2D0 != 0) + gPSSData->bg2_X += gPSSData->scrollSpeed; + if (--gPSSData->scrollTimer != 0) return TRUE; sub_8091E34(); sub_80920AC(); @@ -1074,7 +1074,7 @@ bool8 ScrollToBox(void) return var; } - gPSSData->field_A63++; + gPSSData->scrollState++; return TRUE; } @@ -1105,7 +1105,7 @@ bool8 DoWallpaperGfxChange(void) switch (gPSSData->wallpaperChangeState) { case 0: - BeginNormalPaletteFade(gPSSData->field_738, 1, 0, 16, RGB_WHITEALPHA); + BeginNormalPaletteFade(gPSSData->wallpaperPalBits, 1, 0, 16, RGB_WHITEALPHA); gPSSData->wallpaperChangeState++; break; case 1: @@ -1120,7 +1120,7 @@ bool8 DoWallpaperGfxChange(void) if (WaitForWallpaperGfxLoad() == TRUE) { sub_8091EF0(); - BeginNormalPaletteFade(gPSSData->field_738, 1, 16, 0, RGB_WHITEALPHA); + BeginNormalPaletteFade(gPSSData->wallpaperPalBits, 1, 16, 0, RGB_WHITEALPHA); gPSSData->wallpaperChangeState++; } break; @@ -1142,26 +1142,26 @@ static void LoadWallpaperGfx(u8 boxId, s8 direction) void *iconGfx; u32 size1, size2; - gPSSData->field_6F9 = 0; - gPSSData->field_6FA = boxId; - gPSSData->field_6FB = direction; - if (gPSSData->field_6FB != 0) + gPSSData->wallpaperLoadState = 0; + gPSSData->wallpaperLoadBoxId = boxId; + gPSSData->wallpaperLoadDir = direction; + if (gPSSData->wallpaperLoadDir != 0) { - gPSSData->field_2D2 = (gPSSData->field_2D2 == 0); + gPSSData->wallpaperOffset = (gPSSData->wallpaperOffset == 0); sub_8091A24(gPSSData->field_4AC4); } - wallpaperId = GetBoxWallpaper(gPSSData->field_6FA); + wallpaperId = GetBoxWallpaper(gPSSData->wallpaperLoadBoxId); wallpaperGfx = &sWallpaperTable[wallpaperId]; - LZ77UnCompWram(wallpaperGfx->tileMap, gPSSData->field_792); - sub_8091984(gPSSData->field_4AC4, gPSSData->field_792, gPSSData->field_6FB, gPSSData->field_2D2); + LZ77UnCompWram(wallpaperGfx->tileMap, gPSSData->wallpaperTilemap); + sub_8091984(gPSSData->field_4AC4, gPSSData->wallpaperTilemap, gPSSData->wallpaperLoadDir, gPSSData->wallpaperOffset); - if (gPSSData->field_6FB != 0) - LoadPalette(wallpaperGfx->palettes, (gPSSData->field_2D2 * 32) + 0x40, 0x40); + if (gPSSData->wallpaperLoadDir != 0) + LoadPalette(wallpaperGfx->palettes, (gPSSData->wallpaperOffset * 32) + 0x40, 0x40); else - CpuCopy16(wallpaperGfx->palettes, &gPlttBufferUnfaded[(gPSSData->field_2D2 * 32) + 0x40], 0x40); + CpuCopy16(wallpaperGfx->palettes, &gPlttBufferUnfaded[(gPSSData->wallpaperOffset * 32) + 0x40], 0x40); - DecompressAndLoadBgGfxUsingHeap(2, wallpaperGfx->tiles, 0, 256 * gPSSData->field_2D2, 0); + DecompressAndLoadBgGfxUsingHeap(2, wallpaperGfx->tiles, 0, 256 * gPSSData->wallpaperOffset, 0); CopyBgTilemapBufferToVram(2); } @@ -1221,24 +1221,24 @@ static void sub_8091A94(u8 boxId) struct SpriteSheet spriteSheet = {gPSSData->field_2F8, 0x200, TAG_TILE_3}; struct SpritePalette palettes[] = { - {gPSSData->field_6FC, TAG_PAL_DAC9}, + {gPSSData->boxTitlePal, TAG_PAL_DAC9}, {} }; u16 wallpaperId = GetBoxWallpaper(boxId); - gPSSData->field_6FC[14] = gUnknown_83D29D0[wallpaperId][0]; - gPSSData->field_6FC[15] = gUnknown_83D29D0[wallpaperId][1]; + gPSSData->boxTitlePal[14] = gUnknown_83D29D0[wallpaperId][0]; + gPSSData->boxTitlePal[15] = gUnknown_83D29D0[wallpaperId][1]; LoadSpritePalettes(palettes); - gPSSData->field_738 = 0x3f0; + gPSSData->wallpaperPalBits = 0x3f0; tagIndex = IndexOfSpritePaletteTag(TAG_PAL_DAC9); - gPSSData->field_71C = 0x10e + 16 * tagIndex; - gPSSData->field_738 |= 0x10000 << tagIndex; + gPSSData->boxTitlePalOffset = 0x10e + 16 * tagIndex; + gPSSData->wallpaperPalBits |= 0x10000 << tagIndex; tagIndex = IndexOfSpritePaletteTag(TAG_PAL_DAC9); - gPSSData->field_71E = 0x10e + 16 * tagIndex; - gPSSData->field_738 |= 0x10000 << tagIndex; + gPSSData->boxTitleAltPalOffset = 0x10e + 16 * tagIndex; + gPSSData->wallpaperPalBits |= 0x10000 << tagIndex; StringCopyPadded(gPSSData->field_21B8, GetBoxNamePtr(boxId), 0, 8); DrawTextWindowAndBufferTiles(gPSSData->field_21B8, gPSSData->field_2F8, 0, 0, gPSSData->field_4F8, 2); @@ -1248,10 +1248,10 @@ static void sub_8091A94(u8 boxId) for (i = 0; i < 2; i++) { u8 spriteId = CreateSprite(&gUnknown_83D2B7C, r6 + i * 32, 28, 24); - gPSSData->field_720[i] = &gSprites[spriteId]; - StartSpriteAnim(gPSSData->field_720[i], i); + gPSSData->curBoxTitleSprites[i] = &gSprites[spriteId]; + StartSpriteAnim(gPSSData->curBoxTitleSprites[i], i); } - gPSSData->field_6F8 = 0; + gPSSData->boxTitleCycleId = 0; } static void sub_8091C48(u8 boxId, s8 direction) @@ -1262,16 +1262,16 @@ static void sub_8091C48(u8 boxId, s8 direction) struct SpriteSheet spriteSheet = {gPSSData->field_2F8, 0x200, TAG_TILE_3}; struct SpriteTemplate template = gUnknown_83D2B7C; - gPSSData->field_6F8 = (gPSSData->field_6F8 == 0); - if (gPSSData->field_6F8 == 0) + gPSSData->boxTitleCycleId = (gPSSData->boxTitleCycleId == 0); + if (gPSSData->boxTitleCycleId == 0) { spriteSheet.tag = TAG_TILE_3; - r8 = gPSSData->field_71C; + r8 = gPSSData->boxTitlePalOffset; } else { spriteSheet.tag = TAG_TILE_4; - r8 = gPSSData->field_71C; + r8 = gPSSData->boxTitlePalOffset; template.tileTag = TAG_TILE_4; template.paletteTag = TAG_PAL_DAC9; } @@ -1288,28 +1288,28 @@ static void sub_8091C48(u8 boxId, s8 direction) { u8 spriteId = CreateSprite(&template, i * 32 + x2, 28, 24); - gPSSData->field_728[i] = &gSprites[spriteId]; - gPSSData->field_728[i]->data[0] = (-direction) * 6; - gPSSData->field_728[i]->data[1] = i * 32 + x; - gPSSData->field_728[i]->data[2] = 0; - gPSSData->field_728[i]->callback = sub_8091E84; - StartSpriteAnim(gPSSData->field_728[i], i); + gPSSData->nextBoxTitleSprites[i] = &gSprites[spriteId]; + gPSSData->nextBoxTitleSprites[i]->data[0] = (-direction) * 6; + gPSSData->nextBoxTitleSprites[i]->data[1] = i * 32 + x; + gPSSData->nextBoxTitleSprites[i]->data[2] = 0; + gPSSData->nextBoxTitleSprites[i]->callback = sub_8091E84; + StartSpriteAnim(gPSSData->nextBoxTitleSprites[i], i); - gPSSData->field_720[i]->data[0] = (-direction) * 6; - gPSSData->field_720[i]->data[1] = 1; - gPSSData->field_720[i]->callback = sub_8091EB8; + gPSSData->curBoxTitleSprites[i]->data[0] = (-direction) * 6; + gPSSData->curBoxTitleSprites[i]->data[1] = 1; + gPSSData->curBoxTitleSprites[i]->callback = sub_8091EB8; } } static void sub_8091E34(void) { - if (gPSSData->field_6F8 == 0) + if (gPSSData->boxTitleCycleId == 0) FreeSpriteTilesByTag(TAG_TILE_4); else FreeSpriteTilesByTag(TAG_TILE_3); - gPSSData->field_720[0] = gPSSData->field_728[0]; - gPSSData->field_720[1] = gPSSData->field_728[1]; + gPSSData->curBoxTitleSprites[0] = gPSSData->nextBoxTitleSprites[0]; + gPSSData->curBoxTitleSprites[1] = gPSSData->nextBoxTitleSprites[1]; } static void sub_8091E84(struct Sprite *sprite) @@ -1339,10 +1339,10 @@ static void sub_8091EF0(void) { u8 boxId = StorageGetCurrentBox(); u8 wallpaperId = GetBoxWallpaper(boxId); - if (gPSSData->field_6F8 == 0) - CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + gPSSData->field_71C, 4); + if (gPSSData->boxTitleCycleId == 0) + CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + gPSSData->boxTitlePalOffset, 4); else - CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + gPSSData->field_71E, 4); + CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + gPSSData->boxTitleAltPalOffset, 4); } static s16 sub_8091F60(const u8 *string) @@ -1363,7 +1363,7 @@ static void sub_8091F80(void) struct Sprite *sprite = &gSprites[spriteId]; StartSpriteAnim(sprite, i); sprite->data[3] = (i == 0) ? -1 : 1; - gPSSData->field_730[i] = sprite; + gPSSData->arrowSprites[i] = sprite; } } if (IsCursorOnBox()) @@ -1376,25 +1376,25 @@ static void sub_809200C(s8 direction) for (i = 0; i < 2; i++) { - gPSSData->field_730[i]->x2 = 0; - gPSSData->field_730[i]->data[0] = 2; + gPSSData->arrowSprites[i]->x2 = 0; + gPSSData->arrowSprites[i]->data[0] = 2; } if (direction < 0) { - gPSSData->field_730[0]->data[1] = 29; - gPSSData->field_730[1]->data[1] = 5; - gPSSData->field_730[0]->data[2] = 0x48; - gPSSData->field_730[1]->data[2] = 0x48; + gPSSData->arrowSprites[0]->data[1] = 29; + gPSSData->arrowSprites[1]->data[1] = 5; + gPSSData->arrowSprites[0]->data[2] = 0x48; + gPSSData->arrowSprites[1]->data[2] = 0x48; } else { - gPSSData->field_730[0]->data[1] = 5; - gPSSData->field_730[1]->data[1] = 29; - gPSSData->field_730[0]->data[2] = 0xF8; - gPSSData->field_730[1]->data[2] = 0xF8; + gPSSData->arrowSprites[0]->data[1] = 5; + gPSSData->arrowSprites[1]->data[1] = 29; + gPSSData->arrowSprites[0]->data[2] = 0xF8; + gPSSData->arrowSprites[1]->data[2] = 0xF8; } - gPSSData->field_730[0]->data[7] = 0; - gPSSData->field_730[1]->data[7] = 1; + gPSSData->arrowSprites[0]->data[7] = 0; + gPSSData->arrowSprites[1]->data[7] = 1; } static void sub_80920AC(void) @@ -1403,9 +1403,9 @@ static void sub_80920AC(void) for (i = 0; i < 2; i++) { - gPSSData->field_730[i]->x = 0x88 * i + 0x5c; - gPSSData->field_730[i]->x2 = 0; - gPSSData->field_730[i]->invisible = FALSE; + gPSSData->arrowSprites[i]->x = 0x88 * i + 0x5c; + gPSSData->arrowSprites[i]->x2 = 0; + gPSSData->arrowSprites[i]->invisible = FALSE; } sub_80920FC(TRUE); } @@ -1418,17 +1418,17 @@ void sub_80920FC(bool8 a0) { for (i = 0; i < 2; i++) { - gPSSData->field_730[i]->data[0] = 1; - gPSSData->field_730[i]->data[1] = 0; - gPSSData->field_730[i]->data[2] = 0; - gPSSData->field_730[i]->data[4] = 0; + gPSSData->arrowSprites[i]->data[0] = 1; + gPSSData->arrowSprites[i]->data[1] = 0; + gPSSData->arrowSprites[i]->data[2] = 0; + gPSSData->arrowSprites[i]->data[4] = 0; } } else { for (i = 0; i < 2; i++) { - gPSSData->field_730[i]->data[0] = 0; + gPSSData->arrowSprites[i]->data[0] = 0; } } } @@ -1456,7 +1456,7 @@ static void sub_8092164(struct Sprite *sprite) sprite->data[0] = 3; break; case 3: - sprite->x -= gPSSData->field_2CE; + sprite->x -= gPSSData->scrollSpeed; if (sprite->x < 73 || sprite->x > 247) sprite->invisible = TRUE; if (--sprite->data[1] == 0) @@ -1467,7 +1467,7 @@ static void sub_8092164(struct Sprite *sprite) } break; case 4: - sprite->x -= gPSSData->field_2CE; + sprite->x -= gPSSData->scrollSpeed; break; } } diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c index 7d5da65e9..a994028d3 100644 --- a/src/pokemon_storage_system_5.c +++ b/src/pokemon_storage_system_5.c @@ -33,7 +33,7 @@ static void SetPlacedMonData(u8 boxId, u8 cursorPos); static void PurgeMonOrBoxMon(u8 boxId, u8 cursorPos); static void SetShiftedMonData(u8 boxId, u8 cursorPos); static void sub_8093A10(void); -static void SetCursorMonData(void * cursorMon, u8 mode); +static void SetCursorMonData(void *cursorMon, u8 mode); static void sub_8093AAC(void); static u8 InBoxInput_Normal(void); static u8 InBoxInput_GrabbingMultiple(void); @@ -63,7 +63,7 @@ void sub_80922C0(void) sCanOnlyMove = FALSE; sub_8092B50(); sub_8094AD8(); - gPSSData->field_CD6 = 1; + gPSSData->cursorPrevHorizPos = 1; gPSSData->inBoxMovingMode = 0; sub_8093A10(); } @@ -72,7 +72,7 @@ void sub_8092340(void) { sub_8094AD8(); sub_8093AAC(); - gPSSData->field_CD6 = 1; + gPSSData->cursorPrevHorizPos = 1; gPSSData->inBoxMovingMode = 0; if (sIsMonBeingMoved) { @@ -138,46 +138,46 @@ bool8 sub_80924A8(void) { s16 tmp; - if (gPSSData->field_CD0 == 0) + if (gPSSData->cursorMoveSteps == 0) { if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) return FALSE; else return sub_809610C(); } - else if (--gPSSData->field_CD0 != 0) + else if (--gPSSData->cursorMoveSteps != 0) { - gPSSData->field_CBC += gPSSData->field_CC4; - gPSSData->field_CC0 += gPSSData->field_CC8; - gPSSData->field_CB4->x = gPSSData->field_CBC >> 8; - gPSSData->field_CB4->y = gPSSData->field_CC0 >> 8; - if (gPSSData->field_CB4->x > 0x100) + gPSSData->cursorNewX += gPSSData->cursorSpeedX; + gPSSData->cursorNewY += gPSSData->cursorSpeedY; + gPSSData->cursorSprite->x = gPSSData->cursorNewX >> 8; + gPSSData->cursorSprite->y = gPSSData->cursorNewY >> 8; + if (gPSSData->cursorSprite->x > 0x100) { - tmp = gPSSData->field_CB4->x - 0x100; - gPSSData->field_CB4->x = tmp + 0x40; + tmp = gPSSData->cursorSprite->x - 0x100; + gPSSData->cursorSprite->x = tmp + 0x40; } - if (gPSSData->field_CB4->x < 0x40) + if (gPSSData->cursorSprite->x < 0x40) { - tmp = 0x40 - gPSSData->field_CB4->x; - gPSSData->field_CB4->x = 0x100 - tmp; + tmp = 0x40 - gPSSData->cursorSprite->x; + gPSSData->cursorSprite->x = 0x100 - tmp; } - if (gPSSData->field_CB4->y > 0xb0) + if (gPSSData->cursorSprite->y > 0xb0) { - tmp = gPSSData->field_CB4->y - 0xb0; - gPSSData->field_CB4->y = tmp - 0x10; + tmp = gPSSData->cursorSprite->y - 0xb0; + gPSSData->cursorSprite->y = tmp - 0x10; } - if (gPSSData->field_CB4->y < -0x10) + if (gPSSData->cursorSprite->y < -0x10) { - tmp = -0x10 - gPSSData->field_CB4->y; - gPSSData->field_CB4->y = 0xb0 - tmp; + tmp = -0x10 - gPSSData->cursorSprite->y; + gPSSData->cursorSprite->y = 0xb0 - tmp; } - if (gPSSData->field_CD7 && --gPSSData->field_CD7 == 0) - gPSSData->field_CB4->vFlip = (gPSSData->field_CB4->vFlip == FALSE); + if (gPSSData->cursorFlipTimer && --gPSSData->cursorFlipTimer == 0) + gPSSData->cursorSprite->vFlip = (gPSSData->cursorSprite->vFlip == FALSE); } else { - gPSSData->field_CB4->x = gPSSData->field_CCC; - gPSSData->field_CB4->y = gPSSData->field_CCE; + gPSSData->cursorSprite->x = gPSSData->cursorTargetX; + gPSSData->cursorSprite->y = gPSSData->cursorTargetY; sub_80929B0(); } @@ -189,56 +189,56 @@ static void sub_8092604(u8 newCurosrArea, u8 newCursorPosition) u16 x, y; sub_8092398(newCurosrArea, newCursorPosition, &x, &y); - gPSSData->field_CD4 = newCurosrArea; - gPSSData->field_CD5 = newCursorPosition; - gPSSData->field_CCC = x; - gPSSData->field_CCE = y; + gPSSData->newCursorArea = newCurosrArea; + gPSSData->newCursorPosition = newCursorPosition; + gPSSData->cursorTargetX = x; + gPSSData->cursorTargetY = y; } static void sub_8092660(void) { int r7, r0; - if (gPSSData->field_CD2 != 0 || gPSSData->field_CD3 != 0) - gPSSData->field_CD0 = 12; + if (gPSSData->cursorVerticalWrap != 0 || gPSSData->cursorHorizontalWrap != 0) + gPSSData->cursorMoveSteps = 12; else - gPSSData->field_CD0 = 6; + gPSSData->cursorMoveSteps = 6; - if (gPSSData->field_CD7) - gPSSData->field_CD7 = gPSSData->field_CD0 >> 1; + if (gPSSData->cursorFlipTimer) + gPSSData->cursorFlipTimer = gPSSData->cursorMoveSteps >> 1; - switch (gPSSData->field_CD2) + switch (gPSSData->cursorVerticalWrap) { default: - r7 = gPSSData->field_CCE - gPSSData->field_CB4->y; + r7 = gPSSData->cursorTargetY - gPSSData->cursorSprite->y; break; case -1: - r7 = gPSSData->field_CCE - 0xc0 - gPSSData->field_CB4->y; + r7 = gPSSData->cursorTargetY - 0xc0 - gPSSData->cursorSprite->y; break; case 1: - r7 = gPSSData->field_CCE + 0xc0 - gPSSData->field_CB4->y; + r7 = gPSSData->cursorTargetY + 0xc0 - gPSSData->cursorSprite->y; break; } - switch (gPSSData->field_CD3) + switch (gPSSData->cursorHorizontalWrap) { default: - r0 = gPSSData->field_CCC - gPSSData->field_CB4->x; + r0 = gPSSData->cursorTargetX - gPSSData->cursorSprite->x; break; case -1: - r0 = gPSSData->field_CCC - 0xc0 - gPSSData->field_CB4->x; + r0 = gPSSData->cursorTargetX - 0xc0 - gPSSData->cursorSprite->x; break; case 1: - r0 = gPSSData->field_CCC + 0xc0 - gPSSData->field_CB4->x; + r0 = gPSSData->cursorTargetX + 0xc0 - gPSSData->cursorSprite->x; break; } r7 <<= 8; r0 <<= 8; - gPSSData->field_CC4 = r0 / gPSSData->field_CD0; - gPSSData->field_CC8 = r7 / gPSSData->field_CD0; - gPSSData->field_CBC = gPSSData->field_CB4->x << 8; - gPSSData->field_CC0 = gPSSData->field_CB4->y << 8; + gPSSData->cursorSpeedX = r0 / gPSSData->cursorMoveSteps; + gPSSData->cursorSpeedY = r7 / gPSSData->cursorMoveSteps; + gPSSData->cursorNewX = gPSSData->cursorSprite->x << 8; + gPSSData->cursorNewY = gPSSData->cursorSprite->y << 8; } static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition) @@ -248,12 +248,12 @@ static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition) if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) { if (gPSSData->inBoxMovingMode == 0 && !sIsMonBeingMoved) - StartSpriteAnim(gPSSData->field_CB4, 1); + StartSpriteAnim(gPSSData->cursorSprite, 1); } else { if (!IsActiveItemMoving()) - StartSpriteAnim(gPSSData->field_CB4, 1); + StartSpriteAnim(gPSSData->cursorSprite, 1); } if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) @@ -271,8 +271,8 @@ static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition) if (newCurosrArea == CURSOR_AREA_IN_PARTY && sBoxCursorArea != CURSOR_AREA_IN_PARTY) { - gPSSData->field_CD6 = newCurosrArea; - gPSSData->field_CB8->invisible = TRUE; + gPSSData->cursorPrevHorizPos = newCurosrArea; + gPSSData->cursorShadowSprite->invisible = TRUE; } switch (newCurosrArea) @@ -280,19 +280,19 @@ static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition) case CURSOR_AREA_IN_PARTY: case CURSOR_AREA_BOX: case CURSOR_AREA_BUTTONS: - gPSSData->field_CB4->oam.priority = 1; - gPSSData->field_CB8->invisible = TRUE; - gPSSData->field_CB8->oam.priority = 1; + gPSSData->cursorSprite->oam.priority = 1; + gPSSData->cursorShadowSprite->invisible = TRUE; + gPSSData->cursorShadowSprite->oam.priority = 1; break; case CURSOR_AREA_IN_BOX: if (gPSSData->inBoxMovingMode != 0) { - gPSSData->field_CB4->oam.priority = 0; - gPSSData->field_CB8->invisible = TRUE; + gPSSData->cursorSprite->oam.priority = 0; + gPSSData->cursorShadowSprite->invisible = TRUE; } else { - gPSSData->field_CB4->oam.priority = 2; + gPSSData->cursorSprite->oam.priority = 2; if (sBoxCursorArea == CURSOR_AREA_IN_BOX && sIsMonBeingMoved) SetMovingMonPriority(2); } @@ -302,17 +302,17 @@ static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition) static void sub_80929B0(void) { - sBoxCursorArea = gPSSData->field_CD4; - sBoxCursorPosition = gPSSData->field_CD5; + sBoxCursorArea = gPSSData->newCursorArea; + sBoxCursorPosition = gPSSData->newCursorPosition; if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) { if (gPSSData->inBoxMovingMode == 0 && !sIsMonBeingMoved) - StartSpriteAnim(gPSSData->field_CB4, 1); + StartSpriteAnim(gPSSData->cursorSprite, 1); } else { if (!IsActiveItemMoving()) - StartSpriteAnim(gPSSData->field_CB4, 1); + StartSpriteAnim(gPSSData->cursorSprite, 1); } sub_8093A10(); @@ -325,16 +325,16 @@ static void sub_80929B0(void) sub_80920FC(TRUE); break; case CURSOR_AREA_IN_PARTY: - gPSSData->field_CB8->subpriority = 13; + gPSSData->cursorShadowSprite->subpriority = 13; SetMovingMonPriority(1); break; case CURSOR_AREA_IN_BOX: if (gPSSData->inBoxMovingMode == 0) { - gPSSData->field_CB4->oam.priority = 1; - gPSSData->field_CB8->oam.priority = 2; - gPSSData->field_CB8->subpriority = 21; - gPSSData->field_CB8->invisible = FALSE; + gPSSData->cursorSprite->oam.priority = 1; + gPSSData->cursorShadowSprite->oam.priority = 2; + gPSSData->cursorShadowSprite->subpriority = 21; + gPSSData->cursorShadowSprite->invisible = FALSE; SetMovingMonPriority(2); } break; @@ -355,8 +355,8 @@ void sub_8092AE4(void) if (partyCount >= PARTY_SIZE) partyCount = PARTY_SIZE - 1; } - if (gPSSData->field_CB4->vFlip) - gPSSData->field_CD7 = 1; + if (gPSSData->cursorSprite->vFlip) + gPSSData->cursorFlipTimer = 1; sub_80927E8(CURSOR_AREA_IN_PARTY, partyCount); } @@ -414,13 +414,13 @@ static bool8 MonPlaceChange_Move(void) case 0: if (sIsMonBeingMoved) return FALSE; - StartSpriteAnim(gPSSData->field_CB4, 2); + StartSpriteAnim(gPSSData->cursorSprite, 2); gPSSData->monPlaceChangeState++; break; case 1: if (!sub_8092E20()) { - StartSpriteAnim(gPSSData->field_CB4, 3); + StartSpriteAnim(gPSSData->cursorSprite, 3); MoveMon(); gPSSData->monPlaceChangeState++; } @@ -443,7 +443,7 @@ static bool8 MonPlaceChange_Place(void) case 0: if (!sub_8092E20()) { - StartSpriteAnim(gPSSData->field_CB4, 2); + StartSpriteAnim(gPSSData->cursorSprite, 2); PlaceMon(); gPSSData->monPlaceChangeState++; } @@ -451,7 +451,7 @@ static bool8 MonPlaceChange_Place(void) case 1: if (!sub_8092E54()) { - StartSpriteAnim(gPSSData->field_CB4, 0); + StartSpriteAnim(gPSSData->cursorSprite, 0); gPSSData->monPlaceChangeState++; } break; @@ -470,23 +470,23 @@ static bool8 MonPlaceChange_Shift(void) switch (sBoxCursorArea) { case CURSOR_AREA_IN_PARTY: - gPSSData->field_D91 = TOTAL_BOXES_COUNT; + gPSSData->shiftBoxId = TOTAL_BOXES_COUNT; break; case CURSOR_AREA_IN_BOX: - gPSSData->field_D91 = StorageGetCurrentBox(); + gPSSData->shiftBoxId = StorageGetCurrentBox(); break; default: return FALSE; } - StartSpriteAnim(gPSSData->field_CB4, 2); - sub_8090E08(gPSSData->field_D91, sBoxCursorPosition); + StartSpriteAnim(gPSSData->cursorSprite, 2); + sub_8090E08(gPSSData->shiftBoxId, sBoxCursorPosition); gPSSData->monPlaceChangeState++; break; case 1: if (!sub_8090E74()) { - StartSpriteAnim(gPSSData->field_CB4, 3); - SetShiftedMonData(gPSSData->field_D91, sBoxCursorPosition); + StartSpriteAnim(gPSSData->cursorSprite, 3); + SetShiftedMonData(gPSSData->shiftBoxId, sBoxCursorPosition); gPSSData->monPlaceChangeState++; } break; @@ -509,13 +509,13 @@ static bool8 sub_8092E10(void) static bool8 sub_8092E20(void) { - switch (gPSSData->field_CB4->y2) + switch (gPSSData->cursorSprite->y2) { default: - gPSSData->field_CB4->y2++; + gPSSData->cursorSprite->y2++; break; case 0: - gPSSData->field_CB4->y2++; + gPSSData->cursorSprite->y2++; break; case 8: return FALSE; @@ -526,12 +526,12 @@ static bool8 sub_8092E20(void) static bool8 sub_8092E54(void) { - switch (gPSSData->field_CB4->y2) + switch (gPSSData->cursorSprite->y2) { case 0: return FALSE; default: - gPSSData->field_CB4->y2--; + gPSSData->cursorSprite->y2--; break; } @@ -656,13 +656,13 @@ bool8 TryStorePartyMonInBox(u8 boxId) if (boxId == StorageGetCurrentBox()) sub_80901EC(boxPosition); - StartSpriteAnim(gPSSData->field_CB4, 1); + StartSpriteAnim(gPSSData->cursorSprite, 1); return TRUE; } void sub_8093174(void) { - StartSpriteAnim(gPSSData->field_CB4, 0); + StartSpriteAnim(gPSSData->cursorSprite, 0); sub_8093A10(); } @@ -678,14 +678,14 @@ void sub_8093194(void) mode = MODE_BOX; sub_8090FC4(mode, sBoxCursorPosition); - StringCopy(gPSSData->field_21E0, gPSSData->cursorMonNick); + StringCopy(gPSSData->field_21E0, gPSSData->displayMonName); } bool8 sub_80931EC(void) { if (!sub_8091084()) { - StartSpriteAnim(gPSSData->field_CB4, 0); + StartSpriteAnim(gPSSData->cursorSprite, 0); return FALSE; } else @@ -718,7 +718,7 @@ void ReleaseMon(void) void sub_8093264(void) { if (sIsMonBeingMoved) - StartSpriteAnim(gPSSData->field_CB4, 3); + StartSpriteAnim(gPSSData->cursorSprite, 3); } void InitCanReleaseMonVars(void) @@ -914,7 +914,7 @@ s16 CompactPartySlots(void) void SetMonMarkings(u8 markings) { - gPSSData->cursorMonMarkings = markings; + gPSSData->displayMonMarkings = markings; if (sIsMonBeingMoved) { SetMonData(&gPSSData->movingMon, MON_DATA_MARKINGS, &markings); @@ -942,7 +942,7 @@ bool8 CanShiftMon(void) { if (sBoxCursorArea == CURSOR_AREA_IN_PARTY && CountPartyAliveNonEggMonsExcept(sBoxCursorPosition) == 0) { - if (gPSSData->cursorMonIsEgg || GetMonData(&gPSSData->movingMon, MON_DATA_HP) == 0) + if (gPSSData->displayMonIsEgg || GetMonData(&gPSSData->movingMon, MON_DATA_HP) == 0) return FALSE; } return TRUE; @@ -1009,94 +1009,94 @@ static void SetCursorMonData(void *pokemon, u8 mode) u16 gender; bool8 sanityIsBagEgg; - gPSSData->cursorMonItem = 0; + gPSSData->displayMonItemId = 0; gender = MON_MALE; sanityIsBagEgg = FALSE; if (mode == MODE_PARTY) { struct Pokemon *mon = (struct Pokemon *)pokemon; - gPSSData->cursorMonSpecies = GetMonData(mon, MON_DATA_SPECIES2); - if (gPSSData->cursorMonSpecies != SPECIES_NONE) + gPSSData->displayMonSpecies = GetMonData(mon, MON_DATA_SPECIES2); + if (gPSSData->displayMonSpecies != SPECIES_NONE) { sanityIsBagEgg = GetMonData(mon, MON_DATA_SANITY_IS_BAD_EGG); if (sanityIsBagEgg) - gPSSData->cursorMonIsEgg = TRUE; + gPSSData->displayMonIsEgg = TRUE; else - gPSSData->cursorMonIsEgg = GetMonData(mon, MON_DATA_IS_EGG); + gPSSData->displayMonIsEgg = GetMonData(mon, MON_DATA_IS_EGG); - GetMonData(mon, MON_DATA_NICKNAME, gPSSData->cursorMonNick); - StringGetEnd10(gPSSData->cursorMonNick); - gPSSData->cursorMonLevel = GetMonData(mon, MON_DATA_LEVEL); - gPSSData->cursorMonMarkings = GetMonData(mon, MON_DATA_MARKINGS); - gPSSData->cursorMonPersonality = GetMonData(mon, MON_DATA_PERSONALITY); - gPSSData->cursorMonPalette = GetMonFrontSpritePal(mon); + GetMonData(mon, MON_DATA_NICKNAME, gPSSData->displayMonName); + StringGetEnd10(gPSSData->displayMonName); + gPSSData->displayMonLevel = GetMonData(mon, MON_DATA_LEVEL); + gPSSData->displayMonMarkings = GetMonData(mon, MON_DATA_MARKINGS); + gPSSData->displayMonPersonality = GetMonData(mon, MON_DATA_PERSONALITY); + gPSSData->displayMonPalette = GetMonFrontSpritePal(mon); gender = GetMonGender(mon); - gPSSData->cursorMonItem = GetMonData(mon, MON_DATA_HELD_ITEM); + gPSSData->displayMonItemId = GetMonData(mon, MON_DATA_HELD_ITEM); } } else if (mode == MODE_BOX) { struct BoxPokemon *boxMon = (struct BoxPokemon *)pokemon; - gPSSData->cursorMonSpecies = GetBoxMonData(pokemon, MON_DATA_SPECIES2); - if (gPSSData->cursorMonSpecies != SPECIES_NONE) + gPSSData->displayMonSpecies = GetBoxMonData(pokemon, MON_DATA_SPECIES2); + if (gPSSData->displayMonSpecies != SPECIES_NONE) { u32 otId = GetBoxMonData(boxMon, MON_DATA_OT_ID); sanityIsBagEgg = GetBoxMonData(boxMon, MON_DATA_SANITY_IS_BAD_EGG); if (sanityIsBagEgg) - gPSSData->cursorMonIsEgg = TRUE; + gPSSData->displayMonIsEgg = TRUE; else - gPSSData->cursorMonIsEgg = GetBoxMonData(boxMon, MON_DATA_IS_EGG); + gPSSData->displayMonIsEgg = GetBoxMonData(boxMon, MON_DATA_IS_EGG); - GetBoxMonData(boxMon, MON_DATA_NICKNAME, gPSSData->cursorMonNick); - StringGetEnd10(gPSSData->cursorMonNick); - gPSSData->cursorMonLevel = GetLevelFromBoxMonExp(boxMon); - gPSSData->cursorMonMarkings = GetBoxMonData(boxMon, MON_DATA_MARKINGS); - gPSSData->cursorMonPersonality = GetBoxMonData(boxMon, MON_DATA_PERSONALITY); - gPSSData->cursorMonPalette = GetMonSpritePalFromSpeciesAndPersonality(gPSSData->cursorMonSpecies, otId, gPSSData->cursorMonPersonality); - gender = GetGenderFromSpeciesAndPersonality(gPSSData->cursorMonSpecies, gPSSData->cursorMonPersonality); - gPSSData->cursorMonItem = GetBoxMonData(boxMon, MON_DATA_HELD_ITEM); + GetBoxMonData(boxMon, MON_DATA_NICKNAME, gPSSData->displayMonName); + StringGetEnd10(gPSSData->displayMonName); + gPSSData->displayMonLevel = GetLevelFromBoxMonExp(boxMon); + gPSSData->displayMonMarkings = GetBoxMonData(boxMon, MON_DATA_MARKINGS); + gPSSData->displayMonPersonality = GetBoxMonData(boxMon, MON_DATA_PERSONALITY); + gPSSData->displayMonPalette = GetMonSpritePalFromSpeciesAndPersonality(gPSSData->displayMonSpecies, otId, gPSSData->displayMonPersonality); + gender = GetGenderFromSpeciesAndPersonality(gPSSData->displayMonSpecies, gPSSData->displayMonPersonality); + gPSSData->displayMonItemId = GetBoxMonData(boxMon, MON_DATA_HELD_ITEM); } } else { - gPSSData->cursorMonSpecies = SPECIES_NONE; - gPSSData->cursorMonItem = 0; + gPSSData->displayMonSpecies = SPECIES_NONE; + gPSSData->displayMonItemId = 0; } - if (gPSSData->cursorMonSpecies == SPECIES_NONE) + if (gPSSData->displayMonSpecies == SPECIES_NONE) { - StringFill(gPSSData->cursorMonNick, CHAR_SPACE, 5); - StringFill(gPSSData->cursorMonTexts[0], CHAR_SPACE, 8); - StringFill(gPSSData->cursorMonTexts[1], CHAR_SPACE, 8); - StringFill(gPSSData->cursorMonTexts[2], CHAR_SPACE, 8); - StringFill(gPSSData->cursorMonTexts[3], CHAR_SPACE, 8); + StringFill(gPSSData->displayMonName, CHAR_SPACE, 5); + StringFill(gPSSData->displayMonTexts[0], CHAR_SPACE, 8); + StringFill(gPSSData->displayMonTexts[1], CHAR_SPACE, 8); + StringFill(gPSSData->displayMonTexts[2], CHAR_SPACE, 8); + StringFill(gPSSData->displayMonTexts[3], CHAR_SPACE, 8); } - else if (gPSSData->cursorMonIsEgg) + else if (gPSSData->displayMonIsEgg) { if (sanityIsBagEgg) - StringCopyPadded(gPSSData->cursorMonTexts[0], gPSSData->cursorMonNick, CHAR_SPACE, 5); + StringCopyPadded(gPSSData->displayMonTexts[0], gPSSData->displayMonName, CHAR_SPACE, 5); else - StringCopyPadded(gPSSData->cursorMonTexts[0], gText_EggNickname, CHAR_SPACE, 8); + StringCopyPadded(gPSSData->displayMonTexts[0], gText_EggNickname, CHAR_SPACE, 8); - StringFill(gPSSData->cursorMonTexts[1], CHAR_SPACE, 8); - StringFill(gPSSData->cursorMonTexts[2], CHAR_SPACE, 8); - StringFill(gPSSData->cursorMonTexts[3], CHAR_SPACE, 8); + StringFill(gPSSData->displayMonTexts[1], CHAR_SPACE, 8); + StringFill(gPSSData->displayMonTexts[2], CHAR_SPACE, 8); + StringFill(gPSSData->displayMonTexts[3], CHAR_SPACE, 8); } else { - if (gPSSData->cursorMonSpecies == SPECIES_NIDORAN_F || gPSSData->cursorMonSpecies == SPECIES_NIDORAN_M) + if (gPSSData->displayMonSpecies == SPECIES_NIDORAN_F || gPSSData->displayMonSpecies == SPECIES_NIDORAN_M) gender = MON_GENDERLESS; - StringCopyPadded(gPSSData->cursorMonTexts[0], gPSSData->cursorMonNick, CHAR_SPACE, 5); + StringCopyPadded(gPSSData->displayMonTexts[0], gPSSData->displayMonName, CHAR_SPACE, 5); - txtPtr = gPSSData->cursorMonTexts[1]; + txtPtr = gPSSData->displayMonTexts[1]; *(txtPtr)++ = CHAR_SLASH; - StringCopyPadded(txtPtr, gSpeciesNames[gPSSData->cursorMonSpecies], CHAR_SPACE, 5); + StringCopyPadded(txtPtr, gSpeciesNames[gPSSData->displayMonSpecies], CHAR_SPACE, 5); - txtPtr = gPSSData->cursorMonTexts[2]; + txtPtr = gPSSData->displayMonTexts[2]; *(txtPtr)++ = EXT_CTRL_CODE_BEGIN; *(txtPtr)++ = EXT_CTRL_CODE_COLOR_HIGHLIGHT_SHADOW; switch (gender) @@ -1130,14 +1130,14 @@ static void SetCursorMonData(void *pokemon, u8 mode) *(txtPtr++) = CHAR_EXTRA_SYMBOL; *(txtPtr++) = 5; // LV_2 - txtPtr = ConvertIntToDecimalStringN(txtPtr, gPSSData->cursorMonLevel, STR_CONV_MODE_LEFT_ALIGN, 3); + txtPtr = ConvertIntToDecimalStringN(txtPtr, gPSSData->displayMonLevel, STR_CONV_MODE_LEFT_ALIGN, 3); txtPtr[0] = CHAR_SPACE; txtPtr[1] = EOS; - if (gPSSData->cursorMonItem != 0) - StringCopyPadded(gPSSData->cursorMonTexts[3], ItemId_GetName(gPSSData->cursorMonItem), CHAR_SPACE, 8); + if (gPSSData->displayMonItemId != 0) + StringCopyPadded(gPSSData->displayMonTexts[3], ItemId_GetName(gPSSData->displayMonItemId), CHAR_SPACE, 8); else - StringFill(gPSSData->cursorMonTexts[3], CHAR_SPACE, 8); + StringFill(gPSSData->displayMonTexts[3], CHAR_SPACE, 8); } } @@ -1165,9 +1165,9 @@ static u8 InBoxInput_Normal(void) { cursorArea = sBoxCursorArea; cursorPosition = sBoxCursorPosition; - gPSSData->field_CD2 = 0; - gPSSData->field_CD3 = 0; - gPSSData->field_CD7 = 0; + gPSSData->cursorVerticalWrap = 0; + gPSSData->cursorHorizontalWrap = 0; + gPSSData->cursorFlipTimer = 0; if (JOY_REPT(DPAD_UP)) { retVal = TRUE; @@ -1191,8 +1191,8 @@ static u8 InBoxInput_Normal(void) cursorArea = CURSOR_AREA_BUTTONS; cursorPosition -= IN_BOX_COUNT; cursorPosition /= 3; - gPSSData->field_CD2 = 1; - gPSSData->field_CD7 = 1; + gPSSData->cursorVerticalWrap = 1; + gPSSData->cursorFlipTimer = 1; } break; } @@ -1205,7 +1205,7 @@ static u8 InBoxInput_Normal(void) } else { - gPSSData->field_CD3 = -1; + gPSSData->cursorHorizontalWrap = -1; cursorPosition += (IN_BOX_ROWS - 1); } break; @@ -1219,7 +1219,7 @@ static u8 InBoxInput_Normal(void) } else { - gPSSData->field_CD3 = 1; + gPSSData->cursorHorizontalWrap = 1; cursorPosition -= (IN_BOX_ROWS - 1); } break; @@ -1355,12 +1355,12 @@ static u8 InBoxInput_GrabbingMultiple(void) if (sub_8095AA0() == sBoxCursorPosition) { gPSSData->inBoxMovingMode = 0; - gPSSData->field_CB8->invisible = FALSE; + gPSSData->cursorShadowSprite->invisible = FALSE; return 22; } else { - sIsMonBeingMoved = (gPSSData->cursorMonSpecies != SPECIES_NONE); + sIsMonBeingMoved = (gPSSData->displayMonSpecies != SPECIES_NONE); gPSSData->inBoxMovingMode = 2; sMovingMonOrigBoxId = StorageGetCurrentBox(); return 23; @@ -1460,9 +1460,9 @@ static u8 HandleInput_InParty(void) { cursorArea = sBoxCursorArea; cursorPosition = sBoxCursorPosition; - gPSSData->field_CD3 = 0; - gPSSData->field_CD2 = 0; - gPSSData->field_CD7 = 0; + gPSSData->cursorHorizontalWrap = 0; + gPSSData->cursorVerticalWrap = 0; + gPSSData->cursorFlipTimer = 0; gotoBox = FALSE; retVal = 0; @@ -1485,7 +1485,7 @@ static u8 HandleInput_InParty(void) else if (JOY_REPT(DPAD_LEFT) && sBoxCursorPosition != 0) { retVal = 1; - gPSSData->field_CD6 = sBoxCursorPosition; + gPSSData->cursorPrevHorizPos = sBoxCursorPosition; cursorPosition = 0; break; } @@ -1494,7 +1494,7 @@ static u8 HandleInput_InParty(void) if (sBoxCursorPosition == 0) { retVal = 1; - cursorPosition = gPSSData->field_CD6; + cursorPosition = gPSSData->cursorPrevHorizPos; } else { @@ -1580,16 +1580,16 @@ static u8 HandleInput_OnBox(void) do { - gPSSData->field_CD3 = 0; - gPSSData->field_CD2 = 0; - gPSSData->field_CD7 = 0; + gPSSData->cursorHorizontalWrap = 0; + gPSSData->cursorVerticalWrap = 0; + gPSSData->cursorFlipTimer = 0; if (JOY_REPT(DPAD_UP)) { retVal = 1; cursorArea = CURSOR_AREA_BUTTONS; cursorPosition = 0; - gPSSData->field_CD7 = 1; + gPSSData->cursorFlipTimer = 1; break; } else if (JOY_REPT(DPAD_DOWN)) @@ -1654,20 +1654,20 @@ static u8 HandleInput_OnButtons(void) { cursorArea = sBoxCursorArea; cursorPosition = sBoxCursorPosition; - gPSSData->field_CD3 = 0; - gPSSData->field_CD2 = 0; - gPSSData->field_CD7 = 0; + gPSSData->cursorHorizontalWrap = 0; + gPSSData->cursorVerticalWrap = 0; + gPSSData->cursorFlipTimer = 0; if (JOY_REPT(DPAD_UP)) { retVal = 1; cursorArea = CURSOR_AREA_IN_BOX; - gPSSData->field_CD2 = -1; + gPSSData->cursorVerticalWrap = -1; if (sBoxCursorPosition == 0) cursorPosition = IN_BOX_COUNT - 1 - 5; else cursorPosition = IN_BOX_COUNT - 1; - gPSSData->field_CD7 = 1; + gPSSData->cursorFlipTimer = 1; break; } else if (JOY_REPT(DPAD_DOWN | START_BUTTON)) @@ -1675,7 +1675,7 @@ static u8 HandleInput_OnButtons(void) retVal = 1; cursorArea = CURSOR_AREA_BOX; cursorPosition = 0; - gPSSData->field_CD7 = 1; + gPSSData->cursorFlipTimer = 1; break; } @@ -1816,21 +1816,21 @@ static bool8 sub_809494C(void) static bool8 sub_8094A0C(void) { - if (gPSSData->cursorMonSpecies == SPECIES_EGG) + if (gPSSData->displayMonSpecies == SPECIES_EGG) return FALSE; if (!IsActiveItemMoving()) { - if (gPSSData->cursorMonItem == ITEM_NONE) + if (gPSSData->displayMonItemId == ITEM_NONE) { - if (gPSSData->cursorMonSpecies == SPECIES_NONE) + if (gPSSData->displayMonSpecies == SPECIES_NONE) return FALSE; SetMenuText(PC_TEXT_GIVE2); } else { - if (!ItemIsMail(gPSSData->cursorMonItem)) + if (!ItemIsMail(gPSSData->displayMonItemId)) { SetMenuText(PC_TEXT_TAKE); SetMenuText(PC_TEXT_BAG); @@ -1840,16 +1840,16 @@ static bool8 sub_8094A0C(void) } else { - if (gPSSData->cursorMonItem == ITEM_NONE) + if (gPSSData->displayMonItemId == ITEM_NONE) { - if (gPSSData->cursorMonSpecies == SPECIES_NONE) + if (gPSSData->displayMonSpecies == SPECIES_NONE) return FALSE; SetMenuText(PC_TEXT_GIVE); } else { - if (ItemIsMail(gPSSData->cursorMonItem) == TRUE) + if (ItemIsMail(gPSSData->displayMonItemId) == TRUE) return FALSE; SetMenuText(PC_TEXT_SWITCH); @@ -1862,8 +1862,8 @@ static bool8 sub_8094A0C(void) static void sub_8094AB8(struct Sprite *sprite) { - sprite->x = gPSSData->field_CB4->x; - sprite->y = gPSSData->field_CB4->y + 20; + sprite->x = gPSSData->cursorSprite->x; + sprite->y = gPSSData->cursorSprite->y + 20; } static void sub_8094AD8(void) @@ -1940,22 +1940,22 @@ static void sub_8094AD8(void) LoadSpriteSheets(spriteSheets); LoadSpritePalettes(spritePalettes); - gPSSData->field_CD8[0] = IndexOfSpritePaletteTag(TAG_PAL_WAVEFORM); - gPSSData->field_CD8[1] = IndexOfSpritePaletteTag(TAG_PAL_DAC7); + gPSSData->cursorPalNums[0] = IndexOfSpritePaletteTag(TAG_PAL_WAVEFORM); + gPSSData->cursorPalNums[1] = IndexOfSpritePaletteTag(TAG_PAL_DAC7); sub_8092398(sBoxCursorArea, sBoxCursorPosition, &x, &y); spriteId = CreateSprite(&gSpriteTemplate_857BA50, x, y, 6); if (spriteId != MAX_SPRITES) { - gPSSData->field_CB4 = &gSprites[spriteId]; - gPSSData->field_CB4->oam.paletteNum = gPSSData->field_CD8[sCanOnlyMove]; - gPSSData->field_CB4->oam.priority = 1; + gPSSData->cursorSprite = &gSprites[spriteId]; + gPSSData->cursorSprite->oam.paletteNum = gPSSData->cursorPalNums[sCanOnlyMove]; + gPSSData->cursorSprite->oam.priority = 1; if (sIsMonBeingMoved) - StartSpriteAnim(gPSSData->field_CB4, 3); + StartSpriteAnim(gPSSData->cursorSprite, 3); } else { - gPSSData->field_CB4 = NULL; + gPSSData->cursorSprite = NULL; } if (sBoxCursorArea == CURSOR_AREA_IN_PARTY) @@ -1972,21 +1972,21 @@ static void sub_8094AD8(void) spriteId = CreateSprite(&gSpriteTemplate_857BA68, 0, 0, subpriority); if (spriteId != MAX_SPRITES) { - gPSSData->field_CB8 = &gSprites[spriteId]; - gPSSData->field_CB8->oam.priority = priority; + gPSSData->cursorShadowSprite = &gSprites[spriteId]; + gPSSData->cursorShadowSprite->oam.priority = priority; if (sBoxCursorArea) - gPSSData->field_CB8->invisible = 1; + gPSSData->cursorShadowSprite->invisible = 1; } else { - gPSSData->field_CB8 = NULL; + gPSSData->cursorShadowSprite = NULL; } } static void sub_8094C84(void) { sCanOnlyMove = !sCanOnlyMove; - gPSSData->field_CB4->oam.paletteNum = gPSSData->field_CD8[sCanOnlyMove]; + gPSSData->cursorSprite->oam.paletteNum = gPSSData->cursorPalNums[sCanOnlyMove]; } u8 GetBoxCursorPosition(void) @@ -2010,7 +2010,7 @@ void sub_8094CD4(u8 *arg0, u8 *arg1) void sub_8094D14(u8 animNum) { - StartSpriteAnim(gPSSData->field_CB4, animNum); + StartSpriteAnim(gPSSData->cursorSprite, animNum); } u8 sub_8094D34(void) @@ -2020,7 +2020,7 @@ u8 sub_8094D34(void) void sub_8094D40(void) { - gPSSData->field_CB4->oam.priority = 1; + gPSSData->cursorSprite->oam.priority = 1; } void sub_8094D60(void) diff --git a/src/pokemon_storage_system_6.c b/src/pokemon_storage_system_6.c index 9f40adc06..ab4849ba4 100644 --- a/src/pokemon_storage_system_6.c +++ b/src/pokemon_storage_system_6.c @@ -87,13 +87,13 @@ void AddMenu(void) gPSSData->menuWindow.height = 2 * gPSSData->menuItemsCount; gPSSData->menuWindow.tilemapLeft = 29 - gPSSData->menuWindow.width; gPSSData->menuWindow.tilemapTop = 15 - gPSSData->menuWindow.height; - gPSSData->field_CB0 = AddWindow(&gPSSData->menuWindow); - ClearWindowTilemap(gPSSData->field_CB0); - DrawStdFrameWithCustomTileAndPalette(gPSSData->field_CB0, FALSE, 0x00b, 14); - PrintTextArray(gPSSData->field_CB0, 1, 8, 2, 16, gPSSData->menuItemsCount, (void *)gPSSData->menuItems); - Menu_InitCursor(gPSSData->field_CB0, 1, 0, 2, 16, gPSSData->menuItemsCount, 0); + gPSSData->menuWindowId = AddWindow(&gPSSData->menuWindow); + ClearWindowTilemap(gPSSData->menuWindowId); + DrawStdFrameWithCustomTileAndPalette(gPSSData->menuWindowId, FALSE, 0x00b, 14); + PrintTextArray(gPSSData->menuWindowId, 1, 8, 2, 16, gPSSData->menuItemsCount, (void *)gPSSData->menuItems); + Menu_InitCursor(gPSSData->menuWindowId, 1, 0, 2, 16, gPSSData->menuItemsCount, 0); ScheduleBgCopyTilemapToVram(0); - gPSSData->field_CAE = 0; + gPSSData->menuUnusedField = 0; } bool8 sub_8094F90(void) @@ -142,6 +142,6 @@ s16 sub_8094F94(void) void sub_8095024(void) { - ClearStdWindowAndFrameToTransparent(gPSSData->field_CB0, TRUE); - RemoveWindow(gPSSData->field_CB0); + ClearStdWindowAndFrameToTransparent(gPSSData->menuWindowId, TRUE); + RemoveWindow(gPSSData->menuWindowId); } diff --git a/src/pokemon_storage_system_8.c b/src/pokemon_storage_system_8.c index 52c172505..02be5a7d6 100644 --- a/src/pokemon_storage_system_8.c +++ b/src/pokemon_storage_system_8.c @@ -20,13 +20,13 @@ static void sub_8096624(u8 id, bool8 show); static const u32 *GetItemIconPic(u16 itemId); static const u32 *GetItemIconPalette(u16 itemId); static void sub_8096898(u32 x); -static void sub_809692C(struct Sprite * sprite); -static void sub_8096958(struct Sprite * sprite); -static void sub_80969BC(struct Sprite * sprite); -static void sub_80969F4(struct Sprite * sprite); -static void sub_8096A74(struct Sprite * sprite); -static void sub_8096B10(struct Sprite * sprite); -static void sub_8096BAC(struct Sprite * sprite); +static void sub_809692C(struct Sprite *sprite); +static void sub_8096958(struct Sprite *sprite); +static void sub_80969BC(struct Sprite *sprite); +static void sub_80969F4(struct Sprite *sprite); +static void sub_8096A74(struct Sprite *sprite); +static void sub_8096B10(struct Sprite *sprite); +static void sub_8096BAC(struct Sprite *sprite); static const u32 gUnknown_83D35DC[] = INCBIN_U32("graphics/interface/pss_unk_83D35DC.4bpp"); @@ -215,7 +215,7 @@ void Item_FromMonToMoving(u8 cursorArea, u8 cursorPos) SetPartyMonIconObjMode(cursorPos, ST_OAM_OBJ_BLEND); } - gPSSData->movingItem = gPSSData->cursorMonItem; + gPSSData->movingItem = gPSSData->displayMonItemId; } void sub_8095E2C(u16 item) @@ -560,7 +560,7 @@ void PrintItemDescription(void) if (IsActiveItemMoving()) description = ItemId_GetDescription(gPSSData->movingItem); else - description = ItemId_GetDescription(gPSSData->cursorMonItem); + description = ItemId_GetDescription(gPSSData->displayMonItemId); FillWindowPixelBuffer(2, PIXEL_FILL(1)); AddTextPrinterParameterized5(2, 2, description, 2, 0, 0, NULL, 0, 0); @@ -660,9 +660,9 @@ static void sub_8096958(struct Sprite *sprite) static void sub_80969BC(struct Sprite *sprite) { - sprite->x = gPSSData->field_CB4->x + 4; - sprite->y = gPSSData->field_CB4->y + gPSSData->field_CB4->y2 + 8; - sprite->oam.priority = gPSSData->field_CB4->oam.priority; + sprite->x = gPSSData->cursorSprite->x + 4; + sprite->y = gPSSData->cursorSprite->y + gPSSData->cursorSprite->y2 + 8; + sprite->oam.priority = gPSSData->cursorSprite->oam.priority; } static void sub_80969F4(struct Sprite *sprite) diff --git a/src/pokemon_storage_system_9.c b/src/pokemon_storage_system_9.c index 42fecfd97..d5f648765 100644 --- a/src/pokemon_storage_system_9.c +++ b/src/pokemon_storage_system_9.c @@ -2,12 +2,12 @@ #include "gflib.h" #include "pokemon_storage_system_internal.h" -static EWRAM_DATA struct UnkStruct_2000020 *gUnknown_203982C = NULL; +static EWRAM_DATA struct UnkUtil *gUnknown_203982C = NULL; -static void sub_8096CDC(struct UnkStruct_2000028 *unkStruct); -static void sub_8096D70(struct UnkStruct_2000028 *unkStruct); +static void sub_8096CDC(struct UnkUtilData *unkStruct); +static void sub_8096D70(struct UnkUtilData *unkStruct); -void sub_8096BE4(struct UnkStruct_2000020 *arg0, struct UnkStruct_2000028 *arg1, u32 arg2) +void sub_8096BE4(struct UnkUtil *arg0, struct UnkUtilData *arg1, u32 arg2) { gUnknown_203982C = arg0; arg0->unk_00 = arg1; @@ -23,7 +23,7 @@ void sub_8096BF8(void) { for (i = 0; i < gUnknown_203982C->unk_04; i++) { - struct UnkStruct_2000028 *unkStruct = &gUnknown_203982C->unk_00[i]; + struct UnkUtilData *unkStruct = &gUnknown_203982C->unk_00[i]; unkStruct->unk_0c(unkStruct); } @@ -33,7 +33,7 @@ void sub_8096BF8(void) static bool8 sub_8096C40(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height, u16 unkArg) { - struct UnkStruct_2000028 *unkStruct; + struct UnkUtilData *unkStruct; if (gUnknown_203982C->unk_04 >= gUnknown_203982C->unk_05) return FALSE; @@ -48,7 +48,7 @@ static bool8 sub_8096C40(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft return TRUE; } -static void sub_8096CDC(struct UnkStruct_2000028 *unkStruct) +static void sub_8096CDC(struct UnkUtilData *unkStruct) { u16 i; @@ -62,7 +62,7 @@ static void sub_8096CDC(struct UnkStruct_2000028 *unkStruct) static bool8 sub_8096D14(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height) { - struct UnkStruct_2000028 *unkStruct; + struct UnkUtilData *unkStruct; if (gUnknown_203982C->unk_04 >= gUnknown_203982C->unk_05) return FALSE; @@ -75,7 +75,7 @@ static bool8 sub_8096D14(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height) return TRUE; } -static void sub_8096D70(struct UnkStruct_2000028 *unkStruct) +static void sub_8096D70(struct UnkUtilData *unkStruct) { u16 i; diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index da4df9eff..2c36f8057 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -129,7 +129,7 @@ static void SwapMonMoveSlots(void); static void SwapBoxMonMoveSlots(void); static void UpdateCurrentMonBufferFromPartyOrBox(struct Pokemon * mon); static void PokeSum_SetMonPicSpriteCallback(u16 spriteId); -static void SpriteCB_MoveSelectionCursor(struct Sprite * sprite); +static void SpriteCB_MoveSelectionCursor(struct Sprite *sprite); static void UpdateMonStatusIconObj(void); static void UpdateHpBarObjs(void); static void UpdateExpBarObjs(void); @@ -238,7 +238,7 @@ struct PokemonSummaryScreenData } monList; MainCallback savedCallback; - struct Sprite * markingSprite; + struct Sprite *markingSprite; u8 ALIGNED(4) lastPageFlipDirection; /* 0x3300 */ u8 ALIGNED(4) unk3304; /* 0x3304 */ @@ -264,7 +264,7 @@ struct Struct203B144 struct ExpBarObjs { - struct Sprite * sprites[11]; /* 0x00 */ + struct Sprite *sprites[11]; /* 0x00 */ u16 xpos[11]; /* 0x2c */ u16 tileTag; /* 0x42 */ u16 palTag; /* 0x44 */ @@ -272,7 +272,7 @@ struct ExpBarObjs struct HpBarObjs { - struct Sprite * sprites[10]; /* 0x00 */ + struct Sprite *sprites[10]; /* 0x00 */ u16 xpos[10]; /* 0x28 */ u16 tileTag; /* 0x3c */ u16 palTag; /* 0x3e */ @@ -287,7 +287,7 @@ struct MonPicBounceState struct MoveSelectionCursor { - struct Sprite * sprite; /* 0x00 */ + struct Sprite *sprite; /* 0x00 */ u16 whichSprite; /* 0x04 */ u16 tileTag; /* 0x06 */ u16 palTag; /* 0x08 */ @@ -295,21 +295,21 @@ struct MoveSelectionCursor struct MonStatusIconObj { - struct Sprite * sprite; /* 0x00 */ + struct Sprite *sprite; /* 0x00 */ u16 tileTag; /* 0x04 */ u16 palTag; /* 0x06 */ }; struct PokerusIconObj { - struct Sprite * sprite; /* 0x00 */ + struct Sprite *sprite; /* 0x00 */ u16 tileTag; /* 0x04 */ u16 palTag; /* 0x06 */ }; struct ShinyStarObjData { - struct Sprite * sprite; /* 0x00 */ + struct Sprite *sprite; /* 0x00 */ u16 tileTag; /* 0x04 */ u16 palTag; /* 0x06 */ }; @@ -3914,7 +3914,7 @@ static void Task_InputHandler_SelectOrForgetMove(u8 taskId) } } -static void SpriteCB_PokeSum_MonPicSprite(struct Sprite * sprite) +static void SpriteCB_PokeSum_MonPicSprite(struct Sprite *sprite) { if (sMonSummaryScreen->numMonPicBounces >= 2) return; @@ -3954,7 +3954,7 @@ static void SpriteCB_PokeSum_MonPicSprite(struct Sprite * sprite) } } -static void SpriteCB_PokeSum_EggPicShake(struct Sprite * sprite) +static void SpriteCB_PokeSum_EggPicShake(struct Sprite *sprite) { if (sMonSummaryScreen->numMonPicBounces >= 2) return; @@ -4001,7 +4001,7 @@ static void SpriteCB_PokeSum_EggPicShake(struct Sprite * sprite) } } -static void SpriteCB_MonPicDummy(struct Sprite * sprite) +static void SpriteCB_MonPicDummy(struct Sprite *sprite) { } @@ -4187,7 +4187,7 @@ static void CreateMoveSelectionCursorObjs(u16 tileTag, u16 palTag) { u8 i; u8 spriteId; - void * gfxBufferPtrs[2]; + void *gfxBufferPtrs[2]; gfxBufferPtrs[0] = AllocZeroed(0x20 * 64); gfxBufferPtrs[1] = AllocZeroed(0x20 * 64); @@ -4245,7 +4245,7 @@ static void ShoworHideMoveSelectionCursor(bool8 invisible) sMoveSelectionCursorObjs[i]->sprite->invisible = invisible; } -static void SpriteCB_MoveSelectionCursor(struct Sprite * sprite) +static void SpriteCB_MoveSelectionCursor(struct Sprite *sprite) { u8 i; @@ -4304,7 +4304,7 @@ static void DestroyMoveSelectionCursorObjs(void) static void CreateMonStatusIconObj(u16 tileTag, u16 palTag) { u16 spriteId; - void * gfxBufferPtr; + void *gfxBufferPtr; sStatusIcon = AllocZeroed(sizeof(struct MonStatusIconObj)); gfxBufferPtr = AllocZeroed(0x20 * 32); @@ -4394,7 +4394,7 @@ static void CreateHpBarObjs(u16 tileTag, u16 palTag) { u8 i; u8 spriteId; - void * gfxBufferPtr; + void *gfxBufferPtr; u32 curHp; u32 maxHp; u8 hpBarPalTagOffset = 0; @@ -4554,7 +4554,7 @@ static void CreateExpBarObjs(u16 tileTag, u16 palTag) { u8 i; u8 spriteId; - void * gfxBufferPtr; + void *gfxBufferPtr; sExpBarObjs = AllocZeroed(sizeof(struct ExpBarObjs)); gfxBufferPtr = AllocZeroed(0x20 * 12); @@ -4685,7 +4685,7 @@ static void ShowOrHideExpBarObjs(u8 invisible) static void CreatePokerusIconObj(u16 tileTag, u16 palTag) { u16 spriteId; - void * gfxBufferPtr; + void *gfxBufferPtr; sPokerusIconObj = AllocZeroed(sizeof(struct PokerusIconObj)); gfxBufferPtr = AllocZeroed(0x20 * 1); @@ -4770,7 +4770,7 @@ static void HideShowPokerusIcon(bool8 invisible) static void CreateShinyStarObj(u16 tileTag, u16 palTag) { u16 spriteId; - void * gfxBufferPtr; + void *gfxBufferPtr; sShinyStarObjData = AllocZeroed(sizeof(struct ShinyStarObjData)); gfxBufferPtr = AllocZeroed(0x20 * 2); @@ -4881,7 +4881,7 @@ static void PokeSum_CreateMonMarkingsSprite(void) u32 markings = GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_MARKINGS); DestroySpriteAndFreeResources(sMonSummaryScreen->markingSprite); - sMonSummaryScreen->markingSprite = CreateMonMarkingSprite_SelectCombo(TAG_PSS_UNK_8C, TAG_PSS_UNK_8C, sMonMarkingSpritePalette); + sMonSummaryScreen->markingSprite = CreateMonMarkingAllCombosSprite(TAG_PSS_UNK_8C, TAG_PSS_UNK_8C, sMonMarkingSpritePalette); if (sMonSummaryScreen->markingSprite != NULL) { diff --git a/src/psychic.c b/src/psychic.c index bd1427e83..1c31bfdca 100644 --- a/src/psychic.c +++ b/src/psychic.c @@ -1017,7 +1017,7 @@ static void sub_80B3D78(u8 taskId) break; case 1: task->data[1] -= 4; - task->data[2] = 256 - (gSineTable[task->data[1]] >> 1);; + task->data[2] = 256 - (gSineTable[task->data[1]] >> 1); SetSpriteRotScale(task->data[15], task->data[2], task->data[2], 0); SetBattlerSpriteYOffsetFromOtherYScale(task->data[15], task->data[13]); if (task->data[1] == 0) diff --git a/src/quest_log.c b/src/quest_log.c index a950b9014..5614f834a 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -153,7 +153,7 @@ static const u16 sUnknown_8456638[] = INCBIN_U16("graphics/unknown/unknown_84566 static const u8 sQuestLogTextLineYCoords[] = {17, 10, 3}; -void SetQuestLogRecordAndPlaybackPointers(void * oldPointer) +void SetQuestLogRecordAndPlaybackPointers(void *oldPointer) { ptrdiff_t offset = (void *)gSaveBlock1Ptr - oldPointer; if (gUnknown_203AE04) @@ -201,10 +201,10 @@ void RunQuestLogCB(void) sQuestLogCB(); } -bool8 sub_8110944(const void * a0, size_t cmdSize) +bool8 sub_8110944(const void *a0, size_t cmdSize) { - void * r2 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].script; - void * r0 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end; + void *r2 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].script; + void *r0 = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end; r0 -= cmdSize; if ((const void *)a0 < r2 || (const void *)a0 > r0) return FALSE; @@ -213,8 +213,8 @@ bool8 sub_8110944(const void * a0, size_t cmdSize) bool8 WillCommandOfSizeFitInSav1Record(u16 *cursor, size_t size) { - void * start = gSaveBlock1Ptr->questLog[sCurrentSceneNum].script; - void * end = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end; + void *start = gSaveBlock1Ptr->questLog[sCurrentSceneNum].script; + void *end = gSaveBlock1Ptr->questLog[sCurrentSceneNum].end; end -= size; if ((void *)cursor < start || (void *)cursor > end) return FALSE; @@ -1645,9 +1645,9 @@ static const struct FlagOrVarRecord sDummyFlagOrVarRecord = { 0x7FFF }; -void * QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx) +void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx) { - void * response; + void *response; if (sQuestLogCursor == 0) return NULL; if (sQuestLogCursor >= sNumEventsInLogEntry) diff --git a/src/region_map.c b/src/region_map.c index 2f73db580..e897d3de3 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -116,7 +116,7 @@ struct GpuWindowParams struct SwitchMapMenuCursorSubsprite { u8 tiles[0x400]; - struct Sprite * sprite; + struct Sprite *sprite; u16 tileTag; u16 palTag; s16 x; @@ -176,7 +176,7 @@ struct DungeonMapPreview struct MapEdge { u16 tiles[0x200]; - struct Sprite * sprite; + struct Sprite *sprite; s16 x; s16 y; u16 tileTag; @@ -210,7 +210,7 @@ struct MapCursor u16 selectedMapsec; u16 selectedMapsecType; u16 selectedDungeonType; - struct Sprite * sprite; + struct Sprite *sprite; u16 tileTag; u16 palTag; u16 tiles[0x80]; @@ -220,7 +220,7 @@ struct PlayerIcon { s16 x; s16 y; - struct Sprite * sprite; + struct Sprite *sprite; u16 tileTag; u16 palTag; u16 tiles[0x40]; @@ -230,7 +230,7 @@ struct MapIconSprite { u32 unused; u8 region; - struct Sprite * sprite; + struct Sprite *sprite; u16 tileTag; u16 palTag; }; @@ -2277,7 +2277,7 @@ static bool8 HandleSwitchMapInput(void) return FALSE; } -static void SpriteCB_SwitchMapCursor(struct Sprite * sprite) +static void SpriteCB_SwitchMapCursor(struct Sprite *sprite) { sprite->y = sSwitchMapMenu->highlight.top + 16; } @@ -2619,7 +2619,7 @@ static bool8 UpdateDungeonMapPreview(bool8 a0) return FALSE; } -static void SpriteCB_MapEdge(struct Sprite * sprite) +static void SpriteCB_MapEdge(struct Sprite *sprite) { } @@ -3112,7 +3112,7 @@ static bool8 MoveMapEdgesInward(void) return FALSE; } -static void SpriteCB_MapCursor(struct Sprite * sprite) +static void SpriteCB_MapCursor(struct Sprite *sprite) { if (sMapCursor->moveCounter != 0) { diff --git a/src/seagallop.c b/src/seagallop.c index 79f837df7..2f6377c8b 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -18,7 +18,7 @@ #define PALTAG_FERRY_WAKE 3000 -static EWRAM_DATA void * sBg3TilemapBuffer = NULL; +static EWRAM_DATA void *sBg3TilemapBuffer = NULL; static void CB2_SetUpSeagallopScene(void); static void VBlankCB_SeaGallop(void); @@ -34,9 +34,9 @@ static void ResetBGPos(void); static void LoadFerrySpriteResources(void); static void FreeFerrySpriteResources(void); static void CreateFerrySprite(void); -static void SpriteCB_Ferry(struct Sprite * sprite); +static void SpriteCB_Ferry(struct Sprite *sprite); static void CreateWakeSprite(s16 x); -static void SpriteCB_Wake(struct Sprite * sprite); +static void SpriteCB_Wake(struct Sprite *sprite); static bool8 GetDirectionOfTravel(void); static const u16 sWaterTiles[] = INCBIN_U16("graphics/seagallop/water.4bpp"); @@ -328,7 +328,7 @@ static void Task_Seagallop_3(void) static void ResetGPU(void) { - void * dest = (void *) VRAM; + void *dest = (void *) VRAM; DmaClearLarge16(3, dest, VRAM_SIZE, 0x1000); DmaClear32(3, (void *)OAM, OAM_SIZE); @@ -410,7 +410,7 @@ static void CreateFerrySprite(void) } } -static void SpriteCB_Ferry(struct Sprite * sprite) +static void SpriteCB_Ferry(struct Sprite *sprite) { sprite->data[1] += sprite->data[0]; sprite->x2 = sprite->data[1] >> 4; @@ -437,7 +437,7 @@ static void CreateWakeSprite(s16 x) } } -static void SpriteCB_Wake(struct Sprite * sprite) +static void SpriteCB_Wake(struct Sprite *sprite) { if (sprite->animEnded) { diff --git a/src/slot_machine.c b/src/slot_machine.c index 24a728046..7c8392c78 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -75,10 +75,10 @@ struct SlotMachineState struct SlotMachineGfxManager { u32 field_00[3]; - struct Sprite * reelIconSprites[3][5]; - struct Sprite * creditDigitSprites[4]; - struct Sprite * payoutDigitSprites[4]; - struct Sprite * clefairySprites[2]; + struct Sprite *reelIconSprites[3][5]; + struct Sprite *creditDigitSprites[4]; + struct Sprite *payoutDigitSprites[4]; + struct Sprite *clefairySprites[2]; vu16 * reelIconAffineParamPtr; }; @@ -1743,7 +1743,7 @@ static void InitGfxManager(struct SlotMachineGfxManager * manager) static void CreateReelIconSprites(void) { - struct Sprite * sprite; + struct Sprite *sprite; s32 i, j; s32 spriteId; s32 animId; @@ -1781,12 +1781,12 @@ static void UpdateReelIconSprites(const s16 * reelPosPtr, const s16 * yposPtr) sSlotMachineGfxManager->reelIconSprites[i][j]->y2 = ypos; { s32 animId = sReelIconAnimByReelAndPos[i][reelPos]; - struct Sprite * sprite = sSlotMachineGfxManager->reelIconSprites[i][j]; + struct Sprite *sprite = sSlotMachineGfxManager->reelIconSprites[i][j]; StartSpriteAnim(sprite, animId); } { s32 animId = sReelIconAnimByReelAndPos[i][reelPos]; - struct Sprite * sprite = sSlotMachineGfxManager->reelIconSprites[i][j]; + struct Sprite *sprite = sSlotMachineGfxManager->reelIconSprites[i][j]; StartSpriteAnim(sprite, animId); } sSlotMachineGfxManager->reelIconSprites[i][j]->oam.paletteNum = IndexOfSpritePaletteTag(sReelIconPaletteTags[sReelIconAnimByReelAndPos[i][reelPos]]); diff --git a/src/smokescreen.c b/src/smokescreen.c index 2f269737e..c1d30a347 100644 --- a/src/smokescreen.c +++ b/src/smokescreen.c @@ -2,7 +2,7 @@ #include "decompress.h" #include "util.h" -static void SmokescreenImpact_Callback(struct Sprite * sprite); +static void SmokescreenImpact_Callback(struct Sprite *sprite); extern const struct CompressedSpriteSheet gSmokescreenImpactSpriteSheet; extern const struct CompressedSpritePalette gSmokescreenImpactSpritePalette; diff --git a/src/ss_anne.c b/src/ss_anne.c index ed7666fd3..78ed5b48b 100644 --- a/src/ss_anne.c +++ b/src/ss_anne.c @@ -14,9 +14,9 @@ static void Task_SSAnneInit(u8 taskId); static void Task_SSAnneRun(u8 taskId); static void Task_SSAnneFinish(u8 taskId); static void CreateWakeBehindBoat(void); -static void WakeSpriteCallback(struct Sprite * sprite); +static void WakeSpriteCallback(struct Sprite *sprite); static void CreateSmokeSprite(void); -static void SmokeSpriteCallback(struct Sprite * sprite); +static void SmokeSpriteCallback(struct Sprite *sprite); static const u16 sWakeTiles[] = INCBIN_U16("graphics/ss_anne/unk_8479838.4bpp"); static const u16 sSmokeTiles[] = INCBIN_U16("graphics/ss_anne/unk_8479A38.4bpp"); @@ -156,7 +156,7 @@ static void CreateWakeBehindBoat(void) gSprites[spriteId].oam.paletteNum = 10; } -static void WakeSpriteCallback(struct Sprite * sprite) +static void WakeSpriteCallback(struct Sprite *sprite) { u8 objectEventId; struct ObjectEvent * boatObject; @@ -191,7 +191,7 @@ static void CreateSmokeSprite(void) } } -static void SmokeSpriteCallback(struct Sprite * sprite) +static void SmokeSpriteCallback(struct Sprite *sprite) { sprite->data[0]++; sprite->x2 = sprite->data[0] / 4; diff --git a/src/teachy_tv.c b/src/teachy_tv.c index f18fe056d..75daa080b 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -781,7 +781,7 @@ static void TTVcmd_ClearBg2TeachyTvGraphic(u8 taskId) static void TTVcmd_NpcMoveAndSetupTextPrinter(u8 taskId) { s16 * data = gTasks[taskId].data; - struct Sprite * spriteAddr = &gSprites[data[1]]; + struct Sprite *spriteAddr = &gSprites[data[1]]; if (data[2] != 35) ++data[2]; else { @@ -1220,8 +1220,8 @@ static void TeachyTvLoadBg3Map(u16 *buffer) u8 * mapTilesRowBuffer; u16 i, j, k; u16 currentBlockIdx; - void * tilesetsBuffer; - void * palIndicesBuffer; + void *tilesetsBuffer; + void *palIndicesBuffer; u16 numMapTilesRows = 0; const struct MapLayout *layout = &Route1_Layout; u16 * blockIndicesBuffer = AllocZeroed(0x800); diff --git a/src/text_printer.c b/src/text_printer.c index a701bd671..329463859 100644 --- a/src/text_printer.c +++ b/src/text_printer.c @@ -275,7 +275,7 @@ void CopyGlyphToWindow(struct TextPrinter *textPrinter) } } -void sub_8003614(void * tileData, u16 currentX, u16 currentY, u16 width, u16 height) +void sub_8003614(void *tileData, u16 currentX, u16 currentY, u16 width, u16 height) { int r0, r1; u8 r2; diff --git a/src/text_window_graphics.c b/src/text_window_graphics.c index 0fb8b38f8..554c9e37a 100644 --- a/src/text_window_graphics.c +++ b/src/text_window_graphics.c @@ -51,7 +51,7 @@ const struct TextWindowGraphics gUserFrames[] = { {gUnknown_84717CC, gUnknown_8471A2C} }; // NELEMS = 10 -const struct TextWindowGraphics * GetUserFrameGraphicsInfo(u8 idx) +const struct TextWindowGraphics *GetWindowFrameTilesPal(u8 idx) { if (idx >= 20) // if (idx >= NELEMS(gUserFrames)) return &gUserFrames[0]; diff --git a/src/title_screen.c b/src/title_screen.c index 80c7ce193..86e0427cb 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -54,7 +54,7 @@ static void UpdateScanlineEffectRegBuffer(s16 a0); static void ScheduleStopScanlineEffect(void); static void LoadMainTitleScreenPalsAndResetBgs(void); static void CB2_FadeOutTransitionToSaveClearScreen(void); -static void SpriteCallback_TitleScreenFlameOrLeaf(struct Sprite * sprite); +static void SpriteCallback_TitleScreenFlameOrLeaf(struct Sprite *sprite); static void CB2_FadeOutTransitionToBerryFix(void); static void LoadSpriteGfxAndPals(void); static void Task_FlameOrLeafSpawner(u8 taskId); @@ -65,7 +65,7 @@ static void SetPalOnOrCreateBlankSprite(bool32 a0); static u8 CreateSlashSprite(void); static void ScheduleHideSlashSprite(u8 spriteId); static bool32 IsSlashSpriteHidden(u8 spriteId); -static void SpriteCallback_Slash(struct Sprite * sprite); +static void SpriteCallback_Slash(struct Sprite *sprite); // bg3 static const u8 sBorderBgTiles[] = INCBIN_U8("graphics/title_screen/border_bg.4bpp.lz"); @@ -909,7 +909,7 @@ static void LoadSpriteGfxAndPals(void) LoadSpritePalettes(sSpritePals); } -static void SpriteCallback_TitleScreenFlameOrLeaf(struct Sprite * sprite) +static void SpriteCallback_TitleScreenFlameOrLeaf(struct Sprite *sprite) { s16 * data = sprite->data; sprite->data[0] -= data[1]; @@ -1044,7 +1044,7 @@ static void CreateFlameOrLeafSprite(s32 y0, s32 x1, s32 y1) } } -static void SpriteCallback_LG_8079800(struct Sprite * sprite) +static void SpriteCallback_LG_8079800(struct Sprite *sprite) { sprite->x -= 7; if (sprite->x < -16) @@ -1170,7 +1170,7 @@ static bool32 IsSlashSpriteHidden(u8 spriteId) return FALSE; } -static void SpriteCallback_Slash(struct Sprite * sprite) +static void SpriteCallback_Slash(struct Sprite *sprite) { switch (sprite->data[0]) { diff --git a/src/tm_case.c b/src/tm_case.c index 3c0e31d60..d7ffee5a3 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -61,7 +61,7 @@ struct UnkStruct_203B11C static EWRAM_DATA struct UnkStruct_203B10C sTMCaseStaticResources = {}; static EWRAM_DATA struct UnkStruct_203B118 * sTMCaseDynamicResources = NULL; static EWRAM_DATA struct UnkStruct_203B11C * sPokedudePackBackup = NULL; -static EWRAM_DATA void * sTilemapBuffer = NULL; // tilemap buffer +static EWRAM_DATA void *sTilemapBuffer = NULL; // tilemap buffer static EWRAM_DATA struct ListMenuItem * sListMenuItemsBuffer = NULL; static EWRAM_DATA u8 (* sListMenuStringsBuffer)[29] = NULL; static EWRAM_DATA u16 * sTMSpritePaletteBuffer = NULL; @@ -121,11 +121,11 @@ static void HandleCreateYesNoMenu(u8 taskId, const struct YesNoFuncTable * ptrs) static u8 AddTMContextMenu(u8 * a0, u8 a1); static void RemoveTMContextMenu(u8 * a0); static u8 CreateTMSprite(u16 itemId); -static void SetTMSpriteAnim(struct Sprite * sprite, u8 var); +static void SetTMSpriteAnim(struct Sprite *sprite, u8 var); static void TintTMSpriteByType(u8 type); -static void UpdateTMSpritePosition(struct Sprite * sprite, u8 var); +static void UpdateTMSpritePosition(struct Sprite *sprite, u8 var); static void InitSelectedTMSpriteData(u8 a0, u16 itemId); -static void SpriteCB_MoveTMSpriteInCase(struct Sprite * sprite); +static void SpriteCB_MoveTMSpriteInCase(struct Sprite *sprite); static void LoadTMTypePalettes(void); static const struct BgTemplate sBGTemplates[] = { @@ -1439,7 +1439,7 @@ static u8 CreateTMSprite(u16 itemId) } } -static void SetTMSpriteAnim(struct Sprite * sprite, u8 idx) +static void SetTMSpriteAnim(struct Sprite *sprite, u8 idx) { if (idx >= 50) StartSpriteAnim(sprite, 1); @@ -1457,7 +1457,7 @@ static void TintTMSpriteByType(u8 type) } } -static void UpdateTMSpritePosition(struct Sprite * sprite, u8 var) +static void UpdateTMSpritePosition(struct Sprite *sprite, u8 var) { s32 x, y; if (var == 0xFF) @@ -1486,7 +1486,7 @@ static void InitSelectedTMSpriteData(u8 spriteId, u16 itemId) gSprites[spriteId].callback = SpriteCB_MoveTMSpriteInCase; } -static void SpriteCB_MoveTMSpriteInCase(struct Sprite * sprite) +static void SpriteCB_MoveTMSpriteInCase(struct Sprite *sprite) { switch (sprite->data[1]) { diff --git a/src/trade_scene.c b/src/trade_scene.c index 07edfe8c0..c4acdc38a 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -112,12 +112,12 @@ struct TradeAnimationResources { static EWRAM_DATA struct TradeAnimationResources * sTradeData = NULL; -static void SpriteCB_TradeGlowCable(struct Sprite * sprite); -static void SpriteCB_TradeGlowWireless(struct Sprite * sprite); -static void SpriteCB_TradeGlowCore(struct Sprite * sprite); -static void SpriteCB_GameLinkCableEnd_Outbound(struct Sprite * sprite); -static void SpriteCB_GameLinkCableEnd_Inbound(struct Sprite * sprite); -static void SpriteCB_TradeGBAScreen(struct Sprite * sprite); +static void SpriteCB_TradeGlowCable(struct Sprite *sprite); +static void SpriteCB_TradeGlowWireless(struct Sprite *sprite); +static void SpriteCB_TradeGlowCore(struct Sprite *sprite); +static void SpriteCB_GameLinkCableEnd_Outbound(struct Sprite *sprite); +static void SpriteCB_GameLinkCableEnd_Inbound(struct Sprite *sprite); +static void SpriteCB_TradeGBAScreen(struct Sprite *sprite); static void TradeAnimInit_LoadGfx(void); static void CB2_RunTradeAnim_InGameTrade(void); static void SetTradeSequenceBgGpuRegs(u8 idx); @@ -126,10 +126,10 @@ static void TradeBufferOTnameAndNicknames(void); static u8 DoTradeAnim(void); static u8 DoTradeAnim_Cable(void); static u8 DoTradeAnim_Wireless(void); -static void SpriteCB_TradePokeball_Default(struct Sprite * sprite); -static void SpriteCB_TradePokeball_Outbound(struct Sprite * sprite); -static void SpriteCB_TradePokeball_Outbound2(struct Sprite * sprite); -static void SpriteCB_TradePokeball_Inbound(struct Sprite * sprite); +static void SpriteCB_TradePokeball_Default(struct Sprite *sprite); +static void SpriteCB_TradePokeball_Outbound(struct Sprite *sprite); +static void SpriteCB_TradePokeball_Outbound2(struct Sprite *sprite); +static void SpriteCB_TradePokeball_Inbound(struct Sprite *sprite); static void BufferInGameTradeMonName(void); static void GetInGameTradeMail(struct Mail * mail, const struct InGameTrade * inGameTrade); static void CB2_RunTradeAnim_LinkTrade(void); @@ -591,7 +591,7 @@ static const u8 sWirelessSignalAnimParams[][2] = { }; // Sprite callback for link cable trade glow -static void SpriteCB_TradeGlowCable(struct Sprite * sprite) +static void SpriteCB_TradeGlowCable(struct Sprite *sprite) { sprite->data[0]++; if (sprite->data[0] == 10) @@ -602,7 +602,7 @@ static void SpriteCB_TradeGlowCable(struct Sprite * sprite) } // Sprite callback for wireless trade glow -static void SpriteCB_TradeGlowWireless(struct Sprite * sprite) +static void SpriteCB_TradeGlowWireless(struct Sprite *sprite) { if (!sprite->invisible) { @@ -616,7 +616,7 @@ static void SpriteCB_TradeGlowWireless(struct Sprite * sprite) } // Palette flash for trade glow core -static void SpriteCB_TradeGlowCore(struct Sprite * sprite) +static void SpriteCB_TradeGlowCore(struct Sprite *sprite) { if (sprite->data[1] == 0) { @@ -628,7 +628,7 @@ static void SpriteCB_TradeGlowCore(struct Sprite * sprite) } // Move down for 10 frames -static void SpriteCB_GameLinkCableEnd_Outbound(struct Sprite * sprite) +static void SpriteCB_GameLinkCableEnd_Outbound(struct Sprite *sprite) { sprite->data[0]++; sprite->y2++; @@ -637,7 +637,7 @@ static void SpriteCB_GameLinkCableEnd_Outbound(struct Sprite * sprite) } // Move up for 10 frames -static void SpriteCB_GameLinkCableEnd_Inbound(struct Sprite * sprite) +static void SpriteCB_GameLinkCableEnd_Inbound(struct Sprite *sprite) { sprite->data[0]++; sprite->y2--; @@ -646,7 +646,7 @@ static void SpriteCB_GameLinkCableEnd_Inbound(struct Sprite * sprite) } // Play a sound every 15 frames -static void SpriteCB_TradeGBAScreen(struct Sprite * sprite) +static void SpriteCB_TradeGBAScreen(struct Sprite *sprite) { sprite->data[0]++; if (sprite->data[0] == 15) @@ -2326,7 +2326,7 @@ static void HandleLinkDataReceive(void) } } -static void SpriteCB_TradePokeball_Default(struct Sprite * sprite) +static void SpriteCB_TradePokeball_Default(struct Sprite *sprite) { sprite->y += sprite->data[0] / 10; sprite->data[5] += sprite->data[1]; @@ -2347,7 +2347,7 @@ static void SpriteCB_TradePokeball_Default(struct Sprite * sprite) } } -static void SpriteCB_TradePokeball_Outbound(struct Sprite * sprite) +static void SpriteCB_TradePokeball_Outbound(struct Sprite *sprite) { sprite->y2 += sTradeBallVerticalVelocityTable[sprite->data[0]]; if (sprite->data[0] == 22) @@ -2362,7 +2362,7 @@ static void SpriteCB_TradePokeball_Outbound(struct Sprite * sprite) } } -static void SpriteCB_TradePokeball_Outbound2(struct Sprite * sprite) +static void SpriteCB_TradePokeball_Outbound2(struct Sprite *sprite) { if (sprite->data[1] == 20) StartSpriteAffineAnim(sprite, 1); @@ -2379,7 +2379,7 @@ static void SpriteCB_TradePokeball_Outbound2(struct Sprite * sprite) } } -static void SpriteCB_TradePokeball_Inbound(struct Sprite * sprite) +static void SpriteCB_TradePokeball_Inbound(struct Sprite *sprite) { if (sprite->data[2] == 0) { diff --git a/src/trainer_see.c b/src/trainer_see.c index e884d6104..82a35c2db 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -40,7 +40,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCreateCameraObj(u8 taskId, stru static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); static void Task_DestroyTrainerApproachTask(u8 taskId); -static void SpriteCB_TrainerIcons(struct Sprite * sprite); +static void SpriteCB_TrainerIcons(struct Sprite *sprite); static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum); static const u16 sGfx_Emoticons[] = INCBIN_U16("graphics/misc/emoticons.4bpp"); diff --git a/src/union_room_chat_objects.c b/src/union_room_chat_objects.c index 51c1f2198..24590c67a 100644 --- a/src/union_room_chat_objects.c +++ b/src/union_room_chat_objects.c @@ -16,8 +16,8 @@ struct UnionRoomChat3 static EWRAM_DATA struct UnionRoomChat3 *sWork = NULL; -static void SpriteCB_TextEntryCursor(struct Sprite * sprite); -static void SpriteCB_CharacterSelectCursor(struct Sprite * sprite); +static void SpriteCB_TextEntryCursor(struct Sprite *sprite); +static void SpriteCB_CharacterSelectCursor(struct Sprite *sprite); static const u16 sUnionRoomChatInterfacePal[] = INCBIN_U16("graphics/union_room_chat/unk_845AC14.gbapal"); static const u32 sSelectorCursorGfxTiles[] = INCBIN_U32("graphics/union_room_chat/unk_845AC34.4bpp.lz"); diff --git a/tools/gbagfx/huff.c b/tools/gbagfx/huff.c index 143ed79be..c6c23cbb3 100644 --- a/tools/gbagfx/huff.c +++ b/tools/gbagfx/huff.c @@ -6,21 +6,21 @@ #include "global.h" #include "huff.h" -static int cmp_tree(const void * a0, const void * b0) { +static int cmp_tree(const void *a0, const void *b0) { return ((struct HuffData *)a0)->value - ((struct HuffData *)b0)->value; } typedef int (*cmpfun)(const void *, const void *); -int msort_r(void * data, size_t count, size_t size, cmpfun cmp, void * buffer) { +int msort_r(void *data, size_t count, size_t size, cmpfun cmp, void *buffer) { /* * Out-of-place mergesort (stable sort) * Returns 1 on success, 0 on failure */ - void * leftPtr; - void * rightPtr; - void * leftEnd; - void * rightEnd; + void *leftPtr; + void *rightPtr; + void *leftEnd; + void *rightEnd; int i; switch (count) { @@ -85,8 +85,8 @@ int msort_r(void * data, size_t count, size_t size, cmpfun cmp, void * buffer) { return 1; } -int msort(void * data, size_t count, size_t size, cmpfun cmp) { - void * buffer = malloc(count * size); +int msort(void *data, size_t count, size_t size, cmpfun cmp) { + void *buffer = malloc(count * size); if (buffer == NULL) return 0; int result = msort_r(data, count, size, cmp, buffer); free(buffer); From bcfebc7de4b84b149ccdef6cb025ed79a6578127 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sat, 30 Jul 2022 13:11:02 -0400 Subject: [PATCH 52/64] Review changes --- src/battle_records.c | 2 +- src/cable_club.c | 8 +- src/event_object_lock.c | 2 +- src/fame_checker.c | 4 +- src/field_effect.c | 338 +++++++++++++++++++------------------- src/field_player_avatar.c | 52 +++--- src/field_specials.c | 14 +- src/map_name_popup.c | 2 +- src/naming_screen.c | 18 +- src/script_menu.c | 6 +- src/seagallop.c | 2 +- src/trainer_see.c | 62 +++---- src/vs_seeker.c | 2 +- 13 files changed, 256 insertions(+), 256 deletions(-) diff --git a/src/battle_records.c b/src/battle_records.c index 991767140..740ede597 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -167,7 +167,7 @@ static void Task_WaitFadeIn(u8 taskId) static void Task_WaitButton(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) { diff --git a/src/cable_club.c b/src/cable_club.c index fabbaf00a..cf54d360e 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -580,7 +580,7 @@ void CableClub_AskSaveTheGame(void) static void Task_StartWiredCableClubBattle(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; switch (task->data[0]) { case 0: @@ -772,7 +772,7 @@ void ExitLinkRoom(void) static void Task_EnterCableClubSeat(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; switch (task->data[0]) { case 0: @@ -821,7 +821,7 @@ static void CreateEnterCableClubSeatTaskWithFollowupFunc(TaskFunc followUpFunc) static void Task_StartWiredCableClubTrade(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; switch (task->data[0]) { case 0: @@ -936,7 +936,7 @@ bool32 GetSeeingLinkPlayerCardMsg(u8 who) void Task_WaitForReceivedRemoteLinkPlayers5SecondTimeout(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; task->data[0]++; if (task->data[0] > 300) { diff --git a/src/event_object_lock.c b/src/event_object_lock.c index c578905f3..073e243a1 100644 --- a/src/event_object_lock.c +++ b/src/event_object_lock.c @@ -42,7 +42,7 @@ void ScriptFreezeObjectEvents(void) void Task_WaitPlayerAndTargetNPCStopMoving(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; if (task->data[0] == 0 && walkrun_is_standing_still() == TRUE) { diff --git a/src/fame_checker.c b/src/fame_checker.c index 6bad8f81b..1f4be5af0 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -1503,7 +1503,7 @@ static void FC_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list static void Task_SwitchToPickMode(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; task->data[2] = CreatePersonPicSprite(sFameCheckerData->unlockedPersons[sLastMenuIdx]); gSprites[task->data[2]].data[0] = 0; GetPickModeText(); @@ -1642,7 +1642,7 @@ static void HandleFlavorTextModeSwitch(bool8 state) static void Task_FCOpenOrCloseInfoBox(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; switch (task->data[0]) { case 0: diff --git a/src/field_effect.c b/src/field_effect.c index cbcc4b1d8..541ceba13 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -161,7 +161,7 @@ static const union AnimCmd *const sNewGameOakAnimTable[] = { static const struct SpriteTemplate sNewGameOakObjectTemplate = { .tileTag = TAG_NONE, - .paletteTag = 4102, + .paletteTag = 0x1006, .oam = &sNewGameOakOamAttributes, .anims = sNewGameOakAnimTable, .images = sNewGameOakObjectSpriteFrames, @@ -1133,15 +1133,15 @@ static void Task_FlyIntoMap(u8 taskId) } static void Task_FallWarpFieldEffect(u8 taskId); -static bool8 FallWarpEffect_1(struct Task * task); -static bool8 FallWarpEffect_2(struct Task * task); -static bool8 FallWarpEffect_3(struct Task * task); -static bool8 FallWarpEffect_4(struct Task * task); -static bool8 FallWarpEffect_5(struct Task * task); -static bool8 FallWarpEffect_6(struct Task * task); -static bool8 FallWarpEffect_7(struct Task * task); +static bool8 FallWarpEffect_1(struct Task *task); +static bool8 FallWarpEffect_2(struct Task *task); +static bool8 FallWarpEffect_3(struct Task *task); +static bool8 FallWarpEffect_4(struct Task *task); +static bool8 FallWarpEffect_5(struct Task *task); +static bool8 FallWarpEffect_6(struct Task *task); +static bool8 FallWarpEffect_7(struct Task *task); -static bool8 (*const sFallWarpEffectCBPtrs[])(struct Task * task) = { +static bool8 (*const sFallWarpEffectCBPtrs[])(struct Task *task) = { FallWarpEffect_1, FallWarpEffect_2, FallWarpEffect_3, @@ -1164,12 +1164,12 @@ void FieldCB_FallWarpExit(void) static void Task_FallWarpFieldEffect(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; while (sFallWarpEffectCBPtrs[task->data[0]](task)) ; } -static bool8 FallWarpEffect_1(struct Task * task) +static bool8 FallWarpEffect_1(struct Task *task) { struct ObjectEvent * playerObject; struct Sprite *playerSprite; @@ -1187,7 +1187,7 @@ static bool8 FallWarpEffect_1(struct Task * task) return TRUE; } -static bool8 FallWarpEffect_2(struct Task * task) +static bool8 FallWarpEffect_2(struct Task *task) { if (IsWeatherNotFadingIn()) { @@ -1196,7 +1196,7 @@ static bool8 FallWarpEffect_2(struct Task * task) return FALSE; } -static bool8 FallWarpEffect_3(struct Task * task) +static bool8 FallWarpEffect_3(struct Task *task) { struct Sprite *sprite; s16 centerToCornerVecY; @@ -1211,7 +1211,7 @@ static bool8 FallWarpEffect_3(struct Task * task) return FALSE; } -static bool8 FallWarpEffect_4(struct Task * task) +static bool8 FallWarpEffect_4(struct Task *task) { struct ObjectEvent * objectEvent; struct Sprite *sprite; @@ -1245,7 +1245,7 @@ static bool8 FallWarpEffect_4(struct Task * task) return FALSE; } -static bool8 FallWarpEffect_5(struct Task * task) +static bool8 FallWarpEffect_5(struct Task *task) { task->data[0]++; task->data[1] = 4; @@ -1254,7 +1254,7 @@ static bool8 FallWarpEffect_5(struct Task * task) return TRUE; } -static bool8 FallWarpEffect_6(struct Task * task) +static bool8 FallWarpEffect_6(struct Task *task) { SetCameraPanning(0, task->data[1]); task->data[1] = -task->data[1]; @@ -1270,7 +1270,7 @@ static bool8 FallWarpEffect_6(struct Task * task) return FALSE; } -static bool8 FallWarpEffect_7(struct Task * task) +static bool8 FallWarpEffect_7(struct Task *task) { s16 x, y; gPlayerAvatar.preventStep = FALSE; @@ -1290,27 +1290,27 @@ static bool8 FallWarpEffect_7(struct Task * task) } static void Task_EscalatorWarpFieldEffect(u8 taskId); -static bool8 EscalatorWarpEffect_1(struct Task * task); -static bool8 EscalatorWarpEffect_2(struct Task * task); -static bool8 EscalatorWarpEffect_3(struct Task * task); -static bool8 EscalatorWarpEffect_4(struct Task * task); -static bool8 EscalatorWarpEffect_5(struct Task * task); -static bool8 EscalatorWarpEffect_6(struct Task * task); -static void Escalator_AnimatePlayerGoingDown(struct Task * task); -static void Escalator_AnimatePlayerGoingUp(struct Task * task); +static bool8 EscalatorWarpEffect_1(struct Task *task); +static bool8 EscalatorWarpEffect_2(struct Task *task); +static bool8 EscalatorWarpEffect_3(struct Task *task); +static bool8 EscalatorWarpEffect_4(struct Task *task); +static bool8 EscalatorWarpEffect_5(struct Task *task); +static bool8 EscalatorWarpEffect_6(struct Task *task); +static void Escalator_AnimatePlayerGoingDown(struct Task *task); +static void Escalator_AnimatePlayerGoingUp(struct Task *task); static void Escalator_BeginFadeOutToNewMap(void); static void Escalator_TransitionToWarpInEffect(void); static void FieldCB_EscalatorWarpIn(void); static void Task_EscalatorWarpInFieldEffect(u8 taskId); -static bool8 EscalatorWarpInEffect_1(struct Task * task); -static bool8 EscalatorWarpInEffect_2(struct Task * task); -static bool8 EscalatorWarpInEffect_3(struct Task * task); -static bool8 EscalatorWarpInEffect_4(struct Task * task); -static bool8 EscalatorWarpInEffect_5(struct Task * task); -static bool8 EscalatorWarpInEffect_6(struct Task * task); -static bool8 EscalatorWarpInEffect_7(struct Task * task); +static bool8 EscalatorWarpInEffect_1(struct Task *task); +static bool8 EscalatorWarpInEffect_2(struct Task *task); +static bool8 EscalatorWarpInEffect_3(struct Task *task); +static bool8 EscalatorWarpInEffect_4(struct Task *task); +static bool8 EscalatorWarpInEffect_5(struct Task *task); +static bool8 EscalatorWarpInEffect_6(struct Task *task); +static bool8 EscalatorWarpInEffect_7(struct Task *task); -static bool8 (*const sEscalatorWarpFieldEffectFuncs[])(struct Task * task) = { +static bool8 (*const sEscalatorWarpFieldEffectFuncs[])(struct Task *task) = { EscalatorWarpEffect_1, EscalatorWarpEffect_2, EscalatorWarpEffect_3, @@ -1329,12 +1329,12 @@ void StartEscalatorWarp(u8 metatileBehavior, u8 priority) static void Task_EscalatorWarpFieldEffect(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; while (sEscalatorWarpFieldEffectFuncs[task->data[0]](task)) ; } -static bool8 EscalatorWarpEffect_1(struct Task * task) +static bool8 EscalatorWarpEffect_1(struct Task *task) { FreezeObjectEvents(); CameraObjectReset2(); @@ -1344,7 +1344,7 @@ static bool8 EscalatorWarpEffect_1(struct Task * task) return FALSE; } -static bool8 EscalatorWarpEffect_2(struct Task * task) +static bool8 EscalatorWarpEffect_2(struct Task *task) { struct ObjectEvent * objectEvent; objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; @@ -1363,7 +1363,7 @@ static bool8 EscalatorWarpEffect_2(struct Task * task) return FALSE; } -static bool8 EscalatorWarpEffect_3(struct Task * task) +static bool8 EscalatorWarpEffect_3(struct Task *task) { Escalator_AnimatePlayerGoingDown(task); if (task->data[2] > 3) @@ -1374,14 +1374,14 @@ static bool8 EscalatorWarpEffect_3(struct Task * task) return FALSE; } -static bool8 EscalatorWarpEffect_4(struct Task * task) +static bool8 EscalatorWarpEffect_4(struct Task *task) { Escalator_AnimatePlayerGoingDown(task); Escalator_TransitionToWarpInEffect(); return FALSE; } -static bool8 EscalatorWarpEffect_5(struct Task * task) +static bool8 EscalatorWarpEffect_5(struct Task *task) { Escalator_AnimatePlayerGoingUp(task); if (task->data[2] > 3) @@ -1392,7 +1392,7 @@ static bool8 EscalatorWarpEffect_5(struct Task * task) return FALSE; } -static bool8 EscalatorWarpEffect_6(struct Task * task) +static bool8 EscalatorWarpEffect_6(struct Task *task) { Escalator_AnimatePlayerGoingUp(task); Escalator_TransitionToWarpInEffect(); @@ -1400,7 +1400,7 @@ static bool8 EscalatorWarpEffect_6(struct Task * task) } -static void Escalator_AnimatePlayerGoingDown(struct Task * task) +static void Escalator_AnimatePlayerGoingDown(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; @@ -1413,7 +1413,7 @@ static void Escalator_AnimatePlayerGoingDown(struct Task * task) } } -static void Escalator_AnimatePlayerGoingUp(struct Task * task) +static void Escalator_AnimatePlayerGoingUp(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; @@ -1444,7 +1444,7 @@ static void Escalator_TransitionToWarpInEffect(void) } } -static bool8 (*const sEscalatorWarpInFieldEffectFuncs[])(struct Task * task) = { +static bool8 (*const sEscalatorWarpInFieldEffectFuncs[])(struct Task *task) = { EscalatorWarpInEffect_1, EscalatorWarpInEffect_2, EscalatorWarpInEffect_3, @@ -1467,12 +1467,12 @@ static void FieldCB_EscalatorWarpIn(void) static void Task_EscalatorWarpInFieldEffect(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; while (sEscalatorWarpInFieldEffectFuncs[task->data[0]](task)) ; } -static bool8 EscalatorWarpInEffect_1(struct Task * task) +static bool8 EscalatorWarpInEffect_1(struct Task *task) { struct ObjectEvent * objectEvent; s16 x; @@ -1497,7 +1497,7 @@ static bool8 EscalatorWarpInEffect_1(struct Task * task) return TRUE; } -static bool8 EscalatorWarpInEffect_2(struct Task * task) +static bool8 EscalatorWarpInEffect_2(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; @@ -1507,7 +1507,7 @@ static bool8 EscalatorWarpInEffect_2(struct Task * task) return FALSE; } -static bool8 EscalatorWarpInEffect_3(struct Task * task) +static bool8 EscalatorWarpInEffect_3(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; @@ -1528,7 +1528,7 @@ static bool8 EscalatorWarpInEffect_3(struct Task * task) } -static bool8 EscalatorWarpInEffect_4(struct Task * task) +static bool8 EscalatorWarpInEffect_4(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; @@ -1538,7 +1538,7 @@ static bool8 EscalatorWarpInEffect_4(struct Task * task) return FALSE; } -static bool8 EscalatorWarpInEffect_5(struct Task * task) +static bool8 EscalatorWarpInEffect_5(struct Task *task) { struct Sprite *sprite; sprite = &gSprites[gPlayerAvatar.spriteId]; @@ -1558,7 +1558,7 @@ static bool8 EscalatorWarpInEffect_5(struct Task * task) return FALSE; } -static bool8 EscalatorWarpInEffect_6(struct Task * task) +static bool8 EscalatorWarpInEffect_6(struct Task *task) { if (IsEscalatorMoving()) { @@ -1569,7 +1569,7 @@ static bool8 EscalatorWarpInEffect_6(struct Task * task) return TRUE; } -static bool8 EscalatorWarpInEffect_7(struct Task * task) +static bool8 EscalatorWarpInEffect_7(struct Task *task) { struct ObjectEvent * objectEvent; objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; @@ -1587,13 +1587,13 @@ static bool8 EscalatorWarpInEffect_7(struct Task * task) static void Task_UseWaterfall(u8 taskId); -static bool8 waterfall_0_setup(struct Task * task, struct ObjectEvent * playerObj); -static bool8 waterfall_1_do_anim_probably(struct Task * task, struct ObjectEvent * playerObj); -static bool8 waterfall_2_wait_anim_finish_probably(struct Task * task, struct ObjectEvent * playerObj); -static bool8 waterfall_3_move_player_probably(struct Task * task, struct ObjectEvent * playerObj); -static bool8 waterfall_4_wait_player_move_probably(struct Task * task, struct ObjectEvent * playerObj); +static bool8 waterfall_0_setup(struct Task *task, struct ObjectEvent * playerObj); +static bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent * playerObj); +static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent * playerObj); +static bool8 waterfall_3_move_player_probably(struct Task *task, struct ObjectEvent * playerObj); +static bool8 waterfall_4_wait_player_move_probably(struct Task *task, struct ObjectEvent * playerObj); -static bool8 (*const sUseWaterfallFieldEffectFuncs[])(struct Task * task, struct ObjectEvent * playerObj) = { +static bool8 (*const sUseWaterfallFieldEffectFuncs[])(struct Task *task, struct ObjectEvent * playerObj) = { waterfall_0_setup, waterfall_1_do_anim_probably, waterfall_2_wait_anim_finish_probably, @@ -1615,7 +1615,7 @@ static void Task_UseWaterfall(u8 taskId) ; } -static bool8 waterfall_0_setup(struct Task * task, struct ObjectEvent * playerObj) +static bool8 waterfall_0_setup(struct Task *task, struct ObjectEvent * playerObj) { ScriptContext2_Enable(); gPlayerAvatar.preventStep = TRUE; @@ -1623,7 +1623,7 @@ static bool8 waterfall_0_setup(struct Task * task, struct ObjectEvent * playerOb return FALSE; } -static bool8 waterfall_1_do_anim_probably(struct Task * task, struct ObjectEvent * playerObj) +static bool8 waterfall_1_do_anim_probably(struct Task *task, struct ObjectEvent * playerObj) { ScriptContext2_Enable(); if (!ObjectEventIsMovementOverridden(playerObj)) @@ -1636,7 +1636,7 @@ static bool8 waterfall_1_do_anim_probably(struct Task * task, struct ObjectEvent return FALSE; } -static bool8 waterfall_2_wait_anim_finish_probably(struct Task * task, struct ObjectEvent * playerObj) +static bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct ObjectEvent * playerObj) { if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) return FALSE; @@ -1644,14 +1644,14 @@ static bool8 waterfall_2_wait_anim_finish_probably(struct Task * task, struct Ob return TRUE; } -static bool8 waterfall_3_move_player_probably(struct Task * task, struct ObjectEvent * playerObj) +static bool8 waterfall_3_move_player_probably(struct Task *task, struct ObjectEvent * playerObj) { ObjectEventSetHeldMovement(playerObj, GetWalkSlowerMovementAction(DIR_NORTH)); task->data[0]++; return FALSE; } -static bool8 waterfall_4_wait_player_move_probably(struct Task * task, struct ObjectEvent * playerObj) +static bool8 waterfall_4_wait_player_move_probably(struct Task *task, struct ObjectEvent * playerObj) { if (!ObjectEventClearHeldMovementIfFinished(playerObj)) return FALSE; @@ -1723,20 +1723,20 @@ static bool8 DiveFieldEffect_TryWarp(struct Task *task) } static void Task_LavaridgeGymB1FWarp(u8 taskId); -static bool8 LavaridgeGymB1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGymB1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGymB1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGymB1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGymB1FWarpEffect_6(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpEffect_5(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpEffect_6(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); static void FieldCB_LavaridgeGymB1FWarpExit(void); static void Task_LavaridgeGymB1FWarpExit(u8 taskId); -static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 (*const sLavaridgeGymB1FWarpEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { +static bool8 (*const sLavaridgeGymB1FWarpEffectFuncs[])(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { LavaridgeGymB1FWarpEffect_1, LavaridgeGymB1FWarpEffect_2, LavaridgeGymB1FWarpEffect_3, @@ -1755,7 +1755,7 @@ static void Task_LavaridgeGymB1FWarp(u8 taskId) while (sLavaridgeGymB1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 LavaridgeGymB1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGymB1FWarpEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { FreezeObjectEvents(); CameraObjectReset2(); @@ -1767,7 +1767,7 @@ static bool8 LavaridgeGymB1FWarpEffect_1(struct Task * task, struct ObjectEvent return TRUE; } -static bool8 LavaridgeGymB1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGymB1FWarpEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { SetCameraPanning(0, task->data[1]); task->data[1] = -task->data[1]; @@ -1780,7 +1780,7 @@ static bool8 LavaridgeGymB1FWarpEffect_2(struct Task * task, struct ObjectEvent return FALSE; } -static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGymB1FWarpEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { sprite->y2 = 0; task->data[3] = 1; @@ -1794,7 +1794,7 @@ static bool8 LavaridgeGymB1FWarpEffect_3(struct Task * task, struct ObjectEvent return TRUE; } -static bool8 LavaridgeGymB1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGymB1FWarpEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { s16 centerToCornerVecY; SetCameraPanning(0, task->data[1]); @@ -1837,7 +1837,7 @@ static bool8 LavaridgeGymB1FWarpEffect_4(struct Task * task, struct ObjectEvent return FALSE; } -static bool8 LavaridgeGymB1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGymB1FWarpEffect_5(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { TryFadeOutOldMapMusic(); WarpFadeOutScreen(); @@ -1845,7 +1845,7 @@ static bool8 LavaridgeGymB1FWarpEffect_5(struct Task * task, struct ObjectEvent return FALSE; } -static bool8 LavaridgeGymB1FWarpEffect_6(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGymB1FWarpEffect_6(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -1857,7 +1857,7 @@ static bool8 LavaridgeGymB1FWarpEffect_6(struct Task * task, struct ObjectEvent return FALSE; } -static bool8 (*const sLavaridgeGymB1FWarpExitEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { +static bool8 (*const sLavaridgeGymB1FWarpExitEffectFuncs[])(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { LavaridgeGymB1FWarpExitEffect_1, LavaridgeGymB1FWarpExitEffect_2, LavaridgeGymB1FWarpExitEffect_3, @@ -1879,7 +1879,7 @@ static void Task_LavaridgeGymB1FWarpExit(u8 taskId) while (sLavaridgeGymB1FWarpExitEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { CameraObjectReset2(); FreezeObjectEvents(); @@ -1889,7 +1889,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_1(struct Task * task, struct ObjectEv return FALSE; } -static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (IsWeatherNotFadingIn()) { @@ -1903,7 +1903,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_2(struct Task * task, struct ObjectEv return FALSE; } -static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { sprite = &gSprites[task->data[1]]; if (sprite->animCmdIndex > 1) @@ -1917,7 +1917,7 @@ static bool8 LavaridgeGymB1FWarpExitEffect_3(struct Task * task, struct ObjectEv return FALSE; } -static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { @@ -1930,13 +1930,13 @@ static bool8 LavaridgeGymB1FWarpExitEffect_4(struct Task * task, struct ObjectEv } static void Task_LavaridgeGym1FWarp(u8 taskId); -static bool8 LavaridgeGym1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGym1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGym1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 LavaridgeGym1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGym1FWarpEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGym1FWarpEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGym1FWarpEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGym1FWarpEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); +static bool8 LavaridgeGym1FWarpEffect_5(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite); -static bool8 (*const sLavaridgeGym1FWarpEffectFuncs[])(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { +static bool8 (*const sLavaridgeGym1FWarpEffectFuncs[])(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) = { LavaridgeGym1FWarpEffect_1, LavaridgeGym1FWarpEffect_2, LavaridgeGym1FWarpEffect_3, @@ -1973,7 +1973,7 @@ static void Task_LavaridgeGym1FWarp(u8 taskId) while(sLavaridgeGym1FWarpEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId], &gObjectEvents[gPlayerAvatar.objectEventId], &gSprites[gPlayerAvatar.spriteId])); } -static bool8 LavaridgeGym1FWarpEffect_1(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGym1FWarpEffect_1(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { FreezeObjectEvents(); CameraObjectReset2(); @@ -1983,7 +1983,7 @@ static bool8 LavaridgeGym1FWarpEffect_1(struct Task * task, struct ObjectEvent * return FALSE; } -static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGym1FWarpEffect_2(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (ObjectEventClearHeldMovementIfFinished(objectEvent)) { @@ -2005,7 +2005,7 @@ static bool8 LavaridgeGym1FWarpEffect_2(struct Task * task, struct ObjectEvent * return FALSE; } -static bool8 LavaridgeGym1FWarpEffect_3(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGym1FWarpEffect_3(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (gSprites[task->data[1]].animCmdIndex == 2) { @@ -2015,7 +2015,7 @@ static bool8 LavaridgeGym1FWarpEffect_3(struct Task * task, struct ObjectEvent * return FALSE; } -static bool8 LavaridgeGym1FWarpEffect_4(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGym1FWarpEffect_4(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { @@ -2026,7 +2026,7 @@ static bool8 LavaridgeGym1FWarpEffect_4(struct Task * task, struct ObjectEvent * return FALSE; } -static bool8 LavaridgeGym1FWarpEffect_5(struct Task * task, struct ObjectEvent * objectEvent, struct Sprite *sprite) +static bool8 LavaridgeGym1FWarpEffect_5(struct Task *task, struct ObjectEvent * objectEvent, struct Sprite *sprite) { if (!gPaletteFade.active && BGMusicStopped() == TRUE) { @@ -2331,17 +2331,17 @@ static void EscapeRopeWarpInEffect_Spin(struct Task *task) #undef tOriginalDir static void Task_DoTeleportFieldEffect(u8 taskId); -static void TeleportFieldEffectTask1(struct Task * task); -static void TeleportFieldEffectTask2(struct Task * task); -static void TeleportFieldEffectTask3(struct Task * task); -static void TeleportFieldEffectTask4(struct Task * task); +static void TeleportFieldEffectTask1(struct Task *task); +static void TeleportFieldEffectTask2(struct Task *task); +static void TeleportFieldEffectTask3(struct Task *task); +static void TeleportFieldEffectTask4(struct Task *task); static void FieldCallback_TeleportIn(void); static void Task_DoTeleportInFieldEffect(u8 taskId); -static void TeleportInFieldEffectTask1(struct Task * task); -static void TeleportInFieldEffectTask2(struct Task * task); -static void TeleportInFieldEffectTask3(struct Task * task); +static void TeleportInFieldEffectTask1(struct Task *task); +static void TeleportInFieldEffectTask2(struct Task *task); +static void TeleportInFieldEffectTask3(struct Task *task); -static void (*const sTeleportEffectFuncs[])(struct Task * ) = { +static void (*const sTeleportEffectFuncs[])(struct Task *) = { TeleportFieldEffectTask1, TeleportFieldEffectTask2, TeleportFieldEffectTask3, @@ -2358,7 +2358,7 @@ static void Task_DoTeleportFieldEffect(u8 taskId) sTeleportEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); } -static void TeleportFieldEffectTask1(struct Task * task) +static void TeleportFieldEffectTask1(struct Task *task) { ScriptContext2_Enable(); FreezeObjectEvents(); @@ -2367,7 +2367,7 @@ static void TeleportFieldEffectTask1(struct Task * task) task->data[0]++; } -static void TeleportFieldEffectTask2(struct Task * task) +static void TeleportFieldEffectTask2(struct Task *task) { u8 spinDirections[5] = { [DIR_NONE] = DIR_SOUTH, @@ -2393,7 +2393,7 @@ static void TeleportFieldEffectTask2(struct Task * task) } } -static void TeleportFieldEffectTask3(struct Task * task) +static void TeleportFieldEffectTask3(struct Task *task) { u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; @@ -2421,7 +2421,7 @@ static void TeleportFieldEffectTask3(struct Task * task) } } -static void TeleportFieldEffectTask4(struct Task * task) +static void TeleportFieldEffectTask4(struct Task *task) { if (!gPaletteFade.active) { @@ -2436,7 +2436,7 @@ static void TeleportFieldEffectTask4(struct Task * task) } } -static void (*const sTeleportInEffectFuncs[])(struct Task * ) = { +static void (*const sTeleportInEffectFuncs[])(struct Task *) = { TeleportInFieldEffectTask1, TeleportInFieldEffectTask2, TeleportInFieldEffectTask3 @@ -2460,7 +2460,7 @@ static void Task_DoTeleportInFieldEffect(u8 taskId) sTeleportInEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); } -static void TeleportInFieldEffectTask1(struct Task * task) +static void TeleportInFieldEffectTask1(struct Task *task) { struct Sprite *sprite; s16 centerToCornerVecY; @@ -2479,7 +2479,7 @@ static void TeleportInFieldEffectTask1(struct Task * task) } } -static void TeleportInFieldEffectTask2(struct Task * task) +static void TeleportInFieldEffectTask2(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; @@ -2518,7 +2518,7 @@ static void TeleportInFieldEffectTask2(struct Task * task) } } -static void TeleportInFieldEffectTask3(struct Task * task) +static void TeleportInFieldEffectTask3(struct Task *task) { u8 spinDirections[5] = {1, 3, 4, 2, 1}; struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; @@ -2537,33 +2537,33 @@ static void TeleportInFieldEffectTask3(struct Task * task) } static void Task_ShowMon_Outdoors(u8 taskId); -static void ShowMonEffect_Outdoors_1(struct Task * task); -static void ShowMonEffect_Outdoors_2(struct Task * task); -static void ShowMonEffect_Outdoors_3(struct Task * task); -static void ShowMonEffect_Outdoors_4(struct Task * task); -static void ShowMonEffect_Outdoors_5(struct Task * task); -static void ShowMonEffect_Outdoors_6(struct Task * task); -static void ShowMonEffect_Outdoors_7(struct Task * task); +static void ShowMonEffect_Outdoors_1(struct Task *task); +static void ShowMonEffect_Outdoors_2(struct Task *task); +static void ShowMonEffect_Outdoors_3(struct Task *task); +static void ShowMonEffect_Outdoors_4(struct Task *task); +static void ShowMonEffect_Outdoors_5(struct Task *task); +static void ShowMonEffect_Outdoors_6(struct Task *task); +static void ShowMonEffect_Outdoors_7(struct Task *task); static void VBlankCB_ShowMonEffect_Outdoors(void); static void LoadFieldMoveStreaksTilemapToVram(u16 screenbase); static void Task_ShowMon_Indoors(u8 taskId); -static void ShowMonEffect_Indoors_1(struct Task * task); -static void ShowMonEffect_Indoors_2(struct Task * task); -static void ShowMonEffect_Indoors_3(struct Task * task); -static void ShowMonEffect_Indoors_4(struct Task * task); -static void ShowMonEffect_Indoors_5(struct Task * task); -static void ShowMonEffect_Indoors_6(struct Task * task); -static void ShowMonEffect_Indoors_7(struct Task * task); +static void ShowMonEffect_Indoors_1(struct Task *task); +static void ShowMonEffect_Indoors_2(struct Task *task); +static void ShowMonEffect_Indoors_3(struct Task *task); +static void ShowMonEffect_Indoors_4(struct Task *task); +static void ShowMonEffect_Indoors_5(struct Task *task); +static void ShowMonEffect_Indoors_6(struct Task *task); +static void ShowMonEffect_Indoors_7(struct Task *task); static void VBlankCB_ShowMonEffect_Indoors(void); -static void AnimateIndoorShowMonBg(struct Task * task); -static bool8 SlideIndoorBannerOnscreen(struct Task * task); -static bool8 SlideIndoorBannerOffscreen(struct Task * task); +static void AnimateIndoorShowMonBg(struct Task *task); +static bool8 SlideIndoorBannerOnscreen(struct Task *task); +static bool8 SlideIndoorBannerOffscreen(struct Task *task); static u8 InitFieldMoveMonSprite(u32 species, u32 otId, u32 personality); static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite *sprite); static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite *sprite); static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite *sprite); -static void (*const sShowMonOutdoorsEffectFuncs[])(struct Task * task) = { +static void (*const sShowMonOutdoorsEffectFuncs[])(struct Task *task) = { ShowMonEffect_Outdoors_1, ShowMonEffect_Outdoors_2, ShowMonEffect_Outdoors_3, @@ -2602,7 +2602,7 @@ static void Task_ShowMon_Outdoors(u8 taskId) sShowMonOutdoorsEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); } -static void ShowMonEffect_Outdoors_1(struct Task * task) +static void ShowMonEffect_Outdoors_1(struct Task *task) { task->data[11] = GetGpuReg(REG_OFFSET_WININ); task->data[12] = GetGpuReg(REG_OFFSET_WINOUT); @@ -2619,7 +2619,7 @@ static void ShowMonEffect_Outdoors_1(struct Task * task) task->data[0]++; } -static void ShowMonEffect_Outdoors_2(struct Task * task) +static void ShowMonEffect_Outdoors_2(struct Task *task) { u16 charbase = ((GetGpuReg(REG_OFFSET_BG0CNT) >> 2) << 14); u16 screenbase = ((GetGpuReg(REG_OFFSET_BG0CNT) >> 8) << 11); @@ -2630,7 +2630,7 @@ static void ShowMonEffect_Outdoors_2(struct Task * task) task->data[0]++; } -static void ShowMonEffect_Outdoors_3(struct Task * task) +static void ShowMonEffect_Outdoors_3(struct Task *task) { s16 win0h_lo; s16 win0v_lo; @@ -2663,7 +2663,7 @@ static void ShowMonEffect_Outdoors_3(struct Task * task) } } -static void ShowMonEffect_Outdoors_4(struct Task * task) +static void ShowMonEffect_Outdoors_4(struct Task *task) { task->data[5] -= 16; if (gSprites[task->data[15]].data[7]) @@ -2672,7 +2672,7 @@ static void ShowMonEffect_Outdoors_4(struct Task * task) } } -static void ShowMonEffect_Outdoors_5(struct Task * task) +static void ShowMonEffect_Outdoors_5(struct Task *task) { s16 win0v_lo; s16 win0v_hi; @@ -2696,7 +2696,7 @@ static void ShowMonEffect_Outdoors_5(struct Task * task) } } -static void ShowMonEffect_Outdoors_6(struct Task * task) +static void ShowMonEffect_Outdoors_6(struct Task *task) { u16 bg0cnt = (GetGpuReg(REG_OFFSET_BG0CNT) >> 8) << 11; CpuFill32(0, (void *)VRAM + bg0cnt, 0x800); @@ -2707,7 +2707,7 @@ static void ShowMonEffect_Outdoors_6(struct Task * task) task->data[0]++; } -static void ShowMonEffect_Outdoors_7(struct Task * task) +static void ShowMonEffect_Outdoors_7(struct Task *task) { IntrCallback callback; LoadWordFromTwoHalfwords((u16 *)&task->data[13], (uintptr_t *)&callback); @@ -2723,7 +2723,7 @@ static void ShowMonEffect_Outdoors_7(struct Task * task) static void VBlankCB_ShowMonEffect_Outdoors(void) { IntrCallback callback; - struct Task * task = &gTasks[FindTaskIdByFunc(Task_ShowMon_Outdoors)]; + struct Task *task = &gTasks[FindTaskIdByFunc(Task_ShowMon_Outdoors)]; LoadWordFromTwoHalfwords((u16 *)&task->data[13], (uintptr_t *)&callback); callback(); SetGpuReg(REG_OFFSET_WIN0H, task->data[1]); @@ -2745,7 +2745,7 @@ static void LoadFieldMoveStreaksTilemapToVram(u16 screenbase) } } -static void (*const sShowMonIndoorsEffectFuncs[])(struct Task * ) = { +static void (*const sShowMonIndoorsEffectFuncs[])(struct Task *) = { ShowMonEffect_Indoors_1, ShowMonEffect_Indoors_2, ShowMonEffect_Indoors_3, @@ -2760,7 +2760,7 @@ static void Task_ShowMon_Indoors(u8 taskId) sShowMonIndoorsEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); } -static void ShowMonEffect_Indoors_1(struct Task * task) +static void ShowMonEffect_Indoors_1(struct Task *task) { SetGpuReg(REG_OFFSET_BG0HOFS, task->data[1]); SetGpuReg(REG_OFFSET_BG0VOFS, task->data[2]); @@ -2769,7 +2769,7 @@ static void ShowMonEffect_Indoors_1(struct Task * task) task->data[0]++; } -static void ShowMonEffect_Indoors_2(struct Task * task) +static void ShowMonEffect_Indoors_2(struct Task *task) { u16 charbase; u16 screenbase; @@ -2782,7 +2782,7 @@ static void ShowMonEffect_Indoors_2(struct Task * task) task->data[0]++; } -static void ShowMonEffect_Indoors_3(struct Task * task) +static void ShowMonEffect_Indoors_3(struct Task *task) { if (SlideIndoorBannerOnscreen(task)) { @@ -2796,7 +2796,7 @@ static void ShowMonEffect_Indoors_3(struct Task * task) AnimateIndoorShowMonBg(task); } -static void ShowMonEffect_Indoors_4(struct Task * task) +static void ShowMonEffect_Indoors_4(struct Task *task) { AnimateIndoorShowMonBg(task); if (gSprites[task->data[15]].data[7]) @@ -2805,7 +2805,7 @@ static void ShowMonEffect_Indoors_4(struct Task * task) } } -static void ShowMonEffect_Indoors_5(struct Task * task) +static void ShowMonEffect_Indoors_5(struct Task *task) { AnimateIndoorShowMonBg(task); task->data[3] = task->data[1] & 7; @@ -2816,7 +2816,7 @@ static void ShowMonEffect_Indoors_5(struct Task * task) task->data[0]++; } -static void ShowMonEffect_Indoors_6(struct Task * task) +static void ShowMonEffect_Indoors_6(struct Task *task) { AnimateIndoorShowMonBg(task); if (SlideIndoorBannerOffscreen(task)) @@ -2825,7 +2825,7 @@ static void ShowMonEffect_Indoors_6(struct Task * task) } } -static void ShowMonEffect_Indoors_7(struct Task * task) +static void ShowMonEffect_Indoors_7(struct Task *task) { IntrCallback intrCallback; u16 charbase; @@ -2844,7 +2844,7 @@ static void ShowMonEffect_Indoors_7(struct Task * task) static void VBlankCB_ShowMonEffect_Indoors(void) { IntrCallback intrCallback; - struct Task * task; + struct Task *task; task = &gTasks[FindTaskIdByFunc(Task_ShowMon_Indoors)]; LoadWordFromTwoHalfwords((u16 *)&task->data[13], (uintptr_t *)&intrCallback); intrCallback(); @@ -2852,13 +2852,13 @@ static void VBlankCB_ShowMonEffect_Indoors(void) SetGpuReg(REG_OFFSET_BG0VOFS, task->data[2]); } -static void AnimateIndoorShowMonBg(struct Task * task) +static void AnimateIndoorShowMonBg(struct Task *task) { task->data[1] -= 16; task->data[3] += 16; } -static bool8 SlideIndoorBannerOnscreen(struct Task * task) +static bool8 SlideIndoorBannerOnscreen(struct Task *task) { u16 i; u16 srcOffs; @@ -2887,7 +2887,7 @@ static bool8 SlideIndoorBannerOnscreen(struct Task * task) return FALSE; } -static bool8 SlideIndoorBannerOffscreen(struct Task * task) +static bool8 SlideIndoorBannerOffscreen(struct Task *task) { u16 i; u16 dstOffs; @@ -2966,13 +2966,13 @@ static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite *sprite) } static void Task_FldEffUseSurf(u8 taskId); -static void UseSurfEffect_1(struct Task * task); -static void UseSurfEffect_2(struct Task * task); -static void UseSurfEffect_3(struct Task * task); -static void UseSurfEffect_4(struct Task * task); -static void UseSurfEffect_5(struct Task * task); +static void UseSurfEffect_1(struct Task *task); +static void UseSurfEffect_2(struct Task *task); +static void UseSurfEffect_3(struct Task *task); +static void UseSurfEffect_4(struct Task *task); +static void UseSurfEffect_5(struct Task *task); -static void (*const sUseSurfEffectFuncs[])(struct Task * ) = { +static void (*const sUseSurfEffectFuncs[])(struct Task *) = { UseSurfEffect_1, UseSurfEffect_2, UseSurfEffect_3, @@ -2995,7 +2995,7 @@ static void Task_FldEffUseSurf(u8 taskId) sUseSurfEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); } -static void UseSurfEffect_1(struct Task * task) +static void UseSurfEffect_1(struct Task *task) { ScriptContext2_Enable(); FreezeObjectEvents(); @@ -3006,7 +3006,7 @@ static void UseSurfEffect_1(struct Task * task) task->data[0]++; } -static void UseSurfEffect_2(struct Task * task) +static void UseSurfEffect_2(struct Task *task) { struct ObjectEvent * objectEvent; objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; @@ -3018,7 +3018,7 @@ static void UseSurfEffect_2(struct Task * task) } } -static void UseSurfEffect_3(struct Task * task) +static void UseSurfEffect_3(struct Task *task) { struct ObjectEvent * objectEvent; objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; @@ -3030,7 +3030,7 @@ static void UseSurfEffect_3(struct Task * task) } } -static void UseSurfEffect_4(struct Task * task) +static void UseSurfEffect_4(struct Task *task) { struct ObjectEvent * objectEvent; if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON)) @@ -3047,7 +3047,7 @@ static void UseSurfEffect_4(struct Task * task) } } -static void UseSurfEffect_5(struct Task * task) +static void UseSurfEffect_5(struct Task *task) { struct ObjectEvent * objectEvent; objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; @@ -3066,12 +3066,12 @@ static void UseSurfEffect_5(struct Task * task) } static void Task_FldEffUseVsSeeker(u8 taskId); -static void UseVsSeekerEffect_1(struct Task * task); -static void UseVsSeekerEffect_2(struct Task * task); -static void UseVsSeekerEffect_3(struct Task * task); -static void UseVsSeekerEffect_4(struct Task * task); +static void UseVsSeekerEffect_1(struct Task *task); +static void UseVsSeekerEffect_2(struct Task *task); +static void UseVsSeekerEffect_3(struct Task *task); +static void UseVsSeekerEffect_4(struct Task *task); -static void (*const sUseVsSeekerEffectFuncs[])(struct Task * task) = { +static void (*const sUseVsSeekerEffectFuncs[])(struct Task *task) = { UseVsSeekerEffect_1, UseVsSeekerEffect_2, UseVsSeekerEffect_3, @@ -3091,7 +3091,7 @@ static void Task_FldEffUseVsSeeker(u8 taskId) sUseVsSeekerEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]); } -static void UseVsSeekerEffect_1(struct Task * task) +static void UseVsSeekerEffect_1(struct Task *task) { ScriptContext2_Enable(); FreezeObjectEvents(); @@ -3099,7 +3099,7 @@ static void UseVsSeekerEffect_1(struct Task * task) task->data[0]++; } -static void UseVsSeekerEffect_2(struct Task * task) +static void UseVsSeekerEffect_2(struct Task *task) { struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (!ObjectEventIsMovementOverridden(playerObj) || ObjectEventClearHeldMovementIfFinished(playerObj)) @@ -3110,7 +3110,7 @@ static void UseVsSeekerEffect_2(struct Task * task) } } -static void UseVsSeekerEffect_3(struct Task * task) +static void UseVsSeekerEffect_3(struct Task *task) { struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (ObjectEventClearHeldMovementIfFinished(playerObj)) @@ -3126,7 +3126,7 @@ static void UseVsSeekerEffect_3(struct Task * task) } } -static void UseVsSeekerEffect_4(struct Task * task) +static void UseVsSeekerEffect_4(struct Task *task) { struct ObjectEvent * playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; if (ObjectEventClearHeldMovementIfFinished(playerObj)) diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index a5be40b5c..3de950fcc 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -87,38 +87,38 @@ static bool8 MetatileAtCoordsIsWaterTile(s16 x, s16 y); static void HandleWarpArrowSpriteHideShow(struct ObjectEvent * playerObjEvent); static void StartStrengthAnim(u8 objectEventId, u8 direction); static void Task_BumpBoulder(u8 taskId); -static bool8 DoBoulderInit(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj); -static bool8 DoBoulderDust(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj); -static bool8 DoBoulderFinish(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj); +static bool8 DoBoulderInit(struct Task *task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj); +static bool8 DoBoulderDust(struct Task *task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj); +static bool8 DoBoulderFinish(struct Task *task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj); static void DoPlayerMatJump(void); static void DoPlayerAvatarSecretBaseMatJump(u8 taskId); -static bool8 PlayerAvatar_DoSecretBaseMatJump(struct Task * task, struct ObjectEvent * playerObj); +static bool8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent * playerObj); static void DoPlayerMatSpin(void); static void PlayerAvatar_DoSecretBaseMatSpin(u8 taskId); -static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task * task, struct ObjectEvent * playerObj); -static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task * task, struct ObjectEvent * playerObj); -static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task * task, struct ObjectEvent * playerObj); -static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task * task, struct ObjectEvent * playerObj); +static bool8 PlayerAvatar_SecretBaseMatSpinStep0(struct Task *task, struct ObjectEvent * playerObj); +static bool8 PlayerAvatar_SecretBaseMatSpinStep1(struct Task *task, struct ObjectEvent * playerObj); +static bool8 PlayerAvatar_SecretBaseMatSpinStep2(struct Task *task, struct ObjectEvent * playerObj); +static bool8 PlayerAvatar_SecretBaseMatSpinStep3(struct Task *task, struct ObjectEvent * playerObj); static void CreateStopSurfingTask(u8 direction); static void Task_StopSurfingInit(u8 taskId); static void Task_WaitStopSurfing(u8 taskId); static void Task_Fishing(u8 taskId); -static bool8 Fishing1(struct Task * task); -static bool8 Fishing2(struct Task * task); -static bool8 Fishing3(struct Task * task); -static bool8 Fishing4(struct Task * task); -static bool8 Fishing5(struct Task * task); -static bool8 Fishing6(struct Task * task); -static bool8 Fishing7(struct Task * task); -static bool8 Fishing8(struct Task * task); -static bool8 Fishing9(struct Task * task); -static bool8 Fishing10(struct Task * task); -static bool8 Fishing11(struct Task * task); -static bool8 Fishing12(struct Task * task); -static bool8 Fishing13(struct Task * task); -static bool8 Fishing14(struct Task * task); -static bool8 Fishing15(struct Task * task); -static bool8 Fishing16(struct Task * task); +static bool8 Fishing1(struct Task *task); +static bool8 Fishing2(struct Task *task); +static bool8 Fishing3(struct Task *task); +static bool8 Fishing4(struct Task *task); +static bool8 Fishing5(struct Task *task); +static bool8 Fishing6(struct Task *task); +static bool8 Fishing7(struct Task *task); +static bool8 Fishing8(struct Task *task); +static bool8 Fishing9(struct Task *task); +static bool8 Fishing10(struct Task *task); +static bool8 Fishing11(struct Task *task); +static bool8 Fishing12(struct Task *task); +static bool8 Fishing13(struct Task *task); +static bool8 Fishing14(struct Task *task); +static bool8 Fishing15(struct Task *task); +static bool8 Fishing16(struct Task *task); static void Task_TeleportWarpOutPlayerAnim(u8 taskId); static void Task_TeleportWarpInPlayerAnim(u8 taskId); static u8 TeleportAnim_RotatePlayer(struct ObjectEvent * object, s16 *timer); @@ -1392,7 +1392,7 @@ static void HandleWarpArrowSpriteHideShow(struct ObjectEvent *objectEvent) SetSpriteInvisible(objectEvent->warpArrowSpriteId); } -static bool8 (*const sBoulderTaskSteps[])(struct Task * task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj) = { +static bool8 (*const sBoulderTaskSteps[])(struct Task *task, struct ObjectEvent * playerObj, struct ObjectEvent * boulderObj) = { DoBoulderInit, DoBoulderDust, DoBoulderFinish @@ -1493,7 +1493,7 @@ static bool8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEv return FALSE; } -static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task * task, struct ObjectEvent * playerObj) = { +static bool8 (*const sPlayerAvatarSecretBaseMatSpin[])(struct Task *task, struct ObjectEvent * playerObj) = { PlayerAvatar_SecretBaseMatSpinStep0, PlayerAvatar_SecretBaseMatSpinStep1, PlayerAvatar_SecretBaseMatSpinStep2, diff --git a/src/field_specials.c b/src/field_specials.c index c8107febf..97f9808aa 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1165,7 +1165,7 @@ static void Task_AnimateElevatorWindowView(u8 taskId) void ListMenu(void) { u8 taskId; - struct Task * task; + struct Task *task; if (QuestLog_SchedulePlaybackCB(QLPlaybackCB_DestroyScriptMenuMonPicSprites) != TRUE) { taskId = CreateTask(Task_CreateScriptListMenu, 8); @@ -1334,7 +1334,7 @@ static void Task_CreateScriptListMenu(u8 taskId) u8 i; s32 width; s32 mwidth; - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; u8 windowId; ScriptContext2_Enable(); if (gSpecialVar_0x8004 == LISTMENU_SILPHCO_FLOORS) @@ -1393,7 +1393,7 @@ static void CreateScriptListMenu(void) static void ScriptListMenuMoveCursorFunction(s32 nothing, bool8 is, struct ListMenu * used) { u8 taskId; - struct Task * task; + struct Task *task; PlaySE(SE_SELECT); taskId = FindTaskIdByFunc(Task_ListMenuHandleInput); if (taskId != 0xFF) @@ -1407,7 +1407,7 @@ static void ScriptListMenuMoveCursorFunction(s32 nothing, bool8 is, struct ListM static void Task_ListMenuHandleInput(u8 taskId) { s32 input; - struct Task * task; + struct Task *task; task = &gTasks[taskId]; task++;task--; @@ -1440,7 +1440,7 @@ static void Task_ListMenuHandleInput(u8 taskId) static void Task_DestroyListMenu(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; Task_ListMenuRemoveScrollIndicatorArrowPair(taskId); DestroyListMenuTask(task->data[14], NULL, NULL); Free(sListMenuItems); @@ -1484,7 +1484,7 @@ static void Task_RedrawScrollArrowsAndWaitInput(u8 taskId) static void Task_CreateMenuRemoveScrollIndicatorArrowPair(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; struct ScrollArrowsTemplate template = { .firstArrowType = 2, .secondArrowType = 3, @@ -1505,7 +1505,7 @@ static void Task_CreateMenuRemoveScrollIndicatorArrowPair(u8 taskId) static void Task_ListMenuRemoveScrollIndicatorArrowPair(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; if (task->data[0] != task->data[1]) RemoveScrollIndicatorArrowPair(task->data[12]); } diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 6a2918030..95042ea83 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -48,7 +48,7 @@ void ShowMapNamePopup(bool32 palIntoFadedBuffer) static void Task_MapNamePopup(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; switch (task->tState) { case 0: diff --git a/src/naming_screen.c b/src/naming_screen.c index 8e7165469..b7d1d7d8f 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -130,15 +130,15 @@ static bool8 MainState_WaitPageSwap(void); static void StartPageSwapAnim(void); static void Task_HandlePageSwapAnim(u8 taskId); static bool8 IsPageSwapAnimNotInProgress(void); -static bool8 PageSwapAnimState_Init(struct Task * task); -static bool8 PageSwapAnimState_1(struct Task * task); -static bool8 PageSwapAnimState_2(struct Task * task); -static bool8 PageSwapAnimState_Done(struct Task * task); +static bool8 PageSwapAnimState_Init(struct Task *task); +static bool8 PageSwapAnimState_1(struct Task *task); +static bool8 PageSwapAnimState_2(struct Task *task); +static bool8 PageSwapAnimState_Done(struct Task *task); static void sub_809E518(u8 a0, u8 a1, u8 a2); static void Task_809E58C(u8 taskId); static u16 sub_809E644(u8 tag); static void sub_809E6B8(u8 a0); -static void sub_809E6E0(struct Task * task, u8 a1, u8 a2); +static void sub_809E6E0(struct Task *task, u8 a1, u8 a2); static void sub_809E700(struct Sprite *sprite); static void sub_809E7F0(struct Sprite *sprite); static void sub_809E83C(struct Sprite *sprite); @@ -175,9 +175,9 @@ static bool8 TriggerKeyboardChange(void); static u8 GetInputEvent(void); static void SetInputState(u8 state); static void Task_HandleInput(u8 taskId); -static void InputState_Disabled(struct Task * task); -static void InputState_Enabled(struct Task * task); -static void HandleDpadMovement(struct Task * task); +static void InputState_Disabled(struct Task *task); +static void InputState_Enabled(struct Task *task); +static void HandleDpadMovement(struct Task *task); static void PrintTitle(void); static void AddGenderIconFunc_No(void); static void AddGenderIconFunc_Yes(void); @@ -773,7 +773,7 @@ static bool8 MainState_WaitPageSwap(void) #define tState data[0] #define tFrameCount data[1] -static bool8 (*const sPageSwapAnimStateFuncs[])(struct Task * task) = { +static bool8 (*const sPageSwapAnimStateFuncs[])(struct Task *task) = { PageSwapAnimState_Init, PageSwapAnimState_1, PageSwapAnimState_2, diff --git a/src/script_menu.c b/src/script_menu.c index 0f17a2bd8..8b6b277f9 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -1008,7 +1008,7 @@ void ScriptMenu_DisplayPCStartupPrompt(void) static void Task_ScriptShowMonPic(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; switch (task->data[0]) { case 0: @@ -1068,7 +1068,7 @@ static bool8 PicboxWait(void) void PicboxCancel(void) { u8 taskId = FindTaskIdByFunc(Task_ScriptShowMonPic); - struct Task * task; + struct Task *task; if (taskId != 0xFF) { task = &gTasks[taskId]; @@ -1091,7 +1091,7 @@ void PicboxCancel(void) void Task_WaitMuseumFossilPic(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; switch (task->data[0]) { case 0: diff --git a/src/seagallop.c b/src/seagallop.c index 2f6377c8b..0c8ab7500 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -284,7 +284,7 @@ static void ScrollBG(void) static void Task_Seagallop_1(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; ScrollBG(); if (++task->data[1] == 140) diff --git a/src/trainer_see.c b/src/trainer_see.c index 82a35c2db..f008cdb86 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -24,21 +24,21 @@ static u8 GetTrainerApproachDistanceEast(struct ObjectEvent * trainerObj, s16 ra static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent * trainerObj, u8 approachDistance, u8 facingDirection); static void TrainerApproachPlayer(struct ObjectEvent * trainerObj, u8 approachDistance); static void Task_RunTrainerSeeFuncList(u8 taskId); -static bool8 TrainerSeeFunc_Dummy(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_TrainerApproach(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_PrepareToEngage(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_End(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_BeginRemoveDisguise(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_WaitRemoveDisguise(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_TrainerInAshFacesPlayer(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_BeginJumpOutOfAsh(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_WaitJumpOutOfAsh(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_EndJumpOutOfAsh(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_OffscreenAboveTrainerCreateCameraObj(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); -static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_Dummy(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_TrainerApproach(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_PrepareToEngage(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_End(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_BeginRemoveDisguise(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_WaitRemoveDisguise(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_TrainerInAshFacesPlayer(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_BeginJumpOutOfAsh(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_WaitJumpOutOfAsh(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_EndJumpOutOfAsh(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_OffscreenAboveTrainerCreateCameraObj(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); +static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj); static void Task_DestroyTrainerApproachTask(u8 taskId); static void SpriteCB_TrainerIcons(struct Sprite *sprite); static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum); @@ -57,7 +57,7 @@ static const TrainerApproachFunc sDirectionalApproachDistanceFuncs[] = { GetTrainerApproachDistanceEast }; -// bool8 func(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +// bool8 func(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) // Returns TRUE to run the next func immediately // Returns FALSE to delay the next func to the next frame static const TrainerSeeFunc sTrainerSeeFuncList[] = { @@ -246,7 +246,7 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 ap static void TrainerApproachPlayer(struct ObjectEvent * trainerObj, u8 approachDistance) { u8 taskId = CreateTask(Task_RunTrainerSeeFuncList, 80); - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; task->tTrainerObjHi = ((uintptr_t)trainerObj) >> 16; task->tTrainerObjLo = (uintptr_t)trainerObj; task->tTrainerRange = approachDistance; @@ -262,7 +262,7 @@ static void StartTrainerApproachWithFollowupTask(TaskFunc taskFunc) static void Task_RunTrainerSeeFuncList(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; struct ObjectEvent * trainerObj; TaskGetTrainerObj(trainerObj, task); @@ -279,12 +279,12 @@ static void Task_RunTrainerSeeFuncList(u8 taskId) // TrainerSeeFuncs -static bool8 TrainerSeeFunc_Dummy(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_Dummy(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { return FALSE; } -static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { u8 action; // FRLG introduces trainers who can see the player from offscreen above. @@ -304,7 +304,7 @@ static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task * task, struct return TRUE; } -static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) { @@ -321,7 +321,7 @@ static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task * task, struct O } } -static bool8 TrainerSeeFunc_TrainerApproach(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_TrainerApproach(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { if (!ObjectEventIsMovementOverridden(trainerObj) || ObjectEventClearHeldMovementIfFinished(trainerObj)) { @@ -339,7 +339,7 @@ static bool8 TrainerSeeFunc_TrainerApproach(u8 taskId, struct Task * task, struc return FALSE; } -static bool8 TrainerSeeFunc_PrepareToEngage(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_PrepareToEngage(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { struct ObjectEvent *playerObj; @@ -361,7 +361,7 @@ static bool8 TrainerSeeFunc_PrepareToEngage(u8 taskId, struct Task * task, struc return FALSE; } -static bool8 TrainerSeeFunc_End(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_End(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId]; @@ -372,7 +372,7 @@ static bool8 TrainerSeeFunc_End(u8 taskId, struct Task * task, struct ObjectEven } // Jumps here if disguised. Not used in FRLG. -static bool8 TrainerSeeFunc_BeginRemoveDisguise(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_BeginRemoveDisguise(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { if (!ObjectEventIsMovementOverridden(trainerObj) || ObjectEventClearHeldMovementIfFinished(trainerObj)) @@ -383,7 +383,7 @@ static bool8 TrainerSeeFunc_BeginRemoveDisguise(u8 taskId, struct Task * task, s return FALSE; } -static bool8 TrainerSeeFunc_WaitRemoveDisguise(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_WaitRemoveDisguise(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { if (ObjectEventClearHeldMovementIfFinished(trainerObj)) task->tFuncId = 3; @@ -392,7 +392,7 @@ static bool8 TrainerSeeFunc_WaitRemoveDisguise(u8 taskId, struct Task * task, st } // Jump here if buried in ash. Not used in FRLG. -static bool8 TrainerSeeFunc_TrainerInAshFacesPlayer(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_TrainerInAshFacesPlayer(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { if (!ObjectEventIsMovementOverridden(trainerObj) || ObjectEventClearHeldMovementIfFinished(trainerObj)) @@ -403,7 +403,7 @@ static bool8 TrainerSeeFunc_TrainerInAshFacesPlayer(u8 taskId, struct Task * tas return FALSE; } -static bool8 TrainerSeeFunc_BeginJumpOutOfAsh(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_BeginJumpOutOfAsh(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { if (ObjectEventCheckHeldMovementStatus(trainerObj)) { @@ -417,7 +417,7 @@ static bool8 TrainerSeeFunc_BeginJumpOutOfAsh(u8 taskId, struct Task * task, str return FALSE; } -static bool8 TrainerSeeFunc_WaitJumpOutOfAsh(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_WaitJumpOutOfAsh(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { struct Sprite *sprite; @@ -479,7 +479,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, stru return FALSE; } -static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj) +static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, struct Task *task, struct ObjectEvent * trainerObj) { u8 specialObjectId; TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId); @@ -514,7 +514,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, st static void Task_RevealTrainer_RunTrainerSeeFuncList(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; struct ObjectEvent * trainerObj; // another objEvent loaded into by loadword? diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 1fd93b82b..53293825d 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -597,7 +597,7 @@ void VsSeekerFreezeObjectsAfterChargeComplete(void) static void Task_ResetObjectsRematchWantedState(u8 taskId) { - struct Task * task = &gTasks[taskId]; + struct Task *task = &gTasks[taskId]; u8 i; if (task->data[0] == 0 && walkrun_is_standing_still() == TRUE) From 95dd979f098d6edb78f45765c2a2745db7649882 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 31 Jul 2022 21:00:27 -0400 Subject: [PATCH 53/64] Font constants and slight PSS sync --- charmap.txt | 12 +- .../CeladonCity_DepartmentStore_Roof/text.inc | 2 +- .../text.inc | 2 +- data/maps/PalletTown_RivalsHouse/text.inc | 4 +- data/maps/PewterCity_Gym/text.inc | 4 +- data/maps/VermilionCity/text.inc | 8 +- data/text/fame_checker.inc | 172 +++--- data/text/pokedex_rating.inc | 2 +- include/help_system.h | 4 +- include/new_menu_helpers.h | 2 +- include/pokemon_storage_system_internal.h | 6 +- include/shop.h | 2 +- include/text.h | 14 +- src/bag.c | 12 +- src/battle_interface.c | 2 +- src/battle_message.c | 2 +- src/battle_records.c | 14 +- src/battle_script_commands.c | 2 +- src/berry_crush.c | 78 +-- src/berry_pouch.c | 44 +- src/berry_powder.c | 4 +- src/buy_menu_helpers.c | 4 +- src/cable_club.c | 2 +- src/clear_save_data_screen.c | 6 +- src/coins.c | 10 +- src/credits.c | 6 +- src/daycare.c | 10 +- src/diploma.c | 10 +- src/dodrio_berry_picking.c | 8 +- src/dodrio_berry_picking_2.c | 62 +-- src/easy_chat_3.c | 30 +- src/evolution_scene.c | 2 +- src/fame_checker.c | 30 +- src/field_player_avatar.c | 8 +- src/field_screen_effect.c | 2 +- src/field_specials.c | 12 +- src/hall_of_fame.c | 34 +- src/help_message.c | 2 +- src/help_system_util.c | 36 +- src/item_menu.c | 52 +- src/item_pc.c | 42 +- src/item_use.c | 48 +- src/itemfinder.c | 6 +- src/learn_move.c | 12 +- src/link.c | 10 +- src/mail.c | 8 +- src/mailbox_pc.c | 6 +- src/main_menu.c | 30 +- src/map_name_popup.c | 4 +- src/map_preview_screen.c | 4 +- src/menu.c | 14 +- src/menu2.c | 14 +- src/menu_helpers.c | 4 +- src/mevent_show_card.c | 24 +- src/mevent_show_news.c | 6 +- src/money.c | 6 +- src/mystery_gift_menu.c | 30 +- src/naming_screen.c | 16 +- src/new_menu_helpers.c | 18 +- src/oak_speech.c | 26 +- src/option_menu.c | 26 +- src/party_menu.c | 36 +- src/player_pc.c | 40 +- src/pokedex_screen.c | 82 +-- src/pokemon_jump.c | 32 +- src/pokemon_special_anim_scene.c | 16 +- src/pokemon_storage_system_2.c | 30 +- src/pokemon_storage_system_3.c | 22 +- src/pokemon_storage_system_4.c | 120 +++-- src/pokemon_storage_system_5.c | 8 +- src/pokemon_storage_system_6.c | 4 +- src/pokemon_storage_system_8.c | 2 +- src/pokemon_summary_screen.c | 76 +-- src/quest_log.c | 4 +- src/region_map.c | 12 +- src/scrcmd.c | 4 +- src/script_menu.c | 54 +- src/shop.c | 42 +- src/slot_machine.c | 8 +- src/start_menu.c | 28 +- src/strings.c | 86 +-- src/teachy_tv.c | 4 +- src/text.c | 495 +++++++++--------- src/tm_case.c | 50 +- src/trade.c | 28 +- src/trade_scene.c | 2 +- src/trainer_card.c | 12 +- src/trainer_tower.c | 14 +- src/union_room.c | 14 +- src/union_room_battle.c | 2 +- src/union_room_chat_display.c | 30 +- src/vs_seeker.c | 6 +- src/wireless_communication_status_screen.c | 14 +- 93 files changed, 1243 insertions(+), 1206 deletions(-) diff --git a/charmap.txt b/charmap.txt index febef44e9..150b4a156 100644 --- a/charmap.txt +++ b/charmap.txt @@ -427,7 +427,7 @@ HIGHLIGHT = FC 02 @ same as fc 01 SHADOW = FC 03 @ same as fc 01 COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes PALETTE = FC 05 @ used in credits -SIZE = FC 06 @ note that anything other than "SMALL" is invalid +FONT = FC 06 @ Given a font id, or use font constants below instead RESET_SIZE = FC 07 PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them PAUSE_UNTIL_PRESS = FC 09 @@ -447,10 +447,14 @@ ENG = FC 16 PAUSE_MUSIC = FC 17 RESUME_MUSIC = FC 18 -@ font sizes +@ fonts -SMALL = FC 06 00 -BIG = FC 06 04 +FONT_0 = FC 06 00 +FONT_1 = FC 06 01 +FONT_2 = FC 06 02 +FONT_3 = FC 06 03 +FONT_4 = FC 06 04 +FONT_5 = FC 06 05 @ colors diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc index 23243f721..95e95feff 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc @@ -1,7 +1,7 @@ CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink:: .string "I'm thirsty!\n" .string "I want something to drink!\p" - .string "{SIZE}ÁGive her a drink?$" + .string "{FONT_2}Give her a drink?$" CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink:: .string "Give her which drink?$" diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc index 9cb7e1691..e9dca709d 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/text.inc @@ -64,7 +64,7 @@ CinnabarIsland_PokemonLab_ExperimentRoom_Text_ThatFossilIsOfMonMakeItLiveAgain:: CinnabarIsland_PokemonLab_ExperimentRoom_Text_HandedFossilToWeirdDoctor:: .string "So!\n" .string "You hurry and give me that!\p" - .string "{SIZE}Á{PLAYER} handed over the\n" + .string "{FONT_2}{PLAYER} handed over the\n" .string "{STR_VAR_2} to the weird doctor.$" CinnabarIsland_PokemonLab_ExperimentRoom_Text_TakesTimeGoForWalk:: diff --git a/data/maps/PalletTown_RivalsHouse/text.inc b/data/maps/PalletTown_RivalsHouse/text.inc index 95ba3c061..253f61236 100644 --- a/data/maps/PalletTown_RivalsHouse/text.inc +++ b/data/maps/PalletTown_RivalsHouse/text.inc @@ -62,8 +62,8 @@ PalletTown_RivalsHouse_Text_LookingNiceInNoTime:: .string "nice in no time.$" PalletTown_RivalsHouse_Text_ThereYouGoAllDone:: - .string "{SIZE}Á{STR_VAR_1} looks dreamily content…\p" - .string "{SIZE}ÈDAISY: There you go! All done.\n" + .string "{FONT_2}{STR_VAR_1} looks dreamily content…\p" + .string "{FONT_5}DAISY: There you go! All done.\n" .string "See? Doesn't it look nice?\p" .string "Giggle…\n" .string "It's such a cute POKéMON.$" diff --git a/data/maps/PewterCity_Gym/text.inc b/data/maps/PewterCity_Gym/text.inc index c93a8600c..0b12ccd6c 100644 --- a/data/maps/PewterCity_Gym/text.inc +++ b/data/maps/PewterCity_Gym/text.inc @@ -23,9 +23,9 @@ PewterCity_Gym_Text_BrockDefeat:: .string "As proof of your victory, I confer\n" .string "on you this…the official POKéMON\l" .string "LEAGUE BOULDERBADGE.\p" - .string "{SIZE}Á{PLAYER} received the BOULDERBADGE\n" + .string "{FONT_2}{PLAYER} received the BOULDERBADGE\n" .string "from BROCK!{PAUSE_MUSIC}{PLAY_BGM}{MUS_OBTAIN_BADGE}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}\p" - .string "{SIZE}ÇJust having the BOULDERBADGE makes\n" + .string "{FONT_4}Just having the BOULDERBADGE makes\n" .string "your POKéMON more powerful.\p" .string "It also enables the use of the\n" .string "move FLASH outside of battle.\p" diff --git a/data/maps/VermilionCity/text.inc b/data/maps/VermilionCity/text.inc index 3674d5fe5..a7d41c462 100644 --- a/data/maps/VermilionCity/text.inc +++ b/data/maps/VermilionCity/text.inc @@ -61,14 +61,14 @@ VermilionCity_Text_DoYouHaveATicket:: .string "Excuse me, do you have a ticket?$" VermilionCity_Text_FlashedSSTicket:: - .string "{SIZE}Á{PLAYER} flashed the S.S. TICKET!\p" - .string "{SIZE}ÇGreat!\n" + .string "{FONT_2}{PLAYER} flashed the S.S. TICKET!\p" + .string "{FONT_4}Great!\n" .string "Welcome to the S.S. ANNE!$" VermilionCity_Text_DontHaveNeededSSTicket:: - .string "{SIZE}Á{PLAYER} doesn't have the needed\n" + .string "{FONT_2}{PLAYER} doesn't have the needed\n" .string "S.S. TICKET.\p" - .string "{SIZE}ÇSorry!\p" + .string "{FONT_4}Sorry!\p" .string "You need a ticket to get aboard.$" VermilionCity_Text_TheShipSetSail:: diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 37a975411..a95d2abc8 100644 --- a/data/text/fame_checker.inc +++ b/data/text/fame_checker.inc @@ -4,13 +4,13 @@ gFameCheckerFlavorText_ProfOak0:: @ 0x81AD106 gFameCheckerFlavorText_ProfOak1:: @ 0x81AD145 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}To make a complete guide on all\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}To make a complete guide on all\n" .string "the POKéMON in the world…\p" .string "That was my dream!$" gFameCheckerFlavorText_ProfOak2:: @ 0x81AD1BB .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK may not look like much,\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK may not look like much,\n" .string "but he's the authority on POKéMON.\p" .string "Many POKéMON TRAINERS hold him in\n" .string "high regard.$" @@ -22,7 +22,7 @@ gFameCheckerFlavorText_ProfOak3:: @ 0x81AD258 gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n" .string "interest in you, child.\p" .string "That old duff was once tough and\n" .string "handsome.\p" @@ -31,26 +31,26 @@ gFameCheckerFlavorText_ProfOak4:: @ 0x81AD2B9 gFameCheckerFlavorText_ProfOak5:: @ 0x81AD377 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK is going to have his own\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}PROF. OAK is going to have his own\n" .string "radio show soon.\p" .string "The program will be called PROF.\n" .string "OAK'S POKéMON SEMINAR.$" gFameCheckerFlavorText_Daisy0:: @ 0x81AD40C .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}If you show DAISY your POKéMON,\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}If you show DAISY your POKéMON,\n" .string "she can tell how much it likes you.\p" .string "Occasionally, she will even groom\n" .string "a POKéMON for you.$" gFameCheckerFlavorText_Daisy1:: @ 0x81AD4AE .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}But the person who is most liked by\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}But the person who is most liked by\n" .string "POKéMON is DAISY, I think.$" gFameCheckerFlavorText_Daisy2:: @ 0x81AD516 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}She was gently grooming POKéMON…\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}She was gently grooming POKéMON…\n" .string "She was a little angel.\p" .string "That little girl's name…\n" .string "I think it was DAISY.$" @@ -62,7 +62,7 @@ gFameCheckerFlavorText_Daisy3:: @ 0x81AD5A7 gFameCheckerFlavorText_Daisy4:: @ 0x81AD608 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}A girl from PALLET TOWN, DAISY,\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}A girl from PALLET TOWN, DAISY,\n" .string "she enjoys TEA every day.\p" .string "She visits the CELADON DEPT. STORE\n" .string "to buy some TEA.$" @@ -81,7 +81,7 @@ gFameCheckerFlavorText_Brock0:: @ 0x81AD705 gFameCheckerFlavorText_Brock1:: @ 0x81AD771 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My rock-hard willpower is evident\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My rock-hard willpower is evident\n" .string "in even my POKéMON.\p" .string "My POKéMON are all rock hard and\n" .string "have true-grit determination.\p" @@ -90,7 +90,7 @@ gFameCheckerFlavorText_Brock1:: @ 0x81AD771 gFameCheckerFlavorText_Brock2:: @ 0x81AD840 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There aren't many serious POKéMON\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There aren't many serious POKéMON\n" .string "TRAINERS here.\p" .string "They're all like BUG CATCHERS,\n" .string "you know, just hobbyists.\p" @@ -99,14 +99,14 @@ gFameCheckerFlavorText_Brock2:: @ 0x81AD840 gFameCheckerFlavorText_Brock3:: @ 0x81AD908 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BROCK is cool. He's not just tough.\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BROCK is cool. He's not just tough.\n" .string "People like and respect him.\p" .string "I want to become a GYM LEADER\n" .string "like him.$" gFameCheckerFlavorText_Brock4:: @ 0x81AD99A .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hi, I'm excavating for fossils here\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hi, I'm excavating for fossils here\n" .string "under MT. MOON.\p" .string "Sometimes, BROCK of PEWTER GYM\n" .string "lends me a hand.$" @@ -124,25 +124,25 @@ gFameCheckerFlavorText_Misty0:: @ 0x81ADA91 gFameCheckerFlavorText_Misty1:: @ 0x81ADAF6 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My policy is an all-out offensive\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My policy is an all-out offensive\n" .string "with WATER-type POKéMON!$" gFameCheckerFlavorText_Misty2:: @ 0x81ADB5A .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}MISTY is a TRAINER who's going to\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}MISTY is a TRAINER who's going to\n" .string "keep improving.\p" .string "She won't lose to someone like you!$" gFameCheckerFlavorText_Misty3:: @ 0x81ADBD9 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Strong TRAINERS and WATER POKéMON\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Strong TRAINERS and WATER POKéMON\n" .string "are common sights in these parts.\p" .string "They say that MISTY of the\n" .string "CERULEAN GYM trains here.$" gFameCheckerFlavorText_Misty4:: @ 0x81ADC72 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This cape is a famous date spot.\p" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This cape is a famous date spot.\p" .string "MISTY, the GYM LEADER, has high\n" .string "hopes about this place.$" @@ -159,23 +159,23 @@ gFameCheckerFlavorText_LtSurge0:: @ 0x81ADD3C gFameCheckerFlavorText_LtSurge1:: @ 0x81ADDA7 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I tell you, kid, electric POKéMON\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I tell you, kid, electric POKéMON\n" .string "saved me during the war!$" gFameCheckerFlavorText_LtSurge2:: @ 0x81ADE0B .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When I was in the Army, LT. SURGE\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When I was in the Army, LT. SURGE\n" .string "was my strict CO.\p" .string "He was a hard taskmaster.$" gFameCheckerFlavorText_LtSurge3:: @ 0x81ADE82 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE was always famous for\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE was always famous for\n" .string "his cautious nature in the Army.$" gFameCheckerFlavorText_LtSurge4:: @ 0x81ADEEC .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE installed the traps in\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}LT. SURGE installed the traps in\n" .string "the GYM himself.\p" .string "He set up double locks everywhere.$" @@ -194,26 +194,26 @@ gFameCheckerFlavorText_Erika0:: @ 0x81AE009 gFameCheckerFlavorText_Erika1:: @ 0x81AE072 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am a student of the art of\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am a student of the art of\n" .string "flower arranging.\p" .string "My POKéMON are solely of the\n" .string "GRASS type.$" gFameCheckerFlavorText_Erika2:: @ 0x81AE0F3 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER ERIKA might be quiet,\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER ERIKA might be quiet,\n" .string "but she's famous around here.$" gFameCheckerFlavorText_Erika3:: @ 0x81AE15B .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We only use GRASS-type POKéMON at\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We only use GRASS-type POKéMON at\n" .string "our GYM.\p" .string "Why? We also use them for making\n" .string "flower arrangements!$" gFameCheckerFlavorText_Erika4:: @ 0x81AE1E5 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I would never collect POKéMON if\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I would never collect POKéMON if\n" .string "they were unattractive.$" gFameCheckerFlavorText_Erika5:: @ 0x81AE247 @@ -230,18 +230,18 @@ gFameCheckerFlavorText_Koga0:: @ 0x81AE2B6 gFameCheckerFlavorText_Koga1:: @ 0x81AE31D .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Despair to the creeping horror of\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Despair to the creeping horror of\n" .string "POISON-type POKéMON!$" gFameCheckerFlavorText_Koga2:: @ 0x81AE37D .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even though I've lost, I will keep\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even though I've lost, I will keep\n" .string "training according to the teachings\l" .string "of KOGA, my ninja master.$" gFameCheckerFlavorText_Koga3:: @ 0x81AE407 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My father is the GYM LEADER of\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My father is the GYM LEADER of\n" .string "this town.\p" .string "I'm training to use POISON POKéMON\n" .string "as well as my father.$" @@ -255,7 +255,7 @@ gFameCheckerFlavorText_Koga4:: @ 0x81AE48D gFameCheckerFlavorText_Koga5:: @ 0x81AE51B .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The SAFARI ZONE's huge, wouldn't\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The SAFARI ZONE's huge, wouldn't\n" .string "you say?\p" .string "FUCHSIA's GYM LEADER, KOGA, \n" .string "patrols the grounds every so often.\p" @@ -270,21 +270,21 @@ gFameCheckerFlavorText_Sabrina0:: @ 0x81AE5E8 gFameCheckerFlavorText_Sabrina1:: @ 0x81AE656 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know about a girl GYM LEADER\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know about a girl GYM LEADER\n" .string "in SAFFRON CITY?\p" .string "She uses PSYCHIC-type POKéMON,\n" .string "right?$" gFameCheckerFlavorText_Sabrina2:: @ 0x81AE6D7 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I have had psychic powers since\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I have had psychic powers since\n" .string "I was a child.\p" .string "It started when a spoon I\n" .string "carelessly tossed, bent.$" gFameCheckerFlavorText_Sabrina3:: @ 0x81AE762 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I dislike battling, but if you wish,\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I dislike battling, but if you wish,\n" .string "I will show you my powers!$" gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB @@ -295,7 +295,7 @@ gFameCheckerFlavorText_Sabrina4:: @ 0x81AE7CB gFameCheckerFlavorText_Sabrina5:: @ 0x81AE841 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}SABRINA just wiped out the KARATE\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}SABRINA just wiped out the KARATE\n" .string "MASTER next door.$" gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E @@ -306,13 +306,13 @@ gFameCheckerFlavorText_Blaine0:: @ 0x81AE89E gFameCheckerFlavorText_Blaine1:: @ 0x81AE90A .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fiery POKéMON are all rough\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fiery POKéMON are all rough\n" .string "and ready with intense heat!\p" .string "They incinerate all challengers!$" gFameCheckerFlavorText_Blaine2:: @ 0x81AE990 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER, BLAINE, became lost\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Our LEADER, BLAINE, became lost\n" .string "in the mountains but good.\p" .string "Night fell when a fiery bird\n" .string "POKéMON appeared.\p" @@ -321,7 +321,7 @@ gFameCheckerFlavorText_Blaine2:: @ 0x81AE990 gFameCheckerFlavorText_Blaine3:: @ 0x81AEA59 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}CINNABAR GYM's BLAINE is quite the\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}CINNABAR GYM's BLAINE is quite the\n" .string "odd fellow.\p" .string "He's lived on the island since way\n" .string "before the LAB was built.$" @@ -341,16 +341,16 @@ gFameCheckerFlavorText_Blaine5:: @ 0x81AEB69 gFameCheckerFlavorText_Lorelei0:: @ 0x81AEBDF .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am LORELEI of the ELITE FOUR.$" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am LORELEI of the ELITE FOUR.$" gFameCheckerFlavorText_Lorelei1:: @ 0x81AEC28 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}No one can best me when it comes\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}No one can best me when it comes\n" .string "to icy POKéMON.$" gFameCheckerFlavorText_Lorelei2:: @ 0x81AEC82 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Where was this person born?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We've had a great and powerful\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We've had a great and powerful\n" .string "TRAINER grow up on this island.\p" .string "I bet even you'd know her.\n" .string "It's LORELEI of the ELITE FOUR!$" @@ -363,14 +363,14 @@ gFameCheckerFlavorText_Lorelei3:: @ 0x81AED27 gFameCheckerFlavorText_Lorelei4:: @ 0x81AEDAA .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Did you know that LORELEI has lots\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Did you know that LORELEI has lots\n" .string "and lots of stuffed dolls?\p" .string "Every time she comes back to\n" .string "FOUR ISLAND, her collection grows!$" gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The LAPRAS she has, I imagine it\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The LAPRAS she has, I imagine it\n" .string "to be the one she met as a child.\p" .string "I believe it was in ICEFALL CAVE\n" .string "that she caught it.\p" @@ -379,11 +379,11 @@ gFameCheckerFlavorText_Lorelei5:: @ 0x81AEE51 gFameCheckerFlavorText_Bruno0:: @ 0x81AEF25 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am BRUNO of the ELITE FOUR!$" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am BRUNO of the ELITE FOUR!$" gFameCheckerFlavorText_Bruno1:: @ 0x81AEF6C .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I've lived and trained with my\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I've lived and trained with my\n" .string "fighting POKéMON!$" gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6 @@ -394,14 +394,14 @@ gFameCheckerFlavorText_Bruno2:: @ 0x81AEFC6 gFameCheckerFlavorText_Bruno3:: @ 0x81AF04C .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BRUNO, who's a senior ahead of me,\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BRUNO, who's a senior ahead of me,\n" .string "visits the SPA on occasion.\p" .string "He comes to rehab injuries, both\n" .string "his own and his POKéMON's.$" gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's one of the ELITE FOUR.\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's one of the ELITE FOUR.\n" .string "His name is BRUNO.\p" .string "He went away disappointed when he\n" .string "found out that they were all sold\l" @@ -409,22 +409,22 @@ gFameCheckerFlavorText_Bruno4:: @ 0x81AF0F0 gFameCheckerFlavorText_Bruno5:: @ 0x81AF19A .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even BRUNO…\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Even BRUNO…\n" .string "He trained with a fellow by the\l" .string "name of BRAWLY before.$" gFameCheckerFlavorText_Agatha0:: @ 0x81AF200 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am AGATHA of the ELITE FOUR.$" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am AGATHA of the ELITE FOUR.$" gFameCheckerFlavorText_Agatha1:: @ 0x81AF248 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}AGATHA's GHOST-type POKéMON are\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}AGATHA's GHOST-type POKéMON are\n" .string "horrifically terrifying in toughness.$" gFameCheckerFlavorText_Agatha2:: @ 0x81AF2B7 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}That old lady's also got a really\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}That old lady's also got a really\n" .string "short fuse, too.\p" .string "It doesn't take anything to get\n" .string "that scary lady hollering.$" @@ -437,7 +437,7 @@ gFameCheckerFlavorText_Agatha3:: @ 0x81AF34E gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear OAK's taken a lot of\n" .string "interest in you, child.\p" .string "That old duff was once tough and\n" .string "handsome.\p" @@ -446,19 +446,19 @@ gFameCheckerFlavorText_Agatha4:: @ 0x81AF3BE gFameCheckerFlavorText_Agatha5:: @ 0x81AF47C .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Take AGATHA, for example.\p" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Take AGATHA, for example.\p" .string "She set a record for being the\n" .string "oldest-ever ELITE FOUR member.$" gFameCheckerFlavorText_Lance0:: @ 0x81AF4FD .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I lead the ELITE FOUR.\p" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I lead the ELITE FOUR.\p" .string "You can call me LANCE the dragon\n" .string "TRAINER.$" gFameCheckerFlavorText_Lance1:: @ 0x81AF567 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know that dragons are\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You know that dragons are\n" .string "mythical POKéMON.\p" .string "They're hard to catch and raise,\n" .string "but their powers are superior.\p" @@ -467,13 +467,13 @@ gFameCheckerFlavorText_Lance1:: @ 0x81AF567 gFameCheckerFlavorText_Lance2:: @ 0x81AF641 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He stands for justice!\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He stands for justice!\n" .string "He's cool, and yet passionate!\l" .string "He's the greatest, LANCE!$" gFameCheckerFlavorText_Lance3:: @ 0x81AF6BA .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We have a customer, LANCE, who\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}We have a customer, LANCE, who\n" .string "occasionally comes.\p" .string "He always buys capes.\p" .string "I wonder… Does he have many\n" @@ -487,56 +487,56 @@ gFameCheckerFlavorText_Lance4:: @ 0x81AF758 gFameCheckerFlavorText_Lance5:: @ 0x81AF7CB .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}From what I've heard, LANCE has\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}From what I've heard, LANCE has\n" .string "a cousin who's a GYM LEADER\l" .string "somewhere far away.$" gFameCheckerFlavorText_Bill0:: @ 0x81AF83E .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}After all, BILL's world-famous as a\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}After all, BILL's world-famous as a\n" .string "POKéMANIAC.\p" .string "He invented the POKéMON Storage\n" .string "System on PC, too.$" gFameCheckerFlavorText_Bill1:: @ 0x81AF8CA .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL has lots of POKéMON!\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL has lots of POKéMON!\n" .string "He collects rare ones, too!$" gFameCheckerFlavorText_Bill2:: @ 0x81AF929 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's my grandson!\p" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's my grandson!\p" .string "He always liked collecting things,\n" .string "even as a child!$" gFameCheckerFlavorText_Bill3:: @ 0x81AF998 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL is a POKéMANIAC, so he loves\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL is a POKéMANIAC, so he loves\n" .string "every kind.\p" .string "Apparently, the first one he caught\n" .string "was an ABRA.$" gFameCheckerFlavorText_Bill4:: @ 0x81AFA20 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL's hometown is GOLDENROD CITY,\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}BILL's hometown is GOLDENROD CITY,\n" .string "where his folks still live.\p" .string "I've heard that it's quite the\n" .string "festive, bustling city.$" gFameCheckerFlavorText_Bill5:: @ 0x81AFAB9 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Apparently, BILL simply can't\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Apparently, BILL simply can't\n" .string "stomach milk at all.$" gFameCheckerFlavorText_MrFuji0:: @ 0x81AFB0C .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's really kind.\p" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}He's really kind.\p" .string "He looks after abandoned and\n" .string "orphaned POKéMON.$" gFameCheckerFlavorText_MrFuji1:: @ 0x81AFB76 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This old guy marched right up to\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}This old guy marched right up to\n" .string "our HIDEOUT.\p" .string "Then, he starts ranting about how\n" .string "TEAM ROCKET's abusing POKéMON.\p" @@ -553,7 +553,7 @@ gFameCheckerFlavorText_MrFuji2:: @ 0x81AFC38 gFameCheckerFlavorText_MrFuji3:: @ 0x81AFCE9 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}There's a rumor…\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear that MR. FUJI's not from\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I hear that MR. FUJI's not from\n" .string "these parts originally, either.$" gFameCheckerFlavorText_MrFuji4:: @ 0x81AFD49 @@ -572,7 +572,7 @@ gFameCheckerFlavorText_MrFuji5:: @ 0x81AFDC4 gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET captures POKéMON from\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET captures POKéMON from\n" .string "around the world.\p" .string "They're important tools for keeping\n" .string "our criminal enterprise going.\p" @@ -580,32 +580,32 @@ gFameCheckerFlavorText_Giovanni0:: @ 0x81AFE68 gFameCheckerFlavorText_Giovanni1:: @ 0x81AFF23 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Favorite kind of POKéMON?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Those thugs that took over our\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Those thugs that took over our\n" .string "building…\p" .string "Their BOSS said he was looking for\n" .string "strong POKéMON.$" gFameCheckerFlavorText_Giovanni2:: @ 0x81AFFA8 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What is this person like?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET's BOSS is terribly\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}TEAM ROCKET's BOSS is terribly\n" .string "cruel!\p" .string "To him, POKéMON are just tools to\n" .string "be used.$" gFameCheckerFlavorText_Giovanni3:: @ 0x81B0022 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Welcome to my hideout!\p" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Welcome to my hideout!\p" .string "It shall be so until I can restore\n" .string "TEAM ROCKET to its former glory.$" gFameCheckerFlavorText_Giovanni4:: @ 0x81B00A6 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}What does this person do?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Blow me away! GIOVANNI was the\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Blow me away! GIOVANNI was the\n" .string "GYM LEADER of VIRIDIAN?$" gFameCheckerFlavorText_Giovanni5:: @ 0x81B0106 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}Family and friends?\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You… You're not GIOVANNI's kid,\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You… You're not GIOVANNI's kid,\n" .string "are you?\p" .string "No, that can't be right.\n" .string "GIOVANNI's kid has red hair.$" @@ -617,7 +617,7 @@ gFameCheckerPersonName_ProfOak:: @ 0x81B0188 gFameCheckerPersonQuote_ProfOak:: @ 0x81B0198 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: PROF. OAK\n" .string "To: {PLAYER}\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Why do POKéMON compete and battle\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Why do POKéMON compete and battle\n" .string "so hard for you?\p" .string "They do so because they can see\n" .string "the love and trust you have\l" @@ -630,7 +630,7 @@ gFameCheckerPersonName_Daisy:: @ 0x81B0251 gFameCheckerPersonQuote_Daisy:: @ 0x81B025D .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: DAISY\n" .string "To: {PLAYER}\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}While I was comfortably enjoying\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}While I was comfortably enjoying\n" .string "my tea breaks, you've grown very\l" .string "skilled and powerful.\p" .string "I hope you'll remain a good rival\n" @@ -642,7 +642,7 @@ gFameCheckerPersonName_Brock:: @ 0x81B030F gFameCheckerPersonQuote_Brock:: @ 0x81B031B .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BROCK\n" .string "To: {PLAYER}\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}In this big world of ours, there\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}In this big world of ours, there\n" .string "must be many tough TRAINERS.\p" .string "Let's both keep training and\n" .string "making ourselves stronger!$" @@ -653,7 +653,7 @@ gFameCheckerPersonName_Misty:: @ 0x81B03B3 gFameCheckerPersonQuote_Misty:: @ 0x81B03BF .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MISTY\n" .string "To: {PLAYER}\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm going to keep training here at\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm going to keep training here at\n" .string "this GYM.\p" .string "When I get better, I'd love to hit\n" .string "the road and travel.$" @@ -664,7 +664,7 @@ gFameCheckerPersonName_LtSurge:: @ 0x81B0446 gFameCheckerPersonQuote_LtSurge:: @ 0x81B0456 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LT. SURGE\n" .string "To: {PLAYER}\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, kid!\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, kid!\n" .string "You electrified me in our battle!\p" .string "I didn't know that there were\n" .string "gutsy TRAINERS like you.\p" @@ -677,7 +677,7 @@ gFameCheckerPersonName_Erika:: @ 0x81B0504 gFameCheckerPersonQuote_Erika:: @ 0x81B0510 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: ERIKA\n" .string "To: {PLAYER}\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am so glad that there are strong\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I am so glad that there are strong\n" .string "TRAINERS like you.\p" .string "That awareness alone inspires and\n" .string "motivates me to try harder.\p" @@ -690,7 +690,7 @@ gFameCheckerPersonName_Koga:: @ 0x81B05C2 gFameCheckerPersonQuote_Koga:: @ 0x81B05CD .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: KOGA\n" .string "To: {PLAYER}\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You and I, we must both set our\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}You and I, we must both set our\n" .string "sights higher and work towards\l" .string "meeting our challenges.\p" .string "Now, I must go train my daughter.$" @@ -701,7 +701,7 @@ gFameCheckerPersonName_Sabrina:: @ 0x81B0667 gFameCheckerPersonQuote_Sabrina:: @ 0x81B0675 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: SABRINA\n" .string "To: {PLAYER}\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The love you have towards your\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The love you have towards your\n" .string "POKéMON…\p" .string "It was a power that was never\n" .string "bested by my psychic power.$" @@ -712,7 +712,7 @@ gFameCheckerPersonName_Blaine:: @ 0x81B06FB gFameCheckerPersonQuote_Blaine:: @ 0x81B0708 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BLAINE\n" .string "To: {PLAYER}\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fire POKéMON!\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}My fire POKéMON!\n" .string "They'll become even more powerful!\p" .string "And now, a quiz. How many kinds of\n" .string "FIRE-type POKéMON are there?$" @@ -723,7 +723,7 @@ gFameCheckerPersonName_Lorelei:: @ 0x81B079F gFameCheckerPersonQuote_Lorelei:: @ 0x81B07AD .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LORELEI\n" .string "To: {PLAYER}\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I needed to thank you for your\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I needed to thank you for your\n" .string "help.\p" .string "But that has nothing to do with our\n" .string "battles.\p" @@ -735,7 +735,7 @@ gFameCheckerPersonName_Bruno:: @ 0x81B0845 gFameCheckerPersonQuote_Bruno:: @ 0x81B0851 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BRUNO\n" .string "To: {PLAYER}\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The super power of your POKéMON\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}The super power of your POKéMON\n" .string "and you I've experienced myself.\p" .string "Next time, maybe I should show you\n" .string "how to train yourself.$" @@ -746,7 +746,7 @@ gFameCheckerPersonName_Agatha:: @ 0x81B08EE gFameCheckerPersonQuote_Agatha:: @ 0x81B08FB .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: AGATHA\n" .string "To: {PLAYER}\p" - .string "{SIZE 05}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When you grow older, don't you\n" + .string "{FONT_5}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}When you grow older, don't you\n" .string "dare go soft like that coot OAK!\p" .string "Be like me and keep battling on!$" @@ -756,7 +756,7 @@ gFameCheckerPersonName_Lance:: @ 0x81B097F gFameCheckerPersonQuote_Lance:: @ 0x81B098B .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: LANCE\n" .string "To: {PLAYER}\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm considering going back to my\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}I'm considering going back to my\n" .string "hometown.\p" .string "I want to retrain my DRAGON-type\n" .string "POKéMON and strengthen them.\p" @@ -769,7 +769,7 @@ gFameCheckerPersonName_Bill:: @ 0x81B0A45 gFameCheckerPersonQuote_Bill:: @ 0x81B0A50 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: BILL\n" .string "To: {PLAYER}\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, there! CELIO had nothing but\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Hey, there! CELIO had nothing but\n" .string "praise for you.\p" .string "Hearing that makes me happy.\p" .string "When you catch some rare POKéMON,\n" @@ -781,7 +781,7 @@ gFameCheckerPersonName_MrFuji:: @ 0x81B0AFF gFameCheckerPersonQuote_MrFuji:: @ 0x81B0B0E .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: MR. FUJI\n" .string "To: {PLAYER}\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Instead of hoping for the happiness\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}Instead of hoping for the happiness\n" .string "of just your POKéMON…\p" .string "…Can I get you to wish for the\n" .string "happiness of all POKéMON?$" @@ -792,7 +792,7 @@ gFameCheckerPersonName_Giovanni:: @ 0x81B0BA6 gFameCheckerPersonQuote_Giovanni:: @ 0x81B0BB5 .string "{COLOR BLUE}{SHADOW LIGHT_BLUE}From: GIOVANNI\n" .string "To: {PLAYER}\p" - .string "{SIZE 04}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There is nothing that I wish to say\n" + .string "{FONT_4}{COLOR DARK_GRAY}{SHADOW LIGHT_GRAY}There is nothing that I wish to say\n" .string "to you.\p" .string "I will concentrate solely on\n" .string "bettering myself, and none other.$" diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc index 23d9496b9..dd93f2f9e 100644 --- a/data/text/pokedex_rating.inc +++ b/data/text/pokedex_rating.inc @@ -8,7 +8,7 @@ PokedexRating_Text_SeenXOwnedY:: .string "on your POKéDEX is:\p" .string "{STR_VAR_1} POKéMON seen and\n" .string "{STR_VAR_2} POKéMON owned.\p" - .string "{SIZE}ÁPROF. OAK's rating:$" + .string "{FONT_2}PROF. OAK's rating:$" PokedexRating_Text_LessThan10:: .string "You still have lots to do.\p" diff --git a/include/help_system.h b/include/help_system.h index 92e97731e..040c1891f 100644 --- a/include/help_system.h +++ b/include/help_system.h @@ -85,7 +85,7 @@ void HelpSystem_SetInputDelay(u8); s32 HelpSystem_GetMenuInput(void); void HS_UpdateMenuScrollArrows(void); -void DecompressAndRenderGlyph(u8 font, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height); +void DecompressAndRenderGlyph(u8 fontId, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height); void HelpSystem_PrintTextInTopLeftCorner(const u8 * str); void HelpSystem_FillPanel3(void); void PrintListMenuItems(void); @@ -93,7 +93,7 @@ void PlaceListMenuCursor(void); bool8 MoveCursor(u8 by, u8 dirn); void BackupHelpContext(void); void RestoreHelpContext(void); -void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 width, u8 height); +void HelpSystemRenderText(u8 fontId, u8 * dest, const u8 * src, u8 x, u8 y, u8 width, u8 height); void HelpSystem_DisableToggleWithRButton(void); #endif //GUARD_HELP_SYSTEM_H diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 3af2074ba..99a8e1400 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -36,7 +36,7 @@ void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram); void sub_80F7768(u8 windowId, bool8 copyToVram); void Menu_LoadStdPal(void); void Menu_LoadStdPalAt(u16 offset); -void DisplayItemMessageOnField(u8 taskId, u8 textSpeed, const u8 *src, TaskFunc callback); +void DisplayItemMessageOnField(u8 taskId, u8 fontId, const u8 *src, TaskFunc callback); void DisplayYesNoMenuDefaultYes(void); void DisplayYesNoMenuDefaultNo(void); u8 GetTextSpeedSetting(void); diff --git a/include/pokemon_storage_system_internal.h b/include/pokemon_storage_system_internal.h index 2358347fb..e8b8aa7b8 100644 --- a/include/pokemon_storage_system_internal.h +++ b/include/pokemon_storage_system_internal.h @@ -393,7 +393,7 @@ extern struct PokemonStorageSystemData *gPSSData; void Cb2_EnterPSS(u8 a0); u8 GetCurrentBoxOption(void); -struct Sprite *sub_809223C(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority); +struct Sprite *CreateChooseBoxArrows(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority); void SetBoxWallpaper(u8 boxId, u8 wallpaperId); void SetCurrentBox(u8 boxId); void BoxMonAtToMon(u8 boxId, u8 boxPosition, struct Pokemon * dst); @@ -478,7 +478,7 @@ void SetMenuText(u8 textId); void sub_8095C84(u8 cursorArea, u8 cursorPos); void sub_8095E2C(u16 itemId); u8 GetBoxWallpaper(u8 boxId); -bool8 IsCursorOnBox(void); +bool8 IsCursorOnBoxTitle(void); bool8 IsCursorInBox(void); void sub_808FFAC(void); @@ -492,7 +492,7 @@ void sub_8091114(void); bool8 sub_8091150(void); void sub_80913DC(u8 box); bool8 sub_809140C(void); -void sub_80920FC(bool8 species); +void AnimateBoxScrollArrows(bool8 species); void CreateMovingMonIcon(void); void sub_8090E08(u8 boxId, u8 cursorPos); bool8 sub_8090E74(void); diff --git a/include/shop.h b/include/shop.h index 482c3ddaa..999c3b777 100644 --- a/include/shop.h +++ b/include/shop.h @@ -11,7 +11,7 @@ extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3]; void CreatePokemartMenu(const u16 *itemsForSale); void CreateDecorationShop1Menu(const u16 *); void CreateDecorationShop2Menu(const u16 *); -u8 GetMartUnk16_4(void); +u8 GetMartFontId(void); void RecordItemPurchase(u16 a0, u16 a1, u8 a2); // buy_menu_helper diff --git a/include/text.h b/include/text.h index 6d31b16c7..d0c7f8f54 100644 --- a/include/text.h +++ b/include/text.h @@ -157,8 +157,21 @@ #define NUM_TEXT_PRINTERS 32 #define TEXT_SPEED_INSTANT 0 + +// Given as a text speed when all the text should be +// loaded at once but not copied to vram yet. #define TEXT_SKIP_DRAW 0xFF +enum { + FONT_0, + FONT_1, + FONT_2, + FONT_3, + FONT_4, + FONT_5, + FONT_6, +}; + enum { FONTATTR_MAX_LETTER_WIDTH, @@ -302,7 +315,6 @@ bool16 TextPrinterWaitWithDownArrow(struct TextPrinter *textPrinter); bool16 TextPrinterWait(struct TextPrinter *textPrinter); void DrawDownArrow(u8 windowId, u16 x, u16 y, u8 bgColor, bool8 drawArrow, u8 *counter, u8 *yCoordIndex); u16 RenderText(struct TextPrinter *textPrinter); -s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing); s32 (*GetFontWidthFunc(u8 glyphId))(u16, bool32); s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing); u8 RenderTextFont9(u8 *pixels, u8 fontId, u8 *str, int a3, int a4, int a5, int a6, int a7); diff --git a/src/bag.c b/src/bag.c index e790ce20e..416e007d3 100644 --- a/src/bag.c +++ b/src/bag.c @@ -225,16 +225,16 @@ void BagPrintTextOnWindow(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 void BagPrintTextOnWin1CenteredColor0(const u8 * str, u8 unused) { - u32 x = 0x48 - GetStringWidth(1, str, 0); - AddTextPrinterParameterized3(2, 1, x / 2, 1, sTextColors[0], 0, str); + u32 x = 0x48 - GetStringWidth(FONT_1, str, 0); + AddTextPrinterParameterized3(2, FONT_1, x / 2, 1, sTextColors[0], 0, str); } void BagDrawDepositItemTextBox(void) { u32 x; DrawStdFrameWithCustomTileAndPalette(2, FALSE, 0x081, 0x0C); - x = 0x40 - GetStringWidth(0, gText_DepositItem, 0); - AddTextPrinterParameterized(2, 0, gText_DepositItem, x / 2, 1, 0, NULL); + x = 0x40 - GetStringWidth(FONT_0, gText_DepositItem, 0); + AddTextPrinterParameterized(2, FONT_0, gText_DepositItem, x / 2, 1, 0, NULL); } u8 ShowBagWindow(u8 whichWindow, u8 nItems) @@ -293,12 +293,12 @@ u8 GetBagWindow(u8 whichWindow) void BagCreateYesNoMenuBottomRight(u8 taskId, const struct YesNoFuncTable * ptrs) { - CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[3], 2, 0, 2, 0x064, 0x0E, ptrs); + CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[3], FONT_2, 0, 2, 0x064, 0x0E, ptrs); } void BagCreateYesNoMenuTopRight(u8 taskId, const struct YesNoFuncTable * ptrs) { - CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[4], 2, 0, 2, 0x064, 0x0E, ptrs); + CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates[4], FONT_2, 0, 2, 0x064, 0x0E, ptrs); } void BagPrintMoneyAmount(void) diff --git a/src/battle_interface.c b/src/battle_interface.c index 2f7625f21..d0713bda1 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -2161,7 +2161,7 @@ static u8 *AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y, color[1] = 1; color[2] = 3; - AddTextPrinterParameterized4(winId, 0, x, y, 0, 0, color, -1, str); + AddTextPrinterParameterized4(winId, FONT_0, x, y, 0, 0, color, -1, str); *windowId = winId; return (u8 *)(GetWindowAttribute(winId, WINDOW_TILE_DATA)); diff --git a/src/battle_message.c b/src/battle_message.c index 074073be1..436136069 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1237,7 +1237,7 @@ const u8 gUnknown_83FE7BF[] = _("{RIGHT_ARROW_2}"); const u8 gUnknown_83FE7C2[] = _("{PLUS}"); const u8 gUnknown_83FE7C5[] = _("-"); -const u8 gUnknown_83FE7C7[] = _("{SIZE 0}Max{SIZE 2} HP"); +const u8 gUnknown_83FE7C7[] = _("{FONT_0}Max{FONT_2} HP"); const u8 gUnknown_83FE7D4[] = _("ATTACK "); const u8 gUnknown_83FE7DC[] = _("DEFENSE"); const u8 gUnknown_83FE7E4[] = _("SP. ATK"); diff --git a/src/battle_records.c b/src/battle_records.c index 740ede597..4bde6aec9 100644 --- a/src/battle_records.c +++ b/src/battle_records.c @@ -486,7 +486,7 @@ static void PrintTotalRecord(struct LinkBattleRecords * records) } StringExpandPlaceholders(gStringVar4, gString_BattleRecords_TotalRecord); - AddTextPrinterParameterized4(0, 2, 12, 24, 0, 2, sTextColor, 0, gStringVar4); + AddTextPrinterParameterized4(0, FONT_2, 12, 24, 0, 2, sTextColor, 0, gStringVar4); } static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y) @@ -496,7 +496,7 @@ static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y) if (record->wins == 0 && record->losses == 0 && record->draws == 0) { - AddTextPrinterParameterized4(0, 2, 0, y, 0, 2, sTextColor, 0, gString_BattleRecords_7Dashes); + AddTextPrinterParameterized4(0, FONT_2, 0, y, 0, 2, sTextColor, 0, gString_BattleRecords_7Dashes); for (i = 0; i < 3; i++) { if (i == 0) @@ -505,7 +505,7 @@ static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y) x = 0x84; else x = 0xB4; - AddTextPrinterParameterized4(0, 2, x, y, 0, 2, sTextColor, 0, gString_BattleRecords_4Dashes); + AddTextPrinterParameterized4(0, FONT_2, x, y, 0, 2, sTextColor, 0, gString_BattleRecords_4Dashes); } } else @@ -533,7 +533,7 @@ static void PrintOpponentBattleRecord(struct LinkBattleRecord * record, u8 y) x = 0xB4; ConvertIntToDecimalStringN(gStringVar1, record->draws, STR_CONV_MODE_RIGHT_ALIGN, 4); } - AddTextPrinterParameterized4(0, 2, x, y, 0, 2, sTextColor, 0, gStringVar1); + AddTextPrinterParameterized4(0, FONT_2, x, y, 0, 2, sTextColor, 0, gStringVar1); } } } @@ -545,10 +545,10 @@ static void PrintBattleRecords(void) FillWindowPixelRect(0, PIXEL_FILL(0), 0, 0, 0xD8, 0x90); StringExpandPlaceholders(gStringVar4, gString_BattleRecords_PlayersBattleResults); - left = 0xD0 - GetStringWidth(2, gStringVar4, -1); - AddTextPrinterParameterized4(0, 2, left / 2, 4, 0, 2, sTextColor, 0, gStringVar4); + left = 0xD0 - GetStringWidth(FONT_2, gStringVar4, -1); + AddTextPrinterParameterized4(0, FONT_2, left / 2, 4, 0, 2, sTextColor, 0, gStringVar4); PrintTotalRecord(&gSaveBlock2Ptr->linkBattleRecords); - AddTextPrinterParameterized4(0, 2, 0x54, 0x30, 0, 2, sTextColor, 0, gString_BattleRecords_ColumnHeaders); + AddTextPrinterParameterized4(0, FONT_2, 0x54, 0x30, 0, 2, sTextColor, 0, gString_BattleRecords_ColumnHeaders); for (i = 0; i < LINK_B_RECORDS_COUNT; i++) PrintOpponentBattleRecord(&gSaveBlock2Ptr->linkBattleRecords.entries[i], 0x3D + 14 * i); CommitWindow(0); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index b42a51dea..92dc9ecf4 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5825,7 +5825,7 @@ static void DrawLevelUpBannerText(void) printerTemplate.currentChar = gStringVar4; printerTemplate.windowId = B_WIN_LEVEL_UP_BANNER; - printerTemplate.fontId = 0; + printerTemplate.fontId = FONT_0; printerTemplate.x = 32; printerTemplate.y = 0; printerTemplate.currentX = 32; diff --git a/src/berry_crush.c b/src/berry_crush.c index 259b36a6f..2daca7913 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -1268,11 +1268,11 @@ static u32 Cmd_PrintMessage(struct BerryCrushGame * game, u8 *args) if (bFlags & F_MSG_EXPAND) { StringExpandPlaceholders(gStringVar4, sMessages[bMsgId]); - AddTextPrinterParameterized2(0, 2, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } else { - AddTextPrinterParameterized2(0, 2, sMessages[bMsgId], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, sMessages[bMsgId], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } CopyWindowToVram(0, COPYWIN_FULL); break; @@ -2222,7 +2222,7 @@ static u32 Cmd_SaveGame(struct BerryCrushGame * game, u8 *args) if (!IsLinkTaskFinished()) return 0; DrawDialogueFrame(0, FALSE); - AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); CreateTask(Task_LinkSave, 0); break; @@ -2367,9 +2367,9 @@ static u32 Cmd_StopGame(struct BerryCrushGame * game, UNUSED u8 *args) case 0: DrawDialogueFrame(0, FALSE); if (game->playAgainState == PLAY_AGAIN_NO_BERRIES) - AddTextPrinterParameterized2(0, 2, sMessages[MSG_NO_BERRIES], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, sMessages[MSG_NO_BERRIES], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); else - AddTextPrinterParameterized2(0, 2, sMessages[MSG_DROPPED], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, sMessages[MSG_DROPPED], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); break; case 1: @@ -2896,8 +2896,8 @@ static void FramesToMinSec(struct BerryCrushGame_Gfx * gfx, u16 frames) static void PrintTextCentered(u8 windowId, u8 left, u8 colorId, const u8 *string) { - left = (left * 4) - (GetStringWidth(2, string, -1) / 2u); - AddTextPrinterParameterized3(windowId, 2, left, 0, sBerryCrushTextColorTable[colorId], 0, string); + left = (left * 4) - (GetStringWidth(FONT_2, string, -1) / 2u); + AddTextPrinterParameterized3(windowId, FONT_2, left, 0, sBerryCrushTextColorTable[colorId], 0, string); } static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8 y) @@ -2922,9 +2922,9 @@ static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8 if (i != 0 && bcPlayers->stats[command][i] != bcPlayers->stats[command][i - 1]) linkIdToPrint = i; ConvertIntToDecimalStringN(gStringVar1, bcPlayers->stats[command][i], STR_CONV_MODE_RIGHT_ALIGN, 4); - realX = x - GetStringWidth(2, sBCRankingHeaders[command], -1) - 4; - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, realX, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, sBCRankingHeaders[command]); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, realX - 24, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar1); + realX = x - GetStringWidth(FONT_2, sBCRankingHeaders[command], -1) - 4; + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, realX, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, sBCRankingHeaders[command]); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, realX - 24, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar1); break; case RESULTS_PAGE_RANDOM: // Neatness @@ -2943,7 +2943,7 @@ static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8 ConvertIntToDecimalStringN(gStringVar2, realX, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]); realX2 = x - 4; - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, realX2 - GetStringWidth(2, gStringVar4, 0), y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, realX2 - GetStringWidth(FONT_2, gStringVar4, 0), y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); break; case RESULTS_PAGE_CRUSHING: // Berry names @@ -2954,7 +2954,7 @@ static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8 j = 0; StringCopy(gStringVar1, gBerries[j].name); StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x - GetStringWidth(2, gStringVar4, -1) - 4, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x - GetStringWidth(FONT_2, gStringVar4, -1) - 4, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); break; } if (linkPlayerId == game->localId) @@ -2964,7 +2964,7 @@ static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8 gStringVar3[0] = linkIdToPrint + CHAR_1; DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, game->players[linkPlayerId].name); DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gStringVar3); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, 4, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, 4, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); } } @@ -2977,30 +2977,30 @@ static void printCrushingResults(struct BerryCrushGame * game) u8 y = GetWindowAttribute(game->gfx.resultsWindowId, WINDOW_HEIGHT) * 8 - 42; FramesToMinSec(&game->gfx, players->time); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_TimeColon); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_TimeColon); - x = 190 - (u8)GetStringWidth(2, gText_SpaceSec, 0); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_SpaceSec); + x = 190 - (u8)GetStringWidth(FONT_2, gText_SpaceSec, 0); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_SpaceSec); x -= 32; ConvertIntToDecimalStringN(gStringVar1, game->gfx.secondsInt, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar2, game->gfx.secondsFrac, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, gText_XDotY2); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); - x -= (u8)GetStringWidth(2, gText_SpaceMin, 0) + 3; - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_SpaceMin); + x -= (u8)GetStringWidth(FONT_2, gText_SpaceMin, 0) + 3; + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_SpaceMin); x -= 9; ConvertIntToDecimalStringN(gStringVar1, game->gfx.minutes, STR_CONV_MODE_LEADING_ZEROS, 1); StringExpandPlaceholders(gStringVar4, gText_StrVar1); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); y += 14; - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_PressingSpeed); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_PressingSpeed); - x = 190 - (u8)GetStringWidth(2, gText_TimesPerSec, 0); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 3, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_TimesPerSec); + x = 190 - (u8)GetStringWidth(FONT_2, gText_TimesPerSec, 0); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_3, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_TimesPerSec); for (i = 0; i < 8; ++i) if (((u8)game->pressingSpeed >> (7 - i)) & 1) @@ -3010,17 +3010,17 @@ static void printCrushingResults(struct BerryCrushGame * game) StringExpandPlaceholders(gStringVar4, gText_XDotY3); x -= 38; if (game->newRecord) - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_RED], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_RED], 0, gStringVar4); else - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); y += 14; - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_Silkiness); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_Silkiness); ConvertIntToDecimalStringN(gStringVar1, players->silkiness, STR_CONV_MODE_RIGHT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_Var1Percent); - x = 190 - (u8)GetStringWidth(2, gStringVar4, 0); - AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); + x = 190 - (u8)GetStringWidth(FONT_2, gStringVar4, 0); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, FONT_2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); } static bool32 OpenResultsWindow(struct BerryCrushGame * game, struct BerryCrushGame_Gfx * spriteManager) @@ -3109,20 +3109,20 @@ static void Task_ShowBerryCrushRankings(u8 taskId) DrawStdFrameWithCustomTileAndPalette(tWindowId, 0, 0x21D, 0xD); break; case 1: - xPos = 96 - GetStringWidth(2, gText_BerryCrush2, -1) / 2u; + xPos = 96 - GetStringWidth(FONT_2, gText_BerryCrush2, -1) / 2u; AddTextPrinterParameterized3( tWindowId, - 2, + FONT_2, xPos, 2, sBerryCrushTextColorTable[COLORID_BLUE], 0, gText_BerryCrush2 ); - xPos = 96 - GetStringWidth(2, gText_PressingSpeedRankings, -1) / 2u; + xPos = 96 - GetStringWidth(FONT_2, gText_PressingSpeedRankings, -1) / 2u; AddTextPrinterParameterized3( tWindowId, - 2, + FONT_2, xPos, 18, sBerryCrushTextColorTable[COLORID_BLUE], @@ -3136,7 +3136,7 @@ static void Task_ShowBerryCrushRankings(u8 taskId) StringExpandPlaceholders(gStringVar4, gText_Var1Players); AddTextPrinterParameterized3( tWindowId, - 2, + FONT_2, 4, yPos, sBerryCrushTextColorTable[COLORID_GRAY], @@ -3153,10 +3153,10 @@ static void Task_ShowBerryCrushRankings(u8 taskId) str = StringExpandPlaceholders(gStringVar4, gText_XDotY3); *str++ = CHAR_SPACE; StringCopy(str, gText_TimesPerSec); - xPos = 192 - (u8)GetStringWidth(3, gStringVar4, 0); + xPos = 192 - (u8)GetStringWidth(FONT_3, gStringVar4, 0); AddTextPrinterParameterized3( tWindowId, - 3, + FONT_3, xPos, yPos, sBerryCrushTextColorTable[COLORID_GRAY], @@ -3239,8 +3239,8 @@ static void DrawPlayerNameWindows(struct BerryCrushGame * game) { AddTextPrinterParameterized4( game->gfx.nameWindowIds[i], - 2, - 36 - GetStringWidth(2, game->players[i].name, 0) / 2u, + FONT_2, + 36 - GetStringWidth(FONT_2, game->players[i].name, 0) / 2u, 1, 0, 0, @@ -3253,8 +3253,8 @@ static void DrawPlayerNameWindows(struct BerryCrushGame * game) { AddTextPrinterParameterized4( game->gfx.nameWindowIds[i], - 2, - 36 - GetStringWidth(2, game->players[i].name, 0) / 2u, + FONT_2, + 36 - GetStringWidth(FONT_2, game->players[i].name, 0) / 2u, 1, 0, 0, diff --git a/src/berry_pouch.c b/src/berry_pouch.c index 875f37137..80fa333f7 100644 --- a/src/berry_pouch.c +++ b/src/berry_pouch.c @@ -672,7 +672,7 @@ static void SetUpListMenuTemplate(void) gMultiuseListMenuTemplate.itemVerticalPadding = 2; gMultiuseListMenuTemplate.upText_Y = 2; gMultiuseListMenuTemplate.maxShowed = sResources->listMenuMaxShowed; - gMultiuseListMenuTemplate.fontId = 2; + gMultiuseListMenuTemplate.fontId = FONT_2; gMultiuseListMenuTemplate.cursorPal = 2; gMultiuseListMenuTemplate.fillValue = 0; gMultiuseListMenuTemplate.cursorShadowPal = 3; @@ -726,7 +726,7 @@ static void BerryPouchItemPrintFunc(u8 windowId, u32 itemId, u8 y) itemQuantity = BagGetQuantityByPocketPosition(POCKET_BERRY_POUCH, itemId); ConvertIntToDecimalStringN(gStringVar1, itemQuantity, STR_CONV_MODE_RIGHT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - BerryPouchPrint(windowId, 0, gStringVar4, 110, y, 0, 0, 0xFF, 1); + BerryPouchPrint(windowId, FONT_0, gStringVar4, 110, y, 0, 0, 0xFF, 1); } } @@ -741,14 +741,14 @@ static void BerryPouchSetArrowCursorAt(u8 y, u8 colorIdx) u8 height; if (colorIdx == 0xFF) { - width = GetMenuCursorDimensionByFont(2, 0); - height = GetMenuCursorDimensionByFont(2, 1); + width = GetMenuCursorDimensionByFont(FONT_2, 0); + height = GetMenuCursorDimensionByFont(FONT_2, 1); FillWindowPixelRect(0, 0, 1, y, width, height); CopyWindowToVram(0, COPYWIN_GFX); } else { - BerryPouchPrint(0, 2, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx); + BerryPouchPrint(0, FONT_2, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx); } } @@ -760,7 +760,7 @@ static void PrintSelectedBerryDescription(s32 itemIdx) else str = gText_TheBerryPouchWillBePutAway; FillWindowPixelBuffer(1, PIXEL_FILL(0)); - BerryPouchPrint(1, 2, str, 0, 2, 2, 0, 0, 0); + BerryPouchPrint(1, FONT_2, str, 0, 2, 2, 0, 0, 0); } static void SetDescriptionWindowBorderPalette(s32 pal) @@ -800,8 +800,8 @@ static void DestroyScrollIndicatorArrows(void) static void PrintBerryPouchHeaderCentered(void) { - u32 slack = 72 - GetStringWidth(1, gText_BerryPouch, 0); - BerryPouchPrint(2, 1, gText_BerryPouch, slack / 2, 1, 0, 0, 0, 0); + u32 slack = 72 - GetStringWidth(FONT_1, gText_BerryPouch, 0); + BerryPouchPrint(2, FONT_1, gText_BerryPouch, slack / 2, 1, 0, 0, 0, 0); } void BerryPouch_CursorResetToTop(void) @@ -914,11 +914,11 @@ void InitTossQuantitySelectUI(u8 taskId, const u8 * str) u8 windowId2; CopySelectedListMenuItemName(data[1], gStringVar1); StringExpandPlaceholders(gStringVar4, str); - BerryPouchPrint(windowId, 2, gStringVar4, 0, 2, 1, 2, 0, 1); + BerryPouchPrint(windowId, FONT_2, gStringVar4, 0, 2, 1, 2, 0, 1); windowId2 = GetOrCreateVariableWindow(0); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 3); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - BerryPouchPrint(windowId2, 0, gStringVar4, 4, 10, 1, 0, 0, 1); + BerryPouchPrint(windowId2, FONT_0, gStringVar4, 4, 10, 1, 0, 0, 1); } static void PrintxQuantityOnWindow(u8 whichWindow, s16 quantity, u8 ndigits) @@ -927,7 +927,7 @@ static void PrintxQuantityOnWindow(u8 whichWindow, s16 quantity, u8 ndigits) FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, ndigits); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - BerryPouchPrint(windowId, 0, gStringVar4, 4, 10, 1, 0, 0, 1); + BerryPouchPrint(windowId, FONT_0, gStringVar4, 4, 10, 1, 0, 0, 1); } static void Task_BerryPouchMain(u8 taskId) @@ -1023,12 +1023,12 @@ static void CreateNormalContextMenu(u8 taskId) sContextMenuNumOptions = 4; } windowId = GetOrCreateVariableWindow(sContextMenuNumOptions + 9); - AddItemMenuActionTextPrinters(windowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, GetFontAttribute(2, FONTATTR_LETTER_SPACING), GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumOptions, sContextMenuActions, sContextMenuOptions); - Menu_InitCursor(windowId, 2, 0, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumOptions, 0); + AddItemMenuActionTextPrinters(windowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING), GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumOptions, sContextMenuActions, sContextMenuOptions); + Menu_InitCursor(windowId, FONT_2, 0, 2, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumOptions, 0); windowId2 = GetOrCreateVariableWindow(6); CopySelectedListMenuItemName(data[1], gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); - BerryPouchPrint(windowId2, 2, gStringVar4, 0, 2, 1, 2, 0, 1); + BerryPouchPrint(windowId2, FONT_2, gStringVar4, 0, 2, 1, 2, 0, 1); } static void Task_NormalContextMenu(u8 taskId) @@ -1104,7 +1104,7 @@ static void Task_AskTossMultiple(u8 taskId) s16 * data = gTasks[taskId].data; ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_ThrowAwayStrVar2OfThisItemQM); - BerryPouchPrint(GetOrCreateVariableWindow(7), 2, gStringVar4, 0, 2, 1, 2, 0, 1); + BerryPouchPrint(GetOrCreateVariableWindow(7), FONT_2, gStringVar4, 0, 2, 1, 2, 0, 1); CreateYesNoMenuWin3(taskId, &sYesNoFuncs_Toss); } @@ -1158,7 +1158,7 @@ static void Task_TossYes(u8 taskId) CopySelectedListMenuItemName(data[1], gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayStrVar2StrVar1s); - BerryPouchPrint(GetOrCreateVariableWindow(9), 2, gStringVar4, 0, 2, 1, 2, 0, 1); + BerryPouchPrint(GetOrCreateVariableWindow(9), FONT_2, gStringVar4, 0, 2, 1, 2, 0, 1); gTasks[taskId].func = Task_WaitButtonThenTossBerries; } @@ -1201,7 +1201,7 @@ static void Task_BerryPouch_Give(u8 taskId) static void Task_Give_PrintThereIsNoPokemon(u8 taskId) { - DisplayItemMessageInBerryPouch(taskId, 2, gText_ThereIsNoPokemon, Task_WaitButtonBeforeDialogueWindowDestruction); + DisplayItemMessageInBerryPouch(taskId, FONT_2, gText_ThereIsNoPokemon, Task_WaitButtonBeforeDialogueWindowDestruction); } static void Task_WaitButtonBeforeDialogueWindowDestruction(u8 taskId) @@ -1247,7 +1247,7 @@ static void Task_ContextMenu_FromPartyGiveMenu(u8 taskId) { CopyItemName(itemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_TheStrVar1CantBeHeldHere); - DisplayItemMessageInBerryPouch(taskId, 2, gStringVar4, Task_WaitButtonBeforeDialogueWindowDestruction); + DisplayItemMessageInBerryPouch(taskId, FONT_2, gStringVar4, Task_WaitButtonBeforeDialogueWindowDestruction); } else { @@ -1322,7 +1322,7 @@ static void Task_Sell_PrintSelectMultipleUI(u8 taskId) u8 windowId = GetOrCreateVariableWindow(1); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - BerryPouchPrint(windowId, 0, gStringVar4, 4, 10, 1, 0, 0xFF, 1); + BerryPouchPrint(windowId, FONT_0, gStringVar4, 4, 10, 1, 0, 0xFF, 1); SellMultiple_UpdateSellPriceDisplay(itemid_get_market_price(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8]); PrintMoneyInWin2(); CreateScrollIndicatorArrows_SellQuantity(); @@ -1375,7 +1375,7 @@ static void Task_SellYes(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar3, itemid_get_market_price(BagGetItemIdByPocketPosition(POCKET_BERRY_POUCH, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6); StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen); - DisplayItemMessageInBerryPouch(taskId, 2, gStringVar4, Task_SellBerries_PlaySfxAndRemoveBerries); + DisplayItemMessageInBerryPouch(taskId, FONT_2, gStringVar4, Task_SellBerries_PlaySfxAndRemoveBerries); } static void Task_SellBerries_PlaySfxAndRemoveBerries(u8 taskId) @@ -1490,12 +1490,12 @@ void DisplayItemMessageInBerryPouch(u8 taskId, u8 fontId, const u8 * str, TaskFu static void CreateYesNoMenuWin3(u8 taskId, const struct YesNoFuncTable *ptrs) { - CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates_Variable[3], 2, 0, 2, 0x001, 0xE, ptrs); + CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates_Variable[3], FONT_2, 0, 2, 0x001, 0xE, ptrs); } static void CreateYesNoMenuWin4(u8 taskId, const struct YesNoFuncTable *ptrs) { - CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates_Variable[4], 2, 0, 2, 0x001, 0xE, ptrs); + CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates_Variable[4], FONT_2, 0, 2, 0x001, 0xE, ptrs); } static void PrintMoneyInWin2(void) diff --git a/src/berry_powder.c b/src/berry_powder.c index 3ebffed48..fdb94feae 100644 --- a/src/berry_powder.c +++ b/src/berry_powder.c @@ -94,13 +94,13 @@ u32 GetBerryPowder(void) static void PrintBerryPowderAmount(u8 windowId, u32 amount, u8 x, u8 y, u8 speed) { ConvertIntToDecimalStringN(gStringVar1, amount, STR_CONV_MODE_RIGHT_ALIGN, 5); - AddTextPrinterParameterized(windowId, 0, gStringVar1, x, y, speed, NULL); + AddTextPrinterParameterized(windowId, FONT_0, gStringVar1, x, y, speed, NULL); } static void DrawPlayerPowderAmount(u8 windowId, u16 baseBlock, u8 palette, u32 amount) { DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, baseBlock, palette); - AddTextPrinterParameterized(windowId, 0, gOtherText_Powder, 0, 0, -1, NULL); + AddTextPrinterParameterized(windowId, FONT_0, gOtherText_Powder, 0, 0, -1, NULL); PrintBerryPowderAmount(windowId, amount, 39, 12, 0); } diff --git a/src/buy_menu_helpers.c b/src/buy_menu_helpers.c index 1fd160576..c0fef9fd8 100644 --- a/src/buy_menu_helpers.c +++ b/src/buy_menu_helpers.c @@ -184,7 +184,7 @@ void BuyMenuPrint(u8 windowId, u8 font, const u8 *text, u8 x, u8 y, u8 letterSpa void BuyMenuDisplayMessage(u8 taskId, const u8 *text, TaskFunc callback) { - DisplayMessageAndContinueTask(taskId, 2, 0x13, 0xE, GetMartUnk16_4(), GetTextSpeedSetting(), text, callback); + DisplayMessageAndContinueTask(taskId, 2, 0x13, 0xE, GetMartFontId(), GetTextSpeedSetting(), text, callback); ScheduleBgCopyTilemapToVram(0); } @@ -200,5 +200,5 @@ void BuyMenuQuantityBoxThinBorder(u8 windowId, bool8 copyToVram) void BuyMenuConfirmPurchase(u8 taskId, const struct YesNoFuncTable *yesNo) { - CreateYesNoMenuWithCallbacks(taskId, &sShopBuyMenuYesNoWindowTemplate, 2, 0, 2, 1, 0xD, yesNo); + CreateYesNoMenuWithCallbacks(taskId, &sShopBuyMenuYesNoWindowTemplate, FONT_2, 0, 2, 1, 0xD, yesNo); } diff --git a/src/cable_club.c b/src/cable_club.c index cf54d360e..e4238bb40 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -79,7 +79,7 @@ static void PrintNewCountOnLinkPlayerCountDisplayWindow(u16 windowId, s32 num) ConvertIntToDecimalStringN(gStringVar1, num, STR_CONV_MODE_LEFT_ALIGN, 1); SetStdWindowBorderStyle(windowId, FALSE); StringExpandPlaceholders(gStringVar4, gUnknown_841DF82); - AddTextPrinterParameterized(windowId, 2, gStringVar4, 0, 0, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gStringVar4, 0, 0, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(windowId, COPYWIN_FULL); } diff --git a/src/clear_save_data_screen.c b/src/clear_save_data_screen.c index 75e671445..6a09328ce 100644 --- a/src/clear_save_data_screen.c +++ b/src/clear_save_data_screen.c @@ -106,11 +106,11 @@ static void Task_DrawClearSaveDataScreen(u8 taskId) break; case 4: DrawStdFrameWithCustomTileAndPalette(1, TRUE, 0x001, 0xF); - AddTextPrinterParameterized4(1, 2, 0, 3, 1, 1, sTextColor, 0, gUnknown_841B69E); + AddTextPrinterParameterized4(1, FONT_2, 0, 3, 1, 1, sTextColor, 0, gUnknown_841B69E); CopyWindowToVram(1, COPYWIN_GFX); break; case 5: - CreateYesNoMenu(&sWindowTemplates[0], 2, 0, 2, 0x001, 0xF, 1); + CreateYesNoMenu(&sWindowTemplates[0], FONT_2, 0, 2, 0x001, 0xF, 1); CopyBgTilemapBufferToVram(0); break; default: @@ -138,7 +138,7 @@ static void Task_HandleYesNoMenu(u8 taskId) case 0: PlaySE(SE_SELECT); FillWindowPixelBuffer(1, PIXEL_FILL(1)); - AddTextPrinterParameterized4(1, 2, 0, 3, 1, 1, sTextColor, 0, gUnknown_841B6B9); + AddTextPrinterParameterized4(1, FONT_2, 0, 3, 1, 1, sTextColor, 0, gUnknown_841B6B9); CopyWindowToVram(1, COPYWIN_FULL); ClearSaveData(); break; diff --git a/src/coins.c b/src/coins.c index 1b9c610c5..3a8019b75 100644 --- a/src/coins.c +++ b/src/coins.c @@ -53,13 +53,13 @@ void PrintCoinsString_Parameterized(u8 windowId, u32 coinAmount, u8 x, u8 y, u8 { ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4); StringExpandPlaceholders(gStringVar4, gText_Coins); - AddTextPrinterParameterized(windowId, 0, gStringVar4, x, y, speed, NULL); + AddTextPrinterParameterized(windowId, FONT_0, gStringVar4, x, y, speed, NULL); } void sub_80D0674(u8 windowId, u16 tileStart, u8 palette, u32 coinAmount) { DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, tileStart, palette); - AddTextPrinterParameterized(windowId, 2, gText_Coins_2, 0, 0, 0xFF, 0); + AddTextPrinterParameterized(windowId, FONT_2, gText_Coins_2, 0, 0, 0xFF, 0); PrintCoinsString_Parameterized(windowId, coinAmount, 0x10, 0xC, 0); } @@ -70,9 +70,9 @@ void PrintCoinsString(u32 coinAmount) ConvertIntToDecimalStringN(gStringVar1, coinAmount, STR_CONV_MODE_RIGHT_ALIGN, 4); StringExpandPlaceholders(gStringVar4, gText_Coins); - width = GetStringWidth(0, gStringVar4, 0); + width = GetStringWidth(FONT_0, gStringVar4, 0); windowId = sCoinsWindowId; - AddTextPrinterParameterized(windowId, 0, gStringVar4, 64 - width, 0xC, 0, NULL); + AddTextPrinterParameterized(windowId, FONT_0, gStringVar4, 64 - width, 0xC, 0, NULL); } void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y) @@ -85,7 +85,7 @@ void ShowCoinsWindow(u32 coinAmount, u8 x, u8 y) PutWindowTilemap(sCoinsWindowId); TextWindow_SetStdFrame0_WithPal(sCoinsWindowId, 0x21D, 0xD0); DrawStdFrameWithCustomTileAndPalette(sCoinsWindowId, FALSE, 0x21D, 0xD); - AddTextPrinterParameterized(sCoinsWindowId, 2, gText_Coins_2, 0, 0, 0xFF, 0); + AddTextPrinterParameterized(sCoinsWindowId, FONT_2, gText_Coins_2, 0, 0, 0xFF, 0); PrintCoinsString(coinAmount); } diff --git a/src/credits.c b/src/credits.c index 5b92c9c99..af2ea3889 100644 --- a/src/credits.c +++ b/src/credits.c @@ -856,7 +856,7 @@ static s32 RollCredits(void) } sCreditsMgr->timer = 360; - AddTextPrinterParameterized4(sCreditsMgr->windowId, 1, 0x08, 0x29, 1, 2, sTextColor_Header, 0, TITLE_TEXT); + AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_1, 0x08, 0x29, 1, 2, sTextColor_Header, 0, TITLE_TEXT); sCreditsMgr->mainseqno = CREDITSSCENE_WAIT_TITLE_STAFF; return 0; case CREDITSSCENE_WAIT_TITLE_STAFF: @@ -913,12 +913,12 @@ static s32 RollCredits(void) if (gPaletteFade.active) return sCreditsMgr->canSpeedThrough; win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_8; // unused - AddTextPrinterParameterized4(sCreditsMgr->windowId, 1, 2, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_0); + AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_1, 2, 6, 0, 0, sTextColor_Header, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_0); sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_ADDPRINTER2; return sCreditsMgr->canSpeedThrough; case CREDITSSCENE_PRINT_ADDPRINTER2: win0v[0] = sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_8; - AddTextPrinterParameterized4(sCreditsMgr->windowId, 2, 8, 6, 0, 0, sTextColor_Regular, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_4); + AddTextPrinterParameterized4(sCreditsMgr->windowId, FONT_2, 8, 6, 0, 0, sTextColor_Regular, -1, sCreditsTexts[sCreditsScript[sCreditsMgr->scrcmdidx].param].unk_4); sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_DELAY; return sCreditsMgr->canSpeedThrough; case CREDITSSCENE_PRINT_DELAY: diff --git a/src/daycare.c b/src/daycare.c index a7bd7f7ac..482fc413e 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -119,7 +119,7 @@ static const struct ListMenuTemplate sDaycareListMenuLevelTemplate = .lettersSpacing = 1, .itemVerticalPadding = 0, .scrollMultiple = 0, - .fontId = 3, + .fontId = FONT_3, .cursorKind = 0 }; @@ -1439,7 +1439,7 @@ static void DaycareAddTextPrinter(u8 windowId, const u8 *text, u32 x, u32 y) printer.currentChar = text; printer.windowId = windowId; - printer.fontId = 3; + printer.fontId = FONT_3; printer.x = x; printer.y = y; printer.currentX = x; @@ -1479,7 +1479,7 @@ static void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycare level = GetLevelAfterDaycareSteps(&daycare->mons[daycareSlotId].mon, daycare->mons[daycareSlotId].steps); ConvertIntToDecimalStringN(intText, level, STR_CONV_MODE_LEFT_ALIGN, 3); StringAppend(lvlText, intText); - x = 132 - GetStringWidth(3, lvlText, 0); + x = 132 - GetStringWidth(FONT_3, lvlText, 0); DaycareAddTextPrinter(windowId, lvlText, x, y); } @@ -1957,7 +1957,7 @@ static void CB2_EggHatch_1(void) if (!IsTextPrinterActive(sEggHatchData->windowId)) { LoadUserWindowBorderGfx(sEggHatchData->windowId, 0x140, 0xE0); - CreateYesNoMenu(&sYesNoWinTemplate, 3, 0, 2, 0x140, 0xE, 0); + CreateYesNoMenu(&sYesNoWinTemplate, FONT_3, 0, 2, 0x140, 0xE, 0); sEggHatchData->CB2_state++; } break; @@ -2159,5 +2159,5 @@ static void EggHatchPrintMessage(u8 windowId, u8 *string, u8 x, u8 y, u8 speed) sEggHatchData->textColor[0] = 0; sEggHatchData->textColor[1] = 5; sEggHatchData->textColor[2] = 6; - AddTextPrinterParameterized4(windowId, 3, x, y, 1, 1, sEggHatchData->textColor, speed, string); + AddTextPrinterParameterized4(windowId, FONT_3, x, y, 1, 1, sEggHatchData->textColor, speed, string); } diff --git a/src/diploma.c b/src/diploma.c index 0304c7ae3..21125d257 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -264,11 +264,11 @@ static void DiplomaPrintText(void) } FillWindowPixelBuffer(0, 0); DynamicPlaceholderTextUtil_ExpandPlaceholders(arr, gUnknown_841B60E); - width = GetStringWidth(2, arr, -1); - AddTextPrinterParameterized3(0, 2, 0x78 - (width / 2), 4, gUnknown_8415A04, -1, arr); + width = GetStringWidth(FONT_2, arr, -1); + AddTextPrinterParameterized3(0, FONT_2, 120 - (width / 2), 4, gUnknown_8415A04, -1, arr); DynamicPlaceholderTextUtil_ExpandPlaceholders(arr, gUnknown_841B619); - width = GetStringWidth(2, arr, -1); - AddTextPrinterParameterized3(0, 0x2, 0x78 - (width / 2), 0x1E, gUnknown_8415A04, -1, arr); - AddTextPrinterParameterized3(0, 0x2, 0x78, 0x69, gUnknown_8415A04, 0, gUnknown_841B684); + width = GetStringWidth(FONT_2, arr, -1); + AddTextPrinterParameterized3(0, FONT_2, 120 - (width / 2), 0x1E, gUnknown_8415A04, -1, arr); + AddTextPrinterParameterized3(0, FONT_2, 120, 105, gUnknown_8415A04, 0, gUnknown_841B684); PutWindowTilemap(0); } diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 8ad1256f1..15bc18c2b 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -2379,14 +2379,14 @@ static void sub_81538D0(u8 windowId) TextWindow_SetStdFrame0_WithPal(windowId, 0x21D, 0xD0); DrawTextBorderOuter(windowId, 0x21D, 0xD); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - AddTextPrinterParameterized(windowId, 2, sUnknown_84755E8[0], 1, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_2, sUnknown_84755E8[0], 1, 1, TEXT_SKIP_DRAW, NULL); for (i = 0; i < 3; i++) { ConvertIntToDecimalStringN(strbuf, results[i], STR_CONV_MODE_LEFT_ALIGN, sUnknown_84755F8[i]); - numWidth = GetStringWidth(2, strbuf, -1); - AddTextPrinterParameterized(windowId, 2, sUnknown_84755E8[i + 1], 1, sUnknown_84755FC[i][0], TEXT_SKIP_DRAW, NULL); + numWidth = GetStringWidth(FONT_2, strbuf, -1); + AddTextPrinterParameterized(windowId, FONT_2, sUnknown_84755E8[i + 1], 1, sUnknown_84755FC[i][0], TEXT_SKIP_DRAW, NULL); x = 224 - numWidth; - AddTextPrinterParameterized(windowId, 2, strbuf, x, sUnknown_8475602[i][0], TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_2, strbuf, x, sUnknown_8475602[i][0], TEXT_SKIP_DRAW, NULL); } PutWindowTilemap(windowId); } diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c index 2fcc0a682..758524ba0 100644 --- a/src/dodrio_berry_picking_2.c +++ b/src/dodrio_berry_picking_2.c @@ -1045,7 +1045,7 @@ static void sub_8154B34(void) { colorsId = 0; id = sub_81537AC(i); - left = (56 - GetStringWidth(0, sub_81533C4(id), -1)) / 2u; + left = (56 - GetStringWidth(FONT_0, sub_81533C4(id), -1)) / 2u; window.tilemapLeft = ptr->left; window.tilemapTop = ptr->top; gUnknown_203F440->unk3008[i] = AddWindow(&window); @@ -1054,7 +1054,7 @@ static void sub_8154B34(void) if (id == GetMultiplayerId()) colorsId = 2; name = sub_81533C4(id); - AddTextPrinterParameterized3(gUnknown_203F440->unk3008[i], 0, left, 1, sTextColorTable[colorsId], -1, name); + AddTextPrinterParameterized3(gUnknown_203F440->unk3008[i], FONT_0, left, 1, sTextColorTable[colorsId], -1, name); CopyWindowToVram(gUnknown_203F440->unk3008[i], COPYWIN_GFX); window.baseBlock += 0xE; sub_8154868(&window); @@ -1127,22 +1127,22 @@ static void sub_8154D9C(u8 playersCount_) structArray[i].unk0 = playersCount - 1; } - x = 216 - GetStringWidth(0, gText_SpacePoints, 0); + x = 216 - GetStringWidth(FONT_0, gText_SpacePoints, 0); for (i = 0; i < playersCount; i++) { u8 colorsId = 0; u8 id = array[i]; u32 points = structArray[id].unk4; - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, sUnknown_8478E94[structArray[id].unk0], 8, sUnknown_8478EBA[i], -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_0, sUnknown_8478E94[structArray[id].unk0], 8, sUnknown_8478EBA[i], -1, NULL); if (id == GetMultiplayerId()) colorsId = 2; name = sub_81533C4(id); - AddTextPrinterParameterized3(gUnknown_203F440->unk3008[1], 0, 28, sUnknown_8478EBA[i], sTextColorTable[colorsId], -1, name); + AddTextPrinterParameterized3(gUnknown_203F440->unk3008[1], FONT_0, 28, sUnknown_8478EBA[i], sTextColorTable[colorsId], -1, name); ConvertIntToDecimalStringN(numString, points, STR_CONV_MODE_RIGHT_ALIGN, 7); - numWidth = GetStringWidth(0, numString, -1); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, numString, x - 35, sUnknown_8478EBA[i], -1, NULL); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, gText_SpacePoints, x, sUnknown_8478EBA[i], -1, NULL); + numWidth = GetStringWidth(FONT_0, numString, -1); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_0, numString, x - 35, sUnknown_8478EBA[i], -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_0, gText_SpacePoints, x, sUnknown_8478EBA[i], -1, NULL); } } @@ -1173,10 +1173,10 @@ static void sub_8154F80(void) case 2: FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1)); FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1)); - strWidth = GetStringWidth(0, gText_BerryPickingResults, -1); + strWidth = GetStringWidth(FONT_0, gText_BerryPickingResults, -1); x = (224 - strWidth) / 2; - AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 0, gText_BerryPickingResults, x, 2, -1, NULL); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, gText_10P30P50P50P, 68, 16, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], FONT_0, gText_BerryPickingResults, x, 2, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_0, gText_10P30P50P50P, 68, 16, -1, NULL); for (i = 0; i < playersCount; i++) { u8 colorsId = 0; @@ -1184,7 +1184,7 @@ static void sub_8154F80(void) colorsId = 2; name = sub_81533C4(i); - AddTextPrinterParameterized3(gUnknown_203F440->unk3008[1], 0, 2, sUnknown_8478EB0[i], sTextColorTable[colorsId], -1, name); + AddTextPrinterParameterized3(gUnknown_203F440->unk3008[1], FONT_0, 2, sUnknown_8478EB0[i], sTextColorTable[colorsId], -1, name); for (j = 0; j < 4; j++) { u32 width; @@ -1192,11 +1192,11 @@ static void sub_8154F80(void) u16 result2 = Min(sub_81534F0(j), 9999); ConvertIntToDecimalStringN(sp0C, result1, STR_CONV_MODE_LEFT_ALIGN, 4); - width = GetStringWidth(0, sp0C, -1); + width = GetStringWidth(FONT_0, sp0C, -1); if (result2 == result1 && result2 != 0) - AddTextPrinterParameterized3(gUnknown_203F440->unk3008[1], 0, sUnknown_8478EA8[j] - width, sUnknown_8478EB0[i], sTextColorTable[1], -1, sp0C); + AddTextPrinterParameterized3(gUnknown_203F440->unk3008[1], FONT_0, sUnknown_8478EA8[j] - width, sUnknown_8478EB0[i], sTextColorTable[1], -1, sp0C); else - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, sp0C, sUnknown_8478EA8[j] - width, sUnknown_8478EB0[i], -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_0, sp0C, sUnknown_8478EA8[j] - width, sUnknown_8478EB0[i], -1, NULL); } } CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX); @@ -1225,9 +1225,9 @@ static void sub_8154F80(void) case 5: FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1)); FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1)); - strWidth = GetStringWidth(0, gText_AnnouncingRankings, -1); + strWidth = GetStringWidth(FONT_0, gText_AnnouncingRankings, -1); x = (224 - strWidth) / 2; - AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 0, gText_AnnouncingRankings, x, 2, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], FONT_0, gText_AnnouncingRankings, x, 2, -1, NULL); gUnknown_203F440->state++; break; case 6: @@ -1271,14 +1271,14 @@ static void sub_8154F80(void) PlayNewMapMusic(MUS_LEVEL_UP); FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1)); FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1)); - strWidth = GetStringWidth(0, gText_AnnouncingPrizes, -1); + strWidth = GetStringWidth(FONT_0, gText_AnnouncingPrizes, -1); x = (224 - strWidth) / 2; - AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 0, gText_AnnouncingPrizes, x, 2, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], FONT_0, gText_AnnouncingPrizes, x, 2, -1, NULL); DynamicPlaceholderTextUtil_Reset(); CopyItemName(sub_8153390(), sp70); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sp70); DynamicPlaceholderTextUtil_ExpandPlaceholders(sp0C, gText_FirstPlacePrize); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, sp0C, 8, 2, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_0, sp0C, 8, 2, -1, NULL); itemGiveRet = sub_815372C(); if (itemGiveRet != 0 && itemGiveRet != 3) { @@ -1289,7 +1289,7 @@ static void sub_8154F80(void) DynamicPlaceholderTextUtil_ExpandPlaceholders(sp0C, gText_CantHoldAnyMore); else if (itemGiveRet == 1) DynamicPlaceholderTextUtil_ExpandPlaceholders(sp0C, gText_FilledStorageSpace); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, sp0C, 8, 40, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_0, sp0C, 8, 40, -1, NULL); } CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX); CopyWindowToVram(gUnknown_203F440->unk3008[1], COPYWIN_GFX); @@ -1345,10 +1345,10 @@ static void sub_81556E0(void) case 1: FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1)); FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1)); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 2, gText_WantToPlayAgain, 0, 6, -1, NULL); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_Yes, 8, 2, -1, NULL); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_No, 8, 16, -1, NULL); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_SelectorArrow2, 0, 2, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], FONT_2, gText_WantToPlayAgain, 0, 6, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_2, gText_Yes, 8, 2, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_2, gText_No, 8, 16, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_2, gText_SelectorArrow2, 0, 2, -1, NULL); CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX); CopyWindowToVram(gUnknown_203F440->unk3008[1], COPYWIN_GFX); gUnknown_203F440->state++; @@ -1367,9 +1367,9 @@ static void sub_81556E0(void) if (y == 0) y = 1; FillWindowPixelBuffer(gUnknown_203F440->unk3008[1], PIXEL_FILL(1)); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_Yes, 8, 2, -1, NULL); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_No, 8, 16, -1, NULL); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_SelectorArrow2, 0, y == 1 ? 2 : 16, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_2, gText_Yes, 8, 2, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_2, gText_No, 8, 16, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], FONT_2, gText_SelectorArrow2, 0, y == 1 ? 2 : 16, -1, NULL); CopyWindowToVram(gUnknown_203F440->unk3008[1], COPYWIN_FULL); // Increment state only if A or B button have been pressed. if (JOY_NEW(A_BUTTON)) @@ -1421,7 +1421,7 @@ static void sub_8155A78(void) { case 0: DrawDialogueFrame(0, FALSE); - AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); gUnknown_203F440->state++; break; case 1: @@ -1459,7 +1459,7 @@ static void sub_8155B4C(void) break; case 1: FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1)); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 2, gText_CommunicationStandby3, 0, 6, -1, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], FONT_2, gText_CommunicationStandby3, 0, 6, -1, NULL); CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX); gUnknown_203F440->state++; break; @@ -1499,7 +1499,7 @@ static void sub_8155C80(void) break; case 1: FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1)); - AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 2, gText_SomeoneDroppedOut, 0, 6, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], FONT_2, gText_SomeoneDroppedOut, 0, 6, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX); gUnknown_203F440->state++; break; diff --git a/src/easy_chat_3.c b/src/easy_chat_3.c index 393020674..1660b0cb7 100644 --- a/src/easy_chat_3.c +++ b/src/easy_chat_3.c @@ -695,12 +695,12 @@ static bool8 ECInterfaceCmd_02(void) { if (*ecWord == 0xFFFF) { - stringWidth = GetStringWidth(1, gUnknown_843F8D8, 0) * 7; + stringWidth = GetStringWidth(FONT_1, gUnknown_843F8D8, 0) * 7; } else { CopyEasyChatWord(str, *ecWord); - stringWidth = GetStringWidth(1, str, 0); + stringWidth = GetStringWidth(FONT_1, str, 0); } trueStringWidth = stringWidth + 17; @@ -1319,23 +1319,25 @@ static void PrintTitleText(void) if (titleText == NULL) return; - xOffset = (128 - GetStringWidth(1, titleText, 0)) / 2u; + xOffset = (128 - GetStringWidth(FONT_1, titleText, 0)) / 2u; FillWindowPixelBuffer(0, PIXEL_FILL(0)); - EC_AddTextPrinterParameterized2(0, 1, titleText, xOffset, 0, TEXT_SKIP_DRAW, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); + EC_AddTextPrinterParameterized2(0, FONT_1, titleText, xOffset, 0, TEXT_SKIP_DRAW, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); } static void EC_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16)) { - if (fontId == 1) y += 2; + if (fontId == FONT_1) + y += 2; AddTextPrinterParameterized(windowId, fontId, str, x, y, speed, callback); } static void EC_AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, u8 bg, u8 fg, u8 shadow) { u8 color[3]; - if (fontId == 1) y += 2; + if (fontId == FONT_1) + y += 2; color[0] = bg; color[1] = fg; color[2] = shadow; @@ -1374,17 +1376,17 @@ static void PrintECInterfaceTextById(u8 direction) FillWindowPixelBuffer(1, PIXEL_FILL(1)); if (text1) - EC_AddTextPrinterParameterized(1, 1, text1, 0, 0, TEXT_SKIP_DRAW, NULL); + EC_AddTextPrinterParameterized(1, FONT_1, text1, 0, 0, TEXT_SKIP_DRAW, NULL); if (text2) - EC_AddTextPrinterParameterized(1, 1, text2, 0, 16, TEXT_SKIP_DRAW, NULL); + EC_AddTextPrinterParameterized(1, FONT_1, text2, 0, 16, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(1, COPYWIN_FULL); } static void EC_CreateYesNoMenuWithInitialCursorPos(u8 initialCursorPos) { - CreateYesNoMenu(&sEasyChatYesNoWindowTemplate, 1, 0, 2, 0x001, 14, initialCursorPos); + CreateYesNoMenu(&sEasyChatYesNoWindowTemplate, FONT_1, 0, 2, 0x001, 14, initialCursorPos); } static void CreatePhraseFrameWindow(void) @@ -1451,7 +1453,7 @@ static void PrintECFields(void) } *str = EOS; - EC_AddTextPrinterParameterized(sEasyChatGraphicsResources->windowId, 1, sEasyChatGraphicsResources->ecPrintBuffer, 0, i * 16, TEXT_SKIP_DRAW, NULL); + EC_AddTextPrinterParameterized(sEasyChatGraphicsResources->windowId, FONT_1, sEasyChatGraphicsResources->ecPrintBuffer, 0, i * 16, TEXT_SKIP_DRAW, NULL); } CopyWindowToVram(sEasyChatGraphicsResources->windowId, COPYWIN_FULL); @@ -1566,7 +1568,7 @@ static void PrintECGroupsMenu(void) return; } - EC_AddTextPrinterParameterized(2, 1, GetEasyChatWordGroupName(groupId), x * 84 + 10, y, TEXT_SKIP_DRAW, NULL); + EC_AddTextPrinterParameterized(2, FONT_1, GetEasyChatWordGroupName(groupId), x * 84 + 10, y, TEXT_SKIP_DRAW, NULL); } y += 16; @@ -1578,7 +1580,7 @@ static void PrintEasyChatKeyboardText(void) u32 i; for (i = 0; i < NELEMS(sEasyChatKeyboardText); i++) - EC_AddTextPrinterParameterized(2, 1, sEasyChatKeyboardText[i], 10, 96 + i * 16, TEXT_SKIP_DRAW, NULL); + EC_AddTextPrinterParameterized(2, FONT_1, sEasyChatKeyboardText[i], 10, 96 + i * 16, TEXT_SKIP_DRAW, NULL); } static void PrintECWordsMenu(void) @@ -1652,7 +1654,7 @@ static void PrintECRowsWin2(u8 row, u8 remrow) CopyEasyChatWordPadded(sEasyChatGraphicsResources->ecPaddedWordBuffer, easyChatWord, 0); - EC_AddTextPrinterParameterized(2, 1, sEasyChatGraphicsResources->ecPaddedWordBuffer, (j * 13 + 3) * 8, y_, TEXT_SKIP_DRAW, NULL); + EC_AddTextPrinterParameterized(2, FONT_1, sEasyChatGraphicsResources->ecPaddedWordBuffer, (j * 13 + 3) * 8, y_, TEXT_SKIP_DRAW, NULL); } } y += 16; @@ -2293,6 +2295,6 @@ static void CreateFooterWindow(void) template.baseBlock = 0x030; windowId = AddWindow(&template); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - EC_AddTextPrinterParameterized(windowId, 1, gUnknown_841EE2B, 0, 0, 0, NULL); + EC_AddTextPrinterParameterized(windowId, FONT_1, gUnknown_841EE2B, 0, 0, 0, NULL); PutWindowTilemap(windowId); } diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 67745b803..8ab93a353 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -1333,7 +1333,7 @@ static void Task_TradeEvolutionScene(u8 taskId) if (!IsTextPrinterActive(0) && !IsSEPlaying()) { LoadUserWindowBorderGfx(0, 0xA8, 0xE0); - CreateYesNoMenu(&gTradeEvolutionSceneYesNoWindowTemplate, 3, 0, 2, 0xA8, 0xE, 0); + CreateYesNoMenu(&gTradeEvolutionSceneYesNoWindowTemplate, FONT_3, 0, 2, 0xA8, 0xE, 0); sEvoCursorPos = 0; gTasks[taskId].tLearnMoveState++; sEvoCursorPos = 0; diff --git a/src/fame_checker.c b/src/fame_checker.c index 1f4be5af0..3d7b15f2d 100644 --- a/src/fame_checker.c +++ b/src/fame_checker.c @@ -822,7 +822,7 @@ static bool8 TryExitPickMode(u8 taskId) static void MessageBoxPrintEmptyText(void) { - AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gFameCheckerText_ClearTextbox, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_2, gFameCheckerText_ClearTextbox, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } static void Task_EnterPickMode(u8 taskId) @@ -962,7 +962,7 @@ static void GetPickModeText(void) if (HasUnlockedAllFlavorTextsForCurrentPerson() == TRUE) whichText = NUM_FAMECHECKER_PERSONS; StringExpandPlaceholders(gStringVar4, sFameCheckerNameAndQuotesPointers[sFameCheckerData->unlockedPersons[who] + whichText]); - AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } } @@ -973,7 +973,7 @@ static void PrintSelectedNameInBrightGreen(u8 taskId) u16 cursorPos = FameCheckerGetCursorY(); FillWindowPixelRect(FCWINDOWID_MSGBOX, PIXEL_FILL(1), 0, 0, 0xd0, 0x20); StringExpandPlaceholders(gStringVar4, sFameCheckerFlavorTextPointers[sFameCheckerData->unlockedPersons[cursorPos] * 6 + data[1]]); - AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } @@ -1081,9 +1081,9 @@ static void PrintUIHelp(u8 state) if (state == 1) src = gFameCheckerText_PickScreenUI; } - width = GetStringWidth(0, src, 0); + width = GetStringWidth(FONT_0, src, 0); FillWindowPixelRect(FCWINDOWID_UIHELP, PIXEL_FILL(0), 0, 0, 0xc0, 0x10); - AddTextPrinterParameterized4(FCWINDOWID_UIHELP, 0, 188 - width, 0, 0, 2, sTextColor_White, -1, src); + AddTextPrinterParameterized4(FCWINDOWID_UIHELP, FONT_0, 188 - width, 0, 0, 2, sTextColor_White, -1, src); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_UIHELP); } @@ -1395,11 +1395,11 @@ static void UpdateIconDescriptionBox(u8 whichText) HandleFlavorTextModeSwitch(TRUE); gIconDescriptionBoxIsOpen = 1; FillWindowPixelRect(FCWINDOWID_ICONDESC, PIXEL_FILL(0), 0, 0, 0x58, 0x20); - width = (0x54 - GetStringWidth(0, sFlavorTextOriginLocationTexts[idx], 0)) / 2; - AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, 0, width, 0, 0, 2, sTextColor_DkGrey, -1, sFlavorTextOriginLocationTexts[idx]); + width = (0x54 - GetStringWidth(FONT_0, sFlavorTextOriginLocationTexts[idx], 0)) / 2; + AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, FONT_0, width, 0, 0, 2, sTextColor_DkGrey, -1, sFlavorTextOriginLocationTexts[idx]); StringExpandPlaceholders(gStringVar1, sFlavorTextOriginObjectNameTexts[idx]); - width = (0x54 - GetStringWidth(0, gStringVar1, 0)) / 2; - AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, 0, width, 10, 0, 2, sTextColor_DkGrey, -1, gStringVar1); + width = (0x54 - GetStringWidth(FONT_0, gStringVar1, 0)) / 2; + AddTextPrinterParameterized4(FCWINDOWID_ICONDESC, FONT_0, width, 10, 0, 2, sTextColor_DkGrey, -1, gStringVar1); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_ICONDESC); } @@ -1435,7 +1435,7 @@ static void InitListMenuTemplate(void) gFameChecker_ListMenuTemplate.lettersSpacing = 0; gFameChecker_ListMenuTemplate.itemVerticalPadding = 0; gFameChecker_ListMenuTemplate.scrollMultiple = 0; - gFameChecker_ListMenuTemplate.fontId = 2; + gFameChecker_ListMenuTemplate.fontId = FONT_2; gFameChecker_ListMenuTemplate.cursorKind = 0; } @@ -1513,7 +1513,7 @@ static void Task_SwitchToPickMode(u8 taskId) static void PrintCancelDescription(void) { FillWindowPixelRect(FCWINDOWID_MSGBOX, PIXEL_FILL(1), 0, 0, 0xd0, 0x20); - AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, 2, gFameCheckerText_FameCheckerWillBeClosed, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(FCWINDOWID_MSGBOX, FONT_2, gFameCheckerText_FameCheckerWillBeClosed, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); FC_PutWindowTilemapAndCopyWindowToVramMode3(FCWINDOWID_MSGBOX); } @@ -1524,14 +1524,14 @@ static void FC_DoMoveCursor(s32 itemIndex, bool8 onInit) u16 who; ListMenuGetScrollAndRow(sFameCheckerData->listMenuTaskId, &listY, &cursorY); who = listY + cursorY; - AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 8, 14 * cursorY + 4, 0, 0, sTextColor_Green, 0, sListMenuItems[itemIndex].label); + AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_2, 8, 14 * cursorY + 4, 0, 0, sTextColor_Green, 0, sListMenuItems[itemIndex].label); if (!onInit) { if (listY < sFameCheckerData->listMenuTopIdx2) sFameCheckerData->listMenuDrawnSelIdx++; else if (listY > sFameCheckerData->listMenuTopIdx2 && who != sFameCheckerData->numUnlockedPersons - 1) sFameCheckerData->listMenuDrawnSelIdx--; - AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].label); + AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_2, 8, 14 * sFameCheckerData->listMenuDrawnSelIdx + 4, 0, 0, sTextColor_DkGrey, 0, sListMenuItems[sFameCheckerData->listMenuCurIdx].label); } sFameCheckerData->listMenuCurIdx = itemIndex; @@ -1729,7 +1729,7 @@ static void PlaceListMenuCursor(bool8 isActive) { u16 cursorY = ListMenuGetYCoordForPrintingArrowCursor(sFameCheckerData->listMenuTaskId); if (isActive == TRUE) - AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_DkGrey, 0, gText_SelectorArrow2); + AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_2, 0, cursorY, 0, 0, sTextColor_DkGrey, 0, gText_SelectorArrow2); else - AddTextPrinterParameterized4(FCWINDOWID_LIST, 2, 0, cursorY, 0, 0, sTextColor_White, 0, gText_SelectorArrow2); + AddTextPrinterParameterized4(FCWINDOWID_LIST, FONT_2, 0, cursorY, 0, 0, sTextColor_White, 0, gText_SelectorArrow2); } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 3de950fcc..3660f97a6 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -1767,7 +1767,7 @@ static bool8 Fishing5(struct Task *task) } else { - AddTextPrinterParameterized(0, 2, dot, task->tNumDots * 12, 1, 0, NULL); + AddTextPrinterParameterized(0, FONT_2, dot, task->tNumDots * 12, 1, 0, NULL); task->tNumDots++; } } @@ -1846,7 +1846,7 @@ static bool8 Fishing10(struct Task *task) { AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, gText_PokemonOnHook, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gText_PokemonOnHook, 1, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); task->tStep++; task->tFrameCounter = 0; return FALSE; @@ -1893,7 +1893,7 @@ static bool8 Fishing12(struct Task *task) AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, gText_NotEvenANibble, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gText_NotEvenANibble, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); task->tStep = FISHING_SHOW_RESULT; return TRUE; } @@ -1903,7 +1903,7 @@ static bool8 Fishing13(struct Task *task) { AlignFishingAnimationFrames(&gSprites[gPlayerAvatar.spriteId]); StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection())); - AddTextPrinterParameterized2(0, 2, gText_ItGotAway, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gText_ItGotAway, 1, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); task->tStep++; return TRUE; } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 4519bb27e..d827fc88e 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -367,7 +367,7 @@ static bool8 PrintWhiteOutRecoveryMessage(u8 taskId, const u8 *text, u8 x, u8 y) case 0: FillWindowPixelBuffer(windowId, PIXEL_FILL(0)); StringExpandPlaceholders(gStringVar4, text); - AddTextPrinterParameterized4(windowId, 2, x, y, 1, 0, gUnknown_83C68EC, 1, gStringVar4); + AddTextPrinterParameterized4(windowId, FONT_2, x, y, 1, 0, gUnknown_83C68EC, 1, gStringVar4); gTextFlags.canABSpeedUpPrint = FALSE; gTasks[taskId].data[2] = 1; break; diff --git a/src/field_specials.c b/src/field_specials.c index 97f9808aa..0f8093e8e 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -544,7 +544,7 @@ void NullFieldSpecial(void) void DoPicboxCancel(void) { u8 t = EOS; - AddTextPrinterParameterized(0, 2, &t, 0, 1, 0, NULL); + AddTextPrinterParameterized(0, FONT_2, &t, 0, 1, 0, NULL); PicboxCancel(); } @@ -1098,10 +1098,10 @@ void DrawElevatorCurrentFloorWindow(void) sElevatorCurrentFloorWindowId = AddWindow(&sElevatorCurrentFloorWindowTemplate); TextWindow_SetStdFrame0_WithPal(sElevatorCurrentFloorWindowId, 0x21D, 0xD0); DrawStdFrameWithCustomTileAndPalette(sElevatorCurrentFloorWindowId, FALSE, 0x21D, 0xD); - AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, gText_NowOn, 0, 2, 0xFF, NULL); + AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, FONT_2, gText_NowOn, 0, 2, 0xFF, NULL); floorname = sFloorNamePointers[gSpecialVar_0x8005]; - strwidth = GetStringWidth(2, floorname, 0); - AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, floorname, 56 - strwidth, 16, 0xFF, NULL); + strwidth = GetStringWidth(FONT_2, floorname, 0); + AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, FONT_2, floorname, 56 - strwidth, 16, 0xFF, NULL); PutWindowTilemap(sElevatorCurrentFloorWindowId); CopyWindowToVram(sElevatorCurrentFloorWindowId, COPYWIN_FULL); } @@ -1348,7 +1348,7 @@ static void Task_CreateScriptListMenu(u8 taskId) { sListMenuItems[i].label = sListMenuLabels[gSpecialVar_0x8004][i]; sListMenuItems[i].index = i; - width = GetStringWidth(2, sListMenuItems[i].label, 0); + width = GetStringWidth(FONT_2, sListMenuItems[i].label, 0); if (width > mwidth) mwidth = width; } @@ -1386,7 +1386,7 @@ static void CreateScriptListMenu(void) sFieldSpecialsListMenuTemplate.lettersSpacing = 1; sFieldSpecialsListMenuTemplate.itemVerticalPadding = 0; sFieldSpecialsListMenuTemplate.scrollMultiple = 0; - sFieldSpecialsListMenuTemplate.fontId = 2; + sFieldSpecialsListMenuTemplate.fontId = FONT_2; sFieldSpecialsListMenuTemplate.cursorKind = 0; } diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 9b7e1f7af..b1fd76876 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -452,7 +452,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) *lastSavedTeam = *sHofMonPtr; DrawDialogueFrame(0, 0); - AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_Hof_TrySaveData; } @@ -638,7 +638,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId) FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20); HallOfFame_PrintPlayerInfo(1, 2); DrawDialogueFrame(0, 0); - AddTextPrinterParameterized2(0, 2, gText_LeagueChamp, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gText_LeagueChamp, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_Hof_ExitOnKeyPressed; } @@ -968,7 +968,7 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId) { TopBarWindowPrintString(gText_ABUTTONExit, 8, TRUE); DrawDialogueFrame(0, 0); - AddTextPrinterParameterized2(0, 2, gText_HOFCorrupted, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gText_HOFCorrupted, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); gTasks[taskId].func = Task_HofPC_ExitOnButtonPress; } @@ -981,10 +981,10 @@ static void Task_HofPC_ExitOnButtonPress(u8 taskId) static void HallOfFame_PrintWelcomeText(u8 not, u8 used) { - u8 x = (0xD0 - GetStringWidth(2, gText_WelcomeToHOF, 0)) / 2; + u8 x = (0xD0 - GetStringWidth(FONT_2, gText_WelcomeToHOF, 0)) / 2; FillWindowPixelBuffer(0, PIXEL_FILL(0)); PutWindowTilemap(0); - AddTextPrinterParameterized3(0, 2, x, 1, sTextColors[0], 0, gText_WelcomeToHOF); + AddTextPrinterParameterized3(0, FONT_2, x, 1, sTextColors[0], 0, gText_WelcomeToHOF); CopyWindowToVram(0, COPYWIN_FULL); } @@ -1019,7 +1019,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u } text[3] = EOS; StringAppend(text2, text); - AddTextPrinterParameterized3(0, 2, 0x10, 1, sTextColors[0], 0, text2); + AddTextPrinterParameterized3(0, FONT_2, 16, 1, sTextColors[0], 0, text2); } // nick, species names, gender and lvl @@ -1032,12 +1032,12 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u } } text[i] = EOS; - width = GetStringWidth(2, text, GetFontAttribute(2, FONTATTR_LETTER_SPACING)); + width = GetStringWidth(FONT_2, text, GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING)); if (currMon->species == SPECIES_EGG) x = 0x80 - width / 2; else x = 0x80 - width; - AddTextPrinterParameterized3(0, 2, x, 1, sTextColors[0], 0, text); + AddTextPrinterParameterized3(0, FONT_2, x, 1, sTextColors[0], 0, text); if (currMon->species != SPECIES_EGG) { text[0] = CHAR_SLASH; @@ -1061,15 +1061,15 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u } *stringPtr = EOS; - AddTextPrinterParameterized3(0, 2, 0x80, 1, sTextColors[0], 0, text); + AddTextPrinterParameterized3(0, FONT_2, 0x80, 1, sTextColors[0], 0, text); stringPtr = StringCopy(text, gText_Level); ConvertIntToDecimalStringN(stringPtr, currMon->lvl, STR_CONV_MODE_LEFT_ALIGN, 3); - AddTextPrinterParameterized3(0, 2, 0x20, 0x11, sTextColors[0], 0, text); + AddTextPrinterParameterized3(0, FONT_2, 0x20, 0x11, sTextColors[0], 0, text); stringPtr = StringCopy(text, gText_IDNumber); ConvertIntToDecimalStringN(stringPtr, (u16)(currMon->tid), STR_CONV_MODE_LEADING_ZEROS, 5); - AddTextPrinterParameterized3(0, 2, 0x60, 0x11, sTextColors[0], 0, text); + AddTextPrinterParameterized3(0, FONT_2, 0x60, 0x11, sTextColors[0], 0, text); } CopyWindowToVram(0, COPYWIN_FULL); @@ -1084,21 +1084,21 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2) FillWindowPixelBuffer(1, PIXEL_FILL(1)); PutWindowTilemap(1); DrawStdFrameWithCustomTileAndPalette(1, FALSE, 0x21D, 0xD); - AddTextPrinterParameterized4(1, 2, 4, 3, 0, 0, sTextColors[1], 0, gText_Name); + AddTextPrinterParameterized4(1, FONT_2, 4, 3, 0, 0, sTextColors[1], 0, gText_Name); - AddTextPrinterParameterized3(1, 2, textWidth - GetStringWidth(2, gSaveBlock2Ptr->playerName, 0), 3, sTextColors[1], 0, gSaveBlock2Ptr->playerName); + AddTextPrinterParameterized3(1, FONT_2, textWidth - GetStringWidth(FONT_2, gSaveBlock2Ptr->playerName, 0), 3, sTextColors[1], 0, gSaveBlock2Ptr->playerName); trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) | (gSaveBlock2Ptr->playerTrainerId[1] << 8); - AddTextPrinterParameterized3(1, 2, 4, 18, sTextColors[1], 0, gText_IDNumber); + AddTextPrinterParameterized3(1, FONT_2, 4, 18, sTextColors[1], 0, gText_IDNumber); text[0] = (trainerId % 100000) / 10000 + CHAR_0; text[1] = (trainerId % 10000) / 1000 + CHAR_0; text[2] = (trainerId % 1000) / 100 + CHAR_0; text[3] = (trainerId % 100) / 10 + CHAR_0; text[4] = (trainerId % 10) / 1 + CHAR_0; text[5] = EOS; - AddTextPrinterParameterized3(1, 2, textWidth - 30, 18, sTextColors[1], 0, text); + AddTextPrinterParameterized3(1, FONT_2, textWidth - 30, 18, sTextColors[1], 0, text); - AddTextPrinterParameterized3(1, 2, 4, 32, sTextColors[1], 0, gText_MainMenuTime); + AddTextPrinterParameterized3(1, FONT_2, 4, 32, sTextColors[1], 0, gText_MainMenuTime); text[0] = (gSaveBlock2Ptr->playTimeHours / 100) + CHAR_0; text[1] = (gSaveBlock2Ptr->playTimeHours % 100) / 10 + CHAR_0; text[2] = (gSaveBlock2Ptr->playTimeHours % 10) + CHAR_0; @@ -1113,7 +1113,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2) text[5] = (gSaveBlock2Ptr->playTimeMinutes % 10) + CHAR_0; text[6] = EOS; - AddTextPrinterParameterized3(1, 2, textWidth - 36, 32, sTextColors[1], 0, text); + AddTextPrinterParameterized3(1, FONT_2, textWidth - 36, 32, sTextColors[1], 0, text); CopyWindowToVram(1, COPYWIN_FULL); } diff --git a/src/help_message.c b/src/help_message.c index d59e9ea40..5f3af1668 100644 --- a/src/help_message.c +++ b/src/help_message.c @@ -93,7 +93,7 @@ static const u8 sHelpMessageTextColors[3] = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMI static void PrintHelpMessageText(const u8 *text) { - AddTextPrinterParameterized4(sHelpMessageWindowId, 2, 2, 5, 1, 1, sHelpMessageTextColors, -1, text); + AddTextPrinterParameterized4(sHelpMessageWindowId, FONT_2, 2, 5, 1, 1, sHelpMessageTextColors, -1, text); } void PrintTextOnHelpMessageWindow(const u8 *text, u8 mode) diff --git a/src/help_system_util.c b/src/help_system_util.c index 49554acf8..c95e46003 100644 --- a/src/help_system_util.c +++ b/src/help_system_util.c @@ -370,9 +370,9 @@ void HS_ShowOrHideScrollArrows(u8 which, u8 mode) } } -void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 width, u8 height) +void HelpSystemRenderText(u8 fontId, u8 * dest, const u8 * src, u8 x, u8 y, u8 width, u8 height) { - // font -> sp+24 + // fontId -> sp+24 // dest -> sp+28 // src -> r9 // x -> sp+34 @@ -408,9 +408,9 @@ void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 wid { break; } - DecompressAndRenderGlyph(font, gSaveBlock2Ptr->playerName[i], &srcBlit, &destBlit, dest, x, y, width, height); + DecompressAndRenderGlyph(fontId, gSaveBlock2Ptr->playerName[i], &srcBlit, &destBlit, dest, x, y, width, height); // This is required to match a dummy [sp+#0x24] read here - if (font == 0) + if (fontId == FONT_0) { x += gGlyphInfo.width; } @@ -430,7 +430,7 @@ void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 wid { break; } - DecompressAndRenderGlyph(font, gString_Bill[i], &srcBlit, &destBlit, dest, x, y, width, height); + DecompressAndRenderGlyph(fontId, gString_Bill[i], &srcBlit, &destBlit, dest, x, y, width, height); } else { @@ -438,9 +438,9 @@ void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 wid { break; } - DecompressAndRenderGlyph(font, gString_Someone[i], &srcBlit, &destBlit, dest, x, y, width, height); + DecompressAndRenderGlyph(fontId, gString_Someone[i], &srcBlit, &destBlit, dest, x, y, width, height); } - if (font == 0) + if (fontId == FONT_0) { x += gGlyphInfo.width; } @@ -496,7 +496,7 @@ void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 wid destBlit.pixels = dest; destBlit.width = width * 8; destBlit.height = height * 8; - FillBitmapRect4Bit(&destBlit, x, y, clearPixels, GetFontAttribute(font, FONTATTR_MAX_LETTER_HEIGHT), 0); + FillBitmapRect4Bit(&destBlit, x, y, clearPixels, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_HEIGHT), 0); x += clearPixels; } src++; @@ -529,7 +529,7 @@ void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 wid default: if (curChar == CHAR_SPACE) { - if (font == 0) + if (fontId == FONT_0) { x += 5; } @@ -540,8 +540,8 @@ void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 wid } else { - DecompressAndRenderGlyph(font, curChar, &srcBlit, &destBlit, dest, x, y, width, height); - if (font == 0) + DecompressAndRenderGlyph(fontId, curChar, &srcBlit, &destBlit, dest, x, y, width, height); + if (fontId == FONT_0) { x += gGlyphInfo.width; } @@ -555,11 +555,11 @@ void HelpSystemRenderText(u8 font, u8 * dest, const u8 * src, u8 x, u8 y, u8 wid } } -void DecompressAndRenderGlyph(u8 font, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height) +void DecompressAndRenderGlyph(u8 fontId, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height) { - if (font == 0) + if (fontId == FONT_0) DecompressGlyphFont0(glyph, FALSE); - else if (font == 5) + else if (fontId == FONT_5) DecompressGlyphFont5(glyph, FALSE); else DecompressGlyphFont2(glyph, FALSE); @@ -580,7 +580,7 @@ void HelpSystem_PrintTextInTopLeftCorner(const u8 * str) void HelpSystem_PrintTextRightAlign_Row52(const u8 * str) { - s32 left = 0x7C - GetStringWidth(0, str, 0); + s32 left = 0x7C - GetStringWidth(FONT_0, str, 0); GenerateFontHalfRowLookupTable(TEXT_COLOR_WHITE, TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_DARK_GRAY); HelpSystemRenderText(0, gDecompressionBuffer + 0x3400, str, left, 2, 16, 2); } @@ -713,7 +713,7 @@ void HS_UpdateMenuScrollArrows(void) void PrintListMenuItems(void) { - u8 glyphHeight = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 1; + u8 glyphHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 1; s32 i; s32 r5 = gHelpSystemListMenu.itemsAbove; @@ -728,7 +728,7 @@ void PrintListMenuItems(void) void PlaceListMenuCursor(void) { - u8 glyphHeight = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 1; + u8 glyphHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 1; u8 x = gHelpSystemListMenu.sub.left; u8 y = gHelpSystemListMenu.sub.top + glyphHeight * gHelpSystemListMenu.cursorPos; HelpSystem_PrintTextAt(gText_SelectorArrow2, x, y); @@ -736,7 +736,7 @@ void PlaceListMenuCursor(void) void HS_RemoveSelectionCursorAt(u8 i) { - u8 glyphHeight = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 1; + u8 glyphHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 1; u8 x = gHelpSystemListMenu.sub.left; u8 y = gHelpSystemListMenu.sub.top + i * glyphHeight; HelpSystem_PrintTextAt(gString_HelpSystem_ClearTo8, x, y); diff --git a/src/item_menu.c b/src/item_menu.c index 88ebd1e17..ceddc9675 100644 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -660,7 +660,7 @@ static void Bag_BuildListMenuTemplate(u8 pocket) gMultiuseListMenuTemplate.itemVerticalPadding = 2; gMultiuseListMenuTemplate.upText_Y = 2; gMultiuseListMenuTemplate.maxShowed = sBagMenuDisplay->maxShowed[pocket]; - gMultiuseListMenuTemplate.fontId = 2; + gMultiuseListMenuTemplate.fontId = FONT_2; gMultiuseListMenuTemplate.cursorPal = 2; gMultiuseListMenuTemplate.fillValue = 0; gMultiuseListMenuTemplate.cursorShadowPal = 3; @@ -718,7 +718,7 @@ static void BagListMenuItemPrintFunc(u8 windowId, u32 itemId, u8 y) { ConvertIntToDecimalStringN(gStringVar1, bagItemQuantity, STR_CONV_MODE_RIGHT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - BagPrintTextOnWindow(windowId, 0, gStringVar4, 0x6e, y, 0, 0, 0xFF, 1); + BagPrintTextOnWindow(windowId, FONT_0, gStringVar4, 0x6e, y, 0, 0, 0xFF, 1); } else if (gSaveBlock1Ptr->registeredItem != ITEM_NONE && gSaveBlock1Ptr->registeredItem == bagItemId) { @@ -736,11 +736,11 @@ static void bag_menu_print_cursor(u8 y, u8 colorIdx) { if (colorIdx == 0xFF) { - FillWindowPixelRect(0, PIXEL_FILL(0), 1, y, GetMenuCursorDimensionByFont(2, 0), GetMenuCursorDimensionByFont(2, 1)); + FillWindowPixelRect(0, PIXEL_FILL(0), 1, y, GetMenuCursorDimensionByFont(FONT_2, 0), GetMenuCursorDimensionByFont(FONT_2, 1)); } else { - BagPrintTextOnWindow(0, 2, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx); + BagPrintTextOnWindow(0, FONT_2, gText_SelectorArrow2, 1, y, 0, 0, 0, colorIdx); } } @@ -758,7 +758,7 @@ static void PrintItemDescriptionOnMessageWindow(s32 itemIndex) else description = gText_CloseBag; FillWindowPixelBuffer(1, PIXEL_FILL(0)); - BagPrintTextOnWindow(1, 2, description, 0, 3, 2, 0, 0, 0); + BagPrintTextOnWindow(1, FONT_2, description, 0, 3, 2, 0, 0, 0); } static void CreatePocketScrollArrowPair(void) @@ -1230,7 +1230,7 @@ static void BeginMovingItemInPocket(u8 taskId, s16 itemIndex) StringCopy(gStringVar1, ItemId_GetName(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1]))); StringExpandPlaceholders(gStringVar4, gOtherText_WhereShouldTheStrVar1BePlaced); FillWindowPixelBuffer(1, PIXEL_FILL(0)); - BagPrintTextOnWindow(1, 2, gStringVar4, 0, 3, 2, 0, 0, 0); + BagPrintTextOnWindow(1, FONT_2, gStringVar4, 0, 3, 2, 0, 0, 0); ItemMenuIcons_MoveInsertIndicatorBar(0, ListMenuGetYCoordForPrintingArrowCursor(data[0])); ItemMenuIcons_ToggleInsertIndicatorBarVisibility(FALSE); BagDestroyPocketSwitchArrowPair(); @@ -1315,11 +1315,11 @@ static void InitQuantityToTossOrDeposit(u16 cursorPos, const u8 *str) u8 r5 = ShowBagWindow(6, 2); CopyItemName(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, cursorPos), gStringVar1); StringExpandPlaceholders(gStringVar4, str); - BagPrintTextOnWindow(r5, 2, gStringVar4, 0, 2, 1, 0, 0, 1); + BagPrintTextOnWindow(r5, FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); r4 = ShowBagWindow(0, 0); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 3); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - BagPrintTextOnWindow(r4, 0, gStringVar4, 4, 10, 1, 0, 0, 1); + BagPrintTextOnWindow(r4, FONT_0, gStringVar4, 4, 10, 1, 0, 0, 1); CreateArrowPair_QuantitySelect(); } @@ -1329,7 +1329,7 @@ static void UpdateQuantityToTossOrDeposit(s16 value, u8 ndigits) FillWindowPixelBuffer(r6, PIXEL_FILL(1)); ConvertIntToDecimalStringN(gStringVar1, value, STR_CONV_MODE_LEADING_ZEROS, ndigits); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - BagPrintTextOnWindow(r6, 0, gStringVar4, 4, 10, 1, 0, 0, 1); + BagPrintTextOnWindow(r6, FONT_0, gStringVar4, 4, 10, 1, 0, 0, 1); } static void CopyBagListBgTileRowToTilemapBuffer(u8 frame) @@ -1422,20 +1422,20 @@ static void OpenContextMenu(u8 taskId) r6 = ShowBagWindow(10, sContextMenuNumItems - 1); AddItemMenuActionTextPrinters( r6, + FONT_2, + GetMenuCursorDimensionByFont(FONT_2, 0), 2, - GetMenuCursorDimensionByFont(2, 0), - 2, - GetFontAttribute(2, FONTATTR_LETTER_SPACING), - GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, + GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING), + GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumItems, sItemMenuContextActions, sContextMenuItemsPtr ); - Menu_InitCursor(r6, 2, 0, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumItems, 0); + Menu_InitCursor(r6, FONT_2, 0, 2, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sContextMenuNumItems, 0); r4 = ShowBagWindow(6, 0); CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); - BagPrintTextOnWindow(r4, 2, gStringVar4, 0, 2, 1, 0, 0, 1); + BagPrintTextOnWindow(r4, FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); } static void Task_ItemContext_FieldOrBattle(u8 taskId) @@ -1507,7 +1507,7 @@ static void Task_ConfirmTossItems(u8 taskId) s16 *data = gTasks[taskId].data; ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_ThrowAwayStrVar2OfThisItemQM); - BagPrintTextOnWindow(ShowBagWindow(6, 1), 2, gStringVar4, 0, 2, 1, 0, 0, 1); + BagPrintTextOnWindow(ShowBagWindow(6, 1), FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); BagCreateYesNoMenuBottomRight(taskId, &sYesNoMenu_Toss); } @@ -1559,7 +1559,7 @@ static void Task_TossItem_Yes(u8 taskId) CopyItemName(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1]), gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_ThrewAwayStrVar2StrVar1s); - BagPrintTextOnWindow(ShowBagWindow(6, 3), 2, gStringVar4, 0, 2, 1, 0, 0, 1); + BagPrintTextOnWindow(ShowBagWindow(6, 3), FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); gTasks[taskId].func = Task_WaitAB_RedrawAndReturnToBag; } @@ -1610,7 +1610,7 @@ static void Task_ItemMenuAction_Give(u8 taskId) PutWindowTilemap(1); CopyWindowToVram(0, COPYWIN_MAP); if (!CanWriteMailHere(itemId)) - DisplayItemMessageInBag(taskId, 2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu); else if (!itemid_is_unique(itemId)) { if (CalculatePlayerPartyCount() == 0) @@ -1629,14 +1629,14 @@ static void Task_ItemMenuAction_Give(u8 taskId) static void Task_PrintThereIsNoPokemon(u8 taskId) { - DisplayItemMessageInBag(taskId, 2, gText_ThereIsNoPokemon, Task_WaitAButtonAndCloseContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gText_ThereIsNoPokemon, Task_WaitAButtonAndCloseContextMenu); } static void Task_PrintItemCantBeHeld(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_ItemCantBeHeld); - DisplayItemMessageInBag(taskId, 2, gStringVar4, Task_WaitAButtonAndCloseContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_WaitAButtonAndCloseContextMenu); } static void Task_WaitAButtonAndCloseContextMenu(u8 taskId) @@ -1705,7 +1705,7 @@ static void Task_ItemContext_FieldGive(u8 taskId) u16 itemId = BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1]); if (!CanWriteMailHere(itemId)) { - DisplayItemMessageInBag(taskId, 2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu); } else if (itemId == ITEM_TM_CASE) { @@ -1749,7 +1749,7 @@ static void Task_ItemContext_PcBoxGive(u8 taskId) u16 itemId = BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1]); if (ItemIsMail(itemId) == TRUE) { - DisplayItemMessageInBag(taskId, 2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu); } else if (itemId == ITEM_TM_CASE) { @@ -1872,7 +1872,7 @@ static void Task_InitSaleQuantitySelectInterface(u8 taskId) u8 r4 = ShowBagWindow(0, 1); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - BagPrintTextOnWindow(r4, 0, gStringVar4, 4, 10, 1, 0, 0xFF, 1); + BagPrintTextOnWindow(r4, FONT_0, gStringVar4, 4, 10, 1, 0, 0xFF, 1); UpdateSalePriceDisplay(itemid_get_market_price(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8]); BagPrintMoneyAmount(); CreatePocketScrollArrowPair_SellQuantity(); @@ -1925,7 +1925,7 @@ static void Task_SellItem_Yes(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar3, itemid_get_market_price(BagGetItemIdByPocketPosition(gBagMenuState.pocket + 1, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6); StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen); - DisplayItemMessageInBag(taskId, 2, gStringVar4, Task_FinalizeSaleToShop); + DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_FinalizeSaleToShop); } static void Task_FinalizeSaleToShop(u8 taskId) @@ -2013,12 +2013,12 @@ static void Task_TryDoItemDeposit(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_DepositedStrVar2StrVar1s); - BagPrintTextOnWindow(ShowBagWindow(6, 3), 2, gStringVar4, 0, 2, 1, 0, 0, 1); + BagPrintTextOnWindow(ShowBagWindow(6, 3), FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); gTasks[taskId].func = Task_WaitAB_RedrawAndReturnToBag; } else { - DisplayItemMessageInBag(taskId, 2, gText_NoRoomToStoreItems, Task_WaitAButtonAndCloseContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gText_NoRoomToStoreItems, Task_WaitAButtonAndCloseContextMenu); } } diff --git a/src/item_pc.c b/src/item_pc.c index 68290ef4a..e6d65d9c8 100644 --- a/src/item_pc.c +++ b/src/item_pc.c @@ -498,7 +498,7 @@ static void ItemPc_BuildListMenuTemplate(void) gMultiuseListMenuTemplate.itemVerticalPadding = 2; gMultiuseListMenuTemplate.upText_Y = 2; gMultiuseListMenuTemplate.maxShowed = sStateDataPtr->maxShowed; - gMultiuseListMenuTemplate.fontId = 2; + gMultiuseListMenuTemplate.fontId = FONT_2; gMultiuseListMenuTemplate.cursorPal = 2; gMultiuseListMenuTemplate.fillValue = 0; gMultiuseListMenuTemplate.cursorShadowPal = 3; @@ -534,7 +534,7 @@ static void ItemPc_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu * } sStateDataPtr->itemMenuIconSlot ^= 1; FillWindowPixelBuffer(1, 0); - ItemPc_AddTextPrinterParameterized(1, 2, desc, 0, 3, 2, 0, 0, 3); + ItemPc_AddTextPrinterParameterized(1, FONT_2, desc, 0, 3, 2, 0, 0, 3); } } @@ -552,7 +552,7 @@ static void ItemPc_ItemPrintFunc(u8 windowId, u32 itemId, u8 y) u16 quantity = ItemPc_GetItemQuantityBySlotId(itemId); ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_RIGHT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - ItemPc_AddTextPrinterParameterized(windowId, 0, gStringVar4, 110, y, 0, 0, 0xFF, 1); + ItemPc_AddTextPrinterParameterized(windowId, FONT_0, gStringVar4, 110, y, 0, 0, 0xFF, 1); } } @@ -565,19 +565,19 @@ static void ItemPc_PrintOrRemoveCursorAt(u8 y, u8 colorIdx) { if (colorIdx == 0xFF) { - u8 maxWidth = GetFontAttribute(2, FONTATTR_MAX_LETTER_WIDTH); - u8 maxHeight = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT); + u8 maxWidth = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_WIDTH); + u8 maxHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT); FillWindowPixelRect(0, 0, 0, y, maxWidth, maxHeight); } else { - ItemPc_AddTextPrinterParameterized(0, 2, gText_SelectorArrow2, 0, y, 0, 0, 0, colorIdx); + ItemPc_AddTextPrinterParameterized(0, FONT_2, gText_SelectorArrow2, 0, y, 0, 0, 0, colorIdx); } } static void ItemPc_PrintWithdrawItem(void) { - ItemPc_AddTextPrinterParameterized(2, 0, gText_WithdrawItem, 0, 1, 0, 1, 0, 0); + ItemPc_AddTextPrinterParameterized(2, FONT_0, gText_WithdrawItem, 0, 1, 0, 1, 0, 0); } static void ItemPc_PlaceTopMenuScrollIndicatorArrows(void) @@ -773,7 +773,7 @@ static void ItemPc_MoveItemModeInit(u8 taskId, s16 pos) StringCopy(gStringVar1, ItemId_GetName(ItemPc_GetItemIdBySlotId(data[1]))); StringExpandPlaceholders(gStringVar4, gOtherText_WhereShouldTheStrVar1BePlaced); FillWindowPixelBuffer(1, 0x00); - ItemPc_AddTextPrinterParameterized(1, 2, gStringVar4, 0, 3, 2, 3, 0, 0); + ItemPc_AddTextPrinterParameterized(1, FONT_2, gStringVar4, 0, 3, 2, 3, 0, 0); ItemMenuIcons_MoveInsertIndicatorBar(-32, ListMenuGetYCoordForPrintingArrowCursor(data[0])); ItemMenuIcons_ToggleInsertIndicatorBarVisibility(FALSE); ItemPc_PrintOrRemoveCursor(data[0], 2); @@ -839,11 +839,11 @@ static void Task_ItemPcSubmenuInit(u8 taskId) ItemPc_SetBorderStyleOnWindow(4); windowId = ItemPc_GetOrCreateSubwindow(0); - PrintTextArray(4, 2, 8, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, sItemPcSubmenuOptions); - Menu_InitCursor(4, 2, 0, 2, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, 0); + PrintTextArray(4, FONT_2, 8, 2, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, sItemPcSubmenuOptions); + Menu_InitCursor(4, FONT_2, 0, 2, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 3, 0); CopyItemName(ItemPc_GetItemIdBySlotId(data[1]), gStringVar1); StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected); - ItemPc_AddTextPrinterParameterized(windowId, 2, gStringVar4, 0, 2, 1, 0, 0, 1); + ItemPc_AddTextPrinterParameterized(windowId, FONT_2, gStringVar4, 0, 2, 1, 0, 0, 1); ScheduleBgCopyTilemapToVram(0); gTasks[taskId].func = Task_ItemPcSubmenuRun; } @@ -901,13 +901,13 @@ static void ItemPc_DoWithdraw(u8 taskId) ConvertIntToDecimalStringN(gStringVar2, data[8], STR_CONV_MODE_LEFT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_WithdrewQuantItem); windowId = ItemPc_GetOrCreateSubwindow(2); - AddTextPrinterParameterized(windowId, 2, gStringVar4, 0, 2, 0, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gStringVar4, 0, 2, 0, NULL); gTasks[taskId].func = Task_ItemPcWaitButtonAndFinishWithdrawMultiple; } else { windowId = ItemPc_GetOrCreateSubwindow(2); - AddTextPrinterParameterized(windowId, 2, gText_NoMoreRoomInBag, 0, 2, 0, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gText_NoMoreRoomInBag, 0, 2, 0, NULL); gTasks[taskId].func = Task_ItemPcWaitButtonWithdrawMultipleFailed; } } @@ -957,11 +957,11 @@ static void ItemPc_WithdrawMultipleInitWindow(u16 slotId) CopyItemName(itemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_WithdrawHowMany); - AddTextPrinterParameterized(ItemPc_GetOrCreateSubwindow(1), 2, gStringVar4, 0, 2, 0, NULL); + AddTextPrinterParameterized(ItemPc_GetOrCreateSubwindow(1), FONT_2, gStringVar4, 0, 2, 0, NULL); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 3); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); ItemPc_SetBorderStyleOnWindow(3); - ItemPc_AddTextPrinterParameterized(3, 0, gStringVar4, 8, 10, 1, 0, 0, 1); + ItemPc_AddTextPrinterParameterized(3, FONT_0, gStringVar4, 8, 10, 1, 0, 0, 1); ScheduleBgCopyTilemapToVram(0); } @@ -970,7 +970,7 @@ static void UpdateWithdrawQuantityDisplay(s16 quantity) FillWindowPixelRect(3, PIXEL_FILL(1), 10, 10, 28, 12); ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, 3); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - ItemPc_AddTextPrinterParameterized(3, 0, gStringVar4, 8, 10, 1, 0, 0, 1); + ItemPc_AddTextPrinterParameterized(3, FONT_0, gStringVar4, 8, 10, 1, 0, 0, 1); } static void Task_ItemPcHandleWithdrawMultiple(u8 taskId) @@ -1090,7 +1090,7 @@ static void unused_ItemPc_AddTextPrinterParameterized(u8 windowId, const u8 * st template.currentChar = string; template.windowId = windowId; - template.fontId = 3; + template.fontId = FONT_3; template.x = x; template.y = y; template.currentX = x; @@ -1098,9 +1098,9 @@ static void unused_ItemPc_AddTextPrinterParameterized(u8 windowId, const u8 * st template.fgColor = 2; template.bgColor = 0; template.shadowColor = 3; - template.unk = GetFontAttribute(3, FONTATTR_UNKNOWN); - template.letterSpacing = letterSpacing + GetFontAttribute(3, FONTATTR_LETTER_SPACING); - template.lineSpacing = lineSpacing + GetFontAttribute(3, FONTATTR_LINE_SPACING); + template.unk = GetFontAttribute(FONT_3, FONTATTR_UNKNOWN); + template.letterSpacing = letterSpacing + GetFontAttribute(FONT_3, FONTATTR_LETTER_SPACING); + template.lineSpacing = lineSpacing + GetFontAttribute(FONT_3, FONTATTR_LINE_SPACING); AddTextPrinter(&template, speed, NULL); } @@ -1140,6 +1140,6 @@ static u8 ItemPc_GetSubwindow(u8 idx) static void ItemPc_PrintOnWindow5WithContinueTask(u8 taskId, const u8 * str, TaskFunc taskFunc) { - DisplayMessageAndContinueTask(taskId, 5, 0x3AC, 0x0B, 2, GetTextSpeedSetting(), str, taskFunc); + DisplayMessageAndContinueTask(taskId, 5, 0x3AC, 0x0B, FONT_2, GetTextSpeedSetting(), str, taskFunc); ScheduleBgCopyTilemapToVram(0); } diff --git a/src/item_use.c b/src/item_use.c index cdafef34f..716d42b9a 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -178,18 +178,18 @@ static void Task_WaitFadeIn_CallItemUseOnFieldCB(u8 taskId) } } -static void DisplayItemMessageInCurrentContext(u8 taskId, bool8 inField, u8 textSpeed, const u8 * str) +static void DisplayItemMessageInCurrentContext(u8 taskId, bool8 inField, u8 fontId, const u8 * str) { StringExpandPlaceholders(gStringVar4, str); if (inField == FALSE) - DisplayItemMessageInBag(taskId, textSpeed, gStringVar4, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, fontId, gStringVar4, Task_ReturnToBagFromContextMenu); else - DisplayItemMessageOnField(taskId, textSpeed, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField); + DisplayItemMessageOnField(taskId, fontId, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField); } static void PrintNotTheTimeToUseThat(u8 taskId, bool8 inField) { - DisplayItemMessageInCurrentContext(taskId, inField, 4, gText_OakForbidsUseOfItemHere); + DisplayItemMessageInCurrentContext(taskId, inField, FONT_4, gText_OakForbidsUseOfItemHere); } static void Task_ItemUse_CloseMessageBoxAndReturnToField(u8 taskId) @@ -262,7 +262,7 @@ void FieldUseFunc_MachBike(u8 taskId) || MetatileBehavior_IsHorizontalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedVerticalRail(behavior) == TRUE || MetatileBehavior_IsIsolatedHorizontalRail(behavior) == TRUE) - DisplayItemMessageInCurrentContext(taskId, gTasks[taskId].data[3], 2, gUnknown_8416451); + DisplayItemMessageInCurrentContext(taskId, gTasks[taskId].data[3], FONT_2, gUnknown_8416451); else if (Overworld_IsBikingAllowed() == TRUE && !IsBikingDisallowedByPlayer()) { sItemUseOnFieldCB = ItemUseOnFieldCB_Bicycle; @@ -339,9 +339,9 @@ void FieldUseFunc_CoinCase(u8 taskId) StringExpandPlaceholders(gStringVar4, gUnknown_8416537); ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF); if (gTasks[taskId].data[3] == 0) - DisplayItemMessageInBag(taskId, 2, gStringVar4, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_ReturnToBagFromContextMenu); else - DisplayItemMessageOnField(taskId, 2, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField); + DisplayItemMessageOnField(taskId, FONT_2, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField); } void FieldUseFunc_PowderJar(u8 taskId) @@ -350,9 +350,9 @@ void FieldUseFunc_PowderJar(u8 taskId) StringExpandPlaceholders(gStringVar4, gUnknown_8416644); ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF); if (gTasks[taskId].data[3] == 0) - DisplayItemMessageInBag(taskId, 2, gStringVar4, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_ReturnToBagFromContextMenu); else - DisplayItemMessageOnField(taskId, 2, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField); + DisplayItemMessageOnField(taskId, FONT_2, gStringVar4, Task_ItemUse_CloseMessageBoxAndReturnToField); } void FieldUseFunc_PokeFlute(u8 taskId) @@ -370,17 +370,17 @@ void FieldUseFunc_PokeFlute(u8 taskId) { ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF); if (gTasks[taskId].data[3] == 0) - DisplayItemMessageInBag(taskId, 2, gUnknown_8416690, sub_80A1648); + DisplayItemMessageInBag(taskId, FONT_2, gUnknown_8416690, sub_80A1648); else - DisplayItemMessageOnField(taskId, 2, gUnknown_8416690, sub_80A1648); + DisplayItemMessageOnField(taskId, FONT_2, gUnknown_8416690, sub_80A1648); } else { // Now that's a catchy tune! if (gTasks[taskId].data[3] == 0) - DisplayItemMessageInBag(taskId, 2, gUnknown_841665C, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gUnknown_841665C, Task_ReturnToBagFromContextMenu); else - DisplayItemMessageOnField(taskId, 2, gUnknown_841665C, Task_ItemUse_CloseMessageBoxAndReturnToField); + DisplayItemMessageOnField(taskId, FONT_2, gUnknown_841665C, Task_ItemUse_CloseMessageBoxAndReturnToField); } } @@ -395,9 +395,9 @@ static void sub_80A1674(u8 taskId) if (WaitFanfare(FALSE)) { if (gTasks[taskId].data[3] == 0) - DisplayItemMessageInBag(taskId, 2, gUnknown_84166A7, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gUnknown_84166A7, Task_ReturnToBagFromContextMenu); else - DisplayItemMessageOnField(taskId, 2, gUnknown_84166A7, Task_ItemUse_CloseMessageBoxAndReturnToField); + DisplayItemMessageOnField(taskId, FONT_2, gUnknown_84166A7, Task_ItemUse_CloseMessageBoxAndReturnToField); } } @@ -556,7 +556,7 @@ void FieldUseFunc_SuperRepel(u8 taskId) } else // An earlier repel is still in effect - DisplayItemMessageInBag(taskId, 2, gUnknown_841659E, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gUnknown_841659E, Task_ReturnToBagFromContextMenu); } static void sub_80A19E8(u8 taskId) @@ -566,7 +566,7 @@ static void sub_80A19E8(u8 taskId) ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, NULL, gSpecialVar_ItemId, 0xFFFF); VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gSpecialVar_ItemId)); sub_80A1A44(); - DisplayItemMessageInBag(taskId, 2, gStringVar4, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_ReturnToBagFromContextMenu); } } @@ -607,7 +607,7 @@ static void sub_80A1B48(u8 taskId) if (++gTasks[taskId].data[8] > 7) { PlaySE(SE_GLASS_FLUTE); - DisplayItemMessageInBag(taskId, 2, gStringVar4, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, Task_ReturnToBagFromContextMenu); } } @@ -636,7 +636,7 @@ static void sub_80A1C08(u8 taskId) Overworld_ResetStateAfterDigEscRope(); sub_80A1A44(); gTasks[taskId].data[0] = 0; - DisplayItemMessageOnField(taskId, 2, gStringVar4, sub_80A1C44); + DisplayItemMessageOnField(taskId, FONT_2, gStringVar4, sub_80A1C44); } void sub_80A1C44(u8 taskId) @@ -744,7 +744,7 @@ void BattleUseFunc_PokeBallEtc(u8 taskId) } else { - DisplayItemMessageInBag(taskId, 2, gUnknown_8416631, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gUnknown_8416631, Task_ReturnToBagFromContextMenu); } } @@ -758,7 +758,7 @@ void BattleUseFunc_GuardSpec(u8 taskId) { if (ExecuteTableBasedItemEffect(&gPlayerParty[gBattlerPartyIndexes[gBattlerInMenuId]], gSpecialVar_ItemId, gBattlerPartyIndexes[gBattlerInMenuId], 0)) { - DisplayItemMessageInBag(taskId, 2, gText_WontHaveEffect, Task_ReturnToBagFromContextMenu); + DisplayItemMessageInBag(taskId, FONT_2, gText_WontHaveEffect, Task_ReturnToBagFromContextMenu); } else { @@ -776,7 +776,7 @@ static void Task_BattleUse_StatBooster_DelayAndPrint(u8 taskId) u16 itemId = gSpecialVar_ItemId; PlaySE(SE_USE_ITEM); RemoveBagItem(itemId, 1); - DisplayItemMessageInBag(taskId, 2, Battle_PrintStatBoosterEffectMessage(itemId), Task_BattleUse_StatBooster_WaitButton_ReturnToBattle); + DisplayItemMessageInBag(taskId, FONT_2, Battle_PrintStatBoosterEffectMessage(itemId), Task_BattleUse_StatBooster_WaitButton_ReturnToBattle); } } @@ -827,7 +827,7 @@ void BattleUseFunc_PokeDoll(u8 taskId) { sub_80A1A44(); ItemUse_SetQuestLogEvent(QL_EVENT_USED_ITEM, 0, gSpecialVar_ItemId, 0xFFFF); - DisplayItemMessageInBag(taskId, 2, gStringVar4, ItemMenu_StartFadeToExitCallback); + DisplayItemMessageInBag(taskId, FONT_2, gStringVar4, ItemMenu_StartFadeToExitCallback); } else PrintNotTheTimeToUseThat(taskId, 0); @@ -907,7 +907,7 @@ void FieldUseFunc_OakStopsYou(u8 taskId) if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH) { StringExpandPlaceholders(gStringVar4, gText_OakForbidsUseOfItemHere); - DisplayItemMessageInBerryPouch(taskId, 4, gStringVar4, Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu); + DisplayItemMessageInBerryPouch(taskId, FONT_4, gStringVar4, Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu); } else PrintNotTheTimeToUseThat(taskId, gTasks[taskId].data[3]); diff --git a/src/itemfinder.c b/src/itemfinder.c index 8e8736bf1..95887985f 100644 --- a/src/itemfinder.c +++ b/src/itemfinder.c @@ -143,7 +143,7 @@ void ItemUseOnFieldCB_Itemfinder(u8 taskId) } else { - DisplayItemMessageOnField(taskId, 2, gText_NopeTheresNoResponse, Task_NoResponse_CleanUp); + DisplayItemMessageOnField(taskId, FONT_2, gText_NopeTheresNoResponse, Task_NoResponse_CleanUp); } } @@ -479,7 +479,7 @@ static u8 GetPlayerDirectionTowardsHiddenItem(s16 itemX, s16 itemY) static void Task_ItemfinderResponsePrintMessage(u8 taskId) { - DisplayItemMessageOnField(taskId, 2, gText_ItemfinderResponding, Task_ItemfinderResponseCleanUp); + DisplayItemMessageOnField(taskId, FONT_2, gText_ItemfinderResponding, Task_ItemfinderResponseCleanUp); } static void Task_ItemfinderResponseCleanUp(u8 taskId) @@ -493,7 +493,7 @@ static void Task_ItemfinderResponseCleanUp(u8 taskId) static void Task_ItemfinderUnderfootPrintMessage(u8 taskId) { - DisplayItemMessageOnField(taskId, 2, gText_ItemfinderShakingWildly, Task_ItemfinderUnderfootDigUpItem); + DisplayItemMessageOnField(taskId, FONT_2, gText_ItemfinderShakingWildly, Task_ItemfinderUnderfootDigUpItem); } static void Task_ItemfinderUnderfootDigUpItem(u8 taskId) diff --git a/src/learn_move.c b/src/learn_move.c index 12fa40b65..314125c9e 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -353,7 +353,7 @@ static const struct ListMenuTemplate sMoveRelearnerListMenuTemplate = { .lettersSpacing = 1, .itemVerticalPadding = 0, .scrollMultiple = 0, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0, }; @@ -506,7 +506,7 @@ static void MoveRelearnerStateMachine(void) MoveRelearnerMenuHandleInput(); break; case MENU_STATE_PRINT_TEACH_MOVE_PROMPT: - CreateYesNoMenu(&gUnknown_83FFA8C, 3, 0, 2, 0x001, 0xE, 0); + CreateYesNoMenu(&gUnknown_83FFA8C, FONT_3, 0, 2, 0x001, 0xE, 0); sMoveRelearner->state++; break; case MENU_STATE_TEACH_MOVE_CONFIRM : @@ -531,7 +531,7 @@ static void MoveRelearnerStateMachine(void) } break; case MENU_STATE_PRINT_GIVE_UP_PROMPT: - CreateYesNoMenu(&gUnknown_83FFA8C, 3, 0, 2, 0x001, 0xE, 0); + CreateYesNoMenu(&gUnknown_83FFA8C, FONT_3, 0, 2, 0x001, 0xE, 0); sMoveRelearner->state++; break; case MENU_STATE_GIVE_UP_CONFIRM: @@ -552,7 +552,7 @@ static void MoveRelearnerStateMachine(void) sMoveRelearner->state++; break; case MENU_STATE_WAIT_FOR_TRYING_TO_LEARN: - CreateYesNoMenu(&gUnknown_83FFA8C, 3, 0, 2, 0x001, 0xE, 0); + CreateYesNoMenu(&gUnknown_83FFA8C, FONT_3, 0, 2, 0x001, 0xE, 0); sMoveRelearner->state = 18; break; case MENU_STATE_CONFIRM_DELETE_OLD_MOVE: @@ -573,7 +573,7 @@ static void MoveRelearnerStateMachine(void) sMoveRelearner->state++; break; case MENU_STATE_WAIT_FOR_STOP_TEACHING: - CreateYesNoMenu(&gUnknown_83FFA8C, 3, 0, 2, 0x001, 0xE, 0); + CreateYesNoMenu(&gUnknown_83FFA8C, FONT_3, 0, 2, 0x001, 0xE, 0); sMoveRelearner->state = 26; break; case MENU_STATE_CONFIRM_STOP_TEACHING: @@ -928,5 +928,5 @@ static void PrintTextOnWindow(u8 windowId, const u8 *str, u8 x, u8 y, s32 speed, } if (colorIdx != 1) FillWindowPixelBuffer(windowId, PIXEL_FILL(sMoveRelearner->textColor[0])); - AddTextPrinterParameterized4(windowId, 3, x, y, letterSpacing, lineSpacing, sMoveRelearner->textColor, speed, str); + AddTextPrinterParameterized4(windowId, FONT_3, x, y, letterSpacing, lineSpacing, sMoveRelearner->textColor, speed, str); } diff --git a/src/link.c b/src/link.c index 0b85e2f35..b5167198e 100644 --- a/src/link.c +++ b/src/link.c @@ -1508,8 +1508,8 @@ void sub_800AE1C(void) LoadPalette(sWirelessLinkDisplayPal, 0, 0x20); FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(2, PIXEL_FILL(0)); - AddTextPrinterParameterized3(0, 3, 2, 5, sLinkErrorTextColor, 0, gText_CommErrorEllipsis); - AddTextPrinterParameterized3(2, 3, 2, 2, sLinkErrorTextColor, 0, gText_MoveCloserToLinkPartner); + AddTextPrinterParameterized3(0, FONT_3, 2, 5, sLinkErrorTextColor, 0, gText_CommErrorEllipsis); + AddTextPrinterParameterized3(2, FONT_3, 2, 2, sLinkErrorTextColor, 0, gText_MoveCloserToLinkPartner); PutWindowTilemap(0); PutWindowTilemap(2); CopyWindowToVram(0, 0); @@ -1522,7 +1522,7 @@ void sub_800AED0(void) { FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(2, PIXEL_FILL(0)); - AddTextPrinterParameterized3(1, 3, 2, 0, sLinkErrorTextColor, 0, gText_CommErrorCheckConnections); + AddTextPrinterParameterized3(1, FONT_3, 2, 0, sLinkErrorTextColor, 0, gText_CommErrorCheckConnections); PutWindowTilemap(1); PutWindowTilemap(2); CopyWindowToVram(1, 0); @@ -1556,11 +1556,11 @@ static void CB2_PrintErrorMessage(void) case 130: if (gWirelessCommType == 2) { - AddTextPrinterParameterized3(0, 3, 2, 20, sLinkErrorTextColor, 0, gText_ABtnTitleScreen); + AddTextPrinterParameterized3(0, FONT_3, 2, 20, sLinkErrorTextColor, 0, gText_ABtnTitleScreen); } else if (gWirelessCommType == 1) { - AddTextPrinterParameterized3(0, 3, 2, 20, sLinkErrorTextColor, 0, gText_ABtnRegistrationCounter); + AddTextPrinterParameterized3(0, FONT_3, 2, 20, sLinkErrorTextColor, 0, gText_ABtnRegistrationCounter); } break; } diff --git a/src/mail.c b/src/mail.c index aae5b93a5..ebe5e0312 100644 --- a/src/mail.c +++ b/src/mail.c @@ -669,13 +669,13 @@ static void AddMailMessagePrinters(void) { if (sMailViewResources->messageLinesBuffer[i][0] != EOS && sMailViewResources->messageLinesBuffer[i][0] != CHAR_SPACE) { - AddTextPrinterParameterized3(0, 1, sMailViewResources->messageLayout->linesLayout[i].lineXoffset + sMailViewResources->messageLayout->messageLeft, y + sMailViewResources->messageLayout->messageTop, sTextColor, 0, sMailViewResources->messageLinesBuffer[i]); + AddTextPrinterParameterized3(0, FONT_1, sMailViewResources->messageLayout->linesLayout[i].lineXoffset + sMailViewResources->messageLayout->messageLeft, y + sMailViewResources->messageLayout->messageTop, sTextColor, 0, sMailViewResources->messageLinesBuffer[i]); y += sMailViewResources->messageLayout->linesLayout[i].lineHeight; } } - width = GetStringWidth(1, gText_From, 0); - AddTextPrinterParameterized3(1, 1, sMailViewResources->nameX, sMailViewResources->messageLayout->nameY, sTextColor, 0, gText_From); - AddTextPrinterParameterized3(1, 1, sMailViewResources->nameX + width, sMailViewResources->messageLayout->nameY, sTextColor, 0, sMailViewResources->authorNameBuffer); + width = GetStringWidth(FONT_1, gText_From, 0); + AddTextPrinterParameterized3(1, FONT_1, sMailViewResources->nameX, sMailViewResources->messageLayout->nameY, sTextColor, 0, gText_From); + AddTextPrinterParameterized3(1, FONT_1, sMailViewResources->nameX + width, sMailViewResources->messageLayout->nameY, sTextColor, 0, sMailViewResources->authorNameBuffer); CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(1, COPYWIN_FULL); } diff --git a/src/mailbox_pc.c b/src/mailbox_pc.c index 107e2fd36..8ceafeb26 100644 --- a/src/mailbox_pc.c +++ b/src/mailbox_pc.c @@ -87,7 +87,7 @@ static void ItemPrintFunc(u8 windowId, u32 itemId, u8 y) StringCopy(strbuf, gSaveBlock1Ptr->mail[itemId + PARTY_SIZE].playerName); if (StringLength(strbuf) <= 5) ConvertInternationalString(strbuf, LANGUAGE_JAPANESE); - AddTextPrinterParameterized4(windowId, 2, 8, y, 0, 0, sTextColor, -1, strbuf); + AddTextPrinterParameterized4(windowId, FONT_2, 8, y, 0, 0, sTextColor, -1, strbuf); } } @@ -106,12 +106,12 @@ u8 MailboxPC_InitListMenu(struct PlayerPCItemPageStruct * playerPcStruct) gMultiuseListMenuTemplate.totalItems = playerPcStruct->count + 1; gMultiuseListMenuTemplate.windowId = sWindowIds[1]; gMultiuseListMenuTemplate.header_X = 0; - gMultiuseListMenuTemplate.item_X = GetMenuCursorDimensionByFont(2, 0); + gMultiuseListMenuTemplate.item_X = GetMenuCursorDimensionByFont(FONT_2, 0); gMultiuseListMenuTemplate.cursor_X = 0; gMultiuseListMenuTemplate.lettersSpacing = 0; gMultiuseListMenuTemplate.itemVerticalPadding = 2; gMultiuseListMenuTemplate.maxShowed = 8; - gMultiuseListMenuTemplate.fontId = 2; + gMultiuseListMenuTemplate.fontId = FONT_2; gMultiuseListMenuTemplate.upText_Y = 10; gMultiuseListMenuTemplate.cursorPal = 2; gMultiuseListMenuTemplate.fillValue = 1; diff --git a/src/main_menu.c b/src/main_menu.c index 5c3b888a2..67ad7546e 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -349,7 +349,7 @@ static void Task_PrintMainMenuText(u8 taskId) case MAIN_MENU_NEWGAME: default: FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME_ONLY, PIXEL_FILL(10)); - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME_ONLY, 2, 2, 2, sTextColor1, -1, gText_NewGame); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME_ONLY, FONT_2, 2, 2, sTextColor1, -1, gText_NewGame); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME_ONLY]); PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME_ONLY); CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME_ONLY, COPYWIN_FULL); @@ -357,8 +357,8 @@ static void Task_PrintMainMenuText(u8 taskId) case MAIN_MENU_CONTINUE: FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10)); FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME, PIXEL_FILL(10)); - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 2, 2, sTextColor1, -1, gText_Continue); - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME, 2, 2, 2, sTextColor1, -1, gText_NewGame); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 2, sTextColor1, -1, gText_Continue); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME, FONT_2, 2, 2, sTextColor1, -1, gText_NewGame); PrintContinueStats(); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_CONTINUE]); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME]); @@ -371,10 +371,10 @@ static void Task_PrintMainMenuText(u8 taskId) FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10)); FillWindowPixelBuffer(MAIN_MENU_WINDOW_NEWGAME, PIXEL_FILL(10)); FillWindowPixelBuffer(MAIN_MENU_WINDOW_MYSTERYGIFT, PIXEL_FILL(10)); - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 2, 2, sTextColor1, -1, gText_Continue); - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME, 2, 2, 2, sTextColor1, -1, gText_NewGame); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 2, sTextColor1, -1, gText_Continue); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME, FONT_2, 2, 2, sTextColor1, -1, gText_NewGame); gTasks[taskId].tMGErrorType = 1; - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_MYSTERYGIFT, 2, 2, 2, sTextColor1, -1, gText_MysteryGift); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_MYSTERYGIFT, FONT_2, 2, 2, sTextColor1, -1, gText_MysteryGift); PrintContinueStats(); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_CONTINUE]); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME]); @@ -600,7 +600,7 @@ static void PrintMessageOnWindow4(const u8 *str) { FillWindowPixelBuffer(MAIN_MENU_WINDOW_ERROR, PIXEL_FILL(10)); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_ERROR]); - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_ERROR, 2, 0, 2, sTextColor1, 2, str); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_ERROR, FONT_2, 0, 2, sTextColor1, 2, str); PutWindowTilemap(MAIN_MENU_WINDOW_ERROR); CopyWindowToVram(MAIN_MENU_WINDOW_ERROR, COPYWIN_GFX); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE( 19, 221)); @@ -620,12 +620,12 @@ static void PrintPlayerName(void) s32 i; u8 name[PLAYER_NAME_LENGTH + 1]; u8 *ptr; - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 2, 18, sTextColor2, -1, gText_Player); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 18, sTextColor2, -1, gText_Player); ptr = name; for (i = 0; i < PLAYER_NAME_LENGTH; i++) *ptr++ = gSaveBlock2Ptr->playerName[i]; *ptr = EOS; - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 62, 18, sTextColor2, -1, name); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 62, 18, sTextColor2, -1, name); } static void PrintPlayTime(void) @@ -633,11 +633,11 @@ static void PrintPlayTime(void) u8 strbuf[30]; u8 *ptr; - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 2, 34, sTextColor2, -1, gText_Time); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 34, sTextColor2, -1, gText_Time); ptr = ConvertIntToDecimalStringN(strbuf, gSaveBlock2Ptr->playTimeHours, STR_CONV_MODE_LEFT_ALIGN, 3); *ptr++ = CHAR_COLON; ConvertIntToDecimalStringN(ptr, gSaveBlock2Ptr->playTimeMinutes, STR_CONV_MODE_LEADING_ZEROS, 2); - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 62, 34, sTextColor2, -1, strbuf); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 62, 34, sTextColor2, -1, strbuf); } static void PrintDexCount(void) @@ -651,10 +651,10 @@ static void PrintDexCount(void) dexcount = GetNationalPokedexCount(FLAG_GET_CAUGHT); else dexcount = GetKantoPokedexCount(FLAG_GET_CAUGHT); - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 2, 50, sTextColor2, -1, gText_Pokedex); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 50, sTextColor2, -1, gText_Pokedex); ptr = ConvertIntToDecimalStringN(strbuf, dexcount, STR_CONV_MODE_LEFT_ALIGN, 3); StringAppend(ptr, gTextJPDummy_Hiki); - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 62, 50, sTextColor2, -1, strbuf); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 62, 50, sTextColor2, -1, strbuf); } } @@ -669,10 +669,10 @@ static void PrintBadgeCount(void) if (FlagGet(flagId)) nbadges++; } - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 2, 66, sTextColor2, -1, gText_Badges); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 2, 66, sTextColor2, -1, gText_Badges); ptr = ConvertIntToDecimalStringN(strbuf, nbadges, STR_CONV_MODE_LEADING_ZEROS, 1); StringAppend(ptr, gTextJPDummy_Ko); - AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, 2, 62, 66, sTextColor2, -1, strbuf); + AddTextPrinterParameterized3(MAIN_MENU_WINDOW_CONTINUE, FONT_2, 62, 66, sTextColor2, -1, strbuf); } static void LoadUserFrameToBg(u8 bgId) diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 95042ea83..8d6219858 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -197,9 +197,9 @@ static void MapNamePopupPrintMapNameOnWindow(u16 windowId) ptr = MapNamePopupAppendFloorNum(ptr, gMapHeader.floorNum); maxWidth = gMapHeader.floorNum != 0x7F ? 152 : 176; } - xpos = (maxWidth - GetStringWidth(2, mapName, -1)) / 2; + xpos = (maxWidth - GetStringWidth(FONT_2, mapName, -1)) / 2; FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - AddTextPrinterParameterized(windowId, 2, mapName, xpos, 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_2, mapName, xpos, 2, TEXT_SKIP_DRAW, NULL); } static u8 *MapNamePopupAppendFloorNum(u8 *dest, s8 floorNum) diff --git a/src/map_preview_screen.c b/src/map_preview_screen.c index 100db712a..65b8ba793 100644 --- a/src/map_preview_screen.c +++ b/src/map_preview_screen.c @@ -457,8 +457,8 @@ u16 MapPreview_CreateMapNameWindow(u8 mapsec) color[1] = TEXT_COLOR_RED; // Access violation color[2] = TEXT_COLOR_LIGHT_GRAY; // Access violation GetMapName(gStringVar4, mapsec, 0); - xctr = 104 - GetStringWidth(2, gStringVar4, 0); - AddTextPrinterParameterized4(windowId, 2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4); + xctr = 104 - GetStringWidth(FONT_2, gStringVar4, 0); + AddTextPrinterParameterized4(windowId, FONT_2, xctr / 2, 2, 0, 0, color/* Access violation */, -1, gStringVar4); return windowId; } diff --git a/src/menu.c b/src/menu.c index 328497259..3aedd0574 100644 --- a/src/menu.c +++ b/src/menu.c @@ -192,8 +192,8 @@ void TopBarWindowPrintString(const u8 *string, u8 unused, bool8 copyToVram) { PutWindowTilemap(sTopBarWindowId); FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(15)); - width = GetStringWidth(0, string, 0); - AddTextPrinterParameterized3(sTopBarWindowId, 0, -20 - width, 1, gUnknown_8456618, 0, string); + width = GetStringWidth(FONT_0, string, 0); + AddTextPrinterParameterized3(sTopBarWindowId, FONT_0, -20 - width, 1, gUnknown_8456618, 0, string); if (copyToVram) CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL); } @@ -223,10 +223,10 @@ void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgCo FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(15)); if (string2) { - width = GetStringWidth(0, string2, 0); - AddTextPrinterParameterized3(sTopBarWindowId, 0, -20 - width, 1, color, 0, string2); + width = GetStringWidth(FONT_0, string2, 0); + AddTextPrinterParameterized3(sTopBarWindowId, FONT_0, -20 - width, 1, color, 0, string2); } - AddTextPrinterParameterized4(sTopBarWindowId, 1, 4, 1, 0, 0, color, 0, string); + AddTextPrinterParameterized4(sTopBarWindowId, FONT_1, 4, 1, 0, 0, color, 0, string); if (copyToVram) CopyWindowToVram(sTopBarWindowId, COPYWIN_FULL); } @@ -552,9 +552,9 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u8 fontId, u8 left, u8 } // not used -static void CreateYesNoMenu2(const struct WindowTemplate *window, u8 paletteNum, u16 baseTileNum, u8 initialCursorPos) +static void CreateYesNoMenu2(const struct WindowTemplate *window, u8 fontId, u16 baseTileNum, u8 initialCursorPos) { - CreateYesNoMenu(window, paletteNum, 0, 0, baseTileNum, initialCursorPos, 0); + CreateYesNoMenu(window, fontId, 0, 0, baseTileNum, initialCursorPos, 0); } s8 Menu_ProcessInputNoWrapClearOnChoose(void) diff --git a/src/menu2.c b/src/menu2.c index fdf482fe8..0ee315b55 100644 --- a/src/menu2.c +++ b/src/menu2.c @@ -436,8 +436,8 @@ void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 x, u8 y, const u8 * printer.y = y; printer.currentX = printer.x; printer.currentY = printer.y; - printer.letterSpacing = GetFontAttribute(fontId, 2); - printer.lineSpacing = GetFontAttribute(fontId, 3); + printer.letterSpacing = GetFontAttribute(fontId, FONTATTR_LETTER_SPACING); + printer.lineSpacing = GetFontAttribute(fontId, FONTATTR_LINE_SPACING); printer.unk = 0; printer.fgColor = color[1]; printer.bgColor = color[0]; @@ -479,9 +479,9 @@ void AddTextPrinterParameterized5(u8 windowId, u8 fontId, const u8 *str, u8 x, u printer.letterSpacing = letterSpacing; printer.lineSpacing = lineSpacing; printer.unk = 0; - printer.fgColor = GetFontAttribute(fontId, 5); - printer.bgColor = GetFontAttribute(fontId, 6); - printer.shadowColor = GetFontAttribute(fontId, 7); + printer.fgColor = GetFontAttribute(fontId, FONTATTR_COLOR_FOREGROUND); + printer.bgColor = GetFontAttribute(fontId, FONTATTR_COLOR_BACKGROUND); + printer.shadowColor = GetFontAttribute(fontId, FONTATTR_COLOR_SHADOW); AddTextPrinter(&printer, speed, callback); } @@ -495,11 +495,11 @@ void Menu_PrintFormatIntlPlayerName(u8 windowId, const u8 * src, u16 x, u16 y) StringExpandPlaceholders(gStringVar4, src); if (i != 5) { - AddTextPrinterParameterized(windowId, 2, gStringVar4, x, y, 0xFF, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gStringVar4, x, y, 0xFF, NULL); } else { - AddTextPrinterParameterized5(windowId, 2, gStringVar4, x, y, 0xFF, NULL, 0, 0); + AddTextPrinterParameterized5(windowId, FONT_2, gStringVar4, x, y, 0xFF, NULL, 0, 0); } } diff --git a/src/menu_helpers.c b/src/menu_helpers.c index 5e4e39763..9b8bbda21 100644 --- a/src/menu_helpers.c +++ b/src/menu_helpers.c @@ -242,7 +242,7 @@ bool8 AdjustQuantityAccordingToDPadInput(s16 *quantity_p, u16 qmax) u8 GetDialogBoxFontId(void) { if (!ContextNpcGetTextColor()) - return 4; + return FONT_4; else - return 5; + return FONT_5; } diff --git a/src/mevent_show_card.c b/src/mevent_show_card.c index bf2fe23b5..8d3ce4895 100644 --- a/src/mevent_show_card.c +++ b/src/mevent_show_card.c @@ -355,42 +355,42 @@ static void sub_8145D18(u8 whichWindow) case 0: { s32 x; - AddTextPrinterParameterized3(windowId, 3, 0, 1, gUnknown_8467068[sMEventScreenData->bgSpec->textPal1], 0, sMEventScreenData->title); - x = 160 - GetStringWidth(3, sMEventScreenData->subtitle, GetFontAttribute(3, 2)); + AddTextPrinterParameterized3(windowId, FONT_3, 0, 1, gUnknown_8467068[sMEventScreenData->bgSpec->textPal1], 0, sMEventScreenData->title); + x = 160 - GetStringWidth(FONT_3, sMEventScreenData->subtitle, GetFontAttribute(FONT_3, FONTATTR_LETTER_SPACING)); if (x < 0) x = 0; - AddTextPrinterParameterized3(windowId, 3, x, 17, gUnknown_8467068[sMEventScreenData->bgSpec->textPal1], 0, sMEventScreenData->subtitle); + AddTextPrinterParameterized3(windowId, FONT_3, x, 17, gUnknown_8467068[sMEventScreenData->bgSpec->textPal1], 0, sMEventScreenData->subtitle); if (sMEventScreenData->wonderCard.idNumber != 0) { - AddTextPrinterParameterized3(windowId, 2, 166, 17, gUnknown_8467068[sMEventScreenData->bgSpec->textPal1], 0, sMEventScreenData->unk_01DD); + AddTextPrinterParameterized3(windowId, FONT_2, 166, 17, gUnknown_8467068[sMEventScreenData->bgSpec->textPal1], 0, sMEventScreenData->unk_01DD); } break; } case 1: for (; sp0C < 4; sp0C++) { - AddTextPrinterParameterized3(windowId, 3, 0, 16 * sp0C + 2, gUnknown_8467068[sMEventScreenData->bgSpec->textPal2], 0, sMEventScreenData->mainMessageLines[sp0C]); + AddTextPrinterParameterized3(windowId, FONT_3, 0, 16 * sp0C + 2, gUnknown_8467068[sMEventScreenData->bgSpec->textPal2], 0, sMEventScreenData->mainMessageLines[sp0C]); } break; case 2: - AddTextPrinterParameterized3(windowId, 3, 0, sTextYCoords[sMEventScreenData->wonderCard.type], gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->instructionsLine1); + AddTextPrinterParameterized3(windowId, FONT_3, 0, sTextYCoords[sMEventScreenData->wonderCard.type], gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->instructionsLine1); if (sMEventScreenData->wonderCard.type != 2) { - AddTextPrinterParameterized3(windowId, 3, 0, 16 + sTextYCoords[sMEventScreenData->wonderCard.type], gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->instructionsLine2); + AddTextPrinterParameterized3(windowId, FONT_3, 0, 16 + sTextYCoords[sMEventScreenData->wonderCard.type], gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->instructionsLine2); } else { s32 x = 0; s32 y = sTextYCoords[sMEventScreenData->wonderCard.type] + 16; - s32 spacing = GetFontAttribute(3, 2); + s32 spacing = GetFontAttribute(FONT_3, FONTATTR_LETTER_SPACING); for (; sp0C < sMEventScreenData->recordIdx; sp0C++) { - AddTextPrinterParameterized3(windowId, 3, x, y, gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->recordStrings[sp0C].nameTxt); + AddTextPrinterParameterized3(windowId, FONT_3, x, y, gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->recordStrings[sp0C].nameTxt); if (sMEventScreenData->recordStrings[sp0C].numberTxt[0] != EOS) { - x += GetStringWidth(3, sMEventScreenData->recordStrings[sp0C].nameTxt, spacing); - AddTextPrinterParameterized3(windowId, 2, x, y, gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->recordStrings[sp0C].numberTxt); - x += GetStringWidth(3, sMEventScreenData->recordStrings[sp0C].numberTxt, spacing) + sMEventScreenData->recordStrings[sp0C].nDigits; + x += GetStringWidth(FONT_3, sMEventScreenData->recordStrings[sp0C].nameTxt, spacing); + AddTextPrinterParameterized3(windowId, FONT_2, x, y, gUnknown_8467068[sMEventScreenData->bgSpec->textPal3], 0, sMEventScreenData->recordStrings[sp0C].numberTxt); + x += GetStringWidth(FONT_3, sMEventScreenData->recordStrings[sp0C].numberTxt, spacing) + sMEventScreenData->recordStrings[sp0C].nDigits; } } } diff --git a/src/mevent_show_news.c b/src/mevent_show_news.c index e874a93c2..088f00f11 100644 --- a/src/mevent_show_news.c +++ b/src/mevent_show_news.c @@ -318,13 +318,13 @@ static void sub_8146A30(void) PutWindowTilemap(sWork->windowIds[1]); FillWindowPixelBuffer(sWork->windowIds[0], 0); FillWindowPixelBuffer(sWork->windowIds[1], 0); - x = (0xe0 - GetStringWidth(3, sWork->title, GetFontAttribute(3, 2))) / 2; + x = (0xe0 - GetStringWidth(FONT_3, sWork->title, GetFontAttribute(FONT_3, FONTATTR_LETTER_SPACING))) / 2; if (x < 0) x = 0; - AddTextPrinterParameterized3(sWork->windowIds[0], 3, x, 6, sTextPals[sWork->bgSpec->textPal1], 0, sWork->title); + AddTextPrinterParameterized3(sWork->windowIds[0], FONT_3, x, 6, sTextPals[sWork->bgSpec->textPal1], 0, sWork->title); for (; i < 10; ++i) { - AddTextPrinterParameterized3(sWork->windowIds[1], 3, 0, 16 * i + 2, sTextPals[sWork->bgSpec->textPal2], 0, sWork->messages[i]); + AddTextPrinterParameterized3(sWork->windowIds[1], FONT_3, 0, 16 * i + 2, sTextPals[sWork->bgSpec->textPal2], 0, sWork->messages[i]); } CopyWindowToVram(sWork->windowIds[0], COPYWIN_FULL); CopyWindowToVram(sWork->windowIds[1], COPYWIN_FULL); diff --git a/src/money.c b/src/money.c index 2fb151709..cff3d8d46 100644 --- a/src/money.c +++ b/src/money.c @@ -84,7 +84,7 @@ void PrintMoneyAmountInMoneyBox(u8 windowId, int amount, u8 speed) *(txtPtr++) = 0; StringExpandPlaceholders(txtPtr, gText_PokedollarVar1); - AddTextPrinterParameterized(windowId, 0, gStringVar4, 64 - GetStringWidth(0, gStringVar4, 0), 0xC, speed, NULL); + AddTextPrinterParameterized(windowId, FONT_0, gStringVar4, 64 - GetStringWidth(FONT_0, gStringVar4, 0), 0xC, speed, NULL); } void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed) @@ -101,13 +101,13 @@ void PrintMoneyAmount(u8 windowId, u8 x, u8 y, int amount, u8 speed) *(txtPtr++) = 0; StringExpandPlaceholders(txtPtr, gText_PokedollarVar1); - AddTextPrinterParameterized(windowId, 0, gStringVar4, x, y, speed, NULL); + AddTextPrinterParameterized(windowId, FONT_0, gStringVar4, x, y, speed, NULL); } void PrintMoneyAmountInMoneyBoxWithBorder(u8 windowId, u16 tileStart, u8 pallete, int amount) { DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, tileStart, pallete); - AddTextPrinterParameterized(windowId, 2, gText_TrainerCardMoney, 0, 0, 0xFF, 0); + AddTextPrinterParameterized(windowId, FONT_2, gText_TrainerCardMoney, 0, 0, 0xFF, 0); PrintMoneyAmountInMoneyBox(windowId, amount, 0); } diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index 4db94d60a..8ed6e80d4 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -221,7 +221,7 @@ const struct ListMenuTemplate sListMenuTemplate_ThreeOptions = { .lettersSpacing = 0, .itemVerticalPadding = 0, .scrollMultiple = 0, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0 }; @@ -266,7 +266,7 @@ const struct ListMenuTemplate sListMenu_ReceiveSendToss = { .lettersSpacing = 0, .itemVerticalPadding = 0, .scrollMultiple = 0, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0 }; @@ -287,7 +287,7 @@ const struct ListMenuTemplate sListMenu_ReceiveToss = { .lettersSpacing = 0, .itemVerticalPadding = 0, .scrollMultiple = 0, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0 }; @@ -308,7 +308,7 @@ const struct ListMenuTemplate sListMenu_ReceiveSend = { .lettersSpacing = 0, .itemVerticalPadding = 0, .scrollMultiple = 0, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0 }; @@ -329,7 +329,7 @@ const struct ListMenuTemplate sListMenu_Receive = { .lettersSpacing = 0, .itemVerticalPadding = 2, .scrollMultiple = 0, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0 }; @@ -469,14 +469,14 @@ void PrintMysteryGiftOrEReaderTopMenu(bool8 mg_or_ereader, bool32 usePickOkCance if (!mg_or_ereader) { src = usePickOkCancel == TRUE ? gText_PickOKExit : gText_PickOKCancel; - AddTextPrinterParameterized4(0, 2, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gText_MysteryGift2); - width = 222 - GetStringWidth(0, src, 0); - AddTextPrinterParameterized4(0, 0, width, 2, 0, 0, sMG_Ereader_TextColor_1, 0, src); + AddTextPrinterParameterized4(0, FONT_2, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gText_MysteryGift2); + width = 222 - GetStringWidth(FONT_0, src, 0); + AddTextPrinterParameterized4(0, FONT_0, width, 2, 0, 0, sMG_Ereader_TextColor_1, 0, src); } else { - AddTextPrinterParameterized4(0, 2, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_MysteryGift); - AddTextPrinterParameterized4(0, 0, 0x78, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_DecideStop); + AddTextPrinterParameterized4(0, FONT_2, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_MysteryGift); + AddTextPrinterParameterized4(0, FONT_0, 0x78, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_DecideStop); } CopyWindowToVram(0, COPYWIN_GFX); PutWindowTilemap(0); @@ -527,7 +527,7 @@ void AddTextPrinterToWindow1(const u8 *str) { StringExpandPlaceholders(gStringVar4, str); FillWindowPixelBuffer(1, 0x11); - AddTextPrinterParameterized4(1, 2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4); + AddTextPrinterParameterized4(1, FONT_2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4); DrawTextBorderOuter(1, 0x001, 0xF); PutWindowTilemap(1); CopyWindowToVram(1, COPYWIN_FULL); @@ -634,7 +634,7 @@ u32 MysteryGift_HandleThreeOptionMenu(u8 * unused0, u16 * unused1, u8 whichMenu) width = 0; for (i = 0; i < listMenuTemplate.totalItems; i++) { - u32 curWidth = GetStringWidth(2, listMenuTemplate.items[i].label, listMenuTemplate.lettersSpacing); + u32 curWidth = GetStringWidth(FONT_2, listMenuTemplate.items[i].label, listMenuTemplate.lettersSpacing); if (curWidth > width) width = curWidth; } @@ -668,7 +668,7 @@ s8 mevent_message_print_and_prompt_yes_no(u8 * textState, u16 * windowId, bool8 *windowId = AddWindow(&sWindowTemplate_PromptYesOrNo_Width20); } FillWindowPixelBuffer(*windowId, 0x11); - AddTextPrinterParameterized4(*windowId, 2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4); + AddTextPrinterParameterized4(*windowId, FONT_2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4); DrawTextBorderOuter(*windowId, 0x001, 0x0F); CopyWindowToVram(*windowId, COPYWIN_GFX); PutWindowTilemap(*windowId); @@ -684,7 +684,7 @@ s8 mevent_message_print_and_prompt_yes_no(u8 * textState, u16 * windowId, bool8 { windowTemplate.tilemapTop = 15; } - CreateYesNoMenu(&windowTemplate, 2, 0, 2, 10, 14, 0); + CreateYesNoMenu(&windowTemplate, FONT_2, 0, 2, 10, 14, 0); (*textState)++; break; case 2: @@ -729,7 +729,7 @@ s32 HandleMysteryGiftListMenu(u8 * textState, u16 * windowId, bool32 cannotToss, } *windowId = AddWindow(&sMysteryGiftMenuWindowTemplate); FillWindowPixelBuffer(*windowId, 0x11); - AddTextPrinterParameterized4(*windowId, 2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4); + AddTextPrinterParameterized4(*windowId, FONT_2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4); DrawTextBorderOuter(*windowId, 0x001, 0x0F); CopyWindowToVram(*windowId, COPYWIN_GFX); PutWindowTilemap(*windowId); diff --git a/src/naming_screen.c b/src/naming_screen.c index b7d1d7d8f..1749e33e9 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -706,7 +706,7 @@ static void pokemon_transfer_to_pc_with_message(void) StringExpandPlaceholders(gStringVar4, sTransferredToPCMessages[stringToDisplay]); DrawDialogueFrame(0, FALSE); gTextFlags.canABSpeedUpPrint = TRUE; - AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); } @@ -1604,7 +1604,7 @@ static void HandleDpadMovement(struct Task *task) static void PrintTitleFunction_NoMon(void) { FillWindowPixelBuffer(sNamingScreenData->windows[3], PIXEL_FILL(1)); - AddTextPrinterParameterized(sNamingScreenData->windows[3], 1, sNamingScreenData->template->title, 1, 1, 0, NULL); + AddTextPrinterParameterized(sNamingScreenData->windows[3], FONT_1, sNamingScreenData->template->title, 1, 1, 0, NULL); PutWindowTilemap(sNamingScreenData->windows[3]); } @@ -1615,7 +1615,7 @@ static void PrintTitleFunction_WithMon(void) StringCopy(buffer, gSpeciesNames[sNamingScreenData->monSpecies]); StringAppendN(buffer, sNamingScreenData->template->title, 15); FillWindowPixelBuffer(sNamingScreenData->windows[3], PIXEL_FILL(1)); - AddTextPrinterParameterized(sNamingScreenData->windows[3], 1, buffer, 1, 1, 0, NULL); + AddTextPrinterParameterized(sNamingScreenData->windows[3], FONT_1, buffer, 1, 1, 0, NULL); PutWindowTilemap(sNamingScreenData->windows[3]); } @@ -1666,7 +1666,7 @@ static void AddGenderIconFunc_Yes(void) StringCopy(genderSymbol, gText_FemaleSymbol); gender = FEMALE; } - AddTextPrinterParameterized3(sNamingScreenData->windows[2], 2, 0x68, 1, sGenderColors[gender], TEXT_SKIP_DRAW, genderSymbol); + AddTextPrinterParameterized3(sNamingScreenData->windows[2], FONT_2, 0x68, 1, sGenderColors[gender], TEXT_SKIP_DRAW, genderSymbol); } } @@ -1799,7 +1799,7 @@ static void PrintBufferCharactersOnScreen(void) temp[1] = gExpandedPlaceholder_Empty[0]; xoff = (IsLetter(temp[0]) == TRUE) ? 2 : 0; - AddTextPrinterParameterized(sNamingScreenData->windows[2], 2, temp, i * 8 + xpos + xoff, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sNamingScreenData->windows[2], FONT_2, temp, i * 8 + xpos + xoff, 1, TEXT_SKIP_DRAW, NULL); } CallAddGenderIconFunc(); @@ -1840,7 +1840,7 @@ static void sub_809F9E8(u8 window, u8 page) for (i = 0; i < KBROW_COUNT; i++) { - AddTextPrinterParameterized3(window, 1, 0, i * 16 + 1, sKeyboardTextColors[page], 0, sNamingScreenKeyboardText[page][i]); + AddTextPrinterParameterized3(window, FONT_1, 0, i * 16 + 1, sKeyboardTextColors[page], 0, sNamingScreenKeyboardText[page][i]); } PutWindowTilemap(window); @@ -1881,10 +1881,10 @@ static void sub_809FA60(void) static void sub_809FAE4(void) { const u8 color[3] = { TEXT_DYNAMIC_COLOR_6, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY }; - int strwidth = GetStringWidth(0, gText_MoveOkBack, 0); + int strwidth = GetStringWidth(FONT_0, gText_MoveOkBack, 0); FillWindowPixelBuffer(sNamingScreenData->windows[4], PIXEL_FILL(15)); - AddTextPrinterParameterized3(sNamingScreenData->windows[4], 0, 236 - strwidth, 0, color, 0, gText_MoveOkBack); + AddTextPrinterParameterized3(sNamingScreenData->windows[4], FONT_0, 236 - strwidth, 0, color, 0, gText_MoveOkBack); PutWindowTilemap(sNamingScreenData->windows[4]); CopyWindowToVram(sNamingScreenData->windows[4], COPYWIN_FULL); } diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c index 0dfeffa46..39b86e132 100644 --- a/src/new_menu_helpers.c +++ b/src/new_menu_helpers.c @@ -431,23 +431,23 @@ void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress) gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; result = ContextNpcGetTextColor(); if (result == 0) - AddTextPrinterParameterized2(0, 4, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_BLUE, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_4, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_BLUE, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); else if (result == 1) - AddTextPrinterParameterized2(0, 5, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_RED, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_5, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_RED, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); else - AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gStringVar4, GetTextSpeedSetting(), nptr, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress) { gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; - AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed) { gTextFlags.canABSpeedUpPrint = allowSkippingDelayWithButtonPress; - AddTextPrinterParameterized2(0, 2, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } void LoadStdWindowFrameGfx(void) @@ -640,21 +640,21 @@ static u16 GetStdPalColor(u8 colorNum) return gTMCaseMainWindowPalette[colorNum]; } -void DisplayItemMessageOnField(u8 taskId, u8 textSpeed, const u8 *string, TaskFunc callback) +void DisplayItemMessageOnField(u8 taskId, u8 fontId, const u8 *string, TaskFunc callback) { LoadStdWindowFrameGfx(); - DisplayMessageAndContinueTask(taskId, 0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM, textSpeed, GetTextSpeedSetting(), string, callback); + DisplayMessageAndContinueTask(taskId, 0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM, fontId, GetTextSpeedSetting(), string, callback); CopyWindowToVram(0, COPYWIN_FULL); } void DisplayYesNoMenuDefaultYes(void) { - CreateYesNoMenu(&sYesNo_WindowTemplate, 2, 0, 2, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0); + CreateYesNoMenu(&sYesNo_WindowTemplate, FONT_2, 0, 2, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 0); } void DisplayYesNoMenuDefaultNo(void) { - CreateYesNoMenu(&sYesNo_WindowTemplate, 2, 0, 2, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 1); + CreateYesNoMenu(&sYesNo_WindowTemplate, FONT_2, 0, 2, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM, 1); } u8 GetTextSpeedSetting(void) diff --git a/src/oak_speech.c b/src/oak_speech.c index 4d0d23841..9dd2d5175 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -593,7 +593,7 @@ static void CreateHelpDocsPage1(void) sOakSpeechResources->unk_0014[0] = AddWindow(sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012]); PutWindowTilemap(sOakSpeechResources->unk_0014[0]); FillWindowPixelBuffer(sOakSpeechResources->unk_0014[0], 0x00); - AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[0], 2, 2, 0, 1, 1, sTextColor_HelpSystem, 0, gNewGame_HelpDocs1); + AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[0], FONT_2, 2, 0, 1, 1, sTextColor_HelpSystem, 0, gNewGame_HelpDocs1); CopyWindowToVram(sOakSpeechResources->unk_0014[0], COPYWIN_FULL); FillBgTilemapBufferRect_Palette0(1, 0x3000, 1, 3, 5, 16); CopyBgTilemapBufferToVram(1); @@ -615,7 +615,7 @@ static void Task_OakSpeech4(u8 taskId) sOakSpeechResources->unk_0014[i] = AddWindow(&sHelpDocsWindowTemplatePtrs[sOakSpeechResources->unk_0012][i]); PutWindowTilemap(sOakSpeechResources->unk_0014[i]); FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00); - AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[i], 2, 6, 0, 1, 1, sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]); + AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[i], FONT_2, 6, 0, 1, 1, sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]); CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_FULL); } @@ -747,7 +747,7 @@ static void Task_OakSpeech6(u8 taskId) sOakSpeechResources->unk_0012 = 0; gMain.state = 0; data[15] = 16; - AddTextPrinterParameterized4(data[14], 2, 3, 5, 1, 0, sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[0]); + AddTextPrinterParameterized4(data[14], FONT_2, 3, 5, 1, 0, sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[0]); data[5] = CreateTextCursorSpriteForOakSpeech(0, 0xe2, 0x91, 0, 0); gSprites[data[5]].oam.objMode = ST_OAM_OBJ_BLEND; gSprites[data[5]].oam.priority = 0; @@ -807,7 +807,7 @@ static void Task_OakSpeech7(u8 taskId) if (data[15] <= 0) { FillWindowPixelBuffer(data[14], 0x00); - AddTextPrinterParameterized4(data[14], 2, 3, 5, 1, 0, sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[sOakSpeechResources->unk_0012]); + AddTextPrinterParameterized4(data[14], FONT_2, 3, 5, 1, 0, sTextColor_OakSpeech, 0, sNewGameAdventureIntroTextPointers[sOakSpeechResources->unk_0012]); if (sOakSpeechResources->unk_0012 == 0) { ClearTopBarWindow(); @@ -906,11 +906,11 @@ static void Task_OakSpeech9(u8 taskId) if (str != gStringVar4) \ { \ StringExpandPlaceholders(gStringVar4, str); \ - AddTextPrinterParameterized2(0, 4, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); \ + AddTextPrinterParameterized2(0, FONT_4, gStringVar4, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); \ } \ else \ { \ - AddTextPrinterParameterized2(0, 4, str, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); \ + AddTextPrinterParameterized2(0, FONT_4, str, speed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); \ } \ CopyWindowToVram(0, COPYWIN_FULL); \ }) @@ -1076,12 +1076,12 @@ static void Task_OakSpeech19(u8 taskId) sOakSpeechResources->textColor[0] = 1; sOakSpeechResources->textColor[1] = 2; sOakSpeechResources->textColor[2] = 3; - AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 1, sOakSpeechResources->textColor, 0, gText_Boy); + AddTextPrinterParameterized3(gTasks[taskId].data[13], FONT_2, 8, 1, sOakSpeechResources->textColor, 0, gText_Boy); sOakSpeechResources->textColor[0] = 1; sOakSpeechResources->textColor[1] = 2; sOakSpeechResources->textColor[2] = 3; - AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 17, sOakSpeechResources->textColor, 0, gText_Girl); - Menu_InitCursor(gTasks[taskId].data[13], 2, 0, 1, GetFontAttribute(2, 1) + 2, 2, 0); + AddTextPrinterParameterized3(gTasks[taskId].data[13], FONT_2, 8, 17, sOakSpeechResources->textColor, 0, gText_Girl); + Menu_InitCursor(gTasks[taskId].data[13], FONT_2, 0, 1, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, 2, 0); CopyWindowToVram(gTasks[taskId].data[13], COPYWIN_FULL); gTasks[taskId].func = Task_OakSpeech20; } @@ -1263,7 +1263,7 @@ static void Task_OakSpeech26(u8 taskId) data[3]--; else { - CreateYesNoMenu(&sNewGameAdventureIntroWindowTemplates[2], 2, 0, 2, GetStdWindowBaseTileNum(), 14, 0); + CreateYesNoMenu(&sNewGameAdventureIntroWindowTemplates[2], FONT_2, 0, 2, GetStdWindowBaseTileNum(), 14, 0); gTasks[taskId].func = Task_OakSpeech27; } } @@ -1871,16 +1871,16 @@ static void PrintNameChoiceOptions(u8 taskId, u8 hasPlayerBeenNamed) PutWindowTilemap(data[13]); DrawStdFrameWithCustomTileAndPalette(data[13], 1, GetStdWindowBaseTileNum(), 14); FillWindowPixelBuffer(gTasks[taskId].data[13], 0x11); - AddTextPrinterParameterized(data[13], 2, gOtherText_NewName, 8, 1, 0, NULL); + AddTextPrinterParameterized(data[13], FONT_2, gOtherText_NewName, 8, 1, 0, NULL); if (hasPlayerBeenNamed == FALSE) textPtrs = gSaveBlock2Ptr->playerGender == MALE ? sMaleNameChoices : sFemaleNameChoices; else textPtrs = sRivalNameChoices; for (i = 0; i < 4; i++) { - AddTextPrinterParameterized(data[13], 2, textPtrs[i], 8, 16 * (i + 1) + 1, 0, NULL); + AddTextPrinterParameterized(data[13], FONT_2, textPtrs[i], 8, 16 * (i + 1) + 1, 0, NULL); } - Menu_InitCursor(data[13], 2, 0, 1, 16, 5, 0); + Menu_InitCursor(data[13], FONT_2, 0, 1, 16, 5, 0); CopyWindowToVram(data[13], COPYWIN_FULL); } diff --git a/src/option_menu.c b/src/option_menu.c index 42002795d..477178ada 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -316,9 +316,9 @@ static void InitOptionMenuBg(void) static void OptionMenu_PickSwitchCancel(void) { s32 x; - x = 0xE4 - GetStringWidth(0, gText_PickSwitchCancel, 0); + x = 0xE4 - GetStringWidth(FONT_0, gText_PickSwitchCancel, 0); FillWindowPixelBuffer(2, PIXEL_FILL(15)); - AddTextPrinterParameterized3(2, 0, x, 0, sOptionMenuPickSwitchCancelTextColor, 0, gText_PickSwitchCancel); + AddTextPrinterParameterized3(2, FONT_0, x, 0, sOptionMenuPickSwitchCancelTextColor, 0, gText_PickSwitchCancel); PutWindowTilemap(2); CopyWindowToVram(2, COPYWIN_FULL); } @@ -472,31 +472,31 @@ static void BufferOptionMenuString(u8 selection) memcpy(dst, sOptionMenuTextColor, 3); x = 0x82; - y = ((GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT) - 1) * selection) + 2; - FillWindowPixelRect(1, 1, x, y, 0x46, GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT)); + y = ((GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) - 1) * selection) + 2; + FillWindowPixelRect(1, 1, x, y, 0x46, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT)); switch (selection) { case MENUITEM_TEXTSPEED: - AddTextPrinterParameterized3(1, 2, x, y, dst, -1, sTextSpeedOptions[sOptionMenuPtr->option[selection]]); + AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, sTextSpeedOptions[sOptionMenuPtr->option[selection]]); break; case MENUITEM_BATTLESCENE: - AddTextPrinterParameterized3(1, 2, x, y, dst, -1, sBattleSceneOptions[sOptionMenuPtr->option[selection]]); + AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, sBattleSceneOptions[sOptionMenuPtr->option[selection]]); break; case MENUITEM_BATTLESTYLE: - AddTextPrinterParameterized3(1, 2, x, y, dst, -1, sBattleStyleOptions[sOptionMenuPtr->option[selection]]); + AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, sBattleStyleOptions[sOptionMenuPtr->option[selection]]); break; case MENUITEM_SOUND: - AddTextPrinterParameterized3(1, 2, x, y, dst, -1, sSoundOptions[sOptionMenuPtr->option[selection]]); + AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, sSoundOptions[sOptionMenuPtr->option[selection]]); break; case MENUITEM_BUTTONMODE: - AddTextPrinterParameterized3(1, 2, x, y, dst, -1, sButtonTypeOptions[sOptionMenuPtr->option[selection]]); + AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, sButtonTypeOptions[sOptionMenuPtr->option[selection]]); break; case MENUITEM_FRAMETYPE: StringCopy(str, gText_FrameType); ConvertIntToDecimalStringN(buf, sOptionMenuPtr->option[selection] + 1, 1, 2); StringAppendN(str, buf, 3); - AddTextPrinterParameterized3(1, 2, x, y, dst, -1, str); + AddTextPrinterParameterized3(1, FONT_2, x, y, dst, -1, str); break; default: break; @@ -524,7 +524,7 @@ static void CloseAndSaveOptionMenu(u8 taskId) static void PrintOptionMenuHeader(void) { FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized(WIN_TEXT_OPTION, 2, gText_MenuOption, 8, 1, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(WIN_TEXT_OPTION, FONT_2, gText_MenuOption, 8, 1, TEXT_SKIP_DRAW, NULL); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); } @@ -560,7 +560,7 @@ static void LoadOptionMenuItemNames(void) FillWindowPixelBuffer(1, PIXEL_FILL(1)); for (i = 0; i < MENUITEM_COUNT; i++) { - AddTextPrinterParameterized(WIN_OPTIONS, 2, sOptionMenuItemsNames[i], 8, (u8)((i * (GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT))) + 2) - i, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(WIN_OPTIONS, FONT_2, sOptionMenuItemsNames[i], 8, (u8)((i * (GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT))) + 2) - i, TEXT_SKIP_DRAW, NULL); } } @@ -568,7 +568,7 @@ static void UpdateSettingSelectionDisplay(u16 selection) { u16 maxLetterHeight, y; - maxLetterHeight = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT); + maxLetterHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT); y = selection * (maxLetterHeight - 1) + 0x3A; SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(y, y + maxLetterHeight)); SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0x10, 0xE0)); diff --git a/src/party_menu.c b/src/party_menu.c index d1679b695..ee2800801 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -2160,7 +2160,7 @@ static void CreateCancelConfirmWindows(bool8 chooseHalf) { confirmWindowId = AddWindow(&sConfirmButtonWindowTemplate); FillWindowPixelBuffer(confirmWindowId, PIXEL_FILL(0)); - AddTextPrinterParameterized4(confirmWindowId, 0, (48 - GetStringWidth(0, gMenuText_Confirm, 0)) / 2u, 1, 0, 0, sFontColorTable[0], -1, gMenuText_Confirm); + AddTextPrinterParameterized4(confirmWindowId, FONT_0, (48 - GetStringWidth(FONT_0, gMenuText_Confirm, 0)) / 2u, 1, 0, 0, sFontColorTable[0], -1, gMenuText_Confirm); PutWindowTilemap(confirmWindowId); CopyWindowToVram(confirmWindowId, COPYWIN_GFX); cancelWindowId = AddWindow(&sMultiCancelButtonWindowTemplate); @@ -2175,13 +2175,13 @@ static void CreateCancelConfirmWindows(bool8 chooseHalf) // Branches are functionally identical. Second branch is never reached, Spin Trade wasnt fully implemented if (gPartyMenu.menuType != PARTY_MENU_TYPE_SPIN_TRADE) { - offset += (48 - GetStringWidth(0, gFameCheckerText_Cancel, 0)) / 2; - AddTextPrinterParameterized3(cancelWindowId, 0, offset, 1, sFontColorTable[0], -1, gFameCheckerText_Cancel); + offset += (48 - GetStringWidth(FONT_0, gFameCheckerText_Cancel, 0)) / 2; + AddTextPrinterParameterized3(cancelWindowId, FONT_0, offset, 1, sFontColorTable[0], -1, gFameCheckerText_Cancel); } else { - offset += (48 - GetStringWidth(0, gOtherText_Exit, 0)) / 2; - AddTextPrinterParameterized3(cancelWindowId, 0, offset, 1, sFontColorTable[0], -1, gOtherText_Exit); + offset += (48 - GetStringWidth(FONT_0, gOtherText_Exit, 0)) / 2; + AddTextPrinterParameterized3(cancelWindowId, FONT_0, offset, 1, sFontColorTable[0], -1, gOtherText_Exit); } PutWindowTilemap(cancelWindowId); CopyWindowToVram(cancelWindowId, COPYWIN_GFX); @@ -2322,7 +2322,7 @@ static void LoadPartyBoxPalette(struct PartyMenuBox *menuBox, u8 palFlags) static void DisplayPartyPokemonBarDetail(u8 windowId, const u8 *str, u8 color, const u8 *align) { - AddTextPrinterParameterized3(windowId, 0, align[0], align[1], sFontColorTable[color], 0, str); + AddTextPrinterParameterized3(windowId, FONT_0, align[0], align[1], sFontColorTable[color], 0, str); } static void DisplayPartyPokemonNickname(struct Pokemon *mon, struct PartyMenuBox *menuBox, u8 c) @@ -2478,7 +2478,7 @@ static void DisplayPartyPokemonDescriptionText(u8 stringId, struct PartyMenuBox if (c != 0) menuBox->infoRects->blitFunc(menuBox->windowId, menuBox->infoRects->descTextLeft >> 3, menuBox->infoRects->descTextTop >> 3, menuBox->infoRects->descTextWidth >> 3, menuBox->infoRects->descTextHeight >> 3, TRUE); if (c != 2) - AddTextPrinterParameterized3(menuBox->windowId, 1, menuBox->infoRects->descTextLeft, menuBox->infoRects->descTextTop, sFontColorTable[0], 0, sDescriptionStringTable[stringId]); + AddTextPrinterParameterized3(menuBox->windowId, FONT_1, menuBox->infoRects->descTextLeft, menuBox->infoRects->descTextTop, sFontColorTable[0], 0, sDescriptionStringTable[stringId]); } static void PartyMenuRemoveWindow(u8 *ptr) @@ -2530,7 +2530,7 @@ void DisplayPartyMenuStdMessage(u32 stringId) } DrawStdFrameWithCustomTileAndPalette(*windowPtr, FALSE, 0x58, 0xF); StringExpandPlaceholders(gStringVar4, sActionStringTable[stringId]); - AddTextPrinterParameterized(*windowPtr, 2, gStringVar4, 0, 2, 0, 0); + AddTextPrinterParameterized(*windowPtr, FONT_2, gStringVar4, 0, 2, 0, 0); ScheduleBgCopyTilemapToVram(2); } } @@ -2579,15 +2579,15 @@ static u8 DisplaySelectionWindow(u8 windowType) DrawStdFrameWithCustomTileAndPalette(sPartyMenuInternal->windowId[0], FALSE, 0x4F, 13); if (windowType == SELECTWINDOW_MOVES) return sPartyMenuInternal->windowId[0]; - cursorDimension = GetMenuCursorDimensionByFont(2, 0); - fontAttribute = GetFontAttribute(2, FONTATTR_LETTER_SPACING); + cursorDimension = GetMenuCursorDimensionByFont(FONT_2, 0); + fontAttribute = GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING); for (i = 0; i < sPartyMenuInternal->numActions; ++i) { u8 fontColorsId = (sPartyMenuInternal->actions[i] >= MENU_FIELD_MOVES) ? 4 : 3; - AddTextPrinterParameterized4(sPartyMenuInternal->windowId[0], 2, cursorDimension, (i * 16) + 2, fontAttribute, 0, sFontColorTable[fontColorsId], 0, sCursorOptions[sPartyMenuInternal->actions[i]].text); + AddTextPrinterParameterized4(sPartyMenuInternal->windowId[0], FONT_2, cursorDimension, (i * 16) + 2, fontAttribute, 0, sFontColorTable[fontColorsId], 0, sCursorOptions[sPartyMenuInternal->actions[i]].text); } - Menu_InitCursorInternal(sPartyMenuInternal->windowId[0], 2, 0, 2, 16, sPartyMenuInternal->numActions, 0, 1); + Menu_InitCursorInternal(sPartyMenuInternal->windowId[0], FONT_2, 0, 2, 16, sPartyMenuInternal->numActions, 0, 1); ScheduleBgCopyTilemapToVram(2); return sPartyMenuInternal->windowId[0]; } @@ -2596,12 +2596,12 @@ static void PartyMenuPrintText(const u8 *text) { DrawStdFrameWithCustomTileAndPalette(6, FALSE, 0x4F, 13); gTextFlags.canABSpeedUpPrint = TRUE; - AddTextPrinterParameterized2(6, 2, text, GetTextSpeedSetting(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(6, FONT_2, text, GetTextSpeedSetting(), 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } static void PartyMenuDisplayYesNoMenu(void) { - CreateYesNoMenu(&sPartyMenuYesNoWindowTemplate, 2, 0, 2, 0x4F, 13, 0); + CreateYesNoMenu(&sPartyMenuYesNoWindowTemplate, FONT_2, 0, 2, 0x4F, 13, 0); } static u8 CreateLevelUpStatsWindow(void) @@ -2621,7 +2621,7 @@ static void PartyMenu_Oak_PrintText(u8 windowId, const u8 *str) { StringExpandPlaceholders(gStringVar4, str); gTextFlags.canABSpeedUpPrint = TRUE; - AddTextPrinterParameterized2(windowId, 4, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(windowId, FONT_4, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } static bool8 FirstBattleEnterParty_CreateWindowAndMsg1Printer(void) @@ -2662,8 +2662,8 @@ static void sub_8122138(u8 action) if (ptr->windowId[2] == 0xFF) ptr->windowId[2] = AddWindow(&gUnknown_845A178); sub_8112F18(ptr->windowId[2]); - attr = GetFontAttribute(2, FONTATTR_LETTER_SPACING); - AddTextPrinterParameterized4(ptr->windowId[2], 2, 3, 6, attr, 0, sFontColorTable[5], 0, sHMDescriptionTable[action - MENU_FIELD_MOVES]); + attr = GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING); + AddTextPrinterParameterized4(ptr->windowId[2], FONT_2, 3, 6, attr, 0, sFontColorTable[5], 0, sHMDescriptionTable[action - MENU_FIELD_MOVES]); PutWindowTilemap(ptr->windowId[2]); ScheduleBgCopyTilemapToVram(2); } @@ -4584,7 +4584,7 @@ static void ShowMoveSelectWindow(u8 slot) { u8 i; u8 moveCount = 0; - u8 fontId = 2; + u8 fontId = FONT_2; u8 windowId = DisplaySelectionWindow(SELECTWINDOW_MOVES); u16 move; diff --git a/src/player_pc.c b/src/player_pc.c index 3f5b4dbe6..a150828b3 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -157,7 +157,7 @@ void BedroomPC(void) sItemOrder = gUnknown_8402200; sTopMenuItemCount = 3; taskId = CreateTask(TaskDummy, 0); - DisplayItemMessageOnField(taskId, 2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu); + DisplayItemMessageOnField(taskId, FONT_2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu); } void PlayerPC(void) @@ -169,7 +169,7 @@ void PlayerPC(void) sItemOrder = gUnknown_8402203; sTopMenuItemCount = 3; taskId = CreateTask(TaskDummy, 0); - DisplayItemMessageOnField(taskId, 2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu); + DisplayItemMessageOnField(taskId, FONT_2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu); } static void Task_DrawPlayerPcTopMenu(u8 taskId) @@ -180,8 +180,8 @@ static void Task_DrawPlayerPcTopMenu(u8 taskId) else tWindowId = AddWindow(&sWindowTemplate_TopMenu_4Items); SetStdWindowBorderStyle(tWindowId, 0); - AddItemMenuActionTextPrinters(tWindowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, GetFontAttribute(2, FONTATTR_LETTER_SPACING), 16, sTopMenuItemCount, sMenuActions_TopMenu, sItemOrder); - Menu_InitCursor(tWindowId, 2, 0, 2, 16, sTopMenuItemCount, 0); + AddItemMenuActionTextPrinters(tWindowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, GetFontAttribute(FONT_2, FONTATTR_LETTER_SPACING), 16, sTopMenuItemCount, sMenuActions_TopMenu, sItemOrder); + Menu_InitCursor(tWindowId, FONT_2, 0, 2, 16, sTopMenuItemCount, 0); ScheduleBgCopyTilemapToVram(0); gTasks[taskId].func = Task_TopMenuHandleInput; } @@ -215,7 +215,7 @@ static void Task_TopMenuHandleInput(u8 taskId) static void Task_ReturnToTopMenu(u8 taskId) { RestoreHelpContext(); - DisplayItemMessageOnField(taskId, 2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu); + DisplayItemMessageOnField(taskId, FONT_2, gText_WhatWouldYouLikeToDo, Task_DrawPlayerPcTopMenu); } static void Task_PlayerPcItemStorage(u8 taskId) @@ -229,7 +229,7 @@ static void Task_PlayerPcMailbox(u8 taskId) gPlayerPcMenuManager.count = CountPCMail(); if (gPlayerPcMenuManager.count == 0) { - DisplayItemMessageOnField(taskId, 2, gText_TheresNoMailHere, Task_ReturnToTopMenu); + DisplayItemMessageOnField(taskId, FONT_2, gText_TheresNoMailHere, Task_ReturnToTopMenu); } else { @@ -249,7 +249,7 @@ static void Task_PlayerPcMailbox(u8 taskId) } else { - DisplayItemMessageOnField(taskId, 2, gText_TheresNoMailHere, Task_ReturnToTopMenu); + DisplayItemMessageOnField(taskId, FONT_2, gText_TheresNoMailHere, Task_ReturnToTopMenu); } } } @@ -272,8 +272,8 @@ static void Task_CreateItemStorageSubmenu(u8 taskId, u8 cursorPos) SetHelpContext(HELPCONTEXT_PLAYERS_PC_ITEMS); tWindowId = AddWindow(&sWindowTemplate_ItemStorageSubmenu); SetStdWindowBorderStyle(tWindowId, FALSE); - PrintTextArray(tWindowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, 16, 3, sMenuActions_ItemPc); - Menu_InitCursor(tWindowId, 2, 0, 2, 16, 3, cursorPos); + PrintTextArray(tWindowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, 16, 3, sMenuActions_ItemPc); + Menu_InitCursor(tWindowId, FONT_2, 0, 2, 16, 3, cursorPos); ScheduleBgCopyTilemapToVram(0); PrintStringOnWindow0WithDialogueFrame(sItemStorageActionDescriptionPtrs[cursorPos]); } @@ -281,7 +281,7 @@ static void Task_CreateItemStorageSubmenu(u8 taskId, u8 cursorPos) static void PrintStringOnWindow0WithDialogueFrame(const u8 *str) { DrawDialogueFrame(0, FALSE); - AddTextPrinterParameterized(0, 2, str, 0, 1, 0, NULL); + AddTextPrinterParameterized(0, FONT_2, str, 0, 1, 0, NULL); } static void Task_TopMenu_ItemStorageSubmenu_HandleInput(u8 taskId) @@ -364,7 +364,7 @@ static void Task_PlayerPcWithdrawItem(u8 taskId) ClearStdWindowAndFrameToTransparent(tWindowId, FALSE); ClearWindowTilemap(tWindowId); RemoveWindow(tWindowId); - DisplayItemMessageOnField(taskId, 2, gText_ThereAreNoItems, Task_PlayerPcItemStorage); + DisplayItemMessageOnField(taskId, FONT_2, gText_ThereAreNoItems, Task_PlayerPcItemStorage); } } @@ -453,9 +453,9 @@ static void PCMailCompaction(void) static void Task_DrawMailboxPcMenu(u8 taskId) { u8 windowId = MailboxPC_GetAddWindow(0); - s32 width = GetStringWidth(2, gText_Mailbox, 0); + s32 width = GetStringWidth(FONT_2, gText_Mailbox, 0); MailboxPC_GetAddWindow(1); - AddTextPrinterParameterized(windowId, 2, gText_Mailbox, (80 - width) / 2, 2, 0, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gText_Mailbox, (80 - width) / 2, 2, 0, NULL); ScheduleBgCopyTilemapToVram(0); gTasks[taskId].tListMenuTaskId = MailboxPC_InitListMenu(&gPlayerPcMenuManager); MailboxPC_AddScrollIndicatorArrows(&gPlayerPcMenuManager); @@ -512,7 +512,7 @@ static void Task_PrintWhatToDoWithSelectedMail(u8 taskId) ConvertInternationalString(gStringVar1, LANGUAGE_JAPANESE); } StringExpandPlaceholders(gStringVar4, gText_WhatWouldYouLikeToDoWithPlayersMail); - DisplayItemMessageOnField(taskId, 2, gStringVar4, Task_DrawMailSubmenu); + DisplayItemMessageOnField(taskId, FONT_2, gStringVar4, Task_DrawMailSubmenu); } static void Task_DestroyMailboxPcViewAndCancel(u8 taskId) @@ -529,8 +529,8 @@ static void Task_DestroyMailboxPcViewAndCancel(u8 taskId) static void Task_DrawMailSubmenu(u8 taskId) { u8 windowId = MailboxPC_GetAddWindow(2); - PrintTextArray(windowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, 16, 4, sMenuActions_MailSubmenu); - Menu_InitCursor(windowId, 2, 0, 2, 16, 4, 0); + PrintTextArray(windowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, 16, 4, sMenuActions_MailSubmenu); + Menu_InitCursor(windowId, FONT_2, 0, 2, 16, 4, 0); ScheduleBgCopyTilemapToVram(0); gTasks[taskId].func = Task_MailSubmenuHandleInput; } @@ -600,7 +600,7 @@ static void CB2_SetCbToReturnToMailbox(void) static void Task_PlayerPcMoveMailToBag(u8 taskId) { - DisplayItemMessageOnField(taskId, 2, gText_MessageWillBeLost, Task_DrawYesNoMenuToConfirmMoveToBag); + DisplayItemMessageOnField(taskId, FONT_2, gText_MessageWillBeLost, Task_DrawYesNoMenuToConfirmMoveToBag); } static void Task_DrawYesNoMenuToConfirmMoveToBag(u8 taskId) @@ -632,11 +632,11 @@ static void Task_TryPutMailInBag_DestroyMsgIfSuccessful(u8 taskId) struct Mail * mail = &SELECTED_MAIL; if (!AddBagItem(mail->itemId, 1)) { - DisplayItemMessageOnField(taskId, 2, gText_BagIsFull, Task_PlayerPcExitMailSubmenu); + DisplayItemMessageOnField(taskId, FONT_2, gText_BagIsFull, Task_PlayerPcExitMailSubmenu); } else { - DisplayItemMessageOnField(taskId, 2, gText_MailReturnedToBagMessageErased, Task_PlayerPcExitMailSubmenu); + DisplayItemMessageOnField(taskId, FONT_2, gText_MailReturnedToBagMessageErased, Task_PlayerPcExitMailSubmenu); ClearMailStruct(mail); PCMailCompaction(); gPlayerPcMenuManager.count--; @@ -715,7 +715,7 @@ void Mailbox_ReturnToMailListAfterDeposit(void) static void Task_Error_NoPokemon(u8 taskId) { - DisplayItemMessageOnField(taskId, 2, gText_ThereIsNoPokemon, Task_PlayerPcExitMailSubmenu); + DisplayItemMessageOnField(taskId, FONT_2, gText_ThereIsNoPokemon, Task_PlayerPcExitMailSubmenu); } static void Task_RedrawPlayerPcMailboxAndSetUpInputHandler(u8 taskId) diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c index 4b1e2df8c..764d3c770 100644 --- a/src/pokedex_screen.c +++ b/src/pokedex_screen.c @@ -353,7 +353,7 @@ static const struct ListMenuTemplate sListMenuTemplate_KantoDexModeSelect = { .lettersSpacing = 1, .itemVerticalPadding = 0, .scrollMultiple = 0, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0, }; @@ -397,7 +397,7 @@ static const struct ListMenuTemplate sListMenuTemplate_NatDexModeSelect = { .lettersSpacing = 1, .itemVerticalPadding = 0, .scrollMultiple = 0, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0, }; @@ -520,7 +520,7 @@ static const struct ListMenuTemplate sListMenuTemplate_OrderedListMenu = { .lettersSpacing = 1, .itemVerticalPadding = 0, .scrollMultiple = 1, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0, }; @@ -1133,15 +1133,15 @@ static void DexScreen_InitGfxForTopMenu(void) listMenuTemplate.windowId = sPokedexScreenData->modeSelectWindowId; sPokedexScreenData->modeSelectListMenuId = ListMenuInit(&listMenuTemplate, sPokedexScreenData->modeSelectCursorPos, sPokedexScreenData->modeSelectItemsAbove); FillWindowPixelBuffer(sPokedexScreenData->dexCountsWindowId, PIXEL_FILL(0)); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, 0, gText_Seen, 0, 2, 0); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, 0, gText_Kanto, 8, 13, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_Seen, 0, 2, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_Kanto, 8, 13, 0); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numSeenKanto, 52, 13, 2); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, 0, gText_National, 8, 24, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_National, 8, 24, 0); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numSeenNational, 52, 24, 2); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, 0, gText_Owned, 0, 37, 0); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, 0, gText_Kanto, 8, 48, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_Owned, 0, 37, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_Kanto, 8, 48, 0); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numOwnedKanto, 52, 48, 2); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, 0, gText_National, 8, 59, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_0, gText_National, 8, 59, 0); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 0, sPokedexScreenData->numOwnedNational, 52, 59, 2); } else @@ -1150,9 +1150,9 @@ static void DexScreen_InitGfxForTopMenu(void) listMenuTemplate.windowId = sPokedexScreenData->modeSelectWindowId; sPokedexScreenData->modeSelectListMenuId = ListMenuInit(&listMenuTemplate, sPokedexScreenData->modeSelectCursorPos, sPokedexScreenData->modeSelectItemsAbove); FillWindowPixelBuffer(sPokedexScreenData->dexCountsWindowId, PIXEL_FILL(0)); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, 1, gText_Seen, 0, 9, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_1, gText_Seen, 0, 9, 0); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 1, sPokedexScreenData->numSeenKanto, 32, 21, 2); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, 1, gText_Owned, 0, 37, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->dexCountsWindowId, FONT_1, gText_Owned, 0, 37, 0); DexScreen_PrintNum3RightAlign(sPokedexScreenData->dexCountsWindowId, 1, sPokedexScreenData->numOwnedKanto, 32, 49, 2); } FillWindowPixelBuffer(0, PIXEL_FILL(15)); @@ -1548,7 +1548,7 @@ static void ItemPrintFunc_OrderedListMenu(u8 windowId, u32 itemId, u8 y) bool8 seen = (itemId >> 16) & 1; // not used but required to match bool8 caught = (itemId >> 17) & 1; u8 type1; - DexScreen_PrintMonDexNo(sPokedexScreenData->numericalOrderWindowId, 0, species, 12, y); + DexScreen_PrintMonDexNo(sPokedexScreenData->numericalOrderWindowId, FONT_0, species, 12, y); if (caught) { BlitMoveInfoIcon(sPokedexScreenData->numericalOrderWindowId, 0, 0x28, y); @@ -2161,10 +2161,10 @@ static void DexScreen_AddTextPrinterParameterized(u8 windowId, u8 fontId, const textColor[2] = 2; break; } - AddTextPrinterParameterized4(windowId, fontId, x, y, fontId == 0 ? 0 : 1, 0, textColor, -1, str); + AddTextPrinterParameterized4(windowId, fontId, x, y, fontId == FONT_0 ? 0 : 1, 0, textColor, -1, str); } -void DexScreen_PrintNum3LeadingZeroes(u8 windowId, u8 fontId, u16 num, u8 x, u8 y, u8 colorIdx) +static void DexScreen_PrintNum3LeadingZeroes(u8 windowId, u8 fontId, u16 num, u8 x, u8 y, u8 colorIdx) { u8 buff[4]; buff[0] = (num / 100) + CHAR_0; @@ -2293,7 +2293,7 @@ static u16 DexScreen_GetDexCount(u8 caseId, bool8 whichDex) static void DexScreen_PrintControlInfo(const u8 *src) { - DexScreen_AddTextPrinterParameterized(1, 0, src, 236 - GetStringWidth(0, src, 0), 2, 4); + DexScreen_AddTextPrinterParameterized(1, FONT_0, src, 236 - GetStringWidth(FONT_0, src, 0), 2, 4); } bool8 DexScreen_DrawMonPicInCategoryPage(u16 species, u8 slot, u8 numSlots) @@ -2327,8 +2327,8 @@ bool8 DexScreen_DrawMonPicInCategoryPage(u16 species, u8 slot, u8 numSlots) template.baseBlock = slot * 40 + 0x108; sPokedexScreenData->categoryMonInfoWindowIds[slot] = AddWindow(&template); CopyToWindowPixelBuffer(sPokedexScreenData->categoryMonInfoWindowIds[slot], sCategoryMonInfoBgTiles, 0, 0); - DexScreen_PrintMonDexNo(sPokedexScreenData->categoryMonInfoWindowIds[slot], 0, species, 12, 0); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->categoryMonInfoWindowIds[slot], 2, gSpeciesNames[species], 2, 13, 0); + DexScreen_PrintMonDexNo(sPokedexScreenData->categoryMonInfoWindowIds[slot], FONT_0, species, 12, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->categoryMonInfoWindowIds[slot], FONT_2, gSpeciesNames[species], 2, 13, 0); if (DexScreen_GetSetPokedexFlag(species, FLAG_GET_CAUGHT, TRUE)) BlitBitmapRectToWindow(sPokedexScreenData->categoryMonInfoWindowIds[slot], sDexScreen_CaughtIcon, 0, 0, 8, 8, 2, 3, 8, 8); PutWindowTilemap(sPokedexScreenData->categoryMonInfoWindowIds[slot]); @@ -2695,9 +2695,9 @@ void DexScreen_PrintMonCategory(u8 windowId, u16 species, u8 x, u8 y) categoryStr[index] = EOS; - DexScreen_AddTextPrinterParameterized(windowId, 0, categoryStr, x, y, 0); - x += GetStringWidth(0, categoryStr, 0); - DexScreen_AddTextPrinterParameterized(windowId, 0, gText_PokedexPokemon, x, y, 0); + DexScreen_AddTextPrinterParameterized(windowId, FONT_0, categoryStr, x, y, 0); + x += GetStringWidth(FONT_0, categoryStr, 0); + DexScreen_AddTextPrinterParameterized(windowId, FONT_0, gText_PokedexPokemon, x, y, 0); } void DexScreen_PrintMonHeight(u8 windowId, u16 species, u8 x, u8 y) @@ -2752,9 +2752,9 @@ void DexScreen_PrintMonHeight(u8 windowId, u16 species, u8 x, u8 y) } buffer[i++] = EOS; - DexScreen_AddTextPrinterParameterized(windowId, 0, labelText, x, y, 0); + DexScreen_AddTextPrinterParameterized(windowId, FONT_0, labelText, x, y, 0); x += 30; - DexScreen_AddTextPrinterParameterized(windowId, 0, buffer, x, y, 0); + DexScreen_AddTextPrinterParameterized(windowId, FONT_0, buffer, x, y, 0); } void DexScreen_PrintMonWeight(u8 windowId, u16 species, u8 x, u8 y) @@ -2844,9 +2844,9 @@ void DexScreen_PrintMonWeight(u8 windowId, u16 species, u8 x, u8 y) buffer[i + j] = lbsText[j]; buffer[i + j] = EOS; - DexScreen_AddTextPrinterParameterized(windowId, 0, labelText, x, y, 0); + DexScreen_AddTextPrinterParameterized(windowId, FONT_0, labelText, x, y, 0); x += 30; - DexScreen_AddTextPrinterParameterized(windowId, 0, buffer, x, y, 0); + DexScreen_AddTextPrinterParameterized(windowId, FONT_0, buffer, x, y, 0); } void DexScreen_PrintMonFlavorText(u8 windowId, u16 species, u8 x, u8 y) @@ -2861,7 +2861,7 @@ void DexScreen_PrintMonFlavorText(u8 windowId, u16 species, u8 x, u8 y) { printerTemplate.currentChar = gPokedexEntries[species].description; printerTemplate.windowId = windowId; - printerTemplate.fontId = 2; + printerTemplate.fontId = FONT_2; printerTemplate.letterSpacing = 1; printerTemplate.lineSpacing = 0; printerTemplate.unk = 0; @@ -2869,7 +2869,7 @@ void DexScreen_PrintMonFlavorText(u8 windowId, u16 species, u8 x, u8 y) printerTemplate.bgColor = 0; printerTemplate.shadowColor = 2; - length = GetStringWidth(2, gPokedexEntries[species].description, 0); + length = GetStringWidth(FONT_2, gPokedexEntries[species].description, 0); xCenter = x + (240 - length) / 2; if (xCenter > 0) @@ -2937,8 +2937,8 @@ static u8 DexScreen_DrawMonDexPage(bool8 justRegistered) // Species stats FillWindowPixelBuffer(sPokedexScreenData->windowIds[1], PIXEL_FILL(0)); - DexScreen_PrintMonDexNo(sPokedexScreenData->windowIds[1], 0, sPokedexScreenData->dexSpecies, 0, 8); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[1], 2, gSpeciesNames[sPokedexScreenData->dexSpecies], 28, 8, 0); + DexScreen_PrintMonDexNo(sPokedexScreenData->windowIds[1], FONT_0, sPokedexScreenData->dexSpecies, 0, 8); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[1], FONT_2, gSpeciesNames[sPokedexScreenData->dexSpecies], 28, 8, 0); DexScreen_PrintMonCategory(sPokedexScreenData->windowIds[1], sPokedexScreenData->dexSpecies, 0, 24); DexScreen_PrintMonHeight(sPokedexScreenData->windowIds[1], sPokedexScreenData->dexSpecies, 0, 36); DexScreen_PrintMonWeight(sPokedexScreenData->windowIds[1], sPokedexScreenData->dexSpecies, 0, 48); @@ -2956,7 +2956,7 @@ static u8 DexScreen_DrawMonDexPage(bool8 justRegistered) FillWindowPixelBuffer(1, PIXEL_FILL(15)); if (justRegistered == FALSE) { - DexScreen_AddTextPrinterParameterized(1, 0, gText_Cry, 8, 2, 4); + DexScreen_AddTextPrinterParameterized(1, FONT_0, gText_Cry, 8, 2, 4); DexScreen_PrintControlInfo(gText_NextDataCancel); } else @@ -3059,8 +3059,8 @@ u8 DexScreen_DrawMonAreaPage(void) // Print "Size" FillWindowPixelBuffer(sPokedexScreenData->windowIds[9], PIXEL_FILL(0)); { - s32 strWidth = GetStringWidth(0, gText_Size, 0); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[9], 0, gText_Size, (sWindowTemplate_AreaMap_Size.width * 8 - strWidth) / 2, 4, 0); + s32 strWidth = GetStringWidth(FONT_0, gText_Size, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[9], FONT_0, gText_Size, (sWindowTemplate_AreaMap_Size.width * 8 - strWidth) / 2, 4, 0); } PutWindowTilemap(sPokedexScreenData->windowIds[9]); CopyWindowToVram(sPokedexScreenData->windowIds[9], COPYWIN_GFX); @@ -3068,8 +3068,8 @@ u8 DexScreen_DrawMonAreaPage(void) // Print "Area" FillWindowPixelBuffer(sPokedexScreenData->windowIds[10], PIXEL_FILL(0)); { - s32 strWidth = GetStringWidth(0, gText_Area, 0); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[10], 0, gText_Area, (sWindowTemplate_AreaMap_Area.width * 8 - strWidth) / 2, 4, 0); + s32 strWidth = GetStringWidth(FONT_0, gText_Area, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[10], FONT_0, gText_Area, (sWindowTemplate_AreaMap_Area.width * 8 - strWidth) / 2, 4, 0); } SetWindowAttribute(sPokedexScreenData->windowIds[10], WINDOW_TILEMAP_TOP, GetWindowAttribute(sPokedexScreenData->windowIds[10], WINDOW_TILEMAP_TOP) + kantoMapVoff); PutWindowTilemap(sPokedexScreenData->windowIds[10]); @@ -3077,8 +3077,8 @@ u8 DexScreen_DrawMonAreaPage(void) // Print species name FillWindowPixelBuffer(sPokedexScreenData->windowIds[8], PIXEL_FILL(0)); - DexScreen_PrintMonDexNo(sPokedexScreenData->windowIds[8], 0, species, 0, 0); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[8], 2, gSpeciesNames[species], 3, 12, 0); + DexScreen_PrintMonDexNo(sPokedexScreenData->windowIds[8], FONT_0, species, 0, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[8], FONT_2, gSpeciesNames[species], 3, 12, 0); PutWindowTilemap(sPokedexScreenData->windowIds[8]); CopyWindowToVram(sPokedexScreenData->windowIds[8], COPYWIN_GFX); @@ -3128,15 +3128,15 @@ u8 DexScreen_DrawMonAreaPage(void) { BlitBitmapRectToWindow(sPokedexScreenData->windowIds[0], (void *)sBlitTiles_WideEllipse, 0, 0, 88, 16, 4, 28, 88, 16); { - s32 strWidth = GetStringWidth(0, gText_AreaUnknown, 0); - DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[0], 0, gText_AreaUnknown, (96 - strWidth) / 2, 29, 0); + s32 strWidth = GetStringWidth(FONT_0, gText_AreaUnknown, 0); + DexScreen_AddTextPrinterParameterized(sPokedexScreenData->windowIds[0], FONT_0, gText_AreaUnknown, (96 - strWidth) / 2, 29, 0); } } CopyWindowToVram(sPokedexScreenData->windowIds[0], COPYWIN_GFX); // Draw the control info FillWindowPixelBuffer(1, PIXEL_FILL(15)); - DexScreen_AddTextPrinterParameterized(1, 0, gText_Cry, 8, 2, 4); + DexScreen_AddTextPrinterParameterized(1, FONT_0, gText_Cry, 8, 2, 4); DexScreen_PrintControlInfo(gText_CancelPreviousData); PutWindowTilemap(1); CopyWindowToVram(1, COPYWIN_GFX); @@ -3436,13 +3436,13 @@ void DexScreen_PrintStringWithAlignment(const u8 * str, s32 mode) x = 8; break; case TEXT_CENTER: - x = (u32)(240 - GetStringWidth(2, str, 0)) / 2; + x = (u32)(240 - GetStringWidth(FONT_2, str, 0)) / 2; break; case TEXT_RIGHT: default: - x = 232 - GetStringWidth(2, str, 0); + x = 232 - GetStringWidth(FONT_2, str, 0); break; } - DexScreen_AddTextPrinterParameterized(0, 2, str, x, 2, 4); + DexScreen_AddTextPrinterParameterized(0, FONT_2, str, x, 2, 4); } diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index b345de9bf..6bfea1553 100644 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -3169,7 +3169,7 @@ static void Msg_WantToPlayAgain(void) { case 0: sPokemonJumpGfx->msgWindowId = AddMessageWindow(1, 8, 20, 2); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_WantToPlayAgain2, 0, 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, gText_WantToPlayAgain2, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->mainState++; break; @@ -3196,7 +3196,7 @@ static void Msg_SavingDontTurnOff(void) { case 0: sPokemonJumpGfx->msgWindowId = AddMessageWindow(2, 7, 26, 4); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_SavingDontTurnOffPower, 0, 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, gText_SavingDontTurnOffPower, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->mainState++; break; @@ -3239,7 +3239,7 @@ static void Msg_SomeoneDroppedOut(void) { case 0: sPokemonJumpGfx->msgWindowId = AddMessageWindow(2, 8, 22, 4); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_SomeoneDroppedOut2, 0, 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, gText_SomeoneDroppedOut2, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->mainState++; break; @@ -3265,7 +3265,7 @@ static void Msg_CommunicationStandby(void) { case 0: sPokemonJumpGfx->msgWindowId = AddMessageWindow(7, 10, 16, 2); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, gText_CommunicationStandby4, 0, 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, gText_CommunicationStandby4, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->mainState++; break; @@ -3358,7 +3358,7 @@ static void PrintPrizeMessage(u16 itemId, u16 quantity) DynamicPlaceholderTextUtil_SetPlaceholderPtr(1, sPokemonJumpGfx->itemQuantityStr); DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_AwesomeWonF701F700); sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 8, 22, 4); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->fanfare = MUS_LEVEL_UP; sPokemonJumpGfx->msgWindowState = 0; @@ -3371,7 +3371,7 @@ static void PrintPrizeFilledBagMessage(u16 itemId) DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName); DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_FilledStorageSpace2); sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 8, 22, 4); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->fanfare = MUS_DUMMY; sPokemonJumpGfx->msgWindowState = 0; @@ -3384,7 +3384,7 @@ static void PrintNoRoomForPrizeMessage(u16 itemId) DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, sPokemonJumpGfx->itemName); DynamicPlaceholderTextUtil_ExpandPlaceholders(sPokemonJumpGfx->prizeMsg, gText_CantHoldMore); sPokemonJumpGfx->msgWindowId = AddMessageWindow(4, 9, 22, 2); - AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, 2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sPokemonJumpGfx->msgWindowId, FONT_2, sPokemonJumpGfx->prizeMsg, 0, 2, TEXT_SKIP_DRAW, NULL); CopyWindowToVram(sPokemonJumpGfx->msgWindowId, COPYWIN_GFX); sPokemonJumpGfx->fanfare = MUS_DUMMY; sPokemonJumpGfx->msgWindowState = 0; @@ -3493,7 +3493,7 @@ static void CreatePokeJumpYesNoMenu(u16 left, u16 top, u8 cursorPos) window.paletteNum = 2; window.baseBlock = 0x2B; - CreateYesNoMenu(&window, 2, 0, 2, 0x00a, 0xD, a); + CreateYesNoMenu(&window, FONT_2, 0, 2, 0x00a, 0xD, a); } // "Points" for jump score and "times" for number of jumps in a row @@ -3505,8 +3505,8 @@ static void PrintScoreSuffixes(void) PutWindowTilemap(WIN_TIMES); FillWindowPixelBuffer(WIN_POINTS, PIXEL_FILL(0)); FillWindowPixelBuffer(WIN_TIMES, PIXEL_FILL(0)); - AddTextPrinterParameterized3(WIN_POINTS, 0, 0, 2, color, 0, gText_SpacePoints2); - AddTextPrinterParameterized3(WIN_TIMES, 0, 0, 2, color, 0, gText_SpaceTimes3); + AddTextPrinterParameterized3(WIN_POINTS, FONT_0, 0, 2, color, 0, gText_SpacePoints2); + AddTextPrinterParameterized3(WIN_TIMES, FONT_0, 0, 2, color, 0, gText_SpaceTimes3); } // The venusaurs in the background are actually an empty 256x512 bg with 3 pairs of venusaurs on it. @@ -3726,9 +3726,9 @@ static void PrintPokeJumpPlayerName(int multiplayerId, u8 bgColor, u8 fgColor, u u8 colors[3] = {bgColor, fgColor, shadow}; FillWindowPixelBuffer(sPokemonJumpGfx->nameWindowIds[multiplayerId], PIXEL_FILL(0)); - x = 64 - GetStringWidth(0, GetPokeJumpPlayerName(multiplayerId), -1); + x = 64 - GetStringWidth(FONT_0, GetPokeJumpPlayerName(multiplayerId), -1); x /= 2; - AddTextPrinterParameterized3(sPokemonJumpGfx->nameWindowIds[multiplayerId], 0, x, 2, colors, TEXT_SKIP_DRAW, GetPokeJumpPlayerName(multiplayerId)); + AddTextPrinterParameterized3(sPokemonJumpGfx->nameWindowIds[multiplayerId], FONT_0, x, 2, colors, TEXT_SKIP_DRAW, GetPokeJumpPlayerName(multiplayerId)); CopyWindowToVram(sPokemonJumpGfx->nameWindowIds[multiplayerId], COPYWIN_GFX); } @@ -4557,14 +4557,14 @@ static void PrintRecordsText(u16 windowId) TextWindow_SetStdFrame0_WithPal(windowId, 0x21D, 0xD0); DrawTextBorderOuter(windowId, 0x21D, 0xD); FillWindowPixelBuffer(windowId, PIXEL_FILL(1)); - AddTextPrinterParameterized5(windowId, 2, gText_PkmnJumpRecords, 0, 0, TEXT_SKIP_DRAW, NULL, 1, 0); + AddTextPrinterParameterized5(windowId, FONT_2, gText_PkmnJumpRecords, 0, 0, TEXT_SKIP_DRAW, NULL, 1, 0); for (i = 0; i < ARRAY_COUNT(sRecordsTexts); i++) { - AddTextPrinterParameterized5(windowId, 2, sRecordsTexts[i], 0, 20 + (i * 14), TEXT_SKIP_DRAW, NULL, 1, 0); + AddTextPrinterParameterized5(windowId, FONT_2, sRecordsTexts[i], 0, 20 + (i * 14), TEXT_SKIP_DRAW, NULL, 1, 0); ConvertIntToDecimalStringN(strbuf, recordNums[i], STR_CONV_MODE_LEFT_ALIGN, 5); TruncateToFirstWordOnly(strbuf); - x = 0xDE - GetStringWidth(2, strbuf, 0); - AddTextPrinterParameterized5(windowId, 2, strbuf, x, 20 + (i * 14), TEXT_SKIP_DRAW, NULL, 0, 0); + x = 0xDE - GetStringWidth(FONT_2, strbuf, 0); + AddTextPrinterParameterized5(windowId, FONT_2, strbuf, x, 20 + (i * 14), TEXT_SKIP_DRAW, NULL, 0, 0); } PutWindowTilemap(windowId); } diff --git a/src/pokemon_special_anim_scene.c b/src/pokemon_special_anim_scene.c index 51fd15416..0b1277113 100644 --- a/src/pokemon_special_anim_scene.c +++ b/src/pokemon_special_anim_scene.c @@ -414,10 +414,10 @@ void PSA_PrintMessage(u8 messageId) DynamicPlaceholderTextUtil_ExpandPlaceholders(scene->textBuf, gUnknown_841B32E); break; case 4: // poof! - strWidth += GetStringWidth(2, gUnknown_841B2F1, -1); + strWidth += GetStringWidth(FONT_2, gUnknown_841B2F1, -1); // fallthrough case 3: // 2 and... - strWidth += GetStringWidth(2, gUnknown_841B2ED, -1); + strWidth += GetStringWidth(FONT_2, gUnknown_841B2ED, -1); // fallthrough case 2: // 1 StringCopy(scene->textBuf, s1_2_and_Poof_textPtrs[messageId - 2]); @@ -442,7 +442,7 @@ void PSA_PrintMessage(u8 messageId) return; } - AddTextPrinterParameterized5(0, 2, scene->textBuf, strWidth, 0, textSpeed, NULL, 0, 4); + AddTextPrinterParameterized5(0, FONT_2, scene->textBuf, strWidth, 0, textSpeed, NULL, 0, 4); } void PSA_AfterPoof_ClearMessageWindow(void) @@ -1508,13 +1508,13 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *beforeStats, u16 *afterStats, u8 bg for (i = 0; i < 6; i++) { - AddTextPrinterParameterized3(windowId, 2, 0, i * 15, textColor, TEXT_SKIP_DRAW, sLevelUpWindowStatNames[i]); + AddTextPrinterParameterized3(windowId, FONT_2, 0, i * 15, textColor, TEXT_SKIP_DRAW, sLevelUpWindowStatNames[i]); StringCopy(textbuf, diffStats[i] >= 0 ? gUnknown_841B2DC : gUnknown_841B2E5); - AddTextPrinterParameterized3(windowId, 2, 56, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); + AddTextPrinterParameterized3(windowId, FONT_2, 56, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); textbuf[0] = CHAR_SPACE; x = abs(diffStats[i]) < 10 ? 12 : 6; ConvertIntToDecimalStringN(textbuf + 1, abs(diffStats[i]), STR_CONV_MODE_LEFT_ALIGN, 2); - AddTextPrinterParameterized3(windowId, 2, x + 56, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); + AddTextPrinterParameterized3(windowId, FONT_2, x + 56, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); } } @@ -1550,7 +1550,7 @@ void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgColor, u8 fgColor, ndigits = 1; ConvertIntToDecimalStringN(textbuf, statsRearrange[i], STR_CONV_MODE_LEFT_ALIGN, ndigits); x = 6 * (4 - ndigits); - AddTextPrinterParameterized3(windowId, 2, 0, i * 15, textColor, TEXT_SKIP_DRAW, sLevelUpWindowStatNames[i]); - AddTextPrinterParameterized3(windowId, 2, 56 + x, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); + AddTextPrinterParameterized3(windowId, FONT_2, 0, i * 15, textColor, TEXT_SKIP_DRAW, sLevelUpWindowStatNames[i]); + AddTextPrinterParameterized3(windowId, FONT_2, 56 + x, i * 15, textColor, TEXT_SKIP_DRAW, textbuf); } } diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index 3bb940566..d835fb50c 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -29,7 +29,7 @@ static EWRAM_DATA u8 sPreviousBoxOption = 0; static EWRAM_DATA struct ChooseBoxMenu *sBoxSelectionPopupSpriteManager = NULL; static void PSS_CreatePCMenu(u8 whichMenu, s16 *windowIdPtr); -static void sub_808C9C4(u8 curBox); +static void ChooseBoxMenu_CreateSprites(u8 curBox); static void sub_808CBA4(void); static void UpdateBoxNameAndCountSprite_WraparoundRight(void); static void UpdateBoxNameAndCountSprite_WraparoundLeft(void); @@ -75,7 +75,7 @@ void DrawTextWindowAndBufferTiles(const u8 *string, void *dst, u8 zero1, u8 zero txtColor[0] = zero2; txtColor[1] = TEXT_DYNAMIC_COLOR_6; txtColor[2] = TEXT_DYNAMIC_COLOR_5; - AddTextPrinterParameterized4(windowId, 1, 0, 2, 0, 0, txtColor, -1, string); + AddTextPrinterParameterized4(windowId, FONT_1, 0, 2, 0, 0, txtColor, -1, string); tileBytesToBuffer = bytesToBuffer; if (tileBytesToBuffer > 6) @@ -118,7 +118,7 @@ static void PrintStringToBufferCopyNow(const u8 *string, void *dst, u16 rise, u8 txtColor[0] = bgClr; txtColor[1] = fgClr; txtColor[2] = shClr; - AddTextPrinterParameterized4(windowId, 1, 0, 2, 0, 0, txtColor, -1, string); + AddTextPrinterParameterized4(windowId, FONT_1, 0, 2, 0, 0, txtColor, -1, string); CpuCopy16(tileData1, dst, var); CpuCopy16(tileData2, dst + rise, var); RemoveWindow(windowId); @@ -277,7 +277,7 @@ static void Task_PCMainMenu(u8 taskId) LoadStdWindowFrameGfx(); DrawDialogueFrame(0, FALSE); FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sMainMenuTexts[task->tSelectedOption].desc, TEXT_SKIP_DRAW, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, sMainMenuTexts[task->tSelectedOption].desc, TEXT_SKIP_DRAW, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); CopyWindowToVram(task->tWindowId, COPYWIN_FULL); task->tState++; @@ -303,7 +303,7 @@ static void Task_PCMainMenu(u8 taskId) { task->tSelectedOption = task->tNextOption; FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } break; case MENU_B_PRESSED: @@ -319,14 +319,14 @@ static void Task_PCMainMenu(u8 taskId) { // Can't withdraw FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, gText_PartyFull, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gText_PartyFull, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); task->tState = 3; } else if (task->tInput == 1 && CountPartyMons() == 1) { // Can't deposit FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, gText_JustOnePkmn, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gText_JustOnePkmn, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); task->tState = STATE_ERROR_MSG; } else @@ -344,7 +344,7 @@ static void Task_PCMainMenu(u8 taskId) if (JOY_NEW(A_BUTTON | B_BUTTON)) { FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); task->tState = STATE_HANDLE_INPUT; } else if (JOY_NEW(DPAD_UP)) @@ -354,7 +354,7 @@ static void Task_PCMainMenu(u8 taskId) Menu_MoveCursor(-1); task->tSelectedOption = Menu_GetCursorPos(); FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); task->tState = STATE_HANDLE_INPUT; } else if (JOY_NEW(DPAD_DOWN)) @@ -364,7 +364,7 @@ static void Task_PCMainMenu(u8 taskId) Menu_MoveCursor(1); task->tSelectedOption = Menu_GetCursorPos(); FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, sMainMenuTexts[task->tSelectedOption].desc, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); task->tState = STATE_HANDLE_INPUT; } break; @@ -417,8 +417,8 @@ static void PSS_CreatePCMenu(u8 whichMenu, s16 *windowIdPtr) windowId = AddWindow(&sUnknown_83CDA48); DrawStdWindowFrame(windowId, FALSE); - PrintTextArray(windowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, 16, NELEMS(sMainMenuTexts), (void *)sMainMenuTexts); - Menu_InitCursor(windowId, 2, 0, 2, 16, NELEMS(sMainMenuTexts), whichMenu); + PrintTextArray(windowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, 16, NELEMS(sMainMenuTexts), (void *)sMainMenuTexts); + Menu_InitCursor(windowId, FONT_2, 0, 2, 16, NELEMS(sMainMenuTexts), whichMenu); *windowIdPtr = windowId; } @@ -491,7 +491,7 @@ void FreeBoxSelectionPopupSpriteGfx(void) void sub_808C940(u8 curBox) { - sub_808C9C4(curBox); + ChooseBoxMenu_CreateSprites(curBox); } void sub_808C950(void) @@ -560,7 +560,7 @@ static const union AffineAnimCmd *const gUnknown_83CDA90[] = { gUnknown_83CDA80 }; -static void sub_808C9C4(u8 curBox) +static void ChooseBoxMenu_CreateSprites(u8 curBox) { u16 i; u8 spriteId; @@ -607,7 +607,7 @@ static void sub_808C9C4(u8 curBox) } for (i = 0; i < 2; i++) { - sBoxSelectionPopupSpriteManager->arrowSprites[i] = sub_809223C(72 * i + 0x7c, 0x58, i, 0, sBoxSelectionPopupSpriteManager->subpriority); + sBoxSelectionPopupSpriteManager->arrowSprites[i] = CreateChooseBoxArrows(72 * i + 0x7c, 0x58, i, 0, sBoxSelectionPopupSpriteManager->subpriority); if (sBoxSelectionPopupSpriteManager->arrowSprites[i]) { sBoxSelectionPopupSpriteManager->arrowSprites[i]->data[0] = (i == 0 ? -1 : 1); diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index fdcd726fb..a08b2a920 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -1718,7 +1718,7 @@ static void Cb_HandleBoxOptions(u8 taskId) { case -1: case 0: - sub_80920FC(TRUE); + AnimateBoxScrollArrows(TRUE); ClearBottomWindow(); SetPSSCallback(Cb_MainPSS); break; @@ -1759,7 +1759,7 @@ static void Cb_HandleWallpapers(u8 taskId) switch (gPSSData->wallpaperSetId) { case -1: - sub_80920FC(TRUE); + AnimateBoxScrollArrows(TRUE); ClearBottomWindow(); SetPSSCallback(Cb_MainPSS); break; @@ -1801,7 +1801,7 @@ static void Cb_HandleWallpapers(u8 taskId) case 5: if (!DoWallpaperGfxChange()) { - sub_80920FC(TRUE); + AnimateBoxScrollArrows(TRUE); SetPSSCallback(Cb_MainPSS); } break; @@ -1830,7 +1830,7 @@ static void Cb_JumpBox(u8 taskId) FreeBoxSelectionPopupSpriteGfx(); if (gPSSData->newCurrBoxId == 201 || gPSSData->newCurrBoxId == StorageGetCurrentBox()) { - sub_80920FC(TRUE); + AnimateBoxScrollArrows(TRUE); SetPSSCallback(Cb_MainPSS); } else @@ -2294,16 +2294,16 @@ static void PrintCursorMonInfo(void) { for (i = 0, y = 0; i < 3; i++, y += 14) { - AddTextPrinterParameterized(0, 2, gPSSData->displayMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(0, FONT_2, gPSSData->displayMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); } - AddTextPrinterParameterized(0, 0, gPSSData->displayMonTexts[3], 6, y + 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(0, FONT_0, gPSSData->displayMonTexts[3], 6, y + 2, TEXT_SKIP_DRAW, NULL); } else { - AddTextPrinterParameterized(0, 0, gPSSData->displayMonTexts[3], 6, 0, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(0, FONT_0, gPSSData->displayMonTexts[3], 6, 0, TEXT_SKIP_DRAW, NULL); for (i = 0, y = 15; i < 3; i++, y += 14) { - AddTextPrinterParameterized(0, 2, gPSSData->displayMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(0, FONT_2, gPSSData->displayMonTexts[i], i == 2 ? 10 : 6, y, TEXT_SKIP_DRAW, NULL); } } @@ -2592,7 +2592,7 @@ static void PrintStorageActionText(u8 id) DynamicPlaceholderTextUtil_ExpandPlaceholders(gPSSData->field_2190, sPCStorageActionTexts[id].text); FillWindowPixelBuffer(1, PIXEL_FILL(1)); - AddTextPrinterParameterized(1, 1, gPSSData->field_2190, 0, 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(1, FONT_1, gPSSData->field_2190, 0, 2, TEXT_SKIP_DRAW, NULL); DrawTextBorderOuter(1, 2, 13); PutWindowTilemap(1); CopyWindowToVram(1, COPYWIN_GFX); @@ -2601,7 +2601,7 @@ static void PrintStorageActionText(u8 id) static void ShowYesNoWindow(s8 cursorPos) { - CreateYesNoMenu(&sYesNoWindowTemplate, 1, 0, 2, 0x00b, 14, 1); + CreateYesNoMenu(&sYesNoWindowTemplate, FONT_1, 0, 2, 0x00b, 14, 1); Menu_MoveCursorNoWrapAround(cursorPos); } @@ -2661,7 +2661,7 @@ u8 GetCurrentBoxOption(void) static void sub_808FDFC(void) { - if (!IsCursorOnBox()) + if (!IsCursorOnBoxTitle()) { if (sInPartyMenu) sub_8095C84(CURSOR_AREA_IN_PARTY, GetBoxCursorPosition()); diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 9041c277a..1c1567106 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -25,13 +25,13 @@ static void sub_8091A94(u8 wallpaperId); static void sub_8091C48(u8 wallpaperId, s8 direction); static void sub_8091E84(struct Sprite *sprite); static void sub_8091EB8(struct Sprite *sprite); -static s16 sub_8091F60(const u8 *boxName); +static s16 GetBoxTitleBaseX(const u8 *boxName); static void sub_8091E34(void); static void sub_8091EF0(void); -static void sub_8091F80(void); -static void sub_809200C(s8 direction); -static void sub_80920AC(void); -static void sub_8092164(struct Sprite *sprite); +static void CreateBoxScrollArrows(void); +static void StartBoxScrollArrowsSlide(s8 direction); +static void StopBoxScrollArrowsSlide(void); +static void SpriteCB_Arrow(struct Sprite *sprite); static const struct OamData gUnknown_83CEC08; @@ -169,7 +169,7 @@ static const struct WallpaperTable sWallpaperTable[] = { static const u16 gUnknown_83D2AD0[] = INCBIN_U16("graphics/interface/pss_unk_83D2AD0.4bpp"); static const u8 sUnref_83D2B50[] = {0xba, 0x23}; -static const struct SpriteSheet gUnknown_83D2B54 = { +static const struct SpriteSheet sSpriteSheet_Arrow = { gUnknown_83D2AD0, 0x0080, TAG_TILE_6 }; @@ -243,14 +243,14 @@ static const union AnimCmd *const gUnknown_83D2BAC[] = { gUnknown_83D2BA4 }; -static const struct SpriteTemplate gUnknown_83D2BB4 = { +static const struct SpriteTemplate sSpriteTemplate_Arrow = { .tileTag = TAG_TILE_6, .paletteTag = TAG_PAL_WAVEFORM, .oam = &gUnknown_83D2B94, .anims = gUnknown_83D2BAC, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8092164 + .callback = SpriteCB_Arrow }; void sub_808FFAC(void) @@ -1010,7 +1010,7 @@ static void sub_8091420(u8 taskId) return; sub_8091A94(task->data[2]); - sub_8091F80(); + CreateBoxScrollArrows(); sub_80900D4(task->data[2]); SetGpuReg(REG_OFFSET_BG2CNT, BGCNT_PRIORITY(2) | BGCNT_CHARBASE(2) | BGCNT_SCREENBASE(27) | BGCNT_TXT512x256); break; @@ -1059,7 +1059,7 @@ bool8 ScrollToBox(void) sub_8090574(gPSSData->scrollToBoxId, gPSSData->scrollDirection); sub_8091C48(gPSSData->scrollToBoxId, gPSSData->scrollDirection); - sub_809200C(gPSSData->scrollDirection); + StartBoxScrollArrowsSlide(gPSSData->scrollDirection); break; case 2: var = sub_809062C(); @@ -1069,7 +1069,7 @@ bool8 ScrollToBox(void) if (--gPSSData->scrollTimer != 0) return TRUE; sub_8091E34(); - sub_80920AC(); + StopBoxScrollArrowsSlide(); } return var; } @@ -1243,7 +1243,7 @@ static void sub_8091A94(u8 boxId) StringCopyPadded(gPSSData->field_21B8, GetBoxNamePtr(boxId), 0, 8); DrawTextWindowAndBufferTiles(gPSSData->field_21B8, gPSSData->field_2F8, 0, 0, gPSSData->field_4F8, 2); LoadSpriteSheet(&spriteSheet); - r6 = sub_8091F60(GetBoxNamePtr(boxId)); + r6 = GetBoxTitleBaseX(GetBoxNamePtr(boxId)); for (i = 0; i < 2; i++) { @@ -1280,7 +1280,7 @@ static void sub_8091C48(u8 boxId, s8 direction) DrawTextWindowAndBufferTiles(gPSSData->field_21B8, gPSSData->field_2F8, 0, 0, gPSSData->field_4F8, 2); LoadSpriteSheet(&spriteSheet); LoadPalette(gUnknown_83D29D0[GetBoxWallpaper(boxId)], r8, 4); - x = sub_8091F60(GetBoxNamePtr(boxId)); + x = GetBoxTitleBaseX(GetBoxNamePtr(boxId)); x2 = x; x2 += direction * 192; @@ -1345,19 +1345,30 @@ static void sub_8091EF0(void) CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + gPSSData->boxTitleAltPalOffset, 4); } -static s16 sub_8091F60(const u8 *string) +static s16 GetBoxTitleBaseX(const u8 *string) { - return 0xB0 - GetStringWidth(1, string, 0) / 2; + return DISPLAY_WIDTH - 64 - GetStringWidth(FONT_1, string, 0) / 2; } -static void sub_8091F80(void) + +//------------------------------------------------------------------------------ +// SECTION: Scroll arrows +//------------------------------------------------------------------------------ + + +// Sprite data for box scroll arrows +#define sState data[0] +#define sTimer data[1] +#define sSpeed data[3] + +static void CreateBoxScrollArrows(void) { u16 i; - LoadSpriteSheet(&gUnknown_83D2B54); + LoadSpriteSheet(&sSpriteSheet_Arrow); for (i = 0; i < 2; i++) { - u8 spriteId = CreateSprite(&gUnknown_83D2BB4, 0x5c + i * 0x88, 28, 22); + u8 spriteId = CreateSprite(&sSpriteTemplate_Arrow, 92 + i * 136, 28, 22); if (spriteId != MAX_SPRITES) { struct Sprite *sprite = &gSprites[spriteId]; @@ -1366,85 +1377,88 @@ static void sub_8091F80(void) gPSSData->arrowSprites[i] = sprite; } } - if (IsCursorOnBox()) - sub_80920FC(TRUE); + if (IsCursorOnBoxTitle()) + AnimateBoxScrollArrows(TRUE); } -static void sub_809200C(s8 direction) +// Slide box scroll arrows horizontally for box change +static void StartBoxScrollArrowsSlide(s8 direction) { u16 i; for (i = 0; i < 2; i++) { gPSSData->arrowSprites[i]->x2 = 0; - gPSSData->arrowSprites[i]->data[0] = 2; + gPSSData->arrowSprites[i]->sState = 2; } if (direction < 0) { - gPSSData->arrowSprites[0]->data[1] = 29; - gPSSData->arrowSprites[1]->data[1] = 5; - gPSSData->arrowSprites[0]->data[2] = 0x48; - gPSSData->arrowSprites[1]->data[2] = 0x48; + gPSSData->arrowSprites[0]->sTimer = 29; + gPSSData->arrowSprites[1]->sTimer = 5; + gPSSData->arrowSprites[0]->data[2] = 72; + gPSSData->arrowSprites[1]->data[2] = 72; } else { - gPSSData->arrowSprites[0]->data[1] = 5; - gPSSData->arrowSprites[1]->data[1] = 29; - gPSSData->arrowSprites[0]->data[2] = 0xF8; - gPSSData->arrowSprites[1]->data[2] = 0xF8; + gPSSData->arrowSprites[0]->sTimer = 5; + gPSSData->arrowSprites[1]->sTimer = 29; + gPSSData->arrowSprites[0]->data[2] = DISPLAY_WIDTH + 8; + gPSSData->arrowSprites[1]->data[2] = DISPLAY_WIDTH + 8; } gPSSData->arrowSprites[0]->data[7] = 0; gPSSData->arrowSprites[1]->data[7] = 1; } -static void sub_80920AC(void) +// New box's scroll arrows have entered, stop sliding and set their position +static void StopBoxScrollArrowsSlide(void) { u16 i; for (i = 0; i < 2; i++) { - gPSSData->arrowSprites[i]->x = 0x88 * i + 0x5c; + gPSSData->arrowSprites[i]->x = 136 * i + 92; gPSSData->arrowSprites[i]->x2 = 0; gPSSData->arrowSprites[i]->invisible = FALSE; } - sub_80920FC(TRUE); + AnimateBoxScrollArrows(TRUE); } -void sub_80920FC(bool8 a0) +// Bounce scroll arrows while title is selected +void AnimateBoxScrollArrows(bool8 animate) { u16 i; - if (a0) + if (animate) { + // Start arrows moving for (i = 0; i < 2; i++) { - gPSSData->arrowSprites[i]->data[0] = 1; - gPSSData->arrowSprites[i]->data[1] = 0; + gPSSData->arrowSprites[i]->sState = 1; + gPSSData->arrowSprites[i]->sTimer = 0; gPSSData->arrowSprites[i]->data[2] = 0; gPSSData->arrowSprites[i]->data[4] = 0; } } else { + // Stop arrows moving for (i = 0; i < 2; i++) - { - gPSSData->arrowSprites[i]->data[0] = 0; - } + gPSSData->arrowSprites[i]->sState = 0; } } -static void sub_8092164(struct Sprite *sprite) +static void SpriteCB_Arrow(struct Sprite *sprite) { - switch (sprite->data[0]) + switch (sprite->sState) { case 0: sprite->x2 = 0; break; case 1: - if (++sprite->data[1] > 3) + if (++sprite->sTimer > 3) { - sprite->data[1] = 0; - sprite->x2 += sprite->data[3]; + sprite->sTimer = 0; + sprite->x2 += sprite->sSpeed; if (++sprite->data[2] > 5) { sprite->data[2] = 0; @@ -1453,17 +1467,17 @@ static void sub_8092164(struct Sprite *sprite) } break; case 2: - sprite->data[0] = 3; + sprite->sState = 3; break; case 3: sprite->x -= gPSSData->scrollSpeed; - if (sprite->x < 73 || sprite->x > 247) + if (sprite->x <= 72 || sprite->x >= DISPLAY_WIDTH + 8) sprite->invisible = TRUE; - if (--sprite->data[1] == 0) + if (--sprite->sTimer == 0) { sprite->x = sprite->data[2]; sprite->invisible = FALSE; - sprite->data[0] = 4; + sprite->sState = 4; } break; case 4: @@ -1472,9 +1486,13 @@ static void sub_8092164(struct Sprite *sprite) } } -struct Sprite *sub_809223C(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority) +#undef sState +#undef sSpeed + +// Arrows for Deposit/Jump Box selection +struct Sprite *CreateChooseBoxArrows(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority) { - u8 spriteId = CreateSprite(&gUnknown_83D2BB4, x, y, subpriority); + u8 spriteId = CreateSprite(&sSpriteTemplate_Arrow, x, y, subpriority); if (spriteId == MAX_SPRITES) return NULL; diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c index a994028d3..68a23b053 100644 --- a/src/pokemon_storage_system_5.c +++ b/src/pokemon_storage_system_5.c @@ -322,7 +322,7 @@ static void sub_80929B0(void) SetMovingMonPriority(1); break; case CURSOR_AREA_BOX: - sub_80920FC(TRUE); + AnimateBoxScrollArrows(TRUE); break; case CURSOR_AREA_IN_PARTY: gPSSData->cursorShadowSprite->subpriority = 13; @@ -955,7 +955,7 @@ bool8 IsMonBeingMoved(void) return sIsMonBeingMoved; } -bool8 IsCursorOnBox(void) +bool8 IsCursorOnBoxTitle(void) { return (sBoxCursorArea == CURSOR_AREA_BOX); } @@ -1615,7 +1615,7 @@ static u8 HandleInput_OnBox(void) if (JOY_NEW(A_BUTTON)) { - sub_80920FC(FALSE); + AnimateBoxScrollArrows(FALSE); AddBoxMenu(); return 7; } @@ -1636,7 +1636,7 @@ static u8 HandleInput_OnBox(void) if (retVal) { if (cursorArea != CURSOR_AREA_BOX) - sub_80920FC(FALSE); + AnimateBoxScrollArrows(FALSE); sub_80927E8(cursorArea, cursorPosition); } diff --git a/src/pokemon_storage_system_6.c b/src/pokemon_storage_system_6.c index ab4849ba4..773c0f8aa 100644 --- a/src/pokemon_storage_system_6.c +++ b/src/pokemon_storage_system_6.c @@ -90,8 +90,8 @@ void AddMenu(void) gPSSData->menuWindowId = AddWindow(&gPSSData->menuWindow); ClearWindowTilemap(gPSSData->menuWindowId); DrawStdFrameWithCustomTileAndPalette(gPSSData->menuWindowId, FALSE, 0x00b, 14); - PrintTextArray(gPSSData->menuWindowId, 1, 8, 2, 16, gPSSData->menuItemsCount, (void *)gPSSData->menuItems); - Menu_InitCursor(gPSSData->menuWindowId, 1, 0, 2, 16, gPSSData->menuItemsCount, 0); + PrintTextArray(gPSSData->menuWindowId, FONT_1, 8, 2, 16, gPSSData->menuItemsCount, (void *)gPSSData->menuItems); + Menu_InitCursor(gPSSData->menuWindowId, FONT_1, 0, 2, 16, gPSSData->menuItemsCount, 0); ScheduleBgCopyTilemapToVram(0); gPSSData->menuUnusedField = 0; } diff --git a/src/pokemon_storage_system_8.c b/src/pokemon_storage_system_8.c index 02be5a7d6..8a2cf84c8 100644 --- a/src/pokemon_storage_system_8.c +++ b/src/pokemon_storage_system_8.c @@ -563,7 +563,7 @@ void PrintItemDescription(void) description = ItemId_GetDescription(gPSSData->displayMonItemId); FillWindowPixelBuffer(2, PIXEL_FILL(1)); - AddTextPrinterParameterized5(2, 2, description, 2, 0, 0, NULL, 0, 0); + AddTextPrinterParameterized5(2, FONT_2, description, 2, 0, 0, NULL, 0, 0); } void sub_80966F4(void) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 2c36f8057..fa3731083 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2405,7 +2405,7 @@ static void PokeSum_FinishSetup(void) static void PokeSum_PrintPageName(const u8 * str) { FillWindowPixelBuffer(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME], 0); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME], 2, 4, 1, sLevelNickTextColors[1], 0, str); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME], FONT_2, 4, 1, sLevelNickTextColors[1], 0, str); PutWindowTilemap(sMonSummaryScreen->windowIds[POKESUM_WIN_PAGE_NAME]); } @@ -2416,9 +2416,9 @@ static void PokeSum_PrintControlsString(const u8 * str) u8 r1; FillWindowPixelBuffer(sMonSummaryScreen->windowIds[POKESUM_WIN_CONTROLS], 0); - width = GetStringWidth(0, str, 0); + width = GetStringWidth(FONT_0, str, 0); r1 = sMonSummaryScreen->windowIds[POKESUM_WIN_CONTROLS]; - AddTextPrinterParameterized3(r1, 0, 0x54 - width, 0, sLevelNickTextColors[1], 0, str); + AddTextPrinterParameterized3(r1, FONT_0, 0x54 - width, 0, sLevelNickTextColors[1], 0, str); PutWindowTilemap(sMonSummaryScreen->windowIds[POKESUM_WIN_CONTROLS]); } @@ -2431,12 +2431,12 @@ static void PrintMonLevelNickOnWindow2(const u8 * str) if (sMonSummaryScreen->curPageIndex != PSS_PAGE_MOVES_INFO) AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2, 4, 2, sLevelNickTextColors[1], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.levelStrBuf); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2, 40, 2, sLevelNickTextColors[1], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.nicknameStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], FONT_2, 40, 2, sLevelNickTextColors[1], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.nicknameStrBuf); if (GetMonGender(&sMonSummaryScreen->currentMon) == MON_FEMALE) - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2, 105, 2, sLevelNickTextColors[3], 0, sMonSummaryScreen->summary.genderSymbolStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], FONT_2, 105, 2, sLevelNickTextColors[3], 0, sMonSummaryScreen->summary.genderSymbolStrBuf); else - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], 2, 105, 2, sLevelNickTextColors[2], 0, sMonSummaryScreen->summary.genderSymbolStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK], FONT_2, 105, 2, sLevelNickTextColors[2], 0, sMonSummaryScreen->summary.genderSymbolStrBuf); } PutWindowTilemap(sMonSummaryScreen->windowIds[POKESUM_WIN_LVL_NICK]); @@ -2465,14 +2465,14 @@ static void PokeSum_PrintRightPaneText(void) static void PrintInfoPage(void) { - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 19, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.speciesNameStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 47, 19, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.speciesNameStrBuf); if (!sMonSummaryScreen->isEgg) { - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47 + sMonSkillsPrinterXpos->unk00, 5, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.dexNumStrBuf); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 49, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.otNameStrBuf); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 64, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.unk306C); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 47, 79, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.itemNameStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 47 + sMonSkillsPrinterXpos->unk00, 5, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.dexNumStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 47, 49, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.otNameStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 47, 64, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.unk306C); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 47, 79, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.itemNameStrBuf); } else { @@ -2493,20 +2493,20 @@ static void PrintInfoPage(void) if (sMonSummaryScreen->isBadEgg) hatchMsgIndex = 0; - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 7, 45, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sEggHatchTimeTexts[hatchMsgIndex]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 7, 45, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sEggHatchTimeTexts[hatchMsgIndex]); } } static void PrintSkillsPage(void) { - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 14 + sMonSkillsPrinterXpos->curHpStr, 4, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.curHpStrBuf); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->atkStr, 22, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_ATK]); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->defStr, 35, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_DEF]); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->spAStr, 48, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPA]); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->spDStr, 61, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPD]); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 50 + sMonSkillsPrinterXpos->speStr, 74, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPE]); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 15 + sMonSkillsPrinterXpos->expStr, 87, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.expPointsStrBuf); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 15 + sMonSkillsPrinterXpos->toNextLevel, 100, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.expToNextLevelStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 14 + sMonSkillsPrinterXpos->curHpStr, 4, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.curHpStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 50 + sMonSkillsPrinterXpos->atkStr, 22, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_ATK]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 50 + sMonSkillsPrinterXpos->defStr, 35, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_DEF]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 50 + sMonSkillsPrinterXpos->spAStr, 48, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPA]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 50 + sMonSkillsPrinterXpos->spDStr, 61, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPD]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 50 + sMonSkillsPrinterXpos->speStr, 74, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.statValueStrBufs[PSS_STAT_SPE]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 15 + sMonSkillsPrinterXpos->expStr, 87, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.expPointsStrBuf); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 15 + sMonSkillsPrinterXpos->toNextLevel, 100, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.expToNextLevelStrBuf); } #define GetMoveNamePrinterYpos(x) ((x) * 28 + 5) @@ -2524,7 +2524,7 @@ static void PrintMovesPage(void) if (sMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE) PokeSum_PrintMoveName(4); else - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 3, GetMoveNamePrinterYpos(4), sPrintMoveTextColors[0], TEXT_SKIP_DRAW, gFameCheckerText_Cancel); } @@ -2541,7 +2541,7 @@ static void PokeSum_PrintMoveName(u8 i) if (i == 4) curPP = maxPP; - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 3, GetMoveNamePrinterYpos(i), sPrintMoveTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveNameStrBufs[i]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 3, GetMoveNamePrinterYpos(i), sPrintMoveTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveNameStrBufs[i]); if (sMonSummaryScreen->moveIds[i] == 0 || (curPP == maxPP)) colorIdx = 0; @@ -2567,14 +2567,14 @@ static void PokeSum_PrintMoveName(u8 i) colorIdx = 1; } - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 36, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 36, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, gText_PokeSum_PP); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 46 + sMonSkillsPrinterXpos->curPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveCurPpStrBufs[i]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 46 + sMonSkillsPrinterXpos->curPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveCurPpStrBufs[i]); if (sMonSummaryScreen->moveIds[i] != MOVE_NONE) { - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 58, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, gText_Slash); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], 2, 64 + sMonSkillsPrinterXpos->maxPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveMaxPpStrBufs[i]); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 58, GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, gText_Slash); + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_2, 64 + sMonSkillsPrinterXpos->maxPp[i], GetMovePpPinterYpos(i), sPrintMoveTextColors[colorIdx], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveMaxPpStrBufs[i]); } } @@ -2679,7 +2679,7 @@ static void PokeSum_PrintTrainerMemo_Mon_HeldByOT(void) } } - AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); + AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); } static void PokeSum_PrintTrainerMemo_Mon_NotHeldByOT(void) @@ -2728,7 +2728,7 @@ static void PokeSum_PrintTrainerMemo_Mon_NotHeldByOT(void) DynamicPlaceholderTextUtil_ExpandPlaceholders(natureMetOrHatchedAtLevelStr, gText_PokeSum_MetInATrade); } - AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); + AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); return; } @@ -2776,7 +2776,7 @@ static void PokeSum_PrintTrainerMemo_Mon_NotHeldByOT(void) } } - AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); + AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, natureMetOrHatchedAtLevelStr); } static void PokeSum_PrintTrainerMemo_Mon(void) @@ -2837,17 +2837,17 @@ static void PokeSum_PrintTrainerMemo_Egg(void) if (sMonSummaryScreen->isBadEgg) chosenStrIndex = 0; - AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sEggOriginTexts[chosenStrIndex]); + AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 0, 3, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sEggOriginTexts[chosenStrIndex]); } static void PokeSum_PrintExpPoints_NextLv(void) { - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 26, 7, sLevelNickTextColors[0], TEXT_SKIP_DRAW, gText_PokeSum_ExpPoints); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 26, 20, sLevelNickTextColors[0], TEXT_SKIP_DRAW, gText_PokeSum_NextLv); @@ -2860,17 +2860,17 @@ static void PokeSum_PrintSelectedMoveStats(void) if (sMonSummaryScreen->mode != PSS_MODE_SELECT_MOVE && sMoveSelectionCursorPos == 4) return; - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 57, 1, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.movePowerStrBufs[sMoveSelectionCursorPos]); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 57, 15, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveAccuracyStrBufs[sMoveSelectionCursorPos]); - AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, + AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 7, 42, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, @@ -2900,10 +2900,10 @@ static void PokeSum_PrintAbilityNameAndDesc(void) { FillWindowPixelBuffer(sMonSummaryScreen->windowIds[5], 0); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], 2, + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], FONT_2, 66, 1, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.abilityNameStrBuf); - AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], 2, + AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], FONT_2, 2, 15, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.abilityDescStrBuf); @@ -3893,7 +3893,7 @@ static void Task_InputHandler_SelectOrForgetMove(u8 taskId) break; case 5: FillWindowPixelBuffer(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 0); - AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], 2, + AddTextPrinterParameterized4(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_2, 7, 42, 0, 0, sLevelNickTextColors[0], TEXT_SKIP_DRAW, diff --git a/src/quest_log.c b/src/quest_log.c index 5614f834a..1e3ba901d 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -496,7 +496,7 @@ void DrawPreviouslyOnQuestHeader(u8 sceneNum) StringAppend(gStringVar4, gStringVar1); } - AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[0], 2, 2, 2, 1, 2, sTextColors, 0, gStringVar4); + AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[0], FONT_2, 2, 2, 1, 2, sTextColors, 0, gStringVar4); PutWindowTilemap(sQuestLogHeaderWindowIds[0]); PutWindowTilemap(sQuestLogHeaderWindowIds[1]); CopyWindowToVram(sQuestLogHeaderWindowIds[0], COPYWIN_GFX); @@ -991,7 +991,7 @@ static void DrawQuestLogSceneDescription(void) PutWindowTilemap(sQuestLogHeaderWindowIds[2]); sub_8111D90(sQuestLogHeaderWindowIds[2]); - AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[2], 2, 2, sQuestLogTextLineYCoords[numLines], 1, 0, sTextColors, 0, gStringVar4); + AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[2], FONT_2, 2, sQuestLogTextLineYCoords[numLines], 1, 0, sTextColors, 0, gStringVar4); ScheduleBgCopyTilemapToVram(0); } diff --git a/src/region_map.c b/src/region_map.c index e897d3de3..1c7a74590 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1886,7 +1886,7 @@ static void DisplayCurrentMapName(void) else { GetMapName(sRegionMap->mapName, GetMapsecUnderCursor(), 0); - AddTextPrinterParameterized3(WIN_MAP_NAME, 2, 2, 2, sTextColor_White, 0, sRegionMap->mapName); + AddTextPrinterParameterized3(WIN_MAP_NAME, FONT_2, 2, 2, sTextColor_White, 0, sRegionMap->mapName); PutWindowTilemap(WIN_MAP_NAME); CopyWindowToVram(WIN_MAP_NAME, COPYWIN_GFX); SetGpuWindowDims(WIN_MAP_NAME, &sMapsecNameWindowDims[WIN_MAP_NAME]); @@ -1918,7 +1918,7 @@ static void DisplayCurrentDungeonName(void) sRegionMap->dungeonWinBottom = 48; FillWindowPixelBuffer(WIN_DUNGEON_NAME, PIXEL_FILL(0)); StringCopy(sRegionMap->dungeonName, sMapNames[descOffset]); - AddTextPrinterParameterized3(WIN_DUNGEON_NAME, 2, 12, 2, sTextColorTable[GetSelectedMapsecType(LAYER_DUNGEON) - 2], 0, sRegionMap->dungeonName); + AddTextPrinterParameterized3(WIN_DUNGEON_NAME, FONT_2, 12, 2, sTextColorTable[GetSelectedMapsecType(LAYER_DUNGEON) - 2], 0, sRegionMap->dungeonName); PutWindowTilemap(WIN_DUNGEON_NAME); CopyWindowToVram(WIN_DUNGEON_NAME, COPYWIN_FULL); } @@ -2500,8 +2500,8 @@ static void Task_DrawDungeonMapPreviewFlavorText(u8 taskId) // Draw text if (sDungeonMapPreview->timer > 25) { - AddTextPrinterParameterized3(WIN_MAP_PREVIEW, 2, 4, 0, sTextColor_Green, -1, GetDungeonName(GetDungeonMapsecUnderCursor())); - AddTextPrinterParameterized3(WIN_MAP_PREVIEW, 2, 2, 14, sTextColor_White, -1, GetDungeonFlavorText(GetDungeonMapsecUnderCursor())); + AddTextPrinterParameterized3(WIN_MAP_PREVIEW, FONT_2, 4, 0, sTextColor_Green, -1, GetDungeonName(GetDungeonMapsecUnderCursor())); + AddTextPrinterParameterized3(WIN_MAP_PREVIEW, FONT_2, 2, 14, sTextColor_White, -1, GetDungeonFlavorText(GetDungeonMapsecUnderCursor())); CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_FULL); sDungeonMapPreview->drawState++; } @@ -4283,7 +4283,7 @@ static void PrintTopBarTextLeft(const u8 *str) FillWindowPixelBuffer(WIN_TOPBAR_LEFT, PIXEL_FILL(0)); else FillWindowPixelBuffer(WIN_TOPBAR_LEFT, PIXEL_FILL(15)); - AddTextPrinterParameterized3(WIN_TOPBAR_LEFT, 0, 0, 0, sTextColors, 0, str); + AddTextPrinterParameterized3(WIN_TOPBAR_LEFT, FONT_0, 0, 0, sTextColors, 0, str); CopyWindowToVram(WIN_TOPBAR_LEFT, COPYWIN_GFX); } @@ -4293,7 +4293,7 @@ static void PrintTopBarTextRight(const u8 *str) FillWindowPixelBuffer(WIN_TOPBAR_RIGHT, PIXEL_FILL(0)); else FillWindowPixelBuffer(WIN_TOPBAR_RIGHT, PIXEL_FILL(15)); - AddTextPrinterParameterized3(WIN_TOPBAR_RIGHT, 0, 0, 0, sTextColors, 0, str); + AddTextPrinterParameterized3(WIN_TOPBAR_RIGHT, FONT_0, 0, 0, sTextColors, 0, str); CopyWindowToVram(WIN_TOPBAR_RIGHT, COPYWIN_FULL); } diff --git a/src/scrcmd.c b/src/scrcmd.c index 523523548..823593623 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1561,7 +1561,7 @@ bool8 ScrCmd_braillemessage(struct ScriptContext * ctx) LoadStdWindowFrameGfx(); DrawDialogueFrame(0, 1); - AddTextPrinterParameterized(0, 6, ptr, 0, 1, 0, NULL); + AddTextPrinterParameterized(0, FONT_6, ptr, 0, 1, 0, NULL); return FALSE; } @@ -1571,7 +1571,7 @@ bool8 ScrCmd_getbraillestringwidth(struct ScriptContext * ctx) if (ptr == NULL) ptr = (u8 *)ctx->data[0]; - gSpecialVar_0x8004 = GetStringWidth(6, ptr, -1); + gSpecialVar_0x8004 = GetStringWidth(FONT_6, ptr, -1); return FALSE; } diff --git a/src/script_menu.c b/src/script_menu.c index 8b6b277f9..384881982 100644 --- a/src/script_menu.c +++ b/src/script_menu.c @@ -664,7 +664,7 @@ static const u8 *const sSeagallopDestStrings[] = { static u16 GetStringTilesWide(const u8 *str) { - return (GetStringWidth(1, str, 0) + 7) / 8; + return (GetStringWidth(FONT_1, str, 0) + 7) / 8; } static u8 GetMenuWidthFromList(const struct MenuAction * items, u8 count) @@ -719,7 +719,7 @@ static void DrawVerticalMultichoiceMenu(u8 left, u8 top, u8 mcId, u8 ignoreBpres strWidth = 0; for (i = 0; i < count; i++) { - tmp = GetStringWidth(2, list[i].text, 0); + tmp = GetStringWidth(FONT_2, list[i].text, 0); if (tmp > strWidth) strWidth = tmp; } @@ -730,10 +730,10 @@ static void DrawVerticalMultichoiceMenu(u8 left, u8 top, u8 mcId, u8 ignoreBpres windowId = CreateWindowFromRect(left, top, width, height); SetStdWindowBorderStyle(windowId, FALSE); if (mcId == 30 || mcId == 13 || mcId == 41) - MultichoiceList_PrintItems(windowId, 2, 8, 2, 14, count, list, 0, 2); + MultichoiceList_PrintItems(windowId, FONT_2, 8, 2, 14, count, list, 0, 2); else - MultichoiceList_PrintItems(windowId, 2, 8, 2, 14, count, list, 0, 2); - Menu_InitCursor(windowId, 2, 0, 2, 14, count, initPos); + MultichoiceList_PrintItems(windowId, FONT_2, 8, 2, 14, count, list, 0, 2); + Menu_InitCursor(windowId, FONT_2, 0, 2, 14, count, initPos); CreateMCMenuInputHandlerTask(ignoreBpress, count, windowId, mcId); ScheduleBgCopyTilemapToVram(0); } @@ -827,15 +827,15 @@ static void MultiChoicePrintHelpDescription(u8 mcId) { case 39: FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_CableClub_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, sDescriptionPtrs_CableClub_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); break; case 47: FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, sDescriptionPtrs_WirelessCenter_TradeBattleCrushCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); break; case 50: FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, sDescriptionPtrs_WirelessCenter_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, sDescriptionPtrs_WirelessCenter_TradeBattleCancel[Menu_GetCursorPos()], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); break; } } @@ -909,8 +909,8 @@ bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 co gTasks[taskId].data[4] = a4; gTasks[taskId].data[6] = CreateWindowFromRect(left, top, width * columnCount, rowCount * 2); SetStdWindowBorderStyle(gTasks[taskId].data[6], FALSE); - MultichoiceGrid_PrintItems(gTasks[taskId].data[6], 1, width * 8, 16, columnCount, rowCount, list); - MultichoiceGrid_InitCursor(gTasks[taskId].data[6], 1, 0, 1, width * 8, columnCount, rowCount, 0); + MultichoiceGrid_PrintItems(gTasks[taskId].data[6], FONT_1, width * 8, 16, columnCount, rowCount, list); + MultichoiceGrid_InitCursor(gTasks[taskId].data[6], FONT_1, 0, 1, width * 8, columnCount, rowCount, 0); ScheduleBgCopyTilemapToVram(0); } return TRUE; @@ -950,8 +950,8 @@ bool8 CreatePCMenu(void) static void CreatePCMenuWindow(void) { - u8 cursorWidth = GetMenuCursorDimensionByFont(2, 0); - u8 height = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT); + u8 cursorWidth = GetMenuCursorDimensionByFont(FONT_2, 0); + u8 height = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT); u8 windowWidth; u8 nitems; u8 windowId; @@ -973,9 +973,9 @@ static void CreatePCMenuWindow(void) nitems = 5; windowId = CreateWindowFromRect(0, 0, windowWidth, 10); SetStdWindowBorderStyle(windowId, FALSE); - AddTextPrinterParameterized(windowId, 2, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL); - AddTextPrinterParameterized(windowId, 2, gText_HallOfFame_2, cursorWidth, 50, 0xFF, NULL); - AddTextPrinterParameterized(windowId, 2, gText_LogOff, cursorWidth, 66, 0xFF, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gText_HallOfFame_2, cursorWidth, 50, 0xFF, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gText_LogOff, cursorWidth, 66, 0xFF, NULL); } else { @@ -986,16 +986,16 @@ static void CreatePCMenuWindow(void) windowId = CreateWindowFromRect(0, 0, windowWidth, nitems * 2); SetStdWindowBorderStyle(windowId, FALSE); if (FlagGet(FLAG_SYS_POKEDEX_GET)) - AddTextPrinterParameterized(windowId, 2, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL); - AddTextPrinterParameterized(windowId, 2, gText_LogOff, cursorWidth, 2 + 16 * (nitems - 1), 0xFF, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gText_ProfOakSPc, cursorWidth, 34, 0xFF, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gText_LogOff, cursorWidth, 2 + 16 * (nitems - 1), 0xFF, NULL); } if (FlagGet(FLAG_SYS_NOT_SOMEONES_PC)) - AddTextPrinterParameterized(windowId, 2, gText_BillSPc, cursorWidth, 2 , 0xFF, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gText_BillSPc, cursorWidth, 2 , 0xFF, NULL); else - AddTextPrinterParameterized(windowId, 2, gText_SomeoneSPc, cursorWidth, 2 , 0xFF, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gText_SomeoneSPc, cursorWidth, 2 , 0xFF, NULL); StringExpandPlaceholders(gStringVar4, gText_SPc); Menu_PrintFormatIntlPlayerName(windowId, gStringVar4, cursorWidth, 18); - Menu_InitCursor(windowId, 2, 0, 2, 16, nitems, 0); + Menu_InitCursor(windowId, FONT_2, 0, 2, 16, nitems, 0); CreateMCMenuInputHandlerTask(FALSE, nitems, windowId, 0xFF); ScheduleBgCopyTilemapToVram(0); } @@ -1003,7 +1003,7 @@ static void CreatePCMenuWindow(void) void ScriptMenu_DisplayPCStartupPrompt(void) { sub_80F7768(0, TRUE); - AddTextPrinterParameterized2(0, 2, Text_AccessWhichPC, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, Text_AccessWhichPC, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } static void Task_ScriptShowMonPic(u8 taskId) @@ -1221,24 +1221,24 @@ void DrawSeagallopDestinationMenu(void) nitems = 6; top = 0; } - cursorWidth = GetMenuCursorDimensionByFont(2, 0); - fontHeight = GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT); + cursorWidth = GetMenuCursorDimensionByFont(FONT_2, 0); + fontHeight = GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT); windowId = CreateWindowFromRect(17, top, 11, nitems * 2); SetStdWindowBorderStyle(windowId, FALSE); for (i = 0; i < nitems - 2; i++) { if (r4 != gSpecialVar_0x8004) - AddTextPrinterParameterized(windowId, 2, sSeagallopDestStrings[r4], cursorWidth, i * 16 + 2, 0xFF, NULL); + AddTextPrinterParameterized(windowId, FONT_2, sSeagallopDestStrings[r4], cursorWidth, i * 16 + 2, 0xFF, NULL); else i--; r4++; if (r4 == SEAGALLOP_CINNABAR_ISLAND) r4 = SEAGALLOP_VERMILION_CITY; } - AddTextPrinterParameterized(windowId, 2, gText_Other, cursorWidth, i * 16 + 2, 0xFF, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gText_Other, cursorWidth, i * 16 + 2, 0xFF, NULL); i++; - AddTextPrinterParameterized(windowId, 2, gOtherText_Exit, cursorWidth, i * 16 + 2, 0xFF, NULL); - Menu_InitCursor(windowId, 2, 0, 2, 16, nitems, 0); + AddTextPrinterParameterized(windowId, FONT_2, gOtherText_Exit, cursorWidth, i * 16 + 2, 0xFF, NULL); + Menu_InitCursor(windowId, FONT_2, 0, 2, 16, nitems, 0); CreateMCMenuInputHandlerTask(FALSE, nitems, windowId, 0xFF); ScheduleBgCopyTilemapToVram(0); } diff --git a/src/shop.c b/src/shop.c index f9c190a49..e9eb7097f 100644 --- a/src/shop.c +++ b/src/shop.c @@ -63,7 +63,7 @@ struct ShopData /*0x12*/ u16 field12; /*0x14*/ u16 maxQuantity; /*0x16*/ u16 martType:4; // 0x1 if tm list - u16 unk16_4:5; + u16 fontId:5; u16 itemSlot:2; u16 unk16_11:5; /*0x18*/ u16 unk18; @@ -218,14 +218,14 @@ static u8 CreateShopMenu(u8 a0) gShopData.martType = GetMartTypeFromItemList(a0); gShopData.selectedRow = 0; if (ContextNpcGetTextColor() == 0) - gShopData.unk16_4 = 4; + gShopData.fontId = FONT_4; else - gShopData.unk16_4 = 5; + gShopData.fontId = FONT_5; sShopMenuWindowId = AddWindow(&sShopMenuWindowTemplate); SetStdWindowBorderStyle(sShopMenuWindowId, 0); - PrintTextArray(sShopMenuWindowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, 16, 3, sShopMenuActions_BuySellQuit); - Menu_InitCursor(sShopMenuWindowId, 2, 0, 2, 16, 3, 0); + PrintTextArray(sShopMenuWindowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, 16, 3, sShopMenuActions_BuySellQuit); + Menu_InitCursor(sShopMenuWindowId, FONT_2, 0, 2, 16, 3, 0); PutWindowTilemap(sShopMenuWindowId); CopyWindowToVram(sShopMenuWindowId, COPYWIN_MAP); return CreateTask(Task_ShopMenu, 8); @@ -338,7 +338,7 @@ static void Task_ReturnToShopMenu(u8 taskId) if (IsWeatherNotFadingIn() != TRUE) return; - DisplayItemMessageOnField(taskId, GetMartUnk16_4(), gText_CanIHelpWithAnythingElse, ShowShopMenuAfterExitingBuyOrSellMenu); + DisplayItemMessageOnField(taskId, GetMartFontId(), gText_CanIHelpWithAnythingElse, ShowShopMenuAfterExitingBuyOrSellMenu); } static void ShowShopMenuAfterExitingBuyOrSellMenu(u8 taskId) @@ -547,8 +547,8 @@ bool8 BuyMenuBuildListMenuTemplate(void) gMultiuseListMenuTemplate.upText_Y = 2; gMultiuseListMenuTemplate.fontId = 2; gMultiuseListMenuTemplate.fillValue = 0; - gMultiuseListMenuTemplate.cursorPal = GetFontAttribute(2, FONTATTR_COLOR_FOREGROUND); - gMultiuseListMenuTemplate.cursorShadowPal = GetFontAttribute(2, FONTATTR_COLOR_SHADOW); + gMultiuseListMenuTemplate.cursorPal = GetFontAttribute(FONT_2, FONTATTR_COLOR_FOREGROUND); + gMultiuseListMenuTemplate.cursorShadowPal = GetFontAttribute(FONT_2, FONTATTR_COLOR_SHADOW); gMultiuseListMenuTemplate.moveCursorFunc = BuyMenuPrintItemDescriptionAndShowItemIcon; gMultiuseListMenuTemplate.itemPrintFunc = BuyMenuPrintPriceInList; gMultiuseListMenuTemplate.scrollMultiple = 0; @@ -597,13 +597,13 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, s CreateItemMenuIcon(ITEM_N_A, gShopData.itemSlot); gShopData.itemSlot ^= 1; - BuyMenuPrint(5, 2, description, 0, 3, 2, 1, 0, 0); + BuyMenuPrint(5, FONT_2, description, 0, 3, 2, 1, 0, 0); } else //TM Mart { FillWindowPixelBuffer(6, PIXEL_FILL(0)); LoadTmHmNameInMart(item); - BuyMenuPrint(5, 2, description, 2, 3, 1, 0, 0, 0); + BuyMenuPrint(5, FONT_2, description, 2, 3, 1, 0, 0, 0); } } @@ -620,7 +620,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, u32 item, u8 y) while (x-- != 0) *loc++ = 0; StringExpandPlaceholders(loc, gText_PokedollarVar1); - BuyMenuPrint(windowId, 0, gStringVar4, 0x69, y, 0, 0, TEXT_SKIP_DRAW, 1); + BuyMenuPrint(windowId, FONT_0, gStringVar4, 0x69, y, 0, 0, TEXT_SKIP_DRAW, 1); } } @@ -631,20 +631,20 @@ static void LoadTmHmNameInMart(s32 item) ConvertIntToDecimalStringN(gStringVar1, item - ITEM_DEVON_SCOPE, 2, 2); StringCopy(gStringVar4, gOtherText_UnkF9_08_Clear_01); StringAppend(gStringVar4, gStringVar1); - BuyMenuPrint(6, 0, gStringVar4, 0, 0, 0, 0, TEXT_SKIP_DRAW, 1); + BuyMenuPrint(6, FONT_0, gStringVar4, 0, 0, 0, 0, TEXT_SKIP_DRAW, 1); StringCopy(gStringVar4, gMoveNames[ItemIdToBattleMoveId(item)]); - BuyMenuPrint(6, 2, gStringVar4, 0, 0x10, 0, 0, 0, 1); + BuyMenuPrint(6, FONT_2, gStringVar4, 0, 0x10, 0, 0, 0, 1); } else { - BuyMenuPrint(6, 0, gText_ThreeHyphens, 0, 0, 0, 0, TEXT_SKIP_DRAW, 1); - BuyMenuPrint(6, 2, gText_SevenHyphens, 0, 0x10, 0, 0, 0, 1); + BuyMenuPrint(6, FONT_0, gText_ThreeHyphens, 0, 0, 0, 0, TEXT_SKIP_DRAW, 1); + BuyMenuPrint(6, FONT_2, gText_SevenHyphens, 0, 0x10, 0, 0, 0, 1); } } -u8 GetMartUnk16_4(void) +u8 GetMartFontId(void) { - return gShopData.unk16_4; + return gShopData.fontId; } static void BuyMenuPrintCursor(u8 listTaskId, u8 a1) @@ -656,12 +656,12 @@ static void BuyMenuPrintCursorAtYPosition(u8 y, u8 a1) { if (a1 == 0xFF) { - FillWindowPixelRect(4, 0, 1, y, GetFontAttribute(2, FONTATTR_MAX_LETTER_WIDTH), GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT)); + FillWindowPixelRect(4, 0, 1, y, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_WIDTH), GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT)); CopyWindowToVram(4, COPYWIN_GFX); } else { - BuyMenuPrint(4, 2, gText_SelectorArrow2, 1, y, 0, 0, 0, a1); + BuyMenuPrint(4, FONT_2, gText_SelectorArrow2, 1, y, 0, 0, 0, a1); } } @@ -880,7 +880,7 @@ static void BuyMenuPrintItemQuantityAndPrice(u8 taskId) PrintMoneyAmount(3, 0x36, 0xA, gShopData.itemPrice, TEXT_SKIP_DRAW); ConvertIntToDecimalStringN(gStringVar1, tItemCount, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - BuyMenuPrint(3, 0, gStringVar4, 2, 0xA, 0, 0, 0, 1); + BuyMenuPrint(3, FONT_0, gStringVar4, 2, 0xA, 0, 0, 0, 1); } static void Task_BuyMenu(u8 taskId) @@ -930,7 +930,7 @@ static void Task_BuyHowManyDialogueInit(u8 taskId) BuyMenuQuantityBoxThinBorder(1, 0); ConvertIntToDecimalStringN(gStringVar1, quantityInBag, STR_CONV_MODE_RIGHT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_InBagVar1); - BuyMenuPrint(1, 2, gStringVar4, 0, 2, 0, 0, 0, 1); + BuyMenuPrint(1, FONT_2, gStringVar4, 0, 2, 0, 0, 0, 1); tItemCount = 1; BuyMenuQuantityBoxNormalBorder(3, 0); BuyMenuPrintItemQuantityAndPrice(taskId); diff --git a/src/slot_machine.c b/src/slot_machine.c index 7c8392c78..8ec307ea0 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -1988,11 +1988,11 @@ static bool8 SlotsTask_GraphicsInit(u8 * state, struct SlotMachineSetupTaskData FillWindowPixelBuffer(1, 0xFF); PutWindowTilemap(1); - x = 236 - GetStringWidth(0, gString_SlotMachineControls, 0); + x = 236 - GetStringWidth(FONT_0, gString_SlotMachineControls, 0); textColor[0] = TEXT_DYNAMIC_COLOR_6; textColor[1] = TEXT_COLOR_WHITE; textColor[2] = TEXT_COLOR_DARK_GRAY; - AddTextPrinterParameterized3(1, 0, x, 0, textColor, 0, gString_SlotMachineControls); + AddTextPrinterParameterized3(1, FONT_0, x, 0, textColor, 0, gString_SlotMachineControls); CopyBgTilemapBufferToVram(0); SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | 0x20 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON); @@ -2265,7 +2265,7 @@ static void Slot_PrintOnWindow0(const u8 * str) FillWindowPixelBuffer(0, PIXEL_FILL(1)); PutWindowTilemap(0); DrawTextBorderOuter(0, 0x001, 15); - AddTextPrinterParameterized5(0, 2, str, 1, 2, TEXT_SKIP_DRAW, NULL, 1, 2); + AddTextPrinterParameterized5(0, FONT_2, str, 1, 2, TEXT_SKIP_DRAW, NULL, 1, 2); } static void Slot_ClearWindow0(void) @@ -2387,7 +2387,7 @@ static void SignalStopWinningLineFlashTask(void) static void Slot_CreateYesNoMenu(u8 cursorPos) { - CreateYesNoMenu(&sYesNoWindowTemplate, 2, 0, 2, 10, 13, cursorPos); + CreateYesNoMenu(&sYesNoWindowTemplate, FONT_2, 0, 2, 10, 13, cursorPos); Menu_MoveCursorNoWrapAround(cursorPos); GetSlotMachineSetupTaskDataPtr()->yesNoMenuActive = TRUE; } diff --git a/src/start_menu.c b/src/start_menu.c index 4dba3ce92..f4e1e825f 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -253,7 +253,7 @@ static void DrawSafariZoneStatsWindow(void) ConvertIntToDecimalStringN(gStringVar2, 600, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar3, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2); StringExpandPlaceholders(gStringVar4, gUnknown_84162A9); - AddTextPrinterParameterized(sSafariZoneStatsWindowId,2, gStringVar4, 4, 3, 0xFF, NULL); + AddTextPrinterParameterized(sSafariZoneStatsWindowId, FONT_2, gStringVar4, 4, 3, 0xFF, NULL); CopyWindowToVram(sSafariZoneStatsWindowId, COPYWIN_GFX); } @@ -279,7 +279,7 @@ static s8 PrintStartMenuItems(s8 *cursor_p, u8 nitems) else { StringExpandPlaceholders(gStringVar4, sStartMenuActionTable[sStartMenuOrder[i]].text); - AddTextPrinterParameterized(GetStartMenuWindowId(), 2, gStringVar4, 8, i * 15, 0xFF, NULL); + AddTextPrinterParameterized(GetStartMenuWindowId(), FONT_2, gStringVar4, 8, i * 15, 0xFF, NULL); } i++; if (i >= sNumStartMenuItems) @@ -318,7 +318,7 @@ static s8 DoDrawStartMenu(void) sDrawStartMenuState[0]++; break; case 5: - sStartMenuCursorPos = Menu_InitCursor(GetStartMenuWindowId(), 2, 0, 0, 15, sNumStartMenuItems, sStartMenuCursorPos); + sStartMenuCursorPos = Menu_InitCursor(GetStartMenuWindowId(), FONT_2, 0, 0, 15, sNumStartMenuItems, sStartMenuCursorPos); if (!MenuHelpers_LinkSomething() && InUnionRoom() != TRUE && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_HELP) { DrawHelpMessageWindowWithText(sStartMenuDescPointers[sStartMenuOrder[sStartMenuCursorPos]]); @@ -909,7 +909,7 @@ static void task50_after_link_battle_save(u8 taskId) { case 0: FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0xFF, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, FONT_2, gText_SavingDontTurnOffThePower2, 0xFF, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); DrawTextBorderOuter(0, 0x008, 0x0F); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); @@ -960,26 +960,26 @@ static void PrintSaveStats(void) TextWindow_SetStdFrame0_WithPal(sSaveStatsWindowId, 0x21D, 0xD0); DrawStdFrameWithCustomTileAndPalette(sSaveStatsWindowId, FALSE, 0x21D, 0x0D); SaveStatToString(SAVE_STAT_LOCATION, gStringVar4, 8); - x = (u32)(112 - GetStringWidth(2, gStringVar4, -1)) / 2; - AddTextPrinterParameterized3(sSaveStatsWindowId, 2, x, 0, sTextColor_LocationHeader, -1, gStringVar4); - x = (u32)(112 - GetStringWidth(2, gStringVar4, -1)) / 2; - AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 2, 14, sTextColor_StatName, -1, gSaveStatName_Player); + x = (u32)(112 - GetStringWidth(FONT_2, gStringVar4, -1)) / 2; + AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_2, x, 0, sTextColor_LocationHeader, -1, gStringVar4); + x = (u32)(112 - GetStringWidth(FONT_2, gStringVar4, -1)) / 2; + AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 2, 14, sTextColor_StatName, -1, gSaveStatName_Player); SaveStatToString(SAVE_STAT_NAME, gStringVar4, 2); Menu_PrintFormatIntlPlayerName(sSaveStatsWindowId, gStringVar4, 60, 14); - AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 2, 28, sTextColor_StatName, -1, gSaveStatName_Badges); + AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 2, 28, sTextColor_StatName, -1, gSaveStatName_Badges); SaveStatToString(SAVE_STAT_BADGES, gStringVar4, 2); - AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 60, 28, sTextColor_StatValue, -1, gStringVar4); + AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 60, 28, sTextColor_StatValue, -1, gStringVar4); y = 42; if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) { - AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 2, 42, sTextColor_StatName, -1, gSaveStatName_Pokedex); + AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 2, 42, sTextColor_StatName, -1, gSaveStatName_Pokedex); SaveStatToString(SAVE_STAT_POKEDEX, gStringVar4, 2); - AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 60, 42, sTextColor_StatValue, -1, gStringVar4); + AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 60, 42, sTextColor_StatValue, -1, gStringVar4); y = 56; } - AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 2, y, sTextColor_StatName, -1, gSaveStatName_Time); + AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 2, y, sTextColor_StatName, -1, gSaveStatName_Time); SaveStatToString(SAVE_STAT_TIME, gStringVar4, 2); - AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 60, y, sTextColor_StatValue, -1, gStringVar4); + AddTextPrinterParameterized3(sSaveStatsWindowId, FONT_0, 60, y, sTextColor_StatValue, -1, gStringVar4); CopyWindowToVram(sSaveStatsWindowId, COPYWIN_GFX); } diff --git a/src/strings.c b/src/strings.c index 0855152f5..abbcded06 100644 --- a/src/strings.c +++ b/src/strings.c @@ -207,15 +207,15 @@ const u8 gUnknown_84166A7[] = _("The POKé FLUTE awakened sleeping\nPOKéMON.{PA const u8 gText_TMCase[] = _("TM CASE"); const u8 gText_Close[] = _("CLOSE"); const u8 gText_TMCaseWillBePutAway[] = _("The TM CASE will be\nput away."); -const u8 gText_FontSize0[] = _("{SIZE 0}"); -const u8 gText_FontSize2[] = _("{SIZE 2}"); +const u8 gText_FontSize0[] = _("{FONT_0}"); +const u8 gText_FontSize2[] = _("{FONT_2}"); const u8 gUnknown_8416707[] = _(" "); const u8 gText_BerryPouch[] = _("BERRY POUCH"); const u8 gText_TheBerryPouchWillBePutAway[] = _("The BERRY POUCH will be\nput away."); const u8 gText_ShopBuy[] = _("BUY"); const u8 gText_ShopSell[] = _("SELL"); const u8 gText_ShopQuit[] = _("SEE YA!"); -const u8 gText_InBagVar1[] = _("IN BAG:{SMALL} {STR_VAR_1}"); +const u8 gText_InBagVar1[] = _("IN BAG:{FONT_0} {STR_VAR_1}"); const u8 gText_QuitShopping[] = _("Quit shopping."); const u8 gText_Var1CertainlyHowMany[] = _("{STR_VAR_1}? Certainly.\nHow many would you like?"); const u8 gText_Var1AndYouWantedVar2[] = _("{STR_VAR_1}, and you want {STR_VAR_2}.\nThat will be ¥{STR_VAR_3}. Okay?"); @@ -419,11 +419,11 @@ const u8 gText_DoubleBattle[] = _("DOUBLE BATTLE"); const u8 gText_MultiBattle[] = _("MULTI BATTLE"); const u8 gText_MakeAChallenge[] = _("Make a challenge."); const u8 gText_Info_2[] = _("INFO"); -const u8 gText_FreshWater_200[] = _("FRESH WATER{CLEAR_TO 0x57}{SMALL}¥200"); -const u8 gText_SodaPop_300[] = _("SODA POP{CLEAR_TO 0x57}{SMALL}¥300"); -const u8 gText_Lemonade_350[] = _("LEMONADE{CLEAR_TO 0x57}{SMALL}¥350"); -const u8 gText_50Coins_1000[] = _("{SMALL} 50 COINS{CLEAR_TO 0x45}¥1,000"); -const u8 gText_500Coins_10000[] = _("{SMALL}500 COINS{CLEAR_TO 0x40}¥10,000"); +const u8 gText_FreshWater_200[] = _("FRESH WATER{CLEAR_TO 0x57}{FONT_0}¥200"); +const u8 gText_SodaPop_300[] = _("SODA POP{CLEAR_TO 0x57}{FONT_0}¥300"); +const u8 gText_Lemonade_350[] = _("LEMONADE{CLEAR_TO 0x57}{FONT_0}¥350"); +const u8 gText_50Coins_1000[] = _("{FONT_0} 50 COINS{CLEAR_TO 0x45}¥1,000"); +const u8 gText_500Coins_10000[] = _("{FONT_0}500 COINS{CLEAR_TO 0x40}¥10,000"); const u8 gText_Excellent[] = _("Excellent"); const u8 gText_NotSoBad[] = _("Not so bad"); const u8 gText_RedShard[] = _("RED SHARD"); @@ -433,11 +433,11 @@ const u8 gText_GreenShard[] = _("GREEN SHARD"); const u8 gUnknown_8417A30[] = _("バトルタワ-"); const u8 gText_Right[] = _("Right"); const u8 gText_Left[] = _("Left"); -const u8 gText_Tm13_4000Coins[] = _("TM13{CLEAR_TO 0x48}{SMALL}4,000 COINS"); -const u8 gText_Tm23_3500Coins[] = _("TM23{CLEAR_TO 0x48}{SMALL}3,500 COINS"); -const u8 gText_Tm24_4000Coins[] = _("TM24{CLEAR_TO 0x48}{SMALL}4,000 COINS"); -const u8 gText_Tm30_4500Coins[] = _("TM30{CLEAR_TO 0x48}{SMALL}4,500 COINS"); -const u8 gText_Tm35_4000Coins[] = _("TM35{CLEAR_TO 0x48}{SMALL}4,000 COINS"); +const u8 gText_Tm13_4000Coins[] = _("TM13{CLEAR_TO 0x48}{FONT_0}4,000 COINS"); +const u8 gText_Tm23_3500Coins[] = _("TM23{CLEAR_TO 0x48}{FONT_0}3,500 COINS"); +const u8 gText_Tm24_4000Coins[] = _("TM24{CLEAR_TO 0x48}{FONT_0}4,000 COINS"); +const u8 gText_Tm30_4500Coins[] = _("TM30{CLEAR_TO 0x48}{FONT_0}4,500 COINS"); +const u8 gText_Tm35_4000Coins[] = _("TM35{CLEAR_TO 0x48}{FONT_0}4,000 COINS"); const u8 gText_1F_2[] = _("1F"); const u8 gText_2F_2[] = _("2F"); const u8 gText_3F_2[] = _("3F"); @@ -485,18 +485,18 @@ const u8 gText_FreshWater[] = _("FRESH WATER"); const u8 gText_SodaPop[] = _("SODA POP"); const u8 gText_Lemonade[] = _("LEMONADE"); const u8 gText_Coins_2[] = _("COINS"); -const u8 gText_Bicycle_1000000[] = _("BICYCLE{CLEAR_TO 0x49}{SMALL}¥1,000,000"); +const u8 gText_Bicycle_1000000[] = _("BICYCLE{CLEAR_TO 0x49}{FONT_0}¥1,000,000"); const u8 gText_NoThanks[] = _("NO THANKS"); -const u8 gText_Abra_180Coins[] = _("ABRA{CLEAR_TO 0x55}{SMALL} 180 COINS"); -const u8 gText_Clefairy_500Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{SMALL} 500 COINS"); -const u8 gText_Dratini_2800Coins[] = _("DRATINI{CLEAR_TO 0x4B}{SMALL} 2,800 COINS"); -const u8 gText_Scyther_5500Coins[] = _("SCYTHER{CLEAR_TO 0x4B}{SMALL} 5,500 COINS"); -const u8 gText_Porygon_9999Coins[] = _("PORYGON{CLEAR_TO 0x4B}{SMALL} 9,999 COINS"); -const u8 gText_Abra_120Coins[] = _("ABRA{CLEAR_TO 0x55}{SMALL} 120 COINS"); -const u8 gText_Clefairy_750Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{SMALL} 750 COINS"); -const u8 gText_Pinsir_2500Coins[] = _("PINSIR{CLEAR_TO 0x4B}{SMALL} 2,500 COINS"); -const u8 gText_Dratini_4600Coins[] = _("DRATINI{CLEAR_TO 0x4B}{SMALL} 4,600 COINS"); -const u8 gText_Porygon_6500Coins[] = _("PORYGON{CLEAR_TO 0x4B}{SMALL} 6,500 COINS"); +const u8 gText_Abra_180Coins[] = _("ABRA{CLEAR_TO 0x55}{FONT_0} 180 COINS"); +const u8 gText_Clefairy_500Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{FONT_0} 500 COINS"); +const u8 gText_Dratini_2800Coins[] = _("DRATINI{CLEAR_TO 0x4B}{FONT_0} 2,800 COINS"); +const u8 gText_Scyther_5500Coins[] = _("SCYTHER{CLEAR_TO 0x4B}{FONT_0} 5,500 COINS"); +const u8 gText_Porygon_9999Coins[] = _("PORYGON{CLEAR_TO 0x4B}{FONT_0} 9,999 COINS"); +const u8 gText_Abra_120Coins[] = _("ABRA{CLEAR_TO 0x55}{FONT_0} 120 COINS"); +const u8 gText_Clefairy_750Coins[] = _("CLEFAIRY{CLEAR_TO 0x55}{FONT_0} 750 COINS"); +const u8 gText_Pinsir_2500Coins[] = _("PINSIR{CLEAR_TO 0x4B}{FONT_0} 2,500 COINS"); +const u8 gText_Dratini_4600Coins[] = _("DRATINI{CLEAR_TO 0x4B}{FONT_0} 4,600 COINS"); +const u8 gText_Porygon_6500Coins[] = _("PORYGON{CLEAR_TO 0x4B}{FONT_0} 6,500 COINS"); const u8 gText_NoThanks_2[] = _("NO THANKS"); const u8 gText_HelixFossil[] = _("HELIX FOSSIL"); const u8 gText_DomeFossil[] = _("DOME FOSSIL"); @@ -532,11 +532,11 @@ const u8 gText_1BigMushroom[] = _("1 BIG MUSHROOM"); const u8 gText_SeviiIslands[] = _("SEVII ISLANDS"); const u8 gText_NavelRock[] = _("NAVEL ROCK"); const u8 gText_BirthIsland[] = _("BIRTH ISLAND"); -const u8 gText_MiracleSeed_1000Coins[] = _("MIRACLE SEED{CLEAR_TO 0x50}{SMALL}1,000 COINS"); -const u8 gText_Charcoal_1000Coins[] = _("CHARCOAL{CLEAR_TO 0x50}{SMALL}1,000 COINS"); -const u8 gText_MysticWater_1000Coins[] = _("MYSTIC WATER{CLEAR_TO 0x50}{SMALL}1,000 COINS"); -const u8 gText_YellowFlute_1600Coins[] = _("YELLOW FLUTE{CLEAR_TO 0x50}{SMALL}1,600 COINS"); -const u8 gText_SmokeBall_800Coins[] = _("SMOKE BALL{CLEAR_TO 0x5A}{SMALL}800 COINS"); +const u8 gText_MiracleSeed_1000Coins[] = _("MIRACLE SEED{CLEAR_TO 0x50}{FONT_0}1,000 COINS"); +const u8 gText_Charcoal_1000Coins[] = _("CHARCOAL{CLEAR_TO 0x50}{FONT_0}1,000 COINS"); +const u8 gText_MysticWater_1000Coins[] = _("MYSTIC WATER{CLEAR_TO 0x50}{FONT_0}1,000 COINS"); +const u8 gText_YellowFlute_1600Coins[] = _("YELLOW FLUTE{CLEAR_TO 0x50}{FONT_0}1,600 COINS"); +const u8 gText_SmokeBall_800Coins[] = _("SMOKE BALL{CLEAR_TO 0x5A}{FONT_0}800 COINS"); const u8 gText_Dummy_8417F67[] = _(""); const u8 gText_Dummy_8417F68[] = _(""); const u8 gText_BecomeLeader[] = _("BECOME LEADER"); @@ -582,17 +582,17 @@ const u8 gText_NowOn[] = _("Now on:"); const u8 gText_LinkedGamePlay[] = _("LINKED GAME PLAY"); const u8 gText_DirectCorner[] = _("DIRECT CORNER"); const u8 gText_UnionRoom[] = _("UNION ROOM"); -const u8 gText_Energypowder_50[] = _("ENERGYPOWDER{CLEAR_TO 0x74}{SMALL}50"); -const u8 gText_EnergyRoot_80[] = _("ENERGY ROOT{CLEAR_TO 0x74}{SMALL}80"); -const u8 gText_HealPowder_50[] = _("HEAL POWDER{CLEAR_TO 0x74}{SMALL}50"); -const u8 gText_RevivalHerb_300[] = _("REVIVAL HERB{CLEAR_TO 0x6F}{SMALL}300"); -const u8 gText_Protein_1000[] = _("PROTEIN{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_Iron_1000[] = _("IRON{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_Carbos_1000[] = _("CARBOS{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_Calcium_1000[] = _("CALCIUM{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_Zinc_1000[] = _("ZINC{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_HpUp_1000[] = _("HP UP{CLEAR_TO 0x65}{SMALL}1,000"); -const u8 gText_PpUp_3000[] = _("PP UP{CLEAR_TO 0x65}{SMALL}3,000"); +const u8 gText_Energypowder_50[] = _("ENERGYPOWDER{CLEAR_TO 0x74}{FONT_0}50"); +const u8 gText_EnergyRoot_80[] = _("ENERGY ROOT{CLEAR_TO 0x74}{FONT_0}80"); +const u8 gText_HealPowder_50[] = _("HEAL POWDER{CLEAR_TO 0x74}{FONT_0}50"); +const u8 gText_RevivalHerb_300[] = _("REVIVAL HERB{CLEAR_TO 0x6F}{FONT_0}300"); +const u8 gText_Protein_1000[] = _("PROTEIN{CLEAR_TO 0x65}{FONT_0}1,000"); +const u8 gText_Iron_1000[] = _("IRON{CLEAR_TO 0x65}{FONT_0}1,000"); +const u8 gText_Carbos_1000[] = _("CARBOS{CLEAR_TO 0x65}{FONT_0}1,000"); +const u8 gText_Calcium_1000[] = _("CALCIUM{CLEAR_TO 0x65}{FONT_0}1,000"); +const u8 gText_Zinc_1000[] = _("ZINC{CLEAR_TO 0x65}{FONT_0}1,000"); +const u8 gText_HpUp_1000[] = _("HP UP{CLEAR_TO 0x65}{FONT_0}1,000"); +const u8 gText_PpUp_3000[] = _("PP UP{CLEAR_TO 0x65}{FONT_0}3,000"); const u8 gString_BattleRecords_PlayersBattleResults[] = _("{PLAYER}'s BATTLE RESULTS"); const u8 gString_BattleRecords_TotalRecord[] = _("TOTAL RECORD W:{STR_VAR_1} L:{STR_VAR_2} D:{STR_VAR_3}"); const u8 gString_BattleRecords_ColumnHeaders[] = _("WIN{CLEAR_TO 0x30}LOSE{CLEAR_TO 0x60}DRAW"); @@ -911,14 +911,14 @@ const u8 gUnknown_841B285[] = _(" was used on\n"); const u8 gUnknown_841B293[] = _("."); const u8 gUnknown_841B295[] = _("'s level rose to\n"); const u8 gUnknown_841B2A7[] = _("."); -const u8 gUnknown_841B2A9[] = _("{SMALL}MAX.{SIZE 0x02} HP"); +const u8 gUnknown_841B2A9[] = _("{FONT_0}MAX.{FONT_2} HP"); const u8 gUnknown_841B2B7[] = _("ATTACK"); const u8 gUnknown_841B2BE[] = _("DEFENSE"); const u8 gUnknown_841B2C6[] = _("SPEED"); const u8 gUnknown_841B2CC[] = _("SP. ATK"); const u8 gUnknown_841B2D4[] = _("SP. DEF"); -const u8 gUnknown_841B2DC[] = _("{SMALL}{PLUS}{SIZE 0x02}"); -const u8 gUnknown_841B2E5[] = _("{SMALL}-{SIZE 0x02}"); +const u8 gUnknown_841B2DC[] = _("{FONT_0}{PLUS}{FONT_2}"); +const u8 gUnknown_841B2E5[] = _("{FONT_0}-{FONT_2}"); const u8 gUnknown_841B2ED[] = _("1, "); const u8 gUnknown_841B2F1[] = _("2, and ‥ ‥ ‥ "); const u8 gUnknown_841B2FF[] = _("Poof!\p"); diff --git a/src/teachy_tv.c b/src/teachy_tv.c index 75daa080b..b3985d676 100644 --- a/src/teachy_tv.c +++ b/src/teachy_tv.c @@ -239,7 +239,7 @@ static const struct ListMenuTemplate sListMenuTemplate = .lettersSpacing = 0x0, .itemVerticalPadding = 0x0, .scrollMultiple = 0x1, - .fontId = 0x2, + .fontId = FONT_2, .cursorKind = 0x0, }; @@ -675,7 +675,7 @@ static void TeachyTvSetupPostBattleWindowAndObj(u8 taskId) static void TeachyTvInitTextPrinter(const u8 *text) { gTextFlags.autoScroll = 0; - AddTextPrinterParameterized2(0, 4, text, GetTextSpeedSetting(), 0, 1, 0xC, 3); + AddTextPrinterParameterized2(0, FONT_4, text, GetTextSpeedSetting(), 0, 1, 0xC, 3); } static void TeachyTvFree(void) diff --git a/src/text.c b/src/text.c index a29906052..15487a889 100644 --- a/src/text.c +++ b/src/text.c @@ -79,43 +79,43 @@ const u8 gKeypadIconTiles[] = INCBIN_U8("graphics/fonts/keypad_icons.4bpp"); static const u16 sFont0LatinGlyphs[] = INCBIN_U16("graphics/fonts/font0_latin.latfont"); static const u8 sFont0LatinGlyphWidths[] = { - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x05, 0x04, 0x04, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x04, 0x05, 0x04, 0x04, 0x05, 0x05, 0x05, 0x06, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x08, 0x07, 0x08, 0x05, 0x05, 0x05, 0x05, 0x05, 0x08, 0x08, 0x07, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x07, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x08, 0x08, 0x08, 0x08, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x07, 0x07, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x08, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x08, 0x05, 0x08, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x05, 0x05, 0x05, - 0x05, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x04, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x08, 0x07, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, - 0x05, 0x05, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x05 + 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 4, 4, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 4, 5, 4, 4, 5, 5, 5, 6, 5, 5, 5, 5, + 5, 5, 8, 7, 8, 5, 5, 5, 5, 5, 8, 8, 7, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 8, + 8, 8, 8, 8, 8, 8, 4, 7, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 8, 8, 8, 8, 5, + 5, 5, 5, 5, 5, 5, 5, 7, 7, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 8, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 8, 5, 8, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, + 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 8, 7, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, + 5, 5, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 5 }; static const u16 sFont0JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font0_jap.fwjpnfont"); @@ -123,43 +123,43 @@ static const u16 sFont0JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font0_jap.f static const u16 sFont1LatinGlyphs[] = INCBIN_U16("graphics/fonts/font1_latin.latfont"); static const u8 sFont1LatinGlyphWidths[] = { - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x09, 0x08, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0A, 0x08, 0x05, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x06, 0x08, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x08, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x05, 0x06, 0x06, 0x06, 0x03, 0x03, 0x06, - 0x06, 0x08, 0x05, 0x09, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x04, 0x06, 0x05, - 0x05, 0x06, 0x05, 0x06, 0x06, 0x06, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x08, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06 + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, + 6, 6, 9, 8, 8, 6, 6, 6, 6, 6, 10, 8, 5, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, + 8, 8, 8, 8, 8, 4, 6, 8, 5, 5, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 6, + 6, 6, 6, 6, 6, 6, 8, 8, 8, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 5, 6, 5, 6, 6, 6, 3, 3, 6, + 6, 8, 5, 9, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 4, 6, 5, + 5, 6, 5, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, + 6, 8, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 12, 12, 12, 12, 8, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 6 }; static const u16 sFont1JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font1_jap.fwjpnfont"); @@ -167,201 +167,201 @@ static const u16 sFont1JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font1_jap.f static const u16 sFont2LatinGlyphs[] = INCBIN_U16("graphics/fonts/font2_latin.latfont"); static const u8 sFont2LatinGlyphWidths[] = { - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x09, 0x08, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0A, 0x08, 0x05, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x06, 0x08, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x08, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x05, 0x06, 0x06, 0x06, 0x03, 0x03, 0x06, - 0x06, 0x08, 0x05, 0x09, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x04, 0x06, 0x05, - 0x05, 0x06, 0x05, 0x06, 0x06, 0x06, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x08, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06 + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, + 6, 6, 9, 8, 8, 6, 6, 6, 6, 6, 10, 8, 5, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, + 8, 8, 8, 8, 8, 4, 6, 8, 5, 5, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 6, + 6, 6, 6, 6, 6, 6, 8, 8, 8, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 5, 6, 5, 6, 6, 6, 3, 3, 6, + 6, 8, 5, 9, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 4, 6, 5, + 5, 6, 5, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, + 6, 8, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 12, 12, 12, 12, 8, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 6 }; static const u16 sFont2JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font2_jap.fwjpnfont"); static const u8 sFont2JapaneseGlyphWidths[] = { - 0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x09, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x09, 0x08, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x05, 0x09, 0x0A, 0x0A, 0x0A, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x08, - 0x08, 0x08, 0x0A, 0x0A, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x02, 0x04, 0x06, - 0x03, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x00 + 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 9, 8, 7, 8, 8, 8, 8, 8, + 8, 8, 8, 5, 9, 10, 10, 10, 8, 10, 10, 10, 10, 8, + 8, 8, 10, 10, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 2, 4, 6, + 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 5, 6, 6, 6, 6, 6, 6, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0 }; // Font 4 static const u16 sFont4LatinGlyphs[] = INCBIN_U16("graphics/fonts/font4_latin.latfont"); static const u8 sFont4LatinGlyphWidths[] = { - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x09, 0x08, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0A, 0x08, 0x05, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x06, 0x08, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x08, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x05, 0x06, 0x06, 0x06, 0x03, 0x03, 0x06, - 0x06, 0x08, 0x05, 0x09, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x04, 0x06, 0x05, - 0x05, 0x06, 0x05, 0x06, 0x06, 0x06, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x08, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06 + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, + 6, 6, 9, 8, 8, 6, 6, 6, 6, 6, 10, 8, 5, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, + 8, 8, 8, 8, 8, 4, 6, 8, 5, 5, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 6, + 6, 6, 6, 6, 6, 6, 8, 8, 8, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 5, 6, 5, 6, 6, 6, 3, 3, 6, + 6, 8, 5, 9, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 4, 6, 5, + 5, 6, 5, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, + 6, 8, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 12, 12, 12, 12, 8, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 6 }; static const u16 sFont4JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font4_jap.fwjpnfont"); static const u8 sFont4JapaneseGlyphWidths[] = { - 0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x09, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x09, 0x08, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x05, 0x09, 0x0A, 0x0A, 0x0A, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x08, - 0x08, 0x08, 0x0A, 0x0A, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x02, 0x04, 0x06, - 0x03, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x00 + 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 9, 8, 7, 8, 8, 8, 8, 8, + 8, 8, 8, 5, 9, 10, 10, 10, 8, 10, 10, 10, 10, 8, + 8, 8, 10, 10, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 2, 4, 6, + 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 5, 6, 6, 6, 6, 6, 6, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0 }; // Font 5 static const u16 sFont5LatinGlyphs[] = INCBIN_U16("graphics/fonts/font5_latin.latfont"); static const u8 sFont5LatinGlyphWidths[] = { - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x09, 0x08, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0A, 0x08, 0x05, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x04, 0x06, 0x08, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x08, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x05, 0x06, 0x06, 0x06, 0x03, 0x03, 0x06, - 0x06, 0x08, 0x05, 0x09, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x04, 0x06, 0x05, - 0x05, 0x06, 0x05, 0x06, 0x06, 0x06, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x08, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x0C, 0x0C, 0x0C, 0x0C, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x06 + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, + 6, 6, 9, 8, 8, 6, 6, 6, 6, 6, 10, 8, 5, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 8, + 8, 8, 8, 8, 8, 4, 6, 8, 5, 5, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 12, 12, 12, 12, 6, + 6, 6, 6, 6, 6, 6, 8, 8, 8, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 8, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 5, 6, 5, 6, 6, 6, 3, 3, 6, + 6, 8, 5, 9, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 4, 6, 5, + 5, 6, 5, 6, 6, 6, 5, 5, 5, 6, 6, 6, 6, 6, + 6, 8, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 12, 12, 12, 12, 8, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 6 }; static const u16 sFont5JapaneseGlyphs[] = INCBIN_U16("graphics/fonts/font5_jap.fwjpnfont"); static const u8 sFont5JapaneseGlyphWidths[] = { - 0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x09, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x09, 0x08, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, - 0x08, 0x08, 0x08, 0x05, 0x09, 0x0A, 0x0A, 0x0A, 0x08, 0x0A, 0x0A, 0x0A, 0x0A, 0x08, - 0x08, 0x08, 0x0A, 0x0A, 0x08, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x05, 0x06, 0x06, 0x02, 0x04, 0x06, - 0x03, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, - 0x06, 0x06, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x00 + 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 9, 9, 9, 9, 9, 9, 9, 9, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 9, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 9, 9, 9, 9, 9, 9, 9, 8, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 9, 8, 7, 8, 8, 8, 8, 8, + 8, 8, 8, 5, 9, 10, 10, 10, 8, 10, 10, 10, 10, 8, + 8, 8, 10, 10, 8, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 6, 6, 6, 6, 6, 6, 5, 6, 6, 2, 4, 6, + 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 6, 5, 6, 6, 6, 6, 6, 6, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 0 }; // Font 9 @@ -897,7 +897,8 @@ u16 RenderText(struct TextPrinter *textPrinter) return 1; } -s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) +// Unused +static s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) { int i; u8 width; @@ -985,7 +986,7 @@ s32 GetStringWidthFixedWidthFont(const u8 *str, u8 fontId, u8 letterSpacing) width = lineWidths[strPos]; } - return (u8)(GetFontAttribute(fontId, 0) + letterSpacing) * width; + return (u8)(GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH) + letterSpacing) * width; } s32 (*GetFontWidthFunc(u8 glyphId))(u16 _glyphId, bool32 _isJapanese) diff --git a/src/tm_case.c b/src/tm_case.c index d7ffee5a3..43d590c40 100644 --- a/src/tm_case.c +++ b/src/tm_case.c @@ -111,7 +111,7 @@ static void InitWindowTemplatesAndPals(void); static void AddTextPrinterParameterized_ColorByIndex(u8 windowId, u8 fontId, const u8 * str, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIdx); static void TMCase_SetWindowBorder1(u8 windowId); static void TMCase_SetWindowBorder2(u8 windowId); -static void TMCase_PrintMessageWithFollowupTask(u8 taskId, u8 windowId, const u8 * str, TaskFunc func); +static void TMCase_PrintMessageWithFollowupTask(u8 taskId, u8 fontId, const u8 * str, TaskFunc func); static void PrintStringTMCaseOnWindow3(void); static void DrawMoveInfoUIMarkers(void); static void TMCase_MoveCursor_UpdatePrintedTMInfo(u16 itemId); @@ -504,7 +504,7 @@ static void InitTMCaseListMenuItems(void) gMultiuseListMenuTemplate.itemVerticalPadding = 2; gMultiuseListMenuTemplate.upText_Y = 2; gMultiuseListMenuTemplate.maxShowed = sTMCaseDynamicResources->maxTMsShown; - gMultiuseListMenuTemplate.fontId = 2; + gMultiuseListMenuTemplate.fontId = FONT_2; gMultiuseListMenuTemplate.cursorPal = 2; gMultiuseListMenuTemplate.fillValue = 0; gMultiuseListMenuTemplate.cursorShadowPal = 3; @@ -562,7 +562,7 @@ static void TMCase_ItemPrintFunc(u8 windowId, u32 itemId, u8 y) { ConvertIntToDecimalStringN(gStringVar1, BagGetQuantityByPocketPosition(POCKET_TM_CASE, itemId), STR_CONV_MODE_RIGHT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - AddTextPrinterParameterized_ColorByIndex(windowId, 0, gStringVar4, 0x7E, y, 0, 0, 0xFF, 1); + AddTextPrinterParameterized_ColorByIndex(windowId, FONT_0, gStringVar4, 0x7E, y, 0, 0, 0xFF, 1); } else { @@ -583,7 +583,7 @@ static void TMCase_MoveCursor_UpdatePrintedDescription(s32 itemIndex) str = gText_TMCaseWillBePutAway; } FillWindowPixelBuffer(1, 0); - AddTextPrinterParameterized_ColorByIndex(1, 2, str, 2, 3, 1, 0, 0, 0); + AddTextPrinterParameterized_ColorByIndex(1, FONT_2, str, 2, 3, 1, 0, 0, 0); } static void FillBG2RowWithPalette_2timesNplus1(s32 a0) @@ -601,12 +601,12 @@ static void PrintListMenuCursorAt_WithColorIdx(u8 a0, u8 a1) { if (a1 == 0xFF) { - FillWindowPixelRect(0, 0, 0, a0, GetFontAttribute(2, 0), GetFontAttribute(2, 1)); + FillWindowPixelRect(0, 0, 0, a0, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_WIDTH), GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT)); CopyWindowToVram(0, COPYWIN_GFX); } else { - AddTextPrinterParameterized_ColorByIndex(0, 2, gText_SelectorArrow2, 0, a0, 0, 0, 0, a1); + AddTextPrinterParameterized_ColorByIndex(0, FONT_2, gText_SelectorArrow2, 0, a0, 0, 0, 0, a1); } } @@ -787,12 +787,12 @@ static void Task_SelectTMAction_FromFieldBag(u8 taskId) sTMCaseDynamicResources->menuActionIndices = sMenuActionIndices_UnionRoom; sTMCaseDynamicResources->numMenuActions = NELEMS(sMenuActionIndices_UnionRoom); } - AddItemMenuActionTextPrinters(sTMCaseDynamicResources->contextMenuWindowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, 0, GetFontAttribute(2, 1) + 2, sTMCaseDynamicResources->numMenuActions, sMenuActions_UseGiveExit, sTMCaseDynamicResources->menuActionIndices); - Menu_InitCursor(sTMCaseDynamicResources->contextMenuWindowId, 2, 0, 2, GetFontAttribute(2, 1) + 2, sTMCaseDynamicResources->numMenuActions, 0); + AddItemMenuActionTextPrinters(sTMCaseDynamicResources->contextMenuWindowId, FONT_2, GetMenuCursorDimensionByFont(FONT_2, 0), 2, 0, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sTMCaseDynamicResources->numMenuActions, sMenuActions_UseGiveExit, sTMCaseDynamicResources->menuActionIndices); + Menu_InitCursor(sTMCaseDynamicResources->contextMenuWindowId, FONT_2, 0, 2, GetFontAttribute(FONT_2, FONTATTR_MAX_LETTER_HEIGHT) + 2, sTMCaseDynamicResources->numMenuActions, 0); strbuf = Alloc(256); GetTMNumberAndMoveString(strbuf, gSpecialVar_ItemId); StringAppend(strbuf, gText_Var1IsSelected + 2); // +2 skips over the stringvar - AddTextPrinterParameterized_ColorByIndex(2, 2, strbuf, 0, 2, 1, 0, 0, 1); + AddTextPrinterParameterized_ColorByIndex(2, FONT_2, strbuf, 0, 2, 1, 0, 0, 1); Free(strbuf); if (itemid_is_unique(gSpecialVar_ItemId)) { @@ -879,14 +879,14 @@ static void TMHMContextMenuAction_Give(u8 taskId) static void PrintError_ThereIsNoPokemon(u8 taskId) { - TMCase_PrintMessageWithFollowupTask(taskId, 2, gText_ThereIsNoPokemon, Task_WaitButtonAfterErrorPrint); + TMCase_PrintMessageWithFollowupTask(taskId, FONT_2, gText_ThereIsNoPokemon, Task_WaitButtonAfterErrorPrint); } static void PrintError_ItemCantBeHeld(u8 taskId) { CopyItemName(gSpecialVar_ItemId, gStringVar1); StringExpandPlaceholders(gStringVar4, gText_ItemCantBeHeld); - TMCase_PrintMessageWithFollowupTask(taskId, 2, gStringVar4, Task_WaitButtonAfterErrorPrint); + TMCase_PrintMessageWithFollowupTask(taskId, FONT_2, gStringVar4, Task_WaitButtonAfterErrorPrint); } static void Task_WaitButtonAfterErrorPrint(u8 taskId) @@ -1029,7 +1029,7 @@ static void Task_InitQuantitySelectUI(u8 taskId) TMCase_SetWindowBorder1(7); ConvertIntToDecimalStringN(gStringVar1, 1, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - AddTextPrinterParameterized_ColorByIndex(7, 0, gStringVar4, 4, 10, 1, 0, 0, 1); + AddTextPrinterParameterized_ColorByIndex(7, FONT_0, gStringVar4, 4, 10, 1, 0, 0, 1); SellTM_PrintQuantityAndSalePrice(1, itemid_get_market_price(BagGetItemIdByPocketPosition(POCKET_TM_CASE, data[1])) / 2 * data[8]); HandlePrintMoneyOnHand(); CreateTMCaseScrollIndicatorArrowPair_SellQuantitySelect(); @@ -1043,7 +1043,7 @@ static void SellTM_PrintQuantityAndSalePrice(s16 quantity, s32 amount) FillWindowPixelBuffer(7, 0x11); ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, gText_TimesStrVar1); - AddTextPrinterParameterized_ColorByIndex(7, 0, gStringVar4, 4, 10, 1, 0, 0, 1); + AddTextPrinterParameterized_ColorByIndex(7, FONT_0, gStringVar4, 4, 10, 1, 0, 0, 1); PrintMoneyAmount(7, 0x38, 0x0A, amount, 0); } @@ -1090,7 +1090,7 @@ static void Task_PrintSaleConfirmedText(u8 taskId) CopyItemName(gSpecialVar_ItemId, gStringVar1); ConvertIntToDecimalStringN(gStringVar3, itemid_get_market_price(BagGetItemIdByPocketPosition(POCKET_TM_CASE, data[1])) / 2 * data[8], STR_CONV_MODE_LEFT_ALIGN, 6); StringExpandPlaceholders(gStringVar4, gText_TurnedOverItemsWorthYen); - TMCase_PrintMessageWithFollowupTask(taskId, 2, gStringVar4, Task_DoSaleOfTMs); + TMCase_PrintMessageWithFollowupTask(taskId, FONT_2, gStringVar4, Task_DoSaleOfTMs); } static void Task_DoSaleOfTMs(u8 taskId) @@ -1227,7 +1227,7 @@ static void Task_TMCaseDude_Playback(u8 taskId) break; case 8: FillBG2RowWithPalette_2timesNplus1(1); - TMCase_PrintMessageWithFollowupTask(taskId, 4, gPokedudeText_TMTypes, 0); + TMCase_PrintMessageWithFollowupTask(taskId, FONT_4, gPokedudeText_TMTypes, 0); gTasks[taskId].func = Task_TMCaseDude_Playback; data[8]++; break; @@ -1249,7 +1249,7 @@ static void Task_TMCaseDude_Playback(u8 taskId) break; case 18: FillBG2RowWithPalette_2timesNplus1(1); - TMCase_PrintMessageWithFollowupTask(taskId, 4, gPokedudeText_ReadTMDescription, NULL); + TMCase_PrintMessageWithFollowupTask(taskId, FONT_4, gPokedudeText_ReadTMDescription, NULL); gTasks[taskId].func = Task_TMCaseDude_Playback; // this function data[8]++; break; @@ -1323,16 +1323,16 @@ static void TMCase_SetWindowBorder2(u8 windowId) DrawStdFrameWithCustomTileAndPalette(windowId, FALSE, 0x78, 0x0D); } -static void TMCase_PrintMessageWithFollowupTask(u8 taskId, u8 windowId, const u8 * str, TaskFunc func) +static void TMCase_PrintMessageWithFollowupTask(u8 taskId, u8 fontId, const u8 * str, TaskFunc func) { - DisplayMessageAndContinueTask(taskId, 6, 0x64, 0x0B, windowId, GetTextSpeedSetting(), str, func); + DisplayMessageAndContinueTask(taskId, 6, 0x64, 0x0B, fontId, GetTextSpeedSetting(), str, func); ScheduleBgCopyTilemapToVram(1); } static void PrintStringTMCaseOnWindow3(void) { - u32 distance = 72 - GetStringWidth(1, gText_TMCase, 0); - AddTextPrinterParameterized3(3, 1, distance / 2, 1, sTextColors[0], 0, gText_TMCase); + u32 distance = 72 - GetStringWidth(FONT_1, gText_TMCase, 0); + AddTextPrinterParameterized3(3, FONT_1, distance / 2, 1, sTextColors[0], 0, gText_TMCase); } static void DrawMoveInfoUIMarkers(void) @@ -1355,7 +1355,7 @@ static void TMCase_MoveCursor_UpdatePrintedTMInfo(u16 itemId) { for (i = 0; i < 4; i++) { - AddTextPrinterParameterized_ColorByIndex(5, 3, gText_ThreeHyphens, 7, 12 * i, 0, 0, 0xFF, 3); + AddTextPrinterParameterized_ColorByIndex(5, FONT_3, gText_ThreeHyphens, 7, 12 * i, 0, 0, 0xFF, 3); } CopyWindowToVram(5, COPYWIN_GFX); } @@ -1370,7 +1370,7 @@ static void TMCase_MoveCursor_UpdatePrintedTMInfo(u16 itemId) ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].power, STR_CONV_MODE_RIGHT_ALIGN, 3); str = gStringVar1; } - AddTextPrinterParameterized_ColorByIndex(5, 3, str, 7, 12, 0, 0, 0xFF, 3); + AddTextPrinterParameterized_ColorByIndex(5, FONT_3, str, 7, 12, 0, 0, 0xFF, 3); if (gBattleMoves[move].accuracy == 0) str = gText_ThreeHyphens; else @@ -1378,9 +1378,9 @@ static void TMCase_MoveCursor_UpdatePrintedTMInfo(u16 itemId) ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3); str = gStringVar1; } - AddTextPrinterParameterized_ColorByIndex(5, 3, str, 7, 24, 0, 0, 0xFF, 3); + AddTextPrinterParameterized_ColorByIndex(5, FONT_3, str, 7, 24, 0, 0, 0xFF, 3); ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].pp, STR_CONV_MODE_RIGHT_ALIGN, 3); - AddTextPrinterParameterized_ColorByIndex(5, 3, gStringVar1, 7, 36, 0, 0, 0xFF, 3); + AddTextPrinterParameterized_ColorByIndex(5, FONT_3, gStringVar1, 7, 36, 0, 0, 0xFF, 3); CopyWindowToVram(5, COPYWIN_GFX); } } @@ -1397,7 +1397,7 @@ static void HandlePrintMoneyOnHand(void) static void HandleCreateYesNoMenu(u8 taskId, const struct YesNoFuncTable *ptrs) { - CreateYesNoMenuWithCallbacks(taskId, &sYesNoWindowTemplate, 2, 0, 2, 0x5B, 0x0E, ptrs); + CreateYesNoMenuWithCallbacks(taskId, &sYesNoWindowTemplate, FONT_2, 0, 2, 0x5B, 0x0E, ptrs); } static u8 AddTMContextMenu(u8 * a0, u8 a1) diff --git a/src/trade.c b/src/trade.c index 96aae81c1..392a23061 100644 --- a/src/trade.c +++ b/src/trade.c @@ -891,7 +891,7 @@ static void CB2_ReturnFromLinkTrade2(void) break; case 12: name = gSaveBlock2Ptr->playerName; - width = GetStringWidth(1, name, 0); + width = GetStringWidth(FONT_1, name, 0); xPos = (56 - width) / 2; for (i = 0; i < 3; i++) { @@ -901,7 +901,7 @@ static void CB2_ReturnFromLinkTrade2(void) } id = GetMultiplayerId(); name = gLinkPlayers[id ^ 1].name; - width = GetStringWidth(1, name, 0); + width = GetStringWidth(FONT_1, name, 0); xPos = (56 - width) / 2; for (i = 0; i < 3; i++) { @@ -1086,7 +1086,7 @@ void CB2_ReturnToTradeMenuFromSummary(void) break; case 12: name = gSaveBlock2Ptr->playerName; - width = GetStringWidth(1, name, 0); + width = GetStringWidth(FONT_1, name, 0); xPos = (56 - width) / 2; for (i = 0; i < 3; i++) { @@ -1096,7 +1096,7 @@ void CB2_ReturnToTradeMenuFromSummary(void) } id = GetMultiplayerId(); name = gLinkPlayers[id ^ 1].name; - width = GetStringWidth(1, name, 0); + width = GetStringWidth(FONT_1, name, 0); xPos = (56 - width) / 2; for (i = 0; i < 3; i++) { @@ -1729,8 +1729,8 @@ static void TradeMenuCB_0(void) { DrawTextBorderOuter(1, 1, 14); FillWindowPixelBuffer(1, PIXEL_FILL(1)); - UnionRoomAndTradeMenuPrintOptions(1, 3, 16, 2, sMenuAction_SummaryTrade); - Menu_InitCursor(1, 3, 0, 0, 16, 2, 0); + UnionRoomAndTradeMenuPrintOptions(1, FONT_3, 16, 2, sMenuAction_SummaryTrade); + Menu_InitCursor(1, FONT_3, 0, 0, 16, 2, 0); PutWindowTilemap(1); CopyWindowToVram(1, COPYWIN_FULL); sTradeMenuResourcesPtr->tradeMenuCBnum = 1; @@ -1742,7 +1742,7 @@ static void TradeMenuCB_0(void) } else if (sTradeMenuResourcesPtr->tradeMenuCursorPosition == 12) { - CreateYesNoMenu(&sWindowTemplate_YesNo, 3, 0, 2, 0x001, 14, 0); + CreateYesNoMenu(&sWindowTemplate_YesNo, FONT_3, 0, 2, 0x001, 14, 0); sTradeMenuResourcesPtr->tradeMenuCBnum = 4; RenderTextToVramViaBuffer(sTradeUITextPtrs[TRADEUITEXT_ASKCANCEL], (void *)OBJ_VRAM0 + sTradeMenuResourcesPtr->cursorStartTile * 32, 24); } @@ -1956,7 +1956,7 @@ static void TradeMenuCB_14(void) if (sTradeMenuResourcesPtr->loadUISpritesState > 120) { - CreateYesNoMenu(&sWindowTemplate_YesNo, 3, 0, 2, 1, 14, 0); + CreateYesNoMenu(&sWindowTemplate_YesNo, FONT_3, 0, 2, 1, 14, 0); sTradeMenuResourcesPtr->loadUISpritesState = 0; sTradeMenuResourcesPtr->tradeMenuCBnum = 3; } @@ -2160,9 +2160,9 @@ static void HandleRedrawTradeMenuOnSide(u8 side) gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].x2 = 0; gSprites[sTradeMenuResourcesPtr->partyIcons[0][partyIdx + (whichParty * PARTY_SIZE)]].y2 = 0; nameStringWidth = GetNicknameStringWidthByPartyAndMonIdx(nickname, whichParty, partyIdx); - AddTextPrinterParameterized3((side * 2) + 14, 0, (80 - nameStringWidth) / 2, 4, sTextColor_PartyMonNickname, 0, nickname); + AddTextPrinterParameterized3((side * 2) + 14, FONT_0, (80 - nameStringWidth) / 2, 4, sTextColor_PartyMonNickname, 0, nickname); BuildMovesString(movesString, whichParty, partyIdx); - AddTextPrinterParameterized4((side * 2) + 15, 1, 0, 0, 0, 0, sTextColor_PartyMonNickname, 0, movesString); + AddTextPrinterParameterized4((side * 2) + 15, FONT_1, 0, 0, 0, 0, sTextColor_PartyMonNickname, 0, movesString); PutWindowTilemap((side * 2) + 14); CopyWindowToVram((side * 2) + 14, COPYWIN_FULL); PutWindowTilemap((side * 2) + 15); @@ -2184,7 +2184,7 @@ static u8 GetNicknameStringWidthByPartyAndMonIdx(u8 *dest, u8 whichParty, u8 par else GetMonData(&gEnemyParty[partyIdx], MON_DATA_NICKNAME, nickname); StringCopy_Nickname(dest, nickname); - return GetStringWidth(0, dest, GetFontAttribute(0, FONTATTR_LETTER_SPACING)); + return GetStringWidth(FONT_0, dest, GetFontAttribute(FONT_0, FONTATTR_LETTER_SPACING)); } static void BuildMovesString(u8 *movesString, u8 whichParty, u8 whichMon) @@ -2231,8 +2231,8 @@ static void PrintPartyMonNickname(u8 whichParty, u8 windowId, const u8 *str) s8 speed; windowId += (whichParty * PARTY_SIZE) + 2; speed = 0; - xPos = (64u - GetStringWidth(0, str, GetFontAttribute(0, FONTATTR_LETTER_SPACING))) / 2; - AddTextPrinterParameterized3(windowId, 0, xPos, 4, sTextColor_PartyMonNickname, speed, str); + xPos = (64u - GetStringWidth(FONT_0, str, GetFontAttribute(FONT_0, FONTATTR_LETTER_SPACING))) / 2; + AddTextPrinterParameterized3(windowId, FONT_0, xPos, 4, sTextColor_PartyMonNickname, speed, str); PutWindowTilemap(windowId); CopyWindowToVram(windowId, COPYWIN_FULL); } @@ -2442,7 +2442,7 @@ static void RunScheduledLinkTasks(void) static void PrintTradeErrorOrStatusMessage(u8 idx) { FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized(0, 3, sTradeErrorOrStatusMessagePtrs[idx], 0, 2, 0xFF, NULL); + AddTextPrinterParameterized(0, FONT_3, sTradeErrorOrStatusMessagePtrs[idx], 0, 2, 0xFF, NULL); DrawTextBorderOuter(0, 0x014, 12); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_FULL); diff --git a/src/trade_scene.c b/src/trade_scene.c index c4acdc38a..096731023 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -2767,7 +2767,7 @@ void DrawTextOnTradeWindow(u8 windowId, const u8 *str, s8 speed) sTradeData->textColor[0] = 15; sTradeData->textColor[1] = 1; sTradeData->textColor[2] = 6; - AddTextPrinterParameterized4(windowId, 2, 0, 2, 0, 2, sTradeData->textColor, speed, str); + AddTextPrinterParameterized4(windowId, FONT_2, 0, 2, 0, 2, sTradeData->textColor, speed, str); CopyWindowToVram(windowId, COPYWIN_FULL); } diff --git a/src/trainer_card.c b/src/trainer_card.c index 401a6366d..4a9b99361 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -274,7 +274,7 @@ static const u16 *const sKantoTrainerCardStarPals[] = static const u8 sTrainerCardTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY}; static const u8 sTrainerCardStatColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED}; static const u8 sTimeColonInvisibleTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_TRANSPARENT}; -static const u8 sTrainerCardFontIds[] = {0, 2, 0}; +static const u8 sTrainerCardFontIds[] = {FONT_0, FONT_2, FONT_0}; static const u8 sTrainerPicOffsets[2][GENDER_COUNT][2] = { @@ -620,7 +620,7 @@ static void Task_TrainerCard(u8 taskId) case STATE_WAIT_LINK_PARTNER: SetCloseLinkCallback(); DrawDialogueFrame(0, 1); - AddTextPrinterParameterized(0, 2, gText_WaitingTrainerFinishReading, 0, 1, TEXT_SKIP_DRAW, 0); + AddTextPrinterParameterized(0, FONT_2, gText_WaitingTrainerFinishReading, 0, 1, TEXT_SKIP_DRAW, 0); CopyWindowToVram(0, COPYWIN_FULL); sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD_LINK; break; @@ -1237,16 +1237,16 @@ static void PrintProfilePhraseOnCard(void) { if (sTrainerCardDataPtr->isLink) { - AddTextPrinterParameterized3(1, 2, 10, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType], + AddTextPrinterParameterized3(1, FONT_2, 10, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[0]); - AddTextPrinterParameterized3(1, 2, GetStringWidth(2, sTrainerCardDataPtr->easyChatProfile[0], 0) + 16, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType], + AddTextPrinterParameterized3(1, FONT_2, GetStringWidth(FONT_2, sTrainerCardDataPtr->easyChatProfile[0], 0) + 16, sTrainerCardProfilePhraseXPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[1]); - AddTextPrinterParameterized3(1, 2, 10, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType], + AddTextPrinterParameterized3(1, FONT_2, 10, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[2]); - AddTextPrinterParameterized3(1, 2, GetStringWidth(2, sTrainerCardDataPtr->easyChatProfile[2], 0) + 16, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType], + AddTextPrinterParameterized3(1, FONT_2, GetStringWidth(FONT_2, sTrainerCardDataPtr->easyChatProfile[2], 0) + 16, sTrainerCardProfilePhraseYPositions[sTrainerCardDataPtr->cardType], sTrainerCardTextColors, TEXT_SKIP_DRAW, sTrainerCardDataPtr->easyChatProfile[3]); } } diff --git a/src/trainer_tower.c b/src/trainer_tower.c index a589dcbef..9bc2090f1 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -632,7 +632,7 @@ static void TT_ConvertEasyChatMessageToString(u16 *ecWords, u8 *dest) { s32 i; ConvertEasyChatWordsToString(dest, ecWords, 3, 2); - if ((unsigned)GetStringWidth(2, dest, -1) > 196) + if ((unsigned)GetStringWidth(FONT_2, dest, -1) > 196) { // Has to be printed 2x3 ConvertEasyChatWordsToString(dest, ecWords, 2, 3); @@ -905,15 +905,15 @@ static void ShowResultsBoard(void) windowId = AddWindow(sTimeBoardWindowTemplate); LoadStdWindowFrameGfx(); DrawStdWindowFrame(windowId, FALSE); - AddTextPrinterParameterized(windowId, 2, gText_TimeBoard, 74, 0, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gText_TimeBoard, 74, 0, TEXT_SKIP_DRAW, NULL); for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++) { PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&TRAINER_TOWER.bestTime)); StringExpandPlaceholders(gStringVar4, gText_XMinYZSec); - AddTextPrinterParameterized(windowId, 2, gTrainerTowerChallengeTypeTexts[i - 1], 24, 36 + 20 * i, TEXT_SKIP_DRAW, NULL); - AddTextPrinterParameterized(windowId, 2, gStringVar4, 96, 46 + 20 * i, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gTrainerTowerChallengeTypeTexts[i - 1], 24, 36 + 20 * i, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(windowId, FONT_2, gStringVar4, 96, 46 + 20 * i, TEXT_SKIP_DRAW, NULL); } PutWindowTilemap(windowId); @@ -1059,14 +1059,14 @@ void PrintTrainerTowerRecords(void) SetUpTrainerTowerDataStruct(); FillWindowPixelRect(0, PIXEL_FILL(0), 0, 0, 216, 144); ValidateOrResetCurTrainerTowerRecord(); - AddTextPrinterParameterized3(0, 2, 0x4a, 0, sTextColors, 0, gText_TimeBoard); + AddTextPrinterParameterized3(0, FONT_2, 0x4a, 0, sTextColors, 0, gText_TimeBoard); for (i = 0; i < NUM_TOWER_CHALLENGE_TYPES; i++) { PRINT_TOWER_TIME(GetTrainerTowerRecordTime(&gSaveBlock1Ptr->trainerTower[i].bestTime)); StringExpandPlaceholders(gStringVar4, gText_XMinYZSec); - AddTextPrinterParameterized3(windowId, 2, 0x18, 0x24 + 0x14 * i, sTextColors, 0, gTrainerTowerChallengeTypeTexts[i]); - AddTextPrinterParameterized3(windowId, 2, 0x60, 0x24 + 0x14 * i, sTextColors, 0, gStringVar4); + AddTextPrinterParameterized3(windowId, FONT_2, 0x18, 0x24 + 0x14 * i, sTextColors, 0, gTrainerTowerChallengeTypeTexts[i]); + AddTextPrinterParameterized3(windowId, FONT_2, 0x60, 0x24 + 0x14 * i, sTextColors, 0, gStringVar4); } PutWindowTilemap(windowId); diff --git a/src/union_room.c b/src/union_room.c index 0477cc9fd..cadc00181 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -225,7 +225,7 @@ static const struct ListMenuTemplate sListMenuTemplate_PossibleGroupMembers = { .lettersSpacing = 0, .itemVerticalPadding = 2, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 1 }; @@ -285,7 +285,7 @@ static const struct ListMenuTemplate sListMenuTemplate_UnionRoomGroups = { .lettersSpacing = 0, .itemVerticalPadding = 2, .scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0 }; @@ -323,7 +323,7 @@ static const struct ListMenuTemplate sListMenuTemplate_InviteToActivity = { .lettersSpacing = 1, .itemVerticalPadding = 0, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0 }; @@ -360,7 +360,7 @@ static const struct ListMenuTemplate sListMenuTemplate_TradeBoardRegisterInfoExi .lettersSpacing = 1, .itemVerticalPadding = 0, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0 }; @@ -412,7 +412,7 @@ static const struct ListMenuTemplate sListMenuTemplate_TypeNames = { .lettersSpacing = 1, .itemVerticalPadding = 0, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0 }; @@ -466,7 +466,7 @@ static const struct ListMenuTemplate sTradeBoardListMenuTemplate = { .lettersSpacing = 1, .itemVerticalPadding = 1, .scrollMultiple = LIST_NO_MULTIPLE_SCROLL, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0 }; @@ -516,7 +516,7 @@ static const struct ListMenuTemplate gUnknown_845701C = { .lettersSpacing = 1, .itemVerticalPadding = 0, .scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD, - .fontId = 2, + .fontId = FONT_2, .cursorKind = 0 }; diff --git a/src/union_room_battle.c b/src/union_room_battle.c index 11307891c..56676ab7b 100644 --- a/src/union_room_battle.c +++ b/src/union_room_battle.c @@ -67,7 +67,7 @@ static void UnionRoomBattle_CreateTextPrinter(u8 windowId, const u8 * str, u8 x, s32 letterSpacing = 1; s32 lineSpacing = 1; FillWindowPixelBuffer(windowId, PIXEL_FILL(gUnknown_84571A8[0])); - AddTextPrinterParameterized4(windowId, 3, x, y, letterSpacing, lineSpacing, gUnknown_84571A8, speed, str); + AddTextPrinterParameterized4(windowId, FONT_3, x, y, letterSpacing, lineSpacing, gUnknown_84571A8, speed, str); } static bool32 UnionRoomBattle_PrintTextOnWindow0(s16 * state, const u8 * str, s32 speed) diff --git a/src/union_room_chat_display.c b/src/union_room_chat_display.c index e06bd8aa0..0c9c56c41 100644 --- a/src/union_room_chat_display.c +++ b/src/union_room_chat_display.c @@ -952,10 +952,10 @@ static void PlaceYesNoMenuAt(u8 left, u8 top, u8 initialCursorPos) { FillWindowPixelBuffer(sWork->yesNoMenuWinId, PIXEL_FILL(1)); PutWindowTilemap(sWork->yesNoMenuWinId); - AddTextPrinterParameterized(sWork->yesNoMenuWinId, 2, gText_Yes, 8, 2, TEXT_SKIP_DRAW, NULL); - AddTextPrinterParameterized(sWork->yesNoMenuWinId, 2, gText_No, 8, 16, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sWork->yesNoMenuWinId, FONT_2, gText_Yes, 8, 2, TEXT_SKIP_DRAW, NULL); + AddTextPrinterParameterized(sWork->yesNoMenuWinId, FONT_2, gText_No, 8, 16, TEXT_SKIP_DRAW, NULL); DrawTextBorderOuter(sWork->yesNoMenuWinId, 1, 13); - Menu_InitCursor(sWork->yesNoMenuWinId, 2, 0, 2, 14, 2, initialCursorPos); + Menu_InitCursor(sWork->yesNoMenuWinId, FONT_2, 0, 2, 14, 2, initialCursorPos); } } @@ -1023,7 +1023,7 @@ static void PlaceStdMessageWindow(int id, u16 bg0vofs) DrawTextBorderInner(windowId, 0xA, 2); AddTextPrinterParameterized5( windowId, - 2, + FONT_2, str, sMessageWindowInfo[id].x + 8, sMessageWindowInfo[id].y + 8, @@ -1037,7 +1037,7 @@ static void PlaceStdMessageWindow(int id, u16 bg0vofs) DrawTextBorderOuter(windowId, 0xA, 2); AddTextPrinterParameterized5( windowId, - 2, + FONT_2, str, sMessageWindowInfo[id].x, sMessageWindowInfo[id].y, @@ -1090,7 +1090,7 @@ static void PrintOnWin1Parameterized(u16 x, u8 *str, u8 bgColor, u8 fgColor, u8 strbuf[1] = EXT_CTRL_CODE_MIN_LETTER_SPACING; strbuf[2] = 8; StringCopy(&strbuf[3], str); - AddTextPrinterParameterized3(1, 2, x * 8, 1, color, TEXT_SKIP_DRAW, strbuf); + AddTextPrinterParameterized3(1, FONT_2, x * 8, 1, color, TEXT_SKIP_DRAW, strbuf); } static void PrintCurrentKeyboardPage(void) @@ -1124,7 +1124,7 @@ static void PrintCurrentKeyboardPage(void) return; StringCopy(&str[3], gUnionRoomKeyboardText[page][i]); - AddTextPrinterParameterized3(2, 0, left, top, color, TEXT_SKIP_DRAW, str); + AddTextPrinterParameterized3(2, FONT_0, left, top, color, TEXT_SKIP_DRAW, str); } } else @@ -1133,9 +1133,9 @@ static void PrintCurrentKeyboardPage(void) for (i = 0, top = 0; i < 10; i++, top += 12) { str2 = UnionRoomChat_GetWorkRegisteredText(i); - if (GetStringWidth(0, str2, 0) <= 40) + if (GetStringWidth(FONT_0, str2, 0) <= 40) { - AddTextPrinterParameterized3(2, 0, left, top, color, TEXT_SKIP_DRAW, str2); + AddTextPrinterParameterized3(2, FONT_0, left, top, color, TEXT_SKIP_DRAW, str2); } else { @@ -1144,10 +1144,10 @@ static void PrintCurrentKeyboardPage(void) { length--; StringCopyN_Multibyte(str, str2, length); - } while (GetStringWidth(0, str, 0) > 35); + } while (GetStringWidth(FONT_0, str, 0) > 35); - AddTextPrinterParameterized3(2, 0, left, top, color, TEXT_SKIP_DRAW, str); - AddTextPrinterParameterized3(2, 0, left + 35, top, color, TEXT_SKIP_DRAW, gText_Ellipsis); + AddTextPrinterParameterized3(2, FONT_0, left, top, color, TEXT_SKIP_DRAW, str); + AddTextPrinterParameterized3(2, FONT_0, left + 35, top, color, TEXT_SKIP_DRAW, gText_Ellipsis); } } } @@ -1195,8 +1195,8 @@ static void PrintKeyboardSwapTextsOnWin3(void) { FillWindowPixelBuffer(3, PIXEL_FILL(1)); DrawTextBorderOuter(3, 1, 13); - UnionRoomAndTradeMenuPrintOptions(3, 2, 14, 5, sKeyboardSwapTexts); - Menu_InitCursor(3, 2, 0, 0, 14, 5, GetCurrentKeyboardPage()); + UnionRoomAndTradeMenuPrintOptions(3, FONT_2, 14, 5, sKeyboardSwapTexts); + Menu_InitCursor(3, FONT_2, 0, 0, 14, 5, GetCurrentKeyboardPage()); PutWindowTilemap(3); } @@ -1214,7 +1214,7 @@ static void PrintTextOnWin0Colorized(u16 row, u8 *str, u8 colorIdx) color[1] = colorIdx * 2 + 2; color[2] = colorIdx * 2 + 3; FillWindowPixelRect(0, PIXEL_FILL(1), 0, row * 15, 168, 15); - AddTextPrinterParameterized3(0, 2, 0, row * 15, color, TEXT_SKIP_DRAW, str); + AddTextPrinterParameterized3(0, FONT_2, 0, row * 15, color, TEXT_SKIP_DRAW, str); } static void ResetGpuBgState(void) diff --git a/src/vs_seeker.c b/src/vs_seeker.c index 53293825d..c95c0da52 100644 --- a/src/vs_seeker.c +++ b/src/vs_seeker.c @@ -749,12 +749,12 @@ void Task_VsSeeker_0(u8 taskId) if (respval == VSSEEKER_NOT_CHARGED) { Free(sVsSeeker); - DisplayItemMessageOnField(taskId, 2, VSSeeker_Text_BatteryNotChargedNeedXSteps, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); + DisplayItemMessageOnField(taskId, FONT_2, VSSeeker_Text_BatteryNotChargedNeedXSteps, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); } else if (respval == VSSEEKER_NO_ONE_IN_RANGE) { Free(sVsSeeker); - DisplayItemMessageOnField(taskId, 2, VSSeeker_Text_NoTrainersWithinRange, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); + DisplayItemMessageOnField(taskId, FONT_2, VSSeeker_Text_NoTrainersWithinRange, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); } else if (respval == VSSEEKER_CAN_USE) { @@ -827,7 +827,7 @@ static void Task_VsSeeker_3(u8 taskId) { if (sVsSeeker->responseCode == VSSEEKER_RESPONSE_NO_RESPONSE) { - DisplayItemMessageOnField(taskId, 2, VSSeeker_Text_TrainersNotReady, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); + DisplayItemMessageOnField(taskId, FONT_2, VSSeeker_Text_TrainersNotReady, Task_ItemUse_CloseMessageBoxAndReturnToField_VsSeeker); } else { diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c index 026654e81..ec70c5dfe 100644 --- a/src/wireless_communication_status_screen.c +++ b/src/wireless_communication_status_screen.c @@ -246,13 +246,13 @@ static void PrintHeaderTexts(void) FillWindowPixelBuffer(0, PIXEL_FILL(0)); FillWindowPixelBuffer(1, PIXEL_FILL(0)); FillWindowPixelBuffer(2, PIXEL_FILL(0)); - width = 0xC0 - GetStringWidth(3, sHeaderTextPtrs[0], 0); - WCSS_AddTextPrinterParameterized(0, 3, sHeaderTextPtrs[0], width / 2, 6, 3); + width = 0xC0 - GetStringWidth(FONT_3, sHeaderTextPtrs[0], 0); + WCSS_AddTextPrinterParameterized(0, FONT_3, sHeaderTextPtrs[0], width / 2, 6, 3); for (i = 0; i < 3; i++) { - WCSS_AddTextPrinterParameterized(1, 3, sHeaderTextPtrs[i + 1], 0, 30 * i + 10, 1); + WCSS_AddTextPrinterParameterized(1, FONT_3, sHeaderTextPtrs[i + 1], 0, 30 * i + 10, 1); } - WCSS_AddTextPrinterParameterized(1, 3, sHeaderTextPtrs[i + 1], 0, 30 * i + 10, 2); + WCSS_AddTextPrinterParameterized(1, FONT_3, sHeaderTextPtrs[i + 1], 0, 30 * i + 10, 2); PutWindowTilemap(0); CopyWindowToVram(0, COPYWIN_GFX); PutWindowTilemap(1); @@ -287,9 +287,9 @@ static void Task_WirelessCommunicationScreen(u8 taskId) { ConvertIntToDecimalStringN(gStringVar4, sWCSS->counts[i], STR_CONV_MODE_RIGHT_ALIGN, 2); if (i != 3) - WCSS_AddTextPrinterParameterized(2, 3, gStringVar4, 4, 30 * i + 10, 1); + WCSS_AddTextPrinterParameterized(2, FONT_3, gStringVar4, 4, 30 * i + 10, 1); else - WCSS_AddTextPrinterParameterized(2, 3, gStringVar4, 4, 100, 2); + WCSS_AddTextPrinterParameterized(2, FONT_3, gStringVar4, 4, 100, 2); } PutWindowTilemap(2); CopyWindowToVram(2, COPYWIN_FULL); @@ -348,7 +348,7 @@ static void WCSS_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 * break; // default: UB } - AddTextPrinterParameterized4(windowId, fontId,x, y, fontId == 0 ? 0 : 1, 0, textColor, -1, str); + AddTextPrinterParameterized4(windowId, fontId, x, y, fontId == FONT_0 ? 0 : 1, 0, textColor, -1, str); } static u32 CountMembersInGroup(struct UnkStruct_x20 * unk20, u32 * counts) From 2d2d17dde3c6ba903e0dc2884234211945bad8e8 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 31 Jul 2022 21:41:39 -0400 Subject: [PATCH 54/64] Sync pokemon_storage_system_8.c --- include/pokemon_storage_system_internal.h | 14 +- src/pokemon_storage_system_3.c | 8 +- src/pokemon_storage_system_4.c | 18 +- src/pokemon_storage_system_8.c | 379 ++++++++++++---------- 4 files changed, 222 insertions(+), 197 deletions(-) diff --git a/include/pokemon_storage_system_internal.h b/include/pokemon_storage_system_internal.h index e8b8aa7b8..c53b5ff86 100644 --- a/include/pokemon_storage_system_internal.h +++ b/include/pokemon_storage_system_internal.h @@ -373,9 +373,9 @@ struct PokemonStorageSystemData /* 21db */ u8 itemName[20]; /* 21ef */ u8 inBoxMovingMode; /* 21f0 */ u16 field_2200; - /* 21f4 */ struct PSS_ItemIconSprite itemIconSprites[MAX_ITEM_ICONS]; - /* 2224 */ u16 movingItem; - /* 2226 */ u16 field_2236; + /* 21f4 */ struct PSS_ItemIconSprite itemIcons[MAX_ITEM_ICONS]; + /* 2224 */ u16 movingItemId; + /* 2226 */ u16 itemInfoWindowOffset; /* 2228 */ struct PssQuestLogBuffer qlogBuffer; /* 2230 */ u16 field_2238; /* 2232 */ u16 field_223A; @@ -384,7 +384,7 @@ struct PokemonStorageSystemData /* 223c */ u16 field_2244[0x40]; /* 22bc */ u8 field_22C4[0x800]; /* 2abc */ u8 field_2AC4[0x1800]; - /* 42bc */ u8 field_42C4[0x800]; + /* 42bc */ u8 itemIconBuffer[0x800]; /* 4abc */ u8 field_4AC4[0x1000]; /* 5abc */ u8 field_5AC4[0x800]; }; // size=62bc @@ -442,9 +442,9 @@ void sub_8096088(void); void sub_80960C0(void); bool8 sub_809610C(void); const u8 *GetMovingItemName(void); -void sub_80966F4(void); -bool8 sub_8096728(void); -bool8 sub_80967C0(void); +void InitItemInfoWindow(void); +bool8 UpdateItemInfoWindowSlideIn(void); +bool8 UpdateItemInfoWindowSlideOut(void); void sub_8096BE4(struct UnkUtil *arg0, struct UnkUtilData *arg1, u32 arg2); void sub_8096BF8(void); void AddMenu(void); diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index a08b2a920..d68aaafdc 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -1568,12 +1568,12 @@ static void Cb_ShowItemInfo(u8 taskId) { PlaySE(SE_WIN_OPEN); PrintItemDescription(); - sub_80966F4(); + InitItemInfoWindow(); gPSSData->state++; } break; case 2: - if (!sub_8096728()) + if (!UpdateItemInfoWindowSlideIn()) gPSSData->state++; break; case 3: @@ -1588,7 +1588,7 @@ static void Cb_ShowItemInfo(u8 taskId) } break; case 5: - if (!sub_80967C0()) + if (!UpdateItemInfoWindowSlideOut()) gPSSData->state++; break; case 6: @@ -1617,7 +1617,7 @@ static void Cb_CloseBoxWhileHoldingItem(u8 taskId) SetPSSCallback(Cb_MainPSS); break; case 0: - if (AddBagItem(gPSSData->movingItem, 1) == TRUE) + if (AddBagItem(gPSSData->movingItemId, 1) == TRUE) { ClearBottomWindow(); gPSSData->state = 3; diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 1c1567106..349a9b7b1 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -27,7 +27,7 @@ static void sub_8091E84(struct Sprite *sprite); static void sub_8091EB8(struct Sprite *sprite); static s16 GetBoxTitleBaseX(const u8 *boxName); static void sub_8091E34(void); -static void sub_8091EF0(void); +static void CycleBoxTitleColor(void); static void CreateBoxScrollArrows(void); static void StartBoxScrollArrowsSlide(s8 direction); static void StopBoxScrollArrowsSlide(void); @@ -128,7 +128,7 @@ static const u32 gUnknown_83D2654[] = INCBIN_U32("graphics/interface/pss_unk_83D static const u32 gUnknown_83D277C[] = INCBIN_U32("graphics/interface/pss_unk_83D277C.bin.lz"); static const u16 gUnknown_83D2820[] = INCBIN_U16("graphics/interface/pss_unk_83D2820.bin"); -static const u16 gUnknown_83D29D0[][2] = { +static const u16 sBoxTitleColors[][2] = { {RGB( 7, 7, 7), RGB(31, 31, 31)}, {RGB( 7, 7, 7), RGB(31, 31, 31)}, {RGB( 7, 7, 7), RGB(31, 31, 31)}, @@ -1119,7 +1119,7 @@ bool8 DoWallpaperGfxChange(void) case 2: if (WaitForWallpaperGfxLoad() == TRUE) { - sub_8091EF0(); + CycleBoxTitleColor(); BeginNormalPaletteFade(gPSSData->wallpaperPalBits, 1, 16, 0, RGB_WHITEALPHA); gPSSData->wallpaperChangeState++; } @@ -1227,8 +1227,8 @@ static void sub_8091A94(u8 boxId) u16 wallpaperId = GetBoxWallpaper(boxId); - gPSSData->boxTitlePal[14] = gUnknown_83D29D0[wallpaperId][0]; - gPSSData->boxTitlePal[15] = gUnknown_83D29D0[wallpaperId][1]; + gPSSData->boxTitlePal[14] = sBoxTitleColors[wallpaperId][0]; + gPSSData->boxTitlePal[15] = sBoxTitleColors[wallpaperId][1]; LoadSpritePalettes(palettes); gPSSData->wallpaperPalBits = 0x3f0; @@ -1279,7 +1279,7 @@ static void sub_8091C48(u8 boxId, s8 direction) StringCopyPadded(gPSSData->field_21B8, GetBoxNamePtr(boxId), 0, 8); DrawTextWindowAndBufferTiles(gPSSData->field_21B8, gPSSData->field_2F8, 0, 0, gPSSData->field_4F8, 2); LoadSpriteSheet(&spriteSheet); - LoadPalette(gUnknown_83D29D0[GetBoxWallpaper(boxId)], r8, 4); + LoadPalette(sBoxTitleColors[GetBoxWallpaper(boxId)], r8, 4); x = GetBoxTitleBaseX(GetBoxNamePtr(boxId)); x2 = x; x2 += direction * 192; @@ -1335,14 +1335,14 @@ static void sub_8091EB8(struct Sprite *sprite) } } -static void sub_8091EF0(void) +static void CycleBoxTitleColor(void) { u8 boxId = StorageGetCurrentBox(); u8 wallpaperId = GetBoxWallpaper(boxId); if (gPSSData->boxTitleCycleId == 0) - CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + gPSSData->boxTitlePalOffset, 4); + CpuCopy16(sBoxTitleColors[wallpaperId], gPlttBufferUnfaded + gPSSData->boxTitlePalOffset, 4); else - CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + gPSSData->boxTitleAltPalOffset, 4); + CpuCopy16(sBoxTitleColors[wallpaperId], gPlttBufferUnfaded + gPSSData->boxTitleAltPalOffset, 4); } static s16 GetBoxTitleBaseX(const u8 *string) diff --git a/src/pokemon_storage_system_8.c b/src/pokemon_storage_system_8.c index 8a2cf84c8..7b8670e36 100644 --- a/src/pokemon_storage_system_8.c +++ b/src/pokemon_storage_system_8.c @@ -9,26 +9,38 @@ #include "trig.h" #include "constants/items.h" -static u8 sub_80961D8(void); -static bool32 sub_8096210(u8 cursorArea, u8 cursorPos); -static u8 sub_8096258(u8 cursorArea, u8 cursorPos); -static void sub_80962F0(u8 id, u8 cursorArea, u8 cursorPos); -static void sub_8096408(u8 id, const u32 * tiles, const u32 * pal); -static void sub_80964B8(u8 id, u8 affineAnimNo); -static void sub_80964E8(u8 id, u8 command, u8 cursorArea, u8 cursorPos); -static void sub_8096624(u8 id, bool8 show); +// IDs for the item icon sprite callbacks +enum { + ITEM_CB_WAIT_ANIM, + ITEM_CB_TO_HAND, + ITEM_CB_TO_MON, + ITEM_CB_SWAP_TO_HAND, + ITEM_CB_SWAP_TO_MON, + ITEM_CB_UNUSED_1, + ITEM_CB_UNUSED_2, + ITEM_CB_HIDE_PARTY, +}; + +static u8 GetNewItemIconIdx(void); +static bool32 IsItemIconAtPosition(u8 cursorArea, u8 cursorPos); +static u8 GetItemIconIdxByPosition(u8 cursorArea, u8 cursorPos); +static void SetItemIconPosition(u8 id, u8 cursorArea, u8 cursorPos); +static void LoadItemIconGfx(u8 id, const u32 * tiles, const u32 * pal); +static void SetItemIconAffineAnim(u8 id, u8 affineAnimNo); +static void SetItemIconCallback(u8 id, u8 command, u8 cursorArea, u8 cursorPos); +static void SetItemIconActive(u8 id, bool8 show); static const u32 *GetItemIconPic(u16 itemId); static const u32 *GetItemIconPalette(u16 itemId); -static void sub_8096898(u32 x); -static void sub_809692C(struct Sprite *sprite); -static void sub_8096958(struct Sprite *sprite); -static void sub_80969BC(struct Sprite *sprite); -static void sub_80969F4(struct Sprite *sprite); -static void sub_8096A74(struct Sprite *sprite); -static void sub_8096B10(struct Sprite *sprite); -static void sub_8096BAC(struct Sprite *sprite); +static void DrawItemInfoWindow(u32 x); +static void SpriteCB_ItemIcon_WaitAnim(struct Sprite *sprite); +static void SpriteCB_ItemIcon_ToHand(struct Sprite *sprite); +static void SpriteCB_ItemIcon_SetPosToCursor(struct Sprite *sprite); +static void SpriteCB_ItemIcon_ToMon(struct Sprite *sprite); +static void SpriteCB_ItemIcon_SwapToHand(struct Sprite *sprite); +static void SpriteCB_ItemIcon_SwapToMon(struct Sprite *sprite); +static void SpriteCB_ItemIcon_HideParty(struct Sprite *sprite); -static const u32 gUnknown_83D35DC[] = INCBIN_U32("graphics/interface/pss_unk_83D35DC.4bpp"); +static const u32 sItemInfoFrame_Gfx[] = INCBIN_U32("graphics/interface/pss_unk_83D35DC.4bpp"); static const struct OamData gUnknown_83D365C = { .y = 0, @@ -126,19 +138,19 @@ void sub_8095B5C(void) { spriteSheet.tag = TAG_TILE_7 + i; LoadCompressedSpriteSheet(&spriteSheet); - gPSSData->itemIconSprites[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * 32 + (void *)(OBJ_VRAM0); - gPSSData->itemIconSprites[i].palIndex = AllocSpritePalette(TAG_PAL_DACB + i); - gPSSData->itemIconSprites[i].palIndex *= 16; - gPSSData->itemIconSprites[i].palIndex += 0x100; + gPSSData->itemIcons[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * 32 + (void *)(OBJ_VRAM0); + gPSSData->itemIcons[i].palIndex = AllocSpritePalette(TAG_PAL_DACB + i); + gPSSData->itemIcons[i].palIndex *= 16; + gPSSData->itemIcons[i].palIndex += 0x100; spriteTemplate.tileTag = TAG_TILE_7 + i; spriteTemplate.paletteTag = TAG_PAL_DACB + i; spriteId = CreateSprite(&spriteTemplate, 0, 0, 11); - gPSSData->itemIconSprites[i].sprite = &gSprites[spriteId]; - gPSSData->itemIconSprites[i].sprite->invisible = TRUE; - gPSSData->itemIconSprites[i].active = 0; + gPSSData->itemIcons[i].sprite = &gSprites[spriteId]; + gPSSData->itemIcons[i].sprite->invisible = TRUE; + gPSSData->itemIcons[i].active = 0; } } - gPSSData->movingItem = ITEM_NONE; + gPSSData->movingItemId = ITEM_NONE; } void sub_8095C84(u8 cursorArea, u8 cursorPos) @@ -147,7 +159,7 @@ void sub_8095C84(u8 cursorArea, u8 cursorPos) if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) return; - if (sub_8096210(cursorArea, cursorPos)) + if (IsItemIconAtPosition(cursorArea, cursorPos)) return; switch (cursorArea) @@ -170,12 +182,12 @@ void sub_8095C84(u8 cursorArea, u8 cursorPos) { const u32 *tiles = GetItemIconPic(heldItem); const u32 *pal = GetItemIconPalette(heldItem); - u8 id = sub_80961D8(); + u8 id = GetNewItemIconIdx(); - sub_80962F0(id, cursorArea, cursorPos); - sub_8096408(id, tiles, pal); - sub_80964B8(id, 1); - sub_8096624(id, TRUE); + SetItemIconPosition(id, cursorArea, cursorPos); + LoadItemIconGfx(id, tiles, pal); + SetItemIconAffineAnim(id, 1); + SetItemIconActive(id, TRUE); } } @@ -186,9 +198,9 @@ void sub_8095D44(u8 cursorArea, u8 cursorPos) if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) return; - id = sub_8096258(cursorArea, cursorPos); - sub_80964B8(id, 2); - sub_80964E8(id, 0, cursorArea, cursorPos); + id = GetItemIconIdxByPosition(cursorArea, cursorPos); + SetItemIconAffineAnim(id, 2); + SetItemIconCallback(id, 0, cursorArea, cursorPos); } void Item_FromMonToMoving(u8 cursorArea, u8 cursorPos) @@ -199,11 +211,11 @@ void Item_FromMonToMoving(u8 cursorArea, u8 cursorPos) if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) return; - id = sub_8096258(cursorArea, cursorPos); + id = GetItemIconIdxByPosition(cursorArea, cursorPos); item = 0; - sub_80964B8(id, 3); - sub_80964E8(id, 1, cursorArea, cursorPos); - sub_80962F0(id, 2, 0); + SetItemIconAffineAnim(id, 3); + SetItemIconCallback(id, 1, cursorArea, cursorPos); + SetItemIconPosition(id, 2, 0); if (cursorArea == CURSOR_AREA_IN_BOX) { SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &item); @@ -215,21 +227,21 @@ void Item_FromMonToMoving(u8 cursorArea, u8 cursorPos) SetPartyMonIconObjMode(cursorPos, ST_OAM_OBJ_BLEND); } - gPSSData->movingItem = gPSSData->displayMonItemId; + gPSSData->movingItemId = gPSSData->displayMonItemId; } void sub_8095E2C(u16 item) { const u32 *tiles = GetItemIconPic(item); const u32 *pal = GetItemIconPalette(item); - u8 id = sub_80961D8(); + u8 id = GetNewItemIconIdx(); - sub_8096408(id, tiles, pal); - sub_80964B8(id, 6); - sub_80964E8(id, 1, CURSOR_AREA_IN_BOX, 0); - sub_80962F0(id, CURSOR_AREA_BOX, 0); - sub_8096624(id, TRUE); - gPSSData->movingItem = item; + LoadItemIconGfx(id, tiles, pal); + SetItemIconAffineAnim(id, 6); + SetItemIconCallback(id, 1, CURSOR_AREA_IN_BOX, 0); + SetItemIconPosition(id, CURSOR_AREA_BOX, 0); + SetItemIconActive(id, TRUE); + gPSSData->movingItemId = item; } void Item_SwitchMonsWithMoving(u8 cursorArea, u8 cursorPos) @@ -240,25 +252,25 @@ void Item_SwitchMonsWithMoving(u8 cursorArea, u8 cursorPos) if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) return; - id = sub_8096258(cursorArea, cursorPos); - sub_80964B8(id, 3); - sub_80964E8(id, 3, CURSOR_AREA_BOX, 0); + id = GetItemIconIdxByPosition(cursorArea, cursorPos); + SetItemIconAffineAnim(id, 3); + SetItemIconCallback(id, 3, CURSOR_AREA_BOX, 0); if (cursorArea == CURSOR_AREA_IN_BOX) { item = GetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM); - SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &gPSSData->movingItem); - gPSSData->movingItem = item; + SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &gPSSData->movingItemId); + gPSSData->movingItemId = item; } else { item = GetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM); - SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &gPSSData->movingItem); - gPSSData->movingItem = item; + SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &gPSSData->movingItemId); + gPSSData->movingItemId = item; } - id = sub_8096258(2, 0); - sub_80964B8(id, 4); - sub_80964E8(id, 4, cursorArea, cursorPos); + id = GetItemIconIdxByPosition(2, 0); + SetItemIconAffineAnim(id, 4); + SetItemIconCallback(id, 4, cursorArea, cursorPos); } void Item_GiveMovingToMon(u8 cursorArea, u8 cursorPos) @@ -268,17 +280,17 @@ void Item_GiveMovingToMon(u8 cursorArea, u8 cursorPos) if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) return; - id = sub_8096258(2, 0); - sub_80964B8(id, 4); - sub_80964E8(id, 2, cursorArea, cursorPos); + id = GetItemIconIdxByPosition(2, 0); + SetItemIconAffineAnim(id, 4); + SetItemIconCallback(id, 2, cursorArea, cursorPos); if (cursorArea == CURSOR_AREA_IN_BOX) { - SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &gPSSData->movingItem); + SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &gPSSData->movingItemId); SetBoxMonIconObjMode(cursorPos, ST_OAM_OBJ_NORMAL); } else { - SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &gPSSData->movingItem); + SetMonData(&gPlayerParty[cursorPos], MON_DATA_HELD_ITEM, &gPSSData->movingItemId); SetPartyMonIconObjMode(cursorPos, ST_OAM_OBJ_NORMAL); } } @@ -292,9 +304,9 @@ void Item_TakeMons(u8 cursorArea, u8 cursorPos) return; item = 0; - id = sub_8096258(cursorArea, cursorPos); - sub_80964B8(id, 2); - sub_80964E8(id, 0, cursorArea, cursorPos); + id = GetItemIconIdxByPosition(cursorArea, cursorPos); + SetItemIconAffineAnim(id, 2); + SetItemIconCallback(id, 0, cursorArea, cursorPos); if (cursorArea == CURSOR_AREA_IN_BOX) { SetCurrentBoxMonData(cursorPos, MON_DATA_HELD_ITEM, &item); @@ -311,9 +323,9 @@ void sub_8096088(void) { if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) { - u8 id = sub_8096258(2, 0); - sub_80964B8(id, 5); - sub_80964E8(id, 0, CURSOR_AREA_BOX, 0); + u8 id = GetItemIconIdxByPosition(2, 0); + SetItemIconAffineAnim(id, 5); + SetItemIconCallback(id, 0, CURSOR_AREA_BOX, 0); } } @@ -326,8 +338,8 @@ void sub_80960C0(void) for (i = 0; i < MAX_ITEM_ICONS; i++) { - if (gPSSData->itemIconSprites[i].active && gPSSData->itemIconSprites[i].cursorArea == CURSOR_AREA_IN_PARTY) - sub_80964E8(i, 7, CURSOR_AREA_BOX, 0); + if (gPSSData->itemIcons[i].active && gPSSData->itemIcons[i].cursorArea == CURSOR_AREA_IN_PARTY) + SetItemIconCallback(i, 7, CURSOR_AREA_BOX, 0); } } @@ -337,11 +349,11 @@ bool8 sub_809610C(void) for (i = 0; i < MAX_ITEM_ICONS; i++) { - if (gPSSData->itemIconSprites[i].active) + if (gPSSData->itemIcons[i].active) { - if (!gPSSData->itemIconSprites[i].sprite->affineAnimEnded && gPSSData->itemIconSprites[i].sprite->affineAnimBeginning) + if (!gPSSData->itemIcons[i].sprite->affineAnimEnded && gPSSData->itemIcons[i].sprite->affineAnimBeginning) return TRUE; - if (gPSSData->itemIconSprites[i].sprite->callback != SpriteCallbackDummy && gPSSData->itemIconSprites[i].sprite->callback != sub_80969BC) + if (gPSSData->itemIcons[i].sprite->callback != SpriteCallbackDummy && gPSSData->itemIcons[i].sprite->callback != SpriteCB_ItemIcon_SetPosToCursor) return TRUE; } } @@ -357,7 +369,7 @@ bool8 IsActiveItemMoving(void) { for (i = 0; i < MAX_ITEM_ICONS; i++) { - if (gPSSData->itemIconSprites[i].active && gPSSData->itemIconSprites[i].cursorArea == CURSOR_AREA_BOX) + if (gPSSData->itemIcons[i].active && gPSSData->itemIcons[i].cursorArea == CURSOR_AREA_BOX) return TRUE; } } @@ -367,23 +379,23 @@ bool8 IsActiveItemMoving(void) const u8 *GetMovingItemName(void) { - return ItemId_GetName(gPSSData->movingItem); + return ItemId_GetName(gPSSData->movingItemId); } u16 GetMovingItem(void) { - return gPSSData->movingItem; + return gPSSData->movingItemId; } -static u8 sub_80961D8(void) +static u8 GetNewItemIconIdx(void) { u8 i; for (i = 0; i < MAX_ITEM_ICONS; i++) { - if (!gPSSData->itemIconSprites[i].active) + if (!gPSSData->itemIcons[i].active) { - gPSSData->itemIconSprites[i].active = TRUE; + gPSSData->itemIcons[i].active = TRUE; return i; } } @@ -391,51 +403,51 @@ static u8 sub_80961D8(void) return MAX_ITEM_ICONS; } -static bool32 sub_8096210(u8 cursorArea, u8 cursorPos) +static bool32 IsItemIconAtPosition(u8 cursorArea, u8 cursorPos) { s32 i; for (i = 0; i < MAX_ITEM_ICONS; i++) { - if (gPSSData->itemIconSprites[i].active - && gPSSData->itemIconSprites[i].cursorArea == cursorArea - && gPSSData->itemIconSprites[i].cursorPos == cursorPos) + if (gPSSData->itemIcons[i].active + && gPSSData->itemIcons[i].cursorArea == cursorArea + && gPSSData->itemIcons[i].cursorPos == cursorPos) return TRUE; } return FALSE; } -static u8 sub_8096258(u8 cursorArea, u8 cursorPos) +static u8 GetItemIconIdxByPosition(u8 cursorArea, u8 cursorPos) { u8 i; for (i = 0; i < MAX_ITEM_ICONS; i++) { - if (gPSSData->itemIconSprites[i].active - && gPSSData->itemIconSprites[i].cursorArea == cursorArea - && gPSSData->itemIconSprites[i].cursorPos == cursorPos) + if (gPSSData->itemIcons[i].active + && gPSSData->itemIcons[i].cursorArea == cursorArea + && gPSSData->itemIcons[i].cursorPos == cursorPos) return i; } return MAX_ITEM_ICONS; } -static u8 sub_80962A8(struct Sprite *sprite) +static u8 GetItemIconIdxBySprite(struct Sprite *sprite) { u8 i; for (i = 0; i < MAX_ITEM_ICONS; i++) { - if (gPSSData->itemIconSprites[i].active - && gPSSData->itemIconSprites[i].sprite == sprite) + if (gPSSData->itemIcons[i].active + && gPSSData->itemIcons[i].sprite == sprite) return i; } return MAX_ITEM_ICONS; } -static void sub_80962F0(u8 id, u8 cursorArea, u8 cursorPos) +static void SetItemIconPosition(u8 id, u8 cursorArea, u8 cursorPos) { u8 row, column; @@ -447,100 +459,108 @@ static void sub_80962F0(u8 id, u8 cursorArea, u8 cursorPos) case CURSOR_AREA_IN_BOX: row = cursorPos % IN_BOX_ROWS; column = cursorPos / IN_BOX_ROWS; - gPSSData->itemIconSprites[id].sprite->x = (24 * row) + 112; - gPSSData->itemIconSprites[id].sprite->y = (24 * column) + 56; - gPSSData->itemIconSprites[id].sprite->oam.priority = 2; + gPSSData->itemIcons[id].sprite->x = (24 * row) + 112; + gPSSData->itemIcons[id].sprite->y = (24 * column) + 56; + gPSSData->itemIcons[id].sprite->oam.priority = 2; break; case CURSOR_AREA_IN_PARTY: if (cursorPos == 0) { - gPSSData->itemIconSprites[id].sprite->x = 116; - gPSSData->itemIconSprites[id].sprite->y = 76; + gPSSData->itemIcons[id].sprite->x = 116; + gPSSData->itemIcons[id].sprite->y = 76; } else { - gPSSData->itemIconSprites[id].sprite->x = 164; - gPSSData->itemIconSprites[id].sprite->y = 24 * (cursorPos - 1) + 28; + gPSSData->itemIcons[id].sprite->x = 164; + gPSSData->itemIcons[id].sprite->y = 24 * (cursorPos - 1) + 28; } - gPSSData->itemIconSprites[id].sprite->oam.priority = 1; + gPSSData->itemIcons[id].sprite->oam.priority = 1; break; } - gPSSData->itemIconSprites[id].cursorArea = cursorArea; - gPSSData->itemIconSprites[id].cursorPos = cursorPos; + gPSSData->itemIcons[id].cursorArea = cursorArea; + gPSSData->itemIcons[id].cursorPos = cursorPos; } -static void sub_8096408(u8 id, const u32 *itemTiles, const u32 *itemPal) +static void LoadItemIconGfx(u8 id, const u32 *itemTiles, const u32 *itemPal) { s32 i; if (id >= MAX_ITEM_ICONS) return; - CpuFastFill(0, gPSSData->field_42C4, 0x200); + CpuFastFill(0, gPSSData->itemIconBuffer, 0x200); LZ77UnCompWram(itemTiles, gPSSData->field_22C4); for (i = 0; i < 3; i++) - CpuFastCopy(gPSSData->field_22C4 + (i * 0x60), gPSSData->field_42C4 + (i * 0x80), 0x60); + CpuFastCopy(gPSSData->field_22C4 + (i * 0x60), gPSSData->itemIconBuffer + (i * 0x80), 0x60); - CpuFastCopy(gPSSData->field_42C4, gPSSData->itemIconSprites[id].tiles, 0x200); - LZ77UnCompWram(itemPal, gPSSData->field_42C4); - LoadPalette(gPSSData->field_42C4, gPSSData->itemIconSprites[id].palIndex, 0x20); + CpuFastCopy(gPSSData->itemIconBuffer, gPSSData->itemIcons[id].tiles, 0x200); + LZ77UnCompWram(itemPal, gPSSData->itemIconBuffer); + LoadPalette(gPSSData->itemIconBuffer, gPSSData->itemIcons[id].palIndex, 0x20); } -static void sub_80964B8(u8 id, u8 animNum) +static void SetItemIconAffineAnim(u8 id, u8 animNum) { if (id >= MAX_ITEM_ICONS) return; - StartSpriteAffineAnim(gPSSData->itemIconSprites[id].sprite, animNum); + StartSpriteAffineAnim(gPSSData->itemIcons[id].sprite, animNum); } -static void sub_80964E8(u8 id, u8 command, u8 cursorArea, u8 cursorPos) +#define sItemIconId data[0] +#define sState data[0] +#define sCursorArea data[6] +#define sCursorPos data[7] + +static void SetItemIconCallback(u8 id, u8 callbackId, u8 cursorArea, u8 cursorPos) { if (id >= MAX_ITEM_ICONS) return; - switch (command) + switch (callbackId) { - case 0: - gPSSData->itemIconSprites[id].sprite->data[0] = id; - gPSSData->itemIconSprites[id].sprite->callback = sub_809692C; + case ITEM_CB_WAIT_ANIM: + gPSSData->itemIcons[id].sprite->sItemIconId = id; + gPSSData->itemIcons[id].sprite->callback = SpriteCB_ItemIcon_WaitAnim; break; - case 1: - gPSSData->itemIconSprites[id].sprite->data[0] = 0; - gPSSData->itemIconSprites[id].sprite->callback = sub_8096958; + case ITEM_CB_TO_HAND: + gPSSData->itemIcons[id].sprite->sState = 0; + gPSSData->itemIcons[id].sprite->callback = SpriteCB_ItemIcon_ToHand; break; - case 2: - gPSSData->itemIconSprites[id].sprite->data[0] = 0; - gPSSData->itemIconSprites[id].sprite->data[6] = cursorArea; - gPSSData->itemIconSprites[id].sprite->data[7] = cursorPos; - gPSSData->itemIconSprites[id].sprite->callback = sub_80969F4; + case ITEM_CB_TO_MON: + gPSSData->itemIcons[id].sprite->sState = 0; + gPSSData->itemIcons[id].sprite->sCursorArea = cursorArea; + gPSSData->itemIcons[id].sprite->sCursorPos = cursorPos; + gPSSData->itemIcons[id].sprite->callback = SpriteCB_ItemIcon_ToMon; break; - case 3: - gPSSData->itemIconSprites[id].sprite->data[0] = 0; - gPSSData->itemIconSprites[id].sprite->callback = sub_8096A74; - gPSSData->itemIconSprites[id].sprite->data[6] = cursorArea; - gPSSData->itemIconSprites[id].sprite->data[7] = cursorPos; + case ITEM_CB_SWAP_TO_HAND: + gPSSData->itemIcons[id].sprite->sState = 0; + gPSSData->itemIcons[id].sprite->callback = SpriteCB_ItemIcon_SwapToHand; + gPSSData->itemIcons[id].sprite->sCursorArea = cursorArea; + gPSSData->itemIcons[id].sprite->sCursorPos = cursorPos; break; - case 4: - gPSSData->itemIconSprites[id].sprite->data[0] = 0; - gPSSData->itemIconSprites[id].sprite->data[6] = cursorArea; - gPSSData->itemIconSprites[id].sprite->data[7] = cursorPos; - gPSSData->itemIconSprites[id].sprite->callback = sub_8096B10; + case ITEM_CB_SWAP_TO_MON: + gPSSData->itemIcons[id].sprite->sState = 0; + gPSSData->itemIcons[id].sprite->sCursorArea = cursorArea; + gPSSData->itemIcons[id].sprite->sCursorPos = cursorPos; + gPSSData->itemIcons[id].sprite->callback = SpriteCB_ItemIcon_SwapToMon; break; - case 7: - gPSSData->itemIconSprites[id].sprite->callback = sub_8096BAC; + case ITEM_CB_HIDE_PARTY: + // If cursor is on a Pokémon with a held item and + // the player closes the party menu, have the held + // item follow the Pokémon as the menu slides out + gPSSData->itemIcons[id].sprite->callback = SpriteCB_ItemIcon_HideParty; break; } } -static void sub_8096624(u8 id, bool8 show) +static void SetItemIconActive(u8 id, bool8 show) { if (id >= MAX_ITEM_ICONS) return; - gPSSData->itemIconSprites[id].active = show; - gPSSData->itemIconSprites[id].sprite->invisible = (show == FALSE); + gPSSData->itemIcons[id].active = show; + gPSSData->itemIcons[id].sprite->invisible = (show == FALSE); } static const u32 *GetItemIconPic(u16 itemId) @@ -558,7 +578,7 @@ void PrintItemDescription(void) const u8 *description; if (IsActiveItemMoving()) - description = ItemId_GetDescription(gPSSData->movingItem); + description = ItemId_GetDescription(gPSSData->movingItemId); else description = ItemId_GetDescription(gPSSData->displayMonItemId); @@ -566,77 +586,77 @@ void PrintItemDescription(void) AddTextPrinterParameterized5(2, FONT_2, description, 2, 0, 0, NULL, 0, 0); } -void sub_80966F4(void) +void InitItemInfoWindow(void) { - gPSSData->field_2236 = 25; - LoadBgTiles(0, gUnknown_83D35DC, 0x80, 0x1A4); - sub_8096898(0); + gPSSData->itemInfoWindowOffset = 25; + LoadBgTiles(0, sItemInfoFrame_Gfx, 0x80, 0x1A4); + DrawItemInfoWindow(0); } -bool8 sub_8096728(void) +bool8 UpdateItemInfoWindowSlideIn(void) { s32 i, var; - if (gPSSData->field_2236 == 0) + if (gPSSData->itemInfoWindowOffset == 0) return FALSE; - gPSSData->field_2236--; - var = 25 - gPSSData->field_2236; + gPSSData->itemInfoWindowOffset--; + var = 25 - gPSSData->itemInfoWindowOffset; for (i = 0; i < var; i++) { - WriteSequenceToBgTilemapBuffer(0, GetBgAttribute(0, BG_ATTR_BASETILE) + 0x14 + gPSSData->field_2236 + i, i, 12, 1, 8, 15, 25); + WriteSequenceToBgTilemapBuffer(0, GetBgAttribute(0, BG_ATTR_BASETILE) + 0x14 + gPSSData->itemInfoWindowOffset + i, i, 12, 1, 8, 15, 25); } - sub_8096898(var); - return (gPSSData->field_2236 != 0); + DrawItemInfoWindow(var); + return (gPSSData->itemInfoWindowOffset != 0); } -bool8 sub_80967C0(void) +bool8 UpdateItemInfoWindowSlideOut(void) { s32 i, var; - if (gPSSData->field_2236 == 25) + if (gPSSData->itemInfoWindowOffset == 25) return FALSE; - if (gPSSData->field_2236 == 0) + if (gPSSData->itemInfoWindowOffset == 0) FillBgTilemapBufferRect(0, 0, 25, 11, 1, 10, 17); - gPSSData->field_2236++; - var = 25 - gPSSData->field_2236; + gPSSData->itemInfoWindowOffset++; + var = 25 - gPSSData->itemInfoWindowOffset; for (i = 0; i < var; i++) { - WriteSequenceToBgTilemapBuffer(0, GetBgAttribute(0, BG_ATTR_BASETILE) + 0x14 + gPSSData->field_2236 + i, i, 12, 1, 8, 15, 25); + WriteSequenceToBgTilemapBuffer(0, GetBgAttribute(0, BG_ATTR_BASETILE) + 0x14 + gPSSData->itemInfoWindowOffset + i, i, 12, 1, 8, 15, 25); } - sub_8096898(var); + DrawItemInfoWindow(var); FillBgTilemapBufferRect(0, 0, var, 11, 1, 10, 0x11); - return (gPSSData->field_2236 != 25); + return (gPSSData->itemInfoWindowOffset != 25); } -static void sub_8096898(u32 x) +static void DrawItemInfoWindow(u32 pos) { - if (x != 0) + if (pos != 0) { - FillBgTilemapBufferRect(0, 0x1A4, 0, 0xB, x, 1, 0xFu); - FillBgTilemapBufferRect(0, 0x9A4, 0, 0x14, x, 1, 0xFu); + FillBgTilemapBufferRect(0, 0x1A4, 0, 0xB, pos, 1, 0xFu); + FillBgTilemapBufferRect(0, 0x9A4, 0, 0x14, pos, 1, 0xFu); } - FillBgTilemapBufferRect(0, 0x1A5, x, 0xC, 1, 8, 0xFu); - FillBgTilemapBufferRect(0, 0x1A6, x, 0xB, 1, 1, 0xFu); - FillBgTilemapBufferRect(0, 0x1A7, x, 0x14, 1, 1, 0xFu); + FillBgTilemapBufferRect(0, 0x1A5, pos, 0xC, 1, 8, 0xFu); + FillBgTilemapBufferRect(0, 0x1A6, pos, 0xB, 1, 1, 0xFu); + FillBgTilemapBufferRect(0, 0x1A7, pos, 0x14, 1, 1, 0xFu); ScheduleBgCopyTilemapToVram(0); } -static void sub_809692C(struct Sprite *sprite) +static void SpriteCB_ItemIcon_WaitAnim(struct Sprite *sprite) { if (sprite->affineAnimEnded) { - sub_8096624(sprite->data[0], FALSE); + SetItemIconActive(sprite->data[0], FALSE); sprite->callback = SpriteCallbackDummy; } } -static void sub_8096958(struct Sprite *sprite) +static void SpriteCB_ItemIcon_ToHand(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -653,19 +673,19 @@ static void sub_8096958(struct Sprite *sprite) sprite->x = sprite->data[1] >> 4; sprite->y = sprite->data[2] >> 4; if (++sprite->data[5] > 11) - sprite->callback = sub_80969BC; + sprite->callback = SpriteCB_ItemIcon_SetPosToCursor; break; } } -static void sub_80969BC(struct Sprite *sprite) +static void SpriteCB_ItemIcon_SetPosToCursor(struct Sprite *sprite) { sprite->x = gPSSData->cursorSprite->x + 4; sprite->y = gPSSData->cursorSprite->y + gPSSData->cursorSprite->y2 + 8; sprite->oam.priority = gPSSData->cursorSprite->oam.priority; } -static void sub_80969F4(struct Sprite *sprite) +static void SpriteCB_ItemIcon_ToMon(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -683,14 +703,14 @@ static void sub_80969F4(struct Sprite *sprite) sprite->y = sprite->data[2] >> 4; if (++sprite->data[5] > 11) { - sub_80962F0(sub_80962A8(sprite), sprite->data[6], sprite->data[7]); + SetItemIconPosition(GetItemIconIdxBySprite(sprite), sprite->data[6], sprite->data[7]); sprite->callback = SpriteCallbackDummy; } break; } } -static void sub_8096A74(struct Sprite *sprite) +static void SpriteCB_ItemIcon_SwapToHand(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -709,15 +729,15 @@ static void sub_8096A74(struct Sprite *sprite) sprite->x2 = gSineTable[sprite->data[5] * 8] >> 4; if (++sprite->data[5] > 11) { - sub_80962F0(sub_80962A8(sprite), sprite->data[6], sprite->data[7]); + SetItemIconPosition(GetItemIconIdxBySprite(sprite), sprite->data[6], sprite->data[7]); sprite->x2 = 0; - sprite->callback = sub_80969BC; + sprite->callback = SpriteCB_ItemIcon_SetPosToCursor; } break; } } -static void sub_8096B10(struct Sprite *sprite) +static void SpriteCB_ItemIcon_SwapToMon(struct Sprite *sprite) { switch (sprite->data[0]) { @@ -736,7 +756,7 @@ static void sub_8096B10(struct Sprite *sprite) sprite->x2 = -(gSineTable[sprite->data[5] * 8] >> 4); if (++sprite->data[5] > 11) { - sub_80962F0(sub_80962A8(sprite), sprite->data[6], sprite->data[7]); + SetItemIconPosition(GetItemIconIdxBySprite(sprite), sprite->data[6], sprite->data[7]); sprite->callback = SpriteCallbackDummy; sprite->x2 = 0; } @@ -744,12 +764,17 @@ static void sub_8096B10(struct Sprite *sprite) } } -static void sub_8096BAC(struct Sprite *sprite) +static void SpriteCB_ItemIcon_HideParty(struct Sprite *sprite) { sprite->y -= 8; if (sprite->y + sprite->y2 < -16) { sprite->callback = SpriteCallbackDummy; - sub_8096624(sub_80962A8(sprite), FALSE); + SetItemIconActive(GetItemIconIdxBySprite(sprite), FALSE); } } + +#undef sState +#undef sItemIconId +#undef sCursorArea +#undef sCursorPos From 9d9c2a9667d12fb0177f5c84b2ca5ccf28e13dce Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 31 Jul 2022 22:02:44 -0400 Subject: [PATCH 55/64] Combining pss 8 and 9 --- include/pokemon_storage_system_internal.h | 12 ++-- ld_script.txt | 1 - src/pokemon_storage_system_8.c | 84 ++++++++++++++++++++++ src/pokemon_storage_system_9.c | 87 ----------------------- sym_ewram.txt | 2 +- 5 files changed, 91 insertions(+), 95 deletions(-) delete mode 100644 src/pokemon_storage_system_9.c diff --git a/include/pokemon_storage_system_internal.h b/include/pokemon_storage_system_internal.h index c53b5ff86..1376c7396 100644 --- a/include/pokemon_storage_system_internal.h +++ b/include/pokemon_storage_system_internal.h @@ -198,12 +198,12 @@ struct StorageMenu struct UnkUtilData { - const u8 *unk_00; - u8 *unk_04; - u16 unk_08; - u16 unk_0a; - u16 newField; - void (*unk_0c)(struct UnkUtilData *data); + const u8 *src; + u8 *dest; + u16 size; + u16 unk; + u16 height; + void (*func)(struct UnkUtilData *data); }; struct UnkUtil diff --git a/ld_script.txt b/ld_script.txt index ab1ba9d61..2ea2d0cfd 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -137,7 +137,6 @@ SECTIONS { src/pokemon_storage_system_6.o(.text); src/pokemon_storage_system_7.o(.text); src/pokemon_storage_system_8.o(.text); - src/pokemon_storage_system_9.o(.text); src/pokemon_icon.o(.text); src/script_movement.o(.text); src/fldeff_cut.o(.text); diff --git a/src/pokemon_storage_system_8.c b/src/pokemon_storage_system_8.c index 7b8670e36..327ceb541 100644 --- a/src/pokemon_storage_system_8.c +++ b/src/pokemon_storage_system_8.c @@ -778,3 +778,87 @@ static void SpriteCB_ItemIcon_HideParty(struct Sprite *sprite) #undef sItemIconId #undef sCursorArea #undef sCursorPos + +static EWRAM_DATA struct UnkUtil *gUnknown_203982C = NULL; + +static void sub_8096CDC(struct UnkUtilData *unkStruct); +static void sub_8096D70(struct UnkUtilData *unkStruct); + +void sub_8096BE4(struct UnkUtil *arg0, struct UnkUtilData *arg1, u32 arg2) +{ + gUnknown_203982C = arg0; + arg0->unk_00 = arg1; + arg0->unk_05 = arg2; + arg0->unk_04 = 0; +} + +void sub_8096BF8(void) +{ + u16 i; + + if (gUnknown_203982C->unk_04) + { + for (i = 0; i < gUnknown_203982C->unk_04; i++) + { + struct UnkUtilData *unkStruct = &gUnknown_203982C->unk_00[i]; + unkStruct->func(unkStruct); + } + + gUnknown_203982C->unk_04 = 0; + } +} + +static bool8 sub_8096C40(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height, u16 unkArg) +{ + struct UnkUtilData *unkStruct; + + if (gUnknown_203982C->unk_04 >= gUnknown_203982C->unk_05) + return FALSE; + + unkStruct = &gUnknown_203982C->unk_00[gUnknown_203982C->unk_04++]; + unkStruct->size = width * 2; + unkStruct->dest = dest + 2 * (dTop * 32 + dLeft); + unkStruct->src = src + 2 * (sTop * unkArg + sLeft); + unkStruct->height = height; + unkStruct->unk = unkArg; + unkStruct->func = sub_8096CDC; + return TRUE; +} + +static void sub_8096CDC(struct UnkUtilData *unkStruct) +{ + u16 i; + + for (i = 0; i < unkStruct->height; i++) + { + CpuCopy16(unkStruct->src, unkStruct->dest, unkStruct->size); + unkStruct->dest += 64; + unkStruct->src += (unkStruct->unk * 2); + } +} + +static bool8 sub_8096D14(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height) +{ + struct UnkUtilData *unkStruct; + + if (gUnknown_203982C->unk_04 >= gUnknown_203982C->unk_05) + return FALSE; + + unkStruct = &gUnknown_203982C->unk_00[gUnknown_203982C->unk_04++]; + unkStruct->size = width * 2; + unkStruct->dest = dest + ((dTop * 32) + dLeft) * 2; + unkStruct->height = height; + unkStruct->func = sub_8096D70; + return TRUE; +} + +static void sub_8096D70(struct UnkUtilData *data) +{ + u16 i; + + for (i = 0; i < data->height; i++) + { + Dma3FillLarge_(0, data->dest, data->size, 16); + data->dest += 64; + } +} diff --git a/src/pokemon_storage_system_9.c b/src/pokemon_storage_system_9.c deleted file mode 100644 index d5f648765..000000000 --- a/src/pokemon_storage_system_9.c +++ /dev/null @@ -1,87 +0,0 @@ -#include "global.h" -#include "gflib.h" -#include "pokemon_storage_system_internal.h" - -static EWRAM_DATA struct UnkUtil *gUnknown_203982C = NULL; - -static void sub_8096CDC(struct UnkUtilData *unkStruct); -static void sub_8096D70(struct UnkUtilData *unkStruct); - -void sub_8096BE4(struct UnkUtil *arg0, struct UnkUtilData *arg1, u32 arg2) -{ - gUnknown_203982C = arg0; - arg0->unk_00 = arg1; - arg0->unk_05 = arg2; - arg0->unk_04 = 0; -} - -void sub_8096BF8(void) -{ - u16 i; - - if (gUnknown_203982C->unk_04) - { - for (i = 0; i < gUnknown_203982C->unk_04; i++) - { - struct UnkUtilData *unkStruct = &gUnknown_203982C->unk_00[i]; - unkStruct->unk_0c(unkStruct); - } - - gUnknown_203982C->unk_04 = 0; - } -} - -static bool8 sub_8096C40(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height, u16 unkArg) -{ - struct UnkUtilData *unkStruct; - - if (gUnknown_203982C->unk_04 >= gUnknown_203982C->unk_05) - return FALSE; - - unkStruct = &gUnknown_203982C->unk_00[gUnknown_203982C->unk_04++]; - unkStruct->unk_08 = width * 2; - unkStruct->unk_04 = dest + 2 * (dTop * 32 + dLeft); - unkStruct->unk_00 = src + 2 * (sTop * unkArg + sLeft); - unkStruct->newField = height; - unkStruct->unk_0a = unkArg; - unkStruct->unk_0c = sub_8096CDC; - return TRUE; -} - -static void sub_8096CDC(struct UnkUtilData *unkStruct) -{ - u16 i; - - for (i = 0; i < unkStruct->newField; i++) - { - CpuCopy16(unkStruct->unk_00, unkStruct->unk_04, unkStruct->unk_08); - unkStruct->unk_04 += 64; - unkStruct->unk_00 += (unkStruct->unk_0a * 2); - } -} - -static bool8 sub_8096D14(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height) -{ - struct UnkUtilData *unkStruct; - - if (gUnknown_203982C->unk_04 >= gUnknown_203982C->unk_05) - return FALSE; - - unkStruct = &gUnknown_203982C->unk_00[gUnknown_203982C->unk_04++]; - unkStruct->unk_08 = width * 2; - unkStruct->unk_04 = dest + ((dTop * 32) + dLeft) * 2; - unkStruct->newField = height; - unkStruct->unk_0c = sub_8096D70; - return TRUE; -} - -static void sub_8096D70(struct UnkUtilData *unkStruct) -{ - u16 i; - - for (i = 0; i < unkStruct->newField; i++) - { - Dma3FillLarge_(0, unkStruct->unk_04, unkStruct->unk_08, 16); - unkStruct->unk_04 += 64; - } -} diff --git a/sym_ewram.txt b/sym_ewram.txt index b426b2ddf..9fe766a2b 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -42,7 +42,7 @@ .include "src/pokemon_storage_system_3.o" .include "src/pokemon_storage_system_5.o" .include "src/pokemon_storage_system_7.o" - .include "src/pokemon_storage_system_9.o" + .include "src/pokemon_storage_system_8.o" .include "src/script_movement.o" .include "src/fldeff_cut.o" .include "src/item_menu_icons.o" From 36a5761d360fc46a350a3491ff8b57f4c2e30f2b Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 31 Jul 2022 22:39:59 -0400 Subject: [PATCH 56/64] PSS sync --- include/pokemon_storage_system_internal.h | 23 ++-- src/pokemon_storage_system_2.c | 10 -- src/pokemon_storage_system_3.c | 34 +++--- src/pokemon_storage_system_4.c | 8 +- src/pokemon_storage_system_5.c | 28 ++--- src/pokemon_storage_system_8.c | 127 ++++++++++++---------- 6 files changed, 117 insertions(+), 113 deletions(-) diff --git a/include/pokemon_storage_system_internal.h b/include/pokemon_storage_system_internal.h index 1376c7396..3890928e4 100644 --- a/include/pokemon_storage_system_internal.h +++ b/include/pokemon_storage_system_internal.h @@ -27,11 +27,12 @@ enum enum { - BOX_OPTION_WITHDRAW, - BOX_OPTION_DEPOSIT, - BOX_OPTION_MOVE_MONS, - BOX_OPTION_MOVE_ITEMS, - BOX_OPTION_EXIT, + OPTION_WITHDRAW, + OPTION_DEPOSIT, + OPTION_MOVE_MONS, + OPTION_MOVE_ITEMS, + OPTION_EXIT, + OPTIONS_COUNT }; enum @@ -208,9 +209,9 @@ struct UnkUtilData struct UnkUtil { - struct UnkUtilData *unk_00; - u8 unk_04; - u8 unk_05; + struct UnkUtilData *data; + u8 numActive; + u8 max; }; struct PSS_ItemIconSprite @@ -437,7 +438,7 @@ bool8 sub_8095050(void); void sub_80950A4(void); void sub_80950BC(u8 a0); bool8 sub_80950D0(void); -void sub_8095B5C(void); +void CreateItemIconSprites(void); void sub_8096088(void); void sub_80960C0(void); bool8 sub_809610C(void); @@ -445,8 +446,8 @@ const u8 *GetMovingItemName(void); void InitItemInfoWindow(void); bool8 UpdateItemInfoWindowSlideIn(void); bool8 UpdateItemInfoWindowSlideOut(void); -void sub_8096BE4(struct UnkUtil *arg0, struct UnkUtilData *arg1, u32 arg2); -void sub_8096BF8(void); +void UnkUtil_Init(struct UnkUtil *arg0, struct UnkUtilData *arg1, u32 arg2); +void UnkUtil_Run(void); void AddMenu(void); bool8 CanMovePartyMon(void); bool8 CanShiftMon(void); diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c index d835fb50c..918ffaf7d 100644 --- a/src/pokemon_storage_system_2.c +++ b/src/pokemon_storage_system_2.c @@ -15,16 +15,6 @@ #include "constants/field_weather.h" #include "constants/help_system.h" -// PC main menu options -enum { - OPTION_WITHDRAW, - OPTION_DEPOSIT, - OPTION_MOVE_MONS, - OPTION_MOVE_ITEMS, - OPTION_EXIT, - OPTIONS_COUNT -}; - static EWRAM_DATA u8 sPreviousBoxOption = 0; static EWRAM_DATA struct ChooseBoxMenu *sBoxSelectionPopupSpriteManager = NULL; diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c index d68aaafdc..46212d06c 100644 --- a/src/pokemon_storage_system_3.c +++ b/src/pokemon_storage_system_3.c @@ -349,7 +349,7 @@ static void VblankCb_PSS(void) { LoadOam(); ProcessSpriteCopyRequests(); - sub_8096BF8(); + UnkUtil_Run(); TransferPlttBuffer(); SetGpuReg(REG_OFFSET_BG2HOFS, gPSSData->bg2_X); } @@ -421,7 +421,7 @@ static void sub_808CF10(void) FreeAllSpritePalettes(); ClearDma3Requests(); gReservedSpriteTileCount = 0x280; - sub_8096BE4(&gPSSData->unkUtil, gPSSData->unkUtilData, 8); + UnkUtil_Init(&gPSSData->unkUtil, gPSSData->unkUtilData, 8); gKeyRepeatStartDelay = 20; ClearScheduledBgCopiesToVram(); AllocBoxPartyPokemonDropdowns(3); @@ -433,13 +433,13 @@ static void sub_808CF10(void) static void sub_808CF94(void) { sub_8092B50(); - sInPartyMenu = gPSSData->boxOption == BOX_OPTION_DEPOSIT; + sInPartyMenu = gPSSData->boxOption == OPTION_DEPOSIT; gUnknown_20397B6 = 0; } static void sub_808CFC4(void) { - if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption == OPTION_MOVE_ITEMS) { SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(7, 11)); @@ -529,7 +529,7 @@ static void Cb_InitPSS(u8 taskId) if (sub_809140C()) return; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) { gPSSData->markMenu.baseTileTag = TAG_TILE_D; gPSSData->markMenu.basePaletteTag = TAG_PAL_DACE; @@ -538,7 +538,7 @@ static void Cb_InitPSS(u8 taskId) } else { - sub_8095B5C(); + CreateItemIconSprites(); sub_808FDFC(); } break; @@ -608,7 +608,7 @@ static void Cb_MainPSS(u8 taskId) gPSSData->state = 1; break; case 5: - if (gPSSData->boxOption != BOX_OPTION_MOVE_MONS && gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_MONS && gPSSData->boxOption != OPTION_MOVE_ITEMS) { PrintStorageActionText(PC_TEXT_WHICH_ONE_WILL_TAKE); gPSSData->state = 3; @@ -620,14 +620,14 @@ static void Cb_MainPSS(u8 taskId) } break; case 6: - if (gPSSData->boxOption == BOX_OPTION_MOVE_MONS) + if (gPSSData->boxOption == OPTION_MOVE_MONS) { if (IsMonBeingMoved() && ItemIsMail(gPSSData->displayMonItemId)) gPSSData->state = 5; else SetPSSCallback(Cb_HidePartyPokemon); } - else if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) + else if (gPSSData->boxOption == OPTION_MOVE_ITEMS) { SetPSSCallback(Cb_HidePartyPokemon); } @@ -650,7 +650,7 @@ static void Cb_MainPSS(u8 taskId) gPSSData->newCurrBoxId = StorageGetCurrentBox() + 1; if (gPSSData->newCurrBoxId >= TOTAL_BOXES_COUNT) gPSSData->newCurrBoxId = 0; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) { SetUpScrollToBox(gPSSData->newCurrBoxId); gPSSData->state = 2; @@ -666,7 +666,7 @@ static void Cb_MainPSS(u8 taskId) gPSSData->newCurrBoxId = StorageGetCurrentBox() - 1; if (gPSSData->newCurrBoxId < 0) gPSSData->newCurrBoxId = TOTAL_BOXES_COUNT - 1; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) { SetUpScrollToBox(gPSSData->newCurrBoxId); gPSSData->state = 2; @@ -794,7 +794,7 @@ static void Cb_MainPSS(u8 taskId) BoxSetMosaic(); } - if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption == OPTION_MOVE_ITEMS) { sub_8094D84(); gPSSData->state = 11; @@ -909,7 +909,7 @@ static void Cb_OnSelectedMon(u8 taskId) if (!BoxGetMosaic()) { PlaySE(SE_SELECT); - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) PrintStorageActionText(PC_TEXT_IS_SELECTED); else if (IsActiveItemMoving() || gPSSData->displayMonItemId != 0) PrintStorageActionText(PC_TEXT_IS_SELECTED2); @@ -2041,7 +2041,7 @@ static void Cb_ChangeScreen(u8 taskId) u8 mode, monIndex, maxMonIndex; u8 screenChangeType = gPSSData->screenChangeType; - if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS && IsActiveItemMoving() == TRUE) + if (gPSSData->boxOption == OPTION_MOVE_ITEMS && IsActiveItemMoving() == TRUE) gUnknown_20397BA = GetMovingItem(); else gUnknown_20397BA = ITEM_NONE; @@ -2149,7 +2149,7 @@ static void sub_808F078(void) LoadPalette(gUnknown_8E9C3F8, 0, 0x20); LoadPalette(gUnknown_8E9C418, 0x20, 0x20); LoadPalette(gUnknown_83CEA10, 0xF0, 0x20); - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) LoadPalette(gUnknown_83CE738, 0x30, 0x20); else LoadPalette(gUnknown_83CE758, 0x30, 0x20); @@ -2290,7 +2290,7 @@ static void PrintCursorMonInfo(void) u16 i; u16 y; FillWindowPixelBuffer(0, PIXEL_FILL(1)); - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) { for (i = 0, y = 0; i < 3; i++, y += 14) { @@ -2403,7 +2403,7 @@ static void SetUpHidePartyMenu(void) gPSSData->partyMenuUnused1 = 0; gPSSData->partyMenuY = 22; gPSSData->partyMenuMoveTimer = 0; - if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption == OPTION_MOVE_ITEMS) sub_80960C0(); } diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c index 349a9b7b1..cbd2f1b9c 100644 --- a/src/pokemon_storage_system_4.c +++ b/src/pokemon_storage_system_4.c @@ -314,7 +314,7 @@ static void sub_80900D4(u8 boxId) } } - if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption == OPTION_MOVE_ITEMS) { for (boxPosition = 0; boxPosition < IN_BOX_COUNT; boxPosition++) { @@ -335,7 +335,7 @@ void sub_80901EC(u8 boxPosition) u32 personality = GetCurrentBoxMonData(boxPosition, MON_DATA_PERSONALITY); gPSSData->boxMonsSprites[boxPosition] = CreateMonIconSprite(species, personality, x, y, 2, 19 - (boxPosition % IN_BOX_ROWS)); - if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption == OPTION_MOVE_ITEMS) gPSSData->boxMonsSprites[boxPosition]->oam.objMode = ST_OAM_OBJ_BLEND; } } @@ -411,7 +411,7 @@ static u8 sub_80903A4(u8 row, u16 times, s16 xDelta) u8 count = 0; u8 boxPosition = row; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) { for (i = 0; i < IN_BOX_COLUMNS; i++) { @@ -591,7 +591,7 @@ void CreatePartyMonsSprites(bool8 arg0) } } - if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption == OPTION_MOVE_ITEMS) { for (i = 0; i < PARTY_SIZE; i++) { diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c index 68a23b053..f01a1551b 100644 --- a/src/pokemon_storage_system_5.c +++ b/src/pokemon_storage_system_5.c @@ -51,7 +51,7 @@ static const u16 sHandCursorShadowTiles[] = INCBIN_U16("graphics/interface/pss_u void sub_80922C0(void) { - if (gPSSData->boxOption != BOX_OPTION_DEPOSIT) + if (gPSSData->boxOption != OPTION_DEPOSIT) sBoxCursorArea = CURSOR_AREA_IN_BOX; else sBoxCursorArea = CURSOR_AREA_IN_PARTY; @@ -140,7 +140,7 @@ bool8 sub_80924A8(void) if (gPSSData->cursorMoveSteps == 0) { - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) return FALSE; else return sub_809610C(); @@ -245,7 +245,7 @@ static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition) { sub_8092604(newCurosrArea, newCursorPosition); sub_8092660(); - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) { if (gPSSData->inBoxMovingMode == 0 && !sIsMonBeingMoved) StartSpriteAnim(gPSSData->cursorSprite, 1); @@ -256,7 +256,7 @@ static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition) StartSpriteAnim(gPSSData->cursorSprite, 1); } - if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption == OPTION_MOVE_ITEMS) { if (sBoxCursorArea == CURSOR_AREA_IN_BOX) sub_8095D44(CURSOR_AREA_IN_BOX, sBoxCursorPosition); @@ -304,7 +304,7 @@ static void sub_80929B0(void) { sBoxCursorArea = gPSSData->newCursorArea; sBoxCursorPosition = gPSSData->newCursorPosition; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) { if (gPSSData->inBoxMovingMode == 0 && !sIsMonBeingMoved) StartSpriteAnim(gPSSData->cursorSprite, 1); @@ -1237,7 +1237,7 @@ static u8 InBoxInput_Normal(void) if (!sCanOnlyMove) return 8; - if (gPSSData->boxOption != BOX_OPTION_MOVE_MONS || sIsMonBeingMoved == TRUE) + if (gPSSData->boxOption != OPTION_MOVE_MONS || sIsMonBeingMoved == TRUE) { switch (sub_8094E50(0)) { @@ -1509,7 +1509,7 @@ static u8 HandleInput_InParty(void) { if (sBoxCursorPosition == PARTY_SIZE) { - if (gPSSData->boxOption == BOX_OPTION_DEPOSIT) + if (gPSSData->boxOption == OPTION_DEPOSIT) return 4; gotoBox = TRUE; @@ -1543,7 +1543,7 @@ static u8 HandleInput_InParty(void) if (JOY_NEW(B_BUTTON)) { - if (gPSSData->boxOption == BOX_OPTION_DEPOSIT) + if (gPSSData->boxOption == OPTION_DEPOSIT) return 19; gotoBox = TRUE; @@ -1754,7 +1754,7 @@ static void AddBoxMenu(void) static bool8 sub_8094924(void) { InitMenu(); - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) return sub_809494C(); else return sub_8094A0C(); @@ -1766,19 +1766,19 @@ static bool8 sub_809494C(void) switch (gPSSData->boxOption) { - case BOX_OPTION_DEPOSIT: + case OPTION_DEPOSIT: if (var0) SetMenuText(PC_TEXT_STORE); else return FALSE; break; - case BOX_OPTION_WITHDRAW: + case OPTION_WITHDRAW: if (var0) SetMenuText(PC_TEXT_WITHDRAW); else return FALSE; break; - case BOX_OPTION_MOVE_MONS: + case OPTION_MOVE_MONS: if (sIsMonBeingMoved) { if (var0) @@ -1794,13 +1794,13 @@ static bool8 sub_809494C(void) return FALSE; } break; - case BOX_OPTION_MOVE_ITEMS: + case OPTION_MOVE_ITEMS: default: return FALSE; } SetMenuText(PC_TEXT_SUMMARY); - if (gPSSData->boxOption == BOX_OPTION_MOVE_MONS) + if (gPSSData->boxOption == OPTION_MOVE_MONS) { if (!sBoxCursorArea) SetMenuText(PC_TEXT_WITHDRAW); diff --git a/src/pokemon_storage_system_8.c b/src/pokemon_storage_system_8.c index 327ceb541..b14eb9844 100644 --- a/src/pokemon_storage_system_8.c +++ b/src/pokemon_storage_system_8.c @@ -110,7 +110,7 @@ static const union AffineAnimCmd *const gUnknown_83D370C[] = { gUnknown_83D36FC }; -static const struct SpriteTemplate gUnknown_83D3728 = { +static const struct SpriteTemplate sSpriteTemplate_ItemIcon = { .tileTag = TAG_TILE_7, .paletteTag = TAG_PAL_DACB, .oam = &gUnknown_83D365C, @@ -120,25 +120,25 @@ static const struct SpriteTemplate gUnknown_83D3728 = { .callback = SpriteCallbackDummy, }; -void sub_8095B5C(void) +void CreateItemIconSprites(void) { s32 i; u8 spriteId; struct CompressedSpriteSheet spriteSheet; struct SpriteTemplate spriteTemplate; - static u32 gUnknown_3000FE8[0x61]; + static u32 sItemIconGfxBuffer[0x61]; - if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption == OPTION_MOVE_ITEMS) { - spriteSheet.data = gUnknown_3000FE8; + spriteSheet.data = sItemIconGfxBuffer; spriteSheet.size = 0x200; - spriteTemplate = gUnknown_83D3728; + spriteTemplate = sSpriteTemplate_ItemIcon; for (i = 0; i < MAX_ITEM_ICONS; i++) { spriteSheet.tag = TAG_TILE_7 + i; LoadCompressedSpriteSheet(&spriteSheet); - gPSSData->itemIcons[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * 32 + (void *)(OBJ_VRAM0); + gPSSData->itemIcons[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * TILE_SIZE_4BPP + (void *)(OBJ_VRAM0); gPSSData->itemIcons[i].palIndex = AllocSpritePalette(TAG_PAL_DACB + i); gPSSData->itemIcons[i].palIndex *= 16; gPSSData->itemIcons[i].palIndex += 0x100; @@ -147,7 +147,7 @@ void sub_8095B5C(void) spriteId = CreateSprite(&spriteTemplate, 0, 0, 11); gPSSData->itemIcons[i].sprite = &gSprites[spriteId]; gPSSData->itemIcons[i].sprite->invisible = TRUE; - gPSSData->itemIcons[i].active = 0; + gPSSData->itemIcons[i].active = FALSE; } } gPSSData->movingItemId = ITEM_NONE; @@ -157,7 +157,7 @@ void sub_8095C84(u8 cursorArea, u8 cursorPos) { u16 heldItem; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) return; if (IsItemIconAtPosition(cursorArea, cursorPos)) return; @@ -195,7 +195,7 @@ void sub_8095D44(u8 cursorArea, u8 cursorPos) { u8 id; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) return; id = GetItemIconIdxByPosition(cursorArea, cursorPos); @@ -208,7 +208,7 @@ void Item_FromMonToMoving(u8 cursorArea, u8 cursorPos) u8 id; u16 item; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) return; id = GetItemIconIdxByPosition(cursorArea, cursorPos); @@ -249,7 +249,7 @@ void Item_SwitchMonsWithMoving(u8 cursorArea, u8 cursorPos) u8 id; u16 item; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) return; id = GetItemIconIdxByPosition(cursorArea, cursorPos); @@ -277,7 +277,7 @@ void Item_GiveMovingToMon(u8 cursorArea, u8 cursorPos) { u8 id; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) return; id = GetItemIconIdxByPosition(2, 0); @@ -300,7 +300,7 @@ void Item_TakeMons(u8 cursorArea, u8 cursorPos) u8 id; u16 item; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) return; item = 0; @@ -321,7 +321,7 @@ void Item_TakeMons(u8 cursorArea, u8 cursorPos) void sub_8096088(void) { - if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption == OPTION_MOVE_ITEMS) { u8 id = GetItemIconIdxByPosition(2, 0); SetItemIconAffineAnim(id, 5); @@ -333,7 +333,7 @@ void sub_80960C0(void) { s32 i; - if (gPSSData->boxOption != BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption != OPTION_MOVE_ITEMS) return; for (i = 0; i < MAX_ITEM_ICONS; i++) @@ -365,7 +365,7 @@ bool8 IsActiveItemMoving(void) { s32 i; - if (gPSSData->boxOption == BOX_OPTION_MOVE_ITEMS) + if (gPSSData->boxOption == OPTION_MOVE_ITEMS) { for (i = 0; i < MAX_ITEM_ICONS; i++) { @@ -779,80 +779,93 @@ static void SpriteCB_ItemIcon_HideParty(struct Sprite *sprite) #undef sCursorArea #undef sCursorPos -static EWRAM_DATA struct UnkUtil *gUnknown_203982C = NULL; -static void sub_8096CDC(struct UnkUtilData *unkStruct); -static void sub_8096D70(struct UnkUtilData *unkStruct); +//------------------------------------------------------------------------------ +// SECTION: UnkUtil +// +// Some data transfer utility that goes functionally unused. +// It gets initialized with UnkUtil_Init, and run every vblank in Pokémon +// Storage with UnkUtil_Run, but neither of the Add functions are ever used, +// so UnkUtil_Run performs no actions. +//------------------------------------------------------------------------------ -void sub_8096BE4(struct UnkUtil *arg0, struct UnkUtilData *arg1, u32 arg2) + +static EWRAM_DATA struct UnkUtil *sUnkUtil = NULL; + +static void UnkUtil_CpuRun(struct UnkUtilData *unkStruct); +static void UnkUtil_DmaRun(struct UnkUtilData *unkStruct); + +void UnkUtil_Init(struct UnkUtil *util, struct UnkUtilData *data, u32 max) { - gUnknown_203982C = arg0; - arg0->unk_00 = arg1; - arg0->unk_05 = arg2; - arg0->unk_04 = 0; + sUnkUtil = util; + util->data = data; + util->max = max; + util->numActive = 0; } -void sub_8096BF8(void) +void UnkUtil_Run(void) { u16 i; - - if (gUnknown_203982C->unk_04) + if (sUnkUtil->numActive) { - for (i = 0; i < gUnknown_203982C->unk_04; i++) + for (i = 0; i < sUnkUtil->numActive; i++) { - struct UnkUtilData *unkStruct = &gUnknown_203982C->unk_00[i]; - unkStruct->func(unkStruct); + struct UnkUtilData *data = &sUnkUtil->data[i]; + data->func(data); } - - gUnknown_203982C->unk_04 = 0; + sUnkUtil->numActive = 0; } } -static bool8 sub_8096C40(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height, u16 unkArg) +// Unused +static bool8 UnkUtil_CpuAdd(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height, u16 unkArg) { - struct UnkUtilData *unkStruct; + struct UnkUtilData *data; - if (gUnknown_203982C->unk_04 >= gUnknown_203982C->unk_05) + if (sUnkUtil->numActive >= sUnkUtil->max) return FALSE; - unkStruct = &gUnknown_203982C->unk_00[gUnknown_203982C->unk_04++]; - unkStruct->size = width * 2; - unkStruct->dest = dest + 2 * (dTop * 32 + dLeft); - unkStruct->src = src + 2 * (sTop * unkArg + sLeft); - unkStruct->height = height; - unkStruct->unk = unkArg; - unkStruct->func = sub_8096CDC; + data = &sUnkUtil->data[sUnkUtil->numActive++]; + data->size = width * 2; + data->dest = dest + 2 * (dTop * 32 + dLeft); + data->src = src + 2 * (sTop * unkArg + sLeft); + data->height = height; + data->unk = unkArg; + data->func = UnkUtil_CpuRun; return TRUE; } -static void sub_8096CDC(struct UnkUtilData *unkStruct) +// Functionally unused +static void UnkUtil_CpuRun(struct UnkUtilData *data) { u16 i; - for (i = 0; i < unkStruct->height; i++) + for (i = 0; i < data->height; i++) { - CpuCopy16(unkStruct->src, unkStruct->dest, unkStruct->size); - unkStruct->dest += 64; - unkStruct->src += (unkStruct->unk * 2); + CpuCopy16(data->src, data->dest, data->size); + data->dest += 64; + data->src += (data->unk * 2); } } -static bool8 sub_8096D14(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height) +// Unused +static bool8 UnkUtil_DmaAdd(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height) { - struct UnkUtilData *unkStruct; + struct UnkUtilData *data; - if (gUnknown_203982C->unk_04 >= gUnknown_203982C->unk_05) + if (sUnkUtil->numActive >= sUnkUtil->max) return FALSE; - unkStruct = &gUnknown_203982C->unk_00[gUnknown_203982C->unk_04++]; - unkStruct->size = width * 2; - unkStruct->dest = dest + ((dTop * 32) + dLeft) * 2; - unkStruct->height = height; - unkStruct->func = sub_8096D70; + data = &sUnkUtil->data[sUnkUtil->numActive++]; + data->size = width * 2; + data->dest = dest + ((dTop * 32) + dLeft) * 2; + data->height = height; + data->func = UnkUtil_DmaRun; return TRUE; } -static void sub_8096D70(struct UnkUtilData *data) +// Functionally unused +static void UnkUtil_DmaRun(struct UnkUtilData *data) { u16 i; From 19a521fe335cff0caebcf839a9820eb263492393 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 1 Aug 2022 01:05:18 -0400 Subject: [PATCH 57/64] Almost complete battle_scripts_1.s sync --- asm/macros/battle_script.inc | 37 +- data/battle_scripts_1.s | 1820 +++++++++++++++---------------- data/battle_scripts_2.s | 62 +- include/battle_string_ids.h | 2 +- include/constants/battle.h | 4 + include/constants/battle_anim.h | 4 +- src/battle_message.c | 754 ++++++------- 7 files changed, 1338 insertions(+), 1345 deletions(-) diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 678324275..d9a55bbcd 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -109,10 +109,17 @@ .byte \battler .endm - .macro tryfaintmon battler:req, fromMove:req, ptr:req + .macro tryfaintmon battler:req .byte 0x19 .byte \battler - .byte \fromMove + .byte FALSE + .4byte NULL + .endm + + .macro tryfaintmon_spikes battler:req, ptr:req + .byte 0x19 + .byte \battler + .byte TRUE .4byte \ptr .endm @@ -373,18 +380,18 @@ .byte 0x44 .endm - .macro playanimation battler:req, param1:req, param2:req + .macro playanimation battler:req, animType:req, arg=NULL .byte 0x45 .byte \battler - .byte \param1 - .4byte \param2 + .byte \animType + .4byte \arg .endm - .macro playanimation2 battler:req, param1:req, param2:req + .macro playanimation_var battler:req, animType:req, arg=NULL .byte 0x46 .byte \battler - .4byte \param1 - .4byte \param2 + .4byte \animType + .4byte \arg .endm .macro setgraphicalstatchangevalues @@ -662,7 +669,7 @@ .byte 0x77 .endm - .macro faintifabilitynotdamp + .macro tryexplosion .byte 0x78 .endm @@ -942,7 +949,7 @@ .byte 0xb5 .endm - .macro happinesstodamagecalculation + .macro friendshiptodamagecalculation .byte 0xb6 .endm @@ -1025,7 +1032,7 @@ .byte 0xc8 .endm - .macro jumpifattackandspecialattackcannotfall ptr:req + .macro trymemento ptr:req .byte 0xc9 .4byte \ptr .endm @@ -1271,8 +1278,8 @@ various \battler, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP .endm - .macro resetplayerfainted battler:req - various \battler, VARIOUS_RESET_PLAYER_FAINTED + .macro resetplayerfainted + various BS_ATTACKER, VARIOUS_RESET_PLAYER_FAINTED .endm .macro various8 battler:req @@ -1305,11 +1312,11 @@ .endm .macro chosenstatus1animation battler:req, status:req - chosenstatusanimation \battler 0x0 \status + chosenstatusanimation \battler, 0x0, \status .endm .macro chosenstatus2animation battler:req, status:req - chosenstatusanimation \battler 0x1 \status + chosenstatusanimation \battler, 0x1, \status .endm .macro sethword dst:req, value:req diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index cec621275..d469bb95d 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1,3 +1,4 @@ +#include "constants/global.h" #include "constants/moves.h" #include "constants/battle.h" #include "constants/battle_move_effects.h" @@ -20,220 +21,220 @@ .align 2 gBattleScriptsForMoveEffects:: - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectSleep - .4byte BattleScript_EffectPoisonHit - .4byte BattleScript_EffectAbsorb - .4byte BattleScript_EffectBurnHit - .4byte BattleScript_EffectFreezeHit - .4byte BattleScript_EffectParalyzeHit - .4byte BattleScript_EffectExplosion - .4byte BattleScript_EffectDreamEater - .4byte BattleScript_EffectMirrorMove - .4byte BattleScript_EffectAttackUp - .4byte BattleScript_EffectDefenseUp - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectSpecialAttackUp - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectEvasionUp - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectAttackDown - .4byte BattleScript_EffectDefenseDown - .4byte BattleScript_EffectSpeedDown - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectAccuracyDown - .4byte BattleScript_EffectEvasionDown - .4byte BattleScript_EffectHaze - .4byte BattleScript_EffectBide - .4byte BattleScript_EffectRampage - .4byte BattleScript_EffectRoar - .4byte BattleScript_EffectMultiHit - .4byte BattleScript_EffectConversion - .4byte BattleScript_EffectFlinchHit - .4byte BattleScript_EffectRestoreHp - .4byte BattleScript_EffectToxic - .4byte BattleScript_EffectPayDay - .4byte BattleScript_EffectLightScreen - .4byte BattleScript_EffectTriAttack - .4byte BattleScript_EffectRest - .4byte BattleScript_EffectOHKO - .4byte BattleScript_EffectRazorWind - .4byte BattleScript_EffectSuperFang - .4byte BattleScript_EffectDragonRage - .4byte BattleScript_EffectTrap - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectDoubleHit - .4byte BattleScript_EffectRecoilIfMiss - .4byte BattleScript_EffectMist - .4byte BattleScript_EffectFocusEnergy - .4byte BattleScript_EffectRecoil - .4byte BattleScript_EffectConfuse - .4byte BattleScript_EffectAttackUp2 - .4byte BattleScript_EffectDefenseUp2 - .4byte BattleScript_EffectSpeedUp2 - .4byte BattleScript_EffectSpecialAttackUp2 - .4byte BattleScript_EffectSpecialDefenseUp2 - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectTransform - .4byte BattleScript_EffectAttackDown2 - .4byte BattleScript_EffectDefenseDown2 - .4byte BattleScript_EffectSpeedDown2 - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectSpecialDefenseDown2 - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectReflect - .4byte BattleScript_EffectPoison - .4byte BattleScript_EffectParalyze - .4byte BattleScript_EffectAttackDownHit - .4byte BattleScript_EffectDefenseDownHit - .4byte BattleScript_EffectSpeedDownHit - .4byte BattleScript_EffectSpecialAttackDownHit - .4byte BattleScript_EffectSpecialDefenseDownHit - .4byte BattleScript_EffectAccuracyDownHit - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectSkyAttack - .4byte BattleScript_EffectConfuseHit - .4byte BattleScript_EffectTwineedle - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectSubstitute - .4byte BattleScript_EffectRecharge - .4byte BattleScript_EffectRage - .4byte BattleScript_EffectMimic - .4byte BattleScript_EffectMetronome - .4byte BattleScript_EffectLeechSeed - .4byte BattleScript_EffectSplash - .4byte BattleScript_EffectDisable - .4byte BattleScript_EffectLevelDamage - .4byte BattleScript_EffectPsywave - .4byte BattleScript_EffectCounter - .4byte BattleScript_EffectEncore - .4byte BattleScript_EffectPainSplit - .4byte BattleScript_EffectSnore - .4byte BattleScript_EffectConversion2 - .4byte BattleScript_EffectLockOn - .4byte BattleScript_EffectSketch - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectSleepTalk - .4byte BattleScript_EffectDestinyBond - .4byte BattleScript_EffectFlail - .4byte BattleScript_EffectSpite - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectHealBell - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectTripleKick - .4byte BattleScript_EffectThief - .4byte BattleScript_EffectMeanLook - .4byte BattleScript_EffectNightmare - .4byte BattleScript_EffectMinimize - .4byte BattleScript_EffectCurse - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectProtect - .4byte BattleScript_EffectSpikes - .4byte BattleScript_EffectForesight - .4byte BattleScript_EffectPerishSong - .4byte BattleScript_EffectSandstorm - .4byte BattleScript_EffectProtect - .4byte BattleScript_EffectRollout - .4byte BattleScript_EffectSwagger - .4byte BattleScript_EffectFuryCutter - .4byte BattleScript_EffectAttract - .4byte BattleScript_EffectReturn - .4byte BattleScript_EffectPresent - .4byte BattleScript_EffectReturn - .4byte BattleScript_EffectSafeguard - .4byte BattleScript_EffectThawHit - .4byte BattleScript_EffectMagnitude - .4byte BattleScript_EffectBatonPass - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectRapidSpin - .4byte BattleScript_EffectSonicboom - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectMorningSun - .4byte BattleScript_EffectMorningSun - .4byte BattleScript_EffectMorningSun - .4byte BattleScript_EffectHiddenPower - .4byte BattleScript_EffectRainDance - .4byte BattleScript_EffectSunnyDay - .4byte BattleScript_EffectDefenseUpHit - .4byte BattleScript_EffectAttackUpHit - .4byte BattleScript_EffectAllStatsUpHit - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectBellyDrum - .4byte BattleScript_EffectPsychUp - .4byte BattleScript_EffectMirrorCoat - .4byte BattleScript_EffectSkullBash - .4byte BattleScript_EffectTwister - .4byte BattleScript_EffectEarthquake - .4byte BattleScript_EffectFutureSight - .4byte BattleScript_EffectGust - .4byte BattleScript_EffectFlinchMinimizeHit - .4byte BattleScript_EffectSolarBeam - .4byte BattleScript_EffectThunder - .4byte BattleScript_EffectTeleport - .4byte BattleScript_EffectBeatUp - .4byte BattleScript_EffectSemiInvulnerable - .4byte BattleScript_EffectDefenseCurl - .4byte BattleScript_EffectSoftboiled - .4byte BattleScript_EffectFakeOut - .4byte BattleScript_EffectUproar - .4byte BattleScript_EffectStockpile - .4byte BattleScript_EffectSpitUp - .4byte BattleScript_EffectSwallow - .4byte BattleScript_EffectHit - .4byte BattleScript_EffectHail - .4byte BattleScript_EffectTorment - .4byte BattleScript_EffectFlatter - .4byte BattleScript_EffectWillOWisp - .4byte BattleScript_EffectMemento - .4byte BattleScript_EffectFacade - .4byte BattleScript_EffectFocusPunch - .4byte BattleScript_EffectSmellingsalt - .4byte BattleScript_EffectFollowMe - .4byte BattleScript_EffectNaturePower - .4byte BattleScript_EffectCharge - .4byte BattleScript_EffectTaunt - .4byte BattleScript_EffectHelpingHand - .4byte BattleScript_EffectTrick - .4byte BattleScript_EffectRolePlay - .4byte BattleScript_EffectWish - .4byte BattleScript_EffectAssist - .4byte BattleScript_EffectIngrain - .4byte BattleScript_EffectSuperpower - .4byte BattleScript_EffectMagicCoat - .4byte BattleScript_EffectRecycle - .4byte BattleScript_EffectRevenge - .4byte BattleScript_EffectBrickBreak - .4byte BattleScript_EffectYawn - .4byte BattleScript_EffectKnockOff - .4byte BattleScript_EffectEndeavor - .4byte BattleScript_EffectEruption - .4byte BattleScript_EffectSkillSwap - .4byte BattleScript_EffectImprison - .4byte BattleScript_EffectRefresh - .4byte BattleScript_EffectGrudge - .4byte BattleScript_EffectSnatch - .4byte BattleScript_EffectLowKick - .4byte BattleScript_EffectSecretPower - .4byte BattleScript_EffectDoubleEdge - .4byte BattleScript_EffectTeeterDance - .4byte BattleScript_EffectBurnHit - .4byte BattleScript_EffectMudSport - .4byte BattleScript_EffectPoisonFang - .4byte BattleScript_EffectWeatherBall - .4byte BattleScript_EffectOverheat - .4byte BattleScript_EffectTickle - .4byte BattleScript_EffectCosmicPower - .4byte BattleScript_EffectSkyUppercut - .4byte BattleScript_EffectBulkUp - .4byte BattleScript_EffectPoisonHit - .4byte BattleScript_EffectMudSport - .4byte BattleScript_EffectCalmMind - .4byte BattleScript_EffectDragonDance - .4byte BattleScript_EffectCamouflage + .4byte BattleScript_EffectHit @ EFFECT_HIT + .4byte BattleScript_EffectSleep @ EFFECT_SLEEP + .4byte BattleScript_EffectPoisonHit @ EFFECT_POISON_HIT + .4byte BattleScript_EffectAbsorb @ EFFECT_ABSORB + .4byte BattleScript_EffectBurnHit @ EFFECT_BURN_HIT + .4byte BattleScript_EffectFreezeHit @ EFFECT_FREEZE_HIT + .4byte BattleScript_EffectParalyzeHit @ EFFECT_PARALYZE_HIT + .4byte BattleScript_EffectExplosion @ EFFECT_EXPLOSION + .4byte BattleScript_EffectDreamEater @ EFFECT_DREAM_EATER + .4byte BattleScript_EffectMirrorMove @ EFFECT_MIRROR_MOVE + .4byte BattleScript_EffectAttackUp @ EFFECT_ATTACK_UP + .4byte BattleScript_EffectDefenseUp @ EFFECT_DEFENSE_UP + .4byte BattleScript_EffectHit @ EFFECT_SPEED_UP + .4byte BattleScript_EffectSpecialAttackUp @ EFFECT_SPECIAL_ATTACK_UP + .4byte BattleScript_EffectHit @ EFFECT_SPECIAL_DEFENSE_UP + .4byte BattleScript_EffectHit @ EFFECT_ACCURACY_UP + .4byte BattleScript_EffectEvasionUp @ EFFECT_EVASION_UP + .4byte BattleScript_EffectHit @ EFFECT_ALWAYS_HIT + .4byte BattleScript_EffectAttackDown @ EFFECT_ATTACK_DOWN + .4byte BattleScript_EffectDefenseDown @ EFFECT_DEFENSE_DOWN + .4byte BattleScript_EffectSpeedDown @ EFFECT_SPEED_DOWN + .4byte BattleScript_EffectHit @ EFFECT_SPECIAL_ATTACK_DOWN + .4byte BattleScript_EffectHit @ EFFECT_SPECIAL_DEFENSE_DOWN + .4byte BattleScript_EffectAccuracyDown @ EFFECT_ACCURACY_DOWN + .4byte BattleScript_EffectEvasionDown @ EFFECT_EVASION_DOWN + .4byte BattleScript_EffectHaze @ EFFECT_HAZE + .4byte BattleScript_EffectBide @ EFFECT_BIDE + .4byte BattleScript_EffectRampage @ EFFECT_RAMPAGE + .4byte BattleScript_EffectRoar @ EFFECT_ROAR + .4byte BattleScript_EffectMultiHit @ EFFECT_MULTI_HIT + .4byte BattleScript_EffectConversion @ EFFECT_CONVERSION + .4byte BattleScript_EffectFlinchHit @ EFFECT_FLINCH_HIT + .4byte BattleScript_EffectRestoreHp @ EFFECT_RESTORE_HP + .4byte BattleScript_EffectToxic @ EFFECT_TOXIC + .4byte BattleScript_EffectPayDay @ EFFECT_PAY_DAY + .4byte BattleScript_EffectLightScreen @ EFFECT_LIGHT_SCREEN + .4byte BattleScript_EffectTriAttack @ EFFECT_TRI_ATTACK + .4byte BattleScript_EffectRest @ EFFECT_REST + .4byte BattleScript_EffectOHKO @ EFFECT_OHKO + .4byte BattleScript_EffectRazorWind @ EFFECT_RAZOR_WIND + .4byte BattleScript_EffectSuperFang @ EFFECT_SUPER_FANG + .4byte BattleScript_EffectDragonRage @ EFFECT_DRAGON_RAGE + .4byte BattleScript_EffectTrap @ EFFECT_TRAP + .4byte BattleScript_EffectHit @ EFFECT_HIGH_CRITICAL + .4byte BattleScript_EffectDoubleHit @ EFFECT_DOUBLE_HIT + .4byte BattleScript_EffectRecoilIfMiss @ EFFECT_RECOIL_IF_MISS + .4byte BattleScript_EffectMist @ EFFECT_MIST + .4byte BattleScript_EffectFocusEnergy @ EFFECT_FOCUS_ENERGY + .4byte BattleScript_EffectRecoil @ EFFECT_RECOIL + .4byte BattleScript_EffectConfuse @ EFFECT_CONFUSE + .4byte BattleScript_EffectAttackUp2 @ EFFECT_ATTACK_UP_2 + .4byte BattleScript_EffectDefenseUp2 @ EFFECT_DEFENSE_UP_2 + .4byte BattleScript_EffectSpeedUp2 @ EFFECT_SPEED_UP_2 + .4byte BattleScript_EffectSpecialAttackUp2 @ EFFECT_SPECIAL_ATTACK_UP_2 + .4byte BattleScript_EffectSpecialDefenseUp2 @ EFFECT_SPECIAL_DEFENSE_UP_2 + .4byte BattleScript_EffectHit @ EFFECT_ACCURACY_UP_2 + .4byte BattleScript_EffectHit @ EFFECT_EVASION_UP_2 + .4byte BattleScript_EffectTransform @ EFFECT_TRANSFORM + .4byte BattleScript_EffectAttackDown2 @ EFFECT_ATTACK_DOWN_2 + .4byte BattleScript_EffectDefenseDown2 @ EFFECT_DEFENSE_DOWN_2 + .4byte BattleScript_EffectSpeedDown2 @ EFFECT_SPEED_DOWN_2 + .4byte BattleScript_EffectHit @ EFFECT_SPECIAL_ATTACK_DOWN_2 + .4byte BattleScript_EffectSpecialDefenseDown2 @ EFFECT_SPECIAL_DEFENSE_DOWN_2 + .4byte BattleScript_EffectHit @ EFFECT_ACCURACY_DOWN_2 + .4byte BattleScript_EffectHit @ EFFECT_EVASION_DOWN_2 + .4byte BattleScript_EffectReflect @ EFFECT_REFLECT + .4byte BattleScript_EffectPoison @ EFFECT_POISON + .4byte BattleScript_EffectParalyze @ EFFECT_PARALYZE + .4byte BattleScript_EffectAttackDownHit @ EFFECT_ATTACK_DOWN_HIT + .4byte BattleScript_EffectDefenseDownHit @ EFFECT_DEFENSE_DOWN_HIT + .4byte BattleScript_EffectSpeedDownHit @ EFFECT_SPEED_DOWN_HIT + .4byte BattleScript_EffectSpecialAttackDownHit @ EFFECT_SPECIAL_ATTACK_DOWN_HIT + .4byte BattleScript_EffectSpecialDefenseDownHit @ EFFECT_SPECIAL_DEFENSE_DOWN_HIT + .4byte BattleScript_EffectAccuracyDownHit @ EFFECT_ACCURACY_DOWN_HIT + .4byte BattleScript_EffectHit @ EFFECT_EVASION_DOWN_HIT + .4byte BattleScript_EffectSkyAttack @ EFFECT_SKY_ATTACK + .4byte BattleScript_EffectConfuseHit @ EFFECT_CONFUSE_HIT + .4byte BattleScript_EffectTwineedle @ EFFECT_TWINEEDLE + .4byte BattleScript_EffectHit @ EFFECT_VITAL_THROW + .4byte BattleScript_EffectSubstitute @ EFFECT_SUBSTITUTE + .4byte BattleScript_EffectRecharge @ EFFECT_RECHARGE + .4byte BattleScript_EffectRage @ EFFECT_RAGE + .4byte BattleScript_EffectMimic @ EFFECT_MIMIC + .4byte BattleScript_EffectMetronome @ EFFECT_METRONOME + .4byte BattleScript_EffectLeechSeed @ EFFECT_LEECH_SEED + .4byte BattleScript_EffectSplash @ EFFECT_SPLASH + .4byte BattleScript_EffectDisable @ EFFECT_DISABLE + .4byte BattleScript_EffectLevelDamage @ EFFECT_LEVEL_DAMAGE + .4byte BattleScript_EffectPsywave @ EFFECT_PSYWAVE + .4byte BattleScript_EffectCounter @ EFFECT_COUNTER + .4byte BattleScript_EffectEncore @ EFFECT_ENCORE + .4byte BattleScript_EffectPainSplit @ EFFECT_PAIN_SPLIT + .4byte BattleScript_EffectSnore @ EFFECT_SNORE + .4byte BattleScript_EffectConversion2 @ EFFECT_CONVERSION_2 + .4byte BattleScript_EffectLockOn @ EFFECT_LOCK_ON + .4byte BattleScript_EffectSketch @ EFFECT_SKETCH + .4byte BattleScript_EffectHit @ EFFECT_UNUSED_60 + .4byte BattleScript_EffectSleepTalk @ EFFECT_SLEEP_TALK + .4byte BattleScript_EffectDestinyBond @ EFFECT_DESTINY_BOND + .4byte BattleScript_EffectFlail @ EFFECT_FLAIL + .4byte BattleScript_EffectSpite @ EFFECT_SPITE + .4byte BattleScript_EffectHit @ EFFECT_FALSE_SWIPE + .4byte BattleScript_EffectHealBell @ EFFECT_HEAL_BELL + .4byte BattleScript_EffectHit @ EFFECT_QUICK_ATTACK + .4byte BattleScript_EffectTripleKick @ EFFECT_TRIPLE_KICK + .4byte BattleScript_EffectThief @ EFFECT_THIEF + .4byte BattleScript_EffectMeanLook @ EFFECT_MEAN_LOOK + .4byte BattleScript_EffectNightmare @ EFFECT_NIGHTMARE + .4byte BattleScript_EffectMinimize @ EFFECT_MINIMIZE + .4byte BattleScript_EffectCurse @ EFFECT_CURSE + .4byte BattleScript_EffectHit @ EFFECT_UNUSED_6E + .4byte BattleScript_EffectProtect @ EFFECT_PROTECT + .4byte BattleScript_EffectSpikes @ EFFECT_SPIKES + .4byte BattleScript_EffectForesight @ EFFECT_FORESIGHT + .4byte BattleScript_EffectPerishSong @ EFFECT_PERISH_SONG + .4byte BattleScript_EffectSandstorm @ EFFECT_SANDSTORM + .4byte BattleScript_EffectEndure @ EFFECT_ENDURE + .4byte BattleScript_EffectRollout @ EFFECT_ROLLOUT + .4byte BattleScript_EffectSwagger @ EFFECT_SWAGGER + .4byte BattleScript_EffectFuryCutter @ EFFECT_FURY_CUTTER + .4byte BattleScript_EffectAttract @ EFFECT_ATTRACT + .4byte BattleScript_EffectReturn @ EFFECT_RETURN + .4byte BattleScript_EffectPresent @ EFFECT_PRESENT + .4byte BattleScript_EffectFrustration @ EFFECT_FRUSTRATION + .4byte BattleScript_EffectSafeguard @ EFFECT_SAFEGUARD + .4byte BattleScript_EffectThawHit @ EFFECT_THAW_HIT + .4byte BattleScript_EffectMagnitude @ EFFECT_MAGNITUDE + .4byte BattleScript_EffectBatonPass @ EFFECT_BATON_PASS + .4byte BattleScript_EffectHit @ EFFECT_PURSUIT + .4byte BattleScript_EffectRapidSpin @ EFFECT_RAPID_SPIN + .4byte BattleScript_EffectSonicboom @ EFFECT_SONICBOOM + .4byte BattleScript_EffectHit @ EFFECT_UNUSED_83 + .4byte BattleScript_EffectMorningSun @ EFFECT_MORNING_SUN + .4byte BattleScript_EffectSynthesis @ EFFECT_SYNTHESIS + .4byte BattleScript_EffectMoonlight @ EFFECT_MOONLIGHT + .4byte BattleScript_EffectHiddenPower @ EFFECT_HIDDEN_POWER + .4byte BattleScript_EffectRainDance @ EFFECT_RAIN_DANCE + .4byte BattleScript_EffectSunnyDay @ EFFECT_SUNNY_DAY + .4byte BattleScript_EffectDefenseUpHit @ EFFECT_DEFENSE_UP_HIT + .4byte BattleScript_EffectAttackUpHit @ EFFECT_ATTACK_UP_HIT + .4byte BattleScript_EffectAllStatsUpHit @ EFFECT_ALL_STATS_UP_HIT + .4byte BattleScript_EffectHit @ EFFECT_UNUSED_8D + .4byte BattleScript_EffectBellyDrum @ EFFECT_BELLY_DRUM + .4byte BattleScript_EffectPsychUp @ EFFECT_PSYCH_UP + .4byte BattleScript_EffectMirrorCoat @ EFFECT_MIRROR_COAT + .4byte BattleScript_EffectSkullBash @ EFFECT_SKULL_BASH + .4byte BattleScript_EffectTwister @ EFFECT_TWISTER + .4byte BattleScript_EffectEarthquake @ EFFECT_EARTHQUAKE + .4byte BattleScript_EffectFutureSight @ EFFECT_FUTURE_SIGHT + .4byte BattleScript_EffectGust @ EFFECT_GUST + .4byte BattleScript_EffectStomp @ EFFECT_FLINCH_MINIMIZE_HIT + .4byte BattleScript_EffectSolarBeam @ EFFECT_SOLAR_BEAM + .4byte BattleScript_EffectThunder @ EFFECT_THUNDER + .4byte BattleScript_EffectTeleport @ EFFECT_TELEPORT + .4byte BattleScript_EffectBeatUp @ EFFECT_BEAT_UP + .4byte BattleScript_EffectSemiInvulnerable @ EFFECT_SEMI_INVULNERABLE + .4byte BattleScript_EffectDefenseCurl @ EFFECT_DEFENSE_CURL + .4byte BattleScript_EffectSoftboiled @ EFFECT_SOFTBOILED + .4byte BattleScript_EffectFakeOut @ EFFECT_FAKE_OUT + .4byte BattleScript_EffectUproar @ EFFECT_UPROAR + .4byte BattleScript_EffectStockpile @ EFFECT_STOCKPILE + .4byte BattleScript_EffectSpitUp @ EFFECT_SPIT_UP + .4byte BattleScript_EffectSwallow @ EFFECT_SWALLOW + .4byte BattleScript_EffectHit @ EFFECT_UNUSED_A3 + .4byte BattleScript_EffectHail @ EFFECT_HAIL + .4byte BattleScript_EffectTorment @ EFFECT_TORMENT + .4byte BattleScript_EffectFlatter @ EFFECT_FLATTER + .4byte BattleScript_EffectWillOWisp @ EFFECT_WILL_O_WISP + .4byte BattleScript_EffectMemento @ EFFECT_MEMENTO + .4byte BattleScript_EffectFacade @ EFFECT_FACADE + .4byte BattleScript_EffectFocusPunch @ EFFECT_FOCUS_PUNCH + .4byte BattleScript_EffectSmellingsalt @ EFFECT_SMELLINGSALT + .4byte BattleScript_EffectFollowMe @ EFFECT_FOLLOW_ME + .4byte BattleScript_EffectNaturePower @ EFFECT_NATURE_POWER + .4byte BattleScript_EffectCharge @ EFFECT_CHARGE + .4byte BattleScript_EffectTaunt @ EFFECT_TAUNT + .4byte BattleScript_EffectHelpingHand @ EFFECT_HELPING_HAND + .4byte BattleScript_EffectTrick @ EFFECT_TRICK + .4byte BattleScript_EffectRolePlay @ EFFECT_ROLE_PLAY + .4byte BattleScript_EffectWish @ EFFECT_WISH + .4byte BattleScript_EffectAssist @ EFFECT_ASSIST + .4byte BattleScript_EffectIngrain @ EFFECT_INGRAIN + .4byte BattleScript_EffectSuperpower @ EFFECT_SUPERPOWER + .4byte BattleScript_EffectMagicCoat @ EFFECT_MAGIC_COAT + .4byte BattleScript_EffectRecycle @ EFFECT_RECYCLE + .4byte BattleScript_EffectRevenge @ EFFECT_REVENGE + .4byte BattleScript_EffectBrickBreak @ EFFECT_BRICK_BREAK + .4byte BattleScript_EffectYawn @ EFFECT_YAWN + .4byte BattleScript_EffectKnockOff @ EFFECT_KNOCK_OFF + .4byte BattleScript_EffectEndeavor @ EFFECT_ENDEAVOR + .4byte BattleScript_EffectEruption @ EFFECT_ERUPTION + .4byte BattleScript_EffectSkillSwap @ EFFECT_SKILL_SWAP + .4byte BattleScript_EffectImprison @ EFFECT_IMPRISON + .4byte BattleScript_EffectRefresh @ EFFECT_REFRESH + .4byte BattleScript_EffectGrudge @ EFFECT_GRUDGE + .4byte BattleScript_EffectSnatch @ EFFECT_SNATCH + .4byte BattleScript_EffectLowKick @ EFFECT_LOW_KICK + .4byte BattleScript_EffectSecretPower @ EFFECT_SECRET_POWER + .4byte BattleScript_EffectDoubleEdge @ EFFECT_DOUBLE_EDGE + .4byte BattleScript_EffectTeeterDance @ EFFECT_TEETER_DANCE + .4byte BattleScript_EffectBurnHit @ EFFECT_BLAZE_KICK + .4byte BattleScript_EffectMudSport @ EFFECT_MUD_SPORT + .4byte BattleScript_EffectPoisonFang @ EFFECT_POISON_FANG + .4byte BattleScript_EffectWeatherBall @ EFFECT_WEATHER_BALL + .4byte BattleScript_EffectOverheat @ EFFECT_OVERHEAT + .4byte BattleScript_EffectTickle @ EFFECT_TICKLE + .4byte BattleScript_EffectCosmicPower @ EFFECT_COSMIC_POWER + .4byte BattleScript_EffectSkyUppercut @ EFFECT_SKY_UPPERCUT + .4byte BattleScript_EffectBulkUp @ EFFECT_BULK_UP + .4byte BattleScript_EffectPoisonHit @ EFFECT_POISON_TAIL + .4byte BattleScript_EffectWaterSport @ EFFECT_WATER_SPORT + .4byte BattleScript_EffectCalmMind @ EFFECT_CALM_MIND + .4byte BattleScript_EffectDragonDance @ EFFECT_DRAGON_DANCE + .4byte BattleScript_EffectCamouflage @ EFFECT_CAMOUFLAGE BattleScript_EffectHit:: jumpifnotmove MOVE_SURF, BattleScript_HitFromAtkCanceler @@ -261,11 +262,11 @@ BattleScript_HitFromAtkAnimation:: healthbarupdate BS_TARGET datahpupdate BS_TARGET critmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG seteffectwithchance - tryfaintmon BS_TARGET, 0, NULL + tryfaintmon BS_TARGET BattleScript_MoveEnd:: moveendall end @@ -276,11 +277,11 @@ BattleScript_PrintMoveMissed:: attackstring ppreduce BattleScript_MoveMissedPause:: - pause 0x20 + pause B_WAIT_TIME_SHORT BattleScript_MoveMissed:: effectivenesssound resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectSleep:: @@ -300,21 +301,21 @@ BattleScript_EffectSleep:: goto BattleScript_MoveEnd BattleScript_AlreadyAsleep:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNALREADYASLEEP - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_WasntAffected:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNWASNTAFFECTED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_CantMakeAsleep:: - pause 0x20 + pause B_WAIT_TIME_SHORT printfromtable gUproarAwakeStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectPoisonHit:: @@ -338,27 +339,26 @@ BattleScript_EffectAbsorb:: healthbarupdate BS_TARGET datahpupdate BS_TARGET critmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG negativedamage orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE jumpifability BS_TARGET, ABILITY_LIQUID_OOZE, BattleScript_AbsorbLiquidOoze - setbyte cMULTISTRING_CHOOSER, 0 + setbyte cMULTISTRING_CHOOSER, B_MSG_ABSORB goto BattleScript_AbsorbUpdateHp - BattleScript_AbsorbLiquidOoze:: - manipulatedamage 0 - setbyte cMULTISTRING_CHOOSER, 1 + manipulatedamage DMG_CHANGE_SIGN + setbyte cMULTISTRING_CHOOSER, B_MSG_ABSORB_OOZE BattleScript_AbsorbUpdateHp:: healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER jumpifmovehadnoeffect BattleScript_AbsorbTryFainting - printfromtable gLeechSeedDrainStringIds - waitmessage 0x40 + printfromtable gAbsorbDrainStringIds + waitmessage B_WAIT_TIME_LONG BattleScript_AbsorbTryFainting:: - tryfaintmon BS_ATTACKER, 0, NULL - tryfaintmon BS_TARGET, 0, NULL + tryfaintmon BS_ATTACKER + tryfaintmon BS_TARGET goto BattleScript_MoveEnd BattleScript_EffectBurnHit:: @@ -377,17 +377,17 @@ BattleScript_EffectExplosion:: attackcanceler attackstring ppreduce - faintifabilitynotdamp +@ Below jumps to BattleScript_DampStopsExplosion if it fails (only way it can) + tryexplosion setatkhptozero waitstate jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop call BattleScript_PreserveMissedBitDoMoveAnim goto BattleScript_ExplosionLoop - -BattleScript_ExplosionDoAnimStartLoop:: +BattleScript_ExplosionDoAnimStartLoop: attackanimation waitanimation -BattleScript_ExplosionLoop:: +BattleScript_ExplosionLoop: movevaluescleanup critcalc damagecalc @@ -400,25 +400,24 @@ BattleScript_ExplosionLoop:: healthbarupdate BS_TARGET datahpupdate BS_TARGET critmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG resultmessage - waitmessage 0x40 - tryfaintmon BS_TARGET, 0, NULL - moveendto 16 + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_TARGET + moveendto MOVEEND_NEXT_TARGET jumpifnexttargetvalid BattleScript_ExplosionLoop - tryfaintmon BS_ATTACKER, 0, NULL + tryfaintmon BS_ATTACKER end - -BattleScript_ExplosionMissed:: +BattleScript_ExplosionMissed: effectivenesssound resultmessage - waitmessage 0x40 - moveendto 16 + waitmessage B_WAIT_TIME_LONG + moveendto MOVEEND_NEXT_TARGET jumpifnexttargetvalid BattleScript_ExplosionLoop - tryfaintmon BS_ATTACKER, 0, NULL + tryfaintmon BS_ATTACKER end -BattleScript_PreserveMissedBitDoMoveAnim:: +BattleScript_PreserveMissedBitDoMoveAnim: bicbyte gMoveResultFlags, MOVE_RESULT_MISSED attackanimation waitanimation @@ -429,13 +428,12 @@ BattleScript_EffectDreamEater:: attackcanceler jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_DreamEaterNoEffect jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_DreamEaterWorked -BattleScript_DreamEaterNoEffect:: +BattleScript_DreamEaterNoEffect: attackstring ppreduce - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_WasntAffected - -BattleScript_DreamEaterWorked:: +BattleScript_DreamEaterWorked: accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce @@ -451,29 +449,29 @@ BattleScript_DreamEaterWorked:: healthbarupdate BS_TARGET datahpupdate BS_TARGET critmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG negativedamage orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER jumpifmovehadnoeffect BattleScript_DreamEaterTryFaintEnd printstring STRINGID_PKMNDREAMEATEN - waitmessage 0x40 -BattleScript_DreamEaterTryFaintEnd:: - tryfaintmon BS_TARGET, 0, NULL + waitmessage B_WAIT_TIME_LONG +BattleScript_DreamEaterTryFaintEnd: + tryfaintmon BS_TARGET goto BattleScript_MoveEnd BattleScript_EffectMirrorMove:: attackcanceler attackstring - pause 0x40 + pause B_WAIT_TIME_LONG trymirrormove ppreduce orbyte gMoveResultFlags, MOVE_RESULT_FAILED printstring STRINGID_MIRRORMOVEFAILED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectAttackUp:: @@ -495,11 +493,10 @@ BattleScript_EffectStatUp:: BattleScript_EffectStatUpAfterAtkCanceler:: attackstring ppreduce - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_StatUpEnd - jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_StatUpAttackAnim - pause 0x20 + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_StatUpEnd + jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpAttackAnim + pause B_WAIT_TIME_SHORT goto BattleScript_StatUpPrintString - BattleScript_StatUpAttackAnim:: attackanimation waitanimation @@ -508,14 +505,14 @@ BattleScript_StatUpDoAnim:: playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 BattleScript_StatUpPrintString:: printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_StatUpEnd:: goto BattleScript_MoveEnd BattleScript_StatUp:: playanimation BS_EFFECT_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_EffectAttackDown:: @@ -543,11 +540,10 @@ BattleScript_EffectStatDown:: attackstring ppreduce statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_StatDownEnd - jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, 2, BattleScript_StatDownDoAnim - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 3, BattleScript_StatDownEnd - pause 0x20 + jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_StatDownDoAnim + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StatDownEnd + pause B_WAIT_TIME_SHORT goto BattleScript_StatDownPrintString - BattleScript_StatDownDoAnim:: attackanimation waitanimation @@ -555,14 +551,14 @@ BattleScript_StatDownDoAnim:: playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 BattleScript_StatDownPrintString:: printfromtable gStatDownStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_StatDownEnd:: goto BattleScript_MoveEnd BattleScript_StatDown:: playanimation BS_EFFECT_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 printfromtable gStatDownStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_EffectHaze:: @@ -573,7 +569,7 @@ BattleScript_EffectHaze:: waitanimation normalisebuffs printstring STRINGID_STATCHANGESGONE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectBide:: @@ -592,7 +588,7 @@ BattleScript_EffectRampage:: attackstring jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_EffectRampage2 ppreduce -BattleScript_EffectRampage2:: +BattleScript_EffectRampage2: confuseifrepeatingattackends goto BattleScript_HitFromCritCalc @@ -635,29 +631,28 @@ BattleScript_DoMultiHit:: healthbarupdate BS_TARGET datahpupdate BS_TARGET critmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG printstring STRINGID_EMPTYSTRING3 waitmessage 1 - addbyte gBattleScripting + 12, 1 - moveendto 16 + addbyte sMULTIHIT_STRING + 4, 1 + moveendto MOVEEND_NEXT_TARGET jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings decrementmultihit BattleScript_MultiHitLoop goto BattleScript_MultiHitPrintStrings - BattleScript_MultiHitNoMoreHits:: - pause 0x20 + pause B_WAIT_TIME_SHORT BattleScript_MultiHitPrintStrings:: resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG jumpifmovehadnoeffect BattleScript_MultiHitEnd copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6 printstring STRINGID_HITXTIMES - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_MultiHitEnd:: seteffectwithchance - tryfaintmon BS_TARGET, 0, NULL - moveendcase 2 - moveendfrom 4 + tryfaintmon BS_TARGET + moveendcase MOVEEND_SYNCHRONIZE_TARGET + moveendfrom MOVEEND_IMMUNITY_ABILITIES end BattleScript_EffectConversion:: @@ -668,7 +663,7 @@ BattleScript_EffectConversion:: attackanimation waitanimation printstring STRINGID_PKMNCHANGEDTYPE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectFlinchHit:: @@ -686,7 +681,7 @@ BattleScript_EffectRestoreHp:: healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER printstring STRINGID_PKMNREGAINEDHEALTH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectToxic:: @@ -707,18 +702,18 @@ BattleScript_EffectToxic:: setmoveeffect MOVE_EFFECT_TOXIC seteffectprimary resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_AlreadyPoisoned:: - pause 0x40 + pause B_WAIT_TIME_LONG printstring STRINGID_PKMNALREADYPOISONED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_ImmunityProtected:: copybyte gEffectBattler, gBattlerTarget - setbyte cMULTISTRING_CHOOSER, 0 + setbyte cMULTISTRING_CHOOSER, B_MSG_ABILITY_PREVENTS_MOVE_STATUS call BattleScript_PSNPrevention goto BattleScript_MoveEnd @@ -744,23 +739,23 @@ BattleScript_EffectRest:: jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_RestIsAlreadyAsleep jumpifcantmakeasleep BattleScript_RestCantSleep trysetrest BattleScript_AlreadyAtFullHp - pause 0x20 + pause B_WAIT_TIME_SHORT printfromtable gRestUsedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_ATTACKER waitstate goto BattleScript_PresentHealTarget BattleScript_RestCantSleep:: - pause 0x40 + pause B_WAIT_TIME_LONG printfromtable gUproarAwakeStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_RestIsAlreadyAsleep:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNALREADYASLEEP2 - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectOHKO:: @@ -773,17 +768,16 @@ BattleScript_EffectOHKO:: tryKO BattleScript_KOFail trysetdestinybondtohappen goto BattleScript_HitFromAtkAnimation - BattleScript_KOFail:: - pause 0x40 + pause B_WAIT_TIME_LONG printfromtable gKOFailedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectRazorWind:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn - setbyte sTWOTURN_STRINGID, 0 + setbyte sTWOTURN_STRINGID, B_MSG_TURN1_RAZOR_WIND call BattleScriptFirstChargingTurn goto BattleScript_MoveEnd @@ -808,7 +802,7 @@ BattleScriptFirstChargingTurn:: seteffectprimary copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID printfromtable gFirstTurnOfTwoStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_EffectSuperFang:: @@ -855,25 +849,24 @@ BattleScript_EffectRecoilIfMiss:: attackcanceler accuracycheck BattleScript_MoveMissedDoDamage, ACC_CURR_MOVE goto BattleScript_HitFromAtkString - BattleScript_MoveMissedDoDamage:: attackstring ppreduce - pause 0x40 + pause B_WAIT_TIME_LONG resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd printstring STRINGID_PKMNCRASHED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG damagecalc typecalc adjustnormaldamage - manipulatedamage 1 + manipulatedamage DMG_RECOIL_FROM_MISS bicbyte gMoveResultFlags, MOVE_RESULT_MISSED orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER - tryfaintmon BS_ATTACKER, 0, NULL + tryfaintmon BS_ATTACKER orbyte gMoveResultFlags, MOVE_RESULT_MISSED goto BattleScript_MoveEnd @@ -885,7 +878,7 @@ BattleScript_EffectMist:: attackanimation waitanimation printfromtable gMistUsedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectFocusEnergy:: @@ -897,7 +890,7 @@ BattleScript_EffectFocusEnergy:: attackanimation waitanimation printfromtable gFocusEnergyUsedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectRecoil:: @@ -920,13 +913,13 @@ BattleScript_EffectConfuse:: setmoveeffect MOVE_EFFECT_CONFUSION seteffectprimary resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_AlreadyConfused:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNALREADYCONFUSED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectAttackUp2:: @@ -957,7 +950,7 @@ BattleScript_EffectTransform:: attackanimation waitanimation printfromtable gTransformUsedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectAttackDown2:: @@ -985,7 +978,7 @@ BattleScript_PrintReflectLightScreenSafeguardString:: attackanimation waitanimation printfromtable gReflectLightScreenSafeguardStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectPoison:: @@ -1006,7 +999,7 @@ BattleScript_EffectPoison:: setmoveeffect MOVE_EFFECT_POISON seteffectprimary resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectParalyze:: @@ -1026,18 +1019,18 @@ BattleScript_EffectParalyze:: setmoveeffect MOVE_EFFECT_PARALYSIS seteffectprimary resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_AlreadyParalyzed:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNISALREADYPARALYZED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_LimberProtected:: copybyte gEffectBattler, gBattlerTarget - setbyte cMULTISTRING_CHOOSER, 0 + setbyte cMULTISTRING_CHOOSER, B_MSG_ABILITY_PREVENTS_MOVE_STATUS call BattleScript_PRLZPrevention goto BattleScript_MoveEnd @@ -1068,7 +1061,7 @@ BattleScript_EffectAccuracyDownHit:: BattleScript_EffectSkyAttack:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn - setbyte sTWOTURN_STRINGID, 3 + setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SKY_ATTACK call BattleScriptFirstChargingTurn goto BattleScript_MoveEnd @@ -1093,24 +1086,22 @@ BattleScript_EffectSubstitute:: waitstate jumpifstatus2 BS_ATTACKER, STATUS2_SUBSTITUTE, BattleScript_AlreadyHasSubstitute setsubstitute - jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 1, BattleScript_SubstituteAnim - pause 0x20 + jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_SUBSTITUTE_FAILED, BattleScript_SubstituteAnim + pause B_WAIT_TIME_SHORT goto BattleScript_SubstituteString - BattleScript_SubstituteAnim:: attackanimation waitanimation healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER BattleScript_SubstituteString:: - printfromtable gSubsituteUsedStringIds - waitmessage 0x40 + printfromtable gSubstituteUsedStringIds + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd - BattleScript_AlreadyHasSubstitute:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNHASSUBSTITUTE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectRecharge:: @@ -1121,7 +1112,7 @@ BattleScript_EffectRecharge:: BattleScript_MoveUsedMustRecharge:: printstring STRINGID_PKMNMUSTRECHARGE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectRage:: @@ -1131,7 +1122,6 @@ BattleScript_EffectRage:: seteffectprimary setmoveeffect 0 goto BattleScript_HitFromAtkString - BattleScript_RageMiss:: setmoveeffect MOVE_EFFECT_RAGE clearstatusfromeffect BS_ATTACKER @@ -1147,22 +1137,23 @@ BattleScript_EffectMimic:: attackanimation waitanimation printstring STRINGID_PKMNLEARNEDMOVE2 - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectMetronome:: attackcanceler attackstring - pause 0x20 + pause B_WAIT_TIME_SHORT attackanimation waitanimation setbyte sB_ANIM_TURN, 0 setbyte sB_ANIM_TARGETS_HIT, 0 metronome + BattleScript_EffectLeechSeed:: attackcanceler attackstring - pause 0x20 + pause B_WAIT_TIME_SHORT ppreduce jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed accuracycheck BattleScript_DoLeechSeed, ACC_CURR_MOVE @@ -1171,7 +1162,7 @@ BattleScript_DoLeechSeed:: attackanimation waitanimation printfromtable gLeechSeedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectSplash:: @@ -1182,7 +1173,7 @@ BattleScript_EffectSplash:: waitanimation incrementgamestat GAME_STAT_USED_SPLASH printstring STRINGID_BUTNOTHINGHAPPENED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectDisable:: @@ -1194,7 +1185,7 @@ BattleScript_EffectDisable:: attackanimation waitanimation printstring STRINGID_PKMNMOVEWASDISABLED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectLevelDamage:: @@ -1238,7 +1229,7 @@ BattleScript_EffectEncore:: attackanimation waitanimation printstring STRINGID_PKMNGOTENCORE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectPainSplit:: @@ -1256,7 +1247,7 @@ BattleScript_EffectPainSplit:: healthbarupdate BS_TARGET datahpupdate BS_TARGET printstring STRINGID_SHAREDPAIN - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectSnore:: @@ -1265,11 +1256,10 @@ BattleScript_EffectSnore:: attackstring ppreduce goto BattleScript_ButItFailed - BattleScript_SnoreIsAsleep:: jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoSnore printstring STRINGID_PKMNFASTASLEEP - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG statusanimation BS_ATTACKER BattleScript_DoSnore:: attackstring @@ -1286,7 +1276,7 @@ BattleScript_EffectConversion2:: attackanimation waitanimation printstring STRINGID_PKMNCHANGEDTYPE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectLockOn:: @@ -1299,7 +1289,7 @@ BattleScript_EffectLockOn:: attackanimation waitanimation printstring STRINGID_PKMNTOOKAIM - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectSketch:: @@ -1311,7 +1301,7 @@ BattleScript_EffectSketch:: attackanimation waitanimation printstring STRINGID_PKMNSKETCHEDMOVE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectSleepTalk:: @@ -1320,24 +1310,23 @@ BattleScript_EffectSleepTalk:: attackstring ppreduce goto BattleScript_ButItFailed - BattleScript_SleepTalkIsAsleep:: printstring STRINGID_PKMNFASTASLEEP - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG statusanimation BS_ATTACKER attackstring ppreduce orword gHitMarker, HITMARKER_NO_PPDEDUCT trychoosesleeptalkmove BattleScript_SleepTalkUsingMove - pause 0x40 + pause B_WAIT_TIME_LONG goto BattleScript_ButItFailed - BattleScript_SleepTalkUsingMove:: attackanimation waitanimation setbyte sB_ANIM_TURN, 0 setbyte sB_ANIM_TARGETS_HIT, 0 - jumptocalledmove 1 + jumptocalledmove TRUE + BattleScript_EffectDestinyBond:: attackcanceler attackstring @@ -1346,7 +1335,7 @@ BattleScript_EffectDestinyBond:: attackanimation waitanimation printstring STRINGID_PKMNTRYINGTOTAKEFOE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectFlail:: @@ -1362,7 +1351,7 @@ BattleScript_EffectSpite:: attackanimation waitanimation printstring STRINGID_PKMNREDUCEDPP - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectHealBell:: @@ -1374,15 +1363,15 @@ BattleScript_EffectHealBell:: attackanimation waitanimation printfromtable gPartyStatusHealStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG jumpifnotmove MOVE_HEAL_BELL, BattleScript_PartyHealEnd - jumpifbyte CMP_NO_COMMON_BITS, cMULTISTRING_CHOOSER, 1, BattleScript_CheckHealBellMon2Unaffected + jumpifbyte CMP_NO_COMMON_BITS, cMULTISTRING_CHOOSER, B_MSG_BELL_SOUNDPROOF_ATTACKER, BattleScript_CheckHealBellMon2Unaffected printstring STRINGID_PKMNSXBLOCKSY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_CheckHealBellMon2Unaffected:: - jumpifbyte CMP_NO_COMMON_BITS, cMULTISTRING_CHOOSER, 2, BattleScript_PartyHealEnd + jumpifbyte CMP_NO_COMMON_BITS, cMULTISTRING_CHOOSER, B_MSG_BELL_SOUNDPROOF_PARTNER, BattleScript_PartyHealEnd printstring STRINGID_PKMNSXBLOCKSY2 - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_PartyHealEnd:: updatestatusicon BS_ATTACKER_WITH_PARTNER waitstate @@ -1392,8 +1381,7 @@ BattleScript_EffectTripleKick:: attackcanceler attackstring ppreduce - setbyte sTRIPLE_KICK_POWER, 0 - setbyte gBattleScripting + 19, 0 + sethword sTRIPLE_KICK_POWER, 0 initmultihitstring setmultihit 3 BattleScript_TripleKickLoop:: @@ -1405,7 +1393,7 @@ BattleScript_DoTripleKickAttack:: accuracycheck BattleScript_TripleKickNoMoreHits, ACC_CURR_MOVE movevaluescleanup addbyte sTRIPLE_KICK_POWER, 10 - addbyte gBattleScripting + 12, 1 + addbyte sMULTIHIT_STRING + 4, 1 copyhword gDynamicBasePower, sTRIPLE_KICK_POWER critcalc damagecalc @@ -1420,30 +1408,29 @@ BattleScript_DoTripleKickAttack:: healthbarupdate BS_TARGET datahpupdate BS_TARGET critmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG printstring STRINGID_EMPTYSTRING3 waitmessage 1 - moveendto 16 + moveendto MOVEEND_NEXT_TARGET jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings decrementmultihit BattleScript_TripleKickLoop goto BattleScript_TripleKickPrintStrings - BattleScript_TripleKickNoMoreHits:: - pause 0x20 - jumpifbyte CMP_EQUAL, gBattleScripting + 12, 0, BattleScript_TripleKickPrintStrings + pause B_WAIT_TIME_SHORT + jumpifbyte CMP_EQUAL, sMULTIHIT_STRING + 4, 0, BattleScript_TripleKickPrintStrings bicbyte gMoveResultFlags, MOVE_RESULT_MISSED BattleScript_TripleKickPrintStrings:: resultmessage - waitmessage 0x40 - jumpifbyte CMP_EQUAL, gBattleScripting + 12, 0, BattleScript_TripleKickEnd + waitmessage B_WAIT_TIME_LONG + jumpifbyte CMP_EQUAL, sMULTIHIT_STRING + 4, 0, BattleScript_TripleKickEnd jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_TripleKickEnd copyarray gBattleTextBuff1, sMULTIHIT_STRING, 6 printstring STRINGID_HITXTIMES - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_TripleKickEnd:: seteffectwithchance - tryfaintmon BS_TARGET, 0, NULL - moveendfrom 14 + tryfaintmon BS_TARGET + moveendfrom MOVEEND_UPDATE_LAST_MOVES end BattleScript_EffectThief:: @@ -1462,7 +1449,7 @@ BattleScript_EffectMeanLook:: setmoveeffect MOVE_EFFECT_PREVENT_ESCAPE seteffectprimary printstring STRINGID_TARGETCANTESCAPENOW - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectNightmare:: @@ -1473,14 +1460,13 @@ BattleScript_EffectNightmare:: jumpifstatus2 BS_TARGET, STATUS2_NIGHTMARE, BattleScript_ButItFailed jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_NightmareWorked goto BattleScript_ButItFailed - BattleScript_NightmareWorked:: attackanimation waitanimation setmoveeffect MOVE_EFFECT_NIGHTMARE seteffectprimary printstring STRINGID_PKMNFELLINTONIGHTMARE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectMinimize:: @@ -1494,31 +1480,30 @@ BattleScript_EffectCurse:: attackcanceler attackstring ppreduce - jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, 0, BattleScript_CurseTrySpeed - jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, 12, BattleScript_CurseTrySpeed - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 12, BattleScript_ButItFailed + jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, MIN_STAT_STAGE, BattleScript_CurseTrySpeed + jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_CurseTrySpeed + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_ButItFailed BattleScript_CurseTrySpeed:: copybyte gBattlerTarget, gBattlerAttacker setbyte sB_ANIM_TURN, 1 attackanimation waitanimation setstatchanger STAT_SPEED, 1, TRUE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CurseTryAttack + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryAttack printfromtable gStatDownStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_CurseTryAttack:: setstatchanger STAT_ATK, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CurseTryDefence + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryDefense printfromtable gStatUpStringIds - waitmessage 0x40 -BattleScript_CurseTryDefence:: + waitmessage B_WAIT_TIME_LONG +BattleScript_CurseTryDefense:: setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CurseEnd + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseEnd printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_CurseEnd:: goto BattleScript_MoveEnd - BattleScript_GhostCurse:: jumpifbytenotequal gBattlerAttacker, gBattlerTarget, BattleScript_DoGhostCurse getmovetarget BS_ATTACKER @@ -1536,11 +1521,12 @@ BattleScript_DoGhostCurse:: healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER printstring STRINGID_PKMNLAIDCURSE - waitmessage 0x40 - tryfaintmon BS_ATTACKER, 0, NULL + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_ATTACKER goto BattleScript_MoveEnd BattleScript_EffectProtect:: +BattleScript_EffectEndure:: attackcanceler attackstring ppreduce @@ -1548,7 +1534,7 @@ BattleScript_EffectProtect:: attackanimation waitanimation printfromtable gProtectLikeUsedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectSpikes:: @@ -1559,7 +1545,7 @@ BattleScript_EffectSpikes:: attackanimation waitanimation printstring STRINGID_SPIKESSCATTERED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectForesight:: @@ -1571,7 +1557,7 @@ BattleScript_EffectForesight:: attackanimation waitanimation printstring STRINGID_PKMNIDENTIFIED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectPerishSong:: @@ -1582,7 +1568,7 @@ BattleScript_EffectPerishSong:: attackanimation waitanimation printstring STRINGID_FAINTINTHREE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG setbyte sBATTLER, 0 BattleScript_PerishSongLoop:: jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected @@ -1593,7 +1579,7 @@ BattleScript_PerishSongLoopIncrement:: BattleScript_PerishSongNotAffected:: printstring STRINGID_PKMNSXBLOCKSY2 - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_PerishSongLoopIncrement BattleScript_EffectSandstorm:: @@ -1621,16 +1607,16 @@ BattleScript_EffectSwagger:: accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - jumpifconfusedandstatmaxed 1, BattleScript_ButItFailed + jumpifconfusedandstatmaxed STAT_ATK, BattleScript_ButItFailed attackanimation waitanimation setstatchanger STAT_ATK, 2, FALSE statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_SwaggerTryConfuse - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_SwaggerTryConfuse + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SwaggerTryConfuse setgraphicalstatchangevalues playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_SwaggerTryConfuse:: jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected @@ -1661,13 +1647,14 @@ BattleScript_EffectAttract:: attackanimation waitanimation printstring STRINGID_PKMNFELLINLOVE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectReturn:: +BattleScript_EffectFrustration:: attackcanceler accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE - happinesstodamagecalculation + friendshiptodamagecalculation goto BattleScript_HitFromAtkString BattleScript_EffectPresent:: @@ -1677,6 +1664,7 @@ BattleScript_EffectPresent:: ppreduce typecalc presentdamagecalculation + BattleScript_EffectSafeguard:: attackcanceler attackstring @@ -1694,16 +1682,16 @@ BattleScript_EffectMagnitude:: ppreduce selectfirstvalidtarget magnitudedamagecalculation - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_MAGNITUDESTRENGTH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_HitsAllWithUndergroundBonusLoop BattleScript_EffectBatonPass:: attackcanceler attackstring ppreduce - jumpifcantswitch BS_ATTACKER | SWITCH_IGNORE_ESCAPE_PREVENTION, BattleScript_ButItFailed + jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_ButItFailed attackanimation waitanimation openpartyscreen BS_ATTACKER, BattleScript_ButItFailed @@ -1715,7 +1703,7 @@ BattleScript_EffectBatonPass:: switchindataupdate BS_ATTACKER hpthresholds BS_ATTACKER printstring STRINGID_SWITCHINMON - switchinanim BS_ATTACKER, 1 + switchinanim BS_ATTACKER, TRUE waitstate switchineffects BS_ATTACKER goto BattleScript_MoveEnd @@ -1736,6 +1724,8 @@ BattleScript_EffectSonicboom:: goto BattleScript_HitFromAtkAnimation BattleScript_EffectMorningSun:: +BattleScript_EffectSynthesis:: +BattleScript_EffectMoonlight:: attackcanceler attackstring ppreduce @@ -1756,8 +1746,8 @@ BattleScript_MoveWeatherChange:: attackanimation waitanimation printfromtable gMoveWeatherChangeStringIds - waitmessage 0x40 - call BattleScript_HandleWeatherFormChanges + waitmessage B_WAIT_TIME_LONG + call BattleScript_WeatherFormChanges goto BattleScript_MoveEnd BattleScript_EffectSunnyDay:: @@ -1790,7 +1780,7 @@ BattleScript_EffectBellyDrum:: healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER printstring STRINGID_PKMNCUTHPMAXEDATTACK - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectPsychUp:: @@ -1801,7 +1791,7 @@ BattleScript_EffectPsychUp:: attackanimation waitanimation printstring STRINGID_PKMNCOPIEDSTATCHANGES - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectMirrorCoat:: @@ -1817,15 +1807,15 @@ BattleScript_EffectMirrorCoat:: BattleScript_EffectSkullBash:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn - setbyte sTWOTURN_STRINGID, 2 + setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SKULL_BASH call BattleScriptFirstChargingTurn setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_SkullBashEnd - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_SkullBashEnd + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_SkullBashEnd + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SkullBashEnd setgraphicalstatchangevalues playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_SkullBashEnd:: goto BattleScript_MoveEnd @@ -1848,7 +1838,6 @@ BattleScript_HitsAllWithUndergroundBonusLoop:: orword gHitMarker, HITMARKER_IGNORE_UNDERGROUND setbyte sDMG_MULTIPLIER, 2 goto BattleScript_DoHitAllWithUndergroundBonus - BattleScript_HitsAllNoUndergroundBonus:: bicword gHitMarker, HITMARKER_IGNORE_UNDERGROUND setbyte sDMG_MULTIPLIER, 1 @@ -1866,23 +1855,22 @@ BattleScript_DoHitAllWithUndergroundBonus:: healthbarupdate BS_TARGET datahpupdate BS_TARGET critmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG printstring STRINGID_EMPTYSTRING3 waitmessage 1 - tryfaintmon BS_TARGET, 0, NULL - moveendto 16 + tryfaintmon BS_TARGET + moveendto MOVEEND_NEXT_TARGET jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop end - BattleScript_HitAllWithUndergroundBonusMissed:: - pause 0x20 + pause B_WAIT_TIME_SHORT typecalc effectivenesssound resultmessage - waitmessage 0x40 - moveendto 16 + waitmessage B_WAIT_TIME_LONG + moveendto MOVEEND_NEXT_TARGET jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop end @@ -1894,7 +1882,7 @@ BattleScript_EffectFutureSight:: attackanimation waitanimation printfromtable gFutureMoveUsedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectGust:: @@ -1903,7 +1891,7 @@ BattleScript_EffectGust:: setbyte sDMG_MULTIPLIER, 2 goto BattleScript_EffectHit -BattleScript_EffectFlinchMinimizeHit:: +BattleScript_EffectStomp:: jumpifnostatus3 BS_TARGET, STATUS3_MINIMIZED, BattleScript_FlinchEffect setbyte sDMG_MULTIPLIER, 2 goto BattleScript_FlinchEffect @@ -1911,14 +1899,13 @@ BattleScript_EffectFlinchMinimizeHit:: BattleScript_EffectSolarBeam:: jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarBeamDecideTurn jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarBeamDecideTurn - jumpifhalfword CMP_COMMON_BITS, gBattleWeather, 96, BattleScript_SolarBeamOnFirstTurn + jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN, BattleScript_SolarBeamOnFirstTurn BattleScript_SolarBeamDecideTurn:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn - setbyte sTWOTURN_STRINGID, 1 + setbyte sTWOTURN_STRINGID, B_MSG_TURN1_SOLAR_BEAM call BattleScriptFirstChargingTurn goto BattleScript_MoveEnd - BattleScript_SolarBeamOnFirstTurn:: orword gHitMarker, HITMARKER_CHARGING setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER @@ -1942,7 +1929,7 @@ BattleScript_EffectTeleport:: attackanimation waitanimation printstring STRINGID_PKMNFLEDFROMBATTLE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG setbyte gBattleOutcome, B_OUTCOME_PLAYER_TELEPORTED goto BattleScript_MoveEnd @@ -1950,7 +1937,7 @@ BattleScript_EffectBeatUp:: attackcanceler accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring - pause 0x20 + pause B_WAIT_TIME_SHORT ppreduce setbyte gBattleCommunication, 0 BattleScript_BeatUpLoop:: @@ -1959,7 +1946,7 @@ BattleScript_BeatUpLoop:: printstring STRINGID_PKMNATTACK critcalc jumpifbyte CMP_NOT_EQUAL, gCritMultiplier, 2, BattleScript_BeatUpAttack - manipulatedamage 2 + manipulatedamage DMG_DOUBLED BattleScript_BeatUpAttack:: adjustnormaldamage attackanimation @@ -1970,36 +1957,34 @@ BattleScript_BeatUpAttack:: healthbarupdate BS_TARGET datahpupdate BS_TARGET critmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG resultmessage - waitmessage 0x40 - tryfaintmon BS_TARGET, 0, NULL - moveendto 16 + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_TARGET + moveendto MOVEEND_NEXT_TARGET goto BattleScript_BeatUpLoop - BattleScript_BeatUpEnd:: end BattleScript_EffectSemiInvulnerable:: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_SecondTurnSemiInvulnerable jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_SecondTurnSemiInvulnerable - jumpifmove MOVE_FLY, BattleScript_FlyFirstTurn - jumpifmove MOVE_DIVE, BattleScript_DiveFirstTurn - jumpifmove MOVE_BOUNCE, BattleScript_BounceFirstTurn - @ MOVE_DIG - setbyte sTWOTURN_STRINGID, 5 + jumpifmove MOVE_FLY, BattleScript_FirstTurnFly + jumpifmove MOVE_DIVE, BattleScript_FirstTurnDive + jumpifmove MOVE_BOUNCE, BattleScript_FirstTurnBounce + setbyte sTWOTURN_STRINGID, B_MSG_TURN1_DIG goto BattleScript_FirstTurnSemiInvulnerable -BattleScript_BounceFirstTurn:: - setbyte sTWOTURN_STRINGID, 7 +BattleScript_FirstTurnBounce:: + setbyte sTWOTURN_STRINGID, B_MSG_TURN1_BOUNCE goto BattleScript_FirstTurnSemiInvulnerable -BattleScript_DiveFirstTurn:: - setbyte sTWOTURN_STRINGID, 6 +BattleScript_FirstTurnDive:: + setbyte sTWOTURN_STRINGID, B_MSG_TURN1_DIVE goto BattleScript_FirstTurnSemiInvulnerable -BattleScript_FlyFirstTurn:: - setbyte sTWOTURN_STRINGID, 4 +BattleScript_FirstTurnFly:: + setbyte sTWOTURN_STRINGID, B_MSG_TURN1_FLY BattleScript_FirstTurnSemiInvulnerable:: call BattleScriptFirstChargingTurn setsemiinvulnerablebit @@ -2028,8 +2013,8 @@ BattleScript_EffectDefenseCurl:: ppreduce setdefensecurlbit setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_DefenseCurlDoStatUpAnim - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_StatUpPrintString + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DefenseCurlDoStatUpAnim + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpPrintString attackanimation waitanimation BattleScript_DefenseCurlDoStatUpAnim:: @@ -2047,13 +2032,13 @@ BattleScript_PresentHealTarget:: healthbarupdate BS_TARGET datahpupdate BS_TARGET printstring STRINGID_PKMNREGAINEDHEALTH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_AlreadyAtFullHp:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNHPFULL - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectFakeOut:: @@ -2067,17 +2052,17 @@ BattleScript_ButItFailedAtkStringPpReduce:: BattleScript_ButItFailedPpReduce:: ppreduce BattleScript_ButItFailed:: - pause 0x20 + pause B_WAIT_TIME_SHORT orbyte gMoveResultFlags, MOVE_RESULT_FAILED resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_NotAffected:: - pause 0x20 + pause B_WAIT_TIME_SHORT orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectUproar:: @@ -2099,12 +2084,12 @@ BattleScript_EffectStockpile:: attackanimation waitanimation printfromtable gStockpileUsedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectSpitUp:: attackcanceler - jumpifbyte CMP_EQUAL, gBattleCommunication + 6, 1, BattleScript_SpitUpNoDamage + jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_SpitUpFailProtect attackstring ppreduce accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE @@ -2112,20 +2097,19 @@ BattleScript_EffectSpitUp:: typecalc adjustsetdamage goto BattleScript_HitFromAtkAnimation - BattleScript_SpitUpFail:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_FAILEDTOSPITUP - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd -BattleScript_SpitUpNoDamage:: +BattleScript_SpitUpFailProtect:: attackstring ppreduce - pause 0x40 + pause B_WAIT_TIME_LONG stockpiletobasedamage BattleScript_SpitUpFail resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectSwallow:: @@ -2136,9 +2120,9 @@ BattleScript_EffectSwallow:: goto BattleScript_PresentHealTarget BattleScript_SwallowFail:: - pause 0x20 + pause B_WAIT_TIME_SHORT printfromtable gSwallowFailStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectHail:: @@ -2157,7 +2141,7 @@ BattleScript_EffectTorment:: attackanimation waitanimation printstring STRINGID_PKMNSUBJECTEDTOTORMENT - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectFlatter:: @@ -2166,16 +2150,16 @@ BattleScript_EffectFlatter:: accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE attackstring ppreduce - jumpifconfusedandstatmaxed 4, BattleScript_ButItFailed + jumpifconfusedandstatmaxed STAT_SPATK, BattleScript_ButItFailed attackanimation waitanimation setstatchanger STAT_SPATK, 1, FALSE statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_FlatterTryConfuse - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_FlatterTryConfuse + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_FlatterTryConfuse setgraphicalstatchangevalues playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_FlatterTryConfuse:: jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected @@ -2202,65 +2186,66 @@ BattleScript_EffectWillOWisp:: BattleScript_WaterVeilPrevents:: copybyte gEffectBattler, gBattlerTarget - setbyte cMULTISTRING_CHOOSER, 0 + setbyte cMULTISTRING_CHOOSER, B_MSG_ABILITY_PREVENTS_MOVE_STATUS call BattleScript_BRNPrevention goto BattleScript_MoveEnd BattleScript_AlreadyBurned:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNALREADYHASBURN - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectMemento:: attackcanceler - jumpifbyte CMP_EQUAL, gBattleCommunication + 6, 1, BattleScript_MementoNoReduceStats + jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_MementoTargetProtect attackstring ppreduce - jumpifattackandspecialattackcannotfall BattleScript_ButItFailed + trymemento BattleScript_ButItFailed setatkhptozero attackanimation waitanimation - jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_MementoSubstituteInvulnerable - setbyte sSTAT_ANIM_PLAYED, 0 + jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectMementoPrintNoEffect + setbyte sSTAT_ANIM_PLAYED, FALSE playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_MULTIPLE_STATS playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO setstatchanger STAT_ATK, 2, TRUE - statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MementoSkipStatDown1 - jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_MementoSkipStatDown1 + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk +@ Greater than B_MSG_DEFENDER_STAT_FELL is checking if the stat cannot decrease + jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTrySpAtk printfromtable gStatDownStringIds - waitmessage 0x40 -BattleScript_MementoSkipStatDown1:: + waitmessage B_WAIT_TIME_LONG +BattleScript_EffectMementoTrySpAtk: playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO setstatchanger STAT_SPATK, 2, TRUE - statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MementoSkipStatDown2 - jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, 1, BattleScript_MementoSkipStatDown2 + statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTryFaint +@ Greater than B_MSG_DEFENDER_STAT_FELL is checking if the stat cannot decrease + jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTryFaint printfromtable gStatDownStringIds - waitmessage 0x40 -BattleScript_MementoSkipStatDown2:: - tryfaintmon BS_ATTACKER, 0, NULL + waitmessage B_WAIT_TIME_LONG +BattleScript_EffectMementoTryFaint: + tryfaintmon BS_ATTACKER goto BattleScript_MoveEnd - -BattleScript_MementoSubstituteInvulnerable:: +BattleScript_EffectMementoPrintNoEffect: printstring STRINGID_BUTNOEFFECT - waitmessage 0x40 - goto BattleScript_MementoSkipStatDown2 - -BattleScript_MementoNoReduceStats:: + waitmessage B_WAIT_TIME_LONG + goto BattleScript_EffectMementoTryFaint +@ If the target is protected there's no need to check the target's stats or animate, the user will just faint +BattleScript_MementoTargetProtect: attackstring ppreduce - jumpifattackandspecialattackcannotfall BattleScript_MementoNoReduceStatsEnd -BattleScript_MementoNoReduceStatsEnd:: + trymemento BattleScript_MementoTargetProtectEnd +BattleScript_MementoTargetProtectEnd: setatkhptozero - pause 0x40 + pause B_WAIT_TIME_LONG effectivenesssound resultmessage - waitmessage 0x40 - tryfaintmon BS_ATTACKER, 0, NULL + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_ATTACKER goto BattleScript_MoveEnd BattleScript_EffectFacade:: - jumpifstatus BS_ATTACKER, STATUS1_POISON | STATUS1_PARALYSIS | STATUS1_BURN | STATUS1_TOXIC_POISON, BattleScript_FacadeDoubleDmg + jumpifstatus BS_ATTACKER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, BattleScript_FacadeDoubleDmg goto BattleScript_EffectHit BattleScript_FacadeDoubleDmg:: @@ -2272,16 +2257,15 @@ BattleScript_EffectFocusPunch:: jumpifnodamage BattleScript_HitFromAccCheck ppreduce printstring STRINGID_PKMNLOSTFOCUS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectSmellingsalt:: jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_EffectHit setmoveeffect MOVE_EFFECT_REMOVE_PARALYSIS | MOVE_EFFECT_CERTAIN - jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_SmellingSaltBuff + jumpifstatus BS_TARGET, STATUS1_PARALYSIS, BattleScript_SmellingsaltDoubleDmg goto BattleScript_EffectHit - -BattleScript_SmellingSaltBuff:: +BattleScript_SmellingsaltDoubleDmg:: setbyte sDMG_MULTIPLIER, 2 goto BattleScript_EffectHit @@ -2293,16 +2277,16 @@ BattleScript_EffectFollowMe:: attackanimation waitanimation printstring STRINGID_PKMNCENTERATTENTION - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectNaturePower:: attackcanceler attackstring - pause 0x20 + pause B_WAIT_TIME_SHORT callterrainattack printstring STRINGID_NATUREPOWERTURNEDINTO - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_EffectCharge:: @@ -2313,7 +2297,7 @@ BattleScript_EffectCharge:: attackanimation waitanimation printstring STRINGID_PKMNCHARGINGPOWER - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectTaunt:: @@ -2325,7 +2309,7 @@ BattleScript_EffectTaunt:: attackanimation waitanimation printstring STRINGID_PKMNFELLFORTAUNT - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectHelpingHand:: @@ -2336,7 +2320,7 @@ BattleScript_EffectHelpingHand:: attackanimation waitanimation printstring STRINGID_PKMNREADYTOHELP - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectTrick:: @@ -2349,9 +2333,9 @@ BattleScript_EffectTrick:: attackanimation waitanimation printstring STRINGID_PKMNSWITCHEDITEMS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG printfromtable gItemSwapStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectRolePlay:: @@ -2363,7 +2347,7 @@ BattleScript_EffectRolePlay:: attackanimation waitanimation printstring STRINGID_PKMNCOPIEDFOE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectWish:: @@ -2383,7 +2367,8 @@ BattleScript_EffectAssist:: waitanimation setbyte sB_ANIM_TURN, 0 setbyte sB_ANIM_TARGETS_HIT, 0 - jumptocalledmove 1 + jumptocalledmove TRUE + BattleScript_EffectIngrain:: attackcanceler attackstring @@ -2392,7 +2377,7 @@ BattleScript_EffectIngrain:: attackanimation waitanimation printstring STRINGID_PKMNPLANTEDROOTS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectSuperpower:: @@ -2407,7 +2392,7 @@ BattleScript_EffectMagicCoat:: attackanimation waitanimation printstring STRINGID_PKMNSHROUDEDITSELF - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectRecycle:: @@ -2418,7 +2403,7 @@ BattleScript_EffectRecycle:: attackanimation waitanimation printstring STRINGID_XFOUNDONEY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectRevenge:: @@ -2442,7 +2427,7 @@ BattleScript_BrickBreakAnim:: waitanimation jumpifbyte CMP_LESS_THAN, sB_ANIM_TURN, 2, BattleScript_BrickBreakDoHit printstring STRINGID_THEWALLSHATTERED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_BrickBreakDoHit:: typecalc2 effectivenesssound @@ -2451,11 +2436,11 @@ BattleScript_BrickBreakDoHit:: healthbarupdate BS_TARGET datahpupdate BS_TARGET critmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG seteffectwithchance - tryfaintmon BS_TARGET, 0, NULL + tryfaintmon BS_TARGET goto BattleScript_MoveEnd BattleScript_EffectYawn:: @@ -2472,15 +2457,14 @@ BattleScript_EffectYawn:: attackanimation waitanimation printstring STRINGID_PKMNWASMADEDROWSY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd - BattleScript_PrintBankAbilityMadeIneffective:: copybyte sBATTLER, sBATTLER_WITH_ABILITY BattleScript_PrintAbilityMadeIneffective:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNSXMADEITINEFFECTIVE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectKnockOff:: @@ -2514,7 +2498,7 @@ BattleScript_EffectSkillSwap:: attackanimation waitanimation printstring STRINGID_PKMNSWAPPEDABILITIES - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectImprison:: @@ -2525,7 +2509,7 @@ BattleScript_EffectImprison:: attackanimation waitanimation printstring STRINGID_PKMNSEALEDOPPONENTMOVE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectRefresh:: @@ -2536,7 +2520,7 @@ BattleScript_EffectRefresh:: attackanimation waitanimation printstring STRINGID_PKMNSTATUSNORMAL - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_ATTACKER goto BattleScript_MoveEnd @@ -2548,7 +2532,7 @@ BattleScript_EffectGrudge:: attackanimation waitanimation printstring STRINGID_PKMNWANTSGRUDGE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectSnatch:: @@ -2558,9 +2542,9 @@ BattleScript_EffectSnatch:: ppreduce attackanimation waitanimation - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNWAITSFORTARGET - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectLowKick:: @@ -2597,43 +2581,44 @@ BattleScript_TeeterDanceLoop:: waitanimation seteffectprimary resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_TeeterDanceLoopIncrement:: - moveendto 16 + moveendto MOVEEND_NEXT_TARGET addbyte gBattlerTarget, 1 jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TeeterDanceLoop end BattleScript_TeeterDanceOwnTempoPrevents:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNPREVENTSCONFUSIONWITH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_TeeterDanceLoopIncrement BattleScript_TeeterDanceSafeguardProtected:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNUSEDSAFEGUARD - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_TeeterDanceLoopIncrement BattleScript_TeeterDanceSubstitutePrevents:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_BUTITFAILED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_TeeterDanceLoopIncrement BattleScript_TeeterDanceAlreadyConfused:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNALREADYCONFUSED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_TeeterDanceLoopIncrement BattleScript_TeeterDanceMissed:: resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_TeeterDanceLoopIncrement BattleScript_EffectMudSport:: +BattleScript_EffectWaterSport:: attackcanceler attackstring ppreduce @@ -2641,7 +2626,7 @@ BattleScript_EffectMudSport:: attackanimation waitanimation printfromtable gSportsUsedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectPoisonFang:: @@ -2660,59 +2645,59 @@ BattleScript_EffectTickle:: attackcanceler attackstring ppreduce - jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, 0, BattleScript_TickleDoMoveAnim - jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, 0, BattleScript_CantLowerMultipleStats + jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_TickleDoMoveAnim + jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, MIN_STAT_STAGE, BattleScript_CantLowerMultipleStats BattleScript_TickleDoMoveAnim:: accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE attackanimation waitanimation - setbyte sSTAT_ANIM_PLAYED, 0 + setbyte sSTAT_ANIM_PLAYED, FALSE playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE setstatchanger STAT_ATK, 1, TRUE statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleTryLowerDef - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_TickleTryLowerDef + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleTryLowerDef printfromtable gStatDownStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_TickleTryLowerDef:: playstatchangeanimation BS_TARGET, BIT_DEF, STAT_CHANGE_NEGATIVE setstatchanger STAT_DEF, 1, TRUE statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleEnd - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_TickleEnd + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleEnd printfromtable gStatDownStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_TickleEnd:: goto BattleScript_MoveEnd BattleScript_CantLowerMultipleStats:: - pause 0x20 + pause B_WAIT_TIME_SHORT orbyte gMoveResultFlags, MOVE_RESULT_FAILED printstring STRINGID_STATSWONTDECREASE2 - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectCosmicPower:: attackcanceler attackstring ppreduce - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 12, BattleScript_CosmicPowerDoMoveAnim - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 12, BattleScript_CantRaiseMultipleStats + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_CosmicPowerDoMoveAnim + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats BattleScript_CosmicPowerDoMoveAnim:: attackanimation waitanimation - setbyte sSTAT_ANIM_PLAYED, 0 + setbyte sSTAT_ANIM_PLAYED, FALSE playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0 setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CosmicPowerTrySpDef - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CosmicPowerTrySpDef + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerTrySpDef printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_CosmicPowerTrySpDef:: setstatchanger STAT_SPDEF, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CosmicPowerEnd - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CosmicPowerEnd + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerEnd + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerEnd printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_CosmicPowerEnd:: goto BattleScript_MoveEnd @@ -2724,24 +2709,24 @@ BattleScript_EffectBulkUp:: attackcanceler attackstring ppreduce - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 12, BattleScript_BulkUpDoMoveAnim - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, 12, BattleScript_CantRaiseMultipleStats + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_BulkUpDoMoveAnim + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats BattleScript_BulkUpDoMoveAnim:: attackanimation waitanimation - setbyte sSTAT_ANIM_PLAYED, 0 + setbyte sSTAT_ANIM_PLAYED, FALSE playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0 setstatchanger STAT_ATK, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_BulkUpTryDef - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_BulkUpTryDef + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpTryDef + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpTryDef printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_BulkUpTryDef:: setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_BulkUpEnd - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_BulkUpEnd + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpEnd + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpEnd printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_BulkUpEnd:: goto BattleScript_MoveEnd @@ -2749,56 +2734,56 @@ BattleScript_EffectCalmMind:: attackcanceler attackstring ppreduce - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 12, BattleScript_CalmMindDoMoveAnim - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 12, BattleScript_CantRaiseMultipleStats + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_CalmMindDoMoveAnim + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats BattleScript_CalmMindDoMoveAnim:: attackanimation waitanimation - setbyte sSTAT_ANIM_PLAYED, 0 + setbyte sSTAT_ANIM_PLAYED, FALSE playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0 setstatchanger STAT_SPATK, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CalmMindTrySpDef - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CalmMindTrySpDef + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindTrySpDef + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindTrySpDef printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_CalmMindTrySpDef:: setstatchanger STAT_SPDEF, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_CalmMindEnd - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_CalmMindEnd + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindEnd + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindEnd printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_CalmMindEnd:: goto BattleScript_MoveEnd BattleScript_CantRaiseMultipleStats:: - pause 0x20 + pause B_WAIT_TIME_SHORT orbyte gMoveResultFlags, MOVE_RESULT_FAILED printstring STRINGID_STATSWONTINCREASE2 - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_EffectDragonDance:: attackcanceler attackstring ppreduce - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 12, BattleScript_DragonDanceDoMoveAnim - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, 12, BattleScript_CantRaiseMultipleStats + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_DragonDanceDoMoveAnim + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats BattleScript_DragonDanceDoMoveAnim:: attackanimation waitanimation - setbyte sSTAT_ANIM_PLAYED, 0 + setbyte sSTAT_ANIM_PLAYED, FALSE playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0 setstatchanger STAT_ATK, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_DragonDanceTrySpeed - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_DragonDanceTrySpeed + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceTrySpeed + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceTrySpeed printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_DragonDanceTrySpeed:: setstatchanger STAT_SPEED, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_DragonDanceEnd - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_DragonDanceEnd + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceEnd + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceEnd printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_DragonDanceEnd:: goto BattleScript_MoveEnd @@ -2810,12 +2795,12 @@ BattleScript_EffectCamouflage:: attackanimation waitanimation printstring STRINGID_PKMNCHANGEDTYPE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_FaintAttacker:: playfaintcry BS_ATTACKER - pause 0x40 + pause B_WAIT_TIME_LONG dofaintanimation BS_ATTACKER cleareffectsonfaint BS_ATTACKER printstring STRINGID_ATTACKERFAINTED @@ -2824,7 +2809,7 @@ BattleScript_FaintAttacker:: BattleScript_FaintTarget:: playfaintcry BS_TARGET - pause 0x40 + pause B_WAIT_TIME_LONG dofaintanimation BS_TARGET cleareffectsonfaint BS_TARGET printstring STRINGID_TARGETFAINTED @@ -2837,34 +2822,37 @@ BattleScript_GiveExp:: end2 BattleScript_HandleFaintedMon:: - checkteamslost BattleScript_LinkBattleHandleFaint + checkteamslost BattleScript_LinkHandleFaintedMonMultiple jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd - jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonTryChooseAnother - jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_PLAYER_FAINTED, BattleScript_FaintedMonTryChooseAnother + jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonTryChoose + jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_PLAYER_FAINTED, BattleScript_FaintedMonTryChoose printstring STRINGID_USENEXTPKMN setbyte gBattleCommunication, 0 yesnobox - jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0, BattleScript_FaintedMonTryChooseAnother + jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 0, BattleScript_FaintedMonTryChoose jumpifplayerran BattleScript_FaintedMonEnd printstring STRINGID_CANTESCAPE2 -BattleScript_FaintedMonTryChooseAnother:: +BattleScript_FaintedMonTryChoose:: openpartyscreen BS_FAINTED, BattleScript_FaintedMonEnd switchhandleorder BS_FAINTED, 2 - jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother - jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother - jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_FaintedMonChooseAnother - jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother - jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_PLAYER_FAINTED, BattleScript_FaintedMonChooseAnother - jumpifbyte CMP_EQUAL, sBATTLE_STYLE, 1, BattleScript_FaintedMonChooseAnother - jumpifcantswitch BS_PLAYER1, BattleScript_FaintedMonChooseAnother + jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonSendOutNew + jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonSendOutNew + jumpifbattletype BATTLE_TYPE_BATTLE_TOWER, BattleScript_FaintedMonSendOutNew + jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonSendOutNew + jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_PLAYER_FAINTED, BattleScript_FaintedMonSendOutNew + jumpifbyte CMP_EQUAL, sBATTLE_STYLE, OPTIONS_BATTLE_STYLE_SET, BattleScript_FaintedMonSendOutNew + jumpifcantswitch BS_PLAYER1, BattleScript_FaintedMonSendOutNew +@ Yes/No for sending out a new Pokémon when the opponent is switching printstring STRINGID_ENEMYABOUTTOSWITCHPKMN setbyte gBattleCommunication, 0 yesnobox - jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 1, BattleScript_FaintedMonChooseAnother + jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 1, BattleScript_FaintedMonSendOutNew +@ Player said yes, go to party screen (note optional flag, player may exit the menu instead) setatktoplayer0 - openpartyscreen BS_ATTACKER | PARTY_SCREEN_OPTIONAL, BattleScript_FaintedMonChooseAnother + openpartyscreen BS_ATTACKER | PARTY_SCREEN_OPTIONAL, BattleScript_FaintedMonSendOutNew switchhandleorder BS_ATTACKER, 2 - jumpifbyte CMP_EQUAL, gBattleCommunication, 6, BattleScript_FaintedMonChooseAnother + jumpifbyte CMP_EQUAL, gBattleCommunication, PARTY_SIZE, BattleScript_FaintedMonSendOutNew +@ Switch Pokémon before opponent atknameinbuff1 resetintimidatetracebits BS_ATTACKER hpthresholds2 BS_ATTACKER @@ -2883,29 +2871,29 @@ BattleScript_FaintedMonTryChooseAnother:: waitstate switchineffects BS_ATTACKER resetsentmonsvalue -BattleScript_FaintedMonChooseAnother:: +BattleScript_FaintedMonSendOutNew:: drawpartystatussummary BS_FAINTED getswitchedmondata BS_FAINTED switchindataupdate BS_FAINTED hpthresholds BS_FAINTED printstring STRINGID_SWITCHINMON hidepartystatussummary BS_FAINTED - switchinanim BS_FAINTED, 0 + switchinanim BS_FAINTED, FALSE waitstate - resetplayerfainted BS_ATTACKER + resetplayerfainted switchineffects BS_FAINTED jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonEnd cancelallactions BattleScript_FaintedMonEnd:: end2 -BattleScript_LinkBattleHandleFaint:: - openpartyscreen BS_FAINTED_LINK_MULTIPLE_1, BattleScript_LinkBattleHandleFaintStart -BattleScript_LinkBattleHandleFaintStart:: +BattleScript_LinkHandleFaintedMonMultiple:: + openpartyscreen BS_FAINTED_LINK_MULTIPLE_1, BattleScript_LinkHandleFaintedMonMultipleStart +BattleScript_LinkHandleFaintedMonMultipleStart:: switchhandleorder BS_FAINTED, 0 - openpartyscreen BS_FAINTED_LINK_MULTIPLE_2, BattleScript_LinkBattleFaintedMonEnd + openpartyscreen BS_FAINTED_LINK_MULTIPLE_2, BattleScript_LinkHandleFaintedMonMultipleEnd switchhandleorder BS_FAINTED, 0 -BattleScript_LinkBattleFaintedMonLoop:: +BattleScript_LinkHandleFaintedMonLoop:: switchhandleorder BS_FAINTED, 2 drawpartystatussummary BS_FAINTED getswitchedmondata BS_FAINTED @@ -2913,11 +2901,11 @@ BattleScript_LinkBattleFaintedMonLoop:: hpthresholds BS_FAINTED printstring STRINGID_SWITCHINMON hidepartystatussummary BS_FAINTED - switchinanim BS_FAINTED, 0 + switchinanim BS_FAINTED, FALSE waitstate - switchineffects 5 - jumpifbytenotequal gBattlerFainted, gBattlersCount, BattleScript_LinkBattleFaintedMonLoop -BattleScript_LinkBattleFaintedMonEnd:: + switchineffects BS_FAINTED_LINK_MULTIPLE_1 + jumpifbytenotequal gBattlerFainted, gBattlersCount, BattleScript_LinkHandleFaintedMonLoop +BattleScript_LinkHandleFaintedMonMultipleEnd:: end2 BattleScript_LocalTrainerBattleWon:: @@ -2928,7 +2916,7 @@ BattleScript_LocalTrainerBattleWon:: getmoneyreward BattleScript_LocalTrainerBattleWonGotMoney BattleScript_LocalTrainerBattleWonGotMoney:: printstring STRINGID_PLAYERGOTMONEY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_PayDayMoneyAndPickUpItems:: givepaydaymoney pickup @@ -2942,30 +2930,30 @@ BattleScript_LocalBattleLost:: BattleScript_LocalBattleLostPrintWhiteOut:: jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_LocalBattleLostEnd printstring STRINGID_PLAYERWHITEOUT - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG getmoneyreward BattleScript_LocalBattleLostPrintTrainersWinText printstring STRINGID_PLAYERWHITEOUT2 - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_EReaderOrSecretBaseTrainerEnd BattleScript_LocalBattleLostEnd:: printstring STRINGID_PLAYERLOSTAGAINSTENEMYTRAINER - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG getmoneyreward BattleScript_LocalBattleLostPrintTrainersWinText printstring STRINGID_PLAYERPAIDPRIZEMONEY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_EReaderOrSecretBaseTrainerEnd:: end2 BattleScript_LocalBattleLostPrintTrainersWinText:: printstring STRINGID_PLAYERWHITEDOUT - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_RivalBattleLost:: jumpifhasnohp BS_ATTACKER, BattleScript_RivalBattleLostSkipMonRecall printstring STRINGID_TRAINER1MON1COMEBACK - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG returnatktoball waitstate BattleScript_RivalBattleLostSkipMonRecall:: @@ -2979,7 +2967,7 @@ BattleScript_BattleTowerLost:: various8 BS_ATTACKER jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_BattleTowerLostLostSkipMonRecall printfromtable gDoubleBattleRecallStrings - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG returnopponentmon1toball BS_ATTACKER waitstate returnopponentmon2toball BS_ATTACKER @@ -2995,9 +2983,9 @@ BattleScript_BattleTowerLostLostSkipDouble:: BattleScript_LinkBattleWonOrLost:: printstring STRINGID_BATTLEEND - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG endlinkbattle - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_BattleTowerTrainerBattleWon:: @@ -3013,24 +3001,24 @@ BattleScript_BattleTowerEtcTrainerBattleWonSkipText:: end2 BattleScript_SmokeBallEscape:: - playanimation BS_ATTACKER, B_ANIM_SMOKEBALL_ESCAPE, NULL + playanimation BS_ATTACKER, B_ANIM_SMOKEBALL_ESCAPE printstring STRINGID_PKMNFLEDUSINGITS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_RanAwayUsingMonAbility:: printstring STRINGID_PKMNFLEDUSING - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_GotAwaySafely:: printstring STRINGID_GOTAWAYSAFELY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_WildMonFled:: printstring STRINGID_WILDPKMNFLED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_PrintCantRunFromTrainer:: @@ -3044,7 +3032,7 @@ BattleScript_LeftoverBirchString:: BattleScript_PrintFailedToRunString:: printfromtable gNoEscapeStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_PrintCantEscapeFromBattle:: @@ -3059,20 +3047,19 @@ BattleScript_ActionSwitch:: hpthresholds2 BS_ATTACKER printstring STRINGID_RETURNMON setbyte sDMG_MULTIPLIER, 2 - jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_PursuitSwitchCheckTwice + jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_PursuitSwitchDmgSetMultihit setmultihit 1 - goto BattleScript_PursuitSwitchLoop - -BattleScript_PursuitSwitchCheckTwice:: + goto BattleScript_PursuitSwitchDmgLoop +BattleScript_PursuitSwitchDmgSetMultihit:: setmultihit 2 -BattleScript_PursuitSwitchLoop:: +BattleScript_PursuitSwitchDmgLoop:: jumpifnopursuitswitchdmg BattleScript_DoSwitchOut swapattackerwithtarget trysetdestinybondtohappen call BattleScript_PursuitDmgOnSwitchOut swapattackerwithtarget BattleScript_DoSwitchOut:: - decrementmultihit BattleScript_PursuitSwitchLoop + decrementmultihit BattleScript_PursuitSwitchDmgLoop switchoutabilities BS_ATTACKER waitstate returnatktoball @@ -3084,15 +3071,15 @@ BattleScript_DoSwitchOut:: hpthresholds BS_ATTACKER printstring STRINGID_SWITCHINMON hidepartystatussummary BS_ATTACKER - switchinanim BS_ATTACKER, 0 + switchinanim BS_ATTACKER, FALSE waitstate switchineffects BS_ATTACKER - moveendcase 4 - moveendcase 15 + moveendcase MOVEEND_IMMUNITY_ABILITIES + moveendcase MOVEEND_MIRROR_MOVE end2 BattleScript_PursuitDmgOnSwitchOut:: - pause 0x20 + pause B_WAIT_TIME_SHORT attackstring ppreduce critcalc @@ -3107,20 +3094,20 @@ BattleScript_PursuitDmgOnSwitchOut:: healthbarupdate BS_TARGET datahpupdate BS_TARGET critmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG resultmessage - waitmessage 0x40 - tryfaintmon BS_TARGET, 0, NULL - moveendfromto 3, 6 + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_TARGET + moveendfromto MOVEEND_ON_DAMAGE_ABILITIES, MOVEEND_CHOICE_MOVE getbattlerfainted BS_TARGET - jumpifbyte CMP_EQUAL, gBattleCommunication, 0, BattleScript_PursuitSwitchRivalSkip + jumpifbyte CMP_EQUAL, gBattleCommunication, FALSE, BattleScript_PursuitDmgOnSwitchOutRet setbyte sGIVEEXP_STATE, 0 getexp BS_TARGET -BattleScript_PursuitSwitchRivalSkip:: +BattleScript_PursuitDmgOnSwitchOutRet: return BattleScript_Pausex20:: - pause 0x20 + pause B_WAIT_TIME_SHORT return BattleScript_LevelUp:: @@ -3128,11 +3115,10 @@ BattleScript_LevelUp:: printstring STRINGID_PKMNGREWTOLV setbyte sLVLBOX_STATE, 0 drawlvlupbox - handlelearnnewmove BattleScript_LearnedNewMove, BattleScript_LearnMoveReturn, 1 + handlelearnnewmove BattleScript_LearnedNewMove, BattleScript_LearnMoveReturn, TRUE goto BattleScript_AskToLearnMove - -BattleScript_LearnMoveLoop:: - handlelearnnewmove BattleScript_LearnedNewMove, BattleScript_LearnMoveReturn, 0 +BattleScript_TryLearnMoveLoop:: + handlelearnnewmove BattleScript_LearnedNewMove, BattleScript_LearnMoveReturn, FALSE BattleScript_AskToLearnMove:: buffermovetolearn printstring STRINGID_TRYTOLEARNMOVE1 @@ -3146,8 +3132,7 @@ BattleScript_AskToLearnMove:: setbyte sLEARNMOVE_STATE, 0 yesnoboxstoplearningmove BattleScript_AskToLearnMove printstring STRINGID_DIDNOTLEARNMOVE - goto BattleScript_LearnMoveLoop - + goto BattleScript_TryLearnMoveLoop BattleScript_ForgotAndLearnedNewMove:: printstring STRINGID_123POOF printstring STRINGID_PKMNFORGOTMOVE @@ -3156,38 +3141,37 @@ BattleScript_LearnedNewMove:: buffermovetolearn fanfare MUS_LEVEL_UP printstring STRINGID_PKMNLEARNEDMOVE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatechoicemoveonlvlup BS_ATTACKER - goto BattleScript_LearnMoveLoop - + goto BattleScript_TryLearnMoveLoop BattleScript_LearnMoveReturn:: return BattleScript_RainContinuesOrEnds:: printfromtable gRainContinuesStringIds - waitmessage 0x40 - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_RainContinuesOrEndsEnd - playanimation BS_ATTACKER, B_ANIM_RAIN_CONTINUES, NULL + waitmessage B_WAIT_TIME_LONG + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_RAIN_STOPPED, BattleScript_RainContinuesOrEndsEnd + playanimation BS_ATTACKER, B_ANIM_RAIN_CONTINUES BattleScript_RainContinuesOrEndsEnd:: end2 BattleScript_DamagingWeatherContinues:: printfromtable gSandstormHailContinuesStringIds - waitmessage 0x40 - playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL + waitmessage B_WAIT_TIME_LONG + playanimation_var BS_ATTACKER, sB_ANIM_ARG1 setbyte gBattleCommunication, 0 BattleScript_DamagingWeatherLoop:: copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 1 weatherdamage jumpifword CMP_EQUAL, gBattleMoveDamage, NULL, BattleScript_DamagingWeatherContinuesEnd printfromtable gSandstormHailDmgStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_GRUDGE effectivenesssound hitanimation BS_ATTACKER healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER - tryfaintmon BS_ATTACKER, 0, NULL + tryfaintmon BS_ATTACKER checkteamslost BattleScript_DamagingWeatherContinuesEnd BattleScript_DamagingWeatherContinuesEnd:: jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_WeatherDamageEndedBattle @@ -3199,41 +3183,41 @@ BattleScript_WeatherDamageEndedBattle:: BattleScript_SandStormHailEnds:: printfromtable gSandstormHailEndStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_SunlightContinues:: printstring STRINGID_SUNLIGHTSTRONG - waitmessage 0x40 - playanimation BS_ATTACKER, B_ANIM_SUN_CONTINUES, NULL + waitmessage B_WAIT_TIME_LONG + playanimation BS_ATTACKER, B_ANIM_SUN_CONTINUES end2 BattleScript_SunlightFaded:: printstring STRINGID_SUNLIGHTFADED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_OverworldWeatherStarts:: - printfromtable gWeatherContinuesStringIds - waitmessage 0x40 - playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL + printfromtable gWeatherStartsStringIds + waitmessage B_WAIT_TIME_LONG + playanimation_var BS_ATTACKER, sB_ANIM_ARG1 end3 BattleScript_SideStatusWoreOff:: printstring STRINGID_PKMNSXWOREOFF - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_SafeguardProtected:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNUSEDSAFEGUARD - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_SafeguardEnds:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNSAFEGUARDEXPIRED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_LeechSeedTurnDrain:: @@ -3254,14 +3238,14 @@ BattleScript_LeechSeedTurnPrintAndUpdateHp:: healthbarupdate BS_TARGET datahpupdate BS_TARGET printfromtable gLeechSeedStringIds - waitmessage 0x40 - tryfaintmon BS_ATTACKER, 0, NULL - tryfaintmon BS_TARGET, 0, NULL + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_ATTACKER + tryfaintmon BS_TARGET end2 BattleScript_BideStoringEnergy:: printstring STRINGID_PKMNSTORINGENERGY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_BideAttack:: @@ -3269,7 +3253,7 @@ BattleScript_BideAttack:: setmoveeffect MOVE_EFFECT_CHARGING clearstatusfromeffect BS_ATTACKER printstring STRINGID_PKMNUNLEASHEDENERGY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE typecalc bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE @@ -3284,8 +3268,8 @@ BattleScript_BideAttack:: healthbarupdate BS_TARGET datahpupdate BS_TARGET resultmessage - waitmessage 0x40 - tryfaintmon BS_TARGET, 0, NULL + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_TARGET goto BattleScript_MoveEnd BattleScript_BideNoEnergyToAttack:: @@ -3293,7 +3277,7 @@ BattleScript_BideNoEnergyToAttack:: setmoveeffect MOVE_EFFECT_CHARGING clearstatusfromeffect BS_ATTACKER printstring STRINGID_PKMNUNLEASHEDENERGY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_ButItFailed BattleScript_SuccessForceOut:: @@ -3305,29 +3289,30 @@ BattleScript_SuccessForceOut:: jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_TrainerBattleForceOut setbyte gBattleOutcome, B_OUTCOME_PLAYER_TELEPORTED finishaction + BattleScript_TrainerBattleForceOut:: getswitchedmondata BS_TARGET switchindataupdate BS_TARGET - switchinanim BS_TARGET, 0 + switchinanim BS_TARGET, FALSE waitstate printstring STRINGID_PKMNWASDRAGGEDOUT switchineffects BS_TARGET goto BattleScript_MoveEnd BattleScript_MistProtected:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNPROTECTEDBYMIST - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_RageIsBuilding:: printstring STRINGID_PKMNRAGEBUILDING - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_MoveUsedIsDisabled:: printstring STRINGID_PKMNMOVEISDISABLED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_SelectingDisabledMove:: @@ -3336,21 +3321,21 @@ BattleScript_SelectingDisabledMove:: BattleScript_DisabledNoMore:: printstring STRINGID_PKMNMOVEDISABLEDNOMORE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_EncoredNoMore:: printstring STRINGID_PKMNENCOREENDED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_DestinyBondTakesLife:: printstring STRINGID_PKMNTOOKFOE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER - tryfaintmon BS_ATTACKER, 0, NULL + tryfaintmon BS_ATTACKER return BattleScript_SpikesOnAttacker:: @@ -3358,8 +3343,8 @@ BattleScript_SpikesOnAttacker:: healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER call BattleScript_PrintHurtBySpikes - tryfaintmon BS_ATTACKER, 0, NULL - tryfaintmon BS_ATTACKER, 1, BattleScript_SpikesOnAttackerFainted + tryfaintmon BS_ATTACKER + tryfaintmon_spikes BS_ATTACKER, BattleScript_SpikesOnAttackerFainted return BattleScript_SpikesOnAttackerFainted:: @@ -3373,8 +3358,8 @@ BattleScript_SpikesOnTarget:: healthbarupdate BS_TARGET datahpupdate BS_TARGET call BattleScript_PrintHurtBySpikes - tryfaintmon BS_TARGET, 0, NULL - tryfaintmon BS_TARGET, 1, BattleScript_SpikesOnTargetFainted + tryfaintmon BS_TARGET + tryfaintmon_spikes BS_TARGET, BattleScript_SpikesOnTargetFainted return BattleScript_SpikesOnTargetFainted:: @@ -3388,8 +3373,8 @@ BattleScript_SpikesOnFaintedBattler:: healthbarupdate BS_FAINTED datahpupdate BS_FAINTED call BattleScript_PrintHurtBySpikes - tryfaintmon BS_FAINTED, 0, NULL - tryfaintmon BS_FAINTED, 1, BattleScript_SpikesOnFaintedBattlerFainted + tryfaintmon BS_FAINTED + tryfaintmon_spikes BS_FAINTED, BattleScript_SpikesOnFaintedBattlerFainted return BattleScript_SpikesOnFaintedBattlerFainted:: @@ -3400,56 +3385,56 @@ BattleScript_SpikesOnFaintedBattlerFainted:: BattleScript_PrintHurtBySpikes:: printstring STRINGID_PKMNHURTBYSPIKES - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_PerishSongTakesLife:: printstring STRINGID_PKMNPERISHCOUNTFELL - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER - tryfaintmon BS_ATTACKER, 0, NULL + tryfaintmon BS_ATTACKER end2 BattleScript_PerishSongCountGoesDown:: printstring STRINGID_PKMNPERISHCOUNTFELL - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_AllStatsUp:: - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, 12, BattleScript_AllStatsUpAtk - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, 12, BattleScript_AllStatsUpAtk - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, 12, BattleScript_AllStatsUpAtk - jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, 12, BattleScript_AllStatsUpAtk - jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, 12, BattleScript_AllStatsUpRet + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk + jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk + jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_AllStatsUpRet BattleScript_AllStatsUpAtk:: - setbyte sSTAT_ANIM_PLAYED, 0 + setbyte sSTAT_ANIM_PLAYED, FALSE playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0 setstatchanger STAT_ATK, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpDef + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpDef printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_AllStatsUpDef:: setstatchanger STAT_DEF, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpSpeed + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpeed printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_AllStatsUpSpeed:: setstatchanger STAT_SPEED, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpSpAtk + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpAtk printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_AllStatsUpSpAtk:: setstatchanger STAT_SPATK, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpSpDef + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpDef printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_AllStatsUpSpDef:: setstatchanger STAT_SPDEF, 1, FALSE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_AllStatsUpRet + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpRet printfromtable gStatUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_AllStatsUpRet:: return @@ -3459,37 +3444,35 @@ BattleScript_RapidSpinAway:: BattleScript_WrapFree:: printstring STRINGID_PKMNGOTFREE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG copybyte gBattlerTarget, sBATTLER return BattleScript_LeechSeedFree:: printstring STRINGID_PKMNSHEDLEECHSEED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_SpikesFree:: printstring STRINGID_PKMNBLEWAWAYSPIKES - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_MonTookFutureAttack:: printstring STRINGID_PKMNTOOKATTACK - waitmessage 0x40 - jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_CheckDoomDesireMiss + waitmessage B_WAIT_TIME_LONG + jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_FUTURE_SIGHT, BattleScript_CheckDoomDesireMiss accuracycheck BattleScript_FutureAttackMiss, MOVE_FUTURE_SIGHT goto BattleScript_FutureAttackAnimate - BattleScript_CheckDoomDesireMiss:: accuracycheck BattleScript_FutureAttackMiss, MOVE_DOOM_DESIRE BattleScript_FutureAttackAnimate:: adjustnormaldamage2 - jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_FutureHitAnimDoomDesire - playanimation BS_ATTACKER, B_ANIM_FUTURE_SIGHT_HIT, NULL + jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_FUTURE_SIGHT, BattleScript_FutureHitAnimDoomDesire + playanimation BS_ATTACKER, B_ANIM_FUTURE_SIGHT_HIT goto BattleScript_DoFutureAttackHit - BattleScript_FutureHitAnimDoomDesire:: - playanimation BS_ATTACKER, B_ANIM_DOOM_DESIRE_HIT, NULL + playanimation BS_ATTACKER, B_ANIM_DOOM_DESIRE_HIT BattleScript_DoFutureAttackHit:: effectivenesssound hitanimation BS_TARGET @@ -3497,21 +3480,21 @@ BattleScript_DoFutureAttackHit:: healthbarupdate BS_TARGET datahpupdate BS_TARGET resultmessage - waitmessage 0x40 - tryfaintmon BS_TARGET, 0, NULL + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_TARGET checkteamslost BattleScript_FutureAttackEnd BattleScript_FutureAttackEnd:: - moveendcase 0 - moveendfromto 11, 14 + moveendcase MOVEEND_RAGE + moveendfromto MOVEEND_ITEM_EFFECTS_ALL, MOVEEND_UPDATE_LAST_MOVES setbyte gMoveResultFlags, 0 end2 BattleScript_FutureAttackMiss:: - pause 0x20 + pause B_WAIT_TIME_SHORT setbyte gMoveResultFlags, 0 orbyte gMoveResultFlags, MOVE_RESULT_FAILED resultmessage - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG setbyte gMoveResultFlags, 0 end2 @@ -3525,9 +3508,9 @@ BattleScript_SelectingMoveWithNoPP:: BattleScript_NoPPForMove:: attackstring - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_BUTNOPPLEFT - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_SelectingTormentedMove:: @@ -3535,7 +3518,7 @@ BattleScript_SelectingTormentedMove:: endselectionscript printstring STRINGID_PKMNCANTUSEMOVETORMENT - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_SelectingNotAllowedMoveTaunt:: @@ -3544,72 +3527,72 @@ BattleScript_SelectingNotAllowedMoveTaunt:: BattleScript_MoveUsedIsTaunted:: printstring STRINGID_PKMNCANTUSEMOVETAUNT - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_WishComesTrue:: trywish 1, BattleScript_WishButFullHp - playanimation BS_TARGET, B_ANIM_WISH_HEAL, NULL + playanimation BS_TARGET, B_ANIM_WISH_HEAL printstring STRINGID_PKMNWISHCAMETRUE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate BS_TARGET datahpupdate BS_TARGET printstring STRINGID_PKMNREGAINEDHEALTH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_WishButFullHp:: printstring STRINGID_PKMNWISHCAMETRUE - waitmessage 0x40 - pause 0x20 + waitmessage B_WAIT_TIME_LONG + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNHPFULL - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_IngrainTurnHeal:: - playanimation BS_ATTACKER, B_ANIM_INGRAIN_HEAL, NULL + playanimation BS_ATTACKER, B_ANIM_INGRAIN_HEAL printstring STRINGID_PKMNABSORBEDNUTRIENTS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER end2 BattleScript_PrintMonIsRooted:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNANCHOREDITSELF - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_AtkDefDown:: - setbyte sSTAT_ANIM_PLAYED, 0 - playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS | STAT_CHANGE_CANT_PREVENT - playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT + setbyte sSTAT_ANIM_PLAYED, FALSE + playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS + playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE setstatchanger STAT_ATK, 1, TRUE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_AtkDefDownAtkFail + statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefDownAtkFail jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_AtkDefDownAtkFail printfromtable gStatDownStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_AtkDefDownAtkFail:: playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT setstatchanger STAT_DEF, 1, TRUE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_AtkDefDownDefFail + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_AtkDefDownDefFail jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_AtkDefDownDefFail printfromtable gStatDownStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_AtkDefDownDefFail:: return BattleScript_KnockedOff:: - playanimation BS_TARGET, B_ANIM_ITEM_KNOCKOFF, NULL + playanimation BS_TARGET, B_ANIM_ITEM_KNOCKOFF printstring STRINGID_PKMNKNOCKEDOFF - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_MoveUsedIsImprisoned:: printstring STRINGID_PKMNCANTUSEMOVESEALED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_SelectingImprisonedMove:: @@ -3618,15 +3601,15 @@ BattleScript_SelectingImprisonedMove:: BattleScript_GrudgeTakesPp:: printstring STRINGID_PKMNLOSTPPGRUDGE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_MagicCoatBounce:: attackstring ppreduce - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNMOVEBOUNCED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_ALLOW_NO_PP setmagiccoattarget BS_ATTACKER return @@ -3635,131 +3618,131 @@ BattleScript_SnatchedMove:: attackstring ppreduce snatchsetbattlers - playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL + playanimation BS_TARGET, B_ANIM_SNATCH_MOVE printstring STRINGID_PKMNSNATCHEDMOVE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_ALLOW_NO_PP swapattackerwithtarget return BattleScript_EnduredMsg:: printstring STRINGID_PKMNENDUREDHIT - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_OneHitKOMsg:: printstring STRINGID_ONEHITKO - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_SAtkDown2:: setbyte sSTAT_ANIM_PLAYED, 0 playstatchangeanimation BS_ATTACKER, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_CANT_PREVENT setstatchanger STAT_SPATK, 2, TRUE - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_SAtkDown2End + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_SAtkDown2End jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 2, BattleScript_SAtkDown2End printfromtable gStatDownStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_SAtkDown2End:: return BattleScript_FocusPunchSetUp:: printstring STRINGID_EMPTYSTRING3 waitmessage 1 - playanimation BS_ATTACKER, B_ANIM_FOCUS_PUNCH_SETUP, NULL + playanimation BS_ATTACKER, B_ANIM_FOCUS_PUNCH_SETUP printstring STRINGID_PKMNTIGHTENINGFOCUS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_MoveUsedIsAsleep:: printstring STRINGID_PKMNFASTASLEEP - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG statusanimation BS_ATTACKER goto BattleScript_MoveEnd BattleScript_MoveUsedWokeUp:: bicword gHitMarker, HITMARKER_WAKE_UP_CLEAR printfromtable gWokeUpStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_ATTACKER return BattleScript_MonWokeUpInUproar:: printstring STRINGID_PKMNWOKEUPINUPROAR - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_ATTACKER end2 BattleScript_PoisonTurnDmg:: printstring STRINGID_PKMNHURTBYPOISON - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_DoStatusTurnDmg:: statusanimation BS_ATTACKER BattleScript_DoTurnDmg:: orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER - tryfaintmon BS_ATTACKER, 0, NULL + tryfaintmon BS_ATTACKER checkteamslost BattleScript_DoTurnDmgEnd BattleScript_DoTurnDmgEnd:: end2 BattleScript_BurnTurnDmg:: printstring STRINGID_PKMNHURTBYBURN - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_DoStatusTurnDmg BattleScript_MoveUsedIsFrozen:: printstring STRINGID_PKMNISFROZEN - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG statusanimation BS_ATTACKER goto BattleScript_MoveEnd BattleScript_MoveUsedUnfroze:: printfromtable gGotDefrostedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_ATTACKER return BattleScript_DefrostedViaFireMove:: printstring STRINGID_PKMNWASDEFROSTED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_TARGET return BattleScript_MoveUsedIsParalyzed:: printstring STRINGID_PKMNISPARALYZED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG statusanimation BS_ATTACKER cancelmultiturnmoves BS_ATTACKER goto BattleScript_MoveEnd BattleScript_MoveUsedFlinched:: printstring STRINGID_PKMNFLINCHED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_PrintUproarOverTurns:: printfromtable gUproarOverTurnStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_ThrashConfuses:: - chosenstatusanimation BS_ATTACKER, 1, STATUS2_CONFUSION + chosenstatus2animation BS_ATTACKER, STATUS2_CONFUSION printstring STRINGID_PKMNFATIGUECONFUSION - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_MoveUsedIsConfused:: printstring STRINGID_PKMNISCONFUSED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG status2animation BS_ATTACKER, STATUS2_CONFUSION - jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0, BattleScript_MoveUsedIsConfusedRet + jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, FALSE, BattleScript_MoveUsedIsConfusedRet BattleScript_DoSelfConfusionDmg:: cancelmultiturnmoves BS_ATTACKER adjustnormaldamage2 printstring STRINGID_ITHURTCONFUSION - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG effectivenesssound hitanimation BS_ATTACKER waitstate @@ -3767,88 +3750,87 @@ BattleScript_DoSelfConfusionDmg:: healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER resultmessage - waitmessage 0x40 - tryfaintmon BS_ATTACKER, 0, NULL + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_ATTACKER goto BattleScript_MoveEnd - BattleScript_MoveUsedIsConfusedRet:: return BattleScript_MoveUsedIsConfusedNoMore:: printstring STRINGID_PKMNHEALEDCONFUSION - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_PrintPayDayMoneyString:: - printstring STRINGID_PKMNPICKEDUPITEM - waitmessage 0x40 + printstring STRINGID_PLAYERPICKEDUPMONEY + waitmessage B_WAIT_TIME_LONG return BattleScript_WrapTurnDmg:: playanimation BS_ATTACKER, B_ANIM_TURN_TRAP, sB_ANIM_ARG1 printstring STRINGID_PKMNHURTBY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_DoTurnDmg BattleScript_WrapEnds:: printstring STRINGID_PKMNFREEDFROM - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_MoveUsedIsInLove:: printstring STRINGID_PKMNINLOVE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG status2animation BS_ATTACKER, STATUS2_INFATUATION return BattleScript_MoveUsedIsInLoveCantAttack:: printstring STRINGID_PKMNIMMOBILIZEDBYLOVE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_NightmareTurnDmg:: printstring STRINGID_PKMNLOCKEDINNIGHTMARE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG status2animation BS_ATTACKER, STATUS2_NIGHTMARE goto BattleScript_DoTurnDmg BattleScript_CurseTurnDmg:: printstring STRINGID_PKMNAFFLICTEDBYCURSE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG status2animation BS_ATTACKER, STATUS2_CURSED goto BattleScript_DoTurnDmg BattleScript_TargetPRLZHeal:: printstring STRINGID_PKMNHEALEDPARALYSIS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_TARGET return BattleScript_TooScaredToMove:: printstring STRINGID_MONTOOSCAREDTOMOVE - waitmessage 0x40 - playanimation BS_ATTACKER, B_ANIM_MON_SCARED, NULL + waitmessage B_WAIT_TIME_LONG + playanimation BS_ATTACKER, B_ANIM_MON_SCARED goto BattleScript_MoveEnd BattleScript_GhostGetOutGetOut:: printstring STRINGID_GHOSTGETOUTGETOUT - playanimation BS_ATTACKER, B_ANIM_GHOST_GET_OUT, NULL + playanimation BS_ATTACKER, B_ANIM_GHOST_GET_OUT goto BattleScript_MoveEnd BattleScript_SilphScopeUnveiled:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_SILPHSCOPEUNVEILED waitstate - playanimation BS_OPPONENT1, B_ANIM_SILPH_SCOPED, NULL - pause 0x20 + playanimation BS_OPPONENT1, B_ANIM_SILPH_SCOPED + pause B_WAIT_TIME_SHORT printstring STRINGID_GHOSTWASMAROWAK - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end2 BattleScript_MoveEffectSleep:: statusanimation BS_EFFECT_BATTLER printfromtable gFellAsleepStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_UpdateEffectStatusIconRet:: updatestatusicon BS_EFFECT_BATTLER waitstate @@ -3857,7 +3839,7 @@ BattleScript_UpdateEffectStatusIconRet:: BattleScript_YawnMakesAsleep:: statusanimation BS_EFFECT_BATTLER printstring STRINGID_PKMNFELLASLEEP - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_EFFECT_BATTLER waitstate makevisible BS_EFFECT_BATTLER @@ -3866,52 +3848,52 @@ BattleScript_YawnMakesAsleep:: BattleScript_MoveEffectPoison:: statusanimation BS_EFFECT_BATTLER printfromtable gGotPoisonedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_UpdateEffectStatusIconRet BattleScript_MoveEffectBurn:: statusanimation BS_EFFECT_BATTLER printfromtable gGotBurnedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_UpdateEffectStatusIconRet BattleScript_MoveEffectFreeze:: statusanimation BS_EFFECT_BATTLER printfromtable gGotFrozenStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_UpdateEffectStatusIconRet BattleScript_MoveEffectParalysis:: statusanimation BS_EFFECT_BATTLER printfromtable gGotParalyzedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_UpdateEffectStatusIconRet BattleScript_MoveEffectUproar:: printstring STRINGID_PKMNCAUSEDUPROAR - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_MoveEffectToxic:: statusanimation BS_EFFECT_BATTLER printstring STRINGID_PKMNBADLYPOISONED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_UpdateEffectStatusIconRet BattleScript_MoveEffectPayDay:: printstring STRINGID_COINSSCATTERED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_MoveEffectWrap:: printfromtable gWrappedStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_MoveEffectConfusion:: - chosenstatusanimation BS_EFFECT_BATTLER, 1, STATUS2_CONFUSION + chosenstatus2animation BS_EFFECT_BATTLER, STATUS2_CONFUSION printstring STRINGID_PKMNWASCONFUSED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_MoveEffectRecoil:: @@ -3922,60 +3904,60 @@ BattleScript_DoRecoil:: healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER printstring STRINGID_PKMNHITWITHRECOIL - waitmessage 0x40 - tryfaintmon BS_ATTACKER, 0, NULL + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_ATTACKER BattleScript_RecoilEnd:: return BattleScript_ItemSteal:: - playanimation BS_TARGET, B_ANIM_ITEM_STEAL, NULL + playanimation BS_TARGET, B_ANIM_ITEM_STEAL printstring STRINGID_PKMNSTOLEITEM - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_DrizzleActivates:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNMADEITRAIN waitstate - playanimation BS_BATTLER_0, B_ANIM_RAIN_CONTINUES, NULL - call BattleScript_HandleWeatherFormChanges + playanimation BS_BATTLER_0, B_ANIM_RAIN_CONTINUES + call BattleScript_WeatherFormChanges end3 BattleScript_SpeedBoostActivates:: playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 printstring STRINGID_PKMNRAISEDSPEED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end3 BattleScript_TraceActivates:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNTRACED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG end3 BattleScript_RainDishActivates:: printstring STRINGID_PKMNSXRESTOREDHPALITTLE2 - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER end3 BattleScript_SandstreamActivates:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM waitstate - playanimation BS_BATTLER_0, B_ANIM_SANDSTORM_CONTINUES, NULL - call BattleScript_HandleWeatherFormChanges + playanimation BS_BATTLER_0, B_ANIM_SANDSTORM_CONTINUES + call BattleScript_WeatherFormChanges end3 BattleScript_ShedSkinActivates:: printstring STRINGID_PKMNSXCUREDYPROBLEM - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_ATTACKER end3 -BattleScript_HandleWeatherFormChanges:: +BattleScript_WeatherFormChanges:: setbyte sBATTLER, 0 BattleScript_WeatherFormChangesLoop:: trycastformdatachange @@ -3991,7 +3973,7 @@ BattleScript_DoCastformChangeAnim:: docastformchangeanimation waitstate printstring STRINGID_PKMNTRANSFORMED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_IntimidateActivatesEnd3:: @@ -3999,7 +3981,7 @@ BattleScript_IntimidateActivatesEnd3:: end3 BattleScript_DoIntimidateActivationAnim:: - pause 0x20 + pause B_WAIT_TIME_SHORT BattleScript_IntimidateActivates:: setbyte gBattlerTarget, 0 setstatchanger STAT_ATK, 1, TRUE @@ -4014,7 +3996,7 @@ BattleScript_IntimidateActivationAnimLoop:: setgraphicalstatchangevalues playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1 printstring STRINGID_PKMNCUTSATTACKWITH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG BattleScript_IntimidateFail:: addbyte gBattlerTarget, 1 goto BattleScript_IntimidateActivationAnimLoop @@ -4023,49 +4005,49 @@ BattleScript_IntimidateEnd:: return BattleScript_IntimidateAbilityFail:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PREVENTEDFROMWORKING - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_IntimidateFail BattleScript_DroughtActivates:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNSXINTENSIFIEDSUN waitstate - playanimation BS_BATTLER_0, B_ANIM_SUN_CONTINUES, NULL - call BattleScript_HandleWeatherFormChanges + playanimation BS_BATTLER_0, B_ANIM_SUN_CONTINUES + call BattleScript_WeatherFormChanges end3 BattleScript_TookAttack:: attackstring - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNSXTOOKATTACK - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED return BattleScript_SturdyPreventsOHKO:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNPROTECTEDBY - pause 0x40 + pause B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_DampStopsExplosion:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNPREVENTSUSAGE - pause 0x40 + pause B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_MoveHPDrain_PPLoss:: ppreduce BattleScript_MoveHPDrain:: attackstring - pause 0x20 + pause B_WAIT_TIME_SHORT orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate BS_TARGET datahpupdate BS_TARGET printstring STRINGID_PKMNRESTOREDHPUSING - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE goto BattleScript_MoveEnd @@ -4073,9 +4055,9 @@ BattleScript_MonMadeMoveUseless_PPLoss:: ppreduce BattleScript_MonMadeMoveUseless:: attackstring - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNSXMADEYUSELESS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE goto BattleScript_MoveEnd @@ -4083,83 +4065,83 @@ BattleScript_FlashFireBoost_PPLoss:: ppreduce BattleScript_FlashFireBoost:: attackstring - pause 0x20 + pause B_WAIT_TIME_SHORT printfromtable gFlashFireStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_AbilityPreventsPhasingOut:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNANCHORSITSELFWITH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_AbilityNoStatLoss:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNPREVENTSSTATLOSSWITH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_BRNPrevention:: - pause 0x20 + pause B_WAIT_TIME_SHORT printfromtable gBRNPreventionStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_PRLZPrevention:: - pause 0x20 + pause B_WAIT_TIME_SHORT printfromtable gPRLZPreventionStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_PSNPrevention:: - pause 0x20 + pause B_WAIT_TIME_SHORT printfromtable gPSNPreventionStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_ObliviousPreventsAttraction:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNPREVENTSROMANCEWITH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_FlinchPrevention:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNSXPREVENTSFLINCHING - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_OwnTempoPrevents:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNPREVENTSCONFUSIONWITH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_SoundproofProtected:: attackstring ppreduce - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNSXBLOCKSY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_AbilityNoSpecificStatLoss:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNSXPREVENTSYLOSS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG setbyte cMULTISTRING_CHOOSER, 3 return BattleScript_StickyHoldActivates:: - pause 0x20 + pause B_WAIT_TIME_SHORT printstring STRINGID_PKMNSXMADEYINEFFECTIVE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_MoveEnd BattleScript_ColorChangeActivates:: printstring STRINGID_PKMNCHANGEDTYPEWITH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_RoughSkinActivates:: @@ -4167,14 +4149,14 @@ BattleScript_RoughSkinActivates:: healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER printstring STRINGID_PKMNHURTSWITH - waitmessage 0x40 - tryfaintmon BS_ATTACKER, 0, NULL + waitmessage B_WAIT_TIME_LONG + tryfaintmon BS_ATTACKER return BattleScript_CuteCharmActivates:: status2animation BS_ATTACKER, STATUS2_INFATUATION printstring STRINGID_PKMNSXINFATUATEDY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_ApplySecondaryEffect:: @@ -4189,41 +4171,41 @@ BattleScript_SynchronizeActivates:: BattleScript_AbilityCuredStatus:: printstring STRINGID_PKMNSXCUREDITSYPROBLEM - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_SCRIPTING return BattleScript_IgnoresWhileAsleep:: printstring STRINGID_PKMNIGNORESASLEEP - waitmessage 0x40 - moveendto 16 + waitmessage B_WAIT_TIME_LONG + moveendto MOVEEND_NEXT_TARGET end BattleScript_IgnoresAndUsesRandomMove:: printstring STRINGID_PKMNIGNOREDORDERS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG jumptocalledmove 0 BattleScript_MoveUsedLoafingAround:: printfromtable gInobedientStringIds - waitmessage 0x40 - moveendto 16 + waitmessage B_WAIT_TIME_LONG + moveendto MOVEEND_NEXT_TARGET end BattleScript_IgnoresAndFallsAsleep:: printstring STRINGID_PKMNBEGANTONAP - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG setmoveeffect MOVE_EFFECT_SLEEP | MOVE_EFFECT_AFFECTS_USER seteffectprimary - moveendto 16 + moveendto MOVEEND_NEXT_TARGET end BattleScript_IgnoresAndHitsItself:: printstring STRINGID_PKMNWONTOBEY - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG goto BattleScript_DoSelfConfusionDmg BattleScript_SubstituteFade:: - playanimation BS_TARGET, B_ANIM_SUBSTITUTE_FADE, NULL + playanimation BS_TARGET, B_ANIM_SUBSTITUTE_FADE printstring STRINGID_PKMNSUBSTITUTEFADED return @@ -4232,9 +4214,9 @@ BattleScript_BerryCurePrlzEnd2:: end2 BattleScript_BerryCureParRet:: - playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMCUREDPARALYSIS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_SCRIPTING removeitem BS_SCRIPTING return @@ -4244,9 +4226,9 @@ BattleScript_BerryCurePsnEnd2:: end2 BattleScript_BerryCurePsnRet:: - playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMCUREDPOISON - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_SCRIPTING removeitem BS_SCRIPTING return @@ -4256,9 +4238,9 @@ BattleScript_BerryCureBrnEnd2:: end2 BattleScript_BerryCureBrnRet:: - playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMHEALEDBURN - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_SCRIPTING removeitem BS_SCRIPTING return @@ -4268,9 +4250,9 @@ BattleScript_BerryCureFrzEnd2:: end2 BattleScript_BerryCureFrzRet:: - playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMDEFROSTEDIT - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_SCRIPTING removeitem BS_SCRIPTING return @@ -4280,9 +4262,9 @@ BattleScript_BerryCureSlpEnd2:: end2 BattleScript_BerryCureSlpRet:: - playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMWOKEIT - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_SCRIPTING removeitem BS_SCRIPTING return @@ -4292,9 +4274,9 @@ BattleScript_BerryCureConfusionEnd2:: end2 BattleScript_BerryCureConfusionRet:: - playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMSNAPPEDOUT - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG removeitem BS_SCRIPTING return @@ -4303,9 +4285,9 @@ BattleScript_BerryCureChosenStatusEnd2:: end2 BattleScript_BerryCureChosenStatusRet:: - playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT printfromtable gBerryEffectStringIds - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_SCRIPTING removeitem BS_SCRIPTING return @@ -4315,16 +4297,16 @@ BattleScript_WhiteHerbEnd2:: end2 BattleScript_WhiteHerbRet:: - playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMRESTOREDSTATUS - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG removeitem BS_SCRIPTING return BattleScript_ItemHealHP_RemoveItem:: - playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMRESTOREDHEALTH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER @@ -4332,9 +4314,9 @@ BattleScript_ItemHealHP_RemoveItem:: end2 BattleScript_BerryPPHealEnd2:: - playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMRESTOREDPP - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG removeitem BS_ATTACKER end2 @@ -4343,9 +4325,9 @@ BattleScript_ItemHealHP_End2:: end2 BattleScript_ItemHealHP_Ret:: - playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMRESTOREDHPALITTLE - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER @@ -4356,38 +4338,38 @@ BattleScript_SelectingNotAllowedMoveChoiceItem:: endselectionscript BattleScript_FocusBandActivates:: - playanimation BS_TARGET, B_ANIM_HANGED_ON, NULL + playanimation BS_TARGET, B_ANIM_FOCUS_BAND printstring STRINGID_PKMNHUNGONWITHX - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG return BattleScript_BerryConfuseHealEnd2:: - playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNSITEMRESTOREDHEALTH - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER printstring STRINGID_FORXCOMMAYZ - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER seteffectprimary removeitem BS_ATTACKER end2 BattleScript_BerryStatRaiseEnd2:: - playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL - statbuffchange STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_AFFECTS_USER, BattleScript_BerryStatRaiseDoStatUp + playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT + statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BerryStatRaiseDoStatUp BattleScript_BerryStatRaiseDoStatUp:: - setbyte cMULTISTRING_CHOOSER, 4 + setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_ITEM call BattleScript_StatUp removeitem BS_ATTACKER end2 BattleScript_BerryFocusEnergyEnd2:: - playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL + playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT printstring STRINGID_PKMNUSEDXTOGETPUMPED - waitmessage 0x40 + waitmessage B_WAIT_TIME_LONG removeitem BS_ATTACKER end2 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 3794f2f7a..7a69b2320 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -87,7 +87,7 @@ BattleScript_CaughtPokemonSkipNewDex:: trygivecaughtmonnick BattleScript_CaughtPokemonSkipNickname givecaughtmon printfromtable gCaughtMonStringIds - waitmessage 64 + waitmessage B_WAIT_TIME_LONG goto BattleScript_CaughtPokemonDone BattleScript_CaughtPokemonSkipNickname:: @@ -104,27 +104,27 @@ BattleScript_OldMan_Pokedude_CaughtMessage:: BattleScript_ShakeBallThrow:: printfromtable gBallEscapeStringIds - waitmessage 64 + waitmessage B_WAIT_TIME_LONG jumpifnotbattletype BATTLE_TYPE_SAFARI, BattleScript_CatchFailEnd jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0, BattleScript_CatchFailEnd printstring STRINGID_OUTOFSAFARIBALLS - waitmessage 64 + waitmessage B_WAIT_TIME_LONG setbyte gBattleOutcome, B_OUTCOME_NO_SAFARI_BALLS BattleScript_CatchFailEnd:: finishaction BattleScript_TrainerBallBlock:: - waitmessage 64 + waitmessage B_WAIT_TIME_LONG printstring STRINGID_TRAINERBLOCKEDBALL - waitmessage 64 + waitmessage B_WAIT_TIME_LONG printstring STRINGID_DONTBEATHIEF - waitmessage 64 + waitmessage B_WAIT_TIME_LONG finishaction BattleScript_GhostBallDodge:: - waitmessage 64 + waitmessage B_WAIT_TIME_LONG printstring STRINGID_ITDODGEDBALL - waitmessage 64 + waitmessage B_WAIT_TIME_LONG finishaction BattleScript_PlayerUseItem:: @@ -133,54 +133,54 @@ BattleScript_PlayerUseItem:: BattleScript_AIUseFullRestoreOrHpHeal:: printstring STRINGID_EMPTYSTRING3 - pause 48 + pause B_WAIT_TIME_MED playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM - waitmessage 64 + waitmessage B_WAIT_TIME_LONG useitemonopponent orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate BS_ATTACKER datahpupdate BS_ATTACKER printstring STRINGID_PKMNSITEMRESTOREDHEALTH - waitmessage 64 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_ATTACKER moveendcase 15 finishaction BattleScript_AIUseStatRestore:: printstring STRINGID_EMPTYSTRING3 - pause 48 + pause B_WAIT_TIME_MED playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM - waitmessage 64 + waitmessage B_WAIT_TIME_LONG useitemonopponent printfromtable gTrainerItemCuredStatusStringIds - waitmessage 64 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_ATTACKER moveendcase 15 finishaction BattleScript_AIUseXstat:: printstring STRINGID_EMPTYSTRING3 - pause 48 + pause B_WAIT_TIME_MED playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM - waitmessage 64 + waitmessage B_WAIT_TIME_LONG useitemonopponent printfromtable gStatUpStringIds - waitmessage 64 + waitmessage B_WAIT_TIME_LONG moveendcase 15 finishaction BattleScript_AIUseGuardSpec:: printstring STRINGID_EMPTYSTRING3 - pause 48 + pause B_WAIT_TIME_MED playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM - waitmessage 64 + waitmessage B_WAIT_TIME_LONG useitemonopponent printfromtable gMistUsedStringIds - waitmessage 64 + waitmessage B_WAIT_TIME_LONG moveendcase 15 finishaction @@ -193,16 +193,16 @@ BattleScript_UsePokeFlute:: checkpokeflute BS_ATTACKER jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 1, BattleScript_PokeFluteWakeUp printstring STRINGID_POKEFLUTECATCHY - waitmessage 64 + waitmessage B_WAIT_TIME_LONG goto BattleScript_PokeFluteEnd BattleScript_PokeFluteWakeUp:: printstring STRINGID_POKEFLUTE - waitmessage 64 + waitmessage B_WAIT_TIME_LONG fanfare MUS_POKE_FLUTE waitfanfare BS_ATTACKER printstring STRINGID_MONHEARINGFLUTEAWOKE - waitmessage 64 + waitmessage B_WAIT_TIME_LONG updatestatusicon BS_PLAYER2 waitstate BattleScript_PokeFluteEnd:: @@ -210,29 +210,29 @@ BattleScript_PokeFluteEnd:: BattleScript_WatchesCarefully:: printfromtable gSafariPokeblockResultStringIds - waitmessage 64 - playanimation BS_OPPONENT1, B_ANIM_SAFARI_REACTION, NULL + waitmessage B_WAIT_TIME_LONG + playanimation BS_OPPONENT1, B_ANIM_SAFARI_REACTION end2 BattleScript_ThrowRock:: printstring STRINGID_THREWROCK - waitmessage 64 - playanimation BS_ATTACKER, B_ANIM_ROCK_THROW, NULL + waitmessage B_WAIT_TIME_LONG + playanimation BS_ATTACKER, B_ANIM_ROCK_THROW end2 BattleScript_ThrowBait:: printstring STRINGID_THREWBAIT - waitmessage 64 - playanimation BS_ATTACKER, B_ANIM_BAIT_THROW, NULL + waitmessage B_WAIT_TIME_LONG + playanimation BS_ATTACKER, B_ANIM_BAIT_THROW end2 BattleScript_LeftoverWallyPrepToThrow:: printstring STRINGID_RETURNMON - waitmessage 64 + waitmessage B_WAIT_TIME_LONG returnatktoball waitstate trainerslidein BS_TARGET waitstate printstring STRINGID_YOUTHROWABALLNOWRIGHT - waitmessage 64 + waitmessage B_WAIT_TIME_LONG end2 diff --git a/include/battle_string_ids.h b/include/battle_string_ids.h index 76b0194fe..69086a626 100644 --- a/include/battle_string_ids.h +++ b/include/battle_string_ids.h @@ -121,7 +121,7 @@ #define STRINGID_PKMNSTORINGENERGY 120 #define STRINGID_PKMNUNLEASHEDENERGY 121 #define STRINGID_PKMNFATIGUECONFUSION 122 -#define STRINGID_PKMNPICKEDUPITEM 123 +#define STRINGID_PLAYERPICKEDUPMONEY 123 #define STRINGID_PKMNUNAFFECTED 124 #define STRINGID_PKMNTRANSFORMEDINTO 125 #define STRINGID_PKMNMADESUBSTITUTE 126 diff --git a/include/constants/battle.h b/include/constants/battle.h index 822675837..0b4c372a2 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -305,6 +305,10 @@ #define BATTLE_TERRAIN_LANCE 18 #define BATTLE_TERRAIN_CHAMPION 19 +#define B_WAIT_TIME_LONG 64 +#define B_WAIT_TIME_MED 48 +#define B_WAIT_TIME_SHORT 32 + #define CASTFORM_NORMAL 0 #define CASTFORM_FIRE 1 #define CASTFORM_WATER 2 diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index f8972ce31..1e946dd1a 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -354,9 +354,9 @@ #define B_ANIM_BAIT_THROW 0x4 #define B_ANIM_ITEM_KNOCKOFF 0x5 #define B_ANIM_TURN_TRAP 0x6 -#define B_ANIM_ITEM_EFFECT 0x7 +#define B_ANIM_HELD_ITEM_EFFECT 0x7 #define B_ANIM_SMOKEBALL_ESCAPE 0x8 -#define B_ANIM_HANGED_ON 0x9 +#define B_ANIM_FOCUS_BAND 0x9 #define B_ANIM_RAIN_CONTINUES 0xA #define B_ANIM_SUN_CONTINUES 0xB #define B_ANIM_SANDSTORM_CONTINUES 0xC diff --git a/src/battle_message.c b/src/battle_message.c index 436136069..12369f063 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -514,380 +514,380 @@ const u8 gText_WinEarnsPrizeMoney[] = _("OAK: Hm! Excellent!\pIf you win, you ea const u8 gText_HowDissapointing[] = _("OAK: Hm…\nHow disappointing…\pIf you win, you earn prize money,\nand your POKéMON grow.\pBut if you lose, {B_PLAYER_NAME}, you end\nup paying prize money…\pHowever, since you had no warning\nthis time, I'll pay for you.\pBut things won't be this way once\nyou step outside these doors.\pThat's why you must strengthen your\nPOKéMON by battling wild POKéMON.\p"); const u8 *const gBattleStringsTable[] = { - [STRINGID_TRAINER1LOSETEXT - 12] = sText_Trainer1LoseText, - [STRINGID_PKMNGAINEDEXP - 12] = sText_PkmnGainedEXP, - [STRINGID_PKMNGREWTOLV - 12] = sText_PkmnGrewToLv, - [STRINGID_PKMNLEARNEDMOVE - 12] = sText_PkmnLearnedMove, - [STRINGID_TRYTOLEARNMOVE1 - 12] = sText_TryToLearnMove1, - [STRINGID_TRYTOLEARNMOVE2 - 12] = sText_TryToLearnMove2, - [STRINGID_TRYTOLEARNMOVE3 - 12] = sText_TryToLearnMove3, - [STRINGID_PKMNFORGOTMOVE - 12] = sText_PkmnForgotMove, - [STRINGID_STOPLEARNINGMOVE - 12] = sText_StopLearningMove, - [STRINGID_DIDNOTLEARNMOVE - 12] = sText_DidNotLearnMove, - [STRINGID_PKMNLEARNEDMOVE2 - 12] = sText_PkmnLearnedMove2, - [STRINGID_ATTACKMISSED - 12] = sText_AttackMissed, - [STRINGID_PKMNPROTECTEDITSELF - 12] = sText_PkmnProtectedItself, - [STRINGID_STATSWONTINCREASE2 - 12] = sText_StatsWontIncrease2, - [STRINGID_AVOIDEDDAMAGE - 12] = sText_AvoidedDamage, - [STRINGID_ITDOESNTAFFECT - 12] = sText_ItDoesntAffect, - [STRINGID_ATTACKERFAINTED - 12] = sText_AttackerFainted, - [STRINGID_TARGETFAINTED - 12] = sText_TargetFainted, - [STRINGID_PLAYERGOTMONEY - 12] = sText_PlayerGotMoney, - [STRINGID_PLAYERWHITEOUT - 12] = sText_PlayerWhiteout, - [STRINGID_PLAYERWHITEOUT2 - 12] = sText_PlayerPanicked, - [STRINGID_PREVENTSESCAPE - 12] = sText_PreventsEscape, - [STRINGID_HITXTIMES - 12] = sText_HitXTimes, - [STRINGID_PKMNFELLASLEEP - 12] = sText_PkmnFellAsleep, - [STRINGID_PKMNMADESLEEP - 12] = sText_PkmnMadeSleep, - [STRINGID_PKMNALREADYASLEEP - 12] = sText_PkmnAlreadyAsleep, - [STRINGID_PKMNALREADYASLEEP2 - 12] = sText_PkmnAlreadyAsleep2, - [STRINGID_PKMNWASNTAFFECTED - 12] = sText_PkmnWasntAffected, - [STRINGID_PKMNWASPOISONED - 12] = sText_PkmnWasPoisoned, - [STRINGID_PKMNPOISONEDBY - 12] = sText_PkmnPoisonedBy, - [STRINGID_PKMNHURTBYPOISON - 12] = sText_PkmnHurtByPoison, - [STRINGID_PKMNALREADYPOISONED - 12] = sText_PkmnAlreadyPoisoned, - [STRINGID_PKMNBADLYPOISONED - 12] = sText_PkmnBadlyPoisoned, - [STRINGID_PKMNENERGYDRAINED - 12] = sText_PkmnEnergyDrained, - [STRINGID_PKMNWASBURNED - 12] = sText_PkmnWasBurned, - [STRINGID_PKMNBURNEDBY - 12] = sText_PkmnBurnedBy, - [STRINGID_PKMNHURTBYBURN - 12] = sText_PkmnHurtByBurn, - [STRINGID_PKMNWASFROZEN - 12] = sText_PkmnWasFrozen, - [STRINGID_PKMNFROZENBY - 12] = sText_PkmnFrozenBy, - [STRINGID_PKMNISFROZEN - 12] = sText_PkmnIsFrozen, - [STRINGID_PKMNWASDEFROSTED - 12] = sText_PkmnWasDefrosted, - [STRINGID_PKMNWASDEFROSTED2 - 12] = sText_PkmnWasDefrosted2, - [STRINGID_PKMNWASDEFROSTEDBY - 12] = sText_PkmnWasDefrostedBy, - [STRINGID_PKMNWASPARALYZED - 12] = sText_PkmnWasParalyzed, - [STRINGID_PKMNWASPARALYZEDBY - 12] = sText_PkmnWasParalyzedBy, - [STRINGID_PKMNISPARALYZED - 12] = sText_PkmnIsParalyzed, - [STRINGID_PKMNISALREADYPARALYZED - 12] = sText_PkmnIsAlreadyParalyzed, - [STRINGID_PKMNHEALEDPARALYSIS - 12] = sText_PkmnHealedParalysis, - [STRINGID_PKMNDREAMEATEN - 12] = sText_PkmnDreamEaten, - [STRINGID_STATSWONTINCREASE - 12] = sText_StatsWontIncrease, - [STRINGID_STATSWONTDECREASE - 12] = sText_StatsWontDecrease, - [STRINGID_TEAMSTOPPEDWORKING - 12] = sText_TeamStoppedWorking, - [STRINGID_FOESTOPPEDWORKING - 12] = sText_FoeStoppedWorking, - [STRINGID_PKMNISCONFUSED - 12] = sText_PkmnIsConfused, - [STRINGID_PKMNHEALEDCONFUSION - 12] = sText_PkmnHealedConfusion, - [STRINGID_PKMNWASCONFUSED - 12] = sText_PkmnWasConfused, - [STRINGID_PKMNALREADYCONFUSED - 12] = sText_PkmnAlreadyConfused, - [STRINGID_PKMNFELLINLOVE - 12] = sText_PkmnFellInLove, - [STRINGID_PKMNINLOVE - 12] = sText_PkmnInLove, - [STRINGID_PKMNIMMOBILIZEDBYLOVE - 12] = sText_PkmnImmobilizedByLove, - [STRINGID_PKMNBLOWNAWAY - 12] = sText_PkmnBlownAway, - [STRINGID_PKMNCHANGEDTYPE - 12] = sText_PkmnChangedType, - [STRINGID_PKMNFLINCHED - 12] = sText_PkmnFlinched, - [STRINGID_PKMNREGAINEDHEALTH - 12] = sText_PkmnRegainedHealth, - [STRINGID_PKMNHPFULL - 12] = sText_PkmnHPFull, - [STRINGID_PKMNRAISEDSPDEF - 12] = sText_PkmnRaisedSpDef, - [STRINGID_PKMNRAISEDDEF - 12] = sText_PkmnRaisedDef, - [STRINGID_PKMNCOVEREDBYVEIL - 12] = sText_PkmnCoveredByVeil, - [STRINGID_PKMNUSEDSAFEGUARD - 12] = sText_PkmnUsedSafeguard, - [STRINGID_PKMNSAFEGUARDEXPIRED - 12] = sText_PkmnSafeguardExpired, - [STRINGID_PKMNWENTTOSLEEP - 12] = sText_PkmnWentToSleep, - [STRINGID_PKMNSLEPTHEALTHY - 12] = sText_PkmnSleptHealthy, - [STRINGID_PKMNWHIPPEDWHIRLWIND - 12] = sText_PkmnWhippedWhirlwind, - [STRINGID_PKMNTOOKSUNLIGHT - 12] = sText_PkmnTookSunlight, - [STRINGID_PKMNLOWEREDHEAD - 12] = sText_PkmnLoweredHead, - [STRINGID_PKMNISGLOWING - 12] = sText_PkmnIsGlowing, - [STRINGID_PKMNFLEWHIGH - 12] = sText_PkmnFlewHigh, - [STRINGID_PKMNDUGHOLE - 12] = sText_PkmnDugHole, - [STRINGID_PKMNSQUEEZEDBYBIND - 12] = sText_PkmnSqueezedByBind, - [STRINGID_PKMNTRAPPEDINVORTEX - 12] = sText_PkmnTrappedInVortex, - [STRINGID_PKMNWRAPPEDBY - 12] = sText_PkmnWrappedBy, - [STRINGID_PKMNCLAMPED - 12] = sText_PkmnClamped, - [STRINGID_PKMNHURTBY - 12] = sText_PkmnHurtBy, - [STRINGID_PKMNFREEDFROM - 12] = sText_PkmnFreedFrom, - [STRINGID_PKMNCRASHED - 12] = sText_PkmnCrashed, - [STRINGID_PKMNSHROUDEDINMIST - 12] = gBattleText_MistShroud, - [STRINGID_PKMNPROTECTEDBYMIST - 12] = sText_PkmnProtectedByMist, - [STRINGID_PKMNGETTINGPUMPED - 12] = gBattleText_GetPumped, - [STRINGID_PKMNHITWITHRECOIL - 12] = sText_PkmnHitWithRecoil, - [STRINGID_PKMNPROTECTEDITSELF2 - 12] = sText_PkmnProtectedItself2, - [STRINGID_PKMNBUFFETEDBYSANDSTORM - 12] = sText_PkmnBuffetedBySandstorm, - [STRINGID_PKMNPELTEDBYHAIL - 12] = sText_PkmnPeltedByHail, - [STRINGID_PKMNSEEDED - 12] = sText_PkmnSeeded, - [STRINGID_PKMNEVADEDATTACK - 12] = sText_PkmnEvadedAttack, - [STRINGID_PKMNSAPPEDBYLEECHSEED - 12] = sText_PkmnSappedByLeechSeed, - [STRINGID_PKMNFASTASLEEP - 12] = sText_PkmnFastAsleep, - [STRINGID_PKMNWOKEUP - 12] = sText_PkmnWokeUp, - [STRINGID_PKMNUPROARKEPTAWAKE - 12] = sText_PkmnUproarKeptAwake, - [STRINGID_PKMNWOKEUPINUPROAR - 12] = sText_PkmnWokeUpInUproar, - [STRINGID_PKMNCAUSEDUPROAR - 12] = sText_PkmnCausedUproar, - [STRINGID_PKMNMAKINGUPROAR - 12] = sText_PkmnMakingUproar, - [STRINGID_PKMNCALMEDDOWN - 12] = sText_PkmnCalmedDown, - [STRINGID_PKMNCANTSLEEPINUPROAR - 12] = sText_PkmnCantSleepInUproar, - [STRINGID_PKMNSTOCKPILED - 12] = sText_PkmnStockpiled, - [STRINGID_PKMNCANTSTOCKPILE - 12] = sText_PkmnCantStockpile, - [STRINGID_PKMNCANTSLEEPINUPROAR2 - 12] = sText_PkmnCantSleepInUproar2, - [STRINGID_UPROARKEPTPKMNAWAKE - 12] = sText_UproarKeptPkmnAwake, - [STRINGID_PKMNSTAYEDAWAKEUSING - 12] = sText_PkmnStayedAwakeUsing, - [STRINGID_PKMNSTORINGENERGY - 12] = sText_PkmnStoringEnergy, - [STRINGID_PKMNUNLEASHEDENERGY - 12] = sText_PkmnUnleashedEnergy, - [STRINGID_PKMNFATIGUECONFUSION - 12] = sText_PkmnFatigueConfusion, - [STRINGID_PKMNPICKEDUPITEM - 12] = sText_PkmnPickedUpItem, - [STRINGID_PKMNUNAFFECTED - 12] = sText_PkmnUnaffected, - [STRINGID_PKMNTRANSFORMEDINTO - 12] = sText_PkmnTransformedInto, - [STRINGID_PKMNMADESUBSTITUTE - 12] = sText_PkmnMadeSubstitute, - [STRINGID_PKMNHASSUBSTITUTE - 12] = sText_PkmnHasSubstitute, - [STRINGID_SUBSTITUTEDAMAGED - 12] = sText_SubstituteDamaged, - [STRINGID_PKMNSUBSTITUTEFADED - 12] = sText_PkmnSubstituteFaded, - [STRINGID_PKMNMUSTRECHARGE - 12] = sText_PkmnMustRecharge, - [STRINGID_PKMNRAGEBUILDING - 12] = sText_PkmnRageBuilding, - [STRINGID_PKMNMOVEWASDISABLED - 12] = sText_PkmnMoveWasDisabled, - [STRINGID_PKMNMOVEISDISABLED - 12] = sText_PkmnMoveIsDisabled, - [STRINGID_PKMNMOVEDISABLEDNOMORE - 12] = sText_PkmnMoveDisabledNoMore, - [STRINGID_PKMNGOTENCORE - 12] = sText_PkmnGotEncore, - [STRINGID_PKMNENCOREENDED - 12] = sText_PkmnEncoreEnded, - [STRINGID_PKMNTOOKAIM - 12] = sText_PkmnTookAim, - [STRINGID_PKMNSKETCHEDMOVE - 12] = sText_PkmnSketchedMove, - [STRINGID_PKMNTRYINGTOTAKEFOE - 12] = sText_PkmnTryingToTakeFoe, - [STRINGID_PKMNTOOKFOE - 12] = sText_PkmnTookFoe, - [STRINGID_PKMNREDUCEDPP - 12] = sText_PkmnReducedPP, - [STRINGID_PKMNSTOLEITEM - 12] = sText_PkmnStoleItem, - [STRINGID_TARGETCANTESCAPENOW - 12] = sText_TargetCantEscapeNow, - [STRINGID_PKMNFELLINTONIGHTMARE - 12] = sText_PkmnFellIntoNightmare, - [STRINGID_PKMNLOCKEDINNIGHTMARE - 12] = sText_PkmnLockedInNightmare, - [STRINGID_PKMNLAIDCURSE - 12] = sText_PkmnLaidCurse, - [STRINGID_PKMNAFFLICTEDBYCURSE - 12] = sText_PkmnAfflictedByCurse, - [STRINGID_SPIKESSCATTERED - 12] = sText_SpikesScattered, - [STRINGID_PKMNHURTBYSPIKES - 12] = sText_PkmnHurtBySpikes, - [STRINGID_PKMNIDENTIFIED - 12] = sText_PkmnIdentified, - [STRINGID_PKMNPERISHCOUNTFELL - 12] = sText_PkmnPerishCountFell, - [STRINGID_PKMNBRACEDITSELF - 12] = sText_PkmnBracedItself, - [STRINGID_PKMNENDUREDHIT - 12] = sText_PkmnEnduredHit, - [STRINGID_MAGNITUDESTRENGTH - 12] = sText_MagnitudeStrength, - [STRINGID_PKMNCUTHPMAXEDATTACK - 12] = sText_PkmnCutHPMaxedAttack, - [STRINGID_PKMNCOPIEDSTATCHANGES - 12] = sText_PkmnCopiedStatChanges, - [STRINGID_PKMNGOTFREE - 12] = sText_PkmnGotFree, - [STRINGID_PKMNSHEDLEECHSEED - 12] = sText_PkmnShedLeechSeed, - [STRINGID_PKMNBLEWAWAYSPIKES - 12] = sText_PkmnBlewAwaySpikes, - [STRINGID_PKMNFLEDFROMBATTLE - 12] = sText_PkmnFledFromBattle, - [STRINGID_PKMNFORESAWATTACK - 12] = sText_PkmnForesawAttack, - [STRINGID_PKMNTOOKATTACK - 12] = sText_PkmnTookAttack, - [STRINGID_PKMNATTACK - 12] = sText_PkmnAttack, - [STRINGID_PKMNCENTERATTENTION - 12] = sText_PkmnCenterAttention, - [STRINGID_PKMNCHARGINGPOWER - 12] = sText_PkmnChargingPower, - [STRINGID_NATUREPOWERTURNEDINTO - 12] = sText_NaturePowerTurnedInto, - [STRINGID_PKMNSTATUSNORMAL - 12] = sText_PkmnStatusNormal, - [STRINGID_PKMNHASNOMOVESLEFT - 12] = sText_PkmnHasNoMovesLeft, - [STRINGID_PKMNSUBJECTEDTOTORMENT - 12] = sText_PkmnSubjectedToTorment, - [STRINGID_PKMNCANTUSEMOVETORMENT - 12] = sText_PkmnCantUseMoveTorment, - [STRINGID_PKMNTIGHTENINGFOCUS - 12] = sText_PkmnTighteningFocus, - [STRINGID_PKMNFELLFORTAUNT - 12] = sText_PkmnFellForTaunt, - [STRINGID_PKMNCANTUSEMOVETAUNT - 12] = sText_PkmnCantUseMoveTaunt, - [STRINGID_PKMNREADYTOHELP - 12] = sText_PkmnReadyToHelp, - [STRINGID_PKMNSWITCHEDITEMS - 12] = sText_PkmnSwitchedItems, - [STRINGID_PKMNCOPIEDFOE - 12] = sText_PkmnCopiedFoe, - [STRINGID_PKMNMADEWISH - 12] = sText_PkmnMadeWish, - [STRINGID_PKMNWISHCAMETRUE - 12] = sText_PkmnWishCameTrue, - [STRINGID_PKMNPLANTEDROOTS - 12] = sText_PkmnPlantedRoots, - [STRINGID_PKMNABSORBEDNUTRIENTS - 12] = sText_PkmnAbsorbedNutrients, - [STRINGID_PKMNANCHOREDITSELF - 12] = sText_PkmnAnchoredItself, - [STRINGID_PKMNWASMADEDROWSY - 12] = sText_PkmnWasMadeDrowsy, - [STRINGID_PKMNKNOCKEDOFF - 12] = sText_PkmnKnockedOff, - [STRINGID_PKMNSWAPPEDABILITIES - 12] = sText_PkmnSwappedAbilities, - [STRINGID_PKMNSEALEDOPPONENTMOVE - 12] = sText_PkmnSealedOpponentMove, - [STRINGID_PKMNCANTUSEMOVESEALED - 12] = sText_PkmnCantUseMoveSealed, - [STRINGID_PKMNWANTSGRUDGE - 12] = sText_PkmnWantsGrudge, - [STRINGID_PKMNLOSTPPGRUDGE - 12] = sText_PkmnLostPPGrudge, - [STRINGID_PKMNSHROUDEDITSELF - 12] = sText_PkmnShroudedItself, - [STRINGID_PKMNMOVEBOUNCED - 12] = sText_PkmnMoveBounced, - [STRINGID_PKMNWAITSFORTARGET - 12] = sText_PkmnWaitsForTarget, - [STRINGID_PKMNSNATCHEDMOVE - 12] = sText_PkmnSnatchedMove, - [STRINGID_PKMNMADEITRAIN - 12] = sText_PkmnMadeItRain, - [STRINGID_PKMNRAISEDSPEED - 12] = sText_PkmnRaisedSpeed, - [STRINGID_PKMNPROTECTEDBY - 12] = sText_PkmnProtectedBy, - [STRINGID_PKMNPREVENTSUSAGE - 12] = sText_PkmnPreventsUsage, - [STRINGID_PKMNRESTOREDHPUSING - 12] = sText_PkmnRestoredHPUsing, - [STRINGID_PKMNCHANGEDTYPEWITH - 12] = sText_PkmnChangedTypeWith, - [STRINGID_PKMNPREVENTSPARALYSISWITH - 12] = sText_PkmnPreventsParalysisWith, - [STRINGID_PKMNPREVENTSROMANCEWITH - 12] = sText_PkmnPreventsRomanceWith, - [STRINGID_PKMNPREVENTSPOISONINGWITH - 12] = sText_PkmnPreventsPoisoningWith, - [STRINGID_PKMNPREVENTSCONFUSIONWITH - 12] = sText_PkmnPreventsConfusionWith, - [STRINGID_PKMNRAISEDFIREPOWERWITH - 12] = sText_PkmnRaisedFirePowerWith, - [STRINGID_PKMNANCHORSITSELFWITH - 12] = sText_PkmnAnchorsItselfWith, - [STRINGID_PKMNCUTSATTACKWITH - 12] = sText_PkmnCutsAttackWith, - [STRINGID_PKMNPREVENTSSTATLOSSWITH - 12] = sText_PkmnPreventsStatLossWith, - [STRINGID_PKMNHURTSWITH - 12] = sText_PkmnHurtsWith, - [STRINGID_PKMNTRACED - 12] = sText_PkmnTraced, - [STRINGID_STATSHARPLY - 12] = sText_StatSharply, - [STRINGID_STATROSE - 12] = gBattleText_Rose, - [STRINGID_STATHARSHLY - 12] = sText_StatHarshly, - [STRINGID_STATFELL - 12] = sText_StatFell, - [STRINGID_ATTACKERSSTATROSE - 12] = sText_AttackersStatRose, - [STRINGID_DEFENDERSSTATROSE - 12] = gText_DefendersStatRose, - [STRINGID_ATTACKERSSTATFELL - 12] = sText_AttackersStatFell, - [STRINGID_DEFENDERSSTATFELL - 12] = sText_DefendersStatFell, - [STRINGID_CRITICALHIT - 12] = sText_CriticalHit, - [STRINGID_ONEHITKO - 12] = sText_OneHitKO, - [STRINGID_123POOF - 12] = sText_123Poof, - [STRINGID_ANDELLIPSIS - 12] = sText_AndEllipsis, - [STRINGID_NOTVERYEFFECTIVE - 12] = sText_NotVeryEffective, - [STRINGID_SUPEREFFECTIVE - 12] = sText_SuperEffective, - [STRINGID_GOTAWAYSAFELY - 12] = sText_GotAwaySafely, - [STRINGID_WILDPKMNFLED - 12] = sText_WildPkmnFled, - [STRINGID_NORUNNINGFROMTRAINERS - 12] = sText_NoRunningFromTrainers, - [STRINGID_CANTESCAPE - 12] = sText_CantEscape, - [STRINGID_DONTLEAVEBIRCH - 12] = sText_EmptyString5, - [STRINGID_BUTNOTHINGHAPPENED - 12] = sText_ButNothingHappened, - [STRINGID_BUTITFAILED - 12] = sText_ButItFailed, - [STRINGID_ITHURTCONFUSION - 12] = sText_ItHurtConfusion, - [STRINGID_MIRRORMOVEFAILED - 12] = sText_MirrorMoveFailed, - [STRINGID_STARTEDTORAIN - 12] = sText_StartedToRain, - [STRINGID_DOWNPOURSTARTED - 12] = sText_DownpourStarted, - [STRINGID_RAINCONTINUES - 12] = sText_RainContinues, - [STRINGID_DOWNPOURCONTINUES - 12] = sText_DownpourContinues, - [STRINGID_RAINSTOPPED - 12] = sText_RainStopped, - [STRINGID_SANDSTORMBREWED - 12] = sText_SandstormBrewed, - [STRINGID_SANDSTORMRAGES - 12] = sText_SandstormRages, - [STRINGID_SANDSTORMSUBSIDED - 12] = sText_SandstormSubsided, - [STRINGID_SUNLIGHTGOTBRIGHT - 12] = sText_SunlightGotBright, - [STRINGID_SUNLIGHTSTRONG - 12] = sText_SunlightStrong, - [STRINGID_SUNLIGHTFADED - 12] = sText_SunlightFaded, - [STRINGID_STARTEDHAIL - 12] = sText_StartedHail, - [STRINGID_HAILCONTINUES - 12] = sText_HailContinues, - [STRINGID_HAILSTOPPED - 12] = sText_HailStopped, - [STRINGID_FAILEDTOSPITUP - 12] = sText_FailedToSpitUp, - [STRINGID_FAILEDTOSWALLOW - 12] = sText_FailedToSwallow, - [STRINGID_WINDBECAMEHEATWAVE - 12] = sText_WindBecameHeatWave, - [STRINGID_STATCHANGESGONE - 12] = sText_StatChangesGone, - [STRINGID_COINSSCATTERED - 12] = sText_CoinsScattered, - [STRINGID_TOOWEAKFORSUBSTITUTE - 12] = sText_TooWeakForSubstitute, - [STRINGID_SHAREDPAIN - 12] = sText_SharedPain, - [STRINGID_BELLCHIMED - 12] = sText_BellChimed, - [STRINGID_FAINTINTHREE - 12] = sText_FaintInThree, - [STRINGID_NOPPLEFT - 12] = sText_NoPPLeft, - [STRINGID_BUTNOPPLEFT - 12] = sText_ButNoPPLeft, - [STRINGID_PLAYERUSEDITEM - 12] = sText_PlayerUsedItem, - [STRINGID_OLDMANUSEDITEM - 12] = sText_OldManUsedItem, - [STRINGID_TRAINERBLOCKEDBALL - 12] = sText_TrainerBlockedBall, - [STRINGID_DONTBEATHIEF - 12] = sText_DontBeAThief, - [STRINGID_ITDODGEDBALL - 12] = sText_ItDodgedBall, - [STRINGID_YOUMISSEDPKMN - 12] = sText_YouMissedPkmn, - [STRINGID_PKMNBROKEFREE - 12] = sText_PkmnBrokeFree, - [STRINGID_ITAPPEAREDCAUGHT - 12] = sText_ItAppearedCaught, - [STRINGID_AARGHALMOSTHADIT - 12] = sText_AarghAlmostHadIt, - [STRINGID_SHOOTSOCLOSE - 12] = sText_ShootSoClose, - [STRINGID_GOTCHAPKMNCAUGHT - 12] = sText_GotchaPkmnCaught, - [STRINGID_GOTCHAPKMNCAUGHT2 - 12] = sText_GotchaPkmnCaught2, - [STRINGID_GIVENICKNAMECAPTURED - 12] = sText_GiveNicknameCaptured, - [STRINGID_PKMNSENTTOPC - 12] = sText_PkmnSentToPC, - [STRINGID_PKMNDATAADDEDTODEX - 12] = sText_PkmnDataAddedToDex, - [STRINGID_ITISRAINING - 12] = sText_ItIsRaining, - [STRINGID_SANDSTORMISRAGING - 12] = sText_SandstormIsRaging, - [STRINGID_CANTESCAPE2 - 12] = sText_CantEscape2, - [STRINGID_PKMNIGNORESASLEEP - 12] = sText_PkmnIgnoresAsleep, - [STRINGID_PKMNIGNOREDORDERS - 12] = sText_PkmnIgnoredOrders, - [STRINGID_PKMNBEGANTONAP - 12] = sText_PkmnBeganToNap, - [STRINGID_PKMNLOAFING - 12] = sText_PkmnLoafing, - [STRINGID_PKMNWONTOBEY - 12] = sText_PkmnWontObey, - [STRINGID_PKMNTURNEDAWAY - 12] = sText_PkmnTurnedAway, - [STRINGID_PKMNPRETENDNOTNOTICE - 12] = sText_PkmnPretendNotNotice, - [STRINGID_ENEMYABOUTTOSWITCHPKMN - 12] = sText_EnemyAboutToSwitchPkmn, - [STRINGID_THREWROCK - 12] = sText_ThrewARock, - [STRINGID_THREWBAIT - 12] = sText_ThrewSomeBait, - [STRINGID_PKMNWATCHINGCAREFULLY - 12] = sText_PkmnWatchingCarefully, - [STRINGID_PKMNANGRY - 12] = sText_PkmnIsAngry, - [STRINGID_PKMNEATING - 12] = sText_PkmnIsEating, - [STRINGID_DUMMY288 - 12] = sText_Empty1, - [STRINGID_DUMMY289 - 12] = sText_Empty1, - [STRINGID_OUTOFSAFARIBALLS - 12] = sText_OutOfSafariBalls, - [STRINGID_PKMNSITEMCUREDPARALYSIS - 12] = sText_PkmnsItemCuredParalysis, - [STRINGID_PKMNSITEMCUREDPOISON - 12] = sText_PkmnsItemCuredPoison, - [STRINGID_PKMNSITEMHEALEDBURN - 12] = sText_PkmnsItemHealedBurn, - [STRINGID_PKMNSITEMDEFROSTEDIT - 12] = sText_PkmnsItemDefrostedIt, - [STRINGID_PKMNSITEMWOKEIT - 12] = sText_PkmnsItemWokeIt, - [STRINGID_PKMNSITEMSNAPPEDOUT - 12] = sText_PkmnsItemSnappedOut, - [STRINGID_PKMNSITEMCUREDPROBLEM - 12] = sText_PkmnsItemCuredProblem, - [STRINGID_PKMNSITEMRESTOREDHEALTH - 12] = sText_PkmnsItemRestoredHealth, - [STRINGID_PKMNSITEMRESTOREDPP - 12] = sText_PkmnsItemRestoredPP, - [STRINGID_PKMNSITEMRESTOREDSTATUS - 12] = sText_PkmnsItemRestoredStatus, - [STRINGID_PKMNSITEMRESTOREDHPALITTLE - 12] = sText_PkmnsItemRestoredHPALittle, - [STRINGID_ITEMALLOWSONLYYMOVE - 12] = sText_ItemAllowsOnlyYMove, - [STRINGID_PKMNHUNGONWITHX - 12] = sText_PkmnHungOnWithX, - [STRINGID_EMPTYSTRING3 - 12] = gText_EmptyString3, - [STRINGID_PKMNSXPREVENTSBURNS - 12] = sText_PkmnsXPreventsBurns, - [STRINGID_PKMNSXBLOCKSY - 12] = sText_PkmnsXBlocksY, - [STRINGID_PKMNSXRESTOREDHPALITTLE2 - 12] = sText_PkmnsXRestoredHPALittle2, - [STRINGID_PKMNSXWHIPPEDUPSANDSTORM - 12] = sText_PkmnsXWhippedUpSandstorm, - [STRINGID_PKMNSXPREVENTSYLOSS - 12] = sText_PkmnsXPreventsYLoss, - [STRINGID_PKMNSXINFATUATEDY - 12] = sText_PkmnsXInfatuatedY, - [STRINGID_PKMNSXMADEYINEFFECTIVE - 12] = sText_PkmnsXMadeYIneffective, - [STRINGID_PKMNSXCUREDYPROBLEM - 12] = sText_PkmnsXCuredYProblem, - [STRINGID_ITSUCKEDLIQUIDOOZE - 12] = sText_ItSuckedLiquidOoze, - [STRINGID_PKMNTRANSFORMED - 12] = sText_PkmnTransformed, - [STRINGID_ELECTRICITYWEAKENED - 12] = sText_ElectricityWeakened, - [STRINGID_FIREWEAKENED - 12] = sText_FireWeakened, - [STRINGID_PKMNHIDUNDERWATER - 12] = sText_PkmnHidUnderwater, - [STRINGID_PKMNSPRANGUP - 12] = sText_PkmnSprangUp, - [STRINGID_HMMOVESCANTBEFORGOTTEN - 12] = sText_HMMovesCantBeForgotten, - [STRINGID_XFOUNDONEY - 12] = sText_XFoundOneY, - [STRINGID_PLAYERDEFEATEDTRAINER1 - 12] = sText_PlayerDefeatedLinkTrainerTrainer1, - [STRINGID_SOOTHINGAROMA - 12] = sText_SoothingAroma, - [STRINGID_ITEMSCANTBEUSEDNOW - 12] = sText_ItemsCantBeUsedNow, - [STRINGID_FORXCOMMAYZ - 12] = sText_ForXCommaYZ, - [STRINGID_USINGITEMSTATOFPKMNROSE - 12] = sText_UsingItemTheStatOfPkmnRose, - [STRINGID_PKMNUSEDXTOGETPUMPED - 12] = sText_PkmnUsedXToGetPumped, - [STRINGID_PKMNSXMADEYUSELESS - 12] = sText_PkmnsXMadeYUseless, - [STRINGID_PKMNTRAPPEDBYSANDTOMB - 12] = sText_PkmnTrappedBySandTomb, - [STRINGID_EMPTYSTRING4 - 12] = sText_EmptyString4, - [STRINGID_ABOOSTED - 12] = sText_ABoosted, - [STRINGID_PKMNSXINTENSIFIEDSUN - 12] = sText_PkmnsXIntensifiedSun, - [STRINGID_PKMNMAKESGROUNDMISS - 12] = sText_PkmnMakesGroundMiss, - [STRINGID_YOUTHROWABALLNOWRIGHT - 12] = sText_YouThrowABallNowRight, - [STRINGID_PKMNSXTOOKATTACK - 12] = sText_PkmnsXTookAttack, - [STRINGID_PKMNCHOSEXASDESTINY - 12] = sText_PkmnChoseXAsDestiny, - [STRINGID_PKMNLOSTFOCUS - 12] = sText_PkmnLostFocus, - [STRINGID_USENEXTPKMN - 12] = sText_UseNextPkmn, - [STRINGID_PKMNFLEDUSINGITS - 12] = sText_PkmnFledUsingIts, - [STRINGID_PKMNFLEDUSING - 12] = sText_PkmnFledUsing, - [STRINGID_PKMNWASDRAGGEDOUT - 12] = sText_PkmnWasDraggedOut, - [STRINGID_PREVENTEDFROMWORKING - 12] = sText_PreventedFromWorking, - [STRINGID_PKMNSITEMNORMALIZEDSTATUS - 12] = sText_PkmnsItemNormalizedStatus, - [STRINGID_TRAINER1USEDITEM - 12] = sText_Trainer1UsedItem, - [STRINGID_BOXISFULL - 12] = sText_BoxIsFull, - [STRINGID_PKMNAVOIDEDATTACK - 12] = sText_PkmnAvoidedAttack, - [STRINGID_PKMNSXMADEITINEFFECTIVE - 12] = sText_PkmnsXMadeItIneffective, - [STRINGID_PKMNSXPREVENTSFLINCHING - 12] = sText_PkmnsXPreventsFlinching, - [STRINGID_PKMNALREADYHASBURN - 12] = sText_PkmnAlreadyHasBurn, - [STRINGID_STATSWONTDECREASE2 - 12] = sText_StatsWontDecrease2, - [STRINGID_PKMNSXBLOCKSY2 - 12] = sText_PkmnsXBlocksY2, - [STRINGID_PKMNSXWOREOFF - 12] = sText_PkmnsXWoreOff, - [STRINGID_PKMNRAISEDDEFALITTLE - 12] = sText_PkmnRaisedDefALittle, - [STRINGID_PKMNRAISEDSPDEFALITTLE - 12] = sText_PkmnRaisedSpDefALittle, - [STRINGID_THEWALLSHATTERED - 12] = sText_TheWallShattered, - [STRINGID_PKMNSXPREVENTSYSZ - 12] = sText_PkmnsXPreventsYsZ, - [STRINGID_PKMNSXCUREDITSYPROBLEM - 12] = sText_PkmnsXCuredItsYProblem, - [STRINGID_ATTACKERCANTESCAPE - 12] = sText_AttackerCantEscape, - [STRINGID_PKMNOBTAINEDX - 12] = sText_PkmnObtainedX, - [STRINGID_PKMNOBTAINEDX2 - 12] = sText_PkmnObtainedX2, - [STRINGID_PKMNOBTAINEDXYOBTAINEDZ - 12] = sText_PkmnObtainedXYObtainedZ, - [STRINGID_BUTNOEFFECT - 12] = sText_ButNoEffect, - [STRINGID_PKMNSXHADNOEFFECTONY - 12] = sText_PkmnsXHadNoEffectOnY, - [STRINGID_OAKPLAYERWON - 12] = gText_WinEarnsPrizeMoney, - [STRINGID_OAKPLAYERLOST - 12] = gText_HowDissapointing, - [STRINGID_PLAYERLOSTAGAINSTENEMYTRAINER - 12] = sText_PlayerWhiteoutAgainstTrainer, - [STRINGID_PLAYERPAIDPRIZEMONEY - 12] = sText_PlayerPaidAsPrizeMoney, - [STRINGID_PKMNTRANSFERREDSOMEONESPC - 12] = Text_MonSentToBoxInSomeonesPC, - [STRINGID_PKMNTRANSFERREDBILLSPC - 12] = Text_MonSentToBoxInBillsPC, - [STRINGID_PKMNBOXSOMEONESPCFULL - 12] = Text_MonSentToBoxSomeonesBoxFull, - [STRINGID_PKMNBOXBILLSPCFULL - 12] = Text_MonSentToBoxBillsBoxFull, - [STRINGID_POKEDUDEUSED - 12] = sText_PokedudeUsedItem, - [STRINGID_POKEFLUTECATCHY - 12] = sText_PlayedFluteCatchyTune, - [STRINGID_POKEFLUTE - 12] = sText_PlayedThe, - [STRINGID_MONHEARINGFLUTEAWOKE - 12] = sText_PkmnHearingFluteAwoke, - [STRINGID_TRAINER2CLASS - 12] = sText_Trainer2Class, - [STRINGID_TRAINER2NAME - 12] = sText_Trainer2Name, - [STRINGID_PLAYERWHITEDOUT - 12] = sText_PlayerWhiteout2, - [STRINGID_MONTOOSCAREDTOMOVE - 12] = sText_TooScaredToMove, - [STRINGID_GHOSTGETOUTGETOUT - 12] = sText_GetOutGetOut, - [STRINGID_SILPHSCOPEUNVEILED - 12] = sText_SilphScopeUnveil, - [STRINGID_GHOSTWASMAROWAK - 12] = sText_TheGhostWas, - [STRINGID_TRAINER1MON1COMEBACK - 12] = sText_Trainer1RecallPkmn1, - [STRINGID_TRAINER1WINTEXT - 12] = sText_Trainer1WinText, - [STRINGID_TRAINER1MON2COMEBACK - 12] = sText_Trainer1RecallPkmn2, - [STRINGID_TRAINER1MON1AND2COMEBACK - 12] = sText_Trainer1RecallBoth + [STRINGID_TRAINER1LOSETEXT - BATTLESTRINGS_TABLE_START] = sText_Trainer1LoseText, + [STRINGID_PKMNGAINEDEXP - BATTLESTRINGS_TABLE_START] = sText_PkmnGainedEXP, + [STRINGID_PKMNGREWTOLV - BATTLESTRINGS_TABLE_START] = sText_PkmnGrewToLv, + [STRINGID_PKMNLEARNEDMOVE - BATTLESTRINGS_TABLE_START] = sText_PkmnLearnedMove, + [STRINGID_TRYTOLEARNMOVE1 - BATTLESTRINGS_TABLE_START] = sText_TryToLearnMove1, + [STRINGID_TRYTOLEARNMOVE2 - BATTLESTRINGS_TABLE_START] = sText_TryToLearnMove2, + [STRINGID_TRYTOLEARNMOVE3 - BATTLESTRINGS_TABLE_START] = sText_TryToLearnMove3, + [STRINGID_PKMNFORGOTMOVE - BATTLESTRINGS_TABLE_START] = sText_PkmnForgotMove, + [STRINGID_STOPLEARNINGMOVE - BATTLESTRINGS_TABLE_START] = sText_StopLearningMove, + [STRINGID_DIDNOTLEARNMOVE - BATTLESTRINGS_TABLE_START] = sText_DidNotLearnMove, + [STRINGID_PKMNLEARNEDMOVE2 - BATTLESTRINGS_TABLE_START] = sText_PkmnLearnedMove2, + [STRINGID_ATTACKMISSED - BATTLESTRINGS_TABLE_START] = sText_AttackMissed, + [STRINGID_PKMNPROTECTEDITSELF - BATTLESTRINGS_TABLE_START] = sText_PkmnProtectedItself, + [STRINGID_STATSWONTINCREASE2 - BATTLESTRINGS_TABLE_START] = sText_StatsWontIncrease2, + [STRINGID_AVOIDEDDAMAGE - BATTLESTRINGS_TABLE_START] = sText_AvoidedDamage, + [STRINGID_ITDOESNTAFFECT - BATTLESTRINGS_TABLE_START] = sText_ItDoesntAffect, + [STRINGID_ATTACKERFAINTED - BATTLESTRINGS_TABLE_START] = sText_AttackerFainted, + [STRINGID_TARGETFAINTED - BATTLESTRINGS_TABLE_START] = sText_TargetFainted, + [STRINGID_PLAYERGOTMONEY - BATTLESTRINGS_TABLE_START] = sText_PlayerGotMoney, + [STRINGID_PLAYERWHITEOUT - BATTLESTRINGS_TABLE_START] = sText_PlayerWhiteout, + [STRINGID_PLAYERWHITEOUT2 - BATTLESTRINGS_TABLE_START] = sText_PlayerPanicked, + [STRINGID_PREVENTSESCAPE - BATTLESTRINGS_TABLE_START] = sText_PreventsEscape, + [STRINGID_HITXTIMES - BATTLESTRINGS_TABLE_START] = sText_HitXTimes, + [STRINGID_PKMNFELLASLEEP - BATTLESTRINGS_TABLE_START] = sText_PkmnFellAsleep, + [STRINGID_PKMNMADESLEEP - BATTLESTRINGS_TABLE_START] = sText_PkmnMadeSleep, + [STRINGID_PKMNALREADYASLEEP - BATTLESTRINGS_TABLE_START] = sText_PkmnAlreadyAsleep, + [STRINGID_PKMNALREADYASLEEP2 - BATTLESTRINGS_TABLE_START] = sText_PkmnAlreadyAsleep2, + [STRINGID_PKMNWASNTAFFECTED - BATTLESTRINGS_TABLE_START] = sText_PkmnWasntAffected, + [STRINGID_PKMNWASPOISONED - BATTLESTRINGS_TABLE_START] = sText_PkmnWasPoisoned, + [STRINGID_PKMNPOISONEDBY - BATTLESTRINGS_TABLE_START] = sText_PkmnPoisonedBy, + [STRINGID_PKMNHURTBYPOISON - BATTLESTRINGS_TABLE_START] = sText_PkmnHurtByPoison, + [STRINGID_PKMNALREADYPOISONED - BATTLESTRINGS_TABLE_START] = sText_PkmnAlreadyPoisoned, + [STRINGID_PKMNBADLYPOISONED - BATTLESTRINGS_TABLE_START] = sText_PkmnBadlyPoisoned, + [STRINGID_PKMNENERGYDRAINED - BATTLESTRINGS_TABLE_START] = sText_PkmnEnergyDrained, + [STRINGID_PKMNWASBURNED - BATTLESTRINGS_TABLE_START] = sText_PkmnWasBurned, + [STRINGID_PKMNBURNEDBY - BATTLESTRINGS_TABLE_START] = sText_PkmnBurnedBy, + [STRINGID_PKMNHURTBYBURN - BATTLESTRINGS_TABLE_START] = sText_PkmnHurtByBurn, + [STRINGID_PKMNWASFROZEN - BATTLESTRINGS_TABLE_START] = sText_PkmnWasFrozen, + [STRINGID_PKMNFROZENBY - BATTLESTRINGS_TABLE_START] = sText_PkmnFrozenBy, + [STRINGID_PKMNISFROZEN - BATTLESTRINGS_TABLE_START] = sText_PkmnIsFrozen, + [STRINGID_PKMNWASDEFROSTED - BATTLESTRINGS_TABLE_START] = sText_PkmnWasDefrosted, + [STRINGID_PKMNWASDEFROSTED2 - BATTLESTRINGS_TABLE_START] = sText_PkmnWasDefrosted2, + [STRINGID_PKMNWASDEFROSTEDBY - BATTLESTRINGS_TABLE_START] = sText_PkmnWasDefrostedBy, + [STRINGID_PKMNWASPARALYZED - BATTLESTRINGS_TABLE_START] = sText_PkmnWasParalyzed, + [STRINGID_PKMNWASPARALYZEDBY - BATTLESTRINGS_TABLE_START] = sText_PkmnWasParalyzedBy, + [STRINGID_PKMNISPARALYZED - BATTLESTRINGS_TABLE_START] = sText_PkmnIsParalyzed, + [STRINGID_PKMNISALREADYPARALYZED - BATTLESTRINGS_TABLE_START] = sText_PkmnIsAlreadyParalyzed, + [STRINGID_PKMNHEALEDPARALYSIS - BATTLESTRINGS_TABLE_START] = sText_PkmnHealedParalysis, + [STRINGID_PKMNDREAMEATEN - BATTLESTRINGS_TABLE_START] = sText_PkmnDreamEaten, + [STRINGID_STATSWONTINCREASE - BATTLESTRINGS_TABLE_START] = sText_StatsWontIncrease, + [STRINGID_STATSWONTDECREASE - BATTLESTRINGS_TABLE_START] = sText_StatsWontDecrease, + [STRINGID_TEAMSTOPPEDWORKING - BATTLESTRINGS_TABLE_START] = sText_TeamStoppedWorking, + [STRINGID_FOESTOPPEDWORKING - BATTLESTRINGS_TABLE_START] = sText_FoeStoppedWorking, + [STRINGID_PKMNISCONFUSED - BATTLESTRINGS_TABLE_START] = sText_PkmnIsConfused, + [STRINGID_PKMNHEALEDCONFUSION - BATTLESTRINGS_TABLE_START] = sText_PkmnHealedConfusion, + [STRINGID_PKMNWASCONFUSED - BATTLESTRINGS_TABLE_START] = sText_PkmnWasConfused, + [STRINGID_PKMNALREADYCONFUSED - BATTLESTRINGS_TABLE_START] = sText_PkmnAlreadyConfused, + [STRINGID_PKMNFELLINLOVE - BATTLESTRINGS_TABLE_START] = sText_PkmnFellInLove, + [STRINGID_PKMNINLOVE - BATTLESTRINGS_TABLE_START] = sText_PkmnInLove, + [STRINGID_PKMNIMMOBILIZEDBYLOVE - BATTLESTRINGS_TABLE_START] = sText_PkmnImmobilizedByLove, + [STRINGID_PKMNBLOWNAWAY - BATTLESTRINGS_TABLE_START] = sText_PkmnBlownAway, + [STRINGID_PKMNCHANGEDTYPE - BATTLESTRINGS_TABLE_START] = sText_PkmnChangedType, + [STRINGID_PKMNFLINCHED - BATTLESTRINGS_TABLE_START] = sText_PkmnFlinched, + [STRINGID_PKMNREGAINEDHEALTH - BATTLESTRINGS_TABLE_START] = sText_PkmnRegainedHealth, + [STRINGID_PKMNHPFULL - BATTLESTRINGS_TABLE_START] = sText_PkmnHPFull, + [STRINGID_PKMNRAISEDSPDEF - BATTLESTRINGS_TABLE_START] = sText_PkmnRaisedSpDef, + [STRINGID_PKMNRAISEDDEF - BATTLESTRINGS_TABLE_START] = sText_PkmnRaisedDef, + [STRINGID_PKMNCOVEREDBYVEIL - BATTLESTRINGS_TABLE_START] = sText_PkmnCoveredByVeil, + [STRINGID_PKMNUSEDSAFEGUARD - BATTLESTRINGS_TABLE_START] = sText_PkmnUsedSafeguard, + [STRINGID_PKMNSAFEGUARDEXPIRED - BATTLESTRINGS_TABLE_START] = sText_PkmnSafeguardExpired, + [STRINGID_PKMNWENTTOSLEEP - BATTLESTRINGS_TABLE_START] = sText_PkmnWentToSleep, + [STRINGID_PKMNSLEPTHEALTHY - BATTLESTRINGS_TABLE_START] = sText_PkmnSleptHealthy, + [STRINGID_PKMNWHIPPEDWHIRLWIND - BATTLESTRINGS_TABLE_START] = sText_PkmnWhippedWhirlwind, + [STRINGID_PKMNTOOKSUNLIGHT - BATTLESTRINGS_TABLE_START] = sText_PkmnTookSunlight, + [STRINGID_PKMNLOWEREDHEAD - BATTLESTRINGS_TABLE_START] = sText_PkmnLoweredHead, + [STRINGID_PKMNISGLOWING - BATTLESTRINGS_TABLE_START] = sText_PkmnIsGlowing, + [STRINGID_PKMNFLEWHIGH - BATTLESTRINGS_TABLE_START] = sText_PkmnFlewHigh, + [STRINGID_PKMNDUGHOLE - BATTLESTRINGS_TABLE_START] = sText_PkmnDugHole, + [STRINGID_PKMNSQUEEZEDBYBIND - BATTLESTRINGS_TABLE_START] = sText_PkmnSqueezedByBind, + [STRINGID_PKMNTRAPPEDINVORTEX - BATTLESTRINGS_TABLE_START] = sText_PkmnTrappedInVortex, + [STRINGID_PKMNWRAPPEDBY - BATTLESTRINGS_TABLE_START] = sText_PkmnWrappedBy, + [STRINGID_PKMNCLAMPED - BATTLESTRINGS_TABLE_START] = sText_PkmnClamped, + [STRINGID_PKMNHURTBY - BATTLESTRINGS_TABLE_START] = sText_PkmnHurtBy, + [STRINGID_PKMNFREEDFROM - BATTLESTRINGS_TABLE_START] = sText_PkmnFreedFrom, + [STRINGID_PKMNCRASHED - BATTLESTRINGS_TABLE_START] = sText_PkmnCrashed, + [STRINGID_PKMNSHROUDEDINMIST - BATTLESTRINGS_TABLE_START] = gBattleText_MistShroud, + [STRINGID_PKMNPROTECTEDBYMIST - BATTLESTRINGS_TABLE_START] = sText_PkmnProtectedByMist, + [STRINGID_PKMNGETTINGPUMPED - BATTLESTRINGS_TABLE_START] = gBattleText_GetPumped, + [STRINGID_PKMNHITWITHRECOIL - BATTLESTRINGS_TABLE_START] = sText_PkmnHitWithRecoil, + [STRINGID_PKMNPROTECTEDITSELF2 - BATTLESTRINGS_TABLE_START] = sText_PkmnProtectedItself2, + [STRINGID_PKMNBUFFETEDBYSANDSTORM - BATTLESTRINGS_TABLE_START] = sText_PkmnBuffetedBySandstorm, + [STRINGID_PKMNPELTEDBYHAIL - BATTLESTRINGS_TABLE_START] = sText_PkmnPeltedByHail, + [STRINGID_PKMNSEEDED - BATTLESTRINGS_TABLE_START] = sText_PkmnSeeded, + [STRINGID_PKMNEVADEDATTACK - BATTLESTRINGS_TABLE_START] = sText_PkmnEvadedAttack, + [STRINGID_PKMNSAPPEDBYLEECHSEED - BATTLESTRINGS_TABLE_START] = sText_PkmnSappedByLeechSeed, + [STRINGID_PKMNFASTASLEEP - BATTLESTRINGS_TABLE_START] = sText_PkmnFastAsleep, + [STRINGID_PKMNWOKEUP - BATTLESTRINGS_TABLE_START] = sText_PkmnWokeUp, + [STRINGID_PKMNUPROARKEPTAWAKE - BATTLESTRINGS_TABLE_START] = sText_PkmnUproarKeptAwake, + [STRINGID_PKMNWOKEUPINUPROAR - BATTLESTRINGS_TABLE_START] = sText_PkmnWokeUpInUproar, + [STRINGID_PKMNCAUSEDUPROAR - BATTLESTRINGS_TABLE_START] = sText_PkmnCausedUproar, + [STRINGID_PKMNMAKINGUPROAR - BATTLESTRINGS_TABLE_START] = sText_PkmnMakingUproar, + [STRINGID_PKMNCALMEDDOWN - BATTLESTRINGS_TABLE_START] = sText_PkmnCalmedDown, + [STRINGID_PKMNCANTSLEEPINUPROAR - BATTLESTRINGS_TABLE_START] = sText_PkmnCantSleepInUproar, + [STRINGID_PKMNSTOCKPILED - BATTLESTRINGS_TABLE_START] = sText_PkmnStockpiled, + [STRINGID_PKMNCANTSTOCKPILE - BATTLESTRINGS_TABLE_START] = sText_PkmnCantStockpile, + [STRINGID_PKMNCANTSLEEPINUPROAR2 - BATTLESTRINGS_TABLE_START] = sText_PkmnCantSleepInUproar2, + [STRINGID_UPROARKEPTPKMNAWAKE - BATTLESTRINGS_TABLE_START] = sText_UproarKeptPkmnAwake, + [STRINGID_PKMNSTAYEDAWAKEUSING - BATTLESTRINGS_TABLE_START] = sText_PkmnStayedAwakeUsing, + [STRINGID_PKMNSTORINGENERGY - BATTLESTRINGS_TABLE_START] = sText_PkmnStoringEnergy, + [STRINGID_PKMNUNLEASHEDENERGY - BATTLESTRINGS_TABLE_START] = sText_PkmnUnleashedEnergy, + [STRINGID_PKMNFATIGUECONFUSION - BATTLESTRINGS_TABLE_START] = sText_PkmnFatigueConfusion, + [STRINGID_PLAYERPICKEDUPMONEY - BATTLESTRINGS_TABLE_START] = sText_PkmnPickedUpItem, + [STRINGID_PKMNUNAFFECTED - BATTLESTRINGS_TABLE_START] = sText_PkmnUnaffected, + [STRINGID_PKMNTRANSFORMEDINTO - BATTLESTRINGS_TABLE_START] = sText_PkmnTransformedInto, + [STRINGID_PKMNMADESUBSTITUTE - BATTLESTRINGS_TABLE_START] = sText_PkmnMadeSubstitute, + [STRINGID_PKMNHASSUBSTITUTE - BATTLESTRINGS_TABLE_START] = sText_PkmnHasSubstitute, + [STRINGID_SUBSTITUTEDAMAGED - BATTLESTRINGS_TABLE_START] = sText_SubstituteDamaged, + [STRINGID_PKMNSUBSTITUTEFADED - BATTLESTRINGS_TABLE_START] = sText_PkmnSubstituteFaded, + [STRINGID_PKMNMUSTRECHARGE - BATTLESTRINGS_TABLE_START] = sText_PkmnMustRecharge, + [STRINGID_PKMNRAGEBUILDING - BATTLESTRINGS_TABLE_START] = sText_PkmnRageBuilding, + [STRINGID_PKMNMOVEWASDISABLED - BATTLESTRINGS_TABLE_START] = sText_PkmnMoveWasDisabled, + [STRINGID_PKMNMOVEISDISABLED - BATTLESTRINGS_TABLE_START] = sText_PkmnMoveIsDisabled, + [STRINGID_PKMNMOVEDISABLEDNOMORE - BATTLESTRINGS_TABLE_START] = sText_PkmnMoveDisabledNoMore, + [STRINGID_PKMNGOTENCORE - BATTLESTRINGS_TABLE_START] = sText_PkmnGotEncore, + [STRINGID_PKMNENCOREENDED - BATTLESTRINGS_TABLE_START] = sText_PkmnEncoreEnded, + [STRINGID_PKMNTOOKAIM - BATTLESTRINGS_TABLE_START] = sText_PkmnTookAim, + [STRINGID_PKMNSKETCHEDMOVE - BATTLESTRINGS_TABLE_START] = sText_PkmnSketchedMove, + [STRINGID_PKMNTRYINGTOTAKEFOE - BATTLESTRINGS_TABLE_START] = sText_PkmnTryingToTakeFoe, + [STRINGID_PKMNTOOKFOE - BATTLESTRINGS_TABLE_START] = sText_PkmnTookFoe, + [STRINGID_PKMNREDUCEDPP - BATTLESTRINGS_TABLE_START] = sText_PkmnReducedPP, + [STRINGID_PKMNSTOLEITEM - BATTLESTRINGS_TABLE_START] = sText_PkmnStoleItem, + [STRINGID_TARGETCANTESCAPENOW - BATTLESTRINGS_TABLE_START] = sText_TargetCantEscapeNow, + [STRINGID_PKMNFELLINTONIGHTMARE - BATTLESTRINGS_TABLE_START] = sText_PkmnFellIntoNightmare, + [STRINGID_PKMNLOCKEDINNIGHTMARE - BATTLESTRINGS_TABLE_START] = sText_PkmnLockedInNightmare, + [STRINGID_PKMNLAIDCURSE - BATTLESTRINGS_TABLE_START] = sText_PkmnLaidCurse, + [STRINGID_PKMNAFFLICTEDBYCURSE - BATTLESTRINGS_TABLE_START] = sText_PkmnAfflictedByCurse, + [STRINGID_SPIKESSCATTERED - BATTLESTRINGS_TABLE_START] = sText_SpikesScattered, + [STRINGID_PKMNHURTBYSPIKES - BATTLESTRINGS_TABLE_START] = sText_PkmnHurtBySpikes, + [STRINGID_PKMNIDENTIFIED - BATTLESTRINGS_TABLE_START] = sText_PkmnIdentified, + [STRINGID_PKMNPERISHCOUNTFELL - BATTLESTRINGS_TABLE_START] = sText_PkmnPerishCountFell, + [STRINGID_PKMNBRACEDITSELF - BATTLESTRINGS_TABLE_START] = sText_PkmnBracedItself, + [STRINGID_PKMNENDUREDHIT - BATTLESTRINGS_TABLE_START] = sText_PkmnEnduredHit, + [STRINGID_MAGNITUDESTRENGTH - BATTLESTRINGS_TABLE_START] = sText_MagnitudeStrength, + [STRINGID_PKMNCUTHPMAXEDATTACK - BATTLESTRINGS_TABLE_START] = sText_PkmnCutHPMaxedAttack, + [STRINGID_PKMNCOPIEDSTATCHANGES - BATTLESTRINGS_TABLE_START] = sText_PkmnCopiedStatChanges, + [STRINGID_PKMNGOTFREE - BATTLESTRINGS_TABLE_START] = sText_PkmnGotFree, + [STRINGID_PKMNSHEDLEECHSEED - BATTLESTRINGS_TABLE_START] = sText_PkmnShedLeechSeed, + [STRINGID_PKMNBLEWAWAYSPIKES - BATTLESTRINGS_TABLE_START] = sText_PkmnBlewAwaySpikes, + [STRINGID_PKMNFLEDFROMBATTLE - BATTLESTRINGS_TABLE_START] = sText_PkmnFledFromBattle, + [STRINGID_PKMNFORESAWATTACK - BATTLESTRINGS_TABLE_START] = sText_PkmnForesawAttack, + [STRINGID_PKMNTOOKATTACK - BATTLESTRINGS_TABLE_START] = sText_PkmnTookAttack, + [STRINGID_PKMNATTACK - BATTLESTRINGS_TABLE_START] = sText_PkmnAttack, + [STRINGID_PKMNCENTERATTENTION - BATTLESTRINGS_TABLE_START] = sText_PkmnCenterAttention, + [STRINGID_PKMNCHARGINGPOWER - BATTLESTRINGS_TABLE_START] = sText_PkmnChargingPower, + [STRINGID_NATUREPOWERTURNEDINTO - BATTLESTRINGS_TABLE_START] = sText_NaturePowerTurnedInto, + [STRINGID_PKMNSTATUSNORMAL - BATTLESTRINGS_TABLE_START] = sText_PkmnStatusNormal, + [STRINGID_PKMNHASNOMOVESLEFT - BATTLESTRINGS_TABLE_START] = sText_PkmnHasNoMovesLeft, + [STRINGID_PKMNSUBJECTEDTOTORMENT - BATTLESTRINGS_TABLE_START] = sText_PkmnSubjectedToTorment, + [STRINGID_PKMNCANTUSEMOVETORMENT - BATTLESTRINGS_TABLE_START] = sText_PkmnCantUseMoveTorment, + [STRINGID_PKMNTIGHTENINGFOCUS - BATTLESTRINGS_TABLE_START] = sText_PkmnTighteningFocus, + [STRINGID_PKMNFELLFORTAUNT - BATTLESTRINGS_TABLE_START] = sText_PkmnFellForTaunt, + [STRINGID_PKMNCANTUSEMOVETAUNT - BATTLESTRINGS_TABLE_START] = sText_PkmnCantUseMoveTaunt, + [STRINGID_PKMNREADYTOHELP - BATTLESTRINGS_TABLE_START] = sText_PkmnReadyToHelp, + [STRINGID_PKMNSWITCHEDITEMS - BATTLESTRINGS_TABLE_START] = sText_PkmnSwitchedItems, + [STRINGID_PKMNCOPIEDFOE - BATTLESTRINGS_TABLE_START] = sText_PkmnCopiedFoe, + [STRINGID_PKMNMADEWISH - BATTLESTRINGS_TABLE_START] = sText_PkmnMadeWish, + [STRINGID_PKMNWISHCAMETRUE - BATTLESTRINGS_TABLE_START] = sText_PkmnWishCameTrue, + [STRINGID_PKMNPLANTEDROOTS - BATTLESTRINGS_TABLE_START] = sText_PkmnPlantedRoots, + [STRINGID_PKMNABSORBEDNUTRIENTS - BATTLESTRINGS_TABLE_START] = sText_PkmnAbsorbedNutrients, + [STRINGID_PKMNANCHOREDITSELF - BATTLESTRINGS_TABLE_START] = sText_PkmnAnchoredItself, + [STRINGID_PKMNWASMADEDROWSY - BATTLESTRINGS_TABLE_START] = sText_PkmnWasMadeDrowsy, + [STRINGID_PKMNKNOCKEDOFF - BATTLESTRINGS_TABLE_START] = sText_PkmnKnockedOff, + [STRINGID_PKMNSWAPPEDABILITIES - BATTLESTRINGS_TABLE_START] = sText_PkmnSwappedAbilities, + [STRINGID_PKMNSEALEDOPPONENTMOVE - BATTLESTRINGS_TABLE_START] = sText_PkmnSealedOpponentMove, + [STRINGID_PKMNCANTUSEMOVESEALED - BATTLESTRINGS_TABLE_START] = sText_PkmnCantUseMoveSealed, + [STRINGID_PKMNWANTSGRUDGE - BATTLESTRINGS_TABLE_START] = sText_PkmnWantsGrudge, + [STRINGID_PKMNLOSTPPGRUDGE - BATTLESTRINGS_TABLE_START] = sText_PkmnLostPPGrudge, + [STRINGID_PKMNSHROUDEDITSELF - BATTLESTRINGS_TABLE_START] = sText_PkmnShroudedItself, + [STRINGID_PKMNMOVEBOUNCED - BATTLESTRINGS_TABLE_START] = sText_PkmnMoveBounced, + [STRINGID_PKMNWAITSFORTARGET - BATTLESTRINGS_TABLE_START] = sText_PkmnWaitsForTarget, + [STRINGID_PKMNSNATCHEDMOVE - BATTLESTRINGS_TABLE_START] = sText_PkmnSnatchedMove, + [STRINGID_PKMNMADEITRAIN - BATTLESTRINGS_TABLE_START] = sText_PkmnMadeItRain, + [STRINGID_PKMNRAISEDSPEED - BATTLESTRINGS_TABLE_START] = sText_PkmnRaisedSpeed, + [STRINGID_PKMNPROTECTEDBY - BATTLESTRINGS_TABLE_START] = sText_PkmnProtectedBy, + [STRINGID_PKMNPREVENTSUSAGE - BATTLESTRINGS_TABLE_START] = sText_PkmnPreventsUsage, + [STRINGID_PKMNRESTOREDHPUSING - BATTLESTRINGS_TABLE_START] = sText_PkmnRestoredHPUsing, + [STRINGID_PKMNCHANGEDTYPEWITH - BATTLESTRINGS_TABLE_START] = sText_PkmnChangedTypeWith, + [STRINGID_PKMNPREVENTSPARALYSISWITH - BATTLESTRINGS_TABLE_START] = sText_PkmnPreventsParalysisWith, + [STRINGID_PKMNPREVENTSROMANCEWITH - BATTLESTRINGS_TABLE_START] = sText_PkmnPreventsRomanceWith, + [STRINGID_PKMNPREVENTSPOISONINGWITH - BATTLESTRINGS_TABLE_START] = sText_PkmnPreventsPoisoningWith, + [STRINGID_PKMNPREVENTSCONFUSIONWITH - BATTLESTRINGS_TABLE_START] = sText_PkmnPreventsConfusionWith, + [STRINGID_PKMNRAISEDFIREPOWERWITH - BATTLESTRINGS_TABLE_START] = sText_PkmnRaisedFirePowerWith, + [STRINGID_PKMNANCHORSITSELFWITH - BATTLESTRINGS_TABLE_START] = sText_PkmnAnchorsItselfWith, + [STRINGID_PKMNCUTSATTACKWITH - BATTLESTRINGS_TABLE_START] = sText_PkmnCutsAttackWith, + [STRINGID_PKMNPREVENTSSTATLOSSWITH - BATTLESTRINGS_TABLE_START] = sText_PkmnPreventsStatLossWith, + [STRINGID_PKMNHURTSWITH - BATTLESTRINGS_TABLE_START] = sText_PkmnHurtsWith, + [STRINGID_PKMNTRACED - BATTLESTRINGS_TABLE_START] = sText_PkmnTraced, + [STRINGID_STATSHARPLY - BATTLESTRINGS_TABLE_START] = sText_StatSharply, + [STRINGID_STATROSE - BATTLESTRINGS_TABLE_START] = gBattleText_Rose, + [STRINGID_STATHARSHLY - BATTLESTRINGS_TABLE_START] = sText_StatHarshly, + [STRINGID_STATFELL - BATTLESTRINGS_TABLE_START] = sText_StatFell, + [STRINGID_ATTACKERSSTATROSE - BATTLESTRINGS_TABLE_START] = sText_AttackersStatRose, + [STRINGID_DEFENDERSSTATROSE - BATTLESTRINGS_TABLE_START] = gText_DefendersStatRose, + [STRINGID_ATTACKERSSTATFELL - BATTLESTRINGS_TABLE_START] = sText_AttackersStatFell, + [STRINGID_DEFENDERSSTATFELL - BATTLESTRINGS_TABLE_START] = sText_DefendersStatFell, + [STRINGID_CRITICALHIT - BATTLESTRINGS_TABLE_START] = sText_CriticalHit, + [STRINGID_ONEHITKO - BATTLESTRINGS_TABLE_START] = sText_OneHitKO, + [STRINGID_123POOF - BATTLESTRINGS_TABLE_START] = sText_123Poof, + [STRINGID_ANDELLIPSIS - BATTLESTRINGS_TABLE_START] = sText_AndEllipsis, + [STRINGID_NOTVERYEFFECTIVE - BATTLESTRINGS_TABLE_START] = sText_NotVeryEffective, + [STRINGID_SUPEREFFECTIVE - BATTLESTRINGS_TABLE_START] = sText_SuperEffective, + [STRINGID_GOTAWAYSAFELY - BATTLESTRINGS_TABLE_START] = sText_GotAwaySafely, + [STRINGID_WILDPKMNFLED - BATTLESTRINGS_TABLE_START] = sText_WildPkmnFled, + [STRINGID_NORUNNINGFROMTRAINERS - BATTLESTRINGS_TABLE_START] = sText_NoRunningFromTrainers, + [STRINGID_CANTESCAPE - BATTLESTRINGS_TABLE_START] = sText_CantEscape, + [STRINGID_DONTLEAVEBIRCH - BATTLESTRINGS_TABLE_START] = sText_EmptyString5, + [STRINGID_BUTNOTHINGHAPPENED - BATTLESTRINGS_TABLE_START] = sText_ButNothingHappened, + [STRINGID_BUTITFAILED - BATTLESTRINGS_TABLE_START] = sText_ButItFailed, + [STRINGID_ITHURTCONFUSION - BATTLESTRINGS_TABLE_START] = sText_ItHurtConfusion, + [STRINGID_MIRRORMOVEFAILED - BATTLESTRINGS_TABLE_START] = sText_MirrorMoveFailed, + [STRINGID_STARTEDTORAIN - BATTLESTRINGS_TABLE_START] = sText_StartedToRain, + [STRINGID_DOWNPOURSTARTED - BATTLESTRINGS_TABLE_START] = sText_DownpourStarted, + [STRINGID_RAINCONTINUES - BATTLESTRINGS_TABLE_START] = sText_RainContinues, + [STRINGID_DOWNPOURCONTINUES - BATTLESTRINGS_TABLE_START] = sText_DownpourContinues, + [STRINGID_RAINSTOPPED - BATTLESTRINGS_TABLE_START] = sText_RainStopped, + [STRINGID_SANDSTORMBREWED - BATTLESTRINGS_TABLE_START] = sText_SandstormBrewed, + [STRINGID_SANDSTORMRAGES - BATTLESTRINGS_TABLE_START] = sText_SandstormRages, + [STRINGID_SANDSTORMSUBSIDED - BATTLESTRINGS_TABLE_START] = sText_SandstormSubsided, + [STRINGID_SUNLIGHTGOTBRIGHT - BATTLESTRINGS_TABLE_START] = sText_SunlightGotBright, + [STRINGID_SUNLIGHTSTRONG - BATTLESTRINGS_TABLE_START] = sText_SunlightStrong, + [STRINGID_SUNLIGHTFADED - BATTLESTRINGS_TABLE_START] = sText_SunlightFaded, + [STRINGID_STARTEDHAIL - BATTLESTRINGS_TABLE_START] = sText_StartedHail, + [STRINGID_HAILCONTINUES - BATTLESTRINGS_TABLE_START] = sText_HailContinues, + [STRINGID_HAILSTOPPED - BATTLESTRINGS_TABLE_START] = sText_HailStopped, + [STRINGID_FAILEDTOSPITUP - BATTLESTRINGS_TABLE_START] = sText_FailedToSpitUp, + [STRINGID_FAILEDTOSWALLOW - BATTLESTRINGS_TABLE_START] = sText_FailedToSwallow, + [STRINGID_WINDBECAMEHEATWAVE - BATTLESTRINGS_TABLE_START] = sText_WindBecameHeatWave, + [STRINGID_STATCHANGESGONE - BATTLESTRINGS_TABLE_START] = sText_StatChangesGone, + [STRINGID_COINSSCATTERED - BATTLESTRINGS_TABLE_START] = sText_CoinsScattered, + [STRINGID_TOOWEAKFORSUBSTITUTE - BATTLESTRINGS_TABLE_START] = sText_TooWeakForSubstitute, + [STRINGID_SHAREDPAIN - BATTLESTRINGS_TABLE_START] = sText_SharedPain, + [STRINGID_BELLCHIMED - BATTLESTRINGS_TABLE_START] = sText_BellChimed, + [STRINGID_FAINTINTHREE - BATTLESTRINGS_TABLE_START] = sText_FaintInThree, + [STRINGID_NOPPLEFT - BATTLESTRINGS_TABLE_START] = sText_NoPPLeft, + [STRINGID_BUTNOPPLEFT - BATTLESTRINGS_TABLE_START] = sText_ButNoPPLeft, + [STRINGID_PLAYERUSEDITEM - BATTLESTRINGS_TABLE_START] = sText_PlayerUsedItem, + [STRINGID_OLDMANUSEDITEM - BATTLESTRINGS_TABLE_START] = sText_OldManUsedItem, + [STRINGID_TRAINERBLOCKEDBALL - BATTLESTRINGS_TABLE_START] = sText_TrainerBlockedBall, + [STRINGID_DONTBEATHIEF - BATTLESTRINGS_TABLE_START] = sText_DontBeAThief, + [STRINGID_ITDODGEDBALL - BATTLESTRINGS_TABLE_START] = sText_ItDodgedBall, + [STRINGID_YOUMISSEDPKMN - BATTLESTRINGS_TABLE_START] = sText_YouMissedPkmn, + [STRINGID_PKMNBROKEFREE - BATTLESTRINGS_TABLE_START] = sText_PkmnBrokeFree, + [STRINGID_ITAPPEAREDCAUGHT - BATTLESTRINGS_TABLE_START] = sText_ItAppearedCaught, + [STRINGID_AARGHALMOSTHADIT - BATTLESTRINGS_TABLE_START] = sText_AarghAlmostHadIt, + [STRINGID_SHOOTSOCLOSE - BATTLESTRINGS_TABLE_START] = sText_ShootSoClose, + [STRINGID_GOTCHAPKMNCAUGHT - BATTLESTRINGS_TABLE_START] = sText_GotchaPkmnCaught, + [STRINGID_GOTCHAPKMNCAUGHT2 - BATTLESTRINGS_TABLE_START] = sText_GotchaPkmnCaught2, + [STRINGID_GIVENICKNAMECAPTURED - BATTLESTRINGS_TABLE_START] = sText_GiveNicknameCaptured, + [STRINGID_PKMNSENTTOPC - BATTLESTRINGS_TABLE_START] = sText_PkmnSentToPC, + [STRINGID_PKMNDATAADDEDTODEX - BATTLESTRINGS_TABLE_START] = sText_PkmnDataAddedToDex, + [STRINGID_ITISRAINING - BATTLESTRINGS_TABLE_START] = sText_ItIsRaining, + [STRINGID_SANDSTORMISRAGING - BATTLESTRINGS_TABLE_START] = sText_SandstormIsRaging, + [STRINGID_CANTESCAPE2 - BATTLESTRINGS_TABLE_START] = sText_CantEscape2, + [STRINGID_PKMNIGNORESASLEEP - BATTLESTRINGS_TABLE_START] = sText_PkmnIgnoresAsleep, + [STRINGID_PKMNIGNOREDORDERS - BATTLESTRINGS_TABLE_START] = sText_PkmnIgnoredOrders, + [STRINGID_PKMNBEGANTONAP - BATTLESTRINGS_TABLE_START] = sText_PkmnBeganToNap, + [STRINGID_PKMNLOAFING - BATTLESTRINGS_TABLE_START] = sText_PkmnLoafing, + [STRINGID_PKMNWONTOBEY - BATTLESTRINGS_TABLE_START] = sText_PkmnWontObey, + [STRINGID_PKMNTURNEDAWAY - BATTLESTRINGS_TABLE_START] = sText_PkmnTurnedAway, + [STRINGID_PKMNPRETENDNOTNOTICE - BATTLESTRINGS_TABLE_START] = sText_PkmnPretendNotNotice, + [STRINGID_ENEMYABOUTTOSWITCHPKMN - BATTLESTRINGS_TABLE_START] = sText_EnemyAboutToSwitchPkmn, + [STRINGID_THREWROCK - BATTLESTRINGS_TABLE_START] = sText_ThrewARock, + [STRINGID_THREWBAIT - BATTLESTRINGS_TABLE_START] = sText_ThrewSomeBait, + [STRINGID_PKMNWATCHINGCAREFULLY - BATTLESTRINGS_TABLE_START] = sText_PkmnWatchingCarefully, + [STRINGID_PKMNANGRY - BATTLESTRINGS_TABLE_START] = sText_PkmnIsAngry, + [STRINGID_PKMNEATING - BATTLESTRINGS_TABLE_START] = sText_PkmnIsEating, + [STRINGID_DUMMY288 - BATTLESTRINGS_TABLE_START] = sText_Empty1, + [STRINGID_DUMMY289 - BATTLESTRINGS_TABLE_START] = sText_Empty1, + [STRINGID_OUTOFSAFARIBALLS - BATTLESTRINGS_TABLE_START] = sText_OutOfSafariBalls, + [STRINGID_PKMNSITEMCUREDPARALYSIS - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemCuredParalysis, + [STRINGID_PKMNSITEMCUREDPOISON - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemCuredPoison, + [STRINGID_PKMNSITEMHEALEDBURN - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemHealedBurn, + [STRINGID_PKMNSITEMDEFROSTEDIT - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemDefrostedIt, + [STRINGID_PKMNSITEMWOKEIT - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemWokeIt, + [STRINGID_PKMNSITEMSNAPPEDOUT - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemSnappedOut, + [STRINGID_PKMNSITEMCUREDPROBLEM - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemCuredProblem, + [STRINGID_PKMNSITEMRESTOREDHEALTH - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemRestoredHealth, + [STRINGID_PKMNSITEMRESTOREDPP - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemRestoredPP, + [STRINGID_PKMNSITEMRESTOREDSTATUS - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemRestoredStatus, + [STRINGID_PKMNSITEMRESTOREDHPALITTLE - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemRestoredHPALittle, + [STRINGID_ITEMALLOWSONLYYMOVE - BATTLESTRINGS_TABLE_START] = sText_ItemAllowsOnlyYMove, + [STRINGID_PKMNHUNGONWITHX - BATTLESTRINGS_TABLE_START] = sText_PkmnHungOnWithX, + [STRINGID_EMPTYSTRING3 - BATTLESTRINGS_TABLE_START] = gText_EmptyString3, + [STRINGID_PKMNSXPREVENTSBURNS - BATTLESTRINGS_TABLE_START] = sText_PkmnsXPreventsBurns, + [STRINGID_PKMNSXBLOCKSY - BATTLESTRINGS_TABLE_START] = sText_PkmnsXBlocksY, + [STRINGID_PKMNSXRESTOREDHPALITTLE2 - BATTLESTRINGS_TABLE_START] = sText_PkmnsXRestoredHPALittle2, + [STRINGID_PKMNSXWHIPPEDUPSANDSTORM - BATTLESTRINGS_TABLE_START] = sText_PkmnsXWhippedUpSandstorm, + [STRINGID_PKMNSXPREVENTSYLOSS - BATTLESTRINGS_TABLE_START] = sText_PkmnsXPreventsYLoss, + [STRINGID_PKMNSXINFATUATEDY - BATTLESTRINGS_TABLE_START] = sText_PkmnsXInfatuatedY, + [STRINGID_PKMNSXMADEYINEFFECTIVE - BATTLESTRINGS_TABLE_START] = sText_PkmnsXMadeYIneffective, + [STRINGID_PKMNSXCUREDYPROBLEM - BATTLESTRINGS_TABLE_START] = sText_PkmnsXCuredYProblem, + [STRINGID_ITSUCKEDLIQUIDOOZE - BATTLESTRINGS_TABLE_START] = sText_ItSuckedLiquidOoze, + [STRINGID_PKMNTRANSFORMED - BATTLESTRINGS_TABLE_START] = sText_PkmnTransformed, + [STRINGID_ELECTRICITYWEAKENED - BATTLESTRINGS_TABLE_START] = sText_ElectricityWeakened, + [STRINGID_FIREWEAKENED - BATTLESTRINGS_TABLE_START] = sText_FireWeakened, + [STRINGID_PKMNHIDUNDERWATER - BATTLESTRINGS_TABLE_START] = sText_PkmnHidUnderwater, + [STRINGID_PKMNSPRANGUP - BATTLESTRINGS_TABLE_START] = sText_PkmnSprangUp, + [STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_TABLE_START] = sText_HMMovesCantBeForgotten, + [STRINGID_XFOUNDONEY - BATTLESTRINGS_TABLE_START] = sText_XFoundOneY, + [STRINGID_PLAYERDEFEATEDTRAINER1 - BATTLESTRINGS_TABLE_START] = sText_PlayerDefeatedLinkTrainerTrainer1, + [STRINGID_SOOTHINGAROMA - BATTLESTRINGS_TABLE_START] = sText_SoothingAroma, + [STRINGID_ITEMSCANTBEUSEDNOW - BATTLESTRINGS_TABLE_START] = sText_ItemsCantBeUsedNow, + [STRINGID_FORXCOMMAYZ - BATTLESTRINGS_TABLE_START] = sText_ForXCommaYZ, + [STRINGID_USINGITEMSTATOFPKMNROSE - BATTLESTRINGS_TABLE_START] = sText_UsingItemTheStatOfPkmnRose, + [STRINGID_PKMNUSEDXTOGETPUMPED - BATTLESTRINGS_TABLE_START] = sText_PkmnUsedXToGetPumped, + [STRINGID_PKMNSXMADEYUSELESS - BATTLESTRINGS_TABLE_START] = sText_PkmnsXMadeYUseless, + [STRINGID_PKMNTRAPPEDBYSANDTOMB - BATTLESTRINGS_TABLE_START] = sText_PkmnTrappedBySandTomb, + [STRINGID_EMPTYSTRING4 - BATTLESTRINGS_TABLE_START] = sText_EmptyString4, + [STRINGID_ABOOSTED - BATTLESTRINGS_TABLE_START] = sText_ABoosted, + [STRINGID_PKMNSXINTENSIFIEDSUN - BATTLESTRINGS_TABLE_START] = sText_PkmnsXIntensifiedSun, + [STRINGID_PKMNMAKESGROUNDMISS - BATTLESTRINGS_TABLE_START] = sText_PkmnMakesGroundMiss, + [STRINGID_YOUTHROWABALLNOWRIGHT - BATTLESTRINGS_TABLE_START] = sText_YouThrowABallNowRight, + [STRINGID_PKMNSXTOOKATTACK - BATTLESTRINGS_TABLE_START] = sText_PkmnsXTookAttack, + [STRINGID_PKMNCHOSEXASDESTINY - BATTLESTRINGS_TABLE_START] = sText_PkmnChoseXAsDestiny, + [STRINGID_PKMNLOSTFOCUS - BATTLESTRINGS_TABLE_START] = sText_PkmnLostFocus, + [STRINGID_USENEXTPKMN - BATTLESTRINGS_TABLE_START] = sText_UseNextPkmn, + [STRINGID_PKMNFLEDUSINGITS - BATTLESTRINGS_TABLE_START] = sText_PkmnFledUsingIts, + [STRINGID_PKMNFLEDUSING - BATTLESTRINGS_TABLE_START] = sText_PkmnFledUsing, + [STRINGID_PKMNWASDRAGGEDOUT - BATTLESTRINGS_TABLE_START] = sText_PkmnWasDraggedOut, + [STRINGID_PREVENTEDFROMWORKING - BATTLESTRINGS_TABLE_START] = sText_PreventedFromWorking, + [STRINGID_PKMNSITEMNORMALIZEDSTATUS - BATTLESTRINGS_TABLE_START] = sText_PkmnsItemNormalizedStatus, + [STRINGID_TRAINER1USEDITEM - BATTLESTRINGS_TABLE_START] = sText_Trainer1UsedItem, + [STRINGID_BOXISFULL - BATTLESTRINGS_TABLE_START] = sText_BoxIsFull, + [STRINGID_PKMNAVOIDEDATTACK - BATTLESTRINGS_TABLE_START] = sText_PkmnAvoidedAttack, + [STRINGID_PKMNSXMADEITINEFFECTIVE - BATTLESTRINGS_TABLE_START] = sText_PkmnsXMadeItIneffective, + [STRINGID_PKMNSXPREVENTSFLINCHING - BATTLESTRINGS_TABLE_START] = sText_PkmnsXPreventsFlinching, + [STRINGID_PKMNALREADYHASBURN - BATTLESTRINGS_TABLE_START] = sText_PkmnAlreadyHasBurn, + [STRINGID_STATSWONTDECREASE2 - BATTLESTRINGS_TABLE_START] = sText_StatsWontDecrease2, + [STRINGID_PKMNSXBLOCKSY2 - BATTLESTRINGS_TABLE_START] = sText_PkmnsXBlocksY2, + [STRINGID_PKMNSXWOREOFF - BATTLESTRINGS_TABLE_START] = sText_PkmnsXWoreOff, + [STRINGID_PKMNRAISEDDEFALITTLE - BATTLESTRINGS_TABLE_START] = sText_PkmnRaisedDefALittle, + [STRINGID_PKMNRAISEDSPDEFALITTLE - BATTLESTRINGS_TABLE_START] = sText_PkmnRaisedSpDefALittle, + [STRINGID_THEWALLSHATTERED - BATTLESTRINGS_TABLE_START] = sText_TheWallShattered, + [STRINGID_PKMNSXPREVENTSYSZ - BATTLESTRINGS_TABLE_START] = sText_PkmnsXPreventsYsZ, + [STRINGID_PKMNSXCUREDITSYPROBLEM - BATTLESTRINGS_TABLE_START] = sText_PkmnsXCuredItsYProblem, + [STRINGID_ATTACKERCANTESCAPE - BATTLESTRINGS_TABLE_START] = sText_AttackerCantEscape, + [STRINGID_PKMNOBTAINEDX - BATTLESTRINGS_TABLE_START] = sText_PkmnObtainedX, + [STRINGID_PKMNOBTAINEDX2 - BATTLESTRINGS_TABLE_START] = sText_PkmnObtainedX2, + [STRINGID_PKMNOBTAINEDXYOBTAINEDZ - BATTLESTRINGS_TABLE_START] = sText_PkmnObtainedXYObtainedZ, + [STRINGID_BUTNOEFFECT - BATTLESTRINGS_TABLE_START] = sText_ButNoEffect, + [STRINGID_PKMNSXHADNOEFFECTONY - BATTLESTRINGS_TABLE_START] = sText_PkmnsXHadNoEffectOnY, + [STRINGID_OAKPLAYERWON - BATTLESTRINGS_TABLE_START] = gText_WinEarnsPrizeMoney, + [STRINGID_OAKPLAYERLOST - BATTLESTRINGS_TABLE_START] = gText_HowDissapointing, + [STRINGID_PLAYERLOSTAGAINSTENEMYTRAINER - BATTLESTRINGS_TABLE_START] = sText_PlayerWhiteoutAgainstTrainer, + [STRINGID_PLAYERPAIDPRIZEMONEY - BATTLESTRINGS_TABLE_START] = sText_PlayerPaidAsPrizeMoney, + [STRINGID_PKMNTRANSFERREDSOMEONESPC - BATTLESTRINGS_TABLE_START] = Text_MonSentToBoxInSomeonesPC, + [STRINGID_PKMNTRANSFERREDBILLSPC - BATTLESTRINGS_TABLE_START] = Text_MonSentToBoxInBillsPC, + [STRINGID_PKMNBOXSOMEONESPCFULL - BATTLESTRINGS_TABLE_START] = Text_MonSentToBoxSomeonesBoxFull, + [STRINGID_PKMNBOXBILLSPCFULL - BATTLESTRINGS_TABLE_START] = Text_MonSentToBoxBillsBoxFull, + [STRINGID_POKEDUDEUSED - BATTLESTRINGS_TABLE_START] = sText_PokedudeUsedItem, + [STRINGID_POKEFLUTECATCHY - BATTLESTRINGS_TABLE_START] = sText_PlayedFluteCatchyTune, + [STRINGID_POKEFLUTE - BATTLESTRINGS_TABLE_START] = sText_PlayedThe, + [STRINGID_MONHEARINGFLUTEAWOKE - BATTLESTRINGS_TABLE_START] = sText_PkmnHearingFluteAwoke, + [STRINGID_TRAINER2CLASS - BATTLESTRINGS_TABLE_START] = sText_Trainer2Class, + [STRINGID_TRAINER2NAME - BATTLESTRINGS_TABLE_START] = sText_Trainer2Name, + [STRINGID_PLAYERWHITEDOUT - BATTLESTRINGS_TABLE_START] = sText_PlayerWhiteout2, + [STRINGID_MONTOOSCAREDTOMOVE - BATTLESTRINGS_TABLE_START] = sText_TooScaredToMove, + [STRINGID_GHOSTGETOUTGETOUT - BATTLESTRINGS_TABLE_START] = sText_GetOutGetOut, + [STRINGID_SILPHSCOPEUNVEILED - BATTLESTRINGS_TABLE_START] = sText_SilphScopeUnveil, + [STRINGID_GHOSTWASMAROWAK - BATTLESTRINGS_TABLE_START] = sText_TheGhostWas, + [STRINGID_TRAINER1MON1COMEBACK - BATTLESTRINGS_TABLE_START] = sText_Trainer1RecallPkmn1, + [STRINGID_TRAINER1WINTEXT - BATTLESTRINGS_TABLE_START] = sText_Trainer1WinText, + [STRINGID_TRAINER1MON2COMEBACK - BATTLESTRINGS_TABLE_START] = sText_Trainer1RecallPkmn2, + [STRINGID_TRAINER1MON1AND2COMEBACK - BATTLESTRINGS_TABLE_START] = sText_Trainer1RecallBoth }; const u16 gMissStringIds[] = { @@ -1042,7 +1042,7 @@ const u16 gTransformUsedStringIds[] = { STRINGID_BUTITFAILED }; -const u16 gSubsituteUsedStringIds[] = { +const u16 gSubstituteUsedStringIds[] = { STRINGID_PKMNMADESUBSTITUTE, STRINGID_TOOWEAKFORSUBSTITUTE }; @@ -1087,7 +1087,7 @@ const u16 gAttractUsedStringIds[] = { STRINGID_PKMNSXINFATUATEDY }; -const u16 gLeechSeedDrainStringIds[] = { +const u16 gAbsorbDrainStringIds[] = { STRINGID_PKMNENERGYDRAINED, STRINGID_ITSUCKEDLIQUIDOOZE }; @@ -1117,7 +1117,7 @@ const u16 gBallEscapeStringIds[] = { STRINGID_SHOOTSOCLOSE }; -const u16 gWeatherContinuesStringIds[] = { +const u16 gWeatherStartsStringIds[] = { STRINGID_ITISRAINING, STRINGID_ITISRAINING, STRINGID_ITISRAINING, From 95b16a2391a1a9d3700ca0722097aa691fa098ee Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 1 Aug 2022 15:16:58 -0400 Subject: [PATCH 58/64] Review changes from https://github.com/pret/pokeemerald/pull/1721 --- include/pokemon_storage_system_internal.h | 4 +--- src/pokemon_storage_system_6.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/pokemon_storage_system_internal.h b/include/pokemon_storage_system_internal.h index 3890928e4..3582d1f32 100644 --- a/include/pokemon_storage_system_internal.h +++ b/include/pokemon_storage_system_internal.h @@ -16,8 +16,6 @@ // between 2 Pokémon with held items #define MAX_ITEM_ICONS 3 -#define MAX_MENU_ITEMS 7 - enum { MODE_PARTY, @@ -308,7 +306,7 @@ struct PokemonStorageSystemData /* 0c66 */ u8 iconScrollState; /* 0c67 */ u8 iconScrollToBoxId; // Unused duplicate of scrollToBoxId /* 0c68 */ struct WindowTemplate menuWindow; - /* 0c70 */ struct StorageMenu menuItems[MAX_MENU_ITEMS]; + /* 0c70 */ struct StorageMenu menuItems[7]; /* 0ca8 */ u8 menuItemsCount; /* 0ca9 */ u8 menuWidth; /* 0caa */ u8 menuUnusedField; // Never read. diff --git a/src/pokemon_storage_system_6.c b/src/pokemon_storage_system_6.c index 773c0f8aa..6b8b4f67d 100644 --- a/src/pokemon_storage_system_6.c +++ b/src/pokemon_storage_system_6.c @@ -58,7 +58,7 @@ static const u8 *const sMenuTexts[] = { void SetMenuText(u8 textId) { - if (gPSSData->menuItemsCount < MAX_MENU_ITEMS) + if (gPSSData->menuItemsCount < ARRAY_COUNT(gPSSData->menuItems)) { u8 len; struct StorageMenu *menu = &gPSSData->menuItems[gPSSData->menuItemsCount]; From b1bc05ec058df4b6af848dd166f60070fae5df6b Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 1 Aug 2022 15:37:00 -0400 Subject: [PATCH 59/64] Review changes --- include/constants/battle_anim.h | 4 ++-- src/mon_markings.c | 11 +++-------- src/pokemon_storage_system_8.c | 32 ++++++++++++++++---------------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 1e946dd1a..4363b7fca 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -354,9 +354,9 @@ #define B_ANIM_BAIT_THROW 0x4 #define B_ANIM_ITEM_KNOCKOFF 0x5 #define B_ANIM_TURN_TRAP 0x6 -#define B_ANIM_HELD_ITEM_EFFECT 0x7 +#define B_ANIM_HELD_ITEM_EFFECT 0x7 #define B_ANIM_SMOKEBALL_ESCAPE 0x8 -#define B_ANIM_FOCUS_BAND 0x9 +#define B_ANIM_FOCUS_BAND 0x9 #define B_ANIM_RAIN_CONTINUES 0xA #define B_ANIM_SUN_CONTINUES 0xB #define B_ANIM_SANDSTORM_CONTINUES 0xC diff --git a/src/mon_markings.c b/src/mon_markings.c index d444538e5..da633aacf 100644 --- a/src/mon_markings.c +++ b/src/mon_markings.c @@ -356,9 +356,8 @@ void FreeMonMarkingsMenu(void) u16 i; for (i = 0; i < 3; i++) - { FreeSpriteTilesByTag(sMenu->baseTileTag + i); - } + FreeSpritePaletteByTag(sMenu->basePaletteTag); FreeSpritePaletteByTag(sMenu->basePaletteTag + 1); for (i = 0; i < ARRAY_COUNT(sMenu->windowSprites); i++) @@ -385,20 +384,16 @@ bool8 HandleMonMarkingsMenuInput(void) if (JOY_NEW(DPAD_UP)) { - s8 pos; PlaySE(SE_SELECT); - pos = --sMenu->cursorPos; - if (pos < 0) + if (--sMenu->cursorPos < 0) sMenu->cursorPos = SELECTION_CANCEL; return TRUE; } if (JOY_NEW(DPAD_DOWN)) { - s8 pos; PlaySE(SE_SELECT); - pos = ++sMenu->cursorPos; - if (pos > SELECTION_CANCEL) + if (++sMenu->cursorPos > SELECTION_CANCEL) sMenu->cursorPos = 0; return TRUE; } diff --git a/src/pokemon_storage_system_8.c b/src/pokemon_storage_system_8.c index b14eb9844..cdd7728a2 100644 --- a/src/pokemon_storage_system_8.c +++ b/src/pokemon_storage_system_8.c @@ -595,25 +595,25 @@ void InitItemInfoWindow(void) bool8 UpdateItemInfoWindowSlideIn(void) { - s32 i, var; + s32 i, pos; if (gPSSData->itemInfoWindowOffset == 0) return FALSE; gPSSData->itemInfoWindowOffset--; - var = 25 - gPSSData->itemInfoWindowOffset; - for (i = 0; i < var; i++) + pos = 25 - gPSSData->itemInfoWindowOffset; + for (i = 0; i < pos; i++) { WriteSequenceToBgTilemapBuffer(0, GetBgAttribute(0, BG_ATTR_BASETILE) + 0x14 + gPSSData->itemInfoWindowOffset + i, i, 12, 1, 8, 15, 25); } - DrawItemInfoWindow(var); + DrawItemInfoWindow(pos); return (gPSSData->itemInfoWindowOffset != 0); } bool8 UpdateItemInfoWindowSlideOut(void) { - s32 i, var; + s32 i, pos; if (gPSSData->itemInfoWindowOffset == 25) return FALSE; @@ -622,28 +622,28 @@ bool8 UpdateItemInfoWindowSlideOut(void) FillBgTilemapBufferRect(0, 0, 25, 11, 1, 10, 17); gPSSData->itemInfoWindowOffset++; - var = 25 - gPSSData->itemInfoWindowOffset; - for (i = 0; i < var; i++) + pos = 25 - gPSSData->itemInfoWindowOffset; + for (i = 0; i < pos; i++) { WriteSequenceToBgTilemapBuffer(0, GetBgAttribute(0, BG_ATTR_BASETILE) + 0x14 + gPSSData->itemInfoWindowOffset + i, i, 12, 1, 8, 15, 25); } - DrawItemInfoWindow(var); + DrawItemInfoWindow(pos); - FillBgTilemapBufferRect(0, 0, var, 11, 1, 10, 0x11); + FillBgTilemapBufferRect(0, 0, pos, 11, 1, 10, 0x11); return (gPSSData->itemInfoWindowOffset != 25); } -static void DrawItemInfoWindow(u32 pos) +static void DrawItemInfoWindow(u32 x) { - if (pos != 0) + if (x != 0) { - FillBgTilemapBufferRect(0, 0x1A4, 0, 0xB, pos, 1, 0xFu); - FillBgTilemapBufferRect(0, 0x9A4, 0, 0x14, pos, 1, 0xFu); + FillBgTilemapBufferRect(0, 0x1A4, 0, 0xB, x, 1, 0xFu); + FillBgTilemapBufferRect(0, 0x9A4, 0, 0x14, x, 1, 0xFu); } - FillBgTilemapBufferRect(0, 0x1A5, pos, 0xC, 1, 8, 0xFu); - FillBgTilemapBufferRect(0, 0x1A6, pos, 0xB, 1, 1, 0xFu); - FillBgTilemapBufferRect(0, 0x1A7, pos, 0x14, 1, 1, 0xFu); + FillBgTilemapBufferRect(0, 0x1A5, x, 0xC, 1, 8, 0xFu); + FillBgTilemapBufferRect(0, 0x1A6, x, 0xB, 1, 1, 0xFu); + FillBgTilemapBufferRect(0, 0x1A7, x, 0x14, 1, 1, 0xFu); ScheduleBgCopyTilemapToVram(0); } From 686c8383e596c47d03f3e318534170ea2fb41b55 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Fri, 5 Aug 2022 14:18:53 +0800 Subject: [PATCH 60/64] Document src/save.c --- common_syms/save.txt | 12 +- include/save.h | 119 +++--- src/berry_crush.c | 4 +- src/cereader_tool.c | 8 +- src/dodrio_berry_picking_2.c | 4 +- src/hall_of_fame.c | 4 +- src/intro.c | 2 +- src/pokemon_jump.c | 4 +- src/quest_log.c | 2 +- src/reset_save_heap.c | 2 +- src/save.c | 719 ++++++++++++++++++----------------- src/save_failed_screen.c | 4 +- src/start_menu.c | 10 +- src/title_screen.c | 2 +- src/trade_scene.c | 8 +- 15 files changed, 449 insertions(+), 455 deletions(-) diff --git a/common_syms/save.txt b/common_syms/save.txt index a0106f6fa..8b2ecc95a 100644 --- a/common_syms/save.txt +++ b/common_syms/save.txt @@ -1,12 +1,12 @@ -gFirstSaveSector -gPrevSaveCounter +gLastWrittenSector +gLastSaveCounter gLastKnownGoodSector gDamagedSaveSectors gSaveCounter -gFastSaveSection -gUnknown_3005398 +gSaveDataBufferPtr +gIncrementalSectorId gSaveUnusedVar gSaveFileStatus gGameContinueCallback -gRamSaveSectionLocations -gSaveSucceeded +gRamSaveSectorLocations +gSaveAttemptStatus diff --git a/include/save.h b/include/save.h index f1357bd27..bea8c7189 100644 --- a/include/save.h +++ b/include/save.h @@ -3,13 +3,34 @@ #include "global.h" -#define NUM_SECTORS 32 // defined in agb_flash but not in a header +// Each 4 KiB flash sector contains 3968 bytes of actual data followed by a 128 byte footer. +// Only 12 bytes of the footer are used. +#define SECTOR_DATA_SIZE 3968 +#define SECTOR_FOOTER_SIZE 128 +#define SECTOR_SIZE (SECTOR_DATA_SIZE + SECTOR_FOOTER_SIZE) -#define SAVE_STATUS_EMPTY 0 -#define SAVE_STATUS_OK 1 +#define FILE_SIGNATURE 0x08012025 // signature value to determine if a sector is in use + +#define SPECIAL_SECTOR_SENTINEL 0xB39D + +#define SECTOR_ID_SAVEBLOCK2 0 +#define SECTOR_ID_SAVEBLOCK1_START 1 +#define SECTOR_ID_SAVEBLOCK1_END 4 +#define SECTOR_ID_PKMN_STORAGE_START 5 +#define SECTOR_ID_PKMN_STORAGE_END 13 +#define NUM_SECTORS_PER_SLOT 14 +// Save Slot 1: 0-13; Save Slot 2: 14-27 +#define SECTOR_ID_HOF_1 28 +#define SECTOR_ID_HOF_2 29 +#define SECTOR_ID_TRAINER_TOWER_1 30 +#define SECTOR_ID_TRAINER_TOWER_2 31 +#define SECTORS_COUNT 32 + +#define SAVE_STATUS_EMPTY 0 +#define SAVE_STATUS_OK 1 #define SAVE_STATUS_INVALID 2 #define SAVE_STATUS_NO_FLASH 4 -#define SAVE_STATUS_ERROR 0xFF +#define SAVE_STATUS_ERROR 0xFF enum { @@ -21,45 +42,33 @@ enum SAVE_HALL_OF_FAME_ERASE_BEFORE, // unused }; -struct SaveBlockChunk +// A save sector location holds a pointer to the data for a particular sector +// and the size of that data. Size cannot be greater than SECTOR_DATA_SIZE. +struct SaveSectorLocation { u8 *data; u16 size; }; -struct SaveSection +struct SaveSector { - u8 data[0xFF4]; + u8 data[SECTOR_DATA_SIZE]; + u8 unused[SECTOR_FOOTER_SIZE - 12]; // Unused portion of the footer u16 id; u16 checksum; u32 signature; u32 counter; }; // size is 0x1000 -// headless save section? -struct UnkSaveSection -{ - u8 data[0xFF4]; - u32 signature; -}; // size is 0xFF8 +#define SECTOR_SIGNATURE_OFFSET offsetof(struct SaveSector, signature) +#define SECTOR_COUNTER_OFFSET offsetof(struct SaveSector, counter) -struct SaveSectionOffsets -{ - u16 toAdd; - u16 size; -}; +// Special sector id value for certain save functions +// to indicate that all sectors should be used +// instead of a specific sector. +#define FULL_SAVE_SLOT 0xFFFF -// Emerald changes this definition to be the sectors per slot. -#define NUM_SECTORS_PER_SAVE_SLOT 14 // Number of sectors occupied by a save slot - -#define UNKNOWN_CHECK_VALUE 0x8012025 - -#define SECTOR_SAVE1(n) (n) -#define SECTOR_SAVE2(n) ((n) + NUM_SECTORS_PER_SAVE_SLOT) -#define SECTOR_HOF(n) ((n) + 2 * NUM_SECTORS_PER_SAVE_SLOT) -#define SECTOR_TTOWER(n) ((n) + 2 * NUM_SECTORS_PER_SAVE_SLOT + 2) - -// SetSectorDamagedStatus states +// operations for SetDamagedSectorBits enum { ENABLE, @@ -67,53 +76,27 @@ enum CHECK // unused }; -extern u16 gFirstSaveSector; -extern u32 gPrevSaveCounter; -extern u16 gLastKnownGoodSector; extern u32 gDamagedSaveSectors; -extern u32 gSaveCounter; -extern struct SaveSection *gFastSaveSection; // the pointer is in fast IWRAM but may sometimes point to the slower EWRAM. -extern u16 gUnknown_3005398; -extern u16 gSaveUnusedVar; +extern struct SaveSector *gSaveDataBufferPtr; // the pointer is in fast IWRAM but points to the slower EWRAM. extern u16 gSaveFileStatus; extern void (*gGameContinueCallback)(void); -extern struct SaveBlockChunk gRamSaveSectionLocations[0xE]; -extern u16 gSaveSucceeded; +extern u16 gSaveAttemptStatus; -extern struct SaveSection gSaveDataBuffer; +extern struct SaveSector gSaveDataBuffer; void ClearSaveData(void); void Save_ResetSaveCounters(void); -bool32 SetSectorDamagedStatus(u8 op, u8 bit); -u8 save_write_to_flash(u16 a1, const struct SaveBlockChunk *location); -u8 HandleWriteSector(u16 a1, const struct SaveBlockChunk *location); -u8 HandleWriteSectorNBytes(u8 sector, u8 *data, u16 size); -u8 TryWriteSector(u8 sector, u8 *data); -u32 RestoreSaveBackupVarsAndIncrement(const struct SaveBlockChunk *location); -u32 RestoreSaveBackupVars(const struct SaveBlockChunk *location); -u8 sub_80D9AA4(u16 a1, const struct SaveBlockChunk *location); -u8 sub_80D9B04(u16 a1, const struct SaveBlockChunk *location); -u8 ClearSaveData_2(u16 a1, const struct SaveBlockChunk *location); -u8 sav12_xor_get(u16 a1, const struct SaveBlockChunk *location); -u8 sub_80D9D88(u16 a1, const struct SaveBlockChunk *location); -u8 sub_80D9E14(u16 a1, const struct SaveBlockChunk *location); -u8 sub_80D9E54(u16 a1, const struct SaveBlockChunk *location); -u8 GetSaveValidStatus(const struct SaveBlockChunk *location); -u8 sub_80DA120(u8 a1, u8 *data, u16 size); -u8 DoReadFlashWholeSection(u8 sector, struct SaveSection *section); -u16 CalculateChecksum(void *data, u16 size); -void UpdateSaveAddresses(void); u8 HandleSavingData(u8 saveType); u8 TrySavingData(u8 saveType); -u8 SaveGame_AfterLinkTrade(void); -bool8 AfterLinkTradeSaveFailed(void); -u8 ClearSaveAfterLinkTradeSaveFailure(void); -u8 sub_80DA434(void); -u8 sub_80DA45C(void); -bool8 sub_80DA4A0(void); -u8 Save_LoadGameData(u8 saveType); -u32 TryCopySpecialSaveSection(u8 sector, u8 *dst); -u32 TryWriteSpecialSaveSection(u8 sector, u8 *src); -void Task_LinkSave(u8 taskId); +bool8 LinkFullSave_Init(void); +bool8 LinkFullSave_WriteSector(void); +bool8 LinkFullSave_ReplaceLastSector(void); +bool8 LinkFullSave_SetLastSectorSignature(void); +bool8 WriteSaveBlock2(void); +bool8 WriteSaveBlock1Sector(void); +u8 LoadGameSave(u8 saveType); +u32 TryReadSpecialSaveSector(u8 sector, u8 *dst); +u32 TryWriteSpecialSaveSector(u8 sector, u8 *src); +void Task_LinkFullSave(u8 taskId); #endif // GUARD_SAVE_H diff --git a/src/berry_crush.c b/src/berry_crush.c index 2daca7913..7843ce5cb 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -2224,10 +2224,10 @@ static u32 Cmd_SaveGame(struct BerryCrushGame * game, u8 *args) DrawDialogueFrame(0, FALSE); AddTextPrinterParameterized2(0, FONT_2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_FULL); - CreateTask(Task_LinkSave, 0); + CreateTask(Task_LinkFullSave, 0); break; case 3: - if (FuncIsActiveTask(Task_LinkSave)) + if (FuncIsActiveTask(Task_LinkFullSave)) return 0; break; case 4: diff --git a/src/cereader_tool.c b/src/cereader_tool.c index d00caffd8..96fa195cc 100644 --- a/src/cereader_tool.c +++ b/src/cereader_tool.c @@ -47,11 +47,11 @@ static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerTowerSet * tt memset(buffer, 0, 0x1000); memcpy(buffer, ttdata, SEC30_SIZE); buffer[1] = sub_815D654(); - if (TryWriteSpecialSaveSection(SECTOR_TTOWER(0), buffer) != TRUE) + if (TryWriteSpecialSaveSector(SECTOR_ID_TRAINER_TOWER_1, buffer) != TRUE) return FALSE; memset(buffer, 0, 0x1000); memcpy(buffer, (u8 *)ttdata + SEC30_SIZE, SEC31_SIZE); - if (TryWriteSpecialSaveSection(SECTOR_TTOWER(1), buffer) != TRUE) + if (TryWriteSpecialSaveSector(SECTOR_ID_TRAINER_TOWER_2, buffer) != TRUE) return FALSE; return TRUE; } @@ -66,11 +66,11 @@ bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerTowerSet * ttdata) static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerTowerSet * ttdata, void *buffer) { - if (TryCopySpecialSaveSection(SECTOR_TTOWER(0), buffer) != 1) + if (TryReadSpecialSaveSector(SECTOR_ID_TRAINER_TOWER_1, buffer) != 1) return FALSE; memcpy(ttdata + 0x000, buffer, SEC30_SIZE); - if (TryCopySpecialSaveSection(SECTOR_TTOWER(1), buffer) != 1) + if (TryReadSpecialSaveSector(SECTOR_ID_TRAINER_TOWER_2, buffer) != 1) return FALSE; memcpy((u8 *)ttdata + SEC30_SIZE, buffer, SEC31_SIZE); diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c index 758524ba0..74d5fcacd 100644 --- a/src/dodrio_berry_picking_2.c +++ b/src/dodrio_berry_picking_2.c @@ -1431,12 +1431,12 @@ static void sub_8155A78(void) case 2: if (!IsDma3ManagerBusyWithBgCopy()) { - CreateTask(Task_LinkSave, 0); + CreateTask(Task_LinkFullSave, 0); gUnknown_203F440->state++; } break; case 3: - if (!FuncIsActiveTask(Task_LinkSave)) + if (!FuncIsActiveTask(Task_LinkFullSave)) gUnknown_203F440->state++; break; default: diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index b1fd76876..67aabf80c 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -429,7 +429,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) } else { - if (Save_LoadGameData(SAVE_HALL_OF_FAME) != TRUE) + if (LoadGameSave(SAVE_HALL_OF_FAME) != SAVE_STATUS_OK) memset(gDecompressionBuffer, 0, 0x2000); } @@ -759,7 +759,7 @@ static void Task_HofPC_CopySaveData(u8 taskId) struct HallofFameTeam* savedTeams; CreateTopBarWindowLoadPalette(0, 30, 0, 0x0C, 0x226); - if (Save_LoadGameData(SAVE_HALL_OF_FAME) != SAVE_STATUS_OK) + if (LoadGameSave(SAVE_HALL_OF_FAME) != SAVE_STATUS_OK) { gTasks[taskId].func = Task_HofPC_PrintDataIsCorrupted; } diff --git a/src/intro.c b/src/intro.c index fd6875eee..471cc4fcd 100644 --- a/src/intro.c +++ b/src/intro.c @@ -872,7 +872,7 @@ void c2_copyright_1(void) { ResetMenuAndMonGlobals(); Save_ResetSaveCounters(); - Save_LoadGameData(SAVE_NORMAL); + LoadGameSave(SAVE_NORMAL); if (gSaveFileStatus == SAVE_STATUS_EMPTY || gSaveFileStatus == SAVE_STATUS_INVALID) Sav2_ClearSetDefault(); SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound); diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 6bfea1553..a29397d37 100644 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -1620,12 +1620,12 @@ static bool32 SavePokeJump(void) case 2: if (AreLinkQueuesEmpty()) { - CreateTask(Task_LinkSave, 6); + CreateTask(Task_LinkFullSave, 6); sPokemonJump->mainState++; } break; case 3: - if (!FuncIsActiveTask(Task_LinkSave)) + if (!FuncIsActiveTask(Task_LinkFullSave)) { ClearMessageWindow(); sPokemonJump->mainState++; diff --git a/src/quest_log.c b/src/quest_log.c index 1e3ba901d..7eeb76e04 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -809,7 +809,7 @@ static void QuestLog_StartFinalScene(void) { ResetSpecialVars(); Save_ResetSaveCounters(); - Save_LoadGameData(SAVE_NORMAL); + LoadGameSave(SAVE_NORMAL); SetMainCallback2(CB2_EnterFieldFromQuestLog); gFieldCallback2 = FieldCB2_FinalScene; FreeAllWindowBuffers(); diff --git a/src/reset_save_heap.c b/src/reset_save_heap.c index 20527fa85..d016d7349 100644 --- a/src/reset_save_heap.c +++ b/src/reset_save_heap.c @@ -18,7 +18,7 @@ void ResetSaveHeap(void) SetSaveBlocksPointers(); ResetMenuAndMonGlobals(); Save_ResetSaveCounters(); - Save_LoadGameData(SAVE_NORMAL); + LoadGameSave(SAVE_NORMAL); if (gSaveFileStatus == SAVE_STATUS_EMPTY || gSaveFileStatus == SAVE_STATUS_INVALID) Sav2_ClearSetDefault(); SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound); diff --git a/src/save.c b/src/save.c index 33ea7ccfd..61c97a3a8 100644 --- a/src/save.c +++ b/src/save.c @@ -9,15 +9,13 @@ #include "fieldmap.h" #include "gba/flash_internal.h" -#define FILE_SIGNATURE 0x08012025 // signature value to determine if a sector is in use - -#define TOTAL_FLASH_SECTORS 32 - -// Divide save blocks into individual chunks to be written to flash sectors - -// Each 4 KiB flash sector contains 3968 bytes of actual data followed by a 128 byte footer -#define SECTOR_DATA_SIZE 3968 -#define SECTOR_FOOTER_SIZE 128 +static u8 HandleWriteSector(u16 sectorId, const struct SaveSectorLocation *locations); +static u8 TryWriteSector(u8 sectorNum, u8 *data); +static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *locations); +static u8 CopySaveSlotData(u16 sectorId, const struct SaveSectorLocation *locations); +static u8 GetSaveValidStatus(const struct SaveSectorLocation *locations); +static u8 ReadFlashSector(u8 sectorId, struct SaveSector *sector); +static u16 CalculateChecksum(void *data, u16 size); /* * Sector Layout: @@ -25,8 +23,7 @@ * Sectors 0 - 13: Save Slot 1 * Sectors 14 - 27: Save Slot 2 * Sectors 28 - 29: Hall of Fame - * Sector 30: e-Reader/Mystery Gift Stuff (note: e-Reader is deprecated in Emerald US) - * Sector 31: Recorded Battle + * Sectors 30 - 31: Trainer Tower * * There are two save slots for saving the player's game data. We alternate between * them each time the game is saved, so that if the current save slot is corrupt, @@ -34,6 +31,8 @@ * so that the same data is not always being written to the same sector. This * might be done to reduce wear on the flash memory, but I'm not sure, since all * 14 sectors get written anyway. + * + * See SECTOR_ID_* constants in save.h */ // (u8 *)structure was removed from the first statement of the macro in Emerald @@ -46,16 +45,20 @@ min(sizeof(structure) - chunkNum * SECTOR_DATA_SIZE, SECTOR_DATA_SIZE) : 0 \ } -const struct SaveSectionOffsets gSaveSectionOffsets[] = +struct { - SAVEBLOCK_CHUNK(gSaveBlock2, 0), + u16 offset; + u16 size; +} static const sSaveSlotLayout[] = +{ + SAVEBLOCK_CHUNK(gSaveBlock2, 0), // SECTOR_ID_SAVEBLOCK2 - SAVEBLOCK_CHUNK(gSaveBlock1, 0), + SAVEBLOCK_CHUNK(gSaveBlock1, 0), // SECTOR_ID_SAVEBLOCK1_START SAVEBLOCK_CHUNK(gSaveBlock1, 1), SAVEBLOCK_CHUNK(gSaveBlock1, 2), - SAVEBLOCK_CHUNK(gSaveBlock1, 3), + SAVEBLOCK_CHUNK(gSaveBlock1, 3), // SECTOR_ID_SAVEBLOCK1_END - SAVEBLOCK_CHUNK(gPokemonStorage, 0), + SAVEBLOCK_CHUNK(gPokemonStorage, 0), // SECTOR_ID_PKMN_STORAGE_START SAVEBLOCK_CHUNK(gPokemonStorage, 1), SAVEBLOCK_CHUNK(gPokemonStorage, 2), SAVEBLOCK_CHUNK(gPokemonStorage, 3), @@ -63,42 +66,42 @@ const struct SaveSectionOffsets gSaveSectionOffsets[] = SAVEBLOCK_CHUNK(gPokemonStorage, 5), SAVEBLOCK_CHUNK(gPokemonStorage, 6), SAVEBLOCK_CHUNK(gPokemonStorage, 7), - SAVEBLOCK_CHUNK(gPokemonStorage, 8) + SAVEBLOCK_CHUNK(gPokemonStorage, 8), // SECTOR_ID_PKMN_STORAGE_END }; // Sector num to begin writing save data. Sectors are rotated each time the game is saved. (possibly to avoid wear on flash memory?) -u16 gFirstSaveSector; -u32 gPrevSaveCounter; +u16 gLastWrittenSector; +u32 gLastSaveCounter; u16 gLastKnownGoodSector; u32 gDamagedSaveSectors; u32 gSaveCounter; -struct SaveSection *gFastSaveSection; // the pointer is in fast IWRAM but may sometimes point to the slower EWRAM. -u16 gUnknown_3005398; +struct SaveSector *gSaveDataBufferPtr; // the pointer is in fast IWRAM but points to the slower EWRAM. +u16 gIncrementalSectorId; u16 gSaveUnusedVar; u16 gSaveFileStatus; void (*gGameContinueCallback)(void); -struct SaveBlockChunk gRamSaveSectionLocations[0xE]; -u16 gSaveSucceeded; +struct SaveSectorLocation gRamSaveSectorLocations[NUM_SECTORS_PER_SLOT]; +u16 gSaveAttemptStatus; -EWRAM_DATA struct SaveSection gSaveDataBuffer = {0}; +EWRAM_DATA struct SaveSector gSaveDataBuffer = {0}; EWRAM_DATA u32 gSaveUnusedVar2 = 0; void ClearSaveData(void) { u16 i; - for (i = 0; i < NUM_SECTORS; i++) + for (i = 0; i < SECTORS_COUNT; i++) EraseFlashSector(i); } void Save_ResetSaveCounters(void) { gSaveCounter = 0; - gFirstSaveSector = 0; + gLastWrittenSector = 0; gDamagedSaveSectors = 0; } -bool32 SetSectorDamagedStatus(u8 op, u8 sectorNum) +static bool32 SetDamagedSectorBits(u8 op, u8 sectorNum) { bool32 retVal = FALSE; @@ -119,206 +122,198 @@ bool32 SetSectorDamagedStatus(u8 op, u8 sectorNum) return retVal; } -// If chunkId is 0xFFFF, this function will write all of the chunks pointed to by 'chunks'. -// Otherwise, it will write a single chunk with the given 'chunkId'. -u8 save_write_to_flash(u16 chunkId, const struct SaveBlockChunk *chunks) +static u8 WriteSaveSectorOrSlot(u16 sectorId, const struct SaveSectorLocation *locations) { - u32 retVal; + u32 status; u16 i; - gFastSaveSection = &gSaveDataBuffer; + gSaveDataBufferPtr = &gSaveDataBuffer; - if (chunkId != 0xFFFF) // write single chunk + if (sectorId != FULL_SAVE_SLOT) // write single sector + status = HandleWriteSector(sectorId, locations); + + else // write all sectors { - retVal = HandleWriteSector(chunkId, chunks); - } - else // write all chunks - { - gLastKnownGoodSector = gFirstSaveSector; // backup the current written sector before attempting to write. - gPrevSaveCounter = gSaveCounter; - gFirstSaveSector++; - gFirstSaveSector %= NUM_SECTORS_PER_SAVE_SLOT; // array count save sector locations + gLastKnownGoodSector = gLastWrittenSector; // backup the current written sector before attempting to write. + gLastSaveCounter = gSaveCounter; + gLastWrittenSector++; + gLastWrittenSector %= NUM_SECTORS_PER_SLOT; // array count save sector locations gSaveCounter++; - retVal = SAVE_STATUS_OK; + status = SAVE_STATUS_OK; - for (i = 0; i < NUM_SECTORS_PER_SAVE_SLOT; i++) - HandleWriteSector(i, chunks); + for (i = 0; i < NUM_SECTORS_PER_SLOT; i++) + HandleWriteSector(i, locations); // Check for any bad sectors if (gDamagedSaveSectors != 0) // skip the damaged sector. { - retVal = SAVE_STATUS_ERROR; - gFirstSaveSector = gLastKnownGoodSector; - gSaveCounter = gPrevSaveCounter; + status = SAVE_STATUS_ERROR; + gLastWrittenSector = gLastKnownGoodSector; + gSaveCounter = gLastSaveCounter; } } - return retVal; + return status; } -u8 HandleWriteSector(u16 chunkId, const struct SaveBlockChunk *chunks) +static u8 HandleWriteSector(u16 sectorId, const struct SaveSectorLocation *locations) { u16 i; u16 sectorNum; - u8 *chunkData; - u16 chunkSize; + u8 *data; + u16 size; - // select sector number - sectorNum = chunkId + gFirstSaveSector; - sectorNum %= NUM_SECTORS_PER_SAVE_SLOT; - // select save slot - sectorNum += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); + sectorNum = gLastWrittenSector + sectorId; + sectorNum %= NUM_SECTORS_PER_SLOT; + sectorNum += NUM_SECTORS_PER_SLOT * (gSaveCounter % 2); - chunkData = chunks[chunkId].data; - chunkSize = chunks[chunkId].size; + data = locations[sectorId].data; + size = locations[sectorId].size; - // clear save section. - for (i = 0; i < sizeof(struct SaveSection); i++) - ((char *)gFastSaveSection)[i] = 0; + // clear buffer + for (i = 0; i < SECTOR_SIZE; i++) + ((char *)gSaveDataBufferPtr)[i] = 0; - gFastSaveSection->id = chunkId; - gFastSaveSection->signature = FILE_SIGNATURE; - gFastSaveSection->counter = gSaveCounter; - - for (i = 0; i < chunkSize; i++) - gFastSaveSection->data[i] = chunkData[i]; - - gFastSaveSection->checksum = CalculateChecksum(chunkData, chunkSize); - return TryWriteSector(sectorNum, gFastSaveSection->data); -} - -u8 HandleWriteSectorNBytes(u8 sector, u8 *data, u16 size) -{ - u16 i; - struct SaveSection *section = &gSaveDataBuffer; - - for (i = 0; i < sizeof(struct SaveSection); i++) - ((char *)section)[i] = 0; - - section->signature = FILE_SIGNATURE; + // fill buffer with save data + gSaveDataBufferPtr->id = sectorId; + gSaveDataBufferPtr->signature = FILE_SIGNATURE; + gSaveDataBufferPtr->counter = gSaveCounter; for (i = 0; i < size; i++) - section->data[i] = data[i]; + gSaveDataBufferPtr->data[i] = data[i]; - section->id = CalculateChecksum(data, size); // though this appears to be incorrect, it might be some sector checksum instead of a whole save checksum and only appears to be relevent to HOF data, if used. - return TryWriteSector(sector, section->data); + gSaveDataBufferPtr->checksum = CalculateChecksum(data, size); + return TryWriteSector(sectorNum, gSaveDataBufferPtr->data); } -u8 TryWriteSector(u8 sectorNum, u8 *data) +static u8 HandleWriteSectorNBytes(u8 sectorId, u8 *data, u16 size) { - if (ProgramFlashSectorAndVerify(sectorNum, data) != 0) // is damaged? + u16 i; + struct SaveSector *sector = &gSaveDataBuffer; + + for (i = 0; i < SECTOR_SIZE; i++) + ((char *)sector)[i] = 0; + + sector->signature = FILE_SIGNATURE; + + for (i = 0; i < size; i++) + sector->data[i] = data[i]; + + sector->id = CalculateChecksum(data, size); // though this appears to be incorrect, it might be some sector checksum instead of a whole save checksum and only appears to be relevent to HOF data, if used. + return TryWriteSector(sectorId, sector->data); +} + +static u8 TryWriteSector(u8 sectorNum, u8 *data) +{ + if (ProgramFlashSectorAndVerify(sectorNum, data)) // is damaged? { - SetSectorDamagedStatus(ENABLE, sectorNum); // set damaged sector bits. + SetDamagedSectorBits(ENABLE, sectorNum); // set damaged sector bits. return SAVE_STATUS_ERROR; } else { - SetSectorDamagedStatus(DISABLE, sectorNum); // unset damaged sector bits. it's safe now. + SetDamagedSectorBits(DISABLE, sectorNum); // unset damaged sector bits. it's safe now. return SAVE_STATUS_OK; } } -u32 RestoreSaveBackupVarsAndIncrement(const struct SaveBlockChunk *chunk) // chunk is unused +static u32 RestoreSaveBackupVarsAndIncrement(const struct SaveSectorLocation *locations) { - gFastSaveSection = &gSaveDataBuffer; - gLastKnownGoodSector = gFirstSaveSector; - gPrevSaveCounter = gSaveCounter; - gFirstSaveSector++; - gFirstSaveSector %= NUM_SECTORS_PER_SAVE_SLOT; + gSaveDataBufferPtr = &gSaveDataBuffer; + gLastKnownGoodSector = gLastWrittenSector; + gLastSaveCounter = gSaveCounter; + gLastWrittenSector++; + gLastWrittenSector %= NUM_SECTORS_PER_SLOT; gSaveCounter++; - gUnknown_3005398 = 0; + gIncrementalSectorId = 0; gDamagedSaveSectors = 0; return 0; } -u32 RestoreSaveBackupVars(const struct SaveBlockChunk *chunk) // chunk is unused +static u32 RestoreSaveBackupVars(const struct SaveSectorLocation *locations) { - gFastSaveSection = &gSaveDataBuffer; - gLastKnownGoodSector = gFirstSaveSector; - gPrevSaveCounter = gSaveCounter; - gUnknown_3005398 = 0; + gSaveDataBufferPtr = &gSaveDataBuffer; + gLastKnownGoodSector = gLastWrittenSector; + gLastSaveCounter = gSaveCounter; + gIncrementalSectorId = 0; gDamagedSaveSectors = 0; return 0; } -u8 sub_80D9AA4(u16 a1, const struct SaveBlockChunk *chunk) +static u8 HandleWriteIncrementalSector(u16 numSectors, const struct SaveSectorLocation *locations) { - u8 retVal; + u8 status; - if (gUnknown_3005398 < a1 - 1) + if (gIncrementalSectorId < numSectors - 1) { - retVal = SAVE_STATUS_OK; - HandleWriteSector(gUnknown_3005398, chunk); - gUnknown_3005398++; + status = SAVE_STATUS_OK; + HandleWriteSector(gIncrementalSectorId, locations); + gIncrementalSectorId++; if (gDamagedSaveSectors) { - retVal = SAVE_STATUS_ERROR; - gFirstSaveSector = gLastKnownGoodSector; - gSaveCounter = gPrevSaveCounter; + status = SAVE_STATUS_ERROR; + gLastWrittenSector = gLastKnownGoodSector; + gSaveCounter = gLastSaveCounter; } } else - { - retVal = SAVE_STATUS_ERROR; - } + status = SAVE_STATUS_ERROR; - return retVal; + return status; } -u8 sub_80D9B04(u16 a1, const struct SaveBlockChunk *chunk) +static u8 HandleReplaceSectorAndVerify(u16 sectorId, const struct SaveSectorLocation *locations) { - u8 retVal = SAVE_STATUS_OK; + u8 status = SAVE_STATUS_OK; - ClearSaveData_2(a1 - 1, chunk); + HandleReplaceSector(sectorId - 1, locations); if (gDamagedSaveSectors) { - retVal = SAVE_STATUS_ERROR; - gFirstSaveSector = gLastKnownGoodSector; - gSaveCounter = gPrevSaveCounter; + status = SAVE_STATUS_ERROR; + gLastWrittenSector = gLastKnownGoodSector; + gSaveCounter = gLastSaveCounter; } - return retVal; + return status; } -u8 ClearSaveData_2(u16 chunkId, const struct SaveBlockChunk *chunks) +static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *locations) { u16 i; - u16 sector; + u16 sectorNum; u8 *data; u16 size; u8 status; - // select sector number - sector = chunkId + gFirstSaveSector; - sector %= NUM_SECTORS_PER_SAVE_SLOT; - // select save slot - sector += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); + sectorNum = gLastWrittenSector + sectorId; + sectorNum %= NUM_SECTORS_PER_SLOT; + sectorNum += NUM_SECTORS_PER_SLOT * (gSaveCounter % 2); - data = chunks[chunkId].data; - size = chunks[chunkId].size; + data = locations[sectorId].data; + size = locations[sectorId].size; - // clear temp save section. - for (i = 0; i < sizeof(struct SaveSection); i++) - ((char *)gFastSaveSection)[i] = 0; + // clear buffer + for (i = 0; i < SECTOR_SIZE; i++) + ((char *)gSaveDataBufferPtr)[i] = 0; - gFastSaveSection->id = chunkId; - gFastSaveSection->signature = FILE_SIGNATURE; - gFastSaveSection->counter = gSaveCounter; - - // set temp section's data. + // fill buffer with save data + gSaveDataBufferPtr->id = sectorId; + gSaveDataBufferPtr->signature = FILE_SIGNATURE; + gSaveDataBufferPtr->counter = gSaveCounter; for (i = 0; i < size; i++) - gFastSaveSection->data[i] = data[i]; + gSaveDataBufferPtr->data[i] = data[i]; - // calculate checksum. - gFastSaveSection->checksum = CalculateChecksum(data, size); + gSaveDataBufferPtr->checksum = CalculateChecksum(data, size); - EraseFlashSector(sector); + // erase old save data + EraseFlashSector(sectorNum); status = SAVE_STATUS_OK; - for (i = 0; i < sizeof(struct UnkSaveSection); i++) + // write new save data, excluding the signature and counter fields + for (i = 0; i < SECTOR_SIGNATURE_OFFSET; i++) { - if (ProgramFlashByte(sector, i, gFastSaveSection->data[i])) + if (ProgramFlashByte(sectorNum, i, gSaveDataBufferPtr->data[i])) { status = SAVE_STATUS_ERROR; break; @@ -327,16 +322,18 @@ u8 ClearSaveData_2(u16 chunkId, const struct SaveBlockChunk *chunks) if (status == SAVE_STATUS_ERROR) { - SetSectorDamagedStatus(ENABLE, sector); + SetDamagedSectorBits(ENABLE, sectorNum); return SAVE_STATUS_ERROR; } else { status = SAVE_STATUS_OK; - for (i = 0; i < 7; i++) + // write signature (skipping the first byte) and counter fields + // the first signature byte skipped is instead written in WriteSectorSignatureByte + for (i = 0; i < SECTOR_SIZE - (SECTOR_SIGNATURE_OFFSET + 1); i++) { - if (ProgramFlashByte(sector, 0xFF9 + i, ((u8 *)gFastSaveSection)[0xFF9 + i])) + if (ProgramFlashByte(sectorNum, SECTOR_SIGNATURE_OFFSET + 1 + i, ((u8 *)gSaveDataBufferPtr)[SECTOR_SIGNATURE_OFFSET + 1 + i])) { status = SAVE_STATUS_ERROR; break; @@ -345,109 +342,108 @@ u8 ClearSaveData_2(u16 chunkId, const struct SaveBlockChunk *chunks) if (status == SAVE_STATUS_ERROR) { - SetSectorDamagedStatus(ENABLE, sector); + SetDamagedSectorBits(ENABLE, sectorNum); return SAVE_STATUS_ERROR; } else { - SetSectorDamagedStatus(DISABLE, sector); + SetDamagedSectorBits(DISABLE, sectorNum); return SAVE_STATUS_OK; } } } -u8 sav12_xor_get(u16 a1, const struct SaveBlockChunk *chunk) +static u8 CopySectorSignatureByte(u16 sectorId, const struct SaveSectorLocation *locations) { u16 sector; - // select sector number - sector = a1 + gFirstSaveSector - 1; - sector %= NUM_SECTORS_PER_SAVE_SLOT; - // select save slot - sector += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); + sector = gLastWrittenSector + sectorId - 1; + sector %= NUM_SECTORS_PER_SLOT; + sector += NUM_SECTORS_PER_SLOT * (gSaveCounter % 2); - if (ProgramFlashByte(sector, sizeof(struct UnkSaveSection), ((u8 *)gFastSaveSection)[sizeof(struct UnkSaveSection)])) + if (ProgramFlashByte(sector, SECTOR_SIGNATURE_OFFSET, ((u8 *)gSaveDataBufferPtr)[SECTOR_SIGNATURE_OFFSET])) { // sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter. - SetSectorDamagedStatus(ENABLE, sector); - gFirstSaveSector = gLastKnownGoodSector; - gSaveCounter = gPrevSaveCounter; + SetDamagedSectorBits(ENABLE, sector); + gLastWrittenSector = gLastKnownGoodSector; + gSaveCounter = gLastSaveCounter; return SAVE_STATUS_ERROR; } else { - SetSectorDamagedStatus(DISABLE, sector); + SetDamagedSectorBits(DISABLE, sector); return SAVE_STATUS_OK; } } -u8 sub_80D9D88(u16 a1, const struct SaveBlockChunk *chunk) +static u8 WriteSectorSignatureByte(u16 sectorId, const struct SaveSectorLocation *locations) { u16 sector; - sector = a1 + gFirstSaveSector - 1; - sector %= NUM_SECTORS_PER_SAVE_SLOT; - sector += NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); + sector = gLastWrittenSector + sectorId - 1; + sector %= NUM_SECTORS_PER_SLOT; + sector += NUM_SECTORS_PER_SLOT * (gSaveCounter % 2); - if (ProgramFlashByte(sector, sizeof(struct UnkSaveSection), 0x25)) + // write only the first byte of the signature, which was skipped in HandleReplaceSector + if (ProgramFlashByte(sector, SECTOR_SIGNATURE_OFFSET, FILE_SIGNATURE & 0xFF)) { // sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter. - SetSectorDamagedStatus(ENABLE, sector); - gFirstSaveSector = gLastKnownGoodSector; - gSaveCounter = gPrevSaveCounter; + SetDamagedSectorBits(ENABLE, sector); + gLastWrittenSector = gLastKnownGoodSector; + gSaveCounter = gLastSaveCounter; return SAVE_STATUS_ERROR; } else { - SetSectorDamagedStatus(DISABLE, sector); + SetDamagedSectorBits(DISABLE, sector); return SAVE_STATUS_OK; } } -u8 sub_80D9E14(u16 a1, const struct SaveBlockChunk *chunk) +static u8 TryLoadSaveSlot(u16 sectorId, const struct SaveSectorLocation *locations) { - u8 retVal; - gFastSaveSection = &gSaveDataBuffer; - if (a1 != 0xFFFF) - { - retVal = SAVE_STATUS_ERROR; - } + u8 status; + gSaveDataBufferPtr = &gSaveDataBuffer; + if (sectorId != FULL_SAVE_SLOT) + status = SAVE_STATUS_ERROR; + else { - retVal = GetSaveValidStatus(chunk); - sub_80D9E54(0xFFFF, chunk); + status = GetSaveValidStatus(locations); + CopySaveSlotData(FULL_SAVE_SLOT, locations); } - return retVal; + return status; } -u8 sub_80D9E54(u16 a1, const struct SaveBlockChunk *chunks) +// sectorId is unused. All sectors in the save slot are read and copied. +static u8 CopySaveSlotData(u16 sectorId, const struct SaveSectorLocation *locations) { u16 i; u16 checksum; - u16 sector = NUM_SECTORS_PER_SAVE_SLOT * (gSaveCounter % 2); + u16 sector = NUM_SECTORS_PER_SLOT * (gSaveCounter % 2); u16 id; - for (i = 0; i < NUM_SECTORS_PER_SAVE_SLOT; i++) + for (i = 0; i < NUM_SECTORS_PER_SLOT; i++) { - DoReadFlashWholeSection(i + sector, gFastSaveSection); - id = gFastSaveSection->id; + ReadFlashSector(i + sector, gSaveDataBufferPtr); + id = gSaveDataBufferPtr->id; if (id == 0) - gFirstSaveSector = i; - checksum = CalculateChecksum(gFastSaveSection->data, chunks[id].size); - if (gFastSaveSection->signature == FILE_SIGNATURE - && gFastSaveSection->checksum == checksum) + gLastWrittenSector = i; + + checksum = CalculateChecksum(gSaveDataBufferPtr->data, locations[id].size); + if (gSaveDataBufferPtr->signature == FILE_SIGNATURE && gSaveDataBufferPtr->checksum == checksum) { u16 j; - for (j = 0; j < chunks[id].size; j++) - chunks[id].data[j] = gFastSaveSection->data[j]; + for (j = 0; j < locations[id].size; j++) + locations[id].data[j] = gSaveDataBufferPtr->data[j]; } } - return 1; + return SAVE_STATUS_OK; } -u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) +static u8 GetSaveValidStatus(const struct SaveSectorLocation *locations) { u16 sector; bool8 signatureValid; @@ -457,22 +453,22 @@ u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) u8 slot1Status; u8 slot2Status; u32 validSectors; - const u32 ALL_SECTORS = (1 << NUM_SECTORS_PER_SAVE_SLOT) - 1; // bitmask of all saveblock sectors + const u32 ALL_SECTORS = (1 << NUM_SECTORS_PER_SLOT) - 1; // bitmask of all saveblock sectors // check save slot 1. validSectors = 0; signatureValid = FALSE; - for (sector = 0; sector < NUM_SECTORS_PER_SAVE_SLOT; sector++) + for (sector = 0; sector < NUM_SECTORS_PER_SLOT; sector++) { - DoReadFlashWholeSection(sector, gFastSaveSection); - if (gFastSaveSection->signature == FILE_SIGNATURE) + ReadFlashSector(sector, gSaveDataBufferPtr); + if (gSaveDataBufferPtr->signature == FILE_SIGNATURE) { signatureValid = TRUE; - checksum = CalculateChecksum(gFastSaveSection->data, chunks[gFastSaveSection->id].size); - if (gFastSaveSection->checksum == checksum) + checksum = CalculateChecksum(gSaveDataBufferPtr->data, locations[gSaveDataBufferPtr->id].size); + if (gSaveDataBufferPtr->checksum == checksum) { - slot1saveCounter = gFastSaveSection->counter; - validSectors |= 1 << gFastSaveSection->id; + slot1saveCounter = gSaveDataBufferPtr->counter; + validSectors |= 1 << gSaveDataBufferPtr->id; } } } @@ -485,24 +481,22 @@ u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) slot1Status = SAVE_STATUS_ERROR; } else - { slot1Status = SAVE_STATUS_EMPTY; - } // check save slot 2. validSectors = 0; signatureValid = FALSE; - for (sector = 0; sector < NUM_SECTORS_PER_SAVE_SLOT; sector++) + for (sector = 0; sector < NUM_SECTORS_PER_SLOT; sector++) { - DoReadFlashWholeSection(NUM_SECTORS_PER_SAVE_SLOT + sector, gFastSaveSection); - if (gFastSaveSection->signature == FILE_SIGNATURE) + ReadFlashSector(NUM_SECTORS_PER_SLOT + sector, gSaveDataBufferPtr); + if (gSaveDataBufferPtr->signature == FILE_SIGNATURE) { signatureValid = TRUE; - checksum = CalculateChecksum(gFastSaveSection->data, chunks[gFastSaveSection->id].size); - if (gFastSaveSection->checksum == checksum) + checksum = CalculateChecksum(gSaveDataBufferPtr->data, locations[gSaveDataBufferPtr->id].size); + if (gSaveDataBufferPtr->checksum == checksum) { - slot2saveCounter = gFastSaveSection->counter; - validSectors |= 1 << gFastSaveSection->id; + slot2saveCounter = gSaveDataBufferPtr->counter; + validSectors |= 1 << gSaveDataBufferPtr->id; } } } @@ -515,9 +509,7 @@ u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) slot2Status = SAVE_STATUS_ERROR; } else - { slot2Status = SAVE_STATUS_EMPTY; - } if (slot1Status == SAVE_STATUS_OK && slot2Status == SAVE_STATUS_OK) { @@ -560,48 +552,46 @@ u8 GetSaveValidStatus(const struct SaveBlockChunk *chunks) if (slot1Status == SAVE_STATUS_EMPTY && slot2Status == SAVE_STATUS_EMPTY) { gSaveCounter = 0; - gFirstSaveSector = 0; + gLastWrittenSector = 0; return SAVE_STATUS_EMPTY; } gSaveCounter = 0; - gFirstSaveSector = 0; - return 2; + gLastWrittenSector = 0; + return SAVE_STATUS_INVALID; } -u8 sub_80DA120(u8 sector, u8 *data, u16 size) +static u8 TryLoadSaveSector(u8 sectorId, u8 *data, u16 size) { u16 i; - struct SaveSection *section = &gSaveDataBuffer; + struct SaveSector *sector = &gSaveDataBuffer; - DoReadFlashWholeSection(sector, section); - if (section->signature == FILE_SIGNATURE) + ReadFlashSector(sectorId, sector); + if (sector->signature == FILE_SIGNATURE) { - u16 checksum = CalculateChecksum(section->data, size); - if (section->id == checksum) + u16 checksum = CalculateChecksum(sector->data, size); + if (sector->id == checksum) { for (i = 0; i < size; i++) - data[i] = section->data[i]; + data[i] = sector->data[i]; + return SAVE_STATUS_OK; } else - { return SAVE_STATUS_INVALID; - } + } else - { return SAVE_STATUS_EMPTY; - } } -u8 DoReadFlashWholeSection(u8 sector, struct SaveSection *section) +static u8 ReadFlashSector(u8 sectorId, struct SaveSector *sector) { - ReadFlash(sector, 0, section->data, sizeof(struct SaveSection)); + ReadFlash(sectorId, 0, sector->data, SECTOR_SIZE); return 1; } -u16 CalculateChecksum(void *data, u16 size) +static u16 CalculateChecksum(void *data, u16 size) { u16 i; u32 checksum = 0; @@ -617,25 +607,23 @@ u16 CalculateChecksum(void *data, u16 size) return ((checksum >> 16) + checksum); } -void UpdateSaveAddresses(void) +static void UpdateSaveAddresses(void) { int i = 0; - gRamSaveSectionLocations[i].data = (void *)(gSaveBlock2Ptr) + gSaveSectionOffsets[i].toAdd; - gRamSaveSectionLocations[i].size = gSaveSectionOffsets[i].size; + gRamSaveSectorLocations[i].data = (void *)(gSaveBlock2Ptr) + sSaveSlotLayout[i].offset; + gRamSaveSectorLocations[i].size = sSaveSlotLayout[i].size; - for (i = 1; i < 5; i++) + for (i = SECTOR_ID_SAVEBLOCK1_START; i <= SECTOR_ID_SAVEBLOCK1_END; i++) { - gRamSaveSectionLocations[i].data = (void *)(gSaveBlock1Ptr) + gSaveSectionOffsets[i].toAdd; - gRamSaveSectionLocations[i].size = gSaveSectionOffsets[i].size; + gRamSaveSectorLocations[i].data = (void *)(gSaveBlock1Ptr) + sSaveSlotLayout[i].offset; + gRamSaveSectorLocations[i].size = sSaveSlotLayout[i].size; } - for (i = 5; i < 14; i++) + for (/*i = SECTOR_ID_PKMN_STORAGE_START*/; i <= SECTOR_ID_PKMN_STORAGE_END; i++) // do not initialize here to ensure matching { - gRamSaveSectionLocations[i].data = (void *)(gPokemonStoragePtr) + gSaveSectionOffsets[i].toAdd; - gRamSaveSectionLocations[i].size = gSaveSectionOffsets[i].size; - - i++;i--; // needed to match + gRamSaveSectorLocations[i].data = (void *)(gPokemonStoragePtr) + sSaveSlotLayout[i].offset; + gRamSaveSectorLocations[i].size = sSaveSlotLayout[i].size; } } @@ -649,36 +637,38 @@ u8 HandleSavingData(u8 saveType) UpdateSaveAddresses(); switch (saveType) { - case SAVE_HALL_OF_FAME_ERASE_BEFORE: // deletes HOF before overwriting HOF completely. unused - for (i = 0xE * 2 + 0; i < 32; i++) + case SAVE_HALL_OF_FAME_ERASE_BEFORE: // Unused + for (i = SECTOR_ID_HOF_1; i < SECTORS_COUNT; i++) EraseFlashSector(i); // fallthrough - case SAVE_HALL_OF_FAME: // hall of fame. + case SAVE_HALL_OF_FAME: if (GetGameStat(GAME_STAT_ENTERED_HOF) < 999) IncrementGameStat(GAME_STAT_ENTERED_HOF); tempAddr = gDecompressionBuffer; - HandleWriteSectorNBytes(0x1C, tempAddr, 0xF80); - HandleWriteSectorNBytes(0x1D, tempAddr + 0xF80, 0xF80); + HandleWriteSectorNBytes(SECTOR_ID_HOF_1, tempAddr, SECTOR_DATA_SIZE); + HandleWriteSectorNBytes(SECTOR_ID_HOF_2, tempAddr + SECTOR_DATA_SIZE, SECTOR_DATA_SIZE); // fallthrough - case SAVE_NORMAL: // normal save. also called by overwriting your own save. + case SAVE_NORMAL: default: SaveSerializedGame(); - save_write_to_flash(0xFFFF, gRamSaveSectionLocations); + WriteSaveSectorOrSlot(FULL_SAVE_SLOT, gRamSaveSectorLocations); break; - case SAVE_LINK: // _081532C4 + case SAVE_LINK: SaveSerializedGame(); - for(i = 0; i < 5; i++) - save_write_to_flash(i, gRamSaveSectionLocations); + // only SaveBlock2 and SaveBlock1 (ignores storage in PC) + for(i = SECTOR_ID_SAVEBLOCK2; i <= SECTOR_ID_SAVEBLOCK1_END; i++) + WriteSaveSectorOrSlot(i, gRamSaveSectorLocations); break; - case SAVE_EREADER: + case SAVE_EREADER: // unused SaveSerializedGame(); - save_write_to_flash(0, gRamSaveSectionLocations); + // only SaveBlock2 + WriteSaveSectorOrSlot(SECTOR_ID_SAVEBLOCK2, gRamSaveSectorLocations); break; case SAVE_OVERWRITE_DIFFERENT_FILE: - for (i = (0xE * 2 + 0); i < 32; i++) - EraseFlashSector(i); // erase HOF. + for (i = SECTOR_ID_HOF_1; i < SECTORS_COUNT; i++) + EraseFlashSector(i); SaveSerializedGame(); - save_write_to_flash(0xFFFF, gRamSaveSectionLocations); + WriteSaveSectorOrSlot(FULL_SAVE_SLOT, gRamSaveSectorLocations); break; } gMain.vblankCounter1 = backupPtr; @@ -687,91 +677,107 @@ u8 HandleSavingData(u8 saveType) u8 TrySavingData(u8 saveType) { - if(gFlashMemoryPresent == TRUE) + if (gFlashMemoryPresent != TRUE) { - HandleSavingData(saveType); - if(gDamagedSaveSectors) - DoSaveFailedScreen(saveType); - else - goto OK; // really? + gSaveAttemptStatus = SAVE_STATUS_ERROR; + return SAVE_STATUS_ERROR; } - gSaveSucceeded = 0xFF; - return 0xFF; -OK: - gSaveSucceeded = 1; - return 1; -} - -u8 SaveGame_AfterLinkTrade(void) -{ - if (gFlashMemoryPresent != TRUE) - return 1; - UpdateSaveAddresses(); - SaveSerializedGame(); - RestoreSaveBackupVarsAndIncrement(gRamSaveSectionLocations); - return 0; -} - -bool8 AfterLinkTradeSaveFailed(void) -{ - u8 retVal = sub_80D9AA4(0xE, gRamSaveSectionLocations); - if (gDamagedSaveSectors) - DoSaveFailedScreen(SAVE_NORMAL); - if (retVal == SAVE_STATUS_ERROR) - return 1; - else - return 0; -} - -u8 ClearSaveAfterLinkTradeSaveFailure(void) -{ - sub_80D9B04(0xE, gRamSaveSectionLocations); - if (gDamagedSaveSectors) - DoSaveFailedScreen(SAVE_NORMAL); - return 0; -} - -u8 sub_80DA434(void) -{ - sav12_xor_get(0xE, gRamSaveSectionLocations); - if (gDamagedSaveSectors) - DoSaveFailedScreen(SAVE_NORMAL); - return 0; -} - -u8 sub_80DA45C(void) -{ - if (gFlashMemoryPresent != TRUE) - return 1; - - UpdateSaveAddresses(); - SaveSerializedGame(); - RestoreSaveBackupVars(gRamSaveSectionLocations); - sub_80D9B04(gUnknown_3005398 + 1, gRamSaveSectionLocations); - return 0; -} - -bool8 sub_80DA4A0(void) -{ - u8 retVal = FALSE; - u16 val = ++gUnknown_3005398; - if (val <= 4) + HandleSavingData(saveType); + if (!gDamagedSaveSectors) { - sub_80D9B04(gUnknown_3005398 + 1, gRamSaveSectionLocations); - sub_80D9D88(val, gRamSaveSectionLocations); + gSaveAttemptStatus = SAVE_STATUS_OK; + return SAVE_STATUS_OK; } else { - sub_80D9D88(val, gRamSaveSectionLocations); - retVal = TRUE; + DoSaveFailedScreen(saveType); + gSaveAttemptStatus = SAVE_STATUS_ERROR; + return SAVE_STATUS_ERROR; + } +} + +bool8 LinkFullSave_Init(void) +{ + if (gFlashMemoryPresent != TRUE) + return TRUE; + + UpdateSaveAddresses(); + SaveSerializedGame(); + RestoreSaveBackupVarsAndIncrement(gRamSaveSectorLocations); + return FALSE; +} + +bool8 LinkFullSave_WriteSector(void) +{ + u8 status = HandleWriteIncrementalSector(NUM_SECTORS_PER_SLOT, gRamSaveSectorLocations); + if (gDamagedSaveSectors) + DoSaveFailedScreen(SAVE_NORMAL); + + if (status == SAVE_STATUS_ERROR) + return TRUE; + else + return FALSE; +} + +bool8 LinkFullSave_ReplaceLastSector(void) +{ + HandleReplaceSectorAndVerify(NUM_SECTORS_PER_SLOT, gRamSaveSectorLocations); + if (gDamagedSaveSectors) + DoSaveFailedScreen(SAVE_NORMAL); + + return FALSE; +} + +bool8 LinkFullSave_SetLastSectorSignature(void) +{ + CopySectorSignatureByte(NUM_SECTORS_PER_SLOT, gRamSaveSectorLocations); + if (gDamagedSaveSectors) + DoSaveFailedScreen(SAVE_NORMAL); + + return FALSE; +} + +bool8 WriteSaveBlock2(void) +{ + if (gFlashMemoryPresent != TRUE) + return TRUE; + + UpdateSaveAddresses(); + SaveSerializedGame(); + RestoreSaveBackupVars(gRamSaveSectorLocations); + + // Because RestoreSaveBackupVars is called immediately prior, + // gIncrementalSectorId will always be 0 (SECTOR_ID_SAVEBLOCK2) at this point, + // so this function only saves the first sector (SECTOR_ID_SAVEBLOCK2) + HandleReplaceSectorAndVerify(gIncrementalSectorId + 1, gRamSaveSectorLocations); + return FALSE; +} + +// Used in conjunction with WriteSaveBlock2 to write both for certain link saves. +// This is called repeatedly in a task, writing one sector of SaveBlock1 each time it is called. +// Returns TRUE when all sectors of SaveBlock1 have been written. +bool8 WriteSaveBlock1Sector(void) +{ + u8 finished = FALSE; + u16 sectorId = ++gIncrementalSectorId; + if (sectorId <= SECTOR_ID_SAVEBLOCK1_END) + { + HandleReplaceSectorAndVerify(gIncrementalSectorId + 1, gRamSaveSectorLocations); + WriteSectorSignatureByte(sectorId, gRamSaveSectorLocations); + } + else + { + WriteSectorSignatureByte(sectorId, gRamSaveSectorLocations); + finished = TRUE; } if (gDamagedSaveSectors) DoSaveFailedScreen(SAVE_LINK); - return retVal; + + return finished; } -u8 Save_LoadGameData(u8 saveType) +u8 LoadGameSave(u8 saveType) { u8 result; @@ -786,66 +792,71 @@ u8 Save_LoadGameData(u8 saveType) { case SAVE_NORMAL: default: - result = sub_80D9E14(0xFFFF, gRamSaveSectionLocations); + result = TryLoadSaveSlot(FULL_SAVE_SLOT, gRamSaveSectorLocations); LoadSerializedGame(); gSaveFileStatus = result; - gGameContinueCallback = 0; + gGameContinueCallback = NULL; break; case SAVE_HALL_OF_FAME: - result = sub_80DA120(SECTOR_HOF(0), gDecompressionBuffer, 0xF80); + result = TryLoadSaveSector(SECTOR_ID_HOF_1, gDecompressionBuffer, SECTOR_DATA_SIZE); if (result == SAVE_STATUS_OK) - result = sub_80DA120(SECTOR_HOF(1), gDecompressionBuffer + 0xF80, 0xF80); + result = TryLoadSaveSector(SECTOR_ID_HOF_2, gDecompressionBuffer + SECTOR_DATA_SIZE, SECTOR_DATA_SIZE); break; } return result; } -u32 TryCopySpecialSaveSection(u8 sector, u8 *dst) +u32 TryReadSpecialSaveSector(u8 sectorId, u8 *dst) { s32 i; s32 size; u8 *savData; - if (sector != SECTOR_TTOWER(0) && sector != SECTOR_TTOWER(1)) - return 0xFF; - ReadFlash(sector, 0, (u8 *)&gSaveDataBuffer, sizeof(struct SaveSection)); - if (*(u32 *)(&gSaveDataBuffer.data[0]) != 0xB39D) - return 0xFF; - // copies whole save section except u32 counter + if (sectorId != SECTOR_ID_TRAINER_TOWER_1 && sectorId != SECTOR_ID_TRAINER_TOWER_2) + return SAVE_STATUS_ERROR; + + ReadFlash(sectorId, 0, (u8 *)&gSaveDataBuffer, SECTOR_SIZE); + if (*(u32 *)(&gSaveDataBuffer.data[0]) != SPECIAL_SECTOR_SENTINEL) + return SAVE_STATUS_ERROR; + + // copies whole save sector except the counter field i = 0; - size = 0xFFB; - savData = &gSaveDataBuffer.data[4]; + size = SECTOR_COUNTER_OFFSET - 1; + savData = &gSaveDataBuffer.data[4]; // to skip past SPECIAL_SECTOR_SENTINEL for (; i <= size; i++) dst[i] = savData[i]; - return 1; + + return SAVE_STATUS_OK; } -u32 TryWriteSpecialSaveSection(u8 sector, u8 *src) +u32 TryWriteSpecialSaveSector(u8 sector, u8 *src) { s32 i; s32 size; u8 *savData; void *savDataBuffer; - if (sector != SECTOR_TTOWER(0) && sector != SECTOR_TTOWER(1)) - return 0xFF; + if (sector != SECTOR_ID_TRAINER_TOWER_1 && sector != SECTOR_ID_TRAINER_TOWER_2) + return SAVE_STATUS_ERROR; savDataBuffer = &gSaveDataBuffer; - *(u32 *)(savDataBuffer) = 0xB39D; + *(u32 *)(savDataBuffer) = SPECIAL_SECTOR_SENTINEL; - // copies whole save section except u32 counter + // copies whole save sector except the counter field i = 0; - size = 0xFFB; - savData = &gSaveDataBuffer.data[4]; + size = SECTOR_COUNTER_OFFSET - 1; + savData = &gSaveDataBuffer.data[4]; // to skip past SPECIAL_SECTOR_SENTINEL for (; i <= size; i++) savData[i] = src[i]; + if (ProgramFlashSectorAndVerify(sector, savDataBuffer) != 0) - return 0xFF; - return 1; + return SAVE_STATUS_ERROR; + + return SAVE_STATUS_OK; } -void Task_LinkSave(u8 taskId) +void Task_LinkFullSave(u8 taskId) { switch (gTasks[taskId].data[0]) { @@ -866,7 +877,7 @@ void Task_LinkSave(u8 taskId) break; case 3: SetContinueGameWarpStatusToDynamicWarp(); - SaveGame_AfterLinkTrade(); + LinkFullSave_Init(); gTasks[taskId].data[0] = 4; break; case 4: @@ -877,13 +888,13 @@ void Task_LinkSave(u8 taskId) } break; case 5: - if (AfterLinkTradeSaveFailed()) + if (LinkFullSave_WriteSector()) gTasks[taskId].data[0] = 6; else gTasks[taskId].data[0] = 4; break; case 6: - ClearSaveAfterLinkTradeSaveFailure(); + LinkFullSave_ReplaceLastSector(); gTasks[taskId].data[0] = 7; break; case 7: @@ -894,7 +905,7 @@ void Task_LinkSave(u8 taskId) case 8: if (IsLinkTaskFinished()) { - sub_80DA434(); + LinkFullSave_SetLastSectorSignature(); gTasks[taskId].data[0] = 9; } break; diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index e570b7fa4..c6e078078 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -74,12 +74,12 @@ bool32 RunSaveFailedScreen(void) case 5: if (TryWipeDamagedSectors() == TRUE) { - gSaveSucceeded = SAVE_STATUS_OK; + gSaveAttemptStatus = SAVE_STATUS_OK; PrintTextOnSaveFailedScreen(gText_SaveFailedScreen_SaveCompleted); } else { - gSaveSucceeded = SAVE_STATUS_ERROR; + gSaveAttemptStatus = SAVE_STATUS_ERROR; PrintTextOnSaveFailedScreen(gText_SaveFailedScreen_BackupMemoryDamaged); } sSaveFailedScreenState = 6; diff --git a/src/start_menu.c b/src/start_menu.c index f4e1e825f..80381216e 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -798,7 +798,7 @@ static u8 SaveDialogCB_DoSave(void) static u8 SaveDialogCB_PrintSaveResult(void) { - if (gSaveSucceeded == TRUE) + if (gSaveAttemptStatus == SAVE_STATUS_OK) PrintSaveTextWithFollowupFunc(gText_PlayerSavedTheGame, SaveDialogCB_WaitPrintSuccessAndPlaySE); else PrintSaveTextWithFollowupFunc(gText_SaveError_PleaseExchangeBackupMemory, SaveDialogCB_WaitPrintErrorAndPlaySE); @@ -921,11 +921,11 @@ static void task50_after_link_battle_save(u8 taskId) break; case 1: SetContinueGameWarpStatusToDynamicWarp(); - sub_80DA45C(); + WriteSaveBlock2(); data[0] = 2; break; case 2: - if (sub_80DA4A0()) + if (WriteSaveBlock1Sector()) { ClearContinueGameWarpStatus2(); data[0] = 3; @@ -941,11 +941,11 @@ static void task50_after_link_battle_save(u8 taskId) DestroyTask(taskId); break; case 5: - CreateTask(Task_LinkSave, 5); + CreateTask(Task_LinkFullSave, 5); data[0] = 6; break; case 6: - if (!FuncIsActiveTask(Task_LinkSave)) + if (!FuncIsActiveTask(Task_LinkFullSave)) data[0] = 3; break; } diff --git a/src/title_screen.c b/src/title_screen.c index 86e0427cb..c2aefa0bc 100644 --- a/src/title_screen.c +++ b/src/title_screen.c @@ -698,7 +698,7 @@ static void SetTitleScreenScene_Cry(s16 * data) SetSaveBlocksPointers(); ResetMenuAndMonGlobals(); Save_ResetSaveCounters(); - Save_LoadGameData(SAVE_NORMAL); + LoadGameSave(SAVE_NORMAL); if (gSaveFileStatus == SAVE_STATUS_EMPTY || gSaveFileStatus == SAVE_STATUS_INVALID) Sav2_ClearSetDefault(); SetPokemonCryStereo(gSaveBlock2Ptr->optionsSound); diff --git a/src/trade_scene.c b/src/trade_scene.c index 096731023..c3b36db16 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -2587,7 +2587,7 @@ static void CB2_HandleTradeEnded(void) MEvent_RecordIdOfWonderCardSenderByEventType(2, gLinkPlayers[GetMultiplayerId() ^ 1].trainerId); } SetContinueGameWarpStatusToDynamicWarp(); - SaveGame_AfterLinkTrade(); + LinkFullSave_Init(); gMain.state++; sTradeData->timer = 0; break; @@ -2598,7 +2598,7 @@ static void CB2_HandleTradeEnded(void) } break; case 52: - if (AfterLinkTradeSaveFailed()) + if (LinkFullSave_WriteSector()) { ClearContinueGameWarpStatus2(); gMain.state = 4; @@ -2610,7 +2610,7 @@ static void CB2_HandleTradeEnded(void) } break; case 4: - ClearSaveAfterLinkTradeSaveFailure(); + LinkFullSave_ReplaceLastSector(); gMain.state = 40; sTradeData->timer = 0; break; @@ -2642,7 +2642,7 @@ static void CB2_HandleTradeEnded(void) case 42: if (IsLinkTaskFinished()) { - sub_80DA434(); + LinkFullSave_SetLastSectorSignature(); gMain.state = 5; } break; From f16b6100c8fced4780e40d95d47b795f7eae470c Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 5 Aug 2022 11:49:17 -0400 Subject: [PATCH 61/64] Sync save sector checks --- include/global.h | 4 +++ include/save.h | 19 +++++++++----- src/cereader_tool.c | 17 ++++++++----- src/hall_of_fame.c | 18 +++++++------ src/save.c | 62 +++++++++++++++++++++++++-------------------- 5 files changed, 70 insertions(+), 50 deletions(-) diff --git a/include/global.h b/include/global.h index ce8f050f5..e474e1eaa 100644 --- a/include/global.h +++ b/include/global.h @@ -129,6 +129,10 @@ extern u8 gStringVar4[]; #define NUM_FLAG_BYTES ROUND_BITS_TO_BYTES(FLAGS_COUNT) #define NUM_ADDITIONAL_PHRASE_BYTES ROUND_BITS_TO_BYTES(NUM_ADDITIONAL_PHRASES) +// This produces an error at compile-time if expr is zero. +// It looks like file.c:line: size of array `id' is negative +#define STATIC_ASSERT(expr, id) typedef char id[(expr) ? 1 : -1]; + struct Coords8 { s8 x; diff --git a/include/save.h b/include/save.h index bea8c7189..87fb9b615 100644 --- a/include/save.h +++ b/include/save.h @@ -9,7 +9,10 @@ #define SECTOR_FOOTER_SIZE 128 #define SECTOR_SIZE (SECTOR_DATA_SIZE + SECTOR_FOOTER_SIZE) -#define FILE_SIGNATURE 0x08012025 // signature value to determine if a sector is in use +#define NUM_SAVE_SLOTS 2 + +// If the sector's signature field is not this value then the sector is either invalid or empty. +#define SECTOR_SIGNATURE 0x08012025 #define SPECIAL_SECTOR_SENTINEL 0xB39D @@ -26,12 +29,19 @@ #define SECTOR_ID_TRAINER_TOWER_2 31 #define SECTORS_COUNT 32 +#define NUM_HOF_SECTORS 2 + #define SAVE_STATUS_EMPTY 0 #define SAVE_STATUS_OK 1 #define SAVE_STATUS_INVALID 2 #define SAVE_STATUS_NO_FLASH 4 #define SAVE_STATUS_ERROR 0xFF +// Special sector id value for certain save functions +// to indicate that all sectors should be used +// instead of a specific sector. +#define FULL_SAVE_SLOT 0xFFFF + enum { SAVE_NORMAL, @@ -58,16 +68,11 @@ struct SaveSector u16 checksum; u32 signature; u32 counter; -}; // size is 0x1000 +}; // size is SECTOR_SIZE (0x1000) #define SECTOR_SIGNATURE_OFFSET offsetof(struct SaveSector, signature) #define SECTOR_COUNTER_OFFSET offsetof(struct SaveSector, counter) -// Special sector id value for certain save functions -// to indicate that all sectors should be used -// instead of a specific sector. -#define FULL_SAVE_SLOT 0xFFFF - // operations for SetDamagedSectorBits enum { diff --git a/src/cereader_tool.c b/src/cereader_tool.c index 96fa195cc..ebe0965ac 100644 --- a/src/cereader_tool.c +++ b/src/cereader_tool.c @@ -4,6 +4,12 @@ #include "save.h" #include "cereader_tool.h" +#define SEC30_SIZE (offsetof(struct EReaderTrainerTowerSet, floors[4])) +#define SEC31_SIZE (sizeof(struct EReaderTrainerTowerSet) - SEC30_SIZE) + +// The trainer tower data exceeds SECTOR_DATA_SIZE. They're allowed to use the full save sector up to the counter field. +STATIC_ASSERT(SEC30_SIZE + SEC31_SIZE <= SECTOR_COUNTER_OFFSET * 2, EReaderTrainerTowerSetFreeSpace); + u8 sub_815D654(void) { return (gSaveBlock1Ptr->trainerTower[0].unk9 + 1) % 256; @@ -36,20 +42,17 @@ bool32 ValidateTrainerTowerData(struct EReaderTrainerTowerSet * ttdata) return TRUE; } -#define SEC30_SIZE (offsetof(struct EReaderTrainerTowerSet, floors[4])) -#define SEC31_SIZE (sizeof(struct EReaderTrainerTowerSet) - SEC30_SIZE) - static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerTowerSet * ttdata, u8 * buffer) { AGB_ASSERT_EX(ttdata->dummy == 0, ABSPATH("cereader_tool.c"), 198); AGB_ASSERT_EX(ttdata->id == 0, ABSPATH("cereader_tool.c"), 199) - memset(buffer, 0, 0x1000); + memset(buffer, 0, SECTOR_SIZE); memcpy(buffer, ttdata, SEC30_SIZE); buffer[1] = sub_815D654(); if (TryWriteSpecialSaveSector(SECTOR_ID_TRAINER_TOWER_1, buffer) != TRUE) return FALSE; - memset(buffer, 0, 0x1000); + memset(buffer, 0, SECTOR_SIZE); memcpy(buffer, (u8 *)ttdata + SEC30_SIZE, SEC31_SIZE); if (TryWriteSpecialSaveSector(SECTOR_ID_TRAINER_TOWER_2, buffer) != TRUE) return FALSE; @@ -58,7 +61,7 @@ static bool32 CEReaderTool_SaveTrainerTower_r(struct EReaderTrainerTowerSet * tt bool32 CEReaderTool_SaveTrainerTower(struct EReaderTrainerTowerSet * ttdata) { - u8 * buffer = AllocZeroed(0x1000); + u8 * buffer = AllocZeroed(SECTOR_SIZE); bool32 result = CEReaderTool_SaveTrainerTower_r(ttdata, buffer); Free(buffer); return result; @@ -81,7 +84,7 @@ static bool32 CEReaderTool_LoadTrainerTower_r(struct EReaderTrainerTowerSet * tt bool32 CEReaderTool_LoadTrainerTower(struct EReaderTrainerTowerSet * ttdata) { - void *buffer = AllocZeroed(0x1000); + void *buffer = AllocZeroed(SECTOR_SIZE); bool32 success = CEReaderTool_LoadTrainerTower_r(ttdata, buffer); Free(buffer); return success; diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index 67aabf80c..7d5423e09 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -26,13 +26,16 @@ #include "constants/songs.h" #include "constants/maps.h" +#define HALL_OF_FAME_MAX_TEAMS 50 +#define HALL_OF_FAME_BG_PAL RGB(22, 24, 29) + struct HallofFameMon { u32 tid; u32 personality; u16 species:9; u16 lvl:7; - u8 nick[10]; + u8 nick[POKEMON_NAME_LENGTH]; }; struct HallofFameTeam @@ -40,6 +43,8 @@ struct HallofFameTeam struct HallofFameMon mon[PARTY_SIZE]; }; +STATIC_ASSERT(sizeof(struct HallofFameTeam) * HALL_OF_FAME_MAX_TEAMS <= SECTOR_DATA_SIZE * NUM_HOF_SECTORS, HallOfFameFreeSpace); + struct HofGfx { u16 state; @@ -52,9 +57,6 @@ static EWRAM_DATA u32 sSelectedPaletteIndices = 0; static EWRAM_DATA struct HallofFameTeam * sHofMonPtr = NULL; static EWRAM_DATA struct HofGfx * sHofGfxPtr = NULL; -#define HALL_OF_FAME_MAX_TEAMS 50 -#define HALL_OF_FAME_BG_PAL (RGB(22, 24, 29)) - static void Task_Hof_InitMonData(u8 taskId); static void Task_Hof_InitTeamSaveData(u8 taskId); static void Task_Hof_TrySaveData(u8 taskId); @@ -425,12 +427,12 @@ static void Task_Hof_InitTeamSaveData(u8 taskId) SaveQuestLogData(); if (!gHasHallOfFameRecords) { - memset(gDecompressionBuffer, 0, 0x2000); + memset(gDecompressionBuffer, 0, SECTOR_SIZE * NUM_HOF_SECTORS); } else { if (LoadGameSave(SAVE_HALL_OF_FAME) != SAVE_STATUS_OK) - memset(gDecompressionBuffer, 0, 0x2000); + memset(gDecompressionBuffer, 0, SECTOR_SIZE * NUM_HOF_SECTORS); } for (i = 0; i < HALL_OF_FAME_MAX_TEAMS; i++, lastSavedTeam++) @@ -747,7 +749,7 @@ void CB2_InitHofPC(void) SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 7)); SetGpuReg(REG_OFFSET_BLDY, 0); CreateTask(Task_HofPC_CopySaveData, 0); - sHofMonPtr = AllocZeroed(0x2000); + sHofMonPtr = AllocZeroed(SECTOR_SIZE * NUM_HOF_SECTORS); SetMainCallback2(CB2_HofIdle); break; } @@ -765,7 +767,7 @@ static void Task_HofPC_CopySaveData(u8 taskId) } else { - CpuCopy16(gDecompressionBuffer, sHofMonPtr, 0x2000); + CpuCopy16(gDecompressionBuffer, sHofMonPtr, SECTOR_SIZE * NUM_HOF_SECTORS); savedTeams = sHofMonPtr; for (i = 0; i < HALL_OF_FAME_MAX_TEAMS; i++, savedTeams++) { diff --git a/src/save.c b/src/save.c index 61c97a3a8..08b8465b7 100644 --- a/src/save.c +++ b/src/save.c @@ -49,26 +49,32 @@ struct { u16 offset; u16 size; -} static const sSaveSlotLayout[] = +} static const sSaveSlotLayout[NUM_SECTORS_PER_SLOT] = { - SAVEBLOCK_CHUNK(gSaveBlock2, 0), // SECTOR_ID_SAVEBLOCK2 + SAVEBLOCK_CHUNK(struct SaveBlock2, 0), // SECTOR_ID_SAVEBLOCK2 - SAVEBLOCK_CHUNK(gSaveBlock1, 0), // SECTOR_ID_SAVEBLOCK1_START - SAVEBLOCK_CHUNK(gSaveBlock1, 1), - SAVEBLOCK_CHUNK(gSaveBlock1, 2), - SAVEBLOCK_CHUNK(gSaveBlock1, 3), // SECTOR_ID_SAVEBLOCK1_END + SAVEBLOCK_CHUNK(struct SaveBlock1, 0), // SECTOR_ID_SAVEBLOCK1_START + SAVEBLOCK_CHUNK(struct SaveBlock1, 1), + SAVEBLOCK_CHUNK(struct SaveBlock1, 2), + SAVEBLOCK_CHUNK(struct SaveBlock1, 3), // SECTOR_ID_SAVEBLOCK1_END - SAVEBLOCK_CHUNK(gPokemonStorage, 0), // SECTOR_ID_PKMN_STORAGE_START - SAVEBLOCK_CHUNK(gPokemonStorage, 1), - SAVEBLOCK_CHUNK(gPokemonStorage, 2), - SAVEBLOCK_CHUNK(gPokemonStorage, 3), - SAVEBLOCK_CHUNK(gPokemonStorage, 4), - SAVEBLOCK_CHUNK(gPokemonStorage, 5), - SAVEBLOCK_CHUNK(gPokemonStorage, 6), - SAVEBLOCK_CHUNK(gPokemonStorage, 7), - SAVEBLOCK_CHUNK(gPokemonStorage, 8), // SECTOR_ID_PKMN_STORAGE_END + SAVEBLOCK_CHUNK(struct PokemonStorage, 0), // SECTOR_ID_PKMN_STORAGE_START + SAVEBLOCK_CHUNK(struct PokemonStorage, 1), + SAVEBLOCK_CHUNK(struct PokemonStorage, 2), + SAVEBLOCK_CHUNK(struct PokemonStorage, 3), + SAVEBLOCK_CHUNK(struct PokemonStorage, 4), + SAVEBLOCK_CHUNK(struct PokemonStorage, 5), + SAVEBLOCK_CHUNK(struct PokemonStorage, 6), + SAVEBLOCK_CHUNK(struct PokemonStorage, 7), + SAVEBLOCK_CHUNK(struct PokemonStorage, 8), // SECTOR_ID_PKMN_STORAGE_END }; +// These will produce an error if a save struct is larger than the space +// alloted for it in the flash. +STATIC_ASSERT(sizeof(struct SaveBlock2) <= SECTOR_DATA_SIZE, SaveBlock2FreeSpace); +STATIC_ASSERT(sizeof(struct SaveBlock1) <= SECTOR_DATA_SIZE * (SECTOR_ID_SAVEBLOCK1_END - SECTOR_ID_SAVEBLOCK1_START + 1), SaveBlock1FreeSpace); +STATIC_ASSERT(sizeof(struct PokemonStorage) <= SECTOR_DATA_SIZE * (SECTOR_ID_PKMN_STORAGE_END - SECTOR_ID_PKMN_STORAGE_START + 1), PokemonStorageFreeSpace); + // Sector num to begin writing save data. Sectors are rotated each time the game is saved. (possibly to avoid wear on flash memory?) u16 gLastWrittenSector; u32 gLastSaveCounter; @@ -165,7 +171,7 @@ static u8 HandleWriteSector(u16 sectorId, const struct SaveSectorLocation *locat sectorNum = gLastWrittenSector + sectorId; sectorNum %= NUM_SECTORS_PER_SLOT; - sectorNum += NUM_SECTORS_PER_SLOT * (gSaveCounter % 2); + sectorNum += NUM_SECTORS_PER_SLOT * (gSaveCounter % NUM_SAVE_SLOTS); data = locations[sectorId].data; size = locations[sectorId].size; @@ -176,7 +182,7 @@ static u8 HandleWriteSector(u16 sectorId, const struct SaveSectorLocation *locat // fill buffer with save data gSaveDataBufferPtr->id = sectorId; - gSaveDataBufferPtr->signature = FILE_SIGNATURE; + gSaveDataBufferPtr->signature = SECTOR_SIGNATURE; gSaveDataBufferPtr->counter = gSaveCounter; for (i = 0; i < size; i++) @@ -194,7 +200,7 @@ static u8 HandleWriteSectorNBytes(u8 sectorId, u8 *data, u16 size) for (i = 0; i < SECTOR_SIZE; i++) ((char *)sector)[i] = 0; - sector->signature = FILE_SIGNATURE; + sector->signature = SECTOR_SIGNATURE; for (i = 0; i < size; i++) sector->data[i] = data[i]; @@ -287,7 +293,7 @@ static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *loc sectorNum = gLastWrittenSector + sectorId; sectorNum %= NUM_SECTORS_PER_SLOT; - sectorNum += NUM_SECTORS_PER_SLOT * (gSaveCounter % 2); + sectorNum += NUM_SECTORS_PER_SLOT * (gSaveCounter % NUM_SAVE_SLOTS); data = locations[sectorId].data; size = locations[sectorId].size; @@ -298,7 +304,7 @@ static u8 HandleReplaceSector(u16 sectorId, const struct SaveSectorLocation *loc // fill buffer with save data gSaveDataBufferPtr->id = sectorId; - gSaveDataBufferPtr->signature = FILE_SIGNATURE; + gSaveDataBufferPtr->signature = SECTOR_SIGNATURE; gSaveDataBufferPtr->counter = gSaveCounter; for (i = 0; i < size; i++) gSaveDataBufferPtr->data[i] = data[i]; @@ -359,7 +365,7 @@ static u8 CopySectorSignatureByte(u16 sectorId, const struct SaveSectorLocation sector = gLastWrittenSector + sectorId - 1; sector %= NUM_SECTORS_PER_SLOT; - sector += NUM_SECTORS_PER_SLOT * (gSaveCounter % 2); + sector += NUM_SECTORS_PER_SLOT * (gSaveCounter % NUM_SAVE_SLOTS); if (ProgramFlashByte(sector, SECTOR_SIGNATURE_OFFSET, ((u8 *)gSaveDataBufferPtr)[SECTOR_SIGNATURE_OFFSET])) { @@ -382,10 +388,10 @@ static u8 WriteSectorSignatureByte(u16 sectorId, const struct SaveSectorLocation sector = gLastWrittenSector + sectorId - 1; sector %= NUM_SECTORS_PER_SLOT; - sector += NUM_SECTORS_PER_SLOT * (gSaveCounter % 2); + sector += NUM_SECTORS_PER_SLOT * (gSaveCounter % NUM_SAVE_SLOTS); // write only the first byte of the signature, which was skipped in HandleReplaceSector - if (ProgramFlashByte(sector, SECTOR_SIGNATURE_OFFSET, FILE_SIGNATURE & 0xFF)) + if (ProgramFlashByte(sector, SECTOR_SIGNATURE_OFFSET, SECTOR_SIGNATURE & 0xFF)) { // sector is damaged, so enable the bit in gDamagedSaveSectors and restore the last written sector and save counter. SetDamagedSectorBits(ENABLE, sector); @@ -421,7 +427,7 @@ static u8 CopySaveSlotData(u16 sectorId, const struct SaveSectorLocation *locati { u16 i; u16 checksum; - u16 sector = NUM_SECTORS_PER_SLOT * (gSaveCounter % 2); + u16 sector = NUM_SECTORS_PER_SLOT * (gSaveCounter % NUM_SAVE_SLOTS); u16 id; for (i = 0; i < NUM_SECTORS_PER_SLOT; i++) @@ -432,7 +438,7 @@ static u8 CopySaveSlotData(u16 sectorId, const struct SaveSectorLocation *locati gLastWrittenSector = i; checksum = CalculateChecksum(gSaveDataBufferPtr->data, locations[id].size); - if (gSaveDataBufferPtr->signature == FILE_SIGNATURE && gSaveDataBufferPtr->checksum == checksum) + if (gSaveDataBufferPtr->signature == SECTOR_SIGNATURE && gSaveDataBufferPtr->checksum == checksum) { u16 j; for (j = 0; j < locations[id].size; j++) @@ -461,7 +467,7 @@ static u8 GetSaveValidStatus(const struct SaveSectorLocation *locations) for (sector = 0; sector < NUM_SECTORS_PER_SLOT; sector++) { ReadFlashSector(sector, gSaveDataBufferPtr); - if (gSaveDataBufferPtr->signature == FILE_SIGNATURE) + if (gSaveDataBufferPtr->signature == SECTOR_SIGNATURE) { signatureValid = TRUE; checksum = CalculateChecksum(gSaveDataBufferPtr->data, locations[gSaveDataBufferPtr->id].size); @@ -489,7 +495,7 @@ static u8 GetSaveValidStatus(const struct SaveSectorLocation *locations) for (sector = 0; sector < NUM_SECTORS_PER_SLOT; sector++) { ReadFlashSector(NUM_SECTORS_PER_SLOT + sector, gSaveDataBufferPtr); - if (gSaveDataBufferPtr->signature == FILE_SIGNATURE) + if (gSaveDataBufferPtr->signature == SECTOR_SIGNATURE) { signatureValid = TRUE; checksum = CalculateChecksum(gSaveDataBufferPtr->data, locations[gSaveDataBufferPtr->id].size); @@ -567,7 +573,7 @@ static u8 TryLoadSaveSector(u8 sectorId, u8 *data, u16 size) struct SaveSector *sector = &gSaveDataBuffer; ReadFlashSector(sectorId, sector); - if (sector->signature == FILE_SIGNATURE) + if (sector->signature == SECTOR_SIGNATURE) { u16 checksum = CalculateChecksum(sector->data, size); if (sector->id == checksum) From 1640f8b835dd8c0f6efbfe858313cf99335b3ce8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 5 Aug 2022 15:24:15 -0400 Subject: [PATCH 62/64] Document metatile behaviors --- .gitignore | 1 + include/constants/metatile_behaviors.h | 39 ++- include/metatile_behavior.h | 42 +-- src/battle_setup.c | 2 +- src/event_object_movement.c | 8 +- src/field_control_avatar.c | 8 +- src/field_effect_helpers.c | 2 +- src/field_player_avatar.c | 14 +- src/field_tasks.c | 4 +- src/metatile_behavior.c | 366 ++++++++++++------------- 10 files changed, 243 insertions(+), 243 deletions(-) diff --git a/.gitignore b/.gitignore index 444bb926b..dacec54a5 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ types_*.taghl _Deparsed_XSubs.pm porymap.project.cfg .vscode/*.* +*.js diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index c953ae20b..3564f0886 100644 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -1,33 +1,41 @@ #ifndef GUARD_METATILE_BEHAVIORS #define GUARD_METATILE_BEHAVIORS -#define METATILE_COUNT 0xF0 #define MB_NORMAL 0x00 -#define MB_01 0x01 +#define MB_UNUSED_01 0x01 #define MB_TALL_GRASS 0x02 +// #define MB_CAVE 0x08 +// #define MB_RUNNING_DISALLOWED 0x0A -#define MB_0B 0x0B -#define MB_0C 0x0C +#define MB_INDOOR_ENCOUNTER 0x0B +#define MB_MOUNTAIN_TOP 0x0C +// #define MB_POND_WATER 0x10 #define MB_SEMI_DEEP_WATER 0x11 #define MB_DEEP_WATER 0x12 #define MB_WATERFALL 0x13 +// #define MB_OCEAN_WATER 0x15 #define MB_PUDDLE 0x16 #define MB_SHALLOW_WATER 0x17 +// #define MB_UNDERWATER_BLOCKED_ABOVE 0x19 -#define MB_1A 0x1A -#define MB_1B 0x1B +#define MB_UNUSED_WATER 0x1A +#define MB_CELADON_WATER 0x1B +// #define MB_STRENGTH_BUTTON 0x20 #define MB_SAND 0x21 #define MB_SEAWEED 0x22 #define MB_ICE 0x23 +// #define MB_THIN_ICE 0x26 #define MB_CRACKED_ICE 0x27 #define MB_HOT_SPRINGS 0x28 +// #define MB_ROCK_STAIRS 0x2A #define MB_SAND_CAVE 0x2B +// #define MB_IMPASSABLE_EAST 0x30 #define MB_IMPASSABLE_WEST 0x31 #define MB_IMPASSABLE_NORTH 0x32 @@ -40,8 +48,7 @@ #define MB_JUMP_WEST 0x39 #define MB_JUMP_NORTH 0x3A #define MB_JUMP_SOUTH 0x3B -#define MB_JUMP_SOUTHEAST 0x3E -#define MB_JUMP_SOUTHWEST 0x3F +// #define MB_WALK_EAST 0x40 #define MB_WALK_WEST 0x41 #define MB_WALK_NORTH 0x42 @@ -50,7 +57,8 @@ #define MB_SLIDE_WEST 0x45 #define MB_SLIDE_NORTH 0x46 #define MB_SLIDE_SOUTH 0x47 -#define MB_UNKNOWN_MOVEMENT_48 0x48 +#define MB_TRICK_HOUSE_PUZZLE_8_FLOOR 0x48 +// #define MB_EASTWARD_CURRENT 0x50 #define MB_WESTWARD_CURRENT 0x51 #define MB_NORTHWARD_CURRENT 0x52 @@ -60,6 +68,7 @@ #define MB_SPIN_UP 0x56 #define MB_SPIN_DOWN 0x57 #define MB_STOP_SPINNING 0x58 +// #define MB_CAVE_DOOR 0x60 #define MB_LADDER 0x61 #define MB_EAST_ARROW_WARP 0x62 @@ -76,7 +85,9 @@ #define MB_UP_LEFT_STAIR_WARP 0x6D #define MB_DOWN_RIGHT_STAIR_WARP 0x6E #define MB_DOWN_LEFT_STAIR_WARP 0x6F +// #define MB_UNION_ROOM_WARP 0x71 +// #define MB_COUNTER 0x80 #define MB_BOOKSHELF 0x81 #define MB_POKEMART_SHELF 0x82 @@ -90,12 +101,12 @@ #define MB_KITCHEN 0x8A #define MB_DRESSER 0x8B #define MB_SNACKS 0x8C -#define MB_8D 0x8D +#define MB_CABLE_CLUB_WIRELESS_MONITOR 0x8D #define MB_BATTLE_RECORDS 0x8E #define MB_QUESTIONNAIRE 0x8F #define MB_FOOD 0x90 -#define MB_INDIGO_PLATEAU_MARK_DPAD 0x91 -#define MB_INDIGO_PLATEAU_MARK_2_DPAD 0x92 +#define MB_INDIGO_PLATEAU_SIGN_1 0x91 +#define MB_INDIGO_PLATEAU_SIGN_2 0x92 #define MB_BLUEPRINTS 0x93 #define MB_PAINTING 0x94 #define MB_POWER_PLANT_MACHINE 0x95 @@ -106,13 +117,17 @@ #define MB_TRASH_BIN 0x9A #define MB_CUP 0x9B #define MB_PORTHOLE 0x9C +#define MB_WINDOW 0x9D #define MB_BLINKING_LIGHTS 0x9E #define MB_NEATLY_LINED_UP_TOOLS 0x9F #define MB_IMPRESSIVE_MACHINE 0xA0 #define MB_VIDEO_GAME 0xA1 #define MB_BURGLARY 0xA2 #define MB_TRAINER_TOWER_MONITOR 0xA3 +// #define MB_CYCLING_ROAD_PULL_DOWN 0xD0 #define MB_CYCLING_ROAD_PULL_DOWN_GRASS 0xD1 +// +#define NUM_METATILE_BEHAVIORS 0xF0 #endif // GUARD_METATILE_BEHAVIORS diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h index aedc8b5b0..6e129c830 100644 --- a/include/metatile_behavior.h +++ b/include/metatile_behavior.h @@ -31,10 +31,9 @@ bool8 MetatileBehavior_IsEastArrowWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsWestArrowWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsNorthArrowWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsSouthArrowWarp(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedIsArrowWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsForcedMovementTile(u8 metatileBehavior); bool8 MetatileBehavior_IsIce_2(u8 metatileBehavior); -bool8 MetatileBehavior_IsUnknownMovement48(u8 metatileBehavior); +bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8 metatileBehavior); bool8 MetatileBehavior_IsWalkNorth(u8 metatileBehavior); bool8 MetatileBehavior_IsWalkSouth(u8 metatileBehavior); bool8 MetatileBehavior_IsWalkWest(u8 metatileBehavior); @@ -48,18 +47,16 @@ bool8 MetatileBehavior_IsSlideSouth(u8 metatileBehavior); bool8 MetatileBehavior_IsSlideWest(u8 metatileBehavior); bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior); bool8 MetatileBehavior_IsCounter(u8 metatileBehavior); -bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDirection); +bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 metatileBehavior, u8 playerDirection); bool8 MetatileBehavior_IsPC(u8 metatileBehavior); bool8 MetatileBehavior_HasRipples(u8 metatileBehavior); bool8 MetatileBehavior_IsPuddle(u8 metatileBehavior); -bool8 MetatileBehavior_IsTallGrass_2(u8 metatileBehavior); +bool8 MetatileBehavior_IsTallGrass(u8 metatileBehavior); bool8 MetatileBehavior_IsLongGrass(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_4(u8 metatileBehavior); +bool8 MetatileBehavior_IsAshGrass(u8 metatileBehavior); bool8 MetatileBehavior_IsFootprints(u8 metatileBehavior); bool8 MetatileBehavior_IsBridge(u8 metatileBehavior); bool8 MetatileBehavior_GetBridgeType(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedIsMB_01(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedIsTallGrass(u8 metatileBehavior); bool8 MetatileBehavior_IsIndoorEncounter(u8 metatileBehavior); bool8 MetatileBehavior_IsMountain(u8 metatileBehavior); bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior); @@ -68,7 +65,6 @@ bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior); bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior); bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior); bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior); -bool8 MetatileBehavior_IsMB1A(u8 metatileBehavior); bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8 metatileBehavior); bool8 MetatileBehavior_IsEastBlocked(u8 metatileBehavior); bool8 MetatileBehavior_IsWestBlocked(u8 metatileBehavior); @@ -78,24 +74,15 @@ bool8 MetatileBehavior_IsShortGrass(u8 metatileBehavior); bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior); bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior); bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_2(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_3(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_4(u8 metatileBehavior); bool8 MetatileBehavior_IsPacifidlogLog(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_11(u8 metatileBehavior); bool8 MetatileBehavior_IsRegionMap(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_5(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_6(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_7(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_8(u8 metatileBehavior); bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsWarpPad(u8 metatileBehavior); bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior); bool8 MetatileBehavior_IsWater(u8 metatileBehavior); bool8 MetatileBehavior_IsFallWarp(u8 metatileBehavior); -bool8 MetatileBehavior_ReturnFalse_13(u8 metatileBehavior); +bool8 MetatileBehavior_IsCrackedFloor(u8 metatileBehavior); bool32 MetatileBehavior_IsCyclingRoadPullDownTile(u8 metatileBehavior); bool8 MetatileBehavior_IsCyclingRoadPullDownTileGrass(u8 metatileBehavior); bool8 MetatileBehavior_IsBumpySlope(u8 metatileBehavior); @@ -105,15 +92,10 @@ bool8 MetatileBehavior_IsVerticalRail(u8 metatileBehavior); bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior); bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior); bool8 MetatileBehavior_IsRunningDisallowed(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_9(u8 metatileBehavior); bool8 MetatileBehavior_IsBookshelf(u8 metatileBehavior); bool8 MetatileBehavior_IsPokeMartShelf(u8 metatileBehavior); -bool8 MetatileBehavior_IsPlayerFacingPokemonCenterSign(u8 tile, u8 playerDirection); -bool8 MetatileBehavior_IsPlayerFacingPokeMartSign(u8 tile, u8 playerDirection); -bool8 MetatileBehavior_UnusedReturnFalse_10(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_11(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_12(u8 metatileBehavior); -bool8 MetatileBehavior_UnusedReturnFalse_13(u8 metatileBehavior); +bool8 MetatileBehavior_IsPlayerFacingPokemonCenterSign(u8 metatileBehavior, u8 playerDirection); +bool8 MetatileBehavior_IsPlayerFacingPokeMartSign(u8 metatileBehavior, u8 playerDirection); bool8 TestMetatileAttributeBit(u8 attr, u8 bitmask); bool8 MetatileBehavior_IsSpinRight(u8 metatileBehavior); bool8 MetatileBehavior_IsSpinLeft(u8 metatileBehavior); @@ -127,11 +109,11 @@ bool8 MetatileBehavior_IsKitchen(u8 metatileBehavior); bool8 MetatileBehavior_IsDresser(u8 metatileBehavior); bool8 MetatileBehavior_IsSnacks(u8 metatileBehavior); bool8 MetatileBehavior_IsStrengthButton(u8 metatileBehavior); -bool8 MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor(u8 tile, u8 playerDirection); -bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 tile, u8 playerDirection); +bool8 MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor(u8 metatileBehavior, u8 playerDirection); +bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 metatileBehavior, u8 playerDirection); bool8 MetatileBehavior_IsQuestionnaire(u8 metatileBehavior); -bool8 MetatileBehavior_IsIndigoPlateauMark(u8 metatileBehavior); -bool8 MetatileBehavior_IsIndigoPlateauMark2(u8 metatileBehavior); +bool8 MetatileBehavior_IsIndigoPlateauSign1(u8 metatileBehavior); +bool8 MetatileBehavior_IsIndigoPlateauSign2(u8 metatileBehavior); bool8 MetatileBehavior_IsFood(u8 metatileBehavior); bool8 MetatileBehavior_IsRockStairs(u8 metatileBehavior); bool8 MetatileBehavior_IsBlueprints(u8 metatileBehavior); @@ -151,5 +133,7 @@ bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior); bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior); bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior); bool8 MetatileBehavior_IsTrainerTowerMonitor(u8 metatileBehavior); +bool8 MetatileBehavior_IsSecretBaseJumpMat(u8 metatileBehavior); +bool8 MetatileBehavior_IsSecretBaseSpinMat(u8 metatileBehavior); #endif // GUARD_METATILE_BEHAVIOR diff --git a/src/battle_setup.c b/src/battle_setup.c index 31d0f068a..9f99defd5 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -460,7 +460,7 @@ u8 BattleSetup_GetTerrainId(void) PlayerGetDestCoords(&x, &y); tileBehavior = MapGridGetMetatileBehaviorAt(x, y); - if (MetatileBehavior_IsTallGrass_2(tileBehavior)) + if (MetatileBehavior_IsTallGrass(tileBehavior)) return BATTLE_TERRAIN_GRASS; if (MetatileBehavior_IsLongGrass(tileBehavior)) return BATTLE_TERRAIN_LONG_GRASS; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index f3ba2133b..919ca99c2 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -5148,7 +5148,7 @@ void sub_8063E28(struct ObjectEvent *objectEvent, struct Sprite *sprite) } if (MetatileBehavior_IsIce_2(objectEvent->currentMetatileBehavior) == TRUE - || MetatileBehavior_IsUnknownMovement48(objectEvent->currentMetatileBehavior) == TRUE) + || MetatileBehavior_IsTrickHouseSlipperyFloor(objectEvent->currentMetatileBehavior) == TRUE) objectEvent->disableAnim = TRUE; else objectEvent->disableAnim = FALSE; @@ -8095,13 +8095,13 @@ static void GetGroundEffectFlags_Reflection(struct ObjectEvent *objEvent, u32 *f static void GetGroundEffectFlags_TallGrassOnSpawn(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass_2(objEvent->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN; } static void GetGroundEffectFlags_TallGrassOnBeginStep(struct ObjectEvent *objEvent, u32 *flags) { - if (MetatileBehavior_IsTallGrass_2(objEvent->currentMetatileBehavior)) + if (MetatileBehavior_IsTallGrass(objEvent->currentMetatileBehavior)) *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE; } @@ -8230,7 +8230,7 @@ static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *objEvent, u32 * typedef bool8 (*MetatileFunc)(u8); static const MetatileFunc metatileFuncs[] = { - MetatileBehavior_IsTallGrass_2, + MetatileBehavior_IsTallGrass, MetatileBehavior_IsLongGrass, MetatileBehavior_IsPuddle, MetatileBehavior_IsSurfable, diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 8cab2d12b..9b3d23fe7 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -575,12 +575,12 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me return EventScript_Questionnaire; if (MetatileBehavior_IsPlayerFacingBattleRecords(metatileBehavior, direction) == TRUE) return CableClub_EventScript_ShowBattleRecords; - if (MetatileBehavior_IsIndigoPlateauMark(metatileBehavior) == TRUE) + if (MetatileBehavior_IsIndigoPlateauSign1(metatileBehavior) == TRUE) { MsgSetSignPost(); return EventScript_Indigo_UltimateGoal; } - if (MetatileBehavior_IsIndigoPlateauMark2(metatileBehavior) == TRUE) + if (MetatileBehavior_IsIndigoPlateauSign2(metatileBehavior) == TRUE) { MsgSetSignPost(); return EventScript_Indigo_HighestAuthority; @@ -792,10 +792,10 @@ static u8 GetFacingSignpostType(u16 metatileBehavior, u8 playerDirection) if (MetatileBehavior_IsPlayerFacingPokeMartSign(metatileBehavior, playerDirection) == TRUE) return SIGNPOST_POKEMART; - if (MetatileBehavior_IsIndigoPlateauMark(metatileBehavior) == TRUE) + if (MetatileBehavior_IsIndigoPlateauSign1(metatileBehavior) == TRUE) return SIGNPOST_INDIGO_1; - if (MetatileBehavior_IsIndigoPlateauMark2(metatileBehavior) == TRUE) + if (MetatileBehavior_IsIndigoPlateauSign2(metatileBehavior) == TRUE) return SIGNPOST_INDIGO_2; if (MetatileBehavior_IsSignpost(metatileBehavior) == TRUE) diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 342ff9e8b..9a7dc201d 100644 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -316,7 +316,7 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite) mapNum = sprite->data[3]; mapGroup = sprite->data[4]; metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); - if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsTallGrass_2(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) + if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) { FieldEffectStop(sprite, FLDEFF_TALL_GRASS); } diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 3660f97a6..b65942866 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -58,8 +58,8 @@ static bool8 ForcedMovement_SlideSouth(void); static bool8 ForcedMovement_SlideNorth(void); static bool8 ForcedMovement_SlideWest(void); static bool8 ForcedMovement_SlideEast(void); -static bool8 ForcedMovement_0xBB(void); -static bool8 ForcedMovement_0xBC(void); +static bool8 ForcedMovement_MatJump(void); +static bool8 ForcedMovement_MatSpin(void); static u8 CheckMovementInputNotOnBike(u8 direction); static void PlayerNotOnBikeNotMoving(u8 direction, u16 heldKeys); static void PlayerNotOnBikeTurningInPlace(u8 direction, u16 heldKeys); @@ -225,7 +225,7 @@ static const struct { bool8 (*check)(u8 metatileBehavior); bool8 (*apply)(void); } sForcedMovementFuncs[] = { - {MetatileBehavior_IsUnknownMovement48, ForcedMovement_Slip}, + {MetatileBehavior_IsTrickHouseSlipperyFloor, ForcedMovement_Slip}, {MetatileBehavior_IsIce_2, ForcedMovement_Slip}, {MetatileBehavior_IsWalkSouth, ForcedMovement_WalkSouth}, {MetatileBehavior_IsWalkNorth, ForcedMovement_WalkNorth}, @@ -244,8 +244,8 @@ static const struct { {MetatileBehavior_IsSlideWest, ForcedMovement_SlideWest}, {MetatileBehavior_IsSlideEast, ForcedMovement_SlideEast}, {MetatileBehavior_IsWaterfall, ForcedMovement_PushedSouthByCurrent}, - {MetatileBehavior_UnusedReturnFalse_7, ForcedMovement_0xBB}, - {MetatileBehavior_UnusedReturnFalse_8, ForcedMovement_0xBC}, + {MetatileBehavior_IsSecretBaseJumpMat, ForcedMovement_MatJump}, + {MetatileBehavior_IsSecretBaseSpinMat, ForcedMovement_MatSpin}, {NULL, ForcedMovement_None}, }; @@ -430,13 +430,13 @@ static bool8 ForcedMovement_SlideEast(void) return ForcedMovement_Slide(DIR_EAST, PlayerGoSpeed2); } -static bool8 ForcedMovement_0xBB(void) +static bool8 ForcedMovement_MatJump(void) { DoPlayerMatJump(); return TRUE; } -static bool8 ForcedMovement_0xBC(void) +static bool8 ForcedMovement_MatSpin(void) { DoPlayerMatSpin(); return TRUE; diff --git a/src/field_tasks.c b/src/field_tasks.c index 20fc8de27..20dcb4696 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -233,7 +233,7 @@ static void AshGrassPerStepCallback(u8 taskId) { data[1] = x; data[2] = y; - if (MetatileBehavior_ReturnFalse_4((u8)MapGridGetMetatileBehaviorAt(x, y))) + if (MetatileBehavior_IsAshGrass((u8)MapGridGetMetatileBehaviorAt(x, y))) { if (MapGridGetMetatileIdAt(x, y) == 0x20a) StartAshFieldEffect(x, y, 0x212, 4); @@ -267,7 +267,7 @@ static void CrackedFloorPerStepCallback(u8 taskId) { data[2] = x; data[3] = y; - if (MetatileBehavior_ReturnFalse_13(behavior)) + if (MetatileBehavior_IsCrackedFloor(behavior)) { if (GetPlayerSpeed() != 4) VarSet(VAR_ICE_STEP_COUNT, 0); diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 95215d7b6..743377e6f 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -2,26 +2,26 @@ #include "metatile_behavior.h" #include "constants/metatile_behaviors.h" -static const bool8 sTileSurfable[METATILE_COUNT] = { - [MB_POND_WATER] = TRUE, - [MB_SEMI_DEEP_WATER] = TRUE, - [MB_DEEP_WATER] = TRUE, - [MB_WATERFALL] = TRUE, - [MB_OCEAN_WATER] = TRUE, - [MB_1A] = TRUE, - [MB_1B] = TRUE, - [MB_EASTWARD_CURRENT] = TRUE, - [MB_WESTWARD_CURRENT] = TRUE, +static const bool8 sBehaviorSurfable[NUM_METATILE_BEHAVIORS] = { + [MB_POND_WATER] = TRUE, + [MB_SEMI_DEEP_WATER] = TRUE, + [MB_DEEP_WATER] = TRUE, + [MB_WATERFALL] = TRUE, + [MB_OCEAN_WATER] = TRUE, + [MB_UNUSED_WATER] = TRUE, + [MB_CELADON_WATER] = TRUE, + [MB_EASTWARD_CURRENT] = TRUE, + [MB_WESTWARD_CURRENT] = TRUE, [MB_NORTHWARD_CURRENT] = TRUE, [MB_SOUTHWARD_CURRENT] = TRUE }; static const u8 sTileBitAttributes[32] = { - [0] = 0x00, - [1] = 0x01, - [2] = 0x02, - [3] = 0x04, - [4] = 0x08, + [0] = 0, + [1] = 1 << 0, + [2] = 1 << 1, + [3] = 1 << 2, + [4] = 1 << 3, }; bool8 MetatileBehavior_IsATile(u8 metatileBehavior) @@ -31,7 +31,7 @@ bool8 MetatileBehavior_IsATile(u8 metatileBehavior) bool8 MetatileBehavior_IsJumpEast(u8 metatileBehavior) { - if(metatileBehavior == MB_JUMP_EAST) + if (metatileBehavior == MB_JUMP_EAST) return TRUE; else return FALSE; @@ -39,7 +39,7 @@ bool8 MetatileBehavior_IsJumpEast(u8 metatileBehavior) bool8 MetatileBehavior_IsJumpWest(u8 metatileBehavior) { - if(metatileBehavior == MB_JUMP_WEST) + if (metatileBehavior == MB_JUMP_WEST) return TRUE; else return FALSE; @@ -47,7 +47,7 @@ bool8 MetatileBehavior_IsJumpWest(u8 metatileBehavior) bool8 MetatileBehavior_IsJumpNorth(u8 metatileBehavior) { - if(metatileBehavior == MB_JUMP_NORTH) + if (metatileBehavior == MB_JUMP_NORTH) return TRUE; else return FALSE; @@ -55,7 +55,7 @@ bool8 MetatileBehavior_IsJumpNorth(u8 metatileBehavior) bool8 MetatileBehavior_IsJumpSouth(u8 metatileBehavior) { - if(metatileBehavior == MB_JUMP_SOUTH) + if (metatileBehavior == MB_JUMP_SOUTH) return TRUE; else return FALSE; @@ -63,7 +63,7 @@ bool8 MetatileBehavior_IsJumpSouth(u8 metatileBehavior) bool8 MetatileBehavior_IsPokeGrass(u8 metatileBehavior) { - if(metatileBehavior == MB_TALL_GRASS || metatileBehavior == MB_CYCLING_ROAD_PULL_DOWN_GRASS) + if (metatileBehavior == MB_TALL_GRASS || metatileBehavior == MB_CYCLING_ROAD_PULL_DOWN_GRASS) return TRUE; else return FALSE; @@ -71,7 +71,7 @@ bool8 MetatileBehavior_IsPokeGrass(u8 metatileBehavior) bool8 MetatileBehavior_IsSand(u8 metatileBehavior) { - if(metatileBehavior == MB_SAND || metatileBehavior == MB_SAND_CAVE) + if (metatileBehavior == MB_SAND || metatileBehavior == MB_SAND_CAVE) return TRUE; else return FALSE; @@ -79,7 +79,7 @@ bool8 MetatileBehavior_IsSand(u8 metatileBehavior) bool8 MetatileBehavior_IsSandOrShallowFlowingWater(u8 metatileBehavior) { - if(metatileBehavior == MB_SAND || metatileBehavior == MB_SHALLOW_WATER) + if (metatileBehavior == MB_SAND || metatileBehavior == MB_SHALLOW_WATER) return TRUE; else return FALSE; @@ -89,11 +89,11 @@ bool8 MetatileBehavior_IsDeepSand(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsReflective(u8 metatileBehavior) { - if(metatileBehavior == MB_POND_WATER - || metatileBehavior == MB_PUDDLE - || metatileBehavior == MB_1A - || metatileBehavior == MB_1B - || metatileBehavior == MB_ICE) + if (metatileBehavior == MB_POND_WATER + || metatileBehavior == MB_PUDDLE + || metatileBehavior == MB_UNUSED_WATER + || metatileBehavior == MB_CELADON_WATER + || metatileBehavior == MB_ICE) return TRUE; else return FALSE; @@ -101,7 +101,7 @@ bool8 MetatileBehavior_IsReflective(u8 metatileBehavior) bool8 MetatileBehavior_IsIce(u8 metatileBehavior) { - if(metatileBehavior == MB_ICE) + if (metatileBehavior == MB_ICE) return TRUE; else return FALSE; @@ -109,7 +109,7 @@ bool8 MetatileBehavior_IsIce(u8 metatileBehavior) bool8 MetatileBehavior_IsWarpDoor(u8 metatileBehavior) { - if(metatileBehavior == MB_WARP_DOOR) + if (metatileBehavior == MB_WARP_DOOR) return TRUE; else return FALSE; @@ -117,7 +117,7 @@ bool8 MetatileBehavior_IsWarpDoor(u8 metatileBehavior) bool8 MetatileBehavior_IsWarpDoor_2(u8 metatileBehavior) { - if(metatileBehavior == MB_WARP_DOOR) + if (metatileBehavior == MB_WARP_DOOR) return TRUE; else return FALSE; @@ -125,7 +125,7 @@ bool8 MetatileBehavior_IsWarpDoor_2(u8 metatileBehavior) bool8 MetatileBehavior_IsEscalator(u8 metatileBehavior) { - if(metatileBehavior >= MB_UP_ESCALATOR && metatileBehavior <= MB_DOWN_ESCALATOR) + if (metatileBehavior >= MB_UP_ESCALATOR && metatileBehavior <= MB_DOWN_ESCALATOR) return TRUE; else return FALSE; @@ -135,7 +135,7 @@ bool8 MetatileBehavior_IsDirectionalUpRightStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_UP_RIGHT_STAIR_WARP) + if (metatileBehavior == MB_UP_RIGHT_STAIR_WARP) result = TRUE; return result; @@ -145,7 +145,7 @@ bool8 MetatileBehavior_IsDirectionalUpLeftStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_UP_LEFT_STAIR_WARP) + if (metatileBehavior == MB_UP_LEFT_STAIR_WARP) result = TRUE; return result; @@ -155,7 +155,7 @@ bool8 MetatileBehavior_IsDirectionalDownRightStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_DOWN_RIGHT_STAIR_WARP) + if (metatileBehavior == MB_DOWN_RIGHT_STAIR_WARP) result = TRUE; return result; @@ -165,7 +165,7 @@ bool8 MetatileBehavior_IsDirectionalDownLeftStairWarp(u8 metatileBehavior) { u8 result = FALSE; - if(metatileBehavior == MB_DOWN_LEFT_STAIR_WARP) + if (metatileBehavior == MB_DOWN_LEFT_STAIR_WARP) result = TRUE; return result; @@ -175,7 +175,7 @@ bool8 MetatileBehavior_IsDirectionalStairWarp(u8 metatileBehavior) { bool8 result = FALSE; - if(metatileBehavior >= MB_UP_RIGHT_STAIR_WARP && metatileBehavior <= MB_DOWN_LEFT_STAIR_WARP) + if (metatileBehavior >= MB_UP_RIGHT_STAIR_WARP && metatileBehavior <= MB_DOWN_LEFT_STAIR_WARP) result = TRUE; else result = FALSE; @@ -185,7 +185,7 @@ bool8 MetatileBehavior_IsDirectionalStairWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsLadder(u8 metatileBehavior) { - if(metatileBehavior == MB_LADDER) + if (metatileBehavior == MB_LADDER) return TRUE; else return FALSE; @@ -193,7 +193,7 @@ bool8 MetatileBehavior_IsLadder(u8 metatileBehavior) bool8 MetatileBehavior_IsNonAnimDoor(u8 metatileBehavior) { - if(metatileBehavior == MB_CAVE_DOOR) + if (metatileBehavior == MB_CAVE_DOOR) return TRUE; else return FALSE; @@ -203,7 +203,7 @@ bool8 MetatileBehavior_IsDeepSouthWarp(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior) { - if(sTileSurfable[metatileBehavior] & 1) + if (sBehaviorSurfable[metatileBehavior] & 1) return TRUE; else return FALSE; @@ -211,7 +211,7 @@ bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior) bool8 MetatileBehavior_IsSemiDeepWater(u8 metatileBehavior) { - if(metatileBehavior == MB_SEMI_DEEP_WATER) + if (metatileBehavior == MB_SEMI_DEEP_WATER) return TRUE; else return FALSE; @@ -219,7 +219,7 @@ bool8 MetatileBehavior_IsSemiDeepWater(u8 metatileBehavior) bool8 MetatileBehavior_IsEastArrowWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_EAST_ARROW_WARP) + if (metatileBehavior == MB_EAST_ARROW_WARP) return TRUE; else return FALSE; @@ -227,7 +227,7 @@ bool8 MetatileBehavior_IsEastArrowWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsWestArrowWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_WEST_ARROW_WARP) + if (metatileBehavior == MB_WEST_ARROW_WARP) return TRUE; else return FALSE; @@ -235,7 +235,7 @@ bool8 MetatileBehavior_IsWestArrowWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsNorthArrowWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_NORTH_ARROW_WARP) + if (metatileBehavior == MB_NORTH_ARROW_WARP) return TRUE; else return FALSE; @@ -243,20 +243,20 @@ bool8 MetatileBehavior_IsNorthArrowWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsSouthArrowWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_SOUTH_ARROW_WARP) + if (metatileBehavior == MB_SOUTH_ARROW_WARP) return TRUE; else return FALSE; } -bool8 MetatileBehavior_UnusedIsArrowWarp(u8 metatileBehavior) +bool8 MetatileBehavior_IsArrowWarp(u8 metatileBehavior) { u8 result = FALSE; - if(MetatileBehavior_IsEastArrowWarp(metatileBehavior) - || MetatileBehavior_IsWestArrowWarp(metatileBehavior) - || MetatileBehavior_IsNorthArrowWarp(metatileBehavior) - || MetatileBehavior_IsSouthArrowWarp(metatileBehavior)) + if (MetatileBehavior_IsEastArrowWarp(metatileBehavior) + || MetatileBehavior_IsWestArrowWarp(metatileBehavior) + || MetatileBehavior_IsNorthArrowWarp(metatileBehavior) + || MetatileBehavior_IsSouthArrowWarp(metatileBehavior)) result = TRUE; return result; @@ -264,11 +264,11 @@ bool8 MetatileBehavior_UnusedIsArrowWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsForcedMovementTile(u8 metatileBehavior) { - if((metatileBehavior >= MB_WALK_EAST && metatileBehavior <= MB_UNKNOWN_MOVEMENT_48) - ||(metatileBehavior >= MB_EASTWARD_CURRENT && metatileBehavior <= MB_SOUTHWARD_CURRENT) - || metatileBehavior == MB_WATERFALL - || metatileBehavior == MB_ICE - || (metatileBehavior >= MB_SPIN_RIGHT && metatileBehavior <= MB_SPIN_DOWN)) + if ((metatileBehavior >= MB_WALK_EAST && metatileBehavior <= MB_TRICK_HOUSE_PUZZLE_8_FLOOR) + || (metatileBehavior >= MB_EASTWARD_CURRENT && metatileBehavior <= MB_SOUTHWARD_CURRENT) + || metatileBehavior == MB_WATERFALL + || metatileBehavior == MB_ICE + || (metatileBehavior >= MB_SPIN_RIGHT && metatileBehavior <= MB_SPIN_DOWN)) return TRUE; else return FALSE; @@ -276,15 +276,15 @@ bool8 MetatileBehavior_IsForcedMovementTile(u8 metatileBehavior) bool8 MetatileBehavior_IsIce_2(u8 metatileBehavior) { - if(metatileBehavior == MB_ICE) + if (metatileBehavior == MB_ICE) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsUnknownMovement48(u8 metatileBehavior) +bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8 metatileBehavior) { - if(metatileBehavior == MB_UNKNOWN_MOVEMENT_48) + if (metatileBehavior == MB_TRICK_HOUSE_PUZZLE_8_FLOOR) return TRUE; else return FALSE; @@ -292,7 +292,7 @@ bool8 MetatileBehavior_IsUnknownMovement48(u8 metatileBehavior) bool8 MetatileBehavior_IsWalkNorth(u8 metatileBehavior) { - if(metatileBehavior == MB_WALK_NORTH) + if (metatileBehavior == MB_WALK_NORTH) return TRUE; else return FALSE; @@ -300,7 +300,7 @@ bool8 MetatileBehavior_IsWalkNorth(u8 metatileBehavior) bool8 MetatileBehavior_IsWalkSouth(u8 metatileBehavior) { - if(metatileBehavior == MB_WALK_SOUTH) + if (metatileBehavior == MB_WALK_SOUTH) return TRUE; else return FALSE; @@ -308,7 +308,7 @@ bool8 MetatileBehavior_IsWalkSouth(u8 metatileBehavior) bool8 MetatileBehavior_IsWalkWest(u8 metatileBehavior) { - if(metatileBehavior == MB_WALK_WEST) + if (metatileBehavior == MB_WALK_WEST) return TRUE; else return FALSE; @@ -316,7 +316,7 @@ bool8 MetatileBehavior_IsWalkWest(u8 metatileBehavior) bool8 MetatileBehavior_IsWalkEast(u8 metatileBehavior) { - if(metatileBehavior == MB_WALK_EAST) + if (metatileBehavior == MB_WALK_EAST) return TRUE; else return FALSE; @@ -324,7 +324,7 @@ bool8 MetatileBehavior_IsWalkEast(u8 metatileBehavior) bool8 MetatileBehavior_IsNorthwardCurrent(u8 metatileBehavior) { - if(metatileBehavior == MB_NORTHWARD_CURRENT) + if (metatileBehavior == MB_NORTHWARD_CURRENT) return TRUE; else return FALSE; @@ -332,7 +332,7 @@ bool8 MetatileBehavior_IsNorthwardCurrent(u8 metatileBehavior) bool8 MetatileBehavior_IsSouthwardCurrent(u8 metatileBehavior) { - if(metatileBehavior == MB_SOUTHWARD_CURRENT) + if (metatileBehavior == MB_SOUTHWARD_CURRENT) return TRUE; else return FALSE; @@ -340,7 +340,7 @@ bool8 MetatileBehavior_IsSouthwardCurrent(u8 metatileBehavior) bool8 MetatileBehavior_IsWestwardCurrent(u8 metatileBehavior) { - if(metatileBehavior == MB_WESTWARD_CURRENT) + if (metatileBehavior == MB_WESTWARD_CURRENT) return TRUE; else return FALSE; @@ -348,7 +348,7 @@ bool8 MetatileBehavior_IsWestwardCurrent(u8 metatileBehavior) bool8 MetatileBehavior_IsEastwardCurrent(u8 metatileBehavior) { - if(metatileBehavior == MB_EASTWARD_CURRENT) + if (metatileBehavior == MB_EASTWARD_CURRENT) return TRUE; else return FALSE; @@ -356,7 +356,7 @@ bool8 MetatileBehavior_IsEastwardCurrent(u8 metatileBehavior) bool8 MetatileBehavior_IsSlideNorth(u8 metatileBehavior) { - if(metatileBehavior == MB_SLIDE_NORTH) + if (metatileBehavior == MB_SLIDE_NORTH) return TRUE; else return FALSE; @@ -364,7 +364,7 @@ bool8 MetatileBehavior_IsSlideNorth(u8 metatileBehavior) bool8 MetatileBehavior_IsSlideSouth(u8 metatileBehavior) { - if(metatileBehavior == MB_SLIDE_SOUTH) + if (metatileBehavior == MB_SLIDE_SOUTH) return TRUE; else return FALSE; @@ -372,7 +372,7 @@ bool8 MetatileBehavior_IsSlideSouth(u8 metatileBehavior) bool8 MetatileBehavior_IsSlideWest(u8 metatileBehavior) { - if(metatileBehavior == MB_SLIDE_WEST) + if (metatileBehavior == MB_SLIDE_WEST) return TRUE; else return FALSE; @@ -380,7 +380,7 @@ bool8 MetatileBehavior_IsSlideWest(u8 metatileBehavior) bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior) { - if(metatileBehavior == MB_SLIDE_EAST) + if (metatileBehavior == MB_SLIDE_EAST) return TRUE; else return FALSE; @@ -388,17 +388,17 @@ bool8 MetatileBehavior_IsSlideEast(u8 metatileBehavior) bool8 MetatileBehavior_IsCounter(u8 metatileBehavior) { - if(metatileBehavior == MB_COUNTER) + if (metatileBehavior == MB_COUNTER) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDirection) +bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 metatileBehavior, u8 playerDirection) { - if(playerDirection != DIR_NORTH) + if (playerDirection != DIR_NORTH) return FALSE; - else if(tile == MB_TELEVISION) + else if (metatileBehavior == MB_TELEVISION) return TRUE; else return FALSE; @@ -406,7 +406,7 @@ bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8 tile, u8 playerDirection) bool8 MetatileBehavior_IsPC(u8 metatileBehavior) { - if(metatileBehavior == MB_PC) + if (metatileBehavior == MB_PC) return TRUE; else return FALSE; @@ -414,7 +414,7 @@ bool8 MetatileBehavior_IsPC(u8 metatileBehavior) bool8 MetatileBehavior_HasRipples(u8 metatileBehavior) { - if(metatileBehavior == MB_POND_WATER || metatileBehavior == MB_PUDDLE) + if (metatileBehavior == MB_POND_WATER || metatileBehavior == MB_PUDDLE) return TRUE; else return FALSE; @@ -422,29 +422,29 @@ bool8 MetatileBehavior_HasRipples(u8 metatileBehavior) bool8 MetatileBehavior_IsPuddle(u8 metatileBehavior) { - if(metatileBehavior == MB_PUDDLE) + if (metatileBehavior == MB_PUDDLE) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsTallGrass_2(u8 metatileBehavior) +bool8 MetatileBehavior_IsTallGrass(u8 metatileBehavior) { - if(metatileBehavior == MB_TALL_GRASS || metatileBehavior == MB_CYCLING_ROAD_PULL_DOWN_GRASS) + if (metatileBehavior == MB_TALL_GRASS || metatileBehavior == MB_CYCLING_ROAD_PULL_DOWN_GRASS) return TRUE; else return FALSE; } bool8 MetatileBehavior_IsLongGrass(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_ReturnFalse_4(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsAshGrass(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsFootprints(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsBridge(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_GetBridgeType(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedIsMB_01(u8 metatileBehavior) +bool8 MetatileBehavior_IsUnused01(u8 metatileBehavior) { - if(metatileBehavior == MB_01) + if (metatileBehavior == MB_UNUSED_01) return TRUE; else return FALSE; @@ -452,7 +452,7 @@ bool8 MetatileBehavior_UnusedIsMB_01(u8 metatileBehavior) bool8 MetatileBehavior_UnusedIsTallGrass(u8 metatileBehavior) { - if(metatileBehavior == MB_TALL_GRASS) + if (metatileBehavior == MB_TALL_GRASS) return TRUE; else return FALSE; @@ -460,7 +460,7 @@ bool8 MetatileBehavior_UnusedIsTallGrass(u8 metatileBehavior) bool8 MetatileBehavior_IsIndoorEncounter(u8 metatileBehavior) { - if(metatileBehavior == MB_0B) + if (metatileBehavior == MB_INDOOR_ENCOUNTER) return TRUE; else return FALSE; @@ -468,7 +468,7 @@ bool8 MetatileBehavior_IsIndoorEncounter(u8 metatileBehavior) bool8 MetatileBehavior_IsMountain(u8 metatileBehavior) { - if(metatileBehavior == MB_0C) + if (metatileBehavior == MB_MOUNTAIN_TOP) return TRUE; else return FALSE; @@ -476,7 +476,7 @@ bool8 MetatileBehavior_IsMountain(u8 metatileBehavior) bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior) { - if(metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER) + if (metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER) return TRUE; else return FALSE; @@ -484,7 +484,7 @@ bool8 MetatileBehavior_IsDiveable(u8 metatileBehavior) bool8 MetatileBehavior_IsUnableToEmerge(u8 metatileBehavior) { - if(metatileBehavior == MB_UNDERWATER_BLOCKED_ABOVE) + if (metatileBehavior == MB_UNDERWATER_BLOCKED_ABOVE) return TRUE; else return FALSE; @@ -492,7 +492,7 @@ bool8 MetatileBehavior_IsUnableToEmerge(u8 metatileBehavior) bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior) { - if(metatileBehavior == MB_SHALLOW_WATER) + if (metatileBehavior == MB_SHALLOW_WATER) return TRUE; else return FALSE; @@ -500,7 +500,7 @@ bool8 MetatileBehavior_IsShallowFlowingWater(u8 metatileBehavior) bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior) { - if(metatileBehavior == MB_THIN_ICE) + if (metatileBehavior == MB_THIN_ICE) return TRUE; else return FALSE; @@ -508,7 +508,7 @@ bool8 MetatileBehavior_IsThinIce(u8 metatileBehavior) bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior) { - if(metatileBehavior == MB_CRACKED_ICE) + if (metatileBehavior == MB_CRACKED_ICE) return TRUE; else return FALSE; @@ -516,16 +516,16 @@ bool8 MetatileBehavior_IsCrackedIce(u8 metatileBehavior) bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior) { - if((metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER) - || metatileBehavior == MB_OCEAN_WATER) + if ((metatileBehavior >= MB_SEMI_DEEP_WATER && metatileBehavior <= MB_DEEP_WATER) + || metatileBehavior == MB_OCEAN_WATER) return TRUE; else return FALSE; } -bool8 MetatileBehavior_UnusedIsMB1A(u8 metatileBehavior) +bool8 MetatileBehavior_IsUnusedWater(u8 metatileBehavior) { - if(metatileBehavior == MB_1A) + if (metatileBehavior == MB_UNUSED_WATER) return TRUE; else return FALSE; @@ -533,7 +533,7 @@ bool8 MetatileBehavior_UnusedIsMB1A(u8 metatileBehavior) bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8 metatileBehavior) { - if(MetatileBehavior_IsSurfable(metatileBehavior) + if (MetatileBehavior_IsSurfable(metatileBehavior) && !MetatileBehavior_IsWaterfall(metatileBehavior)) return TRUE; else @@ -542,9 +542,9 @@ bool8 MetatileBehavior_IsSurfableAndNotWaterfall(u8 metatileBehavior) bool8 MetatileBehavior_IsEastBlocked(u8 metatileBehavior) { - if(metatileBehavior == MB_IMPASSABLE_EAST - || metatileBehavior == MB_IMPASSABLE_NORTHEAST - || metatileBehavior == MB_IMPASSABLE_SOUTHEAST) + if (metatileBehavior == MB_IMPASSABLE_EAST + || metatileBehavior == MB_IMPASSABLE_NORTHEAST + || metatileBehavior == MB_IMPASSABLE_SOUTHEAST) return TRUE; else return FALSE; @@ -552,9 +552,9 @@ bool8 MetatileBehavior_IsEastBlocked(u8 metatileBehavior) bool8 MetatileBehavior_IsWestBlocked(u8 metatileBehavior) { - if(metatileBehavior == MB_IMPASSABLE_WEST - || metatileBehavior == MB_IMPASSABLE_NORTHWEST - || metatileBehavior == MB_IMPASSABLE_SOUTHWEST) + if (metatileBehavior == MB_IMPASSABLE_WEST + || metatileBehavior == MB_IMPASSABLE_NORTHWEST + || metatileBehavior == MB_IMPASSABLE_SOUTHWEST) return TRUE; else return FALSE; @@ -562,9 +562,9 @@ bool8 MetatileBehavior_IsWestBlocked(u8 metatileBehavior) bool8 MetatileBehavior_IsNorthBlocked(u8 metatileBehavior) { - if(metatileBehavior == MB_IMPASSABLE_NORTH - || metatileBehavior == MB_IMPASSABLE_NORTHEAST - || metatileBehavior == MB_IMPASSABLE_NORTHWEST) + if (metatileBehavior == MB_IMPASSABLE_NORTH + || metatileBehavior == MB_IMPASSABLE_NORTHEAST + || metatileBehavior == MB_IMPASSABLE_NORTHWEST) return TRUE; else return FALSE; @@ -572,9 +572,9 @@ bool8 MetatileBehavior_IsNorthBlocked(u8 metatileBehavior) bool8 MetatileBehavior_IsSouthBlocked(u8 metatileBehavior) { - if(metatileBehavior == MB_IMPASSABLE_SOUTH - || metatileBehavior == MB_IMPASSABLE_SOUTHEAST - || metatileBehavior == MB_IMPASSABLE_SOUTHWEST) + if (metatileBehavior == MB_IMPASSABLE_SOUTH + || metatileBehavior == MB_IMPASSABLE_SOUTHEAST + || metatileBehavior == MB_IMPASSABLE_SOUTHWEST) return TRUE; else return FALSE; @@ -584,7 +584,7 @@ bool8 MetatileBehavior_IsShortGrass(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior) { - if(metatileBehavior == 0x28) + if (metatileBehavior == MB_HOT_SPRINGS) return TRUE; else return FALSE; @@ -592,37 +592,37 @@ bool8 MetatileBehavior_IsHotSprings(u8 metatileBehavior) bool8 MetatileBehavior_IsWaterfall(u8 metatileBehavior) { - if(metatileBehavior == MB_WATERFALL) + if (metatileBehavior == MB_WATERFALL) return TRUE; else return FALSE; } bool8 MetatileBehavior_IsFortreeBridge(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse(u8 metatileBehavior){ return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_2(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_3(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_4(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsPacifidlogVerticalLogTop(u8 metatileBehavior){ return FALSE; } +bool8 MetatileBehavior_IsPacifidlogVerticalLogBottom(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsPacifidlogHorizontalLogLeft(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsPacifidlogHorizontalLogRight(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsPacifidlogLog(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_ReturnFalse_11(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsRegionMap(u8 metatileBehavior) { - if(metatileBehavior == MB_REGION_MAP) + if (metatileBehavior == MB_REGION_MAP) return TRUE; else return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_5(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_6(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_7(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_8(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsRoulette(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsPokeblockFeeder(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsSecretBaseJumpMat(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsSecretBaseSpinMat(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_LAVARIDGE_1F_WARP) + if (metatileBehavior == MB_LAVARIDGE_1F_WARP) return TRUE; else return FALSE; @@ -630,7 +630,7 @@ bool8 MetatileBehavior_IsLavaridge1FWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsWarpPad(u8 metatileBehavior) { - if(metatileBehavior == MB_REGULAR_WARP) + if (metatileBehavior == MB_REGULAR_WARP) return TRUE; else return FALSE; @@ -638,7 +638,7 @@ bool8 MetatileBehavior_IsWarpPad(u8 metatileBehavior) bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_UNION_ROOM_WARP) + if (metatileBehavior == MB_UNION_ROOM_WARP) return TRUE; else return FALSE; @@ -646,9 +646,9 @@ bool8 MetatileBehavior_IsUnionRoomWarp(u8 metatileBehavior) bool8 MetatileBehavior_IsWater(u8 metatileBehavior) { - if((metatileBehavior >= MB_POND_WATER && metatileBehavior <= MB_DEEP_WATER) - || metatileBehavior == MB_OCEAN_WATER - || (metatileBehavior >= MB_EASTWARD_CURRENT && metatileBehavior <= MB_SOUTHWARD_CURRENT)) + if ((metatileBehavior >= MB_POND_WATER && metatileBehavior <= MB_DEEP_WATER) + || metatileBehavior == MB_OCEAN_WATER + || (metatileBehavior >= MB_EASTWARD_CURRENT && metatileBehavior <= MB_SOUTHWARD_CURRENT)) return TRUE; else return FALSE; @@ -656,17 +656,17 @@ bool8 MetatileBehavior_IsWater(u8 metatileBehavior) bool8 MetatileBehavior_IsFallWarp(u8 metatileBehavior) { - if(metatileBehavior == MB_FALL_WARP) + if (metatileBehavior == MB_FALL_WARP) return TRUE; else return FALSE; } -bool8 MetatileBehavior_ReturnFalse_13(u8 metatileBehavior){ return FALSE; } +bool8 MetatileBehavior_IsCrackedFloor(u8 metatileBehavior){ return FALSE; } bool32 MetatileBehavior_IsCyclingRoadPullDownTile(u8 metatileBehavior) { - if(metatileBehavior >= MB_CYCLING_ROAD_PULL_DOWN && metatileBehavior <= MB_CYCLING_ROAD_PULL_DOWN_GRASS) + if (metatileBehavior >= MB_CYCLING_ROAD_PULL_DOWN && metatileBehavior <= MB_CYCLING_ROAD_PULL_DOWN_GRASS) return TRUE; else return FALSE; @@ -685,7 +685,7 @@ bool8 MetatileBehavior_IsHorizontalRail(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior) { - if(metatileBehavior == MB_SEAWEED) + if (metatileBehavior == MB_SEAWEED) return TRUE; else return FALSE; @@ -693,17 +693,17 @@ bool8 MetatileBehavior_IsSeaweed(u8 metatileBehavior) bool8 MetatileBehavior_IsRunningDisallowed(u8 metatileBehavior) { - if(metatileBehavior == MB_RUNNING_DISALLOWED) + if (metatileBehavior == MB_RUNNING_DISALLOWED) return TRUE; else return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_9(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_IsPictureBookShelf(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_IsBookshelf(u8 metatileBehavior) { - if(metatileBehavior == MB_BOOKSHELF) + if (metatileBehavior == MB_BOOKSHELF) return TRUE; else return FALSE; @@ -711,40 +711,40 @@ bool8 MetatileBehavior_IsBookshelf(u8 metatileBehavior) bool8 MetatileBehavior_IsPokeMartShelf(u8 metatileBehavior) { - if(metatileBehavior == MB_POKEMART_SHELF) + if (metatileBehavior == MB_POKEMART_SHELF) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsPlayerFacingPokemonCenterSign(u8 tile, u8 playerDirection) +bool8 MetatileBehavior_IsPlayerFacingPokemonCenterSign(u8 metatileBehavior, u8 playerDirection) { - if(playerDirection != DIR_NORTH) + if (playerDirection != DIR_NORTH) return FALSE; - else if(tile == MB_POKEMON_CENTER_SIGN) + else if (metatileBehavior == MB_POKEMON_CENTER_SIGN) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsPlayerFacingPokeMartSign(u8 tile, u8 playerDirection) +bool8 MetatileBehavior_IsPlayerFacingPokeMartSign(u8 metatileBehavior, u8 playerDirection) { - if(playerDirection != DIR_NORTH) + if (playerDirection != DIR_NORTH) return FALSE; - else if(tile == MB_POKEMART_SIGN) + else if (metatileBehavior == MB_POKEMART_SIGN) return TRUE; else return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_10(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_11(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_12(u8 metatileBehavior) { return FALSE; } -bool8 MetatileBehavior_UnusedReturnFalse_13(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_UnknownDummy1(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_UnknownDummy2(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_UnknownDummy3(u8 metatileBehavior) { return FALSE; } +bool8 MetatileBehavior_UnknownDummy4(u8 metatileBehavior) { return FALSE; } bool8 TestMetatileAttributeBit(u8 arg1, u8 arg2) { - if(sTileBitAttributes[arg1] & arg2) + if (sTileBitAttributes[arg1] & arg2) return TRUE; else return FALSE; @@ -752,7 +752,7 @@ bool8 TestMetatileAttributeBit(u8 arg1, u8 arg2) bool8 MetatileBehavior_IsSpinRight(u8 metatileBehavior) { - if(metatileBehavior == MB_SPIN_RIGHT) + if (metatileBehavior == MB_SPIN_RIGHT) return TRUE; else return FALSE; @@ -760,7 +760,7 @@ bool8 MetatileBehavior_IsSpinRight(u8 metatileBehavior) bool8 MetatileBehavior_IsSpinLeft(u8 metatileBehavior) { - if(metatileBehavior == MB_SPIN_LEFT) + if (metatileBehavior == MB_SPIN_LEFT) return TRUE; else return FALSE; @@ -768,7 +768,7 @@ bool8 MetatileBehavior_IsSpinLeft(u8 metatileBehavior) bool8 MetatileBehavior_IsSpinUp(u8 metatileBehavior) { - if(metatileBehavior == MB_SPIN_UP) + if (metatileBehavior == MB_SPIN_UP) return TRUE; else return FALSE; @@ -776,7 +776,7 @@ bool8 MetatileBehavior_IsSpinUp(u8 metatileBehavior) bool8 MetatileBehavior_IsSpinDown(u8 metatileBehavior) { - if(metatileBehavior == MB_SPIN_DOWN) + if (metatileBehavior == MB_SPIN_DOWN) return TRUE; else return FALSE; @@ -784,7 +784,7 @@ bool8 MetatileBehavior_IsSpinDown(u8 metatileBehavior) bool8 MetatileBehavior_IsStopSpinning(u8 metatileBehavior) { - if(metatileBehavior == MB_STOP_SPINNING) + if (metatileBehavior == MB_STOP_SPINNING) return TRUE; else return FALSE; @@ -794,7 +794,7 @@ bool8 MetatileBehavior_IsSpinTile(u8 metatileBehavior) { bool8 result = FALSE; - if(metatileBehavior >= MB_SPIN_RIGHT && metatileBehavior <= MB_SPIN_DOWN) + if (metatileBehavior >= MB_SPIN_RIGHT && metatileBehavior <= MB_SPIN_DOWN) result = TRUE; else result = FALSE; @@ -804,7 +804,7 @@ bool8 MetatileBehavior_IsSpinTile(u8 metatileBehavior) bool8 MetatileBehavior_IsSignpost(u8 metatileBehavior) { - if(metatileBehavior == MB_SIGNPOST) + if (metatileBehavior == MB_SIGNPOST) return TRUE; else return FALSE; @@ -812,7 +812,7 @@ bool8 MetatileBehavior_IsSignpost(u8 metatileBehavior) bool8 MetatileBehavior_IsCabinet(u8 metatileBehavior) { - if(metatileBehavior == MB_CABINET) + if (metatileBehavior == MB_CABINET) return TRUE; else return FALSE; @@ -820,7 +820,7 @@ bool8 MetatileBehavior_IsCabinet(u8 metatileBehavior) bool8 MetatileBehavior_IsKitchen(u8 metatileBehavior) { - if(metatileBehavior == MB_KITCHEN) + if (metatileBehavior == MB_KITCHEN) return TRUE; else return FALSE; @@ -828,7 +828,7 @@ bool8 MetatileBehavior_IsKitchen(u8 metatileBehavior) bool8 MetatileBehavior_IsDresser(u8 metatileBehavior) { - if(metatileBehavior == MB_DRESSER) + if (metatileBehavior == MB_DRESSER) return TRUE; else return FALSE; @@ -836,7 +836,7 @@ bool8 MetatileBehavior_IsDresser(u8 metatileBehavior) bool8 MetatileBehavior_IsSnacks(u8 metatileBehavior) { - if(metatileBehavior == MB_SNACKS) + if (metatileBehavior == MB_SNACKS) return TRUE; else return FALSE; @@ -844,27 +844,27 @@ bool8 MetatileBehavior_IsSnacks(u8 metatileBehavior) bool8 MetatileBehavior_IsStrengthButton(u8 metatileBehavior) { - if(metatileBehavior == MB_STRENGTH_BUTTON) + if (metatileBehavior == MB_STRENGTH_BUTTON) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor(u8 tile, u8 playerDirection) +bool8 MetatileBehavior_IsPlayerFacingCableClubWirelessMonitor(u8 metatileBehavior, u8 playerDirection) { - if(playerDirection != DIR_NORTH) + if (playerDirection != DIR_NORTH) return FALSE; - else if(tile == MB_8D) + else if (metatileBehavior == MB_CABLE_CLUB_WIRELESS_MONITOR) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 tile, u8 playerDirection) +bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 metatileBehavior, u8 playerDirection) { - if(playerDirection != DIR_NORTH) + if (playerDirection != DIR_NORTH) return FALSE; - else if(tile == MB_BATTLE_RECORDS) + else if (metatileBehavior == MB_BATTLE_RECORDS) return TRUE; else return FALSE; @@ -872,23 +872,23 @@ bool8 MetatileBehavior_IsPlayerFacingBattleRecords(u8 tile, u8 playerDirection) bool8 MetatileBehavior_IsQuestionnaire(u8 metatileBehavior) { - if(metatileBehavior == MB_QUESTIONNAIRE) + if (metatileBehavior == MB_QUESTIONNAIRE) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsIndigoPlateauMark(u8 metatileBehavior) +bool8 MetatileBehavior_IsIndigoPlateauSign1(u8 metatileBehavior) { - if(metatileBehavior == MB_INDIGO_PLATEAU_MARK_DPAD) + if (metatileBehavior == MB_INDIGO_PLATEAU_SIGN_1) return TRUE; else return FALSE; } -bool8 MetatileBehavior_IsIndigoPlateauMark2(u8 metatileBehavior) +bool8 MetatileBehavior_IsIndigoPlateauSign2(u8 metatileBehavior) { - if(metatileBehavior == MB_INDIGO_PLATEAU_MARK_2_DPAD) + if (metatileBehavior == MB_INDIGO_PLATEAU_SIGN_2) return TRUE; else return FALSE; @@ -896,7 +896,7 @@ bool8 MetatileBehavior_IsIndigoPlateauMark2(u8 metatileBehavior) bool8 MetatileBehavior_IsFood(u8 metatileBehavior) { - if(metatileBehavior == MB_FOOD) + if (metatileBehavior == MB_FOOD) return TRUE; else return FALSE; @@ -906,7 +906,7 @@ bool8 MetatileBehavior_IsRockStairs(u8 metatileBehavior) { bool8 result = FALSE; - if(metatileBehavior == MB_ROCK_STAIRS) + if (metatileBehavior == MB_ROCK_STAIRS) result = TRUE; else result = FALSE; @@ -916,7 +916,7 @@ bool8 MetatileBehavior_IsRockStairs(u8 metatileBehavior) bool8 MetatileBehavior_IsBlueprints(u8 metatileBehavior) { - if(metatileBehavior == MB_BLUEPRINTS) + if (metatileBehavior == MB_BLUEPRINTS) return TRUE; else return FALSE; @@ -924,7 +924,7 @@ bool8 MetatileBehavior_IsBlueprints(u8 metatileBehavior) bool8 MetatileBehavior_IsPainting(u8 metatileBehavior) { - if(metatileBehavior == MB_PAINTING) + if (metatileBehavior == MB_PAINTING) return TRUE; else return FALSE; @@ -932,7 +932,7 @@ bool8 MetatileBehavior_IsPainting(u8 metatileBehavior) bool8 MetatileBehavior_IsPowerPlantMachine(u8 metatileBehavior) { - if(metatileBehavior == MB_POWER_PLANT_MACHINE) + if (metatileBehavior == MB_POWER_PLANT_MACHINE) return TRUE; else return FALSE; @@ -940,7 +940,7 @@ bool8 MetatileBehavior_IsPowerPlantMachine(u8 metatileBehavior) bool8 MetatileBehavior_IsTelephone(u8 metatileBehavior) { - if(metatileBehavior == MB_TELEPHONE) + if (metatileBehavior == MB_TELEPHONE) return TRUE; else return FALSE; @@ -948,7 +948,7 @@ bool8 MetatileBehavior_IsTelephone(u8 metatileBehavior) bool8 MetatileBehavior_IsComputer(u8 metatileBehavior) { - if(metatileBehavior == MB_COMPUTER) + if (metatileBehavior == MB_COMPUTER) return TRUE; else return FALSE; @@ -956,7 +956,7 @@ bool8 MetatileBehavior_IsComputer(u8 metatileBehavior) bool8 MetatileBehavior_IsAdvertisingPoster(u8 metatileBehavior) { - if(metatileBehavior == MB_ADVERTISING_POSTER) + if (metatileBehavior == MB_ADVERTISING_POSTER) return TRUE; else return FALSE; @@ -964,7 +964,7 @@ bool8 MetatileBehavior_IsAdvertisingPoster(u8 metatileBehavior) bool8 MetatileBehavior_IsTastyFood(u8 metatileBehavior) { - if(metatileBehavior == MB_FOOD_SMELLS_TASTY) + if (metatileBehavior == MB_FOOD_SMELLS_TASTY) return TRUE; else return FALSE; @@ -972,7 +972,7 @@ bool8 MetatileBehavior_IsTastyFood(u8 metatileBehavior) bool8 MetatileBehavior_IsTrashBin(u8 metatileBehavior) { - if(metatileBehavior == MB_TRASH_BIN) + if (metatileBehavior == MB_TRASH_BIN) return TRUE; else return FALSE; @@ -980,7 +980,7 @@ bool8 MetatileBehavior_IsTrashBin(u8 metatileBehavior) bool8 MetatileBehavior_IsCup(u8 metatileBehavior) { - if(metatileBehavior == MB_CUP) + if (metatileBehavior == MB_CUP) return TRUE; else return FALSE; @@ -991,7 +991,7 @@ bool8 MetatileBehavior_IsBeautifulSkyWindow(u8 metatileBehavior) { return FALSE; bool8 MetatileBehavior_IsBlinkingLights(u8 metatileBehavior) { - if(metatileBehavior == MB_BLINKING_LIGHTS) + if (metatileBehavior == MB_BLINKING_LIGHTS) return TRUE; else return FALSE; @@ -999,7 +999,7 @@ bool8 MetatileBehavior_IsBlinkingLights(u8 metatileBehavior) bool8 MetatileBehavior_IsNeatlyLinedUpTools(u8 metatileBehavior) { - if(metatileBehavior == MB_NEATLY_LINED_UP_TOOLS) + if (metatileBehavior == MB_NEATLY_LINED_UP_TOOLS) return TRUE; else return FALSE; @@ -1007,7 +1007,7 @@ bool8 MetatileBehavior_IsNeatlyLinedUpTools(u8 metatileBehavior) bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior) { - if(metatileBehavior == MB_IMPRESSIVE_MACHINE) + if (metatileBehavior == MB_IMPRESSIVE_MACHINE) return TRUE; else return FALSE; @@ -1015,7 +1015,7 @@ bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior) bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior) { - if(metatileBehavior == MB_VIDEO_GAME) + if (metatileBehavior == MB_VIDEO_GAME) return TRUE; else return FALSE; @@ -1023,7 +1023,7 @@ bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior) bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior) { - if(metatileBehavior == MB_BURGLARY) + if (metatileBehavior == MB_BURGLARY) return TRUE; else return FALSE; @@ -1031,7 +1031,7 @@ bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior) bool8 MetatileBehavior_IsTrainerTowerMonitor(u8 metatileBehavior) { - if(metatileBehavior == MB_TRAINER_TOWER_MONITOR) + if (metatileBehavior == MB_TRAINER_TOWER_MONITOR) return TRUE; else return FALSE; From daf293b9ab70e374872ebef8d7257b5c24f45311 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 5 Aug 2022 15:51:27 -0400 Subject: [PATCH 63/64] Rename Viridian City houses --- data/event_scripts.s | 8 +- .../border.bin | Bin .../map.bin | 0 .../border.bin | Bin .../map.bin | 0 data/layouts/layouts.json | 16 +-- data/maps/ViridianCity/map.json | 4 +- .../map.json | 14 +-- data/maps/ViridianCity_House/scripts.inc | 24 +++++ .../text.inc | 8 +- data/maps/ViridianCity_House1/scripts.inc | 24 ----- data/maps/ViridianCity_House2/scripts.inc | 100 ------------------ .../map.json | 20 ++-- data/maps/ViridianCity_School/scripts.inc | 100 ++++++++++++++++++ .../text.inc | 30 +++--- data/maps/map_groups.json | 4 +- data/scripts/fame_checker.inc | 2 +- include/constants/layouts.h | 4 +- include/constants/map_groups.h | 4 +- 19 files changed, 181 insertions(+), 181 deletions(-) rename data/layouts/{ViridianCity_House1 => ViridianCity_House}/border.bin (100%) rename data/layouts/{ViridianCity_House1 => ViridianCity_House}/map.bin (100%) rename data/layouts/{ViridianCity_House2 => ViridianCity_School}/border.bin (100%) rename data/layouts/{ViridianCity_House2 => ViridianCity_School}/map.bin (100%) rename data/maps/{ViridianCity_House1 => ViridianCity_House}/map.json (84%) create mode 100644 data/maps/ViridianCity_House/scripts.inc rename data/maps/{ViridianCity_House1 => ViridianCity_House}/text.inc (65%) delete mode 100644 data/maps/ViridianCity_House1/scripts.inc delete mode 100644 data/maps/ViridianCity_House2/scripts.inc rename data/maps/{ViridianCity_House2 => ViridianCity_School}/map.json (80%) create mode 100644 data/maps/ViridianCity_School/scripts.inc rename data/maps/{ViridianCity_House2 => ViridianCity_School}/text.inc (79%) diff --git a/data/event_scripts.s b/data/event_scripts.s index 8d00495a7..004f61131 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -343,9 +343,9 @@ gStdScriptsEnd:: .include "data/maps/PalletTown_PlayersHouse_2F/scripts.inc" .include "data/maps/PalletTown_RivalsHouse/scripts.inc" .include "data/maps/PalletTown_ProfessorOaksLab/scripts.inc" - .include "data/maps/ViridianCity_House1/scripts.inc" + .include "data/maps/ViridianCity_House/scripts.inc" .include "data/maps/ViridianCity_Gym/scripts.inc" - .include "data/maps/ViridianCity_House2/scripts.inc" + .include "data/maps/ViridianCity_School/scripts.inc" .include "data/maps/ViridianCity_Mart/scripts.inc" .include "data/maps/ViridianCity_PokemonCenter_1F/scripts.inc" .include "data/maps/ViridianCity_PokemonCenter_2F/scripts.inc" @@ -669,9 +669,9 @@ gStdScriptsEnd:: .include "data/maps/PalletTown_PlayersHouse_2F/text.inc" .include "data/maps/PalletTown_RivalsHouse/text.inc" .include "data/maps/PalletTown_ProfessorOaksLab/text.inc" - .include "data/maps/ViridianCity_House1/text.inc" + .include "data/maps/ViridianCity_House/text.inc" .include "data/maps/ViridianCity_Gym/text.inc" - .include "data/maps/ViridianCity_House2/text.inc" + .include "data/maps/ViridianCity_School/text.inc" .include "data/maps/ViridianCity_Mart/text.inc" .include "data/maps/ViridianCity_PokemonCenter_1F/text.inc" .include "data/maps/PewterCity_Museum_1F/text.inc" diff --git a/data/layouts/ViridianCity_House1/border.bin b/data/layouts/ViridianCity_House/border.bin similarity index 100% rename from data/layouts/ViridianCity_House1/border.bin rename to data/layouts/ViridianCity_House/border.bin diff --git a/data/layouts/ViridianCity_House1/map.bin b/data/layouts/ViridianCity_House/map.bin similarity index 100% rename from data/layouts/ViridianCity_House1/map.bin rename to data/layouts/ViridianCity_House/map.bin diff --git a/data/layouts/ViridianCity_House2/border.bin b/data/layouts/ViridianCity_School/border.bin similarity index 100% rename from data/layouts/ViridianCity_House2/border.bin rename to data/layouts/ViridianCity_School/border.bin diff --git a/data/layouts/ViridianCity_House2/map.bin b/data/layouts/ViridianCity_School/map.bin similarity index 100% rename from data/layouts/ViridianCity_House2/map.bin rename to data/layouts/ViridianCity_School/map.bin diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index b44d6ed86..41d0eb1b5 100644 --- a/data/layouts/layouts.json +++ b/data/layouts/layouts.json @@ -2984,16 +2984,16 @@ "blockdata_filepath": "data/layouts/SevenIsland_House_Room2/map.bin" }, { - "id": "LAYOUT_VIRIDIAN_CITY_HOUSE2", - "name": "ViridianCity_House2_Layout", + "id": "LAYOUT_VIRIDIAN_CITY_SCHOOL", + "name": "ViridianCity_School_Layout", "width": 10, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_School", - "border_filepath": "data/layouts/ViridianCity_House2/border.bin", - "blockdata_filepath": "data/layouts/ViridianCity_House2/map.bin" + "border_filepath": "data/layouts/ViridianCity_School/border.bin", + "blockdata_filepath": "data/layouts/ViridianCity_School/map.bin" }, { "id": "LAYOUT_CELADON_CITY_RESTAURANT_DUPLICATE", @@ -3104,16 +3104,16 @@ "blockdata_filepath": "data/layouts/Route5_PokemonDayCare/map.bin" }, { - "id": "LAYOUT_VIRIDIAN_CITY_HOUSE1", - "name": "ViridianCity_House1_Layout", + "id": "LAYOUT_VIRIDIAN_CITY_HOUSE", + "name": "ViridianCity_House_Layout", "width": 11, "height": 9, "border_width": 2, "border_height": 2, "primary_tileset": "gTileset_Building", "secondary_tileset": "gTileset_GenericBuilding2", - "border_filepath": "data/layouts/ViridianCity_House1/border.bin", - "blockdata_filepath": "data/layouts/ViridianCity_House1/map.bin" + "border_filepath": "data/layouts/ViridianCity_House/border.bin", + "blockdata_filepath": "data/layouts/ViridianCity_House/map.bin" }, { "id": "LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE", diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index ea6a6794a..1254d1b83 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -161,7 +161,7 @@ "x": 25, "y": 11, "elevation": 3, - "dest_map": "MAP_VIRIDIAN_CITY_HOUSE1", + "dest_map": "MAP_VIRIDIAN_CITY_HOUSE", "dest_warp_id": 1 }, { @@ -175,7 +175,7 @@ "x": 25, "y": 18, "elevation": 0, - "dest_map": "MAP_VIRIDIAN_CITY_HOUSE2", + "dest_map": "MAP_VIRIDIAN_CITY_SCHOOL", "dest_warp_id": 1 }, { diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House/map.json similarity index 84% rename from data/maps/ViridianCity_House1/map.json rename to data/maps/ViridianCity_House/map.json index eb5780daa..72273ebd7 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_VIRIDIAN_CITY_HOUSE1", - "name": "ViridianCity_House1", - "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE1", + "id": "MAP_VIRIDIAN_CITY_HOUSE", + "name": "ViridianCity_House", + "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE", "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "ViridianCity_House1_EventScript_BaldingMan", + "script": "ViridianCity_House_EventScript_BaldingMan", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 2, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "ViridianCity_House1_EventScript_LittleGirl", + "script": "ViridianCity_House_EventScript_LittleGirl", "flag": "0" }, { @@ -51,7 +51,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "ViridianCity_House1_EventScript_Speary", + "script": "ViridianCity_House_EventScript_Speary", "flag": "0" } ], @@ -86,7 +86,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ViridianCity_House1_EventScript_NicknameSign" + "script": "ViridianCity_House_EventScript_NicknameSign" } ] } diff --git a/data/maps/ViridianCity_House/scripts.inc b/data/maps/ViridianCity_House/scripts.inc new file mode 100644 index 000000000..177304c4d --- /dev/null +++ b/data/maps/ViridianCity_House/scripts.inc @@ -0,0 +1,24 @@ +ViridianCity_House_MapScripts:: + .byte 0 + +ViridianCity_House_EventScript_BaldingMan:: + msgbox ViridianCity_House_Text_NicknamingIsFun, MSGBOX_NPC + end + +ViridianCity_House_EventScript_LittleGirl:: + msgbox ViridianCity_House_Text_MyDaddyLovesMonsToo, MSGBOX_NPC + end + +ViridianCity_House_EventScript_Speary:: + lock + faceplayer + waitse + playmoncry SPECIES_SPEAROW, CRY_MODE_NORMAL + msgbox ViridianCity_House_Text_Speary + waitmoncry + release + end + +ViridianCity_House_EventScript_NicknameSign:: + msgbox ViridianCity_House_Text_SpearowNameSpeary, MSGBOX_SIGN + end diff --git a/data/maps/ViridianCity_House1/text.inc b/data/maps/ViridianCity_House/text.inc similarity index 65% rename from data/maps/ViridianCity_House1/text.inc rename to data/maps/ViridianCity_House/text.inc index 83d3cec1a..db09f4621 100644 --- a/data/maps/ViridianCity_House1/text.inc +++ b/data/maps/ViridianCity_House/text.inc @@ -1,16 +1,16 @@ -ViridianCity_House1_Text_NicknamingIsFun:: +ViridianCity_House_Text_NicknamingIsFun:: .string "Coming up with nicknames is fun,\n" .string "but it's not so easy to do.\p" .string "Clever names are nice, but simple\n" .string "names are easier to remember.$" -ViridianCity_House1_Text_MyDaddyLovesMonsToo:: +ViridianCity_House_Text_MyDaddyLovesMonsToo:: .string "My daddy loves POKéMON, too.$" -ViridianCity_House1_Text_Speary:: +ViridianCity_House_Text_Speary:: .string "SPEARY: Tetweet!$" -ViridianCity_House1_Text_SpearowNameSpeary:: +ViridianCity_House_Text_SpearowNameSpeary:: .string "SPEAROW\n" .string "Name: SPEARY$" diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc deleted file mode 100644 index 0ef2732aa..000000000 --- a/data/maps/ViridianCity_House1/scripts.inc +++ /dev/null @@ -1,24 +0,0 @@ -ViridianCity_House1_MapScripts:: - .byte 0 - -ViridianCity_House1_EventScript_BaldingMan:: - msgbox ViridianCity_House1_Text_NicknamingIsFun, MSGBOX_NPC - end - -ViridianCity_House1_EventScript_LittleGirl:: - msgbox ViridianCity_House1_Text_MyDaddyLovesMonsToo, MSGBOX_NPC - end - -ViridianCity_House1_EventScript_Speary:: - lock - faceplayer - waitse - playmoncry SPECIES_SPEAROW, CRY_MODE_NORMAL - msgbox ViridianCity_House1_Text_Speary - waitmoncry - release - end - -ViridianCity_House1_EventScript_NicknameSign:: - msgbox ViridianCity_House1_Text_SpearowNameSpeary, MSGBOX_SIGN - end diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc deleted file mode 100644 index 4b0a7d420..000000000 --- a/data/maps/ViridianCity_House2/scripts.inc +++ /dev/null @@ -1,100 +0,0 @@ -.set LOCALID_WOMAN, 1 -.set LOCALID_LASS, 2 - -ViridianCity_House2_MapScripts:: - .byte 0 - -ViridianCity_House2_EventScript_Lass:: - lock - faceplayer - msgbox ViridianCity_House2_Text_TryingToMemorizeNotes - closemessage - applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp - waitmovement 0 - release - end - -ViridianCity_House2_EventScript_Woman:: - lock - faceplayer - msgbox ViridianCity_House2_Text_ReadBlackboardCarefully - closemessage - applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection - waitmovement 0 - release - end - -ViridianCity_House2_EventScript_Notebook:: - lockall - msgbox ViridianCity_House2_Text_NotebookFirstPage - msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook - msgbox ViridianCity_House2_Text_NotebookSecondPage - msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook - msgbox ViridianCity_House2_Text_NotebookThirdPage - msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO - compare VAR_RESULT, NO - goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook - msgbox ViridianCity_House2_Text_NotebookFourthPage - applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp - waitmovement 0 - textcolor 1 - msgbox ViridianCity_House2_Text_HeyDontLookAtMyNotes - releaseall - end - -ViridianCity_House2_EventScript_StopReadingNotebook:: - releaseall - end - -ViridianCity_House2_EventScript_Blackboard:: - lockall - msgbox ViridianCity_House2_Text_BlackboardListsStatusProblems - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ChooseBlackboardTopic:: - message ViridianCity_House2_Text_ReadWhichTopic - waitmessage - multichoicegrid 7, 1, MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD, 3, FALSE - switch VAR_RESULT - case 0, ViridianCity_House2_EventScript_ReadSleep - case 1, ViridianCity_House2_EventScript_ReadPoison - case 2, ViridianCity_House2_EventScript_ReadParalysis - case 3, ViridianCity_House2_EventScript_ReadBurn - case 4, ViridianCity_House2_EventScript_ReadFreeze - case 5, ViridianCity_House2_EventScript_ExitBlackboard - case 127, ViridianCity_House2_EventScript_ExitBlackboard - end - -ViridianCity_House2_EventScript_ReadSleep:: - msgbox ViridianCity_House2_Text_ExplainSleep - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ReadBurn:: - msgbox ViridianCity_House2_Text_ExplainBurn - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ReadPoison:: - msgbox ViridianCity_House2_Text_ExplainPoison - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ReadFreeze:: - msgbox ViridianCity_House2_Text_ExplainFreeze - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ReadParalysis:: - msgbox ViridianCity_House2_Text_ExplainParalysis - goto ViridianCity_House2_EventScript_ChooseBlackboardTopic - end - -ViridianCity_House2_EventScript_ExitBlackboard:: - releaseall - end diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_School/map.json similarity index 80% rename from data/maps/ViridianCity_House2/map.json rename to data/maps/ViridianCity_School/map.json index 3b2b1cbbf..7dd444ac5 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_School/map.json @@ -1,7 +1,7 @@ { - "id": "MAP_VIRIDIAN_CITY_HOUSE2", - "name": "ViridianCity_House2", - "layout": "LAYOUT_VIRIDIAN_CITY_HOUSE2", + "id": "MAP_VIRIDIAN_CITY_SCHOOL", + "name": "ViridianCity_School", + "layout": "LAYOUT_VIRIDIAN_CITY_SCHOOL", "music": "MUS_PEWTER", "region_map_section": "MAPSEC_VIRIDIAN_CITY", "requires_flash": false, @@ -25,7 +25,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "ViridianCity_House2_EventScript_Woman", + "script": "ViridianCity_School_EventScript_Woman", "flag": "0" }, { @@ -38,7 +38,7 @@ "movement_range_y": 1, "trainer_type": "TRAINER_TYPE_NONE", "trainer_sight_or_berry_tree_id": "0", - "script": "ViridianCity_House2_EventScript_Lass", + "script": "ViridianCity_School_EventScript_Lass", "flag": "0" } ], @@ -73,7 +73,7 @@ "y": 4, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ViridianCity_House2_EventScript_Notebook" + "script": "ViridianCity_School_EventScript_Notebook" }, { "type": "sign", @@ -81,7 +81,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ViridianCity_House2_EventScript_Blackboard" + "script": "ViridianCity_School_EventScript_Blackboard" }, { "type": "sign", @@ -89,7 +89,7 @@ "y": 1, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", - "script": "ViridianCity_House2_EventScript_Blackboard" + "script": "ViridianCity_School_EventScript_Blackboard" }, { "type": "sign", @@ -97,7 +97,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "ViridianCity_House2_EventScript_PokemonJournal" + "script": "ViridianCity_School_EventScript_PokemonJournal" }, { "type": "sign", @@ -105,7 +105,7 @@ "y": 2, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "ViridianCity_House2_EventScript_PokemonJournal" + "script": "ViridianCity_School_EventScript_PokemonJournal" } ] } diff --git a/data/maps/ViridianCity_School/scripts.inc b/data/maps/ViridianCity_School/scripts.inc new file mode 100644 index 000000000..9b4cbcbf2 --- /dev/null +++ b/data/maps/ViridianCity_School/scripts.inc @@ -0,0 +1,100 @@ +.set LOCALID_WOMAN, 1 +.set LOCALID_LASS, 2 + +ViridianCity_School_MapScripts:: + .byte 0 + +ViridianCity_School_EventScript_Lass:: + lock + faceplayer + msgbox ViridianCity_School_Text_TryingToMemorizeNotes + closemessage + applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp + waitmovement 0 + release + end + +ViridianCity_School_EventScript_Woman:: + lock + faceplayer + msgbox ViridianCity_School_Text_ReadBlackboardCarefully + closemessage + applymovement LOCALID_WOMAN, Movement_FaceOriginalDirection + waitmovement 0 + release + end + +ViridianCity_School_EventScript_Notebook:: + lockall + msgbox ViridianCity_School_Text_NotebookFirstPage + msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq ViridianCity_School_EventScript_StopReadingNotebook + msgbox ViridianCity_School_Text_NotebookSecondPage + msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq ViridianCity_School_EventScript_StopReadingNotebook + msgbox ViridianCity_School_Text_NotebookThirdPage + msgbox ViridianCity_School_Text_TurnThePage, MSGBOX_YESNO + compare VAR_RESULT, NO + goto_if_eq ViridianCity_School_EventScript_StopReadingNotebook + msgbox ViridianCity_School_Text_NotebookFourthPage + applymovement LOCALID_LASS, Movement_WalkInPlaceFastestUp + waitmovement 0 + textcolor 1 + msgbox ViridianCity_School_Text_HeyDontLookAtMyNotes + releaseall + end + +ViridianCity_School_EventScript_StopReadingNotebook:: + releaseall + end + +ViridianCity_School_EventScript_Blackboard:: + lockall + msgbox ViridianCity_School_Text_BlackboardListsStatusProblems + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ChooseBlackboardTopic:: + message ViridianCity_School_Text_ReadWhichTopic + waitmessage + multichoicegrid 7, 1, MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD, 3, FALSE + switch VAR_RESULT + case 0, ViridianCity_School_EventScript_ReadSleep + case 1, ViridianCity_School_EventScript_ReadPoison + case 2, ViridianCity_School_EventScript_ReadParalysis + case 3, ViridianCity_School_EventScript_ReadBurn + case 4, ViridianCity_School_EventScript_ReadFreeze + case 5, ViridianCity_School_EventScript_ExitBlackboard + case 127, ViridianCity_School_EventScript_ExitBlackboard + end + +ViridianCity_School_EventScript_ReadSleep:: + msgbox ViridianCity_School_Text_ExplainSleep + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ReadBurn:: + msgbox ViridianCity_School_Text_ExplainBurn + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ReadPoison:: + msgbox ViridianCity_School_Text_ExplainPoison + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ReadFreeze:: + msgbox ViridianCity_School_Text_ExplainFreeze + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ReadParalysis:: + msgbox ViridianCity_School_Text_ExplainParalysis + goto ViridianCity_School_EventScript_ChooseBlackboardTopic + end + +ViridianCity_School_EventScript_ExitBlackboard:: + releaseall + end diff --git a/data/maps/ViridianCity_House2/text.inc b/data/maps/ViridianCity_School/text.inc similarity index 79% rename from data/maps/ViridianCity_House2/text.inc rename to data/maps/ViridianCity_School/text.inc index 0d3cc3ab9..65437fa33 100644 --- a/data/maps/ViridianCity_House2/text.inc +++ b/data/maps/ViridianCity_School/text.inc @@ -1,13 +1,13 @@ -ViridianCity_House2_Text_TryingToMemorizeNotes:: +ViridianCity_School_Text_TryingToMemorizeNotes:: .string "Whew! I'm trying to memorize all my\n" .string "notes.$" -ViridianCity_House2_Text_ReadBlackboardCarefully:: +ViridianCity_School_Text_ReadBlackboardCarefully:: .string "Okay!\p" .string "Be sure to read what's on the\n" .string "blackboard carefully!$" -ViridianCity_House2_Text_NotebookFirstPage:: +ViridianCity_School_Text_NotebookFirstPage:: .string "Let's check out the notebook.\p" .string "First page…\p" .string "POKé BALLS are used to catch\n" @@ -17,14 +17,14 @@ ViridianCity_House2_Text_NotebookFirstPage:: .string "People who raise and battle\n" .string "with POKéMON are called TRAINERS.$" -ViridianCity_House2_Text_NotebookSecondPage:: +ViridianCity_School_Text_NotebookSecondPage:: .string "Second page…\p" .string "A healthy POKéMON may be hard to\n" .string "catch, so weaken it first.\p" .string "Poison, burn, or cause another\n" .string "status problem to weaken it.$" -ViridianCity_House2_Text_NotebookThirdPage:: +ViridianCity_School_Text_NotebookThirdPage:: .string "Third page…\p" .string "POKéMON TRAINERS seek others to\n" .string "engage in POKéMON battles.\p" @@ -33,7 +33,7 @@ ViridianCity_House2_Text_NotebookThirdPage:: .string "Battles are constantly waged at\n" .string "POKéMON GYMS everywhere.$" -ViridianCity_House2_Text_NotebookFourthPage:: +ViridianCity_School_Text_NotebookFourthPage:: .string "Fourth page…\p" .string "The ultimate goal for all POKéMON\n" .string "TRAINERS is simple.\p" @@ -43,21 +43,21 @@ ViridianCity_House2_Text_NotebookFourthPage:: .string "The ELITE FOUR of the POKéMON\n" .string "LEAGUE!$" -ViridianCity_House2_Text_TurnThePage:: +ViridianCity_School_Text_TurnThePage:: .string "Turn the page?$" -ViridianCity_House2_Text_HeyDontLookAtMyNotes:: +ViridianCity_School_Text_HeyDontLookAtMyNotes:: .string "GIRL: Hey!\n" .string "Don't look at my notes!$" -ViridianCity_House2_Text_BlackboardListsStatusProblems:: +ViridianCity_School_Text_BlackboardListsStatusProblems:: .string "The blackboard lists POKéMON\n" .string "STATUS problems during battles.$" -ViridianCity_House2_Text_ReadWhichTopic:: +ViridianCity_School_Text_ReadWhichTopic:: .string "Which topic do you want to read?$" -ViridianCity_House2_Text_ExplainSleep:: +ViridianCity_School_Text_ExplainSleep:: .string "A POKéMON can't attack if it's\n" .string "asleep.\p" .string "POKéMON will stay asleep even\n" @@ -65,19 +65,19 @@ ViridianCity_House2_Text_ExplainSleep:: .string "Use AWAKENING to awaken one\n" .string "from sleep.$" -ViridianCity_House2_Text_ExplainBurn:: +ViridianCity_School_Text_ExplainBurn:: .string "A burn reduces ATTACK power.\n" .string "It also causes ongoing HP loss.\p" .string "A burn remains after a battle.\n" .string "Use BURN HEAL to cure a burn.$" -ViridianCity_House2_Text_ExplainPoison:: +ViridianCity_School_Text_ExplainPoison:: .string "When poisoned, a POKéMON's health\n" .string "steadily drops.\p" .string "Poison lingers after battles.\n" .string "Use an ANTIDOTE to cure poison!$" -ViridianCity_House2_Text_ExplainFreeze:: +ViridianCity_School_Text_ExplainFreeze:: .string "A frozen POKéMON becomes\n" .string "helplessly immobile.\p" .string "It stays frozen even after the\n" @@ -85,7 +85,7 @@ ViridianCity_House2_Text_ExplainFreeze:: .string "Use ICE HEAL to thaw out the\n" .string "suffering POKéMON.$" -ViridianCity_House2_Text_ExplainParalysis:: +ViridianCity_School_Text_ExplainParalysis:: .string "Paralysis reduces SPEED and may\n" .string "prevent the POKéMON from moving.\p" .string "Paralysis remains after battles.\n" diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index ad423a9db..8c382f504 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -313,9 +313,9 @@ "PalletTown_ProfessorOaksLab" ], "gMapGroup_IndoorViridian": [ - "ViridianCity_House1", + "ViridianCity_House", "ViridianCity_Gym", - "ViridianCity_House2", + "ViridianCity_School", "ViridianCity_Mart", "ViridianCity_PokemonCenter_1F", "ViridianCity_PokemonCenter_2F" diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc index b2e12c4c2..4950fd73d 100644 --- a/data/scripts/fame_checker.inc +++ b/data/scripts/fame_checker.inc @@ -1,4 +1,4 @@ -ViridianCity_House2_EventScript_PokemonJournal:: +ViridianCity_School_EventScript_PokemonJournal:: lock faceplayer famechecker FAMECHECKER_OAK, 3 diff --git a/include/constants/layouts.h b/include/constants/layouts.h index 5218ee717..e2bfad149 100644 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -252,7 +252,7 @@ #define LAYOUT_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB 263 #define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN 264 #define LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2 265 -#define LAYOUT_VIRIDIAN_CITY_HOUSE2 266 +#define LAYOUT_VIRIDIAN_CITY_SCHOOL 266 #define LAYOUT_CELADON_CITY_RESTAURANT_DUPLICATE 267 #define LAYOUT_CELADON_CITY_HOTEL_DUPLICATE 268 #define LAYOUT_MT_EMBER_RUBY_PATH_B4F 269 @@ -262,7 +262,7 @@ #define LAYOUT_VERMILION_CITY_POKEMON_FAN_CLUB 273 #define LAYOUT_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE 274 #define LAYOUT_ROUTE5_POKEMON_DAY_CARE 275 -#define LAYOUT_VIRIDIAN_CITY_HOUSE1 276 +#define LAYOUT_VIRIDIAN_CITY_HOUSE 276 #define LAYOUT_FOUR_ISLAND_POKEMON_DAY_CARE 277 #define LAYOUT_SEAFOAM_ISLANDS_B3F_CURRENT_STOPPED 278 #define LAYOUT_SEAFOAM_ISLANDS_B4F_CURRENT_STOPPED 279 diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index b22eca15c..b6f38b365 100644 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -274,9 +274,9 @@ #define MAP_PALLET_TOWN_PROFESSOR_OAKS_LAB (3 | (4 << 8)) // gMapGroup_IndoorViridian -#define MAP_VIRIDIAN_CITY_HOUSE1 (0 | (5 << 8)) +#define MAP_VIRIDIAN_CITY_HOUSE (0 | (5 << 8)) #define MAP_VIRIDIAN_CITY_GYM (1 | (5 << 8)) -#define MAP_VIRIDIAN_CITY_HOUSE2 (2 | (5 << 8)) +#define MAP_VIRIDIAN_CITY_SCHOOL (2 | (5 << 8)) #define MAP_VIRIDIAN_CITY_MART (3 | (5 << 8)) #define MAP_VIRIDIAN_CITY_POKEMON_CENTER_1F (4 | (5 << 8)) #define MAP_VIRIDIAN_CITY_POKEMON_CENTER_2F (5 | (5 << 8)) From 507b2843532b095b1967e5cc0ded6e7bc49a4cf9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sat, 6 Aug 2022 02:31:19 -0400 Subject: [PATCH 64/64] Celadon water -> cycling road water --- include/constants/metatile_behaviors.h | 2 +- src/metatile_behavior.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index 3564f0886..4e71cdb7e 100644 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -22,7 +22,7 @@ // #define MB_UNDERWATER_BLOCKED_ABOVE 0x19 #define MB_UNUSED_WATER 0x1A -#define MB_CELADON_WATER 0x1B +#define MB_CYCLING_ROAD_WATER 0x1B // #define MB_STRENGTH_BUTTON 0x20 #define MB_SAND 0x21 diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 743377e6f..81b9fc239 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -3,17 +3,17 @@ #include "constants/metatile_behaviors.h" static const bool8 sBehaviorSurfable[NUM_METATILE_BEHAVIORS] = { - [MB_POND_WATER] = TRUE, - [MB_SEMI_DEEP_WATER] = TRUE, - [MB_DEEP_WATER] = TRUE, - [MB_WATERFALL] = TRUE, - [MB_OCEAN_WATER] = TRUE, - [MB_UNUSED_WATER] = TRUE, - [MB_CELADON_WATER] = TRUE, - [MB_EASTWARD_CURRENT] = TRUE, - [MB_WESTWARD_CURRENT] = TRUE, - [MB_NORTHWARD_CURRENT] = TRUE, - [MB_SOUTHWARD_CURRENT] = TRUE + [MB_POND_WATER] = TRUE, + [MB_SEMI_DEEP_WATER] = TRUE, + [MB_DEEP_WATER] = TRUE, + [MB_WATERFALL] = TRUE, + [MB_OCEAN_WATER] = TRUE, + [MB_UNUSED_WATER] = TRUE, + [MB_CYCLING_ROAD_WATER] = TRUE, + [MB_EASTWARD_CURRENT] = TRUE, + [MB_WESTWARD_CURRENT] = TRUE, + [MB_NORTHWARD_CURRENT] = TRUE, + [MB_SOUTHWARD_CURRENT] = TRUE }; static const u8 sTileBitAttributes[32] = { @@ -92,7 +92,7 @@ bool8 MetatileBehavior_IsReflective(u8 metatileBehavior) if (metatileBehavior == MB_POND_WATER || metatileBehavior == MB_PUDDLE || metatileBehavior == MB_UNUSED_WATER - || metatileBehavior == MB_CELADON_WATER + || metatileBehavior == MB_CYCLING_ROAD_WATER || metatileBehavior == MB_ICE) return TRUE; else