Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-25 07:29:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename object event movement type symbols (#567)
Some checks are pending
build / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
Eduardo Quezada 2025-06-29 11:30:09 -04:00 committed by GitHub
parent 5782f85be0
commit ac7abab019
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
39 changed files with 109 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asm/macros/scrcmd.inc
View File

@ -12,6 +12,7 @@
#include "generated/mart_frontier_id.h"
#include "generated/mart_seal_id.h"
#include "generated/mart_specialties_id.h"
#include "generated/movement_types.h"
#include "generated/moves.h"
#include "generated/mystery_gift_delivery_stages.h"
#include "generated/npc_trades.h"
@ -2177,10 +2178,10 @@
.short \arg4
.endm
.macro ScrCmd_188 arg0, arg1
.macro SetObjectEventMovementType localID, movementType
.short 392
.short \arg0
.short \arg1
.short \localID
.short \movementType
.endm
.macro SetObjectEventDir localID, dir

2
include/map_object.h
View File

@ -284,7 +284,7 @@ int ObjectEvent_GetZ(const ObjectEvent *objectEvent);
MapObject *sub_0206326C(const MapObjectManager *mapObjMan, int x, int z, int param3);
void MapObject_SetPosDirFromVec(MapObject *mapObj, const VecFx32 *pos, int dir);
void MapObject_SetPosDirFromCoords(MapObject *mapObj, int x, int y, int z, int dir);
void MapObject_SetMoveCode(MapObject *mapObj, u32 param1);
void MapObject_SetMoveCode(MapObject *mapObj, u32 movementType);
void sub_020633C8(MapObject *mapObj, int localID);
void sub_020633E0(MapObject *mapObj);
void sub_020633E4(MapObject *mapObj);

2
res/field/scripts/scripts_battle_frontier.s
View File

@ -50,7 +50,7 @@ _009A:
ScrCmd_329 VAR_MAP_LOCAL_1, VAR_MAP_LOCAL_2, VAR_MAP_LOCAL_3, VAR_MAP_LOCAL_4
SetObjectEventPos 29, VAR_MAP_LOCAL_1, VAR_MAP_LOCAL_2
SetObjectEventDir 29, VAR_MAP_LOCAL_3
ScrCmd_188 29, VAR_MAP_LOCAL_4
SetObjectEventMovementType 29, VAR_MAP_LOCAL_4
ClearFlag FLAG_UNK_0x02C3
End

10
res/field/scripts/scripts_canalave_city.s
View File

@ -54,7 +54,7 @@ _00F8:
_0100:
SetObjectEventPos 16, 55, 0x2CC
SetObjectEventDir 16, DIR_EAST
ScrCmd_188 16, 17
SetObjectEventMovementType 16, MOVEMENT_TYPE_LOOK_RIGHT
Return
_0116:
@ -64,13 +64,13 @@ _0116:
_011C:
SetObjectEventPos 11, 37, 0x2D1
SetObjectEventDir 11, DIR_SOUTH
ScrCmd_188 11, 15
SetObjectEventMovementType 11, MOVEMENT_TYPE_LOOK_SOUTH
Return
_0132:
SetObjectEventPos 11, 39, 0x2DD
SetObjectEventDir 11, DIR_NORTH
ScrCmd_188 11, 14
SetObjectEventMovementType 11, MOVEMENT_TYPE_LOOK_NORTH
Return
_0148:
@ -145,7 +145,7 @@ _027C:
GoTo _028A
_028A:
ScrCmd_188 11, 17
SetObjectEventMovementType 11, MOVEMENT_TYPE_LOOK_RIGHT
ClearFlag FLAG_UNK_0x01B2
AddObject 11
ApplyMovement 11, _0340
@ -675,7 +675,7 @@ _0959:
RemoveObject 16
SetObjectEventPos 16, 45, 0x2EE
SetObjectEventDir 16, DIR_WEST
ScrCmd_188 16, 16
SetObjectEventMovementType 16, MOVEMENT_TYPE_LOOK_LEFT
AddObject 16
SetVar VAR_UNK_0x40F8, 4
ReleaseAll

2
res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s
View File

@ -32,7 +32,7 @@ _0073:
_007B:
SetObjectEventPos 0, 8, 6
SetObjectEventDir 0, DIR_SOUTH
ScrCmd_188 0, 0
SetObjectEventMovementType 0, MOVEMENT_TYPE_NONE
SetObjectEventPos 1, 9, 6
SetObjectEventDir 1, DIR_WEST
Return

2
res/field/scripts/scripts_celestic_town.s
View File

@ -85,7 +85,7 @@ _013C:
RemoveObject 3
SetObjectEventPos 3, 0x1D2, 0x213
SetObjectEventDir 3, DIR_NORTH
ScrCmd_188 3, 14
SetObjectEventMovementType 3, MOVEMENT_TYPE_LOOK_NORTH
ClearFlag FLAG_UNK_0x01AC
AddObject 3
ScrCmd_062 3

4
res/field/scripts/scripts_celestic_town_cave.s
View File

@ -32,7 +32,7 @@ _0040:
ClearFlag FLAG_UNK_0x0229
SetObjectEventPos 0, 4, 11
SetObjectEventDir 0, DIR_NORTH
ScrCmd_188 0, 14
SetObjectEventMovementType 0, MOVEMENT_TYPE_LOOK_NORTH
AddObject 0
GetPlayerMapPos VAR_0x8004, VAR_0x8005
CallIfEq VAR_0x8004, 9, _0110
@ -49,7 +49,7 @@ _0040:
ClearFlag FLAG_UNK_0x029B
SetObjectEventPos 1, 4, 11
SetObjectEventDir 1, DIR_NORTH
ScrCmd_188 1, 14
SetObjectEventMovementType 1, MOVEMENT_TYPE_LOOK_NORTH
AddObject 1
GetPlayerMapPos VAR_0x8004, VAR_0x8005
CallIfEq VAR_0x8004, 9, _0285

2
res/field/scripts/scripts_eterna_city.s
View File

@ -1081,7 +1081,7 @@ _0CF4:
_0D00:
LockAll
SetObjectEventDir 12, DIR_EAST
ScrCmd_188 12, 17
SetObjectEventMovementType 12, MOVEMENT_TYPE_LOOK_RIGHT
GetPlayerMapPos VAR_0x8004, VAR_0x8005
GoToIfEq VAR_0x8005, 0x21C, _0D64
GoToIfEq VAR_0x8005, 0x21D, _0D7A

8
res/field/scripts/scripts_eterna_city_gym.s
View File

@ -234,21 +234,21 @@ _02DA:
Return
_0314:
ScrCmd_188 VAR_0x8007, 15
SetObjectEventMovementType VAR_0x8007, MOVEMENT_TYPE_LOOK_SOUTH
SetObjectEventDir VAR_0x8007, DIR_SOUTH
Return
_0322:
ScrCmd_188 VAR_0x8007, 14
SetObjectEventMovementType VAR_0x8007, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir VAR_0x8007, DIR_NORTH
Return
_0330:
ScrCmd_188 VAR_0x8007, 17
SetObjectEventMovementType VAR_0x8007, MOVEMENT_TYPE_LOOK_RIGHT
SetObjectEventDir VAR_0x8007, DIR_EAST
Return
_033E:
ScrCmd_188 VAR_0x8007, 16
SetObjectEventMovementType VAR_0x8007, MOVEMENT_TYPE_LOOK_LEFT
SetObjectEventDir VAR_0x8007, DIR_WEST
Return

2
res/field/scripts/scripts_fight_area.s
View File

@ -37,7 +37,7 @@ _0066:
_0082:
SetObjectEventPos 7, 0x28F, 0x1AA
ScrCmd_188 7, 14
SetObjectEventMovementType 7, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 7, DIR_NORTH
End

2
res/field/scripts/scripts_iron_island_b2f_left_room.s
View File

@ -27,7 +27,7 @@ _0035:
_004A:
SetObjectEventPos 4, 19, 41
ScrCmd_188 4, 17
SetObjectEventMovementType 4, MOVEMENT_TYPE_LOOK_RIGHT
SetObjectEventDir 4, DIR_EAST
End

8
res/field/scripts/scripts_jubilife_city.s
View File

@ -44,13 +44,13 @@ _0072:
_00AC:
SetObjectEventPos 31, 177, 0x306
SetObjectEventDir 31, DIR_SOUTH
ScrCmd_188 31, 15
SetObjectEventMovementType 31, MOVEMENT_TYPE_LOOK_SOUTH
Return
_00C2:
SetObjectEventPos 7, 176, 0x2E3
SetObjectEventDir 7, DIR_WEST
ScrCmd_188 7, 16
SetObjectEventMovementType 7, MOVEMENT_TYPE_LOOK_LEFT
Return
_00D8:
@ -967,7 +967,7 @@ _0C7C:
RemoveObject 25
RemoveObject 27
SetObjectEventPos 30, 174, 0x2EE
ScrCmd_188 30, 14
SetObjectEventMovementType 30, MOVEMENT_TYPE_LOOK_NORTH
ClearFlag FLAG_UNK_0x018B
AddObject 30
ScrCmd_062 30
@ -1758,7 +1758,7 @@ _14CF:
GetPlayerMapPos VAR_0x8004, VAR_0x8005
SetObjectEventPos 31, 179, VAR_0x8005
SetObjectEventDir 31, DIR_EAST
ScrCmd_188 31, 17
SetObjectEventMovementType 31, MOVEMENT_TYPE_LOOK_RIGHT
ClearFlag FLAG_UNK_0x0181
AddObject 31
ApplyMovement 31, _1538

8
res/field/scripts/scripts_lake_verity.s
View File

@ -31,22 +31,22 @@ _0069:
_0071:
SetObjectEventPos 5, 46, 50
ScrCmd_188 5, 14
SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 5, DIR_NORTH
Return
_0087:
SetObjectEventPos 5, 46, 51
ScrCmd_188 5, 15
SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_SOUTH
SetObjectEventDir 5, DIR_SOUTH
Return
_009D:
SetObjectEventPos 5, 50, 37
ScrCmd_188 5, 16
SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_LEFT
SetObjectEventDir 5, DIR_WEST
SetObjectEventPos 6, 50, 39
ScrCmd_188 6, 16
SetObjectEventMovementType 6, MOVEMENT_TYPE_LOOK_LEFT
SetObjectEventDir 6, DIR_WEST
Return

2
res/field/scripts/scripts_mt_coronet_2f.s
View File

@ -33,7 +33,7 @@ _0036:
GetPlayerMapPos VAR_0x8004, VAR_0x8005
SetVar VAR_UNK_0x40A9, 2
SetObjectEventPos 5, 20, 25
ScrCmd_188 5, 16
SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_LEFT
SetObjectEventDir 5, DIR_WEST
ClearFlag FLAG_UNK_0x029F
AddObject 5

2
res/field/scripts/scripts_oreburgh_city.s
View File

@ -79,7 +79,7 @@ _00CC:
_00D7:
LockAll
ClearFlag FLAG_UNK_0x017C
ScrCmd_188 3, 16
SetObjectEventMovementType 3, MOVEMENT_TYPE_LOOK_LEFT
SetObjectEventDir 3, DIR_WEST
GetPlayerMapPos VAR_0x8004, VAR_0x8005
GoToIfEq VAR_0x8005, 0x2EC, _011E

18
res/field/scripts/scripts_pastoria_city.s
View File

@ -40,7 +40,7 @@ _005E:
_009C:
SetObjectEventPos 21, 0x27D, 0x32C
SetObjectEventDir 21, DIR_EAST
ScrCmd_188 21, 17
SetObjectEventMovementType 21, MOVEMENT_TYPE_LOOK_RIGHT
End
_00B2:
@ -545,7 +545,7 @@ _04C8:
LockAll
ClearFlag FLAG_UNK_0x01A9
SetObjectEventPos 26, 0x253, 0x333
ScrCmd_188 26, 16
SetObjectEventMovementType 26, MOVEMENT_TYPE_LOOK_LEFT
SetObjectEventDir 26, DIR_WEST
AddObject 26
ApplyMovement 26, _05B0
@ -631,7 +631,7 @@ _05E0:
LockAll
ClearFlag FLAG_UNK_0x01A9
SetObjectEventPos 26, 0x253, 0x333
ScrCmd_188 26, 15
SetObjectEventMovementType 26, MOVEMENT_TYPE_LOOK_SOUTH
SetObjectEventDir 26, DIR_SOUTH
AddObject 26
ScrCmd_062 26
@ -650,7 +650,7 @@ _05E0:
ClearFlag FLAG_UNK_0x01FB
SetObjectEventPos 27, 0x24D, 0x33B
SetObjectEventDir 27, DIR_NORTH
ScrCmd_188 27, 14
SetObjectEventMovementType 27, MOVEMENT_TYPE_LOOK_NORTH
AddObject 27
ScrCmd_062 27
ApplyMovement 27, _0764
@ -701,19 +701,19 @@ _05E0:
_0721:
SetObjectEventPos 26, 0x260, 0x32E
SetObjectEventDir 26, DIR_SOUTH
ScrCmd_188 26, 15
SetObjectEventMovementType 26, MOVEMENT_TYPE_LOOK_SOUTH
Return
_0737:
SetObjectEventPos 27, 0x263, 0x32A
SetObjectEventDir 27, DIR_NORTH
ScrCmd_188 27, 14
SetObjectEventMovementType 27, MOVEMENT_TYPE_LOOK_NORTH
Return
_074D:
SetObjectEventPos 26, 0x263, 0x32A
SetObjectEventDir 26, DIR_NORTH
ScrCmd_188 26, 14
SetObjectEventMovementType 26, MOVEMENT_TYPE_LOOK_NORTH
Return
.balign 4, 0
@ -833,7 +833,7 @@ _086F:
ClearFlag FLAG_UNK_0x020C
SetObjectEventPos 21, 0x262, 0x328
SetObjectEventDir 21, DIR_EAST
ScrCmd_188 21, 17
SetObjectEventMovementType 21, MOVEMENT_TYPE_LOOK_RIGHT
AddObject 21
ScrCmd_062 21
Return
@ -853,7 +853,7 @@ _08FA:
RemoveObject 21
ClearFlag FLAG_UNK_0x020C
SetObjectEventPos 21, 0x27D, 0x32C
ScrCmd_188 21, 17
SetObjectEventMovementType 21, MOVEMENT_TYPE_LOOK_RIGHT
SetObjectEventDir 21, DIR_EAST
AddObject 21
Return

2
res/field/scripts/scripts_route_201.s
View File

@ -267,7 +267,7 @@ _03DE:
WaitABXPadPress
CloseMessage
CallCommonScript 0x7F9
ScrCmd_188 2, 16
SetObjectEventMovementType 2, MOVEMENT_TYPE_LOOK_LEFT
SetVar VAR_FOLLOWER_RIVAL_STATE, 1
ReleaseAll
End

2
res/field/scripts/scripts_route_202.s
View File

@ -30,7 +30,7 @@ _0053:
_005B:
SetObjectEventPos 3, 186, 0x331
SetObjectEventDir 3, DIR_SOUTH
ScrCmd_188 3, 15
SetObjectEventMovementType 3, MOVEMENT_TYPE_LOOK_SOUTH
Return
_0071:

4
res/field/scripts/scripts_route_210_south.s
View File

@ -84,12 +84,12 @@ _00CA:
_015B:
SetObjectEventPos 20, 0x230, 0x254
ScrCmd_188 20, 14
SetObjectEventMovementType 20, MOVEMENT_TYPE_LOOK_NORTH
GoTo _0183
_016F:
SetObjectEventPos 20, 0x231, 0x254
ScrCmd_188 20, 14
SetObjectEventMovementType 20, MOVEMENT_TYPE_LOOK_NORTH
GoTo _0183
_0183:

4
res/field/scripts/scripts_route_213.s
View File

@ -34,7 +34,7 @@ _0051:
_0062:
SetObjectEventPos 30, 0x28E, 0x32C
SetObjectEventDir 30, DIR_EAST
ScrCmd_188 30, 17
SetObjectEventMovementType 30, MOVEMENT_TYPE_LOOK_RIGHT
Return
_0078:
@ -79,7 +79,7 @@ _010B:
RemoveObject 30
SetObjectEventPos 30, 0x2AB, 0x341
SetObjectEventDir 30, DIR_EAST
ScrCmd_188 30, 17
SetObjectEventMovementType 30, MOVEMENT_TYPE_LOOK_RIGHT
ClearFlag FLAG_UNK_0x021A
AddObject 30
ReleaseAll

2
res/field/scripts/scripts_sandgem_town.s
View File

@ -27,7 +27,7 @@ _0032:
_005F:
SetObjectEventPos 4, 168, 0x34D
SetObjectEventDir 4, DIR_NORTH
ScrCmd_188 4, 14
SetObjectEventMovementType 4, MOVEMENT_TYPE_LOOK_NORTH
Return
_0075:

4
res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s
View File

@ -29,11 +29,11 @@ _005A:
ClearFlag FLAG_UNK_0x0198
SetObjectEventPos 0, 7, 14
SetObjectEventDir 0, DIR_SOUTH
ScrCmd_188 0, 15
SetObjectEventMovementType 0, MOVEMENT_TYPE_LOOK_SOUTH
ClearFlag FLAG_UNK_0x0199
SetObjectEventPos 3, 6, 14
SetObjectEventDir 3, DIR_SOUTH
ScrCmd_188 3, 15
SetObjectEventMovementType 3, MOVEMENT_TYPE_LOOK_SOUTH
Return
_008C:

2
res/field/scripts/scripts_spear_pillar_distorted.s
View File

@ -20,7 +20,7 @@ _0022:
ScrCmd_1B2 1
SetObjectEventPos 0, 32, 34
SetObjectEventDir 0, DIR_NORTH
ScrCmd_188 0, 14
SetObjectEventMovementType 0, MOVEMENT_TYPE_LOOK_NORTH
ClearFlag FLAG_UNK_0x01CD
AddObject 0
ScrCmd_066 30, 30

4
res/field/scripts/scripts_stark_mountain_room_2.s
View File

@ -45,7 +45,7 @@ _0031:
_007D:
SetObjectEventPos 14, 42, 78
SetObjectEventDir 14, DIR_NORTH
ScrCmd_188 14, 14
SetObjectEventMovementType 14, MOVEMENT_TYPE_LOOK_NORTH
ClearFlag FLAG_UNK_0x01DA
AddObject 14
ApplyMovement 14, _00DC
@ -60,7 +60,7 @@ _007D:
_00B7:
SetObjectEventPos 14, 42, 68
SetObjectEventDir 14, DIR_NORTH
ScrCmd_188 14, 14
SetObjectEventMovementType 14, MOVEMENT_TYPE_LOOK_NORTH
ApplyMovement 14, _0144
WaitMovement
Message 3

4
res/field/scripts/scripts_sunyshore_city.s
View File

@ -37,7 +37,7 @@ _0077:
_0083:
SetObjectEventPos 18, 0x349, 0x316
ScrCmd_188 18, 16
SetObjectEventMovementType 18, MOVEMENT_TYPE_LOOK_LEFT
SetObjectEventDir 18, DIR_WEST
End
@ -479,7 +479,7 @@ _05D7:
RemoveObject 18
WaitTime 1, VAR_RESULT
SetObjectEventPos 18, 0x34D, 0x2EC
ScrCmd_188 18, 15
SetObjectEventMovementType 18, MOVEMENT_TYPE_LOOK_SOUTH
SetObjectEventDir 18, DIR_SOUTH
ClearFlag FLAG_UNK_0x0239
AddObject 18

4
res/field/scripts/scripts_team_galactic_eterna_building_1f.s
View File

@ -66,7 +66,7 @@ _006A:
WaitMovement
ClearFlag FLAG_UNK_0x01BB
SetObjectEventPos 5, 12, 15
ScrCmd_188 5, 16
SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_LEFT
SetObjectEventDir 5, DIR_WEST
AddObject 5
RemoveObject 4
@ -78,7 +78,7 @@ _006A:
WaitMovement
ClearFlag FLAG_UNK_0x01C2
SetObjectEventPos 4, 12, 15
ScrCmd_188 4, 16
SetObjectEventMovementType 4, MOVEMENT_TYPE_LOOK_LEFT
SetObjectEventDir 4, DIR_WEST
AddObject 4
RemoveObject 5

2
res/field/scripts/scripts_twinleaf_town_player_house_1f.s
View File

@ -24,7 +24,7 @@ _002E:
_0048:
SetObjectEventPos 0, 2, 4
SetObjectEventDir 0, DIR_NORTH
ScrCmd_188 0, 14
SetObjectEventMovementType 0, MOVEMENT_TYPE_LOOK_NORTH
Return
_005E:

2
res/field/scripts/scripts_unk_0212.s
View File

@ -150,7 +150,7 @@ _01B1:
_01BE:
SetObjectEventPos 9, 24, 6
ScrCmd_188 9, 15
SetObjectEventMovementType 9, MOVEMENT_TYPE_LOOK_SOUTH
SetObjectEventDir 9, DIR_SOUTH
Return

6
res/field/scripts/scripts_valley_windworks_building.s
View File

@ -21,10 +21,10 @@ _0022:
_0035:
SetObjectEventPos 5, 21, 5
SetObjectEventDir 5, DIR_WEST
ScrCmd_188 5, 16
SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_LEFT
SetObjectEventPos 2, 18, 4
SetObjectEventDir 2, DIR_SOUTH
ScrCmd_188 2, 15
SetObjectEventMovementType 2, MOVEMENT_TYPE_LOOK_SOUTH
End
_005F:
@ -140,7 +140,7 @@ _01DB:
CloseMessage
SetFlag FLAG_UNK_0x01F8
ClearFlag FLAG_UNK_0x01F9
ScrCmd_188 5, 16
SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_LEFT
AddObject 5
ScrCmd_062 5
GetPlayerMapPos VAR_0x8004, VAR_0x8005

6
res/field/scripts/scripts_valor_lakefront.s
View File

@ -24,7 +24,7 @@ _0026:
_004B:
SetObjectEventPos 5, 0x2D3, 0x301
SetObjectEventDir 5, DIR_NORTH
ScrCmd_188 5, 14
SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_NORTH
Return
_0061:
@ -184,7 +184,7 @@ _0248:
CallIfEq VAR_0x8000, 3, _040A
ClearFlag FLAG_UNK_0x01AD
SetObjectEventDir 0, DIR_SOUTH
ScrCmd_188 0, 15
SetObjectEventMovementType 0, MOVEMENT_TYPE_LOOK_SOUTH
AddObject 0
ApplyMovement 0, _0594
WaitMovement
@ -196,7 +196,7 @@ _0248:
CallIfEq VAR_0x8000, 3, _0462
ClearFlag FLAG_UNK_0x01D5
SetObjectEventDir 10, DIR_NORTH
ScrCmd_188 10, 14
SetObjectEventMovementType 10, MOVEMENT_TYPE_LOOK_NORTH
AddObject 10
CallCommonScript 0x7FA
CallIfEq VAR_0x8000, 0, _046C

6
res/field/scripts/scripts_veilstone_city.s
View File

@ -47,7 +47,7 @@ _0082:
_00BA:
SetObjectEventPos 6, 0x2B8, 0x254
ScrCmd_188 6, 17
SetObjectEventMovementType 6, MOVEMENT_TYPE_LOOK_RIGHT
SetObjectEventDir 6, DIR_EAST
Return
@ -61,7 +61,7 @@ _00D8:
_00E0:
SetObjectEventPos 26, 0x2CD, 0x251
ScrCmd_188 26, 14
SetObjectEventMovementType 26, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 26, DIR_NORTH
Return
@ -1219,7 +1219,7 @@ _0DBE:
CloseMessage
SetFlag FLAG_UNK_0x0155
SetObjectEventPos 26, 0x2D3, 0x259
ScrCmd_188 26, 14
SetObjectEventMovementType 26, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 26, DIR_NORTH
ClearFlag FLAG_UNK_0x028A
AddObject 26

4
res/field/scripts/scripts_veilstone_city_galactic_warehouse.s
View File

@ -16,7 +16,7 @@ _0016:
_0025:
SetObjectEventPos 4, 8, 10
ScrCmd_188 4, 14
SetObjectEventMovementType 4, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 4, DIR_NORTH
Return
@ -144,7 +144,7 @@ _0184:
_0197:
LockAll
SetObjectEventPos 4, 8, 11
ScrCmd_188 4, 14
SetObjectEventMovementType 4, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 4, DIR_NORTH
ClearFlag FLAG_UNK_0x020D
AddObject 4

28
res/field/scripts/scripts_villa.s
View File

@ -801,7 +801,7 @@ _0AF4:
PlayFanfare SEQ_SE_DP_DOOR_OPEN
ClearFlag FLAG_UNK_0x02B0
SetObjectEventPos 6, 11, 11
ScrCmd_188 6, 14
SetObjectEventMovementType 6, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 6, DIR_NORTH
AddObject 6
WaitFanfare SEQ_SE_DP_DOOR_OPEN
@ -832,7 +832,7 @@ _0B5C:
PlayFanfare SEQ_SE_DP_DOOR_OPEN
ClearFlag FLAG_UNK_0x02B3
SetObjectEventPos 9, 11, 11
ScrCmd_188 9, 14
SetObjectEventMovementType 9, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 9, DIR_NORTH
AddObject 9
WaitFanfare SEQ_SE_DP_DOOR_OPEN
@ -861,7 +861,7 @@ _0BBC:
PlayFanfare SEQ_SE_DP_DOOR_OPEN
ClearFlag FLAG_UNK_0x02B6
SetObjectEventPos 10, 11, 11
ScrCmd_188 10, 14
SetObjectEventMovementType 10, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 10, DIR_NORTH
AddObject 10
WaitFanfare SEQ_SE_DP_DOOR_OPEN
@ -892,7 +892,7 @@ _0C24:
PlayFanfare SEQ_SE_DP_DOOR_OPEN
ClearFlag FLAG_UNK_0x02B8
SetObjectEventPos 12, 11, 11
ScrCmd_188 12, 14
SetObjectEventMovementType 12, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 12, DIR_NORTH
AddObject 12
WaitFanfare SEQ_SE_DP_DOOR_OPEN
@ -1210,13 +1210,13 @@ _10DA:
Call _2209
GoToIfEq VAR_RESORT_VILLA_VISITOR, 0, _1103
SetObjectEventPos 1, 11, 11
ScrCmd_188 1, 14
SetObjectEventMovementType 1, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 1, DIR_NORTH
Return
_1103:
SetObjectEventPos 1, 10, 8
ScrCmd_188 1, 14
SetObjectEventMovementType 1, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 1, DIR_NORTH
ClearFlag FLAG_UNK_0x02A7
AddObject 1
@ -1226,13 +1226,13 @@ _1121:
Call _2209
GoToIfEq VAR_RESORT_VILLA_VISITOR, 1, _114A
SetObjectEventPos 0, 11, 11
ScrCmd_188 0, 14
SetObjectEventMovementType 0, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 0, DIR_NORTH
Return
_114A:
SetObjectEventPos 0, 10, 8
ScrCmd_188 0, 14
SetObjectEventMovementType 0, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 0, DIR_NORTH
ClearFlag FLAG_UNK_0x02A8
AddObject 0
@ -1246,14 +1246,14 @@ _1168:
_1183:
SetObjectEventPos 2, 11, 11
ScrCmd_188 2, 14
SetObjectEventMovementType 2, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 2, DIR_NORTH
Return
_1199:
GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _1183
SetObjectEventPos 2, 10, 8
ScrCmd_188 2, 14
SetObjectEventMovementType 2, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 2, DIR_NORTH
ClearFlag FLAG_UNK_0x02A9
AddObject 2
@ -1267,14 +1267,14 @@ _11C2:
_11DD:
SetObjectEventPos 5, 11, 11
ScrCmd_188 5, 14
SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 5, DIR_NORTH
Return
_11F3:
GoToIfUnset FLAG_VILLA_VISITOR_INSIDE, _11DD
SetObjectEventPos 5, 10, 8
ScrCmd_188 5, 14
SetObjectEventMovementType 5, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 5, DIR_NORTH
ClearFlag FLAG_UNK_0x02AE
AddObject 5
@ -1284,13 +1284,13 @@ _121C:
Call _2209
GoToIfEq VAR_RESORT_VILLA_VISITOR, 12, _1245
SetObjectEventPos 12, 11, 11
ScrCmd_188 12, 14
SetObjectEventMovementType 12, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 12, DIR_NORTH
Return
_1245:
SetObjectEventPos 12, 10, 8
ScrCmd_188 12, 14
SetObjectEventMovementType 12, MOVEMENT_TYPE_LOOK_NORTH
SetObjectEventDir 12, DIR_NORTH
ClearFlag FLAG_UNK_0x02B8
AddObject 12

9
src/map_object.c
View File

@ -3,6 +3,8 @@
#include <nitro.h>
#include <string.h>
#include "generated/movement_types.h"
#include "struct_decls/struct_02061830_sub1_decl.h"
#include "struct_defs/struct_020EDF0C.h"
@ -676,7 +678,8 @@ static void MapObjectMan_AddMoveTask(const MapObjectManager *mapObjMan, MapObjec
int movementType = MapObject_GetMovementType(mapObj);
SysTask *task;
if (movementType == 48 || movementType == 50) {
if (movementType == MOVEMENT_TYPE_048
|| movementType == MOVEMENT_TYPE_FOLLOW_PARTNER_TRAINER) {
v0 += 2;
}
@ -2476,10 +2479,10 @@ void MapObject_SetPosDirFromCoords(MapObject *mapObj, int x, int y, int z, int d
sub_020656DC(mapObj);
}
void MapObject_SetMoveCode(MapObject *mapObj, u32 param1)
void MapObject_SetMoveCode(MapObject *mapObj, u32 movementType)
{
sub_02062B28(mapObj);
MapObject_SetMovementType(mapObj, param1);
MapObject_SetMovementType(mapObj, movementType);
sub_0206239C(mapObj);
MapObject_InitMove(mapObj);
}

7
src/map_object_move.c
View File

@ -3,6 +3,8 @@
#include <nitro.h>
#include <string.h>
#include "generated/movement_types.h"
#include "struct_decls/struct_02061830_decl.h"
#include "struct_decls/struct_02061AB4_decl.h"
@ -987,7 +989,10 @@ void sub_02064464(MapObject *mapObj)
{
int movementType = MapObject_GetMovementType(mapObj);
if (movementType == 0x33 || movementType == 0x34 || movementType == 0x35 || movementType == 0x36) {
if (movementType == MOVEMENT_TYPE_DISGUISE_SNOW
|| movementType == MOVEMENT_TYPE_DISGUISE_SAND
|| movementType == MOVEMENT_TYPE_DISGUISE_ROCK
|| movementType == MOVEMENT_TYPE_DISGUISE_GRASS) {
sub_02062B14(mapObj);
}
}

3
src/overlay008/ov8_02249960.c
View File

@ -7,6 +7,7 @@
#include "constants/field/map.h"
#include "constants/field/map_prop.h"
#include "generated/movement_actions.h"
#include "generated/movement_types.h"
#include "struct_decls/struct_0205E884_decl.h"
#include "struct_decls/struct_02061830_decl.h"
@ -3902,7 +3903,7 @@ BOOL ov8_0224C5DC(FieldSystem *fieldSystem, void *param1)
MapObject_SetZInitial(v1, MapObject_GetZ(v1));
MapObject_SetMovementRangeX(v1, 2);
MapObject_SetMovementRangeZ(v1, 2);
MapObject_SetMoveCode(v1, 0x3);
MapObject_SetMoveCode(v1, MOVEMENT_TYPE_WANDER_AROUND);
return 1;
}

12
src/scrcmd.c
View File

@ -499,7 +499,7 @@ static BOOL ScrCmd_151(ScriptContext *ctx);
static BOOL ScrCmd_152(ScriptContext *ctx);
static BOOL ScrCmd_SetObjectEventPos(ScriptContext *ctx);
static BOOL ScrCmd_187(ScriptContext *ctx);
static BOOL ScrCmd_188(ScriptContext *ctx);
static BOOL ScrCmd_SetObjectEventMovementType(ScriptContext *ctx);
static BOOL ScrCmd_SetObjectEventDir(ScriptContext *ctx);
static BOOL ScrCmd_SetWarpEventPos(ScriptContext *ctx);
static BOOL ScrCmd_18B(ScriptContext *ctx);
@ -1160,7 +1160,7 @@ const ScrCmdFunc Unk_020EAC58[] = {
ScrCmd_185,
ScrCmd_SetObjectEventPos,
ScrCmd_187,
ScrCmd_188,
ScrCmd_SetObjectEventMovementType,
ScrCmd_SetObjectEventDir,
ScrCmd_SetWarpEventPos,
ScrCmd_18B,
@ -5442,12 +5442,12 @@ static BOOL ScrCmd_187(ScriptContext *ctx)
return FALSE;
}
static BOOL ScrCmd_188(ScriptContext *ctx)
static BOOL ScrCmd_SetObjectEventMovementType(ScriptContext *ctx)
{
u16 v0 = ScriptContext_GetVar(ctx);
u16 v1 = ScriptContext_GetVar(ctx);
u16 localID = ScriptContext_GetVar(ctx);
u16 movementType = ScriptContext_GetVar(ctx);
MapHeaderData_SetObjectEventMovementType(ctx->fieldSystem, v0, v1);
MapHeaderData_SetObjectEventMovementType(ctx->fieldSystem, localID, movementType);
return FALSE;
}

5
src/unk_0205C22C.c
View File

@ -4,6 +4,7 @@
#include <string.h>
#include "generated/movement_actions.h"
#include "generated/movement_types.h"
#include "struct_decls/struct_02027F8C_decl.h"
#include "struct_decls/struct_0205B43C_decl.h"
@ -282,7 +283,7 @@ static void sub_0205C51C(UnkStruct_0205C22C *param0, MapObjectManager *param1)
sub_02062DB4(v0, 0);
if ((param0->unk_0C[v1].unk_00 == 1) && (param0->unk_0C[v1].unk_09 == 0)) {
MapObject_SetMoveCode(v0, 0x3);
MapObject_SetMoveCode(v0, MOVEMENT_TYPE_WANDER_AROUND);
MapObject_SetMovementRangeX(v0, 1);
MapObject_SetMovementRangeZ(v0, 1);
param0->unk_0C[v1].unk_09 = 1;
@ -394,7 +395,7 @@ static void sub_0205C788(UnkStruct_0205C680 *param0, MapObject *param1)
{
LocalMapObj_SetAnimationCode(param1, MOVEMENT_ACTION_WARP_OUT);
sub_02062DB4(param1, 1);
MapObject_SetMoveCode(param1, 0x0);
MapObject_SetMoveCode(param1, MOVEMENT_TYPE_NONE);
sub_0205C680(param0, 1);
param0->unk_04 = 0;

3
src/unk_02067A84.c
View File

@ -5,6 +5,7 @@
#include "constants/field/dynamic_map_features.h"
#include "generated/movement_actions.h"
#include "generated/movement_types.h"
#include "struct_decls/struct_0205E884_decl.h"
#include "struct_decls/struct_02061830_decl.h"
@ -671,7 +672,7 @@ static int sub_02068308(UnkStruct_020EF6D0 *param0)
sub_020656AC(param0->unk_24);
if ((PersistedMapFeatures_IsCurrentDynamicMap(param0->fieldSystem, DYNAMIC_MAP_FEATURES_HEARTHOME_GYM) == 0) || (ov8_0224C5DC(param0->fieldSystem, param0->unk_24) == 0)) {
MapObject_SetMoveCode(param0->unk_24, 0x0);
MapObject_SetMoveCode(param0->unk_24, MOVEMENT_TYPE_NONE);
}
param0->unk_00 = 17;