Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-04-24 23:28:16 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,820 Commits 3 Branches 0 Tags 879 MiB
b56158428e
Commit Graph

240 Commits

Author SHA1 Message Date
Ariel Antonitis
e647e926a8 Added all unconditional HGSS messages. 2021-04-18 20:59:23 -04:00
GriffinR
d717a635c8 event_object_movement cleanup 2021-04-06 17:55:29 -04:00
GriffinR
8bad478b49 Document disguise field effects 2021-04-06 14:51:39 -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
Ariel Antonitis
c15ae199aa Fixed glitch pokemon follower sprites. 2021-03-15 23:04:19 -04:00
Ariel Antonitis
3a0795d862 Followers disappear properly when using Surf. 
Removed leftover palette 31.
 2021-03-10 20:48:20 -05:00
Ariel Antonitis
89774dfc48 Merge branch 'lighting' into romhack 2021-03-10 17:50:25 -05:00
Ariel Antonitis
7bcd2c8fb5 Fixed bird fly sprite shadow position. 
Object event shadows are now displayed by default.
 2021-03-10 17:49:18 -05:00
Ariel Antonitis
d05a5a0857 Temporarily removed follower fly script. 2021-03-10 15:06:59 -05:00
Ariel Antonitis
a15b0de70e Fixed light spawning causing screen tears. 2021-03-07 03:58:02 -05:00
Ariel Antonitis
d45335f1dc Fixed graphics & naming inconsistencies with master branch. 2021-03-03 03:28:03 -05:00
Ariel Antonitis
8dd1811ce5 Updated follower messages. 
Added remote build scripts/workflows.
Fixed followers getting stuck when entering doors.
 2021-03-03 02:07:08 -05:00
Ariel Antonitis
676261a0e0 Fixed bug applying time filter to followers. 2021-03-03 02:05:34 -05:00
Ariel Antonitis
42d5fe07fa Start of implementation for time of day filter. 2021-03-03 02:05:21 -05:00
Ariel Antonitis
12e3b4efad Added alpha-blending shadows. 2021-03-03 02:01:39 -05:00
Ariel Antonitis
b5c8b0f494 Added more follower messages. 2021-03-03 02:00:32 -05:00
Ariel Antonitis
65515f58a6 Added additional follower messages. 2021-03-03 01:47:43 -05:00
Ariel Antonitis
c9834ba967 Changed tracks behavior for airborne followers. 2021-03-03 01:47:31 -05:00
Ariel Antonitis
edbc773120 Refactored and added support for shiny followers. 2021-03-03 01:47:26 -05:00
Ariel Antonitis
38f538b755 Moved follower species into a proper union. 2021-03-03 01:47:14 -05:00
Ariel Antonitis
6692cd992f Added all 386 follower sprites. 
Allow NPC pokemon objects via a custom script header.
 2021-03-03 01:46:43 -05:00
Ariel Antonitis
68ba615ab2 Updated follower script. 2021-03-03 01:37:57 -05:00
Ariel Antonitis
b7a027dab6 Fixed follower behavior on ice. 2021-03-03 01:37:48 -05:00
Ariel Antonitis
db7e98c6a8 Merged SpawnFollowingPokemon into UpdateFollowingPokemon. 2021-03-03 01:35:52 -05:00
Ariel Antonitis
b6eed75fd8 Moved pokemon graphics lookup into table. 2021-03-03 01:35:43 -05:00
Ariel Antonitis
be60824263 Add Banette event object. 2021-03-03 01:33:26 -05:00
Ariel Antonitis
984cfe4699 Fixed endless reflection spawning. 2021-03-03 01:33:21 -05:00
Ariel Antonitis
1fa2bc0df1 Fixed follower not disappearing when surfing. 2021-03-03 01:33:13 -05:00
Ariel Antonitis
4bd6642033 Use front sprite palettes for event objects. 2021-03-03 01:29:52 -05:00
Ariel Antonitis
e9711b7cd5 Fixed high bridge (Route 120) reflections. 2021-03-03 01:26:38 -05:00
Ariel Antonitis
8598c59fad Fixed tree disguise for dynamic palettes. 2021-03-03 01:24:30 -05:00
Ariel Antonitis
66dd1aecf9 Made (most) field effects use dynamic palettes. 2021-03-03 01:21:40 -05:00
Ariel Antonitis
69ae5b18c0 Made pokemon event objects dynamic. 2021-03-03 01:12:05 -05:00
Ariel Antonitis
12a2ec9f26 Added dynamic reflections. 2021-03-03 01:10:48 -05:00
Ariel Antonitis
db46bf855d Fixed berry tree display. 2021-03-03 01:07:06 -05:00
Ariel Antonitis
e52b70e46f Updated follower scripting (applymovement). 2021-03-03 01:04:37 -05:00
Ariel Antonitis
8a3dfbf252 Added pokemon followers & script commands. 2021-03-03 01:04:22 -05:00
Ariel Antonitis
eb55f6bd0a Added dynamic overworld palettes (github.com/pret/pokeemerald/wiki/Dynamic-overworld-palette-system) 2021-03-03 00:53:06 -05:00
Ariel Antonitis
2e32a27d75 Testing follower pokemon. 2021-03-03 00:51:43 -05: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
GriffinR
3ceb43177d
Merge pull request #1312 from sphericalice/pokeemerald 
Fix misnamed ground effect flags & document reflections
 2021-01-20 18:50:31 -05:00
SphericalIce
c0489199c0 Rename GetObjEventReflectionType & fix fakematch in GetGroundEffectFlags_Reflection 2021-01-20 22:32:04 +00:00
SphericalIce
86297398e6 Move the definition of RETURN_REFLECTION_TYPE_AT and make use of REFL_TYPE_NONE 2021-01-20 10:34:33 +00: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
b65980cd4e Remove unused local variables and functions 2021-01-19 18:19:33 -05:00
Sierraffinity
b155c307ea Add UBFIX for null deref in CameraObjectReset2 2020-12-26 17:25:51 -08:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
GriffinR
bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -05:00
Kurausukun
8bf401c227 address comments 2020-11-02 18:43:11 -05:00
Kurausukun
539fd463c8 port MovementAction_StoreAndLockAnim_Step0 fix 2020-10-26 03:46:08 -04:00
Kurausukun
f0efd11aa9 re-match InitObjectEventStateFromTemplate 2020-10-19 06:19:21 -04:00
Kaz
1404cf3330 field_player_avatar.c: Fix TryInterruptObjectEventSpecialAnim fakematch. 2020-09-17 18:24:11 -04:00
Kaz
171154a097 Convert to -g; will be required for eliminating fakematches. 2020-09-16 19:36:30 -04:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
PokeCodec
781eb38d5b Removed unused comment 2020-09-05 20:51:21 -04:00
PokeCodec
ac9a86d7ce Remove movementAction fakematch 2020-09-05 14:51:45 -04:00
PokeCodec
a04b0ff487 More formatting fixes 2020-08-28 14:35:37 -04:00
PokeCodec
1515a2ecc4 Fix To-Dos 2020-08-28 14:00:31 -04:00
DizzyEggg
d072897354
Update event_object_movement.c 2020-08-02 15:37:04 +02:00
DizzyEggg
7890a16d27
Fix UB in event_object_movement.c 2020-08-02 15:04:55 +02:00
GriffinR
e06de33cbd
Merge branch 'master' into doc-overworld 2020-07-28 17:46:17 -04:00
PokeCodec
93be3a08ce Match 2020-07-28 15:31:08 -04:00
PokeCodec
044d968513 Match 2020-07-28 15:23:14 -04:00
PokeCodec
ebcb982e16 Change signedness and add casts to avoid implicit conversion warnings 2020-07-28 15:22:15 -04:00
GriffinR
4a42e2a710
Merge branch 'master' into doc-overworld 2020-07-23 10:31:52 -04:00
GriffinR
a1cc7d2bd6 Document faraway island 2020-07-19 14:12:38 -04: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
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
GriffinR
f53e2491bf Document union_room_player_avatar.c 2020-06-01 10:23:12 -04:00
GriffinR
5bb688df3e Label in_connection's field in ObjectEventTemplate 2020-05-14 17:11:18 -04:00
GriffinR
cb5b8da77b More trainer type usage 2020-04-28 19:59:08 -05:00
GriffinR
487080b425 Minor player avatar doc 2020-04-01 02:54:26 -04:00
Marcus Huderle
49421a41b2 Move field effects data and graphics into own directory, and cleanup naming for object events 2020-02-12 17:32:51 -06: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
8da7a94423
Merge branch 'master' into fix-eventobj 2019-12-10 17:41:08 -05:00
Diegoisawesome
49b56d0136
Merge pull request #929 from jiangzhengwenjz/nonmatching 
fake match InitEventObjectStateFromTemplate
 2019-12-10 14:32:57 -08:00
jiangzhengwenjz
f34b8f564a InitEventObjectStateFromTemplate 2019-12-11 05:35:40 +08:00
GriffinR
b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
GriffinR
2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
GriffinR
4c52cf9ed1 Fix event constant file names 2019-11-21 14:03:35 -05:00
GriffinR
570881b119 Rename event_object directories 2019-11-21 00:44:55 -05:00
GriffinR
7034f59c14 Rename EventObj to ObjEvent 2019-11-21 00:14:40 -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
GriffinR
973e6f9667 Document mauville_man.inc 2019-10-21 17:21:53 -05:00
Marcus Huderle
4494b5d4cb Document collision types 2019-10-06 15:48:26 -05:00
Marcus Huderle
799edaf3e6 Document hide/show reflection movement actions 2019-10-06 14:17:34 -05:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04: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
35505c7f5b Document somre more weather effects 2019-04-01 20:04:23 -05:00
Marcus Huderle
d13563b174 Document some faraway_island code 2019-03-31 14:09:40 -05:00
Marcus Huderle
a7d5f032b1 Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c 2019-03-22 14:16:26 -05:00
Marcus Huderle
7118462b9f Decompile ereader.c up to faraway island code 2019-03-21 18:28:44 -05:00
Marcus Huderle
3a40f5203b Remove old rom_818CFC8.h header 2019-02-07 17:41:44 -06:00
Marcus Huderle
a1ad1bad3a Document a bunch of battle pyramid 2019-02-06 21:14:28 -06:00
DizzyEggg
353ad13f91 make trainer hill compile 2019-01-13 20:58:42 +01:00
Marcus Huderle
46d41d2fb9 Use EVENT_OBJ_ID_PLAYER in C code 2018-12-29 11:36:54 -06:00
Melody
5e6ceeb631 update applymovement to remove magic numbers 2018-12-19 14:08:01 -05:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
nullableVoidPtr
3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
 2018-12-06 09:44:08 +08:00
DizzyEggg
b87e6a4e57 Get rid of static functions in includes 2018-12-02 18:58:33 +01:00
DizzyEggg
27ee7d567e fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT 2018-11-18 20:19:10 +01:00
Slawter666
1d46507110 Move field effects enum to defines 2018-11-13 14:19:04 +00:00
Slawter666
be33878b94 Synchronise wallclock.c 2018-11-12 14:04:32 +00: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
Slawter666
b7b1d609d0 More synchronisation 2018-10-17 13:52:26 +01:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
Slawter666
1435c96b41 Further synchronisation 2018-10-17 01:11:44 +01:00
Slawter666
3aff112127 Begin synchronising with pokeruby 2018-10-16 14:55:16 +01:00
Diegoisawesome
7f211b2588
Merge pull request #359 from Slawter666/label_field_effect_helpers 
Label field_effect_helpers.c
 2018-10-14 18:37:11 -05:00
Deokishisu
bf2063cc1a Update All EVENT_OBJ_GFX References 
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
 2018-10-14 19:09:18 -04:00
Slawter666
137f6549ff label field_effect_helpers 2018-10-14 23:43:40 +01:00
Marcus Huderle
ec0d350137 Move metatile behavior constants to include/constants and sync closer to pokeruby 2018-10-04 17:57:07 -05:00
Diegoisawesome
d9941cd1a8 Standardize sprite visibility to boolean 2018-09-10 10:25:58 -05:00
Diegoisawesome
f73807ea60 Add palette tags for event objects 2018-09-07 23:52:11 -05:00
Slawter666
4c54212b1f Bring labels for overworld.c over from pokeruby 2018-09-04 23:31:37 +01:00
Slawter666
5c66b8a7ef Label event_object_movement.c 2018-09-02 23:20:45 +01:00
Diegoisawesome
07ef762770
Merge pull request #275 from Diegoisawesome/master 
Document list_menu.c and main_menu.c
 2018-07-15 04:43:03 -07:00
Diegoisawesome
731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
Marcus Huderle
d675b7578c Move movement type constants into include/constants/event_object_movement_constants.h 2018-07-10 18:04:41 -05:00
Marcus Huderle
4d13e3394a Bring all movement function names up-to-date with pokeruby 2018-06-13 17:51:26 -05:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Marcus Huderle
ed245b677a Add remaining rodata to event_object_movement.c 2018-06-11 18:17:31 -05:00
Marcus Huderle
89edf6d9e9 Move all field object data into src/data and event_object_movement.c 2018-06-11 17:33:50 -05:00
Marcus Huderle
eb8dbff4a7 Move event_object_movement_helpers into event_object_movement 2018-06-11 10:56:14 -05:00
Marcus Huderle
73327f0d44 Decompile field_ground_effect into event_object_movement.c 2018-06-11 10:23:14 -05:00
Marcus Huderle
4018acfae1 Update event object struct members 2018-06-11 09:19:17 -05:00
Marcus Huderle
38a126df66 Rename field_map_obj to event_object_movement 2018-06-11 08:46:33 -05:00