atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15022 commits 2 branches 40 tags 617 MiB
Commit graph

65 commits

Author SHA1 Message Date
Eduardo Quezada
3d181e5c70 Merge remote-tracking branch '_pret/master' into _RHH/pr/master/pret_sync20240324 
# Conflicts:
#	src/battle_anim_fight.c
 2024-03-24 13:52:18 -03:00
Bassoonian
b948accc80 Remove redundant table 2024-01-04 16:07:12 +00: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
GriffinR
2db9ab2a2f Document camera sprite functions 2023-11-22 13:52:56 -05:00
GriffinR
6db489e2d5 Use constants for overworld object palette slots 2022-09-27 20:16:48 -04:00
Eduardo Quezada
5eb9312250 Added missing labels in headers 2022-09-12 21:14:15 -03:00
GriffinR
5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
GriffinR
3d0326106e Z coord / height -> elevation 2022-01-21 12:48:19 -05:00
GriffinR
b5b5d95de6 Distinguish 'virtual object' names from object events 2021-11-17 23:40:53 -05:00
GriffinR
c940b67716 Continue macro comment updating 2021-11-17 17:45:59 -05:00
cbt6
0fe3881961 Rename WalkInPlaceFastest to WalkInPlaceFaster 2021-11-05 01:54:34 +08:00
GriffinR
afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
cbt6
4cedd2d551 Rename WalkFastest functions to WalkFaster 2021-11-03 01:50:53 +08:00
GriffinR
d717a635c8 event_object_movement cleanup 2021-04-06 17:55:29 -04:00
GriffinR
756fad0e61 Document some event object movement 2021-04-06 14:34:36 -04:00
GriffinR
806abe2999 Document some objev anims, make objevgfx info static 2021-04-05 19:52:35 -04:00
GriffinR
f90026826a Document some weather, field effects 2021-04-04 17:52:07 -04:00
SphericalIce
70ff6c3b84 Rename 'hidden' Trainers/obj events to 'buried' 2021-02-14 19:25:23 +00:00
GriffinR
92bd6400b7 Fix up berry sparkle 2021-01-26 05:40:34 -05:00
GriffinR
9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
GriffinR
0064333e4a Clean up scrcmd.c 2021-01-26 02:16:26 -05:00
SphericalIce
4334f7a379 Include NUM_REFLECTION_TYPES in the ReflectionTypes enum 2021-01-20 10:17:07 +00:00
SphericalIce
2746fd1f95 Name object event ID arguments properly 2021-01-19 23:35:57 +00:00
SphericalIce
6dd973012b Correct ground effect flag names for reflections & document sprite data usage 2021-01-19 23:21:50 +00:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR
1ce929157f Clean up field effect doc 2020-07-02 05:05:13 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR
f53e2491bf Document union_room_player_avatar.c 2020-06-01 10:23:12 -04:00
GriffinR
4c12ad00d2 Merge branch 'master' into fix-eventobj 2020-01-19 21:57:29 -05:00
GriffinR
a40f054900 Move/rename gfx start/end vars 2020-01-18 08:49:34 -06:00
GriffinR
86c08330c4 Fix Event Object include guards 2019-11-21 14:03:11 -05:00
GriffinR
5822dfca8d Rename FIELD_OBJ_EVENT to OBJECT_EVENT_MOVEMENT 2019-11-21 10:47:24 -05:00
GriffinR
82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR
ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
DizzyEggg
dc764698c9 Use implicilt berry indexes in arrays 2019-04-14 10:15:18 -05:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
Marcus Huderle
181baf9fe5 Merge remote-tracking branch 'upstream/master' into misc_docs 
# Conflicts:
#	src/field_weather_effect.c
 2019-04-02 18:29:51 -05:00
Marcus Huderle
35505c7f5b Document somre more weather effects 2019-04-01 20:04:23 -05:00
PikalaxALT
ce89cf6f75 through sub_801A3D0 2019-04-01 14:09:56 -04:00
PikalaxALT
1fe5208560 through sub_801A02C 2019-04-01 12:05:58 -04:00
Phlosioneer
3ceb1667c9 Reduce externs 2019-03-01 22:32:50 -05:00
DizzyEggg
9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
DizzyEggg
6dffa6d17c Match and clean up fldeff misc 2018-12-22 19:33:45 +01:00
DizzyEggg
b87e6a4e57 Get rid of static functions in includes 2018-12-02 18:58:33 +01:00
Slawter666
3d8874d919 Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-10-21 00:20:09 +01:00
Slawter666
7a072d4527 Continue synchronising 2018-10-20 21:01:45 +01:00
Diegoisawesome
dd3689fdbf Finish porting/decompiling field_player_avatar 2018-10-19 00:05:54 -05:00
Slawter666
b7b1d609d0 More synchronisation 2018-10-17 13:52:26 +01:00
Slawter666
1435c96b41 Further synchronisation 2018-10-17 01:11:44 +01:00
Slawter666
137f6549ff label field_effect_helpers 2018-10-14 23:43:40 +01:00