summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/code_8012A18.s2
-rw-r--r--data/data_80B9BB8.s87
-rw-r--r--data/personality_test.inc99
3 files changed, 101 insertions, 87 deletions
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s
index 6618ecf..b716482 100644
--- a/asm/code_8012A18.s
+++ b/asm/code_8012A18.s
@@ -84832,7 +84832,7 @@ sub_803CC40:
.align 2, 0
_0803CC70: .4byte gUnknown_202DF98
_0803CC74: .4byte gUnknown_203B400
-_0803CC78: .4byte gUnknown_80F28F4
+_0803CC78: .4byte gPersonalityTypeDescriptionTable
_0803CC7C: .4byte 0x00000101
thumb_func_end sub_803CC40
diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s
index d78c7eb..2de7b3e 100644
--- a/data/data_80B9BB8.s
+++ b/data/data_80B9BB8.s
@@ -3728,92 +3728,7 @@ gUnknown_80EB3F8: @ 80EB3F8
gUnknown_80EB72C: @ 80EB72C
.incbin "baserom.gba", 0xEB72C, 0x2EC
- .global gUnknown_80EBA18
-gUnknown_80EBA18: @ 80EBA18
- .incbin "baserom.gba", 0xEBA18, 0x6C0C
-
- .global gPersonalityQuestionPointerTable
-gPersonalityQuestionPointerTable: @ 80F2624
- .incbin "baserom.gba", 0xF2624, 0xE0
-
- .global gUnknown_80F2704
-gUnknown_80F2704: @ 80F2704
- .incbin "baserom.gba", 0xF2704, 0x38
-
- .global gUnknown_80F273C
-gUnknown_80F273C: @ 80F273C
- .incbin "baserom.gba", 0xF273C, 0x20
-
- .global gUnknown_80F275C
-gUnknown_80F275C: @ 80F275C
- .incbin "baserom.gba", 0xF275C, 0x32
-
- .global gStarters
-gStarters: @ 80F278E
- .byte 0x04, 0x00 @ Charmander (Hardy M)
- .byte 0x19, 0x00 @ Pikachu (Hardy F)
- .byte 0x01, 0x00 @ Bulbasaur (Docile M)
- .byte 0x98, 0x00 @ Chikorita (Docile F)
- .byte 0x42, 0x00 @ Machop (Brave M)
- .byte 0x04, 0x00 @ Charmander (Brave F)
- .byte 0x07, 0x00 @ Squirtle (Jolly M)
- .byte 0x9E, 0x00 @ Totodile (Jolly F)
- .byte 0x19, 0x00 @ Pikachu (Impish M)
- .byte 0x68, 0x00 @ Cubone (Impish F)
- .byte 0x9E, 0x00 @ Totodile (Naive M)
- .byte 0x85, 0x00 @ Eevee (Naive F)
- .byte 0x9B, 0x00 @ Cyndaquil (Timid M)
- .byte 0x1B, 0x01 @ Mudkip (Timid F)
- .byte 0x18, 0x01 @ Torchic (Hasty M)
- .byte 0x45, 0x01 @ Skitty (Hasty F)
- .byte 0x15, 0x01 @ Treecko (Sassy M)
- .byte 0x18, 0x01 @ Torchic (Sassy F)
- .byte 0x1B, 0x01 @ Mudkip (Calm M)
- .byte 0x01, 0x00 @ Bulbasaur (Calm F)
- .byte 0x36, 0x00 @ Psyduck (Relaxed M)
- .byte 0x07, 0x00 @ Squirtle (Relaxed F)
- .byte 0x68, 0x00 @ Cubone (Lonely M)
- .byte 0x36, 0x00 @ Psyduck (Lonely F)
- .byte 0x34, 0x00 @ Meowth (Quirky M)
- .byte 0x15, 0x01 @ Treecko (Quirky F)
- .byte 0x00, 0x00 @ End of table
-
- .global gUnknown_80F27C4
-gUnknown_80F27C4: @ 80F27C4
- .incbin "baserom.gba", 0xF27C4, 0x18
-
- .global gUnknown_80F27DC
-gUnknown_80F27DC: @ 80F27DC
- .incbin "baserom.gba", 0xF27DC, 0x90
-
- .global gUnknown_80F286C
-gUnknown_80F286C: @ 80F286C
- .incbin "baserom.gba", 0xF286C, 0x2C
-
- .global gUnknown_80F2898
-gUnknown_80F2898: @ 80F2898
- .incbin "baserom.gba", 0xF2898, 0x5C
-
- .global gUnknown_80F28F4
-gUnknown_80F28F4: @ 80F28F4
- .incbin "baserom.gba", 0xF28F4, 0x1950
-
- .global gUnknown_80F4244
-gUnknown_80F4244: @ 80F4244
- .incbin "baserom.gba", 0xF4244, 0x20
-
- .global gPartners
-gPartners: @ 80F4264
- .byte 0x04, 0x00 @ Charmander
- .byte 0x01, 0x00 @ Bulbasaur
- .byte 0x07, 0x00 @ Squirtle
- .byte 0x19, 0x00 @ Pikachu
- .byte 0x98, 0x00 @ Chikorita
- .byte 0x9E, 0x00 @ Totodile
- .byte 0x9B, 0x00 @ Cyndaquil
- .byte 0x18, 0x01 @ Torchic
- .byte 0x15, 0x01 @ Treecko
- .byte 0x1B, 0x01 @ Mudkip
+ .include "data/personality_test.inc"
.global gUnknown_80F4278
gUnknown_80F4278: @ 80F4278
diff --git a/data/personality_test.inc b/data/personality_test.inc
new file mode 100644
index 0000000..a06e51a
--- /dev/null
+++ b/data/personality_test.inc
@@ -0,0 +1,99 @@
+ .global gUnknown_80EBA18
+gUnknown_80EBA18: @ 80EBA18
+ .incbin "baserom.gba", 0xEBA18, 0x6C0C
+
+ .global gPersonalityQuestionPointerTable
+gPersonalityQuestionPointerTable: @ 80F2624
+ .incbin "baserom.gba", 0xF2624, 0xE0
+
+ .global gUnknown_80F2704
+gUnknown_80F2704: @ 80F2704
+ .incbin "baserom.gba", 0xF2704, 0x38
+
+ .global gUnknown_80F273C
+gUnknown_80F273C: @ 80F273C
+ .string "Are you a boy or a girl?"
+ .byte 0
+ .byte 0
+ .byte 0
+ .byte 0
+ .byte 0x3C, 0x27, 0x0F, 0x08
+
+ .global gUnknown_80F275C
+gUnknown_80F275C: @ 80F275C
+ .incbin "baserom.gba", 0xF275C, 0x32
+
+ .global gStarters
+gStarters: @ 80F278E
+ .byte 0x04, 0x00 @ Charmander (Hardy M)
+ .byte 0x19, 0x00 @ Pikachu (Hardy F)
+ .byte 0x01, 0x00 @ Bulbasaur (Docile M)
+ .byte 0x98, 0x00 @ Chikorita (Docile F)
+ .byte 0x42, 0x00 @ Machop (Brave M)
+ .byte 0x04, 0x00 @ Charmander (Brave F)
+ .byte 0x07, 0x00 @ Squirtle (Jolly M)
+ .byte 0x9E, 0x00 @ Totodile (Jolly F)
+ .byte 0x19, 0x00 @ Pikachu (Impish M)
+ .byte 0x68, 0x00 @ Cubone (Impish F)
+ .byte 0x9E, 0x00 @ Totodile (Naive M)
+ .byte 0x85, 0x00 @ Eevee (Naive F)
+ .byte 0x9B, 0x00 @ Cyndaquil (Timid M)
+ .byte 0x1B, 0x01 @ Mudkip (Timid F)
+ .byte 0x18, 0x01 @ Torchic (Hasty M)
+ .byte 0x45, 0x01 @ Skitty (Hasty F)
+ .byte 0x15, 0x01 @ Treecko (Sassy M)
+ .byte 0x18, 0x01 @ Torchic (Sassy F)
+ .byte 0x1B, 0x01 @ Mudkip (Calm M)
+ .byte 0x01, 0x00 @ Bulbasaur (Calm F)
+ .byte 0x36, 0x00 @ Psyduck (Relaxed M)
+ .byte 0x07, 0x00 @ Squirtle (Relaxed F)
+ .byte 0x68, 0x00 @ Cubone (Lonely M)
+ .byte 0x36, 0x00 @ Psyduck (Lonely F)
+ .byte 0x34, 0x00 @ Meowth (Quirky M)
+ .byte 0x15, 0x01 @ Treecko (Quirky F)
+ .byte 0x00, 0x00 @ End of table
+
+ .global gUnknown_80F27C4
+gUnknown_80F27C4: @ 80F27C4
+ .string "\n"
+ .string "#+The Pokémon $m0!"
+ .byte 0
+ .byte 0xC4, 0x27, 0x0F, 0x08
+
+ .global gUnknown_80F27DC
+gUnknown_80F27DC: @ 80F27DC
+ .string "#+This is the final step.#W\n"
+ .string "#+Who would you like to have as a partner?#P"
+ .string "#+Choose the Pokémon you want\n"
+ .string "#+as your partner from this group."
+ .byte 0, 0, 0, 0
+ .byte 0xDC, 0x27, 0x0F, 0x08
+
+ .global gUnknown_80F286C
+gUnknown_80F286C: @ 80F286C
+ .incbin "baserom.gba", 0xF286C, 0x2C
+
+ .global gUnknown_80F2898
+gUnknown_80F2898: @ 80F2898
+ .incbin "baserom.gba", 0xF2898, 0x5C
+
+ .global gPersonalityTypeDescriptionTable
+gPersonalityTypeDescriptionTable: @ 80F28F4
+ .incbin "baserom.gba", 0xF28F4, 0x1950
+
+ .global gUnknown_80F4244
+gUnknown_80F4244: @ 80F4244
+ .incbin "baserom.gba", 0xF4244, 0x20
+
+ .global gPartners
+gPartners: @ 80F4264
+ .byte 0x04, 0x00 @ Charmander
+ .byte 0x01, 0x00 @ Bulbasaur
+ .byte 0x07, 0x00 @ Squirtle
+ .byte 0x19, 0x00 @ Pikachu
+ .byte 0x98, 0x00 @ Chikorita
+ .byte 0x9E, 0x00 @ Totodile
+ .byte 0x9B, 0x00 @ Cyndaquil
+ .byte 0x18, 0x01 @ Torchic
+ .byte 0x15, 0x01 @ Treecko
+ .byte 0x1B, 0x01 @ Mudkip
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 12:37:49 +0000