summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
authorRevo <projectrevotpp@hotmail.com>2020-08-20 01:39:17 -0400
committerGitHub <noreply@github.com>2020-08-20 01:39:17 -0400
commit4ed13afd18de6f0b94d35e83023094efcfec73f5 (patch)
tree1347c2688a313c4a70f3a205ab1cc79c496ed2fa /arm9/modules
parent512d22cff9098f9c3636ca018355a851d011effc (diff)
parent3d2b7e5e5e3c43a8c5dc8c8ce255b0c53413048d (diff)
Merge pull request #265 from PikalaxALT/pikalax_work
save.c, pokemon_storage_system.c
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/module_05.s630
-rw-r--r--arm9/modules/06/asm/module_06.s44
-rw-r--r--arm9/modules/14/asm/module_14.s2
-rw-r--r--arm9/modules/18/asm/module_18.s96
4 files changed, 569 insertions, 203 deletions
diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s
index 7f97e561..f48dc799 100644
--- a/arm9/modules/05/asm/module_05.s
+++ b/arm9/modules/05/asm/module_05.s
@@ -34927,11 +34927,11 @@ _021F61E4: .word UNK05_021FCA00
thumb_func_start MOD05_021F61E8
MOD05_021F61E8: ; 0x021F61E8
lsl r1, r0, #2
- ldr r0, _021F61F0 ; =UNK05_021FCA02
+ ldr r0, _021F61F0 ; =UNK05_021FCA00 + 2
ldrh r0, [r0, r1]
bx lr
.align 2, 0
-_021F61F0: .word UNK05_021FCA02
+_021F61F0: .word UNK05_021FCA00 + 2
thumb_func_start MOD05_021F61F4
MOD05_021F61F4: ; 0x021F61F4
@@ -36074,7 +36074,7 @@ UNK05_021F8F48: ; 0x021F8F48
.byte 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x30, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00
.byte 0x44, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00,
+ .byte 0x02, 0x00, 0x00, 0x00
.global UNK05_021F8F90
UNK05_021F8F90: ; 0x021F8F90
@@ -37787,7 +37787,7 @@ UNK05_021FC820: ; 0x021FC820
.global UNK05_021FC9AC
UNK05_021FC9AC: ; 0x021FC9AC
- .byte 0x2D, 0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00
+ .word 45, 30, 15
.global UNK05_021FC9B8
UNK05_021FC9B8: ; 0x021FC9B8
@@ -37799,134 +37799,500 @@ UNK05_021FC9B8: ; 0x021FC9B8
.global UNK05_021FCA00
UNK05_021FCA00: ; 0x021FCA00
- .byte 0x00, 0x00
-
- .global UNK05_021FCA02
-UNK05_021FCA02: ; 0x021FCA02
- .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00
- .byte 0x05, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00
- .byte 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00
- .byte 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0x05, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x03, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00
- .byte 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x05, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x05, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
- .byte 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00
- .byte 0x05, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00
- .byte 0x05, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00
- .byte 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x03, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00
- .byte 0x05, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00
- .byte 0x05, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00
- .byte 0x03, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x03, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00
- .byte 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x05, 0x00, 0x00, 0x00
- .byte 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x04, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00, 0x05, 0x00, 0x01, 0x00
- .byte 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00
- .byte 0x03, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
+ .short 0x0000, 0x0000 ; SPECIES_NONE
+ .short 0x0001, 0x0001 ; SPECIES_BULBASAUR
+ .short 0x0001, 0x0001 ; SPECIES_IVYSAUR
+ .short 0x0002, 0x0001 ; SPECIES_VENUSAUR
+ .short 0x0001, 0x0001 ; SPECIES_CHARMANDER
+ .short 0x0002, 0x0001 ; SPECIES_CHARMELEON
+ .short 0x0002, 0x0001 ; SPECIES_CHARIZARD
+ .short 0x0001, 0x0001 ; SPECIES_SQUIRTLE
+ .short 0x0001, 0x0001 ; SPECIES_WARTORTLE
+ .short 0x0002, 0x0001 ; SPECIES_BLASTOISE
+ .short 0x0001, 0x0001 ; SPECIES_CATERPIE
+ .short 0x0005, 0x0000 ; SPECIES_METAPOD
+ .short 0x0001, 0x0001 ; SPECIES_BUTTERFREE
+ .short 0x0001, 0x0001 ; SPECIES_WEEDLE
+ .short 0x0005, 0x0000 ; SPECIES_KAKUNA
+ .short 0x0002, 0x0001 ; SPECIES_BEEDRILL
+ .short 0x0001, 0x0001 ; SPECIES_PIDGEY
+ .short 0x0001, 0x0001 ; SPECIES_PIDGEOTTO
+ .short 0x0002, 0x0001 ; SPECIES_PIDGEOT
+ .short 0x0001, 0x0001 ; SPECIES_RATTATA
+ .short 0x0002, 0x0001 ; SPECIES_RATICATE
+ .short 0x0002, 0x0001 ; SPECIES_SPEAROW
+ .short 0x0002, 0x0001 ; SPECIES_FEAROW
+ .short 0x0003, 0x0000 ; SPECIES_EKANS
+ .short 0x0003, 0x0000 ; SPECIES_ARBOK
+ .short 0x0001, 0x0001 ; SPECIES_PIKACHU
+ .short 0x0001, 0x0001 ; SPECIES_RAICHU
+ .short 0x0001, 0x0001 ; SPECIES_SANDSHREW
+ .short 0x0001, 0x0001 ; SPECIES_SANDSLASH
+ .short 0x0001, 0x0001 ; SPECIES_NIDORAN_F
+ .short 0x0001, 0x0001 ; SPECIES_NIDORINA
+ .short 0x0002, 0x0001 ; SPECIES_NIDOQUEEN
+ .short 0x0001, 0x0001 ; SPECIES_NIDORAN_M
+ .short 0x0002, 0x0001 ; SPECIES_NIDORINO
+ .short 0x0002, 0x0001 ; SPECIES_NIDOKING
+ .short 0x0001, 0x0001 ; SPECIES_CLEFAIRY
+ .short 0x0001, 0x0001 ; SPECIES_CLEFABLE
+ .short 0x0001, 0x0001 ; SPECIES_VULPIX
+ .short 0x0002, 0x0001 ; SPECIES_NINETALES
+ .short 0x0001, 0x0001 ; SPECIES_JIGGLYPUFF
+ .short 0x0001, 0x0001 ; SPECIES_WIGGLYTUFF
+ .short 0x0003, 0x0000 ; SPECIES_ZUBAT
+ .short 0x0003, 0x0001 ; SPECIES_GOLBAT
+ .short 0x0001, 0x0001 ; SPECIES_ODDISH
+ .short 0x0001, 0x0001 ; SPECIES_GLOOM
+ .short 0x0001, 0x0001 ; SPECIES_VILEPLUME
+ .short 0x0005, 0x0001 ; SPECIES_PARAS
+ .short 0x0005, 0x0001 ; SPECIES_PARASECT
+ .short 0x0001, 0x0001 ; SPECIES_VENONAT
+ .short 0x0005, 0x0001 ; SPECIES_VENOMOTH
+ .short 0x0001, 0x0000 ; SPECIES_DIGLETT
+ .short 0x0001, 0x0000 ; SPECIES_DUGTRIO
+ .short 0x0001, 0x0001 ; SPECIES_MEOWTH
+ .short 0x0002, 0x0001 ; SPECIES_PERSIAN
+ .short 0x0004, 0x0001 ; SPECIES_PSYDUCK
+ .short 0x0002, 0x0001 ; SPECIES_GOLDUCK
+ .short 0x0002, 0x0001 ; SPECIES_MANKEY
+ .short 0x0002, 0x0001 ; SPECIES_PRIMEAPE
+ .short 0x0001, 0x0001 ; SPECIES_GROWLITHE
+ .short 0x0002, 0x0001 ; SPECIES_ARCANINE
+ .short 0x0001, 0x0001 ; SPECIES_POLIWAG
+ .short 0x0001, 0x0001 ; SPECIES_POLIWHIRL
+ .short 0x0002, 0x0001 ; SPECIES_POLIWRATH
+ .short 0x0001, 0x0001 ; SPECIES_ABRA
+ .short 0x0002, 0x0001 ; SPECIES_KADABRA
+ .short 0x0002, 0x0001 ; SPECIES_ALAKAZAM
+ .short 0x0001, 0x0001 ; SPECIES_MACHOP
+ .short 0x0002, 0x0001 ; SPECIES_MACHOKE
+ .short 0x0002, 0x0001 ; SPECIES_MACHAMP
+ .short 0x0001, 0x0001 ; SPECIES_BELLSPROUT
+ .short 0x0004, 0x0000 ; SPECIES_WEEPINBELL
+ .short 0x0004, 0x0000 ; SPECIES_VICTREEBEL
+ .short 0x0002, 0x0000 ; SPECIES_TENTACOOL
+ .short 0x0002, 0x0000 ; SPECIES_TENTACRUEL
+ .short 0x0001, 0x0000 ; SPECIES_GEODUDE
+ .short 0x0002, 0x0001 ; SPECIES_GRAVELER
+ .short 0x0002, 0x0001 ; SPECIES_GOLEM
+ .short 0x0001, 0x0001 ; SPECIES_PONYTA
+ .short 0x0002, 0x0001 ; SPECIES_RAPIDASH
+ .short 0x0004, 0x0001 ; SPECIES_SLOWPOKE
+ .short 0x0004, 0x0001 ; SPECIES_SLOWBRO
+ .short 0x0005, 0x0001 ; SPECIES_MAGNEMITE
+ .short 0x0005, 0x0001 ; SPECIES_MAGNETON
+ .short 0x0002, 0x0001 ; SPECIES_FARFETCHD
+ .short 0x0001, 0x0001 ; SPECIES_DODUO
+ .short 0x0002, 0x0001 ; SPECIES_DODRIO
+ .short 0x0004, 0x0000 ; SPECIES_SEEL
+ .short 0x0004, 0x0000 ; SPECIES_DEWGONG
+ .short 0x0003, 0x0000 ; SPECIES_GRIMER
+ .short 0x0003, 0x0000 ; SPECIES_MUK
+ .short 0x0004, 0x0000 ; SPECIES_SHELLDER
+ .short 0x0002, 0x0000 ; SPECIES_CLOYSTER
+ .short 0x0003, 0x0000 ; SPECIES_GASTLY
+ .short 0x0003, 0x0000 ; SPECIES_HAUNTER
+ .short 0x0003, 0x0001 ; SPECIES_GENGAR
+ .short 0x0002, 0x0000 ; SPECIES_ONIX
+ .short 0x0003, 0x0001 ; SPECIES_DROWZEE
+ .short 0x0003, 0x0001 ; SPECIES_HYPNO
+ .short 0x0001, 0x0001 ; SPECIES_KRABBY
+ .short 0x0002, 0x0001 ; SPECIES_KINGLER
+ .short 0x0002, 0x0000 ; SPECIES_VOLTORB
+ .short 0x0002, 0x0000 ; SPECIES_ELECTRODE
+ .short 0x0001, 0x0000 ; SPECIES_EXEGGCUTE
+ .short 0x0004, 0x0001 ; SPECIES_EXEGGUTOR
+ .short 0x0001, 0x0001 ; SPECIES_CUBONE
+ .short 0x0002, 0x0001 ; SPECIES_MAROWAK
+ .short 0x0002, 0x0001 ; SPECIES_HITMONLEE
+ .short 0x0002, 0x0001 ; SPECIES_HITMONCHAN
+ .short 0x0004, 0x0001 ; SPECIES_LICKITUNG
+ .short 0x0003, 0x0000 ; SPECIES_KOFFING
+ .short 0x0003, 0x0000 ; SPECIES_WEEZING
+ .short 0x0002, 0x0001 ; SPECIES_RHYHORN
+ .short 0x0002, 0x0001 ; SPECIES_RHYDON
+ .short 0x0001, 0x0001 ; SPECIES_CHANSEY
+ .short 0x0001, 0x0001 ; SPECIES_TANGELA
+ .short 0x0002, 0x0001 ; SPECIES_KANGASKHAN
+ .short 0x0001, 0x0000 ; SPECIES_HORSEA
+ .short 0x0002, 0x0000 ; SPECIES_SEADRA
+ .short 0x0001, 0x0000 ; SPECIES_GOLDEEN
+ .short 0x0002, 0x0000 ; SPECIES_SEAKING
+ .short 0x0005, 0x0001 ; SPECIES_STARYU
+ .short 0x0005, 0x0001 ; SPECIES_STARMIE
+ .short 0x0001, 0x0001 ; SPECIES_MR_MIME
+ .short 0x0002, 0x0001 ; SPECIES_SCYTHER
+ .short 0x0001, 0x0000 ; SPECIES_JYNX
+ .short 0x0002, 0x0001 ; SPECIES_ELECTABUZZ
+ .short 0x0002, 0x0001 ; SPECIES_MAGMAR
+ .short 0x0002, 0x0001 ; SPECIES_PINSIR
+ .short 0x0002, 0x0001 ; SPECIES_TAUROS
+ .short 0x0004, 0x0000 ; SPECIES_MAGIKARP
+ .short 0x0003, 0x0000 ; SPECIES_GYARADOS
+ .short 0x0001, 0x0000 ; SPECIES_LAPRAS
+ .short 0x0004, 0x0000 ; SPECIES_DITTO
+ .short 0x0001, 0x0001 ; SPECIES_EEVEE
+ .short 0x0002, 0x0001 ; SPECIES_VAPOREON
+ .short 0x0002, 0x0001 ; SPECIES_JOLTEON
+ .short 0x0002, 0x0001 ; SPECIES_FLAREON
+ .short 0x0005, 0x0001 ; SPECIES_PORYGON
+ .short 0x0001, 0x0001 ; SPECIES_OMANYTE
+ .short 0x0002, 0x0001 ; SPECIES_OMASTAR
+ .short 0x0005, 0x0001 ; SPECIES_KABUTO
+ .short 0x0002, 0x0001 ; SPECIES_KABUTOPS
+ .short 0x0002, 0x0001 ; SPECIES_AERODACTYL
+ .short 0x0004, 0x0001 ; SPECIES_SNORLAX
+ .short 0x0002, 0x0001 ; SPECIES_ARTICUNO
+ .short 0x0002, 0x0001 ; SPECIES_ZAPDOS
+ .short 0x0002, 0x0001 ; SPECIES_MOLTRES
+ .short 0x0001, 0x0000 ; SPECIES_DRATINI
+ .short 0x0002, 0x0000 ; SPECIES_DRAGONAIR
+ .short 0x0002, 0x0001 ; SPECIES_DRAGONITE
+ .short 0x0002, 0x0001 ; SPECIES_MEWTWO
+ .short 0x0001, 0x0001 ; SPECIES_MEW
+ .short 0x0001, 0x0001 ; SPECIES_CHIKORITA
+ .short 0x0001, 0x0001 ; SPECIES_BAYLEEF
+ .short 0x0002, 0x0001 ; SPECIES_MEGANIUM
+ .short 0x0001, 0x0001 ; SPECIES_CYNDAQUIL
+ .short 0x0002, 0x0001 ; SPECIES_QUILAVA
+ .short 0x0002, 0x0001 ; SPECIES_TYPHLOSION
+ .short 0x0001, 0x0001 ; SPECIES_TOTODILE
+ .short 0x0002, 0x0001 ; SPECIES_CROCONAW
+ .short 0x0002, 0x0001 ; SPECIES_FERALIGATR
+ .short 0x0001, 0x0001 ; SPECIES_SENTRET
+ .short 0x0001, 0x0001 ; SPECIES_FURRET
+ .short 0x0001, 0x0001 ; SPECIES_HOOTHOOT
+ .short 0x0002, 0x0001 ; SPECIES_NOCTOWL
+ .short 0x0001, 0x0001 ; SPECIES_LEDYBA
+ .short 0x0002, 0x0001 ; SPECIES_LEDIAN
+ .short 0x0003, 0x0001 ; SPECIES_SPINARAK
+ .short 0x0003, 0x0001 ; SPECIES_ARIADOS
+ .short 0x0003, 0x0000 ; SPECIES_CROBAT
+ .short 0x0004, 0x0000 ; SPECIES_CHINCHOU
+ .short 0x0002, 0x0000 ; SPECIES_LANTURN
+ .short 0x0001, 0x0001 ; SPECIES_PICHU
+ .short 0x0001, 0x0001 ; SPECIES_CLEFFA
+ .short 0x0001, 0x0001 ; SPECIES_IGGLYBUFF
+ .short 0x0001, 0x0001 ; SPECIES_TOGEPI
+ .short 0x0001, 0x0001 ; SPECIES_TOGETIC
+ .short 0x0001, 0x0001 ; SPECIES_NATU
+ .short 0x0005, 0x0001 ; SPECIES_XATU
+ .short 0x0001, 0x0001 ; SPECIES_MAREEP
+ .short 0x0001, 0x0001 ; SPECIES_FLAAFFY
+ .short 0x0001, 0x0001 ; SPECIES_AMPHAROS
+ .short 0x0001, 0x0000 ; SPECIES_BELLOSSOM
+ .short 0x0001, 0x0001 ; SPECIES_MARILL
+ .short 0x0001, 0x0001 ; SPECIES_AZUMARILL
+ .short 0x0004, 0x0001 ; SPECIES_SUDOWOODO
+ .short 0x0001, 0x0001 ; SPECIES_POLITOED
+ .short 0x0001, 0x0001 ; SPECIES_HOPPIP
+ .short 0x0001, 0x0001 ; SPECIES_SKIPLOOM
+ .short 0x0001, 0x0001 ; SPECIES_JUMPLUFF
+ .short 0x0001, 0x0001 ; SPECIES_AIPOM
+ .short 0x0001, 0x0000 ; SPECIES_SUNKERN
+ .short 0x0001, 0x0001 ; SPECIES_SUNFLORA
+ .short 0x0001, 0x0001 ; SPECIES_YANMA
+ .short 0x0001, 0x0001 ; SPECIES_WOOPER
+ .short 0x0004, 0x0001 ; SPECIES_QUAGSIRE
+ .short 0x0002, 0x0001 ; SPECIES_ESPEON
+ .short 0x0002, 0x0001 ; SPECIES_UMBREON
+ .short 0x0003, 0x0001 ; SPECIES_MURKROW
+ .short 0x0004, 0x0001 ; SPECIES_SLOWKING
+ .short 0x0003, 0x0000 ; SPECIES_MISDREAVUS
+ .short 0x0005, 0x0000 ; SPECIES_UNOWN
+ .short 0x0004, 0x0001 ; SPECIES_WOBBUFFET
+ .short 0x0001, 0x0001 ; SPECIES_GIRAFARIG
+ .short 0x0005, 0x0000 ; SPECIES_PINECO
+ .short 0x0005, 0x0000 ; SPECIES_FORRETRESS
+ .short 0x0004, 0x0000 ; SPECIES_DUNSPARCE
+ .short 0x0004, 0x0001 ; SPECIES_GLIGAR
+ .short 0x0002, 0x0000 ; SPECIES_STEELIX
+ .short 0x0001, 0x0001 ; SPECIES_SNUBBULL
+ .short 0x0001, 0x0001 ; SPECIES_GRANBULL
+ .short 0x0002, 0x0000 ; SPECIES_QWILFISH
+ .short 0x0002, 0x0001 ; SPECIES_SCIZOR
+ .short 0x0001, 0x0001 ; SPECIES_SHUCKLE
+ .short 0x0002, 0x0001 ; SPECIES_HERACROSS
+ .short 0x0002, 0x0001 ; SPECIES_SNEASEL
+ .short 0x0001, 0x0001 ; SPECIES_TEDDIURSA
+ .short 0x0002, 0x0001 ; SPECIES_URSARING
+ .short 0x0004, 0x0000 ; SPECIES_SLUGMA
+ .short 0x0004, 0x0000 ; SPECIES_MAGCARGO
+ .short 0x0001, 0x0001 ; SPECIES_SWINUB
+ .short 0x0004, 0x0001 ; SPECIES_PILOSWINE
+ .short 0x0001, 0x0001 ; SPECIES_CORSOLA
+ .short 0x0005, 0x0000 ; SPECIES_REMORAID
+ .short 0x0004, 0x0001 ; SPECIES_OCTILLERY
+ .short 0x0001, 0x0001 ; SPECIES_DELIBIRD
+ .short 0x0002, 0x0000 ; SPECIES_MANTINE
+ .short 0x0002, 0x0001 ; SPECIES_SKARMORY
+ .short 0x0003, 0x0001 ; SPECIES_HOUNDOUR
+ .short 0x0003, 0x0001 ; SPECIES_HOUNDOOM
+ .short 0x0002, 0x0000 ; SPECIES_KINGDRA
+ .short 0x0001, 0x0001 ; SPECIES_PHANPY
+ .short 0x0002, 0x0001 ; SPECIES_DONPHAN
+ .short 0x0005, 0x0001 ; SPECIES_PORYGON2
+ .short 0x0002, 0x0001 ; SPECIES_STANTLER
+ .short 0x0004, 0x0001 ; SPECIES_SMEARGLE
+ .short 0x0001, 0x0001 ; SPECIES_TYROGUE
+ .short 0x0002, 0x0001 ; SPECIES_HITMONTOP
+ .short 0x0001, 0x0001 ; SPECIES_SMOOCHUM
+ .short 0x0001, 0x0001 ; SPECIES_ELEKID
+ .short 0x0001, 0x0001 ; SPECIES_MAGBY
+ .short 0x0001, 0x0001 ; SPECIES_MILTANK
+ .short 0x0001, 0x0001 ; SPECIES_BLISSEY
+ .short 0x0002, 0x0001 ; SPECIES_RAIKOU
+ .short 0x0002, 0x0001 ; SPECIES_ENTEI
+ .short 0x0002, 0x0001 ; SPECIES_SUICUNE
+ .short 0x0001, 0x0001 ; SPECIES_LARVITAR
+ .short 0x0005, 0x0000 ; SPECIES_PUPITAR
+ .short 0x0003, 0x0001 ; SPECIES_TYRANITAR
+ .short 0x0002, 0x0001 ; SPECIES_LUGIA
+ .short 0x0002, 0x0001 ; SPECIES_HO_OH
+ .short 0x0001, 0x0001 ; SPECIES_CELEBI
+ .short 0x0001, 0x0001 ; SPECIES_TREECKO
+ .short 0x0002, 0x0001 ; SPECIES_GROVYLE
+ .short 0x0002, 0x0001 ; SPECIES_SCEPTILE
+ .short 0x0001, 0x0001 ; SPECIES_TORCHIC
+ .short 0x0002, 0x0001 ; SPECIES_COMBUSKEN
+ .short 0x0002, 0x0001 ; SPECIES_BLAZIKEN
+ .short 0x0001, 0x0001 ; SPECIES_MUDKIP
+ .short 0x0001, 0x0001 ; SPECIES_MARSHTOMP
+ .short 0x0002, 0x0001 ; SPECIES_SWAMPERT
+ .short 0x0001, 0x0001 ; SPECIES_POOCHYENA
+ .short 0x0002, 0x0001 ; SPECIES_MIGHTYENA
+ .short 0x0004, 0x0001 ; SPECIES_ZIGZAGOON
+ .short 0x0004, 0x0001 ; SPECIES_LINOONE
+ .short 0x0001, 0x0001 ; SPECIES_WURMPLE
+ .short 0x0005, 0x0000 ; SPECIES_SILCOON
+ .short 0x0001, 0x0001 ; SPECIES_BEAUTIFLY
+ .short 0x0005, 0x0000 ; SPECIES_CASCOON
+ .short 0x0002, 0x0001 ; SPECIES_DUSTOX
+ .short 0x0001, 0x0001 ; SPECIES_LOTAD
+ .short 0x0004, 0x0001 ; SPECIES_LOMBRE
+ .short 0x0004, 0x0001 ; SPECIES_LUDICOLO
+ .short 0x0005, 0x0001 ; SPECIES_SEEDOT
+ .short 0x0002, 0x0001 ; SPECIES_NUZLEAF
+ .short 0x0003, 0x0001 ; SPECIES_SHIFTRY
+ .short 0x0001, 0x0001 ; SPECIES_TAILLOW
+ .short 0x0002, 0x0001 ; SPECIES_SWELLOW
+ .short 0x0001, 0x0001 ; SPECIES_WINGULL
+ .short 0x0001, 0x0001 ; SPECIES_PELIPPER
+ .short 0x0001, 0x0001 ; SPECIES_RALTS
+ .short 0x0001, 0x0001 ; SPECIES_KIRLIA
+ .short 0x0001, 0x0001 ; SPECIES_GARDEVOIR
+ .short 0x0001, 0x0001 ; SPECIES_SURSKIT
+ .short 0x0002, 0x0000 ; SPECIES_MASQUERAIN
+ .short 0x0001, 0x0001 ; SPECIES_SHROOMISH
+ .short 0x0002, 0x0001 ; SPECIES_BRELOOM
+ .short 0x0004, 0x0001 ; SPECIES_SLAKOTH
+ .short 0x0002, 0x0001 ; SPECIES_VIGOROTH
+ .short 0x0004, 0x0001 ; SPECIES_SLAKING
+ .short 0x0005, 0x0001 ; SPECIES_NINCADA
+ .short 0x0002, 0x0001 ; SPECIES_NINJASK
+ .short 0x0004, 0x0001 ; SPECIES_SHEDINJA
+ .short 0x0004, 0x0001 ; SPECIES_WHISMUR
+ .short 0x0004, 0x0001 ; SPECIES_LOUDRED
+ .short 0x0002, 0x0001 ; SPECIES_EXPLOUD
+ .short 0x0001, 0x0001 ; SPECIES_MAKUHITA
+ .short 0x0002, 0x0001 ; SPECIES_HARIYAMA
+ .short 0x0001, 0x0001 ; SPECIES_AZURILL
+ .short 0x0005, 0x0001 ; SPECIES_NOSEPASS
+ .short 0x0001, 0x0001 ; SPECIES_SKITTY
+ .short 0x0001, 0x0001 ; SPECIES_DELCATTY
+ .short 0x0003, 0x0001 ; SPECIES_SABLEYE
+ .short 0x0001, 0x0001 ; SPECIES_MAWILE
+ .short 0x0001, 0x0001 ; SPECIES_ARON
+ .short 0x0002, 0x0001 ; SPECIES_LAIRON
+ .short 0x0002, 0x0001 ; SPECIES_AGGRON
+ .short 0x0001, 0x0001 ; SPECIES_MEDITITE
+ .short 0x0002, 0x0001 ; SPECIES_MEDICHAM
+ .short 0x0001, 0x0001 ; SPECIES_ELECTRIKE
+ .short 0x0002, 0x0001 ; SPECIES_MANECTRIC
+ .short 0x0001, 0x0001 ; SPECIES_PLUSLE
+ .short 0x0001, 0x0001 ; SPECIES_MINUN
+ .short 0x0002, 0x0001 ; SPECIES_VOLBEAT
+ .short 0x0001, 0x0001 ; SPECIES_ILLUMISE
+ .short 0x0001, 0x0001 ; SPECIES_ROSELIA
+ .short 0x0004, 0x0000 ; SPECIES_GULPIN
+ .short 0x0004, 0x0000 ; SPECIES_SWALOT
+ .short 0x0003, 0x0000 ; SPECIES_CARVANHA
+ .short 0x0003, 0x0000 ; SPECIES_SHARPEDO
+ .short 0x0001, 0x0000 ; SPECIES_WAILMER
+ .short 0x0002, 0x0000 ; SPECIES_WAILORD
+ .short 0x0004, 0x0001 ; SPECIES_NUMEL
+ .short 0x0004, 0x0001 ; SPECIES_CAMERUPT
+ .short 0x0004, 0x0001 ; SPECIES_TORKOAL
+ .short 0x0001, 0x0000 ; SPECIES_SPOINK
+ .short 0x0002, 0x0001 ; SPECIES_GRUMPIG
+ .short 0x0004, 0x0001 ; SPECIES_SPINDA
+ .short 0x0004, 0x0001 ; SPECIES_TRAPINCH
+ .short 0x0002, 0x0001 ; SPECIES_VIBRAVA
+ .short 0x0002, 0x0001 ; SPECIES_FLYGON
+ .short 0x0001, 0x0001 ; SPECIES_CACNEA
+ .short 0x0003, 0x0001 ; SPECIES_CACTURNE
+ .short 0x0001, 0x0001 ; SPECIES_SWABLU
+ .short 0x0001, 0x0001 ; SPECIES_ALTARIA
+ .short 0x0002, 0x0001 ; SPECIES_ZANGOOSE
+ .short 0x0003, 0x0000 ; SPECIES_SEVIPER
+ .short 0x0005, 0x0000 ; SPECIES_LUNATONE
+ .short 0x0005, 0x0000 ; SPECIES_SOLROCK
+ .short 0x0001, 0x0000 ; SPECIES_BARBOACH
+ .short 0x0004, 0x0000 ; SPECIES_WHISCASH
+ .short 0x0002, 0x0001 ; SPECIES_CORPHISH
+ .short 0x0003, 0x0001 ; SPECIES_CRAWDAUNT
+ .short 0x0005, 0x0001 ; SPECIES_BALTOY
+ .short 0x0005, 0x0001 ; SPECIES_CLAYDOL
+ .short 0x0005, 0x0001 ; SPECIES_LILEEP
+ .short 0x0005, 0x0001 ; SPECIES_CRADILY
+ .short 0x0005, 0x0000 ; SPECIES_ANORITH
+ .short 0x0002, 0x0001 ; SPECIES_ARMALDO
+ .short 0x0004, 0x0000 ; SPECIES_FEEBAS
+ .short 0x0002, 0x0000 ; SPECIES_MILOTIC
+ .short 0x0001, 0x0000 ; SPECIES_CASTFORM
+ .short 0x0001, 0x0001 ; SPECIES_KECLEON
+ .short 0x0003, 0x0000 ; SPECIES_SHUPPET
+ .short 0x0003, 0x0001 ; SPECIES_BANETTE
+ .short 0x0003, 0x0000 ; SPECIES_DUSKULL
+ .short 0x0003, 0x0001 ; SPECIES_DUSCLOPS
+ .short 0x0002, 0x0001 ; SPECIES_TROPIUS
+ .short 0x0001, 0x0000 ; SPECIES_CHIMECHO
+ .short 0x0003, 0x0001 ; SPECIES_ABSOL
+ .short 0x0004, 0x0001 ; SPECIES_WYNAUT
+ .short 0x0001, 0x0001 ; SPECIES_SNORUNT
+ .short 0x0002, 0x0000 ; SPECIES_GLALIE
+ .short 0x0001, 0x0000 ; SPECIES_SPHEAL
+ .short 0x0002, 0x0000 ; SPECIES_SEALEO
+ .short 0x0002, 0x0000 ; SPECIES_WALREIN
+ .short 0x0001, 0x0000 ; SPECIES_CLAMPERL
+ .short 0x0002, 0x0000 ; SPECIES_HUNTAIL
+ .short 0x0001, 0x0000 ; SPECIES_GOREBYSS
+ .short 0x0004, 0x0000 ; SPECIES_RELICANTH
+ .short 0x0001, 0x0000 ; SPECIES_LUVDISC
+ .short 0x0001, 0x0001 ; SPECIES_BAGON
+ .short 0x0005, 0x0001 ; SPECIES_SHELGON
+ .short 0x0002, 0x0001 ; SPECIES_SALAMENCE
+ .short 0x0005, 0x0001 ; SPECIES_BELDUM
+ .short 0x0005, 0x0001 ; SPECIES_METANG
+ .short 0x0002, 0x0001 ; SPECIES_METAGROSS
+ .short 0x0005, 0x0001 ; SPECIES_REGIROCK
+ .short 0x0005, 0x0001 ; SPECIES_REGICE
+ .short 0x0005, 0x0001 ; SPECIES_REGISTEEL
+ .short 0x0001, 0x0001 ; SPECIES_LATIAS
+ .short 0x0002, 0x0001 ; SPECIES_LATIOS
+ .short 0x0002, 0x0001 ; SPECIES_KYOGRE
+ .short 0x0002, 0x0001 ; SPECIES_GROUDON
+ .short 0x0002, 0x0000 ; SPECIES_RAYQUAZA
+ .short 0x0001, 0x0001 ; SPECIES_JIRACHI
+ .short 0x0002, 0x0001 ; SPECIES_DEOXYS
+ .short 0x0001, 0x0001 ; SPECIES_TURTWIG
+ .short 0x0001, 0x0001 ; SPECIES_GROTLE
+ .short 0x0002, 0x0001 ; SPECIES_TORTERRA
+ .short 0x0001, 0x0001 ; SPECIES_CHIMCHAR
+ .short 0x0002, 0x0001 ; SPECIES_MONFERNO
+ .short 0x0002, 0x0001 ; SPECIES_INFERNAPE
+ .short 0x0001, 0x0001 ; SPECIES_PIPLUP
+ .short 0x0002, 0x0001 ; SPECIES_PRINPLUP
+ .short 0x0002, 0x0001 ; SPECIES_EMPOLEON
+ .short 0x0001, 0x0001 ; SPECIES_STARLY
+ .short 0x0001, 0x0001 ; SPECIES_STARAVIA
+ .short 0x0002, 0x0001 ; SPECIES_STARAPTOR
+ .short 0x0004, 0x0001 ; SPECIES_BIDOOF
+ .short 0x0004, 0x0001 ; SPECIES_BIBAREL
+ .short 0x0001, 0x0001 ; SPECIES_KRICKETOT
+ .short 0x0002, 0x0001 ; SPECIES_KRICKETUNE
+ .short 0x0001, 0x0001 ; SPECIES_SHINX
+ .short 0x0001, 0x0001 ; SPECIES_LUXIO
+ .short 0x0002, 0x0001 ; SPECIES_LUXRAY
+ .short 0x0001, 0x0001 ; SPECIES_BUDEW
+ .short 0x0002, 0x0001 ; SPECIES_ROSERADE
+ .short 0x0002, 0x0001 ; SPECIES_CRANIDOS
+ .short 0x0002, 0x0001 ; SPECIES_RAMPARDOS
+ .short 0x0002, 0x0001 ; SPECIES_SHIELDON
+ .short 0x0002, 0x0001 ; SPECIES_BASTIODON
+ .short 0x0001, 0x0000 ; SPECIES_BURMY
+ .short 0x0001, 0x0000 ; SPECIES_WORMADAM
+ .short 0x0002, 0x0001 ; SPECIES_MOTHIM
+ .short 0x0001, 0x0000 ; SPECIES_COMBEE
+ .short 0x0001, 0x0000 ; SPECIES_VESPIQUEN
+ .short 0x0001, 0x0001 ; SPECIES_PACHIRISU
+ .short 0x0001, 0x0001 ; SPECIES_BUIZEL
+ .short 0x0002, 0x0001 ; SPECIES_FLOATZEL
+ .short 0x0001, 0x0001 ; SPECIES_CHERUBI
+ .short 0x0001, 0x0001 ; SPECIES_CHERRIM
+ .short 0x0001, 0x0001 ; SPECIES_SHELLOS
+ .short 0x0003, 0x0001 ; SPECIES_GASTRODON
+ .short 0x0001, 0x0001 ; SPECIES_AMBIPOM
+ .short 0x0003, 0x0000 ; SPECIES_DRIFLOON
+ .short 0x0003, 0x0000 ; SPECIES_DRIFBLIM
+ .short 0x0001, 0x0001 ; SPECIES_BUNEARY
+ .short 0x0001, 0x0001 ; SPECIES_LOPUNNY
+ .short 0x0003, 0x0000 ; SPECIES_MISMAGIUS
+ .short 0x0003, 0x0001 ; SPECIES_HONCHKROW
+ .short 0x0001, 0x0001 ; SPECIES_GLAMEOW
+ .short 0x0001, 0x0001 ; SPECIES_PURUGLY
+ .short 0x0001, 0x0001 ; SPECIES_CHINGLING
+ .short 0x0003, 0x0001 ; SPECIES_STUNKY
+ .short 0x0003, 0x0001 ; SPECIES_SKUNTANK
+ .short 0x0005, 0x0000 ; SPECIES_BRONZOR
+ .short 0x0005, 0x0000 ; SPECIES_BRONZONG
+ .short 0x0004, 0x0001 ; SPECIES_BONSLY
+ .short 0x0001, 0x0001 ; SPECIES_MIME_JR
+ .short 0x0001, 0x0001 ; SPECIES_HAPPINY
+ .short 0x0004, 0x0001 ; SPECIES_CHATOT
+ .short 0x0003, 0x0001 ; SPECIES_SPIRITOMB
+ .short 0x0001, 0x0001 ; SPECIES_GIBLE
+ .short 0x0002, 0x0001 ; SPECIES_GABITE
+ .short 0x0002, 0x0001 ; SPECIES_GARCHOMP
+ .short 0x0004, 0x0001 ; SPECIES_MUNCHLAX
+ .short 0x0001, 0x0001 ; SPECIES_RIOLU
+ .short 0x0002, 0x0001 ; SPECIES_LUCARIO
+ .short 0x0004, 0x0001 ; SPECIES_HIPPOPOTAS
+ .short 0x0002, 0x0001 ; SPECIES_HIPPOWDON
+ .short 0x0003, 0x0001 ; SPECIES_SKORUPI
+ .short 0x0003, 0x0001 ; SPECIES_DRAPION
+ .short 0x0003, 0x0001 ; SPECIES_CROAGUNK
+ .short 0x0003, 0x0001 ; SPECIES_TOXICROAK
+ .short 0x0004, 0x0000 ; SPECIES_CARNIVINE
+ .short 0x0001, 0x0000 ; SPECIES_FINNEON
+ .short 0x0002, 0x0000 ; SPECIES_LUMINEON
+ .short 0x0001, 0x0000 ; SPECIES_MANTYKE
+ .short 0x0001, 0x0001 ; SPECIES_SNOVER
+ .short 0x0002, 0x0001 ; SPECIES_ABOMASNOW
+ .short 0x0002, 0x0001 ; SPECIES_WEAVILE
+ .short 0x0005, 0x0000 ; SPECIES_MAGNEZONE
+ .short 0x0004, 0x0001 ; SPECIES_LICKILICKY
+ .short 0x0002, 0x0001 ; SPECIES_RHYPERIOR
+ .short 0x0004, 0x0001 ; SPECIES_TANGROWTH
+ .short 0x0002, 0x0001 ; SPECIES_ELECTIVIRE
+ .short 0x0002, 0x0001 ; SPECIES_MAGMORTAR
+ .short 0x0002, 0x0001 ; SPECIES_TOGEKISS
+ .short 0x0002, 0x0001 ; SPECIES_YANMEGA
+ .short 0x0002, 0x0001 ; SPECIES_LEAFEON
+ .short 0x0002, 0x0001 ; SPECIES_GLACEON
+ .short 0x0002, 0x0001 ; SPECIES_GLISCOR
+ .short 0x0004, 0x0001 ; SPECIES_MAMOSWINE
+ .short 0x0005, 0x0001 ; SPECIES_PORYGON_Z
+ .short 0x0002, 0x0001 ; SPECIES_GALLADE
+ .short 0x0005, 0x0001 ; SPECIES_PROBOPASS
+ .short 0x0003, 0x0000 ; SPECIES_DUSKNOIR
+ .short 0x0001, 0x0000 ; SPECIES_FROSLASS
+ .short 0x0002, 0x0000 ; SPECIES_ROTOM
+ .short 0x0001, 0x0001 ; SPECIES_UXIE
+ .short 0x0001, 0x0001 ; SPECIES_MESPRIT
+ .short 0x0001, 0x0001 ; SPECIES_AZELF
+ .short 0x0002, 0x0001 ; SPECIES_DIALGA
+ .short 0x0002, 0x0001 ; SPECIES_PALKIA
+ .short 0x0002, 0x0001 ; SPECIES_HEATRAN
+ .short 0x0005, 0x0001 ; SPECIES_REGIGIGAS
+ .short 0x0002, 0x0001 ; SPECIES_GIRATINA
+ .short 0x0002, 0x0000 ; SPECIES_CRESSELIA
+ .short 0x0001, 0x0000 ; SPECIES_PHIONE
+ .short 0x0001, 0x0000 ; SPECIES_MANAPHY
+ .short 0x0003, 0x0001 ; SPECIES_DARKRAI
+ .short 0x0001, 0x0001 ; SPECIES_SHAYMIN
+ .short 0x0002, 0x0001 ; SPECIES_ARCEUS
.global UNK05_021FD1B8
UNK05_021FD1B8: ; 0x021FD1B8
diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s
index ee5fe56a..4b2128f2 100644
--- a/arm9/modules/06/asm/module_06.s
+++ b/arm9/modules/06/asm/module_06.s
@@ -5042,7 +5042,7 @@ _0223BBDA:
cmp r0, #0xc
blt _0223BBDA
add r0, r5, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024DA0
bl FUN_02024CA4
add r6, r0, #0
@@ -5479,7 +5479,7 @@ _0223BF7E:
cmp r0, #0xc
blt _0223BF7E
add r0, r5, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024DA0
bl FUN_02024CA4
add r6, r0, #0
@@ -5789,7 +5789,7 @@ _0223C222:
cmp r0, #0xc
blt _0223C222
add r0, r5, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024DA0
bl FUN_02024CA4
add r6, r0, #0
@@ -5930,7 +5930,7 @@ _0223C350:
cmp r0, #1
bne _0223C38C
add r0, r5, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl Sav2_PlayerData_GetProfileAddr
bl PlayerProfile_GetTrainerID
str r0, [sp]
@@ -11442,7 +11442,7 @@ _0223EF28:
str r0, [r2, #0x74]
ldr r0, [r1]
ldr r0, [r0, #0x68]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl Sav2_PlayerData_GetProfileAddr
ldr r1, _0223EFF4 ; =0x02252420
ldr r1, [r1]
@@ -15699,7 +15699,7 @@ MOD06_02241230: ; 0x02241230
cmp r0, #0
beq _022412E0
add r0, r4, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #1
bl FUN_020254A0
@@ -16188,7 +16188,7 @@ MOD06_02241670: ; 0x02241670
push {r4, r5, r6, r7, lr}
sub sp, #0x2c
add r4, r0, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #1
bl FUN_020254A0
@@ -16412,7 +16412,7 @@ MOD06_0224186C: ; 0x0224186C
push {r3, r4, r5, r6, lr}
sub sp, #0x24
add r5, r0, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #2
bl FUN_020254A0
@@ -16499,7 +16499,7 @@ MOD06_02241914: ; 0x02241914
mov r0, #0
str r0, [r6]
add r0, r5, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #2
bl FUN_020254A0
@@ -16820,7 +16820,7 @@ MOD06_02241BB0: ; 0x02241BB0
add r5, r0, #0
ldr r0, [r5]
add r4, r1, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #3
bl FUN_020254A0
@@ -17604,7 +17604,7 @@ MOD06_02242224: ; 0x02242224
push {r4, r5, r6, r7, lr}
sub sp, #0x5c
add r6, r0, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #3
bl FUN_020254A0
@@ -17830,7 +17830,7 @@ _02242400: .word 0x000076A0
MOD06_02242404: ; 0x02242404
push {r4, lr}
add r4, r0, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
bl FUN_020254B4
cmp r0, #3
@@ -17989,7 +17989,7 @@ MOD06_0224252C: ; 0x0224252C
add r5, r0, #0
ldr r0, [r5]
add r4, r1, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #4
bl FUN_020254A0
@@ -18060,7 +18060,7 @@ MOD06_022425C8: ; 0x022425C8
push {r4, r5, r6, r7, lr}
sub sp, #0x24
str r0, [sp, #8]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #4
bl FUN_020254A0
@@ -18173,7 +18173,7 @@ MOD06_02242698: ; 0x02242698
MOD06_022426AC: ; 0x022426AC
push {r3, r4, r5, lr}
add r5, r0, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
bl FUN_020254B4
cmp r0, #4
@@ -18472,7 +18472,7 @@ MOD06_022428D8: ; 0x022428D8
push {r4, r5, r6, r7, lr}
sub sp, #0x2c
add r5, r0, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #5
bl FUN_020254A0
@@ -18652,7 +18652,7 @@ MOD06_02242A38: ; 0x02242A38
push {r3, r4, r5, r6, r7, lr}
add r7, r0, #0
add r5, r1, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #5
bl FUN_020254A0
@@ -23652,7 +23652,7 @@ _02245098:
cmp r0, #0xc
blo _02245098
add r0, r5, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024DA0
bl FUN_02024CA4
add r6, r0, #0
@@ -23816,7 +23816,7 @@ MOD06_022451F4: ; 0x022451F4
push {r3, r4, lr}
sub sp, #0x14
add r4, r0, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #6
bl FUN_020254A0
@@ -23871,7 +23871,7 @@ MOD06_0224525C: ; 0x0224525C
add r7, r0, #0
add r6, r1, #0
str r2, [sp]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #6
bl FUN_020254A0
@@ -23989,7 +23989,7 @@ _0224533C: .word MOD06_02245360
MOD06_02245340: ; 0x02245340
push {r4, lr}
add r4, r1, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02024ED8
mov r1, #6
bl FUN_020254A0
@@ -40845,7 +40845,7 @@ MOD06_0224D46C: ; 0x0224D46C
bl FUN_020377A8
add r5, r0, #0
add r0, r4, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
str r0, [sp, #0x1c]
mov r0, #0xb
mov r1, #0x18
diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s
index 21e68458..0f186c44 100644
--- a/arm9/modules/14/asm/module_14.s
+++ b/arm9/modules/14/asm/module_14.s
@@ -7519,7 +7519,7 @@ MOD14_021DB220: ; 0x021DB220
add r4, r1, #0
add r5, r0, #0
ldr r0, [r4]
- bl FUN_02022510
+ bl GetStoragePCPointer
mov r1, #0x12
lsl r1, r1, #4
str r0, [r5, r1]
diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s
index bc6fe658..a37cfb8a 100644
--- a/arm9/modules/18/asm/module_18.s
+++ b/arm9/modules/18/asm/module_18.s
@@ -2199,7 +2199,7 @@ _0223A7EA:
ldr r0, _0223AB04 ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r5, r0, #0
bl MOD18_0223D638
@@ -3021,7 +3021,7 @@ MOD18_0223AE88: ; 0x0223AE88
ldr r0, _0223AED0 ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
add r6, r0, #0
bl FUN_02026CC4
bl FUN_02025C38
@@ -3153,7 +3153,7 @@ MOD18_0223AF48: ; 0x0223AF48
ldr r0, [r0]
str r2, [sp, #8]
ldr r0, [r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
str r0, [sp, #0x38]
bl MOD18_0223AED4
@@ -5023,12 +5023,12 @@ MOD18_0223BD94: ; 0x0223BD94
add r4, r1, #0
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CB4
ldr r0, _0223BDDC ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r6, r0, #0
add r0, r5, #0
@@ -5057,7 +5057,7 @@ MOD18_0223BDE0: ; 0x0223BDE0
ldr r0, _0223BE24 ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r5, r0, #0
add r0, r4, #0
@@ -5583,7 +5583,7 @@ MOD18_0223C1F0: ; 0x0223C1F0
ldr r0, _0223C338 ; =0x02251380
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r6, r0, #0
ldr r0, _0223C338 ; =0x02251380
@@ -6847,7 +6847,7 @@ MOD18_0223CB94: ; 0x0223CB94
ldr r0, _0223CC28 ; =0x000004C8
str r4, [r1, r0]
add r0, r4, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
mov r4, #0
ldr r7, _0223CC20 ; =0x02251384
@@ -6910,7 +6910,7 @@ MOD18_0223CC2C: ; 0x0223CC2C
ldr r1, [r0]
ldr r0, _0223CC74 ; =0x000004C8
ldr r0, [r1, r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
mov r4, #0
ldr r7, _0223CC70 ; =0x02251384
@@ -7769,7 +7769,7 @@ MOD18_0223D298: ; 0x0223D298
ldr r1, [r0]
ldr r0, _0223D2E8 ; =0x000004C8
ldr r0, [r1, r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r4, r0, #0
mov r5, #0
@@ -9566,17 +9566,17 @@ MOD18_0223E060: ; 0x0223E060
bl AllocFromHeap
add r4, r0, #0
add r0, r5, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CB4
add r6, r0, #0
add r0, r5, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
add r2, r0, #0
add r0, r4, #0
add r1, r6, #0
bl MOD18_0224D2F0
add r0, r5, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
bl MOD18_022492F8
_0223E110:
@@ -10646,7 +10646,7 @@ MOD18_0223E8A8: ; 0x0223E8A8
ldr r0, _0223E948 ; =0x022513A0
ldr r0, [r0, #4]
ldr r0, [r0, #0x40]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
mov r4, #0
ldr r7, _0223E948 ; =0x022513A0
@@ -10739,7 +10739,7 @@ MOD18_0223E958: ; 0x0223E958
ldr r0, [r0, #4]
str r4, [r0, #0x40]
add r0, r4, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
ldr r2, _0223E9B0 ; =0x022513A0
mov r1, #0xa3
@@ -11874,7 +11874,7 @@ MOD18_0223F1DC: ; 0x0223F1DC
ldr r0, _0223F228 ; =0x022513A0
ldr r0, [r0, #4]
ldr r0, [r0, #0x40]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
mov r4, #0
add r7, r0, #0
@@ -12305,7 +12305,7 @@ MOD18_0223F50C: ; 0x0223F50C
add r6, r2, #0
ldr r0, [r0, #4]
ldr r0, [r0, #0x40]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r7, r0, #0
add r0, r5, #0
@@ -12817,7 +12817,7 @@ MOD18_0223F918: ; 0x0223F918
b _0223FA5E
_0223F926:
ldr r0, [r0, #0x40]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CB4
add r6, r0, #0
ldr r0, _0223FA64 ; =0x00000622
@@ -15123,7 +15123,7 @@ MOD18_02240A44: ; 0x02240A44
add r4, r2, #0
ldr r0, [r0, #4]
ldr r0, [r0, #0x40]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CB4
add r5, r0, #0
ldrb r0, [r4, #1]
@@ -24144,7 +24144,7 @@ _02245050: .word MOD18_02246338
MOD18_02245054: ; 0x02245054
push {r4, r5, r6, lr}
add r5, r0, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CA8
add r4, r0, #0
bl FUN_02026CC0
@@ -27700,7 +27700,7 @@ MOD18_02246C94: ; 0x02246C94
add r5, r2, #0
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CB4
ldrb r4, [r5]
add r7, r0, #0
@@ -28092,13 +28092,13 @@ MOD18_02246FB4: ; 0x02246FB4
ldr r0, _02247108 ; =0x022513EC
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CA8
str r0, [sp, #0xc]
ldr r0, _02247108 ; =0x022513EC
ldr r0, [r0]
ldr r0, [r0]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r4, r0, #0
mov r0, #0
@@ -30029,7 +30029,7 @@ MOD18_02247EA0: ; 0x02247EA0
add r3, r2, #0
bl MOD18_0224DCB8
ldr r0, [r4, #8]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CB4
bl FUN_02026940
add r4, #0x2a
@@ -31041,7 +31041,7 @@ MOD18_022486B8: ; 0x022486B8
cmp r0, #0
beq _02248704
ldr r0, [r4, #4]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CB4
bl FUN_02026B90
ldr r0, _0224873C ; =0x000005E3
@@ -32640,7 +32640,7 @@ _02249334: .word FreeToHeap
MOD18_02249338: ; 0x02249338
push {r3, lr}
ldr r0, [r0, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
bl FUN_0202623C
pop {r3, pc}
@@ -32651,7 +32651,7 @@ MOD18_02249338: ; 0x02249338
MOD18_0224934C: ; 0x0224934C
push {r3, lr}
ldr r0, [r0, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
bl FUN_02025DB0
pop {r3, pc}
@@ -32663,7 +32663,7 @@ MOD18_02249360: ; 0x02249360
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r1, r4, #0
bl FUN_02025DC8
@@ -32675,7 +32675,7 @@ MOD18_02249360: ; 0x02249360
MOD18_02249378: ; 0x02249378
push {r3, lr}
ldr r0, [r0, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
bl FUN_02025F80
pop {r3, pc}
@@ -32687,7 +32687,7 @@ MOD18_0224938C: ; 0x0224938C
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r1, r4, #0
bl FUN_02025F98
@@ -32719,7 +32719,7 @@ _022493C4: .word MOD18_022513F8
MOD18_022493C8: ; 0x022493C8
push {r3, lr}
ldr r0, [r0, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
bl FUN_02026050
pop {r3, pc}
@@ -32731,7 +32731,7 @@ MOD18_022493DC: ; 0x022493DC
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r1, r4, #0
bl FUN_02026258
@@ -32744,7 +32744,7 @@ MOD18_022493F4: ; 0x022493F4
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r1, r4, #0
bl FUN_02026068
@@ -32757,7 +32757,7 @@ MOD18_0224940C: ; 0x0224940C
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r1, r4, #0
bl FUN_02026074
@@ -32769,7 +32769,7 @@ MOD18_0224940C: ; 0x0224940C
MOD18_02249424: ; 0x02249424
push {r3, lr}
ldr r0, [r0, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
bl FUN_0202616C
pop {r3, pc}
@@ -32781,7 +32781,7 @@ MOD18_02249438: ; 0x02249438
push {r4, lr}
add r4, r0, #0
ldr r0, [r1, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r1, r4, #0
bl FUN_02026188
@@ -32977,7 +32977,7 @@ _022495BA:
cmp r6, #4
bne _022495E2
ldr r0, [r5, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl Sav2_PlayerData_GetProfileAddr
mov r1, #4
bl PlayerProfile_GetPlayerName_NewString
@@ -35134,7 +35134,7 @@ MOD18_0224A78C: ; 0x0224A78C
bl MOD18_022498EC
bl MOD18_0224D704
ldr r0, [r4, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl Sav2_PlayerData_GetProfileAddr
add r1, r0, #0
mov r0, #1
@@ -35433,7 +35433,7 @@ MOD18_0224A9EC: ; 0x0224A9EC
add r5, r0, #0
bl FUN_02001470
ldr r0, [r0, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r1, r4, #0
bl FUN_02025F0C
@@ -36386,7 +36386,7 @@ MOD18_0224B190: ; 0x0224B190
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r1, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r4, r0, #0
add r1, r5, #0
@@ -36412,7 +36412,7 @@ MOD18_0224B1C4: ; 0x0224B1C4
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r1, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r1, r5, #0
add r4, r0, #0
@@ -37482,11 +37482,11 @@ _0224BA70:
bl MOD18_0223D658
bl MOD18_0224DD94
ldr r0, [r4, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl Sav2_PlayerData_GetProfileAddr
add r5, r0, #0
ldr r0, [r4, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
mov r3, #0
str r3, [sp]
@@ -38088,7 +38088,7 @@ MOD18_0224BFAC: ; 0x0224BFAC
add r6, r0, #0
ldr r0, [r6, #0xc]
add r4, r1, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
bl FUN_02025D40
add r7, r4, r0
@@ -38223,7 +38223,7 @@ MOD18_0224C0AC: ; 0x0224C0AC
add r6, r0, #0
ldr r0, [r6, #0xc]
add r4, r1, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
add r5, r0, #0
bl FUN_02026CC4
add r7, r0, #0
@@ -38366,7 +38366,7 @@ MOD18_0224C1C0: ; 0x0224C1C0
ldr r0, [r5, #0xc]
add r7, r2, #0
add r4, r1, #0
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
add r6, r0, #0
add r0, r7, #0
@@ -38749,7 +38749,7 @@ MOD18_0224C510: ; 0x0224C510
bl FUN_02001470
add r4, r0, #0
ldr r0, [r4, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
str r0, [sp, #0x2c]
add r0, r4, #0
@@ -39310,7 +39310,7 @@ MOD18_0224C9C4: ; 0x0224C9C4
push {r3, r4, r5, lr}
add r5, r0, #0
ldr r0, [r5, #0xc]
- bl FUN_020377AC
+ bl ScriptEnvironment_GetSav2Ptr
bl FUN_02026CC4
ldr r1, _0224CA24 ; =0x00000215
add r4, r0, #0