mirror of
https://github.com/Artrios/pokecarde.git
synced 2026-04-26 00:27:25 -05:00
Merge pull request #2 from gb-mobile/master
Updated Berry names/Fixed minor build issues.
This commit is contained in:
commit
cefc888d79
|
|
@ -2,7 +2,7 @@ INCLUDE "berries/macros.asm"
|
||||||
|
|
||||||
Enigma_Berry
|
Enigma_Berry
|
||||||
|
|
||||||
Text_EN "CHILAN"7
|
Text_EN "CHILAN@"7
|
||||||
Firmness SOFT
|
Firmness SOFT
|
||||||
Size 27,2
|
Size 27,2
|
||||||
Yield_Range 1, 2
|
Yield_Range 1, 2
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ INCLUDE "berries/macros.asm"
|
||||||
|
|
||||||
Enigma_Berry
|
Enigma_Berry
|
||||||
|
|
||||||
Text_EN "EGGANT"7
|
Text_EN "EGGANT@"7
|
||||||
Firmness SOFT
|
Firmness SOFT
|
||||||
Size 4,1
|
Size 4,1
|
||||||
Yield_Range 2, 3
|
Yield_Range 2, 3
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ INCLUDE "berries/macros.asm"
|
||||||
|
|
||||||
Enigma_Berry
|
Enigma_Berry
|
||||||
|
|
||||||
Text_EN "ONYON@@"7
|
Text_EN "NIONIO@"7
|
||||||
;Text_JP "ギネマ@@@@"7
|
;Text_JP "ギネマ@@@@"7
|
||||||
Firmness VERY_HARD
|
Firmness VERY_HARD
|
||||||
Size 3,5
|
Size 3,5
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ INCLUDE "berries/macros.asm"
|
||||||
|
|
||||||
Enigma_Berry
|
Enigma_Berry
|
||||||
|
|
||||||
Text_EN "OCRA@@@"7
|
Text_EN "RAOK@@@"7
|
||||||
;Text_JP "クオ@@@@@"7
|
;Text_JP "クオ@@@@@"7
|
||||||
Firmness HARD
|
Firmness HARD
|
||||||
Size 22,0
|
Size 22,0
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ INCLUDE "berries/macros.asm"
|
||||||
|
|
||||||
Enigma_Berry
|
Enigma_Berry
|
||||||
|
|
||||||
Text_EN "GARLIK@"7
|
Text_EN "GARIC@@"7
|
||||||
;Text_JP "ニニク@@@@"7
|
;Text_JP "ニニク@@@@"7
|
||||||
Firmness HARD
|
Firmness HARD
|
||||||
Size 24,9
|
Size 24,9
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ INCLUDE "berries/macros.asm"
|
||||||
|
|
||||||
Enigma_Berry
|
Enigma_Berry
|
||||||
|
|
||||||
Text_EN "NUTPEA"7
|
Text_EN "NUTPEA@"7
|
||||||
Firmness SUPER_HARD
|
Firmness SUPER_HARD
|
||||||
Size 12,4
|
Size 12,4
|
||||||
Yield_Range 1, 3
|
Yield_Range 1, 3
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ INCLUDE "berries/macros.asm"
|
||||||
|
|
||||||
Enigma_Berry
|
Enigma_Berry
|
||||||
|
|
||||||
Text_EN "PUMKIN"7
|
Text_EN "PUMKIN@"7
|
||||||
Firmness SUPER_HARD
|
Firmness SUPER_HARD
|
||||||
Size 4,8
|
Size 4,8
|
||||||
Yield_Range 2, 3
|
Yield_Range 2, 3
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ INCLUDE "berries/macros.asm"
|
||||||
|
|
||||||
Enigma_Berry
|
Enigma_Berry
|
||||||
|
|
||||||
Text_EN "TOPO@@@"7
|
Text_EN "POTOTO@"7
|
||||||
;Text_JP "トポ@@@@@"7
|
;Text_JP "トポ@@@@@"7
|
||||||
Firmness VERY_HARD
|
Firmness VERY_HARD
|
||||||
Size 8,8
|
Size 8,8
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ INCLUDE "berries/macros.asm"
|
||||||
|
|
||||||
Enigma_Berry
|
Enigma_Berry
|
||||||
|
|
||||||
Text_EN "CHIPEP@"7
|
Text_EN "REPED@@"7
|
||||||
;Text_JP "トウガ@@@@"7
|
;Text_JP "トウガ@@@@"7
|
||||||
Firmness SUPER_HARD
|
Firmness SUPER_HARD
|
||||||
Size 15,3
|
Size 15,3
|
||||||
|
|
@ -21,8 +21,8 @@ BerryPalette:
|
||||||
Text_EN "This BERRY is amazingly spicy."45
|
Text_EN "This BERRY is amazingly spicy."45
|
||||||
Text_EN "No one has been able to eat it whole."45
|
Text_EN "No one has been able to eat it whole."45
|
||||||
|
|
||||||
Text_JP "とてつもなく からい。 1どに まるごと"45
|
;Text_JP "とてつもなく からい。 1どに まるごと"45
|
||||||
Text_JP "たべられた ひとは まだ だれも いない。"45
|
;Text_JP "たべられた ひとは まだ だれも いない。"45
|
||||||
|
|
||||||
db 0,0,0
|
db 0,0,0
|
||||||
db $01 ; cures confusion
|
db $01 ; cures confusion
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ INCLUDE "berries/macros.asm"
|
||||||
|
|
||||||
Enigma_Berry
|
Enigma_Berry
|
||||||
|
|
||||||
Text_EN "BITMEL@"7
|
Text_EN "YAGO@@@"7
|
||||||
;Text_JP "ヤゴ@@@@@"7
|
;Text_JP "ヤゴ@@@@@"7
|
||||||
Firmness VERY_HARD
|
Firmness VERY_HARD
|
||||||
Size 3,6
|
Size 3,6
|
||||||
|
|
|
||||||
BIN
battle-e/nedclib.dll
Normal file
BIN
battle-e/nedclib.dll
Normal file
Binary file not shown.
BIN
battle-e/nedcmake.exe
Normal file
BIN
battle-e/nedcmake.exe
Normal file
Binary file not shown.
BIN
battle-e/nevpk.exe
Normal file
BIN
battle-e/nevpk.exe
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user