dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup link contest map events

Browse Source
This commit is contained in:
Marcus Huderle
2019-01-29 13:05:47 -06:00
committed by huderlem
parent 36a1825bbe
commit d2d44a97b8
24 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/map_events.s
View File

@@ -387,17 +387,17 @@
.include "data/maps/RecordCorner/events.inc" .include "data/maps/RecordCorner/events.inc"
.include "data/maps/DoubleBattleColosseum/events.inc" .include "data/maps/DoubleBattleColosseum/events.inc"
.include "data/maps/LinkContestRoom1/events.inc" .include "data/maps/LinkContestRoom1/events.inc"
.include "data/maps/LinkContestRoom2/events.inc"
.include "data/maps/LinkContestRoom3/events.inc"
.include "data/maps/LinkContestRoom4/events.inc"
.include "data/maps/LinkContestRoom5/events.inc"
.include "data/maps/LinkContestRoom6/events.inc"
.include "data/maps/UnknownMap_25_29/events.inc" .include "data/maps/UnknownMap_25_29/events.inc"
.include "data/maps/UnknownMap_25_30/events.inc" .include "data/maps/UnknownMap_25_30/events.inc"
.include "data/maps/UnknownMap_25_31/events.inc" .include "data/maps/UnknownMap_25_31/events.inc"
.include "data/maps/UnknownMap_25_32/events.inc" .include "data/maps/UnknownMap_25_32/events.inc"
.include "data/maps/UnknownMap_25_33/events.inc" .include "data/maps/UnknownMap_25_33/events.inc"
.include "data/maps/UnknownMap_25_34/events.inc" .include "data/maps/UnknownMap_25_34/events.inc"
.include "data/maps/LinkContestRoom2/events.inc"
.include "data/maps/LinkContestRoom3/events.inc"
.include "data/maps/LinkContestRoom4/events.inc"
.include "data/maps/LinkContestRoom5/events.inc"
.include "data/maps/LinkContestRoom6/events.inc"
.include "data/maps/InsideOfTruck/events.inc" .include "data/maps/InsideOfTruck/events.inc"
.include "data/maps/SSTidalCorridor/events.inc" .include "data/maps/SSTidalCorridor/events.inc"
.include "data/maps/SSTidalLowerDeck/events.inc" .include "data/maps/SSTidalLowerDeck/events.inc"

1
data/maps/LinkContestRoom1/events.inc
View File

@@ -16,3 +16,4 @@ LinkContestRoom1_EventObjects: @ 8539EFC
object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
LinkContestRoom1_MapEvents:: @ 853A064 LinkContestRoom1_MapEvents:: @ 853A064
map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0

1
data/maps/LinkContestRoom2/events.inc
View File

@@ -1 +0,0 @@
LinkContestRoom2_MapEvents:: @ 853A064

2
data/maps/LinkContestRoom2/header.inc
View File

@@ -1,6 +1,6 @@
LinkContestRoom2: @ 8484E64 LinkContestRoom2: @ 8484E64
.4byte LinkContestRoom2_Layout .4byte LinkContestRoom2_Layout
.4byte LinkContestRoom2_MapEvents .4byte LinkContestRoom1_MapEvents
.4byte LinkContestRoom2_MapScripts .4byte LinkContestRoom2_MapScripts
.4byte 0x0 .4byte 0x0
.2byte MUS_CONTEST0 .2byte MUS_CONTEST0

1
data/maps/LinkContestRoom3/events.inc
View File

@@ -1 +0,0 @@
LinkContestRoom3_MapEvents:: @ 853A064

2
data/maps/LinkContestRoom3/header.inc
View File

@@ -1,6 +1,6 @@
LinkContestRoom3: @ 8484E80 LinkContestRoom3: @ 8484E80
.4byte LinkContestRoom3_Layout .4byte LinkContestRoom3_Layout
.4byte LinkContestRoom3_MapEvents .4byte LinkContestRoom1_MapEvents
.4byte LinkContestRoom3_MapScripts .4byte LinkContestRoom3_MapScripts
.4byte 0x0 .4byte 0x0
.2byte MUS_CONTEST0 .2byte MUS_CONTEST0

1
data/maps/LinkContestRoom4/events.inc
View File

@@ -1 +0,0 @@
LinkContestRoom4_MapEvents:: @ 853A064

2
data/maps/LinkContestRoom4/header.inc
View File

@@ -1,6 +1,6 @@
LinkContestRoom4: @ 8484E9C LinkContestRoom4: @ 8484E9C
.4byte LinkContestRoom4_Layout .4byte LinkContestRoom4_Layout
.4byte LinkContestRoom4_MapEvents .4byte LinkContestRoom1_MapEvents
.4byte LinkContestRoom4_MapScripts .4byte LinkContestRoom4_MapScripts
.4byte 0x0 .4byte 0x0
.2byte MUS_CONTEST0 .2byte MUS_CONTEST0

1
data/maps/LinkContestRoom5/events.inc
View File

@@ -1 +0,0 @@
LinkContestRoom5_MapEvents:: @ 853A064

2
data/maps/LinkContestRoom5/header.inc
View File

@@ -1,6 +1,6 @@
LinkContestRoom5: @ 8484EB8 LinkContestRoom5: @ 8484EB8
.4byte LinkContestRoom5_Layout .4byte LinkContestRoom5_Layout
.4byte LinkContestRoom5_MapEvents .4byte LinkContestRoom1_MapEvents
.4byte LinkContestRoom5_MapScripts .4byte LinkContestRoom5_MapScripts
.4byte 0x0 .4byte 0x0
.2byte MUS_CONTEST0 .2byte MUS_CONTEST0

1
data/maps/LinkContestRoom6/events.inc
View File

@@ -1 +0,0 @@
LinkContestRoom6_MapEvents:: @ 853A064

2
data/maps/LinkContestRoom6/header.inc
View File

@@ -1,6 +1,6 @@
LinkContestRoom6: @ 8484ED4 LinkContestRoom6: @ 8484ED4
.4byte LinkContestRoom6_Layout .4byte LinkContestRoom6_Layout
.4byte LinkContestRoom6_MapEvents .4byte LinkContestRoom1_MapEvents
.4byte LinkContestRoom6_MapScripts .4byte LinkContestRoom6_MapScripts
.4byte 0x0 .4byte 0x0
.2byte MUS_CONTEST0 .2byte MUS_CONTEST0

1
data/maps/UnknownMap_25_29/events.inc
View File

@@ -1 +0,0 @@
UnknownMap_25_29_MapEvents:: @ 853A064

2
data/maps/UnknownMap_25_29/header.inc
View File

@@ -1,6 +1,6 @@
UnknownMap_25_29: @ 8484DBC UnknownMap_25_29: @ 8484DBC
.4byte UnknownMap_25_29_Layout .4byte UnknownMap_25_29_Layout
.4byte UnknownMap_25_29_MapEvents .4byte LinkContestRoom1_MapEvents
.4byte UnknownMap_25_29_MapScripts .4byte UnknownMap_25_29_MapScripts
.4byte 0x0 .4byte 0x0
.2byte MUS_NIBI .2byte MUS_NIBI

1
data/maps/UnknownMap_25_30/events.inc
View File

@@ -1 +0,0 @@
UnknownMap_25_30_MapEvents:: @ 853A064

2
data/maps/UnknownMap_25_30/header.inc
View File

@@ -1,6 +1,6 @@
UnknownMap_25_30: @ 8484DD8 UnknownMap_25_30: @ 8484DD8
.4byte UnknownMap_25_30_Layout .4byte UnknownMap_25_30_Layout
.4byte UnknownMap_25_30_MapEvents .4byte LinkContestRoom1_MapEvents
.4byte UnknownMap_25_30_MapScripts .4byte UnknownMap_25_30_MapScripts
.4byte 0x0 .4byte 0x0
.2byte MUS_NIBI .2byte MUS_NIBI

1
data/maps/UnknownMap_25_31/events.inc
View File

@@ -1 +0,0 @@
UnknownMap_25_31_MapEvents:: @ 853A064

2
data/maps/UnknownMap_25_31/header.inc
View File

@@ -1,6 +1,6 @@
UnknownMap_25_31: @ 8484DF4 UnknownMap_25_31: @ 8484DF4
.4byte UnknownMap_25_31_Layout .4byte UnknownMap_25_31_Layout
.4byte UnknownMap_25_31_MapEvents .4byte LinkContestRoom1_MapEvents
.4byte UnknownMap_25_31_MapScripts .4byte UnknownMap_25_31_MapScripts
.4byte 0x0 .4byte 0x0
.2byte MUS_NIBI .2byte MUS_NIBI

1
data/maps/UnknownMap_25_32/events.inc
View File

@@ -1 +0,0 @@
UnknownMap_25_32_MapEvents:: @ 853A064

2
data/maps/UnknownMap_25_32/header.inc
View File

@@ -1,6 +1,6 @@
UnknownMap_25_32: @ 8484E10 UnknownMap_25_32: @ 8484E10
.4byte UnknownMap_25_32_Layout .4byte UnknownMap_25_32_Layout
.4byte UnknownMap_25_32_MapEvents .4byte LinkContestRoom1_MapEvents
.4byte UnknownMap_25_32_MapScripts .4byte UnknownMap_25_32_MapScripts
.4byte 0x0 .4byte 0x0
.2byte MUS_NIBI .2byte MUS_NIBI

1
data/maps/UnknownMap_25_33/events.inc
View File

@@ -1 +0,0 @@
UnknownMap_25_33_MapEvents:: @ 853A064

2
data/maps/UnknownMap_25_33/header.inc
View File

@@ -1,6 +1,6 @@
UnknownMap_25_33: @ 8484E2C UnknownMap_25_33: @ 8484E2C
.4byte UnknownMap_25_33_Layout .4byte UnknownMap_25_33_Layout
.4byte UnknownMap_25_33_MapEvents .4byte LinkContestRoom1_MapEvents
.4byte UnknownMap_25_33_MapScripts .4byte UnknownMap_25_33_MapScripts
.4byte 0x0 .4byte 0x0
.2byte MUS_NIBI .2byte MUS_NIBI

3
data/maps/UnknownMap_25_34/events.inc
View File

@@ -1,3 +0,0 @@
UnknownMap_25_34_MapEvents:: @ 853A064
map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0

2
data/maps/UnknownMap_25_34/header.inc
View File

@@ -1,6 +1,6 @@
UnknownMap_25_34: @ 8484E48 UnknownMap_25_34: @ 8484E48
.4byte UnknownMap_25_34_Layout .4byte UnknownMap_25_34_Layout
.4byte UnknownMap_25_34_MapEvents .4byte LinkContestRoom1_MapEvents
.4byte UnknownMap_25_34_MapScripts .4byte UnknownMap_25_34_MapScripts
.4byte 0x0 .4byte 0x0
.2byte MUS_NIBI .2byte MUS_NIBI