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

135 Commits

Author SHA1 Message Date
Hedara
4bdef731e4 Merge remote-tracking branch 'pret/master' into pret-merge 
Conflicts:
	include/constants/battle_ai.h
	src/battle_ai_script_commands.c
	src/battle_gfx_sfx_util.c
	src/pokemon_summary_screen.c
	src/trainer_pokemon_sprites.c
 2026-01-01 22:16:58 +01:00
Martin Griffin
c466dce996 Fix FLAG_REGISTERED_WALLY 2025-11-06 13:40:22 +00: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
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
hedara90
b6b6e91959
A lot of tests (#6734) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-05-07 16:50:12 +02:00
hedara90
622a7f9a85
Refactor testing flags and vars to not conflict with user ones (#6301) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-02-22 15:32:39 +01:00
Hedara
0da3e49889 Review comments 2025-02-13 10:36:52 +01:00
Hedara
7426a98dc5 Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge 2025-02-12 13:34:28 +01:00
Ariel A
ef05bbf394 Merge remote-tracking branch 'upstream/master' into followers 2025-02-10 00:11:38 -05:00
Ariel A
4056804575 feat: improved follower handling during scripted movements 2024-10-20 23:55:05 -04:00
GriffinR
0eb6d1d74c Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants 2024-10-15 22:04:45 -04:00
Eduardo Quezada
80447bee8e Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015 2024-10-15 20:56:56 -03:00
GriffinR
a0be2cbf7b Fix Fallorbor typo 2024-10-12 23:50:12 -04:00
GriffinR
9f31b0fe90 Generate local IDs from map.json files 2024-10-12 03:04:24 -04:00
Eduardo Quezada
831b394ca1 Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909 
# Conflicts:
#	Makefile
#	include/battle.h
#	include/battle_main.h
#	include/battle_util.h
#	include/data.h
#	make_tools.mk
#	map_data_rules.mk
#	src/battle_setup.c
#	src/fieldmap.c
 2024-09-11 15:26:14 -03:00
GriffinR
3f49c5cbaf Fix trainer match call flags 2024-08-15 23:00:20 +02:00
Eduardo Quezada
dca0305ac8 FLAG_TEMP_HIDE_FOLLOWER is now an alias for FLAG_TEMP_E 2024-05-17 11:24:05 -04:00
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
Ariel A
8df538479a Merge branch 'master' into followers 2023-09-03 17:39:35 -04:00
GriffinR
b248791f47
Merge pull request #1904 from GriffinRichards/temp-alias 
Add temp flag and var aliases
 2023-08-11 15:45:00 -04:00
Martin Griffin
912a80e27a
Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
GriffinR
866c32a735 Add temp var aliases 2023-08-04 14:17:28 -04:00
GriffinR
6d4dadd7b5 Add temp flag aliases 2023-08-03 15:55:06 -04:00
Ariel A
d12efe8cd7 Merge branch 'master' into followers 2023-05-15 18:37:38 -04:00
GriffinR
6be9a79b8c
Merge pull request #1871 from GriffinRichards/doc-trendy-sayings 
Document the trendy sayings word group
 2023-03-24 08:05:51 -04:00
Zunawe
492422b6bd Fix scanner item flag name 2023-03-23 21:47:26 -07:00
GriffinR
0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04:00
Zunawe
f376b71f7c Fix wrong route in item flag name 2023-02-25 13:48:39 -08:00
Zunawe
60be59d18b Fix wrong route in hidden item flag name 2023-02-22 13:13:57 -08:00
Zunawe
8f74a6777a Fix spelling mistake for item flag 2023-02-20 18:17:30 -08:00
Ariel A
1c011a9c1c Merge branch 'master' into followers 2022-10-07 20:52:15 -04:00
Eduardo Quezada
c7fc2e13f7 Renamed TM flags to keep consistency with the rest of the repo 2022-09-02 16:54:58 -04:00
Ariel A
d846b9c781 Added dynamic palette support for virtual objects. 
Added flag to hide follower on certain maps.
 2022-08-17 19:58:46 -04:00
Ariel A
9beee311c4 Merge branch 'master' into romhack 2022-07-17 15:13:15 -04:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
GriffinR
8b920691e6 Fix FLAG_DECORATION_0 name 2022-01-09 01:31:42 -05:00
Ariel A
d06e1d4af6 Added flag for safe follower movement. 2021-12-30 01:46:42 -05:00
GriffinR
845a5e99cc General mystery gift documentation, finish mystery gift client/server/scripts 2021-10-16 23:35:17 -04:00
GriffinR
c02001c46d Document mystery gift link scripts, general mystery gift 2021-10-15 12:05:06 -04:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00
LOuroboros
b4c4650186 Corrected inconsistent flag label spelling 2021-08-05 17:26:03 -03:00
LOuroboros
8012f4b25a Re-ordered the hidden item flags list 
Instead of sorting them by location, it makes more sense to sort them by their value.
 2021-07-26 20:18:11 -03:00
GriffinR
00c3044c96 Clarify Groudon/Kyogre/Rayquaza gfx names 2021-04-06 02:38:15 -04:00
GriffinR
86856098a3 Document Dewford Trend 2021-03-31 16:08:42 -04:00
SphericalIce
56e047f949 Fix Lilcove Motel typos 2021-02-14 21:38:39 +00:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
GriffinR
f5495d1220 Give proper names to underwater maps 2020-09-01 03:03:14 -04:00
GriffinR
503dafd210 Fix wallys parents misnamed as uncle/aunt 2020-08-18 17:51:41 -04:00
GriffinR
813f0c724f Sync flags with pokeruby 2020-07-22 18:00:41 -04:00