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
..
layouts	REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS	2024-12-21 11:00:27 -03:00
maps	Addressing a bunch of small things	2025-01-17 18:21:48 -03:00
scripts	Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2	2025-01-26 12:08:10 -03:00
text	Removed FRONTIER_BRAIN_SPRITES and updated TRAINER_SPRITE, TRAINER_BACK_SPRITE, and TRAINER_CLASS (#5166)	2024-09-22 09:54:01 +02:00
tilesets	REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS	2024-12-21 11:00:27 -03:00
battle_anim_scripts.s	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-12 08:42:57 -03:00
battle_scripts_1.s	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-19 10:32:57 -03:00
battle_scripts_2.s	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-12 08:42:57 -03:00
contest_ai_scripts.s	Move general config file to the config folder (#4805)	2024-06-19 13:42:01 +02:00
event_scripts.s	Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2	2025-01-19 22:31:33 -03:00
field_effect_scripts.s	syntax, alignment fixes	2024-07-08 14:15:41 -04:00
map_events.s
maps.s
mb_berry_fix.gba
mb_colosseum.gba
mb_ereader.gba
multiboot_berry_glitch_fix.s
multiboot_ereader.s
multiboot_pokemon_colosseum.s
mystery_event_script_cmd_table.s
mystery_gift.s
script_cmd_table.inc	Merge branch '_RHH/master' into _RHH/upcoming	2025-01-19 10:32:57 -03:00
sound_data.s
specials.inc	Arbitrary trainer scripts + map script/trigger softlock prevention (#5033)	2025-01-08 10:27:00 +00:00