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

96 Commits

Author SHA1 Message Date
Hedara
67e30c96c0 Merge commit '0965dffe70bb7d4bc229e24e4bc0266a6be6b8c8' into pret-merge 
Conflicts:
	include/item_menu.h
 2025-11-01 14:56:09 +01:00
Estellar
0965dffe70
Use TaskFunc wherever posible (#2188) 2025-10-18 17:53:50 +01:00
Hedara
1686797a5e Merge commit '7612e386419ef913bda5a62a5c8f234190542bb0' into merrp-merge 
Conflicts:
	src/palette.c
 2025-06-25 17:07:13 +02:00
hedara90
981aa3ee7c
Use RGB values for DEFAULT_LIGHT_COLOR (#7133) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-06-16 13:38:07 +02:00
hedara90
d1aa49cca3
Remove compressed palettes (#6455) 2025-04-26 22:58:40 +02:00
Hedara
3c2cc35158 Match expansion formatting for some preproc 2025-04-11 21:17:52 +02:00
Hedara
301ef288f5 Review comments 2025-04-11 11:37:36 +02:00
Ariel A
7612e38641 fix: improved FadeScreenHardware during fade-in 2025-01-26 20:52:50 -05:00
Eduardo Quezada
3fc9b0195d Cleaned up code to align with previous review comments 2025-01-26 17:14:00 -03:00
Eduardo Quezada
00241cf569 Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2 
# Conflicts:
#	README.md
#	asm/macros/event.inc
#	data/scripts/pkmn_center_nurse.inc
#	include/constants/event_objects.h
#	include/constants/field_weather.h
#	include/overworld.h
#	include/palette.h
#	include/sprite.h
#	src/battle_controller_player.c
#	src/data/object_events/object_event_graphics.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_weather.c
#	src/overworld.c
#	src/palette.c
#	src/scrcmd.c
#	src/sprite.c
 2025-01-26 12:08:10 -03:00
Ariel A
090c4f3936 feat: hardware fades now affect BLDALPHA too 2025-01-25 20:57:30 -05:00
Eduardo Quezada
26daf15ce0 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-24 18:29:28 -03:00
DizzyEggg
4e0eab9e27
Remove gDecompressionBuffer (#6029) 2025-01-23 09:47:14 +01:00
Eduardo Quezada
6162628104 A bit more of addressing 2025-01-17 19:25:29 -03:00
Eduardo Quezada
ffc8903f93 More review addressing 2025-01-17 18:47:38 -03:00
Ariel A
4047f9b764 feat: added FadeScreenHardware utility 2025-01-01 00:37:35 -05:00
Eduardo Quezada
aa6d540b75 Code style adjustments 2024-08-30 12:17:31 -04:00
Eduardo Quezada
d80bf06daa Removed unused fields 2024-08-29 20:38:22 -04:00
Greenphx9
ad969c968c Merge branch 'lighting' of https://github.com/aarant/pokeemerald into lighting-expansion-v2 2024-08-25 17:54:28 +10:00
Ariel A
0ae5cb1e39 meta: cleaned up spacing of lighting code 2024-08-12 23:04:41 -04:00
Ariel A
0745eaf2e0 fix: Uninitialized value used in LightenSpritePaletteInFog 2024-08-12 22:42:31 -04:00
DizzyEggg
9ac8d0de25
Optimize/get rid of unused palette vars/functions (#4841) 2024-08-04 21:41:55 -04:00
Ariel A
7cf2d1eca0 Merge branch 'followers' into lighting 2024-02-17 17:51:30 -05:00
Ariel A
afbb88d77a Undo (most) indentation changes. 2024-02-15 22:24:20 -05:00
Eduardo Quezada
ebbcb7d025 Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
Ariel A
72c81db042 Merge branch 'followers' into lighting 2023-12-31 01:45:07 -05:00
Ariel A
7d7531f2fa Merge branch 'master' into followers 2023-12-31 01:28:27 -05:00
Ariel A
4689f0b0d0 Fixes for make modern. 2023-10-15 01:39:44 -04:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412) 
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-10-13 18:39:35 +02:00
Eduardo Quezada
af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
Ariel A
d800d71461 Merge branch 'followers' into lighting 2023-09-03 17:49:27 -04:00
Ariel A
8df538479a Merge branch 'master' into followers 2023-09-03 17:39:35 -04:00
GriffinR
18319e8da3 Misc missing constant use 2023-08-10 01:42:18 -04:00
Martin Griffin
31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01: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
GriffinR
14f7e49099 Add some missing palette macro use 2023-05-25 15:09:16 -04:00
Ariel A
782889d533 Fixed potentially unaligned tileset palettes. Credit to SBird 2022-11-25 15:02:07 -05:00
Ariel A
671fa68410 Merge branch 'romhack' into lighting 2022-07-17 16:07:50 -04:00
Ariel A
9beee311c4 Merge branch 'master' into romhack 2022-07-17 15:13:15 -04:00
GriffinR
1ca1bff81c Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg 2022-06-03 15:43:21 -04:00
GriffinR
34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
Ariel A
bc2b50cd2e Added LoadPaletteFast function. 2022-04-18 00:23:15 -04:00
Ariel A
6e621d80a1 Added day/night palette swapping. 
Updated lighting for lava, Petalburg, Slateport, Dewford, Verdanturf, Oldale, Mossdeep, Lilycove, Fallarbor.
Improved lantern appearance & added neon signs on PokeCenter & Mart.
Optimized gamma shift code.
Removed obselete CacheLightMetatiles.
 2022-04-18 00:23:11 -04:00
Ariel A
26c38e8093 Removed lighting/day-night/shadow code from follower branch. 2021-12-22 22:58:52 -05:00
Ariel A
9de9442c39 Merge branch 'romhack' into lighting 2021-12-18 17:25:56 -05:00
Ariel A
bdcbb5c700 Merge branch 'master' into romhack 2021-12-18 17:14:52 -05:00
GriffinR
ab1074e629 Label unknown palette functions 2021-11-08 16:08:36 -05:00
Ariel Antonitis
b64eb7ea14 Modified palette tint behavior. 2021-09-01 00:12:14 -04:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
 2021-08-24 19:59:32 -03:00