Merge pull request #148 from Kermalis/kermalis-kecleon_shop

Complete Kecleon Bros + Clean Kecleon/Kangaskhan
pret · Aug 5, 2023 · 2159697 · 2159697
2 parents cbc9a72 + 09d6c61
commit 2159697
Show file tree

Hide file tree

Showing 62 changed files with 3,021 additions and 3,657 deletions.
diff --git a/Makefile b/Makefile
@@ -124,7 +124,8 @@ $(C_BUILDDIR)/agb_flash_mx.o: CC1FLAGS := -O -mthumb-interwork
 
 $(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc
 
-$(C_BUILDDIR)/kecleon_items_1.o: CC1FLAGS := -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm 
+# Stack size in sub_801A9E0 is funky with an unused var
+$(C_BUILDDIR)/kecleon_bros.o: CC1FLAGS := -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
 
 
 #### Main Rules ####

diff --git a/asm/code_2.s b/asm/code_2.s
@@ -1548,7 +1548,7 @@ _08001298:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080012B8: .4byte gTeamInventory_203B460
+_080012B8: .4byte gTeamInventoryRef
 _080012BC: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_8001248
 
@@ -1607,7 +1607,7 @@ _08001306:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_08001324: .4byte gTeamInventory_203B460
+_08001324: .4byte gTeamInventoryRef
 _08001328: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_80012C0
 

diff --git a/asm/code_801EE10.s b/asm/code_801EE10.s
@@ -192,7 +192,7 @@ _0801F074:
 	b _0801F12E
 	.align 2, 0
 _0801F0C8: .4byte gUnknown_203B270
-_0801F0CC: .4byte gTeamInventory_203B460
+_0801F0CC: .4byte gTeamInventoryRef
 _0801F0D0:
 	ldr r0, _0801F0E0
 	ldr r1, [r0]

diff --git a/asm/code_801EE10_mid.s b/asm/code_801EE10_mid.s
@@ -173,7 +173,7 @@ _08021502:
 	.align 2, 0
 _08021568: .4byte gUnknown_203B280
 _0802156C: .4byte gUnknown_80DC494
-_08021570: .4byte gTeamInventory_203B460
+_08021570: .4byte gTeamInventoryRef
 _08021574:
 	mov r0, r10
 	ldr r1, _08021598

diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s
@@ -2732,7 +2732,7 @@ _080441A4:
 	.align 2, 0
 _080441AC: .4byte gDungeon
 _080441B0: .4byte 0x00000644
-_080441B4: .4byte gTeamInventory_203B460
+_080441B4: .4byte gTeamInventoryRef
 _080441B8: .4byte gRecruitedPokemonRef
 	thumb_func_end sub_8044124
 

diff --git a/asm/code_8044CC8.s b/asm/code_8044CC8.s
@@ -24,7 +24,7 @@ sub_8044CC8:
 	adds r0, r1
 	b _08044D34
 	.align 2, 0
-_08044CE8: .4byte gTeamInventory_203B460
+_08044CE8: .4byte gTeamInventoryRef
 _08044CEC:
 	adds r0, r1, 0
 	cmp r0, 0x80
@@ -97,7 +97,7 @@ sub_8044D40:
 	bl FillInventoryGaps
 	b _08044D88
 	.align 2, 0
-_08044D70: .4byte gTeamInventory_203B460
+_08044D70: .4byte gTeamInventoryRef
 _08044D74:
 	lsls r0, r1, 24
 	lsrs r0, 24

diff --git a/asm/code_8045A00.s b/asm/code_8045A00.s
@@ -122,7 +122,7 @@ _08045E94:
 	.align 2, 0
 _08045EA8: .4byte gDungeon
 _08045EAC: .4byte 0x0000065b
-_08045EB0: .4byte gTeamInventory_203B460
+_08045EB0: .4byte gTeamInventoryRef
 _08045EB4:
 	ldr r0, [sp, 0xAC]
 	adds r0, 0x60

diff --git a/asm/code_8046CE4.s b/asm/code_8046CE4.s
@@ -36,7 +36,7 @@ _08047180:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0804718C: .4byte gTeamInventory_203B460
+_0804718C: .4byte gTeamInventoryRef
 	thumb_func_end sub_8047158
 
 	thumb_func_start sub_8047190

diff --git a/asm/code_804AFAC.s b/asm/code_804AFAC.s
@@ -14912,7 +14912,7 @@ _08052196:
 	movs r0, 0
 	b _080521CA
 	.align 2, 0
-_080521B4: .4byte gTeamInventory_203B460
+_080521B4: .4byte gTeamInventoryRef
 _080521B8: .4byte gRecruitedPokemonRef
 _080521BC: .4byte 0x00008df8
 _080521C0: .4byte 0x00008e38

diff --git a/asm/code_805D8C8.s b/asm/code_805D8C8.s
@@ -786,7 +786,7 @@ _0805DEFC: .4byte gGameOptionsRef
 _0805DF00: .4byte gRealInputs
 _0805DF04: .4byte gUnknown_202F22D
 _0805DF08: .4byte 0x01000200
-_0805DF0C: .4byte gTeamInventory_203B460
+_0805DF0C: .4byte gTeamInventoryRef
 _0805DF10: .4byte gDungeon
 _0805DF14: .4byte 0x0001820a
 _0805DF18: .4byte gUnknown_202EE00
@@ -4319,7 +4319,7 @@ _0805FBB8: .4byte gFieldMenuGroundPtr
 _0805FBBC: .4byte gPlayTimeRef
 _0805FBC0: .4byte gUnknown_202DE30
 _0805FBC4: .4byte gUnknown_80F9174
-_0805FBC8: .4byte gTeamInventory_203B460
+_0805FBC8: .4byte gTeamInventoryRef
 _0805FBCC: .4byte gUnknown_80F9190
 _0805FBD0: .4byte gAvailablePokemonNames
 _0805FBD4: .4byte gUnknown_80F91A8
@@ -4807,7 +4807,7 @@ _0805FF66:
 	b _0805FFE8
 	.align 2, 0
 _0805FFA8: .4byte gUnknown_202F240
-_0805FFAC: .4byte gTeamInventory_203B460
+_0805FFAC: .4byte gTeamInventoryRef
 _0805FFB0: .4byte gDungeon
 _0805FFB4: .4byte 0x0001357c
 _0805FFB8: .4byte gUnknown_202F258
@@ -5256,7 +5256,7 @@ _0806033C:
 	.align 2, 0
 _0806034C: .4byte gUnknown_202EE10
 _08060350: .4byte gUnknown_202F248
-_08060354: .4byte gTeamInventory_203B460
+_08060354: .4byte gTeamInventoryRef
 _08060358: .4byte gUnknown_202F240
 _0806035C: .4byte gRealInputs
 _08060360: .4byte gDungeon
@@ -5553,7 +5553,7 @@ _08060592:
 	b _08060794
 	.align 2, 0
 _080605C0: .4byte gTeamToolboxAPtr
-_080605C4: .4byte gTeamInventory_203B460
+_080605C4: .4byte gTeamInventoryRef
 _080605C8: .4byte gUnknown_8106B60
 _080605CC:
 	ldr r0, _08060630
@@ -5605,7 +5605,7 @@ _080605FC:
 	b _08060794
 	.align 2, 0
 _08060630: .4byte gTeamToolboxBPtr
-_08060634: .4byte gTeamInventory_203B460
+_08060634: .4byte gTeamInventoryRef
 _08060638: .4byte gUnknown_8106B60
 _0806063C:
 	mov r1, r9
@@ -6012,7 +6012,7 @@ _08060964: .4byte gUnknown_202F238
 _08060968: .4byte gUnknown_202EE6C
 _0806096C: .4byte gDungeon
 _08060970: .4byte 0x0000065b
-_08060974: .4byte gTeamInventory_203B460
+_08060974: .4byte gTeamInventoryRef
 _08060978:
 	mov r0, r10
 	adds r0, 0x60
@@ -6182,7 +6182,7 @@ _08060ABE:
 	bl sub_8044FF0
 	b _08060B3C
 	.align 2, 0
-_08060AD4: .4byte gTeamInventory_203B460
+_08060AD4: .4byte gTeamInventoryRef
 _08060AD8: .4byte gUnknown_202F238
 _08060ADC: .4byte gDungeon
 _08060AE0: .4byte 0x0001357c
@@ -6210,7 +6210,7 @@ _08060AE8:
 	.align 2, 0
 _08060B10: .4byte gDungeon
 _08060B14: .4byte 0x0000065b
-_08060B18: .4byte gTeamInventory_203B460
+_08060B18: .4byte gTeamInventoryRef
 _08060B1C:
 	ldrb r1, [r7, 0x2]
 	movs r0, 0x37
@@ -6356,7 +6356,7 @@ _08060C32:
 	.align 2, 0
 _08060C50: .4byte gDungeon
 _08060C54: .4byte 0x0001357c
-_08060C58: .4byte gTeamInventory_203B460
+_08060C58: .4byte gTeamInventoryRef
 _08060C5C: .4byte 0x0000065b
 _08060C60:
 	ldrb r1, [r7, 0x2]
@@ -6586,7 +6586,7 @@ _08060E1A:
 	.align 2, 0
 _08060E28: .4byte gDungeon
 _08060E2C: .4byte 0x0000065b
-_08060E30: .4byte gTeamInventory_203B460
+_08060E30: .4byte gTeamInventoryRef
 _08060E34: .4byte 0x0001357c
 	thumb_func_end sub_8060D64
 
@@ -17762,7 +17762,7 @@ _08066798:
 	ldr r0, _080667CC
 	b _080667DE
 	.align 2, 0
-_080667C0: .4byte gTeamInventory_203B460
+_080667C0: .4byte gTeamInventoryRef
 _080667C4: .4byte gUnknown_202DE58
 _080667C8: .4byte 0x00000133
 _080667CC: .4byte gUnknown_80F8D04
@@ -17857,7 +17857,7 @@ _08066856:
 	bl SendMessage
 	b _080668BE
 	.align 2, 0
-_0806688C: .4byte gTeamInventory_203B460
+_0806688C: .4byte gTeamInventoryRef
 _08066890: .4byte gUnknown_202DE58
 _08066894: .4byte gUnknown_80F8C7C
 _08066898:
@@ -18139,7 +18139,7 @@ sub_8066AC0:
 	ldr r0, _08066AF4
 	b _08066B10
 	.align 2, 0
-_08066AF0: .4byte gTeamInventory_203B460
+_08066AF0: .4byte gTeamInventoryRef
 _08066AF4: .4byte gUnknown_80F8D60
 _08066AF8:
 	ldrb r1, [r5]

diff --git a/asm/code_806CD90.s b/asm/code_806CD90.s
@@ -1857,7 +1857,7 @@ _0806DEC8:
 	bl SendWaitingEndMessage
 	b _0806DEF2
 	.align 2, 0
-_0806DED4: .4byte gTeamInventory_203B460
+_0806DED4: .4byte gTeamInventoryRef
 _0806DED8: .4byte gDungeon
 _0806DEDC: .4byte 0x00000679
 _0806DEE0: .4byte 0x00000676

diff --git a/asm/code_8073CF0.s b/asm/code_8073CF0.s
@@ -173,7 +173,7 @@ _08073E48:
 	.align 2, 0
 _08073E64: .4byte gDungeon
 _08073E68: .4byte 0x0000065b
-_08073E6C: .4byte gTeamInventory_203B460
+_08073E6C: .4byte gTeamInventoryRef
 _08073E70:
 	mov r0, r10
 	adds r0, 0x60

diff --git a/asm/code_807E5AC.s b/asm/code_807E5AC.s
@@ -1470,7 +1470,7 @@ _0807F204:
 	movs r0, 0x2
 	b _0807F31C
 	.align 2, 0
-_0807F224: .4byte gTeamInventory_203B460
+_0807F224: .4byte gTeamInventoryRef
 _0807F228: .4byte gUnknown_80FE520
 _0807F22C:
 	movs r0, 0xA6
@@ -1597,7 +1597,7 @@ _0807F31C:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0807F324: .4byte gTeamInventory_203B460
+_0807F324: .4byte gTeamInventoryRef
 _0807F328: .4byte gDungeon
 _0807F32C: .4byte 0x000135cc
 _0807F330: .4byte 0x00000694
@@ -1723,7 +1723,7 @@ _0807F41C: .4byte gDungeon
 _0807F420: .4byte 0x0000066e
 _0807F424: .4byte 0x0000066f
 _0807F428: .4byte gUnknown_80FE4B8
-_0807F42C: .4byte gTeamInventory_203B460
+_0807F42C: .4byte gTeamInventoryRef
 _0807F430: .4byte 0x000135cc
 _0807F434: .4byte 0x00000694
 _0807F438: .4byte 0x0000068c

diff --git a/asm/code_807FCD4.s b/asm/code_807FCD4.s
@@ -791,7 +791,7 @@ _08080300:
 	bl sub_80522F4
 	b _0808034A
 	.align 2, 0
-_0808030C: .4byte gTeamInventory_203B460
+_0808030C: .4byte gTeamInventoryRef
 _08080310: .4byte gUnknown_80FDC40
 _08080314:
 	adds r0, r6, 0
@@ -1032,7 +1032,7 @@ _080804B6:
 	ldr r0, _080804C8
 	b _080804D4
 	.align 2, 0
-_080804C0: .4byte gTeamInventory_203B460
+_080804C0: .4byte gTeamInventoryRef
 _080804C4: .4byte gUnknown_80F4E0E
 _080804C8: .4byte gUnknown_80FD788
 _080804CC:

diff --git a/asm/code_808417C.s b/asm/code_808417C.s
@@ -406,7 +406,7 @@ _080844FC: .4byte gDungeon
 _08084500: .4byte 0x0000068a
 _08084504: .4byte gUnknown_80FA32C
 _08084508: .4byte gUnknown_202DE58
-_0808450C: .4byte gTeamInventory_203B460
+_0808450C: .4byte gTeamInventoryRef
 _08084510: .4byte gUnknown_80FA448
 _08084514:
 	lsls r1, r3, 2

diff --git a/asm/code_8085B0C.s b/asm/code_8085B0C.s
@@ -717,7 +717,7 @@ _08086104:
 	movs r0, 0x1
 	b _0808611C
 	.align 2, 0
-_08086108: .4byte gTeamInventory_203B460
+_08086108: .4byte gTeamInventoryRef
 _0808610C: .4byte gDungeon
 _08086110: .4byte 0x0001357c
 _08086114:

diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s
@@ -5658,7 +5658,7 @@ _0809BCE8:
 	beq _0809BCF0
 	movs r0, 0x3
 _0809BCF0:
-	bl DisplayKeckleonDialogueSprite
+	bl CreateKecleonBros
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809BD10
@@ -6386,7 +6386,7 @@ _0809C2CA:
 	movs r1, 0x1
 	b _0809C318
 	.align 2, 0
-_0809C304: .4byte gTeamInventory_203B460
+_0809C304: .4byte gTeamInventoryRef
 _0809C308: .4byte gUnknown_202DE58
 _0809C30C:
 	ldr r0, [r6]
@@ -7562,7 +7562,7 @@ sub_809CBBC:
 	.align 2, 0
 _0809CC0C: .4byte gUnknown_81163E4
 _0809CC10: .4byte gItemParametersData
-_0809CC14: .4byte gTeamInventory_203B460
+_0809CC14: .4byte gTeamInventoryRef
 _0809CC18: .4byte 0x0001869f
 _0809CC1C:
 	str r1, [r2]
@@ -7648,7 +7648,7 @@ sub_809CC90:
 	b _0809CCD6
 	.align 2, 0
 _0809CCBC: .4byte gUnknown_81163BC
-_0809CCC0: .4byte gTeamInventory_203B460
+_0809CCC0: .4byte gTeamInventoryRef
 _0809CCC4: .4byte 0x0001869f
 _0809CCC8:
 	bl GetNumberOfFilledInventorySlots

diff --git a/asm/dungeon_2.s b/asm/dungeon_2.s
@@ -581,7 +581,7 @@ _080907F0: .4byte gUnknown_8115DD4
 _080907F4: .4byte gUnknown_8115E00
 _080907F8: .4byte gUnknown_8115E28
 _080907FC: .4byte gUnknown_8115E54
-_08090800: .4byte gTeamInventory_203B460
+_08090800: .4byte gTeamInventoryRef
 _08090804: .4byte gUnknown_8115E80
 _08090808: .4byte gUnknown_8108F50
 _0809080C: