Merge dodrio_berry_picking 1 and 2, sync function names

ld_script.txt

@@ -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);

src/data/dodrio_berry_picking.h

@@ -1,6 +1,3 @@
-#ifndef GUARD_DATA_DODRIO_BERRY_PICKING_H
-#define GUARD_DATA_DODRIO_BERRY_PICKING_H
-
 static const struct BgTemplate sUnknown_847565C[] =
 {
     {
@@ -243,5 +240,3 @@ static const u32 sDodrioBerryPkmnGfx[] = INCBIN_U32("graphics/link_games/dodriob
 static const u32 sDodrioBerryBgTilemap1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.bin.lz");
 static const u32 sDodrioBerryBgTilemap2Right[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2right.bin.lz");
 static const u32 sDodrioBerryBgTilemap2Left[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2left.bin.lz");
-
-#endif //GUARD_DATA_DODRIO_BERRY_PICKING_H

src/dodrio_berry_picking_2.c

@@ -12,7 +12,7 @@
 #include "text_window.h"
 #include "text_window_graphics.h"
 #include "constants/songs.h"
-
+/*
 struct DodrioStruct_2022CF4
 {
     u8 filler_00[0xc];
@@ -1614,4 +1614,4 @@ static bool32 sub_8155FE0(void)
 
     gUnknown_203F440->unk3018++;
     return FALSE;
-}
+}*/

sym_ewram.txt

@@ -132,7 +132,6 @@
 	.include "src/pokemon_jump.o"
 	.include "src/berry_crush.o"
 	.include "src/dodrio_berry_picking.o"
-	.include "src/dodrio_berry_picking_2.o"
 	.include "src/teachy_tv.o"
 	.include "src/digit_obj_util.o"
 	.include "src/trainer_tower.o"