summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rw-r--r--src/data/battle_strings_en.h4
-rw-r--r--[-rwxr-xr-x]src/data/field_event_obj/event_object_graphics.h0
-rw-r--r--[-rwxr-xr-x]src/data/field_event_obj/field_effect_object_graphics.h0
-rw-r--r--src/data/field_event_obj/movement_action_func_tables.h44
-rw-r--r--src/data/field_event_obj/movement_type_func_tables.h6
5 files changed, 27 insertions, 27 deletions
diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h
index 67eb70ee1..7ae5467dd 100644
--- a/src/data/battle_strings_en.h
+++ b/src/data/battle_strings_en.h
@@ -747,8 +747,8 @@ const u8 BattleText_BallBrokeOhNo[] = _("Oh, no!\nThe POKéMON broke free!");
const u8 BattleText_BallBrokeAppeared[] = _("Aww!\nIt appeared to be caught!");
const u8 BattleText_BallBrokeAlmost[] = _("Aargh!\nAlmost had it!");
const u8 BattleText_BallBrokeSoClose[] = _("Shoot!\nIt was so close, too!");
-const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}\p");
-const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM BGM_KACHI22}{PAUSE 127}");
+const u8 BattleText_BallCaught1[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}\p");
+const u8 BattleText_BallCaught2[] = _("Gotcha!\n{STRING 3} was caught!{UNKNOWN_A}{PLAY_BGM MUS_KACHI22}{PAUSE 127}");
const u8 BattleText_GiveNickname[] = _("Give a nickname to the\ncaptured {STRING 3}?");
const u8 BattleText_SentToPC[] = _("{STRING 3} was sent to\n{STRING 35} PC.");
const u8 BattleText_Someone[] = _("someone’s");
diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h
index 8f1bb96a8..8f1bb96a8 100755..100644
--- a/src/data/field_event_obj/event_object_graphics.h
+++ b/src/data/field_event_obj/event_object_graphics.h
diff --git a/src/data/field_event_obj/field_effect_object_graphics.h b/src/data/field_event_obj/field_effect_object_graphics.h
index 36850a4ec..36850a4ec 100755..100644
--- a/src/data/field_event_obj/field_effect_object_graphics.h
+++ b/src/data/field_event_obj/field_effect_object_graphics.h
diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h
index 819545343..61871a2ca 100644
--- a/src/data/field_event_obj/movement_action_func_tables.h
+++ b/src/data/field_event_obj/movement_action_func_tables.h
@@ -156,10 +156,10 @@ u8 MovementAction_SetFixedPriority_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_ClearFixedPriority_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_InitAffineAnim_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_ClearAffineAnim_Step0(struct EventObject *, struct Sprite *);
-u8 MovementAction_WalkDownAffine0_Step0(struct EventObject *, struct Sprite *);
-u8 MovementAction_WalkDownAffine0_Step1(struct EventObject *, struct Sprite *);
-u8 MovementAction_WalkDownAffine1_Step0(struct EventObject *, struct Sprite *);
-u8 MovementAction_WalkDownAffine1_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownStartAffine_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownStartAffine_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine_Step1(struct EventObject *, struct Sprite *);
u8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *, struct Sprite *);
u8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *);
@@ -329,8 +329,8 @@ u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct
u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *);
u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *);
u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *);
-u8 (*const gMovementActionFuncs_WalkDownAffine0[])(struct EventObject *, struct Sprite *);
-u8 (*const gMovementActionFuncs_WalkDownAffine1[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *);
u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *);
u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *);
u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *);
@@ -422,10 +422,10 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *)
gMovementActionFuncs_WalkFastestUp, // MOVEMENT_ACTION_WALK_FASTEST_UP
gMovementActionFuncs_WalkFastestLeft, // MOVEMENT_ACTION_WALK_FASTEST_LEFT
gMovementActionFuncs_WalkFastestRight, // MOVEMENT_ACTION_WALK_FASTEST_RIGHT
- gMovementActionFuncs_SlideDown, // MOVEMENT_ACITON_SLIDE_DOWN
- gMovementActionFuncs_SlideUp, // MOVEMENT_ACITON_SLIDE_UP
- gMovementActionFuncs_SlideLeft, // MOVEMENT_ACITON_SLIDE_LEFT
- gMovementActionFuncs_SlideRight, // MOVEMENT_ACITON_SLIDE_RIGHT
+ gMovementActionFuncs_SlideDown, // MOVEMENT_ACTION_SLIDE_DOWN
+ gMovementActionFuncs_SlideUp, // MOVEMENT_ACTION_SLIDE_UP
+ gMovementActionFuncs_SlideLeft, // MOVEMENT_ACTION_SLIDE_LEFT
+ gMovementActionFuncs_SlideRight, // MOVEMENT_ACTION_SLIDE_RIGHT
gMovementActionFuncs_PlayerRunDown, // MOVEMENT_ACTION_PLAYER_RUN_DOWN
gMovementActionFuncs_PlayerRunUp, // MOVEMENT_ACTION_PLAYER_RUN_UP
gMovementActionFuncs_PlayerRunLeft, // MOVEMENT_ACTION_PLAYER_RUN_LEFT
@@ -439,10 +439,10 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *)
gMovementActionFuncs_FaceAwayPlayer, // MOVEMENT_ACTION_FACE_AWAY_PLAYER
gMovementActionFuncs_LockFacingDirection, // MOVEMENT_ACTION_LOCK_FACING_DIRECTION
gMovementActionFuncs_UnlockFacingDirection, // MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION
- gMovementActionFuncs_JumpDown, // MOVEMENT_ACITON_JUMP_DOWN
- gMovementActionFuncs_JumpUp, // MOVEMENT_ACITON_JUMP_UP
- gMovementActionFuncs_JumpLeft, // MOVEMENT_ACITON_JUMP_LEFT
- gMovementActionFuncs_JumpRight, // MOVEMENT_ACITON_JUMP_RIGHT
+ gMovementActionFuncs_JumpDown, // MOVEMENT_ACTION_JUMP_DOWN
+ gMovementActionFuncs_JumpUp, // MOVEMENT_ACTION_JUMP_UP
+ gMovementActionFuncs_JumpLeft, // MOVEMENT_ACTION_JUMP_LEFT
+ gMovementActionFuncs_JumpRight, // MOVEMENT_ACTION_JUMP_RIGHT
gMovementActionFuncs_JumpInPlaceDown, // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN
gMovementActionFuncs_JumpInPlaceUp, // MOVEMENT_ACTION_JUMP_IN_PLACE_UP
gMovementActionFuncs_JumpInPlaceLeft, // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT
@@ -469,8 +469,8 @@ u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *)
gMovementActionFuncs_ClearFixedPriority, // MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY
gMovementActionFuncs_InitAffineAnim, // MOVEMENT_ACTION_INIT_AFFINE_ANIM
gMovementActionFuncs_ClearAffineAnim, // MOVEMENT_ACTION_CLEAR_AFFINE_ANIM
- gMovementActionFuncs_WalkDownAffine0, // MOVEMENT_ACTION_WALK_DOWN_AFFINE_0
- gMovementActionFuncs_WalkDownAffine1, // MOVEMENT_ACTION_WALK_DOWN_AFFINE_1
+ gMovementActionFuncs_WalkDownStartAffine, // MOVEMENT_ACTION_WALK_DOWN_START_AFFINE
+ gMovementActionFuncs_WalkDownAffine, // MOVEMENT_ACTION_WALK_DOWN_AFFINE_1
gMovementActionFuncs_AcroWheelieFaceDown, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN
gMovementActionFuncs_AcroWheelieFaceUp, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP
gMovementActionFuncs_AcroWheelieFaceLeft, // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT
@@ -1081,15 +1081,15 @@ u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct
MovementAction_Finish
};
-u8 (*const gMovementActionFuncs_WalkDownAffine0[])(struct EventObject *, struct Sprite *) = {
- MovementAction_WalkDownAffine0_Step0,
- MovementAction_WalkDownAffine0_Step1,
+u8 (*const gMovementActionFuncs_WalkDownStartAffine[])(struct EventObject *, struct Sprite *) = {
+ MovementAction_WalkDownStartAffine_Step0,
+ MovementAction_WalkDownStartAffine_Step1,
MovementAction_PauseSpriteAnim
};
-u8 (*const gMovementActionFuncs_WalkDownAffine1[])(struct EventObject *, struct Sprite *) = {
- MovementAction_WalkDownAffine1_Step0,
- MovementAction_WalkDownAffine1_Step1,
+u8 (*const gMovementActionFuncs_WalkDownAffine[])(struct EventObject *, struct Sprite *) = {
+ MovementAction_WalkDownAffine_Step0,
+ MovementAction_WalkDownAffine_Step1,
MovementAction_PauseSpriteAnim
};
diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/field_event_obj/movement_type_func_tables.h
index ccbdac99c..b038d5b20 100644
--- a/src/data/field_event_obj/movement_type_func_tables.h
+++ b/src/data/field_event_obj/movement_type_func_tables.h
@@ -416,17 +416,17 @@ u8 (*const gMovementTypeFuncs_Hidden[])(struct EventObject *, struct Sprite *) =
u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct EventObject *, struct Sprite *) = {
MovementType_WalkInPlace_Step0,
- MovementType_WalkInPlace_Step1
+ MovementType_MoveInPlace_Step1
};
u8 (*const gMovementTypeFuncs_JogInPlace[])(struct EventObject *, struct Sprite *) = {
MovementType_JogInPlace_Step0,
- MovementType_WalkInPlace_Step1
+ MovementType_MoveInPlace_Step1
};
u8 (*const gMovementTypeFuncs_RunInPlace[])(struct EventObject *, struct Sprite *) = {
MovementType_RunInPlace_Step0,
- MovementType_WalkInPlace_Step1
+ MovementType_MoveInPlace_Step1
};
u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *) = {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 05:56:34 +0000