Hedara
|
c27930eabf
|
Merge commit '678fdf9' into pret-merge
Conflicts:
data/maps/BirthIsland_Exterior/scripts.inc
data/maps/DesertUnderpass/scripts.inc
data/maps/Route117/scripts.inc
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
data/maps/SootopolisCity/scripts.inc
include/constants/event_objects.h
src/battle_setup.c
src/event_object_movement.c
src/field_control_avatar.c
src/item_use.c
src/scrcmd.c
tools/mapjson/mapjson.cpp
|
2025-05-27 19:22:40 +02:00 |
|
GriffinR
|
f61c0099b9
|
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
|
2024-10-12 23:34:02 -04:00 |
|
Eduardo Quezada
|
bf814e11cd
|
Cleanup
- Proper whitespace
- Bracket pret style
- Simplified RemoveObjectEventInternal
- SImplified GetMonInfo
- Made IsFollowerVisible easier to read
|
2023-06-18 01:19:46 -04:00 |
|
Ariel A
|
bdcbb5c700
|
Merge branch 'master' into romhack
|
2021-12-18 17:14:52 -05:00 |
|
cbt6
|
b3d779fd0d
|
Document field player functions
|
2021-10-27 01:39:00 +08:00 |
|
Ariel Antonitis
|
8a3b04e837
|
Merge branch 'master' into romhack
|
2021-09-02 01:03:13 -04:00 |
|
GriffinR
|
4206359862
|
Fix some object lock names
|
2021-05-04 01:21:50 -04:00 |
|
Ariel Antonitis
|
9952a47a64
|
Fixed follower behavior when seen by trainers.
|
2021-03-03 02:06:17 -05:00 |
|
GriffinR
|
9e59581220
|
Document object lock and some trainer approach
|
2021-01-26 04:42:18 -05:00 |
|
GriffinR
|
4fe507e453
|
Document union_room.c
|
2020-05-31 13:11:18 -04:00 |
|
GriffinR
|
68cdd7b1cb
|
Merge master into ObjEvent rename
|
2019-12-21 05:19:27 -05:00 |
|
GriffinR
|
1b30f0c973
|
Rename event_obj_lock to event_object_lock
|
2019-12-06 02:55:30 -05:00 |
|