diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-03-25 11:32:21 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-03-25 11:32:21 -0400 |
| commit | 2650bcffad179be1a874bfaadccb0bb554d28096 (patch) | |
| tree | 7d3a0cc49817625fb35a852a678719603c3c5fe7 | |
| parent | 707020f9be6548b2ea24eda0819c6202b3531571 (diff) | |
| parent | 63eb59c6ede42fb3248e50c99347d59c6a42471a (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
| -rw-r--r-- | maps/AzaleaGym.asm | 2 | ||||
| -rw-r--r-- | maps/RuinsofAlphHoohChamber.blk | 1 | ||||
| -rw-r--r-- | maps/RuinsofAlphHoohItemRoom.blk | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 7714c0e02..136d82da9 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -383,7 +383,7 @@ AzaleaGym_MapEventHeader: person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BugsyScript, -1 person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1 person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherAl, -1 - person_event SPRITE_BUG_CATCHER, PERSONTYPE_TRAINER, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1 + person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1 person_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1 person_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1 person_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1 diff --git a/maps/RuinsofAlphHoohChamber.blk b/maps/RuinsofAlphHoohChamber.blk deleted file mode 100644 index 6560787d3..000000000 --- a/maps/RuinsofAlphHoohChamber.blk +++ /dev/null @@ -1 +0,0 @@ --0
,+
\ No newline at end of file diff --git a/maps/RuinsofAlphHoohItemRoom.blk b/maps/RuinsofAlphHoohItemRoom.blk deleted file mode 100644 index 54b53285d..000000000 --- a/maps/RuinsofAlphHoohItemRoom.blk +++ /dev/null @@ -1 +0,0 @@ -451212,+
\ No newline at end of file |