diff options
| author | IIMarckus <iimarckus@gmail.com> | 2013-05-12 16:55:25 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2013-05-12 16:55:25 -0600 |
| commit | 5ac569e5f3692123a8df29153fa5b3d81f620159 (patch) | |
| tree | 80d605db9ea72bff8b2bb2a7f0c85cc4c61a4d78 | |
| parent | 35d77a29885ccdbcde4350f59c93b6afe010b5f3 (diff) | |
Add pointers to Oak speech text.
| -rw-r--r-- | main.asm | 37 | ||||
| -rw-r--r-- | text/common_2.asm | 11 | ||||
| -rw-r--r-- | text/common_3.asm | 4 |
3 files changed, 43 insertions, 9 deletions
@@ -4583,7 +4583,42 @@ INCBIN "baserom.gbc", $3e32, $3fb5 - $3e32 SECTION "bank1",DATA,BANK[$1] -INCBIN "baserom.gbc", $4000, $617c - $4000 +INCBIN "baserom.gbc", $4000, $6045 - $4000 + +OakText1: ; 0x6045 + TX_FAR _OakText1 + db "@" + +OakText2: ; 0x604a + TX_FAR _OakText2 + db 8 + ld a,WOOPER + call $37ce + call $3c55 + ld hl,OakText3 + ret + +OakText3: ; 0x605b + TX_FAR _OakText3 + db "@" + +OakText4: ; 0x6060 + TX_FAR _OakText4 + db "@" + +OakText5: ; 0x6065 + TX_FAR _OakText5 + db "@" + +OakText6: ; 0x606a + TX_FAR _OakText6 + db "@" + +OakText7: ; 0x606f + TX_FAR _OakText7 + db "@" + +INCBIN "baserom.gbc", $6074, $617c - $6074 IntroFadePalettes: ; 0x617c db %01010100 diff --git a/text/common_2.asm b/text/common_2.asm index 699bbbba4..362e8dbec 100644 --- a/text/common_2.asm +++ b/text/common_2.asm @@ -1504,7 +1504,7 @@ UnknownText_0x1c1cf3: ; 1c1cf3 db "on SELECT Button.", $57 ; 1c1d35 -UnknownText_0x1c1d35: ; 1c1d35 +_OakText1: ; 1c1d35 db $0, "Hello! Sorry to", $4f db "keep you waiting!", $51 db "Welcome to the", $4f @@ -1514,7 +1514,7 @@ UnknownText_0x1c1d35: ; 1c1d35 db "#MON PROF.", $58 ; 1c1da4 -UnknownText_0x1c1da4: ; 1c1da4 +_OakText2: ; 1c1da4 db $0, "This world is in-", $4f db "habited by crea-", $55 db "tures that we call", $55 @@ -1522,7 +1522,7 @@ UnknownText_0x1c1da4: ; 1c1da4 db "@" ; 1c1de2 -UnknownText_0x1c1de2: ; 1c1de2 +_OakText3: ; 1c1de2 text_waitbutton db "@" ; 1c1de4 @@ -1531,7 +1531,7 @@ UnknownText_0x1c1de4: ; 1c1de4 db "@" ; 1c1de5 -UnknownText_0x1c1de5: ; 1c1de5 +_OakText4: ; 1c1de5 db $0, "People and #MON", $4f db "live together by", $51 db "supporting each", $4f @@ -1541,7 +1541,7 @@ UnknownText_0x1c1de5: ; 1c1de5 db "battle with them.", $58 ; 1c1e51 -UnknownText_0x1c1e51: ; 1c1e51 +_OakText5: ; 1c1e51 db $0, "But we don't know", $4f db "everything about", $55 db "#MON yet.", $51 @@ -1551,4 +1551,3 @@ UnknownText_0x1c1e51: ; 1c1e51 db "That's why I study", $4f db "#MON every day.", $58 ; 1c1ec9 - diff --git a/text/common_3.asm b/text/common_3.asm index c41aaaf6f..38a532e4a 100644 --- a/text/common_3.asm +++ b/text/common_3.asm @@ -1,9 +1,9 @@ -UnknownText_0x1c4000: ; 0x1c4000 +_OakText6: ; 0x1c4000 db $0, "Now, what did you", $4f db "say your name was?", $58 ; 0x1c4026 -UnknownText_0x1c4026: ; 0x1c4026 +_OakText7: ; 0x1c4026 db $0, $52, ", are you", $4f db "ready?", $51 db "Your very own", $4f |