Synced from pmdsky-debug

2026-03-21 17:25:15 -05:00 · 2025-08-13 17:44:38 -04:00 · 2025-08-13 17:44:38 -04:00 · 8fc1285284
commit 8fc1285284
parent 35d0ca7856
18 changed files with 104 additions and 104 deletions
--- a/asm/include/get_category_string.inc
+++ b/asm/include/get_category_string.inc
@ -1,6 +1,6 @@
 #pragma once
+.public _020A3200
+.public _s32_div_f
 .public AllocateTemp1024ByteBufferFromPool
 .public SprintfStatic__02052418
 .public StringFromId
-.public _020A3200
-.public _s32_div_f
--- a/asm/include/main_0200EB30.inc
+++ b/asm/include/main_0200EB30.inc
@ -1,5 +1,5 @@
 #pragma once
-.public ARM9_UNKNOWN_TABLE__NA_2097FF8
+.public BABY_EXCLUSIVE_ITEM_PAIRS
 .public BAG_ITEMS_PTR_MIRROR
 .public IsItemValid
 .public ITEM_DATA_TABLE_PTRS
--- a/asm/include/main_02010FC4.inc
+++ b/asm/include/main_02010FC4.inc
@ -85,6 +85,7 @@
 .public RemoveEmptyItemsInBag
 .public RemoveItem
 .public RemoveItemAtIdxInStorage
+.public ReturnEggExclusiveItem
 .public SaveScriptVariableValue
 .public SelectWaza
 .public SetExclusiveItemEffect
@ -92,7 +93,6 @@
 .public SITRUS_BERRY_FULL_HP_BOOST
 .public StringFromId
 .public sub_0200D1F0
-.public sub_0200EB90
 .public sub_02010044
 .public sub_0201007C
 .public sub_02050974
--- a/asm/include/main_02051788.inc
+++ b/asm/include/main_02051788.inc
@ -1,4 +1,14 @@
 #pragma once
+.public _020A20B1
+.public _020A31B8
+.public _020A31D4
+.public _020A31E4
+.public _020A31F4
+.public _020A31FC
+.public _020A45C8_JP
+.public _020B09B0
+.public _020B09C0
+.public _s32_div_f
 .public ARM9_UNKNOWN_PTR__NA_20A2C84
 .public ARM9_UNKNOWN_TABLE__NA_20A20B0
 .public ArrayCopy32
@ -10,24 +20,12 @@
 .public GetBaseForm
 .public LoadFileFromRom
 .public LoadM2nAndN2m
-.public MONSTER_DATA_TABLE_PTR
 .public MemAlloc
 .public MemFree
 .public MemZero
+.public MONSTER_DATA_TABLE_PTR
 .public RANK_UP_TABLE
 .public StringFromId
-.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
-.public UnloadFile
-.public _020A20B1
-.public _020A31B8
-.public _020A31D4
-.public _020A31E4
-.public _020A31F4
-.public _020A31FC
-.public _020A45C8_JP
-.public _020B09B0
-.public _020B09C0
-.public _s32_div_f
 .public strncpy
 .public sub_0200302C
 .public sub_020030FC
@ -46,4 +44,6 @@
 .public sub_0200B3C0
 .public sub_0200B3D4
 .public sub_0200B3FC
+.public UnloadFile
+.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE
 .public vsprintf
--- a/asm/include/main_020527E0.inc
+++ b/asm/include/main_020527E0.inc
@ -1,4 +1,4 @@
 #pragma once
-.public MONSTER_SPRITE_DATA
 .public _020A2D09
 .public _s32_div_f
+.public MONSTER_SPRITE_DATA
--- a/asm/include/main_02052A7C.inc
+++ b/asm/include/main_02052A7C.inc
@ -1,12 +1,30 @@
 #pragma once
+.public _020A1880
+.public _020A1884
+.public _020A189C
+.public _020A18C0
+.public _020A3210
+.public _020A322C
+.public _020A3248
+.public _020A3258
+.public _020A327C
+.public _020A328C
+.public _020A32D4
+.public _020A32F8
+.public _020A3330
+.public _020B09C8
+.public _020B09D0
+.public _020B12F4_EU
+.public _020B1308_EU
+.public _s32_div_f
 .public Debug_Print0
 .public DecompressAtNormalVeneer
 .public DexNumbersEqual
 .public DirectoryFileMngr_OpenDirectoryFile
 .public DungeonToGroundMoveset
 .public EnableAllLearnableIqSkills
-.public FORBIDDEN_FORGOT_MOVE_LIST
 .public FemaleToMaleForm
+.public FORBIDDEN_FORGOT_MOVE_LIST
 .public GetBaseDefensiveStat
 .public GetBaseHp
 .public GetBaseOffensiveStat
@ -27,8 +45,8 @@
 .public GetNbMoves
 .public GetSpriteSize
 .public GroundToDungeonMoveset
-.public HIDDEN_POWER_BASE_POWER_TABLE
 .public HandleSir0Translation
+.public HIDDEN_POWER_BASE_POWER_TABLE
 .public IsShaymin
 .public IsValidTeamMember
 .public ItemZInit
@ -36,9 +54,9 @@
 .public LEVEL_UP_DATA_MONSTER_ID
 .public LoadFileFromRom
 .public LoadMonsterMd
-.public MONSTER_DATA_TABLE_PTR
 .public MemAlloc
 .public MemFree
+.public MONSTER_DATA_TABLE_PTR
 .public PointsToZero
 .public Rand16Bit
 .public RandIntSafe
@ -50,28 +68,6 @@
 .public StrncmpSimple
 .public StrncpyName
 .public StrncpySimple
-.public TEAM_MEMBER_TABLE
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
-.public ZInit8
-.public _020A1880
-.public _020A1884
-.public _020A189C
-.public _020A18C0
-.public _020A3210
-.public _020A322C
-.public _020A3248
-.public _020A3258
-.public _020A327C
-.public _020A328C
-.public _020A32D4
-.public _020A32F8
-.public _020A3330
-.public _020B09C8
-.public _020B09D0
-.public _020B12F4_EU
-.public _020B1308_EU
-.public _s32_div_f
 .public sub_01FF8F28
 .public sub_02015090
 .public sub_02025304_JP
@ -85,4 +81,8 @@
 .public sub_020560B8
 .public sub_020564B0
 .public sub_02056504
+.public TEAM_MEMBER_TABLE
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
 .public vsprintf
+.public ZInit8
--- a/asm/include/main_02054E4C.inc
+++ b/asm/include/main_02054E4C.inc
@ -1,4 +1,22 @@
 #pragma once
+.public _020A190C
+.public _020A333C
+.public _020A3340
+.public _020A3350
+.public _020A336C
+.public _020A3398
+.public _020A33B8
+.public _020A33D4
+.public _020A340C
+.public _020A343C
+.public _020A344C
+.public _020A3450
+.public _020A3468
+.public _020AFC28
+.public _020AFC4C
+.public _020B0A4C
+.public _022B5788
+.public _022B578C
 .public AddMoneyCarried
 .public CleanStickyItemsInBag
 .public CopyAndInterleaveWrapper
@ -23,8 +41,8 @@
 .public GroundToDungeonMoveset
 .public HandleSir0Translation
 .public IQ_GROUP_SKILLS
-.public IQ_SKILLS
 .public IQ_SKILL_RESTRICTIONS
+.public IQ_SKILLS
 .public IqSkillFlagTest
 .public IsLevelResetDungeon
 .public IsSkyExclusiveDungeon
@ -40,27 +58,6 @@
 .public StrncpyName
 .public StrncpySimple
 .public StrncpySimpleNoPadSafe
-.public TACTICS_UNLOCK_LEVEL_TABLE
-.public TEAM_MEMBER_TABLE_PTR
-.public UnloadFile
-.public _020A190C
-.public _020A333C
-.public _020A3340
-.public _020A3350
-.public _020A336C
-.public _020A3398
-.public _020A33B8
-.public _020A33D4
-.public _020A340C
-.public _020A343C
-.public _020A344C
-.public _020A3450
-.public _020A3468
-.public _020AFC28
-.public _020AFC4C
-.public _020B0A4C
-.public _022B5788
-.public _022B578C
 .public sub_0200D8AC
 .public sub_0200FA0C
 .public sub_0201B43C
@ -75,3 +72,6 @@
 .public sub_020534BC
 .public sub_02053D1C
 .public sub_02053F10
+.public TACTICS_UNLOCK_LEVEL_TABLE
+.public TEAM_MEMBER_TABLE_PTR
+.public UnloadFile
--- a/asm/include/overlay_11.inc
+++ b/asm/include/overlay_11.inc
@ -89,6 +89,7 @@
 .public FreeTeamStats
 .public FX_Atan2Idx
 .public G3X_Reset
+.public GenerateCroagunkItems
 .public GenerateDailyMissions
 .public GenerateKecleonItems1
 .public GenerateKecleonItems2
@ -137,6 +138,7 @@
 .public GetRankupPoints
 .public GetReleasedStylus
 .public GetScenarioBalance
+.public GetScriptEntityMonsterId
 .public GetSimpleMenuResult
 .public GetSosMailCount
 .public GetSpriteIndex__02052724
@ -466,7 +468,6 @@
 .public sub_02011420
 .public sub_020114F8
 .public sub_02011FA0
-.public sub_02012B7C
 .public sub_020130B8
 .public sub_02015328
 .public sub_02016300
@ -762,7 +763,6 @@
 .public sub_02065014
 .public sub_02065050
 .public sub_0206549C
-.public sub_02065974
 .public sub_02065B80
 .public sub_02065BC8
 .public sub_02065BD8
--- a/asm/include/overlay_24.inc
+++ b/asm/include/overlay_24.inc
@ -34,6 +34,7 @@
 .public ov11_0230D220
 .public ov11_02310BDC
 .public Rand16Bit
+.public ReturnEggExclusiveItem
 .public SetPokemonJoined
 .public SetPortraitEmotion
 .public SetPortraitLayout
@ -48,7 +49,6 @@
 .public StrncpySimple
 .public StrncpySimpleNoPadSafe
 .public sub_0200D670
-.public sub_0200EB90
 .public sub_0201077C
 .public sub_02010794
 .public sub_020107AC
--- a/asm/include/overlay_26.inc
+++ b/asm/include/overlay_26.inc
@ -8,6 +8,7 @@
 .public GetGameMode
 .public GetMaxItemsAllowed
 .public GetOutlawLeaderLevel
+.public GetScriptEntityMonsterId
 .public IncrementExclusiveMonsterCounts
 .public IncrementNbAdventures
 .public IncrementNbDungeonsCleared
@ -58,4 +59,3 @@
 .public sub_0205F9D4
 .public sub_02062E5C
 .public sub_0206351C
-.public sub_02065974
--- a/asm/main_0200EB30.s
+++ b/asm/main_0200EB30.s
@ -46,10 +46,10 @@ _0200EB88: .word ITEM_DATA_TABLE_PTRS
 _0200EB8C: .word 0x000007FF
 	arm_func_end sub_0200EB64

-	arm_func_start sub_0200EB90
-sub_0200EB90: ; 0x0200EB90
+	arm_func_start ReturnEggExclusiveItem
+ReturnEggExclusiveItem: ; 0x0200EB90
 	mov ip, #0
-	ldr r2, _0200EBC8 ; =ARM9_UNKNOWN_TABLE__NA_2097FF8
+	ldr r2, _0200EBC8 ; =BABY_EXCLUSIVE_ITEM_PAIRS
 	b _0200EBB8
 _0200EB9C:
 	add r1, r2, ip, lsl #2
@ -65,8 +65,8 @@ _0200EBB8:
 	mov r0, #0
 	bx lr
 	.align 2, 0
-_0200EBC8: .word ARM9_UNKNOWN_TABLE__NA_2097FF8
-	arm_func_end sub_0200EB90
+_0200EBC8: .word BABY_EXCLUSIVE_ITEM_PAIRS
+	arm_func_end ReturnEggExclusiveItem

 	arm_func_start SetActiveInventoryToMain
 SetActiveInventoryToMain: ; 0x0200EBCC
--- a/asm/main_02010FC4.s
+++ b/asm/main_02010FC4.s
@ -2171,8 +2171,8 @@ _02012B74: .word _020AF6D0
 _02012B78: .word _020AF6D4
 	arm_func_end CloseSynthBin

-	arm_func_start sub_02012B7C
-sub_02012B7C: ; 0x02012B7C
+	arm_func_start GenerateCroagunkItems
+GenerateCroagunkItems: ; 0x02012B7C
 	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
 	sub sp, sp, #0x160
 	bl GetScenarioBalance
@ -2273,7 +2273,7 @@ _02012CB8:
 	mla r1, r6, r2, r1
 	mov r0, sl
 	add r2, sp, #0x2c
-	bl sub_020132A4
+	bl GetValidSynthsForSpecies
 	cmp r0, #0
 	addne r0, r4, r5, lsl #1
 	addne r0, r0, #0x900
@ -2347,7 +2347,7 @@ _02012DD4:
 	mla r1, r6, r0, r1
 	add r2, sp, #0x2c
 	mov r0, sb
-	bl sub_020132A4
+	bl GetValidSynthsForSpecies
 	cmp r0, #0
 	addne r0, r4, r5, lsl #1
 	addne r0, r0, #0x900
@ -2557,7 +2557,7 @@ _020130A8: .word 0x00000229
 _020130AC: .word TYPE_SPECIFIC_EXCLUSIVE_ITEMS
 _020130B0: .word _022A4BD8
 _020130B4: .word _02098D48
-	arm_func_end sub_02012B7C
+	arm_func_end GenerateCroagunkItems

 	arm_func_start sub_020130B8
 sub_020130B8: ; 0x020130B8
@ -2717,8 +2717,8 @@ _0201328C:
 _020132A0: .word _020AF6D0
 	arm_func_end GetSynthItem

-	arm_func_start sub_020132A4
-sub_020132A4: ; 0x020132A4
+	arm_func_start GetValidSynthsForSpecies
+GetValidSynthsForSpecies: ; 0x020132A4
 	stmdb sp!, {r4, r5, r6, r7, r8, sb, sl, lr}
 	mov sl, r0
 	mov sb, r1
@ -2759,7 +2759,7 @@ _0201332C:
 	cmp r6, #4
 	blt _020132D0
 	mov r0, sl
-	bl sub_0200EB90
+	bl ReturnEggExclusiveItem
 	cmp r0, #0
 	beq _0201338C
 	bl GetSynthItem
@ -2794,7 +2794,7 @@ _0201338C:
 	strneb r1, [r8, r0]
 	mov r0, r5
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, pc}
-	arm_func_end sub_020132A4
+	arm_func_end GetValidSynthsForSpecies

 	arm_func_start LoadWazaP
 LoadWazaP: ; 0x020133C4
--- a/asm/main_02058F24.s
+++ b/asm/main_02058F24.s
@ -15463,8 +15463,8 @@ _0206596C: .word TEAM_MEMBER_TABLE_PTR
 _02065970: .word _020B0B08
 	arm_func_end sub_0206549C

-	arm_func_start sub_02065974
-sub_02065974: ; 0x02065974
+	arm_func_start GetScriptEntityMonsterId
+GetScriptEntityMonsterId: ; 0x02065974
 	stmdb sp!, {r0, r1, r2, r3}
 	stmdb sp!, {r3, lr}
 	add r0, sp, #8
@ -15474,7 +15474,7 @@ sub_02065974: ; 0x02065974
 	ldmia sp!, {r3, lr}
 	add sp, sp, #0x10
 	bx lr
-	arm_func_end sub_02065974
+	arm_func_end GetScriptEntityMonsterId

 	arm_func_start GetActorMatchingStorageId
 GetActorMatchingStorageId: ; 0x02065998
--- a/asm/main_020897DC.s
+++ b/asm/main_020897DC.s
@ -11115,8 +11115,8 @@ _02098434:
 	.byte 0x73, 0x74, 0x5F, 0x69, 0x32, 0x6E, 0x5F, 0x66
 	.byte 0x2E, 0x62, 0x69, 0x6E, 0x00, 0x00, 0x00, 0x00
 #endif
-	.global ARM9_UNKNOWN_TABLE__NA_2097FF8
-ARM9_UNKNOWN_TABLE__NA_2097FF8:
+	.global BABY_EXCLUSIVE_ITEM_PAIRS
+BABY_EXCLUSIVE_ITEM_PAIRS:
 	.byte 0xC8, 0x01, 0xAC, 0x00, 0xC9, 0x01, 0xAD, 0x00, 0xCA, 0x01, 0xAE, 0x00
 	.byte 0xCB, 0x01, 0xAF, 0x00, 0xCC, 0x01, 0x07, 0x01, 0xCD, 0x01, 0x09, 0x01, 0xCE, 0x01, 0x0A, 0x01
 	.byte 0xCF, 0x01, 0x0B, 0x01, 0xD0, 0x01, 0x46, 0x01, 0xD1, 0x01, 0x88, 0x01, 0xD2, 0x01, 0xE0, 0x01
--- a/asm/overlay_11.s
+++ b/asm/overlay_11.s
@ -3685,7 +3685,7 @@ _022DF504:
 	bl ScriptParamToInt
 	mov r0, r0, lsl #0x10
 	mov r0, r0, asr #0x10
-	bl sub_02065974
+	bl GetScriptEntityMonsterId
 	mov r7, r0
 	b _022DF6FC
 _022DF520:
@ -3855,7 +3855,7 @@ _022DF760: ; 0x022DF760
 	mov r1, r7, lsl #0x10
 	mov r4, r0
 	mov r0, r1, asr #0x10
-	bl sub_02065974
+	bl GetScriptEntityMonsterId
 	mov r1, r0, lsl #0x10
 	ldr r2, _022DFE18 ; =ov11_02324ECC
 	orr r3, r7, #0x10000
@ -3886,7 +3886,7 @@ _022DF7CC: ; 0x022DF7CC
 	mov r3, #0x60000
 	mov r0, r1, asr #0x10
 	str r3, [r2, #0x4c]
-	bl sub_02065974
+	bl GetScriptEntityMonsterId
 	mov r1, r0
 	ldr r0, _022DFE1C ; =ov11_02324EA4
 	bl InitPortraitParamsWithMonsterId
@ -3913,7 +3913,7 @@ _022DF834: ; 0x022DF834
 	mov r3, #0x70000
 	mov r0, r1, asr #0x10
 	str r3, [r2, #0x4c]
-	bl sub_02065974
+	bl GetScriptEntityMonsterId
 	mov r1, r0
 	ldr r0, _022DFE1C ; =ov11_02324EA4
 	bl InitPortraitParamsWithMonsterId
@ -4170,7 +4170,7 @@ _022DFBDC:
 	b _022E2478
 _022DFBF0:
 	mov r0, #0x2f
-	bl sub_02065974
+	bl GetScriptEntityMonsterId
 	cmp r0, #0
 	mvneq r6, #0
 	beq _022DFC44
@ -15400,7 +15400,7 @@ _022E9498:
 	mov r0, r4
 	bl GenerateKecleonItems2
 	bl GenerateDailyMissions
-	bl sub_02012B7C
+	bl GenerateCroagunkItems
 	bl sub_0201080C
 	bl sub_02011FA0
 	ldmia sp!, {r4, pc}
--- a/asm/overlay_24.s
+++ b/asm/overlay_24.s
@ -2345,7 +2345,7 @@ _0238C2FC:
 	ldr r0, [r1]
 	strb r2, [r0, #0x21]
 	bl sub_0201077C
-	bl sub_0200EB90
+	bl ReturnEggExclusiveItem
 	ldr r1, _0238C33C ; =OVERLAY24_UNKNOWN_POINTER__NA_238C600
 	ldr r1, [r1]
 	strh r0, [r1, #0x16]
--- a/asm/overlay_26.s
+++ b/asm/overlay_26.s
@ -381,7 +381,7 @@ _0238A678:
 	ldr r1, [r0]
 	mov r0, #0x3c
 	str r2, [r1, #0x54]
-	bl sub_02065974
+	bl GetScriptEntityMonsterId
 	mov r5, r0
 	b _0238A74C
 _0238A698:
@ -390,7 +390,7 @@ _0238A698:
 	ldr r1, [r0]
 	mov r0, #0x3d
 	str r2, [r1, #0x54]
-	bl sub_02065974
+	bl GetScriptEntityMonsterId
 	mov r5, r0
 	b _0238A74C
 _0238A6B8:
@ -399,7 +399,7 @@ _0238A6B8:
 	ldr r1, [r0]
 	mov r0, #0x3f
 	str r2, [r1, #0x54]
-	bl sub_02065974
+	bl GetScriptEntityMonsterId
 	mov r5, r0
 	b _0238A74C
 _0238A6D8:
--- a/asm/overlay_29_02333FD0.s
+++ b/asm/overlay_29_02333FD0.s
@ -411,7 +411,7 @@ _0233454C:
 	moveq r0, #0
 	ldmeqia sp!, {r4, r5, r6, r7, r8, pc}
 	add r0, r5, #0x124 + OV29_02333FD0_OFFSET
-	bl ov29_02334CAC
+	bl HasLastUsedMove
 	cmp r0, #0
 	bne _02334C9C
 	mov r0, #0
@ -459,7 +459,7 @@ _023345F4:
 	movne r0, #0
 	ldmneia sp!, {r4, r5, r6, r7, r8, pc}
 	add r0, r5, #0x124 + OV29_02333FD0_OFFSET
-	bl ov29_02334CAC
+	bl HasLastUsedMove
 	cmp r0, #0
 	bne _02334C9C
 	mov r0, #0
@ -757,7 +757,7 @@ _023349E0:
 	ldmia sp!, {r4, r5, r6, r7, r8, pc}
 _023349F4:
 	add r0, r5, #0x124 + OV29_02333FD0_OFFSET
-	bl ov29_02334CAC
+	bl HasLastUsedMove
 	cmp r0, #0
 	bne _02334C9C
 	mov r0, #0
@ -958,8 +958,8 @@ _02334CA4: .word 0x0000010A
 _02334CA8: .word 0x0000020D
 	arm_func_end StatusCheckerCheckOnTarget

-	arm_func_start ov29_02334CAC
-ov29_02334CAC: ; 0x02334CAC
+	arm_func_start HasLastUsedMove
+HasLastUsedMove: ; 0x02334CAC
 	stmdb sp!, {r3, lr}
 	mov r3, #0
 	mov r1, r3
@ -986,4 +986,4 @@ _02334CE8:
 	moveq r0, #0
 	and r0, r0, #0xff
 	ldmia sp!, {r3, pc}
-	arm_func_end ov29_02334CAC
+	arm_func_end HasLastUsedMove