pokeemmo

History

Eduardo Quezada 5d372b5f8a Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers

# Conflicts:
#	README.md
#	gflib/sprite.c
#	graphics/object_events/pics/pokemon/togetic.png
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info.h
#	src/data/object_events/object_event_graphics_info_followers.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c

2024-01-18 08:12:09 -03:00

defines.h

Merge branch '_RHH/master' into _RHH/upcoming

2024-01-09 09:19:12 -03:00

flash_internal.h

decompile save_failed_screen.c

2017-10-06 18:33:35 -04:00

gba.h

use firered isagbprint header.

2018-01-06 21:38:34 -05:00

io_reg.h

Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829