From ef1f9ead0ba44c67185dccc616846646d7ce9257 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 23 Jan 2020 14:46:03 -0500 Subject: Document Trainer Tower scripts --- include/global.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index 180a1e0a3..561410a45 100644 --- a/include/global.h +++ b/include/global.h @@ -691,19 +691,18 @@ struct MEventBuffers /*0x344 0x3464*/ u32 unk_344[2][5]; }; // 0x36C 0x348C -struct TrainerTowerLog +struct TrainerTower { - u32 unk0; - u32 unk4; - u8 unk8; + u32 timer; + u32 bestTime; + u8 floorsCleared; u8 unk9; - u8 unkA_0:1; - u8 unkA_1:1; - u8 unkA_2:1; - u8 unkA_3:1; + u8 receivedPrize:1; + u8 checkedFinalTime:1; + u8 spokeToOwner:1; + u8 hasLost:1; u8 unkA_4:1; - u8 unkA_5:1; - u8 unkA_6:2; + u8 validated:1; }; struct TrainerRematchState @@ -776,8 +775,8 @@ struct SaveBlock1 /*0x3BA8*/ struct TrainerNameRecord trainerNameRecords[20]; /*0x3C98*/ struct DaycareMon route5DayCareMon; /*0x3D24*/ u8 filler3D24[0x10]; - /*0x3D34*/ u32 unkArrayIdx; - /*0x3D38*/ struct TrainerTowerLog unkArray[4]; + /*0x3D34*/ u32 towerChallengeId; + /*0x3D38*/ struct TrainerTower trainerTower[NUM_TOWER_CHALLENGE_TYPES]; }; struct MapPosition -- cgit v1.2.3 From 9ecd065b5026126389e5011c2d99fced21b62794 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 24 Jan 2020 12:39:40 -0500 Subject: Review changes --- include/global.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index 561410a45..e33159898 100644 --- a/include/global.h +++ b/include/global.h @@ -697,12 +697,12 @@ struct TrainerTower u32 bestTime; u8 floorsCleared; u8 unk9; - u8 receivedPrize:1; - u8 checkedFinalTime:1; - u8 spokeToOwner:1; - u8 hasLost:1; - u8 unkA_4:1; - u8 validated:1; + bool8 receivedPrize:1; + bool8 checkedFinalTime:1; + bool8 spokeToOwner:1; + bool8 hasLost:1; + bool8 unkA_4:1; + bool8 validated:1; }; struct TrainerRematchState -- cgit v1.2.3 From 01fedfa61c12ed9637124dd1f306e8b8f54ea116 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 1 Feb 2020 10:22:28 -0500 Subject: Minor style consistency edit in union_room_chat --- include/global.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index 2f87a0c29..2ed7476e7 100644 --- a/include/global.h +++ b/include/global.h @@ -74,8 +74,8 @@ // GameFreak never ceases to amaze. // TODO: Propagate use of this macro #define TEST_BUTTON(field, button) ({(field) & (button);}) -#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button) -#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button) +#define JOY_NEW(button) TEST_BUTTON(gMain.newKeys, button) +#define JOY_HELD(button) TEST_BUTTON(gMain.heldKeys, button) #define JOY_REPT(button) TEST_BUTTON(gMain.newAndRepeatedKeys, button) extern u8 gStringVar1[]; -- cgit v1.2.3 From ceeed6247dbeca94fdb073441b98a885da44ffe1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 2 Feb 2020 11:23:04 -0500 Subject: Port object event flags from emerald --- include/global.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index 2f87a0c29..a0027f9dc 100644 --- a/include/global.h +++ b/include/global.h @@ -591,22 +591,22 @@ union QuestLogMovement struct QuestLogObjectEvent { /*0x00*/ u8 active:1; - /*0x00*/ u8 mapobj_bit_3:1; - /*0x00*/ u8 mapobj_bit_4:1; - /*0x00*/ u8 mapobj_bit_5:1; - /*0x00*/ u8 mapobj_bit_8:1; - /*0x00*/ u8 mapobj_bit_9:1; - /*0x00*/ u8 mapobj_bit_10:1; - /*0x00*/ u8 mapobj_bit_11:1; - /*0x01*/ u8 mapobj_bit_12:1; - /*0x01*/ u8 mapobj_bit_13:1; - /*0x01*/ u8 mapobj_bit_14:1; - /*0x01*/ u8 mapobj_bit_15:1; - /*0x01*/ u8 mapobj_bit_16:1; - /*0x01*/ u8 mapobj_bit_23:1; - /*0x01*/ u8 mapobj_bit_24:1; - /*0x01*/ u8 mapobj_bit_25:1; - /*0x02*/ u8 mapobj_bit_26:1; + /*0x00*/ u8 triggerGroundEffectsOnStop:1; + /*0x00*/ u8 disableCoveringGroundEffects:1; + /*0x00*/ u8 landingJump:1; + /*0x00*/ u8 frozen:1; + /*0x00*/ u8 facingDirectionLocked:1; + /*0x00*/ u8 disableAnim:1; + /*0x00*/ u8 enableAnim:1; + /*0x01*/ u8 inanimate:1; + /*0x01*/ u8 invisible:1; + /*0x01*/ u8 offScreen:1; + /*0x01*/ u8 trackedByCamera:1; + /*0x01*/ u8 isPlayer:1; + /*0x01*/ u8 spriteAnimPausedBackup:1; + /*0x01*/ u8 spriteAffineAnimPausedBackup:1; + /*0x01*/ u8 disableJumpLandingGroundEffect:1; + /*0x02*/ u8 fixedPriority:1; /*0x02*/ u8 mapobj_unk_18:4; /*0x02*/ u8 unused_02_5:3; /*0x03*/ u8 mapobj_unk_0B_0:4; -- cgit v1.2.3 From 34deceb13695e7b13a27ecb94666fc95d2ced550 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 3 Feb 2020 12:07:02 -0500 Subject: Remove old references to battle pyramid --- include/global.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index e33159898..14028808f 100644 --- a/include/global.h +++ b/include/global.h @@ -168,13 +168,6 @@ struct BerryPickingResults // possibly used in the game itself? Size may be wron u8 field_F; }; -struct PyramidBag -{ - u16 items_Lvl50[10]; - u16 items_OpenLvl[10]; - u8 quantity[10]; -}; - struct BerryCrush { u16 berryCrushResults[4]; -- cgit v1.2.3 From 4770fac9eb9696236fa998554a353f1f140a1ed4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Feb 2020 14:16:45 -0500 Subject: More mevent documentation --- include/global.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index b12508ae5..8644fe364 100644 --- a/include/global.h +++ b/include/global.h @@ -658,8 +658,8 @@ struct FameCheckerSaveData struct MEWonderNewsData { - u16 unk_00; - u8 unk_02; + u16 newsId; + u8 shareState; u8 unk_03; u8 unk_04[40]; u8 unk_2C[10][40]; @@ -673,13 +673,13 @@ struct MEWonderNewsStruct struct MEWonderCardData { - u16 unk_00; + u16 cardId; u16 unk_02; u32 unk_04; u8 unk_08_0:2; u8 unk_08_2:4; - u8 unk_08_6:2; - u8 unk_09; + u8 shareState:2; + u8 recvMonCapacity; u8 unk_0A[40]; u8 unk_32[40]; u8 unk_5A[4][40]; @@ -695,11 +695,12 @@ struct MEWonderCardStruct struct MEventBuffer_3430_Sub { - u16 unk_00; - u16 unk_02; - u16 unk_04; + u16 linkWins; + u16 linkLosses; + u16 linkTrades; u16 unk_06; - u16 unk_08[2][7]; + u16 distributedMons[2][7]; // [0][x] = species + // [1][x] = ??? }; struct MEventBuffer_3430 -- cgit v1.2.3 From 5c530e133042af0dfb2341b0dcf18efc9a37aa95 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 18 Feb 2020 16:39:44 -0500 Subject: Finish porting pokemon_jump from Emerald --- include/global.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index 54d8fdec3..b3fdfe231 100644 --- a/include/global.h +++ b/include/global.h @@ -148,8 +148,7 @@ struct PokemonJumpResults // possibly used in the game itself? u16 field2; u16 excellentsInRow; u16 field6; - u16 field8; - u16 fieldA; + u32 field8; u32 bestJumpScore; }; -- cgit v1.2.3 From 6363d39e99612904a0393a272bbb1748ef9dca20 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 2 Mar 2020 13:34:34 -0500 Subject: port field_effect_helpers from emerald --- include/global.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index b3fdfe231..8a8877143 100644 --- a/include/global.h +++ b/include/global.h @@ -612,8 +612,8 @@ struct QuestLogObjectEvent /*0x0a*/ s16 x; /*0x0c*/ s16 y; /*0x0e*/ u8 trainerRange_berryTreeId; - /*0x0f*/ u8 mapobj_unk_1F; - /*0x10*/ u8 mapobj_unk_21; + /*0x0f*/ u8 previousMetatileBehavior; + /*0x10*/ u8 directionSequenceIndex; /*0x11*/ u8 animId; }; -- cgit v1.2.3