Eduardo Quezada
ddc752eb14
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# asm/macros/event.inc
# data/field_effect_scripts.s
# data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
# data/script_cmd_table.inc
# graphics/pokemon/castform/sunny/anim_front.png
# graphics/pokemon/castform/sunny/normal.pal
# include/battle_util.h
# include/constants/event_object_movement.h
# include/constants/field_effects.h
# src/battle_controller_player.c
# src/battle_util.c
# src/data/object_events/movement_action_func_tables.h
# src/data/object_events/object_event_pic_tables.h
# src/data/trainer_graphics/back_pic_anims.h
# src/daycare.c
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/load_save.c
# src/scrcmd.c
# src/trainer_see.c
2024-01-17 18:11:35 -03:00
psf
bf8b09b1b6
Item Ball refactor / Pluralize item names for giveitem and finditem ( #3942 )
...
* Emptied out item_ball_scripts
Added GetObjectEventTrainerRangeFromTemplate
Added Common_EventScript_FindItem
* Replaced trainer_sight_or_berry_tree_id with item constant
Replaced scripts with Common_EventScript_FindItem
* Renamed to GetItemBallIdAndAmountFromTemplate
Moved to item_ball.c
* Updated ObjectEventTemplate
* Updated inc files to support plural item names
* Refactored CopyItemNameHandlePlural to handle all items
* Change failsafe in GetItemBallIdFromTemplate to be ITEM_NONE + 1 instead of ITEMS_COUNT
* Converted spaces to tabs
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415663
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415525
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415409
https://github.com/rh-hideout/pokeemerald-expansion/pull/3942\#discussion_r1446415130
* Added warning on object_event macro to prevent silent failure
Reverted global.fieldmap to original state, per feedback
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-14 21:35:45 +01:00
Ariel A
5d392244be
Merge branch 'followers' into followers-expanded-id
2023-05-15 19:08:45 -04:00
GriffinR
de56e400ff
Sync clone object macro
2023-02-08 13:11:10 -05:00
Ariel A
7b40e481ce
Improved saving & loading expanded OWs.
2023-01-12 21:45:41 -05:00
Ariel A
72e723df65
Expanded graphicsId field.
2023-01-07 19:54:12 -05:00
GriffinR
dc7d86f026
Add new macro comments
2022-01-23 19:30:39 -05:00
GriffinR
2495d18132
Add missing :req, remove old macros
2022-01-23 18:52:04 -05:00
GriffinR
038505984c
Fix bg event macros
2021-04-01 02:42:02 -04:00
GriffinR
b1d26e10a8
Sync map header property names with pokefirered
2020-04-28 19:59:08 -05:00
Marcus Huderle
a1ea3b5e39
Use map_header_flags macro ( #483 )
2018-12-26 12:20:15 -06:00
Deokishisu
e15c7fc7cf
Fix deleted line
2018-12-19 12:28:37 -05:00
Deokishisu
8edbad78e5
Add requirements to the fields of the object_event macro
...
With these changes, the compiler will yell at you if you screw up the number of fields for your event objects while manually editing a map's events.inc. Making these fields required will prevent event corruption of all map events that are included after the map with the messed up fields.
2018-12-19 12:20:38 -05:00
garak
113a8d1efd
clean flags and remove temp macro
2018-10-19 14:59:18 -04:00
garak
d1b7f32b0a
begin event flag names, add temporary hidden item macro
2018-10-17 22:07:23 -04:00
Marcus Huderle
7d375972ba
Sync bg_event macros with pokeruby
2018-07-11 11:12:26 -05:00
Marcus Huderle
f807eb1f2d
Split out movement radius in object_event macro
2018-06-15 07:49:21 -05:00
Marcus Huderle
2807abe3ba
Remove filler bytes from object_event macro
2018-06-15 07:49:21 -05:00
Marcus Huderle
acc1a5d446
Get all map constants from include/ rather than constants/
2018-06-15 07:49:21 -05:00
Diegoisawesome
32bf0849d2
Test
2017-10-24 14:35:06 -05:00
Diegoisawesome
c23a633a44
Prepare for dumping
2017-10-23 21:18:49 -05:00
YamaArashi
a793e62d83
.s -> .inc
2016-11-01 08:29:13 -07:00
