Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-26 08:41:27 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

First Pass Changes

Browse Source
This commit is contained in:
Adrienn Tindall 2024-05-19 17:06:43 -04:00
parent 546e21a13d
commit 8318595095
7 changed files with 349 additions and 366 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/map_object.h
View File

@ -135,8 +135,8 @@ void sub_02062B88(MapObject * param0, UnkFuncPtr_ov5_021FB0F0_3 param1);
void sub_02062B90(MapObject * param0);
void sub_02062B9C(MapObject * param0, UnkFuncPtr_ov5_021FB0F0_4 param1);
void sub_02062BA4(MapObject * param0);
void sub_02062BB0(MapObject * param0, int param1);
int sub_02062BB8(const MapObject * param0);
void MapObject_SetAnimationCode(MapObject * param0, int param1);
int MapObject_AnimationCode(const MapObject * param0);
void sub_02062BC0(MapObject * param0, int param1);
void sub_02062BC8(MapObject * param0);
int sub_02062BD8(const MapObject * param0);

5
include/struct_defs/struct_02032188.h
View File

@ -1,5 +0,0 @@
#ifndef POKEPLATINUM_STRUCT_02032188_H
#define POKEPLATINUM_STRUCT_02032188_H
#endif // POKEPLATINUM_STRUCT_02032188_H

14
src/comm_ring.c
View File

@ -18,14 +18,14 @@ void CommRing_Init (CommRing * ring, u8 * buffer, int size)
void CommRring_Write (CommRing * ring, u8 * buffer, int size, int unused)
{
int i, j;
int i;
if (CommRing_RemainingSizeBackup(ring) <= size) {
sub_020363BC();
return;
}
j = 0;
int j = 0;
for (i = ring->backupEndIndex; i < ring->backupEndIndex + size; i++, j++) {
GF_ASSERT(buffer);
@ -37,9 +37,7 @@ void CommRring_Write (CommRing * ring, u8 * buffer, int size, int unused)
int CommRing_Read (CommRing * ring, u8 * buffer, int size)
{
int index;
index = CommRing_Peek(ring, buffer, size);
int index = CommRing_Peek(ring, buffer, size);
ring->startIndex = CommRing_Index(ring, ring->startIndex + index);
return index;
@ -56,11 +54,9 @@ u8 CommRing_ReadByte (CommRing * ring)
//Reading but doesn't incriment the index
int CommRing_Peek (CommRing * ring, u8 * buffer, int size)
{
int i, j;
int j = 0;
j = 0;
for (i = ring->startIndex; i < ring->startIndex + size; i++, j++) {
for (int i = ring->startIndex; i < ring->startIndex + size; i++, j++) {
if (ring->endIndex == CommRing_Index(ring, i)) {
return j;
}

606
src/map_object.c
View File

File diff suppressed because it is too large Load Diff

64
src/overlay005/fieldmap.c
View File

@ -102,30 +102,30 @@ struct UnkStruct_ov5_021D1A68_t {
int unk_02[24];
};
static void ov5_021D1444(BGL * param0);
static void ov5_021D1524(BGL * param0);
static void ov5_021D1444(BGL * bgl);
static void ov5_021D1524(BGL * bgl);
static void ov5_021D154C(void);
static void ov5_021D1570(void);
static void ov5_021D1578(UnkStruct_ov5_021D5894 * param0);
static void ov5_021D15F4(FieldSystem * param0);
static void ov5_021D173C(FieldSystem * param0);
static void ov5_021D15F4(FieldSystem * fieldSystem);
static void ov5_021D173C(FieldSystem * fieldSystem);
static void ov5_021D1414(void);
static void ov5_021D15B4(void);
static void ov5_021D15E8(void);
static void ov5_021D1790(FieldSystem * param0);
static void ov5_021D17EC(FieldSystem * param0);
static void ov5_021D1878(FieldSystem * param0);
static void ov5_021D1968(FieldSystem * param0);
static int FieldMap_Init(OverlayManager * param0, int * param1);
static int FieldMap_Main(OverlayManager * param0, int * param1);
static int FieldMap_Exit(OverlayManager * param0, int * param1);
static BOOL FieldMap_ChangeZone(FieldSystem * param0);
static void ov5_021D134C(FieldSystem * param0, u8 param1);
static BOOL ov5_021D119C(FieldSystem * param0);
static void ov5_021D1790(FieldSystem * fieldSystem);
static void ov5_021D17EC(FieldSystem * fieldSystem);
static void ov5_021D1878(FieldSystem * fieldSystem);
static void ov5_021D1968(FieldSystem * fieldSystem);
static BOOL FieldMap_Init(OverlayManager * overlayMan, int * param1);
static BOOL FieldMap_Main(OverlayManager * overlayMan, int * param1);
static BOOL FieldMap_Exit(OverlayManager * overlayMan, int * param1);
static BOOL FieldMap_ChangeZone(FieldSystem * fieldSystem);
static void ov5_021D134C(FieldSystem * fieldSystem, u8 param1);
static BOOL ov5_021D119C(FieldSystem * fieldSystem);
static void ov5_021D0D80(void * param0);
static void ov5_021D13B4(FieldSystem * param0);
static int ov5_021D1178(FieldSystem * param0);
static BOOL FieldMap_InDistortionWorld(FieldSystem * param0);
static void ov5_021D13B4(FieldSystem * fieldSystem);
static int ov5_021D1178(FieldSystem * fieldSystem);
static BOOL FieldMap_InDistortionWorld(FieldSystem * fieldSystem);
static UnkStruct_ov5_021D1A68 * ov5_021D1A14(int param0, int param1);
static const int * ov5_021D1A68(const UnkStruct_ov5_021D1A68 * param0);
static const int ov5_021D1A6C(const UnkStruct_ov5_021D1A68 * param0);
@ -151,12 +151,12 @@ static void ov5_021D0D80 (void * param0)
inline_ov5_021D0D80(fieldSystem);
}
static int FieldMap_Init (OverlayManager * param0, int * param1)
static BOOL FieldMap_Init (OverlayManager * overlayMan, int * param1)
{
FieldSystem * fieldSystem;
int v2 = 0;
fieldSystem = OverlayManager_Args(param0);
fieldSystem = OverlayManager_Args(overlayMan);
switch (*param1) {
case 0:
@ -247,20 +247,18 @@ static int FieldMap_Init (OverlayManager * param0, int * param1)
return v2;
}
static int FieldMap_Main (OverlayManager * param0, int * param1)
static BOOL FieldMap_Main (OverlayManager * overlayMan, int * param1)
{
FieldSystem * fieldSystem;
fieldSystem = OverlayManager_Args(param0);
fieldSystem = OverlayManager_Args(overlayMan);
if (ov5_021D119C(fieldSystem)) {
sub_02055D94(fieldSystem);
ov5_021D13B4(fieldSystem);
ov5_021EA714(fieldSystem, 1, 1);
if (FieldMap_ChangeZone(fieldSystem)) {
(void)0;
}
FieldMap_ChangeZone(fieldSystem);
}
ov5_021D134C(fieldSystem, fieldSystem->unk_C0);
@ -272,11 +270,9 @@ static int FieldMap_Main (OverlayManager * param0, int * param1)
}
}
static int FieldMap_Exit (OverlayManager * param0, int * param1)
static BOOL FieldMap_Exit (OverlayManager * overlayMan, int * param1)
{
FieldSystem * fieldSystem;
fieldSystem = OverlayManager_Args(param0);
FieldSystem * fieldSystem = OverlayManager_Args(overlayMan);
ov5_021E8188(fieldSystem, fieldSystem->unk_28);
switch (*param1) {
@ -377,9 +373,9 @@ const OverlayManagerTemplate gFieldMapTemplate = {
0xffffffff
};
static int ov5_021D1178 (FieldSystem * param0)
static int ov5_021D1178 (FieldSystem * fieldSystem)
{
UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(param0));
UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(fieldSystem));
int v1 = sub_02027F80(v0);
if (v1 == 0) {
@ -535,10 +531,6 @@ static void ov5_021D134C (FieldSystem * fieldSystem, u8 param1)
if ((param1 & 4) != 0) {
ov5_021D15F4(fieldSystem);
}
if (gCoreSys.pressedKeys & PAD_BUTTON_X) {
(void)0;
}
}
static void ov5_021D13B4 (FieldSystem * fieldSystem)
@ -989,9 +981,9 @@ static void ov5_021D1A70 (UnkStruct_ov5_021D1A68 * param0)
Heap_FreeToHeap(param0);
}
static BOOL FieldMap_InDistortionWorld (FieldSystem * param0)
static BOOL FieldMap_InDistortionWorld (FieldSystem * fieldSystem)
{
UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(param0));
UnkStruct_02027860 * v0 = sub_02027860(FieldSystem_SaveData(fieldSystem));
int v1 = sub_02027F80(v0);
if (v1 == 9) {

12
src/unk_0205F180.c
View File

@ -193,7 +193,7 @@ static int PlayerAvatar_CheckStartMoveInternal (PlayerAvatar * playerAvatar, int
return 0;
}
v0 = sub_02062BB8(mapObj);
v0 = MapObject_AnimationCode(mapObj);
if (sub_020613D8(v0) == 1) {
u32 v2;
@ -265,7 +265,7 @@ static void PlayerAvatar_PlayWalkSE (PlayerAvatar * playerAvatar)
u8 v1, v2 = sub_02062BE8(mapObj);
{
int v3 = sub_02062BB8(mapObj);
int v3 = MapObject_AnimationCode(mapObj);
int v4 = sub_0206587C(v3);
if (v4 == -1) {
@ -296,7 +296,7 @@ static void PlayerAvatar_PlayWalkSE (PlayerAvatar * playerAvatar)
}
{
int v5 = sub_02062BB8(mapObj);
int v5 = MapObject_AnimationCode(mapObj);
if (sub_020613D8(v5) == 0) {
if ((sub_0205DAD4(v2) == 1) || (sub_0205DAD4(v1) == 1)) {
@ -332,7 +332,7 @@ void sub_0205F490 (PlayerAvatar * playerAvatar)
case 0:
break;
case 1:
v2 = sub_02062BB8(v3);
v2 = MapObject_AnimationCode(v3);
if (sub_020613D8(v2) == 1) {
break;
@ -418,7 +418,7 @@ int sub_0205F588 (PlayerAvatar * playerAvatar)
return 1;
}
v2 = sub_02062BB8(v3);
v2 = MapObject_AnimationCode(v3);
if (sub_020613D8(v2) == 1) {
return 1;
@ -2194,7 +2194,7 @@ int sub_020613AC (PlayerAvatar * playerAvatar)
}
{
int v1 = sub_02062BB8(v0);
int v1 = MapObject_AnimationCode(v0);
if (sub_020613D8(v1) == 1) {
return 1;

10
src/unk_020655F4.c
View File

@ -141,7 +141,7 @@ void LocalMapObj_SetAnimationCode (MapObject * param0, int param1)
{
GF_ASSERT(param1 < 0x9a);
sub_02062BB0(param0, param1);
MapObject_SetAnimationCode(param0, param1);
sub_02062BC0(param0, 0);
MapObject_SetStatusFlagOn(param0, (1 << 4));
MapObject_SetStatusFlagOff(param0, (1 << 5));
@ -149,7 +149,7 @@ void LocalMapObj_SetAnimationCode (MapObject * param0, int param1)
void sub_02065668 (MapObject * param0, int param1)
{
sub_02062BB0(param0, param1);
MapObject_SetAnimationCode(param0, param1);
sub_02062BC0(param0, 0);
MapObject_SetStatusFlagOff(param0, (1 << 5));
}
@ -186,7 +186,7 @@ void sub_020656DC (MapObject * param0)
{
MapObject_SetStatusFlagOff(param0, (1 << 4));
MapObject_SetStatusFlagOn(param0, (1 << 5));
sub_02062BB0(param0, 0xff);
MapObject_SetAnimationCode(param0, 0xff);
sub_02062BC0(param0, 0);
}
@ -387,7 +387,7 @@ void sub_020658B4 (MapObject * param0)
int v0, v1;
do {
v0 = sub_02062BB8(param0);
v0 = MapObject_AnimationCode(param0);
if (v0 == 0xff) {
break;
@ -406,7 +406,7 @@ int sub_020658DC (MapObject * param0)
}
MapObject_SetStatusFlagOff(param0, (1 << 5));
sub_02062BB0(param0, 0xff);
MapObject_SetAnimationCode(param0, 0xff);
sub_02062BC0(param0, 0);
return 1;