summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-12 15:48:28 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-12 15:48:28 -0600
commita8126e077b59168c054f4b4510850a1612a43752 (patch)
treea991451ec32b4ee6ef00625dc67444471baaee91
parent9d23949741e871c21aee274eeb2871c443f2d508 (diff)
update gbz80disasm for TextScriptEnd
hg-commit-id: f519c306bc00
-rw-r--r--extras/gbz80disasm.py1
-rw-r--r--pokered.asm10
2 files changed, 2 insertions, 9 deletions
diff --git a/extras/gbz80disasm.py b/extras/gbz80disasm.py
index aa01691c..496e46f1 100644
--- a/extras/gbz80disasm.py
+++ b/extras/gbz80disasm.py
@@ -563,6 +563,7 @@ asm_commands = {
"3e6d": "Predef", #library of pre-defined asm routines
"00b5": "CopyData",
"2ff3": "GetMachineName",
+ "24d7": "TextScriptEnd",
}
def random_asm_label():
diff --git a/pokered.asm b/pokered.asm
index c7483281..267cc3a9 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -1034,7 +1034,7 @@ IndigoPlateauLobbyText4:
TextScriptEndingChar:
db "@"
-TextScriptEnd:
+TextScriptEnd: ; 24D7
ld hl,TextScriptEndingChar
ret
@@ -28250,7 +28250,6 @@ SSAnne1Text1: ; 0x6126d
TX_FAR _SSAnne1Text1
db $50
-
SSAnne1Text2: ; 0x61272
TX_FAR _SSAnne1Text2
db $50
@@ -28418,12 +28417,10 @@ SSAnne5Text1: ; 0x616ea
TX_FAR _SSAnne5Text1
db $50
-
SSAnne5Text2: ; 0x616ef
TX_FAR _SSAnne5Text2
db $50
-
SSAnne5Text3: ; 0x616f4
TX_FAR _SSAnne5Text3
db $50
@@ -28486,27 +28483,22 @@ SSAnne6Text1: ; 0x617c5
TX_FAR _SSAnne6Text1
db $50
-
SSAnne6Text2: ; 0x617ca
TX_FAR _SSAnne6Text2
db $50
-
SSAnne6Text3: ; 0x617cf
TX_FAR _SSAnne6Text3
db $50
-
SSAnne6Text4: ; 0x617d4
TX_FAR _SSAnne6Text4
db $50
-
SSAnne6Text5: ; 0x617d9
TX_FAR _SSAnne6Text5
db $50
-
SSAnne6Text6: ; 0x617de
TX_FAR _SSAnne6Text6
db $50