Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,132 Commits 1 Branch 0 Tags
Commit Graph

550 Commits

Author SHA1 Message Date
Eduardo Quezada
d801556a97 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727 2025-07-27 11:59:07 -04:00
GriffinR
0c7c81e02f
Merge branch 'master' into _pret/pr/pyramidLocation 2025-06-30 11:51:45 -04: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
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
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
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
Bivurnum
ddff74e8f9
Bug fix: add proper elevation handling for npc followers (#6871) 2025-05-16 09:54:22 +02:00
GriffinR
929bc8b990 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2025-05-14 11:50:11 -04:00
Bivurnum
49ae82c679 changed remove check from objId to localId for npc followers 2025-04-28 10:58:35 -05:00
hedara90
5dfbdf56da
27/04/25 Master to upcoming merge (#6701) 2025-04-27 18:01:50 +02:00
Bivurnum
47723c34e5
Follower NPCs (follow-me) (#6500) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-04-27 14:56:18 +02:00
AlexOn1ine
e246b20e72 27/04/25 Master to upcoming merge 2025-04-27 09:50:25 +02:00
hedara90
d1aa49cca3
Remove compressed palettes (#6455) 2025-04-26 22:58:40 +02:00
hedara90
6fdb6a9e34
Fixed broken palette load for shiny followers in the sprite visualizer (#6683) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-04-23 12:17:54 +02:00
Hedara
9afd8800f3 Merge branch 'upcoming' into merrps-dns 2025-04-12 16:33:02 +02:00
Hedara
11df205d89 Merge branch 'nemo-merrp-fix' into merrps-dns 2025-04-11 18:50:24 +02:00
Bassoonian
708bb4a831 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr 2025-04-10 23:57:57 +02:00
Hedara
d78afca94f More shadow options and documentation 2025-04-10 22:41:38 +02:00
Hedara
b075163c57 Cleanup and config options 2025-04-10 21:17:20 +02:00
cawtds
1672d99060 make linkDirection more robust to member reordering 2025-04-09 13:40:39 +02:00
Hedara
08a2ad2c98 Merge branch 'upcoming' into merrps-dns 2025-04-09 10:01:51 +02:00
Deokishisu
eaf7549854
Replace Incorrect Slow Stairs Movement with Correct One (#6275) 2025-03-16 14:51:36 -07:00
Eduardo Quezada
1895e6263b Applied a proper fix to blending 2025-02-23 16:44:05 -03:00
Eduardo Quezada
4492f02171 Fixed follower palettes not blending 2025-02-20 22:27:02 -03:00
Eduardo Quezada
ce71dc1adb Removed unused function 2025-02-20 19:52:23 -03:00
Eduardo Quezada
2428af66cd Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-02-20 19:17:59 -03:00
Eduardo Quezada
9c4fbbf274 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-13 13:06:32 -03:00
Alex
8448e745ea
Adds a follower flag define to disable followers on the fly (#6174) 2025-02-13 17:33:59 +01:00
Bassoonian
35324497a6
Update src/event_object_movement.c 2025-02-13 13:35:38 +01:00
hedara90
7d1bbf62e1
Apply suggestions from code review 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-02-13 10:23:06 +01:00
Hedara
a859f40e37 Review comments 2025-02-12 14:31:42 +01:00
Hedara
7426a98dc5 Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge 2025-02-12 13:34:28 +01:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
Ariel A
c8fb56d73b Merge branch 'followers' into followers-expanded-id 2025-02-10 00:24:50 -05:00
Ariel A
ef05bbf394 Merge remote-tracking branch 'upstream/master' into followers 2025-02-10 00:11:38 -05:00
Eduardo Quezada
d3417b00a2
Fixed compilation error when turning P_GENDER_DIFFERENCES off (#6223) 2025-02-09 15:37:56 +01:00
Eduardo Quezada
e29e1c6ca7 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-07 15:33:26 -03:00
hedara90
f9d1fdcf4c
Follower Object Event refactor (#6129) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-02-06 21:12:42 +01:00
Ariel A
bc421740e8 fix: fixed compilation error when OW_GFX_COMPRESS is FALSE 2025-01-29 23:12:45 -05:00
Eduardo Quezada
3fc9b0195d Cleaned up code to align with previous review comments 2025-01-26 17:14:00 -03:00
Eduardo Quezada
00241cf569 Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2 
# Conflicts:
#	README.md
#	asm/macros/event.inc
#	data/scripts/pkmn_center_nurse.inc
#	include/constants/event_objects.h
#	include/constants/field_weather.h
#	include/overworld.h
#	include/palette.h
#	include/sprite.h
#	src/battle_controller_player.c
#	src/data/object_events/object_event_graphics.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_weather.c
#	src/overworld.c
#	src/palette.c
#	src/scrcmd.c
#	src/sprite.c
 2025-01-26 12:08:10 -03:00
Ariel A
c1d105c31c Merge branch 'lighting' into lighting-expanded-id 2025-01-25 21:45:23 -05:00
Ariel A
bc034aaf73 Merge branch 'followers-expanded-id' into lighting-expanded-id 2025-01-25 21:42:02 -05:00
Ariel A
8933b84e1c Merge branch 'followers' into followers-expanded-id 2025-01-25 21:40:51 -05:00
Ariel A
84fecf21c9 Merge branch 'followers' into lighting 2025-01-25 21:38:22 -05:00
Ariel A
d73167e262 fix: treat 1-tile jumps as slow copyable movement for follower pokemon 2025-01-25 21:37:16 -05:00
Ariel A
16c31d61b4 fix: removed fadescreenswapbuffers palette dependence, via hardware fade 2025-01-25 20:58:22 -05:00
Eduardo Quezada
26daf15ce0 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-24 18:29:28 -03:00
DizzyEggg
4e0eab9e27
Remove gDecompressionBuffer (#6029) 2025-01-23 09:47:14 +01:00