ref: 99fb8bcc635599e69429a1545488ef05e3bcc382
parent: d077fae081127bcf7bd9b58f37771519587f5f9c
author: yenatch <yenatch@gmail.com>
date: Fri May 3 10:27:24 EDT 2013
scripting: ScriptJump
--- a/scripting.asm
+++ b/scripting.asm
@@ -252,7 +252,7 @@
ld [$d450], a
ld b, $25
ld hl, $6e79
- jp $759d
+ jp ScriptJump
; 0x96e5f
Script_jumptext: ; 0x96e5f
@@ -268,7 +268,7 @@
ld [$d450], a
ld b, $25
ld hl, $6e7a
- jp $759d
+ jp ScriptJump
; 0x96e79
INCBIN "baserom.gbc",$96e79,$96e81 - $96e79
@@ -286,7 +286,7 @@
ld [$d450], a
ld b, $25
ld hl, $6e7a
- jp $759d
+ jp ScriptJump
; 0x96e9b
Script_2writetext: ; 0x96e9b
@@ -681,7 +681,7 @@
rst $8
ld h, d
ld l, e
- jp $759d
+ jp ScriptJump
; 0x970ee
Script_fruittree: ; 0x970ee
@@ -693,7 +693,7 @@
ld [$d03e], a
ld b, $11
ld hl, $4000
- jp $759d
+ jp ScriptJump
; 0x970fc
Script_loadwilddata: ; 0x970fc
@@ -743,7 +743,7 @@
ld l, a
ld a, [$d03e]
ld b, a
- jp $759d
+ jp ScriptJump
; 0x97132
Script_trainerstatus: ; 0x97132
@@ -1417,7 +1417,7 @@
jr nz, .asm_97470 ; 0x97466 $8
ld b, $4
ld hl, $64c1
- jp $759d
+ jp ScriptJump
.asm_97470
bit 0, d
jr z, .asm_9747c ; 0x97472 $8
@@ -1510,7 +1510,7 @@
ld [hli], a
ld a, [ScriptPos]
ld [hli], a
- ld a, [$d43b]
+ ld a, [ScriptPos + 1]
ld [hl], a
ld a, b
ld [ScriptBank], a
@@ -1517,7 +1517,7 @@
ld a, e
ld [ScriptPos], a
ld a, d
- ld [$d43b], a
+ ld [ScriptPos + 1], a
ret
; 0x974f3
@@ -1539,7 +1539,7 @@
ld h, a
ld a, [ScriptBank]
ld b, a
- jp $759d
+ jp ScriptJump
; 0x9750d
Script_3jump: ; 0x9750d
@@ -1553,7 +1553,7 @@
ld l, a
call GetScriptByte
ld h, a
- jp $759d
+ jp ScriptJump
; 0x9751c
Script_2ptjump: ; 0x9751c
@@ -1570,7 +1570,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- jp $759d
+ jp ScriptJump
; 0x9752c
Script_iffalse: ; 0x9752c
@@ -1655,7 +1655,7 @@
; predefined_script (MultiByteParam)
call $757b
- jr Unknown_9759d ; 0x97571 $2a
+ jr ScriptJump ; 0x97571 $2a
; 0x97573
Script_callstd: ; 0x97573
@@ -1693,13 +1693,13 @@
ret
; 0x9759d
-Unknown_9759d: ; 0x9759d
+ScriptJump: ; 0x9759d
ld a, b
ld [ScriptBank], a
ld a, l
ld [ScriptPos], a
ld a, h
- ld [$d43b], a
+ ld [ScriptPos + 1], a
ret
; 0x975aa
@@ -3041,7 +3041,7 @@
ld [ScriptPos], a
ld a, [hl]
ld d, a
- ld [$d43b], a
+ ld [ScriptPos + 1], a
and a
ret
.asm_97bbe
--
⑨