Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-26 22:40:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dump some more data and cleanup

Browse Source
This commit is contained in:
Seth Barberee 2023-08-19 14:16:00 -07:00
parent f3527fe8de
commit 4c60221b54
11 changed files with 130 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
data/data_80F5668.s
View File

@ -2,7 +2,7 @@
.global gDungeonMusic
gDungeonMusic: @ 80F5668
.incbin "baserom.gba", 0xF5668, 0x98
.2byte 0x72, 0x7d, 0x0e, 0x78, 0x0f, 0x71, 0x6f, 0x14, 0x66, 0x19, 0x68, 0x73, 0x6c, 0x16, 0x7d, 0x7d, 0x7d, 0x7d, 0x0d, 0x15, 0x0f, 0x7e, 0x21, 0x27, 0x7b, 0x7c, 0x17, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x1a, 0x6e, 0x6e, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x1a, 0x7f, 0x23, 0x23, 0x23, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d, 0x7d
.global gUnknown_80F5700
gUnknown_80F5700: @ 80F5700
@ -41,6 +41,82 @@ gUnknown_80F57D4: @ 80F57D4
gUnknown_80F58F4: @ 80F58F4
.incbin "baserom.gba", 0xF58F4, 0x84
.global gUnknown_80F5978
gUnknown_80F5978: @ 80F5978
.incbin "baserom.gba", 0xF5978, 0x4C
.global gSecretPowerTable
gSecretPowerTable: @ 80F5978
.byte 0x03
.byte 0x00
.byte 0x06
.byte 0x07
.byte 0x07
.byte 0x06
.byte 0x06
.byte 0x07
.byte 0x08
.byte 0x06
.byte 0x00
.byte 0x05
.byte 0x08
.byte 0x08
.byte 0x00
.byte 0x08
.byte 0x08
.byte 0x07
.byte 0x07
.byte 0x07
.byte 0x00
.byte 0x05
.byte 0x06
.byte 0x08
.byte 0x06
.byte 0x00
.byte 0x00
.byte 0x08
.byte 0x06
.byte 0x01
.byte 0x07
.byte 0x07
.byte 0x01
.byte 0x01
.byte 0x06
.byte 0x08
.byte 0x08
.byte 0x07
.byte 0x06
.byte 0x06
.byte 0x06
.byte 0x00
.byte 0x06
.byte 0x06
.byte 0x05
.byte 0x08
.byte 0x06
.byte 0x06
.byte 0x06
.byte 0x03
.byte 0x00
.byte 0x00
.byte 0x05
.byte 0x02
.byte 0x07
.byte 0x06
.byte 0x00
.byte 0x08
.byte 0x08
.byte 0x06
.byte 0x00
.byte 0x07
.byte 0x00
.byte 0x00
.byte 0x06
.byte 0x01
.byte 0x06
.byte 0x06
.byte 0x08
.byte 0x08
.byte 0x06
.byte 0x08
.byte 0x08
.byte 0x03
.byte 0x03
.byte 0x06

3
data/data_8115EB8.s
View File

@ -2,5 +2,6 @@
.global gUnknown_8115EB8
gUnknown_8115EB8: @ 8115EB8
.incbin "baserom.gba", 0x115EB8, 0xA4
.string "pksdir0"
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xb2, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0xb6, 0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0xba, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, 0xbf, 0x00, 0x00, 0x00, 0xc1, 0x00, 0x00, 0x00, 0xc3, 0x00, 0x00, 0x00, 0xc6, 0x00, 0x00, 0x00, 0xc9, 0x00, 0x00, 0x00, 0xcc, 0x00, 0x00, 0x00, 0xcf, 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

3
include/code_802C39C.h
View File

@ -19,5 +19,6 @@ struct unkStruct_802C39C
u8 mailStatus; // mail status (suspend / take job / done)
/* 0x48 */ u32 y;
/* 0x4C */ u8 *unk4C;
/* 0x50 */ u8 *unk50[2];
u8 *unk50;
/* 0x54 */ struct WonderMail *mail;
};

18
include/constants/wonder_mail.h
View File

@ -37,6 +37,24 @@ enum WonderMailTypes {
WONDER_MAIL_TYPE_OKD = 7,
};
// Used in CreateRescueTitle and CreateRescueDescription
enum MailStatuses {
MAIL_STATUS_SUSPENDED,
MAIL_STATUS_TAKE_JOB,
MAIL_STATUS_DONE
};
// Used in CreateRescueTitle and CreateRescueDescription
enum MissionTypes {
MISSION_TYPE_FRIEND_RESCUE,
MISSION_TYPE_FIND_ITEM,
MISSION_TYPE_DELIVER_ITEM,
MISSION_TYPE_RESCUE_CLIENT,
MISSION_TYPE_RESCUE_TARGET,
MISSION_TYPE_ESCORT_CLIENT,
MISSION_TYPE_SPECIAL_MISSION
};
enum WonderMailMissionTypes
{
WONDER_MAIL_MISSION_TYPE_RESCUE_CLIENT = 0,

20
src/code_803B050.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "constants/colors.h"
#include "constants/wonder_mail.h"
#include "pokemon.h"
#include "pokemon_3.h"
@ -10,6 +11,7 @@
#include "text2.h"
#include "code_800D090.h"
#include "menu_input.h"
#include "wonder_mail.h"
struct unkStruct_80E9920
{
@ -89,7 +91,7 @@ extern void PrintDungeonLocationtoBuffer(u8 *, void *);
extern void PrintYellowDungeonNametoBuffer(u8 *, void *);
extern u8 sub_803C1D0(struct WonderMailSub *, u8);
extern u8 *sub_803C1F0(u8);
void sub_803D414(u8 *, u8 *);
void sub_803D414(u8 *, struct WonderMail *);
void sub_803B6B0(s32 x, s32 y, u8 index, u32 param_4)
{
@ -190,7 +192,7 @@ void CreateRescueTitle(struct unkStruct_802C39C *param_1)
uVar1 = sub_803C1D0(param_1->unk8,0);
}
else {
uVar1 = sub_803C1D0(param_1->unk8,param_1->unk50[1][1]);
uVar1 = sub_803C1D0(param_1->unk8,param_1->mail->missionType);
}
xxx_call_draw_string(0xb4,param_1->y,sub_803C1F0(uVar1),param_1->unk0[0],0);
}
@ -217,7 +219,7 @@ void CreateRescueDescription(struct unkStruct_802C39C *param_1)
y += 0x10;
switch(param_1->mailDescriptionType) {
case 3:
xxx_call_draw_string(10,y,param_1->unk50[0],param_1->unk0[0],0);
xxx_call_draw_string(10,y,param_1->unk50,param_1->unk0[0],0);
break;
case 0:
xxx_call_draw_string(10,y,gMankeyMissionDescription,param_1->unk0[0],0);
@ -386,7 +388,7 @@ void CreateRescueDescription(struct unkStruct_802C39C *param_1)
uVar3 = sub_803C1D0(param_1->unk8, 0);
}
else {
uVar3 = sub_803C1D0(param_1->unk8,param_1->unk50[1][1]);
uVar3 = sub_803C1D0(param_1->unk8,param_1->mail->missionType);
}
y += 0xC;
@ -420,23 +422,23 @@ void CreateRescueDescription(struct unkStruct_802C39C *param_1)
// Draw the Password
y += 0xC;
if (((2 < (u8)(param_1->mailDescriptionType - 9)) && (param_1->mailDescriptionType != 3)) && (*param_1->unk50[1] == 5))
if (((2 < (u8)(param_1->mailDescriptionType - 9)) && (param_1->mailDescriptionType != 3)) && (param_1->mail->mailType == 5))
{
xxx_call_draw_string(10,y,gUnknown_80E8B7C,param_1->unk0[0],0); // Wonder Mail:
sub_803D414(local_34,param_1->unk50[1]);
sub_803D414(local_34,param_1->mail);
for(counter = 0; counter < 24; counter++)
{
if (counter == 12) {
y += 12;
}
color = 7;
if (((3 < counter) && (color = 6, 7 < counter)) && ((color = 7)))
color = COLOR_WHITE_2;
if (((3 < counter) && (color = COLOR_YELLOW, 7 < counter)) && ((color = COLOR_WHITE_2)))
{
if(counter > 15)
{
if(counter < 20)
{
color = 6;
color = COLOR_YELLOW;
}
}

2
src/code_8057824.c
View File

@ -22,7 +22,7 @@
typedef bool8 (*MoveCallback)(struct Entity *pokemon, struct Entity *target, struct Move *move, s32 param_4);
struct NaturePowerMove
{
s16 moveID;
u16 moveID;
u16 unk2;
MoveCallback move;
};

4
src/code_805A120.c
View File

@ -51,7 +51,7 @@ extern s16 gUnknown_80F4E00;
extern u8 *gUnknown_80FD128[];
extern u8 *gUnknown_80FAD2C[];
extern u32 gUnknown_80F4F64;
extern u8 gUnknown_80F5978[];
extern u8 gSecretPowerTable[];
extern s16 gUnknown_80F4E74;
extern s16 gUnknown_80F4E06;
extern s16 gUnknown_80F4E94[];
@ -1271,7 +1271,7 @@ bool8 SecretPowerMoveAction(struct Entity * pokemon, struct Entity * target, str
if ( sub_8055640(pokemon, target, move, 0x100, param_4) != 0) {
flag = TRUE;
if (sub_805727C(pokemon,target,gUnknown_80F4E06) != 0) {
switch(gUnknown_80F5978[gDungeon->tileset]) {
switch(gSecretPowerTable[gDungeon->tileset]) {
case 0:
PoisonedStatusTarget(pokemon,target,FALSE);
break;

13
src/move_util.c
View File

@ -13,7 +13,16 @@
extern bool8 sub_8044B28(void);
extern void sub_80429C8(struct Entity *r0);
extern u16 gNaturePowerMoveTable[];
typedef bool8 (*MoveCallback)(struct Entity *pokemon, struct Entity *target, struct Move *move, s32 param_4);
struct NaturePowerMove
{
u16 moveID;
u16 unk2;
MoveCallback move;
};
extern struct NaturePowerMove gNaturePowerMoveTable[76];
bool8 sub_805755C(struct Entity* pokemon,u16 param_2);
u32 sub_8057144(struct Entity * pokemon)
@ -104,7 +113,7 @@ bool8 sub_80571F0(struct Entity * pokemon, struct Move *move)
if (0x4a < tileset) {
tileset = 0x4a;
}
if (gNaturePowerMoveTable[tileset << 2] == MOVE_EARTHQUAKE) return FALSE;
if (gNaturePowerMoveTable[tileset].moveID == MOVE_EARTHQUAKE) return FALSE;
}
}
return TRUE;

2
src/status_actions.c
View File

@ -158,7 +158,7 @@ typedef bool8 (*MoveCallback)(struct Entity *pokemon, struct Entity *target, str
struct NaturePowerMove
{
s16 moveID;
u16 moveID;
u16 unk2;
MoveCallback move;
};

2
src/wonder_mail_3.c
View File

@ -731,7 +731,7 @@ void sub_802D2A8(void)
sub_803B35C(&gUnknown_203B2F8->mail->wonderMail,&gUnknown_203B2F8->unk14);
gUnknown_203B2F8->unk14.unk0[0] = 3;
gUnknown_203B2F8->unk14.mailStatus = MAIL_STATUS_SUSPENDED;
gUnknown_203B2F8->unk14.unk50[0] = gUnknown_203B2F8->mail->unk18;
gUnknown_203B2F8->unk14.unk50 = gUnknown_203B2F8->mail->unk18;
sub_802DE84(&gUnknown_203B2F8->unk14);
break;
}

2
src/wonder_mail_3_mid.c
View File

@ -348,7 +348,7 @@ void sub_802F088(void)
sub_803B35C(&temp->mail, &gUnknown_203B30C->unk8);
gUnknown_203B30C->unk8.unk0[0] = 3;
gUnknown_203B30C->unk8.mailStatus = MAIL_STATUS_SUSPENDED;
gUnknown_203B30C->unk8.unk50[0] = temp->unk18;
gUnknown_203B30C->unk8.unk50 = temp->unk18;
sub_802DE84(&gUnknown_203B30C->unk8);
}
}