aboutsummaryrefslogtreecommitdiffstats
path: root/engine
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-04-13 20:11:29 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-04-13 20:11:29 -0400
commita1081856200cec52ba881fc6f878f5ce0328ab0a (patch)
treea8670a323b536f9e6cf991d8f7fd7595f67e2c46 /engine
parentMerge branch 'master' of https://github.com/pret/pokered (diff)
parentUse assertions to catch the GetName bug, and use a NAME_BUFFER_LENGTH constant (diff)
downloadpokeyellow-a1081856200cec52ba881fc6f878f5ce0328ab0a.tar.gz
pokeyellow-a1081856200cec52ba881fc6f878f5ce0328ab0a.tar.xz
pokeyellow-a1081856200cec52ba881fc6f878f5ce0328ab0a.zip
Merge remote-tracking branch 'remotes/pokered/master'
Diffstat (limited to 'engine')
-rw-r--r--engine/movie/oak_speech/oak_speech2.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index af31665b..dc6f0bdc 100644
--- a/engine/movie/oak_speech/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -210,7 +210,7 @@ GetDefaultName:
ld h, d
ld l, e
ld de, wcd6d
- ld bc, $14
+ ld bc, NAME_BUFFER_LENGTH
jp CopyData
INCLUDE "data/player_names_list.asm"