pret/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-10-07 01:17:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

more decomp work

Browse Source
This commit is contained in:
Seth Barberee
2023-06-09 15:39:22 -07:00
parent debc2723b3
commit ea36235ecd
11 changed files with 466 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_8023144.c
+194
View File
@@ -4,6 +4,7 @@
#include "memory.h"
#include "menu.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "team_inventory.h"
#include "text.h"
#include "input.h"
@@ -42,6 +43,10 @@ extern u16 gUnknown_203B29E;
extern struct UnkTextStruct2 gUnknown_80DC91C;
extern struct UnkTextStruct2 gUnknown_80DC904;
void sub_8023758(void);
void sub_80237E0(void);
extern bool8 sub_8098134(s32);
extern void sub_8023730(void);
extern u8 sub_8023704(u8);
extern void sub_8013818(void *, u32, u32, u32);
extern void sub_8013984(u8 *);
@@ -408,3 +413,192 @@ void sub_80233A0(void)
gUnknown_3001B5C = NULL;
}
}
NAKED
void sub_8023420(void)
{
asm_unified(
"\tpush {r4,r5,lr}\n"
"\tldr r4, _080234A8\n"
"\tldr r0, [r4]\n"
"\tmovs r1, 0xFE\n"
"\tlsls r1, 2\n"
"\tadds r0, r1\n"
"\tmovs r2, 0\n"
"\tmovs r1, 0x1\n"
"\tstrb r1, [r0]\n"
"\tldr r0, [r4]\n"
"\tldr r1, _080234AC\n"
"\tadds r0, r1\n"
"\tstrb r2, [r0]\n"
"\tldr r0, [r4]\n"
"\tadds r1, 0x1\n"
"\tadds r0, r1\n"
"\tmovs r1, 0xC\n"
"\tstrb r1, [r0]\n"
"\tldr r0, [r4]\n"
"\tldr r1, _080234B0\n"
"\tadds r0, r1\n"
"\tstrb r2, [r0]\n"
"\tldr r0, [r4]\n"
"\tldr r2, _080234B4\n"
"\tadds r0, r2\n"
"\tmovs r1, 0\n"
"\tldrsh r0, [r0, r1]\n"
"\tmovs r1, 0xC\n"
"\tbl sub_80095E4\n"
"\tadds r0, 0x2\n"
"\tldr r3, [r4]\n"
"\tmovs r2, 0xE4\n"
"\tlsls r2, 2\n"
"\tadds r5, r3, r2\n"
"\tldr r2, [r5]\n"
"\tlsls r1, r2, 1\n"
"\tadds r1, r2\n"
"\tlsls r1, 3\n"
"\tadds r1, r3, r1\n"
"\tldr r2, _080234B8\n"
"\tadds r1, r2\n"
"\tlsls r0, 16\n"
"\tlsrs r0, 16\n"
"\tstrh r0, [r1]\n"
"\tldr r2, [r5]\n"
"\tlsls r1, r2, 1\n"
"\tadds r1, r2\n"
"\tlsls r1, 3\n"
"\tadds r3, r1\n"
"\tmovs r1, 0xEA\n"
"\tlsls r1, 2\n"
"\tadds r3, r1\n"
"\tstrh r0, [r3]\n"
"\tbl ResetUnusedInputStruct\n"
"\tldr r0, [r4]\n"
"\tmovs r2, 0xE6\n"
"\tlsls r2, 2\n"
"\tadds r0, r2\n"
"\tmovs r1, 0x1\n"
"\tmovs r2, 0x1\n"
"\tbl sub_800641C\n"
"\tpop {r4,r5}\n"
"\tpop {r0}\n"
"\tbx r0\n"
"\t.align 2, 0\n"
"_080234A8: .4byte gUnknown_3001B5C\n"
"_080234AC: .4byte 0x000003f9\n"
"_080234B0: .4byte 0x000003fb\n"
"_080234B4: .4byte 0x00000376\n"
"_080234B8: .4byte 0x000003a6");
}
extern u8 gUnknown_80DC934[];
struct unkStruct_8092638
{
u32 unk0;
u8 unk4;
u32 unk5;
};
extern void sub_8092638(u8,struct unkStruct_8092638 *, u32, u32);
extern void xxx_call_draw_string(u32, u32, const u8 *, u32, u32);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
void sub_808D930(u8 *buffer, s32 index);
extern s32 sub_8013800(void *, u32);
bool8 HasRecruitedMon(s16 species_);
extern u8 gUnknown_80DC93C[];
void sprintfStatic(char *buffer, const char *text, ...);
void sub_80234BC(void)
{
u8 cVar2;
u32 y;
s32 uVar3;
s32 iVar4;
s32 species;
u32 color;
s32 index;
u8 buffer2 [256];
u8 buffer1 [100];
struct unkStruct_8092638 auStack_2c;
sub_8008C54(gUnknown_3001B5C->unk390);
sub_80073B8(gUnknown_3001B5C->unk390);
xxx_call_draw_string(10,0,gUnknown_80DC934,gUnknown_3001B5C->unk390,0); // Pokemon
sub_8012BC4(gUnknown_3001B5C->unk3F8[2] * 8 + 4,0,
gUnknown_3001B5C->unk37A + 1,2,7,gUnknown_3001B5C->unk390);
for(index = 0; index < gUnknown_3001B5C->unk376; index++)
{
y = sub_8013800(&gUnknown_3001B5C->unk35C,index);
species = gUnknown_3001B5C->unkC[(gUnknown_3001B5C->unk37A * gUnknown_3001B5C->unk378 + index)];
sub_8092638(GetFriendArea(species),&auStack_2c,0,0);
color = 7;
if (auStack_2c.unk4 != 0) {
color = HasRecruitedMon(species) ? 5 : 4;
}
iVar4 = GetDexInternalNo(species,0);
cVar2 = (iVar4 % 10) + 0x30;
sub_8012C60(0x14,y,cVar2,color,gUnknown_3001B5C->unk390);
if (9 < iVar4) {
iVar4 /= 10;
cVar2 = (iVar4 % 10) + 0x30;
sub_8012C60(0xd,y,cVar2,color,gUnknown_3001B5C->unk390);
if (9 < iVar4) {
uVar3 = iVar4 / 10;
cVar2 = (uVar3 % 10) + 0x30;
sub_8012C60(6,y,cVar2,color,gUnknown_3001B5C->unk390);
}
}
sub_808D930(buffer1,species);
sprintfStatic(buffer2,gUnknown_80DC93C,color,buffer1); // {COLOR_2}%c%s
xxx_call_draw_string(0x24,y,buffer2,gUnknown_3001B5C->unk390,0);
}
sub_80073E0(gUnknown_3001B5C->unk390);
}
u32 sub_80236A4(void)
{
s16 index_s32;
int index;
s32 temp;
gUnknown_3001B5C->unk8 = 0;
for(index = 0; index < 0x1a8; index++)
{
index_s32 = index;
if ((sub_8098134(index_s32)) &&
(index_s32 == GetBaseSpeciesNoUnown(index_s32))) {
temp = gUnknown_3001B5C->unk8;
gUnknown_3001B5C->unkC[gUnknown_3001B5C->unk8] = index;
gUnknown_3001B5C->unk8 = temp + 1;
}
}
sub_8023730();
return gUnknown_3001B5C->unk8;
}
bool8 sub_8023704(u8 unused)
{
s32 index;
for(index = 0; index < 0x1a8; index++)
{
if (sub_8098134((s16)index))
return FALSE;
}
return TRUE;
}
void sub_8023730(void)
{
switch(gUnknown_3001B5C->unk4)
{
case 1:
sub_8023758();
break;
case 2:
sub_80237E0();
break;
}
}
src/code_80972F4.c
+254 -2
View File
@@ -1,17 +1,44 @@
#include "global.h"
#include "constants/dungeon.h"
#include "pokemon.h"
#include "wonder_mail.h"
#include "code_80958E8.h"
#include "dungeon.h"
struct MissionText
{
u8 *text;
u8 unk4;
u8 unk5;
u8 unk6;
u8 unk7;
};
extern struct MissionText gStoryMissionText[];
extern const char gFinalScenarioText[];
extern const char gMeetNinetalesText[];
extern const char gAvoidCaptureText[];
extern const u8 gUnknown_8109CC0[];
extern const u8 gDummyScenarioText[];
extern u8 sub_80A270C();
extern void sub_8097FA8(u32);
extern void sub_8097FF8(void);
extern u8 sub_80A2728(s16);
extern bool8 sub_8001D08(u32, u32 ,s32);
extern u32 sub_8001784(u32, u32, u16);
extern void sub_800199C(u8, u8, u16, s32);
extern bool8 sub_80023E4(u32);
void SaveWonderMail(struct unkStruct_8094924 *a, struct WonderMail *b);
void RestoreWonderMail(struct unkStruct_8094924 *a, struct WonderMail *b);
extern s32 sub_8096EB0(struct WonderMail *);
extern void SaveDungeonLocation(struct unkStruct_8094924*, struct DungeonLocation*);
extern void RestoreDungeonLocation(struct unkStruct_8094924*, struct DungeonLocation*);
extern void sub_80015C0(u32, u32);
extern void sub_80015C0(u8, u8);
extern u32 sub_8001784(u32, u32, u16);
extern void GeneratePelipperJobs(void);
extern void sub_800199C(u32, s32, u32, s32);
s16 sub_80A26B8(s16);
extern void sub_80018D8(u8, u8, u32);
bool8 sub_8096F50(struct WonderMail *mail)
{
@@ -221,3 +248,228 @@ bool32 sub_8097384(s16 param_1)
}
return iVar1;
}
void sub_80973A8(s16 param_1,u32 param_2)
{
s32 sVar1;
s32 param_1_s32 = param_1;
u8 param_2_u32 = param_2;
if (param_1_s32 != 0xd) {
if (param_2_u32 != 0) {
sVar1 = sub_80A26B8(param_1);
sub_800199C(0,0x2b,param_1_s32,0);
if (sVar1 != -1) {
sub_80018D8(0,0x12,sVar1);
}
}
sub_800199C(0,0x2c,param_1_s32,param_2_u32);
}
}
s32 sub_80973F4(s32 param_1)
{
s32 iVar1;
s16 param_1_u16 = param_1;
if (param_1_u16 == 0xd) {
iVar1 = 0;
}
else {
s32 param_1_s32 = param_1_u16;
u16 param_1_temp = param_1_s32;
iVar1 = sub_8001784(0,0x2d,param_1_temp);
if (iVar1 != 0) {
iVar1 = 1;
}
}
return iVar1;
}
void sub_8097418(s16 index,u32 param_2)
{
int index_s32 = index;
u8 param_2_u8 = param_2;
if (index_s32 != 0xd) {
if ((param_2_u8 != 0) && (sub_800199C(0,0x2c,index_s32,0), index_s32 < 0x1f)) {
struct MissionText *mt = &gStoryMissionText[index_s32];
if (mt->unk4 != 0xFF) {
sub_8097FA8(mt->unk4);
}
if (mt->unk5 != 0xFF) {
sub_8097FA8(mt->unk5);
}
if (index_s32 == 9) {
sub_8097FA8(0x1f);
}
sub_8097FF8();
}
sub_800199C(0,0x2d,index_s32,param_2_u8);
}
}
const u8 *sub_809747C(s16 index)
{
if(index == 0xD)
{
return gDummyScenarioText;
}
else
{
return GetDungeonName1(sub_80A270C(index));
}
}
const u8 *sub_80974A0(s16 index)
{
if(index == 0xD)
{
return gDummyScenarioText;
}
else
{
return GetDungeonName1(sub_80A270C(index));
}
}
const u8 *GetCurrentMissionText(s16 index)
{
if(index < 0x1F)
{
struct MissionText *mt = &gStoryMissionText[index];
return mt->text;
}
else
{
return gUnknown_8109CC0;
}
}
void sub_80974E8(void)
{
sub_80015C0(0, 0x2E);
sub_80015C0(0, 0x2F);
}
void nullsub_208(void)
{
}
bool8 sub_8097504(s16 mazeIndex)
{
s32 mazeIndex_s32;
#ifndef NONMATCHING
register s32 mazeIndex_s32_1 asm("r1");
#else
s32 mazeIndex_s32_1;
#endif
s32 uVar3;
mazeIndex_s32 = mazeIndex;
mazeIndex_s32_1 = mazeIndex_s32;
if(mazeIndex_s32 < 17)
{
switch(mazeIndex_s32) {
case 2:
case 10:
case 11:
case 12:
uVar3 = 14;
break;
case 0:
case 1:
case 5:
case 7:
case 9:
case 14:
uVar3 = 15;
break;
case 3:
case 4:
case 6:
case 8:
return TRUE;
case 13:
uVar3 = 6;
break;
default:
return TRUE;
}
}
else
{
if (mazeIndex_s32_1 > 22) return FALSE;
if (mazeIndex_s32_1 == 22) return FALSE;
if (mazeIndex_s32_1 == 21) return FALSE;
uVar3 = 6;
}
if (!sub_80023E4(uVar3)) {
return FALSE;
}
else {
return TRUE;
}
}
// TODO: this should probably be bool8 but can't get a match just yet
bool32 IsMazeCompleted(s16 mazeIndex)
{
bool32 mazeCompletion;
mazeCompletion = sub_8001784(0, 0x2e, mazeIndex);
if (mazeCompletion) {
mazeCompletion = TRUE;
}
return mazeCompletion;
}
void sub_80975A8(s16 param_1,u8 param_2)
{
u16 param_1_u16 = param_1;
sub_800199C(0,0x2e,param_1_u16,param_2);
}
const u8 *sub_80975C4(s16 index)
{
return GetDungeonName1(sub_80A2728(index));
}
const char *sub_80975DC(u32 r0)
{
// TODO: slight hack but matches
r0 <<= 16;
if((0xffe90000 + r0) >> 16 < 2)
if(sub_8001D08(0x3, 0xE, -1))
return gMeetNinetalesText;
else
return gAvoidCaptureText;
else
return gFinalScenarioText;
}
bool8 HasCompletedAllMazes(void)
{
s32 index;
for(index = 0; index < NUM_BASIC_DUNGEON_MAZE; index++)
{
if(!(bool8)IsMazeCompleted(index))
return FALSE;
}
return TRUE;
}
bool8 sub_8097640(void)
{
if(sub_8001784(0, 0x2E, 0x1F) == 0 && HasCompletedAllMazes())
{
sub_800199C(0, 0x2E, 0x1F, 1);
return TRUE;
}
else
{
return FALSE;
}
}
src/code_809747C.c
-193
View File
@@ -1,193 +0,0 @@
#include "global.h"
#include "dungeon.h"
struct MissionText
{
u8 *text;
u8 unk4;
u8 unk5;
u8 unk6;
u8 unk7;
};
extern struct MissionText gStoryMissionText[];
extern const u8 gUnknown_8109CC0[];
extern const u8 gDummyScenarioText[];
extern const char gFinalScenarioText[];
extern const char gMeetNinetalesText[];
extern const char gAvoidCaptureText[];
extern u8 sub_80A270C();
extern void sub_80015C0(u8, u8);
extern u8 sub_80A2728(s16);
extern bool8 sub_8001D08(u32, u32 ,s32);
extern u32 sub_8001784(u32, u32, u16);
extern void sub_800199C(u32, u32, u32, u32);
extern bool8 sub_80023E4(u32);
const u8 *sub_809747C(s16 index)
{
if(index == 0xD)
{
return gDummyScenarioText;
}
else
{
return GetDungeonName1(sub_80A270C(index));
}
}
const u8 *sub_80974A0(s16 index)
{
if(index == 0xD)
{
return gDummyScenarioText;
}
else
{
return GetDungeonName1(sub_80A270C(index));
}
}
const u8 *GetCurrentMissionText(s16 index)
{
if(index < 0x1F)
{
struct MissionText *mt = &gStoryMissionText[index];
return mt->text;
}
else
{
return gUnknown_8109CC0;
}
}
void sub_80974E8(void)
{
sub_80015C0(0, 0x2E);
sub_80015C0(0, 0x2F);
}
void nullsub_208(void)
{
}
bool8 sub_8097504(s16 mazeIndex)
{
s32 mazeIndex_s32;
#ifndef NONMATCHING
register s32 mazeIndex_s32_1 asm("r1");
#else
s32 mazeIndex_s32_1;
#endif
s32 uVar3;
mazeIndex_s32 = mazeIndex;
mazeIndex_s32_1 = mazeIndex_s32;
if(mazeIndex_s32 < 17)
{
switch(mazeIndex_s32) {
case 2:
case 10:
case 11:
case 12:
uVar3 = 14;
break;
case 0:
case 1:
case 5:
case 7:
case 9:
case 14:
uVar3 = 15;
break;
case 3:
case 4:
case 6:
case 8:
return TRUE;
case 13:
uVar3 = 6;
break;
default:
return TRUE;
}
}
else
{
if (mazeIndex_s32_1 > 22) return FALSE;
if (mazeIndex_s32_1 == 22) return FALSE;
if (mazeIndex_s32_1 == 21) return FALSE;
uVar3 = 6;
}
if (!sub_80023E4(uVar3)) {
return FALSE;
}
else {
return TRUE;
}
}
// TODO: this should probably be bool8 but can't get a match just yet
bool32 IsMazeCompleted(s16 mazeIndex)
{
bool32 mazeCompletion;
mazeCompletion = sub_8001784(0, 0x2e, mazeIndex);
if (mazeCompletion) {
mazeCompletion = TRUE;
}
return mazeCompletion;
}
void sub_80975A8(s16 param_1,u8 param_2)
{
u16 param_1_u16 = param_1;
sub_800199C(0,0x2e,param_1_u16,param_2);
}
const u8 *sub_80975C4(s16 index)
{
return GetDungeonName1(sub_80A2728(index));
}
const char *sub_80975DC(u32 r0)
{
// TODO: slight hack but matches
r0 <<= 16;
if((0xffe90000 + r0) >> 16 < 2)
if(sub_8001D08(0x3, 0xE, -1))
return gMeetNinetalesText;
else
return gAvoidCaptureText;
else
return gFinalScenarioText;
}
bool8 HasCompletedAllMazes(void)
{
s32 index;
for(index = 0; index < 17; index++)
{
if(!(bool8)IsMazeCompleted(index))
return FALSE;
}
return TRUE;
}
bool8 sub_8097640(void)
{
if(sub_8001784(0, 0x2E, 0x1F) == 0 && HasCompletedAllMazes())
{
sub_800199C(0, 0x2E, 0x1F, 1);
return TRUE;
}
else
{
return FALSE;
}
}
src/pokemon_3.c
+1 -1
View File
@@ -192,7 +192,7 @@ s32 GetBaseSpecies(s16 index) {
return index;
}
s32 GetBaseSpeciesNoUnown(s16 index) {
s16 GetBaseSpeciesNoUnown(s16 index) {
register s32 a1_ asm("r2") = index;
if (index == MONSTER_CASTFORM_SNOWY) {
return MONSTER_CASTFORM;
src/pokemon_mid.c
+11 -8
View File
@@ -246,20 +246,21 @@ void CopyCyanMonsterNametoBuffer(u8 *buffer, s16 index)
sprintfStatic(buffer, gUnknown_8107608, gMonsterParameters[new_index].species); // {COLOR_2 CYAN}%s{END_COLOR_TEXT_2}
}
void sub_808D930(u8 *buffer, s16 index)
void sub_808D930(u8 *buffer, s32 index)
{
char *unownString;
s32 unownIndex;
const char *preload;
s16 index_s16 = index;
if (GetBaseSpecies(index) == MONSTER_UNOWN) {
if (GetBaseSpecies(index_s16) == MONSTER_UNOWN) {
preload = gUnknown_8107630; // %s%c
unownString = GetMonSpecies(MONSTER_UNOWN);
unownIndex = GetUnownIndex(index);
unownIndex = GetUnownIndex(index_s16);
sprintfStatic(buffer,preload,unownString,gUnownLetters[unownIndex]); // ABCDEFGHIJKLMNOPQRSTUVWXYZ!?
}
else {
sprintfStatic(buffer,gUnknown_8107638, gMonsterParameters[index].species); // %s
sprintfStatic(buffer,gUnknown_8107638, gMonsterParameters[index_s16].species); // %s
}
}
@@ -376,9 +377,10 @@ u32 GetSize(s16 index)
return gMonsterParameters[index].size;
}
u8 GetFriendArea(s16 index)
u8 GetFriendArea(s32 index)
{
return gMonsterParameters[index].friendArea;
s16 index_s32 = index;
return gMonsterParameters[index_s32].friendArea;
}
u16 GetBaseHP(s16 index)
@@ -422,9 +424,10 @@ u8 GetPokemonAbility(s16 index, u32 abilityIndex)
return gMonsterParameters[index].abilities[abilityIndex];
}
s16 GetDexInternalNo(s16 index, u32 r1)
s16 GetDexInternalNo(s32 index, u32 r1)
{
return gMonsterParameters[index].dexInternal[r1];
s16 index_s16 = index;
return gMonsterParameters[index_s16].dexInternal[r1];
}
s16 GetRecruitRate(s16 index)