Hedara
|
3ce34c41b6
|
Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge
Conflicts:
include/follower_helper.h
src/follower_helper.c
|
2025-06-25 17:20:38 +02:00 |
|
Ariel A
|
1f2fe7396b
|
feat: added abnormal weather follower message
Includes support for follower matching != species
|
2025-06-24 20:19:23 -04:00 |
|
Bassoonian
|
d62205f2fc
|
Converts some defines to enums (#6592)
|
2025-04-13 13:39:20 +02:00 |
|
Greenphx9
|
ad969c968c
|
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
|
2024-08-25 17:54:28 +10:00 |
|
Eduardo Quezada
|
1359966a14
|
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
# src/event_object_movement.c
# src/scrcmd.c
|
2024-06-01 20:17:19 -04:00 |
|
Ariel A
|
d410ca6999
|
Merge branch 'followers' into lighting
|
2024-06-01 15:21:57 -04:00 |
|
Ariel A
|
3727be9511
|
fix: fixed a few oversights with follower message generation
|
2024-06-01 14:46:45 -04:00 |
|
Eduardo Quezada
|
73a13e5dd4
|
Some review changes
|
2024-05-18 10:40:09 -04:00 |
|
Eduardo Quezada
|
124c17d315
|
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
# README.md
# data/field_effect_scripts.s
# data/maps/AncientTomb/scripts.inc
# data/maps/DesertRuins/scripts.inc
# data/maps/IslandCave/scripts.inc
# data/scripts/follower.inc
# graphics/object_events/pics/pokemon/wailord.png
# graphics/object_events/pics/pokemon_old/substitute.png
# include/constants/event_objects.h
# include/global.h
# remote_build.sh
# spritesheet_rules.mk
# src/bike.c
# src/data/object_events/object_event_anims.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/data/object_events/object_event_pic_tables.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_screen_effect.c
# src/overworld.c
# src/palette.c
# src/pokemon_summary_screen.c
# src/scrcmd.c
# src/trainer_see.c
|
2024-02-17 23:40:08 -03:00 |
|
Ariel A
|
7cf2d1eca0
|
Merge branch 'followers' into lighting
|
2024-02-17 17:51:30 -05:00 |
|
Ariel A
|
915f40c654
|
Improved follower message system.
|
2024-02-12 20:37:08 -05:00 |
|
Ariel A
|
a407c72235
|
Cleaned up follower code.
Added support for asymmetrical follower pokemon.
Fixed bug with changing GraphicsInfo size.
Added follower Substitute gfx. Credit: shikashipx
|
2024-02-12 20:37:01 -05: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
|
e54c18fb8e
|
Merge branch 'followers' into lighting
|
2022-09-10 22:29:18 -04:00 |
|
Ariel A
|
66acabe5c6
|
Refactored follower messages.
|
2022-08-29 00:43:38 -04:00 |
|
Ariel A
|
831c73c18c
|
Added system for conditional follower messages.
|
2022-05-03 23:01:02 -04:00 |
|