Commit graph

210 commits

Author SHA1 Message Date
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
Ariel Antonitis
87608392fc Merge branch 'romhack' into lighting 2021-06-12 00:37:06 -04:00
Ariel Antonitis
3568c2a882 Fixed bug with followers and cross-map scripting events. 2021-06-12 00:35:15 -04:00
Ariel Antonitis
385c94d068 Merge branch 'romhack' into lighting 2021-06-08 17:58:29 -04:00
Ariel Antonitis
37f0684d98 Unown followers now appear as the right letter. 2021-06-04 23:35:10 -04:00
Ariel Antonitis
bfe0c58326 Merge branch 'romhack' into lighting 2021-05-05 20:01:15 -04:00
Ariel Antonitis
7d420b22e8 Added affine animations for followers entering/exiting pokeball. 2021-05-05 19:58:44 -04:00
Ariel Antonitis
39ba328afb Optimized follower palette loading. 2021-05-02 02:55:23 -04:00
Ariel Antonitis
147e101df5 More testing of fog blending. 2021-05-02 02:55:23 -04:00
Ariel Antonitis
37d0e17be4 Fixed shadow hot springs bug. 2021-05-02 02:55:23 -04:00
Ariel Antonitis
a160012dbf Added shadow toggle to weather structure. 2021-04-25 22:01:33 -04:00
Ariel Antonitis
73d060b3b6 Added glowing colors for some follower pokemon (Ampharos). 2021-04-25 16:26:23 -04:00
Ariel Antonitis
a80de91463 Fixed bugged interaction between reflections & light sprites. 2021-04-25 16:26:23 -04:00
Ariel Antonitis
be2c06d5a4 Made follower emotes immune to time-blending. 2021-04-25 16:25:32 -04:00
Ariel Antonitis
e71c3dbd1b Fixed typo. 2021-04-24 18:56:36 -04:00
Ariel Antonitis
7456e3ce14 Fixed bug where followers appeared underwater. 2021-04-24 18:47:13 -04:00
Ariel Antonitis
a36d6c3c2c Renamed OAM tables to match master.
Fixed renamed functions, etc.
2021-04-18 23:10:40 -04:00
Ariel Antonitis
221569a710 Merge branch 'master' into romhack 2021-04-18 22:17:53 -04:00
Ariel Antonitis
fbbd58a823 Added music messages. 2021-04-18 21:00:27 -04:00
Ariel Antonitis
875c4edd50 Added some conditional messages.
Added emote graphics.
2021-04-18 21:00:27 -04:00
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