diff options
| author | jidoc01 <jidoc01@naver.com> | 2019-06-27 23:13:29 +0900 |
|---|---|---|
| committer | jidoc01 <jidoc01@naver.com> | 2019-06-27 23:13:29 +0900 |
| commit | 363950dd33fdc8e0ebc47afda79ae9bd414e797c (patch) | |
| tree | fc14948e23ba35a4385c165cea1deb1ad614c93e /src | |
| parent | e9febd5e485ca6efd6d5a2dd7f97a6df0dadd22f (diff) | |
[Bank 6] Fix error in labels.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/bank02.asm | 22 | ||||
| -rw-r--r-- | src/engine/bank06.asm | 23 |
2 files changed, 19 insertions, 26 deletions
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index 9c92b52..c58895c 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -254,20 +254,20 @@ Func_8f05: ; 8f05 (2:4f05) ld a, [wceb1] or a jr nz, .asm_8f10 - ld hl, Unknown_a763 + ld hl, Deck1Data jr .asm_8f23 .asm_8f10 dec a jr nz, .asm_8f18 - ld hl, Unknown_a76c + ld hl, Deck2Data jr .asm_8f23 .asm_8f18 dec a jr nz, .asm_8f20 - ld hl, Unknown_a775 + ld hl, Deck3Data jr .asm_8f23 .asm_8f20 - ld hl, Unknown_a77e + ld hl, Deck4Data .asm_8f23 ld a, $14 ld bc, $0401 @@ -789,19 +789,7 @@ Func_9e41: ; 9e41 (2:5e41) INCROM $9e41, $a288 Func_a288: ; a288 (2:6288) - INCROM $a288, $a763 - -Unknown_a763: ; a763 (2:6763) - INCROM $a763, $a76c - -Unknown_a76c: ; a76c (2:676c) - INCROM $a76c, $a775 - -Unknown_a775: ; a775 (2:6775) - INCROM $a775, $a77e - -Unknown_a77e: ; a77e (2:677e) - INCROM $a77e, $b177 + INCROM $a288, $b177 Func_b177: ; b177 (2:7177) INCROM $b177, $b19d diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index 05dff85..74f8140 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -446,22 +446,26 @@ Func_006_673a: ; (6:673a) pop hl ret -WhatIsYourNameData: ; data +WhatIsYourNameData: ; (6:675e) textitem 1, 1, WhatIsYourNameText db $ff - +; [Deck1Data ~ Deck4Data] +; These are directed from (2:4f05), +; without any bank description. +; That is, the developers hard-coded it. -_-;; +Deck1Data: ; (6:6763) textitem 2, 1, Text022b textitem 14, 1, Text0219 db $ff - +Deck2Data: ; (6:676c) textitem 2, 1, Text022c textitem 14, 1, Text0219 db $ff - +Deck3Data: ; (6:6775) textitem 2, 1, Text022d textitem 14, 1, Text0219 db $ff - +Deck4Data: ; (6:677e) textitem 2, 1, Text022e textitem 14, 1, Text0219 db $ff @@ -1210,7 +1214,7 @@ GetCharacterInfoFromCursorPos: ; a set of keyboard datum. ; unit: 6 bytes. ; structure: -; unk 1 (1) / unk 2 (1) / type 1 (1) / type 2 (1) / character code(2) +; unk 1 (1) / unk 2 (1) / type 1 (1) / type 2 (1) / character (2) ; - some of one byte characters have 0x0e in their high byte. ; - unused data contains its character code as zero. KeyboardData: ; (6:6baf) @@ -1696,10 +1700,11 @@ Func_006_7000: ret ; a bunch of data -Unknown_006_7019: - INCROM $1b019, $1ba12 +Unknown_006_7019: ; (6:7019) + INCROM $1b019, $1b8e8 + INCROM $1b8e8, $1ba12 -Func_006_7a12: ; 1ba12 +Func_006_7a12: ; (6:7a12) push af ld [bc], a call EnableSRAM |