diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-30 22:01:20 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-30 22:01:20 -0500 |
| commit | 72cdcb621c09d9b069a688c0c4f063b0ad077f4e (patch) | |
| tree | 66348a046c07f3265d1ce71145281aab673b9dcd /maps/Route43MahoganyGate.asm | |
| parent | 6e00101b895b8f1fe304c116fa861e83997a1dc7 (diff) | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# maps/Route25.asm
# maps/Route27.asm
# maps/Route35.asm
# maps/Route39.asm
# maps/Route42.asm
# maps/Route43.asm
# maps/Route43MahoganyGate.asm
# maps/Route45.asm
# maps/Route5CleanseTagHouse.asm
# maps/Route6SaffronGate.asm
# maps/Route7SaffronGate.asm
# maps/ViridianCity.asm
Diffstat (limited to 'maps/Route43MahoganyGate.asm')
| -rw-r--r-- | maps/Route43MahoganyGate.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 6e9431b2b..0f5243349 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -6,17 +6,17 @@ Route43MahoganyGate_MapScripts: db 0 ; callbacks -OfficerScript_0x19ab0b: +Route43MahoganyGateOfficer: faceplayer opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue UnknownScript_0x19ab19 + iftrue .RocketsCleared writetext UnknownText_0x19ab1f waitbutton closetext end -UnknownScript_0x19ab19: +.RocketsCleared: writetext UnknownText_0x19ab65 waitbutton closetext @@ -50,4 +50,4 @@ Route43MahoganyGate_MapEvents: db 0 ; bg events db 1 ; object events - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OfficerScript_0x19ab0b, -1 + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route43MahoganyGateOfficer, -1 |