Skip to content

Commit e56d734

Browse files
scbroedescbroede
authored
document some object events (#791)
1 parent 0ee44ad commit e56d734

File tree

48 files changed

+384
-382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+384
-382
lines changed

‎generated/object_events.txt‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJ_EVENT_GFX_UNK_000
1+
OBJ_EVENT_GFX_PLAYER_M
22
OBJ_EVENT_GFX_NINJA_BOY
33
OBJ_EVENT_GFX_TWIN
44
OBJ_EVENT_GFX_SCHOOL_KID_M
@@ -19,14 +19,14 @@ OBJ_EVENT_GFX_EXPERT_M
1919
OBJ_EVENT_GFX_EXPERT_F
2020
OBJ_EVENT_GFX_COLLECTOR
2121
OBJ_EVENT_GFX_HIKER
22-
OBJ_EVENT_GFX_UNK_021
22+
OBJ_EVENT_GFX_PLAYER_M_BIKE
2323
OBJ_EVENT_GFX_REPORTER
2424
OBJ_EVENT_GFX_CAMERAMAN
2525
OBJ_EVENT_GFX_CASHIER_M
2626
OBJ_EVENT_GFX_CASHIER_F
2727
OBJ_EVENT_GFX_POKECENTER_NURSE
2828
OBJ_EVENT_GFX_TEALA
29-
OBJ_EVENT_GFX_UNK_028
29+
OBJ_EVENT_GFX_UNUSED_RECEPTIONIST
3030
OBJ_EVENT_GFX_SCIENTIST_M
3131
OBJ_EVENT_GFX_SCIENTIST_F
3232
OBJ_EVENT_GFX_ROUGHNECK
@@ -55,51 +55,51 @@ OBJ_EVENT_GFX_PICNICKER
5555
OBJ_EVENT_GFX_FISHERMAN
5656
OBJ_EVENT_GFX_PARASOL_LADY
5757
OBJ_EVENT_GFX_SAILOR
58-
OBJ_EVENT_GFX_UNK_057
59-
OBJ_EVENT_GFX_UNK_058
58+
OBJ_EVENT_GFX_DUMMY_057
59+
OBJ_EVENT_GFX_DUMMY_058
6060
OBJ_EVENT_GFX_WAITER
6161
OBJ_EVENT_GFX_WAITRESS
62-
OBJ_EVENT_GFX_UNK_061
62+
OBJ_EVENT_GFX_DUMMY_061
6363
OBJ_EVENT_GFX_RICH_BOY
6464
OBJ_EVENT_GFX_LADY
65-
OBJ_EVENT_GFX_UNK_064
66-
OBJ_EVENT_GFX_UNK_065
67-
OBJ_EVENT_GFX_UNK_066
68-
OBJ_EVENT_GFX_UNK_067
65+
OBJ_EVENT_GFX_SNOWPOINT_NPC_M
66+
OBJ_EVENT_GFX_SNOWPOINT_NPC_F
67+
OBJ_EVENT_GFX_DUMMY_066
68+
OBJ_EVENT_GFX_DUMMY_067
6969
OBJ_EVENT_GFX_ACE_TRAINER_SNOW_M
7070
OBJ_EVENT_GFX_ACE_TRAINER_SNOW_F
7171
OBJ_EVENT_GFX_PSYCHIC
7272
OBJ_EVENT_GFX_PIKACHU
7373
OBJ_EVENT_GFX_CLEFAIRY
7474
OBJ_EVENT_GFX_JIGGLYPUFF
7575
OBJ_EVENT_GFX_PSYDUCK
76-
OBJ_EVENT_GFX_UNK_075
77-
OBJ_EVENT_GFX_UNK_076
78-
OBJ_EVENT_GFX_UNK_077
76+
OBJ_EVENT_GFX_DUMMY_075
77+
OBJ_EVENT_GFX_DUMMY_076
78+
OBJ_EVENT_GFX_DUMMY_077
7979
OBJ_EVENT_GFX_TORCHIC
8080
OBJ_EVENT_GFX_SKITTY
81-
OBJ_EVENT_GFX_UNK_080
81+
OBJ_EVENT_GFX_DUMMY_080
8282
OBJ_EVENT_GFX_BABY_IN_PRAM
8383
OBJ_EVENT_GFX_MIDDLE_AGED_MAN
8484
OBJ_EVENT_GFX_MIDDLE_AGED_WOMAN
8585
OBJ_EVENT_GFX_STRENGTH_BOULDER
8686
OBJ_EVENT_GFX_ROCK_SMASH
8787
OBJ_EVENT_GFX_CUT_TREE
8888
OBJ_EVENT_GFX_POKEBALL
89-
OBJ_EVENT_GFX_UNK_088
90-
OBJ_EVENT_GFX_UNK_089
91-
OBJ_EVENT_GFX_UNK_090
89+
OBJ_EVENT_GFX_UNUSED_WOMAN_1
90+
OBJ_EVENT_GFX_UNUSED_WOMAN_2
91+
OBJ_EVENT_GFX_UNUSED_WOMAN_3
9292
OBJ_EVENT_GFX_MAP_SIGNPOST
9393
OBJ_EVENT_GFX_MAILBOX
9494
OBJ_EVENT_GFX_SIGNBOARD
9595
OBJ_EVENT_GFX_ARROW_SIGNPOST
9696
OBJ_EVENT_GFX_GYM_SIGNPOST
9797
OBJ_EVENT_GFX_TRAINER_TIPS_SIGNPOST
98-
OBJ_EVENT_GFX_UNK_097
99-
OBJ_EVENT_GFX_UNK_098
98+
OBJ_EVENT_GFX_PLAYER_F
99+
OBJ_EVENT_GFX_PLAYER_F_BIKE
100100
OBJ_EVENT_GFX_PROF_ROWAN
101101
OBJ_EVENT_GFX_UNK_100
102-
OBJ_EVENT_GFX_UNK_101
102+
OBJ_EVENT_GFX_COUNTERPART
103103
OBJ_EVENT_GFX_UNK_102
104104
OBJ_EVENT_GFX_UNK_103
105105
OBJ_EVENT_GFX_UNK_104
@@ -130,25 +130,25 @@ OBJ_EVENT_GFX_CRASHER_WAKE
130130
OBJ_EVENT_GFX_MAYLENE
131131
OBJ_EVENT_GFX_FANTINA
132132
OBJ_EVENT_GFX_CANDICE
133-
OBJ_EVENT_GFX_BRYON
133+
OBJ_EVENT_GFX_BYRON
134134
OBJ_EVENT_GFX_VOLKNER
135135
OBJ_EVENT_GFX_AARON
136136
OBJ_EVENT_GFX_BERTHA
137137
OBJ_EVENT_GFX_FLINT
138138
OBJ_EVENT_GFX_LUCIAN
139139
OBJ_EVENT_GFX_CYNTHIA
140-
OBJ_EVENT_GFX_UNK_139
140+
OBJ_EVENT_GFX_UNUSED_MAN
141141
OBJ_EVENT_GFX_MOM
142142
OBJ_EVENT_GFX_CHERYL
143143
OBJ_EVENT_GFX_RILEY
144144
OBJ_EVENT_GFX_MARLEY
145145
OBJ_EVENT_GFX_BUCK
146146
OBJ_EVENT_GFX_MIRA
147-
OBJ_EVENT_GFX_UNK_146
148-
OBJ_EVENT_GFX_UNK_147
147+
OBJ_EVENT_GFX_DUMMY_146
148+
OBJ_EVENT_GFX_DUMMY_147
149149
OBJ_EVENT_GFX_BARRY
150-
OBJ_EVENT_GFX_UNK_149
151-
OBJ_EVENT_GFX_UNK_150
150+
OBJ_EVENT_GFX_UNUSED_BIG_MAN_1
151+
OBJ_EVENT_GFX_UNUSED_BIG_MAN_2
152152
OBJ_EVENT_GFX_UXIE
153153
OBJ_EVENT_GFX_MESPRIT
154154
OBJ_EVENT_GFX_AZELF
@@ -160,44 +160,44 @@ OBJ_EVENT_GFX_SHAYMIN
160160
OBJ_EVENT_GFX_CRESSELIA
161161
OBJ_EVENT_GFX_GIRATINA_ALTERED
162162
OBJ_EVENT_GFX_HEATRAN
163-
OBJ_EVENT_GFX_UNK_162
163+
OBJ_EVENT_GFX_DUMMY_162
164164
OBJ_EVENT_GFX_RECEPTIONIST
165165
OBJ_EVENT_GFX_OLD_MAN
166166
OBJ_EVENT_GFX_OLD_WOMAN
167167
OBJ_EVENT_GFX_PROF_OAK
168168
OBJ_EVENT_GFX_JASMINE
169169
OBJ_EVENT_GFX_GYM_GUIDE
170170
OBJ_EVENT_GFX_PALMER
171-
OBJ_EVENT_GFX_UNK_170
172-
OBJ_EVENT_GFX_UNK_171
173-
OBJ_EVENT_GFX_UNK_172
171+
OBJ_EVENT_GFX_UNUSED_BIG_MAN_3
172+
OBJ_EVENT_GFX_UNUSED_BIG_MAN_4
173+
OBJ_EVENT_GFX_UNUSED_BIG_MAN_5
174174
OBJ_EVENT_GFX_STARLY
175175
OBJ_EVENT_GFX_BRIEFCASE
176176
OBJ_EVENT_GFX_MAID
177-
OBJ_EVENT_GFX_UNK_176
178-
OBJ_EVENT_GFX_UNK_177
179-
OBJ_EVENT_GFX_UNK_178
180-
OBJ_EVENT_GFX_UNK_179
181-
OBJ_EVENT_GFX_UNK_180
182-
OBJ_EVENT_GFX_UNK_181
177+
OBJ_EVENT_GFX_PLAYER_M_HOLDING_POKE_BALL
178+
OBJ_EVENT_GFX_PLAYER_F_HOLDING_POKE_BALL
179+
OBJ_EVENT_GFX_PLAYER_M_SURF
180+
OBJ_EVENT_GFX_PLAYER_F_SURF
181+
OBJ_EVENT_GFX_PLAYER_M_SPRAYDUCK
182+
OBJ_EVENT_GFX_PLAYER_F_SPRAYDUCK
183183
OBJ_EVENT_GFX_VENT
184184
OBJ_EVENT_GFX_BOOK
185185
OBJ_EVENT_GFX_REGIGIGAS
186186
OBJ_EVENT_GFX_DRIFLOON
187-
OBJ_EVENT_GFX_UNK_186
188-
OBJ_EVENT_GFX_UNK_187
189-
OBJ_EVENT_GFX_UNK_188
190-
OBJ_EVENT_GFX_UNK_189
187+
OBJ_EVENT_GFX_PLAYER_M_CONTEST
188+
OBJ_EVENT_GFX_PLAYER_F_CONTEST
189+
OBJ_EVENT_GFX_PLAYER_M_FISHING
190+
OBJ_EVENT_GFX_PLAYER_F_FISHING
191191
OBJ_EVENT_GFX_MOSS_ROCK
192192
OBJ_EVENT_GFX_ICE_ROCK
193193
OBJ_EVENT_GFX_BOLLARD
194194
OBJ_EVENT_GFX_MYSTERY_GIFT_DELIVERYMAN
195195
OBJ_EVENT_GFX_KID_WITH_NDS
196196
OBJ_EVENT_GFX_MAGIKARP
197-
OBJ_EVENT_GFX_UNK_196
198-
OBJ_EVENT_GFX_UNK_197
199-
OBJ_EVENT_GFX_UNK_198
200-
OBJ_EVENT_GFX_UNK_199
197+
OBJ_EVENT_GFX_PLAYER_M_POKETCH
198+
OBJ_EVENT_GFX_PLAYER_F_POKETCH
199+
OBJ_EVENT_GFX_PLAYER_M_SAVE
200+
OBJ_EVENT_GFX_PLAYER_F_SAVE
201201
OBJ_EVENT_GFX_UNK_200
202202
OBJ_EVENT_GFX_UNK_201
203203
OBJ_EVENT_GFX_GALACTIC_HQ_DOOR
@@ -232,30 +232,30 @@ OBJ_EVENT_GFX_GIRATINA_ORIGIN
232232
OBJ_EVENT_GFX_FRONTIER_SINGLE_ATTENDANT
233233
OBJ_EVENT_GFX_FRONTIER_MULTI_ATTENDANT
234234
OBJ_EVENT_GFX_FRONTIER_BOOTH_ATTENDANT
235-
OBJ_EVENT_GFX_UNK_234
236-
OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT
237-
OBJ_EVENT_GFX_UNK_236
235+
OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT_M
236+
OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT_F
237+
OBJ_EVENT_GFX_PIKACHU_UNUSED
238238
OBJ_EVENT_GFX_ROTOM_HEAT
239239
OBJ_EVENT_GFX_ROTOM_FAN
240240
OBJ_EVENT_GFX_ROTOM_FROST
241241
OBJ_EVENT_GFX_ROTOM_WASH
242242
OBJ_EVENT_GFX_ROTOM_MOW
243243
OBJ_EVENT_GFX_GAME_DIRECTOR
244-
OBJ_EVENT_GFX_UNK_243
245-
OBJ_EVENT_GFX_UNK_244
246-
OBJ_EVENT_GFX_UNK_245
247-
OBJ_EVENT_GFX_UNK_246
248-
OBJ_EVENT_GFX_UNK_247
244+
OBJ_EVENT_GFX_OVEN_UNUSED
245+
OBJ_EVENT_GFX_FAN_UNUSED
246+
OBJ_EVENT_GFX_FRIDGE_UNUSED
247+
OBJ_EVENT_GFX_WASHING_MACHINE_UNUSED
248+
OBJ_EVENT_GFX_LAWNMOWER_UNUSED
249249
OBJ_EVENT_GFX_GRUNTS_GROUP_OF_4
250250
OBJ_EVENT_GFX_GRUNTS_GROUP_OF_3
251251
OBJ_EVENT_GFX_CAVE_PAINTING_SHARDS_LEFT
252252
OBJ_EVENT_GFX_CAVE_PAINTING_SHARDS_RIGHT
253-
OBJ_EVENT_GFX_UNK_252
254-
OBJ_EVENT_GFX_UNK_253
253+
OBJ_EVENT_GFX_DP_PLAYER_M
254+
OBJ_EVENT_GFX_DP_PLAYER_F
255255
OBJ_EVENT_GFX_UNK_254
256256
OBJ_EVENT_GFX_UNK_255
257-
OBJ_EVENT_GFX_UNK_256
258-
OBJ_EVENT_GFX_UNK_257
257+
OBJ_EVENT_GFX_PLAYER_M_VS_SEEKER
258+
OBJ_EVENT_GFX_PLAYER_F_VS_SEEKER
259259
OBJ_EVENT_GFX_UNK_258
260260
OBJ_EVENT_GFX_UNK_259
261261
OBJ_EVENT_GFX_UNK_260

‎res/field/events/events_amity_square.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
"y": 0
7878
},
7979
{
80-
"id": "AMITY_SQUARE_UNK_101_5",
81-
"graphics_id": "OBJ_EVENT_GFX_UNK_101",
80+
"id": "AMITY_SQUARE_COUNTERPART_5",
81+
"graphics_id": "OBJ_EVENT_GFX_COUNTERPART",
8282
"movement_type": "MOVEMENT_TYPE_NONE",
8383
"trainer_type": "TRAINER_TYPE_NONE",
8484
"flag": "FLAG_UNK_0x02A1",

‎res/field/events/events_battle_hall.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@
101101
"y": 0
102102
},
103103
{
104-
"id": "BATTLE_HALL_UNK_065_6",
105-
"graphics_id": "OBJ_EVENT_GFX_UNK_065",
104+
"id": "BATTLE_HALL_SNOWPOINT_NPC_F_6",
105+
"graphics_id": "OBJ_EVENT_GFX_SNOWPOINT_NPC_F",
106106
"movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
107107
"trainer_type": "TRAINER_TYPE_NONE",
108108
"flag": "0",

‎res/field/events/events_battle_tower.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
"y": 0
5858
},
5959
{
60-
"id": "BATTLE_TOWER_WIFI_PLAZA_ATTENDANT_2",
61-
"graphics_id": "OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT",
60+
"id": "BATTLE_TOWERWIFI_PLAZA_ATTENDANT_F_2",
61+
"graphics_id": "OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT_F",
6262
"movement_type": "MOVEMENT_TYPE_NONE",
6363
"trainer_type": "TRAINER_TYPE_NONE",
6464
"flag": "0",

‎res/field/events/events_battle_tower_battle_room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"y": 0
3333
},
3434
{
35-
"id": "BATTLE_TOWER_BATTLE_ROOM_UNK_101_2",
36-
"graphics_id": "OBJ_EVENT_GFX_UNK_101",
35+
"id": "BATTLE_TOWER_BATTLE_ROOM_COUNTERPART_2",
36+
"graphics_id": "OBJ_EVENT_GFX_COUNTERPART",
3737
"movement_type": "MOVEMENT_TYPE_NONE",
3838
"trainer_type": "TRAINER_TYPE_NONE",
3939
"flag": "0",

‎res/field/events/events_battle_tower_corridor_multi.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"y": 0
3333
},
3434
{
35-
"id": "BATTLE_TOWER_CORRIDOR_MULTI_UNK_101_2",
36-
"graphics_id": "OBJ_EVENT_GFX_UNK_101",
35+
"id": "BATTLE_TOWER_CORRIDOR_MULTI_COUNTERPART_2",
36+
"graphics_id": "OBJ_EVENT_GFX_COUNTERPART",
3737
"movement_type": "MOVEMENT_TYPE_NONE",
3838
"trainer_type": "TRAINER_TYPE_NONE",
3939
"flag": "0",

‎res/field/events/events_battle_tower_multi_battle_room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"y": 0
3333
},
3434
{
35-
"id": "BATTLE_TOWER_MULTI_BATTLE_ROOM_UNK_101_2",
36-
"graphics_id": "OBJ_EVENT_GFX_UNK_101",
35+
"id": "BATTLE_TOWER_MULTI_BATTLE_ROOM_COUNTERPART_2",
36+
"graphics_id": "OBJ_EVENT_GFX_COUNTERPART",
3737
"movement_type": "MOVEMENT_TYPE_NONE",
3838
"trainer_type": "TRAINER_TYPE_NONE",
3939
"flag": "0",

‎res/field/events/events_canalave_city.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@
201201
"y": 1
202202
},
203203
{
204-
"id": "CANALAVE_CITY_UNK_101_12",
205-
"graphics_id": "OBJ_EVENT_GFX_UNK_101",
204+
"id": "CANALAVE_CITY_COUNTERPART_12",
205+
"graphics_id": "OBJ_EVENT_GFX_COUNTERPART",
206206
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
207207
"trainer_type": "TRAINER_TYPE_NONE",
208208
"flag": "FLAG_UNK_0x01B5",

‎res/field/events/events_canalave_city_gym.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@
8585
"y": 0
8686
},
8787
{
88-
"id": "CANALAVE_CITY_GYM_BRYON_4",
89-
"graphics_id": "OBJ_EVENT_GFX_BRYON",
88+
"id": "CANALAVE_CITY_GYM_BYRON_4",
89+
"graphics_id": "OBJ_EVENT_GFX_BYRON",
9090
"movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
9191
"trainer_type": "TRAINER_TYPE_NONE",
9292
"flag": "0",

‎res/field/events/events_canalave_city_pokecenter_b1f.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"bg_events": [],
33
"object_events": [
44
{
5-
"id": "CANALAVE_CITY_POKECENTER_B1F_WIFI_PLAZA_ATTENDANT_0",
6-
"graphics_id": "OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT",
5+
"id": "CANALAVE_CITY_POKECENTER_B1FWIFI_PLAZA_ATTENDANT_F_0",
6+
"graphics_id": "OBJ_EVENT_GFX_WIFI_PLAZA_ATTENDANT_F",
77
"movement_type": "MOVEMENT_TYPE_NONE",
88
"trainer_type": "TRAINER_TYPE_NONE",
99
"flag": "0",

0 commit comments

Comments
 (0)