finish union_room.s code decomp

This commit is contained in:
PikalaxALT
2020-01-20 20:21:58 -05:00
parent 1fd20be8e1
commit 5e0a845fc4
8 changed files with 1428 additions and 3750 deletions
-3687
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -11,5 +11,6 @@ void sub_8098630(void);
bool8 sub_8098734(void);
void sub_80696C0(void);
bool8 walkrun_is_standing_still(void);
void sub_80696F0(void);
#endif // GUARD_EVENT_OBJECT_LOCK_H
+3 -3
View File
@@ -275,9 +275,9 @@ enum
struct PlayerAvatar /* 0x202E858 */
{
/*0x00*/ u8 flags;
/*0x01*/ u8 bike;
/*0x02*/ u8 running2;
/*0x03*/ u8 running1;
/*0x01*/ u8 unk1; // used to be bike, but it's not that in Emerald and probably isn't here either. maybe transition flags?
/*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
/*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
/*0x04*/ u8 spriteId;
/*0x05*/ u8 objectEventId;
/*0x06*/ u8 unk6;
+2
View File
@@ -323,6 +323,8 @@ void sub_80FBC00(void);
void sub_80FBD6C(u32 a0);
void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 a2);
bool32 sub_80FD338(u16 id, u8 *name);
bool8 sub_80FCC3C(struct GFtgtGname *gname, u8 *uname, u8 idx);
bool8 sub_80FCCF4(struct GFtgtGname *gname, u8 *uname, u8 idx);
#include "mevent_server.h"
extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];
+1 -1
View File
@@ -118,7 +118,7 @@ struct UnkStruct_URoom
/* 0x049 */ u8 field_49;
/* 0x04A */ u8 field_4A;
/* 0x04C */ u16 field_4C[6];
/* 0x058 */ u8 field_58[0x84 - 0x58];
/* 0x058 */ u8 field_58[4][11];
/* 0x084 */ u16 field_98;
/* 0x086 */ u16 field_9A[3];
/* 0x08C */ struct UnkStruct_8019BA8 field_A0[8];
+1 -1
View File
@@ -9,7 +9,7 @@
bool8 walkrun_is_standing_still(void)
{
if (gPlayerAvatar.running1 == 1)
if (gPlayerAvatar.tileTransitionState == 1)
return FALSE;
else
return TRUE;
+1419 -57
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -352,7 +352,7 @@ gUnknown_203ACF0: @ 203ACF0
.include "src/quest_log.o"
.align 2
gUnknown_203B04C: @ 203B04C
sUnionRoomPlayerName: @ 203B04C
.space 0xC
gUnknown_203B058: @ 203B058