diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-04-13 11:36:28 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-04-13 11:36:28 -0500 |
| commit | 27ec064056f5ae08a7c547224ff8cb5fdcf969b2 (patch) | |
| tree | 8ca02add77343148c3e3f5acc5cf2b15f6c5e6f1 /engine/scripting.asm | |
| parent | 0b0db144356f88c16134571cecb090004796c90c (diff) | |
| parent | 1fd39f7fb9544c74f143d0c54a84aae55ea8365f (diff) | |
Merge pull request #245 from yenatch/master
Picking off small incbins and static labels.
Diffstat (limited to 'engine/scripting.asm')
| -rw-r--r-- | engine/scripting.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm index 21feaf5d2..4886327ca 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -519,7 +519,7 @@ Script_interpretmenu2: ; 0x96f30 ; script command 0x59 ld a, [ScriptBank] - ld hl, $1d81 + ld hl, Function1d81 rst FarCall ld a, [$cfa9] jr nc, .asm_96f3d ; 0x96f3a $1 @@ -533,7 +533,7 @@ Script_interpretmenu: ; 0x96f41 ; script command 0x58 ld a, [ScriptBank] - ld hl, $202a + ld hl, Function202a rst FarCall ld a, [$cf88] jr nc, .asm_96f4e ; 0x96f4b $1 @@ -2284,7 +2284,7 @@ Script_stringtotext: ; 0x9777d call GetScriptByte ld d, a ld a, [ScriptBank] - ld hl, $30d6 + ld hl, CopyName1 rst FarCall ld de, StringBuffer2 jp Unknown_976c0 |