Eduardo Quezada 341ce6fd95 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 ... # Conflicts: # .github/workflows/build.yml # README.md # gflib/sprite.c # graphics/pokemon/banette/anim_front.png # graphics/pokemon/banette/normal.pal # graphics/pokemon/sentret/normal.pal # graphics/pokemon/togetic/anim_front.png # graphics/pokemon/togetic/normal.pal # include/battle_script_commands.h # include/data.h # ld_script.txt # src/battle_controller_player.c # src/bike.c # src/event_object_movement.c		2023-06-16 21:25:16 -04:00
..
layouts
maps	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3	2023-06-16 21:25:16 -04:00
scripts	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3	2023-06-16 21:25:16 -04:00
text
tilesets	Merge branch 'master' into followers	2022-11-21 21:21:50 -05:00
battle_anim_scripts.s	Replace launchtemplate and launchtask in battle anims (#2640)	2023-05-27 17:32:53 -04:00
battle_scripts_1.s	Fix Speed Boost animation	2023-05-28 11:54:43 +02:00
battle_scripts_2.s	fixed revive in 1v2 battles	2023-05-23 14:19:24 -07:00
contest_ai_scripts.s
event_scripts.s	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3	2023-06-16 21:25:16 -04:00
field_effect_scripts.s	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3	2023-06-16 21:25:16 -04:00
map_events.s	Updated existing OW pokemon events with new system.	2023-01-12 21:45:42 -05:00
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 remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3	2023-06-16 21:25:16 -04:00
sound_data.s	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
specials.inc	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413	2023-04-13 17:05:48 -04:00