From 36b2301fd262adc70fc89ecdd3a7a97549b5a6c9 Mon Sep 17 00:00:00 2001 From: garak Date: Mon, 2 Dec 2019 13:34:11 -0500 Subject: mostly standardize to object event to prep for disassembly --- include/global.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index 9df153270..ea94512f7 100644 --- a/include/global.h +++ b/include/global.h @@ -564,7 +564,7 @@ union QuestLogMovement } ident_struct; }; -struct QuestLogMapObject +struct QuestLogObjectEvent { /*0x00*/ u8 active:1; /*0x00*/ u8 mapobj_bit_3:1; @@ -609,7 +609,7 @@ struct QuestLog /*0x0003*/ s8 unk_003; /*0x0004*/ s16 unk_004; /*0x0006*/ s16 unk_006; - /*0x0008*/ struct QuestLogMapObject unk_008[MAP_OBJECTS_COUNT]; + /*0x0008*/ struct QuestLogObjectEvent unk_008[MAP_OBJECTS_COUNT]; // These arrays hold the game state for // playing back the quest log @@ -727,7 +727,7 @@ struct SaveBlock1 /*0x002E*/ u8 weather; /*0x002F*/ u8 filler_2F; /*0x0030*/ u8 flashLevel; - /*0x0032*/ u16 mapDataId; + /*0x0032*/ u16 mapLayoutId; /*0x0034*/ u8 playerPartyCount; /*0x0038*/ struct Pokemon playerParty[PARTY_SIZE]; /*0x0290*/ u32 money; @@ -744,8 +744,8 @@ struct SaveBlock1 /*0x0632*/ u8 field_632[6]; // unused? /*0x0638*/ u16 trainerRematchStepCounter; /*0x063A*/ u8 ALIGNED(2) trainerRematches[100]; - /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT]; - /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64]; + /*0x06A0*/ struct ObjectEvent objectEvents[MAP_OBJECTS_COUNT]; + /*0x08E0*/ struct ObjectEventTemplate mapObjectTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; /*0x1000*/ u16 vars[VARS_COUNT]; /*0x1200*/ u32 gameStats[NUM_GAME_STATS]; -- cgit v1.2.3 From 7a0edab5732b816536a35b0556d8fa1db13afa30 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 12 Dec 2019 16:10:45 -0500 Subject: fix rebase conflicts --- include/global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index ea94512f7..abc41a9de 100644 --- a/include/global.h +++ b/include/global.h @@ -745,7 +745,7 @@ struct SaveBlock1 /*0x0638*/ u16 trainerRematchStepCounter; /*0x063A*/ u8 ALIGNED(2) trainerRematches[100]; /*0x06A0*/ struct ObjectEvent objectEvents[MAP_OBJECTS_COUNT]; - /*0x08E0*/ struct ObjectEventTemplate mapObjectTemplates[64]; + /*0x08E0*/ struct ObjectEventTemplate objectEventTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; /*0x1000*/ u16 vars[VARS_COUNT]; /*0x1200*/ u32 gameStats[NUM_GAME_STATS]; -- cgit v1.2.3 From 8ee35bc615de6a00a3938f8d9eef88c7e900a203 Mon Sep 17 00:00:00 2001 From: garak Date: Tue, 17 Dec 2019 21:09:15 -0500 Subject: *actual* final pass at unifying on object event --- include/global.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include/global.h') diff --git a/include/global.h b/include/global.h index abc41a9de..f4d21704b 100644 --- a/include/global.h +++ b/include/global.h @@ -544,7 +544,6 @@ typedef union QuestLogScene QuestLogScene; // This name is a complete guess and may change. -#define MAP_OBJECTS_COUNT 16 #define BERRY_TREES_COUNT 128 #define FLAGS_COUNT 288 // 300 #define VARS_COUNT 256 @@ -609,7 +608,7 @@ struct QuestLog /*0x0003*/ s8 unk_003; /*0x0004*/ s16 unk_004; /*0x0006*/ s16 unk_006; - /*0x0008*/ struct QuestLogObjectEvent unk_008[MAP_OBJECTS_COUNT]; + /*0x0008*/ struct QuestLogObjectEvent unk_008[OBJECT_EVENTS_COUNT]; // These arrays hold the game state for // playing back the quest log @@ -744,7 +743,7 @@ struct SaveBlock1 /*0x0632*/ u8 field_632[6]; // unused? /*0x0638*/ u16 trainerRematchStepCounter; /*0x063A*/ u8 ALIGNED(2) trainerRematches[100]; - /*0x06A0*/ struct ObjectEvent objectEvents[MAP_OBJECTS_COUNT]; + /*0x06A0*/ struct ObjectEvent objectEvents[OBJECT_EVENTS_COUNT]; /*0x08E0*/ struct ObjectEventTemplate objectEventTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; /*0x1000*/ u16 vars[VARS_COUNT]; -- cgit v1.2.3