From 578f5d6e1d404bcf8aba624e4211169dc008465f Mon Sep 17 00:00:00 2001 From: lhearachel Date: Sun, 11 Feb 2024 18:18:34 +0000 Subject: [PATCH] Merge pull request #144 from bbepis/pokedex-research --- platinumus.xMAP | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/platinumus.xMAP b/platinumus.xMAP index 15ab7d56cc..c6f0467765 100644 --- a/platinumus.xMAP +++ b/platinumus.xMAP @@ -6843,7 +6843,7 @@ 7](Email_SaveSize,func) found in global src_unk_02030CE8.c.o 7](Sentence_Init,func) found in global src_unk_02014D38.c.o 8](sub_02014F98,func) found in global src_unk_02014D38.c.o - 8](v0$12893,object) found in local src_unk_02014D38.c.o + 8](v0$12942,object) found in local src_unk_02014D38.c.o 7](Sentence_SaveSize,func) found in global src_unk_02014D38.c.o 7](Contest_Init,func) found in global src_unk_0202F108.c.o 7](Contest_SaveSize,func) found in global src_unk_0202F108.c.o @@ -13297,8 +13297,8 @@ 53](ov21_021D1CE0,func) found in global src_overlay021_ov21_021D0D80.c.o 53](ov21_021D561C,func) found in global src_overlay021_ov21_021D5600.c.o 54](ov21_021D5764,func) found in local src_overlay021_ov21_021D5600.c.o - 54](ov21_021D5724,func) found in local src_overlay021_ov21_021D5600.c.o - 54](@13360,object) found in local src_overlay021_ov21_021D5600.c.o + 54](LoadMessage,func) found in local src_overlay021_ov21_021D5600.c.o + 54](@13361,object) found in local src_overlay021_ov21_021D5600.c.o 53](ov21_021D5600,func) found in global src_overlay021_ov21_021D5600.c.o 51](ov21_021D170C,func) found in global src_overlay021_ov21_021D0D80.c.o 50](ov21_021D22E0,func) found in global src_overlay021_ov21_021D1FA4.c.o @@ -27693,7 +27693,7 @@ 39](ov5_021DD3A8,func) found in global src_overlay005_ov5_021DC018.c.o 38](ov5_021F82B8,func) found in global src_overlay005_ov5_021F77A8.c.o 39](ov5_021F7A4C,func) found in local src_overlay005_ov5_021F77A8.c.o - 40](Unk_ov5_02200CE4,object) found in local src_overlay005_ov5_021F77A8.c.o + 40](sTeachableMoves,object) found in local src_overlay005_ov5_021F77A8.c.o 39](ov5_021DD250,func) found in global src_overlay005_ov5_021DC018.c.o 40](ov5_021DC150,func) found in global src_overlay005_ov5_021DC018.c.o 41](ov5_021DC018,func) found in local src_overlay005_ov5_021DC018.c.o @@ -27709,7 +27709,7 @@ 38](ov5_021F7C04,func) found in global src_overlay005_ov5_021F77A8.c.o 39](ov5_021F7ED8,func) found in global src_overlay005_ov5_021F77A8.c.o 40](ov5_021F7E18,func) found in local src_overlay005_ov5_021F77A8.c.o - 39](ov5_021F7A74,func) found in local src_overlay005_ov5_021F77A8.c.o + 39](ReadMovesetMaskByte,func) found in local src_overlay005_ov5_021F77A8.c.o 39](ov5_021F7A3C,func) found in local src_overlay005_ov5_021F77A8.c.o 39](ov5_021F7F2C,func) found in global src_overlay005_ov5_021F77A8.c.o 40](ov5_021F7FF8,func) found in local src_overlay005_ov5_021F77A8.c.o @@ -65766,7 +65766,7 @@ 020E54F0 00000004 .rodata Unk_020E54F0 (src_unk_02014D38.c.o) 020E54F4 00000004 .rodata Unk_020E54F4 (src_unk_02014D38.c.o) 020E54F8 00000008 .rodata Unk_020E54F8 (src_unk_02014D38.c.o) - 020E5500 0000000C .rodata v0$12893 (src_unk_02014D38.c.o) + 020E5500 0000000C .rodata v0$12942 (src_unk_02014D38.c.o) 020E550C 00000016 .rodata Unk_020E550C (src_unk_02014D38.c.o) 020E5522 00000016 .rodata Unk_020E5522 (src_unk_02014D38.c.o) 020E5538 00000060 .rodata Unk_020E5538 (src_unk_02014D38.c.o) @@ -77962,7 +77962,7 @@ 021F7A4C 00000028 .text ov5_021F7A4C (src_overlay005_ov5_021F77A8.c.o) 021F7A70 00000000 .text $d (src_overlay005_ov5_021F77A8.c.o) 021F7A74 00000000 .text $t (src_overlay005_ov5_021F77A8.c.o) - 021F7A74 000000EC .text ov5_021F7A74 (src_overlay005_ov5_021F77A8.c.o) + 021F7A74 000000EC .text ReadMovesetMaskByte (src_overlay005_ov5_021F77A8.c.o) 021F7B58 00000000 .text $d (src_overlay005_ov5_021F77A8.c.o) 021F7B60 00000000 .text $t (src_overlay005_ov5_021F77A8.c.o) 021F7B60 000000A4 .text ov5_021F7B60 (src_overlay005_ov5_021F77A8.c.o) @@ -78379,8 +78379,8 @@ 02200CAC 0000001C .rodata Unk_ov5_02200CAC (src_overlay005_ov5_021F6454.c.o) 02200CC8 0000001C .rodata Unk_ov5_02200CC8 (src_overlay005_ov5_021F6454.c.o) 02200CE4 00000000 .rodata .rodata (src_overlay005_ov5_021F77A8.c.o) - 02200CE4 000001C8 .rodata Unk_ov5_02200CE4 (src_overlay005_ov5_021F77A8.c.o) - 02200EAC 000009DD .rodata Unk_ov5_02200EAC (src_overlay005_ov5_021F77A8.c.o) + 02200CE4 000001C8 .rodata sTeachableMoves (src_overlay005_ov5_021F77A8.c.o) + 02200EAC 000009DD .rodata sTeachableMovesets (src_overlay005_ov5_021F77A8.c.o) 0220188C 00000050 .rodata Unk_ov5_0220188C (src_overlay005_ov5_021F8370.c.o) 0220188C 00000000 .rodata .rodata (src_overlay005_ov5_021F8370.c.o) 022018DC 00000050 .rodata Unk_ov5_022018DC (src_overlay005_ov5_021F8370.c.o) @@ -98320,7 +98320,7 @@ 021D56BC 00000000 .text $t (src_overlay021_ov21_021D5600.c.o) 021D56BC 00000068 .text ov21_021D56BC (src_overlay021_ov21_021D5600.c.o) 021D571C 00000000 .text $d (src_overlay021_ov21_021D5600.c.o) - 021D5724 0000003E .text ov21_021D5724 (src_overlay021_ov21_021D5600.c.o) + 021D5724 0000003E .text LoadMessage (src_overlay021_ov21_021D5600.c.o) 021D5724 00000000 .text $t (src_overlay021_ov21_021D5600.c.o) 021D5764 00000000 .text $t (src_overlay021_ov21_021D5600.c.o) 021D5764 00000050 .text ov21_021D5764 (src_overlay021_ov21_021D5600.c.o) @@ -100582,10 +100582,10 @@ 021E9C88 0000001C .rodata @14279 (src_overlay021_ov21_021D1FA4.c.o) 021E9CA4 00000020 .rodata v0$14216 (src_overlay021_ov21_021D1FA4.c.o) 021E9CC4 00000006 .rodata Unk_ov21_021E9CC4 (src_overlay021_ov21_021D5600.c.o) - 021E9CCC 00000018 .rodata @13360 (src_overlay021_ov21_021D5600.c.o) + 021E9CCC 00000018 .rodata @13361 (src_overlay021_ov21_021D5600.c.o) 021E9CCC 00000000 .rodata .rodata (src_overlay021_ov21_021D5600.c.o) - 021E9CE4 00000018 .rodata @13375 (src_overlay021_ov21_021D5600.c.o) - 021E9CFC 00000018 .rodata @13391 (src_overlay021_ov21_021D5600.c.o) + 021E9CE4 00000018 .rodata @13376 (src_overlay021_ov21_021D5600.c.o) + 021E9CFC 00000018 .rodata @13392 (src_overlay021_ov21_021D5600.c.o) 021E9D14 00000000 .rodata .rodata (src_overlay021_ov21_021D5AEC.c.o) 021E9D14 0000002C .rodata Unk_ov21_021E9D14 (src_overlay021_ov21_021D5AEC.c.o) 021E9D40 0000002C .rodata Unk_ov21_021E9D40 (src_overlay021_ov21_021D5AEC.c.o) @@ -137772,5 +137772,5 @@ 00000000 00000000 00000660 check.ITCM 00000000 00000000 00000880 check.DTCM -# Link start time: Sun Feb 11 17:39:16 2024 -# Link end time: Sun Feb 11 17:39:29 2024 +# Link start time: Sun Feb 11 18:17:37 2024 +# Link end time: Sun Feb 11 18:17:51 2024