diff options
Diffstat (limited to 'data')
364 files changed, 5814 insertions, 2467 deletions
diff --git a/data/map_obj_80688E4.s b/data/event_object_80688E4.s index 884bf379f..884bf379f 100644 --- a/data/map_obj_80688E4.s +++ b/data/event_object_80688E4.s diff --git a/data/field_map_obj.s b/data/event_object_movement.s index 19f0fac9f..9c4f0a7ca 100644 --- a/data/field_map_obj.s +++ b/data/event_object_movement.s @@ -14,710 +14,1190 @@ gUnknown_835B95C:: @ 835B95C .4byte CameraObject_2 gUnknown_835B968:: @ 835B968 - .incbin "graphics/map_objects/0.gbapal" + .incbin "graphics/object_events/0.gbapal" gUnknown_835B988:: - .incbin "graphics/map_objects/unk_835B988.gbapal" + .incbin "graphics/object_events/unk_835B988.gbapal" gUnknown_835B9A0:: .space 0x1C0 gUnknown_835BB68:: @ 835BB68 - .incbin "graphics/map_objects/000.4bpp" + .incbin "graphics/object_events/000.4bpp" gUnknown_835C468:: @ 835C468 - .incbin "graphics/map_objects/002.4bpp" + .incbin "graphics/object_events/002.4bpp" gUnknown_835D268:: @ 835D268 - .incbin "graphics/map_objects/007.4bpp" + .incbin "graphics/object_events/007.4bpp" gUnknown_835DB68:: @ 835DB68 - .incbin "graphics/map_objects/009.4bpp" + .incbin "graphics/object_events/009.4bpp" gUnknown_835E968:: @ 835E968 - .incbin "graphics/map_objects/1.gbapal" + .incbin "graphics/object_events/1.gbapal" gUnknown_835E988:: @ 835E988 - .incbin "graphics/map_objects/2.gbapal" + .incbin "graphics/object_events/2.gbapal" gUnknown_835E9A8:: @ 835E9A8 - .incbin "graphics/map_objects/005.4bpp" + .incbin "graphics/object_events/005.4bpp" gUnknown_835F2A8:: @ 835F2A8 - .incbin "graphics/map_objects/012.4bpp" + .incbin "graphics/object_events/012.4bpp" -@ 35FBA8 - .incbin "graphics/map_objects/male_surf.4bpp" +gObjectEventPic_MaleSurfing:: @ 835FBA8 + .incbin "graphics/object_events/male_surf.4bpp" -@ 360DA8 - .incbin "graphics/map_objects/female_surf.4bpp" +gObjectEventPic_FemaleSurfing:: @ 360DA8 + .incbin "graphics/object_events/female_surf.4bpp" gUnknown_8361FA8:: @ 8361FA8 - .incbin "graphics/map_objects/001.4bpp" + .incbin "graphics/object_events/001.4bpp" gUnknown_83631A8:: @ 83631A8 - .incbin "graphics/map_objects/006.4bpp" + .incbin "graphics/object_events/006.4bpp" gUnknown_8363DA8:: @ 8363DA8 - .incbin "graphics/map_objects/008.4bpp" + .incbin "graphics/object_events/008.4bpp" gUnknown_8364FA8:: @ 8364FA8 - .incbin "graphics/map_objects/013.4bpp" + .incbin "graphics/object_events/013.4bpp" gUnknown_8365BA8:: @ 8365BA8 - .incbin "graphics/map_objects/014.4bpp" + .incbin "graphics/object_events/014.4bpp" gUnknown_83664A8:: @ 83664A8 - .incbin "graphics/map_objects/015.4bpp" + .incbin "graphics/object_events/015.4bpp" gUnknown_8366DA8:: @ 8366DA8 - .incbin "graphics/map_objects/004.4bpp" + .incbin "graphics/object_events/004.4bpp" gUnknown_83685A8:: @ 83685A8 - .incbin "graphics/map_objects/011.4bpp" + .incbin "graphics/object_events/011.4bpp" gUnknown_8369DA8:: @ 8369DA8 - .incbin "graphics/map_objects/094.4bpp" + .incbin "graphics/object_events/094.4bpp" gUnknown_8369E28:: @ 8369E28 - .incbin "graphics/map_objects/093.4bpp" + .incbin "graphics/object_events/093.4bpp" @ 8369F28 - .incbin "graphics/map_objects/unk_8369F28.4bpp" + .incbin "graphics/object_events/unk_8369F28.4bpp" gUnknown_836A228:: @ 836A228 - .incbin "graphics/map_objects/087.4bpp" + .incbin "graphics/object_events/087.4bpp" gUnknown_836AB28:: @ 836AB28 - .incbin "graphics/map_objects/086.4bpp" + .incbin "graphics/object_events/086.4bpp" gUnknown_836AE28:: @ 836AE28 - .incbin "graphics/map_objects/085.4bpp" + .incbin "graphics/object_events/085.4bpp" gUnknown_836B128:: @ 836B128 - .incbin "graphics/map_objects/076.4bpp" + .incbin "graphics/object_events/076.4bpp" gUnknown_836BA28:: @ 836BA28 - .incbin "graphics/map_objects/077.4bpp" + .incbin "graphics/object_events/077.4bpp" gUnknown_836C328:: @ 836C328 - .incbin "graphics/map_objects/083.4bpp" + .incbin "graphics/object_events/083.4bpp" gUnknown_836C628:: @ 836C628 - .incbin "graphics/map_objects/084.4bpp" + .incbin "graphics/object_events/084.4bpp" gUnknown_836C928:: @ 836C928 - .incbin "graphics/map_objects/080.4bpp" + .incbin "graphics/object_events/080.4bpp" gUnknown_836CC28:: @ 836CC28 - .incbin "graphics/map_objects/082.4bpp" + .incbin "graphics/object_events/082.4bpp" gUnknown_836CF28:: @ 836CF28 - .incbin "graphics/map_objects/073.4bpp" + .incbin "graphics/object_events/073.4bpp" gUnknown_836D828:: @ 836D828 - .incbin "graphics/map_objects/3.gbapal" + .incbin "graphics/object_events/3.gbapal" gUnknown_836D848:: @ 836D848 - .incbin "graphics/map_objects/4.gbapal" + .incbin "graphics/object_events/4.gbapal" gUnknown_836D868:: @ 836D868 - .incbin "graphics/map_objects/5.gbapal" + .incbin "graphics/object_events/5.gbapal" gUnknown_836D888:: @ 836D888 - .incbin "graphics/map_objects/6.gbapal" + .incbin "graphics/object_events/6.gbapal" gUnknown_836D8A8:: @ 836D8A8 - .incbin "graphics/map_objects/7.gbapal" + .incbin "graphics/object_events/7.gbapal" gUnknown_836D8C8:: @ 836D8C8 - .incbin "graphics/map_objects/8.gbapal" + .incbin "graphics/object_events/8.gbapal" gUnknown_836D8E8:: @ 836D8E8 - .incbin "graphics/map_objects/9.gbapal" + .incbin "graphics/object_events/9.gbapal" gUnknown_836D908:: @ 836D908 - .incbin "graphics/map_objects/10.gbapal" + .incbin "graphics/object_events/10.gbapal" gUnknown_836D928:: @ 836D928 - .incbin "graphics/map_objects/016.4bpp" + .incbin "graphics/object_events/016.4bpp" gUnknown_836DDA8:: @ 836DDA8 - .incbin "graphics/map_objects/017.4bpp" + .incbin "graphics/object_events/017.4bpp" gUnknown_836E2A8:: @ 836E2A8 - .incbin "graphics/map_objects/021.4bpp" + .incbin "graphics/object_events/021.4bpp" gUnknown_836E5A8:: @ 836E5A8 - .incbin "graphics/map_objects/022.4bpp" + .incbin "graphics/object_events/022.4bpp" gUnknown_836EFA8:: @ 836EFA8 - .incbin "graphics/map_objects/018.4bpp" + .incbin "graphics/object_events/018.4bpp" gUnknown_836F9A8:: @ 836F9A8 - .incbin "graphics/map_objects/019.4bpp" + .incbin "graphics/object_events/019.4bpp" gUnknown_83703A8:: @ 83703A8 - .incbin "graphics/map_objects/023.4bpp" + .incbin "graphics/object_events/023.4bpp" gUnknown_8370DA8:: @ 8370DA8 - .incbin "graphics/map_objects/031.4bpp" + .incbin "graphics/object_events/031.4bpp" gUnknown_83716A8:: @ 83716A8 - .incbin "graphics/map_objects/020.4bpp" + .incbin "graphics/object_events/020.4bpp" gUnknown_83720A8:: @ 83720A8 - .incbin "graphics/map_objects/024.4bpp" + .incbin "graphics/object_events/024.4bpp" -@ 8372AA8 - .incbin "graphics/map_objects/unk_8372AA8.4bpp" +gUnknown_8372AA8:: @ 8372AA8 + .incbin "graphics/object_events/unk_8372AA8.4bpp" gUnknown_83733A8:: @ 83733A8 - .incbin "graphics/map_objects/027.4bpp" + .incbin "graphics/object_events/027.4bpp" gUnknown_8373CA8:: @ 8373CA8 - .incbin "graphics/map_objects/030.4bpp" + .incbin "graphics/object_events/030.4bpp" gUnknown_83746A8:: @ 83746A8 - .incbin "graphics/map_objects/028.4bpp" + .incbin "graphics/object_events/028.4bpp" gUnknown_83750A8:: @ 83750A8 - .incbin "graphics/map_objects/032.4bpp" + .incbin "graphics/object_events/032.4bpp" gUnknown_8375AA8:: @ 8375AA8 - .incbin "graphics/map_objects/034.4bpp" + .incbin "graphics/object_events/034.4bpp" gUnknown_8375CA8:: @ 8375CA8 - .incbin "graphics/map_objects/047.4bpp" + .incbin "graphics/object_events/047.4bpp" gUnknown_83766A8:: @ 83766A8 - .incbin "graphics/map_objects/048.4bpp" + .incbin "graphics/object_events/048.4bpp" gUnknown_83770A8:: @ 83770A8 - .incbin "graphics/map_objects/029.4bpp" + .incbin "graphics/object_events/029.4bpp" gUnknown_8377AA8:: @ 8377AA8 - .incbin "graphics/map_objects/059.4bpp" + .incbin "graphics/object_events/059.4bpp" gUnknown_83783A8:: @ 83783A8 - .incbin "graphics/map_objects/033.4bpp" + .incbin "graphics/object_events/033.4bpp" gUnknown_8378CA8:: @ 8378CA8 - .incbin "graphics/map_objects/035.4bpp" + .incbin "graphics/object_events/035.4bpp" gUnknown_83795A8:: @ 83795A8 - .incbin "graphics/map_objects/039.4bpp" + .incbin "graphics/object_events/039.4bpp" gUnknown_8379FA8:: @ 8379FA8 - .incbin "graphics/map_objects/040.4bpp" + .incbin "graphics/object_events/040.4bpp" gUnknown_837A9A8:: @ 837A9A8 - .incbin "graphics/map_objects/041.4bpp" + .incbin "graphics/object_events/041.4bpp" gUnknown_837B3A8:: @ 837B3A8 - .incbin "graphics/map_objects/042.4bpp" + .incbin "graphics/object_events/042.4bpp" gUnknown_837BDA8:: @ 837BDA8 - .incbin "graphics/map_objects/121.4bpp" + .incbin "graphics/object_events/121.4bpp" gUnknown_837BF28:: @ 837BF28 - .incbin "graphics/map_objects/052.4bpp" + .incbin "graphics/object_events/052.4bpp" gUnknown_837C928:: @ 837C928 - .incbin "graphics/map_objects/058.4bpp" + .incbin "graphics/object_events/058.4bpp" gUnknown_837D328:: @ 837D328 - .incbin "graphics/map_objects/050.4bpp" + .incbin "graphics/object_events/050.4bpp" gUnknown_837DC28:: @ 837DC28 - .incbin "graphics/map_objects/043.4bpp" + .incbin "graphics/object_events/043.4bpp" gUnknown_837E628:: @ 837E628 - .incbin "graphics/map_objects/044.4bpp" + .incbin "graphics/object_events/044.4bpp" gUnknown_837F028:: @ 837F028 - .incbin "graphics/map_objects/045.4bpp" + .incbin "graphics/object_events/045.4bpp" gUnknown_837FA28:: @ 837FA28 - .incbin "graphics/map_objects/046.4bpp" + .incbin "graphics/object_events/046.4bpp" gUnknown_8380428:: @ 8380428 - .incbin "graphics/map_objects/054.4bpp" + .incbin "graphics/object_events/054.4bpp" gUnknown_8380E28:: @ 8380E28 - .incbin "graphics/map_objects/055.4bpp" + .incbin "graphics/object_events/055.4bpp" gUnknown_8381828:: @ 8381828 - .incbin "graphics/map_objects/061.4bpp" + .incbin "graphics/object_events/061.4bpp" gUnknown_8382228:: @ 8382228 - .incbin "graphics/map_objects/062.4bpp" + .incbin "graphics/object_events/062.4bpp" gUnknown_8382C28:: @ 8382C28 - .incbin "graphics/map_objects/063.4bpp" + .incbin "graphics/object_events/063.4bpp" gUnknown_8383528:: @ 8383528 - .incbin "graphics/map_objects/057.4bpp" + .incbin "graphics/object_events/057.4bpp" gUnknown_8383F28:: @ 8383F28 - .incbin "graphics/map_objects/090.4bpp" + .incbin "graphics/object_events/090.4bpp" gUnknown_8384828:: @ 8384828 - .incbin "graphics/map_objects/152.4bpp" + .incbin "graphics/object_events/152.4bpp" gUnknown_8385128:: @ 8385128 - .incbin "graphics/map_objects/037.4bpp" + .incbin "graphics/object_events/037.4bpp" gUnknown_8385628:: @ 8385628 - .incbin "graphics/map_objects/036.4bpp" + .incbin "graphics/object_events/036.4bpp" gUnknown_8385B28:: @ 8385B28 - .incbin "graphics/map_objects/038.4bpp" + .incbin "graphics/object_events/038.4bpp" gUnknown_8386028:: @ 8386028 - .incbin "graphics/map_objects/056.4bpp" + .incbin "graphics/object_events/056.4bpp" gUnknown_8386A28:: @ 8386A28 - .incbin "graphics/map_objects/053.4bpp" + .incbin "graphics/object_events/053.4bpp" gUnknown_8387E28:: @ 8387E28 - .incbin "graphics/map_objects/091.4bpp" + .incbin "graphics/object_events/091.4bpp" gUnknown_8388728:: @ 8388728 - .incbin "graphics/map_objects/025.4bpp" + .incbin "graphics/object_events/025.4bpp" gUnknown_8389128:: @ 8389128 - .incbin "graphics/map_objects/026.4bpp" + .incbin "graphics/object_events/026.4bpp" gUnknown_8389B28:: @ 8389B28 - .incbin "graphics/map_objects/071.4bpp" + .incbin "graphics/object_events/071.4bpp" gUnknown_838A428:: @ 838A428 - .incbin "graphics/map_objects/072.4bpp" + .incbin "graphics/object_events/072.4bpp" gUnknown_838AD28:: @ 838AD28 - .incbin "graphics/map_objects/064.4bpp" + .incbin "graphics/object_events/064.4bpp" gUnknown_838B128:: @ 838B128 - .incbin "graphics/map_objects/065.4bpp" + .incbin "graphics/object_events/065.4bpp" gUnknown_838B428:: @ 838B428 - .incbin "graphics/map_objects/066.4bpp" + .incbin "graphics/object_events/066.4bpp" gUnknown_838B728:: @ 838B728 - .incbin "graphics/map_objects/067.4bpp" + .incbin "graphics/object_events/067.4bpp" gUnknown_838BA28:: @ 838BA28 - .incbin "graphics/map_objects/092.4bpp" + .incbin "graphics/object_events/092.4bpp" gUnknown_838BAA8:: @ 838BAA8 - .incbin "graphics/map_objects/078.4bpp" + .incbin "graphics/object_events/078.4bpp" gUnknown_838C3A8:: @ 838C3A8 - .incbin "graphics/map_objects/079.4bpp" + .incbin "graphics/object_events/079.4bpp" gUnknown_838C6A8:: @ 838C6A8 - .incbin "graphics/map_objects/068.4bpp" + .incbin "graphics/object_events/068.4bpp" gUnknown_838CFA8:: @ 838CFA8 - .incbin "graphics/map_objects/069.4bpp" + .incbin "graphics/object_events/069.4bpp" gUnknown_838D2A8:: @ 838D2A8 - .incbin "graphics/map_objects/070.4bpp" + .incbin "graphics/object_events/070.4bpp" gUnknown_838D5A8:: @ 838D5A8 - .incbin "graphics/map_objects/unk_838D5A8.4bpp" + .incbin "graphics/object_events/unk_838D5A8.4bpp" gUnknown_838DEA8:: @ 838DEA8 - .incbin "graphics/map_objects/049.4bpp" + .incbin "graphics/object_events/049.4bpp" gUnknown_838E7A8:: @ 838E7A8 - .incbin "graphics/map_objects/089.4bpp" + .incbin "graphics/object_events/089.4bpp" gUnknown_838F0A8:: @ 838F0A8 - .incbin "graphics/map_objects/135.4bpp" + .incbin "graphics/object_events/135.4bpp" gUnknown_838F228:: @ 838F228 - .incbin "graphics/map_objects/136.4bpp" + .incbin "graphics/object_events/136.4bpp" gUnknown_838F428:: @ 838F428 - .incbin "graphics/map_objects/137.4bpp" + .incbin "graphics/object_events/137.4bpp" gUnknown_838F628:: @ 838F628 - .incbin "graphics/map_objects/138.4bpp" + .incbin "graphics/object_events/138.4bpp" gUnknown_838F828:: @ 838F828 - .incbin "graphics/map_objects/139.4bpp" + .incbin "graphics/object_events/139.4bpp" gUnknown_838F8A8:: @ 838F8A8 - .incbin "graphics/map_objects/140.4bpp" + .incbin "graphics/object_events/140.4bpp" gUnknown_838F928:: @ 838F928 - .incbin "graphics/map_objects/141.4bpp" + .incbin "graphics/object_events/141.4bpp" gUnknown_838F9A8:: @ 838F9A8 - .incbin "graphics/map_objects/143.4bpp" + .incbin "graphics/object_events/143.4bpp" gUnknown_838FA28:: @ 838FA28 - .incbin "graphics/map_objects/142.4bpp" + .incbin "graphics/object_events/142.4bpp" gUnknown_838FAA8:: @ 838FAA8 - .incbin "graphics/map_objects/144.4bpp" + .incbin "graphics/object_events/144.4bpp" gUnknown_838FEA8:: @ 838FEA8 - .incbin "graphics/map_objects/145.4bpp" + .incbin "graphics/object_events/145.4bpp" gUnknown_83902A8:: @ 83902A8 - .incbin "graphics/map_objects/146.4bpp" + .incbin "graphics/object_events/146.4bpp" gUnknown_8390328:: @ 8390328 - .incbin "graphics/map_objects/148.4bpp" + .incbin "graphics/object_events/148.4bpp" gUnknown_8390728:: @ 8390728 - .incbin "graphics/map_objects/149.4bpp" + .incbin "graphics/object_events/149.4bpp" gUnknown_8390B28:: @ 8390B28 - .incbin "graphics/map_objects/150.4bpp" + .incbin "graphics/object_events/150.4bpp" gUnknown_8390F28:: @ 8390F28 - .incbin "graphics/map_objects/075.4bpp" + .incbin "graphics/object_events/075.4bpp" gUnknown_8391228:: @ 8391228 - .incbin "graphics/map_objects/081.4bpp" + .incbin "graphics/object_events/081.4bpp" gUnknown_8391528:: @ 8391528 - .incbin "graphics/map_objects/074.4bpp" + .incbin "graphics/object_events/074.4bpp" gUnknown_8391828:: @ 8391828 - .incbin "graphics/map_objects/051.4bpp" + .incbin "graphics/object_events/051.4bpp" gUnknown_8391B28:: @ 8391B28 - .incbin "graphics/map_objects/088.4bpp" + .incbin "graphics/object_events/088.4bpp" gUnknown_8391E28:: @ 8391E28 - .incbin "graphics/map_objects/114.4bpp" + .incbin "graphics/object_events/114.4bpp" gUnknown_8391FA8:: @ 8391FA8 - .incbin "graphics/map_objects/118.4bpp" + .incbin "graphics/object_events/118.4bpp" gUnknown_8392128:: @ 8392128 - .incbin "graphics/map_objects/119.4bpp" + .incbin "graphics/object_events/119.4bpp" gUnknown_83922A8:: @ 83922A8 - .incbin "graphics/map_objects/122.4bpp" + .incbin "graphics/object_events/122.4bpp" gUnknown_8392428:: @ 8392428 - .incbin "graphics/map_objects/123.4bpp" + .incbin "graphics/object_events/123.4bpp" gUnknown_83925A8:: @ 83925A8 - .incbin "graphics/map_objects/124.4bpp" + .incbin "graphics/object_events/124.4bpp" gUnknown_8392728:: @ 8392728 - .incbin "graphics/map_objects/125.4bpp" + .incbin "graphics/object_events/125.4bpp" gUnknown_83928A8:: @ 83928A8 - .incbin "graphics/map_objects/126.4bpp" + .incbin "graphics/object_events/126.4bpp" gUnknown_8392A28:: @ 8392A28 - .incbin "graphics/map_objects/127.4bpp" + .incbin "graphics/object_events/127.4bpp" gUnknown_8392BA8:: @ 8392BA8 - .incbin "graphics/map_objects/128.4bpp" + .incbin "graphics/object_events/128.4bpp" gUnknown_8392D28:: @ 8392D28 - .incbin "graphics/map_objects/129.4bpp" + .incbin "graphics/object_events/129.4bpp" gUnknown_8392EA8:: @ 8392EA8 - .incbin "graphics/map_objects/130.4bpp" + .incbin "graphics/object_events/130.4bpp" gUnknown_8393028:: @ 8393028 - .incbin "graphics/map_objects/131.4bpp" + .incbin "graphics/object_events/131.4bpp" gUnknown_83931A8:: @ 83931A8 - .incbin "graphics/map_objects/132.4bpp" + .incbin "graphics/object_events/132.4bpp" gUnknown_8393328:: @ 8393328 - .incbin "graphics/map_objects/133.4bpp" + .incbin "graphics/object_events/133.4bpp" gUnknown_83934A8:: @ 83934A8 - .incbin "graphics/map_objects/147.4bpp" + .incbin "graphics/object_events/147.4bpp" gUnknown_8393628:: @ 8393628 - .incbin "graphics/map_objects/134.4bpp" + .incbin "graphics/object_events/134.4bpp" gUnknown_83937A8:: @ 83937A8 - .incbin "graphics/map_objects/109.4bpp" + .incbin "graphics/object_events/109.4bpp" gUnknown_83939A8:: @ 83939A8 - .incbin "graphics/map_objects/110.4bpp" + .incbin "graphics/object_events/110.4bpp" gUnknown_8393B28:: @ 8393B28 - .incbin "graphics/map_objects/111.4bpp" + .incbin "graphics/object_events/111.4bpp" gUnknown_8393CA8:: @ 8393CA8 - .incbin "graphics/map_objects/112.4bpp" + .incbin "graphics/object_events/112.4bpp" gUnknown_8393E28:: @ 8393E28 - .incbin "graphics/map_objects/117.4bpp" + .incbin "graphics/object_events/117.4bpp" gUnknown_8393FA8:: @ 8393FA8 - .incbin "graphics/map_objects/120.4bpp" + .incbin "graphics/object_events/120.4bpp" gUnknown_8394128:: @ 8394128 - .incbin "graphics/map_objects/115.4bpp" + .incbin "graphics/object_events/115.4bpp" gUnknown_83942A8:: @ 83942A8 - .incbin "graphics/map_objects/116.4bpp" + .incbin "graphics/object_events/116.4bpp" gUnknown_8394428:: @ 8394428 - .incbin "graphics/map_objects/113.4bpp" + .incbin "graphics/object_events/113.4bpp" gUnknown_83945A8:: @ 83945A8 - .incbin "graphics/map_objects/095.4bpp" + .incbin "graphics/object_events/095.4bpp" gUnknown_83947A8:: @ 83947A8 - .incbin "graphics/map_objects/096.4bpp" + .incbin "graphics/object_events/096.4bpp" gUnknown_83949A8:: @ 83949A8 - .incbin "graphics/map_objects/097.4bpp" + .incbin "graphics/object_events/097.4bpp" gUnknown_8394A28:: @ 8394A28 - .incbin "graphics/map_objects/098.4bpp" + .incbin "graphics/object_events/098.4bpp" gUnknown_8394AA8:: @ 8394AA8 - .incbin "graphics/map_objects/099.4bpp" + .incbin "graphics/object_events/099.4bpp" gUnknown_8394B28:: @ 8394B28 - .incbin "graphics/map_objects/100.4bpp" + .incbin "graphics/object_events/100.4bpp" gUnknown_8394BA8:: @ 8394BA8 - .incbin "graphics/map_objects/101.4bpp" + .incbin "graphics/object_events/101.4bpp" gUnknown_8394C28:: @ 8394C28 - .incbin "graphics/map_objects/102.4bpp" + .incbin "graphics/object_events/102.4bpp" gUnknown_8394D28:: @ 8394D28 - .incbin "graphics/map_objects/103.4bpp" + .incbin "graphics/object_events/103.4bpp" gUnknown_8394DA8:: @ 8394DA8 - .incbin "graphics/map_objects/104.4bpp" + .incbin "graphics/object_events/104.4bpp" gUnknown_8394E28:: @ 8394E28 - .incbin "graphics/map_objects/105.4bpp" + .incbin "graphics/object_events/105.4bpp" gUnknown_8394EA8:: @ 8394EA8 - .incbin "graphics/map_objects/19.gbapal" + .incbin "graphics/object_events/19.gbapal" gUnknown_8394EC8:: @ 8394EC8 - .incbin "graphics/map_objects/106.4bpp" + .incbin "graphics/object_events/106.4bpp" gUnknown_83950C8:: @ 83950C8 - .incbin "graphics/map_objects/107.4bpp" + .incbin "graphics/object_events/107.4bpp" gUnknown_83952C8:: @ 83952C8 - .incbin "graphics/map_objects/20.gbapal" + .incbin "graphics/object_events/20.gbapal" gUnknown_83952E8:: @ 83952E8 - .incbin "graphics/map_objects/108.4bpp" + .incbin "graphics/object_events/108.4bpp" gUnknown_8395AE8:: @ 8395AE8 - .incbin "graphics/map_objects/21.gbapal" + .incbin "graphics/object_events/21.gbapal" gUnknown_8395B08:: @ 8395B08 - .incbin "graphics/map_objects/151.4bpp" - .incbin "graphics/map_objects/unk_396B08.4bpp" + .incbin "graphics/object_events/151.4bpp" + +gUnknown_8396B08:: @ 8396B08 + .incbin "graphics/object_events/unk_396B08.4bpp" gUnknown_8397708:: @ 8397708 - .incbin "graphics/map_objects/060.4bpp" + .incbin "graphics/object_events/060.4bpp" gUnknown_8398008:: @ 8398008 - .incbin "graphics/map_objects/11.gbapal" + .incbin "graphics/object_events/11.gbapal" gUnknown_8398028:: @ 8398028 - .incbin "graphics/map_objects/12.gbapal" + .incbin "graphics/object_events/12.gbapal" + +gUnknown_8398048:: @ 8398048 + .incbin "graphics/object_events/pics/effects/shadow_small.4bpp" + +gUnknown_8398068:: @ 8398068 + .incbin "graphics/object_events/pics/effects/shadow_medium.4bpp" + +gUnknown_83980A8:: @ 83980A8 + .incbin "graphics/object_events/pics/effects/shadow_large.4bpp" - .incbin "baserom.gba", 0x398048, 0x600 +gUnknown_8398128:: @ 8398128 + .incbin "graphics/object_events/pics/effects/shadow_extra_large.4bpp" + +filler_8398528:: @ 8398528 + .fill 0x48, 0x4, 0x00 gUnknown_8398648:: - .incbin "graphics/map_objects/fldeff_cut.4bpp" - .incbin "graphics/map_objects/fldeff_cut.4bpp" + .incbin "graphics/object_events/fldeff_cut.4bpp" + +gUnknown_8398668:: + .incbin "graphics/object_events/fldeff_cut.4bpp" gUnknown_8398688:: - .incbin "graphics/map_objects/fldeff_cut.gbapal" - .incbin "baserom.gba", 0x3986A8, 0xCE0 - -gUnknown_8399388:: @ 8399388 - .incbin "baserom.gba", 0x399388, 0x908 - -gUnknown_8399C90:: @ 8399C90 - .incbin "baserom.gba", 0x399C90, 0x5F38 - -gUnknown_839FBC8:: @ 839FBC8 - .incbin "baserom.gba", 0x39FBC8, 0x144 - -gUnknown_839FD0C:: @ 839FD0C - .incbin "baserom.gba", 0x39FD0C, 0x51 - -gUnknown_839FD5D:: @ 839FD5D - .incbin "baserom.gba", 0x39FD5D, 0x53 - -gMapObjectGraphicsInfoPointers:: @ 839FDB0 - .4byte gMapObjectGraphicsInfo_83A3BB0 - .4byte gMapObjectGraphicsInfo_83A3BD4 - .4byte gMapObjectGraphicsInfo_83A3BF8 - .4byte gMapObjectGraphicsInfo_83A3C1C - .4byte gMapObjectGraphicsInfo_83A4858 - .4byte gMapObjectGraphicsInfo_83A48A0 - .4byte gMapObjectGraphicsInfo_83A48C4 - .4byte gMapObjectGraphicsInfo_83A4564 - .4byte gMapObjectGraphicsInfo_83A4588 - .4byte gMapObjectGraphicsInfo_83A45AC - .4byte gMapObjectGraphicsInfo_83A45D0 - .4byte gMapObjectGraphicsInfo_83A487C - .4byte gMapObjectGraphicsInfo_83A48E8 - .4byte gMapObjectGraphicsInfo_83A490C - .4byte gMapObjectGraphicsInfo_83A3C64 - .4byte gMapObjectGraphicsInfo_83A3C88 - .4byte gMapObjectGraphicsInfo_83A3CAC - .4byte gMapObjectGraphicsInfo_83A3CD0 - .4byte gMapObjectGraphicsInfo_83A3D3C - .4byte gMapObjectGraphicsInfo_83A3DA8 - .4byte gMapObjectGraphicsInfo_83A3DF0 - .4byte gMapObjectGraphicsInfo_83A3CF4 - .4byte gMapObjectGraphicsInfo_83A3D18 - .4byte gMapObjectGraphicsInfo_83A3D60 - .4byte gMapObjectGraphicsInfo_83A3DCC - .4byte gMapObjectGraphicsInfo_83A4390 - .4byte gMapObjectGraphicsInfo_83A43B4 - .4byte gMapObjectGraphicsInfo_83A3E14 - .4byte gMapObjectGraphicsInfo_83A3E5C - .4byte gMapObjectGraphicsInfo_83A3EEC - .4byte gMapObjectGraphicsInfo_83A3E38 - .4byte gMapObjectGraphicsInfo_83A3D84 - .4byte gMapObjectGraphicsInfo_83A3E80 - .4byte gMapObjectGraphicsInfo_83A3F34 - .4byte gMapObjectGraphicsInfo_83A4420 - .4byte gMapObjectGraphicsInfo_83A3F58 - .4byte gMapObjectGraphicsInfo_83A424C - .4byte gMapObjectGraphicsInfo_83A4228 - .4byte gMapObjectGraphicsInfo_83A4270 - .4byte gMapObjectGraphicsInfo_83A3F7C - .4byte gMapObjectGraphicsInfo_83A3FA0 - .4byte gMapObjectGraphicsInfo_83A3FC4 - .4byte gMapObjectGraphicsInfo_83A3FE8 - .4byte gMapObjectGraphicsInfo_83A4078 - .4byte gMapObjectGraphicsInfo_83A409C - .4byte gMapObjectGraphicsInfo_83A40C0 - .4byte gMapObjectGraphicsInfo_83A40E4 - .4byte gMapObjectGraphicsInfo_83A3EA4 - .4byte gMapObjectGraphicsInfo_83A3EC8 - .4byte gMapObjectGraphicsInfo_83A4618 - .4byte gMapObjectGraphicsInfo_83A4054 - .4byte gMapObjectGraphicsInfo_83A4978 - .4byte gMapObjectGraphicsInfo_83A400C - .4byte gMapObjectGraphicsInfo_83A42B8 - .4byte gMapObjectGraphicsInfo_83A4108 - .4byte gMapObjectGraphicsInfo_83A412C - .4byte gMapObjectGraphicsInfo_83A4294 - .4byte gMapObjectGraphicsInfo_83A41BC - .4byte gMapObjectGraphicsInfo_83A4030 - .4byte gMapObjectGraphicsInfo_83A3F10 - .4byte gMapObjectGraphicsInfo_83A3C40 - .4byte gMapObjectGraphicsInfo_83A4150 - .4byte gMapObjectGraphicsInfo_83A4174 - .4byte gMapObjectGraphicsInfo_83A4198 - .4byte gMapObjectGraphicsInfo_83A4300 - .4byte gMapObjectGraphicsInfo_83A44D4 - .4byte gMapObjectGraphicsInfo_83A44F8 - .4byte gMapObjectGraphicsInfo_83A4324 - .4byte gMapObjectGraphicsInfo_83A4468 - .4byte gMapObjectGraphicsInfo_83A448C - .4byte gMapObjectGraphicsInfo_83A44B0 - .4byte gMapObjectGraphicsInfo_83A436C - .4byte gMapObjectGraphicsInfo_83A4834 - .4byte gMapObjectGraphicsInfo_83A47A4 - .4byte gMapObjectGraphicsInfo_83A4810 - .4byte gMapObjectGraphicsInfo_83A4660 - .4byte gMapObjectGraphicsInfo_83A47C8 - .4byte gMapObjectGraphicsInfo_83A47EC - .4byte gMapObjectGraphicsInfo_83A43D8 - .4byte gMapObjectGraphicsInfo_83A43FC - .4byte gMapObjectGraphicsInfo_83A4684 - .4byte gMapObjectGraphicsInfo_83A46A8 - .4byte gMapObjectGraphicsInfo_83A46CC - .4byte gMapObjectGraphicsInfo_83A46F0 - .4byte gMapObjectGraphicsInfo_83A4714 - .4byte gMapObjectGraphicsInfo_83A4780 - .4byte gMapObjectGraphicsInfo_83A475C - .4byte gMapObjectGraphicsInfo_83A4738 - .4byte gMapObjectGraphicsInfo_83A50EC - .4byte gMapObjectGraphicsInfo_83A463C - .4byte gMapObjectGraphicsInfo_83A41E0 - .4byte gMapObjectGraphicsInfo_83A42DC - .4byte gMapObjectGraphicsInfo_83A4348 - .4byte gMapObjectGraphicsInfo_83A4930 - .4byte gMapObjectGraphicsInfo_83A4954 - .4byte gMapObjectGraphicsInfo_83A4444 - .4byte gMapObjectGraphicsInfo_83A451C - .4byte gMapObjectGraphicsInfo_83A4540 - .4byte gMapObjectGraphicsInfo_83A49C0 - .4byte gMapObjectGraphicsInfo_83A49E4 - .4byte gMapObjectGraphicsInfo_83A4A08 - .4byte gMapObjectGraphicsInfo_83A4A2C - .4byte gMapObjectGraphicsInfo_83A4A50 - .4byte gMapObjectGraphicsInfo_83A4A74 - .4byte gMapObjectGraphicsInfo_83A4A98 - .4byte gMapObjectGraphicsInfo_83A4ABC - .4byte gMapObjectGraphicsInfo_83A4AE0 - .4byte gMapObjectGraphicsInfo_83A4B04 - .4byte gMapObjectGraphicsInfo_83A5110 - .4byte gMapObjectGraphicsInfo_83A499C - .4byte gMapObjectGraphicsInfo_83A4B28 - .4byte gMapObjectGraphicsInfo_83A4F84 - .4byte gMapObjectGraphicsInfo_83A4FF0 - .4byte gMapObjectGraphicsInfo_83A50C8 - .4byte gMapObjectGraphicsInfo_83A5014 - .4byte gMapObjectGraphicsInfo_83A5080 - .4byte gMapObjectGraphicsInfo_83A50A4 - .4byte gMapObjectGraphicsInfo_83A5038 - .4byte gMapObjectGraphicsInfo_83A4B4C - .4byte gMapObjectGraphicsInfo_83A4B70 - .4byte gMapObjectGraphicsInfo_83A505C - .4byte gMapObjectGraphicsInfo_83A4B94 - .4byte gMapObjectGraphicsInfo_83A4BB8 - .4byte gMapObjectGraphicsInfo_83A4BDC - .4byte gMapObjectGraphicsInfo_83A4C00 - .4byte gMapObjectGraphicsInfo_83A4C24 - .4byte gMapObjectGraphicsInfo_83A4C48 - .4byte gMapObjectGraphicsInfo_83A4C6C - .4byte gMapObjectGraphicsInfo_83A4C90 - .4byte gMapObjectGraphicsInfo_83A4CB4 - .4byte gMapObjectGraphicsInfo_83A4CD8 - .4byte gMapObjectGraphicsInfo_83A4CFC - .4byte gMapObjectGraphicsInfo_83A4D20 - .4byte gMapObjectGraphicsInfo_83A4D44 - .4byte gMapObjectGraphicsInfo_83A4FA8 - .4byte gMapObjectGraphicsInfo_83A4D68 - .4byte gMapObjectGraphicsInfo_83A4D8C - .4byte gMapObjectGraphicsInfo_83A4DB0 - .4byte gMapObjectGraphicsInfo_83A4DD4 - .4byte gMapObjectGraphicsInfo_83A4E64 - .4byte gMapObjectGraphicsInfo_83A4E88 - .4byte gMapObjectGraphicsInfo_83A4EAC - .4byte gMapObjectGraphicsInfo_83A4EF4 - .4byte gMapObjectGraphicsInfo_83A4ED0 - .4byte gMapObjectGraphicsInfo_83A4F18 - .4byte gMapObjectGraphicsInfo_83A4F3C - .4byte gMapObjectGraphicsInfo_83A4F60 - .4byte gMapObjectGraphicsInfo_83A4FCC - .4byte gMapObjectGraphicsInfo_83A4DF8 - .4byte gMapObjectGraphicsInfo_83A4E1C - .4byte gMapObjectGraphicsInfo_83A4E40 - .4byte gMapObjectGraphicsInfo_83A5134 - -gUnknown_83A0010:: @ 83A0010 - .incbin "baserom.gba", 0x3A0010, 0x90 + .incbin "graphics/object_events/fldeff_cut.gbapal" + +gUnknown_83986A8:: @ 83986A8 + .incbin "graphics/object_events/pics/unknown/83986A8.4bpp" + +gUnknown_8398928:: @ 8398928 + .incbin "graphics/object_events/pics/unknown/8398928.4bpp" + +gUnknown_8398BA8:: @ 8398BA8 + .incbin "graphics/object_events/pics/unknown/8398BA8.4bpp" + +gUnknown_8398FA8:: @ 8398FA8 + .incbin "graphics/object_events/palettes/8398FA8.gbapal" + +gUnknown_8398FC8:: @ 8398FC8 + .incbin "graphics/object_events/palettes/8398FC8.gbapal" + +gUnknown_8399008:: @ 8399008 + .incbin "graphics/object_events/pics/unknown/8399008.4bpp" + +gUnknown_83990C8:: @ 83990C8 + .incbin "graphics/object_events/pics/unknown/83990C8.4bpp" + +gUnknown_8399188:: @ 8399188 + .incbin "graphics/object_events/pics/unknown/8399188.4bpp" + +gUnknown_8399288:: @ 8399288 + .incbin "graphics/object_events/pics/unknown/8399288.4bpp" + +gUnknown_8399488:: @ 8399488 + .incbin "graphics/object_events/pics/unknown/8399488.4bpp" + +gUnknown_8399788:: @ 8399788 + .incbin "graphics/object_events/pics/unknown/8399788.4bpp" + +gUnknown_8399C08:: @ 8399C08 + .incbin "graphics/object_events/pics/unknown/8399C08.4bpp" + +gUnknown_8399E08:: @ 8399E08 + .incbin "graphics/object_events/pics/unknown/8399E08.4bpp" + +gUnknown_8399E88:: @ 8399E88 + .incbin "graphics/object_events/pics/unknown/8399E88.4bpp" + +gUnknown_8399F08:: @ 8399F08 + .incbin "graphics/object_events/pics/unknown/8399F08.4bpp" + +gUnknown_8399F88:: @ 8399F88 + .incbin "graphics/object_events/pics/unknown/8399F88.4bpp" + +gUnknown_839A008:: @ 839A008 + .incbin "graphics/object_events/pics/unknown/839A008.4bpp" + +gUnknown_839A288:: @ 839A288 + .incbin "graphics/object_events/pics/unknown/839A288.4bpp" + +gUnknown_839A388:: @ 839A388 + .incbin "graphics/object_events/pics/unknown/839A388.4bpp" + +gUnknown_839A408:: @ 839A408 + .incbin "graphics/object_events/pics/unknown/839A408.4bpp" + +gUnknown_839A488:: @ 839A488 + .incbin "graphics/object_events/pics/unknown/839A488.4bpp" + +gUnknown_839A508:: @ 839A508 + .incbin "graphics/object_events/pics/unknown/839A508.4bpp" + +gUnknown_839A588:: @ 839A588 + .incbin "graphics/object_events/pics/unknown/839A588.4bpp" + +gUnknown_839A608:: @ 839A608 + .incbin "graphics/object_events/pics/unknown/839A608.4bpp" + +gUnknown_839A688:: @ 839A688 + .incbin "graphics/object_events/pics/unknown/839A688.4bpp" + +gUnknown_839A708:: @ 839A708 + .incbin "graphics/object_events/pics/unknown/839A708.4bpp" + +gUnknown_839A788:: @ 839A788 + .incbin "graphics/object_events/pics/unknown/839A788.4bpp" + +gUnknown_839A988:: @ 839A988 + .incbin "graphics/object_events/pics/unknown/839A988.4bpp" + +gUnknown_839AA48:: @ 839AA48 + .incbin "graphics/object_events/pics/unknown/839AA48.4bpp" + +gUnknown_839AAC8:: @ 839AAC8 + .incbin "graphics/object_events/pics/unknown/839AAC8.4bpp" + +gUnknown_839AB48:: @ 839AB48 + .incbin "graphics/object_events/pics/unknown/839AB48.4bpp" + +gUnknown_839ABC8:: @ 839ABC8 + .incbin "graphics/object_events/pics/unknown/839ABC8.4bpp" + +gUnknown_839AC48:: @ 839AC48 + .incbin "graphics/object_events/pics/unknown/839AC48.4bpp" + +gUnknown_839AC88:: @ 839AC88 + .incbin "graphics/object_events/pics/unknown/839AC88.4bpp" + +gUnknown_839ACC8:: @ 839ACC8 + .incbin "graphics/object_events/pics/unknown/839ACC8.4bpp" + +gUnknown_839AD08:: @ 839AD08 + .incbin "graphics/object_events/pics/unknown/839AD08.4bpp" + +gUnknown_839AD48:: @ 839AD48 + .incbin "graphics/object_events/pics/unknown/839AD48.4bpp" + +gUnknown_839AD88:: @ 839AD88 + .incbin "graphics/object_events/pics/unknown/839AD88.4bpp" + +gUnknown_839B008:: @ 839B008 + .incbin "graphics/object_events/pics/unknown/839B008.4bpp" + +gUnknown_839B708:: @ 839B708 + .incbin "graphics/object_events/pics/unknown/839B708.4bpp" + +gUnknown_839BE08:: @ 839BE08 + .incbin "graphics/object_events/pics/unknown/839BE08.4bpp" + +gUnknown_839C508:: @ 839C508 + .incbin "graphics/object_events/pics/unknown/839C508.4bpp" + +gUnknown_839C588:: @ 839C588 + .incbin "graphics/object_events/palettes/839C588.gbapal" + +gUnknown_839C5A8:: @ 839C5A8 + .incbin "graphics/object_events/pics/unknown/839C5A8.4bpp" + +gUnknown_839C628:: @ 839C628 + .incbin "graphics/object_events/pics/unknown/839C628.4bpp" + +gUnknown_839C6A8:: @ 839C6A8 + .incbin "graphics/object_events/pics/unknown/839C6A8.4bpp" + +gUnknown_839C728:: @ 839C728 + .incbin "graphics/object_events/pics/unknown/839C728.4bpp" + +gUnknown_839C7A8:: @ 839C7A8 + .incbin "graphics/object_events/pics/unknown/839C7A8.4bpp" + +gUnknown_839C828:: @ 839C828 + .incbin "graphics/object_events/pics/unknown/839C828.4bpp" + +gUnknown_839C8A8:: @ 839C8A8 + .incbin "graphics/object_events/pics/unknown/839C8A8.4bpp" + +gUnknown_839C928:: @ 839C928 + .incbin "graphics/object_events/pics/unknown/839C928.4bpp" + +gUnknown_839C9A8:: @ 839C9A8 + .incbin "graphics/object_events/pics/unknown/839C9A8.4bpp" + +gUnknown_839CA28:: @ 839CA28 + .incbin "graphics/object_events/pics/unknown/839CA28.4bpp" + +gUnknown_839CAA8:: @ 839CAA8 + .incbin "graphics/object_events/pics/unknown/839CAA8.4bpp" + +gUnknown_839CBA8:: @ 839CBA8 + .incbin "graphics/object_events/pics/unknown/839CBA8.4bpp" + +gUnknown_839CCA8:: @ 839CCA8 + .incbin "graphics/object_events/pics/unknown/839CCA8.4bpp" + +gUnknown_839CDA8:: @ 839CDA8 + .incbin "graphics/object_events/pics/unknown/839CDA8.4bpp" + +gUnknown_839CEA8:: @ 839CEA8 + .incbin "graphics/object_events/pics/unknown/839CEA8.4bpp" +gUnknown_839CFA8:: @ 839CFA8 + .incbin "graphics/object_events/pics/unknown/839CFA8.4bpp" + +gUnknown_839D0A8:: @ 839D0A8 + .incbin "graphics/object_events/pics/unknown/839D0A8.4bpp" + +gUnknown_839D1A8:: @ 839D1A8 + .incbin "graphics/object_events/pics/unknown/839D1A8.4bpp" + +gUnknown_839D2A8:: @ 839D2A8 + .incbin "graphics/object_events/pics/unknown/839D2A8.4bpp" + +gUnknown_839D328:: @ 839D328 + .incbin "graphics/object_events/pics/unknown/839D328.4bpp" + +gUnknown_839D3A8:: @ 839D3A8 + .incbin "graphics/object_events/palettes/839D3A8.gbapal" + +gUnknown_839D3C8:: @ 839D3C8 + .incbin "graphics/object_events/pics/unknown/839D3C8.4bpp" + +gMovementTypeCallbacks:: @ 839FBC8 + .4byte sub_805FFB4 + .4byte sub_806058C + .4byte sub_805FFDC + .4byte sub_80606CC + .4byte sub_80606CC + .4byte sub_8060850 + .4byte sub_8060850 + .4byte sub_80609D4 + .4byte sub_80609D4 + .4byte sub_80609D4 + .4byte sub_80609D4 + .4byte sub_805B3B8 + .4byte NULL + .4byte sub_8060A74 + .4byte sub_8060BB4 + .4byte sub_8060CF4 + .4byte sub_8060E34 + .4byte sub_8060F74 + .4byte sub_80610B4 + .4byte sub_80611F4 + .4byte sub_8061334 + .4byte sub_8061474 + .4byte sub_80615B4 + .4byte sub_80616F4 + .4byte sub_80617F8 + .4byte sub_80618FC + .4byte sub_80618FC + .4byte sub_80618FC + .4byte sub_80618FC + .4byte sub_8061B5C + .4byte sub_8061BE8 + .4byte sub_8061C74 + .4byte sub_8061D00 + .4byte sub_8061D8C + .4byte sub_8061E18 + .4byte sub_8061EA4 + .4byte sub_8061F30 + .4byte sub_8061FBC + .4byte sub_8062048 + .4byte sub_80620D4 + .4byte sub_8062160 + .4byte sub_80621EC + .4byte sub_8062278 + .4byte sub_8062304 + .4byte sub_8062390 + .4byte sub_806241C + .4byte sub_80624A8 + .4byte sub_8062534 + .4byte sub_80625C0 + .4byte sub_806264C + .4byte sub_80626D8 + .4byte sub_8062764 + .4byte sub_80627F0 + .4byte sub_806287C + .4byte sub_806287C + .4byte sub_806287C + .4byte sub_806287C + .4byte ObjectEventCB_TreeDisguise + .4byte ObjectEventCB_MountainDisguise + .4byte sub_8062E60 + .4byte sub_8062E60 + .4byte sub_8062E60 + .4byte sub_8062E60 + .4byte ObjectEventCB_Hidden1 + .4byte sub_80630A0 + .4byte sub_80630A0 + .4byte sub_80630A0 + .4byte sub_80630A0 + .4byte sub_8063110 + .4byte sub_8063110 + .4byte sub_8063110 + .4byte sub_8063110 + .4byte sub_8063180 + .4byte sub_8063180 + .4byte sub_8063180 + .4byte sub_8063180 + .4byte sub_80631F0 + .4byte sub_8063298 + .4byte sub_80632BC + .4byte sub_80632E0 + .4byte sub_8060020 + +gRangedMovementTypes:: @ 839FD0C + .byte FALSE @ MOVEMENT_TYPE_NONE + .byte FALSE @ MOVEMENT_TYPE_LOOK_AROUND + .byte TRUE @ MOVEMENT_TYPE_WANDER_AROUND + .byte TRUE @ MOVEMENT_TYPE_WANDER_UP_AND_DOWN + .byte TRUE @ MOVEMENT_TYPE_WANDER_DOWN_AND_UP + .byte TRUE @ MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_FACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_PLAYER + .byte FALSE @ MOVEMENT_TYPE_BERRY_TREE_GROWTH + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_UP + .byte FALSE @ MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT + .byte FALSE @ MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE + .byte FALSE @ MOVEMENT_TYPE_ROTATE_CLOCKWISE + .byte TRUE @ MOVEMENT_TYPE_WALK_UP_AND_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_DOWN_AND_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN + .byte TRUE @ MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE + .byte FALSE @ MOVEMENT_TYPE_TREE_DISGUISE + .byte FALSE @ MOVEMENT_TYPE_MOUNTAIN_DISGUISE + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS + .byte TRUE @ MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS + .byte FALSE @ MOVEMENT_TYPE_HIDDEN + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_LEFT + .byte FALSE @ MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT + .byte FALSE @ MOVEMENT_TYPE_INVISIBLE + .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN + .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP + .byte FALSE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT + .byte TRUE @ MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT + +gInitialMovementTypeFacingDirections:: @ 839FD5D + .byte 1 @ [MOVEMENT_TYPE_NONE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_LOOK_AROUND] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WANDER_AROUND] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WANDER_UP_AND_DOWN] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WANDER_DOWN_AND_UP] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_FACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_FACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_PLAYER] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_BERRY_TREE_GROWTH] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_UP] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT] = DIR_WEST, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP_AND_LEFT] = DIR_NORTH, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP_AND_RIGHT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_LEFT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_ROTATE_CLOCKWISE] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WALK_UP_AND_DOWN] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_DOWN_AND_UP] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN] = DIR_NORTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT] = DIR_WEST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP] = DIR_WEST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT] = DIR_SOUTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT] = DIR_EAST, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT] = DIR_WEST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT] = DIR_NORTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP] = DIR_SOUTH, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN] = DIR_WEST, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP] = DIR_EAST, + .byte 2 @ [MOVEMENT_TYPE_COPY_PLAYER] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_TREE_DISGUISE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_MOUNTAIN_DISGUISE] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS] = DIR_NORTH, + .byte 1 @ [MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS] = DIR_SOUTH, + .byte 3 @ [MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_HIDDEN] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_WALK_IN_PLACE_UP] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_WALK_IN_PLACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_JOG_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_JOG_IN_PLACE_UP] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_JOG_IN_PLACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_RUN_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 2 @ [MOVEMENT_TYPE_RUN_IN_PLACE_UP] = DIR_NORTH, + .byte 3 @ [MOVEMENT_TYPE_RUN_IN_PLACE_LEFT] = DIR_WEST, + .byte 4 @ [MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT] = DIR_EAST, + .byte 1 @ [MOVEMENT_TYPE_INVISIBLE] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_DOWN] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_UP] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT] = DIR_SOUTH, + .byte 1 @ [MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT] = DIR_SOUTH, + +.align 2, 0 +gObjectEventGraphicsInfoPointers:: @ 839FDB0 + .4byte gObjectEventGraphicsInfo_83A3BB0 + .4byte gObjectEventGraphicsInfo_83A3BD4 + .4byte gObjectEventGraphicsInfo_83A3BF8 + .4byte gObjectEventGraphicsInfo_83A3C1C + .4byte gObjectEventGraphicsInfo_83A4858 + .4byte gObjectEventGraphicsInfo_83A48A0 + .4byte gObjectEventGraphicsInfo_83A48C4 + .4byte gObjectEventGraphicsInfo_83A4564 + .4byte gObjectEventGraphicsInfo_83A4588 + .4byte gObjectEventGraphicsInfo_83A45AC + .4byte gObjectEventGraphicsInfo_83A45D0 + .4byte gObjectEventGraphicsInfo_83A487C + .4byte gObjectEventGraphicsInfo_83A48E8 + .4byte gObjectEventGraphicsInfo_83A490C + .4byte gObjectEventGraphicsInfo_83A3C64 + .4byte gObjectEventGraphicsInfo_83A3C88 + .4byte gObjectEventGraphicsInfo_83A3CAC + .4byte gObjectEventGraphicsInfo_83A3CD0 + .4byte gObjectEventGraphicsInfo_83A3D3C + .4byte gObjectEventGraphicsInfo_83A3DA8 + .4byte gObjectEventGraphicsInfo_83A3DF0 + .4byte gObjectEventGraphicsInfo_83A3CF4 + .4byte gObjectEventGraphicsInfo_83A3D18 + .4byte gObjectEventGraphicsInfo_83A3D60 + .4byte gObjectEventGraphicsInfo_83A3DCC + .4byte gObjectEventGraphicsInfo_83A4390 + .4byte gObjectEventGraphicsInfo_83A43B4 + .4byte gObjectEventGraphicsInfo_83A3E14 + .4byte gObjectEventGraphicsInfo_83A3E5C + .4byte gObjectEventGraphicsInfo_83A3EEC + .4byte gObjectEventGraphicsInfo_83A3E38 + .4byte gObjectEventGraphicsInfo_83A3D84 + .4byte gObjectEventGraphicsInfo_83A3E80 + .4byte gObjectEventGraphicsInfo_83A3F34 + .4byte gObjectEventGraphicsInfo_83A4420 + .4byte gObjectEventGraphicsInfo_83A3F58 + .4byte gObjectEventGraphicsInfo_83A424C + .4byte gObjectEventGraphicsInfo_83A4228 + .4byte gObjectEventGraphicsInfo_83A4270 + .4byte gObjectEventGraphicsInfo_83A3F7C + .4byte gObjectEventGraphicsInfo_83A3FA0 + .4byte gObjectEventGraphicsInfo_83A3FC4 + .4byte gObjectEventGraphicsInfo_83A3FE8 + .4byte gObjectEventGraphicsInfo_83A4078 + .4byte gObjectEventGraphicsInfo_83A409C + .4byte gObjectEventGraphicsInfo_83A40C0 + .4byte gObjectEventGraphicsInfo_83A40E4 + .4byte gObjectEventGraphicsInfo_83A3EA4 + .4byte gObjectEventGraphicsInfo_83A3EC8 + .4byte gObjectEventGraphicsInfo_83A4618 + .4byte gObjectEventGraphicsInfo_83A4054 + .4byte gObjectEventGraphicsInfo_83A4978 + .4byte gObjectEventGraphicsInfo_83A400C + .4byte gObjectEventGraphicsInfo_83A42B8 + .4byte gObjectEventGraphicsInfo_83A4108 + .4byte gObjectEventGraphicsInfo_83A412C + .4byte gObjectEventGraphicsInfo_83A4294 + .4byte gObjectEventGraphicsInfo_83A41BC + .4byte gObjectEventGraphicsInfo_83A4030 + .4byte gObjectEventGraphicsInfo_83A3F10 + .4byte gObjectEventGraphicsInfo_83A3C40 + .4byte gObjectEventGraphicsInfo_83A4150 + .4byte gObjectEventGraphicsInfo_83A4174 + .4byte gObjectEventGraphicsInfo_83A4198 + .4byte gObjectEventGraphicsInfo_83A4300 + .4byte gObjectEventGraphicsInfo_83A44D4 + .4byte gObjectEventGraphicsInfo_83A44F8 + .4byte gObjectEventGraphicsInfo_83A4324 + .4byte gObjectEventGraphicsInfo_83A4468 + .4byte gObjectEventGraphicsInfo_83A448C + .4byte gObjectEventGraphicsInfo_83A44B0 + .4byte gObjectEventGraphicsInfo_83A436C + .4byte gObjectEventGraphicsInfo_83A4834 + .4byte gObjectEventGraphicsInfo_83A47A4 + .4byte gObjectEventGraphicsInfo_83A4810 + .4byte gObjectEventGraphicsInfo_83A4660 + .4byte gObjectEventGraphicsInfo_83A47C8 + .4byte gObjectEventGraphicsInfo_83A47EC + .4byte gObjectEventGraphicsInfo_83A43D8 + .4byte gObjectEventGraphicsInfo_83A43FC + .4byte gObjectEventGraphicsInfo_83A4684 + .4byte gObjectEventGraphicsInfo_83A46A8 + .4byte gObjectEventGraphicsInfo_83A46CC + .4byte gObjectEventGraphicsInfo_83A46F0 + .4byte gObjectEventGraphicsInfo_83A4714 + .4byte gObjectEventGraphicsInfo_83A4780 + .4byte gObjectEventGraphicsInfo_83A475C + .4byte gObjectEventGraphicsInfo_83A4738 + .4byte gObjectEventGraphicsInfo_83A50EC + .4byte gObjectEventGraphicsInfo_83A463C + .4byte gObjectEventGraphicsInfo_83A41E0 + .4byte gObjectEventGraphicsInfo_83A42DC + .4byte gObjectEventGraphicsInfo_83A4348 + .4byte gObjectEventGraphicsInfo_83A4930 + .4byte gObjectEventGraphicsInfo_83A4954 + .4byte gObjectEventGraphicsInfo_83A4444 + .4byte gObjectEventGraphicsInfo_83A451C + .4byte gObjectEventGraphicsInfo_83A4540 + .4byte gObjectEventGraphicsInfo_83A49C0 + .4byte gObjectEventGraphicsInfo_83A49E4 + .4byte gObjectEventGraphicsInfo_83A4A08 + .4byte gObjectEventGraphicsInfo_83A4A2C + .4byte gObjectEventGraphicsInfo_83A4A50 + .4byte gObjectEventGraphicsInfo_83A4A74 + .4byte gObjectEventGraphicsInfo_83A4A98 + .4byte gObjectEventGraphicsInfo_83A4ABC + .4byte gObjectEventGraphicsInfo_83A4AE0 + .4byte gObjectEventGraphicsInfo_83A4B04 + .4byte gObjectEventGraphicsInfo_83A5110 + .4byte gObjectEventGraphicsInfo_83A499C + .4byte gObjectEventGraphicsInfo_83A4B28 + .4byte gObjectEventGraphicsInfo_83A4F84 + .4byte gObjectEventGraphicsInfo_83A4FF0 + .4byte gObjectEventGraphicsInfo_83A50C8 + .4byte gObjectEventGraphicsInfo_83A5014 + .4byte gObjectEventGraphicsInfo_83A5080 + .4byte gObjectEventGraphicsInfo_83A50A4 + .4byte gObjectEventGraphicsInfo_83A5038 + .4byte gObjectEventGraphicsInfo_83A4B4C + .4byte gObjectEventGraphicsInfo_83A4B70 + .4byte gObjectEventGraphicsInfo_83A505C + .4byte gObjectEventGraphicsInfo_83A4B94 + .4byte gObjectEventGraphicsInfo_83A4BB8 + .4byte gObjectEventGraphicsInfo_83A4BDC + .4byte gObjectEventGraphicsInfo_83A4C00 + .4byte gObjectEventGraphicsInfo_83A4C24 + .4byte gObjectEventGraphicsInfo_83A4C48 + .4byte gObjectEventGraphicsInfo_83A4C6C + .4byte gObjectEventGraphicsInfo_83A4C90 + .4byte gObjectEventGraphicsInfo_83A4CB4 + .4byte gObjectEventGraphicsInfo_83A4CD8 + .4byte gObjectEventGraphicsInfo_83A4CFC + .4byte gObjectEventGraphicsInfo_83A4D20 + .4byte gObjectEventGraphicsInfo_83A4D44 + .4byte gObjectEventGraphicsInfo_83A4FA8 + .4byte gObjectEventGraphicsInfo_83A4D68 + .4byte gObjectEventGraphicsInfo_83A4D8C + .4byte gObjectEventGraphicsInfo_83A4DB0 + .4byte gObjectEventGraphicsInfo_83A4DD4 + .4byte gObjectEventGraphicsInfo_83A4E64 + .4byte gObjectEventGraphicsInfo_83A4E88 + .4byte gObjectEventGraphicsInfo_83A4EAC + .4byte gObjectEventGraphicsInfo_83A4EF4 + .4byte gObjectEventGraphicsInfo_83A4ED0 + .4byte gObjectEventGraphicsInfo_83A4F18 + .4byte gObjectEventGraphicsInfo_83A4F3C + .4byte gObjectEventGraphicsInfo_83A4F60 + .4byte gObjectEventGraphicsInfo_83A4FCC + .4byte gObjectEventGraphicsInfo_83A4DF8 + .4byte gObjectEventGraphicsInfo_83A4E1C + .4byte gObjectEventGraphicsInfo_83A4E40 + .4byte gObjectEventGraphicsInfo_83A5134 + +gFieldEffectObjectTemplatePointers:: @ 83A0010 + .4byte gUnknown_83A537C + .4byte gUnknown_83A5394 + .4byte gUnknown_83A53AC + .4byte gUnknown_83A53C4 + .4byte gUnknown_83A5420 + .4byte gUnknown_83A5488 + .4byte gUnknown_83A54E4 + .4byte gUnknown_83A556C + .4byte gUnknown_83A5604 + .4byte gUnknown_83A5648 + .4byte gUnknown_83A5698 + .4byte gUnknown_83A56F4 + .4byte gUnknown_83A583C + .4byte gUnknown_83A589C + .4byte gUnknown_83A58E0 + .4byte gUnknown_83A593C + .4byte gUnknown_83A59A4 + .4byte gUnknown_83A5A30 + .4byte gUnknown_83A5A88 + .4byte gUnknown_83A5AD8 + .4byte gUnknown_83A5B74 + .4byte gUnknown_83A5C34 + .4byte NULL + .4byte gUnknown_83A5750 + .4byte gUnknown_83A5CB4 + .4byte gUnknown_83A5D34 + .4byte gUnknown_83A5E00 + .4byte gUnknown_83A57EC + .4byte gUnknown_83A5D84 + .4byte gUnknown_83A5B1C + .4byte gUnknown_83A5E38 + .4byte gUnknown_83A5E64 + .4byte gUnknown_83A5EC0 + .4byte gUnknown_83A5F24 + .4byte gUnknown_83A5FA4 + .4byte gUnknown_83A5FE0 gSpriteImages_83A00A0:: @ 83A00A0 obj_frame_tiles gUnknown_835BB68, 0x100 @@ -3170,7 +3650,22 @@ gAnimCmd_83A3298:: @ 83A3298 obj_image_anim_frame 3, 30, 0x40 obj_image_anim_jump 0 - .incbin "baserom.gba", 0x3A32AC, 0x68 +gUnknown_83A32AC:: @ 83A32AC + obj_rot_scal_anim_frame 0, 0, 1, 1 + obj_rot_scal_anim_frame 0, 0, 0, 1 + obj_rot_scal_anim_frame 0, 0, 0, 1 + obj_rot_scal_anim_frame 0, 0, 0, 1 + obj_rot_scal_anim_loop 7 + obj_rot_scal_anim_jump 0 + +gUnknown_83A32DC:: @ 83A32DC + obj_rot_scal_anim_frame 0, 0, -1, 1 + obj_rot_scal_anim_frame 0, 0, 0, 1 + obj_rot_scal_anim_loop 15 + obj_rot_scal_anim_frame 0, 0, 1, 1 + obj_rot_scal_anim_frame 0, 0, 0, 1 + obj_rot_scal_anim_loop 15 + obj_rot_scal_anim_jump 0 gAnimTable_83A3314:: @ 83A3314 .4byte gAnimCmd_83A2950 @@ -3445,25 +3940,31 @@ gUnknown_83A3698:: @ 83A3698 .byte 3, 7, 0, 4 .4byte 0x00000000, 0x00000000 -gEventObjectBaseOam_128x64:: +gObjectEventBaseOam_128x64:: .4byte 0x00000000, 0x00000800 + +gObjectEventBaseOam_Unknown1:: .4byte 0x00004000, 0x00000800 -gEventObjectBaseOam_16x16:: +gObjectEventBaseOam_16x16:: .4byte 0x40000000, 0x00000800 -gEventObjectBaseOam_32x16:: +gObjectEventBaseOam_32x16:: .4byte 0x80004000, 0x00000800 + +gObjectEventBaseOam_Unknown2:: .4byte 0x40004000, 0x00000800 + +gObjectEventBaseOam_Unknown3:: .4byte 0xc0004000, 0x00000800 -gEventObjectBaseOam_16x32:: +gObjectEventBaseOam_16x32:: .4byte 0x80008000, 0x00000800 -gEventObjectBaseOam_32x32:: @ 83A3718 +gObjectEventBaseOam_32x32:: @ 83A3718 .4byte 0x80000000, 0x00000800 -gEventObjectBaseOam_64x64:: @ 83A3720 +gObjectEventBaseOam_64x64:: @ 83A3720 .4byte 0xc0000000, 0x00000800 gSubsprites_83A3728:: @ 83A3728 @@ -3582,7 +4083,71 @@ gSubspriteTables_83A37F0:: @ 83A37F0 .align 2 .4byte gSubsprites_83A37E8 - .incbin "baserom.gba", 0x3a3820, 0xa0 +gUnknown_83A3820:: @ 83A3820 + subsprite 232, 232, 2, 0, 32x8 + subsprite 8, 232, 2, 4, 16x8 + subsprite 232, 240, 2, 6, 32x8 + subsprite 8, 240, 2, 10, 16x8 + subsprite 232, 248, 2, 12, 32x8 + subsprite 8, 248, 2, 16, 16x8 + subsprite 232, 0, 2, 18, 32x8 + subsprite 8, 0, 2, 22, 16x8 + subsprite 232, 8, 2, 24, 32x8 + subsprite 8, 8, 2, 28, 16x8 + subsprite 232, 16, 2, 30, 32x8 + subsprite 8, 16, 2, 34, 16x8 + +gUnknown_83A3850:: @ 83A3850 + .byte 0xC + .align 2 + .4byte gUnknown_83A3820 + .byte 0xC + .align 2 + .4byte gUnknown_83A3820 + .byte 0xC + .align 2 + .4byte gUnknown_83A3820 + .byte 0xC + .align 2 + .4byte gUnknown_83A3820 + .byte 0xC + .align 2 + .4byte gUnknown_83A3820 + .byte 0xC + .align 2 + .4byte gUnknown_83A3820 + +gUnknown_83A3880:: @ 83A3880 + subsprite 224, 240, 2, 0, 64x32 + +gUnknown_83A3884:: @ 83A3884 + subsprite 224, 240, 1, 0, 64x32 + +gUnknown_83A3888:: @ 83A3888 + subsprite 224, 240, 2, 0, 64x32 + +gUnknown_83A388C:: @ 83A388C + subsprite 224, 240, 2, 0, 64x32 + +gUnknown_83A3890:: @ 83A3890 + .byte 0x0 + .align 2 + .4byte NULL + .byte 1 + .align 2 + .4byte gUnknown_83A3880 + .byte 1 + .align 2 + .4byte gUnknown_83A3884 + .byte 1 + .align 2 + .4byte gUnknown_83A3888 + .byte 1 + .align 2 + .4byte gUnknown_83A388C + .byte 1 + .align 2 + .4byte gUnknown_83A388C gSubsprites_83A38C0:: @ 83A38C0 subsprite 224, 224, 2, 0x0000, 64x64 @@ -3616,7 +4181,93 @@ gSubspriteTables_83A38D0:: @ 83A38D0 .align 2 .4byte gSubsprites_83A38CC - .incbin "baserom.gba", 0x3a3900, 0x120 +gUnknown_83A3900:: @ 83A3900 + subsprite 208, 236, 2, 0, 32x8 + subsprite 240, 236, 2, 4, 32x8 + subsprite 16, 236, 2, 8, 32x8 + subsprite 208, 244, 2, 12, 32x8 + subsprite 240, 244, 2, 16, 32x8 + subsprite 16, 244, 2, 20, 32x8 + subsprite 208, 252, 2, 24, 32x8 + subsprite 240, 252, 2, 28, 32x8 + subsprite 16, 252, 2, 32, 32x8 + subsprite 208, 4, 2, 36, 32x8 + subsprite 240, 4, 2, 40, 32x8 + subsprite 16, 4, 2, 44, 32x8 + subsprite 208, 12, 2, 48, 32x8 + subsprite 240, 12, 2, 52, 32x8 + subsprite 16, 12, 2, 56, 32x8 + +gUnknown_83A393C:: @ 83A393C + subsprite 208, 236, 1, 0, 32x8 + subsprite 240, 236, 1, 4, 32x8 + subsprite 16, 236, 1, 8, 32x8 + subsprite 208, 244, 1, 12, 32x8 + subsprite 240, 244, 1, 16, 32x8 + subsprite 16, 244, 1, 20, 32x8 + subsprite 208, 252, 1, 24, 32x8 + subsprite 240, 252, 1, 28, 32x8 + subsprite 16, 252, 1, 32, 32x8 + subsprite 208, 4, 1, 36, 32x8 + subsprite 240, 4, 1, 40, 32x8 + subsprite 16, 4, 1, 44, 32x8 + subsprite 208, 12, 1, 48, 32x8 + subsprite 240, 12, 1, 52, 32x8 + subsprite 16, 12, 1, 56, 32x8 + +gUnknown_83A3978:: @ 83A3978 + subsprite 208, 236, 2, 0, 32x8 + subsprite 240, 236, 2, 4, 32x8 + subsprite 16, 236, 2, 8, 32x8 + subsprite 208, 244, 2, 12, 32x8 + subsprite 240, 244, 2, 16, 32x8 + subsprite 16, 244, 2, 20, 32x8 + subsprite 208, 252, 2, 24, 32x8 + subsprite 240, 252, 2, 28, 32x8 + subsprite 16, 252, 2, 32, 32x8 + subsprite 208, 4, 2, 36, 32x8 + subsprite 240, 4, 2, 40, 32x8 + subsprite 16, 4, 2, 44, 32x8 + subsprite 208, 12, 2, 48, 32x8 + subsprite 240, 12, 2, 52, 32x8 + subsprite 16, 12, 2, 56, 32x8 + +gUnknown_83A39B4:: @ 83A39B4 + subsprite 208, 236, 1, 0, 32x8 + subsprite 240, 236, 1, 4, 32x8 + subsprite 16, 236, 1, 8, 32x8 + subsprite 208, 244, 1, 12, 32x8 + subsprite 240, 244, 1, 16, 32x8 + subsprite 16, 244, 1, 20, 32x8 + subsprite 208, 252, 2, 24, 32x8 + subsprite 240, 252, 2, 28, 32x8 + subsprite 16, 252, 2, 32, 32x8 + subsprite 208, 4, 2, 36, 32x8 + subsprite 240, 4, 2, 40, 32x8 + subsprite 16, 4, 2, 44, 32x8 + subsprite 208, 12, 2, 48, 32x8 + subsprite 240, 12, 2, 52, 32x8 + subsprite 16, 12, 2, 56, 32x8 + +gUnknown_83A39F0:: @ 83A39F0 + .byte 0xF + .align 2 + .4byte gUnknown_83A3900 + .byte 0xF + .align 2 + .4byte gUnknown_83A3900 + .byte 0xF + .align 2 + .4byte gUnknown_83A393C + .byte 0xF + .align 2 + .4byte gUnknown_83A3978 + .byte 0xF + .align 2 + .4byte gUnknown_83A39B4 + .byte 0xF + .align 2 + .4byte gUnknown_83A39B4 gSubsprites_83A3A20:: @ 83A3A20 subsprite 224, 240, 2, 0x0000, 64x32 @@ -3656,2181 +4307,4877 @@ gSubspriteTables_83A3A50:: @ 83A3A50 .align 2 .4byte gSubsprites_83A3A40 - .incbin "baserom.gba", 0x3A3A80, 0x130 - -gMapObjectGraphicsInfo_83A3BB0:: @ 83A3BB0 +gUnknown_83A3A80:: @ 83A3A80 + subsprite 208, 236, 2, 0, 32x8 + subsprite 240, 236, 2, 4, 32x8 + subsprite 16, 236, 2, 8, 16x8 + subsprite 32, 236, 2, 10, 8x8 + subsprite 208, 244, 2, 11, 32x8 + subsprite 240, 244, 2, 15, 32x8 + subsprite 16, 244, 2, 19, 16x8 + subsprite 32, 244, 2, 21, 8x8 + subsprite 208, 252, 2, 22, 32x8 + subsprite 240, 252, 2, 26, 32x8 + subsprite 16, 252, 2, 30, 16x8 + subsprite 32, 252, 2, 32, 8x8 + subsprite 208, 4, 2, 33, 32x8 + subsprite 240, 4, 2, 37, 32x8 + subsprite 16, 4, 2, 41, 16x8 + subsprite 32, 4, 2, 43, 8x8 + +gUnknown_83A3AC0:: @ 83A3AC0 + subsprite 208, 236, 1, 0, 32x8 + subsprite 240, 236, 1, 4, 32x8 + subsprite 16, 236, 1, 8, 16x8 + subsprite 32, 236, 1, 10, 8x8 + subsprite 208, 244, 1, 11, 32x8 + subsprite 240, 244, 1, 15, 32x8 + subsprite 16, 244, 1, 19, 16x8 + subsprite 32, 244, 1, 21, 8x8 + subsprite 208, 252, 1, 22, 32x8 + subsprite 240, 252, 1, 26, 32x8 + subsprite 16, 252, 1, 30, 16x8 + subsprite 32, 252, 1, 32, 8x8 + subsprite 208, 4, 1, 33, 32x8 + subsprite 240, 4, 1, 37, 32x8 + subsprite 16, 4, 1, 41, 16x8 + subsprite 32, 4, 1, 43, 8x8 + +gUnknown_83A3B00:: @ 83A3B00 + subsprite 208, 236, 2, 0, 32x8 + subsprite 240, 236, 2, 4, 32x8 + subsprite 16, 236, 2, 8, 16x8 + subsprite 32, 236, 2, 10, 8x8 + subsprite 208, 244, 2, 11, 32x8 + subsprite 240, 244, 2, 15, 32x8 + subsprite 16, 244, 2, 19, 16x8 + subsprite 32, 244, 2, 21, 8x8 + subsprite 208, 252, 2, 22, 32x8 + subsprite 240, 252, 2, 26, 32x8 + subsprite 16, 252, 2, 30, 16x8 + subsprite 32, 252, 2, 32, 8x8 + subsprite 208, 4, 2, 33, 32x8 + subsprite 240, 4, 2, 37, 32x8 + subsprite 16, 4, 2, 41, 16x8 + subsprite 32, 4, 2, 43, 8x8 + +gUnknown_83A3B40:: @ 83A3B40 + subsprite 208, 236, 1, 0, 32x8 + subsprite 240, 236, 1, 4, 32x8 + subsprite 16, 236, 1, 8, 16x8 + subsprite 32, 236, 1, 10, 8x8 + subsprite 208, 244, 1, 11, 32x8 + subsprite 240, 244, 1, 15, 32x8 + subsprite 16, 244, 1, 19, 16x8 + subsprite 32, 244, 1, 21, 8x8 + subsprite 208, 252, 2, 22, 32x8 + subsprite 240, 252, 2, 26, 32x8 + subsprite 16, 252, 2, 30, 16x8 + subsprite 32, 252, 2, 32, 8x8 + subsprite 208, 4, 2, 33, 32x8 + subsprite 240, 4, 2, 37, 32x8 + subsprite 16, 4, 2, 41, 16x8 + subsprite 32, 4, 2, 43, 8x8 + +gUnknown_83A3B80:: @ 83A3B80 + .byte 0x10 + .align 2 + .4byte gUnknown_83A3A80 + .byte 0x10 + .align 2 + .4byte gUnknown_83A3A80 + .byte 0x10 + .align 2 + .4byte gUnknown_83A3AC0 + .byte 0x10 + .align 2 + .4byte gUnknown_83A3B00 + .byte 0x10 + .align 2 + .4byte gUnknown_83A3B40 + .byte 0x10 + .align 2 + .4byte gUnknown_83A3B40 + +gObjectEventGraphicsInfo_83A3BB0:: @ 83A3BB0 .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 16, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3470 .4byte gSpriteImages_83A00A0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3BD4:: @ 83A3BD4 +gObjectEventGraphicsInfo_83A3BD4:: @ 83A3BD4 .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 2 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0140 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3BF8:: @ 83A3BF8 +gObjectEventGraphicsInfo_83A3BF8:: @ 83A3BF8 .2byte 0xFFFF, 0x1100, 0x11FF, 0x100, 16, 32 .byte 0 | (1 << 4) | (0 << 6) | (1 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3584 .4byte gSpriteImages_83A0270 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3C1C:: @ 83A3C1C +gObjectEventGraphicsInfo_83A3C1C:: @ 83A3C1C .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3638 .4byte gSpriteImages_83A0330 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3C40:: @ 83A3C40 +gObjectEventGraphicsInfo_83A3C40:: @ 83A3C40 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A04C0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3C64:: @ 83A3C64 +gObjectEventGraphicsInfo_83A3C64:: @ 83A3C64 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0420 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3C88:: @ 83A3C88 +gObjectEventGraphicsInfo_83A3C88:: @ 83A3C88 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0470 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3CAC:: @ 83A3CAC +gObjectEventGraphicsInfo_83A3CAC:: @ 83A3CAC .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0508 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3CD0:: @ 83A3CD0 +gObjectEventGraphicsInfo_83A3CD0:: @ 83A3CD0 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0550 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3CF4:: @ 83A3CF4 +gObjectEventGraphicsInfo_83A3CF4:: @ 83A3CF4 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A05A0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3D18:: @ 83A3D18 +gObjectEventGraphicsInfo_83A3D18:: @ 83A3D18 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A05E8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3D3C:: @ 83A3D3C +gObjectEventGraphicsInfo_83A3D3C:: @ 83A3D3C .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0638 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3D60:: @ 83A3D60 +gObjectEventGraphicsInfo_83A3D60:: @ 83A3D60 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0688 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3D84:: @ 83A3D84 +gObjectEventGraphicsInfo_83A3D84:: @ 83A3D84 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A06D8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3DA8:: @ 83A3DA8 +gObjectEventGraphicsInfo_83A3DA8:: @ 83A3DA8 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0C40 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3DCC:: @ 83A3DCC +gObjectEventGraphicsInfo_83A3DCC:: @ 83A3DCC .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0720 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3DF0:: @ 83A3DF0 +gObjectEventGraphicsInfo_83A3DF0:: @ 83A3DF0 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0770 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3E14:: @ 83A3E14 +gObjectEventGraphicsInfo_83A3E14:: @ 83A3E14 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A07C0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3E38:: @ 83A3E38 +gObjectEventGraphicsInfo_83A3E38:: @ 83A3E38 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0808 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3E5C:: @ 83A3E5C +gObjectEventGraphicsInfo_83A3E5C:: @ 83A3E5C .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0858 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3E80:: @ 83A3E80 +gObjectEventGraphicsInfo_83A3E80:: @ 83A3E80 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A08A8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3EA4:: @ 83A3EA4 +gObjectEventGraphicsInfo_83A3EA4:: @ 83A3EA4 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A08F8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3EC8:: @ 83A3EC8 +gObjectEventGraphicsInfo_83A3EC8:: @ 83A3EC8 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0940 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3EEC:: @ 83A3EEC +gObjectEventGraphicsInfo_83A3EEC:: @ 83A3EEC .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0988 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3F10:: @ 83A3F10 +gObjectEventGraphicsInfo_83A3F10:: @ 83A3F10 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A09D8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3F34:: @ 83A3F34 +gObjectEventGraphicsInfo_83A3F34:: @ 83A3F34 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0A20 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3F58:: @ 83A3F58 +gObjectEventGraphicsInfo_83A3F58:: @ 83A3F58 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0AB8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3F7C:: @ 83A3F7C +gObjectEventGraphicsInfo_83A3F7C:: @ 83A3F7C .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0B00 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3FA0:: @ 83A3FA0 +gObjectEventGraphicsInfo_83A3FA0:: @ 83A3FA0 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0B50 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3FC4:: @ 83A3FC4 +gObjectEventGraphicsInfo_83A3FC4:: @ 83A3FC4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0BA0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A3FE8:: @ 83A3FE8 +gObjectEventGraphicsInfo_83A3FE8:: @ 83A3FE8 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0BF0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A400C:: @ 83A400C +gObjectEventGraphicsInfo_83A400C:: @ 83A400C .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0C90 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4030:: @ 83A4030 +gObjectEventGraphicsInfo_83A4030:: @ 83A4030 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0CE0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4054:: @ 83A4054 +gObjectEventGraphicsInfo_83A4054:: @ 83A4054 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0D30 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4078:: @ 83A4078 +gObjectEventGraphicsInfo_83A4078:: @ 83A4078 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0D78 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A409C:: @ 83A409C +gObjectEventGraphicsInfo_83A409C:: @ 83A409C .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0DC8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A40C0:: @ 83A40C0 +gObjectEventGraphicsInfo_83A40C0:: @ 83A40C0 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0E18 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A40E4:: @ 83A40E4 +gObjectEventGraphicsInfo_83A40E4:: @ 83A40E4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0E68 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4108:: @ 83A4108 +gObjectEventGraphicsInfo_83A4108:: @ 83A4108 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0EB8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A412C:: @ 83A412C +gObjectEventGraphicsInfo_83A412C:: @ 83A412C .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0F08 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4150:: @ 83A4150 +gObjectEventGraphicsInfo_83A4150:: @ 83A4150 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0F58 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4174:: @ 83A4174 +gObjectEventGraphicsInfo_83A4174:: @ 83A4174 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0FA8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4198:: @ 83A4198 +gObjectEventGraphicsInfo_83A4198:: @ 83A4198 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0FF8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A41BC:: @ 83A41BC +gObjectEventGraphicsInfo_83A41BC:: @ 83A41BC .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1040 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A41E0:: @ 83A41E0 +gObjectEventGraphicsInfo_83A41E0:: @ 83A41E0 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1090 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4204:: @ 83A4204 +gObjectEventGraphicsInfo_83A4204:: @ 83A4204 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A10D8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4228:: @ 83A4228 +gObjectEventGraphicsInfo_83A4228:: @ 83A4228 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1120 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A424C:: @ 83A424C +gObjectEventGraphicsInfo_83A424C:: @ 83A424C .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1170 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4270:: @ 83A4270 +gObjectEventGraphicsInfo_83A4270:: @ 83A4270 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A11C0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4294:: @ 83A4294 +gObjectEventGraphicsInfo_83A4294:: @ 83A4294 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1210 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A42B8:: @ 83A42B8 +gObjectEventGraphicsInfo_83A42B8:: @ 83A42B8 .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 2 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1260 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A42DC:: @ 83A42DC +gObjectEventGraphicsInfo_83A42DC:: @ 83A42DC .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 2 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A12B0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4300:: @ 83A4300 +gObjectEventGraphicsInfo_83A4300:: @ 83A4300 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A35E4 .4byte gSpriteImages_83A12F8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4324:: @ 83A4324 +gObjectEventGraphicsInfo_83A4324:: @ 83A4324 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1348 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4348:: @ 83A4348 +gObjectEventGraphicsInfo_83A4348:: @ 83A4348 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1390 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A436C:: @ 83A436C +gObjectEventGraphicsInfo_83A436C:: @ 83A436C .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1398 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4390:: @ 83A4390 +gObjectEventGraphicsInfo_83A4390:: @ 83A4390 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A13E0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A43B4:: @ 83A43B4 +gObjectEventGraphicsInfo_83A43B4:: @ 83A43B4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1430 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A43D8:: @ 83A43D8 +gObjectEventGraphicsInfo_83A43D8:: @ 83A43D8 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1480 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A43FC:: @ 83A43FC +gObjectEventGraphicsInfo_83A43FC:: @ 83A43FC .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A14C8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4420:: @ 83A4420 +gObjectEventGraphicsInfo_83A4420:: @ 83A4420 .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0A70 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4444:: @ 83A4444 +gObjectEventGraphicsInfo_83A4444:: @ 83A4444 .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .byte 4 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3660 .4byte gSpriteImages_83A1510 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4468:: @ 83A4468 +gObjectEventGraphicsInfo_83A4468:: @ 83A4468 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1530 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A448C:: @ 83A448C +gObjectEventGraphicsInfo_83A448C:: @ 83A448C .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1578 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A44B0:: @ 83A44B0 +gObjectEventGraphicsInfo_83A44B0:: @ 83A44B0 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A15C0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A44D4:: @ 83A44D4 +gObjectEventGraphicsInfo_83A44D4:: @ 83A44D4 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1608 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A44F8:: @ 83A44F8 +gObjectEventGraphicsInfo_83A44F8:: @ 83A44F8 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1650 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A451C:: @ 83A451C +gObjectEventGraphicsInfo_83A451C:: @ 83A451C .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3658 .4byte gSpriteImages_83A1698 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4540:: @ 83A4540 +gObjectEventGraphicsInfo_83A4540:: @ 83A4540 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A16B8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4564:: @ 83A4564 +gObjectEventGraphicsInfo_83A4564:: @ 83A4564 .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 16, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3470 .4byte gSpriteImages_83A0188 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4588:: @ 83A4588 +gObjectEventGraphicsInfo_83A4588:: @ 83A4588 .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 32, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 2 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0228 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A45AC:: @ 83A45AC +gObjectEventGraphicsInfo_83A45AC:: @ 83A45AC .2byte 0xFFFF, 0x1110, 0x11FF, 0x100, 16, 32 .byte 0 | (1 << 4) | (0 << 6) | (1 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3584 .4byte gSpriteImages_83A02D0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A45D0:: @ 83A45D0 +gObjectEventGraphicsInfo_83A45D0:: @ 83A45D0 .2byte 0xFFFF, 0x1110, 0x1102, 0x100, 16, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3638 .4byte gSpriteImages_83A0378 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A45F4:: @ 83A45F4 +gObjectEventGraphicsInfo_83A45F4:: @ 83A45F4 .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 .byte 10 | (1 << 4) | (0 << 6) | (0 << 7) .byte 2 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A0140 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4618:: @ 83A4618 +gObjectEventGraphicsInfo_83A4618:: @ 83A4618 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A16C0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A463C:: @ 83A463C +gObjectEventGraphicsInfo_83A463C:: @ 83A463C .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1708 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4660:: @ 83A4660 +gObjectEventGraphicsInfo_83A4660:: @ 83A4660 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1750 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4684:: @ 83A4684 +gObjectEventGraphicsInfo_83A4684:: @ 83A4684 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1798 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A46A8:: @ 83A46A8 +gObjectEventGraphicsInfo_83A46A8:: @ 83A46A8 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A17E0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A46CC:: @ 83A46CC +gObjectEventGraphicsInfo_83A46CC:: @ 83A46CC .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1828 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A46F0:: @ 83A46F0 +gObjectEventGraphicsInfo_83A46F0:: @ 83A46F0 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1870 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4714:: @ 83A4714 +gObjectEventGraphicsInfo_83A4714:: @ 83A4714 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A18B8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4738:: @ 83A4738 +gObjectEventGraphicsInfo_83A4738:: @ 83A4738 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1900 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A475C:: @ 83A475C +gObjectEventGraphicsInfo_83A475C:: @ 83A475C .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1948 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4780:: @ 83A4780 +gObjectEventGraphicsInfo_83A4780:: @ 83A4780 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1990 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A47A4:: @ 83A47A4 +gObjectEventGraphicsInfo_83A47A4:: @ 83A47A4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A19D8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A47C8:: @ 83A47C8 +gObjectEventGraphicsInfo_83A47C8:: @ 83A47C8 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1A20 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A47EC:: @ 83A47EC +gObjectEventGraphicsInfo_83A47EC:: @ 83A47EC .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1A68 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4810:: @ 83A4810 +gObjectEventGraphicsInfo_83A4810:: @ 83A4810 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1AB0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4834:: @ 83A4834 +gObjectEventGraphicsInfo_83A4834:: @ 83A4834 .2byte 0xFFFF, 0x1105, 0x11FF, 0x100, 16, 32 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1AF8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4858:: @ 83A4858 +gObjectEventGraphicsInfo_83A4858:: @ 83A4858 .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3668 .4byte gSpriteImages_83A1B40 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A487C:: @ 83A487C +gObjectEventGraphicsInfo_83A487C:: @ 83A487C .2byte 0xFFFF, 0x1110, 0x1102, 0x200, 32, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3668 .4byte gSpriteImages_83A1BA0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A48A0:: @ 83A48A0 +gObjectEventGraphicsInfo_83A48A0:: @ 83A48A0 .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A363C .4byte gSpriteImages_83A0330 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A48C4:: @ 83A48C4 +gObjectEventGraphicsInfo_83A48C4:: @ 83A48C4 .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3640 .4byte gSpriteImages_83A03C0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A48E8:: @ 83A48E8 +gObjectEventGraphicsInfo_83A48E8:: @ 83A48E8 .2byte 0xFFFF, 0x1100, 0x1102, 0x100, 16, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A363C .4byte gSpriteImages_83A0378 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A490C:: @ 83A490C +gObjectEventGraphicsInfo_83A490C:: @ 83A490C .2byte 0xFFFF, 0x1100, 0x1102, 0x200, 32, 32 .byte 0 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3640 .4byte gSpriteImages_83A03F0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4930:: @ 83A4930 +gObjectEventGraphicsInfo_83A4930:: @ 83A4930 .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 32, 16 .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_32x16 + .4byte gObjectEventBaseOam_32x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1C00 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4954:: @ 83A4954 +gObjectEventGraphicsInfo_83A4954:: @ 83A4954 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1C08 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4978:: @ 83A4978 +gObjectEventGraphicsInfo_83A4978:: @ 83A4978 .2byte 0xFFFF, 0x1104, 0x11FF, 0x100, 16, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1C10 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A499C:: @ 83A499C +gObjectEventGraphicsInfo_83A499C:: @ 83A499C .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1D38 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A49C0:: @ 83A49C0 +gObjectEventGraphicsInfo_83A49C0:: @ 83A49C0 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1C58 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A49E4:: @ 83A49E4 +gObjectEventGraphicsInfo_83A49E4:: @ 83A49E4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1C60 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4A08:: @ 83A4A08 +gObjectEventGraphicsInfo_83A4A08:: @ 83A4A08 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1C68 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4A2C:: @ 83A4A2C +gObjectEventGraphicsInfo_83A4A2C:: @ 83A4A2C .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1C70 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4A50:: @ 83A4A50 +gObjectEventGraphicsInfo_83A4A50:: @ 83A4A50 .2byte 0xFFFF, 0x1106, 0x11FF, 0x100, 16, 32 .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1C78 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4A74:: @ 83A4A74 +gObjectEventGraphicsInfo_83A4A74:: @ 83A4A74 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1C80 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4A98:: @ 83A4A98 +gObjectEventGraphicsInfo_83A4A98:: @ 83A4A98 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1C88 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4ABC:: @ 83A4ABC +gObjectEventGraphicsInfo_83A4ABC:: @ 83A4ABC .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1C90 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4AE0:: @ 83A4AE0 +gObjectEventGraphicsInfo_83A4AE0:: @ 83A4AE0 .2byte 0xFFFF, 0x1113, 0x11FF, 0x200, 32, 32 .byte 10 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1C98 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4B04:: @ 83A4B04 +gObjectEventGraphicsInfo_83A4B04:: @ 83A4B04 .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 .byte 3 | (0 << 4) | (1 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3314 .4byte gSpriteImages_83A1CA0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4B28:: @ 83A4B28 +gObjectEventGraphicsInfo_83A4B28:: @ 83A4B28 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1D80 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4B4C:: @ 83A4B4C +gObjectEventGraphicsInfo_83A4B4C:: @ 83A4B4C .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1E10 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4B70:: @ 83A4B70 +gObjectEventGraphicsInfo_83A4B70:: @ 83A4B70 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1E58 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4B94:: @ 83A4B94 +gObjectEventGraphicsInfo_83A4B94:: @ 83A4B94 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1EA0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4BB8:: @ 83A4BB8 +gObjectEventGraphicsInfo_83A4BB8:: @ 83A4BB8 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1EE8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4BDC:: @ 83A4BDC +gObjectEventGraphicsInfo_83A4BDC:: @ 83A4BDC .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1F30 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4C00:: @ 83A4C00 +gObjectEventGraphicsInfo_83A4C00:: @ 83A4C00 .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1F78 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4C24:: @ 83A4C24 +gObjectEventGraphicsInfo_83A4C24:: @ 83A4C24 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1FC0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4C48:: @ 83A4C48 +gObjectEventGraphicsInfo_83A4C48:: @ 83A4C48 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2008 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4C6C:: @ 83A4C6C +gObjectEventGraphicsInfo_83A4C6C:: @ 83A4C6C .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2050 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4C90:: @ 83A4C90 +gObjectEventGraphicsInfo_83A4C90:: @ 83A4C90 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2098 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4CB4:: @ 83A4CB4 +gObjectEventGraphicsInfo_83A4CB4:: @ 83A4CB4 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A20E0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4CD8:: @ 83A4CD8 +gObjectEventGraphicsInfo_83A4CD8:: @ 83A4CD8 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2128 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4CFC:: @ 83A4CFC +gObjectEventGraphicsInfo_83A4CFC:: @ 83A4CFC .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2170 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4D20:: @ 83A4D20 +gObjectEventGraphicsInfo_83A4D20:: @ 83A4D20 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A21B8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4D44:: @ 83A4D44 +gObjectEventGraphicsInfo_83A4D44:: @ 83A4D44 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2200 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4D68:: @ 83A4D68 +gObjectEventGraphicsInfo_83A4D68:: @ 83A4D68 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2248 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4D8C:: @ 83A4D8C +gObjectEventGraphicsInfo_83A4D8C:: @ 83A4D8C .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2290 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4DB0:: @ 83A4DB0 +gObjectEventGraphicsInfo_83A4DB0:: @ 83A4DB0 .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A22D8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4DD4:: @ 83A4DD4 +gObjectEventGraphicsInfo_83A4DD4:: @ 83A4DD4 .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2320 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4DF8:: @ 83A4DF8 +gObjectEventGraphicsInfo_83A4DF8:: @ 83A4DF8 .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2368 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4E1C:: @ 83A4E1C +gObjectEventGraphicsInfo_83A4E1C:: @ 83A4E1C .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A23B0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4E40:: @ 83A4E40 +gObjectEventGraphicsInfo_83A4E40:: @ 83A4E40 .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A23F8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4E64:: @ 83A4E64 +gObjectEventGraphicsInfo_83A4E64:: @ 83A4E64 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2440 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4E88:: @ 83A4E88 +gObjectEventGraphicsInfo_83A4E88:: @ 83A4E88 .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2488 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4EAC:: @ 83A4EAC +gObjectEventGraphicsInfo_83A4EAC:: @ 83A4EAC .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A24D0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4ED0:: @ 83A4ED0 +gObjectEventGraphicsInfo_83A4ED0:: @ 83A4ED0 .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2518 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4EF4:: @ 83A4EF4 +gObjectEventGraphicsInfo_83A4EF4:: @ 83A4EF4 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2560 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4F18:: @ 83A4F18 +gObjectEventGraphicsInfo_83A4F18:: @ 83A4F18 .2byte 0xFFFF, 0x1104, 0x11FF, 0x200, 32, 32 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A25A8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4F3C:: @ 83A4F3C +gObjectEventGraphicsInfo_83A4F3C:: @ 83A4F3C .2byte 0xFFFF, 0x1103, 0x11FF, 0x200, 32, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_32x32 + .4byte gObjectEventBaseOam_32x32 .4byte gSubspriteTables_83A37F0 .4byte gAnimTable_83A33BC .4byte gSpriteImages_83A25F0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4F60:: @ 83A4F60 +gObjectEventGraphicsInfo_83A4F60:: @ 83A4F60 .2byte 0xFFFF, 0x1105, 0x11FF, 0x80, 16, 16 .byte 4 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2638 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4F84:: @ 83A4F84 +gObjectEventGraphicsInfo_83A4F84:: @ 83A4F84 .2byte 0xFFFF, 0x1106, 0x11FF, 0x80, 16, 16 .byte 5 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2680 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4FA8:: @ 83A4FA8 +gObjectEventGraphicsInfo_83A4FA8:: @ 83A4FA8 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2878 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4FCC:: @ 83A4FCC +gObjectEventGraphicsInfo_83A4FCC:: @ 83A4FCC .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A28C0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A4FF0:: @ 83A4FF0 +gObjectEventGraphicsInfo_83A4FF0:: @ 83A4FF0 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A26C8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A5014:: @ 83A5014 +gObjectEventGraphicsInfo_83A5014:: @ 83A5014 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1DC8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A5038:: @ 83A5038 +gObjectEventGraphicsInfo_83A5038:: @ 83A5038 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2710 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A505C:: @ 83A505C +gObjectEventGraphicsInfo_83A505C:: @ 83A505C .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2758 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A5080:: @ 83A5080 +gObjectEventGraphicsInfo_83A5080:: @ 83A5080 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A27A0 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A50A4:: @ 83A50A4 +gObjectEventGraphicsInfo_83A50A4:: @ 83A50A4 .2byte 0xFFFF, 0x1103, 0x11FF, 0x80, 16, 16 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A27E8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A50C8:: @ 83A50C8 +gObjectEventGraphicsInfo_83A50C8:: @ 83A50C8 .2byte 0xFFFF, 0x1104, 0x11FF, 0x80, 16, 16 .byte 3 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x16 + .4byte gObjectEventBaseOam_16x16 .4byte gSubspriteTables_83A3748 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2830 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A50EC:: @ 83A50EC +gObjectEventGraphicsInfo_83A50EC:: @ 83A50EC .2byte 0xFFFF, 0x1103, 0x11FF, 0x100, 16, 32 .byte 2 | (1 << 4) | (0 << 6) | (0 << 7) .byte 1 .align 2 - .4byte gEventObjectBaseOam_16x32 + .4byte gObjectEventBaseOam_16x32 .4byte gSubspriteTables_83A379C .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A2908 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A5110:: @ 83A5110 +gObjectEventGraphicsInfo_83A5110:: @ 83A5110 .2byte 0xFFFF, 0x1114, 0x11FF, 0x800, 64, 64 .byte 10 | (1 << 4) | (0 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_64x64 + .4byte gObjectEventBaseOam_64x64 .4byte gSubspriteTables_83A38D0 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1CA8 .4byte gDummySpriteAffineAnimTable -gMapObjectGraphicsInfo_83A5134:: @ 83A5134 +gObjectEventGraphicsInfo_83A5134:: @ 83A5134 .2byte 0xFFFF, 0x1115, 0x11FF, 0x1000, 128, 64 .byte 10 | (1 << 4) | (0 << 6) | (0 << 7) .byte 0 .align 2 - .4byte gEventObjectBaseOam_128x64 + .4byte gObjectEventBaseOam_128x64 .4byte gSubspriteTables_83A3A50 .4byte gAnimTable_83A3368 .4byte gSpriteImages_83A1CF0 .4byte gDummySpriteAffineAnimTable -gUnknown_83A5158:: @ 83A5158 - .incbin "baserom.gba", 0x3A5158, 0xB0 +gObjectEventSpritePalettes:: @ 83A5158 + obj_pal gUnknown_836D828, 0x1103 + obj_pal gUnknown_836D848, 0x1104 + obj_pal gUnknown_836D868, 0x1105 + obj_pal gUnknown_836D888, 0x1106 + obj_pal gUnknown_836D8A8, 0x1107 + obj_pal gUnknown_836D8C8, 0x1108 + obj_pal gUnknown_836D8E8, 0x1109 + obj_pal gUnknown_836D908, 0x110a + obj_pal gUnknown_835B968, 0x1100 + obj_pal gUnknown_835E968, 0x1101 + obj_pal gUnknown_835E988, 0x1102 + obj_pal gUnknown_8398008, 0x110b + obj_pal gUnknown_8398028, 0x110c + obj_pal gUnknown_835B968, 0x1110 + obj_pal gUnknown_835E968, 0x1111 + obj_pal gUnknown_8394EA8, 0x1113 + obj_pal gUnknown_8395AE8, 0x1115 + obj_pal gUnknown_83952C8, 0x1114 + null_obj_pal + +gPlayerReflectionPaletteTags:: @ 83A51F0 + .2byte 0x1101 + .2byte 0x1101 + .2byte 0x1101 + .2byte 0x1101 + .2byte 0x1111 + .2byte 0x1111 + .2byte 0x1111 + .2byte 0x1111 + +gUnknownPaletteTags_83A5200:: @ 83A5200 + .2byte 0x1116 + .2byte 0x1116 + .2byte 0x1116 + .2byte 0x1116 gUnknown_83A5208:: @ 83A5208 - .incbin "baserom.gba", 0x3A5208, 0x70 + .2byte 0x1100 + .2byte 0x0 + .4byte gPlayerReflectionPaletteTags + .2byte 0x1110 + .2byte 0x0 + .4byte gPlayerReflectionPaletteTags + .2byte 0x1116 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5200 + .2byte 0x11FF + .2byte 0x0 + .4byte NULL + +gUnknownPaletteTags_83A5228:: @ 83A5228 + .2byte 0x110c + .2byte 0x110c + .2byte 0x110c + .2byte 0x110c + +gUnknownPaletteTags_83A5230:: @ 83A5230 + .2byte 0x110d + .2byte 0x110d + .2byte 0x110d + .2byte 0x110d + +gUnknownPaletteTags_83A5238:: + .2byte 0x110e + .2byte 0x110e + .2byte 0x110e + .2byte 0x110e + +gUnknownPaletteTags_83A5240:: + .2byte 0x1112 + .2byte 0x1112 + .2byte 0x1112 + .2byte 0x1112 + +gUnknownPaletteTags_83A5248:: + .2byte 0x1113 + .2byte 0x1113 + .2byte 0x1113 + .2byte 0x1113 + +gUnknownPaletteTags_83A5250:: + .2byte 0x1114 + .2byte 0x1114 + .2byte 0x1114 + .2byte 0x1114 + +gUnknownPaletteTags_83A5258:: + .2byte 0x111b + .2byte 0x111b + .2byte 0x111b + .2byte 0x111b + +gUnknownPaletteTags_83A5260:: + .2byte 0x1118 + .2byte 0x1118 + .2byte 0x1118 + .2byte 0x1118 + +gUnknownPaletteTags_83A5268:: + .2byte 0x111a + .2byte 0x111a + .2byte 0x111a + .2byte 0x111a + +gUnknownPaletteTags_83A5270:: + .2byte 0x1109 + .2byte 0x1109 + .2byte 0x1109 + .2byte 0x1109 gUnknown_83A5278:: @ 83A5278 - .incbin "baserom.gba", 0x3A5278, 0xB8 + .2byte 0x1100 + .2byte 0x0 + .4byte gPlayerReflectionPaletteTags + .2byte 0x1110 + .2byte 0x0 + .4byte gPlayerReflectionPaletteTags + .2byte 0x110b + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5228 + .2byte 0x110d + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5230 + .2byte 0x110e + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5238 + .2byte 0x1112 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5240 + .2byte 0x1113 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5248 + .2byte 0x1114 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5250 + .2byte 0x1117 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5260 + .2byte 0x1119 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5268 + .2byte 0x1105 + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5270 + .2byte 0x111b + .2byte 0x0 + .4byte gUnknownPaletteTags_83A5258 + .2byte 0x11ff + .2byte 0x0 + .4byte NULL + +gUnknownPaletteTags_83A52E0:: + .2byte 0x1100 + .2byte 0x1101 + .2byte 0x1103 + .2byte 0x1104 + .2byte 0x1105 + .2byte 0x1106 + .2byte 0x1107 + .2byte 0x1108 + .2byte 0x1109 + .2byte 0x110a + +gUnknownPaletteTags_83A52F4:: + .2byte 0x1100 + .2byte 0x1110 + .2byte 0x1103 + .2byte 0x1104 + .2byte 0x1105 + .2byte 0x1106 + .2byte 0x1107 + .2byte 0x1108 + .2byte 0x1109 + .2byte 0x110a + +gUnknownPaletteTags_83A5308:: + .2byte 0x1100 + .2byte 0x1101 + .2byte 0x1103 + .2byte 0x1104 + .2byte 0x1105 + .2byte 0x1106 + .2byte 0x1107 + .2byte 0x1108 + .2byte 0x1109 + .2byte 0x110a + +gUnknownPaletteTags_83A531C:: + .2byte 0x1100 + .2byte 0x1101 + .2byte 0x1103 + .2byte 0x1104 + .2byte 0x1105 + .2byte 0x1106 + .2byte 0x1107 + .2byte 0x1108 + .2byte 0x1109 + .2byte 0x110a gUnknown_83A5330:: @ 83A5330 - .incbin "baserom.gba", 0x3A5330, 0x10 + .4byte gUnknownPaletteTags_83A52E0 + .4byte gUnknownPaletteTags_83A52F4 + .4byte gUnknownPaletteTags_83A5308 + .4byte gUnknownPaletteTags_83A531C gUnknown_83A5340:: - .incbin "baserom.gba", 0x3A5340, 0x8 + obj_pal gUnknown_8398FA8, 0x1004 gUnknown_83A5348:: @ 83A5348 - .incbin "baserom.gba", 0x3A5348, 0xB90 + obj_pal gUnknown_8398FC8, 0x1005 + +gUnknown_83A5350:: @ 83A5350 + obj_image_anim_frame 0, 1, 0 + obj_image_anim_end + +gUnknown_83A5358:: @ 83A5358 + .4byte gUnknown_83A5350 + +gUnknown_83A535C:: @ 83A535C + obj_frame_tiles gUnknown_8398048, 0x20 + +gUnknown_83A5364:: @ 83A5364 + obj_frame_tiles gUnknown_8398068, 0x40 + +gUnknown_83A536C:: @ 83A536C + obj_frame_tiles gUnknown_83980A8, 0x80 + +gUnknown_83A5374:: @ 83A5374 + obj_frame_tiles gUnknown_8398128, 0x400 + +gUnknown_83A537C:: @ 83A537C + spr_template 65535, 65535, gObjectEventBaseOam_128x64, gUnknown_83A5358, gUnknown_83A535C, gDummySpriteAffineAnimTable, oamc_shadow + +gUnknown_83A5394:: @ 83A5394 + spr_template 65535, 65535, gObjectEventBaseOam_Unknown1, gUnknown_83A5358, gUnknown_83A5364, gDummySpriteAffineAnimTable, oamc_shadow + +gUnknown_83A53AC:: @ 83A53AC + spr_template 65535, 65535, gObjectEventBaseOam_Unknown2, gUnknown_83A5358, gUnknown_83A536C, gDummySpriteAffineAnimTable, oamc_shadow + +gUnknown_83A53C4:: @ 83A53C4 + spr_template 65535, 65535, gObjectEventBaseOam_Unknown3, gUnknown_83A5358, gUnknown_83A5374, gDummySpriteAffineAnimTable, oamc_shadow + +gUnknown_83A53DC:: @ 83A53DC + overworld_frame gUnknown_839A008, 2, 2, 0 + overworld_frame gUnknown_839A008, 2, 2, 1 + overworld_frame gUnknown_839A008, 2, 2, 2 + overworld_frame gUnknown_839A008, 2, 2, 3 + overworld_frame gUnknown_839A008, 2, 2, 4 + +gUnknown_83A5404:: @ 83A5404 + obj_image_anim_frame 1, 10 + obj_image_anim_frame 2, 10 + obj_image_anim_frame 3, 10 + obj_image_anim_frame 4, 10 + obj_image_anim_frame 0, 10 + obj_image_anim_end + +gUnknown_83A541C:: @ 83A541C + .4byte gUnknown_83A5404 + +gUnknown_83A5420:: @ 83A5420 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A541C, gUnknown_83A53DC, gDummySpriteAffineAnimTable, unc_grass_normal + +gUnknown_83A5438:: @ 83A5438 + overworld_frame gUnknown_83986A8, 2, 2, 0 + overworld_frame gUnknown_83986A8, 2, 2, 1 + overworld_frame gUnknown_83986A8, 2, 2, 2 + overworld_frame gUnknown_83986A8, 2, 2, 3 + overworld_frame gUnknown_83986A8, 2, 2, 4 + +gUnknown_83A5460:: @ 83A5460 + obj_image_anim_frame 0, 12 + obj_image_anim_frame 1, 9 + obj_image_anim_frame 2, 9 + obj_image_anim_frame 3, 9 + obj_image_anim_frame 0, 9 + obj_image_anim_frame 1, 9 + obj_image_anim_frame 2, 11 + obj_image_anim_frame 4, 11 + obj_image_anim_end + +gUnknown_83A5484:: @ 83A5484 + .4byte gUnknown_83A5460 + +gUnknown_83A5488:: @ 83A5488 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5484, gUnknown_83A5438, gDummySpriteAffineAnimTable, sub_80DCD1C + +gUnknown_83A54A0:: @ 83A54A0 + overworld_frame gUnknown_8398928, 2, 2, 0 + overworld_frame gUnknown_8398928, 2, 2, 1 + overworld_frame gUnknown_8398928, 2, 2, 2 + overworld_frame gUnknown_8398928, 2, 2, 3 + overworld_frame gUnknown_8398928, 2, 2, 4 + +gUnknown_83A54C8:: @ 83A54C8 + obj_image_anim_frame 0, 12 + obj_image_anim_frame 1, 12 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 12 + obj_image_anim_frame 4, 12 + obj_image_anim_end + +gUnknown_83A54E0:: @ 83A54E0 + .4byte gUnknown_83A54C8 -gUnknown_83A5ED8:: - .incbin "baserom.gba", 0x3A5ED8, 0x120 +gUnknown_83A54E4:: @ 83A54E4 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A54E0, gUnknown_83A54A0, gDummySpriteAffineAnimTable, sub_80DC2FC + +gUnknown_83A54FC:: @ 83A54FC + overworld_frame gUnknown_8396B08, 2, 8, 0 + overworld_frame gUnknown_8396B08, 2, 8, 1 + overworld_frame gUnknown_8396B08, 2, 8, 2 + overworld_frame gUnknown_8396B08, 2, 8, 3 + overworld_frame gUnknown_8396B08, 2, 8, 4 + overworld_frame gUnknown_8396B08, 2, 8, 5 + +gUnknown_83A552C:: @ 83A552C + obj_image_anim_frame 0, 48 + obj_image_anim_frame 1, 48 + obj_image_anim_jump 0 + +gUnknown_83A5538:: @ 83A5538 + obj_image_anim_frame 2, 48 + obj_image_anim_frame 3, 48 + obj_image_anim_jump 0 + +gUnknown_83A5544:: @ 83A5544 + obj_image_anim_frame 4, 48 + obj_image_anim_frame 5, 48 + obj_image_anim_jump 0 + +gUnknown_83A5550:: @ 83A5550 + obj_image_anim_frame 4, 112 + obj_image_anim_frame 5, 112 + obj_image_anim_jump 0 + +gUnknown_83A555C:: @ 83A555C + .4byte gUnknown_83A552C + .4byte gUnknown_83A5538 + .4byte gUnknown_83A5544 + .4byte gUnknown_83A5550 + +gUnknown_83A556C:: @ 83A556C + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_32x32, gUnknown_83A555C, gUnknown_83A54FC, gDummySpriteAffineAnimTable, sub_80DC4F8 + +gUnknown_83A5584:: @ 83A5584 + overworld_frame gUnknown_8398BA8, 2, 2, 0 + overworld_frame gUnknown_8398BA8, 2, 2, 1 + overworld_frame gUnknown_8398BA8, 2, 2, 2 + overworld_frame gUnknown_8398BA8, 2, 2, 3 + overworld_frame gUnknown_8398BA8, 2, 2, 4 + overworld_frame gUnknown_8398BA8, 2, 2, 5 + overworld_frame gUnknown_8398BA8, 2, 2, 6 + overworld_frame gUnknown_8398BA8, 2, 2, 7 + +gUnknown_83A55C4:: @ 83A55C4 + obj_image_anim_frame 2, 32 + obj_image_anim_frame 3, 32 + obj_image_anim_jump 0 + +gUnknown_83A55D0:: @ 83A55D0 + obj_image_anim_frame 0, 32 + obj_image_anim_frame 1, 32 + obj_image_anim_jump 0 + +gUnknown_83A55DC:: @ 83A55DC + obj_image_anim_frame 4, 32 + obj_image_anim_frame 5, 32 + obj_image_anim_jump 0 + +gUnknown_83A55E8:: @ 83A55E8 + obj_image_anim_frame 6, 32 + obj_image_anim_frame 7, 32 + obj_image_anim_jump 0 + +gUnknown_83A55F4:: @ 83A55F4 + .4byte gUnknown_83A55C4 + .4byte gUnknown_83A55D0 + .4byte gUnknown_83A55DC + .4byte gUnknown_83A55E8 + +gUnknown_83A5604:: @ 83A5604 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x16, gUnknown_83A55F4, gUnknown_83A5584, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_83A561C:: @ 83A561C + overworld_frame gUnknown_8399008, 2, 1, 0 + overworld_frame gUnknown_8399008, 2, 1, 1 + overworld_frame gUnknown_8399008, 2, 1, 2 + +gUnknown_83A5634:: @ 83A5634 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_end + +gUnknown_83A5644:: @ 83A5644 + .4byte gUnknown_83A5634 + +gUnknown_83A5648:: @ 83A5648 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5644, gUnknown_83A561C, gDummySpriteAffineAnimTable, sub_80DCCE0 + +gUnknown_83A5660:: @ 83A5660 + overworld_frame gUnknown_8399188, 2, 1, 0 + overworld_frame gUnknown_8399188, 2, 1, 1 + overworld_frame gUnknown_8399188, 2, 1, 2 + overworld_frame gUnknown_8399188, 2, 1, 3 + +gUnknown_83A5680:: @ 83A5680 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_end + +gUnknown_83A5694:: @ 83A5694 + .4byte gUnknown_83A5680 + +gUnknown_83A5698:: @ 83A5698 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_Unknown1, gUnknown_83A5694, gUnknown_83A5660, gDummySpriteAffineAnimTable, sub_80DCCE0 + +gUnknown_83A56B0:: @ 83A56B0 + overworld_frame gUnknown_839A388, 2, 2, 0 + overworld_frame gUnknown_839A388, 2, 2, 1 + +gUnknown_83A56C0:: @ 83A56C0 + obj_image_anim_frame 0, 129 + obj_image_anim_end + +gUnknown_83A56C8:: @ 83A56C8 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_83A56D0:: @ 83A56D0 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_83A56D8:: @ 83A56D8 + obj_image_anim_frame 1, 65 + obj_image_anim_end + +gUnknown_83A56E0:: @ 83A56E0 + .4byte gUnknown_83A56C0 + .4byte gUnknown_83A56C0 + .4byte gUnknown_83A56C8 + .4byte gUnknown_83A56D0 + .4byte gUnknown_83A56D8 + +gUnknown_83A56F4:: @ 83A56F4 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A56E0, gUnknown_83A56B0, gDummySpriteAffineAnimTable, sub_80DBAFC + +gUnknown_83A570C:: @ 83A570C + overworld_frame gUnknown_839A488, 2, 2, 0 + overworld_frame gUnknown_839A488, 2, 2, 1 + +gUnknown_83A571C:: @ 83A571C + obj_image_anim_frame 0, 129 + obj_image_anim_end + +gUnknown_83A5724:: @ 83A5724 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_83A572C:: @ 83A572C + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_83A5734:: @ 83A5734 + obj_image_anim_frame 1, 65 + obj_image_anim_end + +gUnknown_83A573C:: @ 83A573C + .4byte gUnknown_83A571C + .4byte gUnknown_83A571C + .4byte gUnknown_83A5724 + .4byte gUnknown_83A572C + .4byte gUnknown_83A5734 + +gUnknown_83A5750:: @ 83A5750 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A573C, gUnknown_83A570C, gDummySpriteAffineAnimTable, sub_80DBAFC + +gUnknown_83A5768:: @ 83A5768 + overworld_frame gUnknown_839A588, 2, 2, 0 + overworld_frame gUnknown_839A588, 2, 2, 1 + overworld_frame gUnknown_839A588, 2, 2, 2 + overworld_frame gUnknown_839A588, 2, 2, 3 + +gUnknown_83A5788:: @ 83A5788 + obj_image_anim_frame 2, 1 + obj_image_anim_end + +gUnknown_83A5790:: @ 83A5790 + obj_image_anim_frame 2, 1 + obj_image_anim_end + +gUnknown_83A5798:: @ 83A5798 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_83A57A0:: @ 83A57A0 + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_83A57A8:: @ 83A57A8 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_83A57B0:: @ 83A57B0 + obj_image_anim_frame 0, 65 + obj_image_anim_end + +gUnknown_83A57B8:: @ 83A57B8 + obj_image_anim_frame 3, 65 + obj_image_anim_end + +gUnknown_83A57C0:: @ 83A57C0 + obj_image_anim_frame 3, 1 + obj_image_anim_end + +gUnknown_83A57C8:: @ 83A57C8 + .4byte gUnknown_83A5788 + .4byte gUnknown_83A5788 + .4byte gUnknown_83A5790 + .4byte gUnknown_83A5798 + .4byte gUnknown_83A57A0 + .4byte gUnknown_83A57A8 + .4byte gUnknown_83A57B0 + .4byte gUnknown_83A57B8 + .4byte gUnknown_83A57C0 + +gUnknown_83A57EC:: @ 83A57EC + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A57C8, gUnknown_83A5768, gDummySpriteAffineAnimTable, sub_80DBAFC + +gUnknown_83A5804:: @ 83A5804 + overworld_frame gUnknown_839AA48, 2, 2, 0 + overworld_frame gUnknown_839AA48, 2, 2, 1 + overworld_frame gUnknown_839AA48, 2, 2, 2 + overworld_frame gUnknown_839AA48, 2, 2, 3 + +gUnknown_83A5824:: @ 83A5824 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_end + +gUnknown_83A5838:: @ 83A5838 + .4byte gUnknown_83A5824 + +gUnknown_83A583C:: @ 83A583C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5838, gUnknown_83A5804, gDummySpriteAffineAnimTable, sub_80DCCE0 + +gUnknown_83A5854:: @ 83A5854 + overworld_frame gUnknown_839AC48, 2, 1, 0 + overworld_frame gUnknown_839AC48, 2, 1, 1 + +gUnknown_83A5864:: @ 83A5864 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_end + +gUnknown_83A5870:: @ 83A5870 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_frame 0, 8 + obj_image_anim_frame 1, 8 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_jump 0 + +gUnknown_83A5894:: @ 83A5894 + .4byte gUnknown_83A5864 + .4byte gUnknown_83A5870 + +gUnknown_83A589C:: @ 83A589C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5894, gUnknown_83A5854, gDummySpriteAffineAnimTable, sub_80DBC2C + +gUnknown_83A58B4:: @ 83A58B4 + overworld_frame gUnknown_839ACC8, 2, 1, 0 + overworld_frame gUnknown_839ACC8, 2, 1, 1 + overworld_frame gUnknown_839ACC8, 2, 1, 2 + +gUnknown_83A58CC:: @ 83A58CC + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_end + +gUnknown_83A58DC:: @ 83A58DC + .4byte gUnknown_83A58CC + +gUnknown_83A58E0:: @ 83A58E0 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A58DC, gUnknown_83A58B4, gDummySpriteAffineAnimTable, sub_80DCCE0 + +gUnknown_83A58F8:: @ 83A58F8 + overworld_frame gUnknown_8399E08, 2, 2, 0 + overworld_frame gUnknown_8399E08, 2, 2, 1 + overworld_frame gUnknown_8399E08, 2, 2, 2 + overworld_frame gUnknown_8399E08, 2, 2, 3 + +gUnknown_83A5918:: @ 83A5918 + obj_image_anim_frame 1, 3 + obj_image_anim_frame 2, 3 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 0, 4 + obj_image_anim_end + +gUnknown_83A5938:: @ 83A5938 + .4byte gUnknown_83A5918 + +gUnknown_83A593C:: @ 83A593C + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5938, gUnknown_83A58F8, gDummySpriteAffineAnimTable, unc_grass_tall + +gUnknown_83A5954:: @ 83A5954 + overworld_frame gUnknown_8399488, 2, 2, 0 + overworld_frame gUnknown_8399488, 2, 2, 1 + overworld_frame gUnknown_8399488, 2, 2, 2 + overworld_frame gUnknown_8399488, 2, 2, 3 + overworld_frame gUnknown_8399488, 2, 2, 4 + overworld_frame gUnknown_8399488, 2, 2, 6 + +gUnknown_83A5984:: @ 83A5984 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 8 + obj_image_anim_frame 3, 8 + obj_image_anim_frame 4, 8 + obj_image_anim_frame 5, 8 + obj_image_anim_end + +gUnknown_83A59A0:: @ 83A59A0 + .4byte gUnknown_83A5984 + +gUnknown_83A59A4:: @ 83A59A4 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A59A0, gUnknown_83A5954, gDummySpriteAffineAnimTable, sub_80DCCE0 + +gUnknown_83A59BC:: @ 83A59BC + overworld_frame gUnknown_8399788, 2, 2, 0 + overworld_frame gUnknown_8399788, 2, 2, 1 + overworld_frame gUnknown_8399788, 2, 2, 2 + overworld_frame gUnknown_8399788, 2, 2, 3 + overworld_frame gUnknown_8399788, 2, 2, 4 + overworld_frame gUnknown_8399788, 2, 2, 5 + overworld_frame gUnknown_8399788, 2, 2, 6 + overworld_frame gUnknown_8399788, 2, 2, 7 + overworld_frame gUnknown_8399788, 2, 2, 8 + +gUnknown_83A5A04:: @ 83A5A04 + obj_image_anim_frame 0, 10 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_frame 7, 4 + obj_image_anim_frame 8, 4 + obj_image_anim_jump 7 + +gUnknown_83A5A2C:: @ 83A5A2C + .4byte gUnknown_83A5A04 + +gUnknown_83A5A30:: @ 83A5A30 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A2C, gUnknown_83A59BC, gDummySpriteAffineAnimTable, sub_80DCD1C + +gUnknown_83A5A48:: @ 83A5A48 + overworld_frame gUnknown_8399C08, 2, 2, 0 + overworld_frame gUnknown_8399C08, 2, 2, 1 + overworld_frame gUnknown_8399C08, 2, 2, 2 + overworld_frame gUnknown_8399C08, 2, 2, 3 + +gUnknown_83A5A68:: @ 83A5A68 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 + +gUnknown_83A5A84:: @ 83A5A84 + .4byte gUnknown_83A5A68 + +gUnknown_83A5A88:: @ 83A5A88 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A84, gUnknown_83A5A48, gDummySpriteAffineAnimTable, sub_80DCD1C + +gUnknown_83A5AA0:: @ 83A5AA0 + overworld_frame gUnknown_839A788, 2, 2, 0 + overworld_frame gUnknown_839A788, 2, 2, 1 + overworld_frame gUnknown_839A788, 2, 2, 2 + overworld_frame gUnknown_839A788, 2, 2, 3 + +gUnknown_83A5AC0:: @ 83A5AC0 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_jump 0 + +gUnknown_83A5AD4:: @ 83A5AD4 + .4byte gUnknown_83A5AC0 + +gUnknown_83A5AD8:: @ 83A5AD8 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5AD4, gUnknown_83A5AA0, gDummySpriteAffineAnimTable, sub_80DCD1C + +gUnknown_83A5AF0:: @ 83A5AF0 + overworld_frame gUnknown_839A988, 2, 1, 0 + overworld_frame gUnknown_839A988, 2, 1, 1 + overworld_frame gUnknown_839A988, 2, 1, 2 + +gUnknown_83A5B08:: @ 83A5B08 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_end + +gUnknown_83A5B18:: @ 83A5B18 + .4byte gUnknown_83A5B08 + +gUnknown_83A5B1C:: @ 83A5B1C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5B18, gUnknown_83A5AF0, gDummySpriteAffineAnimTable, sub_80DC86C + +gUnknown_83A5B34:: @ 83A5B34 + overworld_frame gUnknown_839AD88, 2, 2, 0 + overworld_frame gUnknown_839AD88, 2, 2, 1 + overworld_frame gUnknown_839AD88, 2, 2, 2 + overworld_frame gUnknown_839AD88, 2, 2, 3 + +gUnknown_83A5B54:: @ 83A5B54 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_jump 0 + +gUnknown_83A5B70:: @ 83A5B70 + .4byte gUnknown_83A5B54 + +gUnknown_83A5B74:: @ 83A5B74 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5B70, gUnknown_83A5B34, gDummySpriteAffineAnimTable, sub_80DCD1C + +gUnknown_83A5B8C:: @ 83A5B8C + obj_rot_scal_anim_frame -256, 256, 128, 0 + obj_rot_scal_anim_frame 1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame -1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame -1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame 1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_jump 1 + +gUnknown_83A5BDC:: @ 83A5BDC + obj_rot_scal_anim_frame 256, 256, 128, 0 + obj_rot_scal_anim_frame -1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame 1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame 1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_frame -1, 0, 0, 4 + obj_rot_scal_anim_frame 0, 0, 0, 8 + obj_rot_scal_anim_jump 1 + +gUnknown_83A5C2C:: @ 83A5C2C + .4byte gUnknown_83A5B8C + .4byte gUnknown_83A5BDC + +gUnknown_83A5C34:: @ 83A5C34 + spr_template 0x0, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gUnknown_83A5C2C, SpriteCallbackDummy + +gUnknown_83A5C4C:: @ 83A5C4C + overworld_frame gUnknown_839B008, 2, 4, 0 + overworld_frame gUnknown_839B008, 2, 4, 1 + overworld_frame gUnknown_839B008, 2, 4, 2 + overworld_frame gUnknown_839B008, 2, 4, 3 + overworld_frame gUnknown_839B008, 2, 4, 4 + overworld_frame gUnknown_839B008, 2, 4, 5 + overworld_frame gUnknown_839B008, 2, 4, 6 + +gUnknown_83A5C84:: @ 83A5C84 + obj_image_anim_frame 0, 16 + obj_image_anim_end + +gUnknown_83A5C8C:: @ 83A5C8C + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_end + +gUnknown_83A5CAC:: @ 83A5CAC + .4byte gUnknown_83A5C84 + .4byte gUnknown_83A5C8C + +gUnknown_83A5CB4:: @ 83A5CB4 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5C4C, gDummySpriteAffineAnimTable, sub_80DCAC8 + +gUnknown_83A5CCC:: @ 83A5CCC + overworld_frame gUnknown_839B708, 2, 4, 0 + overworld_frame gUnknown_839B708, 2, 4, 1 + overworld_frame gUnknown_839B708, 2, 4, 2 + overworld_frame gUnknown_839B708, 2, 4, 3 + overworld_frame gUnknown_839B708, 2, 4, 4 + overworld_frame gUnknown_839B708, 2, 4, 5 + overworld_frame gUnknown_839B708, 2, 4, 6 + +gUnknown_83A5D04:: @ 83A5D04 + obj_image_anim_frame 0, 16 + obj_image_anim_end + +gUnknown_83A5D0C:: @ 83A5D0C + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 4 + obj_image_anim_frame 4, 4 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_end + +gUnknown_83A5D2C:: @ 83A5D2C + .4byte gUnknown_83A5D04 + .4byte gUnknown_83A5D0C + +gUnknown_83A5D34:: @ 83A5D34 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5D2C, gUnknown_83A5CCC, gDummySpriteAffineAnimTable, sub_80DCAC8 + +gUnknown_83A5D4C:: @ 83A5D4C + overworld_frame gUnknown_839BE08, 2, 4, 0 + overworld_frame gUnknown_839BE08, 2, 4, 1 + overworld_frame gUnknown_839BE08, 2, 4, 2 + overworld_frame gUnknown_839BE08, 2, 4, 3 + overworld_frame gUnknown_839BE08, 2, 4, 4 + overworld_frame gUnknown_839BE08, 2, 4, 5 + overworld_frame gUnknown_839BE08, 2, 4, 6 + +gUnknown_83A5D84:: @ 83A5D84 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5D4C, gDummySpriteAffineAnimTable, sub_80DCAC8 + +gUnknown_83A5D9C:: @ 83A5D9C + overworld_frame gUnknown_839D3C8, 8, 8, 0 + overworld_frame gUnknown_839D3C8, 8, 8, 1 + overworld_frame gUnknown_839D3C8, 8, 8, 2 + overworld_frame gUnknown_839D3C8, 8, 8, 3 + overworld_frame gUnknown_839D3C8, 8, 8, 4 + +gUnknown_83A5DC4:: @ 83A5DC4 + obj_image_anim_frame 0, 1 + obj_image_anim_end + +gUnknown_83A5DCC:: @ 83A5DCC + obj_image_anim_frame 1, 1 + obj_image_anim_end + +gUnknown_83A5DD4:: @ 83A5DD4 + obj_image_anim_frame 2, 1 + obj_image_anim_end + +gUnknown_83A5DDC:: @ 83A5DDC + obj_image_anim_frame 3, 1 + obj_image_anim_end + +gUnknown_83A5DE4:: @ 83A5DE4 + obj_image_anim_frame 4, 1 + obj_image_anim_end + +gUnknown_83A5DEC:: @ 83A5DEC + .4byte gUnknown_83A5DC4 + .4byte gUnknown_83A5DCC + .4byte gUnknown_83A5DD4 + .4byte gUnknown_83A5DDC + .4byte gUnknown_83A5DE4 + +gUnknown_83A5E00:: @ 83A5E00 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_64x64, gUnknown_83A5DEC, gUnknown_83A5D9C, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_83A5E18:: @ 83A5E18 + overworld_frame gUnknown_839A288, 2, 2, 0 + overworld_frame gUnknown_839A288, 2, 2, 1 + +gUnknown_83A5E28:: @ 83A5E28 + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_end + +gUnknown_83A5E34:: @ 83A5E34 + .4byte gUnknown_83A5E28 + +gUnknown_83A5E38:: @ 83A5E38 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E34, gUnknown_83A5E18, gDummySpriteAffineAnimTable, sub_80DB8AC + +gUnknown_83A5E50:: @ 83A5E50 + overworld_frame gUnknown_839C508, 2, 2, 0 + +gUnknown_83A5E58:: @ 83A5E58 + obj_image_anim_frame 0, 4 + obj_image_anim_end + +gUnknown_83A5E60:: @ 83A5E60 + .4byte gUnknown_83A5E58 + +gUnknown_83A5E64:: @ 83A5E64 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E60, gUnknown_83A5E50, gDummySpriteAffineAnimTable, sub_80DBFF4 + +gUnknown_83A5E7C:: @ 83A5E7C + overworld_frame gUnknown_839C5A8, 2, 2, 0 + overworld_frame gUnknown_839C5A8, 2, 2, 1 + overworld_frame gUnknown_839C5A8, 2, 2, 2 + overworld_frame gUnknown_839C5A8, 2, 2, 3 + overworld_frame gUnknown_839C5A8, 2, 2, 4 + +gUnknown_83A5EA4:: @ 83A5EA4 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_frame 2, 6 + obj_image_anim_frame 3, 6 + obj_image_anim_frame 4, 6 + obj_image_anim_end + +gUnknown_83A5EBC:: @ 83A5EBC + .4byte gUnknown_83A5EA4 + +gUnknown_83A5EC0:: @ 83A5EC0 + spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5EBC, gUnknown_83A5E7C, gDummySpriteAffineAnimTable, sub_8085604 + +gUnknown_83A5ED8:: @ 83A5ED8 + obj_pal gUnknown_839C588, 0x100D + +gUnknown_83A5EE0:: @ 83A5EE0 + overworld_frame gUnknown_839C828, 2, 2, 0 + overworld_frame gUnknown_839C828, 2, 2, 1 + overworld_frame gUnknown_839C828, 2, 2, 2 + overworld_frame gUnknown_839C828, 2, 2, 3 + overworld_frame gUnknown_839C828, 2, 2, 4 + +gUnknown_83A5F08:: @ 83A5F08 + obj_image_anim_frame 0, 6 + obj_image_anim_frame 1, 6 + obj_image_anim_frame 2, 6 + obj_image_anim_frame 3, 6 + obj_image_anim_frame 4, 6 + obj_image_anim_end + +gUnknown_83A5F20:: @ 83A5F20 + .4byte gUnknown_83A5F08 + +gUnknown_83A5F24:: @ 83A5F24 + spr_template 0xFFFF, 0x100D, gObjectEventBaseOam_16x16, gUnknown_83A5F20, gUnknown_83A5EE0, gDummySpriteAffineAnimTable, sub_80853B0 + +gUnknown_83A5F3C:: @ 83A5F3C + overworld_frame gUnknown_839CAA8, 2, 4, 0 + overworld_frame gUnknown_839CAA8, 2, 4, 1 + overworld_frame gUnknown_839CAA8, 2, 4, 2 + overworld_frame gUnknown_839CAA8, 2, 4, 3 + overworld_frame gUnknown_839CAA8, 2, 4, 4 + overworld_frame gUnknown_839CAA8, 2, 4, 5 + overworld_frame gUnknown_839CAA8, 2, 4, 6 + overworld_frame gUnknown_839CAA8, 2, 4, 7 + +gUnknown_83A5F7C:: @ 83A5F7C + obj_image_anim_frame 0, 4 + obj_image_anim_frame 1, 4 + obj_image_anim_frame 2, 4 + obj_image_anim_frame 3, 6 + obj_image_anim_frame 4, 6 + obj_image_anim_frame 5, 4 + obj_image_anim_frame 6, 4 + obj_image_anim_frame 7, 4 + obj_image_anim_end + +gUnknown_83A5FA0:: @ 83A5FA0 + .4byte gUnknown_83A5F7C + +gUnknown_83A5FA4:: @ 83A5FA4 + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x32, gUnknown_83A5FA0, gUnknown_83A5F3C, gDummySpriteAffineAnimTable, sub_80DC99C + +gUnknown_83A5FBC:: @ 83A5FBC + overworld_frame gUnknown_839D2A8, 2, 2, 0 + overworld_frame gUnknown_839D2A8, 2, 2, 1 + +gUnknown_83A5FCC:: @ 83A5FCC + obj_image_anim_frame 0, 3 + obj_image_anim_frame 1, 5 + obj_image_anim_frame 0, 5 + obj_image_anim_end + +gUnknown_83A5FDC:: @ 83A5FDC + .4byte gUnknown_83A5FCC + +gUnknown_83A5FE0:: @ 83A5FE0 + spr_template 0xFFFF, 0x100F, gObjectEventBaseOam_16x16, gUnknown_83A5FDC, gUnknown_83A5FBC, gDummySpriteAffineAnimTable, sub_80DCC90 gUnknown_83A5FF8:: - .incbin "baserom.gba", 0x3A5FF8, 0x8 + obj_pal gUnknown_839D3A8, 0x100F gUnknown_83A6000:: @ 83A6000 - .incbin "baserom.gba", 0x3A6000, 0x10 + .2byte 0x0020 + .2byte 0x0040 + .2byte 0x0060 + .2byte 0x0080 + +gUnknown_83A6008:: @ 83A6008 + .2byte 0x0020 + .2byte 0x0040 + .2byte 0x0080 + .2byte 0x00C0 gUnknown_83A6010:: @ 83A6010 - .incbin "baserom.gba", 0x3A6010, 0x8 + .2byte 0x0020 + .2byte 0x0030 + .2byte 0x0040 + .2byte 0x0050 gUnknown_83A6018:: @ 83A6018 - .incbin "baserom.gba", 0x3A6018, 0x1C + .4byte sub_8060064 + .4byte sub_8060078 + .4byte sub_80600A4 + .4byte sub_80600E0 + .4byte sub_8060100 + .4byte sub_806014C + .4byte sub_80601AC gUnknown_83A6034:: @ 83A6034 - .incbin "baserom.gba", 0x3A6034, 0x1C + .4byte sub_8060064 + .4byte sub_8060078 + .4byte sub_80600A4 + .4byte sub_80600E0 + .4byte sub_8060100 + .4byte sub_806017C + .4byte sub_80601AC gUnknown_83A6050:: @ 83A6050 - .incbin "baserom.gba", 0x3A6050, 0x4 + .byte 1 @ DIR_SOUTH + .byte 2 @ DIR_NORTH + .byte 3 @ DIR_WEST + .byte 4 @ DIR_EAST gUnknown_83A6054:: @ 83A6054 - .incbin "baserom.gba", 0x3A6054, 0x2C + .4byte GetRegularRunningPastFacingDirection + .4byte GetNorthSouthRunningPastFacingDirection + .4byte GetEastWestRunningPastFacingDirection + .4byte GetNorthEastRunningPastFacingDirection + .4byte GetNorthWestRunningPastFacingDirection + .4byte GetSouthEastRunningPastFacingDirection + .4byte GetSouthWestRunningPastFacingDirection + .4byte GetNonEastRunningPastFacingDirection + .4byte GetNonWestRunningPastFacingDirection + .4byte GetNonSouthRunningPastFacingDirection + .4byte GetNonNorthRunningPastFacingDirection gUnknown_83A6080:: @ 83A6080 - .incbin "baserom.gba", 0x3A6080, 0x14 + .4byte sub_80605D0 + .4byte sub_80605E4 + .4byte sub_8060610 + .4byte sub_8060654 + .4byte sub_8060684 gUnknown_83A6094:: @ 83A6094 - .incbin "baserom.gba", 0x3A6094, 0x1C + .4byte sub_8060710 + .4byte sub_8060724 + .4byte sub_8060750 + .4byte sub_806078C + .4byte sub_80607AC + .4byte sub_80607F8 + .4byte sub_8060828 gUnknown_83A60B0:: @ 83A60B0 - .incbin "baserom.gba", 0x3A60B0, 0x4 + .byte 1 @ DIR_SOUTH + .byte 2 @ DIR_NORTH + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A60B4:: @ 83A60B4 - .incbin "baserom.gba", 0x3A60B4, 0x1C + .4byte sub_8060894 + .4byte sub_80608A8 + .4byte sub_80608D4 + .4byte sub_8060910 + .4byte sub_8060930 + .4byte sub_806097C + .4byte sub_80609AC gUnknown_83A60D0:: @ 83A60D0 - .incbin "baserom.gba", 0x3A60D0, 0x4 + .byte 3 @ DIR_WEST + .byte 4 @ DIR_EAST + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A60D4:: @ 83A60D4 - .incbin "baserom.gba", 0x3A60D4, 0xC + .4byte sub_8060A18 + .4byte sub_8060A44 + .4byte sub_8060A64 gUnknown_83A60E0:: @ 83A60E0 - .incbin "baserom.gba", 0x3A60E0, 0x14 + .4byte sub_8060AB8 + .4byte sub_8060ACC + .4byte sub_8060AF8 + .4byte sub_8060B3C + .4byte sub_8060B6C gUnknown_83A60F4:: @ 83A60F4 - .incbin "baserom.gba", 0x3A60F4, 0x14 + .4byte sub_8060BF8 + .4byte sub_8060C0C + .4byte sub_8060C38 + .4byte sub_8060C7C + .4byte sub_8060CAC gUnknown_83A6108:: @ 83A6108 - .incbin "baserom.gba", 0x3A6108, 0x14 + .4byte sub_8060D38 + .4byte sub_8060D4C + .4byte sub_8060D78 + .4byte sub_8060DBC + .4byte sub_8060DEC gUnknown_83A611C:: @ 83A611C - .incbin "baserom.gba", 0x3A611C, 0x4 + .byte 2 @ DIR_NORTH + .byte 3 @ DIR_WEST + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A6120:: @ 83A6120 - .incbin "baserom.gba", 0x3A6120, 0x14 + .4byte sub_8060E78 + .4byte sub_8060E8C + .4byte sub_8060EB8 + .4byte sub_8060EFC + .4byte sub_8060F2C gUnknown_83A6134:: @ 83A6134 - .incbin "baserom.gba", 0x3A6134, 0x4 + .byte 2 @ DIR_NORTH + .byte 4 @ DIR_EAST + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A6138:: @ 83A6138 - .incbin "baserom.gba", 0x3A6138, 0x14 + .4byte sub_8060FB8 + .4byte sub_8060FCC + .4byte sub_8060FF8 + .4byte sub_806103C + .4byte sub_806106C gUnknown_83A614C:: @ 83A614C - .incbin "baserom.gba", 0x3A614C, 0x4 + .byte 1 @ DIR_SOUTH + .byte 3 @ DIR_WEST + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A6150:: @ 83A6150 - .incbin "baserom.gba", 0x3A6150, 0x14 + .4byte sub_80610F8 + .4byte sub_806110C + .4byte sub_8061138 + .4byte sub_806117C + .4byte sub_80611AC gUnknown_83A6164:: @ 83A6164 - .incbin "baserom.gba", 0x3A6164, 0x4 + .byte 1 @ DIR_SOUTH + .byte 4 @ DIR_EAST + .byte 0 @ DIR_NONE + .byte 0 @ DIR_NONE gUnknown_83A6168:: @ 83A6168 - .incbin "baserom.gba", 0x3A6168, 0x14 + .4byte sub_8061238 + .4byte sub_806124C + .4byte sub_8061278 + .4byte sub_80612BC + .4byte sub_80612EC gUnknown_83A617C:: @ 83A617C - .incbin "baserom.gba", 0x3A617C, 0x4 + .byte 2 @ DIR_NORTH + .byte 1 @ DIR_SOUTH + .byte 3 @ DIR_WEST + .byte 1 @ DIR_SOUTH gUnknown_83A6180:: @ 83A6180 - .incbin "baserom.gba", 0x3A6180, 0x14 + .4byte sub_8061378 + .4byte sub_806138C + .4byte sub_80613B8 + .4byte sub_80613FC + .4byte sub_806142C gUnknown_83A6194:: @ 83A6194 - .incbin "baserom.gba", 0x3A6194, 0x4 + .byte 1 @ DIR_SOUTH + .byte 2 @ DIR_NORTH + .byte 4 @ DIR_EAST + .byte 1 @ DIR_SOUTH gUnknown_83A6198:: @ 83A6198 - .incbin "baserom.gba", 0x3A6198, 0x14 + .4byte sub_80614B8 + .4byte sub_80614CC + .4byte sub_80614F8 + .4byte sub_806153C + .4byte sub_806156C gUnknown_83A61AC:: @ 83A61AC - .incbin "baserom.gba", 0x3A61AC, 0x4 + .byte 2 @ DIR_NORTH + .byte 3 @ DIR_WEST + .byte 4 @ DIR_EAST + .byte 2 @ DIR_NORTH gUnknown_83A61B0:: @ 83A61B0 - .incbin "baserom.gba", 0x3A61B0, 0x14 + .4byte sub_80615F8 + .4byte sub_806160C + .4byte sub_8061638 + .4byte sub_806167C + .4byte sub_80616AC gUnknown_83A61C4:: @ 83A61C4 - .incbin "baserom.gba", 0x3A61C4, 0x4 + .byte 3 @ DIR_WEST + .byte 4 @ DIR_EAST + .byte 1 @ DIR_SOUTH + .byte 1 @ DIR_SOUTH gUnknown_83A61C8:: @ 83A61C8 - .incbin "baserom.gba", 0x3A61C8, 0x10 + .4byte sub_8061738 + .4byte sub_8061764 + .4byte sub_8061788 + .4byte sub_80617B4 gUnknown_83A61D8:: @ 83A61D8 - .incbin "baserom.gba", 0x3A61D8, 0x8 + .byte 0x01 + .byte 0x04 + .byte 0x03 + .byte 0x01 + .byte 0x02 + .byte 0x00 + .byte 0x00 + .byte 0x00 gUnknown_83A61E0:: @ 83A61E0 - .incbin "baserom.gba", 0x3A61E0, 0x10 + .4byte sub_806183C + .4byte sub_8061868 + .4byte sub_806188C + .4byte sub_80618B8 gUnknown_83A61F0:: @ 83A61F0 - .incbin "baserom.gba", 0x3A61F0, 0x8 + .byte 0x01 + .byte 0x03 + .byte 0x04 + .byte 0x02 + .byte 0x01 + .byte 0x00 + .byte 0x00 + .byte 0x00 gUnknown_83A61F8:: @ 83A61F8 - .incbin "baserom.gba", 0x3A61F8, 0x10 + .4byte sub_8061940 + .4byte sub_8061954 + .4byte sub_806198C + .4byte sub_8061A44 gUnknown_83A6208:: @ 83A6208 - .incbin "baserom.gba", 0x3A6208, 0xC + .4byte sub_8061A6C + .4byte sub_8061BA0 + .4byte sub_8061B34 gUnknown_83A6214:: @ 83A6214 - .incbin "baserom.gba", 0x3A6214, 0x4 + .byte 2 + .byte 4 + .byte 3 + .byte 1 gUnknown_83A6218:: @ 83A6218 - .incbin "baserom.gba", 0x3A6218, 0xC + .4byte sub_8061A6C + .4byte sub_8061C2C + .4byte sub_8061B34 gUnknown_83A6224:: @ 83A6224 - .incbin "baserom.gba", 0x3A6224, 0x4 + .byte 4 + .byte 3 + .byte 1 + .byte 2 gUnknown_83A6228:: @ 83A6228 - .incbin "baserom.gba", 0x3A6228, 0xC + .4byte sub_8061A6C + .4byte sub_8061CB8 + .4byte sub_8061B34 gUnknown_83A6234:: @ 83A6234 - .incbin "baserom.gba", 0x3A6234, 0x4 + .byte 1 + .byte 2 + .byte 4 + .byte 3 gUnknown_83A6238:: @ 83A6238 - .incbin "baserom.gba", 0x3A6238, 0xC + .4byte sub_8061A6C + .4byte sub_8061D44 + .4byte sub_8061B34 gUnknown_83A6244:: @ 83A6244 - .incbin "baserom.gba", 0x3A6244, 0x4 + .byte 3 + .byte 1 + .byte 2 + .byte 4 gUnknown_83A6248:: @ 83A6248 - .incbin "baserom.gba", 0x3A6248, 0xC + .4byte sub_8061A6C + .4byte sub_8061DD0 + .4byte sub_8061B34 gUnknown_83A6254:: @ 83A6254 - .incbin "baserom.gba", 0x3A6254, 0x4 + .byte 2 + .byte 3 + .byte 4 + .byte 1 gUnknown_83A6258:: @ 83A6258 - .incbin "baserom.gba", 0x3A6258, 0xC + .4byte sub_8061A6C + .4byte sub_8061E5C + .4byte sub_8061B34 gUnknown_83A6264:: @ 83A6264 - .incbin "baserom.gba", 0x3A6264, 0x4 + .byte 3 + .byte 4 + .byte 1 + .byte 2 gUnknown_83A6268:: @ 83A6268 - .incbin "baserom.gba", 0x3A6268, 0xC + .4byte sub_8061A6C + .4byte sub_8061EE8 + .4byte sub_8061B34 gUnknown_83A6274:: @ 83A6274 - .incbin "baserom.gba", 0x3A6274, 0xC + .4byte sub_8061A6C + .4byte sub_8061F74 + .4byte sub_8061B34 gUnknown_83A6280:: @ 83A6280 - .incbin "baserom.gba", 0x3A6280, 0x4 + .byte 4 + .byte 1 + .byte 2 + .byte 3 gUnknown_83A6284:: @ 83A6284 - .incbin "baserom.gba", 0x3A6284, 0xC + .4byte sub_8061A6C + .4byte sub_8062000 + .4byte sub_8061B34 gUnknown_83A6290:: @ 83A6290 - .incbin "baserom.gba", 0x3A6290, 0x4 + .byte 3 + .byte 2 + .byte 1 + .byte 4 gUnknown_83A6294:: @ 83A6294 - .incbin "baserom.gba", 0x3A6294, 0xC + .4byte sub_8061A6C + .4byte sub_806208C + .4byte sub_8061B34 gUnknown_83A62A0:: @ 83A62A0 - .incbin "baserom.gba", 0x3A62A0, 0x4 + .byte 2 + .byte 1 + .byte 4 + .byte 3 gUnknown_83A62A4:: @ 83A62A4 - .incbin "baserom.gba", 0x3A62A4, 0xC + .4byte sub_8061A6C + .4byte sub_8062118 + .4byte sub_8061B34 gUnknown_83A62B0:: @ 83A62B0 - .incbin "baserom.gba", 0x3A62B0, 0x4 + .byte 4 + .byte 3 + .byte 2 + .byte 1 gUnknown_83A62B4:: @ 83A62B4 - .incbin "baserom.gba", 0x3A62B4, 0xC + .4byte sub_8061A6C + .4byte sub_80621A4 + .4byte sub_8061B34 gUnknown_83A62C0:: @ 83A62C0 - .incbin "baserom.gba", 0x3A62C0, 0x4 + .byte 1 + .byte 4 + .byte 3 + .byte 2 gUnknown_83A62C4:: @ 83A62C4 - .incbin "baserom.gba", 0x3A62C4, 0xC + .4byte sub_8061A6C + .4byte sub_8062230 + .4byte sub_8061B34 gUnknown_83A62D0:: @ 83A62D0 - .incbin "baserom.gba", 0x3A62D0, 0x4 + .byte 4 + .byte 2 + .byte 1 + .byte 3 gUnknown_83A62D4:: @ 83A62D4 - .incbin "baserom.gba", 0x3A62D4, 0xC + .4byte sub_8061A6C + .4byte sub_80622BC + .4byte sub_8061B34 gUnknown_83A62E0:: @ 83A62E0 - .incbin "baserom.gba", 0x3A62E0, 0x4 + .byte 2 + .byte 1 + .byte 3 + .byte 4 gUnknown_83A62E4:: @ 83A62E4 - .incbin "baserom.gba", 0x3A62E4, 0xC + .4byte sub_8061A6C + .4byte sub_8062348 + .4byte sub_8061B34 gUnknown_83A62F0:: @ 83A62F0 - .incbin "baserom.gba", 0x3A62F0, 0x4 + .byte 3 + .byte 4 + .byte 2 + .byte 1 gUnknown_83A62F4:: @ 83A62F4 - .incbin "baserom.gba", 0x3A62F4, 0xC + .4byte sub_8061A6C + .4byte sub_80623D4 + .4byte sub_8061B34 gUnknown_83A6300:: @ 83A6300 - .incbin "baserom.gba", 0x3A6300, 0x4 + .byte 1 + .byte 3 + .byte 4 + .byte 2 gUnknown_83A6304:: @ 83A6304 - .incbin "baserom.gba", 0x3A6304, 0xC + .4byte sub_8061A6C + .4byte sub_8062460 + .4byte sub_8061B34 gUnknown_83A6310:: @ 83A6310 - .incbin "baserom.gba", 0x3A6310, 0x4 + .byte 2 + .byte 3 + .byte 1 + .byte 4 gUnknown_83A6314:: @ 83A6314 - .incbin "baserom.gba", 0x3A6314, 0xC + .4byte sub_8061A6C + .4byte sub_80624EC + .4byte sub_8061B34 gUnknown_83A6320:: @ 83A6320 - .incbin "baserom.gba", 0x3A6320, 0x4 + .byte 1 + .byte 4 + .byte 2 + .byte 3 gUnknown_83A6324:: @ 83A6324 - .incbin "baserom.gba", 0x3A6324, 0xC + .4byte sub_8061A6C + .4byte sub_8062578 + .4byte sub_8061B34 gUnknown_83A6330:: @ 83A6330 - .incbin "baserom.gba", 0x3A6330, 0x4 + .byte 3 + .byte 1 + .byte 4 + .byte 2 gUnknown_83A6334:: @ 83A6334 - .incbin "baserom.gba", 0x3A6334, 0xC + .4byte sub_8061A6C + .4byte sub_8062604 + .4byte sub_8061B34 gUnknown_83A6340:: @ 83A6340 - .incbin "baserom.gba", 0x3A6340, 0x4 + .byte 4 + .byte 2 + .byte 3 + .byte 1 gUnknown_83A6344:: @ 83A6344 - .incbin "baserom.gba", 0x3A6344, 0xC + .4byte sub_8061A6C + .4byte sub_8062690 + .4byte sub_8061B34 gUnknown_83A6350:: @ 83A6350 - .incbin "baserom.gba", 0x3A6350, 0x4 + .byte 2 + .byte 4 + .byte 1 + .byte 3 gUnknown_83A6354:: @ 83A6354 - .incbin "baserom.gba", 0x3A6354, 0xC + .4byte sub_8061A6C + .4byte sub_806271C + .4byte sub_8061B34 gUnknown_83A6360:: @ 83A6360 - .incbin "baserom.gba", 0x3A6360, 0x4 + .byte 1 + .byte 3 + .byte 2 + .byte 4 gUnknown_83A6364:: @ 83A6364 - .incbin "baserom.gba", 0x3A6364, 0xC + .4byte sub_8061A6C + .4byte sub_80627A8 + .4byte sub_8061B34 gUnknown_83A6370:: @ 83A6370 - .incbin "baserom.gba", 0x3A6370, 0x4 + .byte 3 + .byte 2 + .byte 4 + .byte 1 gUnknown_83A6374:: @ 83A6374 - .incbin "baserom.gba", 0x3A6374, 0xC + .4byte sub_8061A6C + .4byte sub_8062834 + .4byte sub_8061B34 gUnknown_83A6380:: @ 83A6380 - .incbin "baserom.gba", 0x3A6380, 0x4 + .byte 4 + .byte 1 + .byte 3 + .byte 2 gUnknown_83A6384:: @ 83A6384 - .incbin "baserom.gba", 0x3A6384, 0xC + .4byte mss_npc_reset_oampriv3_1_unk2_unk3 + .4byte sub_80628E4 + .4byte sub_8062944 gUnknown_83A6390:: @ 83A6390 - .incbin "baserom.gba", 0x3A6390, 0x2C + .4byte sub_806296C + .4byte sub_8062970 + .4byte sub_80629B8 + .4byte sub_8062A70 + .4byte sub_8062B28 + .4byte sub_8062BE0 + .4byte cph_IM_DIFFERENT + .4byte sub_8062CE0 + .4byte oac_hopping + .4byte sub_806296C + .4byte sub_806296C gUnknown_83A63BC:: @ 83A63BC - .incbin "baserom.gba", 0x3A63BC, 0xC + .4byte mss_npc_reset_oampriv3_1_unk2_unk3 + .4byte mss_08062EA4 + .4byte sub_8062944 gUnknown_83A63C8:: @ 83A63C8 - .incbin "baserom.gba", 0x3A63C8, 0x4 + .4byte sub_8063078 gUnknown_83A63CC:: @ 83A63CC - .incbin "baserom.gba", 0x3A63CC, 0x8 + .4byte sub_80630E4 + .4byte sub_8063084 gUnknown_83A63D4:: @ 83A63D4 - .incbin "baserom.gba", 0x3A63D4, 0x8 + .4byte sub_8063154 + .4byte sub_8063084 gUnknown_83A63DC:: @ 83A63DC - .incbin "baserom.gba", 0x3A63DC, 0x8 + .4byte sub_80631C4 + .4byte sub_8063084 gUnknown_83A63E4:: @ 83A63E4 - .incbin "baserom.gba", 0x3A63E4, 0xC + .4byte sub_8063234 + .4byte sub_8063268 + .4byte sub_8063288 gUnknown_83A63F0:: @ 83A63F0 - .incbin "baserom.gba", 0x3A63F0, 0xC + .4byte sub_8063364 + .4byte sub_8063384 + .4byte sub_80633A4 gUnknown_83A63FC:: @ 83A63FC - .incbin "baserom.gba", 0x3A63FC, 0x8 + .4byte sub_80633B4 + .4byte sub_80633F4 gUnknown_83A6404:: @ 83A6404 - .incbin "baserom.gba", 0x3A6404, 0x8 + .4byte sub_80633D4 + .4byte sub_80633F4 +@ gFaceDirectionAnimNums ? gUnknown_83A640C:: @ 83A640C - .incbin "baserom.gba", 0x3A640C, 0x9 + .byte 0x00 + .byte 0x00 + .byte 0x01 + .byte 0x02 + .byte 0x03 + .byte 0x00 + .byte 0x00 + .byte 0x01 + .byte 0x01 gUnknown_83A6415:: @ 83A6415 - .incbin "baserom.gba", 0x3A6415, 0x9 + .byte 0x4 @ DIR_NONE + .byte 0x4 @ DIR_SOUTH + .byte 0x5 @ DIR_NORTH + .byte 0x6 @ DIR_WEST + .byte 0x7 @ DIR_EAST + .byte 0x4 @ DIR_SOUTHWEST + .byte 0x4 @ DIR_SOUTHEAST + .byte 0x5 @ DIR_NORTHWEST + .byte 0x5 @ DIR_NORTHEAST gUnknown_83A641E:: @ 83A641E - .incbin "baserom.gba", 0x3A641E, 0x9 + .byte 0x8 @ DIR_NONE + .byte 0x8 @ DIR_SOUTH + .byte 0x9 @ DIR_NORTH + .byte 0xA @ DIR_WEST + .byte 0xB @ DIR_EAST + .byte 0x8 @ DIR_SOUTHWEST + .byte 0x8 @ DIR_SOUTHEAST + .byte 0x9 @ DIR_NORTHWEST + .byte 0x9 @ DIR_NORTHEAST gUnknown_83A6427:: @ 83A6427 - .incbin "baserom.gba", 0x3A6427, 0x9 + .byte 0xC @ DIR_NONE + .byte 0xC @ DIR_SOUTH + .byte 0xD @ DIR_NORTH + .byte 0xE @ DIR_WEST + .byte 0xF @ DIR_EAST + .byte 0xC @ DIR_SOUTHWEST + .byte 0xC @ DIR_SOUTHEAST + .byte 0xD @ DIR_NORTHWEST + .byte 0xD @ DIR_NORTHEAST gUnknown_83A6430:: @ 83A6430 - .incbin "baserom.gba", 0x3A6430, 0x9 + .byte 0x10 @ DIR_NONE + .byte 0x10 @ DIR_SOUTH + .byte 0x11 @ DIR_NORTH + .byte 0x12 @ DIR_WEST + .byte 0x13 @ DIR_EAST + .byte 0x10 @ DIR_SOUTHWEST + .byte 0x10 @ DIR_SOUTHEAST + .byte 0x11 @ DIR_NORTHWEST + .byte 0x11 @ DIR_NORTHEAST gUnknown_83A6439:: @ 83A6439 - .incbin "baserom.gba", 0x3A6439, 0x9 + .byte 0x14 @ DIR_NONE + .byte 0x14 @ DIR_SOUTH + .byte 0x15 @ DIR_NORTH + .byte 0x16 @ DIR_WEST + .byte 0x17 @ DIR_EAST + .byte 0x14 @ DIR_SOUTHWEST + .byte 0x14 @ DIR_SOUTHEAST + .byte 0x15 @ DIR_NORTHWEST + .byte 0x15 @ DIR_NORTHEAST gUnknown_83A6442:: @ 83A6442 - .incbin "baserom.gba", 0x3A6442, 0x9 + .byte 0x14 @ DIR_NONE + .byte 0x14 @ DIR_SOUTH + .byte 0x15 @ DIR_NORTH + .byte 0x16 @ DIR_WEST + .byte 0x17 @ DIR_EAST + .byte 0x14 @ DIR_SOUTHWEST + .byte 0x14 @ DIR_SOUTHEAST + .byte 0x15 @ DIR_NORTHWEST + .byte 0x15 @ DIR_NORTHEAST gUnknown_83A644B:: @ 83A644B - .incbin "baserom.gba", 0x3A644B, 0x9 + .byte 0x18 @ DIR_NONE + .byte 0x18 @ DIR_SOUTH + .byte 0x19 @ DIR_NORTH + .byte 0x1A @ DIR_WEST + .byte 0x1B @ DIR_EAST + .byte 0x18 @ DIR_SOUTHWEST + .byte 0x18 @ DIR_SOUTHEAST + .byte 0x19 @ DIR_NORTHWEST + .byte 0x19 @ DIR_NORTHEAST gUnknown_83A6454:: @ 83A6454 - .incbin "baserom.gba", 0x3A6454, 0x9 + .byte 0x1C @ DIR_NONE + .byte 0x1C @ DIR_SOUTH + .byte 0x1D @ DIR_NORTH + .byte 0x1E @ DIR_WEST + .byte 0x1F @ DIR_EAST + .byte 0x1C @ DIR_SOUTHWEST + .byte 0x1C @ DIR_SOUTHEAST + .byte 0x1D @ DIR_NORTHWEST + .byte 0x1D @ DIR_NORTHEAST gUnknown_83A645D:: @ 83A645D - .incbin "baserom.gba", 0x3A645D, 0x9 + .byte 0x18 @ DIR_NONE + .byte 0x18 @ DIR_SOUTH + .byte 0x19 @ DIR_NORTH + .byte 0x1A @ DIR_WEST + .byte 0x1B @ DIR_EAST + .byte 0x18 @ DIR_SOUTHWEST + .byte 0x19 @ DIR_SOUTHEAST + .byte 0x1A @ DIR_NORTHWEST + .byte 0x1B @ DIR_NORTHEAST gUnknown_83A6466:: @ 83A6466 - .incbin "baserom.gba", 0x3A6466, 0x9 + .byte 0x20 @ DIR_NONE + .byte 0x20 @ DIR_SOUTH + .byte 0x21 @ DIR_NORTH + .byte 0x22 @ DIR_WEST + .byte 0x23 @ DIR_EAST + .byte 0x20 @ DIR_SOUTHWEST + .byte 0x20 @ DIR_SOUTHEAST + .byte 0x21 @ DIR_NORTHWEST + .byte 0x21 @ DIR_NORTHEAST gUnknown_83A646F:: @ 83A646F - .incbin "baserom.gba", 0x3A646F, 0x9 + .byte 0x24 @ DIR_NONE + .byte 0x24 @ DIR_SOUTH + .byte 0x25 @ DIR_NORTH + .byte 0x26 @ DIR_WEST + .byte 0x27 @ DIR_EAST + .byte 0x24 @ DIR_SOUTHWEST + .byte 0x24 @ DIR_SOUTHEAST + .byte 0x25 @ DIR_NORTHWEST + .byte 0x25 @ DIR_NORTHEAST gUnknown_83A6478:: @ 83A6478 - .incbin "baserom.gba", 0x3A6478, 0x9 + .byte 0x0 @ DIR_NONE + .byte 0x0 @ DIR_SOUTH + .byte 0x1 @ DIR_NORTH + .byte 0x2 @ DIR_WEST + .byte 0x3 @ DIR_EAST + .byte 0x0 @ DIR_SOUTHWEST + .byte 0x0 @ DIR_SOUTHEAST + .byte 0x1 @ DIR_NORTHWEST + .byte 0x1 @ DIR_NORTHEAST gUnknown_83A6481:: @ 83A6481 - .incbin "baserom.gba", 0x3A6481, 0x9 + .byte 0x4 @ DIR_NONE + .byte 0x4 @ DIR_SOUTH + .byte 0x5 @ DIR_NORTH + .byte 0x6 @ DIR_WEST + .byte 0x7 @ DIR_EAST + .byte 0x4 @ DIR_SOUTHWEST + .byte 0x4 @ DIR_SOUTHEAST + .byte 0x5 @ DIR_NORTHWEST + .byte 0x5 @ DIR_NORTHEAST gUnknown_83A648A:: @ 83A648A - .incbin "baserom.gba", 0x3A648A, 0x9 + .byte 0x8 @ DIR_NONE + .byte 0x8 @ DIR_SOUTH + .byte 0x9 @ DIR_NORTH + .byte 0xA @ DIR_WEST + .byte 0xB @ DIR_EAST + .byte 0x8 @ DIR_SOUTHWEST + .byte 0x8 @ DIR_SOUTHEAST + .byte 0x9 @ DIR_NORTHWEST + .byte 0x9 @ DIR_NORTHEAST gUnknown_83A6493:: @ 83A6493 - .incbin "baserom.gba", 0x3A6493, 0x9 + .byte 0x14 @ DIR_NONE + .byte 0x14 @ DIR_SOUTH + .byte 0x15 @ DIR_NORTH + .byte 0x16 @ DIR_WEST + .byte 0x17 @ DIR_EAST + .byte 0x14 @ DIR_SOUTHWEST + .byte 0x14 @ DIR_SOUTHEAST + .byte 0x15 @ DIR_NORTHWEST + .byte 0x15 @ DIR_NORTHEAST gUnknown_83A649C:: @ 83A649C - .incbin "baserom.gba", 0x3A649C, 0xC + .byte 0x08 + .byte 0x08 + .byte 0x07 + .byte 0x09 + .byte 0x0A + .byte 0x08 + .byte 0x08 + .byte 0x07 + .byte 0x07 + .byte 0x00 + .byte 0x00 + .byte 0x00 gUnknown_83A64A8:: @ 83A64A8 - .incbin "baserom.gba", 0x3A64A8, 0x10 + .4byte MetatileBehavior_IsSouthBlocked + .4byte MetatileBehavior_IsNorthBlocked + .4byte MetatileBehavior_IsWestBlocked + .4byte MetatileBehavior_IsEastBlocked gUnknown_83A64B8:: @ 83A64B8 - .incbin "baserom.gba", 0x3A64B8, 0x10 + .4byte MetatileBehavior_IsNorthBlocked + .4byte MetatileBehavior_IsSouthBlocked + .4byte MetatileBehavior_IsEastBlocked + .4byte MetatileBehavior_IsWestBlocked +@ sDirectionToVectors gUnknown_83A64C8:: @ 83A64C8 - .incbin "baserom.gba", 0x3A64C8, 0x24 - + .2byte 0, 0 @ DIR_NONE + .2byte 0, 1 @ DIR_SOUTH + .2byte 0, -1 @ DIR_NORTH + .2byte -1, 0 @ DIR_WEST + .2byte 1, 0 @ DIR_EAST + .2byte -1, 1 @ DIR_SOUTHWEST + .2byte 1, 1 @ DIR_SOUTHEAST + .2byte -1, -1 @ DIR_NORTHWEST + .2byte 1, -1 @ DIR_NORTHEAST + +@ gFaceDirectionMovementActions gUnknown_83A64EC:: @ 83A64EC - .incbin "baserom.gba", 0x3A64EC, 0x5 + .byte 0x0 @ DIR_NONE + .byte 0x0 @ DIR_SOUTH + .byte 0x1 @ DIR_NORTH + .byte 0x2 @ DIR_WEST + .byte 0x3 @ DIR_EAST gUnknown_83A64F1:: @ 83A64F1 - .incbin "baserom.gba", 0x3A64F1, 0x5 + .byte 0x4 @ DIR_NONE + .byte 0x4 @ DIR_SOUTH + .byte 0x5 @ DIR_NORTH + .byte 0x6 @ DIR_WEST + .byte 0x7 @ DIR_EAST gUnknown_83A64F6:: @ 83A64F6 - .incbin "baserom.gba", 0x3A64F6, 0x5 + .byte 0x9B @ DIR_NONE + .byte 0x9B @ DIR_SOUTH + .byte 0x9C @ DIR_NORTH + .byte 0x9D @ DIR_WEST + .byte 0x9E @ DIR_EAST gUnknown_83A64FB:: @ 83A64FB - .incbin "baserom.gba", 0x3A64FB, 0x5 + .byte 0x8 @ DIR_NONE + .byte 0x8 @ DIR_SOUTH + .byte 0x9 @ DIR_NORTH + .byte 0xA @ DIR_WEST + .byte 0xB @ DIR_EAST gUnknown_83A6500:: @ 83A6500 - .incbin "baserom.gba", 0x3A6500, 0x5 + .byte 0xC @ DIR_NONE + .byte 0xC @ DIR_SOUTH + .byte 0xD @ DIR_NORTH + .byte 0xE @ DIR_WEST + .byte 0xF @ DIR_EAST gUnknown_83A6505:: @ 83A6505 - .incbin "baserom.gba", 0x3A6505, 0x5 + .byte 0x10 @ DIR_NONE + .byte 0x10 @ DIR_SOUTH + .byte 0x11 @ DIR_NORTH + .byte 0x12 @ DIR_WEST + .byte 0x13 @ DIR_EAST gUnknown_83A650A:: @ 83A650A - .incbin "baserom.gba", 0x3A650A, 0x5 + .byte 0x1D @ DIR_NONE + .byte 0x1D @ DIR_SOUTH + .byte 0x1E @ DIR_NORTH + .byte 0x1F @ DIR_WEST + .byte 0x20 @ DIR_EAST gUnknown_83A650F:: @ 83A650F - .incbin "baserom.gba", 0x3A650F, 0x5 + .byte 0xA0 @ DIR_NONE + .byte 0xA0 @ DIR_SOUTH + .byte 0xA1 @ DIR_NORTH + .byte 0xA2 @ DIR_WEST + .byte 0xA3 @ DIR_EAST gUnknown_83A6514:: @ 83A6514 - .incbin "baserom.gba", 0x3A6514, 0x5 + .byte 0x31 @ DIR_NONE + .byte 0x31 @ DIR_SOUTH + .byte 0x32 @ DIR_NORTH + .byte 0x33 @ DIR_WEST + .byte 0x34 @ DIR_EAST gUnknown_83A6519:: @ 83A6519 - .incbin "baserom.gba", 0x3A6519, 0x5 + .byte 0x35 @ DIR_NONE + .byte 0x35 @ DIR_SOUTH + .byte 0x36 @ DIR_NORTH + .byte 0x37 @ DIR_WEST + .byte 0x38 @ DIR_EAST gUnknown_83A651E:: @ 83A651E - .incbin "baserom.gba", 0x3A651E, 0x5 + .byte 0x39 @ DIR_NONE + .byte 0x39 @ DIR_SOUTH + .byte 0x3A @ DIR_NORTH + .byte 0x3B @ DIR_WEST + .byte 0x3C @ DIR_EAST gUnknown_83A6523:: @ 83A6523 - .incbin "baserom.gba", 0x3A6523, 0x5 + .byte 0x3D @ DIR_NONE + .byte 0x3D @ DIR_SOUTH + .byte 0x3E @ DIR_NORTH + .byte 0x3F @ DIR_WEST + .byte 0x40 @ DIR_EAST gUnknown_83A6528:: @ 83A6528 - .incbin "baserom.gba", 0x3A6528, 0x5 + .byte 0x41 @ DIR_NONE + .byte 0x41 @ DIR_SOUTH + .byte 0x42 @ DIR_NORTH + .byte 0x43 @ DIR_WEST + .byte 0x44 @ DIR_EAST gUnknown_83A652D:: @ 83A652D - .incbin "baserom.gba", 0x3A652D, 0x5 + .byte 0x94 @ DIR_NONE + .byte 0x94 @ DIR_SOUTH + .byte 0x95 @ DIR_NORTH + .byte 0x96 @ DIR_WEST + .byte 0x97 @ DIR_EAST gUnknown_83A6532:: @ 83A6532 - .incbin "baserom.gba", 0x3A6532, 0x5 + .byte 0x14 @ DIR_NONE + .byte 0x14 @ DIR_SOUTH + .byte 0x15 @ DIR_NORTH + .byte 0x16 @ DIR_WEST + .byte 0x17 @ DIR_EAST gUnknown_83A6537:: @ 83A6537 - .incbin "baserom.gba", 0x3A6537, 0x5 + .byte 0x52 @ DIR_NONE + .byte 0x52 @ DIR_SOUTH + .byte 0x53 @ DIR_NORTH + .byte 0x54 @ DIR_WEST + .byte 0x55 @ DIR_EAST gUnknown_83A653C:: @ 83A653C - .incbin "baserom.gba", 0x3A653C, 0x5 + .byte 0x57 @ DIR_NONE + .byte 0x57 @ DIR_SOUTH + .byte 0x56 @ DIR_NORTH + .byte 0x59 @ DIR_WEST + .byte 0x58 @ DIR_EAST gUnknown_83A6541:: @ 83A6541 - .incbin "baserom.gba", 0x3A6541, 0x5 + .byte 0x4E @ DIR_NONE + .byte 0x4E @ DIR_SOUTH + .byte 0x4F @ DIR_NORTH + .byte 0x50 @ DIR_WEST + .byte 0x51 @ DIR_EAST gUnknown_83A6546:: @ 83A6546 - .incbin "baserom.gba", 0x3A6546, 0x5 + .byte 0x46 @ DIR_NONE + .byte 0x46 @ DIR_SOUTH + .byte 0x47 @ DIR_NORTH + .byte 0x48 @ DIR_WEST + .byte 0x49 @ DIR_EAST gUnknown_83A654B:: @ 83A654B - .incbin "baserom.gba", 0x3A654B, 0x5 + .byte 0xA6 @ DIR_NONE + .byte 0xA6 @ DIR_SOUTH + .byte 0xA7 @ DIR_NORTH + .byte 0xA8 @ DIR_WEST + .byte 0xA9 @ DIR_EAST gUnknown_83A6550:: @ 83A6550 - .incbin "baserom.gba", 0x3A6550, 0x5 + .byte 0x21 @ DIR_NONE + .byte 0x21 @ DIR_SOUTH + .byte 0x22 @ DIR_NORTH + .byte 0x23 @ DIR_WEST + .byte 0x24 @ DIR_EAST gUnknown_83A6555:: @ 83A6555 - .incbin "baserom.gba", 0x3A6555, 0x5 + .byte 0x25 @ DIR_NONE + .byte 0x25 @ DIR_SOUTH + .byte 0x26 @ DIR_NORTH + .byte 0x27 @ DIR_WEST + .byte 0x28 @ DIR_EAST gUnknown_83A655A:: @ 83A655A - .incbin "baserom.gba", 0x3A655A, 0x5 + .byte 0x29 @ DIR_NONE + .byte 0x29 @ DIR_SOUTH + .byte 0x2A @ DIR_NORTH + .byte 0x2B @ DIR_WEST + .byte 0x2C @ DIR_EAST gUnknown_83A655F:: @ 83A655F - .incbin "baserom.gba", 0x3A655F, 0x5 + .byte 0x2D @ DIR_NONE + .byte 0x2D @ DIR_SOUTH + .byte 0x2E @ DIR_NORTH + .byte 0x2F @ DIR_WEST + .byte 0x30 @ DIR_EAST gUnknown_83A6564:: @ 83A6564 - .incbin "baserom.gba", 0x3A6564, 0x5 + .byte 0x70 @ DIR_NONE + .byte 0x70 @ DIR_SOUTH + .byte 0x71 @ DIR_NORTH + .byte 0x72 @ DIR_WEST + .byte 0x73 @ DIR_EAST gUnknown_83A6569:: @ 83A6569 - .incbin "baserom.gba", 0x3A6569, 0x5 + .byte 0x74 @ DIR_NONE + .byte 0x74 @ DIR_SOUTH + .byte 0x75 @ DIR_NORTH + .byte 0x76 @ DIR_WEST + .byte 0x77 @ DIR_EAST gUnknown_83A656E:: @ 83A656E - .incbin "baserom.gba", 0x3A656E, 0x5 + .byte 0x78 @ DIR_NONE + .byte 0x78 @ DIR_SOUTH + .byte 0x79 @ DIR_NORTH + .byte 0x7A @ DIR_WEST + .byte 0x7B @ DIR_EAST gUnknown_83A6573:: @ 83A6573 - .incbin "baserom.gba", 0x3A6573, 0x5 + .byte 0x7C @ DIR_NONE + .byte 0x7C @ DIR_SOUTH + .byte 0x7D @ DIR_NORTH + .byte 0x7E @ DIR_WEST + .byte 0x7F @ DIR_EAST gUnknown_83A6578:: @ 83A6578 - .incbin "baserom.gba", 0x3A6578, 0x5 + .byte 0x80 @ DIR_NONE + .byte 0x80 @ DIR_SOUTH + .byte 0x81 @ DIR_NORTH + .byte 0x82 @ DIR_WEST + .byte 0x83 @ DIR_EAST gUnknown_83A657D:: @ 83A657D - .incbin "baserom.gba", 0x3A657D, 0x5 + .byte 0x84 @ DIR_NONE + .byte 0x84 @ DIR_SOUTH + .byte 0x85 @ DIR_NORTH + .byte 0x86 @ DIR_WEST + .byte 0x87 @ DIR_EAST gUnknown_83A6582:: @ 83A6582 - .incbin "baserom.gba", 0x3A6582, 0x5 + .byte 0x88 @ DIR_NONE + .byte 0x88 @ DIR_SOUTH + .byte 0x89 @ DIR_NORTH + .byte 0x8A @ DIR_WEST + .byte 0x8B @ DIR_EAST gUnknown_83A6587:: @ 83A6587 - .incbin "baserom.gba", 0x3A6587, 0x5 + .byte 0x8C @ DIR_NONE + .byte 0x8C @ DIR_SOUTH + .byte 0x8D @ DIR_NORTH + .byte 0x8E @ DIR_WEST + .byte 0x8F @ DIR_EAST gUnknown_83A658C:: @ 83A658C - .incbin "baserom.gba", 0x3A658C, 0x5 + .byte 0x90 @ DIR_NONE + .byte 0x90 @ DIR_SOUTH + .byte 0x91 @ DIR_NORTH + .byte 0x92 @ DIR_WEST + .byte 0x93 @ DIR_EAST +@ gOppositeDirections ? gUnknown_83A6591:: @ 83A6591 - .incbin "baserom.gba", 0x3A6591, 0x8 + .byte 0x02 + .byte 0x01 + .byte 0x04 + .byte 0x03 + .byte 0x08 + .byte 0x07 + .byte 0x06 + .byte 0x05 gUnknown_83A6599:: @ 83A6599 - .incbin "baserom.gba", 0x3A6599, 0x10 + .byte 0x02 + .byte 0x01 + .byte 0x04 + .byte 0x03 + .byte 0x01 + .byte 0x02 + .byte 0x03 + .byte 0x04 + .byte 0x03 + .byte 0x04 + .byte 0x02 + .byte 0x01 + .byte 0x04 + .byte 0x03 + .byte 0x01 + .byte 0x02 gUnknown_83A65A9:: @ 83A65A9 - .incbin "baserom.gba", 0x3A65A9, 0x13 - + .byte 0x02 + .byte 0x01 + .byte 0x04 + .byte 0x03 + .byte 0x01 + .byte 0x02 + .byte 0x03 + .byte 0x04 + .byte 0x04 + .byte 0x03 + .byte 0x01 + .byte 0x02 + .byte 0x03 + .byte 0x04 + .byte 0x02 + .byte 0x01 + .byte 0x00 + .byte 0x00 + .byte 0x00 + +@ gMovementActionFuncs gUnknown_83A65BC:: @ 83A65BC - .incbin "baserom.gba", 0x3A65BC, 0x2C8 + .4byte gUnknown_83A6864 + .4byte gUnknown_83A686C + .4byte gUnknown_83A6874 + .4byte gUnknown_83A687C + .4byte gUnknown_83A6A30 + .4byte gUnknown_83A6A38 + .4byte gUnknown_83A6A40 + .4byte gUnknown_83A6A48 + .4byte gUnknown_83A68C8 + .4byte gUnknown_83A68D4 + .4byte gUnknown_83A68E0 + .4byte gUnknown_83A68EC + .4byte gUnknown_83A6904 + .4byte gUnknown_83A68F8 + .4byte gUnknown_83A6910 + .4byte gUnknown_83A691C + .4byte gUnknown_83A6928 + .4byte gUnknown_83A6934 + .4byte gUnknown_83A6940 + .4byte gUnknown_83A694C + .4byte gUnknown_83A6964 + .4byte gUnknown_83A6970 + .4byte gUnknown_83A697C + .4byte gUnknown_83A6988 + .4byte gUnknown_83A6994 + .4byte gUnknown_83A69A0 + .4byte gUnknown_83A69AC + .4byte gUnknown_83A69B8 + .4byte gUnknown_83A69C4 + .4byte gUnknown_83A69D0 + .4byte gUnknown_83A69DC + .4byte gUnknown_83A69E8 + .4byte gUnknown_83A69F4 + .4byte gUnknown_83A6A50 + .4byte gUnknown_83A6A5C + .4byte gUnknown_83A6A68 + .4byte gUnknown_83A6A74 + .4byte gUnknown_83A6A80 + .4byte gUnknown_83A6A8C + .4byte gUnknown_83A6A98 + .4byte gUnknown_83A6AA4 + .4byte gUnknown_83A6AB0 + .4byte gUnknown_83A6ABC + .4byte gUnknown_83A6AC8 + .4byte gUnknown_83A6AD4 + .4byte gUnknown_83A6AE0 + .4byte gUnknown_83A6AEC + .4byte gUnknown_83A6AF8 + .4byte gUnknown_83A6B04 + .4byte gUnknown_83A6B10 + .4byte gUnknown_83A6B1C + .4byte gUnknown_83A6B28 + .4byte gUnknown_83A6B34 + .4byte gUnknown_83A6B40 + .4byte gUnknown_83A6B4C + .4byte gUnknown_83A6B58 + .4byte gUnknown_83A6B64 + .4byte gUnknown_83A6B70 + .4byte gUnknown_83A6B7C + .4byte gUnknown_83A6B88 + .4byte gUnknown_83A6B94 + .4byte gUnknown_83A6BA0 + .4byte gUnknown_83A6BAC + .4byte gUnknown_83A6BB8 + .4byte gUnknown_83A6BC4 + .4byte gUnknown_83A6BD0 + .4byte gUnknown_83A6BDC + .4byte gUnknown_83A6BE8 + .4byte gUnknown_83A6BF4 + .4byte gUnknown_83A6C00 + .4byte gUnknown_83A6C0C + .4byte gUnknown_83A6C18 + .4byte gUnknown_83A6C24 + .4byte gUnknown_83A6C30 + .4byte gUnknown_83A6C6C + .4byte gUnknown_83A6C74 + .4byte gUnknown_83A6C7C + .4byte gUnknown_83A6C84 + .4byte gUnknown_83A6C8C + .4byte gUnknown_83A6C98 + .4byte gUnknown_83A6CA4 + .4byte gUnknown_83A6CB0 + .4byte gUnknown_83A6CBC + .4byte gUnknown_83A6CC8 + .4byte gUnknown_83A6CD4 + .4byte gUnknown_83A6CE0 + .4byte gUnknown_83A6CEC + .4byte gUnknown_83A6CF8 + .4byte gUnknown_83A6D04 + .4byte gUnknown_83A6D10 + .4byte gUnknown_83A6D1C + .4byte gUnknown_83A6D24 + .4byte gUnknown_83A6D30 + .4byte gUnknown_83A6D38 + .4byte gUnknown_83A6D40 + .4byte gUnknown_83A6D48 + .4byte gUnknown_83A6D50 + .4byte gUnknown_83A6D58 + .4byte gUnknown_83A6D60 + .4byte gUnknown_83A6D68 + .4byte gUnknown_83A6D70 + .4byte gUnknown_83A6D78 + .4byte gUnknown_83A6D80 + .4byte gUnknown_83A6D88 + .4byte gUnknown_83A6D94 + .4byte gUnknown_83A6DA4 + .4byte gUnknown_83A6DB4 + .4byte gUnknown_83A6DBC + .4byte gUnknown_83A6DC4 + .4byte gUnknown_83A6DCC + .4byte gUnknown_83A6DD4 + .4byte gUnknown_83A6DE0 + .4byte gUnknown_83A6DEC + .4byte gUnknown_83A6DF4 + .4byte gUnknown_83A6DFC + .4byte gUnknown_83A6E04 + .4byte gUnknown_83A6E0C + .4byte gUnknown_83A6E18 + .4byte gUnknown_83A6E24 + .4byte gUnknown_83A6E30 + .4byte gUnknown_83A6E3C + .4byte gUnknown_83A6E48 + .4byte gUnknown_83A6E54 + .4byte gUnknown_83A6E60 + .4byte gUnknown_83A6E9C + .4byte gUnknown_83A6EA8 + .4byte gUnknown_83A6EB4 + .4byte gUnknown_83A6EC0 + .4byte gUnknown_83A6ECC + .4byte gUnknown_83A6ED8 + .4byte gUnknown_83A6EE4 + .4byte gUnknown_83A6EF0 + .4byte gUnknown_83A6EFC + .4byte gUnknown_83A6F08 + .4byte gUnknown_83A6F14 + .4byte gUnknown_83A6F20 + .4byte gUnknown_83A6F2C + .4byte gUnknown_83A6F38 + .4byte gUnknown_83A6F44 + .4byte gUnknown_83A6F50 + .4byte gUnknown_83A6F5C + .4byte gUnknown_83A6F68 + .4byte gUnknown_83A6F74 + .4byte gUnknown_83A6F80 + .4byte gUnknown_83A6F8C + .4byte gUnknown_83A6F98 + .4byte gUnknown_83A6FA4 + .4byte gUnknown_83A6FB0 + .4byte gUnknown_83A6FBC + .4byte gUnknown_83A6FC8 + .4byte gUnknown_83A6FD4 + .4byte gUnknown_83A6FE0 + .4byte gUnknown_83A6FEC + .4byte gUnknown_83A6FF4 + .4byte gUnknown_83A6FFC + .4byte gUnknown_83A6898 + .4byte gUnknown_83A68A4 + .4byte gUnknown_83A68B0 + .4byte gUnknown_83A68BC + .4byte gUnknown_83A7004 + .4byte gUnknown_83A6A00 + .4byte gUnknown_83A6A0C + .4byte gUnknown_83A6A18 + .4byte gUnknown_83A6A24 + .4byte gUnknown_83A700C + .4byte gUnknown_83A7018 + .4byte gUnknown_83A6C3C + .4byte gUnknown_83A6C48 + .4byte gUnknown_83A6C54 + .4byte gUnknown_83A6C60 + +gUnknown_83A6864:: @ 83A6864 + .4byte sub_8064638 + .4byte sub_8067934 + +gUnknown_83A686C:: @ 83A686C + .4byte sub_8064648 + .4byte sub_8067934 + +gUnknown_83A6874:: @ 83A6874 + .4byte sub_8064658 + .4byte sub_8067934 + +gUnknown_83A687C:: @ 83A687C + .4byte sub_8064668 + .4byte sub_8067934 gUnknown_83A6884:: @ 83A6884 - .incbin "baserom.gba", 0x3A6884, 0xD4 + .4byte get_go_image_anim_num + .4byte get_go_fast_image_anim_num + .4byte get_go_fast_image_anim_num + .4byte get_go_faster_image_anim_num + .4byte sub_8063470 + +gUnknown_83A6898:: @ 83A6898 + .4byte sub_8064968 + .4byte sub_8064988 + .4byte sub_8067934 + +gUnknown_83A68A4:: @ 83A68A4 + .4byte sub_80649A8 + .4byte sub_80649C8 + .4byte sub_8067934 + +gUnknown_83A68B0:: @ 83A68B0 + .4byte sub_80649E8 + .4byte sub_8064A08 + .4byte sub_8067934 + +gUnknown_83A68BC:: @ 83A68BC + .4byte sub_8064A28 + .4byte sub_8064A48 + .4byte sub_8067934 + +gUnknown_83A68C8:: @ 83A68C8 + .4byte sub_8064A68 + .4byte sub_8064A88 + .4byte sub_8067934 + +gUnknown_83A68D4:: @ 83A68D4 + .4byte sub_8064AA8 + .4byte sub_8064AC8 + .4byte sub_8067934 + +gUnknown_83A68E0:: @ 83A68E0 + .4byte sub_8064AE8 + .4byte sub_8064B08 + .4byte sub_8067934 + +gUnknown_83A68EC:: @ 83A68EC + .4byte sub_8064B28 + .4byte sub_8064B48 + .4byte sub_8067934 + +gUnknown_83A68F8:: @ 83A68F8 + .4byte sub_8064C3C + .4byte sub_8064C5C + .4byte sub_8067934 + +gUnknown_83A6904:: @ 83A6904 + .4byte sub_8064C7C + .4byte sub_8064C9C + .4byte sub_8067934 + +gUnknown_83A6910:: @ 83A6910 + .4byte sub_8064CBC + .4byte sub_8064CDC + .4byte sub_8067934 + +gUnknown_83A691C:: @ 83A691C + .4byte sub_8064CFC + .4byte sub_8064D1C + .4byte sub_8067934 + +gUnknown_83A6928:: @ 83A6928 + .4byte sub_8064D3C + .4byte sub_8064D5C + .4byte sub_8067934 + +gUnknown_83A6934:: @ 83A6934 + .4byte sub_8064D7C + .4byte sub_8064D9C + .4byte sub_8067934 + +gUnknown_83A6940:: @ 83A6940 + .4byte sub_8064DBC + .4byte sub_8064DDC + .4byte sub_8067934 + +gUnknown_83A694C:: @ 83A694C + .4byte sub_8064DFC + .4byte sub_8064E1C + .4byte sub_8067934 gUnknown_83A6958:: @ 83A6958 - .incbin "baserom.gba", 0x3A6958, 0x6 + .2byte 0x0000 + .2byte 0x0001 + .2byte 0x0001 gUnknown_83A695E:: @ 83A695E - .incbin "baserom.gba", 0x3A695E, 0x6C6 + .2byte 0x0000 + .2byte 0x0000 + .2byte 0x0001 + +gUnknown_83A6964:: @ 83A6964 + .4byte sub_80650A8 + .4byte sub_80650D4 + .4byte sub_8067934 + +gUnknown_83A6970:: @ 83A6970 + .4byte sub_8065100 + .4byte sub_806512C + .4byte sub_8067934 + +gUnknown_83A697C:: @ 83A697C + .4byte sub_8065158 + .4byte sub_8065184 + .4byte sub_8067934 + +gUnknown_83A6988:: @ 83A6988 + .4byte sub_80651B0 + .4byte sub_80651DC + .4byte sub_8067934 + +gUnknown_83A6994:: @ 83A6994 + .4byte sub_806522C + .4byte sub_8065210 + .4byte sub_8067930 + +gUnknown_83A69A0:: @ 83A69A0 + .4byte sub_806524C + .4byte sub_8065210 + .4byte sub_8067930 + +gUnknown_83A69AC:: @ 83A69AC + .4byte sub_806526C + .4byte sub_8065210 + .4byte sub_8067930 + +gUnknown_83A69B8:: @ 83A69B8 + .4byte sub_806528C + .4byte sub_8065210 + .4byte sub_8067930 + +gUnknown_83A69C4:: @ 83A69C4 + .4byte sub_80652AC + .4byte sub_8065210 + .4byte sub_8067930 + +gUnknown_83A69D0:: @ 83A69D0 + .4byte sub_80652CC + .4byte sub_80652EC + .4byte sub_8067934 + +gUnknown_83A69DC:: @ 83A69DC + .4byte sub_806530C + .4byte sub_806532C + .4byte sub_8067934 + +gUnknown_83A69E8:: @ 83A69E8 + .4byte sub_806534C + .4byte sub_806536C + .4byte sub_8067934 + +gUnknown_83A69F4:: @ 83A69F4 + .4byte sub_806538C + .4byte sub_80653AC + .4byte sub_8067934 + +gUnknown_83A6A00:: @ 83A6A00 + .4byte sub_80653F8 + .4byte sub_8065438 + .4byte sub_8067930 + +gUnknown_83A6A0C:: @ 83A6A0C + .4byte sub_8065464 + .4byte sub_80654A4 + .4byte sub_8067930 + +gUnknown_83A6A18:: @ 83A6A18 + .4byte sub_80654D0 + .4byte sub_8065510 + .4byte sub_8067930 + +gUnknown_83A6A24:: @ 83A6A24 + .4byte sub_806553C + .4byte sub_806557C + .4byte sub_8067930 + +gUnknown_83A6A30:: @ 83A6A30 + .4byte sub_80655D4 + .4byte sub_8067930 + +gUnknown_83A6A38:: @ 83A6A38 + .4byte sub_8065610 + .4byte sub_8067930 + +gUnknown_83A6A40:: @ 83A6A40 + .4byte sub_806564C + .4byte sub_8067930 + +gUnknown_83A6A48:: @ 83A6A48 + .4byte sub_8065688 + .4byte sub_8067930 + +gUnknown_83A6A50:: @ 83A6A50 + .4byte sub_8065770 + .4byte sub_8065734 + .4byte sub_8067934 + +gUnknown_83A6A5C:: @ 83A6A5C + .4byte sub_80657A8 + .4byte sub_8065734 + .4byte sub_8067934 + +gUnknown_83A6A68:: @ 83A6A68 + .4byte sub_80657E0 + .4byte sub_8065734 + .4byte sub_8067934 + +gUnknown_83A6A74:: @ 83A6A74 + .4byte sub_8065818 + .4byte sub_8065734 + .4byte sub_8067934 + +gUnknown_83A6A80:: @ 83A6A80 + .4byte sub_8065850 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6A8C:: @ 83A6A8C + .4byte sub_8065888 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6A98:: @ 83A6A98 + .4byte sub_80658C0 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AA4:: @ 83A6AA4 + .4byte sub_80658F8 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AB0:: @ 83A6AB0 + .4byte sub_8065930 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6ABC:: @ 83A6ABC + .4byte sub_8065968 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AC8:: @ 83A6AC8 + .4byte sub_80659A0 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AD4:: @ 83A6AD4 + .4byte sub_80659D8 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AE0:: @ 83A6AE0 + .4byte sub_8065A10 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AEC:: @ 83A6AEC + .4byte sub_8065A48 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6AF8:: @ 83A6AF8 + .4byte sub_8065A80 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6B04:: @ 83A6B04 + .4byte sub_8065AB8 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6B10:: @ 83A6B10 + .4byte sub_8065AF0 + .4byte sub_8065B10 + .4byte sub_8067934 + +gUnknown_83A6B1C:: @ 83A6B1C + .4byte sub_8065B30 + .4byte sub_8065B50 + .4byte sub_8067934 + +gUnknown_83A6B28:: @ 83A6B28 + .4byte sub_8065B70 + .4byte sub_8065B90 + .4byte sub_8067934 + +gUnknown_83A6B34:: @ 83A6B34 + .4byte sub_8065BB0 + .4byte sub_8065BD0 + .4byte sub_8067934 + +gUnknown_83A6B40:: @ 83A6B40 + .4byte sub_8065BF0 + .4byte sub_8065C10 + .4byte sub_8067934 + +gUnknown_83A6B4C:: @ 83A6B4C + .4byte sub_8065C30 + .4byte sub_8065C50 + .4byte sub_8067934 + +gUnknown_83A6B58:: @ 83A6B58 + .4byte sub_8065C70 + .4byte sub_8065C90 + .4byte sub_8067934 + +gUnknown_83A6B64:: @ 83A6B64 + .4byte sub_8065CB0 + .4byte sub_8065CD0 + .4byte sub_8067934 + +gUnknown_83A6B70:: @ 83A6B70 + .4byte sub_8065CF0 + .4byte sub_8065D10 + .4byte sub_8067934 + +gUnknown_83A6B7C:: @ 83A6B7C + .4byte sub_8065D30 + .4byte sub_8065D50 + .4byte sub_8067934 + +gUnknown_83A6B88:: @ 83A6B88 + .4byte sub_8065D70 + .4byte sub_8065D90 + .4byte sub_8067934 + +gUnknown_83A6B94:: @ 83A6B94 + .4byte sub_8065DB0 + .4byte sub_8065DD0 + .4byte sub_8067934 + +gUnknown_83A6BA0:: @ 83A6BA0 + .4byte do_run_south_anim + .4byte sub_8065E10 + .4byte sub_8067934 + +gUnknown_83A6BAC:: @ 83A6BAC + .4byte do_run_north_anim + .4byte sub_8065E50 + .4byte sub_8067934 + +gUnknown_83A6BB8:: @ 83A6BB8 + .4byte do_run_west_anim + .4byte sub_8065E90 + .4byte sub_8067934 + +gUnknown_83A6BC4:: @ 83A6BC4 + .4byte do_run_east_anim + .4byte sub_8065ED0 + .4byte sub_8067934 + +gUnknown_83A6BD0:: @ 83A6BD0 + .4byte sub_8065FC4 + .4byte sub_8065FE4 + .4byte sub_8067934 + +gUnknown_83A6BDC:: @ 83A6BDC + .4byte sub_8066004 + .4byte sub_8066024 + .4byte sub_8067934 + +gUnknown_83A6BE8:: @ 83A6BE8 + .4byte sub_8066044 + .4byte sub_8066064 + .4byte sub_8067934 + +gUnknown_83A6BF4:: @ 83A6BF4 + .4byte sub_8066084 + .4byte sub_80660A4 + .4byte sub_8067934 + +gUnknown_83A6C00:: @ 83A6C00 + .4byte sub_80660F0 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6C0C:: @ 83A6C0C + .4byte sub_806615C + .4byte sub_806617C + .4byte sub_8067934 + +gUnknown_83A6C18:: @ 83A6C18 + .4byte sub_80661A4 + .4byte sub_80661C4 + .4byte sub_8067934 + +gUnknown_83A6C24:: @ 83A6C24 + .4byte sub_80661EC + .4byte sub_806620C + .4byte sub_8067934 + +gUnknown_83A6C30:: @ 83A6C30 + .4byte sub_8066234 + .4byte sub_8066254 + .4byte sub_8067934 + +gUnknown_83A6C3C:: @ 83A6C3C + .4byte sub_806627C + .4byte sub_806629C + .4byte sub_8067934 + +gUnknown_83A6C48:: @ 83A6C48 + .4byte sub_80662BC + .4byte sub_80662DC + .4byte sub_8067934 + +gUnknown_83A6C54:: @ 83A6C54 + .4byte sub_80662FC + .4byte sub_806631C + .4byte sub_8067934 + +gUnknown_83A6C60:: @ 83A6C60 + .4byte sub_806633C + .4byte sub_806635C + .4byte sub_8067934 + +gUnknown_83A6C6C:: @ 83A6C6C + .4byte sub_806637C + .4byte sub_8067934 + +gUnknown_83A6C74:: @ 83A6C74 + .4byte sub_80663D8 + .4byte sub_8067934 + +gUnknown_83A6C7C:: @ 83A6C7C + .4byte sub_806643C + .4byte sub_8067934 + +gUnknown_83A6C84:: @ 83A6C84 + .4byte sub_806644C + .4byte sub_8067934 + +gUnknown_83A6C8C:: @ 83A6C8C + .4byte sub_806645C + .4byte sub_8066488 + .4byte sub_8067934 + +gUnknown_83A6C98:: @ 83A6C98 + .4byte sub_80664B4 + .4byte sub_80664E0 + .4byte sub_8067934 + +gUnknown_83A6CA4:: @ 83A6CA4 + .4byte sub_806650C + .4byte sub_8066538 + .4byte sub_8067934 + +gUnknown_83A6CB0:: @ 83A6CB0 + .4byte sub_8066564 + .4byte sub_8066590 + .4byte sub_8067934 + +gUnknown_83A6CBC:: @ 83A6CBC + .4byte sub_80665BC + .4byte sub_80665E8 + .4byte sub_8067934 + +gUnknown_83A6CC8:: @ 83A6CC8 + .4byte sub_8066614 + .4byte sub_8066640 + .4byte sub_8067934 + +gUnknown_83A6CD4:: @ 83A6CD4 + .4byte sub_806666C + .4byte sub_8066698 + .4byte sub_8067934 + +gUnknown_83A6CE0:: @ 83A6CE0 + .4byte sub_80666C4 + .4byte sub_80666F0 + .4byte sub_8067934 + +gUnknown_83A6CEC:: @ 83A6CEC + .4byte sub_806671C + .4byte sub_8066748 + .4byte sub_8067934 + +gUnknown_83A6CF8:: @ 83A6CF8 + .4byte sub_8066774 + .4byte sub_80667A0 + .4byte sub_8067934 + +gUnknown_83A6D04:: @ 83A6D04 + .4byte sub_80667CC + .4byte sub_80667F8 + .4byte sub_8067934 + +gUnknown_83A6D10:: @ 83A6D10 + .4byte sub_8066824 + .4byte sub_8066850 + .4byte sub_8067934 + +gUnknown_83A6D1C:: @ 83A6D1C + .4byte sub_806687C + .4byte sub_8067934 + +gUnknown_83A6D24:: @ 83A6D24 + .4byte sub_8066894 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6D30:: @ 83A6D30 + .4byte sub_80668A4 + .4byte sub_8067930 + +gUnknown_83A6D38:: @ 83A6D38 + .4byte sub_80668B4 + .4byte sub_8067930 + +gUnknown_83A6D40:: @ 83A6D40 + .4byte sub_80668C4 + .4byte sub_8067930 + +gUnknown_83A6D48:: @ 83A6D48 + .4byte sub_80668D4 + .4byte sub_8067930 + +gUnknown_83A6D50:: @ 83A6D50 + .4byte sub_8066900 + .4byte sub_8067930 + +gUnknown_83A6D58:: @ 83A6D58 + .4byte sub_8066910 + .4byte sub_8067930 + +gUnknown_83A6D60:: @ 83A6D60 + .4byte do_exclamation_mark_bubble_1 + .4byte sub_8067930 + +gUnknown_83A6D68:: @ 83A6D68 + .4byte do_exclamation_mark_bubble_2 + .4byte sub_8067930 + +gUnknown_83A6D70:: @ 83A6D70 + .4byte do_heart_bubble + .4byte sub_8067930 + +gUnknown_83A6D78:: @ 83A6D78 + .4byte sub_806698C + .4byte sub_8067930 + +gUnknown_83A6D80:: @ 83A6D80 + .4byte sub_80669B0 + .4byte sub_8067930 + +gUnknown_83A6D88:: @ 83A6D88 + .4byte sub_80669D4 + .4byte sub_8066A18 + .4byte sub_8067930 + +gUnknown_83A6D94:: @ 83A6D94 + .4byte sub_8066A38 + .4byte sub_8066A54 + .4byte sub_8066A78 + .4byte sub_8067930 + +gUnknown_83A6DA4:: @ 83A6DA4 + .4byte sub_8066AB4 + .4byte sub_8066AD0 + .4byte sub_8066AF4 + .4byte sub_8067930 + +gUnknown_83A6DB4:: @ 83A6DB4 + .4byte sub_8066B30 + .4byte sub_8067930 + +gUnknown_83A6DBC:: @ 83A6DBC + .4byte sub_8066B40 + .4byte sub_8067930 + +gUnknown_83A6DC4:: @ 83A6DC4 + .4byte sub_8066B50 + .4byte sub_8067930 + +gUnknown_83A6DCC:: @ 83A6DCC + .4byte sub_8066B80 + .4byte sub_8067930 + +gUnknown_83A6DD4:: @ 83A6DD4 + .4byte sub_8066BB0 + .4byte sub_8066BE4 + .4byte sub_8067934 + +gUnknown_83A6DE0:: @ 83A6DE0 + .4byte sub_8066C10 + .4byte sub_8066C44 + .4byte sub_8067934 + +gUnknown_83A6DEC:: @ 83A6DEC + .4byte sub_8066CB0 + .4byte sub_8067934 + +gUnknown_83A6DF4:: @ 83A6DF4 + .4byte sub_8066CC0 + .4byte sub_8067934 + +gUnknown_83A6DFC:: @ 83A6DFC + .4byte sub_8066CD0 + .4byte sub_8067934 + +gUnknown_83A6E04:: @ 83A6E04 + .4byte sub_8066CE0 + .4byte sub_8067934 + +gUnknown_83A6E0C:: @ 83A6E0C + .4byte sub_8066CF0 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E18:: @ 83A6E18 + .4byte sub_8066D14 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E24:: @ 83A6E24 + .4byte sub_8066D38 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E30:: @ 83A6E30 + .4byte sub_8066D5C + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E3C:: @ 83A6E3C + .4byte sub_8066D80 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E48:: @ 83A6E48 + .4byte sub_8066DA4 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E54:: @ 83A6E54 + .4byte sub_8066DC8 + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E60:: @ 83A6E60 + .4byte sub_8066DEC + .4byte sub_8066108 + .4byte sub_8067934 + .4byte sub_8066E10 + .4byte sub_8066108 + .4byte sub_8067934 + .4byte sub_8066E34 + .4byte sub_8066108 + .4byte sub_8067934 + .4byte sub_8066E58 + .4byte sub_8066108 + .4byte sub_8067934 + .4byte sub_8066E7C + .4byte sub_8066108 + .4byte sub_8067934 + +gUnknown_83A6E9C:: @ 83A6E9C + .4byte sub_8066EE4 + .4byte sub_8066F10 + .4byte sub_8067934 + +gUnknown_83A6EA8:: @ 83A6EA8 + .4byte sub_8066F3C + .4byte sub_8066F68 + .4byte sub_8067934 + +gUnknown_83A6EB4:: @ 83A6EB4 + .4byte sub_8066F94 + .4byte sub_8066FC0 + .4byte sub_8067934 + +gUnknown_83A6EC0:: @ 83A6EC0 + .4byte sub_8066FEC + .4byte sub_8067018 + .4byte sub_8067934 + +gUnknown_83A6ECC:: @ 83A6ECC + .4byte sub_8067044 + .4byte sub_8067070 + .4byte sub_8067934 + +gUnknown_83A6ED8:: @ 83A6ED8 + .4byte sub_806709C + .4byte sub_80670C8 + .4byte sub_8067934 + +gUnknown_83A6EE4:: @ 83A6EE4 + .4byte sub_80670F4 + .4byte sub_8067120 + .4byte sub_8067934 + +gUnknown_83A6EF0:: @ 83A6EF0 + .4byte sub_806714C + .4byte sub_8067178 + .4byte sub_8067934 + +gUnknown_83A6EFC:: @ 83A6EFC + .4byte sub_80671A4 + .4byte sub_80671D0 + .4byte sub_8067934 + +gUnknown_83A6F08:: @ 83A6F08 + .4byte sub_80671FC + .4byte sub_8067228 + .4byte sub_8067934 + +gUnknown_83A6F14:: @ 83A6F14 + .4byte sub_8067254 + .4byte sub_8067280 + .4byte sub_8067934 + +gUnknown_83A6F20:: @ 83A6F20 + .4byte sub_80672AC + .4byte sub_80672D8 + .4byte sub_8067934 + +gUnknown_83A6F2C:: @ 83A6F2C + .4byte sub_8067304 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6F38:: @ 83A6F38 + .4byte sub_806733C + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6F44:: @ 83A6F44 + .4byte sub_8067374 + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6F50:: @ 83A6F50 + .4byte sub_80673AC + .4byte sub_806570C + .4byte sub_8067934 + +gUnknown_83A6F5C:: @ 83A6F5C + .4byte sub_806741C + .4byte sub_806743C + .4byte sub_8067934 + +gUnknown_83A6F68:: @ 83A6F68 + .4byte sub_806745C + .4byte sub_806747C + .4byte sub_8067934 + +gUnknown_83A6F74:: @ 83A6F74 + .4byte sub_806749C + .4byte sub_80674BC + .4byte sub_8067934 + +gUnknown_83A6F80:: @ 83A6F80 + .4byte sub_80674DC + .4byte sub_80674FC + .4byte sub_8067934 + +gUnknown_83A6F8C:: @ 83A6F8C + .4byte sub_806754C + .4byte sub_806756C + .4byte sub_8067934 + +gUnknown_83A6F98:: @ 83A6F98 + .4byte sub_806758C + .4byte sub_80675AC + .4byte sub_8067934 + +gUnknown_83A6FA4:: @ 83A6FA4 + .4byte sub_80675CC + .4byte sub_80675EC + .4byte sub_8067934 + +gUnknown_83A6FB0:: @ 83A6FB0 + .4byte sub_806760C + .4byte sub_806762C + .4byte sub_8067934 + +gUnknown_83A6FBC:: @ 83A6FBC + .4byte sub_8067684 + .4byte sub_80676A4 + .4byte sub_8067934 + +gUnknown_83A6FC8:: @ 83A6FC8 + .4byte sub_80676C4 + .4byte sub_80676E4 + .4byte sub_8067934 + +gUnknown_83A6FD4:: @ 83A6FD4 + .4byte sub_8067704 + .4byte sub_8067724 + .4byte sub_8067934 + +gUnknown_83A6FE0:: @ 83A6FE0 + .4byte sub_8067744 + .4byte sub_8067764 + .4byte sub_8067934 + +gUnknown_83A6FEC:: @ 83A6FEC + .4byte sub_8067784 + .4byte sub_80677C0 + +gUnknown_83A6FF4:: @ 83A6FF4 + .4byte sub_8067784 + .4byte sub_80677CC + +gUnknown_83A6FFC:: @ 83A6FFC + .4byte sub_8067784 + .4byte sub_80678C0 + +gUnknown_83A7004:: @ 83A7004 + .4byte sub_80678F0 + .4byte sub_8067924 + +gUnknown_83A700C:: @ 83A700C + .4byte sub_8067944 + .4byte sub_8067954 + .4byte sub_80679A8 + +gUnknown_83A7018:: @ 83A7018 + .4byte sub_8067978 + .4byte sub_806798C + .4byte sub_80679A8 diff --git a/data/event_scripts.s b/data/event_scripts.s index c07f400a1..c2daa0031 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -12,7 +12,7 @@ #include "constants/spawn_points.h" #include "constants/field_effects.h" #include "constants/trainers.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" #include "constants/fame_checker.h" #include "constants/seagallop.h" #include "constants/game_stat.h" diff --git a/data/map_events.s b/data/map_events.s index a36cd149f..99b85e154 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -10,7 +10,7 @@ #include "constants/vars.h" #include "constants/weather.h" @#include "constants/trainer_hill.h" -#include "constants/map_objects.h" +#include "constants/object_events.h" .include "asm/macros.inc" .include "constants/constants.inc" .include "constants/item_data_constants.inc" diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json index 8e78364f6..563f45333 100644 --- a/data/maps/BirthIsland_Exterior/map.json +++ b/data/maps/BirthIsland_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_METEORITE", + "graphics_id": "OBJECT_EVENT_GFX_METEORITE", "x": 15, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_BIRTH_ISLAND_METEORITE" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 15, "y": 3, "elevation": 3, diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 0c20c59b8..0d7c001ee 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -10,7 +10,7 @@ BirthIsland_Exterior_MapScript3_165213:: @ 8165213 BirthIsland_Exterior_MapScript1_165217:: @ 8165217 setworldmapflag FLAG_WORLD_MAP_BIRTH_ISLAND_EXTERIOR - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_DEOXYS_N + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_DEOXYS_N setvar VAR_DEOXYS_INTERACTION_STEP_COUNTER, 0 setvar VAR_DEOXYS_INTERACTION_NUM, 0 checkflag FLAG_FOUGHT_DEOXYS diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json index eed07d984..f8c4be078 100644 --- a/data/maps/BirthIsland_Harbor/map.json +++ b/data/maps/BirthIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json index 0f323d993..d60b4da02 100644 --- a/data/maps/CeladonCity/map.json +++ b/data/maps/CeladonCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 48, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 38, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLIWRATH", + "graphics_id": "OBJECT_EVENT_GFX_POLIWRATH", "x": 36, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 11, "y": 18, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 18, "y": 22, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 30, "y": 24, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 26, "y": 19, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 38, "y": 31, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_CELADON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 30, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 52, "y": 22, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 40, "y": 35, "elevation": 0, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 25, "y": 10, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_HIDE_CELADON_CITY_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 47, "y": 24, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json index eed6a38a6..b9d14c154 100644 --- a/data/maps/CeladonCity_Condominiums_1F/map.json +++ b/data/maps/CeladonCity_Condominiums_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MEOWTH", + "graphics_id": "OBJECT_EVENT_GFX_MEOWTH", "x": 1, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLEFAIRY", + "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY", "x": 5, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", "x": 5, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 9, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json index 41561f349..b468bf984 100644 --- a/data/maps/CeladonCity_Condominiums_3F/map.json +++ b/data/maps/CeladonCity_Condominiums_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 0, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 3, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 4, "y": 10, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 0, "y": 13, "elevation": 3, diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json index b66f7bc8a..3b94da798 100644 --- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json +++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json index f40f5c2fe..3db8fd602 100644 --- a/data/maps/CeladonCity_DepartmentStore_1F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 6, "y": 10, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json index f5333e88a..566deb0a9 100644 --- a/data/maps/CeladonCity_DepartmentStore_2F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 5, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 1, "y": 8, "elevation": 0, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 1, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 11, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json index 3ac411820..c1cc95ac4 100644 --- a/data/maps/CeladonCity_DepartmentStore_3F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 10, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 11, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 4, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 1, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 9, "y": 14, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json index e68119e01..8f13009f7 100644 --- a/data/maps/CeladonCity_DepartmentStore_4F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 6, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 10, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 3, "y": 13, "elevation": 0, diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json index 2c30cb8b5..4686cea40 100644 --- a/data/maps/CeladonCity_DepartmentStore_5F/map.json +++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 11, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 6, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 1, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json index 1d499c195..bde4fd50b 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json +++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 9, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json index 31a03a047..3056f37d1 100644 --- a/data/maps/CeladonCity_GameCorner/map.json +++ b/data/maps/CeladonCity_GameCorner/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 4, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 1, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 1, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 4, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 7, "y": 10, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 7, "y": 8, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 10, "y": 9, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 13, "y": 7, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 16, "y": 10, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 11, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json index 658ec5bd4..15a8770af 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 2, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 6, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 4, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 6, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json index 539f0cb0d..81b0a0954 100644 --- a/data/maps/CeladonCity_Gym/map.json +++ b/data/maps/CeladonCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 3, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 9, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 10, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 2, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 5, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 7, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ERIKA", + "graphics_id": "OBJECT_EVENT_GFX_ERIKA", "x": 6, "y": 4, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 8, "y": 7, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 6, "y": 8, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 3, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json index 4d1d99203..04c2602a4 100644 --- a/data/maps/CeladonCity_Hotel/map.json +++ b/data/maps/CeladonCity_Hotel/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 3, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 9, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json index ea37835d1..36ea4b0df 100644 --- a/data/maps/CeladonCity_House1/map.json +++ b/data/maps/CeladonCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json index c29be0604..84b6c620c 100644 --- a/data/maps/CeladonCity_PokemonCenter_1F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 10, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/CeladonCity_PokemonCenter_2F/map.json b/data/maps/CeladonCity_PokemonCenter_2F/map.json index e5bc26a2a..c0cac69eb 100644 --- a/data/maps/CeladonCity_PokemonCenter_2F/map.json +++ b/data/maps/CeladonCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json index 1e96149ad..e64cc7298 100644 --- a/data/maps/CeladonCity_Restaurant/map.json +++ b/data/maps/CeladonCity_Restaurant/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 12, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 11, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 9, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 3, "y": 7, "elevation": 0, diff --git a/data/maps/CeruleanCave_1F/map.json b/data/maps/CeruleanCave_1F/map.json index a2373d45c..8914af7e7 100644 --- a/data/maps/CeruleanCave_1F/map.json +++ b/data/maps/CeruleanCave_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_NUGGET" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 25, "y": 5, "elevation": 4, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_1F_MAX_ELIXIR" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 21, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 20, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 14, "y": 20, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 18, "elevation": 3, diff --git a/data/maps/CeruleanCave_2F/map.json b/data/maps/CeruleanCave_2F/map.json index d52fa3da5..89438c4fb 100644 --- a/data/maps/CeruleanCave_2F/map.json +++ b/data/maps/CeruleanCave_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 9, "y": 18, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_PP_UP" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 29, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_ULTRA_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 33, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_2F_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 10, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 28, "y": 20, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 20, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 6, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 12, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 20, "elevation": 3, diff --git a/data/maps/CeruleanCave_B1F/map.json b/data/maps/CeruleanCave_B1F/map.json index 9f93a9557..87b278438 100644 --- a/data/maps/CeruleanCave_B1F/map.json +++ b/data/maps/CeruleanCave_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 31, "y": 9, "elevation": 4, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_ULTRA_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 32, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_CERULEAN_CAVE_B1F_MAX_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_MEWTWO", + "graphics_id": "OBJECT_EVENT_GFX_MEWTWO", "x": 7, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_MEWTWO" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 1, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 38, "y": 2, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 1, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 37, "y": 4, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 35, "y": 5, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 2, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 1, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 1, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 4, "elevation": 3, diff --git a/data/maps/CeruleanCity/map.json b/data/maps/CeruleanCity/map.json index f3fcae4ab..87d7dd8bf 100644 --- a/data/maps/CeruleanCity/map.json +++ b/data/maps/CeruleanCity/map.json @@ -35,7 +35,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 31, "y": 12, "elevation": 3, @@ -48,7 +48,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 33, "y": 6, "elevation": 3, @@ -61,7 +61,7 @@ "flag": "FLAG_HIDE_CERULEAN_ROCKET" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 16, "y": 21, "elevation": 3, @@ -74,7 +74,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 9, "y": 23, "elevation": 3, @@ -87,7 +87,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SLOWBRO", + "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO", "x": 32, "y": 29, "elevation": 3, @@ -100,7 +100,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 33, "y": 29, "elevation": 3, @@ -113,7 +113,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 34, "y": 22, "elevation": 3, @@ -126,7 +126,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 22, "y": 0, "elevation": 3, @@ -139,7 +139,7 @@ "flag": "FLAG_HIDE_CERULEAN_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 26, "y": 32, "elevation": 3, @@ -165,7 +165,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 12, "y": 30, "elevation": 3, @@ -178,7 +178,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 1, "y": 13, "elevation": 3, diff --git a/data/maps/CeruleanCity_BikeShop/map.json b/data/maps/CeruleanCity_BikeShop/map.json index 34b8b351a..0f3aec9c9 100644 --- a/data/maps/CeruleanCity_BikeShop/map.json +++ b/data/maps/CeruleanCity_BikeShop/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 9, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 9, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_Gym/map.json b/data/maps/CeruleanCity_Gym/map.json index 6cf69cf3e..e707b7c3e 100644 --- a/data/maps/CeruleanCity_Gym/map.json +++ b/data/maps/CeruleanCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 10, "y": 12, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 4, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MISTY", + "graphics_id": "OBJECT_EVENT_GFX_MISTY", "x": 8, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 7, "y": 16, "elevation": 3, diff --git a/data/maps/CeruleanCity_House1/map.json b/data/maps/CeruleanCity_House1/map.json index 9326a9234..b2e5699ec 100644 --- a/data/maps/CeruleanCity_House1/map.json +++ b/data/maps/CeruleanCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_House2/map.json b/data/maps/CeruleanCity_House2/map.json index 44fcd2b45..aee9d5bbe 100644 --- a/data/maps/CeruleanCity_House2/map.json +++ b/data/maps/CeruleanCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 1, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 7, "y": 6, "elevation": 3, diff --git a/data/maps/CeruleanCity_House3/map.json b/data/maps/CeruleanCity_House3/map.json index c1ce74bf3..8ada074dd 100644 --- a/data/maps/CeruleanCity_House3/map.json +++ b/data/maps/CeruleanCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/CeruleanCity_House4/map.json b/data/maps/CeruleanCity_House4/map.json index 13ef69f13..cfa2c4d36 100644 --- a/data/maps/CeruleanCity_House4/map.json +++ b/data/maps/CeruleanCity_House4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/CeruleanCity_House5/map.json b/data/maps/CeruleanCity_House5/map.json index 9feb1ced4..b1b38b2ff 100644 --- a/data/maps/CeruleanCity_House5/map.json +++ b/data/maps/CeruleanCity_House5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/CeruleanCity_Mart/map.json b/data/maps/CeruleanCity_Mart/map.json index 182e8ccf6..fcf185a81 100644 --- a/data/maps/CeruleanCity_Mart/map.json +++ b/data/maps/CeruleanCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 9, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 1, "y": 7, "elevation": 3, diff --git a/data/maps/CeruleanCity_PokemonCenter_1F/map.json b/data/maps/CeruleanCity_PokemonCenter_1F/map.json index 85e02720a..976935818 100644 --- a/data/maps/CeruleanCity_PokemonCenter_1F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 5, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 4, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 3, "y": 3, "elevation": 3, diff --git a/data/maps/CeruleanCity_PokemonCenter_2F/map.json b/data/maps/CeruleanCity_PokemonCenter_2F/map.json index a5f191ced..e15dbda8e 100644 --- a/data/maps/CeruleanCity_PokemonCenter_2F/map.json +++ b/data/maps/CeruleanCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland/map.json b/data/maps/CinnabarIsland/map.json index f5ab2fb9f..ecc68bb6d 100644 --- a/data/maps/CinnabarIsland/map.json +++ b/data/maps/CinnabarIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 14, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BILL", + "graphics_id": "OBJECT_EVENT_GFX_BILL", "x": 20, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_CINNABAR_BILL" }, { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 23, "y": 7, "elevation": 1, diff --git a/data/maps/CinnabarIsland_Gym/map.json b/data/maps/CinnabarIsland_Gym/map.json index f442fb26a..b67761ea8 100644 --- a/data/maps/CinnabarIsland_Gym/map.json +++ b/data/maps/CinnabarIsland_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 25, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 25, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 17, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 16, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 16, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 4, "y": 19, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 4, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLAINE", + "graphics_id": "OBJECT_EVENT_GFX_BLAINE", "x": 5, "y": 4, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 24, "y": 20, "elevation": 3, diff --git a/data/maps/CinnabarIsland_Mart/map.json b/data/maps/CinnabarIsland_Mart/map.json index 59430b7ed..0febfbc73 100644 --- a/data/maps/CinnabarIsland_Mart/map.json +++ b/data/maps/CinnabarIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json index e45fcd735..7d2f4f416 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 9, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_BILL", + "graphics_id": "OBJECT_EVENT_GFX_BILL", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json index 527b4a67d..4bb297599 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_2F/map.json +++ b/data/maps/CinnabarIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json index 1e35330d9..8db54fd38 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Entrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json index a942a9ca8..fcc7c282d 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ExperimentRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 11, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 12, "y": 3, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json index 6542e543c..1710cc88c 100644 --- a/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_Lounge/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 5, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 4, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json index 0402b218a..093cf61c7 100644 --- a/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json +++ b/data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/DiglettsCave_NorthEntrance/map.json b/data/maps/DiglettsCave_NorthEntrance/map.json index ac1360466..347f76e17 100644 --- a/data/maps/DiglettsCave_NorthEntrance/map.json +++ b/data/maps/DiglettsCave_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/DiglettsCave_SouthEntrance/map.json b/data/maps/DiglettsCave_SouthEntrance/map.json index 9b1a1ce89..aef56bde7 100644 --- a/data/maps/DiglettsCave_SouthEntrance/map.json +++ b/data/maps/DiglettsCave_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland/map.json b/data/maps/FiveIsland/map.json index ecb5fb9d9..fa6366c19 100644 --- a/data/maps/FiveIsland/map.json +++ b/data/maps/FiveIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 8, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 16, "y": 10, "elevation": 3, diff --git a/data/maps/FiveIsland_Harbor/map.json b/data/maps/FiveIsland_Harbor/map.json index d1220b637..fb35c7b47 100644 --- a/data/maps/FiveIsland_Harbor/map.json +++ b/data/maps/FiveIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/FiveIsland_House1/map.json b/data/maps/FiveIsland_House1/map.json index 00af7faf1..9de0bb25c 100644 --- a/data/maps/FiveIsland_House1/map.json +++ b/data/maps/FiveIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 10, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_House2/map.json b/data/maps/FiveIsland_House2/map.json index b7e3229c8..c316f2bc6 100644 --- a/data/maps/FiveIsland_House2/map.json +++ b/data/maps/FiveIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room1/map.json b/data/maps/FiveIsland_LostCave_Room1/map.json index 05d20f0d4..5f1389b26 100644 --- a/data/maps/FiveIsland_LostCave_Room1/map.json +++ b/data/maps/FiveIsland_LostCave_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room10/map.json b/data/maps/FiveIsland_LostCave_Room10/map.json index 5626f8a64..606513822 100644 --- a/data/maps/FiveIsland_LostCave_Room10/map.json +++ b/data/maps/FiveIsland_LostCave_Room10/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 5, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_LOST_CAVE_SELPHY" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room11/map.json b/data/maps/FiveIsland_LostCave_Room11/map.json index 82463cc38..52b658dcb 100644 --- a/data/maps/FiveIsland_LostCave_Room11/map.json +++ b/data/maps/FiveIsland_LostCave_Room11/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room12/map.json b/data/maps/FiveIsland_LostCave_Room12/map.json index 6e3a0ffc7..09392a2ca 100644 --- a/data/maps/FiveIsland_LostCave_Room12/map.json +++ b/data/maps/FiveIsland_LostCave_Room12/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room13/map.json b/data/maps/FiveIsland_LostCave_Room13/map.json index dc558c6b2..028c7cea6 100644 --- a/data/maps/FiveIsland_LostCave_Room13/map.json +++ b/data/maps/FiveIsland_LostCave_Room13/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room14/map.json b/data/maps/FiveIsland_LostCave_Room14/map.json index 046685c55..f25b7ee72 100644 --- a/data/maps/FiveIsland_LostCave_Room14/map.json +++ b/data/maps/FiveIsland_LostCave_Room14/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_LostCave_Room4/map.json b/data/maps/FiveIsland_LostCave_Room4/map.json index 5a6782d59..24abad1d6 100644 --- a/data/maps/FiveIsland_LostCave_Room4/map.json +++ b/data/maps/FiveIsland_LostCave_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/FiveIsland_Meadow/map.json b/data/maps/FiveIsland_Meadow/map.json index 1ac91ff3c..66ac71058 100644 --- a/data/maps/FiveIsland_Meadow/map.json +++ b/data/maps/FiveIsland_Meadow/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_F", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", "x": 18, "y": 18, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 17, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 11, "y": 27, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 8, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 19, "y": 12, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_MEADOW_MAX_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 22, "elevation": 3, diff --git a/data/maps/FiveIsland_MemorialPillar/map.json b/data/maps/FiveIsland_MemorialPillar/map.json index 33ee6f13c..2054a0159 100644 --- a/data/maps/FiveIsland_MemorialPillar/map.json +++ b/data/maps/FiveIsland_MemorialPillar/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 8, "y": 44, "elevation": 4, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 12, "y": 6, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 14, "y": 17, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 17, "y": 31, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 4, "y": 47, "elevation": 3, diff --git a/data/maps/FiveIsland_PokemonCenter_1F/map.json b/data/maps/FiveIsland_PokemonCenter_1F/map.json index 053a14a62..82c5e2a44 100644 --- a/data/maps/FiveIsland_PokemonCenter_1F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/FiveIsland_PokemonCenter_2F/map.json b/data/maps/FiveIsland_PokemonCenter_2F/map.json index 8a64b44fa..dc97dcdc3 100644 --- a/data/maps/FiveIsland_PokemonCenter_2F/map.json +++ b/data/maps/FiveIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_ResortGorgeous/map.json b/data/maps/FiveIsland_ResortGorgeous/map.json index ba96caa5a..dba3d3d21 100644 --- a/data/maps/FiveIsland_ResortGorgeous/map.json +++ b/data/maps/FiveIsland_ResortGorgeous/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 44, "y": 10, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 33, "y": 12, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 12, "y": 10, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 23, "y": 9, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 33, "y": 8, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 33, "y": 3, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 56, "y": 7, "elevation": 1, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 39, "y": 9, "elevation": 3, diff --git a/data/maps/FiveIsland_ResortGorgeous_House/map.json b/data/maps/FiveIsland_ResortGorgeous_House/map.json index cb950d16f..570c291b4 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/map.json +++ b/data/maps/FiveIsland_ResortGorgeous_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_RESORT_GORGEOUS_INSIDE_SELPHY" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json index 7ac00f1cc..a89fe7b45 100644 --- a/data/maps/FiveIsland_RocketWarehouse/map.json +++ b/data/maps/FiveIsland_RocketWarehouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 15, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 17, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_F", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", "x": 27, "y": 16, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 25, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_F", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_F", "x": 6, "y": 6, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 27, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 8, "y": 25, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_BIG_PEARL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 3, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_TM36" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 16, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKET_WAREHOUSE_PEARL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/FiveIsland_WaterLabyrinth/map.json b/data/maps/FiveIsland_WaterLabyrinth/map.json index e9f0eb16a..0dc66d822 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/map.json +++ b/data/maps/FiveIsland_WaterLabyrinth/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 14, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/FourIsland/map.json b/data/maps/FourIsland/map.json index 54e4e9849..0e7b31ad7 100644 --- a/data/maps/FourIsland/map.json +++ b/data/maps/FourIsland/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_DODUO", + "graphics_id": "OBJECT_EVENT_GFX_DODUO", "x": 12, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", "x": 13, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", "x": 14, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PSYDUCK", + "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", "x": 17, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 26, "y": 19, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 6, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_STAR_PIECE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 32, "y": 19, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_STARDUST" }, { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 8, "y": 25, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 36, "y": 13, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 31, "y": 21, "elevation": 3, diff --git a/data/maps/FourIsland_Harbor/map.json b/data/maps/FourIsland_Harbor/map.json index 5b550da70..0b3ede231 100644 --- a/data/maps/FourIsland_Harbor/map.json +++ b/data/maps/FourIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/FourIsland_House1/map.json b/data/maps/FourIsland_House1/map.json index c47859aff..0fd639d54 100644 --- a/data/maps/FourIsland_House1/map.json +++ b/data/maps/FourIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 8, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/FourIsland_House2/map.json b/data/maps/FourIsland_House2/map.json index a11437ab1..f9ef214bb 100644 --- a/data/maps/FourIsland_House2/map.json +++ b/data/maps/FourIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_1F/map.json b/data/maps/FourIsland_IcefallCave_1F/map.json index 995ac7728..575294c84 100644 --- a/data/maps/FourIsland_IcefallCave_1F/map.json +++ b/data/maps/FourIsland_IcefallCave_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_1F_ULTRA_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 16, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_B1F/map.json b/data/maps/FourIsland_IcefallCave_B1F/map.json index 0fbf41a57..c6b9e866e 100644 --- a/data/maps/FourIsland_IcefallCave_B1F/map.json +++ b/data/maps/FourIsland_IcefallCave_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 10, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_FOUR_ISLAND_ICEFALL_CAVE_B1F_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 21, "y": 7, "elevation": 3, diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json index 12e4daece..ade705c51 100644 --- a/data/maps/FourIsland_IcefallCave_Back/map.json +++ b/data/maps/FourIsland_IcefallCave_Back/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 11, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 13, "y": 14, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_LORELEI", + "graphics_id": "OBJECT_EVENT_GFX_LORELEI", "x": 12, "y": 16, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 10, "y": 15, "elevation": 3, diff --git a/data/maps/FourIsland_LoreleisHouse/map.json b/data/maps/FourIsland_LoreleisHouse/map.json index b40738201..553467495 100644 --- a/data/maps/FourIsland_LoreleisHouse/map.json +++ b/data/maps/FourIsland_LoreleisHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LORELEI", + "graphics_id": "OBJECT_EVENT_GFX_LORELEI", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE" }, { - "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF", + "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF", "x": 0, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SEEL", + "graphics_id": "OBJECT_EVENT_GFX_SEEL", "x": 10, "y": 3, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PIKACHU", + "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", "x": 9, "y": 3, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SLOWPOKE", + "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE", "x": 7, "y": 2, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SLOWBRO", + "graphics_id": "OBJECT_EVENT_GFX_SLOWBRO", "x": 6, "y": 2, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PSYDUCK", + "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", "x": 6, "y": 4, "elevation": 0, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MEOWTH", + "graphics_id": "OBJECT_EVENT_GFX_MEOWTH", "x": 9, "y": 4, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_CHANSEY", + "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", "x": 10, "y": 4, "elevation": 0, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", + "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", "x": 0, "y": 3, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_F", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_F", "x": 0, "y": 5, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", "x": 1, "y": 5, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_PIDGEOT", + "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT", "x": 9, "y": 0, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_FEAROW", + "graphics_id": "OBJECT_EVENT_GFX_FEAROW", "x": 10, "y": 0, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL" }, { - "graphics_id": "MAP_OBJ_GFX_LAPRAS_DOLL", + "graphics_id": "OBJECT_EVENT_GFX_LAPRAS_DOLL", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/FourIsland_Mart/map.json b/data/maps/FourIsland_Mart/map.json index 5b9164382..11985d6a9 100644 --- a/data/maps/FourIsland_Mart/map.json +++ b/data/maps/FourIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 6, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 8, "y": 3, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonCenter_1F/map.json b/data/maps/FourIsland_PokemonCenter_1F/map.json index f6db941e8..c41dd4742 100644 --- a/data/maps/FourIsland_PokemonCenter_1F/map.json +++ b/data/maps/FourIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 10, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonCenter_2F/map.json b/data/maps/FourIsland_PokemonCenter_2F/map.json index dbb6bb145..332a0efa7 100644 --- a/data/maps/FourIsland_PokemonCenter_2F/map.json +++ b/data/maps/FourIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FourIsland_PokemonDayCare/map.json b/data/maps/FourIsland_PokemonDayCare/map.json index be2f8dc9d..27f280e43 100644 --- a/data/maps/FourIsland_PokemonDayCare/map.json +++ b/data/maps/FourIsland_PokemonDayCare/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 2, "y": 2, "elevation": 3, diff --git a/data/maps/FuchsiaCity/map.json b/data/maps/FuchsiaCity/map.json index 9b484daec..6c4b76320 100644 --- a/data/maps/FuchsiaCity/map.json +++ b/data/maps/FuchsiaCity/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 37, "y": 17, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SLOWPOKE", + "graphics_id": "OBJECT_EVENT_GFX_SLOWPOKE", "x": 36, "y": 15, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_VOLTORB", + "graphics_id": "OBJECT_EVENT_GFX_VOLTORB", "x": 33, "y": 8, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 33, "y": 11, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANSEY", + "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", "x": 39, "y": 8, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 15, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LAPRAS", + "graphics_id": "OBJECT_EVENT_GFX_LAPRAS", "x": 12, "y": 20, "elevation": 1, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 36, "y": 20, "elevation": 3, @@ -134,7 +134,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 8, "y": 8, "elevation": 1, @@ -147,7 +147,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_KANGASKHAN", + "graphics_id": "OBJECT_EVENT_GFX_KANGASKHAN", "x": 16, "y": 9, "elevation": 3, @@ -160,7 +160,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 30, "y": 10, "elevation": 3, @@ -173,7 +173,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 21, "y": 13, "elevation": 3, @@ -186,7 +186,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 32, "y": 16, "elevation": 3, @@ -199,7 +199,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 24, "y": 22, "elevation": 3, @@ -212,7 +212,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 15, "y": 11, "elevation": 3, @@ -225,7 +225,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 40, "y": 6, "elevation": 3, diff --git a/data/maps/FuchsiaCity/scripts.inc b/data/maps/FuchsiaCity/scripts.inc index ea921b4d1..f66cf33e6 100644 --- a/data/maps/FuchsiaCity/scripts.inc +++ b/data/maps/FuchsiaCity/scripts.inc @@ -11,11 +11,11 @@ FuchsiaCity_MapScript1_166D7B:: @ 8166D7B end EventScript_166D91:: @ 8166D91 - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OMANYTE + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OMANYTE return EventScript_166D97:: @ 8166D97 - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_KABUTO + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_KABUTO return FuchsiaCity_EventScript_166D9D:: @ 8166D9D diff --git a/data/maps/FuchsiaCity_Building1/map.json b/data/maps/FuchsiaCity_Building1/map.json index 7fbd2870c..8b91a19fa 100644 --- a/data/maps/FuchsiaCity_Building1/map.json +++ b/data/maps/FuchsiaCity_Building1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 11, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_Gym/map.json b/data/maps/FuchsiaCity_Gym/map.json index 4ee96a265..cacf8a3ab 100644 --- a/data/maps/FuchsiaCity_Gym/map.json +++ b/data/maps/FuchsiaCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 12, "y": 16, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 2, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 11, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 13, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 6, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 2, "y": 16, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_KOGA", + "graphics_id": "OBJECT_EVENT_GFX_KOGA", "x": 7, "y": 13, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 11, "y": 19, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House1/map.json b/data/maps/FuchsiaCity_House1/map.json index a0b11d62e..d9cb2b507 100644 --- a/data/maps/FuchsiaCity_House1/map.json +++ b/data/maps/FuchsiaCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 1, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House2/map.json b/data/maps/FuchsiaCity_House2/map.json index 2f57e17fb..a3619a5ef 100644 --- a/data/maps/FuchsiaCity_House2/map.json +++ b/data/maps/FuchsiaCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_House3/map.json b/data/maps/FuchsiaCity_House3/map.json index 4e47edc91..2c5f0837a 100644 --- a/data/maps/FuchsiaCity_House3/map.json +++ b/data/maps/FuchsiaCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/FuchsiaCity_Mart/map.json b/data/maps/FuchsiaCity_Mart/map.json index d8da727b1..357b824d5 100644 --- a/data/maps/FuchsiaCity_Mart/map.json +++ b/data/maps/FuchsiaCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 6, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json index 6246ddfb2..8684bc17e 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 13, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 4, "y": 8, "elevation": 3, diff --git a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json index c54ed2085..6e82de7a9 100644 --- a/data/maps/FuchsiaCity_PokemonCenter_2F/map.json +++ b/data/maps/FuchsiaCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json index d0451f0aa..13f4ee261 100644 --- a/data/maps/FuchsiaCity_SafariZone_Entrance/map.json +++ b/data/maps/FuchsiaCity_SafariZone_Entrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 7, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/FuchsiaCity_ZooBuilding/map.json b/data/maps/FuchsiaCity_ZooBuilding/map.json index 42e36142c..499deb4c9 100644 --- a/data/maps/FuchsiaCity_ZooBuilding/map.json +++ b/data/maps/FuchsiaCity_ZooBuilding/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 12, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 6, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 10, "y": 8, "elevation": 3, diff --git a/data/maps/IndigoPlateau_Exterior/map.json b/data/maps/IndigoPlateau_Exterior/map.json index 9a4761ba7..314a75275 100644 --- a/data/maps/IndigoPlateau_Exterior/map.json +++ b/data/maps/IndigoPlateau_Exterior/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 11, "y": 6, "elevation": 0, @@ -33,7 +33,7 @@ "flag": "FLAG_HIDE_CREDITS_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_PROF_OAK", + "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", "x": 11, "y": 6, "elevation": 0, diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json index f86588559..4bc3abec2 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 0, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 13, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 7, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 5, "y": 3, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 23, "y": 13, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 16, "y": 15, "elevation": 3, diff --git a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json index 7da5e0706..81a413874 100644 --- a/data/maps/IndigoPlateau_PokemonCenter_2F/map.json +++ b/data/maps/IndigoPlateau_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/LavenderTown/map.json b/data/maps/LavenderTown/map.json index ff8bd94a4..cac78d8e1 100644 --- a/data/maps/LavenderTown/map.json +++ b/data/maps/LavenderTown/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 19, "y": 10, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 12, "y": 12, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 10, "y": 7, "elevation": 3, diff --git a/data/maps/LavenderTown_House1/map.json b/data/maps/LavenderTown_House1/map.json index 8cd810223..e026daa1a 100644 --- a/data/maps/LavenderTown_House1/map.json +++ b/data/maps/LavenderTown_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUBONE", + "graphics_id": "OBJECT_EVENT_GFX_CUBONE", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/LavenderTown_House2/map.json b/data/maps/LavenderTown_House2/map.json index 5d754bc7c..109ea9cde 100644 --- a/data/maps/LavenderTown_House2/map.json +++ b/data/maps/LavenderTown_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/LavenderTown_Mart/map.json b/data/maps/LavenderTown_Mart/map.json index fab6c58ac..cccd65956 100644 --- a/data/maps/LavenderTown_Mart/map.json +++ b/data/maps/LavenderTown_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 9, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/LavenderTown_PokemonCenter_1F/map.json b/data/maps/LavenderTown_PokemonCenter_1F/map.json index 3c3062b4b..c8aef2900 100644 --- a/data/maps/LavenderTown_PokemonCenter_1F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 5, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 2, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/LavenderTown_PokemonCenter_2F/map.json b/data/maps/LavenderTown_PokemonCenter_2F/map.json index c99020e41..1880c2425 100644 --- a/data/maps/LavenderTown_PokemonCenter_2F/map.json +++ b/data/maps/LavenderTown_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json index 617fae94b..95890a431 100644 --- a/data/maps/LavenderTown_VolunteerPokemonHouse/map.json +++ b/data/maps/LavenderTown_VolunteerPokemonHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MR_FUJI", + "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI", "x": 3, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_POKEHOUSE_FUJI" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORINO", + "graphics_id": "OBJECT_EVENT_GFX_NIDORINO", "x": 1, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PSYDUCK", + "graphics_id": "OBJECT_EVENT_GFX_PSYDUCK", "x": 9, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 9, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 3, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_Exterior/map.json b/data/maps/MtEmber_Exterior/map.json index 1b6927eb8..45fcd4703 100644 --- a/data/maps/MtEmber_Exterior/map.json +++ b/data/maps/MtEmber_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 29, "y": 45, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 41, "y": 40, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 42, "y": 40, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 22, "y": 35, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 15, "y": 28, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 14, "y": 42, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 29, "y": 41, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 30, "y": 42, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 45, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 46, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 36, "y": 14, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 34, "y": 14, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 36, "y": 15, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 14, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 17, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 39, "elevation": 3, @@ -222,7 +222,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 40, "elevation": 3, @@ -235,7 +235,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 13, "y": 6, "elevation": 3, @@ -248,7 +248,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_ULTRA_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 38, "y": 10, "elevation": 3, @@ -261,7 +261,7 @@ "flag": "FLAG_HIDE_MT_EMBER_EXTERIOR_FIRE_STONE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 48, "y": 20, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_1F/map.json b/data/maps/MtEmber_RubyPath_1F/map.json index b0d678752..c8e3cf79e 100644 --- a/data/maps/MtEmber_RubyPath_1F/map.json +++ b/data/maps/MtEmber_RubyPath_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 16, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 20, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 19, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 21, "y": 15, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B1F/map.json b/data/maps/MtEmber_RubyPath_B1F/map.json index b56e52770..965fdaa58 100644 --- a/data/maps/MtEmber_RubyPath_B1F/map.json +++ b/data/maps/MtEmber_RubyPath_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 14, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json index 76a7c17e2..645a76950 100644 --- a/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B1F_Stairs/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B2F/map.json b/data/maps/MtEmber_RubyPath_B2F/map.json index 5fd04b480..a1d6f74d4 100644 --- a/data/maps/MtEmber_RubyPath_B2F/map.json +++ b/data/maps/MtEmber_RubyPath_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 8, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json index 5b72aa5c3..85f9e084e 100644 --- a/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json +++ b/data/maps/MtEmber_RubyPath_B2F_Stairs/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B3F/map.json b/data/maps/MtEmber_RubyPath_B3F/map.json index ac41ffbcb..78e5824b8 100644 --- a/data/maps/MtEmber_RubyPath_B3F/map.json +++ b/data/maps/MtEmber_RubyPath_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 10, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 26, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 28, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 3, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 6, "y": 6, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 6, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 5, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 5, "y": 2, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 15, "y": 13, "elevation": 3, diff --git a/data/maps/MtEmber_RubyPath_B5F/map.json b/data/maps/MtEmber_RubyPath_B5F/map.json index ce5dbc269..dc8ab175e 100644 --- a/data/maps/MtEmber_RubyPath_B5F/map.json +++ b/data/maps/MtEmber_RubyPath_B5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_RUBY", + "graphics_id": "OBJECT_EVENT_GFX_RUBY", "x": 7, "y": 7, "elevation": 0, diff --git a/data/maps/MtEmber_Summit/map.json b/data/maps/MtEmber_Summit/map.json index 1715ccf58..e37d10962 100644 --- a/data/maps/MtEmber_Summit/map.json +++ b/data/maps/MtEmber_Summit/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MOLTRES", + "graphics_id": "OBJECT_EVENT_GFX_MOLTRES", "x": 9, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_MOLTRES" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 10, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 10, "elevation": 3, diff --git a/data/maps/MtEmber_SummitPath_2F/map.json b/data/maps/MtEmber_SummitPath_2F/map.json index 5712426b2..cd8f39c65 100644 --- a/data/maps/MtEmber_SummitPath_2F/map.json +++ b/data/maps/MtEmber_SummitPath_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 40, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 33, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 19, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 23, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 13, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 38, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 35, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 34, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 26, "elevation": 3, diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json index 2701adad6..432699237 100644 --- a/data/maps/MtMoon_1F/map.json +++ b/data/maps/MtMoon_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 20, "y": 26, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 36, "y": 30, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 30, "y": 35, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 33, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 26, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 13, "y": 17, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 7, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 22, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_PARALYZE_HEAL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 35, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_TM09" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 26, "y": 32, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 42, "y": 35, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_RARE_CANDY" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 44, "y": 21, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_ESCAPE_ROPE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_HIDE_MT_MOON_1F_MOON_STONE" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 42, "y": 7, "elevation": 3, diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json index 652a883b3..478a00f7d 100644 --- a/data/maps/MtMoon_B2F/map.json +++ b/data/maps/MtMoon_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FOSSIL", + "graphics_id": "OBJECT_EVENT_GFX_FOSSIL", "x": 13, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_DOME_FOSSIL" }, { - "graphics_id": "MAP_OBJ_GFX_FOSSIL", + "graphics_id": "OBJECT_EVENT_GFX_FOSSIL", "x": 14, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_HELIX_FOSSIL" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 13, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 37, "y": 21, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 12, "y": 20, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 35, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 18, "y": 27, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 30, "y": 26, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_STAR_PIECE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 35, "y": 5, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_TM46" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 24, "y": 6, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_MT_MOON_B2F_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, diff --git a/data/maps/NavelRock_Base/map.json b/data/maps/NavelRock_Base/map.json index 0441624ed..f483a5f85 100644 --- a/data/maps/NavelRock_Base/map.json +++ b/data/maps/NavelRock_Base/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LUGIA", + "graphics_id": "OBJECT_EVENT_GFX_LUGIA", "x": 10, "y": 15, "elevation": 3, diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json index cdbf54da8..334886745 100644 --- a/data/maps/NavelRock_Harbor/map.json +++ b/data/maps/NavelRock_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json index fe7c5dd8b..6baaa256f 100644 --- a/data/maps/NavelRock_Summit/map.json +++ b/data/maps/NavelRock_Summit/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HO_OH", + "graphics_id": "OBJECT_EVENT_GFX_HO_OH", "x": 9, "y": 6, "elevation": 0, diff --git a/data/maps/OneIsland/map.json b/data/maps/OneIsland/map.json index fb1e43775..e79709023 100644 --- a/data/maps/OneIsland/map.json +++ b/data/maps/OneIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BILL", + "graphics_id": "OBJECT_EVENT_GFX_BILL", "x": 12, "y": 16, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_BILL" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 13, "y": 9, "elevation": 3, diff --git a/data/maps/OneIsland_Harbor/map.json b/data/maps/OneIsland_Harbor/map.json index 861731295..66fda50c4 100644 --- a/data/maps/OneIsland_Harbor/map.json +++ b/data/maps/OneIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/OneIsland_House1/map.json b/data/maps/OneIsland_House1/map.json index 216436861..b481baf9b 100644 --- a/data/maps/OneIsland_House1/map.json +++ b/data/maps/OneIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/OneIsland_House2/map.json b/data/maps/OneIsland_House2/map.json index 06f7031e1..48ad4a077 100644 --- a/data/maps/OneIsland_House2/map.json +++ b/data/maps/OneIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/OneIsland_KindleRoad/map.json b/data/maps/OneIsland_KindleRoad/map.json index b618253aa..3520eaac0 100644 --- a/data/maps/OneIsland_KindleRoad/map.json +++ b/data/maps/OneIsland_KindleRoad/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 11, "y": 32, "elevation": 1, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_LAND", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_LAND", "x": 17, "y": 132, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 7, "y": 39, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", "x": 19, "y": 79, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 15, "y": 25, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 9, "y": 53, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 18, "y": 105, "elevation": 4, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 16, "y": 64, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 11, "y": 64, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 11, "y": 89, "elevation": 3, @@ -150,7 +150,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 9, "y": 108, "elevation": 3, @@ -163,7 +163,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 8, "y": 68, "elevation": 3, @@ -176,7 +176,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 9, "y": 68, "elevation": 3, @@ -189,7 +189,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 8, "y": 104, "elevation": 3, @@ -202,7 +202,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 95, "elevation": 3, @@ -215,7 +215,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 96, "elevation": 3, @@ -228,7 +228,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 95, "elevation": 3, @@ -241,7 +241,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 105, "elevation": 3, @@ -254,7 +254,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 75, "elevation": 3, @@ -267,7 +267,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 84, "elevation": 3, @@ -280,7 +280,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 74, "elevation": 3, @@ -293,7 +293,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 73, "elevation": 3, @@ -306,7 +306,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 111, "elevation": 4, @@ -319,7 +319,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 10, "y": 86, "elevation": 3, @@ -332,7 +332,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 9, "y": 110, "elevation": 3, @@ -345,7 +345,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 18, "y": 112, "elevation": 4, @@ -358,7 +358,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 15, "y": 70, "elevation": 3, @@ -371,7 +371,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 103, "elevation": 3, @@ -384,7 +384,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_KINDLE_ROAD_MAX_REPEL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 114, "elevation": 4, diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json index cefa0b75b..a04cfa085 100644 --- a/data/maps/OneIsland_KindleRoad_EmberSpa/map.json +++ b/data/maps/OneIsland_KindleRoad_EmberSpa/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 15, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 6, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 20, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 10, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 11, "y": 20, "elevation": 3, diff --git a/data/maps/OneIsland_PokemonCenter_1F/map.json b/data/maps/OneIsland_PokemonCenter_1F/map.json index b5575d3fd..85352beb1 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/map.json +++ b/data/maps/OneIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BILL", + "graphics_id": "OBJECT_EVENT_GFX_BILL", "x": 14, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_BILL" }, { - "graphics_id": "MAP_OBJ_GFX_CELIO", + "graphics_id": "OBJECT_EVENT_GFX_CELIO", "x": 15, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_ONE_ISLAND_POKECENTER_CELIO" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 3, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/OneIsland_PokemonCenter_2F/map.json b/data/maps/OneIsland_PokemonCenter_2F/map.json index aacfae373..96d913b13 100644 --- a/data/maps/OneIsland_PokemonCenter_2F/map.json +++ b/data/maps/OneIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/OneIsland_TreasureBeach/map.json b/data/maps/OneIsland_TreasureBeach/map.json index 2d351ae47..2d5c09ac0 100644 --- a/data/maps/OneIsland_TreasureBeach/map.json +++ b/data/maps/OneIsland_TreasureBeach/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 13, "y": 20, "elevation": 3, diff --git a/data/maps/PalletTown/map.json b/data/maps/PalletTown/map.json index 344d30be7..2b2c4330a 100644 --- a/data/maps/PalletTown/map.json +++ b/data/maps/PalletTown/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 3, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 13, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PROF_OAK", + "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", "x": 10, "y": 8, "elevation": 3, diff --git a/data/maps/PalletTown_GarysHouse/map.json b/data/maps/PalletTown_GarysHouse/map.json index c2c15b1b8..d53da31c1 100644 --- a/data/maps/PalletTown_GarysHouse/map.json +++ b/data/maps/PalletTown_GarysHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_DAISY", + "graphics_id": "OBJECT_EVENT_GFX_DAISY", "x": 10, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TOWN_MAP", + "graphics_id": "OBJECT_EVENT_GFX_TOWN_MAP", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/PalletTown_PlayersHouse_1F/map.json b/data/maps/PalletTown_PlayersHouse_1F/map.json index 4e281c43a..54b41dbf8 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/map.json +++ b/data/maps/PalletTown_PlayersHouse_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MOM", + "graphics_id": "OBJECT_EVENT_GFX_MOM", "x": 8, "y": 4, "elevation": 3, diff --git a/data/maps/PalletTown_ProfessorOaksLab/map.json b/data/maps/PalletTown_ProfessorOaksLab/map.json index 9ff650466..3aefa7fa2 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/map.json +++ b/data/maps/PalletTown_ProfessorOaksLab/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 3, "y": 11, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 2, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 11, "y": 10, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PROF_OAK", + "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", "x": 6, "y": 3, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_OAK_IN_HIS_LAB" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 8, "y": 4, "elevation": 0, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_BULBASAUR_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 9, "y": 4, "elevation": 0, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_SQUIRTLE_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 10, "y": 4, "elevation": 0, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_CHARMANDER_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 5, "y": 4, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_RIVAL_IN_LAB" }, { - "graphics_id": "MAP_OBJ_GFX_POKEDEX", + "graphics_id": "OBJECT_EVENT_GFX_POKEDEX", "x": 4, "y": 1, "elevation": 0, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_POKEDEX" }, { - "graphics_id": "MAP_OBJ_GFX_POKEDEX", + "graphics_id": "OBJECT_EVENT_GFX_POKEDEX", "x": 5, "y": 1, "elevation": 0, diff --git a/data/maps/PewterCity/map.json b/data/maps/PewterCity/map.json index 2f51e7462..dbf624f2a 100644 --- a/data/maps/PewterCity/map.json +++ b/data/maps/PewterCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 6, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 33, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_PEWTER_MUSEUM_GUIDE" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 21, "y": 28, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 33, "y": 27, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 42, "y": 20, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_PEWTER_CITY_GYM_GUIDE" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 30, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 46, "y": 20, "elevation": 3, diff --git a/data/maps/PewterCity_Gym/map.json b/data/maps/PewterCity_Gym/map.json index 16d0992be..adc0b397b 100644 --- a/data/maps/PewterCity_Gym/map.json +++ b/data/maps/PewterCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BROCK", + "graphics_id": "OBJECT_EVENT_GFX_BROCK", "x": 6, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 3, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 7, "y": 12, "elevation": 3, diff --git a/data/maps/PewterCity_House1/map.json b/data/maps/PewterCity_House1/map.json index 5f177362a..4478ca348 100644 --- a/data/maps/PewterCity_House1/map.json +++ b/data/maps/PewterCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 1, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 5, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NIDORAN_M", + "graphics_id": "OBJECT_EVENT_GFX_NIDORAN_M", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/PewterCity_House2/map.json b/data/maps/PewterCity_House2/map.json index 83699d95f..677ae5cc0 100644 --- a/data/maps/PewterCity_House2/map.json +++ b/data/maps/PewterCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 3, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/PewterCity_Mart/map.json b/data/maps/PewterCity_Mart/map.json index 08555943c..275478428 100644 --- a/data/maps/PewterCity_Mart/map.json +++ b/data/maps/PewterCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 8, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 6, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, diff --git a/data/maps/PewterCity_Museum_1F/map.json b/data/maps/PewterCity_Museum_1F/map.json index 7dcbbe776..76945d8ca 100644 --- a/data/maps/PewterCity_Museum_1F/map.json +++ b/data/maps/PewterCity_Museum_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 16, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 21, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_AMBER", + "graphics_id": "OBJECT_EVENT_GFX_OLD_AMBER", "x": 22, "y": 3, "elevation": 0, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_OLD_AMBER" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 26, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 26, "y": 7, "elevation": 3, diff --git a/data/maps/PewterCity_Museum_2F/map.json b/data/maps/PewterCity_Museum_2F/map.json index 069f33249..12d797fe6 100644 --- a/data/maps/PewterCity_Museum_2F/map.json +++ b/data/maps/PewterCity_Museum_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 10, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 0, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 15, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 16, "y": 8, "elevation": 3, diff --git a/data/maps/PewterCity_PokemonCenter_1F/map.json b/data/maps/PewterCity_PokemonCenter_1F/map.json index a4a4bee9f..1a54e269b 100644 --- a/data/maps/PewterCity_PokemonCenter_1F/map.json +++ b/data/maps/PewterCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", + "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", "x": 2, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 1, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 13, "y": 2, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 10, "y": 7, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 14, "y": 6, "elevation": 3, diff --git a/data/maps/PewterCity_PokemonCenter_2F/map.json b/data/maps/PewterCity_PokemonCenter_2F/map.json index 32a9afe45..f223ec1fc 100644 --- a/data/maps/PewterCity_PokemonCenter_2F/map.json +++ b/data/maps/PewterCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json index 30d6cc36c..357aef9a4 100644 --- a/data/maps/PokemonLeague_AgathasRoom/map.json +++ b/data/maps/PokemonLeague_AgathasRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_AGATHA", + "graphics_id": "OBJECT_EVENT_GFX_AGATHA", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json index b3ff9a6e6..699130e5f 100644 --- a/data/maps/PokemonLeague_BrunosRoom/map.json +++ b/data/maps/PokemonLeague_BrunosRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BRUNO", + "graphics_id": "OBJECT_EVENT_GFX_BRUNO", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonLeague_ChampionsRoom/map.json b/data/maps/PokemonLeague_ChampionsRoom/map.json index 2154adc3a..ec8d5db18 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/map.json +++ b/data/maps/PokemonLeague_ChampionsRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PROF_OAK", + "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", "x": 6, "y": 15, "elevation": 0, diff --git a/data/maps/PokemonLeague_HallOfFame/map.json b/data/maps/PokemonLeague_HallOfFame/map.json index cacd686ab..03029ea74 100644 --- a/data/maps/PokemonLeague_HallOfFame/map.json +++ b/data/maps/PokemonLeague_HallOfFame/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PROF_OAK", + "graphics_id": "OBJECT_EVENT_GFX_PROF_OAK", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json index 0a995986e..fe17526ee 100644 --- a/data/maps/PokemonLeague_LancesRoom/map.json +++ b/data/maps/PokemonLeague_LancesRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LANCE", + "graphics_id": "OBJECT_EVENT_GFX_LANCE", "x": 6, "y": 8, "elevation": 3, diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json index 1a8512901..b5dd7cf45 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/map.json +++ b/data/maps/PokemonLeague_LoreleisRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LORELEI", + "graphics_id": "OBJECT_EVENT_GFX_LORELEI", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json index 3c015536e..8f26c3d11 100644 --- a/data/maps/PokemonMansion_1F/map.json +++ b/data/maps/PokemonMansion_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 22, "y": 24, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 29, "y": 32, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_CARBOS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 22, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_ESCAPE_ROPE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 27, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_1F_PROTEIN" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 8, "y": 8, "elevation": 3, diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json index 4a618c86d..b5bf6d6d3 100644 --- a/data/maps/PokemonMansion_2F/map.json +++ b/data/maps/PokemonMansion_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 5, "y": 23, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 36, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_CALCIUM" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 23, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_2F_ZINC" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 35, "y": 17, "elevation": 3, diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json index b76f6bb0b..47ef76894 100644 --- a/data/maps/PokemonMansion_3F/map.json +++ b/data/maps/PokemonMansion_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 7, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 22, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 9, "y": 19, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_3F_MAX_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 32, "y": 6, "elevation": 3, diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json index cbbc3f9a2..5a6b105ab 100644 --- a/data/maps/PokemonMansion_B1F/map.json +++ b/data/maps/PokemonMansion_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 6, "y": 21, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM22" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 20, "y": 25, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 34, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 23, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_TM14" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 29, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_POKEMON_MANSION_B1F_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json index 5185ebec7..88446bcf4 100644 --- a/data/maps/PokemonTower_1F/map.json +++ b/data/maps/PokemonTower_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 18, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 18, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 15, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 7, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 8, "y": 12, "elevation": 3, diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json index a155ee492..de6a03ac6 100644 --- a/data/maps/PokemonTower_2F/map.json +++ b/data/maps/PokemonTower_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 16, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_TOWER_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 3, "y": 7, "elevation": 0, diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json index 49ca729a0..668f87e73 100644 --- a/data/maps/PokemonTower_3F/map.json +++ b/data/maps/PokemonTower_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 10, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 9, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 12, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 13, "y": 2, "elevation": 3, diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json index 94832e3da..e24927018 100644 --- a/data/maps/PokemonTower_4F/map.json +++ b/data/maps/PokemonTower_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 17, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 15, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 4, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_ELIXIR" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 8, "y": 11, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_4F_AWAKENING" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json index 7f06f059d..bd64e246e 100644 --- a/data/maps/PokemonTower_5F/map.json +++ b/data/maps/PokemonTower_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 11, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 19, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 7, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 11, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 12, "y": 8, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 6, "y": 16, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_5F_NUGGET" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 9, "elevation": 3, diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json index 4f1934e2c..6c9e9aefb 100644 --- a/data/maps/PokemonTower_6F/map.json +++ b/data/maps/PokemonTower_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 13, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 18, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 9, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_POKEMON_TOWER_6F_RARE_CANDY" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 15, "y": 15, "elevation": 3, diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json index bb49bbecd..3d8a1a5be 100644 --- a/data/maps/PokemonTower_7F/map.json +++ b/data/maps/PokemonTower_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MR_FUJI", + "graphics_id": "OBJECT_EVENT_GFX_MR_FUJI", "x": 11, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_TOWER_FUJI" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 9, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_1" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 13, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_TOWER_ROCKET_2" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/PowerPlant/map.json b/data/maps/PowerPlant/map.json index 7a8d2c1f2..751b0448a 100644 --- a/data/maps/PowerPlant/map.json +++ b/data/maps/PowerPlant/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 7, "y": 27, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_MAX_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 40, "y": 22, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_TM17" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 46, "y": 37, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_TM25" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 45, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_THUNDER_STONE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 26, "y": 22, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_ELIXIR" }, { - "graphics_id": "MAP_OBJ_GFX_ZAPDOS", + "graphics_id": "OBJECT_EVENT_GFX_ZAPDOS", "x": 5, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_ZAPDOS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 36, "y": 5, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_POWER_PLANT_ELECTRODE_2" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 30, "y": 38, "elevation": 3, diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json index ab85b27d2..381dc663b 100644 --- a/data/maps/RockTunnel_1F/map.json +++ b/data/maps/RockTunnel_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 26, "y": 28, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 39, "y": 27, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 45, "y": 24, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 5, "y": 20, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 7, "y": 5, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 27, "y": 10, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 37, "y": 5, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_REPEL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 33, "y": 22, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_1F_PEARL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 22, "y": 22, "elevation": 3, diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json index c904e3b4b..1dd0f419e 100644 --- a/data/maps/RockTunnel_B1F/map.json +++ b/data/maps/RockTunnel_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 2, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 5, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 11, "y": 15, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 36, "y": 11, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 41, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 23, "y": 23, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 15, "y": 33, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 29, "y": 35, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 2, "y": 29, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 37, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 9, "y": 2, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_HIDE_ROCK_TUNNEL_B1F_MAX_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 20, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 1, "y": 22, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 4, "y": 23, "elevation": 3, @@ -196,7 +196,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 2, "y": 23, "elevation": 3, @@ -209,7 +209,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 39, "y": 26, "elevation": 3, @@ -222,7 +222,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 42, "y": 26, "elevation": 3, @@ -235,7 +235,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 43, "y": 28, "elevation": 3, @@ -248,7 +248,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 30, "elevation": 3, @@ -261,7 +261,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 45, "y": 33, "elevation": 3, @@ -274,7 +274,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 25, "y": 1, "elevation": 3, @@ -287,7 +287,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 4, "elevation": 3, @@ -300,7 +300,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 23, "y": 2, "elevation": 3, @@ -313,7 +313,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 26, "y": 2, "elevation": 3, @@ -326,7 +326,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 24, "y": 7, "elevation": 3, @@ -339,7 +339,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 27, "y": 6, "elevation": 3, diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json index 5e1e205d8..1ae6a2b49 100644 --- a/data/maps/RocketHideout_B1F/map.json +++ b/data/maps/RocketHideout_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 4, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 24, "y": 12, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 6, "y": 32, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 10, "y": 22, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 21, "y": 27, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 16, "elevation": 0, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B1F_ESCAPE_ROPE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 22, "elevation": 3, diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json index c306907fd..4bdde29e9 100644 --- a/data/maps/RocketHideout_B2F/map.json +++ b/data/maps/RocketHideout_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 20, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 15, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_X_SPEED" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_MOON_STONE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B2F_TM12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 0, "y": 14, "elevation": 3, diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json index 84326943e..40f6c205f 100644 --- a/data/maps/RocketHideout_B3F/map.json +++ b/data/maps/RocketHideout_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 19, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 2, "y": 20, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_RARE_CANDY" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 19, "y": 14, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B3F_TM21" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 14, "y": 24, "elevation": 3, diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json index 6a88db1a7..85113e7c6 100644 --- a/data/maps/RocketHideout_B4F/map.json +++ b/data/maps/RocketHideout_B4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GIOVANNI", + "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", "x": 19, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 20, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_SCOPE" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 4, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_LIFT_KEY" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 19, "y": 14, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 16, "y": 14, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 6, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_TM49" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 4, "y": 14, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_ROCKET_HIDEOUT_B4F_MAX_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 6, "y": 23, "elevation": 0, diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json index 265822796..e133094f3 100644 --- a/data/maps/Route1/map.json +++ b/data/maps/Route1/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 6, "y": 28, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 19, "y": 16, "elevation": 3, diff --git a/data/maps/Route10/map.json b/data/maps/Route10/map.json index 04ea2bf57..a0339bf58 100644 --- a/data/maps/Route10/map.json +++ b/data/maps/Route10/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 7, "y": 60, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 4, "y": 62, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 15, "y": 70, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 4, "y": 68, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 13, "y": 44, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 9, "y": 27, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 10, "y": 20, "elevation": 0, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 10, "y": 22, "elevation": 0, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 10, "y": 24, "elevation": 0, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 10, "y": 26, "elevation": 0, diff --git a/data/maps/Route10_PokemonCenter_1F/map.json b/data/maps/Route10_PokemonCenter_1F/map.json index c6a6d57c6..ffa9b5483 100644 --- a/data/maps/Route10_PokemonCenter_1F/map.json +++ b/data/maps/Route10_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 9, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 14, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/Route10_PokemonCenter_2F/map.json b/data/maps/Route10_PokemonCenter_2F/map.json index ba0d61e30..e815a98be 100644 --- a/data/maps/Route10_PokemonCenter_2F/map.json +++ b/data/maps/Route10_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/Route11/map.json b/data/maps/Route11/map.json index a7cf69d51..854692035 100644 --- a/data/maps/Route11/map.json +++ b/data/maps/Route11/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 19, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 16, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 31, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 28, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 38, "y": 15, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 50, "y": 4, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 42, "y": 8, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 50, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 57, "y": 16, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 32, "y": 18, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 42, "y": 12, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_ROUTE11_X_DEFEND" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 63, "y": 13, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_HIDE_ROUTE11_GREAT_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 13, "y": 3, "elevation": 3, diff --git a/data/maps/Route11_EastEntrance_1F/map.json b/data/maps/Route11_EastEntrance_1F/map.json index 2806f681c..672ff606f 100644 --- a/data/maps/Route11_EastEntrance_1F/map.json +++ b/data/maps/Route11_EastEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 4, "y": 10, "elevation": 0, diff --git a/data/maps/Route11_EastEntrance_2F/map.json b/data/maps/Route11_EastEntrance_2F/map.json index dfe0c5030..86a3a8650 100644 --- a/data/maps/Route11_EastEntrance_2F/map.json +++ b/data/maps/Route11_EastEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 7, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/Route12/map.json b/data/maps/Route12/map.json index 9d660528e..cfc684de8 100644 --- a/data/maps/Route12/map.json +++ b/data/maps/Route12/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 17, "y": 32, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 9, "y": 40, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 16, "y": 47, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 13, "y": 59, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SNORLAX", + "graphics_id": "OBJECT_EVENT_GFX_SNORLAX", "x": 14, "y": 70, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "FLAG_HIDE_ROUTE_12_SNORLAX" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 13, "y": 92, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 10, "y": 99, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 18, "y": 108, "elevation": 3, @@ -134,7 +134,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 11, "y": 100, "elevation": 3, @@ -147,7 +147,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 36, "elevation": 3, @@ -160,7 +160,7 @@ "flag": "FLAG_HIDE_ROUTE12_TM48" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 9, "y": 101, "elevation": 3, @@ -173,7 +173,7 @@ "flag": "FLAG_HIDE_ROUTE12_IRON" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 19, "y": 64, "elevation": 3, @@ -186,7 +186,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 19, "y": 63, "elevation": 3, @@ -199,7 +199,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 12, "y": 111, "elevation": 3, diff --git a/data/maps/Route12_FishingHouse/map.json b/data/maps/Route12_FishingHouse/map.json index 366c3e2c7..bcb35b07f 100644 --- a/data/maps/Route12_FishingHouse/map.json +++ b/data/maps/Route12_FishingHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/Route12_NorthEntrance_1F/map.json b/data/maps/Route12_NorthEntrance_1F/map.json index a133ae23f..1f5ecbe0d 100644 --- a/data/maps/Route12_NorthEntrance_1F/map.json +++ b/data/maps/Route12_NorthEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/Route12_NorthEntrance_2F/map.json b/data/maps/Route12_NorthEntrance_2F/map.json index 687ac9bf6..57d619ddb 100644 --- a/data/maps/Route12_NorthEntrance_2F/map.json +++ b/data/maps/Route12_NorthEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/Route13/map.json b/data/maps/Route13/map.json index 86a682dfb..8905899b1 100644 --- a/data/maps/Route13/map.json +++ b/data/maps/Route13/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 62, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 63, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 54, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 42, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 43, "y": 7, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 35, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 29, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 9, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 16, "y": 5, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 14, "y": 8, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 44, "y": 5, "elevation": 3, diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index 831e178d6..cb71cd411 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 7, "y": 37, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 18, "y": 35, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 10, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 16, "y": 16, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 7, "y": 31, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 7, "y": 34, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 8, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 7, "y": 6, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 10, "y": 37, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 18, "y": 47, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 7, "y": 26, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 12, "y": 35, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 1, "y": 47, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 13, "y": 51, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 12, "y": 51, "elevation": 3, diff --git a/data/maps/Route15/map.json b/data/maps/Route15/map.json index 6d33098a6..4c6fa5d47 100644 --- a/data/maps/Route15/map.json +++ b/data/maps/Route15/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 22, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 31, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 37, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 44, "y": 13, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 50, "y": 12, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 59, "y": 12, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 63, "y": 13, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 52, "y": 8, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 54, "y": 12, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 28, "y": 6, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 20, "y": 6, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_ROUTE15_TM18" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 39, "y": 7, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 40, "y": 7, "elevation": 3, diff --git a/data/maps/Route15_WestEntrance_1F/map.json b/data/maps/Route15_WestEntrance_1F/map.json index 745e9e2c2..af929b0e1 100644 --- a/data/maps/Route15_WestEntrance_1F/map.json +++ b/data/maps/Route15_WestEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route15_WestEntrance_2F/map.json b/data/maps/Route15_WestEntrance_2F/map.json index fc6391217..43a338c6c 100644 --- a/data/maps/Route15_WestEntrance_2F/map.json +++ b/data/maps/Route15_WestEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 5, "y": 5, "elevation": 3, diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index f6dc03f3e..fba9847f1 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 16, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 14, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 12, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 8, "y": 12, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 10, "y": 14, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 6, "y": 14, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 41, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 30, "y": 5, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 31, "y": 5, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SNORLAX", + "graphics_id": "OBJECT_EVENT_GFX_SNORLAX", "x": 31, "y": 13, "elevation": 3, diff --git a/data/maps/Route16_House/map.json b/data/maps/Route16_House/map.json index eb7e79232..248a93f35 100644 --- a/data/maps/Route16_House/map.json +++ b/data/maps/Route16_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 4, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FEAROW", + "graphics_id": "OBJECT_EVENT_GFX_FEAROW", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/Route16_NorthEntrance_1F/map.json b/data/maps/Route16_NorthEntrance_1F/map.json index 52272f873..6288d8418 100644 --- a/data/maps/Route16_NorthEntrance_1F/map.json +++ b/data/maps/Route16_NorthEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/Route16_NorthEntrance_2F/map.json b/data/maps/Route16_NorthEntrance_2F/map.json index adec1e6b3..3d1f285c6 100644 --- a/data/maps/Route16_NorthEntrance_2F/map.json +++ b/data/maps/Route16_NorthEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 10, "y": 6, "elevation": 0, diff --git a/data/maps/Route17/map.json b/data/maps/Route17/map.json index 7158ae516..4ec96dc6c 100644 --- a/data/maps/Route17/map.json +++ b/data/maps/Route17/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 4, "y": 18, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 11, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 15, "y": 24, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 18, "y": 41, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 7, "y": 38, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 2, "y": 61, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 21, "y": 61, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 18, "y": 94, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 16, "y": 134, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 4, "y": 116, "elevation": 3, diff --git a/data/maps/Route18/map.json b/data/maps/Route18/map.json index 9ced2a41f..636acc2a7 100644 --- a/data/maps/Route18/map.json +++ b/data/maps/Route18/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 46, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 41, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 39, "y": 12, "elevation": 3, diff --git a/data/maps/Route18_EastEntrance_1F/map.json b/data/maps/Route18_EastEntrance_1F/map.json index 803722807..6dfc516fd 100644 --- a/data/maps/Route18_EastEntrance_1F/map.json +++ b/data/maps/Route18_EastEntrance_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route18_EastEntrance_2F/map.json b/data/maps/Route18_EastEntrance_2F/map.json index 5731ecd8c..37094e443 100644 --- a/data/maps/Route18_EastEntrance_2F/map.json +++ b/data/maps/Route18_EastEntrance_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 5, "y": 3, "elevation": 3, diff --git a/data/maps/Route19/map.json b/data/maps/Route19/map.json index 439c5f405..3280d8588 100644 --- a/data/maps/Route19/map.json +++ b/data/maps/Route19/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", "x": 15, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_LAND", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_LAND", "x": 10, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 12, "y": 17, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 18, "y": 33, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 8, "y": 27, "elevation": 1, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 16, "y": 22, "elevation": 1, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 11, "y": 47, "elevation": 1, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 48, "elevation": 1, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 12, "y": 49, "elevation": 1, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 9, "y": 48, "elevation": 1, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 41, "elevation": 1, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", + "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", "x": 9, "y": 41, "elevation": 1, diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json index c211c5b72..aecf7a7de 100644 --- a/data/maps/Route2/map.json +++ b/data/maps/Route2/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 16, "y": 62, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 15, "y": 69, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 11, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 18, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 54, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_ROUTE2_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 64, "elevation": 3, diff --git a/data/maps/Route20/map.json b/data/maps/Route20/map.json index 231efcf51..60b59fc66 100644 --- a/data/maps/Route20/map.json +++ b/data/maps/Route20/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 8, "y": 11, "elevation": 1, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 16, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 34, "y": 7, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 43, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 23, "y": 10, "elevation": 1, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 73, "y": 16, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 111, "y": 9, "elevation": 1, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 106, "y": 11, "elevation": 1, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 93, "y": 10, "elevation": 1, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 54, "y": 11, "elevation": 1, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 69, "y": 3, "elevation": 3, diff --git a/data/maps/Route21_North/map.json b/data/maps/Route21_North/map.json index 8d504c75c..ceda4c2db 100644 --- a/data/maps/Route21_North/map.json +++ b/data/maps/Route21_North/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 7, "y": 27, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 16, "y": 26, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 12, "y": 44, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 35, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", + "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", "x": 15, "y": 35, "elevation": 1, diff --git a/data/maps/Route21_South/map.json b/data/maps/Route21_South/map.json index 0895e18f1..7a45953bf 100644 --- a/data/maps/Route21_South/map.json +++ b/data/maps/Route21_South/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 11, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 14, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 15, "y": 24, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 15, "y": 38, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 10, "y": 29, "elevation": 1, diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json index 1b3e558b4..0772e9303 100644 --- a/data/maps/Route22/map.json +++ b/data/maps/Route22/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 25, "y": 4, "elevation": 3, diff --git a/data/maps/Route22_NorthEntrance/map.json b/data/maps/Route22_NorthEntrance/map.json index 1a034d844..ee3f73dcb 100644 --- a/data/maps/Route22_NorthEntrance/map.json +++ b/data/maps/Route22_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/Route23/map.json b/data/maps/Route23/map.json index f9d0f142e..145e8cdd7 100644 --- a/data/maps/Route23/map.json +++ b/data/maps/Route23/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 15, "y": 149, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 8, "y": 140, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 14, "y": 123, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 16, "y": 112, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 10, "y": 94, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 14, "y": 61, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 35, "elevation": 3, diff --git a/data/maps/Route24/map.json b/data/maps/Route24/map.json index 9fe5db518..9cf6bf74d 100644 --- a/data/maps/Route24/map.json +++ b/data/maps/Route24/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 12, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_NUGGET_BRIDGE_ROCKET" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 12, "y": 19, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 10, "y": 22, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 12, "y": 25, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 10, "y": 28, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 31, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 5, "y": 21, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 4, "elevation": 3, diff --git a/data/maps/Route25/map.json b/data/maps/Route25/map.json index a17f32488..d369225d3 100644 --- a/data/maps/Route25/map.json +++ b/data/maps/Route25/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 11, "y": 4, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 18, "y": 2, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 17, "y": 7, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 22, "y": 4, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 22, "y": 8, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 27, "y": 9, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 28, "y": 4, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 36, "y": 4, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 42, "y": 5, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 26, "y": 2, "elevation": 3, @@ -150,7 +150,7 @@ "flag": "FLAG_HIDE_ROUTE25_TM43" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 30, "y": 3, "elevation": 3, @@ -163,7 +163,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 49, "y": 10, "elevation": 3, @@ -176,7 +176,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 49, "y": 11, "elevation": 3, diff --git a/data/maps/Route25_SeaCottage/map.json b/data/maps/Route25_SeaCottage/map.json index ac63be354..d08181f06 100644 --- a/data/maps/Route25_SeaCottage/map.json +++ b/data/maps/Route25_SeaCottage/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BILL", + "graphics_id": "OBJECT_EVENT_GFX_BILL", "x": 7, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_BILL_HUMAN_SEA_COTTAGE" }, { - "graphics_id": "MAP_OBJ_GFX_CLEFAIRY", + "graphics_id": "OBJECT_EVENT_GFX_CLEFAIRY", "x": 10, "y": 6, "elevation": 3, diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json index e895e6c89..708a8f5a8 100644 --- a/data/maps/Route2_EastBuilding/map.json +++ b/data/maps/Route2_EastBuilding/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 4, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 10, "y": 3, "elevation": 3, diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json index 9833021a2..a04e5c546 100644 --- a/data/maps/Route2_House/map.json +++ b/data/maps/Route2_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 4, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 7, "y": 2, "elevation": 3, diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json index 1ee618faa..37c58ebbd 100644 --- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 5, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 10, "y": 5, "elevation": 3, diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json index 808232f30..841360fe0 100644 --- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json +++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 10, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 4, "y": 7, "elevation": 3, diff --git a/data/maps/Route3/map.json b/data/maps/Route3/map.json index 837e483b8..0def5e68f 100644 --- a/data/maps/Route3/map.json +++ b/data/maps/Route3/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 70, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 40, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 32, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 30, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 25, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 29, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 19, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 6, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 17, "y": 4, "elevation": 3, diff --git a/data/maps/Route4/map.json b/data/maps/Route4/map.json index dc2f902d7..b628beefc 100644 --- a/data/maps/Route4/map.json +++ b/data/maps/Route4/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 9, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 75, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 67, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_ROUTE4_TM05" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 15, "y": 14, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 47, "y": 3, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 50, "y": 3, "elevation": 3, diff --git a/data/maps/Route4_PokemonCenter_1F/map.json b/data/maps/Route4_PokemonCenter_1F/map.json index 936900208..c9216ca84 100644 --- a/data/maps/Route4_PokemonCenter_1F/map.json +++ b/data/maps/Route4_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 1, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 5, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", + "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", "x": 12, "y": 6, "elevation": 0, diff --git a/data/maps/Route4_PokemonCenter_2F/map.json b/data/maps/Route4_PokemonCenter_2F/map.json index a4189df66..2501fc3f4 100644 --- a/data/maps/Route4_PokemonCenter_2F/map.json +++ b/data/maps/Route4_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/Route5_PokemonDayCare/map.json b/data/maps/Route5_PokemonDayCare/map.json index efa1789d8..99f47dba4 100644 --- a/data/maps/Route5_PokemonDayCare/map.json +++ b/data/maps/Route5_PokemonDayCare/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json index 7cf88dbcb..f34ea88bf 100644 --- a/data/maps/Route5_SouthEntrance/map.json +++ b/data/maps/Route5_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json index b5f66bf88..c0e0968bb 100644 --- a/data/maps/Route6/map.json +++ b/data/maps/Route6/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 3, "y": 16, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 12, "y": 21, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 13, "y": 21, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 20, "y": 25, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 13, "y": 32, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 13, "y": 33, "elevation": 3, diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json index f354d825c..3ffcf414a 100644 --- a/data/maps/Route6_NorthEntrance/map.json +++ b/data/maps/Route6_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json index baf05fc78..e08a364f1 100644 --- a/data/maps/Route7_EastEntrance/map.json +++ b/data/maps/Route7_EastEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json index 9a15eca59..b1ff3747a 100644 --- a/data/maps/Route8/map.json +++ b/data/maps/Route8/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 62, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 55, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 51, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 29, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 29, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 29, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 29, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 21, "y": 3, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 9, "y": 6, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 33, "y": 15, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 47, "y": 12, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 40, "y": 3, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 41, "y": 3, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 14, "y": 16, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 24, "y": 17, "elevation": 3, diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json index 9a8bd58ba..02365a2b4 100644 --- a/data/maps/Route8_WestEntrance/map.json +++ b/data/maps/Route8_WestEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_POLICEMAN", + "graphics_id": "OBJECT_EVENT_GFX_POLICEMAN", "x": 6, "y": 2, "elevation": 3, diff --git a/data/maps/Route9/map.json b/data/maps/Route9/map.json index e6fff0498..b8e4aef83 100644 --- a/data/maps/Route9/map.json +++ b/data/maps/Route9/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 14, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 20, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 61, "y": 16, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 26, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 26, "y": 1, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 49, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 53, "y": 2, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 60, "y": 9, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 36, "y": 6, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 2, "y": 8, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 17, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_ROUTE9_TM40" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 65, "y": 17, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Corridor/map.json b/data/maps/SSAnne_1F_Corridor/map.json index fff50854a..ba206ecd0 100644 --- a/data/maps/SSAnne_1F_Corridor/map.json +++ b/data/maps/SSAnne_1F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 18, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 12, "y": 9, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room1/map.json b/data/maps/SSAnne_1F_Room1/map.json index 784405a63..18ef8fc04 100644 --- a/data/maps/SSAnne_1F_Room1/map.json +++ b/data/maps/SSAnne_1F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room2/map.json b/data/maps/SSAnne_1F_Room2/map.json index 1895ff07a..a9ec320be 100644 --- a/data/maps/SSAnne_1F_Room2/map.json +++ b/data/maps/SSAnne_1F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 5, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 0, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 2, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 7, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room3/map.json b/data/maps/SSAnne_1F_Room3/map.json index da0466b37..e5c78e2b6 100644 --- a/data/maps/SSAnne_1F_Room3/map.json +++ b/data/maps/SSAnne_1F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WIGGLYTUFF", + "graphics_id": "OBJECT_EVENT_GFX_WIGGLYTUFF", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 0, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room4/map.json b/data/maps/SSAnne_1F_Room4/map.json index 4f8d00d91..8011082b6 100644 --- a/data/maps/SSAnne_1F_Room4/map.json +++ b/data/maps/SSAnne_1F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room5/map.json b/data/maps/SSAnne_1F_Room5/map.json index bd987f990..92f493357 100644 --- a/data/maps/SSAnne_1F_Room5/map.json +++ b/data/maps/SSAnne_1F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room6/map.json b/data/maps/SSAnne_1F_Room6/map.json index 8eca10460..0d7dbf323 100644 --- a/data/maps/SSAnne_1F_Room6/map.json +++ b/data/maps/SSAnne_1F_Room6/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_1F_Room7/map.json b/data/maps/SSAnne_1F_Room7/map.json index b93710fe4..d5ca318a5 100644 --- a/data/maps/SSAnne_1F_Room7/map.json +++ b/data/maps/SSAnne_1F_Room7/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 4, "y": 3, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Corridor/map.json b/data/maps/SSAnne_2F_Corridor/map.json index b45106629..32aa20766 100644 --- a/data/maps/SSAnne_2F_Corridor/map.json +++ b/data/maps/SSAnne_2F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 30, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SS_ANNE_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 2, "y": 7, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room1/map.json b/data/maps/SSAnne_2F_Room1/map.json index c590cad89..06830f6cc 100644 --- a/data/maps/SSAnne_2F_Room1/map.json +++ b/data/maps/SSAnne_2F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 1, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room2/map.json b/data/maps/SSAnne_2F_Room2/map.json index 124f37b4f..1aeabe4d5 100644 --- a/data/maps/SSAnne_2F_Room2/map.json +++ b/data/maps/SSAnne_2F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 5, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 1, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 3, "elevation": 0, diff --git a/data/maps/SSAnne_2F_Room3/map.json b/data/maps/SSAnne_2F_Room3/map.json index cec02b750..ee86853c8 100644 --- a/data/maps/SSAnne_2F_Room3/map.json +++ b/data/maps/SSAnne_2F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 2, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room4/map.json b/data/maps/SSAnne_2F_Room4/map.json index 966b86cf6..8cba587e6 100644 --- a/data/maps/SSAnne_2F_Room4/map.json +++ b/data/maps/SSAnne_2F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 0, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 3, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room5/map.json b/data/maps/SSAnne_2F_Room5/map.json index 3759a810b..0583bd2a1 100644 --- a/data/maps/SSAnne_2F_Room5/map.json +++ b/data/maps/SSAnne_2F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 3, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_2F_Room6/map.json b/data/maps/SSAnne_2F_Room6/map.json index 4583c0fcb..b1a3c0f8f 100644 --- a/data/maps/SSAnne_2F_Room6/map.json +++ b/data/maps/SSAnne_2F_Room6/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 1, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_3F_Corridor/map.json b/data/maps/SSAnne_3F_Corridor/map.json index 654973f7d..8933f6f60 100644 --- a/data/maps/SSAnne_3F_Corridor/map.json +++ b/data/maps/SSAnne_3F_Corridor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 10, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room1/map.json b/data/maps/SSAnne_B1F_Room1/map.json index 4a7460d85..a82071d9e 100644 --- a/data/maps/SSAnne_B1F_Room1/map.json +++ b/data/maps/SSAnne_B1F_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room2/map.json b/data/maps/SSAnne_B1F_Room2/map.json index c69229610..173d2149e 100644 --- a/data/maps/SSAnne_B1F_Room2/map.json +++ b/data/maps/SSAnne_B1F_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 2, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room3/map.json b/data/maps/SSAnne_B1F_Room3/map.json index d4f6b9c97..f1acb1d5a 100644 --- a/data/maps/SSAnne_B1F_Room3/map.json +++ b/data/maps/SSAnne_B1F_Room3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room4/map.json b/data/maps/SSAnne_B1F_Room4/map.json index 8fb8e9349..32f9351fb 100644 --- a/data/maps/SSAnne_B1F_Room4/map.json +++ b/data/maps/SSAnne_B1F_Room4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 3, "y": 3, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 2, "y": 6, "elevation": 3, diff --git a/data/maps/SSAnne_B1F_Room5/map.json b/data/maps/SSAnne_B1F_Room5/map.json index bd70e785b..6313e108a 100644 --- a/data/maps/SSAnne_B1F_Room5/map.json +++ b/data/maps/SSAnne_B1F_Room5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MACHOKE", + "graphics_id": "OBJECT_EVENT_GFX_MACHOKE", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 2, "elevation": 0, diff --git a/data/maps/SSAnne_CaptainsOffice/map.json b/data/maps/SSAnne_CaptainsOffice/map.json index 3c5b166f4..b8f968c32 100644 --- a/data/maps/SSAnne_CaptainsOffice/map.json +++ b/data/maps/SSAnne_CaptainsOffice/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CAPTAIN", + "graphics_id": "OBJECT_EVENT_GFX_CAPTAIN", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/SSAnne_Deck/map.json b/data/maps/SSAnne_Deck/map.json index fcf2204fe..2ac95ca72 100644 --- a/data/maps/SSAnne_Deck/map.json +++ b/data/maps/SSAnne_Deck/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 12, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 14, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 13, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 6, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/SSAnne_Exterior/map.json b/data/maps/SSAnne_Exterior/map.json index 65461e33a..7be9b5fb5 100644 --- a/data/maps/SSAnne_Exterior/map.json +++ b/data/maps/SSAnne_Exterior/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SS_ANNE", + "graphics_id": "OBJECT_EVENT_GFX_SS_ANNE", "x": 30, "y": 16, "elevation": 1, diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json index 45404e0cc..968d87938 100644 --- a/data/maps/SSAnne_Kitchen/map.json +++ b/data/maps/SSAnne_Kitchen/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 1, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 6, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 10, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 8, "y": 9, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 14, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 14, "y": 7, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHEF", + "graphics_id": "OBJECT_EVENT_GFX_CHEF", "x": 14, "y": 9, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 10, "elevation": 3, diff --git a/data/maps/SafariZone_Building1/map.json b/data/maps/SafariZone_Building1/map.json index 700aa87d1..3a1d5491f 100644 --- a/data/maps/SafariZone_Building1/map.json +++ b/data/maps/SafariZone_Building1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Building2/map.json b/data/maps/SafariZone_Building2/map.json index 17b2fb57a..856b8b647 100644 --- a/data/maps/SafariZone_Building2/map.json +++ b/data/maps/SafariZone_Building2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 3, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 6, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Building3/map.json b/data/maps/SafariZone_Building3/map.json index de59e1575..0dca9cb75 100644 --- a/data/maps/SafariZone_Building3/map.json +++ b/data/maps/SafariZone_Building3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 7, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 6, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 11, "y": 2, "elevation": 3, diff --git a/data/maps/SafariZone_Building4/map.json b/data/maps/SafariZone_Building4/map.json index 09b1e09a7..2ca3a9a4f 100644 --- a/data/maps/SafariZone_Building4/map.json +++ b/data/maps/SafariZone_Building4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 3, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 2, "y": 2, "elevation": 0, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SafariZone_Center/map.json b/data/maps/SafariZone_Center/map.json index 39b950060..e40c94cee 100644 --- a/data/maps/SafariZone_Center/map.json +++ b/data/maps/SafariZone_Center/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 24, "y": 15, "elevation": 3, diff --git a/data/maps/SafariZone_East/map.json b/data/maps/SafariZone_East/map.json index dae5d93f8..17f951070 100644 --- a/data/maps/SafariZone_East/map.json +++ b/data/maps/SafariZone_East/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 13, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_MAX_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 37, "y": 15, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 31, "y": 18, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_EAST_TM11" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 36, "y": 17, "elevation": 4, diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json index 5d15f61f9..0e47573f6 100644 --- a/data/maps/SafariZone_North/map.json +++ b/data/maps/SafariZone_North/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 33, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_PROTEIN" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 28, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_NORTH_TM47" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 29, "y": 17, "elevation": 3, diff --git a/data/maps/SafariZone_SecretHouse/map.json b/data/maps/SafariZone_SecretHouse/map.json index 88838d5ff..806455000 100644 --- a/data/maps/SafariZone_SecretHouse/map.json +++ b/data/maps/SafariZone_SecretHouse/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/SafariZone_West/map.json b/data/maps/SafariZone_West/map.json index bad880c1b..cdccbbe45 100644 --- a/data/maps/SafariZone_West/map.json +++ b/data/maps/SafariZone_West/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 28, "y": 14, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_GOLD_TEETH" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_TM32" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 16, "y": 27, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SAFARI_ZONE_WEST_MAX_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 27, "y": 24, "elevation": 3, diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json index b70aa83c1..cec8e2fca 100644 --- a/data/maps/SaffronCity/map.json +++ b/data/maps/SaffronCity/map.json @@ -36,7 +36,7 @@ "connections_no_include": true, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 22, "y": 15, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 26, "y": 16, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 46, "y": 13, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 27, "y": 22, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 25, "y": 33, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 34, "y": 31, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 30, "y": 39, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 48, "y": 24, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "FLAG_HIDE_SAFFRON_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 37, "y": 32, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 21, "y": 23, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 39, "y": 16, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 44, "y": 22, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_PIDGEOT", + "graphics_id": "OBJECT_EVENT_GFX_PIDGEOT", "x": 45, "y": 22, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 32, "y": 39, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "FLAG_HIDE_SAFFRON_CIVILIANS" }, { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 47, "y": 24, "elevation": 3, diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json index 91bf8e662..a0137ad22 100644 --- a/data/maps/SaffronCity_Dojo/map.json +++ b/data/maps/SaffronCity_Dojo/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 11, "y": 10, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 1, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 11, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 1, "y": 8, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 6, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 7, "y": 3, "elevation": 3, diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json index 4f6f13afc..407084933 100644 --- a/data/maps/SaffronCity_Gym/map.json +++ b/data/maps/SaffronCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 18, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 4, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 14, "y": 2, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 4, "y": 10, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 4, "y": 18, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SABRINA", + "graphics_id": "OBJECT_EVENT_GFX_SABRINA", "x": 14, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 24, "y": 10, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 15, "y": 20, "elevation": 3, diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_House1_1F/map.json index 6a233f785..a6e09da5c 100644 --- a/data/maps/SaffronCity_House1_1F/map.json +++ b/data/maps/SaffronCity_House1_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 8, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 3, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANSEY", + "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_House1_2F/map.json index 8598b129a..279ebff20 100644 --- a/data/maps/SaffronCity_House1_2F/map.json +++ b/data/maps/SaffronCity_House1_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_DODUO", + "graphics_id": "OBJECT_EVENT_GFX_DODUO", "x": 6, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PIKACHU", + "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", "x": 4, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_JIGGLYPUFF", + "graphics_id": "OBJECT_EVENT_GFX_JIGGLYPUFF", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House2/map.json index 4c6e64a1d..8f61b1054 100644 --- a/data/maps/SaffronCity_House2/map.json +++ b/data/maps/SaffronCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_PIDGEY", + "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", "x": 0, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 4, "y": 4, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", + "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", "x": 5, "y": 4, "elevation": 0, diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_House3/map.json index 51f9c8294..858646db5 100644 --- a/data/maps/SaffronCity_House3/map.json +++ b/data/maps/SaffronCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json index d4248d680..8e4b9ce60 100644 --- a/data/maps/SaffronCity_Mart/map.json +++ b/data/maps/SaffronCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 1, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json index 9fbefc7f3..a10d91a62 100644 --- a/data/maps/SaffronCity_PokemonCenter_1F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 14, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 4, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonCenter_2F/map.json b/data/maps/SaffronCity_PokemonCenter_2F/map.json index dd7076a54..fd1021732 100644 --- a/data/maps/SaffronCity_PokemonCenter_2F/map.json +++ b/data/maps/SaffronCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json index dbeccc674..9bb75dc81 100644 --- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json +++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 7, "y": 13, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 3, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 3, "y": 12, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 9, "y": 11, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 7, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 9, "y": 12, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 5, "y": 11, "elevation": 3, diff --git a/data/maps/SeafoamIslands_1F/map.json b/data/maps/SeafoamIslands_1F/map.json index 95261f368..ac46adf1f 100644 --- a/data/maps/SeafoamIslands_1F/map.json +++ b/data/maps/SeafoamIslands_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_1" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 32, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SEAFOAM_1F_BOULDER_2" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 8, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B1F/map.json b/data/maps/SeafoamIslands_B1F/map.json index ded9935d2..113bfe865 100644 --- a/data/maps/SeafoamIslands_B1F/map.json +++ b/data/maps/SeafoamIslands_B1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_1" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B1F_BOULDER_2" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 19, "y": 18, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SEAFOAM_ISLANDS_B1F_WATER_STONE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 24, "y": 14, "elevation": 4, diff --git a/data/maps/SeafoamIslands_B2F/map.json b/data/maps/SeafoamIslands_B2F/map.json index cc9d54955..f1a234d05 100644 --- a/data/maps/SeafoamIslands_B2F/map.json +++ b/data/maps/SeafoamIslands_B2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 22, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_1" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 30, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B2F_BOULDER_2" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 15, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B3F/map.json b/data/maps/SeafoamIslands_B3F/map.json index a1068f489..6201fb5ea 100644 --- a/data/maps/SeafoamIslands_B3F/map.json +++ b/data/maps/SeafoamIslands_B3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 23, "y": 8, "elevation": 1, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_1" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 24, "y": 8, "elevation": 1, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_2" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 12, "y": 16, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_5" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 13, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_6" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 16, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B3F_BOULDER_4" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 17, "elevation": 3, diff --git a/data/maps/SeafoamIslands_B4F/map.json b/data/maps/SeafoamIslands_B4F/map.json index 8ef4ca3b2..edd644634 100644 --- a/data/maps/SeafoamIslands_B4F/map.json +++ b/data/maps/SeafoamIslands_B4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 18, "elevation": 1, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_1" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 9, "y": 18, "elevation": 1, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SEAFOAM_B4F_BOULDER_2" }, { - "graphics_id": "MAP_OBJ_GFX_ARTICUNO", + "graphics_id": "OBJECT_EVENT_GFX_ARTICUNO", "x": 9, "y": 2, "elevation": 4, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_ARTICUNO" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 22, "y": 19, "elevation": 4, diff --git a/data/maps/SevenIsland/map.json b/data/maps/SevenIsland/map.json index c9fe0c17b..d83f81ed4 100644 --- a/data/maps/SevenIsland/map.json +++ b/data/maps/SevenIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": 18, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 9, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 15, "y": 5, "elevation": 3, diff --git a/data/maps/SevenIsland_Harbor/map.json b/data/maps/SevenIsland_Harbor/map.json index cd88eae20..1e86aa88b 100644 --- a/data/maps/SevenIsland_Harbor/map.json +++ b/data/maps/SevenIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/SevenIsland_House_Room1/map.json b/data/maps/SevenIsland_House_Room1/map.json index 066f3d18d..822cc960a 100644 --- a/data/maps/SevenIsland_House_Room1/map.json +++ b/data/maps/SevenIsland_House_Room1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_House_Room2/map.json b/data/maps/SevenIsland_House_Room2/map.json index 2336916fa..219481590 100644 --- a/data/maps/SevenIsland_House_Room2/map.json +++ b/data/maps/SevenIsland_House_Room2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 6, "y": 5, "elevation": 0, diff --git a/data/maps/SevenIsland_Mart/map.json b/data/maps/SevenIsland_Mart/map.json index 94f07f060..715183f88 100644 --- a/data/maps/SevenIsland_Mart/map.json +++ b/data/maps/SevenIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 9, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_PokemonCenter_1F/map.json b/data/maps/SevenIsland_PokemonCenter_1F/map.json index 702c10d3b..dc68e4013 100644 --- a/data/maps/SevenIsland_PokemonCenter_1F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 14, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/SevenIsland_PokemonCenter_2F/map.json b/data/maps/SevenIsland_PokemonCenter_2F/map.json index 9817d6ff1..bcd215d25 100644 --- a/data/maps/SevenIsland_PokemonCenter_2F/map.json +++ b/data/maps/SevenIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SevenIsland_SevaultCanyon/map.json b/data/maps/SevenIsland_SevaultCanyon/map.json index cf4f14540..350cb0060 100644 --- a/data/maps/SevenIsland_SevaultCanyon/map.json +++ b/data/maps/SevenIsland_SevaultCanyon/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BATTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_BATTLE_GIRL", "x": 13, "y": 43, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 13, "y": 36, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 3, "y": 35, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 3, "y": 36, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 7, "y": 56, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 11, "y": 63, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 14, "y": 13, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 14, "y": 14, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 3, "y": 41, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 13, "y": 47, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 7, "y": 44, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 12, "y": 47, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 15, "y": 46, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 16, "y": 47, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 47, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCK_SMASH_ROCK", + "graphics_id": "OBJECT_EVENT_GFX_ROCK_SMASH_ROCK", "x": 11, "y": 31, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 45, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_KINGS_ROCK" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 7, "y": 38, "elevation": 3, @@ -259,7 +259,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_MAX_ELIXIR" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 23, "elevation": 3, @@ -272,7 +272,7 @@ "flag": "FLAG_HIDE_SEVEN_ISLAND_SEVAULT_CANYON_NUGGET" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 8, "y": 26, "elevation": 3, diff --git a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json index 90a26bff2..d0ad8bc08 100644 --- a/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_Entrance/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 12, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 3, "y": 34, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 34, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 11, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 10, "y": 26, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 11, "y": 17, "elevation": 5, diff --git a/data/maps/SevenIsland_SevaultCanyon_House/map.json b/data/maps/SevenIsland_SevaultCanyon_House/map.json index 8fa5f28fb..09447abbf 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 2, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CHANSEY", + "graphics_id": "OBJECT_EVENT_GFX_CHANSEY", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 6, "y": 4, "elevation": 0, diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json index 4f492d72d..c1b70fd2d 100644 --- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json +++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 7, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 6, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 10, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 9, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json index 812fa7fc3..619d30729 100644 --- a/data/maps/SevenIsland_TanobyRuins/map.json +++ b/data/maps/SevenIsland_TanobyRuins/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 35, "y": 7, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 121, "y": 11, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 85, "y": 8, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 85, "y": 5, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json index 9d9244f89..9973bc923 100644 --- a/data/maps/SevenIsland_TrainerTower/map.json +++ b/data/maps/SevenIsland_TrainerTower/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 56, "y": 26, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 56, "y": 29, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/SevenIsland_TrainerTower_1F/map.json index 8340ada47..524654792 100644 --- a/data/maps/SevenIsland_TrainerTower_1F/map.json +++ b/data/maps/SevenIsland_TrainerTower_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 11, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 10, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/SevenIsland_TrainerTower_2F/map.json index 3cab31165..dde2e99ac 100644 --- a/data/maps/SevenIsland_TrainerTower_2F/map.json +++ b/data/maps/SevenIsland_TrainerTower_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/SevenIsland_TrainerTower_3F/map.json index 32b53f781..ddc7e3009 100644 --- a/data/maps/SevenIsland_TrainerTower_3F/map.json +++ b/data/maps/SevenIsland_TrainerTower_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/SevenIsland_TrainerTower_4F/map.json index cfb7f97c7..010f213de 100644 --- a/data/maps/SevenIsland_TrainerTower_4F/map.json +++ b/data/maps/SevenIsland_TrainerTower_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/SevenIsland_TrainerTower_5F/map.json index 7aae856d4..933e07d80 100644 --- a/data/maps/SevenIsland_TrainerTower_5F/map.json +++ b/data/maps/SevenIsland_TrainerTower_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json index 6c9ab9fa5..522d796dd 100644 --- a/data/maps/SevenIsland_TrainerTower_6F/map.json +++ b/data/maps/SevenIsland_TrainerTower_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json index e3984966b..55ca3f1b7 100644 --- a/data/maps/SevenIsland_TrainerTower_7F/map.json +++ b/data/maps/SevenIsland_TrainerTower_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json index c83e9128b..78e1fe89d 100644 --- a/data/maps/SevenIsland_TrainerTower_8F/map.json +++ b/data/maps/SevenIsland_TrainerTower_8F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_TEMP_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 10, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 15, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 11, "y": 10, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/SevenIsland_TrainerTower_Lobby/map.json index 0b3bc2fc5..e4bbd291f 100644 --- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json +++ b/data/maps/SevenIsland_TrainerTower_Lobby/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 4, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 14, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 11, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 12, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 2, "y": 12, "elevation": 3, diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/SevenIsland_TrainerTower_Roof/map.json index 4fb265a15..cff922886 100644 --- a/data/maps/SevenIsland_TrainerTower_Roof/map.json +++ b/data/maps/SevenIsland_TrainerTower_Roof/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_TRAINER_TOWER_DUDE", + "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE", "x": 9, "y": 7, "elevation": 3, diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json index 666d811f8..f3e5abafe 100644 --- a/data/maps/SilphCo_10F/map.json +++ b/data/maps/SilphCo_10F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 2, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 10, "y": 17, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 0, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SILPH_CO_10F_CARBOS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 15, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_CO_10F_ULTRA_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 17, "elevation": 3, diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json index 10f0bc778..bd9d83597 100644 --- a/data/maps/SilphCo_11F/map.json +++ b/data/maps/SilphCo_11F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 9, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 11, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GIOVANNI", + "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", "x": 6, "y": 11, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 16, "y": 12, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 16, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_CO_11F_ZINC" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 2, "y": 19, "elevation": 3, diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json index 1adffa9bf..06a5b7ac0 100644 --- a/data/maps/SilphCo_1F/map.json +++ b/data/maps/SilphCo_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 3, "y": 7, "elevation": 3, diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json index 8abb2ed86..a2d405b3a 100644 --- a/data/maps/SilphCo_2F/map.json +++ b/data/maps/SilphCo_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 29, "y": 12, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 28, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 20, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 5, "y": 19, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 10, "y": 4, "elevation": 0, diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json index ced5b0efa..5581d6926 100644 --- a/data/maps/SilphCo_3F/map.json +++ b/data/maps/SilphCo_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 25, "y": 9, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 31, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 4, "y": 12, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 8, "y": 10, "elevation": 3, diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json index 37566a737..2bfb46286 100644 --- a/data/maps/SilphCo_4F/map.json +++ b/data/maps/SilphCo_4F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 33, "y": 16, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 10, "y": 19, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 14, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 5, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_MAX_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 4, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_ESCAPE_ROPE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 13, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_SILPH_CO_4F_FULL_HEAL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 30, "y": 18, "elevation": 0, diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json index 0391f0718..a59f7836b 100644 --- a/data/maps/SilphCo_5F/map.json +++ b/data/maps/SilphCo_5F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 35, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 23, "y": 13, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 16, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 11, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 9, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 4, "y": 9, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_PROTEIN" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 18, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_TM01" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 22, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_SILPH_CO_5F_CARD_KEY" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 2, "y": 7, "elevation": 3, diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json index bdb8020b4..82eda6e92 100644 --- a/data/maps/SilphCo_6F/map.json +++ b/data/maps/SilphCo_6F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 21, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 23, "y": 9, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 24, "y": 9, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 22, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 14, "y": 9, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 16, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 9, "y": 11, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 2, "y": 14, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_SILPH_CO_6F_HP_UP" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 1, "y": 17, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_SILPH_CO_6F_X_SPECIAL" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 18, "y": 17, "elevation": 3, diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json index fcaeaef00..ec2735f05 100644 --- a/data/maps/SilphCo_7F/map.json +++ b/data/maps/SilphCo_7F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 2, "y": 6, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 0, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 24, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 24, "y": 15, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 13, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 10, "y": 10, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 13, "y": 14, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 9, "y": 14, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 3, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 0, "y": 12, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_HIDE_SILPH_CO_7F_CALCIUM" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 30, "y": 11, "elevation": 3, diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json index 05f29bbd3..7d1f410dc 100644 --- a/data/maps/SilphCo_8F/map.json +++ b/data/maps/SilphCo_8F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 28, "y": 5, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 10, "y": 17, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 9, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_M", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_M", "x": 2, "y": 5, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 24, "y": 8, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_SILPH_CO_8F_IRON" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 29, "y": 9, "elevation": 3, diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json index 7d3227d08..b350f620c 100644 --- a/data/maps/SilphCo_9F/map.json +++ b/data/maps/SilphCo_9F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 26, "y": 16, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 15, "y": 18, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SILPH_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 2, "y": 16, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 1, "y": 6, "elevation": 3, diff --git a/data/maps/SixIsland/map.json b/data/maps/SixIsland/map.json index 072d78313..86eb5ca6d 100644 --- a/data/maps/SixIsland/map.json +++ b/data/maps/SixIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 10, "y": 15, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 15, "y": 13, "elevation": 3, diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json index 9f1c986c9..6d0b3c957 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SAPPHIRE", + "graphics_id": "OBJECT_EVENT_GFX_SAPPHIRE", "x": 7, "y": 7, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_SAPPHIRE" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 5, "y": 9, "elevation": 3, diff --git a/data/maps/SixIsland_GreenPath/map.json b/data/maps/SixIsland_GreenPath/map.json index c104478d5..57be8be4a 100644 --- a/data/maps/SixIsland_GreenPath/map.json +++ b/data/maps/SixIsland_GreenPath/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 11, "y": 8, "elevation": 3, diff --git a/data/maps/SixIsland_Harbor/map.json b/data/maps/SixIsland_Harbor/map.json index 4469af84e..be77bd7eb 100644 --- a/data/maps/SixIsland_Harbor/map.json +++ b/data/maps/SixIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/SixIsland_House/map.json b/data/maps/SixIsland_House/map.json index 447c0a10c..026d381e1 100644 --- a/data/maps/SixIsland_House/map.json +++ b/data/maps/SixIsland_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/SixIsland_Mart/map.json b/data/maps/SixIsland_Mart/map.json index e0852cc49..988fddd5f 100644 --- a/data/maps/SixIsland_Mart/map.json +++ b/data/maps/SixIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_WOMAN", + "graphics_id": "OBJECT_EVENT_GFX_OLD_WOMAN", "x": 8, "y": 3, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 7, "y": 7, "elevation": 3, diff --git a/data/maps/SixIsland_OutcastIsland/map.json b/data/maps/SixIsland_OutcastIsland/map.json index 47e361882..0997aafc7 100644 --- a/data/maps/SixIsland_OutcastIsland/map.json +++ b/data/maps/SixIsland_OutcastIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKET_M", + "graphics_id": "OBJECT_EVENT_GFX_ROCKET_M", "x": 9, "y": 24, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS" }, { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 12, "y": 15, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 13, "y": 34, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 14, "y": 61, "elevation": 1, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 10, "y": 44, "elevation": 1, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TUBER_M_1", + "graphics_id": "OBJECT_EVENT_GFX_TUBER_M_1", "x": 11, "y": 44, "elevation": 1, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 11, "y": 16, "elevation": 3, diff --git a/data/maps/SixIsland_PatternBush/map.json b/data/maps/SixIsland_PatternBush/map.json index 8763c72fa..733c0c958 100644 --- a/data/maps/SixIsland_PatternBush/map.json +++ b/data/maps/SixIsland_PatternBush/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 48, "y": 15, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 10, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 51, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 13, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 37, "y": 23, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 32, "y": 5, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 52, "y": 20, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 8, "y": 21, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 39, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CAMPER", + "graphics_id": "OBJECT_EVENT_GFX_CAMPER", "x": 3, "y": 9, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 19, "y": 24, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 30, "y": 19, "elevation": 3, diff --git a/data/maps/SixIsland_PokemonCenter_1F/map.json b/data/maps/SixIsland_PokemonCenter_1F/map.json index eae20e595..2f3c4b610 100644 --- a/data/maps/SixIsland_PokemonCenter_1F/map.json +++ b/data/maps/SixIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLUE", + "graphics_id": "OBJECT_EVENT_GFX_BLUE", "x": 5, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 13, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 12, "y": 5, "elevation": 3, diff --git a/data/maps/SixIsland_PokemonCenter_2F/map.json b/data/maps/SixIsland_PokemonCenter_2F/map.json index bf48ee91c..2c1c53efb 100644 --- a/data/maps/SixIsland_PokemonCenter_2F/map.json +++ b/data/maps/SixIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/SixIsland_RuinValley/map.json b/data/maps/SixIsland_RuinValley/map.json index d31b0fe31..c3be304c9 100644 --- a/data/maps/SixIsland_RuinValley/map.json +++ b/data/maps/SixIsland_RuinValley/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 24, "y": 25, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 32, "y": 11, "elevation": 5, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 33, "y": 16, "elevation": 5, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 31, "y": 24, "elevation": 5, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 14, "y": 10, "elevation": 5, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 21, "y": 29, "elevation": 5, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 10, "elevation": 5, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 17, "y": 12, "elevation": 5, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 18, "y": 11, "elevation": 5, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 33, "elevation": 3, @@ -150,7 +150,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 34, "elevation": 3, @@ -163,7 +163,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 41, "y": 32, "elevation": 3, @@ -176,7 +176,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 41, "y": 33, "elevation": 3, @@ -189,7 +189,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 42, "y": 33, "elevation": 3, @@ -202,7 +202,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 33, "elevation": 3, @@ -215,7 +215,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_HP_UP" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 19, "y": 11, "elevation": 5, @@ -228,7 +228,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_RUIN_VALLEY_FULL_RESTORE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 43, "y": 32, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath/map.json b/data/maps/SixIsland_WaterPath/map.json index 470b708c5..f1bd689c9 100644 --- a/data/maps/SixIsland_WaterPath/map.json +++ b/data/maps/SixIsland_WaterPath/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 12, "y": 13, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 11, "y": 52, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_M_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_M_WATER", "x": 13, "y": 35, "elevation": 1, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 15, "y": 45, "elevation": 1, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 21, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 7, "y": 21, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 11, "y": 76, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 19, "elevation": 0, @@ -134,7 +134,7 @@ "flag": "FLAG_HIDE_SIX_ISLAND_WATER_PATH_ELIXIR" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 87, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath_House1/map.json b/data/maps/SixIsland_WaterPath_House1/map.json index c889d7a5a..6cc57af62 100644 --- a/data/maps/SixIsland_WaterPath_House1/map.json +++ b/data/maps/SixIsland_WaterPath_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 3, "y": 4, "elevation": 3, diff --git a/data/maps/SixIsland_WaterPath_House2/map.json b/data/maps/SixIsland_WaterPath_House2/map.json index 818e179f4..cf4c1dad2 100644 --- a/data/maps/SixIsland_WaterPath_House2/map.json +++ b/data/maps/SixIsland_WaterPath_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/ThreeIsland/map.json b/data/maps/ThreeIsland/map.json index 49100e7a0..fc30c5a41 100644 --- a/data/maps/ThreeIsland/map.json +++ b/data/maps/ThreeIsland/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 7, "y": 24, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 8, "y": 23, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ANTIBIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 8, "y": 24, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_LONE_BIKER" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 9, "y": 23, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 9, "y": 24, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 10, "y": 22, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 10, "y": 24, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 11, "y": 23, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 20, "y": 7, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 18, "y": 17, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_ZINC" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 15, "y": 7, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 14, "y": 14, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_DODUO", + "graphics_id": "OBJECT_EVENT_GFX_DODUO", "x": 15, "y": 14, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 15, "y": 31, "elevation": 3, diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json index 0e14592f6..a9a72b4ae 100644 --- a/data/maps/ThreeIsland_BerryForest/map.json +++ b/data/maps/ThreeIsland_BerryForest/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 8, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 12, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 19, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 23, "y": 17, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 38, "y": 23, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 44, "y": 23, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 44, "y": 29, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 16, "y": 43, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 17, "y": 39, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 14, "y": 39, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 11, "y": 39, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 5, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_MAX_ETHER" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 27, "y": 11, "elevation": 3, @@ -183,7 +183,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BERRY_FOREST_FULL_HEAL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 43, "elevation": 3, diff --git a/data/maps/ThreeIsland_BondBridge/map.json b/data/maps/ThreeIsland_BondBridge/map.json index 02ac7426c..71dbfd64d 100644 --- a/data/maps/ThreeIsland_BondBridge/map.json +++ b/data/maps/ThreeIsland_BondBridge/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 27, "y": 10, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 68, "y": 10, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TUBER_F", + "graphics_id": "OBJECT_EVENT_GFX_TUBER_F", "x": 33, "y": 13, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_TUBER_F", + "graphics_id": "OBJECT_EVENT_GFX_TUBER_F", "x": 50, "y": 11, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SWIMMER_F_WATER", + "graphics_id": "OBJECT_EVENT_GFX_SWIMMER_F_WATER", "x": 36, "y": 4, "elevation": 1, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 77, "y": 5, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 78, "y": 5, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 72, "y": 8, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 86, "y": 13, "elevation": 3, diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json index 317fb6580..18fddbfc1 100644 --- a/data/maps/ThreeIsland_DunsparceTunnel/map.json +++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 23, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_Harbor/map.json b/data/maps/ThreeIsland_Harbor/map.json index dfce743a3..b11ac06db 100644 --- a/data/maps/ThreeIsland_Harbor/map.json +++ b/data/maps/ThreeIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/ThreeIsland_House1/map.json b/data/maps/ThreeIsland_House1/map.json index e21901499..a8aa72fdf 100644 --- a/data/maps/ThreeIsland_House1/map.json +++ b/data/maps/ThreeIsland_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 3, "y": 4, "elevation": 0, diff --git a/data/maps/ThreeIsland_House2/map.json b/data/maps/ThreeIsland_House2/map.json index 681380cc9..f692de547 100644 --- a/data/maps/ThreeIsland_House2/map.json +++ b/data/maps/ThreeIsland_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 4, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 7, "y": 4, "elevation": 3, diff --git a/data/maps/ThreeIsland_House3/map.json b/data/maps/ThreeIsland_House3/map.json index df96d64eb..65e391a96 100644 --- a/data/maps/ThreeIsland_House3/map.json +++ b/data/maps/ThreeIsland_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 8, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_House4/map.json b/data/maps/ThreeIsland_House4/map.json index a518b76d8..1933aab5e 100644 --- a/data/maps/ThreeIsland_House4/map.json +++ b/data/maps/ThreeIsland_House4/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 6, "y": 3, "elevation": 3, diff --git a/data/maps/ThreeIsland_House5/map.json b/data/maps/ThreeIsland_House5/map.json index c5f567825..2a9a5665a 100644 --- a/data/maps/ThreeIsland_House5/map.json +++ b/data/maps/ThreeIsland_House5/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 2, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_Mart/map.json b/data/maps/ThreeIsland_Mart/map.json index f27177490..c7db3c25c 100644 --- a/data/maps/ThreeIsland_Mart/map.json +++ b/data/maps/ThreeIsland_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PICNICKER", + "graphics_id": "OBJECT_EVENT_GFX_PICNICKER", "x": 2, "y": 7, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 6, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_PokemonCenter_1F/map.json b/data/maps/ThreeIsland_PokemonCenter_1F/map.json index 83fec9da8..7a6688bc6 100644 --- a/data/maps/ThreeIsland_PokemonCenter_1F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 12, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 3, "y": 4, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 11, "y": 5, "elevation": 3, diff --git a/data/maps/ThreeIsland_PokemonCenter_2F/map.json b/data/maps/ThreeIsland_PokemonCenter_2F/map.json index bb174d2f2..af562f042 100644 --- a/data/maps/ThreeIsland_PokemonCenter_2F/map.json +++ b/data/maps/ThreeIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/ThreeIsland_Port/map.json b/data/maps/ThreeIsland_Port/map.json index e49bb1224..e7adfec0b 100644 --- a/data/maps/ThreeIsland_Port/map.json +++ b/data/maps/ThreeIsland_Port/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 14, "y": 9, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 8, "y": 8, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "FLAG_HIDE_THREE_ISLAND_BIKERS" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 13, "y": 10, "elevation": 3, diff --git a/data/maps/TwoIsland/map.json b/data/maps/TwoIsland/map.json index 64aba9d7f..24db68596 100644 --- a/data/maps/TwoIsland/map.json +++ b/data/maps/TwoIsland/map.json @@ -20,7 +20,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 28, "y": 4, "elevation": 3, @@ -33,7 +33,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 31, "y": 6, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_WOMAN" }, { - "graphics_id": "MAP_OBJ_GFX_BEAUTY", + "graphics_id": "OBJECT_EVENT_GFX_BEAUTY", "x": 30, "y": 11, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_BEAUTY" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 26, "y": 5, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 27, "y": 6, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 30, "y": 16, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 39, "y": 16, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_BOY", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_BOY", "x": 37, "y": 12, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 24, "y": 12, "elevation": 3, diff --git a/data/maps/TwoIsland_CapeBrink_House/map.json b/data/maps/TwoIsland_CapeBrink_House/map.json index 93538a4c9..4aa63fd0b 100644 --- a/data/maps/TwoIsland_CapeBrink_House/map.json +++ b/data/maps/TwoIsland_CapeBrink_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CHANNELER", + "graphics_id": "OBJECT_EVENT_GFX_CHANNELER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/TwoIsland_Harbor/map.json b/data/maps/TwoIsland_Harbor/map.json index 0fb8e4f6b..6d992c355 100644 --- a/data/maps/TwoIsland_Harbor/map.json +++ b/data/maps/TwoIsland_Harbor/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SEAGALLOP", + "graphics_id": "OBJECT_EVENT_GFX_SEAGALLOP", "x": 8, "y": 9, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 6, "elevation": 3, diff --git a/data/maps/TwoIsland_House/map.json b/data/maps/TwoIsland_House/map.json index 66f6aabed..684033ce5 100644 --- a/data/maps/TwoIsland_House/map.json +++ b/data/maps/TwoIsland_House/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 7, "y": 5, "elevation": 3, diff --git a/data/maps/TwoIsland_JoyfulGameCorner/map.json b/data/maps/TwoIsland_JoyfulGameCorner/map.json index fd3c9fac2..4caef4f41 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/map.json +++ b/data/maps/TwoIsland_JoyfulGameCorner/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 5, "y": 5, "elevation": 1, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BIKER", + "graphics_id": "OBJECT_EVENT_GFX_BIKER", "x": 5, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 6, "y": 5, "elevation": 1, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_TWO_ISLAND_GAME_CORNER_LOSTELLE" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 2, "elevation": 3, diff --git a/data/maps/TwoIsland_PokemonCenter_1F/map.json b/data/maps/TwoIsland_PokemonCenter_1F/map.json index 4b227d7b7..4d3db31f6 100644 --- a/data/maps/TwoIsland_PokemonCenter_1F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GBA_KID", + "graphics_id": "OBJECT_EVENT_GFX_GBA_KID", "x": 11, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/TwoIsland_PokemonCenter_2F/map.json b/data/maps/TwoIsland_PokemonCenter_2F/map.json index 43f5eb4ad..a9c4b0c27 100644 --- a/data/maps/TwoIsland_PokemonCenter_2F/map.json +++ b/data/maps/TwoIsland_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/UndergroundPath_EastEntrance/map.json b/data/maps/UndergroundPath_EastEntrance/map.json index 107b622f6..8ad44f032 100644 --- a/data/maps/UndergroundPath_EastEntrance/map.json +++ b/data/maps/UndergroundPath_EastEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_NorthEntrance/map.json b/data/maps/UndergroundPath_NorthEntrance/map.json index a839da159..93aa45550 100644 --- a/data/maps/UndergroundPath_NorthEntrance/map.json +++ b/data/maps/UndergroundPath_NorthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_SouthEntrance/map.json b/data/maps/UndergroundPath_SouthEntrance/map.json index cce927999..fd06be101 100644 --- a/data/maps/UndergroundPath_SouthEntrance/map.json +++ b/data/maps/UndergroundPath_SouthEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UndergroundPath_WestEntrance/map.json b/data/maps/UndergroundPath_WestEntrance/map.json index dd73060a4..bc4e4f4aa 100644 --- a/data/maps/UndergroundPath_WestEntrance/map.json +++ b/data/maps/UndergroundPath_WestEntrance/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 5, "y": 6, "elevation": 3, diff --git a/data/maps/UnknownMap_00_00/map.json b/data/maps/UnknownMap_00_00/map.json index dc4ac7d19..a4da32612 100644 --- a/data/maps/UnknownMap_00_00/map.json +++ b/data/maps/UnknownMap_00_00/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 3, "elevation": 3, diff --git a/data/maps/UnknownMap_00_01/map.json b/data/maps/UnknownMap_00_01/map.json index 65c7875bb..a427bdc14 100644 --- a/data/maps/UnknownMap_00_01/map.json +++ b/data/maps/UnknownMap_00_01/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 9, "y": 6, "elevation": 3, diff --git a/data/maps/UnknownMap_00_02/map.json b/data/maps/UnknownMap_00_02/map.json index de002c33f..611a3c092 100644 --- a/data/maps/UnknownMap_00_02/map.json +++ b/data/maps/UnknownMap_00_02/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 10, "y": 5, "elevation": 0, diff --git a/data/maps/UnknownMap_00_04/map.json b/data/maps/UnknownMap_00_04/map.json index 3c0340f01..b18296b2c 100644 --- a/data/maps/UnknownMap_00_04/map.json +++ b/data/maps/UnknownMap_00_04/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_UNION_ROOM_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_UNION_ROOM_RECEPTIONIST", "x": 3, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_3", + "graphics_id": "OBJECT_EVENT_GFX_VAR_3", "x": 1, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_4" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_7", + "graphics_id": "OBJECT_EVENT_GFX_VAR_7", "x": 7, "y": 8, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_8" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_6", + "graphics_id": "OBJECT_EVENT_GFX_VAR_6", "x": 1, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_7" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_5", + "graphics_id": "OBJECT_EVENT_GFX_VAR_5", "x": 7, "y": 4, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_6" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_4", + "graphics_id": "OBJECT_EVENT_GFX_VAR_4", "x": 13, "y": 4, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_5" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_2", + "graphics_id": "OBJECT_EVENT_GFX_VAR_2", "x": 10, "y": 6, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_3" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_1", + "graphics_id": "OBJECT_EVENT_GFX_VAR_1", "x": 13, "y": 8, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_UNION_ROOM_2" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 4, "y": 6, "elevation": 3, diff --git a/data/maps/VermilionCity/map.json b/data/maps/VermilionCity/map.json index e9d3a097d..216206ad1 100644 --- a/data/maps/VermilionCity/map.json +++ b/data/maps/VermilionCity/map.json @@ -25,7 +25,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 22, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 17, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_2", "x": 36, "y": 10, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MACHOP", + "graphics_id": "OBJECT_EVENT_GFX_MACHOP", "x": 35, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 31, "y": 30, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 24, "y": 33, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 19, "y": 24, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_SCIENTIST", + "graphics_id": "OBJECT_EVENT_GFX_SCIENTIST", "x": 25, "y": 7, "elevation": 3, diff --git a/data/maps/VermilionCity_Gym/map.json b/data/maps/VermilionCity_Gym/map.json index c5a9d6d38..128b723d6 100644 --- a/data/maps/VermilionCity_Gym/map.json +++ b/data/maps/VermilionCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LT_SURGE", + "graphics_id": "OBJECT_EVENT_GFX_LT_SURGE", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 2, "y": 11, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SAILOR", + "graphics_id": "OBJECT_EVENT_GFX_SAILOR", "x": 8, "y": 13, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 4, "y": 17, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 7, "y": 8, "elevation": 3, diff --git a/data/maps/VermilionCity_House1/map.json b/data/maps/VermilionCity_House1/map.json index c45c3f65f..b712f5c9f 100644 --- a/data/maps/VermilionCity_House1/map.json +++ b/data/maps/VermilionCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FISHER", + "graphics_id": "OBJECT_EVENT_GFX_FISHER", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/VermilionCity_House2/map.json b/data/maps/VermilionCity_House2/map.json index 94cbf7c94..547e72ba9 100644 --- a/data/maps/VermilionCity_House2/map.json +++ b/data/maps/VermilionCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 4, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_House3/map.json b/data/maps/VermilionCity_House3/map.json index d1a3688f0..aa5247c5d 100644 --- a/data/maps/VermilionCity_House3/map.json +++ b/data/maps/VermilionCity_House3/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PIDGEY", + "graphics_id": "OBJECT_EVENT_GFX_PIDGEY", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CLIPBOARD", + "graphics_id": "OBJECT_EVENT_GFX_CLIPBOARD", "x": 6, "y": 4, "elevation": 0, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 2, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_Mart/map.json b/data/maps/VermilionCity_Mart/map.json index f53ba795a..754b3c81b 100644 --- a/data/maps/VermilionCity_Mart/map.json +++ b/data/maps/VermilionCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 4, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 9, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonCenter_1F/map.json b/data/maps/VermilionCity_PokemonCenter_1F/map.json index aaf4bc861..b5b5467c8 100644 --- a/data/maps/VermilionCity_PokemonCenter_1F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 4, "y": 8, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_HIKER", + "graphics_id": "OBJECT_EVENT_GFX_HIKER", "x": 12, "y": 5, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 14, "y": 4, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 6, "y": 4, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonCenter_2F/map.json b/data/maps/VermilionCity_PokemonCenter_2F/map.json index 789cc891a..9edc3d8bf 100644 --- a/data/maps/VermilionCity_PokemonCenter_2F/map.json +++ b/data/maps/VermilionCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/VermilionCity_PokemonFanClub/map.json b/data/maps/VermilionCity_PokemonFanClub/map.json index f4ec8fe14..761fac2ab 100644 --- a/data/maps/VermilionCity_PokemonFanClub/map.json +++ b/data/maps/VermilionCity_PokemonFanClub/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 5, "y": 4, "elevation": 4, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WORKER_F", + "graphics_id": "OBJECT_EVENT_GFX_WORKER_F", "x": 6, "y": 4, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_PIKACHU", + "graphics_id": "OBJECT_EVENT_GFX_PIKACHU", "x": 7, "y": 6, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SEEL", + "graphics_id": "OBJECT_EVENT_GFX_SEEL", "x": 4, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 4, "y": 5, "elevation": 0, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 7, "y": 5, "elevation": 0, diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index 4fb068476..2f1147e86 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 5, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 14, "y": 6, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 3, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_RARE_CANDY" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 14, "y": 1, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_1F_TM02" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 7, "y": 18, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 4, "y": 12, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 16, "y": 3, "elevation": 3, diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json index dfbe906bd..02d2c8369 100644 --- a/data/maps/VictoryRoad_2F/map.json +++ b/data/maps/VictoryRoad_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_SUPER_NERD", + "graphics_id": "OBJECT_EVENT_GFX_SUPER_NERD", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 20, "y": 11, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 31, "y": 16, "elevation": 4, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 26, "y": 6, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ROCKER", + "graphics_id": "OBJECT_EVENT_GFX_ROCKER", "x": 36, "y": 5, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 6, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_GUARD_SPEC" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 40, "y": 7, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM07" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 25, "y": 13, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_FULL_HEAL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 14, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_TM37" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 8, "y": 7, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 6, "y": 17, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 33, "y": 19, "elevation": 3, @@ -170,7 +170,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_2F_BOULDER" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 40, "y": 9, "elevation": 3, diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json index 13e9e1481..f9bbe5bc2 100644 --- a/data/maps/VictoryRoad_3F/map.json +++ b/data/maps/VictoryRoad_3F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 40, "y": 7, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 21, "y": 5, "elevation": 4, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 10, "y": 17, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 11, "y": 16, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 38, "y": 7, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_MAX_REVIVE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 12, "y": 9, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_TM50" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 19, "y": 15, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 33, "y": 18, "elevation": 0, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_VICTORY_ROAD_3F_BOULDER" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 35, "y": 13, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_STRENGTH_BOULDER", + "graphics_id": "OBJECT_EVENT_GFX_STRENGTH_BOULDER", "x": 32, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 38, "y": 13, "elevation": 3, @@ -157,7 +157,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_F", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_F", "x": 39, "y": 13, "elevation": 3, diff --git a/data/maps/ViridianCity/map.json b/data/maps/ViridianCity/map.json index 081e17e98..4e1b2cd0e 100644 --- a/data/maps/ViridianCity/map.json +++ b/data/maps/ViridianCity/map.json @@ -30,7 +30,7 @@ ], "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJECT_EVENT_GFX_FAT_MAN", "x": 8, "y": 26, "elevation": 3, @@ -43,7 +43,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 11, "y": 24, "elevation": 3, @@ -56,7 +56,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "MAP_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJECT_EVENT_GFX_OLD_MAN_1", "x": 34, "y": 11, "elevation": 3, @@ -69,7 +69,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_VAR_0", + "graphics_id": "OBJECT_EVENT_GFX_VAR_0", "x": 21, "y": 6, "elevation": 3, @@ -82,7 +82,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_3", "x": 20, "y": 12, "elevation": 3, @@ -95,7 +95,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 33, "y": 26, "elevation": 3, @@ -108,7 +108,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 16, "y": 22, "elevation": 3, @@ -121,7 +121,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CUT_TREE", + "graphics_id": "OBJECT_EVENT_GFX_CUT_TREE", "x": 18, "y": 5, "elevation": 3, @@ -134,7 +134,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 17, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 24c38bfd7..070c162c6 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -15,17 +15,17 @@ ViridianCity_MapScript1_1658D9:: @ 81658D9 end EventScript_165909:: @ 8165909 - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1 + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1 return EventScript_16590F:: @ 816590F - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_OLD_MAN_1 + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1 setobjectxyperm 4, 21, 8 setobjectmovementtype 4, 1 return EventScript_165920:: @ 8165920 - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_VIRIDIAN_DRUNK + setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_VIRIDIAN_DRUNK setobjectxyperm 4, 21, 11 setobjectmovementtype 4, 8 return diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json index 451a6a6e2..1361dfb46 100644 --- a/data/maps/ViridianCity_Gym/map.json +++ b/data/maps/ViridianCity_Gym/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 10, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 12, "y": 10, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 11, "y": 14, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 10, "y": 10, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MAN", + "graphics_id": "OBJECT_EVENT_GFX_MAN", "x": 2, "y": 21, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BLACKBELT", + "graphics_id": "OBJECT_EVENT_GFX_BLACKBELT", "x": 3, "y": 11, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 6, "y": 8, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GIOVANNI", + "graphics_id": "OBJECT_EVENT_GFX_GIOVANNI", "x": 2, "y": 2, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI" }, { - "graphics_id": "MAP_OBJ_GFX_COOLTRAINER_M", + "graphics_id": "OBJECT_EVENT_GFX_COOLTRAINER_M", "x": 13, "y": 7, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GYM_GUY", + "graphics_id": "OBJECT_EVENT_GFX_GYM_GUY", "x": 16, "y": 20, "elevation": 3, diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json index edc6072ab..668ae37da 100644 --- a/data/maps/ViridianCity_House1/map.json +++ b/data/maps/ViridianCity_House1/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_BALDING_MAN", + "graphics_id": "OBJECT_EVENT_GFX_BALDING_MAN", "x": 7, "y": 4, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LITTLE_GIRL", + "graphics_id": "OBJECT_EVENT_GFX_LITTLE_GIRL", "x": 2, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_SPEAROW", + "graphics_id": "OBJECT_EVENT_GFX_SPEAROW", "x": 6, "y": 6, "elevation": 3, diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json index a3abf9f9d..0f027934d 100644 --- a/data/maps/ViridianCity_House2/map.json +++ b/data/maps/ViridianCity_House2/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_2", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_LASS", + "graphics_id": "OBJECT_EVENT_GFX_LASS", "x": 4, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json index 350ed4020..e4761721c 100644 --- a/data/maps/ViridianCity_Mart/map.json +++ b/data/maps/ViridianCity_Mart/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CLERK", + "graphics_id": "OBJECT_EVENT_GFX_CLERK", "x": 2, "y": 3, "elevation": 0, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 6, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJECT_EVENT_GFX_WOMAN_1", "x": 9, "y": 5, "elevation": 3, diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json index 419e7b4ca..6dbd242bb 100644 --- a/data/maps/ViridianCity_PokemonCenter_1F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_NURSE", + "graphics_id": "OBJECT_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJECT_EVENT_GFX_GENTLEMAN", "x": 12, "y": 5, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 4, "y": 7, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 2, "y": 3, "elevation": 3, diff --git a/data/maps/ViridianCity_PokemonCenter_2F/map.json b/data/maps/ViridianCity_PokemonCenter_2F/map.json index 3711140e9..cf764b446 100644 --- a/data/maps/ViridianCity_PokemonCenter_2F/map.json +++ b/data/maps/ViridianCity_PokemonCenter_2F/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 6, "y": 2, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 2, "y": 2, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_CABLE_CLUB_RECEPTIONIST", + "graphics_id": "OBJECT_EVENT_GFX_CABLE_CLUB_RECEPTIONIST", "x": 10, "y": 2, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_MG_DELIVERYMAN", + "graphics_id": "OBJECT_EVENT_GFX_MG_DELIVERYMAN", "x": 1, "y": 2, "elevation": 3, diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json index 7a17aca4c..af19f7f56 100644 --- a/data/maps/ViridianForest/map.json +++ b/data/maps/ViridianForest/map.json @@ -14,7 +14,7 @@ "connections": null, "object_events": [ { - "graphics_id": "MAP_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJECT_EVENT_GFX_YOUNGSTER", "x": 29, "y": 58, "elevation": 3, @@ -27,7 +27,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BOY", + "graphics_id": "OBJECT_EVENT_GFX_BOY", "x": 45, "y": 58, "elevation": 3, @@ -40,7 +40,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 47, "y": 45, "elevation": 3, @@ -53,7 +53,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 47, "y": 29, "elevation": 3, @@ -66,7 +66,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 22, "elevation": 3, @@ -79,7 +79,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 5, "y": 41, "elevation": 3, @@ -92,7 +92,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POKE_BALL" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 40, "y": 21, "elevation": 3, @@ -105,7 +105,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_ANTIDOTE" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 21, "y": 34, "elevation": 3, @@ -118,7 +118,7 @@ "flag": "FLAG_HIDE_VIRIDIAN_FOREST_POTION" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 43, "y": 6, "elevation": 3, @@ -131,7 +131,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJECT_EVENT_GFX_BUG_CATCHER", "x": 16, "y": 5, "elevation": 3, @@ -144,7 +144,7 @@ "flag": "0" }, { - "graphics_id": "MAP_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJECT_EVENT_GFX_ITEM_BALL", "x": 49, "y": 60, "elevation": 3, diff --git a/data/trainer_see.s b/data/trainer_see.s index 3392f090f..3014d8ba0 100644 --- a/data/trainer_see.s +++ b/data/trainer_see.s @@ -5,7 +5,7 @@ .align 2 gUnknown_83C6AC8:: - .incbin "graphics/map_objects/emoticons.4bpp" + .incbin "graphics/object_events/emoticons.4bpp" gUnknown_83C7248:: @ 83C7248 .4byte IsTrainerInRangeSouth |