atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Honey

Browse source 
And updated gitignore
This commit is contained in:
Fontbane 2019-03-25 19:00:46 -04:00
parent fc69631a10
commit 2cfa5ea326
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -27,3 +27,5 @@ Thumbs.db
build/ build/
.DS_Store .DS_Store
*.ddump *.ddump
*.bin
*.ipch

2
include/graphics.h
View file

@ -3940,6 +3940,8 @@ extern const u32 gItemIcon_DreadPlate[];
extern const u32 gItemIconPalette_DreadPlate[]; extern const u32 gItemIconPalette_DreadPlate[];
extern const u32 gItemIcon_IronPlate[]; extern const u32 gItemIcon_IronPlate[];
extern const u32 gItemIconPalette_IronPlate[]; extern const u32 gItemIconPalette_IronPlate[];
extern const u32 gItemIcon_Honey[];
extern const u32 gItemIconPalette_Honey[];
// Gen 5 Items // Gen 5 Items
extern const u32 gItemIcon_Eviolite[]; extern const u32 gItemIcon_Eviolite[];
extern const u32 gItemIconPalette_Eviolite[]; extern const u32 gItemIconPalette_Eviolite[];

9
src/battle_script_commands.c
View file

@ -10504,6 +10504,7 @@ static void atkE5_pickup(void)
u16 species, heldItem; u16 species, heldItem;
u8 ability; u8 ability;
u8 level; u8 level;
u8 lvlDivBy10;
if (InBattlePike()) if (InBattlePike())
{ {
@ -10539,7 +10540,7 @@ static void atkE5_pickup(void)
species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2);
heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL); level = GetMonData(&gPlayerParty[i], MON_DATA_LEVEL);
u8 lvlDivBy10 = (level - 1) / 10; lvlDivBy10 = (level - 1) / 10;
if (lvlDivBy10 > 9) if (lvlDivBy10 > 9)
lvlDivBy10 = 9; lvlDivBy10 = 9;
@ -10576,7 +10577,11 @@ static void atkE5_pickup(void)
&& species != SPECIES_EGG && species != SPECIES_EGG
&& heldItem == ITEM_NONE && heldItem == ITEM_NONE
&& (Random()%100 <= lvlDivBy10*5+5)) && (Random()%100 <= lvlDivBy10*5+5))
SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, ITEM_HONEY); {
u16 honey = ITEM_HONEY;
SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &honey);
break;
}
} }
} }

4
src/data/graphics/items.h
View file

@ -877,8 +877,8 @@ const u32 gItemIconPalette_DreadPlate[] = INCBIN_U32("graphics/items/icon_palett
const u32 gItemIcon_IronPlate[] = INCBIN_U32("graphics/items/icons/iron_plate.4bpp.lz"); const u32 gItemIcon_IronPlate[] = INCBIN_U32("graphics/items/icons/iron_plate.4bpp.lz");
const u32 gItemIconPalette_IronPlate[] = INCBIN_U32("graphics/items/icon_palettes/iron_plate.gbapal.lz"); const u32 gItemIconPalette_IronPlate[] = INCBIN_U32("graphics/items/icon_palettes/iron_plate.gbapal.lz");
const u32 gItemIcon_IronPlate[] = INCBIN_U32("graphics/items/icons/honey.4bpp.lz"); const u32 gItemIcon_Honey[] = INCBIN_U32("graphics/items/icons/honey.4bpp.lz");
const u32 gItemIconPalette_IronPlate[] = INCBIN_U32("graphics/items/icon_palettes/honey.gbapal.lz"); const u32 gItemIconPalette_Honey[] = INCBIN_U32("graphics/items/icon_palettes/honey.gbapal.lz");
// Gen 5 Items // Gen 5 Items