From 95b06d5d6b5ec3ba54b7d9f7a04a8df91f452606 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 17 Sep 2020 12:18:11 -0500 Subject: split to decomp type name string functions --- src/code_8092334.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/code_8092334.c (limited to 'src/code_8092334.c') diff --git a/src/code_8092334.c b/src/code_8092334.c new file mode 100644 index 0000000..cb9acff --- /dev/null +++ b/src/code_8092334.c @@ -0,0 +1,26 @@ +#include "global.h" + +extern u32 gUnformattedTypeStrings[]; // unformatted type names +extern u32 gFormattedTypeStrings[]; // formatted type names +extern u8 gUnknown_810AC7C[]; +extern u8 gUnknown_810AC6A[]; + +u32 GetUnformattedTypeString(u8 type) +{ + return gUnformattedTypeStrings[type]; +} + +u32 GetFormattedTypeString(u8 type) +{ + return gFormattedTypeStrings[type]; +} + +u8 sub_8092354(u8 r0) +{ + return gUnknown_810AC7C[r0]; +} + +u8 sub_8092364(u8 r0) +{ + return gUnknown_810AC6A[r0]; +} -- cgit v1.2.3 From 93ed78878789a60e9c3e7e0566f3dc8f7ed1f7d2 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 26 Sep 2020 18:30:40 -0500 Subject: more decomping --- src/code_8092334.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/code_8092334.c') diff --git a/src/code_8092334.c b/src/code_8092334.c index cb9acff..88a9c5a 100644 --- a/src/code_8092334.c +++ b/src/code_8092334.c @@ -4,6 +4,10 @@ extern u32 gUnformattedTypeStrings[]; // unformatted type names extern u32 gFormattedTypeStrings[]; // formatted type names extern u8 gUnknown_810AC7C[]; extern u8 gUnknown_810AC6A[]; +extern u8 *gUnknown_810B4C8[]; +extern u8 *gUnknown_810B988[]; +extern u32 gUnknown_2038C28; +extern u32 *gUnknown_203B468; u32 GetUnformattedTypeString(u8 type) { @@ -24,3 +28,23 @@ u8 sub_8092364(u8 r0) { return gUnknown_810AC6A[r0]; } + +void sub_8092374(char *r0, u8 r1) +{ + strncpy(r0, gUnknown_810B4C8[r1], 0x50); +} + +u8 *sub_8092390(u8 r0) +{ + return gUnknown_810B988[r0]; +} + +void sub_80923A0(void) +{ + gUnknown_203B468 = &gUnknown_2038C28; +} + +u32 *sub_80923B0(void) +{ + return &gUnknown_2038C28; +} -- cgit v1.2.3 From 18308a119060984051cfb95a486778210dbae451 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 5 Oct 2020 22:32:47 -0500 Subject: some doc'ing and decomp work --- src/code_8092334.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/code_8092334.c') diff --git a/src/code_8092334.c b/src/code_8092334.c index 88a9c5a..9049635 100644 --- a/src/code_8092334.c +++ b/src/code_8092334.c @@ -6,7 +6,7 @@ extern u8 gUnknown_810AC7C[]; extern u8 gUnknown_810AC6A[]; extern u8 *gUnknown_810B4C8[]; extern u8 *gUnknown_810B988[]; -extern u32 gUnknown_2038C28; +extern u32 gBoughtFriendAreas; extern u32 *gUnknown_203B468; u32 GetUnformattedTypeString(u8 type) @@ -41,10 +41,10 @@ u8 *sub_8092390(u8 r0) void sub_80923A0(void) { - gUnknown_203B468 = &gUnknown_2038C28; + gUnknown_203B468 = &gBoughtFriendAreas; } u32 *sub_80923B0(void) { - return &gUnknown_2038C28; + return &gBoughtFriendAreas; } -- cgit v1.2.3 From 3c986032f82b895c52287374685fee880c70edb7 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Tue, 13 Oct 2020 17:30:44 -0500 Subject: docing and one decomp of a function --- src/code_8092334.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/code_8092334.c') diff --git a/src/code_8092334.c b/src/code_8092334.c index 9049635..d12bc44 100644 --- a/src/code_8092334.c +++ b/src/code_8092334.c @@ -4,8 +4,8 @@ extern u32 gUnformattedTypeStrings[]; // unformatted type names extern u32 gFormattedTypeStrings[]; // formatted type names extern u8 gUnknown_810AC7C[]; extern u8 gUnknown_810AC6A[]; -extern u8 *gUnknown_810B4C8[]; -extern u8 *gUnknown_810B988[]; +extern u8 *gAbilityNames[]; +extern u8 *AbilityDescriptions[]; extern u32 gBoughtFriendAreas; extern u32 *gUnknown_203B468; @@ -31,12 +31,12 @@ u8 sub_8092364(u8 r0) void sub_8092374(char *r0, u8 r1) { - strncpy(r0, gUnknown_810B4C8[r1], 0x50); + strncpy(r0, gAbilityNames[r1], 0x50); } u8 *sub_8092390(u8 r0) { - return gUnknown_810B988[r0]; + return AbilityDescriptions[r0]; } void sub_80923A0(void) -- cgit v1.2.3 From df9385ed9e221a5a59b03b14e32988d8bd31fe3b Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 7 Nov 2020 17:29:46 -0600 Subject: continue my slow pace --- src/code_8092334.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'src/code_8092334.c') diff --git a/src/code_8092334.c b/src/code_8092334.c index d12bc44..f68e59b 100644 --- a/src/code_8092334.c +++ b/src/code_8092334.c @@ -6,8 +6,8 @@ extern u8 gUnknown_810AC7C[]; extern u8 gUnknown_810AC6A[]; extern u8 *gAbilityNames[]; extern u8 *AbilityDescriptions[]; -extern u32 gBoughtFriendAreas; -extern u32 *gUnknown_203B468; +extern u8 gBoughtFriendAreas[]; +extern u8 *gUnknown_203B468; u32 GetUnformattedTypeString(u8 type) { @@ -41,10 +41,19 @@ u8 *sub_8092390(u8 r0) void sub_80923A0(void) { - gUnknown_203B468 = &gBoughtFriendAreas; + gUnknown_203B468 = gBoughtFriendAreas; } -u32 *sub_80923B0(void) +u8 *sub_80923B0(void) { - return &gBoughtFriendAreas; + return gBoughtFriendAreas; +} + +void sub_80923B8(void) +{ + s32 counter; + for(counter = 0; counter <= 0x39; counter++) + { + gUnknown_203B468[counter] = 0; + } } -- cgit v1.2.3 From a1cd2ce87fd9281dbea59520b8f5160c1bdeae28 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Sat, 7 Nov 2020 19:01:11 -0600 Subject: some data dumping and doc # of friend areas --- src/code_8092334.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/code_8092334.c') diff --git a/src/code_8092334.c b/src/code_8092334.c index f68e59b..d5d17ee 100644 --- a/src/code_8092334.c +++ b/src/code_8092334.c @@ -1,14 +1,20 @@ #include "global.h" +#define NUM_FRIEND_AREAS 58 + extern u32 gUnformattedTypeStrings[]; // unformatted type names extern u32 gFormattedTypeStrings[]; // formatted type names + extern u8 gUnknown_810AC7C[]; extern u8 gUnknown_810AC6A[]; + extern u8 *gAbilityNames[]; extern u8 *AbilityDescriptions[]; -extern u8 gBoughtFriendAreas[]; + +extern u8 gBoughtFriendAreas[NUM_FRIEND_AREAS]; extern u8 *gUnknown_203B468; + u32 GetUnformattedTypeString(u8 type) { return gUnformattedTypeStrings[type]; @@ -52,7 +58,7 @@ u8 *sub_80923B0(void) void sub_80923B8(void) { s32 counter; - for(counter = 0; counter <= 0x39; counter++) + for(counter = 0; counter < NUM_FRIEND_AREAS; counter++) { gUnknown_203B468[counter] = 0; } -- cgit v1.2.3 From 9237db777e49204e8f09ec6607caefedb469da05 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 12 Nov 2020 18:26:02 -0600 Subject: 3% decompiled woo --- src/code_8092334.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/code_8092334.c') diff --git a/src/code_8092334.c b/src/code_8092334.c index d5d17ee..1fba58e 100644 --- a/src/code_8092334.c +++ b/src/code_8092334.c @@ -14,6 +14,7 @@ extern u8 *AbilityDescriptions[]; extern u8 gBoughtFriendAreas[NUM_FRIEND_AREAS]; extern u8 *gUnknown_203B468; +extern s16 gUnknown_810AA90[]; u32 GetUnformattedTypeString(u8 type) { @@ -63,3 +64,21 @@ void sub_80923B8(void) gUnknown_203B468[counter] = 0; } } + +u8 sub_80923D4(s32 target) +{ + s32 counter; + s32 index; + s32 sum = 0; + index = 0; + for(counter = 0; counter < NUM_FRIEND_AREAS; counter++) + { + sum += gUnknown_810AA90[index]; + if(sum > target) + { + return counter; + } + index += 4; + } + return 0; +} -- cgit v1.2.3