303 Commits

Author SHA1 Message Date
Ariel A
eaff8abefb Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-10-26 19:41:07 -04:00
Ariel A
f27a252958 Merge branch 'followers' into followers-expanded-id 2023-10-15 02:46:46 -04:00
Ariel A
9c77aa3c66 Improved support for 64x64 followers. Updated reflection code.
Added 24x24 subsprite tables.
2023-10-14 22:14:42 -04:00
Ariel A
f8ca559378 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-09-03 18:17:50 -04:00
Ariel A
bf80e5cf4f Merge branch 'followers' into followers-expanded-id
# TODOs changed:
# -: Define action flags:
2023-09-03 17:42:31 -04:00
Ariel A
d929aa60ed Added support for 48x48 and 64x64 followers. See event_objects.h 2023-09-03 16:51:43 -04:00
Ariel A
394b4cb3a5 Merge branch 'followers' into followers-expanded-id 2023-07-29 17:26:31 -04:00
Ariel A
712669c822 Added support for follower bobbing. See event_objects.h 2023-07-29 17:23:32 -04:00
Ariel A
4a3f6ba2fe Merge branch 'lighting' into lighting-expanded-id 2023-06-28 00:11:59 -04:00
Ariel A
73685b5533 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-06-28 00:00:47 -04:00
Ariel A
fbec37b9e0 Merge branch 'followers' into followers-expanded-id 2023-06-27 23:54:27 -04:00
Ariel A
7631ceddf9 Merge branch 'followers' into lighting 2023-06-08 21:11:56 -04:00
Ariel A
91794286b5 Improved light color blending logic.
Added auxiliary .pla files to gbafx, to support setting color high bits.
Updated light palettes to new system.
2023-06-08 21:07:07 -04:00
Ariel A
8b0457197a Updated follower color fill palette logic. 2023-06-05 18:22:19 -04:00
Ariel A
540c536342 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-05-15 19:15:38 -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
GriffinR
36e6981ac0 Replace some & usage with % 2023-04-26 16:12:00 -04:00
Ariel A
6a89e5b0d2 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-04-23 17:50:20 -04:00
Ariel A
9e00e23b96 Added OW daycare pokemon. 2023-04-23 17:34:38 -04:00
Ariel A
582761f56a Merge branch 'lighting' into lighting-expanded-id 2023-03-13 18:22:53 -04:00
Ariel A
284ec24e0c Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-03-13 18:19:35 -04:00
Ariel A
07995f8925 Fixed some decoration icons being darkened at night in outdoor shops. 2023-03-13 18:11:05 -04:00
Ariel A
2ec895fbee Updated CreateObjectGraphicsSprite with new system. 2023-03-13 18:03:01 -04:00
GriffinR
dbf757be88 Treat map data as const 2023-03-08 12:00:30 -05:00
Ariel A
829427a4b7 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-02-26 18:37:00 -05:00
Ariel A
2c922adbf9 Merge branch 'followers' into followers-expanded-id 2023-02-26 18:34:35 -05:00
Ariel A
f83970f2fc Merge branch 'followers' into lighting 2023-02-10 22:06:52 -05:00
Ariel A
84e8df98fb Fix bug with ledge jumps and invisible followers. 2023-02-10 20:18:47 -05:00
Ariel A
15e6acc0a3 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-02-10 19:49:54 -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
Ariel A
66c57e3442 Merge branch 'master' into followers 2023-01-29 18:44:06 -05:00
Ariel A
5047f1280e Improved saving & loading object events. 2023-01-26 17:55:32 -05:00
GriffinR
0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
GriffinR
a203c03eac Add bugfix to LoadObjectEventPalette 2023-01-18 10:33:39 -05:00
Ariel A
244f3ceb15 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-01-12 21:58:39 -05:00
Ariel A
7b40e481ce Improved saving & loading expanded OWs. 2023-01-12 21:45:41 -05:00
Ariel A
3a0dc0f4f6 Reworked how OW pokemon's graphics are loaded. 2023-01-12 21:45:36 -05:00
Ariel A
5d5d97b46a Fixed most functions that take/return graphicsIds to accept u16s. 2023-01-12 21:44:56 -05:00
Ariel A
72e723df65 Expanded graphicsId field. 2023-01-07 19:54:12 -05:00
Ariel A
4bee03bc18 Merge branch 'followers' into lighting 2023-01-03 18:19:19 -05:00
Ariel A
a59564fc1e Improved follower pokemon animation code. 2023-01-03 18:18:13 -05:00
Ariel A
beb282a359 Added movements/scripts for overworld follower field moves. 2023-01-03 18:18:09 -05:00
Ariel A
5cae740eba Merge branch 'followers' into lighting 2022-11-21 22:17:14 -05:00
Ariel A
e6d1cfae24 Merge branch 'master' into followers 2022-11-21 21:21:50 -05:00
tustin2121
33f3a7c11a Adding FindObjectEventPaletteIndexByTag bugfix
The code in event_object_movement.c indicates that OBJ_EVENT_PAL_TAG_NONE was meant to be a sentinel for the bottom of each of the tables involving palettes in there. sObjectEventSpritePalettes is the exception, but the functions that access it look for OBJ_EVENT_PAL_TAG_NONE even though it's not in the table. If the palette tag isn't in the table, the functions which scan it fall off the bottom of the table into an infinite loop of scanning 256 "entries" of the table (because it uses a u8 index), and the game locks up. In vanilla, the search simply never falls off the bottom of the table. It seems the developers intended for that last entry to be {NULL, OBJ_EVENT_PAL_TAG_NONE}.
2022-11-07 06:09:21 -05:00
Ariel A
22c1d94ab9 Merge branch 'followers' into lighting 2022-11-05 19:04:14 -04:00