add pointers for shifting stuff around

This commit is contained in:
Seth Barberee 2020-10-29 19:42:05 -05:00
parent 8c2d6a42c8
commit de91e24ec8
2 changed files with 52 additions and 12 deletions

View File

@ -1554,9 +1554,13 @@ gUnknown_80EBA18: @ 80EBA18
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff
.global QuirkyQuest1
QuirkyQuest1:
.byte 0x38, 0x21, 0x0f, 0x08
.byte 0x14, 0x21, 0x0f, 0x08
.byte 0xf4, 0x20, 0x0f, 0x08
.byte 0x44, 0x6f, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x73, 0x6f, 0x6d, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x20, 0x72, 0x75, 0x6e, 0x20, 0x6f, 0x75, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x69, 0x6e
.byte 0x67, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x64, 0x6f, 0x0a
.byte 0x61, 0x6c, 0x6c, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x20, 0x73, 0x75, 0x64, 0x64, 0x65, 0x6e, 0x3f, 0x00, 0x00, 0x00
@ -1576,9 +1580,13 @@ gUnknown_80EBA18: @ 80EBA18
.byte 0x54, 0x6f, 0x6f, 0x20, 0x6d, 0x75, 0x63, 0x68, 0x20, 0x74, 0x72, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x2e, 0x00, 0x00, 0x00
.byte 0x4d, 0x61, 0x79, 0x20, 0x72, 0x65, 0x70, 0x6c, 0x79, 0x7e, 0x32, 0x63, 0x20, 0x6d, 0x61, 0x79, 0x20, 0x6e, 0x6f, 0x74, 0x2e, 0x00, 0x00, 0x00, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x20, 0x72, 0x69
.byte 0x67, 0x68, 0x74, 0x20, 0x61, 0x77, 0x61, 0x79, 0x2e, 0x00, 0x00, 0x00
.global QuirkyQuest2
QuirkyQuest2:
.byte 0x10, 0x22, 0x0f, 0x08
.byte 0xa4, 0x21, 0x0f, 0x08
.byte 0x74, 0x21, 0x0f, 0x08
.byte 0x48, 0x6f, 0x77, 0x20, 0x71, 0x75, 0x69, 0x63
.byte 0x6b, 0x6c, 0x79, 0x20, 0x64, 0x6f, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x6e, 0x20, 0x65, 0x2d, 0x6d, 0x61, 0x69, 0x6c, 0x3f, 0x00, 0x00, 0x00, 0x00
@ -1601,6 +1609,9 @@ gUnknown_80EBA18: @ 80EBA18
.byte 0x20, 0x61, 0x20, 0x70, 0x72, 0x61, 0x6e, 0x6b, 0x20, 0x74, 0x6f, 0x20, 0x67, 0x65, 0x74, 0x20, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x00, 0x00, 0x4d, 0x69, 0x67, 0x68
.byte 0x74, 0x20, 0x73, 0x61, 0x79, 0x20, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x2e, 0x2e, 0x2e, 0x00, 0x00, 0x42, 0x72, 0x61, 0x76, 0x65, 0x6c, 0x79, 0x20, 0x64, 0x65, 0x63, 0x6c, 0x61, 0x72, 0x65, 0x20
.byte 0x6d, 0x79, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x00, 0x00, 0x00, 0x00
.global QuirkyQuest3
QuirkyQuest3:
.byte 0x10, 0x23, 0x0f, 0x08
.byte 0x7c, 0x22, 0x0f, 0x08
.byte 0x3c, 0x22, 0x0f, 0x08
@ -1613,6 +1624,7 @@ gUnknown_80EBA18: @ 80EBA18
.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @ +2 Docile
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @ +2 Sassy
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 @ +2 Quirky
.byte 0xe8, 0x23, 0x0f, 0x08
.byte 0x00, 0x00, 0x00, 0x00
.byte 0xd0, 0x23, 0x0f, 0x08
@ -1621,15 +1633,20 @@ gUnknown_80EBA18: @ 80EBA18
.byte 0x02, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff
.asciz "Choose either side."
.align 2,0
.asciz "It~27s a trap! Go left."
.align 2,0
.asciz "Instantly go right."
.align 2,0
.global QuirkyQuest4
QuirkyQuest4:
.byte 0x08, 0x24, 0x0f, 0x08
.byte 0x9c, 0x23, 0x0f, 0x08
.byte 0x6c, 0x23, 0x0f, 0x08
.string "The road forks to the right and left.\n"
.string "You are told there is a treasure on the\n"
.asciz "right side. What do you do?"
@ -1648,6 +1665,9 @@ gUnknown_80EBA18: @ 80EBA18
.align 2,0
.asciz "Go alone."
.align 2,0
.global MiscQuest1
MiscQuest1:
.byte 0xd4, 0x24, 0x0f, 0x08
.byte 0x94, 0x24, 0x0f, 0x08
.byte 0x74, 0x24, 0x0f, 0x08
@ -1665,6 +1685,9 @@ gUnknown_80EBA18: @ 80EBA18
.byte 0xff, 0xff, 0xff, 0xff
.asciz "Don~27t care."
.align 2,0
.global MiscQuest2
MiscQuest2:
.byte 0x50, 0x25, 0x0f, 0x08 @ Pointer to Question Text
.byte 0x1c, 0x25, 0x0f, 0x08 @ Pointer to Answers Pointer Table
.byte 0xfc, 0x24, 0x0f, 0x08 @ Nature Points for Answers
@ -1673,21 +1696,38 @@ gUnknown_80EBA18: @ 80EBA18
.align 2,0
@ Question 3, Category 14 (Miscellaneous)
.global MiscQuest3Points
MiscQuest3Points:
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 @ +1 Naive, +1 Lonely
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @ +1 Sassy, +1 Hasty
.byte 0xc8, 0x25, 0x0f, 0x08 @ Happy pointer
.global MiscQuest3Answers
MiscQuest3Answers:
.4byte MiscQuest3Happy @ Happy pointer
.byte 0x00, 0x00, 0x00, 0x00
.byte 0xbc, 0x25, 0x0f, 0x08 @ Not happy pointer
.4byte MiscQuest3NotHappy @ Not happy pointer
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.byte 0xff, 0xff, 0xff, 0xff
.global MiscQuest3NotHappy
MiscQuest3NotHappy:
.asciz "Not happy."
.align 2,0
.global MiscQuest3Happy
MiscQuest3Happy:
.asciz "Happy!"
.align 2,0
.byte 0xdc, 0x25, 0x0f, 0x08 @ Pointer to Question Text
.byte 0xa4, 0x25, 0x0f, 0x08 @ Pointer to Answers Pointer Table
.byte 0x84, 0x25, 0x0f, 0x08 @ Nature Points for Answers
.global MiscQuest3
MiscQuest3:
.4byte MiscQuest3Text
.4byte MiscQuest3Answers
.4byte MiscQuest3Points
.global MiscQuest3Text
MiscQuest3Text:
.string "Somebody calls you ~93weird but funny.~94\n"
.asciz "How does that make you feel?"
.align 2,0

View File

@ -52,13 +52,13 @@ gPersonalityQuestionPointerTable: @ 80F2624 (pointers to each question text)
.byte 0x04, 0x1F, 0x0F, 0x08
.byte 0xB8, 0x1F, 0x0F, 0x08
.byte 0xA0, 0x20, 0x0F, 0x08
.byte 0x2C, 0x21, 0x0F, 0x08
.byte 0x04, 0x22, 0x0F, 0x08
.byte 0x04, 0x23, 0x0F, 0x08
.byte 0xFC, 0x23, 0x0F, 0x08
.byte 0xC8, 0x24, 0x0F, 0x08
.byte 0x44, 0x25, 0x0F, 0x08
.byte 0xD0, 0x25, 0x0F, 0x08
.4byte QuirkyQuest1
.4byte QuirkyQuest2
.4byte QuirkyQuest3
.4byte QuirkyQuest4
.4byte MiscQuest1
.4byte MiscQuest2
.4byte MiscQuest3
.byte 0xD8, 0x07, 0x0F, 0x08 @ (pointer to Question 2B for Brave)
.global gNatureQuestionTable