Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-25 07:28:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

more documentation of vars and funcs

Browse Source
This commit is contained in:
Seth Barberee 2023-04-24 10:45:52 -07:00
parent df0f1b2298
commit 672c5071ed
36 changed files with 429 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/friend_area_action_menu.h
View File

@ -12,7 +12,7 @@ struct unkStruct_203B2BC
u32 id;
struct BulkItem itemToGive;
struct BulkItem item2;
struct PokemonStruct *unk18;
struct PokemonStruct *pokeStruct;
bool8 isTeamLeader;
u32 moveIndex; // some sort of move index
u16 moveID;

10
include/friend_rescue.h
View File

@ -25,7 +25,7 @@ struct WonderMailStruct_203B33C
struct MenuStruct unk21C[4];
struct UnkTextStruct2 unk35C[4];
struct UnkTextStruct2 unk3BC[4];
struct Item unk41C;
struct Item item;
u32 unk420; // Is this supposed to be a File like 203B2C4?
u8 unk424[0x100];
s32 unk524;
@ -44,5 +44,13 @@ u32 CreateFriendRescueMenu(void);
u32 UpdateFriendRescueMenu(void);
void CleanFriendRescueMenu(void);
enum FriendRescueMenuStates {
FRIEND_RESCUE_MENU_INIT,
FRIEND_RESCUE_MENU_MAIN,
FRIEND_RESCUE_MENU_EXIT,
FRIEND_RESCUE_MENU_ERROR = 8,
FRIEND_RESCUE_MENU_ERROR_2 = 0x6B,
FRIEND_RESCUE_MENU_DEFAULT_FALLBACK = 0x7e,
};
#endif

6
include/item.h
View File

@ -36,10 +36,10 @@ struct BulkItem {
u8 quantity;
};
struct unkStruct_80915F4
struct Gummi
{
s16 unk0;
u16 unk2;
s16 boostAmount;
u16 flags;
};
struct unkStruct_8090F58

2
include/makuhita_dojo.h
View File

@ -6,7 +6,7 @@ struct unkStruct_203B318
s32 state;
s32 fallbackState;
s16 unk10;
s32 unk14;
s32 menuAction;
struct MenuItem unk18[4];
u8 fill[0x58 - 0x38];
struct OpenedFile *faceFile;

6
include/wonder_mail_3.h
View File

@ -48,9 +48,9 @@ struct unkStruct_203B2F8
u8 fill59[0x64 - 0x59];
u8 *unk64;
u32 unk68;
u32 unk6C;
u32 unk70;
u32 unk74;
u32 menuAction1;
u32 menuAction2;
u32 menuAction3;
struct MenuStruct unk78;
struct MenuStruct unkC8;
struct MenuItem unk118[8];

20
src/code_801AFA4.c
View File

@ -242,7 +242,7 @@ void sub_801B2D8(void)
s32 GetNumMonsAbleToLearnItemMove(void)
{
s32 length;
s32 iVar4;
s32 numMons;
s32 index;
s32 team [MAX_TEAM_MEMBERS];
struct PokemonStruct *preload;
@ -255,9 +255,9 @@ s32 GetNumMonsAbleToLearnItemMove(void)
preload = &gRecruitedPokemonRef->pokemon[team[index]];
if (CanMonLearnMove(gUnknown_203B22C->moveID, preload->speciesNum)) {
gUnknown_203B22C->unk50[gUnknown_203B22C->monsAbleToLearnMove] = team[index];
iVar4 = gUnknown_203B22C->monsAbleToLearnMove;
if (iVar4 >= MAX_TEAM_MEMBERS) break;
gUnknown_203B22C->monsAbleToLearnMove = iVar4 + 1;
numMons = gUnknown_203B22C->monsAbleToLearnMove;
if (numMons >= MAX_TEAM_MEMBERS) break;
gUnknown_203B22C->monsAbleToLearnMove = numMons + 1;
}
}
return gUnknown_203B22C->monsAbleToLearnMove;
@ -267,16 +267,16 @@ s32 GetNumMonsAbleToLearnItemMove(void)
bool8 sub_801B374(u8 id)
{
u16 moveID;
struct PokemonStruct *puVar4;
s32 iVar5;
struct PokemonStruct *pokeStruct;
s32 index;
puVar4 = &gRecruitedPokemonRef->pokemon[0];
pokeStruct = &gRecruitedPokemonRef->pokemon[0];
moveID = GetItemMoveID(id);
for(iVar5 = 0; iVar5 < NUM_MONSTERS; iVar5++, puVar4++)
for(index = 0; index < NUM_MONSTERS; index++, pokeStruct++)
{
if((puVar4->unk0 >> 1 & 1) != 0)
if(CanMonLearnMove(moveID, puVar4->speciesNum))
if((pokeStruct->unk0 >> 1 & 1) != 0)
if(CanMonLearnMove(moveID, pokeStruct->speciesNum))
return FALSE;
}
return TRUE;

12
src/code_801B3C0.c
View File

@ -47,7 +47,7 @@ struct unkStruct_203B234
u32 unk24;
struct MenuStruct unk28;
struct MenuStruct unk78;
u32 unkC8;
u32 menuAction;
struct MenuItem unkCC[5];
struct UnkTextStruct2 unkF4[4];
};
@ -249,7 +249,7 @@ void sub_801B590(void)
u32 sub_801B60C(u32 r0, u8 id, u8 quantity)
{
gUnknown_203B234 = MemoryAlloc(sizeof(struct unkStruct_203B234), 8);
gUnknown_203B234->unkC8 = 0;
gUnknown_203B234->menuAction = 0;
gUnknown_203B234->unk0 = r0;
gUnknown_203B234->unk10.id = id;
if(IsThrowableItem(gUnknown_203B234->unk10.id))
@ -326,7 +326,7 @@ void sub_801B748(u32 newState)
void sub_801B760(void)
{
s32 iVar4;
s32 index;
switch(gUnknown_203B234->state)
{
case 1:
@ -339,9 +339,9 @@ void sub_801B760(void)
case 14:
case 15:
sub_8006518(gUnknown_203B234->unkF4);
for(iVar4 = 0; iVar4 < 4; iVar4++)
for(index = 0; index < 4; index++)
{
gUnknown_203B234->unkF4[iVar4] = gUnknown_80DBA58;
gUnknown_203B234->unkF4[index] = gUnknown_80DBA58;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B234->unkF4, 1, 1);
@ -471,7 +471,7 @@ void sub_801B874(void)
break;
case 10:
sub_801A9E0();
sub_8012D60(&gUnknown_203B234->unk28,gUnknown_203B234->unkCC,0,0,gUnknown_203B234->unkC8,2);
sub_8012D60(&gUnknown_203B234->unk28,gUnknown_203B234->unkCC,0,0,gUnknown_203B234->menuAction,2);
break;
case 0xb:
sub_801B3C0(&gUnknown_203B234->unk20);

16
src/code_801C620.c
View File

@ -22,7 +22,7 @@ struct unkStruct_203B234
u32 unk24;
struct MenuStruct unk28;
struct MenuStruct unk78;
u32 unkC8;
u32 menuAction;
struct MenuItem unkCC[5];
struct UnkTextStruct2 unkF4[4];
};
@ -40,7 +40,7 @@ struct unkStruct_203B238
u32 unk24;
u8 iqSkillIndex;
u32 numIQSkills;
s32 unk30;
s32 menuAction;
struct MenuItem unk34[8];
struct MenuStruct unk74;
struct UnkTextStruct2 unkC4[4];
@ -296,7 +296,7 @@ void sub_801BD80(void)
sub_801A6E8(0);
if (sub_8012FD8(&gUnknown_203B234->unk28) == '\0') {
sub_8013114(&gUnknown_203B234->unk28,&menuAction);
if (menuAction != 1) gUnknown_203B234->unkC8 = menuAction;
if (menuAction != 1) gUnknown_203B234->menuAction = menuAction;
}
switch(menuAction)
{
@ -381,7 +381,7 @@ bool8 sub_801BEEC(s16 species)
}
else {
gUnknown_203B238 = MemoryAlloc(sizeof(struct unkStruct_203B238),8);
gUnknown_203B238->unk30 = 0;
gUnknown_203B238->menuAction = 0;
gUnknown_203B238->species = species_s32;
gUnknown_203B238->pokeStruct = &gRecruitedPokemonRef->pokemon[species_s32];
gUnknown_203B238->numIQSkills = GetNumAvailableIQSkills(gUnknown_203B238->iqSkills,gUnknown_203B238->pokeStruct->IQ);
@ -459,7 +459,7 @@ void sub_801C03C(void)
case 2:
sub_801C4C8();
sub_801C0C8();
sub_8012D60(&gUnknown_203B238->unk74,gUnknown_203B238->unk34,0,0,gUnknown_203B238->unk30,2);
sub_8012D60(&gUnknown_203B238->unk74,gUnknown_203B238->unk34,0,0,gUnknown_203B238->menuAction,2);
break;
case 3:
sub_801C620(gUnknown_203B238->iqSkillIndex);
@ -491,10 +491,10 @@ void sub_801C0C8(void)
for(index = 0; index < max; index++)
{
if(gUnknown_203B238->unk34[index].menuAction == gUnknown_203B238->unk30)
if(gUnknown_203B238->unk34[index].menuAction == gUnknown_203B238->menuAction)
return;
}
gUnknown_203B238->unk30 = 2;
gUnknown_203B238->menuAction = 2;
}
void sub_801C118(void)
@ -527,7 +527,7 @@ void sub_801C1A0(void)
menuAction = 0;
sub_801C308(0);
if (!(sub_8012FD8(&gUnknown_203B238->unk74)) && (sub_8013114(&gUnknown_203B238->unk74,&menuAction), menuAction != 1)) {
gUnknown_203B238->unk30 = menuAction;
gUnknown_203B238->menuAction = menuAction;
}
switch(menuAction)

50
src/code_8023144.c
View File

@ -59,18 +59,18 @@ struct unkStruct_203B294
// size: 0x1A8
/* 0x0 */ u32 state;
/* 0x4 */ u32 fallbackState;
u8 unk8[NUM_IQ_SKILLS];
u8 unk20[NUM_IQ_SKILLS];
u32 unk38;
u32 unk3C;
u32 unk40;
struct unkStruct_80915F4 unk44;
u8 iqSkillPreGummi[NUM_IQ_SKILLS];
u8 iqSkillPostGummi[NUM_IQ_SKILLS];
u32 availIQSkillPreGummi;
u32 availIQSkillPostGummi;
u32 unk40; // Gummi eaten flag?
struct Gummi gummi;
/* 0x48 */ struct PokemonStruct *pokeStruct;
u32 unk4C;
struct Item unk50;
u32 itemIndex;
struct Item item;
struct MenuStruct unk54;
struct MenuStruct unkA4;
u32 unkF4;
u32 menuAction;
u32 unkF8;
u16 unkFC;
};
@ -85,12 +85,12 @@ extern u32 sub_801B00C(void);
extern void sub_801B048(void);
extern u32 sub_801B410(void);
extern void sub_801B450(void);
void GetGummiItemStatBoost(struct PokemonStruct* pokemon, u8 id, bool8 checkBoostFlags, struct Gummi* gummi);
extern u32 sub_801A6E8(u32);
extern void sub_8099690(u32);
extern void sub_801A928(void);
s32 GetNumAvailableIQSkills(u8 *iqSkillBuffer, s32 pokeIQ);
void GetGummiItemStatBoost(struct PokemonStruct* pokemon, u8 itemIndex, u8 a3, struct unkStruct_80915F4* a4);
extern u32 sub_801A8AC(void);
void sub_8022E78(void)
@ -98,13 +98,13 @@ void sub_8022E78(void)
switch(sub_801A6E8(1))
{
case 3:
gUnknown_203B294->unk4C = sub_801A8AC();
gUnknown_203B294->unk50 = gTeamInventory_203B460->teamItems[gUnknown_203B294->unk4C];
gUnknown_203B294->itemIndex = sub_801A8AC();
gUnknown_203B294->item = gTeamInventory_203B460->teamItems[gUnknown_203B294->itemIndex];
sub_8022924(2);
break;
case 4:
gUnknown_203B294->unk4C = sub_801A8AC();
gUnknown_203B294->unk50 = gTeamInventory_203B460->teamItems[gUnknown_203B294->unk4C];
gUnknown_203B294->itemIndex = sub_801A8AC();
gUnknown_203B294->item = gTeamInventory_203B460->teamItems[gUnknown_203B294->itemIndex];
sub_8099690(0);
sub_8022924(4);
break;
@ -117,13 +117,13 @@ void sub_8022E78(void)
void sub_8022EF4(void)
{
s32 menuAction;
s32 r5;
s32 boostAmount;
menuAction = 0;
sub_801A6E8(0);
if (sub_8012FD8(&gUnknown_203B294->unk54) == 0) {
sub_8013114(&gUnknown_203B294->unk54,&menuAction);
if(menuAction != 1) gUnknown_203B294->unkF4 = menuAction;
if(menuAction != 1) gUnknown_203B294->menuAction = menuAction;
}
switch(menuAction)
@ -135,21 +135,21 @@ void sub_8022EF4(void)
case 3:
break;
case 5:
gUnknown_203B294->unk38 = GetNumAvailableIQSkills(gUnknown_203B294->unk8, gUnknown_203B294->pokeStruct->IQ);
GetGummiItemStatBoost(gUnknown_203B294->pokeStruct, gUnknown_203B294->unk50.id, 0, &gUnknown_203B294->unk44);
gUnknown_203B294->unk3C = GetNumAvailableIQSkills(gUnknown_203B294->unk20, gUnknown_203B294->pokeStruct->IQ);
gUnknown_203B294->availIQSkillPreGummi = GetNumAvailableIQSkills(gUnknown_203B294->iqSkillPreGummi, gUnknown_203B294->pokeStruct->IQ);
GetGummiItemStatBoost(gUnknown_203B294->pokeStruct, gUnknown_203B294->item.id, FALSE, &gUnknown_203B294->gummi);
gUnknown_203B294->availIQSkillPostGummi = GetNumAvailableIQSkills(gUnknown_203B294->iqSkillPostGummi, gUnknown_203B294->pokeStruct->IQ);
gUnknown_203B294->unk40 = 1;
r5 = gUnknown_203B294->unk44.unk0;
boostAmount = gUnknown_203B294->gummi.boostAmount;
sub_8090E14(gUnknown_202DE58, &gTeamInventory_203B460->teamItems[gUnknown_203B294->unk4C], NULL);
sub_8090E14(gUnknown_202DE58, &gTeamInventory_203B460->teamItems[gUnknown_203B294->itemIndex], NULL);
if(r5 != -1)
ShiftItemsDownFrom(gUnknown_203B294->unk4C);
if(boostAmount != -1)
ShiftItemsDownFrom(gUnknown_203B294->itemIndex);
sub_8099690(0);
gUnknown_203B294->fallbackState = 0xA;
switch(r5 + 1)
switch(boostAmount + 1)
{
case 1:
sub_8022924(6);
@ -201,7 +201,7 @@ void sub_8023068(void)
sub_8022924(1);
break;
case 2:
ShiftItemsDownFrom(gUnknown_203B294->unk4C);
ShiftItemsDownFrom(gUnknown_203B294->itemIndex);
if (GetNumberOfFilledInventorySlots() == 0) {
sub_8099690(0);
sub_801A928();

44
src/code_805A120.c
View File

@ -853,22 +853,22 @@ bool8 SurfMoveAction(struct Entity *pokemon, struct Entity *target, struct Move
bool8 RolePlayMoveAction(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
{
struct EntityInfo * iVar3;
struct EntityInfo * iVar4;
struct EntityInfo * entityInfo;
struct EntityInfo * targetEntityInfo;
iVar3 = pokemon->info;
iVar4 = target->info;
entityInfo = pokemon->info;
targetEntityInfo = target->info;
if (HasAbility(target, ABILITY_WONDER_GUARD)) {
sub_80522F4(pokemon,target,*gUnknown_80FC854);
return FALSE;
}
else
{
iVar3->abilities[0] = iVar4->abilities[0];
iVar3->abilities[1] = iVar4->abilities[1];
entityInfo->abilities[0] = targetEntityInfo->abilities[0];
entityInfo->abilities[1] = targetEntityInfo->abilities[1];
gDungeon->unkC = 1;
if (iVar3->unkFB == 0) {
iVar3->unkFB = 1;
if (entityInfo->unkFB == 0) {
entityInfo->unkFB = 1;
}
sub_80522F4(pokemon,target,*gUnknown_80FC81C);
sub_806ABAC(pokemon, pokemon);
@ -1005,17 +1005,17 @@ bool8 TickleMoveAction(struct Entity *pokemon, struct Entity *target, struct Mov
bool8 sub_805A5E8(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 stat, u32 param_5)
{
struct EntityInfo *iVar2;
struct EntityInfo *entityInfo;
bool32 flag;
flag = FALSE;
if (sub_8055640(pokemon,target,move,0x100,param_5) != 0) {
flag = TRUE;
if (sub_805727C(pokemon,pokemon,gUnknown_80F4DD2) != 0) {
iVar2 = pokemon->info;
entityInfo = pokemon->info;
RaiseDefenseStageTarget(pokemon,pokemon,stat,1);
if (iVar2->unkFB == 0) {
iVar2->unkFB = 1;
if (entityInfo->unkFB == 0) {
entityInfo->unkFB = 1;
}
}
}
@ -1054,18 +1054,18 @@ bool8 sub_805A688(struct Entity *pokemon, struct Entity *target, struct Move *mo
bool8 KnockOffMoveAction(struct Entity *pokemon, struct Entity *target, struct Move *move, u32 param_4)
{
struct EntityInfo *iVar2;
struct EntityInfo *iVar6;
struct EntityInfo *iVar7;
struct EntityInfo *entityInfo;
struct EntityInfo *targetEntityInfo1;
struct EntityInfo *targetEntityInfo2;
struct Item heldItem;
struct Position pos;
struct Item *itemPtr;
u32 flag;
u32 itemFlag;
iVar2 = pokemon->info;
iVar6 = target->info;
iVar7 = iVar6;
entityInfo = pokemon->info;
targetEntityInfo1 = target->info;
targetEntityInfo2 = targetEntityInfo1;
SetMessageArgument(gAvailablePokemonNames, pokemon, 0);
SetMessageArgument(gAvailablePokemonNames + 0x50, target, 0);
if (HasAbility(target, ABILITY_STICKY_HOLD))
@ -1080,7 +1080,7 @@ bool8 KnockOffMoveAction(struct Entity *pokemon, struct Entity *target, struct M
}
else
{
heldItem = iVar6->heldItem;
heldItem = targetEntityInfo1->heldItem;
itemFlag = heldItem.flags;
flag = ITEM_FLAG_EXISTS;
flag &= itemFlag;
@ -1091,13 +1091,13 @@ bool8 KnockOffMoveAction(struct Entity *pokemon, struct Entity *target, struct M
}
else
{
itemPtr = &iVar7->heldItem;
itemPtr = &targetEntityInfo2->heldItem;
itemPtr->id = ITEM_NOTHING;
itemPtr->quantity = 0;
itemPtr->flags = 0;
sub_80522F4(pokemon,target,*gUnknown_80FD170); // $m1's item was swatted down!
pos.x = gAdjacentTileOffsets[iVar2->action.direction].x;
pos.y = gAdjacentTileOffsets[iVar2->action.direction].y;
pos.x = gAdjacentTileOffsets[entityInfo->action.direction].x;
pos.y = gAdjacentTileOffsets[entityInfo->action.direction].y;
sub_805A7D4(pokemon,target,&heldItem,&pos);
if (sub_80706A4(target, &target->pos) != 0)
{

36
src/code_806CD90.c
View File

@ -18,13 +18,13 @@ extern const u8 gDungeonWaterType[];
void sub_806CD90(void)
{
s32 iVar3;
struct Entity *iVar2;
for(iVar3 = 0; iVar3 < DUNGEON_MAX_POKEMON; iVar3++)
s32 index;
struct Entity *entity;
for(index = 0; index < DUNGEON_MAX_POKEMON; index++)
{
iVar2 = gDungeon->allPokemon[iVar3];
if(EntityExists(iVar2))
sub_806CCB4(iVar2, sub_806CEBC(iVar2));
entity = gDungeon->allPokemon[index];
if(EntityExists(entity))
sub_806CCB4(entity, sub_806CEBC(entity));
}
}
@ -96,22 +96,22 @@ void sub_806CE94(struct Entity *r0, u32 newDir)
u8 sub_806CEBC(struct Entity *param_1)
{
u8 sleep;
struct EntityInfo * iVar2;
struct EntityInfo * iVar3;
struct EntityInfo * entityInfo1;
struct EntityInfo * entityInfo2;
// NOTE: copy needed to match
iVar2 = param_1->info;
iVar3 = param_1->info;
sleep = iVar2->sleep;
entityInfo1 = param_1->info;
entityInfo2 = param_1->info;
sleep = entityInfo1->sleep;
if ((sleep == STATUS_SLEEP) || (sleep == STATUS_NAPPING) || (sleep == STATUS_NIGHTMARE)) {
if ((iVar3->apparentID != MONSTER_SUDOWOODO) || (iVar3->sleepTurns != 0x7f)) {
if ((entityInfo2->apparentID != MONSTER_SUDOWOODO) || (entityInfo2->sleepTurns != 0x7f)) {
return 5;
}
else
return 7;
}
else if (iVar3->chargingStatus == STATUS_BIDE) {
else if (entityInfo2->chargingStatus == STATUS_BIDE) {
return 0xB;
}
return 0x7;
@ -125,12 +125,12 @@ void sub_806CEFC(struct Entity *param_1, u32 newDir)
void sub_806CF18(struct Entity *param_1)
{
s32 iVar2;
s32 index;
struct EntityInfo *entityInfo;
if (EntityExists(param_1)) {
entityInfo = param_1->info;
for (iVar2 = 0; iVar2 < 100; iVar2++) {
for (index = 0; index < 100; index++) {
sub_803E46C(0x21);
if (!sub_808DA44(entityInfo->apparentID, param_1->unk6B)) {
break;
@ -147,11 +147,11 @@ u8 sub_806CF54(struct Entity *param_1)
void sub_806CF60(void)
{
struct Entity *uVar2;
s32 iVar3;
s32 index;
for(iVar3 = 0; iVar3 < DUNGEON_MAX_POKEMON; iVar3++)
for(index = 0; index < DUNGEON_MAX_POKEMON; index++)
{
uVar2 = gDungeon->allPokemon[iVar3];
uVar2 = gDungeon->allPokemon[index];
if (EntityExists(uVar2)) {
sub_806CF98(uVar2);
}

56
src/code_80869E4.c
View File

@ -148,13 +148,13 @@ void sub_8086434(struct Entity *entity)
void sub_8086448(void)
{
s32 iVar1;
s32 index;
u32 XPos;
u32 YPos;
sub_80855E4(sub_80862DC);
for(iVar1 = 0; iVar1 < 0x38; iVar1++)
for(index = 0; index < 0x38; index++)
{
XPos = GetCameraXPos();
YPos = GetCameraYPos();
@ -168,7 +168,7 @@ void sub_8086448(void)
void sub_8086494(void)
{
s32 iVar1;
s32 index;
sub_8085930(DIRECTION_NORTHEAST);
sub_803E708(4, 0x46);
@ -183,7 +183,7 @@ void sub_8086494(void)
sub_803E708(4, 0x46);
sub_80855E4(sub_80863C8);
for(iVar1 = 0; iVar1 < 0x90; iVar1++)
for(index = 0; index < 0x90; index++)
{
sub_80855E4(sub_8086424);
sub_803E46C(0x46);
@ -193,13 +193,13 @@ void sub_8086494(void)
void sub_8086500(void)
{
s32 iVar1;
s32 index;
u32 XPos;
u32 YPos;
sub_80855E4(sub_8086348);
for(iVar1 = 0; iVar1 < 0x48; iVar1++)
for(index = 0; index < 0x48; index++)
{
XPos = GetCameraXPos();
XPos += (0x80 << 1);
@ -213,13 +213,13 @@ void sub_8086500(void)
void sub_808654C(void)
{
s32 iVar1;
s32 index;
u32 XPos;
u32 YPos;
sub_80855E4(sub_8086384);
for(iVar1 = 0; iVar1 < 0x78; iVar1++)
for(index = 0; index < 0x78; index++)
{
XPos = GetCameraXPos();
XPos += (0x80 << 1);
@ -233,13 +233,13 @@ void sub_808654C(void)
void sub_8086598(void)
{
s32 iVar1;
s32 index;
u32 XPos;
u32 YPos;
sub_80855E4(sub_80863B8);
for(iVar1 = 0; iVar1 < 0x18; iVar1++)
for(index = 0; index < 0x18; index++)
{
XPos = GetCameraXPos();
YPos = GetCameraYPos();
@ -252,13 +252,13 @@ void sub_8086598(void)
void sub_80865E8(void)
{
s32 iVar1;
s32 index;
u32 XPos;
u32 YPos;
sub_80855E4(sub_80863E8);
for(iVar1 = 0; iVar1 < 0xC; iVar1++)
for(index = 0; index < 0xC; index++)
{
XPos = GetCameraXPos();
YPos = GetCameraYPos();
@ -272,13 +272,13 @@ void sub_80865E8(void)
void sub_808663C(void)
{
s32 iVar1;
s32 index;
u32 XPos;
u32 YPos;
sub_80855E4(sub_80863E8);
for(iVar1 = 0; iVar1 < 0x10; iVar1++)
for(index = 0; index < 0x10; index++)
{
XPos = GetCameraXPos();
YPos = GetCameraYPos();
@ -293,11 +293,11 @@ void sub_808663C(void)
void sub_8086690(void)
{
s32 iVar1;
s32 index;
sub_80855E4(sub_80863D8);
for(iVar1 = 0; iVar1 < 0x30; iVar1++)
for(index = 0; index < 0x30; index++)
{
sub_80855E4(sub_8086434);
sub_803E46C(0x46);
@ -319,11 +319,11 @@ void sub_80866C4(u32 entity)
void sub_80866FC(void)
{
s32 iVar1;
s32 index;
for(iVar1 = 0; iVar1 >= -0xFA; iVar1 -= 0xA)
for(index = 0; index >= -0xFA; index -= 0xA)
{
SetDungeonBGColorRGB(iVar1, iVar1, iVar1, 1, 0);
SetDungeonBGColorRGB(index, index, index, 1, 0);
sub_803E46C(0x46);
}
}
@ -335,22 +335,22 @@ void sub_808627C(void)
void sub_8086738(void)
{
s32 iVar1;
s32 index;
for(iVar1 = 0; iVar1 < 0xFA; iVar1 += 0xA)
for(index = 0; index < 0xFA; index += 0xA)
{
SetDungeonBGColorRGB(iVar1, iVar1, iVar1, 1, 0);
SetDungeonBGColorRGB(index, index, index, 1, 0);
sub_803E46C(0x46);
}
}
void sub_8086764(void)
{
s32 iVar1;
s32 index;
for(iVar1 = 0xFA; iVar1 >= 0; iVar1 -= 5)
for(index = 0xFA; index >= 0; index -= 5)
{
SetDungeonBGColorRGB(iVar1, iVar1, iVar1, 1, 0);
SetDungeonBGColorRGB(index, index, index, 1, 0);
sub_803E46C(0x46);
}
sub_8085EB0();
@ -358,16 +358,16 @@ void sub_8086764(void)
void sub_8086794(void)
{
s32 iVar1;
s32 index;
gUnknown_202EDC8 = 0;
for(iVar1 = 0; iVar1 < 0xC8; iVar1++)
for(index = 0; index < 0xC8; index++)
{
SetDungeonBGColorRGB(0, 0, 0, 1, 0);
sub_803E9D0();
sub_803E46C(0x46);
if((iVar1 & 3) == 0)
if((index & 3) == 0)
{
gUnknown_202EDC8++;
if(gUnknown_202EDC8 == 0x1F)

6
src/debug_menu.c
View File

@ -67,14 +67,14 @@ extern void sub_808CFD0(u8 *, s32, u8 *, u32, u32 *, u16 *);
void CreateDebugMenu(void)
{
int iVar2;
int index;
if (gUnknown_203B3EC == NULL) {
gUnknown_203B3EC = MemoryAlloc(sizeof(struct DebugMenu), 8);
MemoryFill8((u8 *)gUnknown_203B3EC, 0, sizeof(struct DebugMenu));
}
for(iVar2 = 0; iVar2 < 4; iVar2++){
gUnknown_203B3EC->unk140[iVar2] = gUnknown_80E7D40;
for(index = 0; index < 4; index++){
gUnknown_203B3EC->unk140[index] = gUnknown_80E7D40;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B3EC->unk140, 1, 1);

6
src/debug_menu_2.c
View File

@ -89,7 +89,7 @@ void sub_803ACD0(u32 newState)
void sub_803ACE8(void)
{
s32 iVar2;
s32 index;
sub_8006518(gUnknown_203B3F8->unkE0);
switch(gUnknown_203B3F8->state)
{
@ -102,9 +102,9 @@ void sub_803ACE8(void)
gUnknown_203B3F8->unkE0[3] = gUnknown_80E7F04;
break;
default:
for(iVar2 = 0; iVar2 < 4; iVar2++)
for(index = 0; index < 4; index++)
{
gUnknown_203B3F8->unkE0[iVar2] = gUnknown_80E7ED4;
gUnknown_203B3F8->unkE0[index] = gUnknown_80E7ED4;
}
break;
}

50
src/debug_menu_mid.c
View File

@ -36,7 +36,7 @@ struct unkStruct_203B3F4
u32 state;
u8 friendArea;
u8 fill5[0x8 - 5];
u32 unk8;
u32 menuAction;
struct MenuItem menuItems[8];
struct MenuStruct unk4C;
struct UnkTextStruct2 unk9C[4];
@ -227,7 +227,7 @@ void sub_803A690(void)
void sub_803A6F0(void)
{
s32 temp1;
s32 menuAction;
struct unkStruct_203B3F0 *preload;
gUnknown_203B3F0->menuItems[0].text = &gDebug_NumberText;
@ -239,11 +239,11 @@ void sub_803A6F0(void)
}
preload = gUnknown_203B3F0;
// this var gets loaded in between the sets... very dumb
temp1 = 1;
menuAction = 1;
preload->menuItems[1].text = *gUnknown_80D4970;
preload->menuItems[1].menuAction = 3;
preload->menuItems[2].text = NULL;
preload->menuItems[2].menuAction = temp1;
preload->menuItems[2].menuAction = menuAction;
}
void sub_803A740(void)
@ -269,14 +269,14 @@ void sub_803A740(void)
void sub_803A7B0(void)
{
s32 local_c;
s32 menuAction;
local_c = 0;
menuAction = 0;
sub_801CA08(0);
if (sub_8012FD8(&gUnknown_203B3F0->unk4C) == '\0') {
sub_8013114(&gUnknown_203B3F0->unk4C,&local_c);
sub_8013114(&gUnknown_203B3F0->unk4C,&menuAction);
}
switch(local_c)
switch(menuAction)
{
case 2:
sub_803A504(3);
@ -372,7 +372,7 @@ void sub_803A924(u32 newState)
void sub_803A93C(void)
{
s32 iVar4;
s32 index;
sub_8006518(gUnknown_203B3F4->unk9C);
if(gUnknown_203B3F4->state == 2)
{
@ -380,9 +380,9 @@ void sub_803A93C(void)
}
else
{
for(iVar4 = 0; iVar4 < 4; iVar4++)
for(index = 0; index < 4; index++)
{
gUnknown_203B3F4->unk9C[iVar4] = gUnknown_80E7E8C;
gUnknown_203B3F4->unk9C[index] = gUnknown_80E7E8C;
}
}
ResetUnusedInputStruct();
@ -401,7 +401,7 @@ void sub_803A9AC(void)
case 2:
sub_8021494();
sub_803AA34();
sub_8012D60(&gUnknown_203B3F4->unk4C,gUnknown_203B3F4->menuItems,0,0,gUnknown_203B3F4->unk8,2);
sub_8012D60(&gUnknown_203B3F4->unk4C,gUnknown_203B3F4->menuItems,0,0,gUnknown_203B3F4->menuAction,2);
break;
case 3:
sub_8021774(gUnknown_203B3F4->friendArea,1,0);
@ -413,11 +413,11 @@ void sub_803A9AC(void)
void sub_803AA34(void)
{
s32 iVar4;
s32 index;
u8 *FriendAreas;
iVar4 = 0;
index = 0;
// So dumb that it matches...
FriendAreas = gFriendAreas;
@ -436,15 +436,15 @@ void sub_803AA34(void)
gUnknown_203B3F4->menuItems[0].menuAction = 2;
}
iVar4++;
gUnknown_203B3F4->menuItems[iVar4].text = *gUnknown_80D4970;
gUnknown_203B3F4->menuItems[iVar4].menuAction = 4;
index++;
gUnknown_203B3F4->menuItems[index].text = *gUnknown_80D4970;
gUnknown_203B3F4->menuItems[index].menuAction = 4;
iVar4++;
gUnknown_203B3F4->menuItems[iVar4].text = NULL;
gUnknown_203B3F4->menuItems[iVar4].menuAction = 1;
index++;
gUnknown_203B3F4->menuItems[index].text = NULL;
gUnknown_203B3F4->menuItems[index].menuAction = 1;
gUnknown_203B3F4->unk8 = gUnknown_203B3F4->menuItems[0].menuAction;
gUnknown_203B3F4->menuAction = gUnknown_203B3F4->menuItems[0].menuAction;
}
void sub_803AAC4(void)
@ -471,12 +471,12 @@ void sub_803AAC4(void)
void sub_803AB34(void)
{
s32 temp;
temp = 0;
s32 menuAction;
menuAction = 0;
sub_8021274(0);
if(!sub_8012FD8(&gUnknown_203B3F4->unk4C))
sub_8013114(&gUnknown_203B3F4->unk4C, &temp);
switch(temp)
sub_8013114(&gUnknown_203B3F4->unk4C, &menuAction);
switch(menuAction)
{
case 2:
UnlockFriendArea(gUnknown_203B3F4->friendArea);

6
src/dungeon_ai_items.c
View File

@ -43,12 +43,12 @@ extern struct TeamInventory *gTeamInventory_203B460;
void sub_807360C(struct Entity *pokemon)
{
s32 iVar2;
s32 index;
struct Entity *entity;
for(iVar2 = 0; iVar2 < DUNGEON_MAX_POKEMON; iVar2++)
for(index = 0; index < DUNGEON_MAX_POKEMON; index++)
{
entity = gDungeon->allPokemon[iVar2];
entity = gDungeon->allPokemon[index];
if(EntityExists(entity))
{
if(entity->info->unk152 != 0)

6
src/dungeon_range.c
View File

@ -49,7 +49,7 @@ bool8 IsPositionActuallyInSight(struct Position *pos1, struct Position *pos2)
bool8 IsPositionInSight(struct Position *pos1, struct Position *pos2)
{
struct Tile *iVar2;
struct Tile *tile;
u8 pos1Room;
s32 xDiff;
s32 yDiff;
@ -58,8 +58,8 @@ bool8 IsPositionInSight(struct Position *pos1, struct Position *pos2)
s32 y1;
s32 y2;
iVar2 = GetTile(pos1->x,pos1->y);
pos1Room = iVar2->room;
tile = GetTile(pos1->x,pos1->y);
pos1Room = tile->room;
if (pos1Room != CORRIDOR_ROOM) {
struct RoomData *pos1RoomData = &gDungeon->roomData[pos1Room];
if (pos1RoomData->bottomRightCornerX - 1 > pos2->x || pos1RoomData->bottomRightCornerY - 1 > pos2->y ||

6
src/felicity_bank.c
View File

@ -106,7 +106,7 @@ void UpdateFelicityBankState(u32 newState)
void sub_801645C(void)
{
s32 uVar3;
s32 index;
sub_8006518(gUnknown_203B204->unkA8);
switch(gUnknown_203B204->currState)
@ -129,9 +129,9 @@ void sub_801645C(void)
sub_800641C(gUnknown_203B204->unkA8, 1, 0);
break;
default:
for(uVar3 = 0; uVar3 < 4; uVar3++)
for(index = 0; index < 4; index++)
{
gUnknown_203B204->unkA8[uVar3] = gUnknown_80DB6DC;
gUnknown_203B204->unkA8[index] = gUnknown_80DB6DC;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B204->unkA8, 1, 1);

2
src/friend_area_action_menu.c
View File

@ -270,7 +270,7 @@ void sub_8027274(void)
sub_801B3C0(&slot);
break;
case 0xe:
unk_CopyMoves4To8(gUnknown_203B2BC->moves,gUnknown_203B2BC->unk18->moves);
unk_CopyMoves4To8(gUnknown_203B2BC->moves,gUnknown_203B2BC->pokeStruct->moves);
sub_801EE10(3,gUnknown_203B2BC->targetPoke,gUnknown_203B2BC->moves,0,0,0);
break;
case 0xf:

20
src/friend_area_action_menu_1.c
View File

@ -79,7 +79,7 @@ void sub_80277FC(void)
case 3:
gUnknown_203B2BC->targetPoke = sub_8023B44();
pokeStruct = &gRecruitedPokemonRef->pokemon[gUnknown_203B2BC->targetPoke];
gUnknown_203B2BC->unk18 = pokeStruct;
gUnknown_203B2BC->pokeStruct = pokeStruct;
gUnknown_203B2BC->isTeamLeader = pokeStruct->isTeamLeader;
PeekPokemonItem(gUnknown_203B2BC->targetPoke,&gUnknown_203B2BC->item2);
SetFriendAreaActionMenuState(3);
@ -87,7 +87,7 @@ void sub_80277FC(void)
case 4:
gUnknown_203B2BC->targetPoke = sub_8023B44();
pokeStruct = &gRecruitedPokemonRef->pokemon[gUnknown_203B2BC->targetPoke];
gUnknown_203B2BC->unk18 = pokeStruct;
gUnknown_203B2BC->pokeStruct = pokeStruct;
gUnknown_203B2BC->isTeamLeader = pokeStruct->isTeamLeader;
PeekPokemonItem(gUnknown_203B2BC->targetPoke,&gUnknown_203B2BC->item2);
SetFriendAreaActionMenuState(4);
@ -129,7 +129,7 @@ void sub_80278B4(void)
SetFriendAreaActionMenuState(2);
break;
case 7:
gUnknown_203B2BC->unk18->unk0 &= 0xfffd;
gUnknown_203B2BC->pokeStruct->unk0 &= 0xfffd;
nullsub_104();
sub_808ED00();
SetFriendAreaActionMenuState(2);
@ -209,7 +209,7 @@ void sub_8027A5C(void)
}
static inline bool8 sub_8027A78_sub(void) {
if (gUnknown_203B2BC->unk18->dungeonLocation.id == 0x44 || gUnknown_203B2BC->unk18->dungeonLocation.id == 0x45)
if (gUnknown_203B2BC->pokeStruct->dungeonLocation.id == 0x44 || gUnknown_203B2BC->pokeStruct->dungeonLocation.id == 0x45)
return TRUE;
else
return FALSE;
@ -217,10 +217,10 @@ static inline bool8 sub_8027A78_sub(void) {
void sub_8027A78(void)
{
s32 temp;
if(sub_80144A4(&temp) == 0)
s32 menuAction;
if(sub_80144A4(&menuAction) == 0)
{
switch(temp)
switch(menuAction)
{
case 1:
case 3:
@ -232,7 +232,7 @@ void sub_8027A78(void)
else
{
sub_8027EB8();
sub_808D31C(gUnknown_203B2BC->unk18);
sub_808D31C(gUnknown_203B2BC->pokeStruct);
}
break;
}
@ -252,7 +252,7 @@ void sub_8027AE4(void)
break;
case 2:
sub_8027EB8();
sub_808D31C(gUnknown_203B2BC->unk18);
sub_808D31C(gUnknown_203B2BC->pokeStruct);
break;
}
}
@ -471,7 +471,7 @@ bool8 sub_8027E4C(struct PokemonStruct *pokeStruct)
void sub_8027EB8(void)
{
switch(sub_8027E18(gUnknown_203B2BC->unk18))
switch(sub_8027E18(gUnknown_203B2BC->pokeStruct))
{
case 1:
PlaySound(0x14d);

16
src/friend_list_menu.c
View File

@ -25,8 +25,8 @@ struct unkStruct_203B2B8
/* 0x24 */ u16 moveID;
struct Move moves[8];
u16 moveIDs[4]; // some list of move IDs
u32 unk70;
u32 unk74;
u32 menuAction1;
u32 menuAction2;
u32 unk78;
struct MenuStruct unk7C;
struct MenuStruct unkCC;
@ -87,12 +87,12 @@ void sub_80268CC(void)
{
struct PokemonStruct *playerPokemon;
struct PokemonStruct *pokeStruct;
struct PokemonStruct *iVar4;
struct PokemonStruct *pokeStruct2;
s32 choice;
choice = 0;
if ((sub_8012FD8(&gUnknown_203B2B8->unk7C) == 0) && (sub_8013114(&gUnknown_203B2B8->unk7C,&choice), choice != 1)) {
gUnknown_203B2B8->unk70 = choice;
gUnknown_203B2B8->menuAction1 = choice;
}
switch(choice) {
case 6:
@ -120,12 +120,12 @@ void sub_80268CC(void)
sub_8026074(6);
break;
case 8:
iVar4 = &gRecruitedPokemonRef->pokemon[gUnknown_203B2B8->pokeSpecies];
pokeStruct2 = &gRecruitedPokemonRef->pokemon[gUnknown_203B2B8->pokeSpecies];
playerPokemon = GetPlayerPokemonStruct();
if (!iVar4->isTeamLeader) {
if (!pokeStruct2->isTeamLeader) {
playerPokemon->isTeamLeader = FALSE;
iVar4->isTeamLeader = TRUE;
pokeStruct2->isTeamLeader = TRUE;
nullsub_104();
}
sub_808ED00();
@ -299,7 +299,7 @@ void sub_8026C14(void)
menuAction = 0;
sub_801A6E8(0);
if ((sub_8012FD8(&gUnknown_203B2B8->unkCC) == '\0') && (sub_8013114(&gUnknown_203B2B8->unkCC,&menuAction), menuAction != 1)) {
gUnknown_203B2B8->unk74 = menuAction;
gUnknown_203B2B8->menuAction2 = menuAction;
}
switch(menuAction)
{

18
src/friend_list_menu_1.c
View File

@ -22,15 +22,15 @@ struct unkStruct_203B2B4
u8 unkD;
s16 species;
u32 unk10;
struct BulkItem unk14;
struct BulkItem unk18;
struct BulkItem item1;
struct BulkItem item2;
/* 0x1C */ struct PokemonStruct *pokeStruct;
u32 moveIndex; // some sort of move index
u16 moveID;
struct Move moves[8];
u16 moveIDs[4]; // some list of move IDs
u32 unk70;
s32 unk74;
u32 menuAction1;
s32 menuAction2;
struct MenuStruct unk78;
struct MenuItem unkC8[4];
u8 fillE8[0x108 - 0xE8];
@ -98,7 +98,7 @@ bool8 sub_80252F0(s32 param_1)
}
else {
gUnknown_203B2B4 = MemoryAlloc(sizeof(struct unkStruct_203B2B4),8);
gUnknown_203B2B4->unk70 = 0;
gUnknown_203B2B4->menuAction1 = 0;
gUnknown_203B2B4->unk0 = param_1;
gUnknown_203B2B4->unkC = sub_8002658(sub_80A5728());
gUnknown_203B2B4->unkD = 0;
@ -234,12 +234,12 @@ void sub_8025518(void)
break;
case 3:
if (gUnknown_203B2B4->unk0 == 0) {
sub_8025E68(3,&gUnknown_203B2B4->unk18);
sub_8025E68(3,&gUnknown_203B2B4->item2);
}
sub_8023DA4();
PrintColoredPokeNameToBuffer(gAvailablePokemonNames,gUnknown_203B2B4->pokeStruct,7);
PrintColoredPokeNameToBuffer(gAvailablePokemonNames + 0x50,gUnknown_203B2B4->pokeStruct,6);
sub_8012D60(&gUnknown_203B2B4->unk78,gUnknown_203B2B4->unkC8,0,gUnknown_203B2B4->unk108,gUnknown_203B2B4->unk70,2);
sub_8012D60(&gUnknown_203B2B4->unk78,gUnknown_203B2B4->unkC8,0,gUnknown_203B2B4->unk108,gUnknown_203B2B4->menuAction1,2);
break;
case 4:
sub_8024458(gUnknown_203B2B4->species,2);
@ -255,10 +255,10 @@ void sub_8025518(void)
break;
case 0xd:
sub_801A9E0();
sub_8012D60(&gUnknown_203B2B4->unk78,gUnknown_203B2B4->unkC8,0,gUnknown_203B2B4->unk108,gUnknown_203B2B4->unk74,2);
sub_8012D60(&gUnknown_203B2B4->unk78,gUnknown_203B2B4->unkC8,0,gUnknown_203B2B4->unk108,gUnknown_203B2B4->menuAction2,2);
break;
case 0xe:
HeldItemToSlot(&item, &gUnknown_203B2B4->unk14);
HeldItemToSlot(&item, &gUnknown_203B2B4->item1);
sub_801B3C0(&item);
break;
case 8:

68
src/friend_rescue.c
View File

@ -19,7 +19,7 @@ extern struct WonderMailStruct_203B33C *gUnknown_203B33C;
extern u8 sub_8039880(void);
extern void sub_8035300(void);
extern void sub_8035404(u32);
extern void QueueNextFriendRescueState(u32);
extern void nullsub_41(void);
extern void nullsub_42(void);
extern void nullsub_43(void);
@ -128,10 +128,10 @@ u32 CreateFriendRescueMenu(void)
for(counter = 0; counter < 0x36; counter++){
gUnknown_203B33C->passwordBuffer[counter] = 0;
}
gUnknown_203B33C->fallbackState = 0x7E;
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
gUnknown_203B33C->unk52C = sub_8039880();
gUnknown_203B33C->unk52D = gUnknown_203B33C->unk52C;
SetFriendRescueMenuState(0);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_INIT);
return 1;
}
@ -143,19 +143,19 @@ u32 UpdateFriendRescueMenu(void)
sub_8035300();
break;
case 0x79:
sub_8035404(0x78);
QueueNextFriendRescueState(0x78);
break;
case 0x7A:
sub_8035374();
break;
case 0x7B:
sub_8035404(0x7a);
QueueNextFriendRescueState(0x7a);
break;
case 0x7C:
sub_80353BC();
break;
case 0x7D:
sub_8035404(0x7c);
QueueNextFriendRescueState(0x7c);
break;
case 3:
case 4:
@ -177,13 +177,13 @@ u32 UpdateFriendRescueMenu(void)
sub_8034804();
break;
case 0x2D:
sub_8035404(0x2e);
QueueNextFriendRescueState(0x2e);
break;
case 0x2E:
sub_80344C0();
break;
case 0x2A:
sub_8035404(0xd);
QueueNextFriendRescueState(0xd);
break;
case 0x2C:
sub_8034478();
@ -192,7 +192,7 @@ u32 UpdateFriendRescueMenu(void)
sub_80344A0();
break;
case 0x25:
sub_8035404(0x26);
QueueNextFriendRescueState(0x26);
break;
case 0x26:
sub_803418C();
@ -210,13 +210,13 @@ u32 UpdateFriendRescueMenu(void)
sub_80343C4();
break;
case 0x23:
sub_8035404(0x21);
QueueNextFriendRescueState(0x21);
break;
case 0x21:
sub_8034404();
break;
case 0x31:
sub_8035404(0x32);
QueueNextFriendRescueState(0x32);
break;
case 0x32:
sub_8034500();
@ -246,7 +246,7 @@ u32 UpdateFriendRescueMenu(void)
sub_8033FB4();
break;
case 0x1C:
sub_8035404(0x1d);
QueueNextFriendRescueState(0x1d);
break;
case 0x1E:
sub_8034074();
@ -258,7 +258,7 @@ u32 UpdateFriendRescueMenu(void)
sub_8033FE4();
break;
case 0x11:
sub_8035404(0x12);
QueueNextFriendRescueState(0x12);
break;
case 0x12:
nullsub_42();
@ -280,7 +280,7 @@ u32 UpdateFriendRescueMenu(void)
break;
case 0x19:
case 0x43:
sub_8035404(0x1a);
QueueNextFriendRescueState(0x1a);
break;
case 0x1A:
sub_8033DBC();
@ -297,7 +297,7 @@ u32 UpdateFriendRescueMenu(void)
case 7:
sub_8033CAC();
break;
case 8:
case FRIEND_RESCUE_MENU_ERROR:
sub_8033D48();
break;
case 9:
@ -308,31 +308,31 @@ u32 UpdateFriendRescueMenu(void)
break;
case 0xB:
case 0xC:
sub_8035404(6);
QueueNextFriendRescueState(6);
break;
case 0xD:
sub_8035404(7);
QueueNextFriendRescueState(7);
break;
case 0xE:
sub_8033B8C();
break;
case 0:
case 1:
case FRIEND_RESCUE_MENU_INIT:
case FRIEND_RESCUE_MENU_MAIN:
sub_80339C8();
break;
case 2:
case FRIEND_RESCUE_MENU_EXIT:
return 3;
case 0x6A:
sub_80348C4();
break;
case 0x6B:
case FRIEND_RESCUE_MENU_ERROR_2:
sub_803482C();
break;
case 0x5A:
sub_80349B0();
break;
case 0x5B:
sub_8035404(0x5c);
QueueNextFriendRescueState(0x5c);
break;
case 0x5D:
sub_8034A70();
@ -356,7 +356,7 @@ u32 UpdateFriendRescueMenu(void)
sub_8034D54();
break;
case 0x66:
sub_8035404(0x67);
QueueNextFriendRescueState(0x67);
break;
case 0x67:
sub_8034970();
@ -365,7 +365,7 @@ u32 UpdateFriendRescueMenu(void)
sub_80351E0();
break;
case 0x72:
sub_8035404(0x73);
QueueNextFriendRescueState(0x73);
break;
case 0x73:
sub_8034D74();
@ -378,13 +378,13 @@ u32 UpdateFriendRescueMenu(void)
break;
case 0x50:
case 0x6D:
sub_8035404(0x6e);
QueueNextFriendRescueState(0x6e);
break;
case 0x6E:
sub_80352A4();
break;
case 0x62:
sub_8035404(0x6a);
QueueNextFriendRescueState(0x6a);
break;
case 0x65:
sub_8034EC8();
@ -394,7 +394,7 @@ u32 UpdateFriendRescueMenu(void)
break;
case 0x63:
case 0x6F:
sub_8035404(0x62);
QueueNextFriendRescueState(0x62);
break;
case 0x69:
sub_8034F58();
@ -415,10 +415,10 @@ u32 UpdateFriendRescueMenu(void)
case 0x59:
case 0x6C:
case 0x77:
sub_8035404(2);
QueueNextFriendRescueState(FRIEND_RESCUE_MENU_EXIT);
break;
case 0x57:
sub_8035404(0x5f);
QueueNextFriendRescueState(0x5f);
break;
case 0x56:
sub_8035094();
@ -427,7 +427,7 @@ u32 UpdateFriendRescueMenu(void)
sub_80350F4();
break;
case 0x53:
sub_8035404(0x54);
QueueNextFriendRescueState(0x54);
break;
case 0x54:
sub_803517C();
@ -436,7 +436,7 @@ u32 UpdateFriendRescueMenu(void)
sub_8035210();
break;
case 0x46:
sub_8035404(0x47);
QueueNextFriendRescueState(0x47);
break;
case 0x47:
nullsub_46();
@ -458,7 +458,7 @@ u32 UpdateFriendRescueMenu(void)
break;
case 0x4D:
case 0x4E:
sub_8035404(0x4f);
QueueNextFriendRescueState(0x4f);
break;
case 0x4F:
sub_8034848();
@ -470,10 +470,10 @@ u32 UpdateFriendRescueMenu(void)
case 0x3C:
case 0x44:
case 0x45:
sub_8035404(1);
QueueNextFriendRescueState(FRIEND_RESCUE_MENU_MAIN);
break;
case 0x51:
sub_8035404(1);
QueueNextFriendRescueState(FRIEND_RESCUE_MENU_MAIN);
break;
case 0x36:
break;

146
src/friend_rescue_1.c
View File

@ -256,7 +256,7 @@ extern struct WonderMailStruct_203B33C *gUnknown_203B33C;
extern u8 sub_8039880(void);
extern void sub_8035300(void);
extern void sub_8035404(u32);
extern void QueueNextFriendRescueState(u32);
extern void nullsub_41(void);
extern void nullsub_42(void);
extern void nullsub_43(void);
@ -425,7 +425,7 @@ void sub_80339C8(void)
SetFriendRescueMenuState(0x78);
break;
case 0x8:
SetFriendRescueMenuState(2);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_EXIT);
break;
}
}
@ -485,7 +485,7 @@ void sub_8033A2C(void)
SetFriendRescueMenuState(0x52);
break;
case 8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
}
}
@ -536,7 +536,7 @@ void sub_8033B8C(void)
}
break;
case 8:
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
}
}
@ -570,7 +570,7 @@ void sub_8033C54(void)
}
break;
case 8:
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
}
}
@ -615,7 +615,7 @@ void sub_8033CAC(void)
else
{
PrintFriendRescueError(gUnknown_203B33C->status);
SetFriendRescueMenuState(8);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR);
}
}
}
@ -625,7 +625,7 @@ void sub_8033D48(void)
s32 temp;
if(sub_80144A4(&temp) == 0)
{
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
}
}
@ -700,11 +700,11 @@ void sub_8033DBC(void)
break;
case PASSWORD_ENTRY_NOT_SOS_MAIL:
sub_80141B4(gUnknown_80E48E8, 0, 0, 0x101);
SetFriendRescueMenuState(8);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR);
break;
case PASSWORD_ENTRY_DUPLICATE_SOS_MAIL:
sub_80141B4(gUnknown_80E460C, 0, 0, 0x101);
SetFriendRescueMenuState(8);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR);
break;
case PASSWORD_ENTRY_SOS_MAIL_SUCCESS:
sub_8095274(mail.unk10.unk10);
@ -715,11 +715,11 @@ void sub_8033DBC(void)
break;
case PASSWORD_ENTRY_NOT_AOK_MAIL:
sub_80141B4(gUnknown_80E4964, 0, 0, 0x101);
SetFriendRescueMenuState(8);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR);
break;
case PASSWORD_ENTRY_DUPLICATE_AOK_MAIL:
sub_80141B4(gUnknown_80E499C, 0, 0, 0x101);
SetFriendRescueMenuState(8);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR);
break;
case PASSWORD_ENTRY_AOK_MAIL_SUCCESS:
mail.mailType = 5;
@ -739,7 +739,7 @@ void sub_8033DBC(void)
sub_80155F0();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
break;
@ -765,7 +765,7 @@ void sub_8033F64(void)
}
break;
case 8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
break;
@ -785,7 +785,7 @@ void sub_8033FB4(void)
break;
case 7:
case 8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
break;
@ -799,7 +799,7 @@ void sub_8033FE4(void)
{
case 2:
sub_803084C();
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
case 3:
gUnknown_203B33C->unk218 = sub_80307EC();
@ -832,7 +832,7 @@ void sub_8034074(void)
SetFriendRescueMenuState(0x20);
break;
case 10:
gUnknown_203B33C->fallbackState = 0x7E;
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
@ -858,7 +858,7 @@ void sub_8034130(void)
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_803092C();
if(gUnknown_203B33C->fallbackState == 0x7E)
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
SetFriendRescueMenuState(0x1E);
@ -877,7 +877,7 @@ void sub_803418C(void)
{
case 2:
sub_8023C60();
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
sub_8035D1C();
gUnknown_203B33C->speciesNum = -1;
break;
@ -915,7 +915,7 @@ void sub_8034254(void)
SetFriendRescueMenuState(0x29);
break;
case 10:
gUnknown_203B33C->fallbackState = 0x7E;
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
@ -944,7 +944,7 @@ void sub_8034310(void)
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_8023B7C(1);
if(gUnknown_203B33C->fallbackState == 0x7E)
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
SetFriendRescueMenuState(0x27);
@ -971,7 +971,7 @@ void sub_8034378(void)
SetFriendRescueMenuState(0x5);
break;
case 8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
break;
@ -993,7 +993,7 @@ void sub_80343C4(void)
SetFriendRescueMenuState(0x25);
break;
case 8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
break;
@ -1021,7 +1021,7 @@ void sub_8034404(void)
SetFriendRescueMenuState(0x5);
break;
case 0x8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
break;
@ -1037,7 +1037,7 @@ void sub_8034478(void)
if(!WriteSavePak())
{
FinishWriteSavePak();
SetFriendRescueMenuState(0x2);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_EXIT);
}
}
}
@ -1077,7 +1077,7 @@ void sub_8034500(void)
{
case 2:
sub_803084C();
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
case 3:
gUnknown_203B33C->unk218 = sub_80307EC();
@ -1110,7 +1110,7 @@ void sub_8034590(void)
SetFriendRescueMenuState(0x35);
break;
case 10:
gUnknown_203B33C->fallbackState = 0x7E;
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
@ -1136,7 +1136,7 @@ void sub_803464C(void)
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_803092C();
if(gUnknown_203B33C->fallbackState == 0x7E)
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
SetFriendRescueMenuState(0x33);
@ -1161,7 +1161,7 @@ void sub_80346A8(void)
break;
case 7:
case 8:
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
}
}
@ -1175,7 +1175,7 @@ void sub_80346D8(void)
if(!WriteSavePak())
{
FinishWriteSavePak();
SetFriendRescueMenuState(0x2);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_EXIT);
}
}
}
@ -1230,7 +1230,7 @@ void sub_803477C(void)
break;
case 7:
case 8:
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
}
}
@ -1282,7 +1282,7 @@ void sub_803482C(void)
s32 temp;
if(sub_80144A4(&temp) == 0)
{
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
}
}
@ -1292,10 +1292,10 @@ void sub_8034848(void)
s32 temp;
if(sub_80144A4(&temp) == 0)
{
MemoryFill8((u8 *)&gUnknown_203B33C->unk41C, 0 , sizeof(struct Item));
gUnknown_203B33C->unk41C.id = ITEM_NOTHING;
gUnknown_203B33C->unk41C.quantity = 1;
gUnknown_203B33C->unk41C.flags = 0;
MemoryFill8((u8 *)&gUnknown_203B33C->item, 0 , sizeof(struct Item));
gUnknown_203B33C->item.id = ITEM_NOTHING;
gUnknown_203B33C->item.quantity = 1;
gUnknown_203B33C->item.flags = 0;
if(gUnknown_203B33C->status == COMMS_GOOD)
{
@ -1312,7 +1312,7 @@ void sub_8034848(void)
else
{
PrintFriendRescueError(gUnknown_203B33C->status);
SetFriendRescueMenuState(0x6B);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR_2);
}
}
}
@ -1322,10 +1322,10 @@ void sub_80348C4(void)
s32 temp;
if(sub_80144A4(&temp) == 0)
{
MemoryFill8((u8 *)&gUnknown_203B33C->unk41C, 0 , sizeof(struct Item));
gUnknown_203B33C->unk41C.id = ITEM_NOTHING;
gUnknown_203B33C->unk41C.quantity = 1;
gUnknown_203B33C->unk41C.flags = 0;
MemoryFill8((u8 *)&gUnknown_203B33C->item, 0 , sizeof(struct Item));
gUnknown_203B33C->item.id = ITEM_NOTHING;
gUnknown_203B33C->item.quantity = 1;
gUnknown_203B33C->item.flags = 0;
if(gUnknown_203B33C->status == COMMS_GOOD)
{
@ -1354,7 +1354,7 @@ void sub_80348C4(void)
else
{
PrintFriendRescueError(gUnknown_203B33C->status);
SetFriendRescueMenuState(0x6B);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR_2);
}
}
}
@ -1390,7 +1390,7 @@ void sub_80349B0(void)
break;
case 7:
case 8:
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
}
}
@ -1402,7 +1402,7 @@ void sub_80349E0(void)
{
case 2:
sub_803084C();
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
case 3:
gUnknown_203B33C->unk218 = sub_80307EC();
@ -1435,7 +1435,7 @@ void sub_8034A70(void)
SetFriendRescueMenuState(0x5A);
break;
case 10:
gUnknown_203B33C->fallbackState = 0x7E;
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
@ -1461,7 +1461,7 @@ void sub_8034B2C(void)
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_803092C();
if(gUnknown_203B33C->fallbackState == 0x7E)
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
SetFriendRescueMenuState(0x5D);
@ -1476,26 +1476,26 @@ void sub_8034B2C(void)
void sub_8034B88(void)
{
gUnknown_203B33C->unk41C.id = ITEM_NOTHING;
gUnknown_203B33C->unk41C.quantity = 1;
gUnknown_203B33C->unk41C.flags = 0;
gUnknown_203B33C->item.id = ITEM_NOTHING;
gUnknown_203B33C->item.quantity = 1;
gUnknown_203B33C->item.flags = 0;
switch(sub_801CA08(1))
{
case 2:
sub_801CBB8();
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
case 3:
gUnknown_203B33C->unk41C.id = sub_801CB24();
gUnknown_203B33C->item.id = sub_801CB24();
SetFriendRescueMenuState(0x60);
break;
case 4:
gUnknown_203B33C->fallbackState = 0x5F;
gUnknown_203B33C->unk41C.id = sub_801CB24();
gUnknown_203B33C->item.id = sub_801CB24();
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_801B3C0(&gUnknown_203B33C->unk41C);
sub_801B3C0(&gUnknown_203B33C->item);
SetFriendRescueMenuState(0x61);
break;
}
@ -1511,7 +1511,7 @@ void sub_8034C38(void)
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
sub_801CB5C(1);
if(gUnknown_203B33C->fallbackState == 0x7E)
if(gUnknown_203B33C->fallbackState == FRIEND_RESCUE_MENU_DEFAULT_FALLBACK)
{
sub_8035CF4(gUnknown_203B33C->unk21C, 3, 1);
SetFriendRescueMenuState(0x60);
@ -1540,11 +1540,11 @@ void sub_8034C98(void)
SetFriendRescueMenuState(0x58);
break;
case 10:
gUnknown_203B33C->fallbackState = 0x7E;
gUnknown_203B33C->fallbackState = FRIEND_RESCUE_MENU_DEFAULT_FALLBACK;
sub_8006518(gUnknown_203B33C->unk3BC);
ResetUnusedInputStruct();
sub_800641C(0, 1, 1);
sub_801B3C0(&gUnknown_203B33C->unk41C);
sub_801B3C0(&gUnknown_203B33C->item);
SetFriendRescueMenuState(0x61);
break;
case 5:
@ -1585,11 +1585,11 @@ void sub_8034D74(void)
break;
case PASSWORD_ENTRY_NOT_THANK_YOU_MAIL:
sub_80141B4(gUnknown_80E49C4, 0, 0, 0x101);
SetFriendRescueMenuState(0x6B);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR_2);
break;
case PASSWORD_ENTRY_DUPLICATE_THANK_YOU_MAIL:
sub_80141B4(gUnknown_80E4704, 0, 0, 0x101);
SetFriendRescueMenuState(0x6B);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_ERROR_2);
break;
case PASSWORD_ENTRY_THANK_YOU_MAIL_SUCCESS:
mail2 = sub_8095228(GetMailIndex(4, mail.unk10.unk10));
@ -1608,7 +1608,7 @@ void sub_8034D74(void)
sub_80155F0();
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B33C->unk3BC, 1, 1);
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
break;
@ -1623,7 +1623,7 @@ void sub_8034EC8(void)
if(!WriteSavePak())
{
FinishWriteSavePak();
SetFriendRescueMenuState(2);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_EXIT);
}
}
}
@ -1636,7 +1636,7 @@ void sub_8034EF0(void)
if(!WriteSavePak())
{
FinishWriteSavePak();
SetFriendRescueMenuState(2);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_EXIT);
}
}
}
@ -1675,7 +1675,7 @@ void sub_8034F58(void)
SetFriendRescueMenuState(0x62);
break;
case 8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
}
}
@ -1692,16 +1692,16 @@ void sub_8034F88(void)
{
case 6:
mail = sub_8095228(gUnknown_203B33C->unk218);
if(gUnknown_203B33C->unk41C.id != ITEM_NOTHING)
mail->unk20 = gUnknown_203B33C->unk41C;
gTeamInventory_203B460->teamStorage[gUnknown_203B33C->unk41C.id]--;
if(gUnknown_203B33C->item.id != ITEM_NOTHING)
mail->unk20 = gUnknown_203B33C->item;
gTeamInventory_203B460->teamStorage[gUnknown_203B33C->item.id]--;
SetFriendRescueMenuState(0x75);
break;
case 7:
SetFriendRescueMenuState(0x57);
break;
case 8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
}
}
@ -1773,7 +1773,7 @@ void sub_8035094(void)
}
break;
case 8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
break;
@ -1814,7 +1814,7 @@ void sub_80350F4(void)
}
break;
case 8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
break;
@ -1849,7 +1849,7 @@ void sub_803517C(void)
}
break;
case 8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
break;
@ -1869,7 +1869,7 @@ void sub_80351E0(void)
SetFriendRescueMenuState(0x72);
break;
case 8:
SetFriendRescueMenuState(0x1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
default:
break;
@ -1905,7 +1905,7 @@ void sub_8035210(void)
SetFriendRescueMenuState(0x72);
break;
case 8:
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
case 0xE:
default:
@ -1954,7 +1954,7 @@ void sub_8035300(void)
switch(menuAction)
{
case 0x19:
SetFriendRescueMenuState(1);
SetFriendRescueMenuState(FRIEND_RESCUE_MENU_MAIN);
break;
case 0x1B:
SetFriendRescueMenuState(0x7A);
@ -2011,12 +2011,12 @@ void sub_80353BC(void)
}
}
void sub_8035404(u32 param_1)
void QueueNextFriendRescueState(u32 nextState)
{
s32 iVar1;
if(sub_80144A4(&iVar1) == 0){
SetFriendRescueMenuState(param_1);
SetFriendRescueMenuState(nextState);
}
}

6
src/gulpin_shop.c
View File

@ -105,7 +105,7 @@ void UpdateGulpinShopState(u32 newState)
void sub_801E980(void)
{
s32 iVar2;
s32 index;
sub_8006518(gUnknown_203B26C->unk12C);
switch(gUnknown_203B26C->state)
@ -117,9 +117,9 @@ void sub_801E980(void)
sub_8012CAC(&gUnknown_203B26C->unk12C[2], gUnknown_203B26C->unk28);
break;
default:
for(iVar2 = 0; iVar2 < 4; iVar2++)
for(index = 0; index < 4; index++)
{
gUnknown_203B26C->unk12C[iVar2] = gUnknown_80DC11C;
gUnknown_203B26C->unk12C[index] = gUnknown_80DC11C;
}
break;
}

32
src/items.c
View File

@ -821,13 +821,13 @@ u32 GetMoneyValueHeld(struct BulkItem* slot)
return gUnknown_810A3F0[slot->quantity];
}
void GetGummiItemStatBoost(struct PokemonStruct* pokemon, u8 id, u8 a3, struct unkStruct_80915F4* a4)
void GetGummiItemStatBoost(struct PokemonStruct* pokemon, u8 id, bool8 checkBoostFlags, struct Gummi* gummi)
{
// item stat buff?
s8 result;
a4->unk0 = (u16)-1;
a4->unk2 = 0;
gummi->boostAmount = (u16)-1;
gummi->flags = 0;
result = IsGummiItem(id);
if (result) {
u8 pokemon_type_0 = GetPokemonType(pokemon->speciesNum, 0);
@ -861,8 +861,8 @@ void GetGummiItemStatBoost(struct PokemonStruct* pokemon, u8 id, u8 a3, struct u
}
}
}
a4->unk0 = boost_amount;
if (!a3) {
gummi->boostAmount = boost_amount;
if (!checkBoostFlags) {
u16 boost_flags;
if (!boost_amount && RandInt(16) == 10) {
// supa gummi (all stats boost)
@ -874,41 +874,41 @@ void GetGummiItemStatBoost(struct PokemonStruct* pokemon, u8 id, u8 a3, struct u
boost_flags = table[random_index];
}
a4->unk2 = boost_flags;
boost_flags = a4->unk2;
if (a4->unk2 & 1) {
gummi->flags = boost_flags;
boost_flags = gummi->flags;
if (gummi->flags & 1) {
if (pokemon->offense.att[OFFENSE_NRM] < 255) {
pokemon->offense.att[OFFENSE_NRM]++;
}
else {
// fix operand order
u16 unk2 = a4->unk2;
u16 unk2 = gummi->flags;
unk2 &= ~1;
a4->unk2 &= unk2;
gummi->flags &= unk2;
}
}
if (a4->unk2 & 2) {
if (gummi->flags & 2) {
if (pokemon->offense.att[OFFENSE_SP] < 255) {
pokemon->offense.att[OFFENSE_SP]++;
}
else {
a4->unk2 &= ~2;
gummi->flags &= ~2;
}
}
if (a4->unk2 & 4) {
if (gummi->flags & 4) {
if (pokemon->offense.def[OFFENSE_NRM] < 255) {
pokemon->offense.def[OFFENSE_NRM]++;
}
else {
a4->unk2 &= ~4;
gummi->flags &= ~4;
}
}
if (a4->unk2 & 8) {
if (gummi->flags & 8) {
if (pokemon->offense.def[OFFENSE_SP] < 255) {
pokemon->offense.def[OFFENSE_SP] ++;
}
else {
a4->unk2 &= ~8;
gummi->flags &= ~8;
}
}
}

48
src/luminous_cave.c
View File

@ -28,9 +28,9 @@ struct unkStruct_203B2B0
struct Item chosenItem;
u32 state;
u32 fallbackState;
u32 unk28;
u32 unk2C;
u32 unk30;
u32 menuAction1;
u32 menuAction2;
u32 menuAction3;
struct MenuItem unk34[8];
u16 unk74[0x8];
struct MenuStruct unk84;
@ -172,9 +172,9 @@ u32 sub_802465C(void)
ResetUnusedInputStruct();
sub_800641C(0,1,1);
gUnknown_203B2B0 = MemoryAlloc(sizeof(struct unkStruct_203B2B0),8);
gUnknown_203B2B0->unk28 = 0;
gUnknown_203B2B0->unk2C = 0;
gUnknown_203B2B0->unk30 = 0;
gUnknown_203B2B0->menuAction1 = 0;
gUnknown_203B2B0->menuAction2 = 0;
gUnknown_203B2B0->menuAction3 = 0;
gUnknown_203B2B0->pokeStruct = GetPlayerPokemonStruct();
gUnknown_203B2B0->pokeRenamed = IsPokemonRenamed(gUnknown_203B2B0->pokeStruct);
gUnknown_203B2B0->evolutionComplete = FALSE;
@ -296,17 +296,17 @@ void UpdateLuminousCaveDialogue(void)
switch(gUnknown_203B2B0->state) {
case LUMINOUS_CAVE_ENTRY:
if (LuminousCave_HasOnly1Member()) {
gUnknown_203B2B0->unk28 = 3;
gUnknown_203B2B0->menuAction1 = 3;
}
else {
gUnknown_203B2B0->unk28 = 1;
gUnknown_203B2B0->menuAction1 = 1;
}
sub_8024CFC();
sub_8014248(gLuminousCaveSeekAwakening,0,gUnknown_203B2B0->unk28,gUnknown_203B2B0->unk34,gUnknown_203B2B0->unk74,4,0,0,5);
sub_8014248(gLuminousCaveSeekAwakening,0,gUnknown_203B2B0->menuAction1,gUnknown_203B2B0->unk34,gUnknown_203B2B0->unk74,4,0,0,5);
break;
case LUMINOUS_CAVE_ASK_EVOLVE:
sub_8024CFC();
sub_8014248(gLuminousCaveAskEvolution,0,gUnknown_203B2B0->unk28,gUnknown_203B2B0->unk34,gUnknown_203B2B0->unk74,4,0,0,5);
sub_8014248(gLuminousCaveAskEvolution,0,gUnknown_203B2B0->menuAction1,gUnknown_203B2B0->unk34,gUnknown_203B2B0->unk74,4,0,0,5);
break;
case LUMINOUS_CAVE_EVOLVE_INFO:
gUnknown_203B2B0->fallbackState = LUMINOUS_CAVE_ASK_EVOLVE;
@ -320,7 +320,7 @@ void UpdateLuminousCaveDialogue(void)
case LUMINOUS_CAVE_GIVE_ITEM_1:
sub_8024D48();
sub_8014248(gLuminousCaveGiveItem,0,gUnknown_203B2B0->unk2C,gUnknown_203B2B0->unk34,gUnknown_203B2B0->unk74,4,0,0,5);
sub_8014248(gLuminousCaveGiveItem,0,gUnknown_203B2B0->menuAction2,gUnknown_203B2B0->unk34,gUnknown_203B2B0->unk74,4,0,0,5);
break;
case 6:
sub_801A5D8(2,3,0,10);
@ -330,7 +330,7 @@ void UpdateLuminousCaveDialogue(void)
break;
case LUMINOUS_CAVE_GIVE_ITEM_2:
sub_8024DBC();
sub_8014248(gLuminousCaveGiveAnotherItem,0,gUnknown_203B2B0->unk2C,gUnknown_203B2B0->unk34,gUnknown_203B2B0->unk74,4,0,0,5);
sub_8014248(gLuminousCaveGiveAnotherItem,0,gUnknown_203B2B0->menuAction2,gUnknown_203B2B0->unk34,gUnknown_203B2B0->unk74,4,0,0,5);
break;
case 0xb:
sub_801A5D8(2,3,0,10);
@ -347,7 +347,7 @@ void UpdateLuminousCaveDialogue(void)
sub_801A9E0();
sub_8024E30();
sub_8012D60(&gUnknown_203B2B0->unk84,gUnknown_203B2B0->unk34,0,gUnknown_203B2B0->unk74,
gUnknown_203B2B0->unk30,2);
gUnknown_203B2B0->menuAction3,2);
break;
case 9:
case 0xe:
@ -510,12 +510,12 @@ void sub_8024D48(void)
{
if(gUnknown_203B2B0->unk74[index] == 0)
{
if(gUnknown_203B2B0->unk34[index].menuAction == gUnknown_203B2B0->unk2C)
if(gUnknown_203B2B0->unk34[index].menuAction == gUnknown_203B2B0->menuAction2)
return;
}
}
gUnknown_203B2B0->unk2C = 4;
gUnknown_203B2B0->menuAction2 = 4;
}
void sub_8024DBC(void)
@ -546,12 +546,12 @@ void sub_8024DBC(void)
{
if(gUnknown_203B2B0->unk74[index] == 0)
{
if(gUnknown_203B2B0->unk34[index].menuAction == gUnknown_203B2B0->unk2C)
if(gUnknown_203B2B0->unk34[index].menuAction == gUnknown_203B2B0->menuAction2)
return;
}
}
gUnknown_203B2B0->unk2C = 4;
gUnknown_203B2B0->menuAction2 = 4;
}
void sub_8024E30(void)
@ -580,12 +580,12 @@ void sub_8024E30(void)
{
if(gUnknown_203B2B0->unk74[index] == 0)
{
if(gUnknown_203B2B0->unk34[index].menuAction == gUnknown_203B2B0->unk30)
if(gUnknown_203B2B0->unk34[index].menuAction == gUnknown_203B2B0->menuAction3)
return;
}
}
gUnknown_203B2B0->unk30 = 5;
gUnknown_203B2B0->menuAction3 = 5;
}
void sub_8024E9C(void)
@ -593,7 +593,7 @@ void sub_8024E9C(void)
s32 menuAction;
if(sub_80144A4(&menuAction) == 0)
{
if(menuAction != 1) gUnknown_203B2B0->unk28 = menuAction;
if(menuAction != 1) gUnknown_203B2B0->menuAction1 = menuAction;
switch(menuAction)
{
case 3:
@ -617,7 +617,7 @@ void sub_8024F00(void)
s32 menuAction;
if(sub_80144A4(&menuAction) == 0)
{
if(menuAction != 1) gUnknown_203B2B0->unk2C = menuAction;
if(menuAction != 1) gUnknown_203B2B0->menuAction2 = menuAction;
switch(menuAction)
{
case 4:
@ -643,7 +643,7 @@ void sub_8024F70(void)
s32 menuAction;
if(sub_80144A4(&menuAction) == 0)
{
if(menuAction != 1) gUnknown_203B2B0->unk2C = menuAction;
if(menuAction != 1) gUnknown_203B2B0->menuAction2 = menuAction;
switch(menuAction)
{
case 4:
@ -719,7 +719,7 @@ void sub_80250EC(void)
if(!sub_8012FD8(&gUnknown_203B2B0->unk84))
{
sub_8013114(&gUnknown_203B2B0->unk84, &menuAction);
if(menuAction != 1) gUnknown_203B2B0->unk30 = menuAction;
if(menuAction != 1) gUnknown_203B2B0->menuAction3 = menuAction;
}
switch(menuAction)
{
@ -746,7 +746,7 @@ void sub_802515C(void)
if(!sub_8012FD8(&gUnknown_203B2B0->unk84))
{
sub_8013114(&gUnknown_203B2B0->unk84, &menuAction);
if(menuAction != 1) gUnknown_203B2B0->unk30 = menuAction;
if(menuAction != 1) gUnknown_203B2B0->menuAction3 = menuAction;
}
switch(menuAction)
{

10
src/makuhita_dojo.c
View File

@ -33,7 +33,7 @@ const u8 gMakuhitaDojoGoTrain[] = "Go Train";
extern void sub_8030208();
extern void sub_8030258();
extern void sub_80302A8();
extern void sub_80302C4();
extern void GotoMakuhitaFallbackState();
extern void UpdateMakuhitaDialogue();
void UpdateMakuhitaState(s32);
@ -124,7 +124,7 @@ u32 sub_802FE58(void)
case 13:
return 3;
default:
sub_80302C4();
GotoMakuhitaFallbackState();
break;
}
return 0;
@ -154,16 +154,16 @@ void UpdateMakuhitaState(s32 newState)
void sub_802FF1C(void)
{
s32 iVar3;
s32 index;
sub_8006518(gUnknown_203B318->unk6C);
switch(gUnknown_203B318->state)
{
case 0:
case 4:
case 13:
for(iVar3 = 0; iVar3 < 4; iVar3++)
for(index = 0; index < 4; index++)
{
gUnknown_203B318->unk6C[iVar3] = gUnknown_80E0760;
gUnknown_203B318->unk6C[index] = gUnknown_80E0760;
}
break;
default:

14
src/makuhita_dojo_1.c
View File

@ -98,13 +98,13 @@ void DrawMakuhitaMainMenu(void) {
s32 menuAction;
struct unkStruct_203B318 *preload;
gUnknown_203B318->unk14 = 2;
gUnknown_203B318->menuAction = 2;
gUnknown_203B318->unk18[0].text = gMakuhitaDojoGoTrain;
gUnknown_203B318->unk18[0].menuAction = 2;
if(sub_80306A4())
{
gUnknown_203B318->unk18[0].menuAction = -1;
gUnknown_203B318->unk14 = 1;
gUnknown_203B318->menuAction = 1;
}
preload = gUnknown_203B318;
menuAction = 1;
@ -117,11 +117,11 @@ void DrawMakuhitaMainMenu(void) {
}
void sub_8030208(void) {
s32 temp;
if(sub_80144A4(&temp) == 0)
s32 menuAction;
if(sub_80144A4(&menuAction) == 0)
{
gUnknown_203B318->unk14 = temp;
switch(temp)
gUnknown_203B318->menuAction = menuAction;
switch(menuAction)
{
case 2:
UpdateMakuhitaState(3);
@ -170,7 +170,7 @@ void sub_80302A8(void) {
}
}
void sub_80302C4(void) {
void GotoMakuhitaFallbackState(void) {
s32 temp;
if(sub_80144A4(&temp) == 0)
{

62
src/options_menu.c
View File

@ -69,7 +69,7 @@ void sub_801317C(u32 *);
extern void sub_8013818(void *, u32, u32, u32);
void CreateOptionsMenu(void);
void nullsub_38(void);
extern void sub_801DD6C(u32);
extern void SetOptionsMenuState(u32);
extern void HandleOthersMenu();
extern void sub_801E088();
extern void sub_801E0E0();
@ -103,10 +103,20 @@ enum
MENU_OPTION_NO
};
enum OptionsMenuStates {
OPTIONS_MENU_INIT,
OPTIONS_MENU_MAIN,
OPTIONS_MENU_EXIT,
OPTIONS_MENU_PRE_HINT_SELECTION,
OPTIONS_MENU_HINT_SELECTION,
OPTIONS_MENU_DISPLAY_HINT,
OPTIONS_MENU_CONFIRM_NEW_OPTIONS = 7,
};
u32 sub_801DCC4(void)
{
gUnknown_203B25C = MemoryAlloc(sizeof(struct unkStruct_203B25C), 8);
sub_801DD6C(0);
SetOptionsMenuState(OPTIONS_MENU_INIT);
return 1;
}
@ -114,23 +124,23 @@ u32 sub_801DCE8(void)
{
switch(gUnknown_203B25C->state)
{
case 2:
case OPTIONS_MENU_EXIT:
return 3;
case 0:
case 1:
case OPTIONS_MENU_INIT:
case OPTIONS_MENU_MAIN:
HandleOthersMenu();
break;
case 3:
case 4:
case OPTIONS_MENU_PRE_HINT_SELECTION:
case OPTIONS_MENU_HINT_SELECTION:
sub_801E088();
break;
case 5:
case OPTIONS_MENU_DISPLAY_HINT:
sub_801E0E0();
break;
case 6:
sub_801E0FC();
break;
case 7:
case OPTIONS_MENU_CONFIRM_NEW_OPTIONS:
HandleChangeSettingsMenu();
break;
default:
@ -148,7 +158,7 @@ void sub_801DD50(void)
}
}
void sub_801DD6C(u32 newState)
void SetOptionsMenuState(u32 newState)
{
gUnknown_203B25C->state = newState;
sub_801DD84();
@ -380,18 +390,18 @@ void sub_801DD84(void)
void sub_801DED0(void)
{
switch(gUnknown_203B25C->state) {
case 0:
case 1:
case OPTIONS_MENU_INIT:
case OPTIONS_MENU_MAIN:
gUnknown_203B25C->unk1C.unk0 = gOthers_MenuOption;
sub_8012D60(&gUnknown_203B25C->unk1C,gUnknown_203B25C->menuItems,0,gUnknown_203B25C->unkAC,gUnknown_203B25C->menuAction,0);
break;
case 3:
case OPTIONS_MENU_PRE_HINT_SELECTION:
sub_801E3F0(0);
break;
case 4:
case OPTIONS_MENU_HINT_SELECTION:
CreateHintSelectionScreen(1);
break;
case 5:
case OPTIONS_MENU_DISPLAY_HINT:
CreateHintDisplayScreen(gUnknown_203B25C->chosenHintIndex);
break;
case 6:
@ -399,7 +409,7 @@ void sub_801DED0(void)
gUnknown_203B25C->newOptions = *gGameOptionsRef;
sub_801E198(&gUnknown_203B25C->newOptions);
break;
case 7:
case OPTIONS_MENU_CONFIRM_NEW_OPTIONS:
CreateChangeSettingsConfirmMenu();
// Change settings?
sub_8014248(gUnknown_80DBFEC,0,4,gUnknown_203B25C->menuItems,0,4,0,0,0x20);
@ -459,13 +469,13 @@ void HandleOthersMenu(void)
switch(menuAction)
{
case MENU_OPTION_HINTS:
sub_801DD6C(3);
SetOptionsMenuState(OPTIONS_MENU_PRE_HINT_SELECTION);
break;
case MENU_OPTION_GAMEOPTIONS:
sub_801DD6C(6);
SetOptionsMenuState(6);
break;
case MENU_OPTION_DEFAULT:
sub_801DD6C(2);
SetOptionsMenuState(OPTIONS_MENU_EXIT);
break;
}
}
@ -478,11 +488,11 @@ void sub_801E088(void)
case 3:
case 4:
gUnknown_203B25C->chosenHintIndex = GetChosenHintIndex();
sub_801DD6C(5);
SetOptionsMenuState(OPTIONS_MENU_DISPLAY_HINT);
break;
case 2:
sub_801E54C();
sub_801DD6C(1);
SetOptionsMenuState(OPTIONS_MENU_MAIN);
break;
case 0:
case 1:
@ -499,7 +509,7 @@ void sub_801E0E0(void)
case 3:
case 2:
DestroyHintDisplayScreen();
sub_801DD6C(4);
SetOptionsMenuState(OPTIONS_MENU_HINT_SELECTION);
break;
case 0:
case 1:
@ -517,10 +527,10 @@ void sub_801E0FC(void)
sub_801E2C4();
// Check to see if the options changed?
if (GameOptionsNotChange(&gUnknown_203B25C->newOptions)) {
sub_801DD6C(1);
SetOptionsMenuState(OPTIONS_MENU_MAIN);
}
else {
sub_801DD6C(7);
SetOptionsMenuState(OPTIONS_MENU_CONFIRM_NEW_OPTIONS);
}
break;
case 0:
@ -542,11 +552,11 @@ void HandleChangeSettingsMenu(void)
*gGameOptionsRef = gUnknown_203B25C->newOptions;
SetWindowBGColor();
sub_8099690(0);
sub_801DD6C(1);
SetOptionsMenuState(OPTIONS_MENU_MAIN);
break;
case MENU_OPTION_DEFAULT:
case MENU_OPTION_NO:
sub_801DD6C(1);
SetOptionsMenuState(OPTIONS_MENU_MAIN);
break;
}
}

16
src/pokemon.c
View File

@ -27,22 +27,22 @@ struct unkStruct_203B45C *GetRecruitedPokemon(void)
void InitializeRecruitedPokemon(void)
{
s32 iVar3;
s32 index;
for(iVar3 = 0; iVar3 < NUM_MONSTERS; iVar3++)
for(index = 0; index < NUM_MONSTERS; index++)
{
gRecruitedPokemonRef->pokemon[iVar3].unk0 = 0;
gRecruitedPokemonRef->pokemon[index].unk0 = 0;
}
for(iVar3 = 0; iVar3 < 4; iVar3++)
for(index = 0; index < 4; index++)
{
gRecruitedPokemonRef->pokemon2[iVar3].unk0 = 0;
gRecruitedPokemonRef->pokemon2[index].unk0 = 0;
}
for(iVar3 = 0; iVar3 < MAX_TEAM_MEMBERS; iVar3++)
for(index = 0; index < MAX_TEAM_MEMBERS; index++)
{
gRecruitedPokemonRef->team[iVar3].speciesNum = 0;
gRecruitedPokemonRef->team[iVar3].unk0 = 0;
gRecruitedPokemonRef->team[index].speciesNum = 0;
gRecruitedPokemonRef->team[index].unk0 = 0;
}
}

10
src/post_office_guide.c
View File

@ -578,16 +578,16 @@ void sub_8031A3C(void)
void sub_8031A84(void)
{
s32 iVar1;
s32 jobs;
sub_8006518(gUnknown_203B330->unk18);
gUnknown_203B330->unk18[gUnknown_203B330->unk10] = gUnknown_80E1F18;
if (gUnknown_203B330->unkC == 2) {
iVar1 = CountJobsinDungeon(gUnknown_203B330->dungeonIndex);
if (iVar1 == 0) {
iVar1 = 1;
jobs = CountJobsinDungeon(gUnknown_203B330->dungeonIndex);
if (jobs == 0) {
jobs = 1;
}
sub_8012D08(gUnknown_203B330->unk14,iVar1);
sub_8012D08(gUnknown_203B330->unk14,jobs);
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B330->unk18,1,1);

6
src/unk_menu_203B360.c
View File

@ -38,14 +38,14 @@ extern void sub_80384D0();
void sub_80382E4(s32 param_1)
{
s32 iVar4;
s32 index;
if (gUnknown_203B360 == NULL) {
gUnknown_203B360 = MemoryAlloc(sizeof(struct unkStruct_203B360), 8);
MemoryFill8((u8 *)gUnknown_203B360, 0, sizeof(struct unkStruct_203B360));
}
for(iVar4 = 0; iVar4 < 4; iVar4++){
gUnknown_203B360->unk148[iVar4] = gUnknown_80E6E7C;
for(index = 0; index < 4; index++){
gUnknown_203B360->unk148[index] = gUnknown_80E6E7C;
}
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B360->unk148,1,1);

12
src/wonder_mail_3.c
View File

@ -191,9 +191,9 @@ void sub_802CFD0(void)
u32 sub_802D098(struct unkSubStruct_203B2F8 *mail)
{
gUnknown_203B2F8 = MemoryAlloc(0x208,8);
gUnknown_203B2F8->unk6C = 0;
gUnknown_203B2F8->unk70 = 0;
gUnknown_203B2F8->unk74 = 0;
gUnknown_203B2F8->menuAction1 = 0;
gUnknown_203B2F8->menuAction2 = 0;
gUnknown_203B2F8->menuAction3 = 0;
gUnknown_203B2F8->mail = mail;
gUnknown_203B2F8->wonderMailAccepted = FALSE;
gUnknown_203B2F8->unk9 = sub_8099328(&gUnknown_203B2F8->dungeonID);
@ -322,7 +322,7 @@ void sub_802D2A8(void)
break;
case 1:
sub_802D73C();
sub_8014248(gUnknown_80DFE4C,0,gUnknown_203B2F8->unk70,gUnknown_203B2F8->unk158,0,4,0,0,0);
sub_8014248(gUnknown_80DFE4C,0,gUnknown_203B2F8->menuAction2,gUnknown_203B2F8->unk158,0,4,0,0,0);
break;
case DUPLICATE_WONDER_MAIL:
gUnknown_203B2F8->fallbackState = WONDER_MAIL_EXIT;
@ -374,7 +374,7 @@ void sub_802D2A8(void)
break;
case 9:
sub_802D690();
sub_8014248(gUnknown_80E0094,0,gUnknown_203B2F8->unk74,gUnknown_203B2F8->unk158,0,4,0,0,0);
sub_8014248(gUnknown_80E0094,0,gUnknown_203B2F8->menuAction3,gUnknown_203B2F8->unk158,0,4,0,0,0);
break;
case JOB_LIST_FULL:
gUnknown_203B2F8->fallbackState = DRAW_JOB_LIST;
@ -389,7 +389,7 @@ void sub_802D2A8(void)
case 0xd:
DrawJobListMenu();
sub_8012D60(&gUnknown_203B2F8->unk78,gUnknown_203B2F8->unk118,0,gUnknown_203B2F8->unk198,
gUnknown_203B2F8->unk6C,2);
gUnknown_203B2F8->menuAction1,2);
break;
case 0xe:
DrawJobListMenu();

8
src/wonder_mail_6.c
View File

@ -98,7 +98,7 @@ extern void sub_8030D40(u8, u32);
bool8 sub_8030F58(u32 wonderMailType)
{
struct OpenedFile *iVar3;
struct OpenedFile *file;
ResetUnusedInputStruct();
sub_800641C(0,1,1);
@ -107,9 +107,9 @@ bool8 sub_8030F58(u32 wonderMailType)
MemoryFill8((u8 *)gUnknown_203B328,0,sizeof(struct unkStruct_203B328));
}
gUnknown_203B328->wonderMailType = wonderMailType;
iVar3 = GetDialogueSpriteDataPtr(MONSTER_PELIPPER);
gUnknown_203B328->faceFile = iVar3;
gUnknown_203B328->faceData = iVar3->data;
file = GetDialogueSpriteDataPtr(MONSTER_PELIPPER);
gUnknown_203B328->faceFile = file;
gUnknown_203B328->faceData = file->data;
gUnknown_203B328->unk114 = 0;
gUnknown_203B328->unk115 = 0;
gUnknown_203B328->unk116 = 0;

6
src/wonder_mail_802DF88.c
View File

@ -147,7 +147,7 @@ void sub_802D7D0(void)
if (sub_80144A4(&menuAction) == 0) {
if (menuAction != 1) {
gUnknown_203B2F8->unk70 = menuAction;
gUnknown_203B2F8->menuAction2 = menuAction;
}
switch(menuAction) {
// Yes
@ -175,7 +175,7 @@ void sub_802D82C(void)
if (sub_80144A4(&menuAction) == 0) {
if (menuAction != 1) {
gUnknown_203B2F8->unk74 = menuAction;
gUnknown_203B2F8->menuAction3 = menuAction;
}
switch(menuAction) {
// Yes
@ -235,7 +235,7 @@ void sub_802D940(void)
menuAction = 0;
sub_802C598(0);
if ((sub_8012FD8(&gUnknown_203B2F8->unk78) == 0) && (sub_8013114(&gUnknown_203B2F8->unk78,&menuAction), menuAction != 1)) {
gUnknown_203B2F8->unk6C = menuAction;
gUnknown_203B2F8->menuAction1 = menuAction;
}
switch(menuAction)