summaryrefslogtreecommitdiff
path: root/engine/scripting.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-20 03:51:52 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-20 03:51:52 -0400
commitbef792f2d21ccac0127aeffd9e0838aba81f44b6 (patch)
tree22185c93e9f9dcc3937a5e96279dd71f3b24c0d8 /engine/scripting.asm
parent94129b6b451fc7770ea75ffbdcbaab4967f513bd (diff)
More label updates, moved predefs to new file
Also named most of the engine and event flag constants.
Diffstat (limited to 'engine/scripting.asm')
-rw-r--r--engine/scripting.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm
index c3749f56a..9cec631ab 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -2124,7 +2124,7 @@ ConvertMemToText: ; 0x976c0
CopyConvertedText: ; 976c8
ld hl, StringBuffer3
- ld bc, 19
+ ld bc, StringBuffer4 - StringBuffer3
call AddNTimes
call CopyName2
ret
@@ -2200,7 +2200,7 @@ Script_name: ; 0x97716
call GetScriptByte
ld [wcf61], a
-Unknown_9771c: ; 0x9771c
+ContinueToGetName: ; 0x9771c
call GetScriptByte
ld [CurSpecies], a
call GetName
@@ -2216,7 +2216,7 @@ Script_trainerclassname: ; 0x9772b
ld a, TRAINER_NAME
ld [wcf61], a
- jr Unknown_9771c ; 0x97730 $ea
+ jr ContinueToGetName ; 0x97730 $ea
; 0x97732
Script_readmoney: ; 0x97732