dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prelim names for mvmt actions; merge field_ground_effect into evobjmv

Browse Source
This commit is contained in:
PikalaxALT
2020-02-21 13:41:18 -05:00
parent 14a599bbc2
commit 69d8833b31
21 changed files with 3935 additions and 3933 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/event_object_movement.s
+2849 -963
View File
File diff suppressed because it is too large Load Diff
asm/field_ground_effect.s
-1894
View File
File diff suppressed because it is too large Load Diff
data/event_object_movement.s
+921 -844
View File
File diff suppressed because it is too large Load Diff
data/field_effect_scripts.s
+2 -2
View File
@@ -35,7 +35,7 @@ gUnknown_81D96AC:: @ 81D96AC
.4byte gFldEffScript_NpcflyOut
.4byte gFldEffScript_UseFly
.4byte gFldEffScript_FlyIn
.4byte gFldEffScript_ExclamationMarkIcon2
.4byte gFldEffScript_QuestionMarkIcon
.4byte gFldEffScript_FeetInFlowingWater
.4byte gFldEffScript_BikeTireTracks
.4byte gFldEffScript_SandDisguise
@@ -203,7 +203,7 @@ gFldEffScript_FlyIn:: @ 81D98BE
callnative FldEff_FlyIn
end
gFldEffScript_ExclamationMarkIcon2:: @ 81D98C4
gFldEffScript_QuestionMarkIcon:: @ 81D98C4
callnative FldEff_QuestionMarkIcon
end
data/field_ground_effect.s
-63
View File
@@ -1,63 +0,0 @@
.section .rodata
.align 2
gUnknown_83A7024:: @ 83A7024
.4byte 0x00000020, 0x00000010
gUnknown_83A702C:: @ 83A702C
.4byte MetatileBehavior_IsTallGrass_2
.4byte MetatileBehavior_IsLongGrass
.4byte MetatileBehavior_IsPuddle
.4byte MetatileBehavior_IsSurfable
.4byte MetatileBehavior_IsWaterfallBottom
.4byte MetatileBehavior_UnusedReturnTrue
gUnknown_83A7044:: @ 83A7044
.4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000
gUnknown_83A705C:: @ 83A705C
.4byte MetatileBehavior_IsJumpSouth
.4byte MetatileBehavior_IsJumpNorth
.4byte MetatileBehavior_IsJumpWest
.4byte MetatileBehavior_IsJumpEast
gUnknown_83A706C:: @ 83A706C
.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
gUnknown_83A707C:: @ 83A707C
.byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02
gUnknown_83A708C:: @ 83A708C
.byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01
gUnknown_83A709C:: @ 83A709C
.4byte nullsub_26
.4byte DoTracksGroundEffect_Footprints
.4byte DoTracksGroundEffect_BikeTireTracks
gUnknown_83A70A8:: @ 83A70A8
.byte 0x0d, 0x00, 0x18, 0x00
gUnknown_83A70AC:: @ 83A70AC
.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
gUnknown_83A70BC:: @ 83A70BC
.4byte GroundEffect_SpawnOnTallGrass
.4byte GroundEffect_StepOnTallGrass
.4byte GroundEffect_SpawnOnLongGrass
.4byte GroundEffect_StepOnLongGrass
.4byte GroundEffect_WaterReflection
.4byte GroundEffect_IceReflection
.4byte GroundEffect_FlowingWater
.4byte GroundEffect_SandTracks
.4byte GroundEffect_DeepSandTracks
.4byte GroundEffect_Ripple
.4byte GroundEffect_StepOnPuddle
.4byte GroundEffect_SandHeap
.4byte GroundEffect_JumpOnTallGrass
.4byte GroundEffect_JumpOnLongGrass
.4byte GroundEffect_JumpOnShallowWater
.4byte GroundEffect_JumpOnWater
.4byte GroundEffect_JumpLandingDust
.4byte GroundEffect_ShortGrass
.4byte GroundEffect_HotSprings
.4byte GroundEffect_Seaweed
include/constants/event_object_movement.h
+125 -122
View File
@@ -88,65 +88,65 @@
#define MOVEMENT_ACTION_FACE_UP 0x1
#define MOVEMENT_ACTION_FACE_LEFT 0x2
#define MOVEMENT_ACTION_FACE_RIGHT 0x3
#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0x4
#define MOVEMENT_ACTION_WALK_SLOW_UP 0x5
#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0x6
#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0x7
#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x8
#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x9
#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0xA
#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0xB
#define MOVEMENT_ACTION_JUMP_2_DOWN 0xC
#define MOVEMENT_ACTION_JUMP_2_UP 0xD
#define MOVEMENT_ACTION_JUMP_2_LEFT 0xE
#define MOVEMENT_ACTION_JUMP_2_RIGHT 0xF
#define MOVEMENT_ACTION_DELAY_1 0x10
#define MOVEMENT_ACTION_DELAY_2 0x11
#define MOVEMENT_ACTION_DELAY_4 0x12
#define MOVEMENT_ACTION_DELAY_8 0x13
#define MOVEMENT_ACTION_DELAY_16 0x14
#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x15
#define MOVEMENT_ACTION_WALK_FAST_UP 0x16
#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x17
#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x18
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x19
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x1A
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x1B
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x1C
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x1D
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x1E
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x1F
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x20
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x21
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x22
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x23
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x24
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x25
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x26
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x27
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x28
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x29
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x2A
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x2B
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x2C
#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x2D
#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x2E
#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x2F
#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x30
#define MOVEMENT_ACTION_SLIDE_DOWN 0x31
#define MOVEMENT_ACTION_SLIDE_UP 0x32
#define MOVEMENT_ACTION_SLIDE_LEFT 0x33
#define MOVEMENT_ACTION_SLIDE_RIGHT 0x34
#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x35
#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x36
#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x37
#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x38
#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x39
#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x3A
#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x3B
#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x3C
#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x3D
// Something else here maybe? idk
#define MOVEMENT_ACTION_WALK_SLOW_DOWN 0xC
#define MOVEMENT_ACTION_WALK_SLOW_UP 0xD
#define MOVEMENT_ACTION_WALK_SLOW_LEFT 0xE
#define MOVEMENT_ACTION_WALK_SLOW_RIGHT 0xF
#define MOVEMENT_ACTION_WALK_NORMAL_DOWN 0x10
#define MOVEMENT_ACTION_WALK_NORMAL_UP 0x11
#define MOVEMENT_ACTION_WALK_NORMAL_LEFT 0x12
#define MOVEMENT_ACTION_WALK_NORMAL_RIGHT 0x13
#define MOVEMENT_ACTION_JUMP_2_DOWN 0x14
#define MOVEMENT_ACTION_JUMP_2_UP 0x15
#define MOVEMENT_ACTION_JUMP_2_LEFT 0x16
#define MOVEMENT_ACTION_JUMP_2_RIGHT 0x17
#define MOVEMENT_ACTION_DELAY_1 0x18
#define MOVEMENT_ACTION_DELAY_2 0x19
#define MOVEMENT_ACTION_DELAY_4 0x1A
#define MOVEMENT_ACTION_DELAY_8 0x1B
#define MOVEMENT_ACTION_DELAY_16 0x1C
#define MOVEMENT_ACTION_WALK_FAST_DOWN 0x1D
#define MOVEMENT_ACTION_WALK_FAST_UP 0x1E
#define MOVEMENT_ACTION_WALK_FAST_LEFT 0x1F
#define MOVEMENT_ACTION_WALK_FAST_RIGHT 0x20
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN 0x21
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP 0x22
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT 0x23
#define MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT 0x24
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN 0x25
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP 0x26
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT 0x27
#define MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT 0x28
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN 0x29
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP 0x2A
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT 0x2B
#define MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT 0x2C
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN 0x2D
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP 0x2E
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT 0x2F
#define MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT 0x30
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN 0x31
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP 0x32
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT 0x33
#define MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT 0x34
#define MOVEMENT_ACTION_WALK_FASTEST_DOWN 0x35
#define MOVEMENT_ACTION_WALK_FASTEST_UP 0x36
#define MOVEMENT_ACTION_WALK_FASTEST_LEFT 0x37
#define MOVEMENT_ACTION_WALK_FASTEST_RIGHT 0x38
#define MOVEMENT_ACTION_SLIDE_DOWN 0x39
#define MOVEMENT_ACTION_SLIDE_UP 0x3A
#define MOVEMENT_ACTION_SLIDE_LEFT 0x3B
#define MOVEMENT_ACTION_SLIDE_RIGHT 0x3C
#define MOVEMENT_ACTION_PLAYER_RUN_DOWN 0x3D
#define MOVEMENT_ACTION_PLAYER_RUN_UP 0x3E
#define MOVEMENT_ACTION_PLAYER_RUN_LEFT 0x3F
#define MOVEMENT_ACTION_PLAYER_RUN_RIGHT 0x40
#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION 0x41
#define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN 0x46
#define MOVEMENT_ACTION_JUMP_SPECIAL_UP 0x47
#define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT 0x48
#define MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT 0x49
#define MOVEMENT_ACTION_FACE_PLAYER 0x4A
#define MOVEMENT_ACTION_FACE_AWAY_PLAYER 0x4B
#define MOVEMENT_ACTION_LOCK_FACING_DIRECTION 0x4C
@@ -173,8 +173,9 @@
#define MOVEMENT_ACTION_SET_VISIBLE 0x61
#define MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK 0x62
#define MOVEMENT_ACTION_EMOTE_QUESTION_MARK 0x63
#define MOVEMENT_ACTION_EMOTE_HEART 0x64
// more stuff here? idk
#define MOVEMENT_ACTION_EMOTE_X 0x64
#define MOVEMENT_ACTION_EMOTE_DOUBLE_EXCL_MARK 0x65
#define MOVEMENT_ACTION_EMOTE_SMILE 0x66
#define MOVEMENT_ACTION_REVEAL_TRAINER 0x67
#define MOVEMENT_ACTION_ROCK_SMASH_BREAK 0x68
#define MOVEMENT_ACTION_CUT_TREE 0x69
@@ -182,72 +183,74 @@
#define MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY 0x6B
#define MOVEMENT_ACTION_INIT_AFFINE_ANIM 0x6C
#define MOVEMENT_ACTION_CLEAR_AFFINE_ANIM 0x6D
#define MOVEMENT_ACTION_HIDE_REFLECTION 0x6E
#define MOVEMENT_ACTION_SHOW_REFLECTION 0x6F
#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x70
#define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x71
// Acro Bike related movement actions might not be in FRLG at all
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x72
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x73
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x74
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x75
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x76
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x77
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x78
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x79
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x7A
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x7B
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x7C
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x7D
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x7E
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x7F
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x80
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x81
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x82
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x83
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x84
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x85
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x86
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x87
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x88
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x89
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x8A
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x8B
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x8C
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x8D
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x8E
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x8F
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x90
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x91
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x92
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x93
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x94
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x95
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x96
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x97
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x98
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x99
#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT 0x9A
#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT 0x9B
#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT 0x9C
#define MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT 0x9D
#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT 0x9E
#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT 0x9F
#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT 0xA0
#define MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT 0xA1
#define MOVEMENT_ACTION_STORE_AND_LOCK_ANIM 0xA2
#define MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM 0xA3
#define MOVEMENT_ACTION_WALK_LEFT_AFFINE 0xA4
#define MOVEMENT_ACTION_WALK_RIGHT_AFFINE 0xA5
#define MOVEMENT_ACTION_LEVITATE 0xA6
#define MOVEMENT_ACTION_STOP_LEVITATE 0xA7
#define MOVEMENT_ACTION_DESTROY_EXTRA_TASK_IF_AT_TOP 0xA8
#define MOVEMENT_ACTION_FIGURE_8 0xA9
// These two are verified correct in FRLG
// These still exist in FRLG for some reason. They're not used by anything obvious.
#define MOVEMENT_ACTION_WALK_DOWN_START_AFFINE 0x6E
#define MOVEMENT_ACTION_WALK_DOWN_AFFINE 0x6F
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN 0x70
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP 0x71
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT 0x72
#define MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT 0x73
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN 0x74
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP 0x75
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT 0x76
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT 0x77
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN 0x78
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP 0x79
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT 0x7A
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT 0x7B
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN 0x7C
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP 0x7D
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT 0x7E
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT 0x7F
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN 0x80
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP 0x81
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT 0x82
#define MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT 0x83
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN 0x84
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP 0x85
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT 0x86
#define MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT 0x87
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN 0x88
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP 0x89
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT 0x8A
#define MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT 0x8B
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN 0x8C
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP 0x8D
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT 0x8E
#define MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT 0x8F
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN 0x90
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP 0x91
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT 0x92
#define MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT 0x93
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN 0x94
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP 0x95
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT 0x96
#define MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT 0x97
// 98-A3 are unknown
#define MOVEMENT_ACTION_0x98 0x98
#define MOVEMENT_ACTION_0x99 0x99
#define MOVEMENT_ACTION_0x9A 0x9A
#define MOVEMENT_ACTION_0x9B 0x9B
#define MOVEMENT_ACTION_0x9C 0x9C
#define MOVEMENT_ACTION_0x9D 0x9D
#define MOVEMENT_ACTION_0x9E 0x9E
#define MOVEMENT_ACTION_0x9F 0x9F
#define MOVEMENT_ACTION_0xA0 0xA0
#define MOVEMENT_ACTION_0xA1 0xA1
#define MOVEMENT_ACTION_0xA2 0xA2
#define MOVEMENT_ACTION_0xA3 0xA3
#define MOVEMENT_ACTION_FLY_UP 0xA4
#define MOVEMENT_ACTION_FLY_DOWN 0xA5
// Duplicates of JUMP_SPECIAL?
#define MOVEMENT_ACTION_0xA6 0xA6
#define MOVEMENT_ACTION_0xA7 0xA7
#define MOVEMENT_ACTION_0xA8 0xA8
#define MOVEMENT_ACTION_0xA9 0xA9
#define MOVEMENT_ACTION_STEP_END 0xFE
#endif // GUARD_CONSTANTS_EVENT_OBJECT_MOVEMENT_H
include/constants/field_effects.h
+5 -5
View File
@@ -1,7 +1,7 @@
#ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H
#define GUARD_CONSTANTS_FIELD_EFFECTS_H
#define FLDEFF_EXCLAMATION_MARK_ICON_1 0
#define FLDEFF_EXCLAMATION_MARK_ICON 0
#define FLDEFF_USE_CUT_ON_GRASS 1
#define FLDEFF_USE_CUT_ON_TREE 2
#define FLDEFF_SHADOW 3
@@ -34,7 +34,7 @@
#define FLDEFF_NPCFLY_OUT 30
#define FLDEFF_USE_FLY 31
#define FLDEFF_FLY_IN 32
#define FLDEFF_EXCLAMATION_MARK_ICON_2 33
#define FLDEFF_QUESTION_MARK_ICON 33
#define FLDEFF_FEET_IN_FLOWING_WATER 34
#define FLDEFF_BIKE_TIRE_TRACKS 35
#define FLDEFF_SAND_DISGUISE 36
@@ -65,11 +65,11 @@
#define FLDEFF_PCTURN_ON 61
#define FLDEFF_HALL_OF_FAME_RECORD 62
#define FLDEFF_USE_TELEPORT 63
#define FLDEFF_SMILEY_FACE_ICON 64 // TODO: game corner smile icon?
#define FLDEFF_SMILEY_FACE_ICON 64
#define FLDEFF_UNK_41 65 // TODO: related to vs_seeker
#define FLDEFF_DOUBLE_EXCL_MARK_ICON 66 // TODO: related to trainer see
#define FLDEFF_DOUBLE_EXCL_MARK_ICON 66
#define FLDEFF_UNK_43 67 // TODO: related to deoxys
#define FLDEFF_UNK_44 68 // TODO: related to trainer see
#define FLDEFF_UNK_44 68 // TODO: related to ???
#define FLDEFF_UNK_45 69 // TODO: related to fame checker photos
#endif // GUARD_CONSTANTS_FIELD_EFFECTS_H
include/event_object_80688E4.h
-15
View File
@@ -1,15 +0,0 @@
#ifndef GUARD_EVENT_OBJECT_80688E4_H
#define GUARD_EVENT_OBJECT_80688E4_H
#include "global.h"
void FreezeObjectEvents(void);
bool8 FreezeObjectEvent(struct ObjectEvent *);
void FreezeObjectEventsExceptOne(u8 objEventId);
void RfuUnionObjectSetFacingDirection(u8 objectEventId, u8 direction);
void RfuUnionObjectToggleInvisibility(u8 objectEventId, bool32 invisible);
bool32 RfuUnionObjectIsInvisible(u8 objectEventId);
void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo);
bool32 RfuUnionObjectIsWarping(u8 objectEventId);
#endif // GUARD_EVENT_OBJECT_80688E4_H
include/event_object_movement.h
+9
View File
@@ -107,6 +107,15 @@ u8 sub_8063FB0(u8 direction);
void OverrideTemplateCoordsForObjectEvent(struct ObjectEvent *);
void sub_805C774(void);
void FreezeObjectEvents(void);
bool8 FreezeObjectEvent(struct ObjectEvent *);
void FreezeObjectEventsExceptOne(u8 objEventId);
void RfuUnionObjectSetFacingDirection(u8 objectEventId, u8 direction);
void RfuUnionObjectToggleInvisibility(u8 objectEventId, bool32 invisible);
bool32 RfuUnionObjectIsInvisible(u8 objectEventId);
void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo);
bool32 RfuUnionObjectIsWarping(u8 objectEventId);
// Exported data declarations
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
ld_script.txt
+2 -4
View File
@@ -94,8 +94,7 @@ SECTIONS {
src/field_door.o(.text);
asm/field_player_avatar.o(.text);
asm/event_object_movement.o(.text);
asm/field_ground_effect.o(.text);
src/event_object_80688E4.o(.text);
src/event_object_80688E4.o(.text); /* event_object_movement */
asm/field_message_box.o(.text);
src/event_object_lock.o(.text);
src/text_window_graphics.o(.text);
@@ -426,8 +425,7 @@ SECTIONS {
src/field_door.o(.rodata);
data/field_player_avatar.o(.rodata);
data/event_object_movement.o(.rodata);
data/field_ground_effect.o(.rodata);
src/event_object_80688E4.o(.rodata);
src/event_object_80688E4.o(.rodata); /* event_object_movement */
src/scrcmd.o(.rodata);
src/coord_event_weather.o(.rodata);
src/field_tasks.o(.rodata);
src/battle_setup.c
+1 -1
View File
@@ -13,7 +13,7 @@
#include "strings.h"
#include "string_util.h"
#include "event_data.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "metatile_behavior.h"
#include "event_scripts.h"
#include "fldeff.h"
src/event_object_80688E4.c
+2 -1
View File
@@ -1,5 +1,5 @@
#include "global.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_movement.h"
#include "field_effect.h"
#include "field_ground_effect.h"
@@ -204,6 +204,7 @@ void sub_8068BBC(struct Sprite *sprite, u8 direction)
sprite->tStepNo = 0;
}
// used by an_walk_any_2
bool8 sub_8068BCC(struct Sprite *sprite)
{
if (!(sprite->tDelay & 1))
src/event_object_lock.c
+1 -1
View File
@@ -3,7 +3,7 @@
#include "field_player_avatar.h"
#include "event_object_movement.h"
#include "script_movement.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_data.h"
#include "event_object_lock.h"
src/field_fadetransition.c
+1 -1
View File
@@ -13,7 +13,7 @@
#include "metatile_behavior.h"
#include "quest_log.h"
#include "link.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "sound.h"
#include "field_door.h"
#include "field_effect.h"
src/item_menu.c
+1 -1
View File
@@ -5,7 +5,7 @@
#include "berry_pouch.h"
#include "decompress.h"
#include "event_scripts.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "field_player_avatar.h"
#include "graphics.h"
#include "help_system.h"
src/item_use.c
+1 -1
View File
@@ -19,7 +19,7 @@
#include "mail.h"
#include "main.h"
#include "malloc.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_lock.h"
#include "metatile_behavior.h"
#include "new_menu_helpers.h"
src/quest_log.c
+1 -1
View File
@@ -18,7 +18,7 @@
#include "field_fadetransition.h"
#include "field_weather.h"
#include "event_object_movement.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_lock.h"
#include "field_player_avatar.h"
#include "field_control_avatar.h"
src/rfu_union_tool.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include "global.h"
#include "event_data.h"
#include "event_object_movement.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_8097404.h"
#include "field_player_avatar.h"
#include "fieldmap.h"
src/start_menu.c
+1 -1
View File
@@ -23,7 +23,7 @@
#include "field_fadetransition.h"
#include "field_player_avatar.h"
#include "new_menu_helpers.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_lock.h"
#include "script.h"
#include "sound.h"
src/trainer_see.c
+11 -11
View File
@@ -12,8 +12,8 @@
#include "constants/event_objects.h"
#include "constants/object_events.h"
typedef u8 (*trainerApproachFunc)(struct ObjectEvent *, s16, s16, s16);
typedef bool8 (*trainerSeeFunc)(u8, struct Task *, struct ObjectEvent *);
typedef u8 (*TrainerApproachFunc)(struct ObjectEvent *, s16, s16, s16);
typedef bool8 (*TrainerSeeFunc)(u8, struct Task *, struct ObjectEvent *);
static bool8 CheckTrainer(u8 trainerObjId);
static u8 GetTrainerApproachDistance(struct ObjectEvent * trainerObj);
@@ -50,7 +50,7 @@ static const u16 sGfx_Emoticons[] = INCBIN_U16("graphics/object_events/emoticons
// x and y are the player's coordinates
// Returns distance to walk if trainer has unobstructed view of player
// Returns 0 if trainer can't see player
static const trainerApproachFunc sDirectionalApproachDistanceFuncs[] = {
static const TrainerApproachFunc sDirectionalApproachDistanceFuncs[] = {
GetTrainerApproachDistanceSouth,
GetTrainerApproachDistanceNorth,
GetTrainerApproachDistanceWest,
@@ -60,7 +60,7 @@ static const trainerApproachFunc sDirectionalApproachDistanceFuncs[] = {
// 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[] = {
static const TrainerSeeFunc sTrainerSeeFuncList[] = {
TrainerSeeFunc_Dummy,
TrainerSeeFunc_StartExclMark,
TrainerSeeFunc_WaitExclMark,
@@ -78,7 +78,7 @@ static const trainerSeeFunc sTrainerSeeFuncList[] = {
TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown
};
static const trainerSeeFunc sTrainerSeeFuncList2[] = {
static const TrainerSeeFunc sTrainerSeeFuncList2[] = {
TrainerSeeFunc_TrainerInAshFacesPlayer,
TrainerSeeFunc_BeginJumpOutOfAsh,
TrainerSeeFunc_WaitJumpOutOfAsh,
@@ -299,7 +299,7 @@ static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task * task, struct
else
{
ObjectEventGetLocalIdAndMap(trainerObj, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
action = GetFaceDirectionMovementAction(trainerObj->facingDirection);
ObjectEventSetHeldMovement(trainerObj, action);
task->tFuncId++;
@@ -309,7 +309,7 @@ static bool8 TrainerSeeFunc_StartExclMark(u8 taskId, struct Task * task, struct
static bool8 TrainerSeeFunc_WaitExclMark(u8 taskId, struct Task * task, struct ObjectEvent * trainerObj)
{
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1))
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
{
return FALSE;
}
@@ -475,7 +475,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveUp(u8 taskId, stru
else
{
ObjectEventGetLocalIdAndMap(trainerObj, (u8 *)&gFieldEffectArguments[0], (u8 *)&gFieldEffectArguments[1], (u8 *)&gFieldEffectArguments[2]);
FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
task->tData5 = 0;
task->tFuncId++;
}
@@ -487,7 +487,7 @@ static bool8 TrainerSeeFunc_OffscreenAboveTrainerCameraObjMoveDown(u8 taskId, st
u8 specialObjectId;
TryGetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_CAMERA, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &specialObjectId);
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON_1))
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
return FALSE;
if (ObjectEventIsMovementOverridden(&gObjectEvents[specialObjectId]) && !ObjectEventClearHeldMovementIfFinished(&gObjectEvents[specialObjectId]))
@@ -661,7 +661,7 @@ u8 FldEff_ExclamationMarkIcon1(void)
u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_Emoticons, 0, 0, 0x53);
if (spriteId != MAX_SPRITES)
SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_1, 0);
SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON, 0);
return 0;
}
@@ -701,7 +701,7 @@ u8 FldEff_QuestionMarkIcon(void)
u8 spriteId = CreateSpriteAtEnd(&sSpriteTemplate_Emoticons, 0, 0, 0x52);
if (spriteId != MAX_SPRITES)
SetIconSpriteData(&gSprites[spriteId], FLDEFF_EXCLAMATION_MARK_ICON_2, 4);
SetIconSpriteData(&gSprites[spriteId], FLDEFF_QUESTION_MARK_ICON, 4);
return 0;
}
src/vs_seeker.c
+1 -1
View File
@@ -20,7 +20,7 @@
#include "random.h"
#include "event_object_movement.h"
#include "field_player_avatar.h"
#include "event_object_80688E4.h"
#include "event_object_movement.h"
#include "event_object_8097404.h"
#include "vs_seeker.h"
#include "constants/movement_commands.h"