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 /engine/scripting.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 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 7512bdc06..9a89c375a 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -147,9 +147,9 @@ ScriptCommandTable: dw Script_loadmenudata ; 4f dw Script_closewindow ; 50 dw Script_jumptextfaceplayer ; 51 -IF _CRYSTAL +if _CRYSTAL dw Script_farjumptext ; 52 -ENDC +endc dw Script_jumptext ; 53 dw Script_waitbutton ; 54 dw Script_buttonsound ; 55 @@ -338,7 +338,7 @@ JumpTextScript: end -IF _CRYSTAL +if _CRYSTAL Script_farjumptext: ; script command 0x52 @@ -355,7 +355,7 @@ Script_farjumptext: ld hl, JumpTextScript jp ScriptJump -ENDC +endc Script_writetext: |