Forgor these two funcs

pret · Aug 4, 2023 · 0290a45 · 0290a45
1 parent e68a5b7
commit 0290a45
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s
@@ -6044,7 +6044,7 @@ _0809BFFC:
 	ands r4, r0
 	bl sub_809B294
 	adds r0, r4, 0
-	bl CreateMakuhitaShop
+	bl MakuhitaDojo_New
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809C032
@@ -6068,7 +6068,7 @@ _0809C046:
 	lsls r0, 16
 	asrs r0, 16
 	str r0, [r1]
-	bl DestroyMakuhitaShop
+	bl MakuhitaDojo_Delete
 	b _0809C392
 _0809C05E:
 	ldr r0, [r6]
@@ -6078,7 +6078,7 @@ _0809C05E:
 	movs r1, 0x1
 	negs r1, r1
 	str r1, [r0]
-	bl DestroyMakuhitaShop
+	bl MakuhitaDojo_Delete
 	b _0809C392
 _0809C072:
 	movs r4, 0x1
@@ -6091,7 +6091,7 @@ _0809C072:
 _0809C082:
 	bl sub_809B294
 	adds r0, r4, 0
-	bl CreateMakuhitaShop
+	bl MakuhitaDojo_New
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809C0A8
@@ -6125,7 +6125,7 @@ _0809C0B8:
 _0809C0C8:
 	bl sub_809B294
 	adds r0, r4, 0
-	bl CreateMakuhitaShop
+	bl MakuhitaDojo_New
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809C0F0
@@ -6156,7 +6156,7 @@ _0809C0FC:
 _0809C10C:
 	bl sub_809B294
 	adds r0, r4, 0
-	bl CreateMakuhitaShop
+	bl MakuhitaDojo_New
 	lsls r0, 24
 	cmp r0, 0
 	beq _0809C134

diff --git a/data/data_8115F5C.s b/data/data_8115F5C.s
@@ -224,21 +224,21 @@ gUnknown_8116288: @ 8116288
 gUnknown_8116298: @ 8116298
         .byte 0x01, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
-        .4byte DestroyMakuhitaShop
+        .4byte MakuhitaDojo_Delete
         .4byte sub_802FE58
 
 	.global gUnknown_81162A8
 gUnknown_81162A8: @ 81162A8
         .byte 0x01, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
-        .4byte DestroyMakuhitaShop
+        .4byte MakuhitaDojo_Delete
         .4byte sub_802FE58
 
 	.global gUnknown_81162B8
 gUnknown_81162B8: @ 81162B8
         .byte 0x01, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
-        .4byte DestroyMakuhitaShop
+        .4byte MakuhitaDojo_Delete
         .4byte sub_802FE58
 
 	.global gUnknown_81162C8

diff --git a/include/makuhita_dojo.h b/include/makuhita_dojo.h
@@ -41,7 +41,8 @@ struct unkStruct_203B31C
     u8 unkCC[4];
 };
 
-void DestroyMakuhitaShop(void);
+u32 MakuhitaDojo_New(u32);
+void MakuhitaDojo_Delete(void);
 
 u32 sub_802FE58(void);
 s16 sub_802FED0(void);

diff --git a/src/makuhita_dojo.c b/src/makuhita_dojo.c
@@ -101,7 +101,7 @@ void sub_80302A8(void);
 void sub_80304C8(void);
 s32 sub_8030668(void);
 
-u32 CreateMakuhitaShop(u32 param_1)
+u32 MakuhitaDojo_New(u32 param_1)
 {
     char *monName;
     struct OpenedFile *faceFile;
@@ -198,7 +198,7 @@ s16 sub_802FED0(void)
     return gUnknown_203B318->unk10;
 }
 
-void DestroyMakuhitaShop(void)
+void MakuhitaDojo_Delete(void)
 {
     if (gUnknown_203B318 != NULL) {
         CloseFile(gUnknown_203B318->faceFile);