From 459d5d31640334b88cc2d82bb1b2f794d13fcbfd Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 00:45:03 -0500 Subject: =?UTF-8?q?default=5Fnames.asm=20=E2=86=92=20player=5Fnames.asm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/default_names.asm | 39 --------------------------------------- data/player_names.asm | 39 +++++++++++++++++++++++++++++++++++++++ engine/player_gfx.asm | 2 +- 3 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 data/default_names.asm create mode 100644 data/player_names.asm diff --git a/data/default_names.asm b/data/default_names.asm deleted file mode 100644 index 87c341652..000000000 --- a/data/default_names.asm +++ /dev/null @@ -1,39 +0,0 @@ -ChrisNameMenuHeader: ; 882b5 - db $40 ; flags - db 00, 00 ; start coords - db 11, 10 ; end coords - dw .MaleNames - db 1 ; ???? - db 0 ; default option - -.MaleNames: ; 882be - db $91 ; flags - db 5 ; items - db "NEW NAME@" -MalePlayerNameArray: ; 882c9 - db "CHRIS@" - db "MAT@" - db "ALLAN@" - db "JON@" - db 2 ; displacement - db " NAME @" ; title - -KrisNameMenuHeader: ; 882e5 - db $40 ; flags - db 00, 00 ; start coords - db 11, 10 ; end coords - dw .FemaleNames - db 1 ; ???? - db 0 ; default option - -.FemaleNames: ; 882ee - db $91 ; flags - db 5 ; items - db "NEW NAME@" -FemalePlayerNameArray: ; 882f9 - db "KRIS@" - db "AMANDA@" - db "JUANA@" - db "JODI@" - db 2 ; displacement - db " NAME @" ; title diff --git a/data/player_names.asm b/data/player_names.asm new file mode 100644 index 000000000..87c341652 --- /dev/null +++ b/data/player_names.asm @@ -0,0 +1,39 @@ +ChrisNameMenuHeader: ; 882b5 + db $40 ; flags + db 00, 00 ; start coords + db 11, 10 ; end coords + dw .MaleNames + db 1 ; ???? + db 0 ; default option + +.MaleNames: ; 882be + db $91 ; flags + db 5 ; items + db "NEW NAME@" +MalePlayerNameArray: ; 882c9 + db "CHRIS@" + db "MAT@" + db "ALLAN@" + db "JON@" + db 2 ; displacement + db " NAME @" ; title + +KrisNameMenuHeader: ; 882e5 + db $40 ; flags + db 00, 00 ; start coords + db 11, 10 ; end coords + dw .FemaleNames + db 1 ; ???? + db 0 ; default option + +.FemaleNames: ; 882ee + db $91 ; flags + db 5 ; items + db "NEW NAME@" +FemalePlayerNameArray: ; 882f9 + db "KRIS@" + db "AMANDA@" + db "JUANA@" + db "JODI@" + db 2 ; displacement + db " NAME @" ; title diff --git a/engine/player_gfx.asm b/engine/player_gfx.asm index 98a54684b..6170b29cc 100644 --- a/engine/player_gfx.asm +++ b/engine/player_gfx.asm @@ -71,7 +71,7 @@ ShowPlayerNamingChoices: ; 88297 call CloseWindow ret -INCLUDE "data/default_names.asm" +INCLUDE "data/player_names.asm" GetPlayerNameArray: ; 88318 This Function is never called ld hl, PlayerName -- cgit v1.2.3