diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-03-03 23:38:54 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-03-03 23:38:54 -0600 |
| commit | f676c3d357417c81daa33544536213ae85a5472f (patch) | |
| tree | 7a4424aafc11c9f410217062ac0d25c5d48895ac /engine/scripting.asm | |
| parent | 0b6cb7a3b601875b21f6a2e2a1ab20490eb93921 (diff) | |
| parent | 7ab8f76117e13a192a1f4f797ee73c48f6154cff (diff) | |
Merge pull request #237 from yenatch/incbins
Map triggers and egg hatching.
Diffstat (limited to 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 1a5ee4cea..21feaf5d2 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1884,7 +1884,7 @@ Script_checkmaptriggers: ; 0x975d1 ld b, a call GetScriptByte ld c, a - call Function2147 + call GetMapTrigger ld a, d or e jr z, .asm_975e5 ; 0x975de $5 @@ -1923,7 +1923,7 @@ Script_domaptrigger: ; 0x975f5 ; fallthrough Unknown_975fd: ; 0x975fd - call Function2147 + call GetMapTrigger ld a, d or e jr z, .asm_97608 ; 0x97602 $4 |