ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 15:13:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #932 from jiangzhengwenjz/berry_crush

Browse Source 
berry crush
This commit is contained in:
huderlem 2019-12-17 19:35:00 -06:00 committed by GitHub
commit f8cef9a6a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2536 additions and 5672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -31,3 +31,4 @@ build/
porymap.project.cfg porymap.project.cfg
.vscode/ .vscode/
*.a *.a
.fuse_hidden*

5515
asm/berry_crush.s
View File

File diff suppressed because it is too large Load Diff

21
include/strings.h
View File

@ -2864,6 +2864,27 @@ extern const u8 gText_JumpsInARow[];
extern const u8 gText_BestScore2[]; extern const u8 gText_BestScore2[];
extern const u8 gText_ExcellentsInARow[]; extern const u8 gText_ExcellentsInARow[];
// Berry crush
extern const u8 gText_Var1Berry[];
extern const u8 gText_XDotY[];
extern const u8 gText_1DotBlueF700[];
extern const u8 gText_1DotF700[];
extern const u8 gText_TimeColon[];
extern const u8 gText_SpaceSec[];
extern const u8 gText_XDotY2[];
extern const u8 gText_SpaceMin[];
extern const u8 gText_StrVar1[];
extern const u8 gText_PressingSpeed[];
extern const u8 gText_TimesPerSec[];
extern const u8 gText_XDotY3[];
extern const u8 gText_Silkiness[];
extern const u8 gText_Var1Percent[];
extern const u8 gText_PressesRankings[];
extern const u8 gText_CrushingResults[];
extern const u8 gText_BerryCrush2[];
extern const u8 gText_PressingSpeedRankings[];
extern const u8 gText_Var1Players[];
// Lilycove Lady // Lilycove Lady
extern const u8 gText_ContestLady_Handsome[]; extern const u8 gText_ContestLady_Handsome[];
extern const u8 gText_ContestLady_Vinny[]; extern const u8 gText_ContestLady_Vinny[];

1
ld_script.txt
View File

@ -72,7 +72,6 @@ SECTIONS {
src/mevent_news.o(.text); src/mevent_news.o(.text);
src/union_room_chat.o(.text); src/union_room_chat.o(.text);
src/berry_crush.o(.text); src/berry_crush.o(.text);
asm/berry_crush.o(.text);
src/berry_powder.o(.text); src/berry_powder.o(.text);
src/dodrio_berry_picking.o(.text); src/dodrio_berry_picking.o(.text);
src/pokemon_jump.o(.text); src/pokemon_jump.o(.text);

2670
src/berry_crush.c
View File

File diff suppressed because it is too large Load Diff