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

Clean up some additional unknowns

Browse source
This commit is contained in:
GriffinR 2022-05-17 17:12:45 -04:00
parent 71ea78cc32
commit 5fa8ca55b0
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/battle_ai_scripts.s
View file

@ -1099,15 +1099,18 @@ AI_CV_AttackDown3:
score -2 score -2
AI_CV_AttackDown4: AI_CV_AttackDown4:
get_target_type1 get_target_type1
if_in_bytes AI_CV_AttackDown_UnknownTypeList, AI_CV_AttackDown_End if_in_bytes AI_CV_AttackDown_PhysicalTypeList, AI_CV_AttackDown_End
get_target_type2 get_target_type2
if_in_bytes AI_CV_AttackDown_UnknownTypeList, AI_CV_AttackDown_End if_in_bytes AI_CV_AttackDown_PhysicalTypeList, AI_CV_AttackDown_End
if_random_less_than 50, AI_CV_AttackDown_End if_random_less_than 50, AI_CV_AttackDown_End
score -2 score -2
AI_CV_AttackDown_End: AI_CV_AttackDown_End:
end end
AI_CV_AttackDown_UnknownTypeList: @ If the target is not of any type in this list then using the move may be discouraged.
@ It seems likely this was meant to be "discourage reducing the target's attack if they're
@ not a physical type", but they've left out Flying, Poison, and Ghost.
AI_CV_AttackDown_PhysicalTypeList:
.byte TYPE_NORMAL .byte TYPE_NORMAL
.byte TYPE_FIGHTING .byte TYPE_FIGHTING
.byte TYPE_GROUND .byte TYPE_GROUND

3
graphics_file_rules.mk
View file

@ -665,9 +665,6 @@ $(WALLPAPERGFXDIR)/ludicolo/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $
$(WALLPAPERGFXDIR)/whiscash/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/whiscash/bg.4bpp $(WALLPAPERGFXDIR)/whiscash/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/whiscash/bg.4bpp
@cat $^ >$@ @cat $^ >$@
$(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 11
$(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 8 $(GFX) $< $@ -num_tiles 8

6
src/item.c
View file

@ -15,20 +15,14 @@
#include "constants/items.h" #include "constants/items.h"
#include "constants/hold_effects.h" #include "constants/hold_effects.h"
extern u16 gUnknown_0203CF30[];
// this file's functions
static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count); static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count);
static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count); static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count);
// EWRAM variables
EWRAM_DATA struct BagPocket gBagPockets[POCKETS_COUNT] = {0}; EWRAM_DATA struct BagPocket gBagPockets[POCKETS_COUNT] = {0};
// rodata
#include "data/text/item_descriptions.h" #include "data/text/item_descriptions.h"
#include "data/items.h" #include "data/items.h"
// code
static u16 GetBagItemQuantity(u16 *quantity) static u16 GetBagItemQuantity(u16 *quantity)
{ {
return gSaveBlock2Ptr->encryptionKey ^ *quantity; return gSaveBlock2Ptr->encryptionKey ^ *quantity;