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

56 Commits

Author SHA1 Message Date
Hedara
8c4d1269a0 Merge commit 'f2cf20ce9bdf4a9f6cd0300a005ca3ec6ae89e3c' into pret-merge 
Conflicts:
	INSTALL.md
	include/battle.h
	include/save.h
	src/wild_encounter.c
 2025-11-01 14:51:14 +01:00
Estellar
f4f7c38255
Use MainCallback wherever posible (#2184) 2025-10-14 09:41:27 +01:00
hedara90
6e64f6f5ef
New sprite compressor (#5627) 
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: DizzyEggg
Co-authored-by: Raymond Dodge <git@rayrobdod.name>
 2025-05-30 23:10:54 +02:00
hedara90
d1aa49cca3
Remove compressed palettes (#6455) 2025-04-26 22:58:40 +02:00
Eduardo Quezada
a6bfcc1194 More style fixes 2024-05-18 14:36:06 -04:00
Eduardo Quezada
ddc752eb14 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	asm/macros/event.inc
#	data/field_effect_scripts.s
#	data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
#	data/script_cmd_table.inc
#	graphics/pokemon/castform/sunny/anim_front.png
#	graphics/pokemon/castform/sunny/normal.pal
#	include/battle_util.h
#	include/constants/event_object_movement.h
#	include/constants/field_effects.h
#	src/battle_controller_player.c
#	src/battle_util.c
#	src/data/object_events/movement_action_func_tables.h
#	src/data/object_events/object_event_pic_tables.h
#	src/data/trainer_graphics/back_pic_anims.h
#	src/daycare.c
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/load_save.c
#	src/scrcmd.c
#	src/trainer_see.c
 2024-01-17 18:11:35 -03:00
Eduardo Quezada
af210da972 Solved a bunch of -Wall errors on modern 2023-09-20 19:01:08 -03:00
Martin Griffin
31a3ada7de Detect potential misalignment in modern 2023-07-24 19:42:56 +01:00
Ariel A
66c57e3442 Merge branch 'master' into followers 2023-01-29 18:44:06 -05:00
Ariel A
1c011a9c1c Merge branch 'master' into followers 2022-10-07 20:52:15 -04:00
Ariel A
e322475aee Fixed Rayquaza cutscene flicker. 2022-09-03 21:43:04 -04:00
Martin Griffin
d57442a511 Decimal paletteNums 2022-08-19 17:05:22 +01:00
Martin Griffin
6fed961ed6 Write palette IDs in hex 2022-08-19 15:29:35 +01:00
Eduardo Quezada
2e1bf0d965 OamData mosaic FALSE 2022-07-29 21:27:39 -04:00
Eduardo Quezada
b00bd8b181 Cleaned by comparing evolution_scene.c with pokefirered 2022-07-27 18:51:32 -04:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav 
Document Pokénav
 2021-11-17 14:47:34 -05:00
GriffinR
b14fe9dce3
Merge pull request #1547 from GriffinRichards/doc-sounddata 
Clean up sound, add CRY_MODE constants
 2021-11-13 15:54:40 -05:00
GriffinR
4590887359 Clean up some register constant use 2021-11-10 17:01:21 -05:00
GriffinR
c4169cfd29 Disambiguate cry functions 2021-11-07 14:26:09 -05:00
GriffinR
c291fa8e7f Propagate BG_COORD constants 2021-11-03 23:02:06 -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
PikalaxALT
810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
GriffinR
62abcecc54 More usage of DISPLAY constants 2021-04-15 02:22:24 -04:00
GriffinR
b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
GriffinR
0cfc279af5
Merge branch 'master' into doc-rayscene 2020-08-28 16:17:11 -04:00
GriffinR
38d4fc9c17 Clean up rayquaza scene documentation 2020-08-27 16:04:11 -04:00
GriffinR
a220d3986f Document fifth rayquaza scene 2020-08-27 15:43:28 -04:00
GriffinR
e63297138d Document fourth rayquaza scene 2020-08-27 15:43:28 -04:00
GriffinR
c7e685edff Document third rayquaza scene 2020-08-27 15:43:28 -04:00
GriffinR
52b1251b48 Document second rayquaza scene 2020-08-27 15:43:27 -04:00
GriffinR
ba13e9ec95 Document first rayquaza scene 2020-08-27 15:43:18 -04:00
GriffinR
95ea0e92e7 Start documenting rayquaza_scene 2020-08-25 17:49:42 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
GriffinR
2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
Phlosioneer
1360b3a477 RGB Constants 2019-04-04 17:05:46 -04:00
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields 
Also some general formatting fixes for constants.
 2019-03-16 12:37:04 -05:00
DizzyEggg
6761a049da Fix Bldalpha args 2018-12-26 14:03:48 +01:00
DizzyEggg
9ffd0c7382 3.5 asm left 2018-12-17 23:00:08 +01: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
Diegoisawesome
731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
DizzyEggg
593031904b ray changes 2018-02-07 19:47:55 +01:00
DizzyEggg
af068e74ad more function names in ray scene 2018-02-01 23:39:53 +01:00
DizzyEggg
be08cc06f2 more function names in ray scene 2018-02-01 15:32:12 +01:00
DizzyEggg
9976e21f6a give some names ray scene 2018-02-01 14:53:27 +01:00