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

162 Commits

Author SHA1 Message Date
Hedara
dd17524fc9 Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge 
sha1sum changed

 Conflicts:
	include/global.h
	include/overworld.h
	include/pokemon.h
	src/map_name_popup.c
	src/pokedex_area_screen.c
	src/pokemon.c
 2025-11-01 15:09:20 +01:00
DavidJCobb
7fd0029ed7
Add typedefs for MAPSEC and METLOC values (#2183) 
Added typedefs: mapsec_t, metloc_t, and variants for MAPSEC and METLOC values. There are some rough edges that could do with smoothing out, but for now, this gets us close to ideal with a ROM that compares equal.

Per feedback, all typedefs to mention the underlying type within the typedef name. The documentation comments reflect and explain the naming convention.

Updated comments to reflect the fact that we're no longer using SET8 for a Pokemon's met locations, in favor of a new macro (added by this PR) that adjusts to match the width of whatever is being set.
 2025-10-19 17:37:13 +01:00
Eduardo Quezada
d801556a97 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727 2025-07-27 11:59:07 -04:00
GriffinR
6f8a1bbdb8
Add pack/unpack for data masks (#2163) 2025-07-23 09:28:34 +01:00
Hedara
9afd8800f3 Merge branch 'upcoming' into merrps-dns 2025-04-12 16:33:02 +02:00
Hedara
301ef288f5 Review comments 2025-04-11 11:37:36 +02:00
Bassoonian
708bb4a831 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr 2025-04-10 23:57:57 +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
Eduardo Quezada
937b3106b4 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-17 19:33:48 -03:00
hedara90
7c6c9120ea
Ewram and unused function cleanup sweep (#6019) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-01-15 14:07:12 +01:00
Eduardo Quezada
89f90e1f69 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-03 13:58:10 -03:00
Eduardo Quezada
d151e00c70 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-04 19:15:48 -03:00
ghoulslash
b488ff9b53 merge w upcoming 2024-11-03 07:11:40 -05:00
hedara90
bcfdf41078
Follower female fix (#5475) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-10-22 12:38:06 -03:00
ghoulslash
229525d122 some cleanup 2024-10-18 22:13:49 -04:00
ghoulslash
2e52e3331f merge w upcoming 2024-10-04 12:56:21 -04:00
Eduardo Quezada
d1056f887b Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-09-30 15:52:49 -03:00
ghoulslash
be3ee1ba85 merge w upcoming 2024-09-29 13:33:20 -04:00
ghoulslash
b7246a018c merge w upcoming 2024-09-22 09:13:25 -04:00
pkmnsnfrn
fe428fc89b original merge of branch 2024-08-25 16:46:22 -07:00
Greenphx9
ad969c968c Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2 2024-08-25 17:54:28 +10:00
Bassoonian
63a1f85d81 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge14aug 2024-08-14 12:33:04 +02:00
GriffinR
a3d5f54b75 Fix type for offset in MapConnection 2024-08-13 19:10:24 +02:00
ghoulslash
b8dea3c7ec sideways stairs, try to integrate with follower code 2024-06-19 10:50:59 -04:00
ghoulslash
cb1696384c merge in original dexnav code with some rhh specific tweaks 2024-06-16 10:39:28 -04:00
Eduardo Quezada
a6bfcc1194 More style fixes 2024-05-18 14:36:06 -04:00
Eduardo Quezada
569749f9c2 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	Makefile
#	gflib/sprite.h
#	graphics/object_events/pics/pokemon/wailord.png
#	include/constants/event_objects.h
#	include/random.h
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info.h
#	src/data/object_events/object_event_graphics_info_pointers.h
#	src/event_object_movement.c
#	src/random.c
#	src/scrcmd.c
 2024-05-18 10:12:17 -04:00
Ariel A
d785fad8cf refactor: code review for expansion 2024-05-17 21:37:18 -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
195d2bb79a Merge branch 'followers' into followers-expanded-id 2024-02-17 17:19:01 -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
5d372b5f8a Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	README.md
#	gflib/sprite.c
#	graphics/object_events/pics/pokemon/togetic.png
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info.h
#	src/data/object_events/object_event_graphics_info_followers.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
 2024-01-18 08:12:09 -03: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
dcaaac92d9 Added support for compressed OW graphics. 
Added CpuSmartCopy macros (Credit: luckytyphlosion)
 2023-12-31 00:35:27 -05:00
psf
fe16a2cdee
Port pokefirered's Vs. Seeker to pokeemerald (#3256) 
* First version of Vs. Seeker

* Update movement.inc

98f7e9978d (r1306721924)

* Update field_effect_scripts.s

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722004

* Update field_effect_scripts.s

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722024

* Update item_use.h

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722401

* Update movement_action_func_tables.h

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722828

* Update event_object_movement.c

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306722887

* Update overworld.c

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306723396

* Update vs_seeker.h

https://github.com/rh-hideout/pokeemerald-expansion/pull/3256/files#r1306724158

* Update vs_seeker.c

Addressed some cleanup comments from SBird

* Update UpdateRandomTrainerRematches
Fixed typo in ClearAllTrainerRematchStates
Fixed types in GetRematchableTrainerLocalId

* Updated UseVsSeekerEffect_2

* Updated UseVsSeekerEffect_3

* Updated UseVsSeekerEffect_4

* Fixed bug that allowed Vs Seeker to be used indoors in correct places
Moved VsSeeker function declarations into header

* Refactored FieldUseFunc_VsSeeker

* Added curly braces to else case in FieldUseFunc_VsSeeker

* renamed data[x] in Task_ResetObjectsRematchWantedState

* Refactored Task_ResetObjectsRematchWantedState

* Refactored VsSeekerResetObjectMovementAfterChargeComplete

* Refactored ResetMovementOfRematchableTrainers

* Refactored GatherNearbyTrainerInfo

* Refactored Task_VsSeeker_3

* CanUseVsSeeker

* Refactored GetVsSeekerResponseInArea

* GetCurVsSeekerResponse refactored

* Cleaned up GetTrainerFlagFromScript

* Gave sensible names to Task_VsSeeker

* Fixed two bugs where player would not have the right gfx state after using VsSeeker on a Bike or Underwater

* Renamed UseVsSeeker Functions

* Added I_VS_SEEKER_CHARGING to make Vs. Seeker broken until flag is assigned
Removed extra VsSeeker animation code

* Addressed PR feedback

* Fixed issue with building non-modern

* Refactored GetRunningBehaviorFromGraphicsId and renamed to GetResponseMovementTypeFromTrainerGraphicsId

* Addresses Lunos's PR feedback: https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1623547850
Removed the check to see if a map was not indoors to improve readability
Made IsValidLocationForVsSeeker into a static function

* Added changes in response to Jasper's feedback
https://github.com/rh-hideout/pokeemerald-expansion/pull/3256\#pullrequestreview-1725276522

* Updated with Edu's discord feedback https://discord.com/channels/419213663107416084/1135040810082123907/1176872015085453392

* Removed ifdef tags around the repo unless needed
b5dc744ced
 2023-11-26 18:58:43 +01:00
Ariel A
294657a585 Fixes for make modern. 2023-10-26 19:37:19 -04:00
Ariel A
5d392244be Merge branch 'followers' into followers-expanded-id 2023-05-15 19:08:45 -04:00
Ariel A
996f43120d Merge branch 'followers' into lighting 2023-05-15 18:50:55 -04:00
Ariel A
d12efe8cd7 Merge branch 'master' into followers 2023-05-15 18:37:38 -04:00
ghoulslash
0585123da9 merge w pret 2023-05-11 10:44:57 -04:00
ghoulslash
7d010529d6 merge w master 2023-04-15 22:06:08 -04:00
ghoulslash
6c8cf2c026 merge w master 2023-04-15 22:04:35 -04:00
GriffinR
dbf757be88 Treat map data as const 2023-03-08 12:00:30 -05:00
Ariel A
b733cd14a5 Merge branch 'followers' into followers-expanded-id 2023-02-10 19:40:44 -05:00
Ariel A
2ddd292b36 Merge branch 'followers' into lighting 2023-02-10 19:27:23 -05:00
GriffinR
de56e400ff Sync clone object macro 2023-02-08 13:11:10 -05:00
PSF
0790882fd8 Merged with pret 2023-02-04 14:03:38 -08:00
Ariel A
66c57e3442 Merge branch 'master' into followers 2023-01-29 18:44:06 -05:00