ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1853 from GriffinRichards/doc-contest-bar

Browse Source 
Clarify AI_CV_AttackDown_UnknownTypeList
This commit is contained in:
GriffinR 2023-02-15 11:29:57 -05:00 committed by GitHub
commit 69fdf0faa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 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

4
src/item.c
View File

@ -15,18 +15,14 @@
#include "constants/items.h" #include "constants/items.h"
#include "constants/hold_effects.h" #include "constants/hold_effects.h"
// 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;