dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

through sub_8153048

Browse Source
This commit is contained in:
PikalaxALT
2020-03-04 14:58:44 -05:00
parent 171e4bbea4
commit 6871f3dd33
4 changed files with 986 additions and 3085 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/dodrio_berry_picking.s
+3 -3071
View File
File diff suppressed because it is too large Load Diff
include/dodrio_berry_picking.h
+7
View File
@@ -27,5 +27,12 @@ void StartDodrioBerryPicking(u16 species, MainCallback callback);
u32 sub_815A950(u32 unused, struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 *arg6, u32 *arg7, u32 *arg8);
u32 sub_815AB04(u32 arg0, u8 *arg1);
bool32 sub_815AB60(u8 a0);
void sub_815A61C(struct DodrioSubstruct_31A0 *arg0, struct DodrioSubstruct_31A0_2C *arg1, struct DodrioSubstruct_31A0_2C *arg2, struct DodrioSubstruct_31A0_2C *arg3, struct DodrioSubstruct_31A0_2C *arg4, struct DodrioSubstruct_31A0_2C *arg5, u8 arg6, u32 arg7, u32 arg8);
void sub_815A5BC(u8 a0);
void sub_815AAD8(u8 a0);
void sub_815AB3C(u8 a0);
u8 sub_815A5E8(s32 a0);
u32 IncrementWithLimit(u32, u32);
#endif //GUARD_DODRIO_BERRY_PICKING_H
src/dodrio_berry_picking.c
+961
View File
File diff suppressed because it is too large Load Diff
src/sound.c
+15 -14
View File
@@ -6,6 +6,7 @@
#include "m4a.h"
#include "main.h"
#include "constants/songs.h"
#include "constants/fanfares.h"
#include "task.h"
struct Fanfare
@@ -41,20 +42,20 @@ extern struct ToneData gCryTable[];
extern struct ToneData gCryTable2[];
static const struct Fanfare sFanfares[] = {
{ MUS_FANFA1, 80 },
{ MUS_FANFA4, 160 },
{ MUS_FANFA5, 220 },
{ MUS_ME_WAZA, 220 },
{ MUS_ME_ASA, 160 },
{ MUS_ME_BACHI, 340 },
{ MUS_ME_WASURE, 180 },
{ MUS_ME_KINOMI, 120 },
{ MUS_ME_B_BIG, 250 },
{ MUS_ME_B_SMALL, 150 },
{ MUS_ME_ZANNEN, 160 },
{ MUS_POKEFUE, 450 },
{ MUS_FAN5, 170 },
{ MUS_FAN2, 196 }
[FANFARE_00] = { MUS_FANFA1, 80 },
[FANFARE_01] = { MUS_FANFA4, 160 },
[FANFARE_02] = { MUS_FANFA5, 220 },
[FANFARE_03] = { MUS_ME_WAZA, 220 },
[FANFARE_04] = { MUS_ME_ASA, 160 },
[FANFARE_05] = { MUS_ME_BACHI, 340 },
[FANFARE_06] = { MUS_ME_WASURE, 180 },
[FANFARE_07] = { MUS_ME_KINOMI, 120 },
[FANFARE_08] = { MUS_ME_B_BIG, 250 },
[FANFARE_09] = { MUS_ME_B_SMALL, 150 },
[FANFARE_10] = { MUS_ME_ZANNEN, 160 },
[FANFARE_POKEFLUTE] = { MUS_POKEFUE, 450 },
[FANFARE_KEY_ITEM] = { MUS_FAN5, 170 },
[FANFARE_DEX_EVAL] = { MUS_FAN2, 196 }
};
extern u16 SpeciesToCryId(u16);