Merge pull request #243 from SethBarberee/decomp_jan_2026

Decomp jan 2026

Author: AnonymousRandomPerson

asm/include/main_0200EB30.inc

@@ -4,3 +4,4 @@
 .public IsItemValid
 .public ITEM_DATA_TABLE_PTRS
 .public ItemZInit
+.public SetActiveInventory

asm/include/overlay_29_02301E88.inc

@@ -1,2 +1,3 @@
 #pragma once
 .public GravityIsActive
+.public IsTypeAffectedByGravity

asm/main_0200EB30.s

@@ -68,107 +68,3 @@ _0200EBB8:
 _0200EBC8: .word BABY_EXCLUSIVE_ITEM_PAIRS
 	arm_func_end ReturnEggExclusiveItem
 
-	arm_func_start SetActiveInventoryToMain
-SetActiveInventoryToMain: ; 0x0200EBCC
-	ldr ip, _0200EBD8 ; =SetActiveInventory
-	mov r0, #0
-	bx ip
-	.align 2, 0
-_0200EBD8: .word SetActiveInventory
-	arm_func_end SetActiveInventoryToMain
-
-	arm_func_start AllInventoriesZInit
-AllInventoriesZInit: ; 0x0200EBDC
-	stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
-	mov sl, #0
-	ldr r6, _0200EC44 ; =BAG_ITEMS_PTR_MIRROR
-	mov r7, sl
-	mov fp, sl
-	mov r4, #6
-	mov r5, #0x12c
-_0200EBF8:
-	mul sb, sl, r5
-	mov r8, fp
-_0200EC00:
-	ldr r0, [r6]
-	add r0, r0, sb
-	mla r0, r8, r4, r0
-	bl ItemZInit
-	add r8, r8, #1
-	cmp r8, #0x32
-	blt _0200EC00
-	ldr r0, [r6]
-	add r0, r0, sl, lsl #2
-	add r0, r0, #0x1000
-	add sl, sl, #1
-	str r7, [r0, #0x394]
-	cmp sl, #3
-	blt _0200EBF8
-	mov r0, r7
-	bl SetActiveInventory
-	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
-	.align 2, 0
-_0200EC44: .word BAG_ITEMS_PTR_MIRROR
-	arm_func_end AllInventoriesZInit
-
-	arm_func_start SpecialEpisodeInventoryZInit
-SpecialEpisodeInventoryZInit: ; 0x0200EC48
-	stmdb sp!, {r4, r5, r6, lr}
-	ldr r5, _0200EC8C ; =BAG_ITEMS_PTR_MIRROR
-	mov r6, #0
-	mov r4, #6
-_0200EC58:
-	ldr r0, [r5]
-	add r0, r0, #0x12c
-	mla r0, r6, r4, r0
-	bl ItemZInit
-	add r6, r6, #1
-	cmp r6, #0x32
-	blt _0200EC58
-	ldr r0, _0200EC8C ; =BAG_ITEMS_PTR_MIRROR
-	mov r1, #0
-	ldr r0, [r0]
-	add r0, r0, #0x1000
-	str r1, [r0, #0x398]
-	ldmia sp!, {r4, r5, r6, pc}
-	.align 2, 0
-_0200EC8C: .word BAG_ITEMS_PTR_MIRROR
-	arm_func_end SpecialEpisodeInventoryZInit
-
-	arm_func_start RescueInventoryZInit
-RescueInventoryZInit: ; 0x0200EC90
-	stmdb sp!, {r4, r5, r6, lr}
-	ldr r5, _0200ECD4 ; =BAG_ITEMS_PTR_MIRROR
-	mov r6, #0
-	mov r4, #6
-_0200ECA0:
-	ldr r0, [r5]
-	add r0, r0, #0x258
-	mla r0, r6, r4, r0
-	bl ItemZInit
-	add r6, r6, #1
-	cmp r6, #0x32
-	blt _0200ECA0
-	ldr r0, _0200ECD4 ; =BAG_ITEMS_PTR_MIRROR
-	mov r1, #0
-	ldr r0, [r0]
-	add r0, r0, #0x1000
-	str r1, [r0, #0x39c]
-	ldmia sp!, {r4, r5, r6, pc}
-	.align 2, 0
-_0200ECD4: .word BAG_ITEMS_PTR_MIRROR
-	arm_func_end RescueInventoryZInit
-
-	arm_func_start SetActiveInventory
-SetActiveInventory: ; 0x0200ECD8
-	ldr r2, _0200ECF8 ; =BAG_ITEMS_PTR_MIRROR
-	mov r1, #0x12c
-	ldr r3, [r2]
-	strb r0, [r3, #0x388]
-	ldr r2, [r2]
-	mla r1, r0, r1, r2
-	str r1, [r2, #0x384]
-	bx lr
-	.align 2, 0
-_0200ECF8: .word BAG_ITEMS_PTR_MIRROR
-	arm_func_end SetActiveInventory

asm/main_0200ED1C.s

@@ -3,50 +3,6 @@
 
 	.text
 
-	arm_func_start GetSpawnThreshold
-GetSpawnThreshold: ; 0x02052B44
-	ldr r2, _02052B5C ; =MONSTER_DATA_TABLE_PTR
-	mov r1, #0x44
-	ldr r2, [r2]
-	smlabb r0, r0, r1, r2
-	ldrb r0, [r0, #0x31]
-	bx lr
-	.align 2, 0
-_02052B5C: .word MONSTER_DATA_TABLE_PTR
-	arm_func_end GetSpawnThreshold
-
-	arm_func_start NeedsItemToSpawn
-NeedsItemToSpawn: ; 0x02052B60
-	ldr r2, _02052B88 ; =MONSTER_DATA_TABLE_PTR
-	mov r1, #0x44
-	ldr r2, [r2]
-	smlabb r0, r0, r1, r2
-	ldrb r0, [r0, #0x1a]
-	tst r0, #0x80
-	movne r0, #1
-	moveq r0, #0
-	and r0, r0, #0xff
-	bx lr
-	.align 2, 0
-_02052B88: .word MONSTER_DATA_TABLE_PTR
-	arm_func_end NeedsItemToSpawn
-
-	arm_func_start GetExclusiveItem
-GetExclusiveItem: ; 0x02052B8C
-	ldr r2, _02052BB4 ; =MONSTER_DATA_TABLE_PTR
-	mov r3, r1, lsr #0x1f
-	ldr ip, [r2]
-	mov r2, #0x44
-	rsb r1, r3, r1, lsl #30
-	smlabb r2, r0, r2, ip
-	add r0, r3, r1, ror #30
-	add r0, r2, r0, lsl #1
-	ldrsh r0, [r0, #0x34]
-	bx lr
-	.align 2, 0
-_02052BB4: .word MONSTER_DATA_TABLE_PTR
-	arm_func_end GetExclusiveItem
-
 	arm_func_start GetFamilyIndex
 GetFamilyIndex: ; 0x02052BB8
 	ldr r2, _02052BD0 ; =MONSTER_DATA_TABLE_PTR

asm/main_02052B44.s

@@ -8,4 +8,10 @@ bool8 LevitateIsActive(struct entity* entity);
 // Checks if a monster is a given type.
 bool8 MonsterIsType(struct entity *entity, enum type_id type_id);
 
+// Checks if the type affected by Gravity
+bool8 IsTypeAffectedByGravity(struct entity *entity, enum type_id type);
+
+// Checks if the monster has a type affected by Gravity
+bool8 HasTypeAffectedByGravity(struct entity* entity, enum type_id type);
+
 #endif //PMDSKY_DUNGEON_LOGIC_3_H

asm/overlay_29_02301E88.s

@@ -1596,7 +1596,7 @@ enum exclusive_item_effect_id {
 
 #define GROUND_ITEM_TOOLBOX_INDEX 0x80
 #define HELD_ITEM_TOOLBOX_INDEX 0x81
-#define INVENTORY_SIZE 52
+#define INVENTORY_SIZE 50
 #define NUMBER_OF_ITEM_IDS (ITEM_UNNAMED_0x577 + 1)
 
 // Item info
@@ -1634,12 +1634,25 @@ struct item_volatile {
 };
 
 struct bag_items_inner {
-    /* 0x0 */ struct item bag_items[INVENTORY_SIZE];
+    /* 0x0 */ struct item bag_items[INVENTORY_SIZE]; 
+    // NOTE: I don't know why we have to do the subtraction  - Seth
 };
 
+#define MAIN_INVENTORY_INDEX 0
+#define SPECIAL_EPISODE_INVENTORY_INDEX 1
+#define RESCUE_INVENTORY_INDEX 2
+#define NUM_INVENTORIES 3
+
 struct bag_items {
-    u8 fill0[0x384];
+    // Indexes:
+    // 0x0 - Main, default
+    // 0x1 - Special Episode
+    // 0x2 - Rescue
+    /* 0x0   */ struct bag_items_inner inventories[NUM_INVENTORIES];
     /* 0x384 */ struct bag_items_inner *bag_items;
+    /* 0x388 */ u8 active_inventory_idx;
+    u8 fill2[0x1009];
+    u32 maybeMoney[NUM_INVENTORIES]; // indexed with an u8, uses same indexes as Inventory
 };
 
 struct bulk_item

asm/overlay_29_02318A90.s

@@ -1,15 +1,29 @@
 #ifndef PMDSKY_MAIN_0200ECFC_H
 #define PMDSKY_MAIN_0200ECFC_H
 
-typedef struct {
-    u8 fill1[0x388];
-    u8 unk388;
-    u8 fill2[0x1009];
-    u32 maybeMoney[]; // Unknown size, but indexed with an u8
-} bag_items;
+// Set the active inventory to the main inventory
+void SetActiveInventoryToMain(void);
+
+// Init all inventories, all money the player is carrying, and set default active inventory
+void AllInventoriesZInit(void);
+
+// Init the special episode inventory and money the player is carrying
+void SpecialEpisodeInventoryZInit(void);
+
+// Init the rescue inventory and money the player is carrying
+void RescueInventoryZInit(void);
+
+// Set the active inventory to the current index
+void SetActiveInventory(s8 index);
 
 // Gets the amount of money the player is carrying.
 // return: value
 u32 GetMoneyCarried(void);
 
+// Sets the amount of money the player is carrying.
+void SetMoneyCarried(s32 amount);
+
+// Adds the amount of to the money the player is carrying.
+void AddMoneyCarried(s32 amount);
+
 #endif //PMDSKY_MAIN_0200ECFC_H