Hedara
|
80ec5ff409
|
Merge commit '143500a1f95bf5951c001ec88db8b9d3f55d43e7' into merrp-merge
|
2025-06-25 17:22:11 +02:00 |
|
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
|
143500a1f9
|
fix: capitalization in follower splash message
|
2025-06-24 20:20:01 -04:00 |
|
Ariel A
|
1f2fe7396b
|
feat: added abnormal weather follower message
Includes support for follower matching != species
|
2025-06-24 20:19:23 -04:00 |
|
Hedara
|
9d80ad530d
|
Merge branch 'master' into master-to-upcoming
Conflicts:
Makefile
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
data/maps/MtChimney/scripts.inc
data/maps/MtPyre_Summit/scripts.inc
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
include/constants/event_objects.h
include/constants/expansion.h
src/battle_script_commands.c
src/battle_util.c
src/field_screen_effect.c
|
2025-05-28 14:26:15 +02:00 |
|
Hedara
|
9bfef357a2
|
Merge commit 'e4e90ea' into pret-merge
Conflicts:
src/battle_setup.c
src/field_specials.c
src/menu_helpers.c
src/pokedex_area_screen.c
src/roamer.c
src/script.c
|
2025-05-27 18:53:30 +02:00 |
|
Eduardo Quezada
|
458bd5ad4d
|
Review changes pt 1
|
2024-12-05 07:56:49 -03:00 |
|
Eduardo Quezada
|
56859e35e0
|
Using TIME instead of TIME_OF_DAY
|
2024-09-12 10:26:58 -03:00 |
|
Greenphx9
|
ad969c968c
|
Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2
|
2024-08-25 17:54:28 +10:00 |
|
Ariel A
|
29b2a7512f
|
Merge branch 'followers' into lighting
|
2024-08-12 23:06:45 -04:00 |
|
Bassoonian
|
207129e0c8
|
Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug
|
2024-08-07 12:42:45 +02:00 |
|
Bassoonian
|
369efc1208
|
Fix two small text errors in follower dialogue
|
2024-08-04 01:15:36 +01:00 |
|
Eduardo Quezada
|
14ab00cfeb
|
Moved message counts to their own file + remove unneeded include
|
2024-05-21 22:04:22 -04:00 |
|
Eduardo Quezada
|
a6bfcc1194
|
More style fixes
|
2024-05-18 14:36:06 -04: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 |
|
Ariel A
|
7d7531f2fa
|
Merge branch 'master' into followers
|
2023-12-31 01:28:27 -05:00 |
|
Ariel A
|
4689f0b0d0
|
Fixes for make modern.
|
2023-10-15 01:39:44 -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
|
b46a8b16ca
|
Added time-of-day related follower messages.
|
2022-05-03 23:20:43 -04:00 |
|
Ariel A
|
831c73c18c
|
Added system for conditional follower messages.
|
2022-05-03 23:01:02 -04:00 |
|