Merge branch 'master' of github.com:pret/pokeemerald

This commit is contained in:
Diegoisawesome
2018-07-24 21:18:36 -07:00
1092 changed files with 39655 additions and 38981 deletions
@@ -1,12 +1,12 @@
Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C
object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0
object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0
Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4
warp_def 3, 8, 0, 0, MAP_ROUTE124
warp_def 4, 8, 0, 0, MAP_ROUTE124
Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4
bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63
bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_270F63
Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0
map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents
@@ -5,11 +5,11 @@ Route124_DivingTreasureHuntersHouse: @ 8485D44
.4byte 0x0
.2byte MUS_MINAMO
.2byte 301
.byte 39
.byte MAPSEC_ROUTE_124
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL