Merge dodrio_berry_picking 1 and 2, sync function names

This commit is contained in:
GriffinR
2022-08-06 20:40:11 -04:00
parent d6d5290099
commit 12fdf455ce
5 changed files with 2931 additions and 827 deletions
-2
View File
@@ -292,7 +292,6 @@ SECTIONS {
src/text_window.o(.text);
src/quest_log_player.o(.text);
src/dodrio_berry_picking.o(.text);
src/dodrio_berry_picking_2.o(.text);
src/battle_controller_pokedude.o(.text);
src/quest_log_objects.o(.text);
src/dodrio_berry_picking_3.o(.text);
@@ -590,7 +589,6 @@ SECTIONS {
src/text_window_graphics.o(.rodata);
src/quest_log_player.o(.rodata);
src/dodrio_berry_picking.o(.rodata);
src/dodrio_berry_picking_2.o(.rodata);
src/battle_controller_pokedude.o(.rodata);
src/teachy_tv.o(.rodata);
src/digit_obj_util.o(.rodata);