diasurgical/scalpel
1
0
Fork 0
mirror of https://github.com/diasurgical/scalpel.git synced 2026-05-21 05:40:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

psx: regenerate merged debug output

Browse Source
This commit is contained in:
Robin Eklind
2019-02-21 21:05:31 +09:00
parent 08fda10aa1
commit 7bc47b8bc8
83 changed files with 59388 additions and 60510 deletions
Download Patch File Download Diff File Expand all files Collapse all files
psx/_dump_/_dump_merge_c_/decls.h
+29558 -30119
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_/types.h
+11 -11
View File
@@ -83,7 +83,7 @@ enum MEM_TYPES {
MT_POST_QUIT = 5,
};
enum MEM_TYPES_dup_29 {
enum MEM_TYPES_dup_23 {
MT_NONE = 0,
MT_FRONTEND = 1,
MT_DEMO = 2,
@@ -4819,7 +4819,7 @@ struct AMap_dup_19 {
};
// size: 0x10
struct AMap_dup_29 {
struct AMap_dup_23 {
// offset: 0000
bool Compressed;
// offset: 0004
@@ -6221,11 +6221,11 @@ struct CompLevelMaps_dup_20 {
};
// size: 0x170
struct CompLevelMaps_dup_29 {
struct CompLevelMaps_dup_23 {
// offset: 0000 (4 bytes)
struct CompClass *CompObj;
// offset: 0004 (352 bytes)
struct AMap_dup_29 TheMaps[22];
struct AMap_dup_23 TheMaps[22];
// offset: 0164
int LastNumOut;
// offset: 0168 (3868 bytes)
@@ -6235,7 +6235,7 @@ struct CompLevelMaps_dup_29 {
};
// size: 0x160
struct CompLevelMaps_dup_30 {
struct CompLevelMaps_dup_24 {
// offset: 0000 (4 bytes)
struct CompClass *CompObj;
// offset: 0004 (336 bytes)
@@ -6271,7 +6271,7 @@ struct CompressedLevs {
};
// size: 0xAC
struct CompressedLevs_dup_30 {
struct CompressedLevs_dup_24 {
// offset: 0000
unsigned long Version;
// offset: 0004 (84 bytes)
@@ -20614,7 +20614,7 @@ typedef struct AMap AMap;
typedef struct AMap_dup_17 AMap;
typedef struct AMap_dup_29 AMap;
typedef struct AMap_dup_23 AMap;
typedef struct AMap_dup_18 AMap;
@@ -20796,7 +20796,7 @@ typedef struct CompLevelMaps_dup_14 CompLevelMaps;
typedef struct CompLevelMaps_dup_19 CompLevelMaps;
typedef struct CompLevelMaps_dup_30 CompLevelMaps;
typedef struct CompLevelMaps_dup_24 CompLevelMaps;
typedef struct CompLevelMaps_dup_18 CompLevelMaps;
@@ -20804,7 +20804,7 @@ typedef struct CompLevelMaps_dup_6 CompLevelMaps;
typedef struct CompLevelMaps_dup_5 CompLevelMaps;
typedef struct CompLevelMaps_dup_29 CompLevelMaps;
typedef struct CompLevelMaps_dup_23 CompLevelMaps;
typedef struct CompLevelMaps_dup_17 CompLevelMaps;
@@ -20816,7 +20816,7 @@ typedef struct CompLevelMemImage CompLevelMemImage;
typedef struct CompressedLevs CompressedLevs;
typedef struct CompressedLevs_dup_30 CompressedLevs;
typedef struct CompressedLevs_dup_24 CompressedLevs;
typedef struct Creds_dup_17 Creds;
@@ -21412,7 +21412,7 @@ typedef struct MEM_INIT_INFO MEM_INIT_INFO;
typedef struct MEM_REG MEM_REG;
typedef enum MEM_TYPES_dup_29 MEM_TYPES;
typedef enum MEM_TYPES_dup_23 MEM_TYPES;
typedef enum MEM_TYPES MEM_TYPES;
psx/_dump_/_dump_merge_c_src_/diabpsx/glibdev/source/gal.c
+409 -409
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/glibdev/source/psx/vrip.c
+229 -229
View File
@@ -2,67 +2,10 @@
#include "types.h"
// address: 0x800253AC
// line start: 172
// line end: 479
int _doprnt(char *fmt0, char *argp, struct FILE *fp) {
// register: 22
register char *fmt;
// register: 4
register int ch;
// address: 0xFFFFFFA8
auto int cnt;
// register: 16
register int n;
// register: 17
register char *t;
// register: 3
register unsigned long _ulong;
// register: 5
register int base;
// address: 0xFFFFFFB0
auto int dprec;
// register: 30
register int fieldsz;
// register: 19
register int flags;
// address: 0xFFFFFFB8
auto int fpprec;
// register: 20
register int prec;
// register: 20
register int realsz;
// register: 23
register int size;
// address: 0xFFFFFFC0
auto int width;
// register: 6
register char sign;
// address: 0xFFFFFFC8
auto char *digs;
// address: 0x80025500
bool rflag;
// address: 0x80025868
bool nosign;
// address: 0x80025914
bool pforw;
{
// register: 2
register char c;
{
{
// register: 2
register char *p;
}
}
}
}
// address: 0x80024A68
// line start: 172
// line end: 479
int _doprnt_addr_80024A68(char *fmt0, char *argp, struct FILE *fp) {
int _doprnt(char *fmt0, char *argp, struct FILE *fp) {
// register: 22
register char *fmt;
// register: 4
@@ -116,63 +59,6 @@ int _doprnt_addr_80024A68(char *fmt0, char *argp, struct FILE *fp) {
}
// address: 0x80024A4C
// line start: 172
// line end: 479
int _doprnt_addr_80024A4C(char *fmt0, char *argp, struct FILE *fp) {
// register: 22
register char *fmt;
// register: 4
register int ch;
// address: 0xFFFFFFA8
auto int cnt;
// register: 16
register int n;
// register: 17
register char *t;
// register: 3
register unsigned long _ulong;
// register: 5
register int base;
// address: 0xFFFFFFB0
auto int dprec;
// register: 30
register int fieldsz;
// register: 19
register int flags;
// address: 0xFFFFFFB8
auto int fpprec;
// register: 20
register int prec;
// register: 20
register int realsz;
// register: 23
register int size;
// address: 0xFFFFFFC0
auto int width;
// register: 6
register char sign;
// address: 0xFFFFFFC8
auto char *digs;
// address: 0x80024BA0
bool rflag;
// address: 0x80024F08
bool nosign;
// address: 0x80024FB4
bool pforw;
{
// register: 2
register char c;
{
{
// register: 2
register char *p;
}
}
}
}
// address: 0x80025584
// line start: 172
// line end: 479
@@ -230,120 +116,6 @@ int _doprnt_addr_80025584(char *fmt0, char *argp, struct FILE *fp) {
}
// address: 0x80023C58
// line start: 172
// line end: 479
int _doprnt_addr_80023C58(char *fmt0, char *argp, struct FILE *fp) {
// register: 22
register char *fmt;
// register: 4
register int ch;
// address: 0xFFFFFFA8
auto int cnt;
// register: 16
register int n;
// register: 17
register char *t;
// register: 3
register unsigned long _ulong;
// register: 5
register int base;
// address: 0xFFFFFFB0
auto int dprec;
// register: 30
register int fieldsz;
// register: 19
register int flags;
// address: 0xFFFFFFB8
auto int fpprec;
// register: 20
register int prec;
// register: 20
register int realsz;
// register: 23
register int size;
// address: 0xFFFFFFC0
auto int width;
// register: 6
register char sign;
// address: 0xFFFFFFC8
auto char *digs;
// address: 0x80023DAC
bool rflag;
// address: 0x80024114
bool nosign;
// address: 0x800241C0
bool pforw;
{
// register: 2
register char c;
{
{
// register: 2
register char *p;
}
}
}
}
// address: 0x80023CA8
// line start: 172
// line end: 479
int _doprnt_addr_80023CA8(char *fmt0, char *argp, struct FILE *fp) {
// register: 22
register char *fmt;
// register: 4
register int ch;
// address: 0xFFFFFFA8
auto int cnt;
// register: 16
register int n;
// register: 17
register char *t;
// register: 3
register unsigned long _ulong;
// register: 5
register int base;
// address: 0xFFFFFFB0
auto int dprec;
// register: 30
register int fieldsz;
// register: 19
register int flags;
// address: 0xFFFFFFB8
auto int fpprec;
// register: 20
register int prec;
// register: 20
register int realsz;
// register: 23
register int size;
// address: 0xFFFFFFC0
auto int width;
// register: 6
register char sign;
// address: 0xFFFFFFC8
auto char *digs;
// address: 0x80023DFC
bool rflag;
// address: 0x80024164
bool nosign;
// address: 0x80024210
bool pforw;
{
// register: 2
register char c;
{
{
// register: 2
register char *p;
}
}
}
}
// address: 0x80023CB8
// line start: 172
// line end: 479
@@ -458,6 +230,234 @@ int _doprnt_addr_800252F4(char *fmt0, char *argp, struct FILE *fp) {
}
// address: 0x80023C58
// line start: 172
// line end: 479
int _doprnt_addr_80023C58(char *fmt0, char *argp, struct FILE *fp) {
// register: 22
register char *fmt;
// register: 4
register int ch;
// address: 0xFFFFFFA8
auto int cnt;
// register: 16
register int n;
// register: 17
register char *t;
// register: 3
register unsigned long _ulong;
// register: 5
register int base;
// address: 0xFFFFFFB0
auto int dprec;
// register: 30
register int fieldsz;
// register: 19
register int flags;
// address: 0xFFFFFFB8
auto int fpprec;
// register: 20
register int prec;
// register: 20
register int realsz;
// register: 23
register int size;
// address: 0xFFFFFFC0
auto int width;
// register: 6
register char sign;
// address: 0xFFFFFFC8
auto char *digs;
// address: 0x80023DAC
bool rflag;
// address: 0x80024114
bool nosign;
// address: 0x800241C0
bool pforw;
{
// register: 2
register char c;
{
{
// register: 2
register char *p;
}
}
}
}
// address: 0x80024A4C
// line start: 172
// line end: 479
int _doprnt_addr_80024A4C(char *fmt0, char *argp, struct FILE *fp) {
// register: 22
register char *fmt;
// register: 4
register int ch;
// address: 0xFFFFFFA8
auto int cnt;
// register: 16
register int n;
// register: 17
register char *t;
// register: 3
register unsigned long _ulong;
// register: 5
register int base;
// address: 0xFFFFFFB0
auto int dprec;
// register: 30
register int fieldsz;
// register: 19
register int flags;
// address: 0xFFFFFFB8
auto int fpprec;
// register: 20
register int prec;
// register: 20
register int realsz;
// register: 23
register int size;
// address: 0xFFFFFFC0
auto int width;
// register: 6
register char sign;
// address: 0xFFFFFFC8
auto char *digs;
// address: 0x80024BA0
bool rflag;
// address: 0x80024F08
bool nosign;
// address: 0x80024FB4
bool pforw;
{
// register: 2
register char c;
{
{
// register: 2
register char *p;
}
}
}
}
// address: 0x80023CA8
// line start: 172
// line end: 479
int _doprnt_addr_80023CA8(char *fmt0, char *argp, struct FILE *fp) {
// register: 22
register char *fmt;
// register: 4
register int ch;
// address: 0xFFFFFFA8
auto int cnt;
// register: 16
register int n;
// register: 17
register char *t;
// register: 3
register unsigned long _ulong;
// register: 5
register int base;
// address: 0xFFFFFFB0
auto int dprec;
// register: 30
register int fieldsz;
// register: 19
register int flags;
// address: 0xFFFFFFB8
auto int fpprec;
// register: 20
register int prec;
// register: 20
register int realsz;
// register: 23
register int size;
// address: 0xFFFFFFC0
auto int width;
// register: 6
register char sign;
// address: 0xFFFFFFC8
auto char *digs;
// address: 0x80023DFC
bool rflag;
// address: 0x80024164
bool nosign;
// address: 0x80024210
bool pforw;
{
// register: 2
register char c;
{
{
// register: 2
register char *p;
}
}
}
}
// address: 0x800253AC
// line start: 172
// line end: 479
int _doprnt_addr_800253AC(char *fmt0, char *argp, struct FILE *fp) {
// register: 22
register char *fmt;
// register: 4
register int ch;
// address: 0xFFFFFFA8
auto int cnt;
// register: 16
register int n;
// register: 17
register char *t;
// register: 3
register unsigned long _ulong;
// register: 5
register int base;
// address: 0xFFFFFFB0
auto int dprec;
// register: 30
register int fieldsz;
// register: 19
register int flags;
// address: 0xFFFFFFB8
auto int fpprec;
// register: 20
register int prec;
// register: 20
register int realsz;
// register: 23
register int size;
// address: 0xFFFFFFC0
auto int width;
// register: 6
register char sign;
// address: 0xFFFFFFC8
auto char *digs;
// address: 0x80025500
bool rflag;
// address: 0x80025868
bool nosign;
// address: 0x80025914
bool pforw;
{
// register: 2
register char c;
{
{
// register: 2
register char *p;
}
}
}
}
// address: 0x80024A00
// line start: 157
// line end: 167
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/async.cpp
+42 -42
View File
@@ -2,17 +2,26 @@
#include "types.h"
// address: 0x8008DFE0
// line start: 85
// line end: 86
void AS_CallBack0__Fi(int handle) {
}
// address: 0x8009A6F0
// line start: 88
// line end: 99
void AS_CallBack0__Fi_addr_8009A6F0(int ah) {
void AS_CallBack0__Fi(int ah) {
// register: 16
register unsigned long OldGp;
}
// address: 0x8008DFE0
// line start: 85
// line end: 86
void AS_CallBack0__Fi_addr_8008DFE0(int handle) {
}
// address: 0x8009A75C
// line start: 102
// line end: 113
void AS_CallBack1__Fi(int ah) {
// register: 16
register unsigned long OldGp;
}
@@ -21,30 +30,21 @@ void AS_CallBack0__Fi_addr_8009A6F0(int ah) {
// address: 0x8008DFF4
// line start: 90
// line end: 91
void AS_CallBack1__Fi(int handle) {
}
// address: 0x8009A75C
// line start: 102
// line end: 113
void AS_CallBack1__Fi_addr_8009A75C(int ah) {
// register: 16
register unsigned long OldGp;
}
// address: 0x8008E190
// line start: 184
// line end: 188
void AS_CloseStream__FP6STRHDRP6SFXHDR(struct STRHDR *sh, struct SFXHDR *sfh) {
void AS_CallBack1__Fi_addr_8008DFF4(int handle) {
}
// address: 0x8009A960
// line start: 205
// line end: 212
void AS_CloseStream__FP6STRHDRP6SFXHDR_addr_8009A960(struct STRHDR *sh, struct SFXHDR_dup_17 *sfh) {
void AS_CloseStream__FP6STRHDRP6SFXHDR(struct STRHDR *sh, struct SFXHDR_dup_17 *sfh) {
}
// address: 0x8008E190
// line start: 184
// line end: 188
void AS_CloseStream__FP6STRHDRP6SFXHDR_addr_8008E190(struct STRHDR *sh, struct SFXHDR *sfh) {
}
@@ -71,37 +71,37 @@ int AS_LoopStream__FiP6STRHDRP6SFXHDR(int ah, struct STRHDR *sh, struct SFXHDR *
}
// address: 0x8009A890
// line start: 166
// line end: 183
int AS_OpenStream__FP6STRHDRP6SFXHDR(struct STRHDR *sh, struct SFXHDR_dup_17 *sfh) {
// register: 16
register int ah;
}
// address: 0x8008E0E4
// line start: 147
// line end: 163
int AS_OpenStream__FP6STRHDRP6SFXHDR_addr_8008E0E4(struct STRHDR *sh, struct SFXHDR *sfh) {
int AS_OpenStream__FP6STRHDRP6SFXHDR(struct STRHDR *sh, struct SFXHDR *sfh) {
// register: 16
register int ah;
}
// address: 0x8008E008
// line start: 101
// line end: 124
void AS_WasLastBlock__FiP6STRHDRP6SFXHDR(int ah, struct STRHDR *sh, struct SFXHDR *sfh) {
// address: 0x8009A890
// line start: 166
// line end: 183
int AS_OpenStream__FP6STRHDRP6SFXHDR_addr_8009A890(struct STRHDR *sh, struct SFXHDR_dup_17 *sfh) {
// register: 16
register unsigned char *ptr;
register int ah;
}
// address: 0x8009A7C8
// line start: 122
// line end: 142
void AS_WasLastBlock__FiP6STRHDRP6SFXHDR_addr_8009A7C8(int ah, struct STRHDR *sh, struct SFXHDR_dup_17 *sfh) {
void AS_WasLastBlock__FiP6STRHDRP6SFXHDR(int ah, struct STRHDR *sh, struct SFXHDR_dup_17 *sfh) {
// register: 16
register unsigned char *ptr;
}
// address: 0x8008E008
// line start: 101
// line end: 124
void AS_WasLastBlock__FiP6STRHDRP6SFXHDR_addr_8008E008(int ah, struct STRHDR *sh, struct SFXHDR *sfh) {
// register: 16
register unsigned char *ptr;
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/attract.cpp
+16 -16
View File
@@ -40,21 +40,10 @@ void ATT_DoAttract__Fv_addr_80085198() {
}
// address: 0x8008CFD4
// line start: 149
// line end: 158
void CreatePlayersFromFeData__FR9FE_CREATE(struct FE_CREATE_dup_20 *CStruct) {
{
// register: 16
register int Loop;
}
}
// address: 0x80085250
// line start: 97
// line end: 102
void CreatePlayersFromFeData__FR9FE_CREATE_addr_80085250(struct FE_CREATE *CStruct) {
void CreatePlayersFromFeData__FR9FE_CREATE(struct FE_CREATE *CStruct) {
{
// register: 16
register int Loop;
@@ -62,10 +51,21 @@ void CreatePlayersFromFeData__FR9FE_CREATE_addr_80085250(struct FE_CREATE *CStru
}
// address: 0x8008CFC0
// address: 0x8008CFD4
// line start: 149
// line end: 158
void CreatePlayersFromFeData__FR9FE_CREATE_addr_8008CFD4(struct FE_CREATE_dup_20 *CStruct) {
{
// register: 16
register int Loop;
}
}
// address: 0x8008D090
// line start: 144
// line end: 145
void CustomPlayerInit__FR12PlayerStruct(struct PlayerStruct_dup_18 *P) {
void CustomPlayerInit__FR12PlayerStruct(struct PlayerStruct_dup_17 *P) {
}
@@ -76,10 +76,10 @@ void CustomPlayerInit__FR12PlayerStruct_addr_8008CF18(struct PlayerStruct *P) {
}
// address: 0x8008D090
// address: 0x8008CFC0
// line start: 144
// line end: 145
void CustomPlayerInit__FR12PlayerStruct_addr_8008D090(struct PlayerStruct_dup_17 *P) {
void CustomPlayerInit__FR12PlayerStruct_addr_8008CFC0(struct PlayerStruct_dup_18 *P) {
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/biglump.cpp
+69 -69
View File
@@ -2,19 +2,19 @@
#include "types.h"
// address: 0x80087BE4
// line start: 631
// line end: 644
void BL_AsyncLoadCallBack__Fi(int ah) {
// register: 16
register unsigned long OldGp;
}
// address: 0x80082D50
// line start: 568
// line end: 570
void BL_AsyncLoadCallBack__Fi_addr_80082D50(int handle) {
void BL_AsyncLoadCallBack__Fi(int handle) {
}
// address: 0x80087BE4
// line start: 631
// line end: 644
void BL_AsyncLoadCallBack__Fi_addr_80087BE4(int ah) {
// register: 16
register unsigned long OldGp;
}
@@ -94,21 +94,21 @@ bool BL_FileExists__FPcc(char *Name, char LumpID) {
}
// address: 0x800809D8
// line start: 398
// line end: 404
// address: 0x800879AC
// line start: 475
// line end: 493
int BL_FileLength__FPcc(char *Name, char LumpID) {
// register: 3
// register: 2
// size: 0x14
register struct STRHDR *ptr;
}
// address: 0x800879AC
// line start: 475
// line end: 493
int BL_FileLength__FPcc_addr_800879AC(char *Name, char LumpID) {
// register: 2
// address: 0x800809D8
// line start: 398
// line end: 404
int BL_FileLength__FPcc_addr_800809D8(char *Name, char LumpID) {
// register: 3
// size: 0x14
register struct STRHDR *ptr;
}
@@ -207,10 +207,27 @@ void BL_InitEAC__Fv() {
}
// address: 0x80082004
// line start: 230
// line end: 264
void BL_LoadDirectory__Fv() {
// register: 18
register long BL_DirMHandle;
// register: 16
register char *AsyncAddr;
// register: 16
register unsigned char *BL_DirPtr;
// register: 17
register unsigned long DirId;
// register: 2
register unsigned long DirId2;
}
// address: 0x800802F4
// line start: 178
// line end: 222
void BL_LoadDirectory__Fv() {
void BL_LoadDirectory__Fv_addr_800802F4() {
// register: 18
register long BL_DirMHandle;
// register: 16
@@ -226,23 +243,6 @@ void BL_LoadDirectory__Fv() {
}
// address: 0x80082004
// line start: 230
// line end: 264
void BL_LoadDirectory__Fv_addr_80082004() {
// register: 18
register long BL_DirMHandle;
// register: 16
register char *AsyncAddr;
// register: 16
register unsigned char *BL_DirPtr;
// register: 17
register unsigned long DirId;
// register: 2
register unsigned long DirId2;
}
// address: 0x80080B6C
// line start: 534
// line end: 568
@@ -258,18 +258,18 @@ bool BL_LoadFileAsync__FPcPUcc(char *Name, unsigned char *Dest, char LumpID) {
}
// address: 0x80087C48
// line start: 649
// line end: 699
// address: 0x80082D80
// line start: 598
// line end: 645
long BL_LoadFileAsync__FPcc(char *Name, char LumpID) {
// register: 18
// register: 17
// size: 0x14
register struct STRHDR *sh;
// register: 16
register int Size;
// register: 16
register long MyHnd;
// register: 19
// register: 18
register unsigned char *LoadAddr;
}
@@ -295,6 +295,22 @@ long BL_LoadFileAsync__FPcc_addr_800822A8(char *Name, char LumpID) {
}
// address: 0x80087C48
// line start: 649
// line end: 699
long BL_LoadFileAsync__FPcc_addr_80087C48(char *Name, char LumpID) {
// register: 18
// size: 0x14
register struct STRHDR *sh;
// register: 16
register int Size;
// register: 16
register long MyHnd;
// register: 19
register unsigned char *LoadAddr;
}
// address: 0x80082974
// line start: 585
// line end: 631
@@ -316,22 +332,6 @@ long BL_LoadFileAsync__FPcc_addr_80082974(char *Name, char LumpID) {
}
// address: 0x80082D80
// line start: 598
// line end: 645
long BL_LoadFileAsync__FPcc_addr_80082D80(char *Name, char LumpID) {
// register: 17
// size: 0x14
register struct STRHDR *sh;
// register: 16
register int Size;
// register: 16
register long MyHnd;
// register: 18
register unsigned char *LoadAddr;
}
// address: 0x80080A0C
// line start: 414
// line end: 495
@@ -378,15 +378,15 @@ void BL_LoadStreamDir__Fv() {
}
// address: 0x80080718
// address: 0x800876FC
// size: 0x14
// line start: 304
// line end: 325
// line start: 376
// line end: 397
struct STRHDR *BL_MakeFilePosTab__FPUcUl(unsigned char *BL_DirPtr, unsigned long NoStreamFiles) {
// register: 18
// register: 17
// size: 0x14
register struct STREAM *DirPtr;
// register: 16
// register: 9
// size: 0x14
register struct STRHDR *TFileTab;
{
@@ -400,15 +400,15 @@ struct STRHDR *BL_MakeFilePosTab__FPUcUl(unsigned char *BL_DirPtr, unsigned long
}
// address: 0x800876FC
// address: 0x80080718
// size: 0x14
// line start: 376
// line end: 397
struct STRHDR *BL_MakeFilePosTab__FPUcUl_addr_800876FC(unsigned char *BL_DirPtr, unsigned long NoStreamFiles) {
// register: 17
// line start: 304
// line end: 325
struct STRHDR *BL_MakeFilePosTab__FPUcUl_addr_80080718(unsigned char *BL_DirPtr, unsigned long NoStreamFiles) {
// register: 18
// size: 0x14
register struct STREAM *DirPtr;
// register: 9
// register: 16
// size: 0x14
register struct STRHDR *TFileTab;
{
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/bird.cpp
+330 -330
View File
@@ -20,35 +20,10 @@ void AlterBirdPos__FP10BIRDSTRUCTUc_addr_8009B730(struct BIRDSTRUCT *b, unsigned
}
// address: 0x8009F95C
// line start: 326
// line end: 370
void BIRD_DoFly__FP10BIRDSTRUCT(struct BIRDSTRUCT *b) {
// register: 17
register int pnum;
{
{
{
{
{
{
// register: 8
register int x;
// register: 3
register int y;
}
}
}
}
}
}
}
// address: 0x8009C374
// line start: 362
// line end: 414
void BIRD_DoFly__FP10BIRDSTRUCT_addr_8009C374(struct BIRDSTRUCT *b) {
void BIRD_DoFly__FP10BIRDSTRUCT(struct BIRDSTRUCT *b) {
// register: 20
register int pnum;
{
@@ -70,6 +45,31 @@ void BIRD_DoFly__FP10BIRDSTRUCT_addr_8009C374(struct BIRDSTRUCT *b) {
}
// address: 0x8009F95C
// line start: 326
// line end: 370
void BIRD_DoFly__FP10BIRDSTRUCT_addr_8009F95C(struct BIRDSTRUCT *b) {
// register: 17
register int pnum;
{
{
{
{
{
{
// register: 8
register int x;
// register: 3
register int y;
}
}
}
}
}
}
}
// address: 0x8009BFBC
// line start: 224
// line end: 244
@@ -165,6 +165,13 @@ void BIRD_StartHop__FP10BIRDSTRUCT(struct BIRDSTRUCT *b) {
}
// address: 0x8009F574
// line start: 186
// line end: 192
void BIRD_StartHop__FP10BIRDSTRUCT_addr_8009F574(struct BIRDSTRUCT *b) {
}
// address: 0x800AB884
// line start: 250
// line end: 283
@@ -185,13 +192,6 @@ void BIRD_StartHop__FP10BIRDSTRUCT_addr_800AB884(struct BIRDSTRUCT *b) {
}
// address: 0x8009F574
// line start: 186
// line end: 192
void BIRD_StartHop__FP10BIRDSTRUCT_addr_8009F574(struct BIRDSTRUCT *b) {
}
// address: 0x8009C620
// line start: 424
// line end: 425
@@ -224,21 +224,21 @@ unsigned char BirdDistanceOK__Fiiii(int WorldXa, int WorldYa, int WorldXb, int W
}
// address: 0x800AB630
// line start: 200
// line end: 223
// address: 0x8009EAD4
// line start: 160
// line end: 183
int BirdScared__FP10BIRDSTRUCT(struct BIRDSTRUCT *b) {
// register: 17
register int scared;
// register: 4
register int p;
// register: 2
register int type;
// register: 4
register int i;
{
{
// register: 5
// size: 0x19E8
register struct PlayerStruct_dup_18 *player;
// register: 6
// size: 0x23A8
register struct PlayerStruct_dup_11 *player;
}
}
}
@@ -264,6 +264,66 @@ int BirdScared__FP10BIRDSTRUCT_addr_800AB598(struct BIRDSTRUCT *b) {
}
// address: 0x8009E974
// line start: 160
// line end: 183
int BirdScared__FP10BIRDSTRUCT_addr_8009E974(struct BIRDSTRUCT *b) {
// register: 17
register int scared;
// register: 2
register int type;
// register: 4
register int i;
{
{
// register: 6
// size: 0x23A8
register struct PlayerStruct *player;
}
}
}
// address: 0x800AB630
// line start: 200
// line end: 223
int BirdScared__FP10BIRDSTRUCT_addr_800AB630(struct BIRDSTRUCT *b) {
// register: 17
register int scared;
// register: 4
register int p;
// register: 4
register int i;
{
{
// register: 5
// size: 0x19E8
register struct PlayerStruct_dup_18 *player;
}
}
}
// address: 0x8009FA58
// line start: 160
// line end: 183
int BirdScared__FP10BIRDSTRUCT_addr_8009FA58(struct BIRDSTRUCT *b) {
// register: 17
register int scared;
// register: 2
register int type;
// register: 4
register int i;
{
{
// register: 6
// size: 0x23A8
register struct PlayerStruct_dup_13 *player;
}
}
}
// address: 0x8009BD20
// line start: 143
// line end: 161
@@ -297,66 +357,6 @@ int BirdScared__FP10BIRDSTRUCT_addr_800AB704(struct BIRDSTRUCT *b) {
}
// address: 0x8009FA58
// line start: 160
// line end: 183
int BirdScared__FP10BIRDSTRUCT_addr_8009FA58(struct BIRDSTRUCT *b) {
// register: 17
register int scared;
// register: 2
register int type;
// register: 4
register int i;
{
{
// register: 6
// size: 0x23A8
register struct PlayerStruct_dup_13 *player;
}
}
}
// address: 0x8009E974
// line start: 160
// line end: 183
int BirdScared__FP10BIRDSTRUCT_addr_8009E974(struct BIRDSTRUCT *b) {
// register: 17
register int scared;
// register: 2
register int type;
// register: 4
register int i;
{
{
// register: 6
// size: 0x23A8
register struct PlayerStruct *player;
}
}
}
// address: 0x8009EAD4
// line start: 160
// line end: 183
int BirdScared__FP10BIRDSTRUCT_addr_8009EAD4(struct BIRDSTRUCT *b) {
// register: 17
register int scared;
// register: 2
register int type;
// register: 4
register int i;
{
{
// register: 6
// size: 0x23A8
register struct PlayerStruct_dup_11 *player;
}
}
}
// address: 0x8009BCA4
// line start: 124
// line end: 134
@@ -410,132 +410,10 @@ bool CheckDist__Fii(int x, int y) {
}
// address: 0x800AC9BC
// line start: 834
// line end: 898
void DrawLBird__Fv() {
// register: 20
// size: 0x18
register struct BIRDSTRUCT *ThisBird;
// address: 0xFFFFFFC8
// size: 0x28
auto struct POLY_FT4 *Ft4;
// register: 30
// size: 0x108
register struct CBlocks_dup_17 *gblock;
// register: 2
register int ScrXOff;
// register: 2
register int ScrYOff;
// register: 19
register int x;
// register: 18
register int y;
// address: 0xFFFFFFC0
// size: 0x8
auto struct RECT R;
// address: 0xFFFFFFD0
// size: 0x70
auto struct TextDat_dup_17 *Dat;
{
{
{
// register: 22
register int i;
{
{
{
// register: 16
register int ot;
}
}
}
}
}
}
}
// address: 0x8009CA00
// line start: 725
// line end: 787
void DrawLBird__Fv_addr_8009CA00() {
// register: 19
// size: 0x18
register struct BIRDSTRUCT *ThisBird;
// address: 0xFFFFFFC8
// size: 0x28
auto struct POLY_FT4 *Ft4;
// address: 0xFFFFFFD0
// size: 0xE0
auto struct CBlocks_dup_4 *gblock;
// register: 2
register int ScrXOff;
// register: 2
register int ScrYOff;
// register: 17
register int x;
// register: 18
register int y;
// address: 0xFFFFFFC0
// size: 0x8
auto struct RECT R;
// register: 30
// size: 0x6C
register struct TextDat *Dat;
{
{
{
// register: 21
register int i;
}
}
}
}
// address: 0x800A0154
// line start: 612
// line end: 679
void DrawLBird__Fv_addr_800A0154() {
// register: 19
// size: 0x18
register struct BIRDSTRUCT *ThisBird;
// address: 0xFFFFFFC8
// size: 0x28
auto struct POLY_FT4 *Ft4;
// address: 0xFFFFFFD0
// size: 0xDC
auto struct CBlocks_dup_1 *gblock;
// register: 2
register int ScrXOff;
// register: 2
register int ScrYOff;
// register: 16
register int x;
// register: 17
register int y;
// address: 0xFFFFFFC0
// size: 0x8
auto struct RECT R;
// register: 30
// size: 0x68
register struct TextDat_dup_1 *Dat;
{
{
{
// register: 21
register int i;
}
}
}
}
// address: 0x800AC8E8
// line start: 834
// line end: 898
void DrawLBird__Fv_addr_800AC8E8() {
void DrawLBird__Fv() {
// register: 20
// size: 0x18
register struct BIRDSTRUCT *ThisBird;
@@ -578,6 +456,52 @@ void DrawLBird__Fv_addr_800AC8E8() {
}
// address: 0x800AC8C8
// line start: 834
// line end: 898
void DrawLBird__Fv_addr_800AC8C8() {
// register: 20
// size: 0x18
register struct BIRDSTRUCT *ThisBird;
// address: 0xFFFFFFC8
// size: 0x28
auto struct POLY_FT4 *Ft4;
// register: 30
// size: 0x108
register struct CBlocks *gblock;
// register: 2
register int ScrXOff;
// register: 2
register int ScrYOff;
// register: 19
register int x;
// register: 18
register int y;
// address: 0xFFFFFFC0
// size: 0x8
auto struct RECT R;
// address: 0xFFFFFFD0
// size: 0x70
auto struct TextDat *Dat;
{
{
{
// register: 22
register int i;
{
{
{
// register: 16
register int ot;
}
}
}
}
}
}
}
// address: 0x800AC850
// line start: 834
// line end: 898
@@ -662,10 +586,10 @@ void DrawLBird__Fv_addr_8009CC58() {
}
// address: 0x800AC8C8
// address: 0x800AC9BC
// line start: 834
// line end: 898
void DrawLBird__Fv_addr_800AC8C8() {
void DrawLBird__Fv_addr_800AC9BC() {
// register: 20
// size: 0x18
register struct BIRDSTRUCT *ThisBird;
@@ -674,7 +598,7 @@ void DrawLBird__Fv_addr_800AC8C8() {
auto struct POLY_FT4 *Ft4;
// register: 30
// size: 0x108
register struct CBlocks *gblock;
register struct CBlocks_dup_17 *gblock;
// register: 2
register int ScrXOff;
// register: 2
@@ -688,7 +612,7 @@ void DrawLBird__Fv_addr_800AC8C8() {
auto struct RECT R;
// address: 0xFFFFFFD0
// size: 0x70
auto struct TextDat *Dat;
auto struct TextDat_dup_17 *Dat;
{
{
{
@@ -708,6 +632,44 @@ void DrawLBird__Fv_addr_800AC8C8() {
}
// address: 0x8009CA00
// line start: 725
// line end: 787
void DrawLBird__Fv_addr_8009CA00() {
// register: 19
// size: 0x18
register struct BIRDSTRUCT *ThisBird;
// address: 0xFFFFFFC8
// size: 0x28
auto struct POLY_FT4 *Ft4;
// address: 0xFFFFFFD0
// size: 0xE0
auto struct CBlocks_dup_4 *gblock;
// register: 2
register int ScrXOff;
// register: 2
register int ScrYOff;
// register: 17
register int x;
// register: 18
register int y;
// address: 0xFFFFFFC0
// size: 0x8
auto struct RECT R;
// register: 30
// size: 0x6C
register struct TextDat *Dat;
{
{
{
// register: 21
register int i;
}
}
}
}
// address: 0x800A0D8C
// line start: 786
// line end: 848
@@ -746,24 +708,62 @@ void DrawLBird__Fv_addr_800A0D8C() {
}
// address: 0x8009CAC8
// line start: 595
// line end: 624
int GetBirdFrame__FP10BIRDSTRUCT(struct BIRDSTRUCT *b) {
// register: 5
register int banim;
// address: 0x800A0154
// line start: 612
// line end: 679
void DrawLBird__Fv_addr_800A0154() {
// register: 19
// size: 0x18
register struct BIRDSTRUCT *ThisBird;
// address: 0xFFFFFFC8
// size: 0x28
auto struct POLY_FT4 *Ft4;
// address: 0xFFFFFFD0
// size: 0xDC
auto struct CBlocks_dup_1 *gblock;
// register: 2
register int ScrXOff;
// register: 2
register int ScrYOff;
// register: 16
register int x;
// register: 17
register int y;
// address: 0xFFFFFFC0
// size: 0x8
auto struct RECT R;
// register: 30
// size: 0x68
register struct TextDat_dup_1 *Dat;
{
{
{
// register: 21
register int i;
}
}
}
}
// address: 0x800AC6CC
// line start: 715
// line end: 744
int GetBirdFrame__FP10BIRDSTRUCT_addr_800AC6CC(struct BIRDSTRUCT *b) {
int GetBirdFrame__FP10BIRDSTRUCT(struct BIRDSTRUCT *b) {
// register: 3
register int banim;
}
// address: 0x8009CAC8
// line start: 595
// line end: 624
int GetBirdFrame__FP10BIRDSTRUCT_addr_8009CAC8(struct BIRDSTRUCT *b) {
// register: 5
register int banim;
}
// address: 0x8009BE00
// line start: 170
// line end: 179
@@ -838,10 +838,24 @@ void ProcessBird__Fv() {
}
// address: 0x8009FCD0
// line start: 430
// line end: 446
void ProcessFlock__FP10BIRDSTRUCT(struct BIRDSTRUCT *leader) {
// register: 17
// size: 0x18
register struct BIRDSTRUCT *b;
{
// register: 18
register int i;
}
}
// address: 0x8009C768
// line start: 472
// line end: 491
void ProcessFlock__FP10BIRDSTRUCT(struct BIRDSTRUCT *leader) {
void ProcessFlock__FP10BIRDSTRUCT_addr_8009C768(struct BIRDSTRUCT *leader) {
// register: 19
// size: 0x18
register struct BIRDSTRUCT *b;
@@ -880,20 +894,6 @@ void ProcessFlock__FP10BIRDSTRUCT_addr_800AC3C0(struct BIRDSTRUCT *b) {
}
// address: 0x8009FCD0
// line start: 430
// line end: 446
void ProcessFlock__FP10BIRDSTRUCT_addr_8009FCD0(struct BIRDSTRUCT *leader) {
// register: 17
// size: 0x18
register struct BIRDSTRUCT *b;
{
// register: 18
register int i;
}
}
// address: 0x800AB3B4
// line start: 47
// line end: 51
@@ -912,89 +912,10 @@ void bscale__FP8POLY_FT4i(struct POLY_FT4 *Ft4, int height) {
}
// address: 0x800A0C80
// line start: 728
// line end: 747
void doshadow__FP10BIRDSTRUCTii(struct BIRDSTRUCT *b, int x, int y) {
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *Ft4;
// register: 19
// size: 0x6C
register struct TextDat_dup_14 *Dat;
}
// address: 0x800AC728
// line start: 775
// line end: 795
void doshadow__FP10BIRDSTRUCTii_addr_800AC728(struct BIRDSTRUCT *b, int x, int y) {
// register: 4
// size: 0x108
register struct CBlocks_dup_19 *gb;
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *Ft4;
// register: 20
// size: 0x70
register struct TextDat *Dat;
{
{
// register: 16
register int ot;
}
}
}
// address: 0x800AC894
// line start: 775
// line end: 795
void doshadow__FP10BIRDSTRUCTii_addr_800AC894(struct BIRDSTRUCT *b, int x, int y) {
// register: 4
// size: 0x108
register struct CBlocks_dup_17 *gb;
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *Ft4;
// register: 20
// size: 0x70
register struct TextDat_dup_17 *Dat;
{
{
// register: 16
register int ot;
}
}
}
// address: 0x800AC7A0
// line start: 775
// line end: 795
void doshadow__FP10BIRDSTRUCTii_addr_800AC7A0(struct BIRDSTRUCT *b, int x, int y) {
// register: 4
// size: 0x108
register struct CBlocks *gb;
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *Ft4;
// register: 20
// size: 0x70
register struct TextDat *Dat;
{
{
// register: 16
register int ot;
}
}
}
// address: 0x8009CB64
// line start: 630
// line end: 643
void doshadow__FP10BIRDSTRUCTii_addr_8009CB64(struct BIRDSTRUCT *b, int x, int y) {
void doshadow__FP10BIRDSTRUCTii(struct BIRDSTRUCT *b, int x, int y) {
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *Ft4;
@@ -1039,6 +960,50 @@ void doshadow__FP10BIRDSTRUCTii_addr_800AC7C0(struct BIRDSTRUCT *b, int x, int y
}
// address: 0x800AC728
// line start: 775
// line end: 795
void doshadow__FP10BIRDSTRUCTii_addr_800AC728(struct BIRDSTRUCT *b, int x, int y) {
// register: 4
// size: 0x108
register struct CBlocks_dup_19 *gb;
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *Ft4;
// register: 20
// size: 0x70
register struct TextDat *Dat;
{
{
// register: 16
register int ot;
}
}
}
// address: 0x800AC7A0
// line start: 775
// line end: 795
void doshadow__FP10BIRDSTRUCTii_addr_800AC7A0(struct BIRDSTRUCT *b, int x, int y) {
// register: 4
// size: 0x108
register struct CBlocks *gb;
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *Ft4;
// register: 20
// size: 0x70
register struct TextDat *Dat;
{
{
// register: 16
register int ot;
}
}
}
// address: 0x8009C8FC
// line start: 670
// line end: 684
@@ -1052,3 +1017,38 @@ void doshadow__FP10BIRDSTRUCTii_addr_8009C8FC(struct BIRDSTRUCT *b, int x, int y
}
// address: 0x800A0C80
// line start: 728
// line end: 747
void doshadow__FP10BIRDSTRUCTii_addr_800A0C80(struct BIRDSTRUCT *b, int x, int y) {
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *Ft4;
// register: 19
// size: 0x6C
register struct TextDat_dup_14 *Dat;
}
// address: 0x800AC894
// line start: 775
// line end: 795
void doshadow__FP10BIRDSTRUCTii_addr_800AC894(struct BIRDSTRUCT *b, int x, int y) {
// register: 4
// size: 0x108
register struct CBlocks_dup_17 *gb;
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *Ft4;
// register: 20
// size: 0x70
register struct TextDat_dup_17 *Dat;
{
{
// register: 16
register int ot;
}
}
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/block.cpp
+3104 -3358
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/block.h
+130 -152
View File
@@ -170,17 +170,10 @@ void CopyToGt4__9LittleGt4P8POLY_GT4(struct LittleGt4 *this, struct POLY_GT4 *Gt
}
// address: 0x80088CD4
// line start: 158
// line end: 158
void DumpItems__7CBlocks(struct CBlocks_dup_4 *this) {
}
// address: 0x80089634
// line start: 158
// line end: 158
void DumpItems__7CBlocks_addr_80089634(struct CBlocks *this) {
// address: 0x80091814
// line start: 230
// line end: 230
void DumpItems__7CBlocks(struct CBlocks_dup_19 *this) {
}
@@ -198,6 +191,20 @@ void DumpItems__7CBlocks_addr_8008BE50(struct CBlocks_dup_14 *this) {
}
// address: 0x80089634
// line start: 158
// line end: 158
void DumpItems__7CBlocks_addr_80089634(struct CBlocks *this) {
}
// address: 0x80088CD4
// line start: 158
// line end: 158
void DumpItems__7CBlocks_addr_80088CD4(struct CBlocks_dup_4 *this) {
}
// address: 0x8009198C
// line start: 230
// line end: 230
@@ -205,13 +212,6 @@ void DumpItems__7CBlocks_addr_8009198C(struct CBlocks_dup_17 *this) {
}
// address: 0x80091814
// line start: 230
// line end: 230
void DumpItems__7CBlocks_addr_80091814(struct CBlocks_dup_19 *this) {
}
// address: 0x800918BC
// line start: 230
// line end: 230
@@ -247,10 +247,17 @@ void DumpMonsters__7CBlocks_addr_800ADCE4(struct CBlocks *this) {
}
// address: 0x800918E0
// line start: 229
// line end: 229
void DumpObjs__7CBlocks(struct CBlocks_dup_18 *this) {
}
// address: 0x80091838
// line start: 229
// line end: 229
void DumpObjs__7CBlocks(struct CBlocks_dup_19 *this) {
void DumpObjs__7CBlocks_addr_80091838(struct CBlocks_dup_19 *this) {
}
@@ -261,17 +268,10 @@ void DumpObjs__7CBlocks_addr_8008BE74(struct CBlocks_dup_14 *this) {
}
// address: 0x800919B0
// line start: 229
// line end: 229
void DumpObjs__7CBlocks_addr_800919B0(struct CBlocks_dup_17 *this) {
}
// address: 0x800918E0
// line start: 229
// line end: 229
void DumpObjs__7CBlocks_addr_800918E0(struct CBlocks_dup_18 *this) {
// address: 0x8008CBAC
// line start: 157
// line end: 157
void DumpObjs__7CBlocks_addr_8008CBAC(struct CBlocks_dup_1 *this) {
}
@@ -289,10 +289,10 @@ void DumpObjs__7CBlocks_addr_80088CF8(struct CBlocks_dup_4 *this) {
}
// address: 0x8008CBAC
// line start: 157
// line end: 157
void DumpObjs__7CBlocks_addr_8008CBAC(struct CBlocks_dup_1 *this) {
// address: 0x800919B0
// line start: 229
// line end: 229
void DumpObjs__7CBlocks_addr_800919B0(struct CBlocks_dup_17 *this) {
}
@@ -304,14 +304,6 @@ struct TextDat_dup_14 *GetBlockTexDat__7CBlocks(struct CBlocks_dup_14 *this) {
}
// address: 0x800625B4
// size: 0x6C
// line start: 151
// line end: 151
struct TextDat *GetBlockTexDat__7CBlocks_addr_800625B4(struct CBlocks_dup_4 *this) {
}
// address: 0x80063BD0
// size: 0x6C
// line start: 151
@@ -320,6 +312,14 @@ struct TextDat *GetBlockTexDat__7CBlocks_addr_80063BD0(struct CBlocks *this) {
}
// address: 0x800625B4
// size: 0x6C
// line start: 151
// line end: 151
struct TextDat *GetBlockTexDat__7CBlocks_addr_800625B4(struct CBlocks_dup_4 *this) {
}
// address: 0x80075F44
// size: 0x6C
// line start: 151
@@ -416,14 +416,6 @@ struct TextDat *GetBlockTexDat__7CBlocks_addr_800764D8(struct CBlocks_dup_4 *thi
}
// address: 0x800764D8
// size: 0x6C
// line start: 151
// line end: 151
struct TextDat *GetBlockTexDat__7CBlocks_addr_800764D8_addr_800764D8(struct CBlocks *this) {
}
// address: 0x800773D8
// size: 0x6C
// line start: 151
@@ -601,10 +593,10 @@ int GetMaxOtPos__7CBlocks_addr_80098684() {
}
// address: 0x8008BEC0
// address: 0x80088D44
// line start: 117
// line end: 117
int GetNumOfBlocks__7CBlocks(struct CBlocks_dup_14 *this) {
int GetNumOfBlocks__7CBlocks(struct CBlocks_dup_4 *this) {
}
@@ -615,6 +607,13 @@ int GetNumOfBlocks__7CBlocks_addr_8008CBF8(struct CBlocks_dup_1 *this) {
}
// address: 0x8008BEC0
// line start: 117
// line end: 117
int GetNumOfBlocks__7CBlocks_addr_8008BEC0(struct CBlocks_dup_14 *this) {
}
// address: 0x800896A4
// line start: 117
// line end: 117
@@ -622,17 +621,10 @@ int GetNumOfBlocks__7CBlocks_addr_800896A4(struct CBlocks *this) {
}
// address: 0x80088D44
// line start: 117
// line end: 117
int GetNumOfBlocks__7CBlocks_addr_80088D44(struct CBlocks_dup_4 *this) {
}
// address: 0x80091938
// address: 0x800919FC
// line start: 177
// line end: 188
int GetOtPos__7CBlocksi(struct CBlocks *this, int LogicalY) {
int GetOtPos__7CBlocksi(struct CBlocks_dup_17 *this, int LogicalY) {
// register: 3
register int OtPos;
}
@@ -647,10 +639,10 @@ int GetOtPos__7CBlocksi_addr_8009192C(struct CBlocks_dup_18 *this, int LogicalY)
}
// address: 0x800919FC
// address: 0x80091938
// line start: 177
// line end: 188
int GetOtPos__7CBlocksi_addr_800919FC(struct CBlocks_dup_17 *this, int LogicalY) {
int GetOtPos__7CBlocksi_addr_80091938(struct CBlocks *this, int LogicalY) {
// register: 3
register int OtPos;
}
@@ -1159,10 +1151,10 @@ int GetOverlayOtBase__7CBlocks_addr_80082308() {
}
// address: 0x8008D3BC
// address: 0x8008AB6C
// line start: 126
// line end: 126
int GetPlrOt__7CBlocksi(struct CBlocks_dup_14 *this, int PlayerNum) {
int GetPlrOt__7CBlocksi(struct CBlocks *this, int PlayerNum) {
}
@@ -1173,10 +1165,10 @@ int GetPlrOt__7CBlocksi_addr_8008A2FC(struct CBlocks_dup_4 *this, int PlayerNum)
}
// address: 0x8008AB6C
// address: 0x8008D3BC
// line start: 126
// line end: 126
int GetPlrOt__7CBlocksi_addr_8008AB6C(struct CBlocks *this, int PlayerNum) {
int GetPlrOt__7CBlocksi_addr_8008D3BC(struct CBlocks_dup_14 *this, int PlayerNum) {
}
@@ -1187,17 +1179,17 @@ int GetPlrOt__7CBlocksi_addr_8008E088(struct CBlocks_dup_1 *this, int PlayerNum)
}
// address: 0x80091A34
// line start: 56
// line end: 69
void InitFromGt4__9LittleGt4P8POLY_GT4ii(struct LittleGt4_dup_17 *this, struct POLY_GT4 *Gt4, int nw, int nh) {
}
// address: 0x80089748
// line start: 47
// line end: 60
void InitFromGt4__9LittleGt4P8POLY_GT4ii_addr_80089748(struct LittleGt4 *this, struct POLY_GT4 *Gt4, int nw, int nh) {
void InitFromGt4__9LittleGt4P8POLY_GT4ii(struct LittleGt4 *this, struct POLY_GT4 *Gt4, int nw, int nh) {
}
// address: 0x80091A34
// line start: 56
// line end: 69
void InitFromGt4__9LittleGt4P8POLY_GT4ii_addr_80091A34(struct LittleGt4_dup_17 *this, struct POLY_GT4 *Gt4, int nw, int nh) {
}
@@ -1362,13 +1354,6 @@ void MoveToScrollTarget__7CBlocks_addr_8007207C(struct CBlocks_dup_4 *this) {
}
// address: 0x8007207C
// line start: 128
// line end: 128
void MoveToScrollTarget__7CBlocks_addr_8007207C_addr_8007207C(struct CBlocks *this) {
}
// address: 0x8007341C
// line start: 128
// line end: 128
@@ -1456,14 +1441,7 @@ void MoveToScrollTarget__7CBlocks_addr_80075908(struct CBlocks *this) {
// address: 0x80097008
// line start: 128
// line end: 128
void MoveToScrollTarget__7CBlocks_addr_80097008(struct CBlocks *this) {
}
// address: 0x80097008
// line start: 128
// line end: 128
void MoveToScrollTarget__7CBlocks_addr_80097008_addr_80097008(struct CBlocks_dup_4 *this) {
void MoveToScrollTarget__7CBlocks_addr_80097008(struct CBlocks_dup_4 *this) {
}
@@ -1502,17 +1480,24 @@ void MoveToScrollTarget__7CBlocks_addr_80099960(struct CBlocks *this) {
}
// address: 0x80088C84
// line start: 173
// line end: 173
void SetItemGraphics__7CBlocksi(struct CBlocks_dup_4 *this, int Id) {
// address: 0x8008CB38
// line start: 167
// line end: 167
void SetItemGraphics__7CBlocksi(struct CBlocks_dup_1 *this, int Id) {
}
// address: 0x8009186C
// address: 0x80088C84
// line start: 173
// line end: 173
void SetItemGraphics__7CBlocksi_addr_80088C84(struct CBlocks_dup_4 *this, int Id) {
}
// address: 0x8009193C
// line start: 261
// line end: 261
void SetItemGraphics__7CBlocksi_addr_8009186C(struct CBlocks_dup_18 *this, int Id) {
void SetItemGraphics__7CBlocksi_addr_8009193C(struct CBlocks_dup_17 *this, int Id) {
}
@@ -1523,13 +1508,6 @@ void SetItemGraphics__7CBlocksi_addr_800917C4(struct CBlocks_dup_19 *this, int I
}
// address: 0x8008CB38
// line start: 167
// line end: 167
void SetItemGraphics__7CBlocksi_addr_8008CB38(struct CBlocks_dup_1 *this, int Id) {
}
// address: 0x800895E4
// line start: 167
// line end: 167
@@ -1544,45 +1522,17 @@ void SetItemGraphics__7CBlocksi_addr_8008BE00(struct CBlocks_dup_14 *this, int I
}
// address: 0x8009193C
// address: 0x8009186C
// line start: 261
// line end: 261
void SetItemGraphics__7CBlocksi_addr_8009193C(struct CBlocks_dup_17 *this, int Id) {
}
// address: 0x8008CB60
// line start: 166
// line end: 166
void SetObjGraphics__7CBlocksi(struct CBlocks_dup_1 *this, int Id) {
}
// address: 0x80091964
// line start: 260
// line end: 260
void SetObjGraphics__7CBlocksi_addr_80091964(struct CBlocks_dup_17 *this, int Id) {
}
// address: 0x80088CAC
// line start: 172
// line end: 172
void SetObjGraphics__7CBlocksi_addr_80088CAC(struct CBlocks_dup_4 *this, int Id) {
}
// address: 0x80091894
// line start: 260
// line end: 260
void SetObjGraphics__7CBlocksi_addr_80091894(struct CBlocks_dup_18 *this, int Id) {
void SetItemGraphics__7CBlocksi_addr_8009186C(struct CBlocks_dup_18 *this, int Id) {
}
// address: 0x8008BE28
// line start: 172
// line end: 172
void SetObjGraphics__7CBlocksi_addr_8008BE28(struct CBlocks_dup_14 *this, int Id) {
void SetObjGraphics__7CBlocksi(struct CBlocks_dup_14 *this, int Id) {
}
@@ -1600,10 +1550,45 @@ void SetObjGraphics__7CBlocksi_addr_8008960C(struct CBlocks *this, int Id) {
}
// address: 0x8009267C
// line start: 139
// line end: 139
void SetTown__7CBlocksb(struct CBlocks_dup_14 *this, bool Val) {
// address: 0x80088CAC
// line start: 172
// line end: 172
void SetObjGraphics__7CBlocksi_addr_80088CAC(struct CBlocks_dup_4 *this, int Id) {
}
// address: 0x80091894
// line start: 260
// line end: 260
void SetObjGraphics__7CBlocksi_addr_80091894(struct CBlocks_dup_18 *this, int Id) {
}
// address: 0x8008CB60
// line start: 166
// line end: 166
void SetObjGraphics__7CBlocksi_addr_8008CB60(struct CBlocks_dup_1 *this, int Id) {
}
// address: 0x80091964
// line start: 260
// line end: 260
void SetObjGraphics__7CBlocksi_addr_80091964(struct CBlocks_dup_17 *this, int Id) {
}
// address: 0x8009C0B4
// line start: 212
// line end: 212
void SetTown__7CBlocksb(struct CBlocks_dup_19 *this, bool Val) {
}
// address: 0x8009C15C
// line start: 212
// line end: 212
void SetTown__7CBlocksb_addr_8009C15C(struct CBlocks_dup_18 *this, bool Val) {
}
@@ -1614,6 +1599,13 @@ void SetTown__7CBlocksb_addr_80092C24(struct CBlocks_dup_1 *this, bool Val) {
}
// address: 0x8009267C
// line start: 139
// line end: 139
void SetTown__7CBlocksb_addr_8009267C(struct CBlocks_dup_14 *this, bool Val) {
}
// address: 0x8008F074
// line start: 139
// line end: 139
@@ -1628,20 +1620,6 @@ void SetTown__7CBlocksb_addr_8009C230(struct CBlocks_dup_17 *this, bool Val) {
}
// address: 0x8009C0B4
// line start: 212
// line end: 212
void SetTown__7CBlocksb_addr_8009C0B4(struct CBlocks_dup_19 *this, bool Val) {
}
// address: 0x8009C15C
// line start: 212
// line end: 212
void SetTown__7CBlocksb_addr_8009C15C(struct CBlocks_dup_18 *this, bool Val) {
}
// address: 0x8008F714
// line start: 139
// line end: 139
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/cardcore.cpp
+9 -9
View File
@@ -42,20 +42,20 @@ void CardUpdateTask__FP4TASK_addr_800A515C(struct TASK *T) {
}
// address: 0x8009AA70
// line start: 286
// line end: 304
// address: 0x800A5254
// line start: 417
// line end: 443
void CheckSavedOptions__Fv() {
// register: 5
// register: 2
register int option_file;
}
// address: 0x800A5254
// line start: 417
// line end: 443
void CheckSavedOptions__Fv_addr_800A5254() {
// register: 2
// address: 0x8009AA70
// line start: 286
// line end: 304
void CheckSavedOptions__Fv_addr_8009AA70() {
// register: 5
register int option_file;
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/cdio.cpp
+93 -93
View File
@@ -2,33 +2,10 @@
#include "types.h"
// address: 0x80083C34
// line start: 266
// line end: 293
bool CD_GetCdlFILE__FPCcP7CdlFILE(char *Name, struct CdlFILE *RetFile) {
// address: 0xFFFFFEB8
// size: 0x100
auto char SearchBuffer[256];
// register: 17
register int pos;
// register: 3
register int c;
// register: 16
register int size;
// address: 0xFFFFFFB8
// size: 0x19
auto char Monkey[25];
{
// register: 3
register int i;
}
}
// address: 0x8007FD30
// line start: 254
// line end: 281
bool CD_GetCdlFILE__FPCcP7CdlFILE_addr_8007FD30(char *Name, struct CdlFILE *RetFile) {
bool CD_GetCdlFILE__FPCcP7CdlFILE(char *Name, struct CdlFILE *RetFile) {
// address: 0xFFFFFF98
// size: 0x19
auto char SearchBuffer[25];
@@ -58,6 +35,29 @@ bool CD_GetCdlFILE__FPCcP7CdlFILE_addr_80086C0C(char *Name, struct CdlFILE *RetF
}
// address: 0x80083C34
// line start: 266
// line end: 293
bool CD_GetCdlFILE__FPCcP7CdlFILE_addr_80083C34(char *Name, struct CdlFILE *RetFile) {
// address: 0xFFFFFEB8
// size: 0x100
auto char SearchBuffer[256];
// register: 17
register int pos;
// register: 3
register int c;
// register: 16
register int size;
// address: 0xFFFFFFB8
// size: 0x19
auto char Monkey[25];
{
// register: 3
register int i;
}
}
// address: 0x8007FBD0
// line start: 143
// line end: 153
@@ -100,11 +100,11 @@ bool LoAsyncStreamFile__4CdIOPCciPFPUciib_bii(struct CdIO *this, char *Name, int
}
// address: 0x80081FF8
// line start: 381
// line end: 421
bool LoAsyncStreamFile__4CdIOPCciPFPUciib_bii_addr_80081FF8(struct CdIO *this, char *Name, int Slice, bool (*Func)(), int Offset, int Size) {
// register: 19
// address: 0x80081C0C
// line start: 375
// line end: 410
bool LoAsyncStreamFile__4CdIOPCciPFPUciib_bii_addr_80081C0C(struct CdIO *this, char *Name, int Slice, bool (*Func)(), int Offset, int Size) {
// register: 20
register long hndText;
// register: 18
register unsigned char *Dest;
@@ -117,11 +117,11 @@ bool LoAsyncStreamFile__4CdIOPCciPFPUciib_bii_addr_80081FF8(struct CdIO *this, c
}
// address: 0x80081C0C
// line start: 375
// line end: 410
bool LoAsyncStreamFile__4CdIOPCciPFPUciib_bii_addr_80081C0C(struct CdIO *this, char *Name, int Slice, bool (*Func)(), int Offset, int Size) {
// register: 20
// address: 0x80081FF8
// line start: 381
// line end: 421
bool LoAsyncStreamFile__4CdIOPCciPFPUciib_bii_addr_80081FF8(struct CdIO *this, char *Name, int Slice, bool (*Func)(), int Offset, int Size) {
// register: 19
register long hndText;
// register: 18
register unsigned char *Dest;
@@ -157,10 +157,68 @@ void LoStreamCallBack__Fi(int handle) {
}
// address: 0x80086C5C
// line start: 292
// line end: 373
bool LoStreamFile__4CdIOPCciPFPUciib_bii(struct CdIO *this, char *Name, int Slice, bool (*Func)(), int Offset, int Size) {
// address: 0xFFFFFFC8
auto unsigned char *Dest;
// address: 0xFFFFFFD0
auto int OrigSize;
// register: 19
register unsigned long Pos;
// register: 23
// size: 0x14
register struct STRHDR *sh;
// register: 16
register int ah;
// register: 22
register unsigned char Count;
// register: 30
register int Lumpfile;
{
// register: 17
register int SizeToRead;
// register: 20
register unsigned char *ptr;
}
}
// address: 0x80081D1C
// line start: 300
// line end: 372
bool LoStreamFile__4CdIOPCciPFPUciib_bii_addr_80081D1C(struct CdIO *this, char *Name, int Slice, bool (*Func)(), int Offset, int Size) {
// register: 30
register unsigned char *Dest;
// address: 0xFFFFFFB8
auto int OrigSize;
// register: 21
register unsigned long Pos;
// address: 0xFFFFFFC0
// size: 0x14
auto struct STRHDR *sh;
// register: 17
register int ah;
// address: 0xFFFFFFC8
auto unsigned char Count;
{
// register: 16
register int SizeToRead;
// register: 18
register unsigned char *ptr;
{
// register: 17
register int i;
}
}
}
// address: 0x8008136C
// line start: 290
// line end: 364
bool LoStreamFile__4CdIOPCciPFPUciib_bii(struct CdIO *this, char *Name, int Slice, bool (*Func)(), int Offset, int Size) {
bool LoStreamFile__4CdIOPCciPFPUciib_bii_addr_8008136C(struct CdIO *this, char *Name, int Slice, bool (*Func)(), int Offset, int Size) {
// register: 23
register unsigned char *Dest;
// register: 30
@@ -217,36 +275,6 @@ bool LoStreamFile__4CdIOPCciPFPUciib_bii_addr_8007FE7C(struct CdIO *this, char *
}
// address: 0x80081D1C
// line start: 300
// line end: 372
bool LoStreamFile__4CdIOPCciPFPUciib_bii_addr_80081D1C(struct CdIO *this, char *Name, int Slice, bool (*Func)(), int Offset, int Size) {
// register: 30
register unsigned char *Dest;
// address: 0xFFFFFFB8
auto int OrigSize;
// register: 21
register unsigned long Pos;
// address: 0xFFFFFFC0
// size: 0x14
auto struct STRHDR *sh;
// register: 17
register int ah;
// address: 0xFFFFFFC8
auto unsigned char Count;
{
// register: 16
register int SizeToRead;
// register: 18
register unsigned char *ptr;
{
// register: 17
register int i;
}
}
}
// address: 0x80083D80
// line start: 300
// line end: 372
@@ -275,34 +303,6 @@ bool LoStreamFile__4CdIOPCciPFPUciib_bii_addr_80083D80(struct CdIO *this, char *
}
// address: 0x80086C5C
// line start: 292
// line end: 373
bool LoStreamFile__4CdIOPCciPFPUciib_bii_addr_80086C5C(struct CdIO *this, char *Name, int Slice, bool (*Func)(), int Offset, int Size) {
// address: 0xFFFFFFC8
auto unsigned char *Dest;
// address: 0xFFFFFFD0
auto int OrigSize;
// register: 19
register unsigned long Pos;
// register: 23
// size: 0x14
register struct STRHDR *sh;
// register: 16
register int ah;
// register: 22
register unsigned char Count;
// register: 30
register int Lumpfile;
{
// register: 17
register int SizeToRead;
// register: 20
register unsigned char *ptr;
}
}
// address: 0x8007FB34
// size: 0x14
// line start: 120
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/corefmv.cpp
+27 -27
View File
@@ -38,22 +38,10 @@ short PlayFMV__FPCc_addr_8009CC88(char *str) {
}
// address: 0x800ACCA8
// line start: 95
// line end: 192
short PlayFMV__FPcii(char *str, int w, int h) {
// register: 17
register short RetVal;
// register: 21
// size: 0x4
register enum OVER_TYPE CurrentOver;
}
// address: 0x8009FDA4
// line start: 90
// line end: 125
short PlayFMV__FPcii_addr_8009FDA4(char *str, int w, int h) {
short PlayFMV__FPcii(char *str, int w, int h) {
// register: 16
register short RetVal;
// register: 19
@@ -62,10 +50,35 @@ short PlayFMV__FPcii_addr_8009FDA4(char *str, int w, int h) {
}
// address: 0x800ACCA8
// line start: 95
// line end: 192
short PlayFMV__FPcii_addr_800ACCA8(char *str, int w, int h) {
// register: 17
register short RetVal;
// register: 21
// size: 0x4
register enum OVER_TYPE CurrentOver;
}
// address: 0x8009FE64
// line start: 130
// line end: 144
void play_movie(char *pszMovie) {
{
{
{
}
}
}
}
// address: 0x8009CF64
// line start: 178
// line end: 191
void play_movie(char *pszMovie, unsigned char bAllowCancel) {
void play_movie_addr_8009CF64(char *pszMovie, unsigned char bAllowCancel) {
// register: 16
// size: 0x20
register struct StrInfo *ptr;
@@ -91,16 +104,3 @@ void play_movie_addr_8009CD30(char *pszMovie) {
}
// address: 0x8009FE64
// line start: 130
// line end: 144
void play_movie_addr_8009FE64(char *pszMovie) {
{
{
{
}
}
}
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/cplayer.cpp
+902 -986
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/cplayer.h
+109 -109
View File
@@ -2,17 +2,17 @@
#include "types.h"
// address: 0x8009645C
// address: 0x800962E4
// line start: 76
// line end: 80
int GetDatMaxSize__7CPlayer(struct CPlayer_dup_17 *this) {
int GetDatMaxSize__7CPlayer(struct CPlayer_dup_19 *this) {
}
// address: 0x8009638C
// address: 0x8009645C
// line start: 76
// line end: 80
int GetDatMaxSize__7CPlayer_addr_8009638C(struct CPlayer_dup_18 *this) {
int GetDatMaxSize__7CPlayer_addr_8009645C(struct CPlayer_dup_17 *this) {
}
@@ -23,24 +23,17 @@ int GetDatMaxSize__7CPlayer_addr_80096398(struct CPlayer *this) {
}
// address: 0x800962E4
// address: 0x8009638C
// line start: 76
// line end: 80
int GetDatMaxSize__7CPlayer_addr_800962E4(struct CPlayer_dup_19 *this) {
}
// address: 0x80096DCC
// line start: 60
// line end: 60
int GetLastOtPos__C7CPlayer(struct CPlayer_dup_14 *this) {
int GetDatMaxSize__7CPlayer_addr_8009638C(struct CPlayer_dup_18 *this) {
}
// address: 0x800A05A8
// line start: 60
// line end: 60
int GetLastOtPos__C7CPlayer_addr_800A05A8(struct CPlayer_dup_18 *this) {
int GetLastOtPos__C7CPlayer(struct CPlayer_dup_18 *this) {
}
@@ -51,6 +44,13 @@ int GetLastOtPos__C7CPlayer_addr_800A0510(struct CPlayer_dup_19 *this) {
}
// address: 0x800649AC
// line start: 60
// line end: 60
int GetLastOtPos__C7CPlayer_addr_800649AC(struct CPlayer_dup_1 *this) {
}
// address: 0x80061C0C
// line start: 60
// line end: 60
@@ -58,6 +58,13 @@ int GetLastOtPos__C7CPlayer_addr_80061C0C(struct CPlayer *this) {
}
// address: 0x80096DCC
// line start: 60
// line end: 60
int GetLastOtPos__C7CPlayer_addr_80096DCC(struct CPlayer_dup_14 *this) {
}
// address: 0x800A067C
// line start: 60
// line end: 60
@@ -65,13 +72,6 @@ int GetLastOtPos__C7CPlayer_addr_800A067C(struct CPlayer_dup_17 *this) {
}
// address: 0x800649AC
// line start: 60
// line end: 60
int GetLastOtPos__C7CPlayer_addr_800649AC(struct CPlayer_dup_1 *this) {
}
// address: 0x8005F2A4
// line start: 60
// line end: 60
@@ -303,31 +303,24 @@ int GetLastOtPos__C7CPlayer_addr_80075924(struct CPlayer *this) {
}
// address: 0x800613D0
// line start: 58
// line end: 58
int GetLastScrX__C7CPlayer(struct CPlayer_dup_14 *this) {
}
// address: 0x80061C24
// line start: 58
// line end: 58
int GetLastScrX__C7CPlayer_addr_80061C24(struct CPlayer *this) {
}
// address: 0x800671BC
// line start: 58
// line end: 58
int GetLastScrX__C7CPlayer_addr_800671BC(struct CPlayer_dup_17 *this) {
}
// address: 0x80067030
// line start: 58
// line end: 58
int GetLastScrX__C7CPlayer_addr_80067030(struct CPlayer_dup_19 *this) {
int GetLastScrX__C7CPlayer(struct CPlayer_dup_19 *this) {
}
// address: 0x800613D0
// line start: 58
// line end: 58
int GetLastScrX__C7CPlayer_addr_800613D0(struct CPlayer_dup_14 *this) {
}
// address: 0x800649C4
// line start: 58
// line end: 58
int GetLastScrX__C7CPlayer_addr_800649C4(struct CPlayer_dup_1 *this) {
}
@@ -338,10 +331,17 @@ int GetLastScrX__C7CPlayer_addr_800670F8(struct CPlayer_dup_18 *this) {
}
// address: 0x800649C4
// address: 0x800671BC
// line start: 58
// line end: 58
int GetLastScrX__C7CPlayer_addr_800649C4(struct CPlayer_dup_1 *this) {
int GetLastScrX__C7CPlayer_addr_800671BC(struct CPlayer_dup_17 *this) {
}
// address: 0x80061C24
// line start: 58
// line end: 58
int GetLastScrX__C7CPlayer_addr_80061C24(struct CPlayer *this) {
}
@@ -527,17 +527,17 @@ int GetLastScrX__C7CPlayer_addr_80075888(struct CPlayer *this) {
}
// address: 0x800649B8
// address: 0x800613C4
// line start: 59
// line end: 59
int GetLastScrY__C7CPlayer(struct CPlayer_dup_1 *this) {
int GetLastScrY__C7CPlayer(struct CPlayer_dup_14 *this) {
}
// address: 0x80067024
// address: 0x800649B8
// line start: 59
// line end: 59
int GetLastScrY__C7CPlayer_addr_80067024(struct CPlayer_dup_19 *this) {
int GetLastScrY__C7CPlayer_addr_800649B8(struct CPlayer_dup_1 *this) {
}
@@ -548,13 +548,6 @@ int GetLastScrY__C7CPlayer_addr_800670EC(struct CPlayer_dup_18 *this) {
}
// address: 0x800613C4
// line start: 59
// line end: 59
int GetLastScrY__C7CPlayer_addr_800613C4(struct CPlayer_dup_14 *this) {
}
// address: 0x800671B0
// line start: 59
// line end: 59
@@ -569,6 +562,13 @@ int GetLastScrY__C7CPlayer_addr_80061C18(struct CPlayer *this) {
}
// address: 0x80067024
// line start: 59
// line end: 59
int GetLastScrY__C7CPlayer_addr_80067024(struct CPlayer_dup_19 *this) {
}
// address: 0x8007D2D8
// line start: 59
// line end: 59
@@ -751,43 +751,27 @@ int GetLastScrY__C7CPlayer_addr_80075930(struct CPlayer *this) {
}
// address: 0x800A0558
// size: 0x90
// line start: 64
// line end: 66
struct CPlayer_dup_18 *GetPlayer__7CPlayeri(int PNum) {
}
// address: 0x80061BBC
// size: 0x84
// line start: 63
// line end: 65
struct CPlayer *GetPlayer__7CPlayeri_addr_80061BBC(int PNum) {
}
// address: 0x800A062C
// size: 0x90
// line start: 64
// line end: 66
struct CPlayer_dup_17 *GetPlayer__7CPlayeri_addr_800A062C(int PNum) {
}
// address: 0x8006495C
// size: 0x80
// line start: 63
// line end: 65
struct CPlayer_dup_1 *GetPlayer__7CPlayeri_addr_8006495C(int PNum) {
}
// address: 0x80096D7C
// size: 0x84
// line start: 63
// line end: 65
struct CPlayer_dup_14 *GetPlayer__7CPlayeri_addr_80096D7C(int PNum) {
struct CPlayer_dup_14 *GetPlayer__7CPlayeri(int PNum) {
}
// address: 0x800A04C0
// size: 0x90
// line start: 64
// line end: 66
struct CPlayer_dup_19 *GetPlayer__7CPlayeri_addr_800A04C0(int PNum) {
}
// address: 0x800A0558
// size: 0x90
// line start: 64
// line end: 66
struct CPlayer_dup_18 *GetPlayer__7CPlayeri_addr_800A0558(int PNum) {
}
@@ -799,11 +783,27 @@ struct CPlayer *GetPlayer__7CPlayeri_addr_800A0574(int PNum) {
}
// address: 0x800A04C0
// address: 0x8006495C
// size: 0x80
// line start: 63
// line end: 65
struct CPlayer_dup_1 *GetPlayer__7CPlayeri_addr_8006495C(int PNum) {
}
// address: 0x800A062C
// size: 0x90
// line start: 64
// line end: 66
struct CPlayer_dup_19 *GetPlayer__7CPlayeri_addr_800A04C0(int PNum) {
struct CPlayer_dup_17 *GetPlayer__7CPlayeri_addr_800A062C(int PNum) {
}
// address: 0x80061BBC
// size: 0x84
// line start: 63
// line end: 65
struct CPlayer *GetPlayer__7CPlayeri_addr_80061BBC(int PNum) {
}
@@ -1103,17 +1103,10 @@ struct CPlayer_dup_14 *GetPlayer__7CPlayeri_addr_80076050(int PNum) {
}
// address: 0x8009C150
// address: 0x8009C0A8
// line start: 55
// line end: 55
int GetTexId__7CPlayer(struct CPlayer_dup_18 *this) {
}
// address: 0x8009C224
// line start: 55
// line end: 55
int GetTexId__7CPlayer_addr_8009C224(struct CPlayer_dup_17 *this) {
int GetTexId__7CPlayer(struct CPlayer_dup_19 *this) {
}
@@ -1124,17 +1117,10 @@ int GetTexId__7CPlayer_addr_80092670(struct CPlayer_dup_14 *this) {
}
// address: 0x8009C0A8
// address: 0x8009C150
// line start: 55
// line end: 55
int GetTexId__7CPlayer_addr_8009C0A8(struct CPlayer_dup_19 *this) {
}
// address: 0x8008F708
// line start: 55
// line end: 55
int GetTexId__7CPlayer_addr_8008F708(struct CPlayer *this) {
int GetTexId__7CPlayer_addr_8009C150(struct CPlayer_dup_18 *this) {
}
@@ -1145,3 +1131,17 @@ int GetTexId__7CPlayer_addr_80092C18(struct CPlayer_dup_1 *this) {
}
// address: 0x8008F708
// line start: 55
// line end: 55
int GetTexId__7CPlayer_addr_8008F708(struct CPlayer *this) {
}
// address: 0x8009C224
// line start: 55
// line end: 55
int GetTexId__7CPlayer_addr_8009C224(struct CPlayer_dup_17 *this) {
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/creature.cpp
+44 -44
View File
@@ -2,10 +2,45 @@
#include "types.h"
// address: 0x800949BC
// address: 0x80094388
// line start: 87
// line end: 136
bool TryCreaturePrint__Fiiiiiii(int nMonster, int blockr, int blockg, int blockb, int OtPos, int ScrX, int ScrY) {
// register: 16
// size: 0x28
register struct POLY_FT4 *ShadFt4;
// register: 2
// size: 0x28
register struct POLY_FT4 *Ft4;
{
{
// register: 18
// size: 0x70
register struct MonsterStruct *MyMonst;
// register: 19
// size: 0x6C
register struct TextDat_dup_14 *CMonstGraphics;
// register: 2
register int Frame;
// register: 17
register int Action;
// register: 16
register int Dir;
// register: 16
register int PhysFrame;
// register: 21
register int ScrXOff;
// register: 20
register int ScrYOff;
}
}
}
// address: 0x800949BC
// line start: 87
// line end: 136
bool TryCreaturePrint__Fiiiiiii_addr_800949BC(int nMonster, int blockr, int blockg, int blockb, int OtPos, int ScrX, int ScrY) {
// register: 16
// size: 0x28
register struct POLY_FT4 *ShadFt4;
@@ -72,41 +107,6 @@ bool TryCreaturePrint__Fiiiiiii_addr_800914AC(int nMonster, int blockr, int bloc
}
// address: 0x80094388
// line start: 87
// line end: 136
bool TryCreaturePrint__Fiiiiiii_addr_80094388(int nMonster, int blockr, int blockg, int blockb, int OtPos, int ScrX, int ScrY) {
// register: 16
// size: 0x28
register struct POLY_FT4 *ShadFt4;
// register: 2
// size: 0x28
register struct POLY_FT4 *Ft4;
{
{
// register: 18
// size: 0x70
register struct MonsterStruct *MyMonst;
// register: 19
// size: 0x6C
register struct TextDat_dup_14 *CMonstGraphics;
// register: 2
register int Frame;
// register: 17
register int Action;
// register: 16
register int Dir;
// register: 16
register int PhysFrame;
// register: 21
register int ScrXOff;
// register: 20
register int ScrYOff;
}
}
}
// address: 0x80091710
// line start: 147
// line end: 202
@@ -114,17 +114,10 @@ void TryWater__FiiP8POLY_GT4i(int BlockBase, int BlockNum, struct POLY_GT4 *Dest
}
// address: 0x80093FEC
// line start: 188
// line end: 217
void nightgfx__FibiP8POLY_GT4i(int BlockBase, bool water, int BlockNum, struct POLY_GT4 *DestGt4, int MyOt) {
}
// address: 0x800918BC
// line start: 205
// line end: 230
void nightgfx__FibiP8POLY_GT4i_addr_800918BC(int BlockBase, bool water, int BlockNum, struct POLY_GT4 *DestGt4, int MyOt) {
void nightgfx__FibiP8POLY_GT4i(int BlockBase, bool water, int BlockNum, struct POLY_GT4 *DestGt4, int MyOt) {
{
{
{
@@ -144,3 +137,10 @@ void nightgfx__FibiP8POLY_GT4i_addr_800918BC(int BlockBase, bool water, int Bloc
}
// address: 0x80093FEC
// line start: 188
// line end: 217
void nightgfx__FibiP8POLY_GT4i_addr_80093FEC(int BlockBase, bool water, int BlockNum, struct POLY_GT4 *DestGt4, int MyOt) {
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/ctrl.cpp
+210 -210
View File
@@ -2,9 +2,9 @@
#include "types.h"
// address: 0x80092554
// line start: 738
// line end: 814
// address: 0x800936E4
// line start: 690
// line end: 768
void DrawCtrlSetup__Fv() {
// register: 16
register int i;
@@ -12,24 +12,18 @@ void DrawCtrlSetup__Fv() {
register int pnum;
{
{
// register: 17
register int lena;
// register: 2
register int len;
{
{
// register: 2
register int len;
{
// register: 17
register int lena;
// register: 2
register int len;
{
{
// register: 19
register int oldDot;
// register: 18
register int OldPrintOT;
}
}
}
// register: 20
register int oldDot;
// register: 19
register int OldPrintOT;
// register: 18
register bool oldbuttoncol;
}
}
}
@@ -64,35 +58,6 @@ void DrawCtrlSetup__Fv_addr_800931F4() {
}
// address: 0x800936E4
// line start: 690
// line end: 768
void DrawCtrlSetup__Fv_addr_800936E4() {
// register: 16
register int i;
// register: 20
register int pnum;
{
{
// register: 17
register int lena;
// register: 2
register int len;
{
{
// register: 20
register int oldDot;
// register: 19
register int OldPrintOT;
// register: 18
register bool oldbuttoncol;
}
}
}
}
}
// address: 0x80092FB4
// line start: 663
// line end: 737
@@ -124,33 +89,20 @@ void DrawCtrlSetup__Fv_addr_80092FB4() {
}
// address: 0x8009098C
// line start: 620
// line end: 710
void DrawCtrlSetup__Fv_addr_8009098C() {
// address: 0x80092554
// line start: 738
// line end: 814
void DrawCtrlSetup__Fv_addr_80092554() {
// register: 16
register int i;
// register: 18
register int pnum;
{
{
}
}
}
// address: 0x80090234
// line start: 647
// line end: 719
void DrawCtrlSetup__Fv_addr_80090234() {
// register: 16
register int i;
// register: 22
// register: 20
register int pnum;
{
{
{
{
// register: 2
register int len;
{
// register: 17
register int lena;
@@ -201,10 +153,65 @@ void DrawCtrlSetup__Fv_addr_8009D2DC() {
}
// address: 0x80090234
// line start: 647
// line end: 719
void DrawCtrlSetup__Fv_addr_80090234() {
// register: 16
register int i;
// register: 22
register int pnum;
{
{
{
{
{
// register: 17
register int lena;
// register: 2
register int len;
{
{
// register: 19
register int oldDot;
// register: 18
register int OldPrintOT;
}
}
}
}
}
}
}
}
// address: 0x8009098C
// line start: 620
// line end: 710
void DrawCtrlSetup__Fv_addr_8009098C() {
// register: 16
register int i;
// register: 18
register int pnum;
{
{
}
}
}
// address: 0x800918B8
// line start: 275
// line end: 376
unsigned char Init_ctrl_pos__Fv() {
}
// address: 0x8008F190
// line start: 236
// line end: 333
unsigned char Init_ctrl_pos__Fv() {
unsigned char Init_ctrl_pos__Fv_addr_8008F190() {
// register: 22
// size: 0x6C
register struct CPad_dup_4 *Pad;
@@ -235,13 +242,6 @@ unsigned char Init_ctrl_pos__Fv() {
}
// address: 0x800918B8
// line start: 275
// line end: 376
unsigned char Init_ctrl_pos__Fv_addr_800918B8() {
}
// address: 0x8008F834
// line start: 173
// line end: 285
@@ -276,69 +276,10 @@ unsigned char Init_ctrl_pos__Fv_addr_8008F834() {
}
// address: 0x80092018
// line start: 620
// line end: 735
void PrintCtrlString__FiiUcic(int x, int y, unsigned char cjustflag, int str_num, int col) {
// register: 18
// size: 0x10
register struct KEY_ASSIGNS *ta;
// register: 2
register int i;
// address: 0xFFFFFFC8
auto unsigned char r;
// address: 0xFFFFFFD0
auto unsigned char g;
// register: 23
register unsigned char b;
// register: 19
register int str;
// register: 21
register int len;
{
{
// register: 4
register int x1;
// register: 22
register int x2;
// register: 5
register int nlen;
}
}
}
// address: 0x80090338
// line start: 495
// line end: 615
void PrintCtrlString__FiiUcic_addr_80090338(int x, int y, unsigned char cjustflag, int str_num, int col) {
// register: 6
register int i;
// address: 0xFFFFFFC0
auto unsigned char r;
// address: 0xFFFFFFC8
auto unsigned char g;
// address: 0xFFFFFFD0
auto unsigned char b;
// register: 4
register int str;
// register: 18
register int len;
{
{
// register: 4
register int x1;
// register: 30
register int x2;
}
}
}
// address: 0x8009CD88
// line start: 793
// line end: 914
void PrintCtrlString__FiiUcic_addr_8009CD88(int x, int y, unsigned char cjustflag, int str_num, int col) {
void PrintCtrlString__FiiUcic(int x, int y, unsigned char cjustflag, int str_num, int col) {
// register: 17
// size: 0x10
register struct KEY_ASSIGNS *ta;
@@ -369,31 +310,33 @@ void PrintCtrlString__FiiUcic_addr_8009CD88(int x, int y, unsigned char cjustfla
}
// address: 0x8008FD24
// line start: 539
// line end: 644
void PrintCtrlString__FiiUcic_addr_8008FD24(int x, int y, unsigned char cjustflag, int str_num, int col) {
// register: 22
// address: 0x80092018
// line start: 620
// line end: 735
void PrintCtrlString__FiiUcic_addr_80092018(int x, int y, unsigned char cjustflag, int str_num, int col) {
// register: 18
// size: 0x10
register struct KEY_ASSIGNS *ta;
// register: 2
register int i;
// address: 0xFFFFFFC0
auto unsigned char r;
// address: 0xFFFFFFC8
auto unsigned char g;
auto unsigned char r;
// address: 0xFFFFFFD0
auto unsigned char b;
// register: 4
auto unsigned char g;
// register: 23
register unsigned char b;
// register: 19
register int str;
// register: 5
// register: 21
register int len;
{
{
// register: 4
register int x1;
// register: 23
// register: 22
register int x2;
// register: 5
register int nlen;
}
}
}
@@ -429,17 +372,74 @@ void PrintCtrlString__FiiUcic_addr_80091CA8(int x, int y, unsigned char cjustfla
}
// address: 0x80091DEC
// line start: 281
// line end: 292
bool RemoveCtrlScreen__Fv() {
// address: 0x80090338
// line start: 495
// line end: 615
void PrintCtrlString__FiiUcic_addr_80090338(int x, int y, unsigned char cjustflag, int str_num, int col) {
// register: 6
register int i;
// address: 0xFFFFFFC0
auto unsigned char r;
// address: 0xFFFFFFC8
auto unsigned char g;
// address: 0xFFFFFFD0
auto unsigned char b;
// register: 4
register int str;
// register: 18
register int len;
{
{
// register: 4
register int x1;
// register: 30
register int x2;
}
}
}
// address: 0x8008FD24
// line start: 539
// line end: 644
void PrintCtrlString__FiiUcic_addr_8008FD24(int x, int y, unsigned char cjustflag, int str_num, int col) {
// register: 22
// size: 0x10
register struct KEY_ASSIGNS *ta;
// register: 2
register int i;
// address: 0xFFFFFFC0
auto unsigned char r;
// address: 0xFFFFFFC8
auto unsigned char g;
// address: 0xFFFFFFD0
auto unsigned char b;
// register: 4
register int str;
// register: 5
register int len;
{
{
// register: 4
register int x1;
// register: 23
register int x2;
}
}
}
// address: 0x8008F7EC
// line start: 164
// line end: 168
void RemoveCtrlScreen__Fv_addr_8008F7EC() {
void RemoveCtrlScreen__Fv() {
}
// address: 0x80091DEC
// line start: 281
// line end: 292
bool RemoveCtrlScreen__Fv_addr_80091DEC() {
}
@@ -555,18 +555,6 @@ int get_key_pad__Fi(int n) {
}
// address: 0x8008FA30
// line start: 210
// line end: 220
int get_key_pad__Fi_addr_8008FA30(int n) {
// register: 3
register int i;
// register: 5
// size: 0xC
register struct pad_assigns *pa;
}
// address: 0x8008F108
// line start: 210
// line end: 220
@@ -579,22 +567,22 @@ int get_key_pad__Fi_addr_8008F108(int n) {
}
// address: 0x80091B94
// line start: 475
// line end: 613
unsigned char main_ctrl_setup__Fv() {
// register: 17
// size: 0x6C
register struct CPad *Pad;
// address: 0x8008FA30
// line start: 210
// line end: 220
int get_key_pad__Fi_addr_8008FA30(int n) {
// register: 3
register int i;
// register: 5
register int lv;
// size: 0xC
register struct pad_assigns *pa;
}
// address: 0x8009C8AC
// line start: 587
// line end: 786
unsigned char main_ctrl_setup__Fv_addr_8009C8AC() {
unsigned char main_ctrl_setup__Fv() {
// register: 17
// size: 0xEC
register struct CPad_dup_17 *Pad;
@@ -603,30 +591,18 @@ unsigned char main_ctrl_setup__Fv_addr_8009C8AC() {
}
// address: 0x80092C7C
// line start: 436
// line end: 586
unsigned char main_ctrl_setup__Fv_addr_80092C7C() {
// address: 0x8009C7D8
// line start: 587
// line end: 786
unsigned char main_ctrl_setup__Fv_addr_8009C7D8() {
// register: 17
// size: 0x6C
// size: 0xEC
register struct CPad *Pad;
// register: 16
register int lv;
}
// address: 0x8008F9BC
// line start: 432
// line end: 532
unsigned char main_ctrl_setup__Fv_addr_8008F9BC() {
// register: 16
// size: 0x6C
register struct CPad_dup_4 *Pad;
// register: 5
register int lv;
}
// address: 0x800900A8
// line start: 391
// line end: 488
@@ -639,18 +615,42 @@ unsigned char main_ctrl_setup__Fv_addr_800900A8() {
}
// address: 0x8009C7D8
// line start: 587
// line end: 786
unsigned char main_ctrl_setup__Fv_addr_8009C7D8() {
// address: 0x80092C7C
// line start: 436
// line end: 586
unsigned char main_ctrl_setup__Fv_addr_80092C7C() {
// register: 17
// size: 0xEC
// size: 0x6C
register struct CPad *Pad;
// register: 16
register int lv;
}
// address: 0x80091B94
// line start: 475
// line end: 613
unsigned char main_ctrl_setup__Fv_addr_80091B94() {
// register: 17
// size: 0x6C
register struct CPad *Pad;
// register: 5
register int lv;
}
// address: 0x8008F9BC
// line start: 432
// line end: 532
unsigned char main_ctrl_setup__Fv_addr_8008F9BC() {
// register: 16
// size: 0x6C
register struct CPad_dup_4 *Pad;
// register: 5
register int lv;
}
// address: 0x80092C50
// line start: 418
// line end: 429
@@ -726,10 +726,23 @@ void restore_controller_settings__Fv() {
}
// address: 0x8008FEB8
// line start: 330
// line end: 376
unsigned char set_buttons__Fii(int cline, int n) {
// register: 3
register int cval;
// register: 4
register int i;
// register: 19
register int p;
}
// address: 0x8008F820
// line start: 370
// line end: 414
unsigned char set_buttons__Fii(int cline, int n) {
unsigned char set_buttons__Fii_addr_8008F820(int cline, int n) {
// register: 16
// size: 0x10
register struct KEY_ASSIGNS *ta;
@@ -742,16 +755,3 @@ unsigned char set_buttons__Fii(int cline, int n) {
}
// address: 0x8008FEB8
// line start: 330
// line end: 376
unsigned char set_buttons__Fii_addr_8008FEB8(int cline, int n) {
// register: 3
register int cval;
// register: 4
register int i;
// register: 19
register int p;
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/davel.cpp
+1416 -1416
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/daveo.cpp
+61 -61
View File
@@ -2,19 +2,19 @@
#include "types.h"
// address: 0x80084970
// address: 0x80084A40
// line start: 441
// line end: 450
int CalcItemVal__FP10ItemStruct(struct ItemStruct *Item) {
int CalcItemVal__FP10ItemStruct(struct ItemStruct_dup_17 *Item) {
// register: 2
register int cost;
}
// address: 0x80084A40
// address: 0x80084970
// line start: 441
// line end: 450
int CalcItemVal__FP10ItemStruct_addr_80084A40(struct ItemStruct_dup_17 *Item) {
int CalcItemVal__FP10ItemStruct_addr_80084970(struct ItemStruct *Item) {
// register: 2
register int cost;
}
@@ -150,12 +150,25 @@ void PlaceStoreGold2__Fil(int myplr, long v) {
}
// address: 0x8007B3E0
// line start: 58
// line end: 65
// address: 0x8007A7DC
// line start: 64
// line end: 92
void ReadPad__Fi(int NoDeb) {
// register: 2
// size: 0x6C
register struct CPad_dup_4 *Pad;
// register: 2
register int New;
// register: 3
register int cmem;
// register: 4
register int p1mema;
// register: 5
register int p1memb;
// register: 6
register int p2mema;
// register: 7
register int p2memb;
}
@@ -186,11 +199,11 @@ void ReadPad__Fi_addr_8007CB84(int NoDeb) {
}
// address: 0x8007C588
// address: 0x8007CD18
// line start: 65
// line end: 103
void ReadPad__Fi_addr_8007C588(int NoDeb) {
// register: 2
// line end: 113
void ReadPad__Fi_addr_8007CD18(int NoDeb) {
// register: 16
// size: 0x6C
register struct CPad *Pad;
// register: 2
@@ -210,30 +223,6 @@ void ReadPad__Fi_addr_8007C588(int NoDeb) {
}
// address: 0x800842B4
// line start: 71
// line end: 137
void ReadPad__Fi_addr_800842B4(int NoDeb) {
// register: 16
// size: 0xEC
register struct CPad *DPad;
// register: 2
register int New;
// register: 4
register int cmem;
// register: 5
register int p1mema;
// register: 6
register int p1memb;
// register: 7
register int p2mema;
// register: 8
register int p2memb;
// register: 9
register int diffm;
}
// address: 0x80084384
// line start: 71
// line end: 137
@@ -258,28 +247,6 @@ void ReadPad__Fi_addr_80084384(int NoDeb) {
}
// address: 0x8007A7DC
// line start: 64
// line end: 92
void ReadPad__Fi_addr_8007A7DC(int NoDeb) {
// register: 2
// size: 0x6C
register struct CPad_dup_4 *Pad;
// register: 2
register int New;
// register: 3
register int cmem;
// register: 4
register int p1mema;
// register: 5
register int p1memb;
// register: 6
register int p2mema;
// register: 7
register int p2memb;
}
// address: 0x8007B10C
// line start: 64
// line end: 92
@@ -302,11 +269,35 @@ void ReadPad__Fi_addr_8007B10C(int NoDeb) {
}
// address: 0x8007CD18
// line start: 65
// line end: 113
void ReadPad__Fi_addr_8007CD18(int NoDeb) {
// address: 0x800842B4
// line start: 71
// line end: 137
void ReadPad__Fi_addr_800842B4(int NoDeb) {
// register: 16
// size: 0xEC
register struct CPad *DPad;
// register: 2
register int New;
// register: 4
register int cmem;
// register: 5
register int p1mema;
// register: 6
register int p1memb;
// register: 7
register int p2mema;
// register: 8
register int p2memb;
// register: 9
register int diffm;
}
// address: 0x8007C588
// line start: 65
// line end: 103
void ReadPad__Fi_addr_8007C588(int NoDeb) {
// register: 2
// size: 0x6C
register struct CPad *Pad;
// register: 2
@@ -326,6 +317,15 @@ void ReadPad__Fi_addr_8007CD18(int NoDeb) {
}
// address: 0x8007B3E0
// line start: 58
// line end: 65
void ReadPad__Fi_addr_8007B3E0(int NoDeb) {
// register: 2
register int New;
}
// address: 0x80084A9C
// line start: 454
// line end: 477
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/decomp.cpp
+38 -38
View File
@@ -31,6 +31,15 @@ void DEC_AddAsDecRequestor__FP7TextDat_addr_8009A584(struct TextDat_dup_14 *Td)
}
// address: 0x80097764
// line start: 71
// line end: 80
void DEC_AddAsDecRequestor__FP7TextDat_addr_80097764(struct TextDat *Td) {
// register: 16
register int TdIndex;
}
// address: 0x8009AE60
// line start: 71
// line end: 80
@@ -49,15 +58,6 @@ void DEC_AddAsDecRequestor__FP7TextDat_addr_800A4048(struct TextDat_dup_17 *Td)
}
// address: 0x80097764
// line start: 71
// line end: 80
void DEC_AddAsDecRequestor__FP7TextDat_addr_80097764(struct TextDat *Td) {
// register: 16
register int TdIndex;
}
// address: 0x80097838
// line start: 102
// line end: 107
@@ -69,10 +69,10 @@ void DEC_DoDecompRequests__Fv() {
}
// address: 0x800A3FF0
// address: 0x8009A600
// line start: 90
// line end: 94
void DEC_RemoveAsDecRequestor__FP7TextDat(struct TextDat_dup_18 *Td) {
void DEC_RemoveAsDecRequestor__FP7TextDat(struct TextDat_dup_14 *Td) {
// register: 16
register int TdIndex;
}
@@ -87,19 +87,19 @@ void DEC_RemoveAsDecRequestor__FP7TextDat_addr_8009AEDC(struct TextDat_dup_1 *Td
}
// address: 0x8009A600
// address: 0x800977E0
// line start: 90
// line end: 94
void DEC_RemoveAsDecRequestor__FP7TextDat_addr_8009A600(struct TextDat_dup_14 *Td) {
void DEC_RemoveAsDecRequestor__FP7TextDat_addr_800977E0(struct TextDat *Td) {
// register: 16
register int TdIndex;
}
// address: 0x800977E0
// address: 0x800A3FF0
// line start: 90
// line end: 94
void DEC_RemoveAsDecRequestor__FP7TextDat_addr_800977E0(struct TextDat *Td) {
void DEC_RemoveAsDecRequestor__FP7TextDat_addr_800A3FF0(struct TextDat_dup_18 *Td) {
// register: 16
register int TdIndex;
}
@@ -125,32 +125,10 @@ int FindEmptyIndex__Fv() {
}
// address: 0x8009AF90
// line start: 116
// line end: 122
int FindThisTd__FP7TextDat(struct TextDat_dup_1 *Td) {
{
// register: 3
register int f;
}
}
// address: 0x80097894
// line start: 116
// line end: 122
int FindThisTd__FP7TextDat_addr_80097894(struct TextDat *Td) {
{
// register: 3
register int f;
}
}
// address: 0x8009A6B4
// line start: 116
// line end: 122
int FindThisTd__FP7TextDat_addr_8009A6B4(struct TextDat_dup_14 *Td) {
int FindThisTd__FP7TextDat(struct TextDat *Td) {
{
// register: 3
register int f;
@@ -169,6 +147,17 @@ int FindThisTd__FP7TextDat_addr_800A4178(struct TextDat_dup_17 *Td) {
}
// address: 0x8009AF90
// line start: 116
// line end: 122
int FindThisTd__FP7TextDat_addr_8009AF90(struct TextDat_dup_1 *Td) {
{
// register: 3
register int f;
}
}
// address: 0x800A40A4
// line start: 116
// line end: 122
@@ -180,3 +169,14 @@ int FindThisTd__FP7TextDat_addr_800A40A4(struct TextDat_dup_18 *Td) {
}
// address: 0x8009A6B4
// line start: 116
// line end: 122
int FindThisTd__FP7TextDat_addr_8009A6B4(struct TextDat_dup_14 *Td) {
{
// register: 3
register int f;
}
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/dialog.cpp
+204 -204
View File
@@ -2,7 +2,7 @@
#include "types.h"
// address: 0x80086590
// address: 0x80083D88
// line start: 565
// line end: 989
void Back__6Dialogiiii(struct Dialog *this, int DX, int DY, int DW, int DH) {
@@ -43,8 +43,11 @@ void Back__6Dialogiiii(struct Dialog *this, int DX, int DY, int DW, int DH) {
register int c;
{
// register: 2
register int fw;
// size: 0xC
register struct FRAME_HDR *Fr;
// register: 3
register int fw;
// register: 5
register int fh;
}
}
@@ -106,10 +109,10 @@ void Back__6Dialogiiii_addr_8008BC34(struct Dialog *this, int DX, int DY, int DW
}
// address: 0x80083D88
// address: 0x80086590
// line start: 565
// line end: 989
void Back__6Dialogiiii_addr_80083D88(struct Dialog *this, int DX, int DY, int DW, int DH) {
void Back__6Dialogiiii_addr_80086590(struct Dialog *this, int DX, int DY, int DW, int DH) {
// register: 30
register int X;
// register: 23
@@ -147,11 +150,8 @@ void Back__6Dialogiiii_addr_80083D88(struct Dialog *this, int DX, int DY, int DW
register int c;
{
// register: 2
// size: 0xC
register struct FRAME_HDR *Fr;
// register: 3
register int fw;
// register: 5
// register: 3
register int fh;
}
}
@@ -162,195 +162,11 @@ void Back__6Dialogiiii_addr_80083D88(struct Dialog *this, int DX, int DY, int DW
}
// address: 0x8008AB1C
// size: 0x34
// line start: 206
// line end: 387
struct POLY_GT4 *DialogPrint__Fiiiiiiiiii(int Frm, int X, int Y, int SW, int SH, int UW, int UH, int UOfs, int VOfs, int Trans) {
// address: 0xFFFFFF78
// size: 0xC
auto struct FRAME_HDR_dup_17 *Fr;
// register: 17
// size: 0x34
register struct POLY_GT4 *GT4;
// register: 16
// size: 0x28
register struct POLY_FT4 *FT4;
// address: 0xFFFFFF80
// size: 0x4
auto struct TP_LOAD_HDR *Tp;
// address: 0xFFFFFF88
auto int x0;
// address: 0xFFFFFF90
auto int x1;
// address: 0xFFFFFF98
auto int x2;
// address: 0xFFFFFFA0
auto int x3;
// address: 0xFFFFFFA8
auto int y0;
// address: 0xFFFFFFB0
auto int y1;
// address: 0xFFFFFFB8
auto int y2;
// address: 0xFFFFFFC0
auto int y3;
// register: 18
register int u0;
// register: 19
register int u1;
// register: 23
register int u2;
// register: 30
register int u3;
// register: 21
register int v0;
// register: 20
register int v1;
// register: 22
register int v2;
// address: 0xFFFFFFC8
auto int v3;
// register: 3
register int U;
// register: 7
register int V;
// register: 4
register int W;
// register: 5
register int H;
{
{
{
{
// register: 3
// size: 0x8
register struct PAL *Pal;
{
{
{
// register: 3
// size: 0x8
register struct PAL *Pal;
// register: 16
register short G1;
// register: 18
register short G2;
// register: 19
register short G3;
// register: 20
register short G4;
{
{
}
}
}
}
}
}
}
}
}
}
// address: 0x80085478
// size: 0x34
// line start: 204
// line end: 385
struct POLY_GT4 *DialogPrint__Fiiiiiiiiii_addr_80085478(int Frm, int X, int Y, int SW, int SH, int UW, int UH, int UOfs, int VOfs, int Trans) {
// address: 0xFFFFFF78
// size: 0xC
auto struct FRAME_HDR_dup_14 *Fr;
// register: 17
// size: 0x34
register struct POLY_GT4 *GT4;
// register: 16
// size: 0x28
register struct POLY_FT4 *FT4;
// address: 0xFFFFFF80
// size: 0x4
auto struct TP_LOAD_HDR *Tp;
// address: 0xFFFFFF88
auto int x0;
// address: 0xFFFFFF90
auto int x1;
// address: 0xFFFFFF98
auto int x2;
// address: 0xFFFFFFA0
auto int x3;
// address: 0xFFFFFFA8
auto int y0;
// address: 0xFFFFFFB0
auto int y1;
// address: 0xFFFFFFB8
auto int y2;
// address: 0xFFFFFFC0
auto int y3;
// register: 18
register int u0;
// register: 19
register int u1;
// register: 23
register int u2;
// register: 30
register int u3;
// register: 21
register int v0;
// register: 20
register int v1;
// register: 22
register int v2;
// address: 0xFFFFFFC8
auto int v3;
// register: 3
register int U;
// register: 7
register int V;
// register: 4
register int W;
// register: 5
register int H;
{
{
{
{
// register: 3
// size: 0x8
register struct PAL *Pal;
{
{
{
// register: 3
// size: 0x8
register struct PAL *Pal;
// register: 16
register short G1;
// register: 18
register short G2;
// register: 19
register short G3;
// register: 20
register short G4;
{
{
}
}
}
}
}
}
}
}
}
}
// address: 0x80082CA4
// size: 0x34
// line start: 204
// line end: 385
struct POLY_GT4 *DialogPrint__Fiiiiiiiiii_addr_80082CA4(int Frm, int X, int Y, int SW, int SH, int UW, int UH, int UOfs, int VOfs, int Trans) {
struct POLY_GT4 *DialogPrint__Fiiiiiiiiii(int Frm, int X, int Y, int SW, int SH, int UW, int UH, int UOfs, int VOfs, int Trans) {
// address: 0xFFFFFF78
// size: 0xC
auto struct FRAME_HDR *Fr;
@@ -530,6 +346,190 @@ struct POLY_GT4 *DialogPrint__Fiiiiiiiiii_addr_80083200(int Frm, int X, int Y, i
}
// address: 0x8008AB1C
// size: 0x34
// line start: 206
// line end: 387
struct POLY_GT4 *DialogPrint__Fiiiiiiiiii_addr_8008AB1C(int Frm, int X, int Y, int SW, int SH, int UW, int UH, int UOfs, int VOfs, int Trans) {
// address: 0xFFFFFF78
// size: 0xC
auto struct FRAME_HDR_dup_17 *Fr;
// register: 17
// size: 0x34
register struct POLY_GT4 *GT4;
// register: 16
// size: 0x28
register struct POLY_FT4 *FT4;
// address: 0xFFFFFF80
// size: 0x4
auto struct TP_LOAD_HDR *Tp;
// address: 0xFFFFFF88
auto int x0;
// address: 0xFFFFFF90
auto int x1;
// address: 0xFFFFFF98
auto int x2;
// address: 0xFFFFFFA0
auto int x3;
// address: 0xFFFFFFA8
auto int y0;
// address: 0xFFFFFFB0
auto int y1;
// address: 0xFFFFFFB8
auto int y2;
// address: 0xFFFFFFC0
auto int y3;
// register: 18
register int u0;
// register: 19
register int u1;
// register: 23
register int u2;
// register: 30
register int u3;
// register: 21
register int v0;
// register: 20
register int v1;
// register: 22
register int v2;
// address: 0xFFFFFFC8
auto int v3;
// register: 3
register int U;
// register: 7
register int V;
// register: 4
register int W;
// register: 5
register int H;
{
{
{
{
// register: 3
// size: 0x8
register struct PAL *Pal;
{
{
{
// register: 3
// size: 0x8
register struct PAL *Pal;
// register: 16
register short G1;
// register: 18
register short G2;
// register: 19
register short G3;
// register: 20
register short G4;
{
{
}
}
}
}
}
}
}
}
}
}
// address: 0x80085478
// size: 0x34
// line start: 204
// line end: 385
struct POLY_GT4 *DialogPrint__Fiiiiiiiiii_addr_80085478(int Frm, int X, int Y, int SW, int SH, int UW, int UH, int UOfs, int VOfs, int Trans) {
// address: 0xFFFFFF78
// size: 0xC
auto struct FRAME_HDR_dup_14 *Fr;
// register: 17
// size: 0x34
register struct POLY_GT4 *GT4;
// register: 16
// size: 0x28
register struct POLY_FT4 *FT4;
// address: 0xFFFFFF80
// size: 0x4
auto struct TP_LOAD_HDR *Tp;
// address: 0xFFFFFF88
auto int x0;
// address: 0xFFFFFF90
auto int x1;
// address: 0xFFFFFF98
auto int x2;
// address: 0xFFFFFFA0
auto int x3;
// address: 0xFFFFFFA8
auto int y0;
// address: 0xFFFFFFB0
auto int y1;
// address: 0xFFFFFFB8
auto int y2;
// address: 0xFFFFFFC0
auto int y3;
// register: 18
register int u0;
// register: 19
register int u1;
// register: 23
register int u2;
// register: 30
register int u3;
// register: 21
register int v0;
// register: 20
register int v1;
// register: 22
register int v2;
// address: 0xFFFFFFC8
auto int v3;
// register: 3
register int U;
// register: 7
register int V;
// register: 4
register int W;
// register: 5
register int H;
{
{
{
{
// register: 3
// size: 0x8
register struct PAL *Pal;
{
{
{
// register: 3
// size: 0x8
register struct PAL *Pal;
// register: 16
register short G1;
// register: 18
register short G2;
// register: 19
register short G3;
// register: 20
register short G4;
{
{
}
}
}
}
}
}
}
}
}
}
// address: 0x8008B5D4
// line start: 408
// line end: 461
@@ -573,20 +573,10 @@ struct POLY_G4 *GetDropShadowG4__FUcUcUcUcUcUcUcUcUcUcUcUc(unsigned char r0, uns
}
// address: 0x80083B30
// line start: 496
// line end: 552
void GetSizes__6Dialog(struct Dialog *this) {
// register: 3
// size: 0xC
register struct FRAME_HDR *Fr;
}
// address: 0x8008B9B0
// line start: 499
// line end: 555
void GetSizes__6Dialog_addr_8008B9B0(struct Dialog *this) {
void GetSizes__6Dialog(struct Dialog *this) {
// register: 3
// size: 0xC
register struct FRAME_HDR_dup_17 *Fr;
@@ -603,6 +593,16 @@ void GetSizes__6Dialog_addr_8008630C(struct Dialog *this) {
}
// address: 0x80083B30
// line start: 496
// line end: 552
void GetSizes__6Dialog_addr_80083B30(struct Dialog *this) {
// register: 3
// size: 0xC
register struct FRAME_HDR *Fr;
}
// address: 0x800839F8
// line start: 474
// line end: 492
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/glue.cpp
+318 -318
View File
@@ -37,6 +37,82 @@ void BgTask__FP4TASK(struct TASK *T) {
}
// address: 0x8009B9F0
// line start: 470
// line end: 625
void BgTask__FP4TASK_addr_8009B9F0(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *Args;
// register: 18
register bool IsTown;
// register: 20
register int TextId;
// register: 16
register int Level;
// register: 17
register int ObjId;
// register: 19
register int List;
// register: 21
// size: 0x19E8
register struct PlayerStruct_dup_17 *plr1;
// register: 22
// size: 0x19E8
register struct PlayerStruct_dup_17 *plr2;
// address: 0xFFFFFD78
// size: 0x108
auto struct CBlocks_dup_17 MyBlocks;
// address: 0xFFFFFE80
// size: 0x90
auto struct CPlayer_dup_17 MyPlayer;
// address: 0xFFFFFF10
// size: 0x90
auto struct CPlayer_dup_17 MyPlayer2;
// address: 0xFFFFFFA0
// size: 0x1C
auto struct GPanel_dup_17 P1Panel;
// address: 0xFFFFFFC0
// size: 0x1C
auto struct GPanel_dup_17 P2Panel;
}
// address: 0x80091A00
// line start: 430
// line end: 612
void BgTask__FP4TASK_addr_80091A00(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *Args;
// register: 18
register bool IsTown;
// register: 16
register int TextId;
// register: 17
register int Level;
// register: 19
register int ObjId;
// register: 20
register int List;
// address: 0xFFFFFDD0
// size: 0xE0
auto struct CBlocks MyBlocks;
// address: 0xFFFFFEB0
// size: 0x84
auto struct CPlayer MyPlayer;
// address: 0xFFFFFF38
// size: 0x84
auto struct CPlayer MyPlayer2;
// address: 0xFFFFFFC0
// size: 0x10
auto struct GPanel P1Panel;
// address: 0xFFFFFFD0
// size: 0x10
auto struct GPanel P2Panel;
}
// address: 0x8008EFEC
// line start: 417
// line end: 572
@@ -72,85 +148,38 @@ void BgTask__FP4TASK_addr_8008EFEC(struct TASK *T) {
}
// address: 0x8009B874
// line start: 470
// address: 0x80091E60
// line start: 438
// line end: 625
void BgTask__FP4TASK_addr_8009B874(struct TASK *T) {
void BgTask__FP4TASK_addr_80091E60(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *Args;
// register: 18
register bool IsTown;
// register: 20
register int TextId;
// register: 16
register int Level;
register int TextId;
// register: 17
register int ObjId;
register int Level;
// register: 19
register int ObjId;
// register: 20
register int List;
// register: 21
// size: 0x19E8
register struct PlayerStruct *plr1;
// register: 22
// size: 0x19E8
register struct PlayerStruct *plr2;
// address: 0xFFFFFD78
// size: 0x108
auto struct CBlocks_dup_19 MyBlocks;
// address: 0xFFFFFE80
// size: 0x90
auto struct CPlayer_dup_19 MyPlayer;
// address: 0xFFFFFF10
// size: 0x90
auto struct CPlayer_dup_19 MyPlayer2;
// address: 0xFFFFFFA0
// size: 0x1C
auto struct GPanel_dup_19 P1Panel;
// address: 0xFFFFFDD0
// size: 0xE0
auto struct CBlocks_dup_14 MyBlocks;
// address: 0xFFFFFEB0
// size: 0x84
auto struct CPlayer_dup_14 MyPlayer;
// address: 0xFFFFFF38
// size: 0x84
auto struct CPlayer_dup_14 MyPlayer2;
// address: 0xFFFFFFC0
// size: 0x1C
auto struct GPanel_dup_19 P2Panel;
}
// address: 0x8009B9F0
// line start: 470
// line end: 625
void BgTask__FP4TASK_addr_8009B9F0(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *Args;
// register: 18
register bool IsTown;
// register: 20
register int TextId;
// register: 16
register int Level;
// register: 17
register int ObjId;
// register: 19
register int List;
// register: 21
// size: 0x19E8
register struct PlayerStruct_dup_17 *plr1;
// register: 22
// size: 0x19E8
register struct PlayerStruct_dup_17 *plr2;
// address: 0xFFFFFD78
// size: 0x108
auto struct CBlocks_dup_17 MyBlocks;
// address: 0xFFFFFE80
// size: 0x90
auto struct CPlayer_dup_17 MyPlayer;
// address: 0xFFFFFF10
// size: 0x90
auto struct CPlayer_dup_17 MyPlayer2;
// address: 0xFFFFFFA0
// size: 0x1C
auto struct GPanel_dup_17 P1Panel;
// address: 0xFFFFFFC0
// size: 0x1C
auto struct GPanel_dup_17 P2Panel;
auto struct GPanel_dup_14 P1Panel;
// address: 0xFFFFFFD0
// size: 0x10
auto struct GPanel_dup_14 P2Panel;
}
@@ -195,38 +224,38 @@ void BgTask__FP4TASK_addr_8009B91C(struct TASK *T) {
}
// address: 0x80091E60
// line start: 438
// line end: 625
void BgTask__FP4TASK_addr_80091E60(struct TASK *T) {
// address: 0x8009250C
// line start: 417
// line end: 569
void BgTask__FP4TASK_addr_8009250C(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *Args;
// register: 18
// register: 19
register bool IsTown;
// register: 16
register int TextId;
// register: 17
register int Level;
// register: 19
// register: 18
register int ObjId;
// register: 20
register int List;
// address: 0xFFFFFDD0
// size: 0xE0
auto struct CBlocks_dup_14 MyBlocks;
// address: 0xFFFFFEB0
// size: 0x84
auto struct CPlayer_dup_14 MyPlayer;
// address: 0xFFFFFF38
// size: 0x84
auto struct CPlayer_dup_14 MyPlayer2;
// address: 0xFFFFFDE0
// size: 0xDC
auto struct CBlocks_dup_1 MyBlocks;
// address: 0xFFFFFEC0
// size: 0x80
auto struct CPlayer_dup_1 MyPlayer;
// address: 0xFFFFFF40
// size: 0x80
auto struct CPlayer_dup_1 MyPlayer2;
// address: 0xFFFFFFC0
// size: 0x10
auto struct GPanel_dup_14 P1Panel;
auto struct GPanel_dup_1 P1Panel;
// address: 0xFFFFFFD0
// size: 0x10
auto struct GPanel_dup_14 P2Panel;
auto struct GPanel_dup_1 P2Panel;
}
@@ -271,87 +300,58 @@ void BgTask__FP4TASK_addr_8009B928(struct TASK *T) {
}
// address: 0x80091A00
// line start: 430
// line end: 612
void BgTask__FP4TASK_addr_80091A00(struct TASK *T) {
// address: 0x8009B874
// line start: 470
// line end: 625
void BgTask__FP4TASK_addr_8009B874(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *Args;
// register: 18
register bool IsTown;
// register: 16
register int TextId;
// register: 17
register int Level;
// register: 19
register int ObjId;
// register: 20
register int List;
// address: 0xFFFFFDD0
// size: 0xE0
auto struct CBlocks MyBlocks;
// address: 0xFFFFFEB0
// size: 0x84
auto struct CPlayer MyPlayer;
// address: 0xFFFFFF38
// size: 0x84
auto struct CPlayer MyPlayer2;
// address: 0xFFFFFFC0
// size: 0x10
auto struct GPanel P1Panel;
// address: 0xFFFFFFD0
// size: 0x10
auto struct GPanel P2Panel;
}
// address: 0x8009250C
// line start: 417
// line end: 569
void BgTask__FP4TASK_addr_8009250C(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *Args;
// register: 19
register bool IsTown;
// register: 16
register int TextId;
// register: 17
// register: 16
register int Level;
// register: 18
// register: 17
register int ObjId;
// register: 20
// register: 19
register int List;
// address: 0xFFFFFDE0
// size: 0xDC
auto struct CBlocks_dup_1 MyBlocks;
// address: 0xFFFFFEC0
// size: 0x80
auto struct CPlayer_dup_1 MyPlayer;
// address: 0xFFFFFF40
// size: 0x80
auto struct CPlayer_dup_1 MyPlayer2;
// register: 21
// size: 0x19E8
register struct PlayerStruct *plr1;
// register: 22
// size: 0x19E8
register struct PlayerStruct *plr2;
// address: 0xFFFFFD78
// size: 0x108
auto struct CBlocks_dup_19 MyBlocks;
// address: 0xFFFFFE80
// size: 0x90
auto struct CPlayer_dup_19 MyPlayer;
// address: 0xFFFFFF10
// size: 0x90
auto struct CPlayer_dup_19 MyPlayer2;
// address: 0xFFFFFFA0
// size: 0x1C
auto struct GPanel_dup_19 P1Panel;
// address: 0xFFFFFFC0
// size: 0x10
auto struct GPanel_dup_1 P1Panel;
// address: 0xFFFFFFD0
// size: 0x10
auto struct GPanel_dup_1 P2Panel;
}
// address: 0x8009B78C
// line start: 430
// line end: 450
void DoShowPanelGFX__FP6GPanelT0(struct GPanel_dup_19 *P1, struct GPanel_dup_19 *P2) {
// size: 0x1C
auto struct GPanel_dup_19 P2Panel;
}
// address: 0x80092434
// line start: 386
// line end: 406
void DoShowPanelGFX__FP6GPanelT0_addr_80092434(struct GPanel_dup_1 *P1, struct GPanel_dup_1 *P2) {
void DoShowPanelGFX__FP6GPanelT0(struct GPanel_dup_1 *P1, struct GPanel_dup_1 *P2) {
}
// address: 0x8009B78C
// line start: 430
// line end: 450
void DoShowPanelGFX__FP6GPanelT0_addr_8009B78C(struct GPanel_dup_19 *P1, struct GPanel_dup_19 *P2) {
}
@@ -362,13 +362,6 @@ void DoShowPanelGFX__FP6GPanelT0_addr_8009B834(struct GPanel_dup_18 *P1, struct
}
// address: 0x80091D88
// line start: 407
// line end: 427
void DoShowPanelGFX__FP6GPanelT0_addr_80091D88(struct GPanel_dup_14 *P1, struct GPanel_dup_14 *P2) {
}
// address: 0x8008EF14
// line start: 386
// line end: 406
@@ -383,19 +376,18 @@ void DoShowPanelGFX__FP6GPanelT0_addr_8009B908(struct GPanel_dup_17 *P1, struct
}
// address: 0x80090D9C
// size: 0x8
// line start: 620
// line end: 625
struct PInf *FindPlayerChar__FP12PlayerStruct(struct PlayerStruct_dup_6 *P) {
// address: 0x80091D88
// line start: 407
// line end: 427
void DoShowPanelGFX__FP6GPanelT0_addr_80091D88(struct GPanel_dup_14 *P1, struct GPanel_dup_14 *P2) {
}
// address: 0x8008EEF8
// size: 0x8
// line start: 620
// line end: 625
struct PInf *FindPlayerChar__FP12PlayerStruct_addr_8008EEF8(struct PlayerStruct_dup_4 *P) {
// address: 0x8009BF90
// size: 0xC
// line start: 660
// line end: 665
struct PInf *FindPlayerChar__FP12PlayerStruct(struct PlayerStruct_dup_17 *P) {
}
@@ -407,27 +399,27 @@ struct PInf *FindPlayerChar__FP12PlayerStruct_addr_8008F598(struct PlayerStruct
}
// address: 0x8009BF90
// size: 0xC
// line start: 660
// line end: 665
struct PInf *FindPlayerChar__FP12PlayerStruct_addr_8009BF90(struct PlayerStruct_dup_17 *P) {
}
// address: 0x800914C4
// address: 0x80091BB8
// size: 0x8
// line start: 624
// line end: 629
struct PInf *FindPlayerChar__FP12PlayerStruct_addr_800914C4(struct PlayerStruct_dup_7 *P) {
struct PInf *FindPlayerChar__FP12PlayerStruct_addr_80091BB8(struct PlayerStruct_dup_11 *P) {
}
// address: 0x800925B4
// size: 0xC
// line start: 652
// line end: 657
struct PInf *FindPlayerChar__FP12PlayerStruct_addr_800925B4(struct PlayerStruct_dup_13 *P) {
// address: 0x80090D9C
// size: 0x8
// line start: 620
// line end: 625
struct PInf *FindPlayerChar__FP12PlayerStruct_addr_80090D9C(struct PlayerStruct_dup_6 *P) {
}
// address: 0x8008EEF8
// size: 0x8
// line start: 620
// line end: 625
struct PInf *FindPlayerChar__FP12PlayerStruct_addr_8008EEF8(struct PlayerStruct_dup_4 *P) {
}
@@ -439,6 +431,14 @@ struct PInf_dup_12 *FindPlayerChar__FP12PlayerStruct_addr_80092010(struct Player
}
// address: 0x800914C4
// size: 0x8
// line start: 624
// line end: 629
struct PInf *FindPlayerChar__FP12PlayerStruct_addr_800914C4(struct PlayerStruct_dup_7 *P) {
}
// address: 0x800924B4
// size: 0xC
// line start: 660
@@ -455,34 +455,20 @@ struct PInf *FindPlayerChar__FP12PlayerStruct_addr_8009BEBC(struct PlayerStruct_
}
// address: 0x80091BB8
// size: 0x8
// line start: 624
// line end: 629
struct PInf *FindPlayerChar__FP12PlayerStruct_addr_80091BB8(struct PlayerStruct_dup_11 *P) {
// address: 0x800925B4
// size: 0xC
// line start: 652
// line end: 657
struct PInf *FindPlayerChar__FP12PlayerStruct_addr_800925B4(struct PlayerStruct_dup_13 *P) {
}
// address: 0x8009BEEC
// line start: 669
// line end: 701
int FindPlayerChar__FP12PlayerStructb(struct PlayerStruct_dup_18 *P, bool InTown) {
{
{
// register: 3
// size: 0xC
register struct PInf *Inf;
}
}
}
// address: 0x800924E4
// line start: 669
// line end: 681
int FindPlayerChar__FP12PlayerStructb_addr_800924E4(struct PlayerStruct *P, bool InTown) {
// register: 3
// size: 0xC
// address: 0x8008F5C8
// line start: 616
// line end: 622
int FindPlayerChar__FP12PlayerStructb(struct PlayerStruct *P, bool InTown) {
// register: 2
// size: 0x8
register struct PInf *Inf;
}
@@ -511,30 +497,6 @@ int FindPlayerChar__FP12PlayerStructb_addr_80092040(struct PlayerStruct *P, bool
}
// address: 0x8009BE44
// line start: 669
// line end: 701
int FindPlayerChar__FP12PlayerStructb_addr_8009BE44(struct PlayerStruct *P, bool InTown) {
{
{
// register: 3
// size: 0xC
register struct PInf *Inf;
}
}
}
// address: 0x800925E4
// line start: 661
// line end: 673
int FindPlayerChar__FP12PlayerStructb_addr_800925E4(struct PlayerStruct_dup_13 *P, bool InTown) {
// register: 3
// size: 0xC
register struct PInf *Inf;
}
// address: 0x80090DCC
// line start: 629
// line end: 635
@@ -545,22 +507,22 @@ int FindPlayerChar__FP12PlayerStructb_addr_80090DCC(struct PlayerStruct_dup_6 *P
}
// address: 0x800914F4
// line start: 633
// line end: 639
int FindPlayerChar__FP12PlayerStructb_addr_800914F4(struct PlayerStruct_dup_7 *P, bool InTown) {
// register: 2
// size: 0x8
// address: 0x800924E4
// line start: 669
// line end: 681
int FindPlayerChar__FP12PlayerStructb_addr_800924E4(struct PlayerStruct *P, bool InTown) {
// register: 3
// size: 0xC
register struct PInf *Inf;
}
// address: 0x80091BE8
// line start: 633
// line end: 639
int FindPlayerChar__FP12PlayerStructb_addr_80091BE8(struct PlayerStruct_dup_11 *P, bool InTown) {
// register: 2
// size: 0x8
// address: 0x800925E4
// line start: 661
// line end: 673
int FindPlayerChar__FP12PlayerStructb_addr_800925E4(struct PlayerStruct_dup_13 *P, bool InTown) {
// register: 3
// size: 0xC
register struct PInf *Inf;
}
@@ -575,33 +537,59 @@ int FindPlayerChar__FP12PlayerStructb_addr_8008EF28(struct PlayerStruct_dup_4 *P
}
// address: 0x8008F5C8
// line start: 616
// line end: 622
int FindPlayerChar__FP12PlayerStructb_addr_8008F5C8(struct PlayerStruct *P, bool InTown) {
// address: 0x8009BEEC
// line start: 669
// line end: 701
int FindPlayerChar__FP12PlayerStructb_addr_8009BEEC(struct PlayerStruct_dup_18 *P, bool InTown) {
{
{
// register: 3
// size: 0xC
register struct PInf *Inf;
}
}
}
// address: 0x80091BE8
// line start: 633
// line end: 639
int FindPlayerChar__FP12PlayerStructb_addr_80091BE8(struct PlayerStruct_dup_11 *P, bool InTown) {
// register: 2
// size: 0x8
register struct PInf *Inf;
}
// address: 0x80091F1C
// size: 0xC
// line start: 622
// line end: 632
struct PInf_dup_12 *FindPlayerChar__FPc(char *Id) {
// address: 0x8009BE44
// line start: 669
// line end: 701
int FindPlayerChar__FP12PlayerStructb_addr_8009BE44(struct PlayerStruct *P, bool InTown) {
{
// register: 17
register int f;
{
// register: 3
// size: 0xC
register struct PInf *Inf;
}
}
}
// address: 0x800914F4
// line start: 633
// line end: 639
int FindPlayerChar__FP12PlayerStructb_addr_800914F4(struct PlayerStruct_dup_7 *P, bool InTown) {
// register: 2
// size: 0x8
register struct PInf *Inf;
}
// address: 0x800924C0
// size: 0xC
// line start: 627
// line end: 637
struct PInf *FindPlayerChar__FPc_addr_800924C0(char *Id) {
struct PInf *FindPlayerChar__FPc(char *Id) {
{
// register: 17
register int f;
@@ -619,6 +607,18 @@ struct PInf *FindPlayerChar__FPc_addr_8008F4B4(char *Id) {
}
// address: 0x80091F1C
// size: 0xC
// line start: 622
// line end: 632
struct PInf_dup_12 *FindPlayerChar__FPc_addr_80091F1C(char *Id) {
{
// register: 17
register int f;
}
}
// address: 0x80092558
// size: 0xC
// line start: 642
@@ -801,64 +801,10 @@ void GLUE_SuspendGame__Fv() {
}
// address: 0x80092B18
// line start: 629
// line end: 635
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb(struct CPlayer_dup_1 *Player, struct PlayerStruct *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x80090E0C
// line start: 645
// line end: 651
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_80090E0C(struct CPlayer *Player, struct PlayerStruct_dup_6 *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x8008F608
// line start: 632
// line end: 638
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_8008F608(struct CPlayer *Player, struct PlayerStruct *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x80092644
// line start: 685
// line end: 700
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_80092644(struct CPlayer *Player, struct PlayerStruct_dup_13 *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x80091C28
// line start: 649
// line end: 655
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_80091C28(struct CPlayer *Player, struct PlayerStruct_dup_11 *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x80091534
// line start: 649
// line end: 655
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_80091534(struct CPlayer *Player, struct PlayerStruct_dup_7 *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x8008EF68
// line start: 645
// line end: 651
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_8008EF68(struct CPlayer *Player, struct PlayerStruct_dup_4 *Plr, bool InTown) {
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb(struct CPlayer *Player, struct PlayerStruct_dup_7 *Plr, bool InTown) {
// register: 16
register int Id;
}
@@ -873,10 +819,73 @@ void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_80092544(str
}
// address: 0x80092644
// line start: 685
// line end: 700
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_80092644(struct CPlayer *Player, struct PlayerStruct_dup_13 *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x8008F608
// line start: 632
// line end: 638
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_8008F608(struct CPlayer *Player, struct PlayerStruct *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x80090E0C
// line start: 645
// line end: 651
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_80090E0C(struct CPlayer *Player, struct PlayerStruct_dup_6 *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x80092B18
// line start: 629
// line end: 635
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_80092B18(struct CPlayer_dup_1 *Player, struct PlayerStruct *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x8008EF68
// line start: 645
// line end: 651
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_8008EF68(struct CPlayer *Player, struct PlayerStruct_dup_4 *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x80091C28
// line start: 649
// line end: 655
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructb_addr_80091C28(struct CPlayer *Player, struct PlayerStruct_dup_11 *Plr, bool InTown) {
// register: 16
register int Id;
}
// address: 0x8009BF10
// line start: 714
// line end: 724
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructbT2(struct CPlayer_dup_19 *Player, struct PlayerStruct *Plr, bool InTown, bool Blocking) {
// register: 16
register int Id;
}
// address: 0x8009C08C
// line start: 714
// line end: 724
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructbT2(struct CPlayer_dup_17 *Player, struct PlayerStruct_dup_17 *Plr, bool InTown, bool Blocking) {
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructbT2_addr_8009C08C(struct CPlayer_dup_17 *Player, struct PlayerStruct_dup_17 *Plr, bool InTown, bool Blocking) {
// register: 16
register int Id;
}
@@ -900,12 +909,3 @@ void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructbT2_addr_8009BFC4(s
}
// address: 0x8009BF10
// line start: 714
// line end: 724
void MakeSurePlayerDressedProperly__FR7CPlayerR12PlayerStructbT2_addr_8009BF10(struct CPlayer_dup_19 *Player, struct PlayerStruct *Plr, bool InTown, bool Blocking) {
// register: 16
register int Id;
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/gman.cpp
+1240 -1240
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/gman.h
+156 -156
View File
@@ -194,10 +194,10 @@ bool CanXferFrame__7TextDat(struct TextDat_dup_1 *this) {
}
// address: 0x8007F978
// line start: 243
// line end: 243
bool CanXferFrame__C7TextDat(struct TextDat *this) {
// address: 0x80094F04
// line start: 259
// line end: 259
bool CanXferFrame__C7TextDat(struct TextDat_dup_18 *this) {
}
@@ -215,10 +215,10 @@ bool CanXferFrame__C7TextDat_addr_80081460(struct TextDat_dup_14 *this) {
}
// address: 0x80094F04
// line start: 259
// line end: 259
bool CanXferFrame__C7TextDat_addr_80094F04(struct TextDat_dup_18 *this) {
// address: 0x8007F978
// line start: 243
// line end: 243
bool CanXferFrame__C7TextDat_addr_8007F978(struct TextDat *this) {
}
@@ -236,10 +236,17 @@ bool CanXferPal__7TextDat_addr_8008CDF4(struct TextDat_dup_1 *this) {
}
// address: 0x8007F9A0
// line start: 242
// line end: 242
bool CanXferPal__C7TextDat(struct TextDat *this) {
}
// address: 0x80094F2C
// line start: 258
// line end: 258
bool CanXferPal__C7TextDat(struct TextDat_dup_18 *this) {
bool CanXferPal__C7TextDat_addr_80094F2C(struct TextDat_dup_18 *this) {
}
@@ -257,17 +264,21 @@ bool CanXferPal__C7TextDat_addr_80094FFC(struct TextDat_dup_17 *this) {
}
// address: 0x8007F9A0
// line start: 242
// line end: 242
bool CanXferPal__C7TextDat_addr_8007F9A0(struct TextDat *this) {
// address: 0x80094F60
// line start: 290
// line end: 296
void DumpDatFile__7TextDat(struct TextDat_dup_17 *this) {
{
{
}
}
}
// address: 0x80094DE8
// line start: 290
// line end: 296
void DumpDatFile__7TextDat(struct TextDat *this) {
void DumpDatFile__7TextDat_addr_80094DE8(struct TextDat *this) {
{
{
}
@@ -286,17 +297,6 @@ void DumpDatFile__7TextDat_addr_80094E90(struct TextDat_dup_18 *this) {
}
// address: 0x80094F60
// line start: 290
// line end: 296
void DumpDatFile__7TextDat_addr_80094F60(struct TextDat_dup_17 *this) {
{
{
}
}
}
// address: 0x80082E08
// size: 0x14
// line start: 298
@@ -1513,11 +1513,11 @@ struct CCreatureHdr *GetCreature__7TextDati_addr_80096488(struct TextDat *this,
}
// address: 0x800ADC94
// address: 0x800ADCAC
// size: 0xC
// line start: 243
// line end: 247
struct ALL_DECOMP_BUFFERS *GetDecompBuffers__7TextDat(struct TextDat *this) {
struct ALL_DECOMP_BUFFERS *GetDecompBuffers__7TextDat(struct TextDat_dup_17 *this) {
}
@@ -1529,11 +1529,11 @@ struct ALL_DECOMP_BUFFERS *GetDecompBuffers__7TextDat_addr_800ADBD8(struct TextD
}
// address: 0x800ADCAC
// address: 0x800ADC94
// size: 0xC
// line start: 243
// line end: 247
struct ALL_DECOMP_BUFFERS *GetDecompBuffers__7TextDat_addr_800ADCAC(struct TextDat_dup_17 *this) {
struct ALL_DECOMP_BUFFERS *GetDecompBuffers__7TextDat_addr_800ADC94(struct TextDat *this) {
}
@@ -2435,17 +2435,17 @@ struct FRAME_HDR *GetFr__7TextDati_addr_80034FBC(struct TextDat *this, int FrNum
// address: 0x80035FCC
// size: 0xC
// line start: 221
// line end: 221
struct FRAME_HDR *GetFr__7TextDati_addr_80035FCC(struct TextDat *this, int FrNum) {
// line start: 223
// line end: 223
struct FRAME_HDR *GetFr__7TextDati_addr_80035FCC(struct TextDat_dup_1 *this, int FrNum) {
}
// address: 0x80035FCC
// size: 0xC
// line start: 223
// line end: 223
struct FRAME_HDR *GetFr__7TextDati_addr_80035FCC_addr_80035FCC(struct TextDat_dup_1 *this, int FrNum) {
// line start: 221
// line end: 221
struct FRAME_HDR *GetFr__7TextDati_addr_80035FCC_addr_80035FCC(struct TextDat *this, int FrNum) {
}
@@ -3069,7 +3069,7 @@ struct FRAME_HDR *GetFr__7TextDati_addr_800376A0(struct TextDat *this, int FrNum
// size: 0xC
// line start: 229
// line end: 229
struct FRAME_HDR_dup_17 *GetFr__7TextDati_addr_800376C8(struct TextDat_dup_17 *this, int FrNum) {
struct FRAME_HDR *GetFr__7TextDati_addr_800376C8(struct TextDat_dup_18 *this, int FrNum) {
}
@@ -3077,7 +3077,7 @@ struct FRAME_HDR_dup_17 *GetFr__7TextDati_addr_800376C8(struct TextDat_dup_17 *t
// size: 0xC
// line start: 229
// line end: 229
struct FRAME_HDR *GetFr__7TextDati_addr_800376C8_addr_800376C8(struct TextDat_dup_18 *this, int FrNum) {
struct FRAME_HDR_dup_17 *GetFr__7TextDati_addr_800376C8_addr_800376C8(struct TextDat_dup_17 *this, int FrNum) {
}
@@ -3952,24 +3952,10 @@ char *GetName__C13CTextFileInfo(struct CTextFileInfo *this) {
}
// address: 0x8008D420
// line start: 236
// line end: 236
int GetNumOfActions__7TextDati(struct TextDat_dup_14 *this, int Creature) {
}
// address: 0x80091A28
// line start: 252
// line end: 252
int GetNumOfActions__7TextDati_addr_80091A28(struct TextDat_dup_18 *this, int Creature) {
}
// address: 0x8008E0EC
// line start: 238
// line end: 238
int GetNumOfActions__7TextDati_addr_8008E0EC(struct TextDat_dup_1 *this, int Creature) {
int GetNumOfActions__7TextDati(struct TextDat_dup_18 *this, int Creature) {
}
@@ -3980,6 +3966,20 @@ int GetNumOfActions__7TextDati_addr_8008ABD0(struct TextDat *this, int Creature)
}
// address: 0x8008D420
// line start: 236
// line end: 236
int GetNumOfActions__7TextDati_addr_8008D420(struct TextDat_dup_14 *this, int Creature) {
}
// address: 0x8008E0EC
// line start: 238
// line end: 238
int GetNumOfActions__7TextDati_addr_8008E0EC(struct TextDat_dup_1 *this, int Creature) {
}
// address: 0x80091AF8
// line start: 252
// line end: 252
@@ -4176,24 +4176,17 @@ int GetNumOfActions__7TextDati_addr_80096528(struct TextDat_dup_17 *this, int Cr
}
// address: 0x80095058
// line start: 251
// line end: 251
int GetNumOfCreatures__7TextDat(struct TextDat_dup_17 *this) {
}
// address: 0x80082E80
// line start: 237
// line end: 237
int GetNumOfCreatures__7TextDat_addr_80082E80(struct TextDat_dup_1 *this) {
}
// address: 0x8007FA58
// line start: 235
// line end: 235
int GetNumOfCreatures__7TextDat_addr_8007FA58(struct TextDat *this) {
int GetNumOfCreatures__7TextDat(struct TextDat *this) {
}
// address: 0x80094F88
// line start: 251
// line end: 251
int GetNumOfCreatures__7TextDat_addr_80094F88(struct TextDat_dup_18 *this) {
}
@@ -4204,10 +4197,17 @@ int GetNumOfCreatures__7TextDat_addr_80081540(struct TextDat_dup_14 *this) {
}
// address: 0x80094F88
// address: 0x80082E80
// line start: 237
// line end: 237
int GetNumOfCreatures__7TextDat_addr_80082E80(struct TextDat_dup_1 *this) {
}
// address: 0x80095058
// line start: 251
// line end: 251
int GetNumOfCreatures__7TextDat_addr_80094F88(struct TextDat_dup_18 *this) {
int GetNumOfCreatures__7TextDat_addr_80095058(struct TextDat_dup_17 *this) {
}
@@ -5128,17 +5128,10 @@ int GetNumOfCreatures__7TextDat_addr_80097094(struct TextDat *this) {
}
// address: 0x80081560
// address: 0x8007FA78
// line start: 225
// line end: 225
int GetNumOfFrames__7TextDat(struct TextDat_dup_14 *this) {
}
// address: 0x80091B44
// line start: 233
// line end: 233
int GetNumOfFrames__7TextDat_addr_80091B44(struct TextDat_dup_17 *this) {
int GetNumOfFrames__7TextDat(struct TextDat *this) {
}
@@ -5149,6 +5142,13 @@ int GetNumOfFrames__7TextDat_addr_80091A74(struct TextDat_dup_18 *this) {
}
// address: 0x80091B44
// line start: 233
// line end: 233
int GetNumOfFrames__7TextDat_addr_80091B44(struct TextDat_dup_17 *this) {
}
// address: 0x80082E9C
// line start: 227
// line end: 227
@@ -5156,10 +5156,10 @@ int GetNumOfFrames__7TextDat_addr_80082E9C(struct TextDat_dup_1 *this) {
}
// address: 0x8007FA78
// address: 0x80081560
// line start: 225
// line end: 225
int GetNumOfFrames__7TextDat_addr_8007FA78(struct TextDat *this) {
int GetNumOfFrames__7TextDat_addr_80081560(struct TextDat_dup_14 *this) {
}
@@ -5373,17 +5373,10 @@ int GetNumOfFrames__7TextDat_addr_80095078(struct TextDat_dup_17 *this) {
}
// address: 0x8008BFF4
// line start: 237
// line end: 237
int GetNumOfFrames__7TextDatii(struct TextDat_dup_14 *this, int Creature, int Action) {
}
// address: 0x800897D8
// line start: 237
// line end: 237
int GetNumOfFrames__7TextDatii_addr_800897D8(struct TextDat *this, int Creature, int Action) {
int GetNumOfFrames__7TextDatii(struct TextDat *this, int Creature, int Action) {
}
@@ -5394,10 +5387,10 @@ int GetNumOfFrames__7TextDatii_addr_80091AC0(struct TextDat_dup_17 *this, int Cr
}
// address: 0x8008CE1C
// line start: 239
// line end: 239
int GetNumOfFrames__7TextDatii_addr_8008CE1C(struct TextDat_dup_1 *this, int Creature, int Action) {
// address: 0x8008BFF4
// line start: 237
// line end: 237
int GetNumOfFrames__7TextDatii_addr_8008BFF4(struct TextDat_dup_14 *this, int Creature, int Action) {
}
@@ -5408,6 +5401,13 @@ int GetNumOfFrames__7TextDatii_addr_800919F0(struct TextDat_dup_18 *this, int Cr
}
// address: 0x8008CE1C
// line start: 239
// line end: 239
int GetNumOfFrames__7TextDatii_addr_8008CE1C(struct TextDat_dup_1 *this, int Creature, int Action) {
}
// address: 0x800A0B68
// line start: 237
// line end: 237
@@ -6087,27 +6087,27 @@ int GetNumOfFrames__7TextDatii_addr_80096420(struct TextDat_dup_18 *this, int Cr
}
// address: 0x8008CEC0
// size: 0x8
// line start: 232
// line end: 232
struct PAL *GetPal__7TextDati(struct TextDat_dup_18 *this, int PalNum) {
}
// address: 0x8007FA8C
// size: 0x8
// line start: 224
// line end: 224
struct PAL *GetPal__7TextDati_addr_8007FA8C(struct TextDat *this, int PalNum) {
}
// address: 0x8008CF90
// size: 0x8
// line start: 232
// line end: 232
struct PAL *GetPal__7TextDati_addr_8008CF90(struct TextDat_dup_17 *this, int PalNum) {
struct PAL *GetPal__7TextDati(struct TextDat_dup_17 *this, int PalNum) {
}
// address: 0x80082EB0
// size: 0x8
// line start: 226
// line end: 226
struct PAL *GetPal__7TextDati_addr_80082EB0(struct TextDat_dup_1 *this, int PalNum) {
}
// address: 0x8008CEC0
// size: 0x8
// line start: 232
// line end: 232
struct PAL *GetPal__7TextDati_addr_8008CEC0(struct TextDat_dup_18 *this, int PalNum) {
}
@@ -6119,11 +6119,11 @@ struct PAL *GetPal__7TextDati_addr_80081574(struct TextDat_dup_14 *this, int Pal
}
// address: 0x80082EB0
// address: 0x8007FA8C
// size: 0x8
// line start: 226
// line end: 226
struct PAL *GetPal__7TextDati_addr_80082EB0(struct TextDat_dup_1 *this, int PalNum) {
// line start: 224
// line end: 224
struct PAL *GetPal__7TextDati_addr_8007FA8C(struct TextDat *this, int PalNum) {
}
@@ -6489,17 +6489,17 @@ struct PAL *GetPal__7TextDati_addr_80034FA0(struct TextDat *this, int PalNum) {
// address: 0x80035FB0
// size: 0x8
// line start: 226
// line end: 226
struct PAL *GetPal__7TextDati_addr_80035FB0(struct TextDat_dup_1 *this, int PalNum) {
// line start: 224
// line end: 224
struct PAL *GetPal__7TextDati_addr_80035FB0(struct TextDat *this, int PalNum) {
}
// address: 0x80035FB0
// size: 0x8
// line start: 224
// line end: 224
struct PAL *GetPal__7TextDati_addr_80035FB0_addr_80035FB0(struct TextDat *this, int PalNum) {
// line start: 226
// line end: 226
struct PAL *GetPal__7TextDati_addr_80035FB0_addr_80035FB0(struct TextDat_dup_1 *this, int PalNum) {
}
@@ -7126,17 +7126,17 @@ int GetSize__C6CBlock(struct CBlock *this) {
}
// address: 0x80095030
// line start: 256
// line end: 256
int GetTexNum__C7TextDat(struct TextDat_dup_17 *this) {
// address: 0x800814BC
// line start: 240
// line end: 240
int GetTexNum__C7TextDat(struct TextDat_dup_14 *this) {
}
// address: 0x8007F9D4
// line start: 240
// line end: 240
int GetTexNum__C7TextDat_addr_8007F9D4(struct TextDat *this) {
// address: 0x80095030
// line start: 256
// line end: 256
int GetTexNum__C7TextDat_addr_80095030(struct TextDat_dup_17 *this) {
}
@@ -7147,10 +7147,10 @@ int GetTexNum__C7TextDat_addr_80094F60(struct TextDat_dup_18 *this) {
}
// address: 0x800814BC
// address: 0x8007F9D4
// line start: 240
// line end: 240
int GetTexNum__C7TextDat_addr_800814BC(struct TextDat_dup_14 *this) {
int GetTexNum__C7TextDat_addr_8007F9D4(struct TextDat *this) {
}
@@ -7168,17 +7168,10 @@ bool HasTp__C13CTextFileInfo(struct CTextFileInfo *this) {
}
// address: 0x8007F9C8
// line start: 241
// line end: 241
bool IsLoaded__C7TextDat(struct TextDat *this) {
}
// address: 0x80095024
// line start: 257
// line end: 257
bool IsLoaded__C7TextDat_addr_80095024(struct TextDat_dup_17 *this) {
bool IsLoaded__C7TextDat(struct TextDat_dup_17 *this) {
}
@@ -7196,17 +7189,24 @@ bool IsLoaded__C7TextDat_addr_80094F54(struct TextDat_dup_18 *this) {
}
// address: 0x80096408
// line start: 265
// line end: 269
void SetDecompArea__7TextDatiiii(struct TextDat_dup_18 *this, int nDecX, int nDecY, int nPalX, int nPalY) {
// address: 0x8007F9C8
// line start: 241
// line end: 241
bool IsLoaded__C7TextDat_addr_8007F9C8(struct TextDat *this) {
}
// address: 0x800964D8
// line start: 265
// line end: 269
void SetDecompArea__7TextDatiiii_addr_800964D8(struct TextDat_dup_17 *this, int nDecX, int nDecY, int nPalX, int nPalY) {
void SetDecompArea__7TextDatiiii(struct TextDat_dup_17 *this, int nDecX, int nDecY, int nPalX, int nPalY) {
}
// address: 0x8008E09C
// line start: 278
// line end: 282
void SetDecompArea__7TextDatiiii_addr_8008E09C(struct TextDat_dup_1 *this, int nDecX, int nDecY, int nPalX, int nPalY) {
}
@@ -7217,6 +7217,13 @@ void SetDecompArea__7TextDatiiii_addr_8008AB80(struct TextDat *this, int nDecX,
}
// address: 0x80096408
// line start: 265
// line end: 269
void SetDecompArea__7TextDatiiii_addr_80096408(struct TextDat_dup_18 *this, int nDecX, int nDecY, int nPalX, int nPalY) {
}
// address: 0x8008D3D0
// line start: 249
// line end: 253
@@ -7224,13 +7231,6 @@ void SetDecompArea__7TextDatiiii_addr_8008D3D0(struct TextDat_dup_14 *this, int
}
// address: 0x8008E09C
// line start: 278
// line end: 282
void SetDecompArea__7TextDatiiii_addr_8008E09C(struct TextDat_dup_1 *this, int nDecX, int nDecY, int nPalX, int nPalY) {
}
// address: 0x80082E94
// line start: 234
// line end: 234
@@ -7266,13 +7266,6 @@ void SetFileInfo__7TextDatPC13CTextFileInfoi_addr_80081554(struct TextDat_dup_14
}
// address: 0x80091A68
// line start: 240
// line end: 240
void SetFileInfo__7TextDatPC13CTextFileInfoi_addr_80091A68(struct TextDat_dup_18 *this, struct CTextFileInfo *NewInfo, int NewTexNum) {
}
// address: 0x8007FA6C
// line start: 232
// line end: 232
@@ -7280,6 +7273,13 @@ void SetFileInfo__7TextDatPC13CTextFileInfoi_addr_8007FA6C(struct TextDat *this,
}
// address: 0x80091A68
// line start: 240
// line end: 240
void SetFileInfo__7TextDatPC13CTextFileInfoi_addr_80091A68(struct TextDat_dup_18 *this, struct CTextFileInfo *NewInfo, int NewTexNum) {
}
// address: 0x8008A8E0
// line start: 232
// line end: 232
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/gpanel.cpp
+691 -691
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/kanji.cpp
+81 -81
View File
@@ -62,7 +62,7 @@ enum KANJI_FRMS GetKanjiCacheFrm__Fv() {
}
// address: 0x800AD97C
// address: 0x800AD8A8
// size: 0x28
// line start: 535
// line end: 619
@@ -86,7 +86,7 @@ struct POLY_FT4 *GetKanjiFrm__FUs(unsigned short kan) {
register struct vbuffS *kl;
// register: 16
// size: 0x70
register struct TextDat_dup_17 *Dat;
register struct TextDat_dup_18 *Dat;
// register: 17
register int TpX;
// register: 16
@@ -102,11 +102,11 @@ struct POLY_FT4 *GetKanjiFrm__FUs(unsigned short kan) {
}
// address: 0x800AD8A8
// address: 0x800AD97C
// size: 0x28
// line start: 535
// line end: 619
struct POLY_FT4 *GetKanjiFrm__FUs_addr_800AD8A8(unsigned short kan) {
struct POLY_FT4 *GetKanjiFrm__FUs_addr_800AD97C(unsigned short kan) {
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *ft4;
@@ -126,7 +126,7 @@ struct POLY_FT4 *GetKanjiFrm__FUs_addr_800AD8A8(unsigned short kan) {
register struct vbuffS *kl;
// register: 16
// size: 0x70
register struct TextDat_dup_18 *Dat;
register struct TextDat_dup_17 *Dat;
// register: 17
register int TpX;
// register: 16
@@ -186,36 +186,10 @@ bool IsKanjiLoaded__Fv() {
}
// address: 0x800ACFC8
// line start: 154
// line end: 236
void KANJI_SetCache__F10KANJI_FRMS(enum KANJI_FRMS ct) {
// register: 17
// size: 0x108
register struct CBlocks_dup_18 *BgBlocks;
{
{
// register: 16
// size: 0x70
register struct TextDat_dup_18 *Dat;
{
// register: 16
// size: 0x70
register struct TextDat_dup_18 *Dat;
{
{
}
}
}
}
}
}
// address: 0x800AD09C
// line start: 154
// line end: 236
void KANJI_SetCache__F10KANJI_FRMS_addr_800AD09C(enum KANJI_FRMS ct) {
void KANJI_SetCache__F10KANJI_FRMS(enum KANJI_FRMS ct) {
// register: 17
// size: 0x108
register struct CBlocks_dup_17 *BgBlocks;
@@ -238,13 +212,13 @@ void KANJI_SetCache__F10KANJI_FRMS_addr_800AD09C(enum KANJI_FRMS ct) {
}
// address: 0x800AD08C
// address: 0x800AD014
// line start: 150
// line end: 232
void KANJI_SetCache__F10KANJI_FRMS_addr_800AD08C(enum KANJI_FRMS ct) {
void KANJI_SetCache__F10KANJI_FRMS_addr_800AD014(enum KANJI_FRMS ct) {
// register: 17
// size: 0x108
register struct CBlocks *BgBlocks;
register struct CBlocks_dup_19 *BgBlocks;
{
{
// register: 16
@@ -264,13 +238,39 @@ void KANJI_SetCache__F10KANJI_FRMS_addr_800AD08C(enum KANJI_FRMS ct) {
}
// address: 0x800AD014
// line start: 150
// line end: 232
void KANJI_SetCache__F10KANJI_FRMS_addr_800AD014(enum KANJI_FRMS ct) {
// address: 0x800ACFC8
// line start: 154
// line end: 236
void KANJI_SetCache__F10KANJI_FRMS_addr_800ACFC8(enum KANJI_FRMS ct) {
// register: 17
// size: 0x108
register struct CBlocks_dup_19 *BgBlocks;
register struct CBlocks_dup_18 *BgBlocks;
{
{
// register: 16
// size: 0x70
register struct TextDat_dup_18 *Dat;
{
// register: 16
// size: 0x70
register struct TextDat_dup_18 *Dat;
{
{
}
}
}
}
}
}
// address: 0x800AD08C
// line start: 150
// line end: 232
void KANJI_SetCache__F10KANJI_FRMS_addr_800AD08C(enum KANJI_FRMS ct) {
// register: 17
// size: 0x108
register struct CBlocks *BgBlocks;
{
{
// register: 16
@@ -316,10 +316,28 @@ void KANJI_SetDb__F10LANG_DB_NO_addr_800AD4CC(enum LANG_DB_NO_dup_17 NewLangDbNo
}
// address: 0x800A08A8
// line start: 188
// line end: 229
int KPrintChar__FUsUsUcUcUs(unsigned short Cx, unsigned short Cy, unsigned char h, unsigned char l, int col) {
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *ft4;
// address: 0xFFFFFE80
// size: 0x152
auto unsigned short buff[169];
// register: 5
register unsigned short kan;
// address: 0xFFFFFFD8
// size: 0x8
auto struct RECT r;
}
// address: 0x800A3DF4
// line start: 214
// line end: 257
int KPrintChar__FUsUsUcUcUs(unsigned short Cx, unsigned short Cy, unsigned char h, unsigned char l, int col) {
int KPrintChar__FUsUsUcUcUs_addr_800A3DF4(unsigned short Cx, unsigned short Cy, unsigned char h, unsigned char l, int col) {
// address: 0xFFFFFE60
// size: 0x28
auto struct POLY_FT4 At4;
@@ -337,24 +355,6 @@ int KPrintChar__FUsUsUcUcUs(unsigned short Cx, unsigned short Cy, unsigned char
}
// address: 0x800A08A8
// line start: 188
// line end: 229
int KPrintChar__FUsUsUcUcUs_addr_800A08A8(unsigned short Cx, unsigned short Cy, unsigned char h, unsigned char l, int col) {
// address: 0xFFFFFFE0
// size: 0x28
auto struct POLY_FT4 *ft4;
// address: 0xFFFFFE80
// size: 0x152
auto unsigned short buff[169];
// register: 5
register unsigned short kan;
// address: 0xFFFFFFD8
// size: 0x8
auto struct RECT r;
}
// address: 0x8009F65C
// line start: 110
// line end: 144
@@ -463,23 +463,23 @@ void LoadKanjiIndex__FPc_addr_800A0558(char *name) {
}
// address: 0x8009F4D0
// line start: 40
// line end: 42
void LoadKanjiIndex__Fv() {
}
// address: 0x8009FA18
// line start: 59
// line end: 78
void LoadKanjiIndex__Fv_addr_8009FA18() {
void LoadKanjiIndex__Fv() {
// register: 17
// size: 0x14
register struct FileIO *Fs;
}
// address: 0x8009F4D0
// line start: 40
// line end: 42
void LoadKanjiIndex__Fv_addr_8009F4D0() {
}
// address: 0x800AD328
// line start: 245
// line end: 278
@@ -487,6 +487,13 @@ void LoadKanji__F10LANG_DB_NO(enum LANG_DB_NO_dup_17 NewLangDbNo) {
}
// address: 0x800AD254
// line start: 245
// line end: 278
void LoadKanji__F10LANG_DB_NO_addr_800AD254(enum LANG_DB_NO NewLangDbNo) {
}
// address: 0x800A0694
// line start: 101
// line end: 123
@@ -499,13 +506,6 @@ void LoadKanji__F10LANG_DB_NO_addr_800A0694(enum LANG_DB_NO NewLangDbNo) {
}
// address: 0x800AD254
// line start: 245
// line end: 278
void LoadKanji__F10LANG_DB_NO_addr_800AD254(enum LANG_DB_NO NewLangDbNo) {
}
// address: 0x800AD458
// line start: 286
// line end: 289
@@ -578,6 +578,13 @@ unsigned short *getb__FUs(unsigned short n) {
}
// address: 0x800AD5CC
// line start: 351
// line end: 355
unsigned short getb__FUs_addr_800AD5CC(unsigned short n) {
}
// address: 0x8009FB04
// line start: 85
// line end: 103
@@ -592,13 +599,6 @@ unsigned short *getb__FUs_addr_8009FB04(unsigned short n) {
}
// address: 0x800AD5CC
// line start: 351
// line end: 355
unsigned short getb__FUs_addr_800AD5CC(unsigned short n) {
}
// address: 0x800AD8B8
// line start: 507
// line end: 525
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/loading.cpp
+11 -11
View File
@@ -61,23 +61,21 @@ void MY_TSK_Sleep__Fi(int time) {
}
// address: 0x800999F0
// address: 0x80097970
// line start: 166
// line end: 242
// line end: 235
void PutUpCutScreenTSK__FP4TASK(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *Args;
// address: 0xFFFFFFD0
auto int lev;
// register: 16
register int tx;
// address: 0xFFFFFFC8
// size: 0x24
auto struct POLY_G4 *G4;
// register: 21
register unsigned char barr;
// register: 16
register unsigned char barr;
// register: 21
register unsigned char barg;
// register: 17
register unsigned short prog;
@@ -98,21 +96,23 @@ void PutUpCutScreenTSK__FP4TASK_addr_800A4754(struct TASK *T) {
}
// address: 0x80097970
// address: 0x800999F0
// line start: 166
// line end: 235
void PutUpCutScreenTSK__FP4TASK_addr_80097970(struct TASK *T) {
// line end: 242
void PutUpCutScreenTSK__FP4TASK_addr_800999F0(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *Args;
// address: 0xFFFFFFD0
auto int lev;
// register: 16
register int tx;
// address: 0xFFFFFFC8
// size: 0x24
auto struct POLY_G4 *G4;
// register: 16
register unsigned char barr;
// register: 21
register unsigned char barr;
// register: 16
register unsigned char barg;
// register: 17
register unsigned short prog;
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/main.cpp
+13 -13
View File
@@ -2,17 +2,10 @@
#include "types.h"
// address: 0x8007A2B8
// line start: 129
// line end: 200
void AppMain() {
}
// address: 0x8007BA14
// line start: 133
// line end: 220
void AppMain_addr_8007BA14() {
void AppMain() {
{
// register: 16
register int option_file;
@@ -26,17 +19,17 @@ void AppMain_addr_8007BA14() {
}
// address: 0x8007A38C
// line start: 217
// line end: 241
void GameTask__FP4TASK(struct TASK *T) {
// address: 0x8007A2B8
// line start: 129
// line end: 200
void AppMain_addr_8007A2B8() {
}
// address: 0x80082F98
// line start: 354
// line end: 429
void GameTask__FP4TASK_addr_80082F98(struct TASK *T) {
void GameTask__FP4TASK(struct TASK *T) {
{
{
{
@@ -46,6 +39,13 @@ void GameTask__FP4TASK_addr_80082F98(struct TASK *T) {
}
// address: 0x8007A38C
// line start: 217
// line end: 241
void GameTask__FP4TASK_addr_8007A38C(struct TASK *T) {
}
// address: 0x8007A424
// line start: 254
// line end: 269
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/monsview.cpp
+48 -48
View File
@@ -2,10 +2,57 @@
#include "types.h"
// address: 0x8009D86C
// line start: 130
// line end: 216
void DisplayMonsterTypes__Fv() {
// address: 0xFFFFFED8
// size: 0x100
auto char Text[256];
// register: 17
// size: 0xE0
register struct CBlocks *MBlocks;
// register: 20
// size: 0x1C
register struct CMonster *MyCMonst;
// register: 18
// size: 0x3C
register struct MonsterData *MyMonst;
// register: 17
// size: 0x6C
register struct TextDat *CMonstGraphics;
// register: 19
// size: 0x6C
register struct TextDat *ObjGraphics;
// register: 16
// size: 0x28
register struct POLY_FT4 *Ft4;
// register: 21
register int NumMons;
// register: 16
register int PhysFrame;
// register: 16
register int Creature;
// register: 16
// size: 0x6C
register struct CPad *P;
{
{
{
{
// register: 2
register char transfile;
}
}
}
}
}
// address: 0x800AEE38
// line start: 232
// line end: 233
void DisplayMonsterTypes__Fv() {
void DisplayMonsterTypes__Fv_addr_800AEE38() {
}
@@ -103,50 +150,3 @@ void DisplayMonsterTypes__Fv_addr_800A11A4() {
}
// address: 0x8009D86C
// line start: 130
// line end: 216
void DisplayMonsterTypes__Fv_addr_8009D86C() {
// address: 0xFFFFFED8
// size: 0x100
auto char Text[256];
// register: 17
// size: 0xE0
register struct CBlocks *MBlocks;
// register: 20
// size: 0x1C
register struct CMonster *MyCMonst;
// register: 18
// size: 0x3C
register struct MonsterData *MyMonst;
// register: 17
// size: 0x6C
register struct TextDat *CMonstGraphics;
// register: 19
// size: 0x6C
register struct TextDat *ObjGraphics;
// register: 16
// size: 0x28
register struct POLY_FT4 *Ft4;
// register: 21
register int NumMons;
// register: 16
register int PhysFrame;
// register: 16
register int Creature;
// register: 16
// size: 0x6C
register struct CPad *P;
{
{
{
{
// register: 2
register char transfile;
}
}
}
}
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/options.cpp
+1058 -1058
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/padfuncs.cpp
+2123 -2123
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/pads.cpp
+53 -53
View File
@@ -9,10 +9,10 @@ void PAD_Open__Fv() {
}
// address: 0x80089690
// address: 0x800895C0
// line start: 290
// line end: 299
void BothNewVal__4CPadUsUs(struct CPad_dup_17 *this, unsigned short New, unsigned short New2) {
void BothNewVal__4CPadUsUs(struct CPad *this, unsigned short New, unsigned short New2) {
}
@@ -29,6 +29,13 @@ void BothNewVal__4CPadUsUs_addr_800819DC(struct CPad_dup_4 *this, unsigned short
}
// address: 0x80089690
// line start: 290
// line end: 299
void BothNewVal__4CPadUsUs_addr_80089690(struct CPad_dup_17 *this, unsigned short New, unsigned short New2) {
}
// address: 0x80082134
// line start: 225
// line end: 257
@@ -42,13 +49,6 @@ void BothNewVal__4CPadUsUs_addr_80082134(struct CPad *this, unsigned short New,
}
// address: 0x800895C0
// line start: 290
// line end: 299
void BothNewVal__4CPadUsUs_addr_800895C0(struct CPad *this, unsigned short New, unsigned short New2) {
}
// address: 0x80089848
// line start: 344
// line end: 350
@@ -82,10 +82,16 @@ unsigned short MakeClickBits__FiiiPUs(int Switch, int Closed, int Speed, unsigne
}
// address: 0x8008961C
// line start: 277
// line end: 285
void NewVal__4CPadUs(struct CPad_dup_17 *this, unsigned short New) {
// address: 0x800818A4
// line start: 240
// line end: 271
void NewVal__4CPadUs(struct CPad_dup_4 *this, unsigned short New) {
{
// register: 7
register int i;
{
}
}
}
@@ -96,6 +102,13 @@ void NewVal__4CPadUs_addr_8008954C(struct CPad *this, unsigned short New) {
}
// address: 0x8008961C
// line start: 277
// line end: 285
void NewVal__4CPadUs_addr_8008961C(struct CPad_dup_17 *this, unsigned short New) {
}
// address: 0x80081FFC
// line start: 190
// line end: 221
@@ -109,19 +122,6 @@ void NewVal__4CPadUs_addr_80081FFC(struct CPad *this, unsigned short New) {
}
// address: 0x800818A4
// line start: 240
// line end: 271
void NewVal__4CPadUs_addr_800818A4(struct CPad_dup_4 *this, unsigned short New) {
{
// register: 7
register int i;
{
}
}
}
// address: 0x8008949C
// size: 0xEC
// line start: 251
@@ -130,14 +130,6 @@ struct CPad *PAD_GetPad__FiUc(int PadNum, unsigned char both) {
}
// address: 0x80081F60
// size: 0x6C
// line start: 168
// line end: 178
struct CPad *PAD_GetPad__FiUc_addr_80081F60(int PadNum, unsigned char both) {
}
// address: 0x8008956C
// size: 0xEC
// line start: 251
@@ -154,23 +146,18 @@ struct CPad_dup_4 *PAD_GetPad__FiUc_addr_80081808(int PadNum, unsigned char both
}
// address: 0x80083F84
// line start: 152
// line end: 201
void PAD_Handler__Fv() {
// register: 20
register unsigned long JVal;
// register: 3
register unsigned long v;
// register: 16
register unsigned char fin;
// address: 0x80081F60
// size: 0x6C
// line start: 168
// line end: 178
struct CPad *PAD_GetPad__FiUc_addr_80081F60(int PadNum, unsigned char both) {
}
// address: 0x80081DAC
// line start: 109
// line end: 158
void PAD_Handler__Fv_addr_80081DAC() {
void PAD_Handler__Fv() {
// register: 16
register unsigned long JVal;
// register: 3
@@ -180,6 +167,19 @@ void PAD_Handler__Fv_addr_80081DAC() {
}
// address: 0x80083F84
// line start: 152
// line end: 201
void PAD_Handler__Fv_addr_80083F84() {
// register: 20
register unsigned long JVal;
// register: 3
register unsigned long v;
// register: 16
register unsigned char fin;
}
// address: 0x80081650
// line start: 152
// line end: 203
@@ -206,10 +206,10 @@ unsigned long ReadPadStream__Fv() {
}
// address: 0x80082290
// line start: 267
// line end: 291
unsigned short Trans__4CPadUs(struct CPad *this, unsigned short PadVal) {
// address: 0x80081B38
// line start: 317
// line end: 341
unsigned short Trans__4CPadUs(struct CPad_dup_4 *this, unsigned short PadVal) {
// register: 2
register unsigned short RetVal;
}
@@ -224,10 +224,10 @@ unsigned short Trans__4CPadUs_addr_80089724(struct CPad_dup_17 *this, unsigned s
}
// address: 0x80081B38
// line start: 317
// line end: 341
unsigned short Trans__4CPadUs_addr_80081B38(struct CPad_dup_4 *this, unsigned short PadVal) {
// address: 0x80082290
// line start: 267
// line end: 291
unsigned short Trans__4CPadUs_addr_80082290(struct CPad *this, unsigned short PadVal) {
// register: 2
register unsigned short RetVal;
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/pads.h
+64 -155
View File
@@ -82,14 +82,7 @@ unsigned char CheckActive__4CPad_addr_80081EE8(struct CPad *this) {
// address: 0x80081C9C
// line start: 85
// line end: 85
unsigned char CheckActive__4CPad_addr_80081C9C(struct CPad *this) {
}
// address: 0x80081C9C
// line start: 85
// line end: 85
unsigned char CheckActive__4CPad_addr_80081C9C_addr_80081C9C(struct CPad_dup_4 *this) {
unsigned char CheckActive__4CPad_addr_80081C9C(struct CPad_dup_4 *this) {
}
@@ -502,14 +495,7 @@ unsigned short GetCur__C4CPad_addr_8009AE38(struct CPad *this) {
// address: 0x8009B5C4
// line start: 90
// line end: 94
unsigned short GetCur__C4CPad_addr_8009B5C4(struct CPad *this) {
}
// address: 0x8009B5C4
// line start: 90
// line end: 94
unsigned short GetCur__C4CPad_addr_8009B5C4_addr_8009B5C4(struct CPad_dup_4 *this) {
unsigned short GetCur__C4CPad_addr_8009B5C4(struct CPad_dup_4 *this) {
}
@@ -709,13 +695,6 @@ unsigned short GetCur__C4CPad_addr_800720E0(struct CPad_dup_4 *this) {
}
// address: 0x800720E0
// line start: 90
// line end: 94
unsigned short GetCur__C4CPad_addr_800720E0_addr_800720E0(struct CPad *this) {
}
// address: 0x800730E4
// line start: 100
// line end: 104
@@ -891,13 +870,6 @@ unsigned short GetCur__C4CPad_addr_80090808(struct CPad_dup_4 *this) {
}
// address: 0x80090808
// line start: 90
// line end: 94
unsigned short GetCur__C4CPad_addr_80090808_addr_80090808(struct CPad *this) {
}
// address: 0x80091018
// line start: 85
// line end: 89
@@ -933,13 +905,6 @@ unsigned short GetCur__C4CPad_addr_80097044(struct CPad_dup_4 *this) {
}
// address: 0x80097044
// line start: 90
// line end: 94
unsigned short GetCur__C4CPad_addr_80097044_addr_80097044(struct CPad *this) {
}
// address: 0x800A0AA8
// line start: 114
// line end: 118
@@ -1178,13 +1143,6 @@ unsigned short GetDown__C4CPad_addr_8006BD6C(struct CPad_dup_4 *this) {
}
// address: 0x8006BD6C
// line start: 104
// line end: 108
unsigned short GetDown__C4CPad_addr_8006BD6C_addr_8006BD6C(struct CPad *this) {
}
// address: 0x8006BE78
// line start: 104
// line end: 108
@@ -1395,13 +1353,6 @@ unsigned short GetDown__C4CPad_addr_8009B574(struct CPad_dup_4 *this) {
}
// address: 0x8009B574
// line start: 104
// line end: 108
unsigned short GetDown__C4CPad_addr_8009B574_addr_8009B574(struct CPad *this) {
}
// address: 0x8009BA3C
// line start: 99
// line end: 103
@@ -1465,13 +1416,6 @@ unsigned short GetDown__C4CPad_addr_8009D25C(struct CPad_dup_4 *this) {
}
// address: 0x8009D25C
// line start: 104
// line end: 108
unsigned short GetDown__C4CPad_addr_8009D25C_addr_8009D25C(struct CPad *this) {
}
// address: 0x8009D79C
// line start: 120
// line end: 124
@@ -1643,14 +1587,14 @@ unsigned short GetDown__C4CPad_addr_80032DC0(struct CPad *this) {
// address: 0x80034E18
// line start: 104
// line end: 108
unsigned short GetDown__C4CPad_addr_80034E18(struct CPad *this) {
unsigned short GetDown__C4CPad_addr_80034E18(struct CPad_dup_4 *this) {
}
// address: 0x80034E18
// line start: 104
// line end: 108
unsigned short GetDown__C4CPad_addr_80034E18_addr_80034E18(struct CPad_dup_4 *this) {
unsigned short GetDown__C4CPad_addr_80034E18_addr_80034E18(struct CPad *this) {
}
@@ -2014,14 +1958,7 @@ unsigned short GetDown__C4CPad_addr_800840B8(struct CPad *this) {
// address: 0x800907E0
// line start: 104
// line end: 108
unsigned short GetDown__C4CPad_addr_800907E0(struct CPad *this) {
}
// address: 0x800907E0
// line start: 104
// line end: 108
unsigned short GetDown__C4CPad_addr_800907E0_addr_800907E0(struct CPad_dup_4 *this) {
unsigned short GetDown__C4CPad_addr_800907E0(struct CPad_dup_4 *this) {
}
@@ -2186,13 +2123,6 @@ unsigned short GetDown__C4CPad_addr_8009701C(struct CPad_dup_4 *this) {
}
// address: 0x8009701C
// line start: 104
// line end: 108
unsigned short GetDown__C4CPad_addr_8009701C_addr_8009701C(struct CPad *this) {
}
// address: 0x80035014
// line start: 114
// line end: 118
@@ -2231,14 +2161,7 @@ unsigned short GetDown__C4CPad_addr_80049778(struct CPad *this) {
// address: 0x80072090
// line start: 104
// line end: 108
unsigned short GetDown__C4CPad_addr_80072090(struct CPad *this) {
}
// address: 0x80072090
// line start: 104
// line end: 108
unsigned short GetDown__C4CPad_addr_80072090_addr_80072090(struct CPad_dup_4 *this) {
unsigned short GetDown__C4CPad_addr_80072090(struct CPad_dup_4 *this) {
}
@@ -2375,13 +2298,6 @@ unsigned short GetDown__C4CPad_addr_80099974(struct CPad *this) {
}
// address: 0x8009B988
// line start: 106
// line end: 110
unsigned short GetTick__C4CPad_addr_8009B988(struct CPad *this) {
}
// address: 0x8009B54C
// line start: 111
// line end: 115
@@ -2389,6 +2305,13 @@ unsigned short GetTick__C4CPad_addr_8009B54C(struct CPad_dup_4 *this) {
}
// address: 0x8009B988
// line start: 106
// line end: 110
unsigned short GetTick__C4CPad_addr_8009B988(struct CPad *this) {
}
// address: 0x800A0A80
// line start: 121
// line end: 125
@@ -2725,10 +2648,10 @@ unsigned short GetTick__C4CPad_addr_80098488(struct CPad *this) {
}
// address: 0x80081504
// line start: 97
// line end: 101
unsigned short GetUp__C4CPad(struct CPad_dup_4 *this) {
// address: 0x80081D84
// line start: 92
// line end: 96
unsigned short GetUp__C4CPad(struct CPad *this) {
}
@@ -2739,10 +2662,10 @@ unsigned short GetUp__C4CPad_addr_8009D87C(struct CPad_dup_17 *this) {
}
// address: 0x80081D84
// line start: 92
// line end: 96
unsigned short GetUp__C4CPad_addr_80081D84(struct CPad *this) {
// address: 0x80081504
// line start: 97
// line end: 101
unsigned short GetUp__C4CPad_addr_80081504(struct CPad_dup_4 *this) {
}
@@ -2826,14 +2749,7 @@ unsigned short GetUp__C4CPad_addr_8009B9D8(struct CPad *this) {
// address: 0x8009B59C
// line start: 97
// line end: 101
unsigned short GetUp__C4CPad_addr_8009B59C(struct CPad *this) {
}
// address: 0x8009B59C
// line start: 97
// line end: 101
unsigned short GetUp__C4CPad_addr_8009B59C_addr_8009B59C(struct CPad_dup_4 *this) {
unsigned short GetUp__C4CPad_addr_8009B59C(struct CPad_dup_4 *this) {
}
@@ -3050,14 +2966,7 @@ unsigned short GetUp__C4CPad_addr_80093C40(struct CPad *this) {
// address: 0x800720B8
// line start: 97
// line end: 101
unsigned short GetUp__C4CPad_addr_800720B8(struct CPad *this) {
}
// address: 0x800720B8
// line start: 97
// line end: 101
unsigned short GetUp__C4CPad_addr_800720B8_addr_800720B8(struct CPad_dup_4 *this) {
unsigned short GetUp__C4CPad_addr_800720B8(struct CPad_dup_4 *this) {
}
@@ -3229,17 +3138,10 @@ unsigned short GetUp__C4CPad_addr_80093734(struct CPad *this) {
}
// address: 0x80081CA8
// line start: 84
// line end: 84
void SetActive__4CPadUc(struct CPad_dup_4 *this, unsigned char a) {
}
// address: 0x80082664
// line start: 84
// line end: 84
void SetActive__4CPadUc_addr_80082664(struct CPad *this, unsigned char a) {
void SetActive__4CPadUc(struct CPad *this, unsigned char a) {
}
@@ -3250,10 +3152,17 @@ void SetActive__4CPadUc_addr_80089994(struct CPad_dup_17 *this, unsigned char a)
}
// address: 0x800823EC
// address: 0x80081CA8
// line start: 84
// line end: 84
void SetActive__4CPadUc_addr_80081CA8(struct CPad_dup_4 *this, unsigned char a) {
}
// address: 0x80081CB0
// line start: 77
// line end: 77
void SetBothFlag__4CPadUc(struct CPad *this, unsigned char fl) {
void SetBothFlag__4CPadUc(struct CPad_dup_4 *this, unsigned char fl) {
}
@@ -3264,10 +3173,10 @@ void SetBothFlag__4CPadUc_addr_8008999C(struct CPad_dup_17 *this, unsigned char
}
// address: 0x80081CB0
// address: 0x800823EC
// line start: 77
// line end: 77
void SetBothFlag__4CPadUc_addr_80081CB0(struct CPad_dup_4 *this, unsigned char fl) {
void SetBothFlag__4CPadUc_addr_800823EC(struct CPad *this, unsigned char fl) {
}
@@ -3621,13 +3530,6 @@ void SetPadTickMask__4CPadUs_addr_80098500(struct CPad *this, unsigned short mas
}
// address: 0x8009BA30
// line start: 81
// line end: 81
void SetPadTick__4CPadUs_addr_8009BA30(struct CPad *this, unsigned short tick) {
}
// address: 0x8009B5F4
// line start: 81
// line end: 81
@@ -3635,6 +3537,13 @@ void SetPadTick__4CPadUs_addr_8009B5F4(struct CPad_dup_4 *this, unsigned short t
}
// address: 0x8009BA30
// line start: 81
// line end: 81
void SetPadTick__4CPadUs_addr_8009BA30(struct CPad *this, unsigned short tick) {
}
// address: 0x800A0AD8
// line start: 85
// line end: 85
@@ -3971,10 +3880,17 @@ void SetPadTick__4CPadUs_addr_80098508(struct CPad *this, unsigned short tick) {
}
// address: 0x80081C94
// line start: 86
// line end: 86
void SetPadType__4CPadUc(struct CPad_dup_4 *this, unsigned char val) {
}
// address: 0x80089980
// line start: 102
// line end: 102
void SetPadType__4CPadUc(struct CPad_dup_17 *this, unsigned char val) {
void SetPadType__4CPadUc_addr_80089980(struct CPad_dup_17 *this, unsigned char val) {
}
@@ -3985,10 +3901,11 @@ void SetPadType__4CPadUc_addr_80082650(struct CPad *this, unsigned char val) {
}
// address: 0x80081C94
// line start: 86
// line end: 86
void SetPadType__4CPadUc_addr_80081C94(struct CPad_dup_4 *this, unsigned char val) {
// address: 0x800898D4
// size: 0xEC
// line start: 85
// line end: 85
struct CPad *__4CPadi(struct CPad *this, int PhysStick) {
}
@@ -3996,23 +3913,7 @@ void SetPadType__4CPadUc_addr_80081C94(struct CPad_dup_4 *this, unsigned char va
// size: 0x6C
// line start: 75
// line end: 75
struct CPad_dup_4 *__4CPadi(struct CPad_dup_4 *this, int PhysStick) {
}
// address: 0x800899A4
// size: 0xEC
// line start: 85
// line end: 85
struct CPad_dup_17 *__4CPadi_addr_800899A4(struct CPad_dup_17 *this, int PhysStick) {
}
// address: 0x800898D4
// size: 0xEC
// line start: 85
// line end: 85
struct CPad *__4CPadi_addr_800898D4(struct CPad *this, int PhysStick) {
struct CPad_dup_4 *__4CPadi_addr_80081CB8(struct CPad_dup_4 *this, int PhysStick) {
}
@@ -4024,3 +3925,11 @@ struct CPad *__4CPadi_addr_800823F4(struct CPad *this, int PhysStick) {
}
// address: 0x800899A4
// size: 0xEC
// line start: 85
// line end: 85
struct CPad_dup_17 *__4CPadi_addr_800899A4(struct CPad_dup_17 *this, int PhysStick) {
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/pause.cpp
+388 -388
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/primpool.cpp
+11 -11
View File
@@ -50,20 +50,10 @@ void PRIM_Clip__FP4RECTi(struct RECT *R, int Depth) {
}
// address: 0x8007AC18
// line start: 267
// line end: 330
void PRIM_Flush__Fv() {
// register: 16
// size: 0x1C
register struct PRIM_BUFFER *Pb;
}
// address: 0x800838A4
// line start: 279
// line end: 349
void PRIM_Flush__Fv_addr_800838A4() {
void PRIM_Flush__Fv() {
// register: 17
// size: 0x1C
register struct PRIM_BUFFER *Pb;
@@ -74,6 +64,16 @@ void PRIM_Flush__Fv_addr_800838A4() {
}
// address: 0x8007AC18
// line start: 267
// line end: 330
void PRIM_Flush__Fv_addr_8007AC18() {
// register: 16
// size: 0x1C
register struct PRIM_BUFFER *Pb;
}
// address: 0x8007ABDC
// line start: 245
// line end: 254
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/printy.cpp
+725 -725
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/printy.h
+59 -59
View File
@@ -114,10 +114,10 @@ int GetCharHeight__5CFontUc_addr_8013E2CC(struct CFont_dup_17 *this, unsigned ch
}
// address: 0x80082B68
// line start: 88
// line end: 88
void ClearFont__5CFont_addr_80082B68(struct CFont *this) {
// address: 0x80084ADC
// line start: 91
// line end: 91
void ClearFont__5CFont_addr_80084ADC(struct CFont_dup_10 *this) {
}
@@ -135,31 +135,24 @@ void ClearFont__5CFont_addr_800860D8(struct CFont_dup_1 *this) {
}
// address: 0x80084ADC
// line start: 91
// line end: 91
void ClearFont__5CFont_addr_80084ADC(struct CFont_dup_10 *this) {
}
// address: 0x8008AA7C
// line start: 79
// line end: 79
int GetCharFrameNum__5CFontUc(struct CFont_dup_17 *this, unsigned char ch) {
// address: 0x80082B68
// line start: 88
// line end: 88
void ClearFont__5CFont_addr_80082B68(struct CFont *this) {
}
// address: 0x8008A904
// line start: 79
// line end: 79
int GetCharFrameNum__5CFontUc_addr_8008A904(struct CFont_dup_19 *this, unsigned char ch) {
int GetCharFrameNum__5CFontUc(struct CFont_dup_19 *this, unsigned char ch) {
}
// address: 0x8008310C
// line start: 85
// line end: 85
int GetCharFrameNum__5CFontUc_addr_8008310C(struct CFont *this, unsigned char ch) {
// address: 0x8008AA7C
// line start: 79
// line end: 79
int GetCharFrameNum__5CFontUc_addr_8008AA7C(struct CFont_dup_17 *this, unsigned char ch) {
}
@@ -170,17 +163,24 @@ int GetCharFrameNum__5CFontUc_addr_8008A9AC(struct CFont_dup_18 *this, unsigned
}
// address: 0x80085380
// address: 0x8008310C
// line start: 85
// line end: 85
int GetCharFrameNum__5CFontc(struct CFont_dup_14 *this, char ch) {
int GetCharFrameNum__5CFontUc_addr_8008310C(struct CFont *this, unsigned char ch) {
}
// address: 0x8008611C
// line start: 82
// line end: 82
int GetCharFrameNum__5CFontc_addr_8008611C(struct CFont_dup_1 *this, char ch) {
int GetCharFrameNum__5CFontc(struct CFont_dup_1 *this, char ch) {
}
// address: 0x80085380
// line start: 85
// line end: 85
int GetCharFrameNum__5CFontc_addr_80085380(struct CFont_dup_14 *this, char ch) {
}
@@ -359,31 +359,10 @@ int GetCharWidth__5CFontc_addr_80048790(struct CFont *this, char ch) {
}
// address: 0x8008AA94
// address: 0x80084B90
// line start: 59
// line end: 59
void Init__5CFont(struct CFont_dup_17 *this) {
}
// address: 0x8008618C
// line start: 59
// line end: 59
void Init__5CFont_addr_8008618C(struct CFont_dup_1 *this) {
}
// address: 0x8008A9C4
// line start: 59
// line end: 59
void Init__5CFont_addr_8008A9C4(struct CFont_dup_18 *this) {
}
// address: 0x8008A91C
// line start: 59
// line end: 59
void Init__5CFont_addr_8008A91C(struct CFont_dup_19 *this) {
void Init__5CFont(struct CFont_dup_10 *this) {
}
@@ -394,6 +373,13 @@ void Init__5CFont_addr_800853F0(struct CFont_dup_14 *this) {
}
// address: 0x8008A91C
// line start: 59
// line end: 59
void Init__5CFont_addr_8008A91C(struct CFont_dup_19 *this) {
}
// address: 0x80082C1C
// line start: 59
// line end: 59
@@ -401,10 +387,24 @@ void Init__5CFont_addr_80082C1C(struct CFont *this) {
}
// address: 0x80084B90
// address: 0x8008618C
// line start: 59
// line end: 59
void Init__5CFont_addr_80084B90(struct CFont_dup_10 *this) {
void Init__5CFont_addr_8008618C(struct CFont_dup_1 *this) {
}
// address: 0x8008AA94
// line start: 59
// line end: 59
void Init__5CFont_addr_8008AA94(struct CFont_dup_17 *this) {
}
// address: 0x8008A9C4
// line start: 59
// line end: 59
void Init__5CFont_addr_8008A9C4(struct CFont_dup_18 *this) {
}
@@ -415,10 +415,10 @@ bool IsDefined__5CFontUc(struct CFont_dup_1 *this, unsigned char C) {
}
// address: 0x8008AA5C
// line start: 82
// line end: 82
bool IsDefined__5CFontUc_addr_8008AA5C(struct CFont_dup_17 *this, unsigned char C) {
// address: 0x80082B8C
// line start: 85
// line end: 85
bool IsDefined__5CFontUc_addr_80082B8C(struct CFont *this, unsigned char C) {
}
@@ -443,6 +443,13 @@ bool IsDefined__5CFontUc_addr_8008A98C(struct CFont_dup_18 *this, unsigned char
}
// address: 0x8008AA5C
// line start: 82
// line end: 82
bool IsDefined__5CFontUc_addr_8008AA5C(struct CFont_dup_17 *this, unsigned char C) {
}
// address: 0x80085360
// line start: 88
// line end: 88
@@ -450,10 +457,3 @@ bool IsDefined__5CFontUc_addr_80085360(struct CFont_dup_14 *this, unsigned char
}
// address: 0x80082B8C
// line start: 85
// line end: 85
bool IsDefined__5CFontUc_addr_80082B8C(struct CFont *this, unsigned char C) {
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/psxhelp.cpp
+61 -61
View File
@@ -24,10 +24,40 @@ void CheckStr__FPcT0i_addr_800A23B0(char *s, char *d, int pos) {
}
// address: 0x800AE6A0
// line start: 346
// line end: 411
void DisplayHelp__Fv() {
// register: 23
// size: 0xC
register struct HelpStruct_dup_17 *hp;
// register: 22
register int y;
{
// address: 0xFFFFFFB8
auto int i;
{
// register: 16
register char *txt;
{
{
{
{
// register: 30
register int nlen;
}
}
}
}
}
}
}
// address: 0x800A2484
// line start: 172
// line end: 247
void DisplayHelp__Fv() {
void DisplayHelp__Fv_addr_800A2484() {
// register: 22
// size: 0x8
register struct HelpStruct *hp;
@@ -84,36 +114,6 @@ void DisplayHelp__Fv_addr_800AE5CC() {
}
// address: 0x800AE6A0
// line start: 346
// line end: 411
void DisplayHelp__Fv_addr_800AE6A0() {
// register: 23
// size: 0xC
register struct HelpStruct_dup_17 *hp;
// register: 22
register int y;
{
// address: 0xFFFFFFB8
auto int i;
{
// register: 16
register char *txt;
{
{
{
{
// register: 30
register int nlen;
}
}
}
}
}
}
}
// address: 0x800AE48C
// line start: 294
// line end: 342
@@ -160,34 +160,18 @@ int DrawHelpLine__FiiPccccP10HelpStruct_addr_800AE3B8(int x, int y, char *txt, c
}
// address: 0x800AEA20
// line start: 415
// line end: 452
void DrawHelp__Fv() {
// address: 0x80121ED0
// size: 0x10
static struct Dialog txtBack;
// register: 16
register int otpos;
// register: 19
register int oldDot;
// register: 20
register int OldPrintOT;
}
// address: 0x800A2848
// line start: 251
// line end: 264
void DrawHelp__Fv_addr_800A2848() {
void DrawHelp__Fv() {
}
// address: 0x800AEA08
// address: 0x800AEA20
// line start: 415
// line end: 452
void DrawHelp__Fv_addr_800AEA08() {
// address: 0x8011D740
void DrawHelp__Fv_addr_800AEA20() {
// address: 0x80121ED0
// size: 0x10
static struct Dialog txtBack;
// register: 16
@@ -231,6 +215,22 @@ void DrawHelp__Fv_addr_800AE94C() {
}
// address: 0x800AEA08
// line start: 415
// line end: 452
void DrawHelp__Fv_addr_800AEA08() {
// address: 0x8011D740
// size: 0x10
static struct Dialog txtBack;
// register: 16
register int otpos;
// register: 19
register int oldDot;
// register: 20
register int OldPrintOT;
}
// address: 0x800A2308
// line start: 110
// line end: 130
@@ -255,16 +255,6 @@ void HelpPad__Fv() {
}
// address: 0x800AE01C
// line start: 80
// line end: 150
void HelpPad__Fv_addr_800AE01C() {
// register: 16
// size: 0xEC
register struct CPad *Pad;
}
// address: 0x800AE0F0
// line start: 80
// line end: 150
@@ -275,6 +265,16 @@ void HelpPad__Fv_addr_800AE0F0() {
}
// address: 0x800AE01C
// line start: 80
// line end: 150
void HelpPad__Fv_addr_800AE01C() {
// register: 16
// size: 0xEC
register struct CPad *Pad;
}
// address: 0x800A22C4
// line start: 103
// line end: 106
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/psxmsg.cpp
+23 -23
View File
@@ -16,10 +16,17 @@ void GoForwardLevel__Fv() {
}
// address: 0x8008B24C
// line start: 295
// line end: 310
void GoLoadGame__Fv() {
}
// address: 0x80096E6C
// line start: 491
// line end: 542
void GoLoadGame__Fv() {
void GoLoadGame__Fv_addr_80096E6C() {
{
// register: 6
register int p;
@@ -37,17 +44,17 @@ void GoLoadGame__Fv() {
}
// address: 0x8008B24C
// line start: 295
// line end: 310
void GoLoadGame__Fv_addr_8008B24C() {
// address: 0x8009726C
// line start: 604
// line end: 609
void GoNewGame__Fv() {
}
// address: 0x8008B45C
// line start: 346
// line end: 351
void GoNewGame__Fv() {
void GoNewGame__Fv_addr_8008B45C() {
{
// register: 3
register int i;
@@ -55,13 +62,6 @@ void GoNewGame__Fv() {
}
// address: 0x8009726C
// line start: 604
// line end: 609
void GoNewGame__Fv_addr_8009726C() {
}
// address: 0x8008AB20
// line start: 333
// line end: 344
@@ -122,19 +122,19 @@ void PostGoForwardLevel__Fv() {
}
// address: 0x8008B1B0
// line start: 285
// line end: 291
void PostLoadGame__Fv() {
// register: 16
register int palnum;
}
// address: 0x80096DF4
// line start: 475
// line end: 487
void PostLoadGame__Fv_addr_80096DF4() {
void PostLoadGame__Fv() {
}
// address: 0x8008B1B0
// line start: 285
// line end: 291
void PostLoadGame__Fv_addr_8008B1B0() {
// register: 16
register int palnum;
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/scratch.cpp
+28 -28
View File
@@ -9,22 +9,22 @@ void SCR_Open__Fv() {
}
// address: 0x8008E3A0
// address: 0x8008DC48
// size: 0x18
// line start: 205
// line end: 238
struct PalEntry *FindPal__13PalCollectionUsUsi(struct PalCollection *this, unsigned short SourceClut, unsigned short PixVal, int NumOfCols) {
struct PalEntry *FindPal__13PalCollectionUsUsi(struct PalCollection_dup_4 *this, unsigned short SourceClut, unsigned short PixVal, int NumOfCols) {
// register: 16
// size: 0x18
register struct PalEntry *RetPal;
}
// address: 0x8008DC48
// address: 0x8008E3A0
// size: 0x18
// line start: 205
// line end: 238
struct PalEntry *FindPal__13PalCollectionUsUsi_addr_8008DC48(struct PalCollection_dup_4 *this, unsigned short SourceClut, unsigned short PixVal, int NumOfCols) {
struct PalEntry *FindPal__13PalCollectionUsUsi_addr_8008E3A0(struct PalCollection *this, unsigned short SourceClut, unsigned short PixVal, int NumOfCols) {
// register: 16
// size: 0x18
register struct PalEntry *RetPal;
@@ -65,10 +65,10 @@ void Init__8PalEntry(struct PalEntry *this) {
}
// address: 0x8008DBB8
// address: 0x8008E310
// line start: 181
// line end: 190
void Init__13PalCollectionPC7InitPos(struct PalCollection_dup_4 *this, struct InitPos *IPos) {
void Init__13PalCollectionPC7InitPos(struct PalCollection *this, struct InitPos *IPos) {
{
// register: 19
register int f;
@@ -76,10 +76,10 @@ void Init__13PalCollectionPC7InitPos(struct PalCollection_dup_4 *this, struct In
}
// address: 0x8008E310
// address: 0x8008DBB8
// line start: 181
// line end: 190
void Init__13PalCollectionPC7InitPos_addr_8008E310(struct PalCollection *this, struct InitPos *IPos) {
void Init__13PalCollectionPC7InitPos_addr_8008DBB8(struct PalCollection_dup_4 *this, struct InitPos *IPos) {
{
// register: 19
register int f;
@@ -104,22 +104,22 @@ void MakePal__8PalEntryUsUsi(struct PalEntry *this, unsigned short _SourceClut,
}
// address: 0x8008E47C
// address: 0x8008DD24
// size: 0x18
// line start: 247
// line end: 269
struct PalEntry *NewPal__13PalCollectionUsUsi(struct PalCollection *this, unsigned short SourceClut, unsigned short PixVal, int NumOfCols) {
struct PalEntry *NewPal__13PalCollectionUsUsi(struct PalCollection_dup_4 *this, unsigned short SourceClut, unsigned short PixVal, int NumOfCols) {
// register: 16
// size: 0x18
register struct PalEntry *RetPal;
}
// address: 0x8008DD24
// address: 0x8008E47C
// size: 0x18
// line start: 247
// line end: 269
struct PalEntry *NewPal__13PalCollectionUsUsi_addr_8008DD24(struct PalCollection_dup_4 *this, unsigned short SourceClut, unsigned short PixVal, int NumOfCols) {
struct PalEntry *NewPal__13PalCollectionUsUsi_addr_8008E47C(struct PalCollection *this, unsigned short SourceClut, unsigned short PixVal, int NumOfCols) {
// register: 16
// size: 0x18
register struct PalEntry *RetPal;
@@ -187,25 +187,25 @@ void Set__8PalEntryUsUsi(struct PalEntry *this, unsigned short _SourceClut, unsi
}
// address: 0x8008E630
// line start: 327
// line end: 344
void UpdatePals__13PalCollection(struct PalCollection *this) {
// register: 16
// size: 0x18
register struct PalEntry *ThisPal;
{
// register: 17
// size: 0x18
register struct PalEntry *NextPal;
}
}
// address: 0x8008DED8
// line start: 327
// line end: 344
void UpdatePals__13PalCollection_addr_8008DED8(struct PalCollection_dup_4 *this) {
void UpdatePals__13PalCollection(struct PalCollection_dup_4 *this) {
// register: 16
// size: 0x18
register struct PalEntry *ThisPal;
{
// register: 17
// size: 0x18
register struct PalEntry *NextPal;
}
}
// address: 0x8008E630
// line start: 327
// line end: 344
void UpdatePals__13PalCollection_addr_8008E630(struct PalCollection *this) {
// register: 16
// size: 0x18
register struct PalEntry *ThisPal;
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/sndbank.cpp
+211 -211
View File
@@ -186,22 +186,10 @@ void SND_StopSnd__Fi(int voice) {
}
// address: 0x8008D9F8
// line start: 176
// line end: 212
void SPU_Init__Fv() {
{
// address: 0xFFFFFFD0
// size: 0x28
auto struct SpuCommonAttr common_attr;
}
}
// address: 0x80099F98
// line start: 175
// line end: 218
void SPU_Init__Fv_addr_80099F98() {
void SPU_Init__Fv() {
{
// address: 0xFFFFFFC8
// size: 0x28
@@ -230,6 +218,18 @@ void SPU_Init__Fv_addr_80090708() {
}
// address: 0x8008D9F8
// line start: 176
// line end: 212
void SPU_Init__Fv_addr_8008D9F8() {
{
// address: 0xFFFFFFD0
// size: 0x28
auto struct SpuCommonAttr common_attr;
}
}
// address: 0x80099F60
// line start: 164
// line end: 166
@@ -237,177 +237,15 @@ void SPU_OnceOnlyInit__Fv() {
}
// address: 0x8008DD74
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x801163FC
static int DestAddr;
}
// address: 0x8009A0A8
// line start: 278
// line end: 291
bool SndLoadCallBack__FPUciib_addr_8009A0A8(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011C7F4
static int DestAddr;
}
// address: 0x8008FF58
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008FF58(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011A0A4
static int DestAddr;
}
// address: 0x8009A000
// line start: 278
// line end: 291
bool SndLoadCallBack__FPUciib_addr_8009A000(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011C8BC
static int DestAddr;
}
// address: 0x800908F8
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_800908F8(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012DB9C
static int DestAddr;
}
// address: 0x8008D804
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_8008D804(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80117BF0
static int DestAddr;
}
// address: 0x8008E6F4
// line start: 268
// line end: 281
bool SndLoadCallBack__FPUciib_addr_8008E6F4(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012B0D0
static int DestAddr;
}
// address: 0x80092BC0
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_80092BC0(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011D9BC
static int DestAddr;
}
// address: 0x8008FD70
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008FD70(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012C364
static int DestAddr;
}
// address: 0x80090358
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_80090358(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012C584
static int DestAddr;
}
// address: 0x8008F728
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008F728(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80118C48
static int DestAddr;
}
// address: 0x80090694
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_80090694(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012D954
static int DestAddr;
}
// address: 0x8008FF50
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008FF50(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012C670
static int DestAddr;
}
// address: 0x8008DD98
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_8008DD98(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80118404
static int DestAddr;
}
// address: 0x8009A17C
// line start: 278
// line end: 291
bool SndLoadCallBack__FPUciib_addr_8009A17C(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011C8FC
static int DestAddr;
}
// address: 0x8008F2E4
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008F2E4(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80118240
static int DestAddr;
}
// address: 0x80090364
// line start: 233
// line end: 246
bool SndLoadCallBack__FPUciib_addr_80090364(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
bool SndLoadCallBack__FPUciib(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012CE78
static int DestAddr;
}
// address: 0x8008D44C
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008D44C(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80114C4C
static int DestAddr;
}
// address: 0x8008DBA4
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_8008DBA4(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80117AC8
static int DestAddr;
}
// address: 0x800901D0
// line start: 232
// line end: 245
@@ -417,47 +255,20 @@ bool SndLoadCallBack__FPUciib_addr_800901D0(unsigned char *Mem, int ReadSoFar, i
}
// address: 0x8009A0B4
// line start: 278
// line end: 291
bool SndLoadCallBack__FPUciib_addr_8009A0B4(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011C908
static int DestAddr;
}
// address: 0x80090430
// line start: 233
// line end: 246
bool SndLoadCallBack__FPUciib_addr_80090430(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012D488
static int DestAddr;
}
// address: 0x80090390
// line start: 233
// line end: 246
bool SndLoadCallBack__FPUciib_addr_80090390(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012D5C0
static int DestAddr;
}
// address: 0x80092D4C
// address: 0x80090694
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_80092D4C(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80123C0C
bool SndLoadCallBack__FPUciib_addr_80090694(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012D954
static int DestAddr;
}
// address: 0x800910C4
// line start: 268
// line end: 281
bool SndLoadCallBack__FPUciib_addr_800910C4(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80121788
// address: 0x8008FD70
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008FD70(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012C364
static int DestAddr;
}
@@ -471,6 +282,177 @@ bool SndLoadCallBack__FPUciib_addr_8008F97C(unsigned char *Mem, int ReadSoFar, i
}
// address: 0x8008F2E4
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008F2E4(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80118240
static int DestAddr;
}
// address: 0x8009A0A8
// line start: 278
// line end: 291
bool SndLoadCallBack__FPUciib_addr_8009A0A8(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011C7F4
static int DestAddr;
}
// address: 0x80092BC0
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_80092BC0(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011D9BC
static int DestAddr;
}
// address: 0x8009A000
// line start: 278
// line end: 291
bool SndLoadCallBack__FPUciib_addr_8009A000(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011C8BC
static int DestAddr;
}
// address: 0x80090390
// line start: 233
// line end: 246
bool SndLoadCallBack__FPUciib_addr_80090390(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012D5C0
static int DestAddr;
}
// address: 0x8008DD98
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_8008DD98(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80118404
static int DestAddr;
}
// address: 0x8009A0B4
// line start: 278
// line end: 291
bool SndLoadCallBack__FPUciib_addr_8009A0B4(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011C908
static int DestAddr;
}
// address: 0x80090358
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_80090358(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012C584
static int DestAddr;
}
// address: 0x8008FF58
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008FF58(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011A0A4
static int DestAddr;
}
// address: 0x8008DBA4
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_8008DBA4(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80117AC8
static int DestAddr;
}
// address: 0x8009A17C
// line start: 278
// line end: 291
bool SndLoadCallBack__FPUciib_addr_8009A17C(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8011C8FC
static int DestAddr;
}
// address: 0x80090430
// line start: 233
// line end: 246
bool SndLoadCallBack__FPUciib_addr_80090430(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012D488
static int DestAddr;
}
// address: 0x800910C4
// line start: 268
// line end: 281
bool SndLoadCallBack__FPUciib_addr_800910C4(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80121788
static int DestAddr;
}
// address: 0x8008FF50
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008FF50(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012C670
static int DestAddr;
}
// address: 0x8008D44C
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008D44C(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80114C4C
static int DestAddr;
}
// address: 0x80092D4C
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_80092D4C(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80123C0C
static int DestAddr;
}
// address: 0x8008DD74
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008DD74(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x801163FC
static int DestAddr;
}
// address: 0x8008E6F4
// line start: 268
// line end: 281
bool SndLoadCallBack__FPUciib_addr_8008E6F4(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012B0D0
static int DestAddr;
}
// address: 0x8008D804
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_8008D804(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80117BF0
static int DestAddr;
}
// address: 0x800907A4
// line start: 268
// line end: 281
@@ -480,3 +462,21 @@ bool SndLoadCallBack__FPUciib_addr_800907A4(unsigned char *Mem, int ReadSoFar, i
}
// address: 0x8008F728
// line start: 232
// line end: 245
bool SndLoadCallBack__FPUciib_addr_8008F728(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x80118C48
static int DestAddr;
}
// address: 0x800908F8
// line start: 267
// line end: 280
bool SndLoadCallBack__FPUciib_addr_800908F8(unsigned char *Mem, int ReadSoFar, int Size, bool LastChunk) {
// address: 0x8012DB9C
static int DestAddr;
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/spltargt.cpp
+25 -25
View File
@@ -208,10 +208,10 @@ void ClearTrails__11SpellTarget(struct SpellTarget_dup_18 *this) {
}
// address: 0x800AEFDC
// address: 0x800AEFC4
// line start: 103
// line end: 108
void ClearTrails__11SpellTarget_addr_800AEFDC(struct SpellTarget *this) {
void ClearTrails__11SpellTarget_addr_800AEFC4(struct SpellTarget_dup_19 *this) {
{
// register: 3
register int i;
@@ -219,10 +219,10 @@ void ClearTrails__11SpellTarget_addr_800AEFDC(struct SpellTarget *this) {
}
// address: 0x800AEFC4
// address: 0x800AEFDC
// line start: 103
// line end: 108
void ClearTrails__11SpellTarget_addr_800AEFC4(struct SpellTarget_dup_19 *this) {
void ClearTrails__11SpellTarget_addr_800AEFDC(struct SpellTarget *this) {
{
// register: 3
register int i;
@@ -332,13 +332,13 @@ void ForceTarget__11SpellTargetiii_addr_800AFA54(struct SpellTarget_dup_19 *this
}
// address: 0x800AEE38
// address: 0x800AEF0C
// line start: 79
// line end: 99
void GetScrXY__FPiT0(int *wx, int *wy) {
// register: 19
// size: 0x108
register struct CBlocks_dup_18 *gblocks;
register struct CBlocks_dup_17 *gblocks;
// address: 0xFFFFFFD8
// size: 0x8
auto struct RECT R;
@@ -355,13 +355,13 @@ void GetScrXY__FPiT0(int *wx, int *wy) {
}
// address: 0x800AEF0C
// address: 0x800AEF6C
// line start: 79
// line end: 99
void GetScrXY__FPiT0_addr_800AEF0C(int *wx, int *wy) {
void GetScrXY__FPiT0_addr_800AEF6C(int *wx, int *wy) {
// register: 19
// size: 0x108
register struct CBlocks_dup_17 *gblocks;
register struct CBlocks *gblocks;
// address: 0xFFFFFFD8
// size: 0x8
auto struct RECT R;
@@ -401,13 +401,13 @@ void GetScrXY__FPiT0_addr_800AEEF4(int *wx, int *wy) {
}
// address: 0x800AEF6C
// address: 0x800AEE38
// line start: 79
// line end: 99
void GetScrXY__FPiT0_addr_800AEF6C(int *wx, int *wy) {
void GetScrXY__FPiT0_addr_800AEE38(int *wx, int *wy) {
// register: 19
// size: 0x108
register struct CBlocks *gblocks;
register struct CBlocks_dup_18 *gblocks;
// address: 0xFFFFFFD8
// size: 0x8
auto struct RECT R;
@@ -487,10 +487,10 @@ void Init__11SpellTargeti(struct SpellTarget *this, int plrn) {
}
// address: 0x800AEFEC
// address: 0x800AEF30
// line start: 114
// line end: 170
void Init__11SpellTargeti_addr_800AEFEC(struct SpellTarget_dup_19 *this, int plrn) {
void Init__11SpellTargeti_addr_800AEF30(struct SpellTarget_dup_18 *this, int plrn) {
{
{
{
@@ -508,10 +508,10 @@ void Init__11SpellTargeti_addr_800AEFEC(struct SpellTarget_dup_19 *this, int plr
}
// address: 0x800AEF30
// address: 0x800AEFEC
// line start: 114
// line end: 170
void Init__11SpellTargeti_addr_800AEF30(struct SpellTarget_dup_18 *this, int plrn) {
void Init__11SpellTargeti_addr_800AEFEC(struct SpellTarget_dup_19 *this, int plrn) {
{
{
{
@@ -574,7 +574,7 @@ void SPL_Arrow__F6TARGETiii(enum TARGET t, int pnum, int times, int size) {
}
// address: 0x800AF5B0
// address: 0x800AF550
// line start: 239
// line end: 387
void Show__11SpellTarget(struct SpellTarget *this) {
@@ -584,7 +584,7 @@ void Show__11SpellTarget(struct SpellTarget *this) {
auto int y;
// register: 16
// size: 0xEC
register struct CPad *Pad;
register struct CPad_dup_17 *Pad;
// register: 20
register int otx;
// register: 21
@@ -597,7 +597,7 @@ void Show__11SpellTarget(struct SpellTarget *this) {
register int ply;
// register: 19
// size: 0x6C
register struct MonsterStruct *Monst;
register struct MonsterStruct_dup_17 *Monst;
// register: 20
register int ops;
{
@@ -668,17 +668,17 @@ void Show__11SpellTarget_addr_800AF538(struct SpellTarget_dup_19 *this) {
}
// address: 0x800AF550
// address: 0x800AF47C
// line start: 239
// line end: 387
void Show__11SpellTarget_addr_800AF550(struct SpellTarget *this) {
void Show__11SpellTarget_addr_800AF47C(struct SpellTarget_dup_18 *this) {
// address: 0xFFFFFFD8
auto int x;
// address: 0xFFFFFFDC
auto int y;
// register: 16
// size: 0xEC
register struct CPad_dup_17 *Pad;
register struct CPad *Pad;
// register: 20
register int otx;
// register: 21
@@ -691,7 +691,7 @@ void Show__11SpellTarget_addr_800AF550(struct SpellTarget *this) {
register int ply;
// register: 19
// size: 0x6C
register struct MonsterStruct_dup_17 *Monst;
register struct MonsterStruct *Monst;
// register: 20
register int ops;
{
@@ -715,10 +715,10 @@ void Show__11SpellTarget_addr_800AF550(struct SpellTarget *this) {
}
// address: 0x800AF47C
// address: 0x800AF5B0
// line start: 239
// line end: 387
void Show__11SpellTarget_addr_800AF47C(struct SpellTarget_dup_18 *this) {
void Show__11SpellTarget_addr_800AF5B0(struct SpellTarget *this) {
// address: 0xFFFFFFD8
auto int x;
// address: 0xFFFFFFDC
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/stream.cpp
+142 -142
View File
@@ -9,13 +9,13 @@ void InitCDWaitIcon__Fv() {
}
// address: 0x800985F0
// address: 0x800986C4
// line start: 166
// line end: 191
void PrintCDWaitTask__FP4TASK(struct TASK *T) {
// register: 20
// size: 0x70
register struct TextDat_dup_18 *CDGfxData;
register struct TextDat_dup_17 *CDGfxData;
// register: 2
// size: 0x28
register struct POLY_FT4 *Ft4;
@@ -32,13 +32,13 @@ void PrintCDWaitTask__FP4TASK(struct TASK *T) {
}
// address: 0x80098548
// address: 0x800985F0
// line start: 166
// line end: 191
void PrintCDWaitTask__FP4TASK_addr_80098548(struct TASK *T) {
void PrintCDWaitTask__FP4TASK_addr_800985F0(struct TASK *T) {
// register: 20
// size: 0x70
register struct TextDat *CDGfxData;
register struct TextDat_dup_18 *CDGfxData;
// register: 2
// size: 0x28
register struct POLY_FT4 *Ft4;
@@ -68,13 +68,13 @@ void PrintCDWaitTask__FP4TASK_addr_8008E868(struct TASK *T) {
}
// address: 0x800986C4
// address: 0x80098548
// line start: 166
// line end: 191
void PrintCDWaitTask__FP4TASK_addr_800986C4(struct TASK *T) {
void PrintCDWaitTask__FP4TASK_addr_80098548(struct TASK *T) {
// register: 20
// size: 0x70
register struct TextDat_dup_17 *CDGfxData;
register struct TextDat *CDGfxData;
// register: 2
// size: 0x28
register struct POLY_FT4 *Ft4;
@@ -147,41 +147,10 @@ void STR_AllocBuffer__Fv_addr_8008EE10() {
}
// address: 0x8008D4BC
// line start: 1060
// line end: 1227
void STR_AsyncTASK__FP4TASK(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *A;
// register: 21
// size: 0x14
register struct STRHDR *StreamHND;
// register: 16
// size: 0x80
register struct SFXHDR *sfh;
// register: 18
register char Done;
// register: 17
register int latency;
// register: 19
register int frame;
// register: 22
register int framediff;
// register: 20
register int AsyncHND;
// register: 2
register unsigned char *ptr;
// address: 0xFFFFFFD0
// size: 0xE
auto char OrigName[14];
}
// address: 0x800998EC
// line start: 1281
// line end: 1461
void STR_AsyncTASK__FP4TASK_addr_800998EC(struct TASK *T) {
void STR_AsyncTASK__FP4TASK(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *A;
@@ -288,45 +257,41 @@ void STR_AsyncTASK__FP4TASK_addr_800999C0(struct TASK *T) {
}
// address: 0x80099614
// line start: 1145
// line end: 1268
void STR_AsyncWeeTASK__FP4TASK(struct TASK *T) {
// address: 0x8008D4BC
// line start: 1060
// line end: 1227
void STR_AsyncTASK__FP4TASK_addr_8008D4BC(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *A;
// register: 20
// register: 21
// size: 0x14
register struct STRHDR *StreamHND;
// register: 16
// size: 0x84
// size: 0x80
register struct SFXHDR *sfh;
// register: 17
// register: 18
register char Done;
// register: 17
register int latency;
// register: 19
register int frame;
// register: 18
// register: 22
register int framediff;
// register: 21
// register: 20
register int AsyncHND;
// register: 2
register unsigned char *ptr;
// address: 0xFFFFFFD0
// size: 0xE
auto char OrigName[14];
{
{
{
}
}
}
}
// address: 0x8008D1C4
// line start: 926
// line end: 1047
void STR_AsyncWeeTASK__FP4TASK_addr_8008D1C4(struct TASK *T) {
void STR_AsyncWeeTASK__FP4TASK(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *A;
@@ -387,6 +352,41 @@ void STR_AsyncWeeTASK__FP4TASK_addr_800996E8(struct TASK *T) {
}
// address: 0x80099614
// line start: 1145
// line end: 1268
void STR_AsyncWeeTASK__FP4TASK_addr_80099614(struct TASK *T) {
// register: 2
// size: 0x10
register struct DEF_ARGS *A;
// register: 20
// size: 0x14
register struct STRHDR *StreamHND;
// register: 16
// size: 0x84
register struct SFXHDR *sfh;
// register: 17
register char Done;
// register: 19
register int frame;
// register: 18
register int framediff;
// register: 21
register int AsyncHND;
// register: 2
register unsigned char *ptr;
// address: 0xFFFFFFD0
// size: 0xE
auto char OrigName[14];
{
{
{
}
}
}
}
// address: 0x80099058
// line start: 846
// line end: 867
@@ -401,24 +401,24 @@ void STR_CloseStream__FP6SFXHDR_addr_8008CC88(struct SFXHDR *sfh) {
}
// address: 0x8008CE00
// line start: 743
// line end: 797
char STR_Command__FP6SFXHDR(struct SFXHDR *sfh) {
}
// address: 0x800991B0
// line start: 927
// line end: 1003
char STR_Command__FP6SFXHDR_addr_800991B0(struct SFXHDR_dup_17 *sfh) {
char STR_Command__FP6SFXHDR(struct SFXHDR_dup_17 *sfh) {
}
// address: 0x800993A0
// line start: 1013
// line end: 1031
void STR_DMAControl__FP6SFXHDR(struct SFXHDR_dup_17 *sfh) {
// address: 0x8008CE00
// line start: 743
// line end: 797
char STR_Command__FP6SFXHDR_addr_8008CE00(struct SFXHDR *sfh) {
}
// address: 0x8008CF20
// line start: 807
// line end: 826
void STR_DMAControl__FP6SFXHDR(struct SFXHDR *sfh) {
// register: 17
register unsigned char *ptr;
// register: 20
@@ -428,10 +428,10 @@ void STR_DMAControl__FP6SFXHDR(struct SFXHDR_dup_17 *sfh) {
}
// address: 0x8008CF20
// line start: 807
// line end: 826
void STR_DMAControl__FP6SFXHDR_addr_8008CF20(struct SFXHDR *sfh) {
// address: 0x800993A0
// line start: 1013
// line end: 1031
void STR_DMAControl__FP6SFXHDR_addr_800993A0(struct SFXHDR_dup_17 *sfh) {
// register: 17
register unsigned char *ptr;
// register: 20
@@ -492,10 +492,32 @@ struct SFXHDR *STR_InitStream__Fv() {
}
// address: 0x800988B0
// line start: 472
// line end: 520
void STR_Init__Fv() {
{
{
// register: 3
register long vm;
// register: 5
register unsigned char *ptr;
// register: 16
// size: 0x5C
register struct TASK *T;
{
// register: 4
register int i;
}
}
}
}
// address: 0x8008C748
// line start: 390
// line end: 417
void STR_Init__Fv() {
void STR_Init__Fv_addr_8008C748() {
{
{
// register: 4
@@ -530,41 +552,19 @@ void STR_Init__Fv_addr_8008EE40() {
}
// address: 0x800988B0
// line start: 472
// line end: 520
void STR_Init__Fv_addr_800988B0() {
{
{
// register: 3
register long vm;
// register: 5
register unsigned char *ptr;
// register: 16
// size: 0x5C
register struct TASK *T;
{
// register: 4
register int i;
}
}
}
// address: 0x8008CADC
// line start: 596
// line end: 627
void STR_PlaySFX__FP6SFXHDR(struct SFXHDR *sfh) {
// register: 5
register int offs;
}
// address: 0x80098E64
// line start: 775
// line end: 806
void STR_PlaySFX__FP6SFXHDR(struct SFXHDR_dup_17 *sfh) {
// register: 5
register int offs;
}
// address: 0x8008CADC
// line start: 596
// line end: 627
void STR_PlaySFX__FP6SFXHDR_addr_8008CADC(struct SFXHDR *sfh) {
void STR_PlaySFX__FP6SFXHDR_addr_80098E64(struct SFXHDR_dup_17 *sfh) {
// register: 5
register int offs;
}
@@ -632,23 +632,10 @@ struct SFXHDR_dup_17 *STR_PlaySound__FUscic_addr_80098B04(unsigned short Name, c
}
// address: 0x8008CFE8
// line start: 837
// line end: 914
void STR_PlayStream__FP6SFXHDRPUci(struct SFXHDR *sfh, unsigned char *Src, int size) {
// register: 19
register int sec_num;
// register: 17
register unsigned char *dp;
// register: 3
register int i;
}
// address: 0x80099394
// line start: 1042
// line end: 1133
void STR_PlayStream__FP6SFXHDRPUci_addr_80099394(struct SFXHDR *sfh, unsigned char *Src, int size) {
void STR_PlayStream__FP6SFXHDRPUci(struct SFXHDR *sfh, unsigned char *Src, int size) {
// register: 19
register int sec_num;
// register: 17
@@ -662,6 +649,19 @@ void STR_PlayStream__FP6SFXHDRPUci_addr_80099394(struct SFXHDR *sfh, unsigned ch
}
// address: 0x8008CFE8
// line start: 837
// line end: 914
void STR_PlayStream__FP6SFXHDRPUci_addr_8008CFE8(struct SFXHDR *sfh, unsigned char *Src, int size) {
// register: 19
register int sec_num;
// register: 17
register unsigned char *dp;
// register: 3
register int i;
}
// address: 0x80099468
// line start: 1042
// line end: 1133
@@ -693,11 +693,11 @@ void STR_SoundCommand__FP6SFXHDRi_addr_800990C4(struct SFXHDR_dup_17 *sfh, int C
}
// address: 0x80099DA8
// line start: 1471
// line end: 1515
void STR_StreamMainTask__FP6SFXHDRc(struct SFXHDR_dup_17 *sfh, char FileType) {
// register: 17
// address: 0x8008D8E8
// line start: 1241
// line end: 1276
void STR_StreamMainTask__FP6SFXHDRc(struct SFXHDR *sfh, char FileType) {
// register: 18
// size: 0x14
register struct STRHDR *sh;
// register: 2
@@ -733,11 +733,11 @@ void STR_StreamMainTask__FP6SFXHDRc_addr_80099CD4(struct SFXHDR *sfh, char FileT
}
// address: 0x8008D8E8
// line start: 1241
// line end: 1276
void STR_StreamMainTask__FP6SFXHDRc_addr_8008D8E8(struct SFXHDR *sfh, char FileType) {
// register: 18
// address: 0x80099DA8
// line start: 1471
// line end: 1515
void STR_StreamMainTask__FP6SFXHDRc_addr_80099DA8(struct SFXHDR_dup_17 *sfh, char FileType) {
// register: 17
// size: 0x14
register struct STRHDR *sh;
// register: 2
@@ -774,23 +774,23 @@ void STR_fadeupto__FP6SFXHDRi(struct SFXHDR *sfh, int vol) {
}
// address: 0x80098F70
// line start: 816
// line end: 821
// address: 0x8008CBE8
// line start: 637
// line end: 641
void STR_pauseall__Fv() {
{
// register: 18
// register: 17
register int i;
}
}
// address: 0x8008CBE8
// line start: 637
// line end: 641
void STR_pauseall__Fv_addr_8008CBE8() {
// address: 0x80098F70
// line start: 816
// line end: 821
void STR_pauseall__Fv_addr_80098F70() {
{
// register: 17
// register: 18
register int i;
}
}
@@ -842,13 +842,6 @@ void STR_setvolume__FP6SFXHDR(struct SFXHDR_dup_17 *sfh) {
}
// address: 0x8008CA84
// line start: 566
// line end: 571
void STR_setvolume__FP6SFXHDR_addr_8008CA84(struct SFXHDR *sfh) {
}
// address: 0x80098C78
// line start: 736
// line end: 752
@@ -859,3 +852,10 @@ void STR_setvolume__FP6SFXHDR_addr_80098C78(struct SFXHDR *sfh) {
}
// address: 0x8008CA84
// line start: 566
// line end: 571
void STR_setvolume__FP6SFXHDR_addr_8008CA84(struct SFXHDR *sfh) {
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/sysinit.cpp
+8 -8
View File
@@ -28,19 +28,19 @@ struct FileIO *SYSI_GetOverlayFs__Fv() {
}
// address: 0x8007B23C
// line start: 182
// line end: 242
void SortOutFileSystem__Fv() {
}
// address: 0x800841D4
// line start: 201
// line end: 275
void SortOutFileSystem__Fv() {
void SortOutFileSystem__Fv_addr_800841D4() {
// register: 16
register char *SearchPath;
}
// address: 0x8007B23C
// line start: 182
// line end: 242
void SortOutFileSystem__Fv_addr_8007B23C() {
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/titlescr.cpp
+63 -63
View File
@@ -2,10 +2,54 @@
#include "types.h"
// address: 0x8009DEF4
// line start: 65
// line end: 99
void DrawFlameLogo__Fv() {
// register: 8
// size: 0x28
register struct POLY_FT4 *FT4;
// register: 16
register int diff;
// register: 6
register int x;
// register: 18
register int *frm;
// register: 17
register int *xp;
{
// register: 16
register int i;
}
}
// address: 0x80090BF8
// line start: 50
// line end: 82
void DrawFlameLogo__Fv_addr_80090BF8() {
// register: 4
// size: 0x28
register struct POLY_FT4 *FT4;
// register: 16
register int diff;
}
// address: 0x80091220
// line start: 46
// line end: 75
void DrawFlameLogo__Fv_addr_80091220() {
// register: 4
// size: 0x28
register struct POLY_FT4 *FT4;
}
// address: 0x80092F38
// line start: 50
// line end: 79
void DrawFlameLogo__Fv() {
void DrawFlameLogo__Fv_addr_80092F38() {
// register: 16
register int diff;
}
@@ -51,50 +95,6 @@ void DrawFlameLogo__Fv_addr_80094038() {
}
// address: 0x8009DEF4
// line start: 65
// line end: 99
void DrawFlameLogo__Fv_addr_8009DEF4() {
// register: 8
// size: 0x28
register struct POLY_FT4 *FT4;
// register: 16
register int diff;
// register: 6
register int x;
// register: 18
register int *frm;
// register: 17
register int *xp;
{
// register: 16
register int i;
}
}
// address: 0x80090BF8
// line start: 50
// line end: 82
void DrawFlameLogo__Fv_addr_80090BF8() {
// register: 4
// size: 0x28
register struct POLY_FT4 *FT4;
// register: 16
register int diff;
}
// address: 0x80091220
// line start: 46
// line end: 75
void DrawFlameLogo__Fv_addr_80091220() {
// register: 4
// size: 0x28
register struct POLY_FT4 *FT4;
}
// address: 0x80094000
// line start: 77
// line end: 82
@@ -108,17 +108,10 @@ void ReInitDFL__Fv() {
}
// address: 0x8009DFD0
// line start: 107
// line end: 110
void TitleScreen__FP7CScreen(struct CScreen_dup_18 *FeScreen) {
}
// address: 0x8009145C
// line start: 81
// line end: 84
void TitleScreen__FP7CScreen_addr_8009145C(struct CScreen *FeScreen) {
// address: 0x80094334
// line start: 147
// line end: 150
void TitleScreen__FP7CScreen(struct CScreen_dup_14 *FeScreen) {
}
@@ -129,6 +122,13 @@ void TitleScreen__FP7CScreen_addr_8009E0A4(struct CScreen_dup_17 *FeScreen) {
}
// address: 0x8009145C
// line start: 81
// line end: 84
void TitleScreen__FP7CScreen_addr_8009145C(struct CScreen *FeScreen) {
}
// address: 0x8009496C
// line start: 81
// line end: 84
@@ -136,13 +136,6 @@ void TitleScreen__FP7CScreen_addr_8009496C(struct CScreen_dup_1 *FeScreen) {
}
// address: 0x80094334
// line start: 147
// line end: 150
void TitleScreen__FP7CScreen_addr_80094334(struct CScreen_dup_14 *FeScreen) {
}
// address: 0x8009DF38
// line start: 107
// line end: 110
@@ -150,3 +143,10 @@ void TitleScreen__FP7CScreen_addr_8009DF38(struct CScreen_dup_19 *FeScreen) {
}
// address: 0x8009DFD0
// line start: 107
// line end: 110
void TitleScreen__FP7CScreen_addr_8009DFD0(struct CScreen_dup_18 *FeScreen) {
}
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/tony.cpp
+26 -26
View File
@@ -16,10 +16,10 @@ int CurrCheatStr__Fv() {
}
// address: 0x8009B6F8
// address: 0x8009B57C
// line start: 344
// line end: 365
void DrawManaShield__FP12PlayerStruct(struct PlayerStruct_dup_17 *ptrplr) {
void DrawManaShield__FP12PlayerStruct(struct PlayerStruct *ptrplr) {
}
@@ -30,10 +30,10 @@ void DrawManaShield__FP12PlayerStruct_addr_8009B624(struct PlayerStruct_dup_18 *
}
// address: 0x8009B57C
// address: 0x8009B6F8
// line start: 344
// line end: 365
void DrawManaShield__FP12PlayerStruct_addr_8009B57C(struct PlayerStruct *ptrplr) {
void DrawManaShield__FP12PlayerStruct_addr_8009B6F8(struct PlayerStruct_dup_17 *ptrplr) {
}
@@ -104,23 +104,23 @@ void demo_game_task__FP4TASK(struct TASK *T) {
}
// address: 0x8008EB2C
// line start: 139
// line end: 145
void load_demo_pad_data__FUl(unsigned long demo_num) {
}
// address: 0x8008E3F0
// line start: 134
// line end: 141
void load_demo_pad_data__FUl_addr_8008E3F0(unsigned long demo_num) {
void load_demo_pad_data__FUl(unsigned long demo_num) {
// register: 4
// size: 0x14
register struct FileIO *Fs;
}
// address: 0x8008EB2C
// line start: 139
// line end: 145
void load_demo_pad_data__FUl_addr_8008EB2C(unsigned long demo_num) {
}
// address: 0x8008E938
// line start: 77
// line end: 79
@@ -128,23 +128,10 @@ void new_eprint__FPcT0i(char *Text, char *File, int Line) {
}
// address: 0x800907CC
// line start: 116
// line end: 158
void print_demo_task__FP4TASK(struct TASK *T) {
{
{
// register: 3
register int x;
}
}
}
// address: 0x8009B228
// line start: 178
// line end: 255
void print_demo_task__FP4TASK_addr_8009B228(struct TASK *T) {
void print_demo_task__FP4TASK(struct TASK *T) {
{
// register: 16
register int demo_char;
@@ -163,6 +150,19 @@ void print_demo_task__FP4TASK_addr_8008E9F4(struct TASK *T) {
}
// address: 0x800907CC
// line start: 116
// line end: 158
void print_demo_task__FP4TASK_addr_800907CC(struct TASK *T) {
{
{
// register: 3
register int x;
}
}
}
// address: 0x8008EB7C
// line start: 149
// line end: 155
psx/_dump_/_dump_merge_c_src_/diabpsx/psxsrc/vid.cpp
+7 -7
View File
@@ -99,6 +99,13 @@ void VID_SetDBuffer__Fb(bool DBuf) {
}
// address: 0x8007AA68
// line start: 252
// line end: 285
void VID_SetDBuffer__Fb_addr_8007AA68(bool DBuf) {
}
// address: 0x8007ED40
// line start: 274
// line end: 316
@@ -112,13 +119,6 @@ void VID_SetDBuffer__Fb_addr_8007ED40(bool DBuf) {
}
// address: 0x8007AA68
// line start: 252
// line end: 285
void VID_SetDBuffer__Fb_addr_8007AA68(bool DBuf) {
}
// address: 0x8007B1AC
// line start: 236
// line end: 238
psx/_dump_/_dump_merge_c_src_/diabpsx/source/compmap.cpp
+512 -512
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/source/compmap.h
+67 -67
View File
@@ -2,24 +2,10 @@
#include "types.h"
// address: 0x800792C8
// line start: 82
// line end: 82
void CheckMapNum__13CompLevelMapsi(struct CompLevelMaps *this, int MapNum) {
}
// address: 0x80081E68
// address: 0x80081D10
// line start: 129
// line end: 129
void CheckMapNum__13CompLevelMapsi_addr_80081E68(struct CompLevelMaps_dup_17 *this, int MapNum) {
}
// address: 0x8007D77C
// line start: 129
// line end: 129
void CheckMapNum__13CompLevelMapsi_addr_8007D77C(struct CompLevelMaps_dup_30 *this, int MapNum) {
void CheckMapNum__13CompLevelMapsi(struct CompLevelMaps_dup_20 *this, int MapNum) {
}
@@ -30,13 +16,6 @@ void CheckMapNum__13CompLevelMapsi_addr_80081CD0(struct CompLevelMaps_dup_19 *th
}
// address: 0x8007B600
// line start: 82
// line end: 82
void CheckMapNum__13CompLevelMapsi_addr_8007B600(struct CompLevelMaps_dup_14 *this, int MapNum) {
}
// address: 0x80081D98
// line start: 129
// line end: 129
@@ -44,24 +23,45 @@ void CheckMapNum__13CompLevelMapsi_addr_80081D98(struct CompLevelMaps_dup_18 *th
}
// address: 0x80081D10
// line start: 129
// line end: 129
void CheckMapNum__13CompLevelMapsi_addr_80081D10(struct CompLevelMaps_dup_20 *this, int MapNum) {
// address: 0x8007B600
// line start: 82
// line end: 82
void CheckMapNum__13CompLevelMapsi_addr_8007B600(struct CompLevelMaps_dup_14 *this, int MapNum) {
}
// address: 0x8007D8B4
// line start: 129
// line end: 129
void CheckMapNum__13CompLevelMapsi_addr_8007D8B4(struct CompLevelMaps_dup_29 *this, int MapNum) {
void CheckMapNum__13CompLevelMapsi_addr_8007D8B4(struct CompLevelMaps_dup_23 *this, int MapNum) {
}
// address: 0x800792C8
// line start: 82
// line end: 82
void CheckMapNum__13CompLevelMapsi_addr_800792C8(struct CompLevelMaps *this, int MapNum) {
}
// address: 0x8007D77C
// line start: 129
// line end: 129
void CheckMapNum__13CompLevelMapsi_addr_8007D77C(struct CompLevelMaps_dup_24 *this, int MapNum) {
}
// address: 0x80081E68
// line start: 129
// line end: 129
void CheckMapNum__13CompLevelMapsi_addr_80081E68(struct CompLevelMaps_dup_17 *this, int MapNum) {
}
// address: 0x8004D990
// line start: 60
// line end: 65
int GetSize__14CompressedLevs(struct CompressedLevs_dup_30 *this) {
int GetSize__14CompressedLevs(struct CompressedLevs_dup_24 *this) {
}
@@ -72,24 +72,10 @@ int GetSize__14CompressedLevs_addr_80052824(struct CompressedLevs *this) {
}
// address: 0x80081DCC
// address: 0x80081E9C
// line start: 86
// line end: 86
bool IsCompressed__4AMap(struct AMap_dup_18 *this) {
}
// address: 0x80081D44
// line start: 86
// line end: 86
bool IsCompressed__4AMap_addr_80081D44(struct AMap *this) {
}
// address: 0x8007D8E8
// line start: 86
// line end: 86
bool IsCompressed__4AMap_addr_8007D8E8(struct AMap_dup_29 *this) {
bool IsCompressed__4AMap(struct AMap_dup_17 *this) {
}
@@ -100,26 +86,24 @@ bool IsCompressed__4AMap_addr_80081D04(struct AMap_dup_19 *this) {
}
// address: 0x80081E9C
// address: 0x8007D8E8
// line start: 86
// line end: 86
bool IsCompressed__4AMap_addr_80081E9C(struct AMap_dup_17 *this) {
bool IsCompressed__4AMap_addr_8007D8E8(struct AMap_dup_23 *this) {
}
// address: 0x8007B67C
// size: 0xC
// line start: 48
// line end: 50
struct AMap *__4AMap(struct AMap *this) {
// address: 0x80081DCC
// line start: 86
// line end: 86
bool IsCompressed__4AMap_addr_80081DCC(struct AMap_dup_18 *this) {
}
// address: 0x80081D98
// size: 0x10
// line start: 75
// line end: 77
struct AMap *__4AMap_addr_80081D98(struct AMap *this) {
// address: 0x80081D44
// line start: 86
// line end: 86
bool IsCompressed__4AMap_addr_80081D44(struct AMap *this) {
}
@@ -127,7 +111,7 @@ struct AMap *__4AMap_addr_80081D98(struct AMap *this) {
// size: 0x10
// line start: 75
// line end: 77
struct AMap_dup_29 *__4AMap_addr_8007D93C(struct AMap_dup_29 *this) {
struct AMap_dup_23 *__4AMap(struct AMap_dup_23 *this) {
}
@@ -139,11 +123,11 @@ struct AMap_dup_18 *__4AMap_addr_80081E20(struct AMap_dup_18 *this) {
}
// address: 0x80081EF0
// address: 0x80081D98
// size: 0x10
// line start: 75
// line end: 77
struct AMap_dup_17 *__4AMap_addr_80081EF0(struct AMap_dup_17 *this) {
struct AMap *__4AMap_addr_80081D98(struct AMap *this) {
}
@@ -155,6 +139,22 @@ struct AMap_dup_19 *__4AMap_addr_80081D58(struct AMap_dup_19 *this) {
}
// address: 0x8007B67C
// size: 0xC
// line start: 48
// line end: 50
struct AMap *__4AMap_addr_8007B67C(struct AMap *this) {
}
// address: 0x80081EF0
// size: 0x10
// line start: 75
// line end: 77
struct AMap_dup_17 *__4AMap_addr_80081EF0(struct AMap_dup_17 *this) {
}
// address: 0x80052860
// size: 0x4
// line start: 51
@@ -168,6 +168,13 @@ void ___4AMap(struct AMap_dup_17 *this, int __in_chrg) {
}
// address: 0x8007D8F4
// line start: 80
// line end: 80
void ___4AMap_addr_8007D8F4(struct AMap_dup_23 *this, int __in_chrg) {
}
// address: 0x8007B634
// line start: 53
// line end: 53
@@ -182,13 +189,6 @@ void ___4AMap_addr_80081DD8(struct AMap_dup_18 *this, int __in_chrg) {
}
// address: 0x8007D8F4
// line start: 80
// line end: 80
void ___4AMap_addr_8007D8F4(struct AMap_dup_29 *this, int __in_chrg) {
}
// address: 0x80081D10
// line start: 80
// line end: 80
psx/_dump_/_dump_merge_c_src_/diabpsx/source/control.cpp
+910 -910
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/source/coreauto.cpp
+12 -12
View File
@@ -2,10 +2,21 @@
#include "types.h"
// address: 0x80079AFC
// line start: 108
// line end: 200
unsigned short GetAutomapType__FiiUc(int x, int y, unsigned char view) {
// register: 5
register unsigned short rv;
// register: 4
register unsigned char f;
}
// address: 0x8008072C
// line start: 158
// line end: 236
unsigned short GetAutomapType__FiiUc(int x, int y, unsigned char view) {
unsigned short GetAutomapType__FiiUc_addr_8008072C(int x, int y, unsigned char view) {
// register: 5
register unsigned short rv;
// register: 4
@@ -17,17 +28,6 @@ unsigned short GetAutomapType__FiiUc(int x, int y, unsigned char view) {
}
// address: 0x80079AFC
// line start: 108
// line end: 200
unsigned short GetAutomapType__FiiUc_addr_80079AFC(int x, int y, unsigned char view) {
// register: 5
register unsigned short rv;
// register: 4
register unsigned char f;
}
// address: 0x80079E08
// line start: 205
// line end: 278
psx/_dump_/_dump_merge_c_src_/diabpsx/source/coremon.cpp
+170 -170
View File
@@ -34,22 +34,16 @@ void ClearMVars__Fi(int i) {
}
// address: 0x8007F594
// line start: 383
// line end: 508
// address: 0x80078AC8
// line start: 324
// line end: 431
void InitMonster__Fiiiii(int i, int rd, int mtype, int x, int y) {
// register: 17
// size: 0x1C
register struct CMonster *monst;
// register: 16
// size: 0x6C
register struct MonsterStruct_dup_17 *pmonster;
{
{
// register: 6
register int slvl;
}
}
// size: 0x70
register struct MonsterStruct *pmonster;
}
@@ -72,16 +66,22 @@ void InitMonster__Fiiiii_addr_8007F4C4(int i, int rd, int mtype, int x, int y) {
}
// address: 0x80078AC8
// line start: 324
// line end: 431
void InitMonster__Fiiiii_addr_80078AC8(int i, int rd, int mtype, int x, int y) {
// address: 0x8007F594
// line start: 383
// line end: 508
void InitMonster__Fiiiii_addr_8007F594(int i, int rd, int mtype, int x, int y) {
// register: 17
// size: 0x1C
register struct CMonster *monst;
// register: 16
// size: 0x70
register struct MonsterStruct *pmonster;
// size: 0x6C
register struct MonsterStruct_dup_17 *pmonster;
{
{
// register: 6
register int slvl;
}
}
}
@@ -149,37 +149,86 @@ void M_ClearSquares__Fi_addr_800781F8(int i) {
}
// address: 0x8007B770
// line start: 221
// line end: 306
// address: 0x8007F230
// line start: 225
// line end: 275
void M_Enemy__Fi(int i) {
// register: 30
register int j;
// register: 18
// size: 0x6C
register struct MonsterStruct *Monst;
// register: 5
register int closest;
// register: 19
register int _mx;
// register: 20
register int _my;
// register: 16
register int _menemy;
// register: 21
// size: 0x19E8
register struct PlayerStruct_dup_18 *plr1;
// register: 23
// size: 0x19E8
register struct PlayerStruct_dup_18 *plr2;
{
{
{
{
// register: 2
// size: 0x19E8
register struct PlayerStruct_dup_18 *enemy;
// register: 17
register int y;
{
{
// register: 17
register int x1;
// register: 19
register int y1;
// register: 16
register int x2;
// register: 3
register int y2;
}
}
}
}
}
}
}
// address: 0x80076ECC
// line start: 221
// line end: 305
void M_Enemy__Fi_addr_80076ECC(int i) {
// address: 0xFFFFFFA8
auto int j;
// register: 19
register int mi;
// register: 19
// register: 21
register int pnum;
// address: 0xFFFFFFA8
// address: 0xFFFFFFB0
auto int closest;
// register: 3
register int dist;
// address: 0xFFFFFFB0
// address: 0xFFFFFFB8
auto int bestdist;
// register: 20
register unsigned char sameroom;
// address: 0xFFFFFFB8
// address: 0xFFFFFFC0
auto unsigned char bestsameroom;
// register: 22
// size: 0x70
register struct MonsterStruct *Monst;
// address: 0xFFFFFFC0
auto unsigned char enemyx;
// address: 0xFFFFFFC8
auto unsigned char enemyx;
// address: 0xFFFFFFD0
auto unsigned char enemyy;
// register: 23
register int _mxi;
// address: 0xFFFFFFD0
auto int _myi;
// register: 30
register int _myi;
{
{
// register: 17
@@ -240,15 +289,57 @@ void M_Enemy__Fi_addr_8007F168(int i) {
}
// address: 0x80078494
// address: 0x8007B770
// line start: 221
// line end: 306
void M_Enemy__Fi_addr_80078494(int i) {
void M_Enemy__Fi_addr_8007B770(int i) {
// register: 30
register int j;
// register: 19
register int mi;
// register: 19
register int pnum;
// address: 0xFFFFFFA8
auto int closest;
// register: 3
register int dist;
// address: 0xFFFFFFB0
auto int bestdist;
// register: 20
register unsigned char sameroom;
// address: 0xFFFFFFB8
auto unsigned char bestsameroom;
// register: 22
// size: 0x70
register struct MonsterStruct *Monst;
// address: 0xFFFFFFC0
auto unsigned char enemyx;
// address: 0xFFFFFFC8
auto unsigned char enemyy;
// register: 23
register int _mxi;
// address: 0xFFFFFFD0
auto int _myi;
{
{
// register: 17
register int _mx;
// register: 21
register int _my;
}
}
}
// address: 0x80077DD8
// line start: 221
// line end: 304
void M_Enemy__Fi_addr_80077DD8(int i) {
// address: 0xFFFFFFA8
auto int j;
// register: 19
register int mi;
// register: 19
// register: 22
register int pnum;
// address: 0xFFFFFFB0
auto int closest;
@@ -260,7 +351,7 @@ void M_Enemy__Fi_addr_80078494(int i) {
register unsigned char sameroom;
// address: 0xFFFFFFC0
auto unsigned char bestsameroom;
// register: 22
// register: 21
// size: 0x70
register struct MonsterStruct *Monst;
// address: 0xFFFFFFC8
@@ -275,22 +366,22 @@ void M_Enemy__Fi_addr_80078494(int i) {
{
// register: 17
register int _mx;
// register: 21
// register: 22
register int _my;
}
}
}
// address: 0x80076ECC
// address: 0x80078494
// line start: 221
// line end: 305
void M_Enemy__Fi_addr_80076ECC(int i) {
// line end: 306
void M_Enemy__Fi_addr_80078494(int i) {
// address: 0xFFFFFFA8
auto int j;
// register: 19
register int mi;
// register: 21
// register: 19
register int pnum;
// address: 0xFFFFFFB0
auto int closest;
@@ -373,119 +464,28 @@ void M_Enemy__Fi_addr_8007F300(int i) {
}
// address: 0x80077DD8
// line start: 221
// line end: 304
void M_Enemy__Fi_addr_80077DD8(int i) {
// address: 0xFFFFFFA8
auto int j;
// register: 19
register int mi;
// register: 22
register int pnum;
// address: 0xFFFFFFB0
auto int closest;
// register: 3
register int dist;
// address: 0xFFFFFFB8
auto int bestdist;
// register: 20
register unsigned char sameroom;
// address: 0xFFFFFFC0
auto unsigned char bestsameroom;
// register: 21
// size: 0x70
register struct MonsterStruct *Monst;
// address: 0xFFFFFFC8
auto unsigned char enemyx;
// address: 0xFFFFFFD0
auto unsigned char enemyy;
// register: 23
register int _mxi;
// register: 30
register int _myi;
{
{
// register: 17
register int _mx;
// register: 22
register int _my;
}
}
}
// address: 0x8007F230
// line start: 225
// line end: 275
void M_Enemy__Fi_addr_8007F230(int i) {
// register: 18
// size: 0x6C
register struct MonsterStruct *Monst;
// register: 5
register int closest;
// register: 19
register int _mx;
// register: 20
register int _my;
// register: 16
register int _menemy;
// register: 21
// size: 0x19E8
register struct PlayerStruct_dup_18 *plr1;
// register: 23
// size: 0x19E8
register struct PlayerStruct_dup_18 *plr2;
{
{
{
{
// register: 2
// size: 0x19E8
register struct PlayerStruct_dup_18 *enemy;
// register: 17
register int y;
{
{
// register: 17
register int x1;
// register: 19
register int y1;
// register: 16
register int x2;
// register: 3
register int y2;
}
}
}
}
}
}
// address: 0x800783EC
// line start: 192
// line end: 201
unsigned char M_Ranged__Fi(int i) {
}
// address: 0x8007B654
// line start: 192
// line end: 201
unsigned char M_Ranged__Fi(int i) {
unsigned char M_Ranged__Fi_addr_8007B654(int i) {
// register: 16
register unsigned char _mAi;
}
// address: 0x800783EC
// line start: 192
// line end: 201
unsigned char M_Ranged__Fi_addr_800783EC(int i) {
}
// address: 0x80079498
// line start: 565
// line end: 582
// address: 0x8008000C
// line start: 644
// line end: 661
void M_StartSpStand__Fii(int i, int md) {
// register: 2
// size: 0x70
// size: 0x6C
register struct MonsterStruct *pmonster;
// register: 3
register int _mx;
@@ -494,12 +494,12 @@ void M_StartSpStand__Fii(int i, int md) {
}
// address: 0x8008000C
// line start: 644
// line end: 661
void M_StartSpStand__Fii_addr_8008000C(int i, int md) {
// address: 0x80079498
// line start: 565
// line end: 582
void M_StartSpStand__Fii_addr_80079498(int i, int md) {
// register: 2
// size: 0x6C
// size: 0x70
register struct MonsterStruct *pmonster;
// register: 3
register int _mx;
@@ -564,28 +564,39 @@ void M_StartStand__Fii_addr_8007FAFC(int i, int md) {
}
// address: 0x80078434
// address: 0x8007B6D8
// line start: 205
// line end: 217
unsigned char M_Talker__Fi(int i) {
// register: 16
register unsigned char _mAi;
}
// address: 0x80078434
// line start: 205
// line end: 217
unsigned char M_Talker__Fi_addr_80078434(int i) {
// register: 4
register unsigned char _mAi;
}
// address: 0x8007B6D8
// line start: 205
// line end: 217
unsigned char M_Talker__Fi_addr_8007B6D8(int i) {
// register: 16
register unsigned char _mAi;
// address: 0x8007C538
// line start: 481
// line end: 500
void M_UpdateLeader__Fi(int i) {
// register: 4
register int x;
// register: 2
register int tmp;
}
// address: 0x80079108
// line start: 481
// line end: 500
void M_UpdateLeader__Fi(int i) {
void M_UpdateLeader__Fi_addr_80079108(int i) {
// register: 5
register int x;
// register: 2
@@ -593,37 +604,26 @@ void M_UpdateLeader__Fi(int i) {
}
// address: 0x8007C538
// line start: 481
// line end: 500
void M_UpdateLeader__Fi_addr_8007C538(int i) {
// register: 4
register int x;
// address: 0x800783A0
// line start: 176
// line end: 188
void NewMonsterAnim__FiR10AnimStructii(int i, struct AnimStruct *anim, int md, int AnimType) {
// register: 2
register int tmp;
// size: 0x70
register struct MonsterStruct *Monst;
}
// address: 0x8007F244
// line start: 178
// line end: 190
void NewMonsterAnim__FiR10AnimStructii(int i, struct AnimStruct *anim, int md, int AnimType) {
void NewMonsterAnim__FiR10AnimStructii_addr_8007F244(int i, struct AnimStruct *anim, int md, int AnimType) {
// register: 2
// size: 0x6C
register struct MonsterStruct_dup_17 *Monst;
}
// address: 0x800783A0
// line start: 176
// line end: 188
void NewMonsterAnim__FiR10AnimStructii_addr_800783A0(int i, struct AnimStruct *anim, int md, int AnimType) {
// register: 2
// size: 0x70
register struct MonsterStruct *Monst;
}
// address: 0x8007F174
// line start: 178
// line end: 190
psx/_dump_/_dump_merge_c_src_/diabpsx/source/cursor.cpp
+33 -33
View File
@@ -9,10 +9,37 @@ void CheckCursMove__Fv() {
}
// address: 0x80035454
// line start: 247
// line end: 279
void CheckRportal__Fv() {
// register: 11
register int ocursmx;
// register: 10
register int ocursmy;
{
// register: 9
register int i;
{
// register: 3
register int mx;
{
{
{
// register: 8
register int dir;
}
}
}
}
}
}
// address: 0x80036390
// line start: 237
// line end: 258
void CheckRportal__Fv() {
void CheckRportal__Fv_addr_80036390() {
{
// register: 17
register int i;
@@ -24,10 +51,10 @@ void CheckRportal__Fv() {
}
// address: 0x80035454
// line start: 247
// line end: 279
void CheckRportal__Fv_addr_80035454() {
// address: 0x800351C8
// line start: 211
// line end: 242
void CheckTown__Fv() {
// register: 11
register int ocursmx;
// register: 10
@@ -54,7 +81,7 @@ void CheckRportal__Fv_addr_80035454() {
// address: 0x80036138
// line start: 211
// line end: 231
void CheckTown__Fv() {
void CheckTown__Fv_addr_80036138() {
{
// register: 18
register int i;
@@ -66,33 +93,6 @@ void CheckTown__Fv() {
}
// address: 0x800351C8
// line start: 211
// line end: 242
void CheckTown__Fv_addr_800351C8() {
// register: 11
register int ocursmx;
// register: 10
register int ocursmy;
{
// register: 9
register int i;
{
// register: 3
register int mx;
{
{
{
// register: 8
register int dir;
}
}
}
}
}
}
// address: 0x80035FF0
// line start: 137
// line end: 142
psx/_dump_/_dump_merge_c_src_/diabpsx/source/diablo.cpp
+22 -22
View File
@@ -16,29 +16,10 @@ void AllSolid__Fii(int x, int y) {
}
// address: 0x80037464
// line start: 2531
// line end: 2556
void ClearOutDungeonMap__Fv() {
// register: 11
register unsigned short val;
{
// register: 10
register int x;
{
{
// register: 6
register int y;
}
}
}
}
// address: 0x80038C94
// line start: 2592
// line end: 2661
void ClearOutDungeonMap__Fv_addr_80038C94() {
void ClearOutDungeonMap__Fv() {
// register: 17
register bool istown;
// register: 16
@@ -92,6 +73,25 @@ void ClearOutDungeonMap__Fv_addr_80038C94() {
}
// address: 0x80037464
// line start: 2531
// line end: 2556
void ClearOutDungeonMap__Fv_addr_80037464() {
// register: 11
register unsigned short val;
{
// register: 10
register int x;
{
{
// register: 6
register int y;
}
}
}
}
// address: 0x800371E4
// line start: 2444
// line end: 2464
@@ -128,7 +128,7 @@ void DoMemCardFromInGame__Fv() {
void FillCrapBits__Fv() {
// register: 18
// size: 0x14
register struct QuestStruct_dup_17 *qs;
register struct QuestStruct *qs;
{
{
{
@@ -150,7 +150,7 @@ void FillCrapBits__Fv() {
void FillCrapBits__Fv_addr_80038F74() {
// register: 18
// size: 0x14
register struct QuestStruct *qs;
register struct QuestStruct_dup_17 *qs;
{
{
{
psx/_dump_/_dump_merge_c_src_/diabpsx/source/effects.cpp
+52 -52
View File
@@ -51,10 +51,21 @@ void PlaySFX__Fi(int psfx) {
}
// address: 0x8003A338
// line start: 284
// line end: 315
void PlaySFX_priv__FP4TSFXUcii(struct TSFX_dup_13 *pSFX, unsigned char loc, int x, int y) {
// address: 0xFFFFFFF4
auto long lPan;
// address: 0xFFFFFFF0
auto long lVolume;
}
// address: 0x8003B184
// line start: 278
// line end: 309
void PlaySFX_priv__FP4TSFXUcii(struct TSFX *pSFX, unsigned char loc, int x, int y) {
void PlaySFX_priv__FP4TSFXUcii_addr_8003B184(struct TSFX *pSFX, unsigned char loc, int x, int y) {
// address: 0xFFFFFFF4
auto long lPan;
// address: 0xFFFFFFF0
@@ -73,17 +84,6 @@ void PlaySFX_priv__FP4TSFXUcii_addr_8003D354(struct TSFX *pSFX, unsigned char lo
}
// address: 0x8003A338
// line start: 284
// line end: 315
void PlaySFX_priv__FP4TSFXUcii_addr_8003A338(struct TSFX_dup_13 *pSFX, unsigned char loc, int x, int y) {
// address: 0xFFFFFFF4
auto long lPan;
// address: 0xFFFFFFF0
auto long lVolume;
}
// address: 0x8003B498
// line start: 418
// line end: 428
@@ -117,7 +117,7 @@ unsigned char calc_snd_position__FiiPlT2(int x, int y, long *plVolume, long *plP
register int scry;
// register: 2
// size: 0x108
register struct CBlocks_dup_19 *gblocks;
register struct CBlocks *gblocks;
// address: 0xFFFFFFE0
// size: 0x8
auto struct RECT R;
@@ -163,6 +163,32 @@ unsigned char calc_snd_position__FiiPlT2_addr_8003D16C(int x, int y, long *plVol
}
// address: 0x8003D144
// line start: 327
// line end: 368
unsigned char calc_snd_position__FiiPlT2_addr_8003D144(int x, int y, long *plVolume, long *plPan) {
// address: 0xFFFFFFA0
// size: 0x40
auto char Temp[64];
// register: 4294967295
register long volume;
// register: 6
register long pan;
// register: 5
register int scrx;
// register: 4
register int scry;
// register: 2
// size: 0x108
register struct CBlocks_dup_19 *gblocks;
// address: 0xFFFFFFE0
// size: 0x8
auto struct RECT R;
// register: 3
register long vol;
}
// address: 0x8003D16C
// line start: 327
// line end: 368
@@ -189,32 +215,6 @@ unsigned char calc_snd_position__FiiPlT2_addr_8003D16C(int x, int y, long *plVol
}
// address: 0x8003D144
// line start: 327
// line end: 368
unsigned char calc_snd_position__FiiPlT2_addr_8003D144(int x, int y, long *plVolume, long *plPan) {
// address: 0xFFFFFFA0
// size: 0x40
auto char Temp[64];
// register: 4294967295
register long volume;
// register: 6
register long pan;
// register: 5
register int scrx;
// register: 4
register int scry;
// register: 2
// size: 0x108
register struct CBlocks *gblocks;
// address: 0xFFFFFFE0
// size: 0x8
auto struct RECT R;
// register: 3
register long vol;
}
// address: 0x8003AEE8
// line start: 77
// line end: 88
@@ -242,20 +242,20 @@ void sfx_stop__Fv() {
}
// address: 0x8003B9C0
// address: 0x8003B5FC
// line start: 512
// line end: 525
void sound_init__Fv() {
// register: 16
// register: 4
register unsigned char bLoadMask;
}
// address: 0x8003B5FC
// address: 0x8003B9C0
// line start: 512
// line end: 525
void sound_init__Fv_addr_8003B5FC() {
// register: 4
void sound_init__Fv_addr_8003B9C0() {
// register: 16
register unsigned char bLoadMask;
}
@@ -306,17 +306,17 @@ void stream_pause__Fv() {
}
// address: 0x8003A0C0
// line start: 115
// line end: 149
void stream_play__FP4TSFXll(struct TSFX_dup_13 *pSFX, long lVolume, long lPan) {
}
// address: 0x8003AF38
// line start: 116
// line end: 143
void stream_play__FP4TSFXll_addr_8003AF38(struct TSFX *pSFX, long lVolume, long lPan) {
void stream_play__FP4TSFXll(struct TSFX *pSFX, long lVolume, long lPan) {
}
// address: 0x8003A0C0
// line start: 115
// line end: 149
void stream_play__FP4TSFXll_addr_8003A0C0(struct TSFX_dup_13 *pSFX, long lVolume, long lPan) {
}
psx/_dump_/_dump_merge_c_src_/diabpsx/source/gameover.cpp
+28 -28
View File
@@ -9,10 +9,23 @@ void GO_DoGameOver__Fv() {
}
// address: 0x8007B1DC
// line start: 85
// line end: 116
void GameOverTask__FP4TASK(struct TASK *T) {
// register: 17
register bool OldPause;
{
// register: 16
register int f;
}
}
// address: 0x80081EC4
// line start: 116
// line end: 211
void GameOverTask__FP4TASK(struct TASK *T) {
void GameOverTask__FP4TASK_addr_80081EC4(struct TASK *T) {
// register: 19
register bool TimeOut;
// register: 17
@@ -41,19 +54,6 @@ void GameOverTask__FP4TASK(struct TASK *T) {
}
// address: 0x8007B1DC
// line start: 85
// line end: 116
void GameOverTask__FP4TASK_addr_8007B1DC(struct TASK *T) {
// register: 17
register bool OldPause;
{
// register: 16
register int f;
}
}
// address: 0x80081F94
// line start: 116
// line end: 211
@@ -93,10 +93,23 @@ bool IS_GameOver__Fv() {
}
// address: 0x8007B298
// line start: 126
// line end: 140
void PrintGameOver__Fv() {
// address: 0xFFFFFFE0
// size: 0x10
auto struct Dialog PBack;
// address: 0xFFFFFFF0
// size: 0x8
auto struct RECT PRect;
}
// address: 0x80082198
// line start: 220
// line end: 242
void PrintGameOver__Fv() {
void PrintGameOver__Fv_addr_80082198() {
// address: 0xFFFFFFD8
// size: 0x10
auto struct Dialog PBack;
@@ -112,16 +125,3 @@ void PrintGameOver__Fv() {
}
// address: 0x8007B298
// line start: 126
// line end: 140
void PrintGameOver__Fv_addr_8007B298() {
// address: 0xFFFFFFE0
// size: 0x10
auto struct Dialog PBack;
// address: 0xFFFFFFF0
// size: 0x8
auto struct RECT PRect;
}
psx/_dump_/_dump_merge_c_src_/diabpsx/source/gamepad.cpp
+2369 -2437
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/source/interfac.cpp
+13 -13
View File
@@ -11,19 +11,6 @@ void ShowProgress__FUi(unsigned int uMsg) {
}
// address: 0x8003BB1C
// line start: 331
// line end: 562
void ShowProgress__FUi_addr_8003BB1C(unsigned int uMsg) {
// register: 17
register unsigned long (*saveProc)();
{
{
}
}
}
// address: 0x8003BE84
// line start: 331
// line end: 562
@@ -39,6 +26,19 @@ void ShowProgress__FUi_addr_8003BE84(unsigned int uMsg) {
}
// address: 0x8003BB1C
// line start: 331
// line end: 562
void ShowProgress__FUi_addr_8003BB1C(unsigned int uMsg) {
// register: 17
register unsigned long (*saveProc)();
{
{
}
}
}
// address: 0x8003BB14
// line start: 297
// line end: 306
psx/_dump_/_dump_merge_c_src_/diabpsx/source/items.cpp
+1335 -1335
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/source/lang.cpp
+21 -21
View File
@@ -79,6 +79,27 @@ void LANG_SetDb__F10LANG_DB_NO(enum LANG_DB_NO_dup_17 NewLangDbNo) {
}
// address: 0x80073B3C
// line start: 87
// line end: 123
void LANG_SetDb__F10LANG_DB_NO_addr_80073B3C(enum LANG_DB_NO NewLangDbNo) {
{
{
// address: 0xFFFFFFC0
// size: 0x28
auto char FileNameBuffer[40];
// register: 16
// size: 0x14
register struct FileIO *FIO;
{
// register: 4
register int f;
}
}
}
}
// address: 0x80072380
// line start: 90
// line end: 148
@@ -104,27 +125,6 @@ void LANG_SetDb__F10LANG_DB_NO_addr_80072380(enum LANG_DB_NO NewLangDbNo) {
}
// address: 0x80073B3C
// line start: 87
// line end: 123
void LANG_SetDb__F10LANG_DB_NO_addr_80073B3C(enum LANG_DB_NO NewLangDbNo) {
{
{
// address: 0xFFFFFFC0
// size: 0x28
auto char FileNameBuffer[40];
// register: 16
// size: 0x14
register struct FileIO *FIO;
{
// register: 4
register int f;
}
}
}
}
// address: 0x800734A0
// line start: 91
// line end: 132
psx/_dump_/_dump_merge_c_src_/diabpsx/source/lighting.cpp
+188 -188
View File
@@ -2,19 +2,10 @@
#include "types.h"
// address: 0x800476F0
// line start: 1089
// line end: 1105
int AddLight__Fiii(int x, int y, int r) {
// register: 7
register int lid;
}
// address: 0x80046BD0
// line start: 1101
// line end: 1119
int AddLight__Fiii_addr_80046BD0(int x, int y, int r) {
int AddLight__Fiii(int x, int y, int r) {
// register: 7
register int lid;
// register: 2
@@ -23,6 +14,15 @@ int AddLight__Fiii_addr_80046BD0(int x, int y, int r) {
}
// address: 0x800476F0
// line start: 1089
// line end: 1105
int AddLight__Fiii_addr_800476F0(int x, int y, int r) {
// register: 7
register int lid;
}
// address: 0x80047784
// line start: 1110
// line end: 1116
@@ -71,37 +71,37 @@ int AddVision__FiiiUc_addr_80047A50(int x, int y, int r, unsigned char mine) {
}
// address: 0x8004789C
// line start: 1198
// line end: 1199
void ChangeLightColour__Fii(int i, int c) {
}
// address: 0x80046D48
// line start: 1216
// line end: 1218
void ChangeLightColour__Fii(int i, int c) {
void ChangeLightColour__Fii_addr_80046D48(int i, int c) {
// register: 4
// size: 0x8
register struct LightListStruct2 *ll;
}
// address: 0x8004789C
// line start: 1198
// line end: 1199
void ChangeLightColour__Fii_addr_8004789C(int i, int c) {
// address: 0x80046CDC
// line start: 1182
// line end: 1195
void ChangeLightOff__Fiii(int i, int x, int y) {
// register: 2
// size: 0x8
register struct LightListStruct2 *ll;
}
// address: 0x80047820
// line start: 1166
// line end: 1178
void ChangeLightOff__Fiii(int i, int x, int y) {
}
// address: 0x80046CDC
// line start: 1182
// line end: 1195
void ChangeLightOff__Fiii_addr_80046CDC(int i, int x, int y) {
// register: 2
// size: 0x8
register struct LightListStruct2 *ll;
void ChangeLightOff__Fiii_addr_80047820(int i, int x, int y) {
}
@@ -112,37 +112,37 @@ void ChangeLightRadius__Fii(int i, int r) {
}
// address: 0x800477E0
// line start: 1136
// line end: 1147
void ChangeLightXY__Fiii(int i, int x, int y) {
}
// address: 0x80046C98
// line start: 1151
// line end: 1163
void ChangeLightXY__Fiii_addr_80046C98(int i, int x, int y) {
void ChangeLightXY__Fiii(int i, int x, int y) {
// register: 3
// size: 0x8
register struct LightListStruct2 *ll;
}
// address: 0x80046D10
// line start: 1200
// line end: 1213
void ChangeLight__Fiiii(int i, int x, int y, int r) {
// register: 2
// size: 0x8
register struct LightListStruct2 *ll;
// address: 0x800477E0
// line start: 1136
// line end: 1147
void ChangeLightXY__Fiii_addr_800477E0(int i, int x, int y) {
}
// address: 0x80047858
// line start: 1183
// line end: 1195
void ChangeLight__Fiiii_addr_80047858(int i, int x, int y, int r) {
void ChangeLight__Fiiii(int i, int x, int y, int r) {
}
// address: 0x80046D10
// line start: 1200
// line end: 1213
void ChangeLight__Fiiii_addr_80046D10(int i, int x, int y, int r) {
// register: 2
// size: 0x8
register struct LightListStruct2 *ll;
}
@@ -176,63 +176,10 @@ void ChangeVisionXY__Fiii_addr_8004701C(int id, int x, int y) {
}
// address: 0x8004BC28
// line start: 443
// line end: 826
void DoLighting__Fiiii(int nXPos, int nYPos, int nRadius, int Lnum) {
// register: 9
register int xoff;
// register: 10
register int yoff;
// register: 20
register int x;
// register: 30
register int y;
// register: 3
register int v;
// register: 22
register int colour_mask;
// register: 17
register int shift_mask;
// register: 12
register int shake;
// address: 0xFFFFFFA8
auto int light_x;
// address: 0xFFFFFFB0
auto int light_y;
// address: 0xFFFFFFB8
auto int block_x;
// register: 9
register int block_y;
// register: 23
register int dist_y;
// register: 11
register int max_x;
// register: 5
register int mult;
// register: 7
register int mult_st;
// register: 21
register int radius_block;
// register: 7
register int scr_x;
// register: 8
register int scr_y;
// register: 6
register int temp_x;
// register: 5
register int temp_y;
// register: 18
register int weirdy;
// register: 11
register int cont;
}
// address: 0x800461A8
// line start: 415
// line end: 765
void DoLighting__Fiiii_addr_800461A8(int nXPos, int nYPos, int nRadius, int Lnum) {
void DoLighting__Fiiii(int nXPos, int nYPos, int nRadius, int Lnum) {
// register: 9
register int xoff;
// register: 10
@@ -282,6 +229,59 @@ void DoLighting__Fiiii_addr_800461A8(int nXPos, int nYPos, int nRadius, int Lnum
}
// address: 0x8004BC28
// line start: 443
// line end: 826
void DoLighting__Fiiii_addr_8004BC28(int nXPos, int nYPos, int nRadius, int Lnum) {
// register: 9
register int xoff;
// register: 10
register int yoff;
// register: 20
register int x;
// register: 30
register int y;
// register: 3
register int v;
// register: 22
register int colour_mask;
// register: 17
register int shift_mask;
// register: 12
register int shake;
// address: 0xFFFFFFA8
auto int light_x;
// address: 0xFFFFFFB0
auto int light_y;
// address: 0xFFFFFFB8
auto int block_x;
// register: 9
register int block_y;
// register: 23
register int dist_y;
// register: 11
register int max_x;
// register: 5
register int mult;
// register: 7
register int mult_st;
// register: 21
register int radius_block;
// register: 7
register int scr_x;
// register: 8
register int scr_y;
// register: 6
register int temp_x;
// register: 5
register int temp_y;
// register: 18
register int weirdy;
// register: 11
register int cont;
}
// address: 0x80046334
// line start: 777
// line end: 831
@@ -378,31 +378,10 @@ void DoUnVision__Fiii(int nXPos, int nYPos, int nRadius) {
}
// address: 0x8004CB40
// line start: 892
// line end: 932
void DoUnVision__Fiiii(int nXPos, int nYPos, int nRadius, int num) {
// register: 9
register int i;
// register: 3
register int j;
// register: 3
register int x1;
// register: 12
register int y1;
// register: 4
register int x2;
// register: 5
register int y2;
// register: 7
register int vis_flag;
}
// address: 0x80048210
// line start: 842
// line end: 858
void DoUnVision__Fiiii_addr_80048210(int nXPos, int nYPos, int nRadius, int num) {
void DoUnVision__Fiiii(int nXPos, int nYPos, int nRadius, int num) {
// register: 8
register int i;
// register: 7
@@ -420,39 +399,31 @@ void DoUnVision__Fiiii_addr_80048210(int nXPos, int nYPos, int nRadius, int num)
}
// address: 0x80047160
// line start: 848
// line end: 952
void DoVision__FiiiUcUc(int nXPos, int nYPos, int nRadius, unsigned char doautomap, int visible) {
// register: 16
register int nCrawlX;
// register: 19
register int nCrawlY;
// address: 0x8004CB40
// line start: 892
// line end: 932
void DoUnVision__Fiiii_addr_8004CB40(int nXPos, int nYPos, int nRadius, int num) {
// register: 9
register int nLineLen;
// register: 21
register int nBlockerFlag;
// register: 8
register int i;
// register: 3
register int j;
// register: 20
register int k;
// register: 2
register int v;
// register: 5
register int x1adj;
// register: 7
register int x2adj;
// register: 3
register int x1;
// register: 12
register int y1;
// register: 4
register int y1adj;
// register: 6
register int y2adj;
register int x2;
// register: 5
register int y2;
// register: 7
register int vis_flag;
}
// address: 0x800482E8
// line start: 865
// line end: 969
void DoVision__FiiiUcUc_addr_800482E8(int nXPos, int nYPos, int nRadius, unsigned char doautomap, int visible) {
void DoVision__FiiiUcUc(int nXPos, int nYPos, int nRadius, unsigned char doautomap, int visible) {
// register: 18
register int nCrawlX;
// register: 19
@@ -480,6 +451,35 @@ void DoVision__FiiiUcUc_addr_800482E8(int nXPos, int nYPos, int nRadius, unsigne
}
// address: 0x80047160
// line start: 848
// line end: 952
void DoVision__FiiiUcUc_addr_80047160(int nXPos, int nYPos, int nRadius, unsigned char doautomap, int visible) {
// register: 16
register int nCrawlX;
// register: 19
register int nCrawlY;
// register: 9
register int nLineLen;
// register: 21
register int nBlockerFlag;
// register: 8
register int j;
// register: 20
register int k;
// register: 2
register int v;
// register: 5
register int x1adj;
// register: 7
register int x2adj;
// register: 4
register int y1adj;
// register: 6
register int y2adj;
}
// address: 0x8004CC48
// line start: 939
// line end: 1046
@@ -564,10 +564,23 @@ void MakeLightTable__Fv() {
}
// address: 0x800478CC
// line start: 1205
// line end: 1266
void ProcessLightList__Fv() {
// register: 7
register int i;
// register: 16
register int j;
// register: 4
register unsigned char temp;
}
// address: 0x80046D70
// line start: 1224
// line end: 1291
void ProcessLightList__Fv() {
void ProcessLightList__Fv_addr_80046D70() {
// register: 7
register int i;
// register: 16
@@ -580,23 +593,21 @@ void ProcessLightList__Fv() {
}
// address: 0x800478CC
// line start: 1205
// line end: 1266
void ProcessLightList__Fv_addr_800478CC() {
// register: 7
// address: 0x80047CC0
// line start: 1417
// line end: 1446
void ProcessVisionList__Fv() {
// register: 17
register int i;
// register: 16
register int j;
// register: 4
register unsigned char temp;
register unsigned char delflag;
}
// address: 0x8004709C
// line start: 1444
// line end: 1491
void ProcessVisionList__Fv() {
void ProcessVisionList__Fv_addr_8004709C() {
// register: 17
register int i;
// register: 4
@@ -607,17 +618,6 @@ void ProcessVisionList__Fv() {
}
// address: 0x80047CC0
// line start: 1417
// line end: 1446
void ProcessVisionList__Fv_addr_80047CC0() {
// register: 17
register int i;
// register: 4
register unsigned char delflag;
}
// address: 0x800479F8
// line start: 1271
// line end: 1298
@@ -646,21 +646,10 @@ void light_fix__Fi(int i) {
}
// address: 0x80047238
// line start: 383
// line end: 405
void set_light_bands__Fv() {
// register: 2
register int v;
// register: 3
register unsigned char *mt;
}
// address: 0x8004BAD8
// line start: 390
// line end: 412
void set_light_bands__Fv_addr_8004BAD8() {
void set_light_bands__Fv() {
// register: 3
register int v;
// register: 5
@@ -670,6 +659,30 @@ void set_light_bands__Fv_addr_8004BAD8() {
}
// address: 0x800460C8
// line start: 380
// line end: 399
void set_light_bands__Fv_addr_800460C8() {
// register: 2
register int v;
// register: 5
register int y;
// register: 4
register int c;
}
// address: 0x80047238
// line start: 383
// line end: 405
void set_light_bands__Fv_addr_80047238() {
// register: 2
register int v;
// register: 3
register unsigned char *mt;
}
// address: 0x8004559C
// line start: 380
// line end: 405
@@ -685,19 +698,6 @@ void set_light_bands__Fv_addr_8004559C() {
}
// address: 0x800460C8
// line start: 380
// line end: 399
void set_light_bands__Fv_addr_800460C8() {
// register: 2
register int v;
// register: 5
register int y;
// register: 4
register int c;
}
// address: 0x80046060
// line start: 319
// line end: 334
psx/_dump_/_dump_merge_c_src_/diabpsx/source/minitext.cpp
+155 -155
View File
@@ -51,10 +51,26 @@ void CalcTextSpeed__FPCc_addr_8004D778(char *Name) {
}
// address: 0x8004819C
// line start: 210
// line end: 216
// address: 0x8004DCD4
// line start: 397
// line end: 425
void DrawQTextBack__Fv() {
{
{
{
{
// address: 0xFFFFFF98
// size: 0x50
auto char BookName[80];
// address: 0xFFFFFFE8
// size: 0x8
auto struct RECT ClipRect;
// register: 17
register int oldot;
}
}
}
}
}
@@ -76,35 +92,27 @@ void DrawQTextBack__Fv_addr_80049274() {
}
// address: 0x8004DCD4
// line start: 397
// line end: 425
void DrawQTextBack__Fv_addr_8004DCD4() {
{
{
{
{
// address: 0xFFFFFF98
// size: 0x50
auto char BookName[80];
// address: 0xFFFFFFE8
// size: 0x8
auto struct RECT ClipRect;
// register: 17
register int oldot;
}
}
}
}
// address: 0x8004819C
// line start: 210
// line end: 216
void DrawQTextBack__Fv_addr_8004819C() {
}
// address: 0x800477A0
// line start: 246
// line end: 297
// address: 0x8004DE70
// line start: 439
// line end: 545
void DrawQTextTSK__FP4TASK(struct TASK *T) {
{
}
// register: 16
// size: 0x10
register struct DEF_ARGS *args;
// register: 17
register int pnum;
// address: 0xFFFFFFE0
// size: 0xE
auto char Name[14];
// register: 18
register char stextflagsave;
}
@@ -119,23 +127,6 @@ void DrawQTextTSK__FP4TASK_addr_80045610(struct TASK *T) {
}
// address: 0x8004DE70
// line start: 439
// line end: 545
void DrawQTextTSK__FP4TASK_addr_8004DE70(struct TASK *T) {
// register: 16
// size: 0x10
register struct DEF_ARGS *args;
// register: 17
register int pnum;
// address: 0xFFFFFFE0
// size: 0xE
auto char Name[14];
// register: 18
register char stextflagsave;
}
// address: 0x80048298
// line start: 239
// line end: 259
@@ -143,72 +134,19 @@ void DrawQTextTSK__FP4TASK_addr_80048298(struct TASK *T) {
}
// address: 0x80048420
// line start: 265
// line end: 368
void DrawQText__Fv() {
// register: 18
register char *p;
// address: 0xFFFFFFC0
auto char *pnl;
// register: 21
register char *SpacePtr;
// address: 0xFFFFFF38
// size: 0x80
auto char tempstr[128];
// register: 23
register int ty;
// register: 19
register int l;
// register: 17
register int i;
// register: 30
register unsigned char doneflag;
// address: 0xFFFFFFB8
// size: 0x8
auto struct RECT ClipRect;
// register: 4
register unsigned long currTime;
// register: 20
register int LetterCount;
}
// address: 0x800472FC
// line start: 271
// line end: 379
void DrawQText__Fv_addr_800472FC() {
// register: 18
register char *p;
// address: 0xFFFFFFC0
auto char *pnl;
// register: 21
register char *SpacePtr;
// address: 0xFFFFFF38
// size: 0x80
auto char tempstr[128];
// register: 30
register int ty;
// register: 19
register int l;
// register: 17
register int i;
// register: 23
register unsigned char doneflag;
// address: 0xFFFFFFB8
// size: 0x8
auto struct RECT ClipRect;
// register: 4
register unsigned long currTime;
// register: 20
register int LetterCount;
// address: 0x800477A0
// line start: 246
// line end: 297
void DrawQTextTSK__FP4TASK_addr_800477A0(struct TASK *T) {
{
}
}
// address: 0x8004E198
// line start: 587
// line end: 813
void DrawQText__Fv_addr_8004E198() {
void DrawQText__Fv() {
// register: 17
register char *p;
// register: 30
@@ -269,6 +207,95 @@ void DrawQText__Fv_addr_8004E198() {
}
// address: 0x800472FC
// line start: 271
// line end: 379
void DrawQText__Fv_addr_800472FC() {
// register: 18
register char *p;
// address: 0xFFFFFFC0
auto char *pnl;
// register: 21
register char *SpacePtr;
// address: 0xFFFFFF38
// size: 0x80
auto char tempstr[128];
// register: 30
register int ty;
// register: 19
register int l;
// register: 17
register int i;
// register: 23
register unsigned char doneflag;
// address: 0xFFFFFFB8
// size: 0x8
auto struct RECT ClipRect;
// register: 4
register unsigned long currTime;
// register: 20
register int LetterCount;
}
// address: 0x80048420
// line start: 265
// line end: 368
void DrawQText__Fv_addr_80048420() {
// register: 18
register char *p;
// address: 0xFFFFFFC0
auto char *pnl;
// register: 21
register char *SpacePtr;
// address: 0xFFFFFF38
// size: 0x80
auto char tempstr[128];
// register: 23
register int ty;
// register: 19
register int l;
// register: 17
register int i;
// register: 30
register unsigned char doneflag;
// address: 0xFFFFFFB8
// size: 0x8
auto struct RECT ClipRect;
// register: 4
register unsigned long currTime;
// register: 20
register int LetterCount;
}
// address: 0x80048364
// line start: 265
// line end: 355
void DrawQText__Fv_addr_80048364() {
// register: 18
register char *p;
// address: 0xFFFFFFC0
auto char *pnl;
// address: 0xFFFFFF38
// size: 0x80
auto char tempstr[128];
// register: 21
register int ty;
// register: 19
register int l;
// register: 17
register int i;
// register: 22
register unsigned char doneflag;
// address: 0xFFFFFFB8
// size: 0x8
auto struct RECT ClipRect;
// register: 4
register unsigned long currTime;
}
// address: 0x8004956C
// line start: 347
// line end: 480
@@ -302,33 +329,6 @@ void DrawQText__Fv_addr_8004956C() {
}
// address: 0x80048364
// line start: 265
// line end: 355
void DrawQText__Fv_addr_80048364() {
// register: 18
register char *p;
// address: 0xFFFFFFC0
auto char *pnl;
// address: 0xFFFFFF38
// size: 0x80
auto char tempstr[128];
// register: 21
register int ty;
// register: 19
register int l;
// register: 17
register int i;
// register: 22
register unsigned char doneflag;
// address: 0xFFFFFFB8
// size: 0x8
auto struct RECT ClipRect;
// register: 4
register unsigned long currTime;
}
// address: 0x8004D934
// line start: 240
// line end: 283
@@ -345,32 +345,10 @@ void FreeQuestText__Fv() {
}
// address: 0x80047458
// line start: 176
// line end: 225
void InitQTextMsg__Fi(int m) {
// address: 0xFFFFFFE0
// size: 0xE
auto char Name[14];
}
// address: 0x8004901C
// line start: 178
// line end: 248
void InitQTextMsg__Fi_addr_8004901C(int m) {
// register: 4
register int iBookName;
// address: 0xFFFFFFE0
// size: 0xE
auto char Name[14];
}
// address: 0x8004DA80
// line start: 296
// line end: 392
void InitQTextMsg__Fi_addr_8004DA80(int m) {
void InitQTextMsg__Fi(int m) {
{
// register: 16
register int i;
@@ -385,6 +363,16 @@ void InitQTextMsg__Fi_addr_8004DA80(int m) {
}
// address: 0x80047458
// line start: 176
// line end: 225
void InitQTextMsg__Fi_addr_80047458(int m) {
// address: 0xFFFFFFE0
// size: 0xE
auto char Name[14];
}
// address: 0x80048074
// line start: 177
// line end: 205
@@ -395,6 +383,18 @@ void InitQTextMsg__Fi_addr_80048074(int m) {
}
// address: 0x8004901C
// line start: 178
// line end: 248
void InitQTextMsg__Fi_addr_8004901C(int m) {
// register: 4
register int iBookName;
// address: 0xFFFFFFE0
// size: 0xE
auto char Name[14];
}
// address: 0x80047F28
// line start: 115
// line end: 119
psx/_dump_/_dump_merge_c_src_/diabpsx/source/misdat.cpp
+8 -8
View File
@@ -2,17 +2,17 @@
#include "types.h"
// address: 0x8004E89C
// line start: 812
// line end: 814
void FuncNULL__FP13MissileStructiii(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
}
// address: 0x8004880C
// line start: 806
// line end: 808
void FuncNULL__FP13MissileStructiii_addr_8004880C(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
void FuncNULL__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
}
// address: 0x8004E89C
// line start: 812
// line end: 814
void FuncNULL__FP13MissileStructiii_addr_8004E89C(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
}
psx/_dump_/_dump_merge_c_src_/diabpsx/source/misprint.cpp
+337 -337
View File
@@ -2,7 +2,7 @@
#include "types.h"
// address: 0x8007B51C
// address: 0x8007B5EC
// line start: 85
// line end: 144
void DoPortalFX__FP8POLY_FT4iiii(struct POLY_FT4 *Ft4, int R, int G, int B, int OtPos) {
@@ -22,7 +22,7 @@ void DoPortalFX__FP8POLY_FT4iiii(struct POLY_FT4 *Ft4, int R, int G, int B, int
register short zY;
// register: 19
register int n;
// address: 0x800E355C
// address: 0x800E3630
// size: 0xE0
static int xoffset[56];
}
@@ -54,6 +54,32 @@ void DoPortalFX__FP8POLY_FT4iiii_addr_8007B494(struct POLY_FT4 *Ft4, int R, int
}
// address: 0x8007B51C
// line start: 85
// line end: 144
void DoPortalFX__FP8POLY_FT4iiii_addr_8007B51C(struct POLY_FT4 *Ft4, int R, int G, int B, int OtPos) {
// register: 16
register unsigned char zU;
// register: 3
register unsigned char *s;
// register: 4
register unsigned char *d;
// register: 18
register unsigned char *Ft4m;
// register: 21
register short zX0;
// register: 22
register short zX1;
// register: 17
register short zY;
// register: 19
register int n;
// address: 0x800E355C
// size: 0xE0
static int xoffset[56];
}
// address: 0x8007B454
// line start: 85
// line end: 144
@@ -80,43 +106,17 @@ void DoPortalFX__FP8POLY_FT4iiii_addr_8007B454(struct POLY_FT4 *Ft4, int R, int
}
// address: 0x8007B5EC
// line start: 85
// line end: 144
void DoPortalFX__FP8POLY_FT4iiii_addr_8007B5EC(struct POLY_FT4 *Ft4, int R, int G, int B, int OtPos) {
// register: 16
register unsigned char zU;
// register: 3
register unsigned char *s;
// register: 4
register unsigned char *d;
// register: 18
register unsigned char *Ft4m;
// register: 21
register short zX0;
// register: 22
register short zX1;
// register: 17
register short zY;
// register: 19
register int n;
// address: 0x800E3630
// size: 0xE0
static int xoffset[56];
// address: 0x80075108
// line start: 373
// line end: 374
void FuncACIDPUD__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
}
// address: 0x8007C9F0
// line start: 498
// line end: 499
void FuncACIDPUD__FP13MissileStructiii(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
}
// address: 0x80075108
// line start: 373
// line end: 374
void FuncACIDPUD__FP13MissileStructiii_addr_80075108(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
void FuncACIDPUD__FP13MissileStructiii_addr_8007C9F0(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
}
@@ -160,10 +160,23 @@ void FuncACID__FP13MissileStructiii_addr_80075004(struct MissileStruct *Ms, int
}
// address: 0x80074C0C
// line start: 263
// line end: 274
void FuncARROW__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 10
register char xflip;
// register: 9
register char yflip;
// register: 3
register int frame;
}
// address: 0x80074B0C
// line start: 302
// line end: 313
void FuncARROW__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
void FuncARROW__FP13MissileStructiii_addr_80074B0C(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 10
register char xflip;
// register: 9
@@ -186,19 +199,6 @@ void FuncARROW__FP13MissileStructiii_addr_8007C488(struct MissileStruct_dup_17 *
}
// address: 0x80074C0C
// line start: 263
// line end: 274
void FuncARROW__FP13MissileStructiii_addr_80074C0C(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 10
register char xflip;
// register: 9
register char yflip;
// register: 3
register int frame;
}
// address: 0x8007C3B8
// line start: 356
// line end: 368
@@ -242,17 +242,17 @@ void FuncBONESPIRIT__FP13MissileStructiii_addr_80074EE8(struct MissileStruct *Ms
}
// address: 0x8007CDCC
// line start: 554
// line end: 557
void FuncBOOM__FP13MissileStructiii(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
}
// address: 0x80075450
// line start: 409
// line end: 410
void FuncBOOM__FP13MissileStructiii_addr_80075450(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
void FuncBOOM__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
}
// address: 0x8007CDCC
// line start: 554
// line end: 557
void FuncBOOM__FP13MissileStructiii_addr_8007CDCC(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
}
@@ -355,10 +355,10 @@ void FuncFARROW__FP13MissileStructiii_addr_8007C538(struct MissileStruct_dup_17
}
// address: 0x8007C000
// line start: 277
// line end: 294
void FuncFIREBOLT__FP13MissileStructiii(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
// address: 0x800747B0
// line start: 190
// line end: 205
void FuncFIREBOLT__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
{
{
// register: 3
@@ -368,10 +368,10 @@ void FuncFIREBOLT__FP13MissileStructiii(struct MissileStruct_dup_17 *Ms, int Scr
}
// address: 0x800747B0
// line start: 190
// line end: 205
void FuncFIREBOLT__FP13MissileStructiii_addr_800747B0(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// address: 0x8007C000
// line start: 277
// line end: 294
void FuncFIREBOLT__FP13MissileStructiii_addr_8007C000(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
{
{
// register: 3
@@ -431,23 +431,10 @@ void FuncFLAME__FP13MissileStructiii_addr_8007C41C(struct MissileStruct_dup_17 *
}
// address: 0x800752A4
// line start: 391
// line end: 400
void FuncFLAREXP__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 18
register unsigned char red;
// register: 19
register unsigned char grn;
// register: 16
register unsigned char blu;
}
// address: 0x8007CB14
// line start: 528
// line end: 543
void FuncFLAREXP__FP13MissileStructiii_addr_8007CB14(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
void FuncFLAREXP__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 20
register unsigned char red;
// register: 21
@@ -474,6 +461,19 @@ void FuncFLAREXP__FP13MissileStructiii_addr_8007CBE4(struct MissileStruct_dup_17
}
// address: 0x800752A4
// line start: 391
// line end: 400
void FuncFLAREXP__FP13MissileStructiii_addr_800752A4(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 18
register unsigned char red;
// register: 19
register unsigned char grn;
// register: 16
register unsigned char blu;
}
// address: 0x8007C988
// line start: 503
// line end: 524
@@ -533,7 +533,7 @@ void FuncFLASH2__FP13MissileStructiii_addr_80075BB0(struct MissileStruct *Ms, in
}
// address: 0x8007CE1C
// address: 0x8007CDDC
// line start: 589
// line end: 606
void FuncFLASH__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
@@ -541,14 +541,14 @@ void FuncFLASH__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int Scr
register int size;
{
{
// address: 0x80118F74
// address: 0x80118F24
// size: 0x60
static int xoffset[8][3];
// register: 17
register int id;
// register: 18
// size: 0x90
register struct CPlayer *test;
register struct CPlayer_dup_19 *test;
// register: 16
// size: 0x19E8
register struct PlayerStruct *player;
@@ -557,17 +557,17 @@ void FuncFLASH__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int Scr
}
// address: 0x80078808
// line start: 439
// line end: 514
void FuncFLASH__FP13MissileStructiii_addr_80078808(struct MissileStruct *Ms, int x, int y, int OtPos) {
// address: 0x800759A4
// line start: 480
// line end: 555
void FuncFLASH__FP13MissileStructiii_addr_800759A4(struct MissileStruct *Ms, int x, int y, int OtPos) {
// register: 16
register int size;
{
{
// register: 16
// size: 0x80
register struct CPlayer_dup_1 *test;
// size: 0x84
register struct CPlayer_dup_14 *test;
// register: 16
register int rot;
{
@@ -576,8 +576,8 @@ void FuncFLASH__FP13MissileStructiii_addr_80078808(struct MissileStruct *Ms, int
// size: 0x34
register struct POLY_GT4 *GT4;
// address: 0xFFFFFFC0
// size: 0x68
auto struct TextDat_dup_1 *ThisDat;
// size: 0x6C
auto struct TextDat_dup_14 *ThisDat;
// register: 4
register int xr1;
// register: 3
@@ -615,30 +615,6 @@ void FuncFLASH__FP13MissileStructiii_addr_80078808(struct MissileStruct *Ms, int
}
// address: 0x8007CDDC
// line start: 589
// line end: 606
void FuncFLASH__FP13MissileStructiii_addr_8007CDDC(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 3
register int size;
{
{
// address: 0x80118F24
// size: 0x60
static int xoffset[8][3];
// register: 17
register int id;
// register: 18
// size: 0x90
register struct CPlayer_dup_19 *test;
// register: 16
// size: 0x19E8
register struct PlayerStruct *player;
}
}
}
// address: 0x8007CEA4
// line start: 589
// line end: 606
@@ -721,17 +697,65 @@ void FuncFLASH__FP13MissileStructiii_addr_800755E0(struct MissileStruct *Ms, int
}
// address: 0x800759A4
// line start: 480
// line end: 555
void FuncFLASH__FP13MissileStructiii_addr_800759A4(struct MissileStruct *Ms, int x, int y, int OtPos) {
// address: 0x8007CF74
// line start: 589
// line end: 606
void FuncFLASH__FP13MissileStructiii_addr_8007CF74(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
// register: 3
register int size;
{
{
// address: 0x80118F68
// size: 0x60
static int xoffset[8][3];
// register: 17
register int id;
// register: 18
// size: 0x90
register struct CPlayer_dup_17 *test;
// register: 16
// size: 0x19E8
register struct PlayerStruct_dup_17 *player;
}
}
}
// address: 0x8007CE1C
// line start: 589
// line end: 606
void FuncFLASH__FP13MissileStructiii_addr_8007CE1C(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 3
register int size;
{
{
// address: 0x80118F74
// size: 0x60
static int xoffset[8][3];
// register: 17
register int id;
// register: 18
// size: 0x90
register struct CPlayer *test;
// register: 16
// size: 0x19E8
register struct PlayerStruct *player;
}
}
}
// address: 0x80078808
// line start: 439
// line end: 514
void FuncFLASH__FP13MissileStructiii_addr_80078808(struct MissileStruct *Ms, int x, int y, int OtPos) {
// register: 16
register int size;
{
{
// register: 16
// size: 0x84
register struct CPlayer_dup_14 *test;
// size: 0x80
register struct CPlayer_dup_1 *test;
// register: 16
register int rot;
{
@@ -740,8 +764,8 @@ void FuncFLASH__FP13MissileStructiii_addr_800759A4(struct MissileStruct *Ms, int
// size: 0x34
register struct POLY_GT4 *GT4;
// address: 0xFFFFFFC0
// size: 0x6C
auto struct TextDat_dup_14 *ThisDat;
// size: 0x68
auto struct TextDat_dup_1 *ThisDat;
// register: 4
register int xr1;
// register: 3
@@ -779,30 +803,6 @@ void FuncFLASH__FP13MissileStructiii_addr_800759A4(struct MissileStruct *Ms, int
}
// address: 0x8007CF74
// line start: 589
// line end: 606
void FuncFLASH__FP13MissileStructiii_addr_8007CF74(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
// register: 3
register int size;
{
{
// address: 0x80118F68
// size: 0x60
static int xoffset[8][3];
// register: 17
register int id;
// register: 18
// size: 0x90
register struct CPlayer_dup_17 *test;
// register: 16
// size: 0x19E8
register struct PlayerStruct_dup_17 *player;
}
}
}
// address: 0x8007C1C8
// line start: 330
// line end: 333
@@ -817,10 +817,10 @@ void FuncGUARDIAN__FP13MissileStructiii_addr_8007495C(struct MissileStruct *Ms,
}
// address: 0x80074848
// line start: 212
// line end: 227
void FuncHBOLT__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// address: 0x8007C0A8
// line start: 300
// line end: 317
void FuncHBOLT__FP13MissileStructiii(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
{
{
// register: 3
@@ -830,10 +830,10 @@ void FuncHBOLT__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int Scr
}
// address: 0x8007C0A8
// line start: 300
// line end: 317
void FuncHBOLT__FP13MissileStructiii_addr_8007C0A8(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
// address: 0x80074848
// line start: 212
// line end: 227
void FuncHBOLT__FP13MissileStructiii_addr_80074848(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
{
{
// register: 3
@@ -860,10 +860,10 @@ void FuncLARROW__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int Sc
}
// address: 0x8007C630
// address: 0x8007C560
// line start: 400
// line end: 425
void FuncLARROW__FP13MissileStructiii_addr_8007C630(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
void FuncLARROW__FP13MissileStructiii_addr_8007C560(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
{
{
// register: 11
@@ -879,10 +879,10 @@ void FuncLARROW__FP13MissileStructiii_addr_8007C630(struct MissileStruct_dup_17
}
// address: 0x8007C560
// address: 0x8007C630
// line start: 400
// line end: 425
void FuncLARROW__FP13MissileStructiii_addr_8007C560(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
void FuncLARROW__FP13MissileStructiii_addr_8007C630(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
{
{
// register: 11
@@ -912,23 +912,10 @@ void FuncLIGHTNING__FP13MissileStructiii_addr_8007C160(struct MissileStruct_dup_
}
// address: 0x8007C650
// line start: 430
// line end: 444
void FuncMAGMABALL__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 9
register char xflip;
// register: 10
register char yflip;
// register: 8
register int frame;
}
// address: 0x8007C720
// line start: 430
// line end: 444
void FuncMAGMABALL__FP13MissileStructiii_addr_8007C720(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
void FuncMAGMABALL__FP13MissileStructiii(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
// register: 9
register char xflip;
// register: 10
@@ -951,6 +938,19 @@ void FuncMAGMABALL__FP13MissileStructiii_addr_80074E58(struct MissileStruct *Ms,
}
// address: 0x8007C650
// line start: 430
// line end: 444
void FuncMAGMABALL__FP13MissileStructiii_addr_8007C650(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 9
register char xflip;
// register: 10
register char yflip;
// register: 8
register int frame;
}
// address: 0x8007D0D4
// line start: 610
// line end: 612
@@ -979,17 +979,17 @@ void FuncMISEXP__FP13MissileStructiii_addr_80075574(struct MissileStruct *Ms, in
}
// address: 0x8007D13C
// line start: 620
// line end: 621
void FuncRESURRECTBEAM__FP13MissileStructiii(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
}
// address: 0x80075BB8
// line start: 532
// line end: 533
void FuncRESURRECTBEAM__FP13MissileStructiii_addr_80075BB8(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
void FuncRESURRECTBEAM__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
}
// address: 0x8007D13C
// line start: 620
// line end: 621
void FuncRESURRECTBEAM__FP13MissileStructiii_addr_8007D13C(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
}
@@ -1007,10 +1007,53 @@ void FuncRHINO__FP13MissileStructiii_addr_800755D8(struct MissileStruct *Ms, int
}
// address: 0x80072728
// line start: 230
// line end: 238
void FuncRPORTAL__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 4
register int anim;
}
// address: 0x8007BEE4
// line start: 258
// line end: 272
void FuncRPORTAL__FP13MissileStructiii_addr_8007BEE4(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
// register: 16
register int anim;
// address: 0xFFFFFFD8
// size: 0x28
auto struct POLY_FT4 *FT4;
// register: 18
// size: 0x70
register struct TextDat_dup_17 *missdat;
// register: 17
register int frame;
}
// address: 0x8007BD4C
// line start: 258
// line end: 272
void FuncRPORTAL__FP13MissileStructiii_addr_8007BD4C(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 16
register int anim;
// address: 0xFFFFFFD8
// size: 0x28
auto struct POLY_FT4 *FT4;
// register: 18
// size: 0x70
register struct TextDat *missdat;
// register: 17
register int frame;
}
// address: 0x8007BE14
// line start: 258
// line end: 272
void FuncRPORTAL__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
void FuncRPORTAL__FP13MissileStructiii_addr_8007BE14(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 16
register int anim;
// address: 0xFFFFFFD8
@@ -1038,49 +1081,6 @@ void FuncRPORTAL__FP13MissileStructiii_addr_80074650(struct MissileStruct *Ms, i
}
// address: 0x8007BD4C
// line start: 258
// line end: 272
void FuncRPORTAL__FP13MissileStructiii_addr_8007BD4C(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 16
register int anim;
// address: 0xFFFFFFD8
// size: 0x28
auto struct POLY_FT4 *FT4;
// register: 18
// size: 0x70
register struct TextDat *missdat;
// register: 17
register int frame;
}
// address: 0x8007BEE4
// line start: 258
// line end: 272
void FuncRPORTAL__FP13MissileStructiii_addr_8007BEE4(struct MissileStruct_dup_17 *Ms, int ScrX, int ScrY, int OtPos) {
// register: 16
register int anim;
// address: 0xFFFFFFD8
// size: 0x28
auto struct POLY_FT4 *FT4;
// register: 18
// size: 0x70
register struct TextDat_dup_17 *missdat;
// register: 17
register int frame;
}
// address: 0x80072728
// line start: 230
// line end: 238
void FuncRPORTAL__FP13MissileStructiii_addr_80072728(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 4
register int anim;
}
// address: 0x80072690
// line start: 201
// line end: 214
@@ -1090,20 +1090,6 @@ void FuncTOWN__FP13MissileStructiii(struct MissileStruct *Ms, int ScrX, int ScrY
}
// address: 0x800744D0
// line start: 155
// line end: 169
void FuncTOWN__FP13MissileStructiii_addr_800744D0(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 16
register int anim;
// register: 2
// size: 0x18
register struct POLY_F4 *F4;
// register: 3
register int tv1;
}
// address: 0x8007BC74
// line start: 225
// line end: 252
@@ -1121,6 +1107,20 @@ void FuncTOWN__FP13MissileStructiii_addr_8007BC74(struct MissileStruct *Ms, int
}
// address: 0x800744D0
// line start: 155
// line end: 169
void FuncTOWN__FP13MissileStructiii_addr_800744D0(struct MissileStruct *Ms, int ScrX, int ScrY, int OtPos) {
// register: 16
register int anim;
// register: 2
// size: 0x18
register struct POLY_F4 *F4;
// register: 3
register int tv1;
}
// address: 0x8007BBAC
// line start: 225
// line end: 252
@@ -1169,99 +1169,10 @@ void FuncWEAPEXP__FP13MissileStructiii_addr_80075968(struct MissileStruct *Ms, i
}
// address: 0x8007B88C
// size: 0x28
// line start: 156
// line end: 221
struct POLY_FT4 *TempPrintMissile__FiiiiiiiiccUcUcUcc(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0xFFFFFF90
// size: 0x28
auto struct POLY_FT4 *FT4;
// register: 17
// size: 0x70
register struct TextDat_dup_18 *missdat;
// register: 16
register int frame;
// register: 5
register int tv1;
// register: 2
register int dw;
// register: 3
register int dh;
}
// address: 0x8007232C
// line start: 122
// line end: 196
void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_8007232C(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0xFFFFFFA8
// size: 0x28
auto struct POLY_FT4 *FT4;
// register: 17
// size: 0x6C
register struct TextDat *missdat;
// register: 16
register int frame;
// register: 5
register int tv1;
}
// address: 0x8007B95C
// size: 0x28
// line start: 156
// line end: 221
struct POLY_FT4 *TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_8007B95C(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0xFFFFFF90
// size: 0x28
auto struct POLY_FT4 *FT4;
// register: 17
// size: 0x70
register struct TextDat_dup_17 *missdat;
// register: 16
register int frame;
// register: 5
register int tv1;
// register: 2
register int dw;
// register: 3
register int dh;
}
// address: 0x80074420
// line start: 97
// line end: 175
void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_80074420(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0xFFFFFFB0
// size: 0x28
auto struct POLY_FT4 *FT4;
// address: 0xFFFFFFB4
// size: 0x28
auto struct POLY_FT4 *FT5;
// register: 17
// size: 0x6C
register struct TextDat_dup_14 *missdat;
// register: 16
register int frame;
// register: 5
register int tv1;
{
{
{
{
}
}
}
}
}
// address: 0x800771C0
// line start: 96
// line end: 150
void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_800771C0(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
void TempPrintMissile__FiiiiiiiiccUcUcUcc(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0xFFFFFFA8
// size: 0x28
auto struct POLY_FT4 *FT4;
@@ -1298,10 +1209,31 @@ void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_800771C0(int ScrX, int ScrY, int
}
// address: 0x800741F8
// address: 0x800761C8
// line start: 122
// line end: 209
void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_800761C8(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0xFFFFFF90
// size: 0x28
auto struct POLY_FT4 *FT4;
// register: 17
// size: 0x6C
register struct TextDat *missdat;
// register: 16
register int frame;
// register: 5
register int tv1;
// register: 2
register int dw;
// register: 3
register int dh;
}
// address: 0x80074420
// line start: 97
// line end: 175
void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_800741F8(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_80074420(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0xFFFFFFB0
// size: 0x28
auto struct POLY_FT4 *FT4;
@@ -1310,7 +1242,7 @@ void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_800741F8(int ScrX, int ScrY, int
auto struct POLY_FT4 *FT5;
// register: 17
// size: 0x6C
register struct TextDat *missdat;
register struct TextDat_dup_14 *missdat;
// register: 16
register int frame;
// register: 5
@@ -1366,24 +1298,70 @@ void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_80073F98(int ScrX, int ScrY, int
}
// address: 0x800761C8
// line start: 122
// line end: 209
void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_800761C8(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0x8007B95C
// size: 0x28
// line start: 156
// line end: 221
struct POLY_FT4 *TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_8007B95C(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0xFFFFFF90
// size: 0x28
auto struct POLY_FT4 *FT4;
// register: 17
// size: 0x70
register struct TextDat_dup_17 *missdat;
// register: 16
register int frame;
// register: 5
register int tv1;
// register: 2
register int dw;
// register: 3
register int dh;
}
// address: 0x800741F8
// line start: 97
// line end: 175
void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_800741F8(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0xFFFFFFB0
// size: 0x28
auto struct POLY_FT4 *FT4;
// address: 0xFFFFFFB4
// size: 0x28
auto struct POLY_FT4 *FT5;
// register: 17
// size: 0x6C
register struct TextDat *missdat;
// register: 16
register int frame;
// register: 5
register int tv1;
{
{
{
{
}
}
}
}
}
// address: 0x8007232C
// line start: 122
// line end: 196
void TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_8007232C(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0xFFFFFFA8
// size: 0x28
auto struct POLY_FT4 *FT4;
// register: 17
// size: 0x6C
register struct TextDat *missdat;
// register: 16
register int frame;
// register: 5
register int tv1;
// register: 2
register int dw;
// register: 3
register int dh;
}
@@ -1409,3 +1387,25 @@ struct POLY_FT4 *TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_8007B7C4(int ScrX, in
}
// address: 0x8007B88C
// size: 0x28
// line start: 156
// line end: 221
struct POLY_FT4 *TempPrintMissile__FiiiiiiiiccUcUcUcc_addr_8007B88C(int ScrX, int ScrY, int OtPos, int spell, int aframe, int direction, int anim, int sfx, int xflip, int yflip, int red, int grn, int blu, int semi) {
// address: 0xFFFFFF90
// size: 0x28
auto struct POLY_FT4 *FT4;
// register: 17
// size: 0x70
register struct TextDat_dup_18 *missdat;
// register: 16
register int frame;
// register: 5
register int tv1;
// register: 2
register int dw;
// register: 3
register int dh;
}
psx/_dump_/_dump_merge_c_src_/diabpsx/source/mlist.cpp
+10 -10
View File
@@ -11,9 +11,9 @@ int ML_GetList__Fi(int Level) {
}
// address: 0x80075F0C
// line start: 156
// line end: 199
// address: 0x8007D520
// line start: 163
// line end: 216
int ML_GetPresetMonsters__FiPiUl(int currlevel, int *typelist, unsigned long QuestsNeededMask) {
// register: 10
// size: 0x10
@@ -22,6 +22,9 @@ int ML_GetPresetMonsters__FiPiUl(int currlevel, int *typelist, unsigned long Que
register int NumOfMonsters;
// register: 16
register int ThisList;
// address: 0xFFFFFFC0
// size: 0x28
auto int Index[10];
{
// register: 9
register unsigned int f;
@@ -49,10 +52,10 @@ int ML_GetPresetMonsters__FiPiUl(int currlevel, int *typelist, unsigned long Que
}
// address: 0x8007D520
// line start: 163
// line end: 216
int ML_GetPresetMonsters__FiPiUl_addr_8007D520(int currlevel, int *typelist, unsigned long QuestsNeededMask) {
// address: 0x80075F0C
// line start: 156
// line end: 199
int ML_GetPresetMonsters__FiPiUl_addr_80075F0C(int currlevel, int *typelist, unsigned long QuestsNeededMask) {
// register: 10
// size: 0x10
register struct MonstList *Mlist;
@@ -60,9 +63,6 @@ int ML_GetPresetMonsters__FiPiUl_addr_8007D520(int currlevel, int *typelist, uns
register int NumOfMonsters;
// register: 16
register int ThisList;
// address: 0xFFFFFFC0
// size: 0x28
auto int Index[10];
{
// register: 9
register unsigned int f;
psx/_dump_/_dump_merge_c_src_/diabpsx/source/msg.cpp
+1338 -1338
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/source/multi.cpp
+24 -24
View File
@@ -20,33 +20,10 @@ void InitNewSeed__Fl(long newseed) {
}
// address: 0x80052BC0
// line start: 708
// line end: 863
unsigned char NetInit__FUcPUc(unsigned char bSinglePlayer, unsigned char *pfExitProgram) {
// address: 0xFFFFFF50
// size: 0x80
auto char szPlayerDescript[128];
// register: 2
register long time;
{
{
// address: 0xFFFFFFD0
// size: 0x28
auto struct _uiheroinfo heroinfo;
{
{
}
}
}
}
}
// address: 0x8004F06C
// line start: 701
// line end: 930
unsigned char NetInit__FUcPUc_addr_8004F06C(unsigned char bSinglePlayer, unsigned char *pfExitProgram) {
unsigned char NetInit__FUcPUc(unsigned char bSinglePlayer, unsigned char *pfExitProgram) {
// address: 0xFFFFFF18
// size: 0x80
auto char szPlayerDescript[128];
@@ -70,6 +47,29 @@ unsigned char NetInit__FUcPUc_addr_8004F06C(unsigned char bSinglePlayer, unsigne
}
// address: 0x80052BC0
// line start: 708
// line end: 863
unsigned char NetInit__FUcPUc_addr_80052BC0(unsigned char bSinglePlayer, unsigned char *pfExitProgram) {
// address: 0xFFFFFF50
// size: 0x80
auto char szPlayerDescript[128];
// register: 2
register long time;
{
{
// address: 0xFFFFFFD0
// size: 0x28
auto struct _uiheroinfo heroinfo;
{
{
}
}
}
}
}
// address: 0x8004CF48
// line start: 703
// line end: 903
psx/_dump_/_dump_merge_c_src_/diabpsx/source/objects.cpp
+348 -348
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/source/objprint.cpp
+1103 -1103
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/source/palette.cpp
+43 -43
View File
@@ -22,16 +22,23 @@ void BlackPalette__Fv_addr_8007ED8C() {
}
// address: 0x8007ED04
// line start: 258
// line end: 267
// address: 0x8007762C
// line start: 236
// line end: 256
void DrawFadedScreen__Fv() {
// register: 16
// size: 0x70
register struct TextDat_dup_17 *ThisDat;
// address: 0xFFFFFFF0
// size: 0x28
auto struct POLY_FT4 *FT4;
}
// address: 0x80077E88
// line start: 186
// line end: 198
void DrawFadedScreen__Fv_addr_80077E88() {
// register: 2
// size: 0x34
register struct POLY_GT4 *GT4a;
// size: 0x28
register struct POLY_FT4 *FT4;
}
@@ -55,13 +62,16 @@ void DrawFadedScreen__Fv_addr_8007EC34() {
}
// address: 0x8007762C
// line start: 236
// line end: 256
void DrawFadedScreen__Fv_addr_8007762C() {
// address: 0xFFFFFFF0
// size: 0x28
auto struct POLY_FT4 *FT4;
// address: 0x8007ED04
// line start: 258
// line end: 267
void DrawFadedScreen__Fv_addr_8007ED04() {
// register: 16
// size: 0x70
register struct TextDat_dup_17 *ThisDat;
// register: 2
// size: 0x34
register struct POLY_GT4 *GT4a;
}
@@ -78,16 +88,6 @@ void DrawFadedScreen__Fv_addr_8007EB6C() {
}
// address: 0x80077E88
// line start: 186
// line end: 198
void DrawFadedScreen__Fv_addr_80077E88() {
// register: 2
// size: 0x28
register struct POLY_FT4 *FT4;
}
// address: 0x80077E7C
// line start: 174
// line end: 175
@@ -109,12 +109,14 @@ void LoadRndLvlPal__Fi(int l) {
}
// address: 0x80078010
// line start: 222
// line end: 245
// address: 0x80077BE8
// line start: 304
// line end: 332
void PaletteFadeInTask__FP4TASK(struct TASK *T) {
// register: 16
register int i;
{
}
}
@@ -133,14 +135,12 @@ void PaletteFadeInTask__FP4TASK_addr_80076844(struct TASK *T) {
}
// address: 0x80077BE8
// line start: 304
// line end: 332
void PaletteFadeInTask__FP4TASK_addr_80077BE8(struct TASK *T) {
// address: 0x80078010
// line start: 222
// line end: 245
void PaletteFadeInTask__FP4TASK_addr_80078010(struct TASK *T) {
// register: 16
register int i;
{
}
}
@@ -162,6 +162,15 @@ void PaletteFadeOutTask__FP4TASK(struct TASK *T) {
}
// address: 0x800780EC
// line start: 267
// line end: 293
void PaletteFadeOutTask__FP4TASK_addr_800780EC(struct TASK *T) {
// register: 16
register int i;
}
// address: 0x80076958
// line start: 354
// line end: 389
@@ -177,15 +186,6 @@ void PaletteFadeOutTask__FP4TASK_addr_80076958(struct TASK *T) {
}
// address: 0x800780EC
// line start: 267
// line end: 293
void PaletteFadeOutTask__FP4TASK_addr_800780EC(struct TASK *T) {
// register: 16
register int i;
}
// address: 0x80078184
// line start: 300
// line end: 307
psx/_dump_/_dump_merge_c_src_/diabpsx/source/pfile.cpp
+29 -29
View File
@@ -9,17 +9,17 @@ void SetupLocalPlayer__Fv() {
}
// address: 0x80058CEC
// line start: 381
// line end: 386
unsigned char game_2_ui_class__FPC12PlayerStruct(struct PlayerStruct_dup_6 *p) {
// address: 0x8005F934
// line start: 380
// line end: 385
unsigned char game_2_ui_class__FPC12PlayerStruct(struct PlayerStruct_dup_17 *p) {
}
// address: 0x80058308
// address: 0x80058CEC
// line start: 381
// line end: 386
unsigned char game_2_ui_class__FPC12PlayerStruct_addr_80058308(struct PlayerStruct_dup_4 *p) {
unsigned char game_2_ui_class__FPC12PlayerStruct_addr_80058CEC(struct PlayerStruct_dup_6 *p) {
}
@@ -30,17 +30,17 @@ unsigned char game_2_ui_class__FPC12PlayerStruct_addr_80058D7C(struct PlayerStru
}
// address: 0x8005F870
// address: 0x80058CA0
// line start: 380
// line end: 385
unsigned char game_2_ui_class__FPC12PlayerStruct_addr_8005F870(struct PlayerStruct_dup_18 *p) {
unsigned char game_2_ui_class__FPC12PlayerStruct_addr_80058CA0(struct PlayerStruct_dup_13 *p) {
}
// address: 0x8005F934
// line start: 380
// line end: 385
unsigned char game_2_ui_class__FPC12PlayerStruct_addr_8005F934(struct PlayerStruct_dup_17 *p) {
// address: 0x80058308
// line start: 381
// line end: 386
unsigned char game_2_ui_class__FPC12PlayerStruct_addr_80058308(struct PlayerStruct_dup_4 *p) {
}
@@ -58,10 +58,10 @@ unsigned char game_2_ui_class__FPC12PlayerStruct_addr_80058AF0(struct PlayerStru
}
// address: 0x80058CA0
// address: 0x8005F870
// line start: 380
// line end: 385
unsigned char game_2_ui_class__FPC12PlayerStruct_addr_80058CA0(struct PlayerStruct_dup_13 *p) {
unsigned char game_2_ui_class__FPC12PlayerStruct_addr_8005F870(struct PlayerStruct_dup_18 *p) {
}
@@ -79,10 +79,10 @@ void game_2_ui_player__FPC12PlayerStructP11_uiheroinfoUc_addr_80058334(struct Pl
}
// address: 0x80058DA8
// line start: 392
// line end: 405
void game_2_ui_player__FPC12PlayerStructP11_uiheroinfoUc_addr_80058DA8(struct PlayerStruct *p, struct _uiheroinfo *heroinfo, unsigned char bHasSaveFile) {
// address: 0x8005F960
// line start: 391
// line end: 404
void game_2_ui_player__FPC12PlayerStructP11_uiheroinfoUc_addr_8005F960(struct PlayerStruct_dup_17 *p, struct _uiheroinfo *heroinfo, unsigned char bHasSaveFile) {
}
@@ -93,10 +93,10 @@ void game_2_ui_player__FPC12PlayerStructP11_uiheroinfoUc_addr_80058D18(struct Pl
}
// address: 0x80058CCC
// line start: 391
// line end: 404
void game_2_ui_player__FPC12PlayerStructP11_uiheroinfoUc_addr_80058CCC(struct PlayerStruct_dup_13 *p, struct _uiheroinfo *heroinfo, unsigned char bHasSaveFile) {
// address: 0x80058DA8
// line start: 392
// line end: 405
void game_2_ui_player__FPC12PlayerStructP11_uiheroinfoUc_addr_80058DA8(struct PlayerStruct *p, struct _uiheroinfo *heroinfo, unsigned char bHasSaveFile) {
}
@@ -107,13 +107,6 @@ void game_2_ui_player__FPC12PlayerStructP11_uiheroinfoUc_addr_80058B1C(struct Pl
}
// address: 0x8005F960
// line start: 391
// line end: 404
void game_2_ui_player__FPC12PlayerStructP11_uiheroinfoUc_addr_8005F960(struct PlayerStruct_dup_17 *p, struct _uiheroinfo *heroinfo, unsigned char bHasSaveFile) {
}
// address: 0x8005F89C
// line start: 391
// line end: 404
@@ -121,3 +114,10 @@ void game_2_ui_player__FPC12PlayerStructP11_uiheroinfoUc_addr_8005F89C(struct Pl
}
// address: 0x80058CCC
// line start: 391
// line end: 404
void game_2_ui_player__FPC12PlayerStructP11_uiheroinfoUc_addr_80058CCC(struct PlayerStruct_dup_13 *p, struct _uiheroinfo *heroinfo, unsigned char bHasSaveFile) {
}
psx/_dump_/_dump_merge_c_src_/diabpsx/source/player.cpp
+4132 -4174
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/source/portal.cpp
+14 -14
View File
@@ -98,20 +98,6 @@ void DelMis__Fii(int mi, int i) {
}
// address: 0x8007A3B0
// line start: 262
// line end: 277
void RemovePortalMissile__Fi_addr_8007A3B0(int id) {
// register: 17
register int i;
// register: 18
register int mi;
// register: 16
// size: 0x50
register struct MissileStruct *m;
}
// address: 0x80080FD0
// line start: 285
// line end: 300
@@ -126,6 +112,20 @@ void RemovePortalMissile__Fi_addr_80080FD0(int id) {
}
// address: 0x8007A3B0
// line start: 262
// line end: 277
void RemovePortalMissile__Fi_addr_8007A3B0(int id) {
// register: 17
register int i;
// register: 18
register int mi;
// register: 16
// size: 0x50
register struct MissileStruct *m;
}
// address: 0x80080D38
// line start: 189
// line end: 219
psx/_dump_/_dump_merge_c_src_/diabpsx/source/quests.cpp
+104 -104
View File
@@ -2,9 +2,9 @@
#include "types.h"
// address: 0x80067918
// line start: 317
// line end: 424
// address: 0x800650FC
// line start: 333
// line end: 431
void CheckQuestKill__FiUc(int m, unsigned char sendmsg) {
{
{
@@ -16,9 +16,9 @@ void CheckQuestKill__FiUc(int m, unsigned char sendmsg) {
{
{
{
// register: 16
// register: 4
register int i;
// register: 17
// register: 6
register int j;
}
}
@@ -33,10 +33,10 @@ void CheckQuestKill__FiUc(int m, unsigned char sendmsg) {
}
// address: 0x800650FC
// line start: 333
// line end: 431
void CheckQuestKill__FiUc_addr_800650FC(int m, unsigned char sendmsg) {
// address: 0x80067918
// line start: 317
// line end: 424
void CheckQuestKill__FiUc_addr_80067918(int m, unsigned char sendmsg) {
{
{
{
@@ -47,9 +47,9 @@ void CheckQuestKill__FiUc_addr_800650FC(int m, unsigned char sendmsg) {
{
{
{
// register: 4
// register: 16
register int i;
// register: 6
// register: 17
register int j;
}
}
@@ -95,66 +95,10 @@ void CheckQuestKill__FiUc_addr_80062570(int m, unsigned char sendmsg) {
}
// address: 0x80067208
// line start: 185
// line end: 269
void CheckQuests__Fv() {
// register: 20
register int i;
// address: 0xFFFFFFD8
auto int rportx;
// address: 0xFFFFFFDC
auto int rporty;
// register: 21
register int omp;
{
{
{
// register: 17
register int pl;
{
// register: 4
// size: 0x19E8
register struct PlayerStruct_dup_17 *player;
}
}
}
}
}
// address: 0x8006707C
// line start: 185
// line end: 269
void CheckQuests__Fv_addr_8006707C() {
// register: 20
register int i;
// address: 0xFFFFFFD8
auto int rportx;
// address: 0xFFFFFFDC
auto int rporty;
// register: 21
register int omp;
{
{
{
// register: 17
register int pl;
{
// register: 4
// size: 0x19E8
register struct PlayerStruct *player;
}
}
}
}
}
// address: 0x80061628
// line start: 226
// line end: 304
void CheckQuests__Fv_addr_80061628() {
void CheckQuests__Fv() {
// register: 20
register int i;
// register: 4
@@ -179,19 +123,6 @@ void CheckQuests__Fv_addr_80061628() {
}
// address: 0x80061E80
// line start: 224
// line end: 288
void CheckQuests__Fv_addr_80061E80() {
// register: 18
register int i;
// register: 4
register int rportx;
// register: 5
register int rporty;
}
// address: 0x80067144
// line start: 185
// line end: 269
@@ -220,6 +151,75 @@ void CheckQuests__Fv_addr_80067144() {
}
// address: 0x80067208
// line start: 185
// line end: 269
void CheckQuests__Fv_addr_80067208() {
// register: 20
register int i;
// address: 0xFFFFFFD8
auto int rportx;
// address: 0xFFFFFFDC
auto int rporty;
// register: 21
register int omp;
{
{
{
// register: 17
register int pl;
{
// register: 4
// size: 0x19E8
register struct PlayerStruct_dup_17 *player;
}
}
}
}
}
// address: 0x80061E80
// line start: 224
// line end: 288
void CheckQuests__Fv_addr_80061E80() {
// register: 18
register int i;
// register: 4
register int rportx;
// register: 5
register int rporty;
}
// address: 0x8006707C
// line start: 185
// line end: 269
void CheckQuests__Fv_addr_8006707C() {
// register: 20
register int i;
// address: 0xFFFFFFD8
auto int rportx;
// address: 0xFFFFFFDC
auto int rporty;
// register: 21
register int omp;
{
{
{
// register: 17
register int pl;
{
// register: 4
// size: 0x19E8
register struct PlayerStruct *player;
}
}
}
}
}
// address: 0x800671C8
// line start: 166
// line end: 173
@@ -238,23 +238,10 @@ void DrawQuestLogTSK__FP4TASK(struct TASK *T) {
}
// address: 0x8006357C
// line start: 700
// line end: 728
void DrawQuestLog__Fv() {
// register: 18
register int i;
// register: 17
register int l;
// register: 2
register int q;
}
// address: 0x80068784
// line start: 696
// line end: 735
void DrawQuestLog__Fv_addr_80068784() {
void DrawQuestLog__Fv() {
// register: 16
register int i;
// register: 17
@@ -266,6 +253,19 @@ void DrawQuestLog__Fv_addr_80068784() {
}
// address: 0x8006357C
// line start: 700
// line end: 728
void DrawQuestLog__Fv_addr_8006357C() {
// register: 18
register int i;
// register: 17
register int l;
// register: 2
register int q;
}
// address: 0x80062338
// line start: 292
// line end: 319
@@ -409,9 +409,9 @@ void StartQuestlog__Fv() {
}
// address: 0x80061C30
// line start: 157
// line end: 217
// address: 0x800613DC
// line start: 160
// line end: 220
void TSK_Lava2Water__FP4TASK(struct TASK *T) {
// address: 0xFFFFFFB0
// size: 0x20
@@ -426,7 +426,7 @@ void TSK_Lava2Water__FP4TASK(struct TASK *T) {
register int clut;
// register: 16
// size: 0x6C
register struct TextDat *ThisDat;
register struct TextDat_dup_14 *ThisDat;
// register: 3
// size: 0x8
register struct PAL *Pal;
@@ -469,10 +469,10 @@ void TSK_Lava2Water__FP4TASK(struct TASK *T) {
}
// address: 0x800613DC
// line start: 160
// line end: 220
void TSK_Lava2Water__FP4TASK_addr_800613DC(struct TASK *T) {
// address: 0x80061C30
// line start: 157
// line end: 217
void TSK_Lava2Water__FP4TASK_addr_80061C30(struct TASK *T) {
// address: 0xFFFFFFB0
// size: 0x20
auto unsigned short LAVAPAL[16];
@@ -486,7 +486,7 @@ void TSK_Lava2Water__FP4TASK_addr_800613DC(struct TASK *T) {
register int clut;
// register: 16
// size: 0x6C
register struct TextDat_dup_14 *ThisDat;
register struct TextDat *ThisDat;
// register: 3
// size: 0x8
register struct PAL *Pal;
psx/_dump_/_dump_merge_c_src_/diabpsx/source/sound.cpp
+22 -22
View File
@@ -23,23 +23,10 @@ void music_release__Fv() {
}
// address: 0x80070818
// line start: 261
// line end: 275
void music_start__Fi(int nTrack) {
{
{
// register: 2
register int MusicVolume;
}
}
}
// address: 0x8007145C
// line start: 260
// line end: 273
void music_start__Fi_addr_8007145C(int nTrack) {
void music_start__Fi(int nTrack) {
}
@@ -69,6 +56,19 @@ void music_start__Fi_addr_80070868(int nTrack) {
}
// address: 0x80070818
// line start: 261
// line end: 275
void music_start__Fi_addr_80070818(int nTrack) {
{
{
// register: 2
register int MusicVolume;
}
}
}
// address: 0x800713D0
// line start: 227
// line end: 234
@@ -99,22 +99,22 @@ void snd_init__FUl(unsigned long hWnd) {
}
// address: 0x800712CC
// line start: 167
// line end: 195
void snd_play_msnd__FUsll(unsigned short pszName, long lVolume, long lPan) {
}
// address: 0x80077A88
// line start: 172
// line end: 201
void snd_play_msnd__FUsll_addr_80077A88(unsigned short pszName, long lVolume, long lPan) {
void snd_play_msnd__FUsll(unsigned short pszName, long lVolume, long lPan) {
// register: 18
register int padj;
}
// address: 0x800712CC
// line start: 167
// line end: 195
void snd_play_msnd__FUsll_addr_800712CC(unsigned short pszName, long lVolume, long lPan) {
}
// address: 0x8007125C
// line start: 141
// line end: 158
psx/_dump_/_dump_merge_c_src_/diabpsx/source/spells.cpp
+13 -13
View File
@@ -31,13 +31,10 @@ void DoHealOther__Fii(int pnum, int rid) {
}
// address: 0x80077530
// line start: 250
// line end: 312
// address: 0x80070CB4
// line start: 201
// line end: 236
void DoResurrect__Fii(int pnum, int rid) {
// register: 16
// size: 0x19E8
register struct PlayerStruct_dup_17 *ptrplr;
}
@@ -51,13 +48,6 @@ void DoResurrect__Fii_addr_80077460(int pnum, int rid) {
}
// address: 0x80070CB4
// line start: 201
// line end: 236
void DoResurrect__Fii_addr_80070CB4(int pnum, int rid) {
}
// address: 0x80077398
// line start: 250
// line end: 312
@@ -68,6 +58,16 @@ void DoResurrect__Fii_addr_80077398(int pnum, int rid) {
}
// address: 0x80077530
// line start: 250
// line end: 312
void DoResurrect__Fii_addr_80077530(int pnum, int rid) {
// register: 16
// size: 0x19E8
register struct PlayerStruct_dup_17 *ptrplr;
}
// address: 0x800705A4
// line start: 44
// line end: 93
psx/_dump_/_dump_merge_c_src_/diabpsx/source/stores.cpp
+874 -874
View File
File diff suppressed because it is too large Load Diff
psx/_dump_/_dump_merge_c_src_/diabpsx/source/town.cpp
+15 -15
View File
@@ -189,15 +189,15 @@ void T_FillTile__FPUciii_addr_8007454C(unsigned char *P3Tiles, int xx, int yy, i
}
// address: 0x8007469C
// line start: 351
// line end: 437
// address: 0x8006DEB8
// line start: 326
// line end: 404
void T_Pass3__Fv() {
// register: 19
register unsigned char *pSector;
// register: 17
// register: 16
register int xx;
// register: 18
// register: 10
register int yy;
{
// register: 5
@@ -210,6 +210,10 @@ void T_Pass3__Fv() {
{
{
{
{
// register: 4
register void *p__p;
}
}
}
}
@@ -251,15 +255,15 @@ void T_Pass3__Fv_addr_8006F708() {
}
// address: 0x8006DEB8
// line start: 326
// line end: 404
void T_Pass3__Fv_addr_8006DEB8() {
// address: 0x8007469C
// line start: 351
// line end: 437
void T_Pass3__Fv_addr_8007469C() {
// register: 19
register unsigned char *pSector;
// register: 16
// register: 17
register int xx;
// register: 10
// register: 18
register int yy;
{
// register: 5
@@ -272,10 +276,6 @@ void T_Pass3__Fv_addr_8006DEB8() {
{
{
{
{
// register: 4
register void *p__p;
}
}
}
}
psx/_dump_/_dump_merge_c_src_/diabpsx/source/towners.cpp
+261 -261
View File
@@ -2,74 +2,14 @@
#include "types.h"
// address: 0x80038AE0
// address: 0x80038AD8
// line start: 595
// line end: 641
void CowSFX__Fi(int pnum) {
// address: 0x801228B0
// address: 0x8012258C
// size: 0x24
static int snSFX[3][3];
// address: 0x8012CBF8
static int snLastCowSFX;
}
// address: 0x8003998C
// line start: 593
// line end: 639
void CowSFX__Fi_addr_8003998C(int pnum) {
// address: 0x8010DA38
// size: 0x24
static int snSFX[3][3];
// address: 0x80117068
static int snLastCowSFX;
}
// address: 0x80038BA8
// line start: 593
// line end: 639
void CowSFX__Fi_addr_80038BA8(int pnum) {
// address: 0x801216A8
// size: 0x24
static int snSFX[3][3];
// address: 0x8012B838
static int snLastCowSFX;
}
// address: 0x80039964
// line start: 593
// line end: 639
void CowSFX__Fi_addr_80039964(int pnum) {
// address: 0x8010D8E4
// size: 0x24
static int snSFX[3][3];
// address: 0x80116F38
static int snLastCowSFX;
}
// address: 0x8003B7E0
// line start: 607
// line end: 653
void CowSFX__Fi_addr_8003B7E0(int pnum) {
// address: 0x80111548
// size: 0x24
static int snSFX[3][3];
// address: 0x8011BA8C
static int snLastCowSFX;
}
// address: 0x80038A48
// line start: 593
// line end: 639
void CowSFX__Fi_addr_80038A48(int pnum) {
// address: 0x8010F368
// size: 0x24
static int snSFX[3][3];
// address: 0x80119380
// address: 0x8012C858
static int snLastCowSFX;
}
@@ -98,74 +38,26 @@ void CowSFX__Fi_addr_80038A48(int pnum) {
}
// address: 0x800388A4
// address: 0x800388E0
// line start: 593
// line end: 639
void CowSFX__Fi_addr_800388A4(int pnum) {
// address: 0x8010A6E8
void CowSFX__Fi_addr_800388E0(int pnum) {
// address: 0x8010B764
// size: 0x24
static int snSFX[3][3];
// address: 0x80114094
// address: 0x801156E4
static int snLastCowSFX;
}
// address: 0x800389FC
// address: 0x80038A48
// line start: 593
// line end: 639
void CowSFX__Fi_addr_800389FC(int pnum) {
// address: 0x8010EB70
void CowSFX__Fi_addr_80038A48(int pnum) {
// address: 0x8010F368
// size: 0x24
static int snSFX[3][3];
// address: 0x80118B9C
static int snLastCowSFX;
}
// address: 0x8003B7B8
// line start: 607
// line end: 653
void CowSFX__Fi_addr_8003B7B8(int pnum) {
// address: 0x8011153C
// size: 0x24
static int snSFX[3][3];
// address: 0x8011BA50
static int snLastCowSFX;
}
// address: 0x8003B7E0
// line start: 607
// line end: 653
void CowSFX__Fi_addr_8003B7E0(int pnum) {
// address: 0x80111474
// size: 0x24
static int snSFX[3][3];
// address: 0x8011B980
static int snLastCowSFX;
}
// address: 0x8003A2D4
// line start: 595
// line end: 641
void CowSFX__Fi_addr_8003A2D4(int pnum) {
// address: 0x80112860
// size: 0x24
static int snSFX[3][3];
// address: 0x8011CC64
static int snLastCowSFX;
}
// address: 0x80038C1C
// line start: 593
// line end: 639
void CowSFX__Fi_addr_80038C1C(int pnum) {
// address: 0x8010D70C
// size: 0x24
static int snSFX[3][3];
// address: 0x80117528
// address: 0x80119380
static int snLastCowSFX;
}
@@ -182,50 +74,14 @@ void CowSFX__Fi_addr_8003B7B8(int pnum) {
}
// address: 0x80038AD8
// line start: 595
// line end: 641
void CowSFX__Fi_addr_80038AD8(int pnum) {
// address: 0x8012258C
// size: 0x24
static int snSFX[3][3];
// address: 0x8012C858
static int snLastCowSFX;
}
// address: 0x800388E0
// address: 0x8003998C
// line start: 593
// line end: 639
void CowSFX__Fi_addr_800388E0(int pnum) {
// address: 0x8010B764
void CowSFX__Fi_addr_8003998C(int pnum) {
// address: 0x8010DA38
// size: 0x24
static int snSFX[3][3];
// address: 0x801156E4
static int snLastCowSFX;
}
// address: 0x80039C90
// line start: 593
// line end: 639
void CowSFX__Fi_addr_80039C90(int pnum) {
// address: 0x801172D0
// size: 0x24
static int snSFX[3][3];
// address: 0x80120BCC
static int snLastCowSFX;
}
// address: 0x800369A8
// line start: 595
// line end: 641
void CowSFX__Fi_addr_800369A8(int pnum) {
// address: 0x80120040
// size: 0x24
static int snSFX[3][3];
// address: 0x8012A3BC
// address: 0x80117068
static int snLastCowSFX;
}
@@ -242,6 +98,54 @@ void CowSFX__Fi_addr_80038A50(int pnum) {
}
// address: 0x800389FC
// line start: 593
// line end: 639
void CowSFX__Fi_addr_800389FC(int pnum) {
// address: 0x8010EB70
// size: 0x24
static int snSFX[3][3];
// address: 0x80118B9C
static int snLastCowSFX;
}
// address: 0x800369A8
// line start: 595
// line end: 641
void CowSFX__Fi_addr_800369A8(int pnum) {
// address: 0x80120040
// size: 0x24
static int snSFX[3][3];
// address: 0x8012A3BC
static int snLastCowSFX;
}
// address: 0x80039964
// line start: 593
// line end: 639
void CowSFX__Fi_addr_80039964(int pnum) {
// address: 0x8010D8E4
// size: 0x24
static int snSFX[3][3];
// address: 0x80116F38
static int snLastCowSFX;
}
// address: 0x80039C90
// line start: 593
// line end: 639
void CowSFX__Fi_addr_80039C90(int pnum) {
// address: 0x801172D0
// size: 0x24
static int snSFX[3][3];
// address: 0x80120BCC
static int snLastCowSFX;
}
// address: 0x8003A628
// line start: 595
// line end: 641
@@ -254,18 +158,6 @@ void CowSFX__Fi_addr_8003A628(int pnum) {
}
// address: 0x800389D4
// line start: 593
// line end: 639
void CowSFX__Fi_addr_800389D4(int pnum) {
// address: 0x80121464
// size: 0x24
static int snSFX[3][3];
// address: 0x8012B614
static int snLastCowSFX;
}
// address: 0x80038AE0
// line start: 595
// line end: 641
@@ -278,14 +170,38 @@ void CowSFX__Fi_addr_80038AE0(int pnum) {
}
// address: 0x800389F8
// address: 0x80039994
// line start: 593
// line end: 639
void CowSFX__Fi_addr_800389F8(int pnum) {
// address: 0x80121730
void CowSFX__Fi_addr_80039994(int pnum) {
// address: 0x8010E208
// size: 0x24
static int snSFX[3][3];
// address: 0x8012B920
// address: 0x80117874
static int snLastCowSFX;
}
// address: 0x8003B7B8
// line start: 607
// line end: 653
void CowSFX__Fi_addr_8003B7B8(int pnum) {
// address: 0x8011153C
// size: 0x24
static int snSFX[3][3];
// address: 0x8011BA50
static int snLastCowSFX;
}
// address: 0x800389D4
// line start: 593
// line end: 639
void CowSFX__Fi_addr_800389D4(int pnum) {
// address: 0x80121464
// size: 0x24
static int snSFX[3][3];
// address: 0x8012B614
static int snLastCowSFX;
}
@@ -302,6 +218,66 @@ void CowSFX__Fi_addr_80038B3C(int pnum) {
}
// address: 0x800389F8
// line start: 593
// line end: 639
void CowSFX__Fi_addr_800389F8(int pnum) {
// address: 0x80121730
// size: 0x24
static int snSFX[3][3];
// address: 0x8012B920
static int snLastCowSFX;
}
// address: 0x8003B7E0
// line start: 607
// line end: 653
void CowSFX__Fi_addr_8003B7E0(int pnum) {
// address: 0x80111474
// size: 0x24
static int snSFX[3][3];
// address: 0x8011B980
static int snLastCowSFX;
}
// address: 0x80038C1C
// line start: 593
// line end: 639
void CowSFX__Fi_addr_80038C1C(int pnum) {
// address: 0x8010D70C
// size: 0x24
static int snSFX[3][3];
// address: 0x80117528
static int snLastCowSFX;
}
// address: 0x8003B7E0
// line start: 607
// line end: 653
void CowSFX__Fi_addr_8003B7E0(int pnum) {
// address: 0x80111548
// size: 0x24
static int snSFX[3][3];
// address: 0x8011BA8C
static int snLastCowSFX;
}
// address: 0x80038BA8
// line start: 593
// line end: 639
void CowSFX__Fi_addr_80038BA8(int pnum) {
// address: 0x801216A8
// size: 0x24
static int snSFX[3][3];
// address: 0x8012B838
static int snLastCowSFX;
}
// address: 0x80038BCC
// line start: 593
// line end: 639
@@ -314,14 +290,38 @@ void CowSFX__Fi_addr_80038BCC(int pnum) {
}
// address: 0x80039994
// address: 0x800388A4
// line start: 593
// line end: 639
void CowSFX__Fi_addr_80039994(int pnum) {
// address: 0x8010E208
void CowSFX__Fi_addr_800388A4(int pnum) {
// address: 0x8010A6E8
// size: 0x24
static int snSFX[3][3];
// address: 0x80117874
// address: 0x80114094
static int snLastCowSFX;
}
// address: 0x80038AE0
// line start: 595
// line end: 641
void CowSFX__Fi_addr_80038AE0(int pnum) {
// address: 0x801228B0
// size: 0x24
static int snSFX[3][3];
// address: 0x8012CBF8
static int snLastCowSFX;
}
// address: 0x8003A2D4
// line start: 595
// line end: 641
void CowSFX__Fi_addr_8003A2D4(int pnum) {
// address: 0x80112860
// size: 0x24
static int snSFX[3][3];
// address: 0x8011CC64
static int snLastCowSFX;
}
@@ -548,11 +548,19 @@ void NewTownerAnim__FiPUcii(int tnum, unsigned char *pAnim, int numFrames, int D
}
// address: 0x8003B70C
// size: 0x6C
// line start: 593
// line end: 598
struct ItemStruct *PlrHasItem__FiiRi(int pnum, int item, int *i) {
// address: 0x80038A0C
// size: 0x98
// line start: 581
// line end: 586
struct ItemStruct_dup_13 *PlrHasItem__FiiRi(int pnum, int item, int *i) {
}
// address: 0x80038924
// size: 0x98
// line start: 579
// line end: 584
struct ItemStruct_dup_11 *PlrHasItem__FiiRi_addr_80038924(int pnum, int item, int *i) {
}
@@ -572,14 +580,6 @@ struct ItemStruct_dup_17 *PlrHasItem__FiiRi_addr_8003B70C(int pnum, int item, in
}
// address: 0x80039890
// size: 0x94
// line start: 579
// line end: 584
struct ItemStruct *PlrHasItem__FiiRi_addr_80039890(int pnum, int item, int *i) {
}
// address: 0x80038928
// size: 0x98
// line start: 579
@@ -588,19 +588,19 @@ struct ItemStruct *PlrHasItem__FiiRi_addr_80038928(int pnum, int item, int *i) {
}
// address: 0x80038924
// size: 0x98
// address: 0x80039890
// size: 0x94
// line start: 579
// line end: 584
struct ItemStruct_dup_11 *PlrHasItem__FiiRi_addr_80038924(int pnum, int item, int *i) {
struct ItemStruct *PlrHasItem__FiiRi_addr_80039890(int pnum, int item, int *i) {
}
// address: 0x80038A0C
// size: 0x98
// line start: 581
// line end: 586
struct ItemStruct_dup_13 *PlrHasItem__FiiRi_addr_80038A0C(int pnum, int item, int *i) {
// address: 0x8003B70C
// size: 0x6C
// line start: 593
// line end: 598
struct ItemStruct *PlrHasItem__FiiRi_addr_8003B70C(int pnum, int item, int *i) {
}
@@ -660,10 +660,10 @@ void TalkToTowner__Fii(int p, int t) {
}
// address: 0x80039AC0
// line start: 659
// line end: 1055
void TalkToTowner__Fii_addr_80039AC0(int p, int t) {
// address: 0x8003B93C
// line start: 673
// line end: 1090
void TalkToTowner__Fii_addr_8003B93C(int p, int t) {
// address: 0xFFFFFFE0
auto int i;
// register: 16
@@ -671,7 +671,7 @@ void TalkToTowner__Fii_addr_80039AC0(int p, int t) {
// register: 2
register int dy;
// register: 17
// size: 0x94
// size: 0x6C
register struct ItemStruct *Item;
{
{
@@ -716,62 +716,6 @@ void TalkToTowner__Fii_addr_80038C3C(int p, int t) {
}
// address: 0x8003B93C
// line start: 673
// line end: 1090
void TalkToTowner__Fii_addr_8003B93C(int p, int t) {
// address: 0xFFFFFFE0
auto int i;
// register: 16
register int dx;
// register: 2
register int dy;
// register: 17
// size: 0x6C
register struct ItemStruct *Item;
{
{
{
{
{
{
}
}
}
}
}
}
}
// address: 0x80038D78
// line start: 659
// line end: 1055
void TalkToTowner__Fii_addr_80038D78(int p, int t) {
// address: 0xFFFFFFE0
auto int i;
// register: 16
register int dx;
// register: 2
register int dy;
// register: 17
// size: 0x98
register struct ItemStruct_dup_6 *Item;
{
{
{
{
{
{
}
}
}
}
}
}
}
// address: 0x80038B58
// line start: 659
// line end: 1055
@@ -828,6 +772,62 @@ void TalkToTowner__Fii_addr_8003B93C(int p, int t) {
}
// address: 0x80039AC0
// line start: 659
// line end: 1055
void TalkToTowner__Fii_addr_80039AC0(int p, int t) {
// address: 0xFFFFFFE0
auto int i;
// register: 16
register int dx;
// register: 2
register int dy;
// register: 17
// size: 0x94
register struct ItemStruct *Item;
{
{
{
{
{
{
}
}
}
}
}
}
}
// address: 0x80038D78
// line start: 659
// line end: 1055
void TalkToTowner__Fii_addr_80038D78(int p, int t) {
// address: 0xFFFFFFE0
auto int i;
// register: 16
register int dx;
// register: 2
register int dy;
// register: 17
// size: 0x98
register struct ItemStruct_dup_6 *Item;
{
{
{
{
{
{
}
}
}
}
}
}
}
// address: 0x800395F0
// line start: 503
// line end: 505
psx/_dump_/_dump_merge_c_src_/diabpsx/source/trigs.cpp
+56 -56
View File
@@ -119,43 +119,6 @@ void CheckTriggers__Fi(int pnum) {
}
// address: 0x80073204
// line start: 501
// line end: 640
void CheckTriggers__Fi_addr_80073204(int pnum) {
// register: 17
register int x;
// register: 16
register int y;
{
// register: 23
register int i;
{
{
{
{
{
// register: 4
register unsigned char abortflag;
// register: 17
register int dx;
// register: 16
register int dy;
// register: 18
register char m;
{
{
}
}
}
}
}
}
}
}
}
// address: 0x800767A8
// line start: 895
// line end: 1051
@@ -222,6 +185,43 @@ void CheckTriggers__Fi_addr_8006F458(int pnum) {
}
// address: 0x80073204
// line start: 501
// line end: 640
void CheckTriggers__Fi_addr_80073204(int pnum) {
// register: 17
register int x;
// register: 16
register int y;
{
// register: 23
register int i;
{
{
{
{
{
// register: 4
register unsigned char abortflag;
// register: 17
register int dx;
// register: 16
register int dy;
// register: 18
register char m;
{
{
}
}
}
}
}
}
}
}
}
// address: 0x8007535C
// line start: 323
// line end: 365
@@ -322,12 +322,10 @@ unsigned char ForceSKingTrig__Fv() {
}
// address: 0x8006E55C
// line start: 76
// line end: 117
// address: 0x8007537C
// line start: 371
// line end: 451
unsigned char ForceTownTrig__Fv() {
// register: 5
register int i;
}
@@ -346,10 +344,12 @@ unsigned char ForceTownTrig__Fv_addr_80075134() {
}
// address: 0x8007537C
// line start: 371
// line end: 451
unsigned char ForceTownTrig__Fv_addr_8007537C() {
// address: 0x8006E55C
// line start: 76
// line end: 117
unsigned char ForceTownTrig__Fv_addr_8006E55C() {
// register: 5
register int i;
}
@@ -370,24 +370,24 @@ void Freeupstairs__Fv() {
}
// address: 0x80076674
// line start: 863
// line end: 882
bool IsTrigger__Fii(int x, int y) {
// register: 6
register int i;
}
// address: 0x8006E460
// line start: 502
// line end: 509
bool IsTrigger__Fii_addr_8006E460(int x, int y) {
bool IsTrigger__Fii(int x, int y) {
{
}
}
// address: 0x80076674
// line start: 863
// line end: 882
bool IsTrigger__Fii_addr_80076674(int x, int y) {
// register: 6
register int i;
}
// address: 0x800750C0
// line start: 230
// line end: 252
psx/_dump_/_dump_merge_c_src_/global_0.cpp
+104 -104
View File
@@ -1926,7 +1926,7 @@ static bool GameLoading;
// address: 0x800D2EB0
// size: 0x170
extern struct CompLevelMaps_dup_29 GameMaps;
extern struct CompLevelMaps_dup_23 GameMaps;
// address: 0x800D6D80
// size: 0x170
@@ -1942,7 +1942,7 @@ extern struct CompLevelMaps_dup_20 GameMaps_addr_800D6E0C;
// address: 0x800CCC9C
// size: 0x160
extern struct CompLevelMaps_dup_30 GameMaps_addr_800CCC9C;
extern struct CompLevelMaps_dup_24 GameMaps_addr_800CCC9C;
// address: 0x800D6CC4
// size: 0x170
@@ -4276,13 +4276,13 @@ extern char STREAM_DIR[16];
// address: 0x8011672C
static bool STRInit;
// address: 0x800CB9A0
// size: 0x84
extern struct SFXHDR STRSave;
// address: 0x800BBDF4
// size: 0x80
extern struct SFXHDR STRSave_addr_800BBDF4;
extern struct SFXHDR STRSave;
// address: 0x800CB9A0
// size: 0x84
extern struct SFXHDR STRSave_addr_800CB9A0;
// address: 0x800CBA74
// size: 0x84
@@ -4291,14 +4291,14 @@ extern struct SFXHDR_dup_17 STRSave_addr_800CBA74;
// address: 0x80116724
extern unsigned long *STR_Buffer;
// address: 0x800AE4DC
// size: 0x18000
extern unsigned long STR_Buffer_addr_800AE4DC[24576];
// address: 0x800A9DB4
// size: 0x12000
extern unsigned long STR_Buffer_addr_800A9DB4[18432];
// address: 0x800AE4DC
// size: 0x18000
extern unsigned long STR_Buffer_addr_800AE4DC[24576];
// address: 0x8011BD40
extern int SWrapCount;
@@ -4437,13 +4437,9 @@ static unsigned char SkelKingTrans3[20];
// size: 0x1C
static unsigned char SkelKingTrans4[28];
// address: 0x80117B48
// size: 0x6C
static struct TextDat *Slider;
// address: 0x8011C904
// size: 0x70
static struct TextDat *Slider_addr_8011C904;
static struct TextDat *Slider;
// address: 0x8011C83C
// size: 0x70
@@ -4457,6 +4453,10 @@ static struct TextDat_dup_14 *Slider_addr_8012E774;
// size: 0x70
static struct TextDat_dup_17 *Slider_addr_8011C944;
// address: 0x80117B48
// size: 0x6C
static struct TextDat *Slider_addr_80117B48;
// address: 0x80121808
// size: 0x68
static struct TextDat_dup_1 *Slider_addr_80121808;
@@ -4509,11 +4509,11 @@ static int SpdColInc2;
// address: 0x8011B024
static int SpdColInc3;
// address: 0x80117B44
static unsigned long SpeechVol;
// address: 0x80113B5C
extern unsigned long SpeechVol_addr_80113B5C;
extern unsigned long SpeechVol;
// address: 0x80117B44
static unsigned long SpeechVol_addr_80117B44;
// address: 0x800A5C40
// size: 0xC8
@@ -4526,17 +4526,17 @@ extern char SpellCol;
// size: 0x12
extern unsigned char SpellColors[18];
// address: 0x800A9BEC
// size: 0x90
extern struct SPELLFX_DAT_dup_7 SpellFXDat[2];
// address: 0x800A77E4
// size: 0xA0
extern struct SPELLFX_DAT SpellFXDat[2];
// address: 0x800AA368
// size: 0x90
extern struct SPELLFX_DAT SpellFXDat_addr_800AA368[2];
// address: 0x800A77E4
// size: 0xA0
extern struct SPELLFX_DAT SpellFXDat_addr_800A77E4[2];
// address: 0x800A9BEC
// size: 0x90
extern struct SPELLFX_DAT_dup_7 SpellFXDat_addr_800A9BEC[2];
// address: 0x800A7B5C
// size: 0x25
@@ -4546,30 +4546,30 @@ extern char SpellITbl[37];
// size: 0x64
extern int SpellPages[5][5];
// address: 0x800BEAA4
// size: 0x30
extern struct Spell_Target SplTarget[2];
// address: 0x800A6864
// size: 0x48
extern struct Spell_Target_dup_4 SplTarget[2];
// address: 0x800A7884
// size: 0x48
extern struct Spell_Target SplTarget_addr_800A7884[2];
extern struct Spell_Target_dup_4 SplTarget_addr_800A6864[2];
// address: 0x800A65B4
// size: 0x38
extern struct Spell_Target SplTarget_addr_800A65B4[2];
// address: 0x800BE130
// size: 0x30
extern struct Spell_Target_dup_13 SplTarget_addr_800BE130[2];
// address: 0x800BEAA4
// size: 0x30
extern struct Spell_Target SplTarget_addr_800BEAA4[2];
// address: 0x800A7884
// size: 0x48
extern struct Spell_Target SplTarget_addr_800A7884[2];
// address: 0x800BD59C
// size: 0x38
extern struct Spell_Target_dup_12 SplTarget_addr_800BD59C[2];
// address: 0x800BE130
// size: 0x30
extern struct Spell_Target_dup_13 SplTarget_addr_800BE130[2];
// address: 0x80117DDC
static void (*StackFloodCallback)();
@@ -4591,13 +4591,13 @@ static struct RECT StoreBackRectClipper;
// address: 0x8011BD08
extern int StorePlrNo;
// address: 0x800D8984
// size: 0x12
extern unsigned short StoryBookName[9];
// address: 0x800C9BC8
// size: 0x24
extern int StoryBookName_addr_800C9BC8[9];
extern int StoryBookName[9];
// address: 0x800D8984
// size: 0x12
extern unsigned short StoryBookName_addr_800D8984[9];
// address: 0x800D4E00
// size: 0x24
@@ -4682,18 +4682,18 @@ extern char **TextPtr;
// address: 0x8011BBB0
extern int TextWait;
// address: 0x800A70E0
// size: 0x1EC
extern struct PalCollection ThePals;
// address: 0x800A5E48
// size: 0x18C
extern struct PalCollection ThePals;
extern struct PalCollection ThePals_addr_800A5E48;
// address: 0x800A6160
// size: 0x1EC
extern struct PalCollection_dup_4 ThePals_addr_800A6160;
// address: 0x800A70E0
// size: 0x1EC
extern struct PalCollection ThePals_addr_800A70E0;
// address: 0x800FDA84
// size: 0x10
extern int ThemeGood[4];
@@ -4789,14 +4789,14 @@ static struct TextDat_dup_17 *TownerGfx;
// size: 0x6C
static struct TextDat *TownerGfx_addr_80117AD8;
// address: 0x80121798
// size: 0x68
static struct TextDat_dup_1 *TownerGfx_addr_80121798;
// address: 0x8011C8CC
// size: 0x70
static struct TextDat *TownerGfx_addr_8011C8CC;
// address: 0x80121798
// size: 0x68
static struct TextDat_dup_1 *TownerGfx_addr_80121798;
// address: 0x8012E744
// size: 0x6C
static struct TextDat_dup_14 *TownerGfx_addr_8012E744;
@@ -4957,30 +4957,30 @@ static int WWorldX;
// address: 0x80117AA4
static int WWorldY;
// address: 0x80118F38
// size: 0x2
static char WarpDropX[2];
// address: 0x800E3918
// size: 0x10
static int WarpDropX_addr_800E3918[4];
static int WarpDropX[4];
// address: 0x80118F38
// size: 0x2
static char WarpDropX_addr_80118F38[2];
// address: 0x80108E2C
// size: 0x10
extern int WarpDropX_addr_80108E2C[4];
// address: 0x80118F3C
// size: 0x2
static char WarpDropY[2];
// address: 0x800E3928
// size: 0x10
static int WarpDropY[4];
static int WarpDropY_addr_800E3928[4];
// address: 0x80108E3C
// size: 0x10
extern int WarpDropY_addr_80108E3C[4];
// address: 0x80118F3C
// size: 0x2
static char WarpDropY_addr_80118F3C[2];
// address: 0x8011423C
extern bool WaterDone;
@@ -5010,38 +5010,38 @@ extern int Year;
// size: 0x32
extern char _6FileIO_FileToLoad[50];
// address: 0x8012DD74
// size: 0x94
static struct GamePad_dup_13 *_GP0;
// address: 0x8012DD74
// size: 0x94
static struct GamePad *_GP0_addr_8012DD74;
// address: 0x8012C840
// size: 0x9C
static struct GamePad_dup_11 *_GP0_addr_8012C840;
static struct GamePad_dup_11 *_GP0;
// address: 0x8012C534
// size: 0x9C
static struct GamePad *_GP0_addr_8012C534;
// address: 0x8012DD78
// address: 0x8012DD74
// size: 0x94
static struct GamePad *_GP1;
static struct GamePad_dup_13 *_GP0_addr_8012DD74;
// address: 0x8012DB2C
// size: 0x94
static struct GamePad *_GP0_addr_8012DB2C;
// address: 0x8012C844
// size: 0x9C
static struct GamePad_dup_11 *_GP1_addr_8012C844;
static struct GamePad_dup_11 *_GP1;
// address: 0x8012DD78
// address: 0x8012DB30
// size: 0x94
static struct GamePad_dup_13 *_GP1_addr_8012DD78;
static struct GamePad *_GP1_addr_8012DB30;
// address: 0x8012C538
// size: 0x9C
static struct GamePad *_GP1_addr_8012C538;
// address: 0x8012DD78
// size: 0x94
static struct GamePad_dup_13 *_GP1_addr_8012DD78;
// address: 0x8011BD1C
// size: 0x8
extern int _NoWitchItems[2];
@@ -5072,13 +5072,13 @@ extern int _discard_count;
// address: 0x80113D9C
extern int _get_count;
// address: 0x800E19FC
// size: 0xD8
extern struct ItemStruct_dup_17 _golditem[2];
// address: 0x800E1928
// size: 0xD8
extern struct ItemStruct _golditem_addr_800E1928[2];
extern struct ItemStruct _golditem[2];
// address: 0x800E19FC
// size: 0xD8
extern struct ItemStruct_dup_17 _golditem_addr_800E19FC[2];
// address: 0x800E091C
// size: 0x10E0
@@ -5164,14 +5164,14 @@ extern char _pfind_index[2];
// size: 0x3C
extern struct found_objects_dup_17 _pfind_list[10][2];
// address: 0x800D4B18
// size: 0x50
extern struct found_objects _pfind_list_addr_800D4B18[10][2];
// address: 0x800E3520
// size: 0x3C
extern struct found_objects _pfind_list_addr_800E3520[10][2];
// address: 0x800D4B18
// size: 0x50
extern struct found_objects _pfind_list_addr_800D4B18[10][2];
// address: 0x801171F4
// size: 0x2
extern char _pfindx[2];
@@ -5216,13 +5216,13 @@ extern short _psplypos[3][2];
// size: 0x8
static int _pspotid[2];
// address: 0x8012EC90
// size: 0x50
static int _pstrjust[10][2];
// address: 0x80118A80
// size: 0x40
static int _pstrjust_addr_80118A80[8][2];
static int _pstrjust[8][2];
// address: 0x8012EC90
// size: 0x50
static int _pstrjust_addr_8012EC90[10][2];
// address: 0x800DE0A0
// size: 0x10E0
@@ -5606,29 +5606,29 @@ extern int current_card;
// address: 0x80117560
extern unsigned char currlevel;
// address: 0x80118C58
// size: 0x94
static struct ItemStruct curruitem;
// address: 0x8012D680
// size: 0x98
static struct ItemStruct_dup_11 curruitem_addr_8012D680;
static struct ItemStruct_dup_11 curruitem;
// address: 0x80125B00
// size: 0x98
static struct ItemStruct_dup_6 curruitem_addr_80125B00;
// address: 0x8012EEB0
// address: 0x80118C58
// size: 0x94
static struct ItemStruct curruitem_addr_80118C58;
// address: 0x8012EDA8
// size: 0x6C
static struct ItemStruct_dup_17 curruitem_addr_8012EEB0;
static struct ItemStruct curruitem_addr_8012EDA8;
// address: 0x8011A8B8
// size: 0x98
static struct ItemStruct curruitem_addr_8011A8B8;
// address: 0x8012EDA8
// address: 0x8012EEB0
// size: 0x6C
static struct ItemStruct curruitem_addr_8012EDA8;
static struct ItemStruct_dup_17 curruitem_addr_8012EEB0;
// address: 0x8012EBE8
// size: 0x98
@@ -5765,13 +5765,13 @@ extern int demo_which;
// address: 0x801182ED
extern unsigned char demo_which_addr_801182ED;
// address: 0x800A96C0
// size: 0x14
extern unsigned long demolevel[5];
// address: 0x801137B4
// size: 0x5
extern char demolevel_addr_801137B4[5];
extern char demolevel[5];
// address: 0x800A96C0
// size: 0x14
extern unsigned long demolevel_addr_800A96C0[5];
// address: 0x800D6664
// size: 0x640
psx/_dump_/_dump_merge_c_src_/types.h
+11 -11
View File
@@ -83,7 +83,7 @@ enum MEM_TYPES {
MT_POST_QUIT = 5,
};
enum MEM_TYPES_dup_29 {
enum MEM_TYPES_dup_23 {
MT_NONE = 0,
MT_FRONTEND = 1,
MT_DEMO = 2,
@@ -4819,7 +4819,7 @@ struct AMap_dup_19 {
};
// size: 0x10
struct AMap_dup_29 {
struct AMap_dup_23 {
// offset: 0000
bool Compressed;
// offset: 0004
@@ -6221,11 +6221,11 @@ struct CompLevelMaps_dup_20 {
};
// size: 0x170
struct CompLevelMaps_dup_29 {
struct CompLevelMaps_dup_23 {
// offset: 0000 (4 bytes)
struct CompClass *CompObj;
// offset: 0004 (352 bytes)
struct AMap_dup_29 TheMaps[22];
struct AMap_dup_23 TheMaps[22];
// offset: 0164
int LastNumOut;
// offset: 0168 (3868 bytes)
@@ -6235,7 +6235,7 @@ struct CompLevelMaps_dup_29 {
};
// size: 0x160
struct CompLevelMaps_dup_30 {
struct CompLevelMaps_dup_24 {
// offset: 0000 (4 bytes)
struct CompClass *CompObj;
// offset: 0004 (336 bytes)
@@ -6271,7 +6271,7 @@ struct CompressedLevs {
};
// size: 0xAC
struct CompressedLevs_dup_30 {
struct CompressedLevs_dup_24 {
// offset: 0000
unsigned long Version;
// offset: 0004 (84 bytes)
@@ -20614,7 +20614,7 @@ typedef struct AMap AMap;
typedef struct AMap_dup_17 AMap;
typedef struct AMap_dup_29 AMap;
typedef struct AMap_dup_23 AMap;
typedef struct AMap_dup_18 AMap;
@@ -20796,7 +20796,7 @@ typedef struct CompLevelMaps_dup_14 CompLevelMaps;
typedef struct CompLevelMaps_dup_19 CompLevelMaps;
typedef struct CompLevelMaps_dup_30 CompLevelMaps;
typedef struct CompLevelMaps_dup_24 CompLevelMaps;
typedef struct CompLevelMaps_dup_18 CompLevelMaps;
@@ -20804,7 +20804,7 @@ typedef struct CompLevelMaps_dup_6 CompLevelMaps;
typedef struct CompLevelMaps_dup_5 CompLevelMaps;
typedef struct CompLevelMaps_dup_29 CompLevelMaps;
typedef struct CompLevelMaps_dup_23 CompLevelMaps;
typedef struct CompLevelMaps_dup_17 CompLevelMaps;
@@ -20816,7 +20816,7 @@ typedef struct CompLevelMemImage CompLevelMemImage;
typedef struct CompressedLevs CompressedLevs;
typedef struct CompressedLevs_dup_30 CompressedLevs;
typedef struct CompressedLevs_dup_24 CompressedLevs;
typedef struct Creds_dup_17 Creds;
@@ -21412,7 +21412,7 @@ typedef struct MEM_INIT_INFO MEM_INIT_INFO;
typedef struct MEM_REG MEM_REG;
typedef enum MEM_TYPES_dup_29 MEM_TYPES;
typedef enum MEM_TYPES_dup_23 MEM_TYPES;
typedef enum MEM_TYPES MEM_TYPES;
psx/_dump_/_dump_merge_types_/types.h
+11 -11
View File
@@ -83,7 +83,7 @@ enum MEM_TYPES {
MT_POST_QUIT = 5,
};
enum MEM_TYPES_dup_29 {
enum MEM_TYPES_dup_23 {
MT_NONE = 0,
MT_FRONTEND = 1,
MT_DEMO = 2,
@@ -4819,7 +4819,7 @@ struct AMap_dup_19 {
};
// size: 0x10
struct AMap_dup_29 {
struct AMap_dup_23 {
// offset: 0000
bool Compressed;
// offset: 0004
@@ -6221,11 +6221,11 @@ struct CompLevelMaps_dup_20 {
};
// size: 0x170
struct CompLevelMaps_dup_29 {
struct CompLevelMaps_dup_23 {
// offset: 0000 (4 bytes)
struct CompClass *CompObj;
// offset: 0004 (352 bytes)
struct AMap_dup_29 TheMaps[22];
struct AMap_dup_23 TheMaps[22];
// offset: 0164
int LastNumOut;
// offset: 0168 (3868 bytes)
@@ -6235,7 +6235,7 @@ struct CompLevelMaps_dup_29 {
};
// size: 0x160
struct CompLevelMaps_dup_30 {
struct CompLevelMaps_dup_24 {
// offset: 0000 (4 bytes)
struct CompClass *CompObj;
// offset: 0004 (336 bytes)
@@ -6271,7 +6271,7 @@ struct CompressedLevs {
};
// size: 0xAC
struct CompressedLevs_dup_30 {
struct CompressedLevs_dup_24 {
// offset: 0000
unsigned long Version;
// offset: 0004 (84 bytes)
@@ -20614,7 +20614,7 @@ typedef struct AMap AMap;
typedef struct AMap_dup_17 AMap;
typedef struct AMap_dup_29 AMap;
typedef struct AMap_dup_23 AMap;
typedef struct AMap_dup_18 AMap;
@@ -20796,7 +20796,7 @@ typedef struct CompLevelMaps_dup_14 CompLevelMaps;
typedef struct CompLevelMaps_dup_19 CompLevelMaps;
typedef struct CompLevelMaps_dup_30 CompLevelMaps;
typedef struct CompLevelMaps_dup_24 CompLevelMaps;
typedef struct CompLevelMaps_dup_18 CompLevelMaps;
@@ -20804,7 +20804,7 @@ typedef struct CompLevelMaps_dup_6 CompLevelMaps;
typedef struct CompLevelMaps_dup_5 CompLevelMaps;
typedef struct CompLevelMaps_dup_29 CompLevelMaps;
typedef struct CompLevelMaps_dup_23 CompLevelMaps;
typedef struct CompLevelMaps_dup_17 CompLevelMaps;
@@ -20816,7 +20816,7 @@ typedef struct CompLevelMemImage CompLevelMemImage;
typedef struct CompressedLevs CompressedLevs;
typedef struct CompressedLevs_dup_30 CompressedLevs;
typedef struct CompressedLevs_dup_24 CompressedLevs;
typedef struct Creds_dup_17 Creds;
@@ -21412,7 +21412,7 @@ typedef struct MEM_INIT_INFO MEM_INIT_INFO;
typedef struct MEM_REG MEM_REG;
typedef enum MEM_TYPES_dup_29 MEM_TYPES;
typedef enum MEM_TYPES_dup_23 MEM_TYPES;
typedef enum MEM_TYPES MEM_TYPES;