summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/code_8012A18.s2
-rw-r--r--data/personality_test.inc134
2 files changed, 121 insertions, 15 deletions
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s
index 69207a0..4e979df 100644
--- a/asm/code_8012A18.s
+++ b/asm/code_8012A18.s
@@ -84357,7 +84357,7 @@ _0803C8F8:
pop {r0}
bx r0
.align 2, 0
-_0803C900: .4byte gUnknown_80F2704
+_0803C900: .4byte gNatureQuestionTable
_0803C904: .4byte gUnknown_203B400
thumb_func_end sub_803C870
diff --git a/data/personality_test.inc b/data/personality_test.inc
index a9f7feb..9077082 100644
--- a/data/personality_test.inc
+++ b/data/personality_test.inc
@@ -3,22 +3,113 @@ gUnknown_80EBA18: @ 80EBA18
.incbin "baserom.gba", 0xEBA18, 0x6C0C
.global gPersonalityQuestionPointerTable
-gPersonalityQuestionPointerTable: @ 80F2624
- .incbin "baserom.gba", 0xF2624, 0xE0
+gPersonalityQuestionPointerTable: @ 80F2624 (pointers to each question text)
+ .byte 0xD8, 0x00, 0x0F, 0x08
+ .byte 0x5C, 0x01, 0x0F, 0x08
+ .byte 0xCC, 0x01, 0x0F, 0x08
+ .byte 0x74, 0x02, 0x0F, 0x08
+ .byte 0x18, 0x03, 0x0F, 0x08
+ .byte 0xCC, 0x03, 0x0F, 0x08
+ .byte 0xB0, 0x04, 0x0F, 0x08
+ .byte 0xA0, 0x05, 0x0F, 0x08
+ .byte 0x10, 0x06, 0x0F, 0x08
+ .byte 0x44, 0x07, 0x0F, 0x08
+ .byte 0x1C, 0x09, 0x0F, 0x08
+ .byte 0x2C, 0x0A, 0x0F, 0x08
+ .byte 0xBC, 0x0A, 0x0F, 0x08
+ .byte 0x20, 0x0B, 0x0F, 0x08
+ .byte 0xD0, 0x0B, 0x0F, 0x08
+ .byte 0xBC, 0x0C, 0x0F, 0x08
+ .byte 0x94, 0x0D, 0x0F, 0x08
+ .byte 0xFC, 0x0D, 0x0F, 0x08
+ .byte 0x54, 0x0E, 0x0F, 0x08
+ .byte 0x3C, 0x0F, 0x0F, 0x08
+ .byte 0xE0, 0x0F, 0x0F, 0x08
+ .byte 0x48, 0x10, 0x0F, 0x08
+ .byte 0xA8, 0x10, 0x0F, 0x08
+ .byte 0x10, 0x11, 0x0F, 0x08
+ .byte 0xE8, 0x11, 0x0F, 0x08
+ .byte 0xF8, 0x12, 0x0F, 0x08
+ .byte 0xCC, 0x13, 0x0F, 0x08
+ .byte 0xA4, 0x14, 0x0F, 0x08
+ .byte 0x5C, 0x15, 0x0F, 0x08
+ .byte 0x48, 0x16, 0x0F, 0x08
+ .byte 0x24, 0x17, 0x0F, 0x08
+ .byte 0xEC, 0x17, 0x0F, 0x08
+ .byte 0xCC, 0x18, 0x0F, 0x08
+ .byte 0x5C, 0x19, 0x0F, 0x08
+ .byte 0xCC, 0x19, 0x0F, 0x08
+ .byte 0x38, 0x1A, 0x0F, 0x08
+ .byte 0xB4, 0x1A, 0x0F, 0x08
+ .byte 0x38, 0x1B, 0x0F, 0x08
+ .byte 0xBC, 0x1B, 0x0F, 0x08
+ .byte 0x18, 0x1C, 0x0F, 0x08
+ .byte 0x70, 0x1C, 0x0F, 0x08
+ .byte 0xE0, 0x1C, 0x0F, 0x08
+ .byte 0xB0, 0x1D, 0x0F, 0x08
+ .byte 0x28, 0x1E, 0x0F, 0x08
+ .byte 0x94, 0x1E, 0x0F, 0x08
+ .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
+ .byte 0xD8, 0x07, 0x0F, 0x08 @ (pointer to Question 2B for Brave)
- .global gUnknown_80F2704
-gUnknown_80F2704: @ 80F2704
- .incbin "baserom.gba", 0xF2704, 0x38
+ .global gNatureQuestionTable
+gNatureQuestionTable: @ 80F2704 (Categories??)
+ .byte 0x00, 0x00, 0x00, 0x00 @ (Hardy)
+ .byte 0x01, 0x01, 0x01, 0x01 @ (Docile)
+ .byte 0x02, 0x02, 0x02, 0x02 @ (Brave)
+ .byte 0x03, 0x03, 0x03, 0x03 @ (Jolly)
+ .byte 0x04, 0x04, 0x04, 0x04 @ (Impish)
+ .byte 0x05, 0x05, 0x05, 0x05 @ (Naive)
+ .byte 0x06, 0x06, 0x06, 0x06 @ (Timid)
+ .byte 0x07, 0x07, 0x07, 0x07 @ (Hasty)
+ .byte 0x08, 0x08, 0x08, 0x08 @ (Sassy)
+ .byte 0x09, 0x09, 0x09, 0x09 @ (Calm)
+ .byte 0x0A, 0x0A, 0x0A, 0x0A @ (Relaxed)
+ .byte 0x0B, 0x0B, 0x0B, 0x0B @ (Lonely)
+ .byte 0x0C, 0x0C, 0x0C, 0x0C @ (Quirky)
+ .byte 0x0D, 0x0D, 0x0D @ (Miscellaneous)
+ .byte 0x02 @ (Question 2b for Brave Category)
.global gUnknown_80F273C
gUnknown_80F273C: @ 80F273C
.asciz "Are you a boy or a girl?"
.align 2,0
- .byte 0x3C, 0x27, 0x0F, 0x08 @ Script to display small box?
+ .byte 0x3C, 0x27, 0x0F, 0x08 @ pointer to above text
.global gUnknown_80F275C
gUnknown_80F275C: @ 80F275C
- .incbin "baserom.gba", 0xF275C, 0x32
+ .byte 0x7C, 0x27, 0x0F, 0x08 @ Pointer to boy text
+ .byte 0x00, 0x00, 0x00, 0x00
+ .byte 0x74, 0x27, 0x0F, 0x08 @ Pointer to girl text
+ .byte 0x01, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00 @ end of table
+ .byte 0xFF, 0xFF, 0xFF, 0xFF
+ .asciz "Girl."
+ .align 2,0
+ .string "Boy."
+ .byte 0x00
+ .byte 0x01
+ .byte 0x02
+ .byte 0x03
+ .byte 0x04
+ .byte 0x05
+ .byte 0x06
+ .byte 0x07
+ .byte 0x08
+ .byte 0x09
+ .byte 0x0A
+ .byte 0x0B
+ .byte 0x0C
+ .byte 0x0D
.global gStarters
gStarters: @ 80F278E
@@ -55,7 +146,7 @@ gUnknown_80F27C4: @ 80F27C4
.string "\n"
.string "#+The Pokémon $m0!"
.byte 0
- .byte 0xC4, 0x27, 0x0F, 0x08 @ Script command to display pokepic of buffer
+ .byte 0xC4, 0x27, 0x0F, 0x08 @ pointer to above text
.global gUnknown_80F27DC
gUnknown_80F27DC: @ 80F27DC
@@ -64,23 +155,38 @@ gUnknown_80F27DC: @ 80F27DC
.string "#+Choose the Pokémon you want\n"
.asciz "#+as your partner from this group."
.align 2,0
- .byte 0xDC, 0x27, 0x0F, 0x08 @ Script command to display pokepic of hovered?
+ .byte 0xDC, 0x27, 0x0F, 0x08 @ pointer to above text
.global gUnknown_80F286C
gUnknown_80F286C: @ 80F286C
- .incbin "baserom.gba", 0xF286C, 0x2C
+ .asciz "#+What is your partner~27s nickname?"
+ .align 2,0
+ .byte 0x6C, 0x28, 0x0F, 0x08 @ pointer to above text
.global gUnknown_80F2898
gUnknown_80F2898: @ 80F2898
- .incbin "baserom.gba", 0xF2898, 0x5C
+ .string "#+OK! We~27re all set!#P"
+ .string "#+Let~27s get you into the\n"
+ .string "#+world of Pokémon!#P"
+ .asciz "#+Go for it!"
+ .align 2,0
+ .byte 0x98, 0x28, 0x0F, 0x08 @ (pointer to start of text)
.global gPersonalityTypeDescriptionTable
gPersonalityTypeDescriptionTable: @ 80F28F4
- .incbin "baserom.gba", 0xF28F4, 0x1950
+ .incbin "baserom.gba", 0xF28F4, 0x1950
.global gUnknown_80F4244
-gUnknown_80F4244: @ 80F4244
- .incbin "baserom.gba", 0xF4244, 0x20
+gUnknown_80F4244: @ 80F4244 (maybe dialog to ok starter selection??)
+ .byte 0x00, 0x00, 0x00, 0x00
+
+ .byte 0x05, 0x00, 0x00, 0x00
+ .byte 0x0C, 0x00, 0x06, 0x00
+ .byte 0x05, 0x00, 0x05, 0x00
+ .byte 0x05, 0x00, 0x00, 0x00
+
+ .byte 0x00, 0x00, 0x00, 0x00
+ .asciz "pksdir0"
.global gPartners
gPartners: @ 80F4264
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 11:02:49 +0000