diff options
author | yenatch <yenatch@gmail.com> | 2017-12-28 22:17:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-28 22:17:13 -0500 |
commit | b97a1acf3d676ca1c776e37ff4cfa48164ffc92b (patch) | |
tree | 59b5db70690a9f9041e4964adae1722b4d178a1b /maps/DragonShrine.asm | |
parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
parent | b9a68fec2589eb6969be63e6ed1eb3fca312c307 (diff) |
Merge pull request #445 from roukaour/master
Rename Pokémon animation files; consistent (x, y) coords; document design flaws
Diffstat (limited to 'maps/DragonShrine.asm')
-rw-r--r-- | maps/DragonShrine.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 0e805f230..1df424ca1 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -674,8 +674,8 @@ DragonShrine_MapEventHeader: .Warps: db 2 - warp_def $9, $4, 2, DRAGONS_DEN_B1F - warp_def $9, $5, 2, DRAGONS_DEN_B1F + warp_def 4, 9, 2, DRAGONS_DEN_B1F + warp_def 5, 9, 2, DRAGONS_DEN_B1F .CoordEvents: db 0 @@ -685,7 +685,7 @@ DragonShrine_MapEventHeader: .ObjectEvents: db 4 - object_event SPRITE_ELDER, 1, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS - object_event SPRITE_ELDER, 4, 2, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS - object_event SPRITE_ELDER, 4, 7, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS - object_event SPRITE_CLAIR, 8, 4, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR + object_event 5, 1, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS + object_event 2, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS + object_event 7, 4, SPRITE_ELDER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS + object_event 4, 8, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR |