Skip to content

Commit

Permalink
Merge pull request #480 from camthesaxman/wild_encounter_data
Browse files Browse the repository at this point in the history 
convert wild_encounter data to C
  • Loading branch information
@camthesaxman
camthesaxman authored Nov 28, 2017
2 parents b6934e4 + 749ec00 commit 61e0c62
Show file tree
Hide file tree
Showing 40 changed files with 861 additions and 773 deletions.
6 changes: 0 additions & 6 deletions asm/macros/map.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@
.space 2
.endm

.equiv GROUP_NONE, 0x7f
.equiv MAP_NONE, 0x7f

.equiv GROUP_UNDEFINED, 0xff
.equiv MAP_UNDEFINED, 0xff

.macro map_script type, address
.byte \type
.4byte \address
Expand Down
5 changes: 5 additions & 0 deletions constants/map_constants.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -461,4 +461,9 @@

new_map_group
map_group Route124_DivingTreasureHuntersHouse @ 33.0
.set MAP_None, 0x7F
.set GROUP_None, 0x7F

.set MAP_Undefined, 0xFF
.set GROUP_Undefined, 0xFF
2 changes: 1 addition & 1 deletion data-de/event_scripts.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4915,7 +4915,7 @@ S_FallDownHole:: @ 81C6BC5
waitmovement 0
playse 43
delay 60
warphole UNDEFINED
warphole Undefined
waitstate
end

Expand Down
2 changes: 1 addition & 1 deletion data/event_scripts.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4883,7 +4883,7 @@ S_FallDownHole:: @ 81C6BC5
waitmovement 0
playse 43
delay 60
warphole UNDEFINED
warphole Undefined
waitstate
end

Expand Down
8 changes: 4 additions & 4 deletions data/maps/events/DoubleBattleColosseum.inc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
DoubleBattleColosseum_MapWarps:: @ 8391428
warp_def 5, 8, 3, 127, NONE
warp_def 6, 8, 3, 127, NONE
warp_def 7, 8, 3, 127, NONE
warp_def 8, 8, 3, 127, NONE
warp_def 5, 8, 3, 127, None
warp_def 6, 8, 3, 127, None
warp_def 7, 8, 3, 127, None
warp_def 8, 8, 3, 127, None

DoubleBattleColosseum_MapCoordEvents:: @ 8391448
coord_event 3, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A4383
Expand Down
6 changes: 3 additions & 3 deletions data/maps/events/InsideOfTruck.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ InsideOfTruck_MapObjects:: @ 8391618
object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 2, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0

InsideOfTruck_MapWarps:: @ 8391660
warp_def 4, 1, 0, 127, NONE
warp_def 4, 2, 0, 127, NONE
warp_def 4, 3, 0, 127, NONE
warp_def 4, 1, 0, 127, None
warp_def 4, 2, 0, 127, None
warp_def 4, 3, 0, 127, None

InsideOfTruck_MapCoordEvents:: @ 8391678
coord_event 3, 1, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29
Expand Down
4 changes: 2 additions & 2 deletions data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ LilycoveCity_DepartmentStoreElevator_MapObjects:: @ 838A624
object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0, 0, 0

LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C
warp_def 1, 5, 3, 127, NONE
warp_def 2, 5, 3, 127, NONE
warp_def 1, 5, 3, 127, None
warp_def 2, 5, 3, 127, None

LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C
map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0
8 changes: 4 additions & 4 deletions data/maps/events/RecordCorner.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ RecordCorner_MapObjects:: @ 839139C
object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 10, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0, 0, 0

RecordCorner_MapWarps:: @ 83913B4
warp_def 8, 9, 3, 127, NONE
warp_def 9, 9, 3, 127, NONE
warp_def 11, 9, 3, 127, NONE
warp_def 10, 9, 3, 127, NONE
warp_def 8, 9, 3, 127, None
warp_def 9, 9, 3, 127, None
warp_def 11, 9, 3, 127, None
warp_def 10, 9, 3, 127, None

RecordCorner_MapCoordEvents:: @ 83913D4
coord_event 6, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4418
Expand Down
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_BlueCave1.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_BlueCave1_MapObjects:: @ 838F18C
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_BlueCave1_MapWarps:: @ 838F2F4
warp_def 5, 7, 0, 126, NONE
warp_def 5, 7, 0, 126, None

SecretBase_BlueCave1_MapEvents:: @ 838F2FC
map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_BlueCave2.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_BlueCave2_MapObjects:: @ 838FAA4
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_BlueCave2_MapWarps:: @ 838FC0C
warp_def 7, 5, 0, 126, NONE
warp_def 7, 5, 0, 126, None

SecretBase_BlueCave2_MapEvents:: @ 838FC14
map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_BlueCave3.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_BlueCave3_MapObjects:: @ 83903BC
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_BlueCave3_MapWarps:: @ 8390524
warp_def 4, 15, 0, 126, NONE
warp_def 4, 15, 0, 126, None

SecretBase_BlueCave3_MapEvents:: @ 839052C
map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_BlueCave4.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_BlueCave4_MapObjects:: @ 8390CD4
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_BlueCave4_MapWarps:: @ 8390E3C
warp_def 4, 15, 0, 126, NONE
warp_def 4, 15, 0, 126, None

SecretBase_BlueCave4_MapEvents:: @ 8390E44
map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_BrownCave1.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_BrownCave1_MapObjects:: @ 838F008
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_BrownCave1_MapWarps:: @ 838F170
warp_def 5, 7, 0, 126, NONE
warp_def 5, 7, 0, 126, None

SecretBase_BrownCave1_MapEvents:: @ 838F178
map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_BrownCave2.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_BrownCave2_MapObjects:: @ 838F920
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_BrownCave2_MapWarps:: @ 838FA88
warp_def 1, 7, 0, 126, NONE
warp_def 1, 7, 0, 126, None

SecretBase_BrownCave2_MapEvents:: @ 838FA90
map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_BrownCave3.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_BrownCave3_MapObjects:: @ 8390238
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_BrownCave3_MapWarps:: @ 83903A0
warp_def 11, 9, 0, 126, NONE
warp_def 11, 9, 0, 126, None

SecretBase_BrownCave3_MapEvents:: @ 83903A8
map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_BrownCave4.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_BrownCave4_MapObjects:: @ 8390B50
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_BrownCave4_MapWarps:: @ 8390CB8
warp_def 2, 8, 0, 126, NONE
warp_def 2, 8, 0, 126, None

SecretBase_BrownCave4_MapEvents:: @ 8390CC0
map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_RedCave1.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_RedCave1_MapObjects:: @ 838EE84
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_RedCave1_MapWarps:: @ 838EFEC
warp_def 5, 7, 0, 126, NONE
warp_def 5, 7, 0, 126, None

SecretBase_RedCave1_MapEvents:: @ 838EFF4
map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_RedCave2.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_RedCave2_MapObjects:: @ 838F79C
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_RedCave2_MapWarps:: @ 838F904
warp_def 3, 14, 0, 126, NONE
warp_def 3, 14, 0, 126, None

SecretBase_RedCave2_MapEvents:: @ 838F90C
map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_RedCave3.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_RedCave3_MapObjects:: @ 83900B4
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_RedCave3_MapWarps:: @ 839021C
warp_def 3, 6, 0, 126, NONE
warp_def 3, 6, 0, 126, None

SecretBase_RedCave3_MapEvents:: @ 8390224
map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_RedCave4.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_RedCave4_MapObjects:: @ 83909CC
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_RedCave4_MapWarps:: @ 8390B34
warp_def 2, 12, 0, 126, NONE
warp_def 2, 12, 0, 126, None

SecretBase_RedCave4_MapEvents:: @ 8390B3C
map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_Shrub1.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_Shrub1_MapObjects:: @ 838F618
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_Shrub1_MapWarps:: @ 838F780
warp_def 5, 7, 0, 126, NONE
warp_def 5, 7, 0, 126, None

SecretBase_Shrub1_MapEvents:: @ 838F788
map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_Shrub2.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_Shrub2_MapObjects:: @ 838FF30
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_Shrub2_MapWarps:: @ 8390098
warp_def 7, 5, 0, 126, NONE
warp_def 7, 5, 0, 126, None

SecretBase_Shrub2_MapEvents:: @ 83900A0
map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_Shrub3.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_Shrub3_MapObjects:: @ 8390848
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_Shrub3_MapWarps:: @ 83909B0
warp_def 6, 9, 0, 126, NONE
warp_def 6, 9, 0, 126, None

SecretBase_Shrub3_MapEvents:: @ 83909B8
map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_Shrub4.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_Shrub4_MapObjects:: @ 8391160
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_Shrub4_MapWarps:: @ 83912C8
warp_def 11, 8, 0, 126, NONE
warp_def 11, 8, 0, 126, None

SecretBase_Shrub4_MapEvents:: @ 83912D0
map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_Tree1.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_Tree1_MapObjects:: @ 838F494
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_Tree1_MapWarps:: @ 838F5FC
warp_def 5, 7, 0, 126, NONE
warp_def 5, 7, 0, 126, None

SecretBase_Tree1_MapEvents:: @ 838F604
map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_Tree2.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_Tree2_MapObjects:: @ 838FDAC
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_Tree2_MapWarps:: @ 838FF14
warp_def 3, 14, 0, 126, NONE
warp_def 3, 14, 0, 126, None

SecretBase_Tree2_MapEvents:: @ 838FF1C
map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_Tree3.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_Tree3_MapObjects:: @ 83906C4
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_Tree3_MapWarps:: @ 839082C
warp_def 8, 6, 0, 126, NONE
warp_def 8, 6, 0, 126, None

SecretBase_Tree3_MapEvents:: @ 8390834
map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_Tree4.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_Tree4_MapObjects:: @ 8390FDC
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_Tree4_MapWarps:: @ 8391144
warp_def 7, 12, 0, 126, NONE
warp_def 7, 12, 0, 126, None

SecretBase_Tree4_MapEvents:: @ 839114C
map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_YellowCave1.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_YellowCave1_MapObjects:: @ 838F310
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_YellowCave1_MapWarps:: @ 838F478
warp_def 5, 7, 0, 126, NONE
warp_def 5, 7, 0, 126, None

SecretBase_YellowCave1_MapEvents:: @ 838F480
map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_YellowCave2.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_YellowCave2_MapObjects:: @ 838FC28
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_YellowCave2_MapWarps:: @ 838FD90
warp_def 12, 7, 0, 126, NONE
warp_def 12, 7, 0, 126, None

SecretBase_YellowCave2_MapEvents:: @ 838FD98
map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_YellowCave3.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_YellowCave3_MapObjects:: @ 8390540
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_YellowCave3_MapWarps:: @ 83906A8
warp_def 5, 9, 0, 126, NONE
warp_def 5, 9, 0, 126, None

SecretBase_YellowCave3_MapEvents:: @ 83906B0
map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0
2 changes: 1 addition & 1 deletion data/maps/events/SecretBase_YellowCave4.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SecretBase_YellowCave4_MapObjects:: @ 8390E58
object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0

SecretBase_YellowCave4_MapWarps:: @ 8390FC0
warp_def 6, 12, 0, 126, NONE
warp_def 6, 12, 0, 126, None

SecretBase_YellowCave4_MapEvents:: @ 8390FC8
map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
4 changes: 2 additions & 2 deletions data/maps/events/SingleBattleColosseum.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ SingleBattleColosseum_MapObjects:: @ 83912E4
object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0, 0, 0

SingleBattleColosseum_MapWarps:: @ 83912FC
warp_def 6, 8, 3, 127, NONE
warp_def 7, 8, 3, 127, NONE
warp_def 6, 8, 3, 127, None
warp_def 7, 8, 3, 127, None

SingleBattleColosseum_MapCoordEvents:: @ 839130C
coord_event 3, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A436F
Expand Down
4 changes: 2 additions & 2 deletions data/maps/events/TradeCenter.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ TradeCenter_MapObjects:: @ 8391340
object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0, 0, 0

TradeCenter_MapWarps:: @ 8391358
warp_def 5, 8, 3, 127, NONE
warp_def 6, 8, 3, 127, NONE
warp_def 5, 8, 3, 127, None
warp_def 6, 8, 3, 127, None

TradeCenter_MapCoordEvents:: @ 8391368
coord_event 4, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43F0
Expand Down
20 changes: 0 additions & 20 deletions data/wild_encounter.s
View file

This file was deleted.

Loading

0 comments on commit 61e0c62

Please sign in to comment.