Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-04-25 07:24:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #113 from AnonymousRandomPerson/main
Some checks are pending
build / build (push) Waiting to run
Details

Browse Source 
Synced from pmdsky-debug
This commit is contained in:
AnonymousRandomPerson 2025-03-05 00:41:12 -05:00 committed by GitHub
commit e340603464
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/include/main_0200C4CC.inc
View File

@ -1,11 +1,14 @@
#pragma once
.public _02094C0C
.public _02094C18
.public _0209E7A6
.public AllInventoriesZInit
.public AllKecleonShopsZInit
.public AllocateTemp1024ByteBufferFromPool
.public BAG_ITEMS
.public BAG_ITEMS_PTR_MIRROR
.public DUNGEON_RETURN_STATUS_TABLE
.public DrawTextInWindow
.public DUNGEON_RETURN_STATUS_TABLE
.public FormatMoveString
.public GetDungeonResultString
.public GetItemCategoryVeneer
@ -19,9 +22,6 @@
.public SpecialEpisodeInventoryZInit
.public SpecialEpisodeKecleonShopZInit
.public StringFromId
.public _02094C0C
.public _02094C18
.public _0209E7A6
.public sub_0200D670
.public sub_0200FD38
.public sub_0200FD3C

52
asm/include/main_0200CAFC.inc
View File

@ -1,30 +1,4 @@
#pragma once
.public AVAILABLE_ITEMS_IN_GROUP_TABLE
.public BAG_ITEMS_PTR_MIRROR
.public CopyBitsFrom
.public CopyBitsTo
.public GetDungeonGroup
.public GetItemActionName
.public GetItemBuyPrice
.public GetItemCategory
.public GetItemMoveId
.public GetItemName
.public GetItemPaletteId
.public GetItemSellPrice
.public GetLanguage
.public GetThrownItemQuantityLimit
.public HandleSir0Translation
.public ITEM_DATA_TABLE_PTRS
.public ITEM_TABLES_PTRS_1
.public IsItemValid
.public LoadFileFromRom
.public MONEY_QUANTITY_TABLE
.public MemAlloc
.public MemFree
.public MultiplyByFixedPoint
.public PointsToZero
.public RandRangeSafe
.public ZInit8
.public _02094D0C
.public _02094D20
.public _02097F34
@ -46,6 +20,31 @@
.public _020AF6C4
.public _020AF6C8
.public _020AFF88_EU
.public AVAILABLE_ITEMS_IN_GROUP_TABLE
.public BAG_ITEMS_PTR_MIRROR
.public CopyBitsFrom
.public CopyBitsTo
.public GetDungeonGroup
.public GetItemActionName
.public GetItemBuyPrice
.public GetItemCategory
.public GetItemMoveId
.public GetItemName
.public GetItemPaletteId
.public GetItemSellPrice
.public GetLanguage
.public GetThrownItemQuantityLimit
.public HandleSir0Translation
.public IsItemValid
.public ITEM_DATA_TABLE_PTRS
.public ITEM_TABLES_PTRS_1
.public LoadFileFromRom
.public MemAlloc
.public MemFree
.public MONEY_QUANTITY_TABLE
.public MultiplyByFixedPoint
.public PointsToZero
.public RandRangeSafe
.public strcpy
.public strncpy
.public sub_0200EB64
@ -54,3 +53,4 @@
.public sub_02050990
.public sub_020509BC
.public vsprintf
.public ZInit8

18
asm/include/main_0200E864.inc
View File

@ -1,16 +1,16 @@
#pragma once
.public ARM9_UNKNOWN_TABLE__NA_2097FF8
.public BAG_ITEMS_PTR_MIRROR
.public EnsureValidItem
.public GET_ITEM_NAME_FORMATTED_SPRINTF
.public ITEM_DATA_TABLE_PTRS
.public IsItemValid
.public ItemZInit
.public SprintfStatic__0200E808_EU
.public StringFromId
.public _0209808C
.public _0209809C
.public _020980AC
.public _020980B0
.public ARM9_UNKNOWN_TABLE__NA_2097FF8
.public BAG_ITEMS_PTR_MIRROR
.public EnsureValidItem
.public GET_ITEM_NAME_FORMATTED_SPRINTF
.public IsItemValid
.public ITEM_DATA_TABLE_PTRS
.public ItemZInit
.public SprintfStatic__0200E808_EU
.public strcpy
.public StringFromId
.public vsprintf

2
asm/include/overlay_29_022ECDE4.inc
View File

@ -28,7 +28,6 @@
.public LogMessageByIdWithPopupCheckUserUnknown
.public memset
.public MemZero
.public ov10_022C445C
.public ov29_022E2CA0
.public ov29_022E56A0
.public ov29_022E58B0
@ -51,5 +50,6 @@
.public sub_0201F2A0
.public sub_02024FC8
.public SubstitutePlaceholderStringTags
.public TRAP_BUSTER_ACTIVATION_CHANCE
.public UpdateShopkeeperModeAfterTrap
.public UpdateTrapsVisibility

2
asm/include/overlay_29_023016A8.inc
View File

@ -1,5 +1,5 @@
#pragma once
.public AbilityIsActive
.public ov29_022E62A8
.public ShouldMonsterRunAway
.public UpdateStateFlags
.public ov29_022E62A8

4
asm/overlay_10.s
View File

@ -9399,8 +9399,8 @@ ov10_022C4454:
.global ov10_022C4458
ov10_022C4458:
.byte 0x0A, 0x00, 0x00, 0x00
.global ov10_022C445C
ov10_022C445C:
.global TRAP_BUSTER_ACTIVATION_CHANCE
TRAP_BUSTER_ACTIVATION_CHANCE:
.byte 0x1E, 0x00, 0x00, 0x00
.global ov10_022C4460
ov10_022C4460:

4
asm/overlay_29_022ECDE4.s
View File

@ -1504,7 +1504,7 @@ _022EE148:
bl IqSkillIsEnabled
cmp r0, #0
beq _022EE1D8
ldr r0, _022EE310 ; =ov10_022C445C
ldr r0, _022EE310 ; =TRAP_BUSTER_ACTIVATION_CHANCE
ldrsh r0, [r0]
bl DungeonRandOutcome__022EAB20
cmp r0, #0
@ -1647,7 +1647,7 @@ _022EE300: .word 0x00000E5B + TRY_TRIGGER_TRAP_DATA_OFFSET
_022EE304: .word 0x00000E5A + TRY_TRIGGER_TRAP_DATA_OFFSET
_022EE308: .word DUNGEON_PTR
_022EE30C: .word 0x00000E5C + TRY_TRIGGER_TRAP_DATA_OFFSET
_022EE310: .word ov10_022C445C
_022EE310: .word TRAP_BUSTER_ACTIVATION_CHANCE
_022EE314: .word 0x00000E5D + TRY_TRIGGER_TRAP_DATA_OFFSET
arm_func_end TryTriggerTrap

2
src/dungeon_ai_targeting_1.c
View File

@ -79,6 +79,8 @@ enum monster_treatment GetTreatmentBetweenMonsters(struct entity *pokemon, struc
if (pokemon_targeting_decoy == DECOY_AI_NONE)
{
if (pokemon_info->is_team_leader)
// New to Explorers, not in Rescue Team. This allows the leader to do damage to team members
// if the team member is turned into a decoy by a wild Pokémon.
decoy_ai_tracker = DECOY_AI_TREATMENT_NONE_LEADER;
else
decoy_ai_tracker = DECOY_AI_TREATMENT_NONE_NONLEADER;