dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*actual* final pass at unifying on object event

Browse Source
This commit is contained in:
garak
2019-12-17 21:09:15 -05:00
parent fabe354c01
commit 8ee35bc615
377 changed files with 1967 additions and 5531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/map_objects.h
-186
View File
@@ -1,186 +0,0 @@
#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H
#define GUARD_CONSTANTS_MAP_OBJECTS_H
#define MAP_OBJ_GFX_RED_NORMAL 0
#define MAP_OBJ_GFX_RED_BIKE 1
#define MAP_OBJ_GFX_RED_RUN 2
#define MAP_OBJ_GFX_RED_ITEM 3
#define MAP_OBJ_GFX_RED_FISH 4
#define MAP_OBJ_GFX_RED_ITEM_COPY 5
#define MAP_OBJ_GFX_RED_VS_SEEKER 6
#define MAP_OBJ_GFX_GREEN_NORMAL 7
#define MAP_OBJ_GFX_GREEN_BIKE 8
#define MAP_OBJ_GFX_GREEN_RUN 9
#define MAP_OBJ_GFX_GREEN_ITEM 10
#define MAP_OBJ_GFX_GREEN_FISH 11
#define MAP_OBJ_GFX_GREEN_ITEM_COPY 12
#define MAP_OBJ_GFX_GREEN_VS_SEEKER 13
#define MAP_OBJ_GFX_RS_BRENDAN 14
#define MAP_OBJ_GFX_RS_MAY 15
#define MAP_OBJ_GFX_LITTLE_BOY 16
#define MAP_OBJ_GFX_LITTLE_GIRL 17
#define MAP_OBJ_GFX_YOUNGSTER 18
#define MAP_OBJ_GFX_BOY 19
#define MAP_OBJ_GFX_BUG_CATCHER 20
#define MAP_OBJ_GFX_SITTING_BOY 21
#define MAP_OBJ_GFX_LASS 22
#define MAP_OBJ_GFX_WOMAN_1 23
#define MAP_OBJ_GFX_BATTLE_GIRL 24
#define MAP_OBJ_GFX_MAN 25
#define MAP_OBJ_GFX_ROCKER 26
#define MAP_OBJ_GFX_FAT_MAN 27
#define MAP_OBJ_GFX_WOMAN_2 28
#define MAP_OBJ_GFX_BEAUTY 29
#define MAP_OBJ_GFX_BALDING_MAN 30
#define MAP_OBJ_GFX_WOMAN_3 31
#define MAP_OBJ_GFX_OLD_MAN_1 32
#define MAP_OBJ_GFX_OLD_MAN_2 33
#define MAP_OBJ_GFX_VIRIDIAN_DRUNK 34
#define MAP_OBJ_GFX_OLD_WOMAN 35
#define MAP_OBJ_GFX_TUBER_M_1 36
#define MAP_OBJ_GFX_TUBER_F 37
#define MAP_OBJ_GFX_TUBER_M_2 38
#define MAP_OBJ_GFX_CAMPER 39
#define MAP_OBJ_GFX_PICNICKER 40
#define MAP_OBJ_GFX_COOLTRAINER_M 41
#define MAP_OBJ_GFX_COOLTRAINER_F 42
#define MAP_OBJ_GFX_SWIMMER_M_WATER 43
#define MAP_OBJ_GFX_SWIMMER_F_WATER 44
#define MAP_OBJ_GFX_SWIMMER_M_LAND 45
#define MAP_OBJ_GFX_SWIMMER_F_LAND 46
#define MAP_OBJ_GFX_WORKER_M 47
#define MAP_OBJ_GFX_WORKER_F 48
#define MAP_OBJ_GFX_ROCKET_M 49
#define MAP_OBJ_GFX_ROCKET_F 50
#define MAP_OBJ_GFX_GBA_KID 51
#define MAP_OBJ_GFX_SUPER_NERD 52
#define MAP_OBJ_GFX_BIKER 53
#define MAP_OBJ_GFX_BLACKBELT 54
#define MAP_OBJ_GFX_SCIENTIST 55
#define MAP_OBJ_GFX_HIKER 56
#define MAP_OBJ_GFX_FISHER 57
#define MAP_OBJ_GFX_CHANNELER 58
#define MAP_OBJ_GFX_CHEF 59
#define MAP_OBJ_GFX_POLICEMAN 60
#define MAP_OBJ_GFX_GENTLEMAN 61
#define MAP_OBJ_GFX_SAILOR 62
#define MAP_OBJ_GFX_CAPTAIN 63
#define MAP_OBJ_GFX_NURSE 64
#define MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST 65
#define MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST 66
#define MAP_OBJ_GFX_UNUSED_MALE_RECEPTIONIST 67
#define MAP_OBJ_GFX_CLERK 68
#define MAP_OBJ_GFX_MG_DELIVERYMAN 69
#define MAP_OBJ_GFX_TRAINER_TOWER_DUDE 70
#define MAP_OBJ_GFX_PROF_OAK 71
#define MAP_OBJ_GFX_BLUE 72
#define MAP_OBJ_GFX_BILL 73
#define MAP_OBJ_GFX_LANCE 74
#define MAP_OBJ_GFX_AGATHA 75
#define MAP_OBJ_GFX_DAISY 76
#define MAP_OBJ_GFX_LORELEI 77
#define MAP_OBJ_GFX_MR_FUJI 78
#define MAP_OBJ_GFX_BRUNO 79
#define MAP_OBJ_GFX_BROCK 80
#define MAP_OBJ_GFX_MISTY 81
#define MAP_OBJ_GFX_LT_SURGE 82
#define MAP_OBJ_GFX_ERIKA 83
#define MAP_OBJ_GFX_KOGA 84
#define MAP_OBJ_GFX_SABRINA 85
#define MAP_OBJ_GFX_BLAINE 86
#define MAP_OBJ_GFX_GIOVANNI 87
#define MAP_OBJ_GFX_MOM 88
#define MAP_OBJ_GFX_CELIO 89
#define MAP_OBJ_GFX_TEACHY_TV_HOST 90
#define MAP_OBJ_GFX_GYM_GUY 91
#define MAP_OBJ_GFX_ITEM_BALL 92
#define MAP_OBJ_GFX_TOWN_MAP 93
#define MAP_OBJ_GFX_POKEDEX 94
#define MAP_OBJ_GFX_CUT_TREE 95
#define MAP_OBJ_GFX_ROCK_SMASH_ROCK 96
#define MAP_OBJ_GFX_STRENGTH_BOULDER 97
#define MAP_OBJ_GFX_FOSSIL 98
#define MAP_OBJ_GFX_RUBY 99
#define MAP_OBJ_GFX_SAPPHIRE 100
#define MAP_OBJ_GFX_OLD_AMBER 101
#define MAP_OBJ_GFX_GYM_SIGN 102
#define MAP_OBJ_GFX_SIGN 103
#define MAP_OBJ_GFX_TRAINER_TIPS 104
#define MAP_OBJ_GFX_CLIPBOARD 105
#define MAP_OBJ_GFX_METEORITE 106
#define MAP_OBJ_GFX_LAPRAS_DOLL 107
#define MAP_OBJ_GFX_SEAGALLOP 108
#define MAP_OBJ_GFX_SNORLAX 109
#define MAP_OBJ_GFX_SPEAROW 110
#define MAP_OBJ_GFX_CUBONE 111
#define MAP_OBJ_GFX_POLIWRATH 112
#define MAP_OBJ_GFX_CLEFAIRY 113
#define MAP_OBJ_GFX_PIDGEOT 114
#define MAP_OBJ_GFX_JIGGLYPUFF 115
#define MAP_OBJ_GFX_PIDGEY 116
#define MAP_OBJ_GFX_CHANSEY 117
#define MAP_OBJ_GFX_OMANYTE 118
#define MAP_OBJ_GFX_KANGASKHAN 119
#define MAP_OBJ_GFX_PIKACHU 120
#define MAP_OBJ_GFX_PSYDUCK 121
#define MAP_OBJ_GFX_NIDORAN_F 122
#define MAP_OBJ_GFX_NIDORAN_M 123
#define MAP_OBJ_GFX_NIDORINO 124
#define MAP_OBJ_GFX_MEOWTH 125
#define MAP_OBJ_GFX_SEEL 126
#define MAP_OBJ_GFX_VOLTORB 127
#define MAP_OBJ_GFX_SLOWPOKE 128
#define MAP_OBJ_GFX_SLOWBRO 129
#define MAP_OBJ_GFX_MACHOP 130
#define MAP_OBJ_GFX_WIGGLYTUFF 131
#define MAP_OBJ_GFX_DODUO 132
#define MAP_OBJ_GFX_FEAROW 133
#define MAP_OBJ_GFX_MACHOKE 134
#define MAP_OBJ_GFX_LAPRAS 135
#define MAP_OBJ_GFX_ZAPDOS 136
#define MAP_OBJ_GFX_MOLTRES 137
#define MAP_OBJ_GFX_ARTICUNO 138
#define MAP_OBJ_GFX_MEWTWO 139
#define MAP_OBJ_GFX_MEW 140
#define MAP_OBJ_GFX_ENTEI 141
#define MAP_OBJ_GFX_SUICUNE 142
#define MAP_OBJ_GFX_RAIKOU 143
#define MAP_OBJ_GFX_LUGIA 144
#define MAP_OBJ_GFX_HO_OH 145
#define MAP_OBJ_GFX_CELEBI 146
#define MAP_OBJ_GFX_KABUTO 147
#define MAP_OBJ_GFX_DEOXYS_D 148
#define MAP_OBJ_GFX_DEOXYS_A 149
#define MAP_OBJ_GFX_DEOXYS_N 150
#define MAP_OBJ_GFX_SS_ANNE 151
#define MAP_OBJ_GFX_VAR_0 240
#define MAP_OBJ_GFX_VAR_1 241
#define MAP_OBJ_GFX_VAR_2 242
#define MAP_OBJ_GFX_VAR_3 243
#define MAP_OBJ_GFX_VAR_4 244
#define MAP_OBJ_GFX_VAR_5 245
#define MAP_OBJ_GFX_VAR_6 246
#define MAP_OBJ_GFX_VAR_7 247
#define MAP_OBJ_GFX_VAR_8 248
#define MAP_OBJ_GFX_VAR_9 249
#define MAP_OBJ_GFX_VAR_A 250
#define MAP_OBJ_GFX_VAR_B 251
#define MAP_OBJ_GFX_VAR_C 252
#define MAP_OBJ_GFX_VAR_D 253
#define MAP_OBJ_GFX_VAR_E 254
#define MAP_OBJ_GFX_VAR_F 255
#define SHADOW_SIZE_S 0
#define SHADOW_SIZE_M 1
#define SHADOW_SIZE_L 2
#define SHADOW_SIZE_XL 3
#define F_INANIMATE (1 << 6)
#define F_DISABLE_REFLECTION_PALETTE_LOAD (1 << 7)
#define TRACKS_NONE 0
#define TRACKS_FOOT 1
#define TRACKS_BIKE_TIRE 2
#endif // GUARD_CONSTANTS_MAP_OBJECTS_H
include/constants/object_events.h
+186
View File
@@ -0,0 +1,186 @@
#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H
#define GUARD_CONSTANTS_MAP_OBJECTS_H
#define OBJECT_EVENT_GFX_RED_NORMAL 0
#define OBJECT_EVENT_GFX_RED_BIKE 1
#define OBJECT_EVENT_GFX_RED_RUN 2
#define OBJECT_EVENT_GFX_RED_ITEM 3
#define OBJECT_EVENT_GFX_RED_FISH 4
#define OBJECT_EVENT_GFX_RED_ITEM_COPY 5
#define OBJECT_EVENT_GFX_RED_VS_SEEKER 6
#define OBJECT_EVENT_GFX_GREEN_NORMAL 7
#define OBJECT_EVENT_GFX_GREEN_BIKE 8
#define OBJECT_EVENT_GFX_GREEN_RUN 9
#define OBJECT_EVENT_GFX_GREEN_ITEM 10
#define OBJECT_EVENT_GFX_GREEN_FISH 11
#define OBJECT_EVENT_GFX_GREEN_ITEM_COPY 12
#define OBJECT_EVENT_GFX_GREEN_VS_SEEKER 13
#define OBJECT_EVENT_GFX_RS_BRENDAN 14
#define OBJECT_EVENT_GFX_RS_MAY 15
#define OBJECT_EVENT_GFX_LITTLE_BOY 16
#define OBJECT_EVENT_GFX_LITTLE_GIRL 17
#define OBJECT_EVENT_GFX_YOUNGSTER 18
#define OBJECT_EVENT_GFX_BOY 19
#define OBJECT_EVENT_GFX_BUG_CATCHER 20
#define OBJECT_EVENT_GFX_SITTING_BOY 21
#define OBJECT_EVENT_GFX_LASS 22
#define OBJECT_EVENT_GFX_WOMAN_1 23
#define OBJECT_EVENT_GFX_BATTLE_GIRL 24
#define OBJECT_EVENT_GFX_MAN 25
#define OBJECT_EVENT_GFX_ROCKER 26
#define OBJECT_EVENT_GFX_FAT_MAN 27
#define OBJECT_EVENT_GFX_WOMAN_2 28
#define OBJECT_EVENT_GFX_BEAUTY 29
#define OBJECT_EVENT_GFX_BALDING_MAN 30
#define OBJECT_EVENT_GFX_WOMAN_3 31
#define OBJECT_EVENT_GFX_OLD_MAN_1 32
#define OBJECT_EVENT_GFX_OLD_MAN_2 33
#define OBJECT_EVENT_GFX_VIRIDIAN_DRUNK 34
#define OBJECT_EVENT_GFX_OLD_WOMAN 35
#define OBJECT_EVENT_GFX_TUBER_M_1 36
#define OBJECT_EVENT_GFX_TUBER_F 37
#define OBJECT_EVENT_GFX_TUBER_M_2 38
#define OBJECT_EVENT_GFX_CAMPER 39
#define OBJECT_EVENT_GFX_PICNICKER 40
#define OBJECT_EVENT_GFX_COOLTRAINER_M 41
#define OBJECT_EVENT_GFX_COOLTRAINER_F 42
#define OBJECT_EVENT_GFX_SWIMMER_M_WATER 43
#define OBJECT_EVENT_GFX_SWIMMER_F_WATER 44
#define OBJECT_EVENT_GFX_SWIMMER_M_LAND 45
#define OBJECT_EVENT_GFX_SWIMMER_F_LAND 46
#define OBJECT_EVENT_GFX_WORKER_M 47
#define OBJECT_EVENT_GFX_WORKER_F 48
#define OBJECT_EVENT_GFX_ROCKET_M 49
#define OBJECT_EVENT_GFX_ROCKET_F 50
#define OBJECT_EVENT_GFX_GBA_KID 51
#define OBJECT_EVENT_GFX_SUPER_NERD 52
#define OBJECT_EVENT_GFX_BIKER 53
#define OBJECT_EVENT_GFX_BLACKBELT 54
#define OBJECT_EVENT_GFX_SCIENTIST 55
#define OBJECT_EVENT_GFX_HIKER 56
#define OBJECT_EVENT_GFX_FISHER 57
#define OBJECT_EVENT_GFX_CHANNELER 58
#define OBJECT_EVENT_GFX_CHEF 59
#define OBJECT_EVENT_GFX_POLICEMAN 60
#define OBJECT_EVENT_GFX_GENTLEMAN 61
#define OBJECT_EVENT_GFX_SAILOR 62
#define OBJECT_EVENT_GFX_CAPTAIN 63
#define OBJECT_EVENT_GFX_NURSE 64
#define OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST 65
#define OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST 66
#define OBJECT_EVENT_GFX_UNUSED_MALE_RECEPTIONIST 67
#define OBJECT_EVENT_GFX_CLERK 68
#define OBJECT_EVENT_GFX_MG_DELIVERYMAN 69
#define OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE 70
#define OBJECT_EVENT_GFX_PROF_OAK 71
#define OBJECT_EVENT_GFX_BLUE 72
#define OBJECT_EVENT_GFX_BILL 73
#define OBJECT_EVENT_GFX_LANCE 74
#define OBJECT_EVENT_GFX_AGATHA 75
#define OBJECT_EVENT_GFX_DAISY 76
#define OBJECT_EVENT_GFX_LORELEI 77
#define OBJECT_EVENT_GFX_MR_FUJI 78
#define OBJECT_EVENT_GFX_BRUNO 79
#define OBJECT_EVENT_GFX_BROCK 80
#define OBJECT_EVENT_GFX_MISTY 81
#define OBJECT_EVENT_GFX_LT_SURGE 82
#define OBJECT_EVENT_GFX_ERIKA 83
#define OBJECT_EVENT_GFX_KOGA 84
#define OBJECT_EVENT_GFX_SABRINA 85
#define OBJECT_EVENT_GFX_BLAINE 86
#define OBJECT_EVENT_GFX_GIOVANNI 87
#define OBJECT_EVENT_GFX_MOM 88
#define OBJECT_EVENT_GFX_CELIO 89
#define OBJECT_EVENT_GFX_TEACHY_TV_HOST 90
#define OBJECT_EVENT_GFX_GYM_GUY 91
#define OBJECT_EVENT_GFX_ITEM_BALL 92
#define OBJECT_EVENT_GFX_TOWN_MAP 93
#define OBJECT_EVENT_GFX_POKEDEX 94
#define OBJECT_EVENT_GFX_CUT_TREE 95
#define OBJECT_EVENT_GFX_ROCK_SMASH_ROCK 96
#define OBJECT_EVENT_GFX_STRENGTH_BOULDER 97
#define OBJECT_EVENT_GFX_FOSSIL 98
#define OBJECT_EVENT_GFX_RUBY 99
#define OBJECT_EVENT_GFX_SAPPHIRE 100
#define OBJECT_EVENT_GFX_OLD_AMBER 101
#define OBJECT_EVENT_GFX_GYM_SIGN 102
#define OBJECT_EVENT_GFX_SIGN 103
#define OBJECT_EVENT_GFX_TRAINER_TIPS 104
#define OBJECT_EVENT_GFX_CLIPBOARD 105
#define OBJECT_EVENT_GFX_METEORITE 106
#define OBJECT_EVENT_GFX_LAPRAS_DOLL 107
#define OBJECT_EVENT_GFX_SEAGALLOP 108
#define OBJECT_EVENT_GFX_SNORLAX 109
#define OBJECT_EVENT_GFX_SPEAROW 110
#define OBJECT_EVENT_GFX_CUBONE 111
#define OBJECT_EVENT_GFX_POLIWRATH 112
#define OBJECT_EVENT_GFX_CLEFAIRY 113
#define OBJECT_EVENT_GFX_PIDGEOT 114
#define OBJECT_EVENT_GFX_JIGGLYPUFF 115
#define OBJECT_EVENT_GFX_PIDGEY 116
#define OBJECT_EVENT_GFX_CHANSEY 117
#define OBJECT_EVENT_GFX_OMANYTE 118
#define OBJECT_EVENT_GFX_KANGASKHAN 119
#define OBJECT_EVENT_GFX_PIKACHU 120
#define OBJECT_EVENT_GFX_PSYDUCK 121
#define OBJECT_EVENT_GFX_NIDORAN_F 122
#define OBJECT_EVENT_GFX_NIDORAN_M 123
#define OBJECT_EVENT_GFX_NIDORINO 124
#define OBJECT_EVENT_GFX_MEOWTH 125
#define OBJECT_EVENT_GFX_SEEL 126
#define OBJECT_EVENT_GFX_VOLTORB 127
#define OBJECT_EVENT_GFX_SLOWPOKE 128
#define OBJECT_EVENT_GFX_SLOWBRO 129
#define OBJECT_EVENT_GFX_MACHOP 130
#define OBJECT_EVENT_GFX_WIGGLYTUFF 131
#define OBJECT_EVENT_GFX_DODUO 132
#define OBJECT_EVENT_GFX_FEAROW 133
#define OBJECT_EVENT_GFX_MACHOKE 134
#define OBJECT_EVENT_GFX_LAPRAS 135
#define OBJECT_EVENT_GFX_ZAPDOS 136
#define OBJECT_EVENT_GFX_MOLTRES 137
#define OBJECT_EVENT_GFX_ARTICUNO 138
#define OBJECT_EVENT_GFX_MEWTWO 139
#define OBJECT_EVENT_GFX_MEW 140
#define OBJECT_EVENT_GFX_ENTEI 141
#define OBJECT_EVENT_GFX_SUICUNE 142
#define OBJECT_EVENT_GFX_RAIKOU 143
#define OBJECT_EVENT_GFX_LUGIA 144
#define OBJECT_EVENT_GFX_HO_OH 145
#define OBJECT_EVENT_GFX_CELEBI 146
#define OBJECT_EVENT_GFX_KABUTO 147
#define OBJECT_EVENT_GFX_DEOXYS_D 148
#define OBJECT_EVENT_GFX_DEOXYS_A 149
#define OBJECT_EVENT_GFX_DEOXYS_N 150
#define OBJECT_EVENT_GFX_SS_ANNE 151
#define OBJECT_EVENT_GFX_VAR_0 240
#define OBJECT_EVENT_GFX_VAR_1 241
#define OBJECT_EVENT_GFX_VAR_2 242
#define OBJECT_EVENT_GFX_VAR_3 243
#define OBJECT_EVENT_GFX_VAR_4 244
#define OBJECT_EVENT_GFX_VAR_5 245
#define OBJECT_EVENT_GFX_VAR_6 246
#define OBJECT_EVENT_GFX_VAR_7 247
#define OBJECT_EVENT_GFX_VAR_8 248
#define OBJECT_EVENT_GFX_VAR_9 249
#define OBJECT_EVENT_GFX_VAR_A 250
#define OBJECT_EVENT_GFX_VAR_B 251
#define OBJECT_EVENT_GFX_VAR_C 252
#define OBJECT_EVENT_GFX_VAR_D 253
#define OBJECT_EVENT_GFX_VAR_E 254
#define OBJECT_EVENT_GFX_VAR_F 255
#define SHADOW_SIZE_S 0
#define SHADOW_SIZE_M 1
#define SHADOW_SIZE_L 2
#define SHADOW_SIZE_XL 3
#define F_INANIMATE (1 << 6)
#define F_DISABLE_REFLECTION_PALETTE_LOAD (1 << 7)
#define TRACKS_NONE 0
#define TRACKS_FOOT 1
#define TRACKS_BIKE_TIRE 2
#endif // GUARD_CONSTANTS_MAP_OBJECTS_H
include/event_object_80688E4.h
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GUARD_MAP_OBJ_80688E4_H
#define GUARD_MAP_OBJ_80688E4_H
#ifndef GUARD_EVENT_OBJECT_80688E4_H
#define GUARD_EVENT_OBJECT_80688E4_H
#include "global.h"
@@ -7,4 +7,4 @@ void FreezeObjectEvents(void);
void FreezeObjectEvent(struct ObjectEvent *);
void FreezeObjectEventsExceptOne(u8 objEventId);
#endif //GUARD_MAP_OBJ_80688E4_H
#endif // GUARD_EVENT_OBJECT_80688E4_H
include/event_object_8097404.h
+3 -3
View File
@@ -2,8 +2,8 @@
// Created by scott on 9/7/2017.
//
#ifndef GUARD_MAP_OBJ_8097404_H
#define GUARD_MAP_OBJ_8097404_H
#ifndef GUARD_EVENT_OBJECT_8097404_H
#define GUARD_EVENT_OBJECT_8097404_H
#include "global.h"
@@ -31,4 +31,4 @@ bool8 sub_8097758(struct Sprite *);
void sub_8097FA4(struct ObjectEvent *);
void sub_8098044(u8);
#endif //GUARD_MAP_OBJ_8097404_H
#endif // GUARD_EVENT_OBJECT_8097404_H
include/event_object_lock.h
+3 -3
View File
@@ -1,5 +1,5 @@
#ifndef GUARD_MAP_OBJ_LOCK_H
#define GUARD_MAP_OBJ_LOCK_H
#ifndef GUARD_EVENT_OBJECT_LOCK_H
#define GUARD_EVENT_OBJECT_LOCK_H
#include "global.h"
@@ -12,4 +12,4 @@ bool8 sub_8098734(void);
void sub_80696C0(void);
bool8 walkrun_is_standing_still(void);
#endif // GUARD_MAP_OBJ_LOCK_H
#endif // GUARD_EVENT_OBJECT_LOCK_H
include/global.h
+2 -3
View File
@@ -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];
include/overworld.h
+1 -1
View File
@@ -32,7 +32,7 @@ struct CreditsOverworldCmd
extern struct UCoords32 gDirectionToVectors[];
extern struct LinkPlayerObjectEvent gLinkPlayerMapObjects[4];
extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4];
extern MainCallback gFieldCallback;
extern struct WarpData gUnknown_2031DB4;