From 1a9b1a45cae6d547167821601872220853074365 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 4 Sep 2017 15:05:11 +0200 Subject: split battle rodata --- data/data2c.s | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 data/data2c.s (limited to 'data/data2c.s') diff --git a/data/data2c.s b/data/data2c.s new file mode 100644 index 000000000..75c146269 --- /dev/null +++ b/data/data2c.s @@ -0,0 +1,110 @@ +@ the second big chunk of data + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 + + +@ 831C898 + .include "data/battle_moves.inc" + + .incbin "baserom.gba", 0x31d93c, 0x10 + +@ 831D94C + .include "data/pokedex_order.inc" + +@ 831E2F0 + .include "data/spinda_spot_graphics.inc" + +@ 831E380 + .include "data/item_effect_info.inc" + +@ 831E818 + .include "data/nature_stat_table.inc" + +@ 831E898 + .include "data/tm_hm_learnsets.inc" + +@ 831F578 + .include "data/trainer_pic_indices.inc" + +@ 831F5CA + .include "data/trainer_class_name_indices.inc" + +@ 831F61C + .include "data/cry_id_table.inc" + +@ 831F72C + .include "data/experience_tables.inc" + +@ 83203CC + .include "data/base_stats.inc" + +@ 83230DC + .include "data/level_up_learnsets.inc" + +@ 832531C + .include "data/evolution_table.inc" + +@ 832937C + .include "data/level_up_learnset_pointers.inc" + +gUnknown_083299EC:: @ 83299EC + .incbin "baserom.gba", 0x3299ec, 0x19b + +gUnknown_08329B87:: @ 8329B87 + .incbin "baserom.gba", 0x329b87, 0x19b + +gUnknown_08329D22:: @ 8329D22 + .incbin "baserom.gba", 0x329d22, 0x4 + +gUnknown_08329D26:: @ 8329D26 + .incbin "baserom.gba", 0x329d26, 0x4 + +gUnknown_08329D2A:: @ 8329D2A + .incbin "baserom.gba", 0x329d2a, 0x4 + +gUnknown_08329D2E:: @ 8329D2E + .incbin "baserom.gba", 0x329d2e, 0x1a + +gUnknown_08329D48:: @ 8329D48 + .incbin "baserom.gba", 0x329d48, 0xc + +gUnknown_08329D54:: @ 8329D54 + .incbin "baserom.gba", 0x329d54, 0x20 + +gHoldEffectToType:: @ 8329D74 + .incbin "baserom.gba", 0x329d74, 0x24 + +gUnknown_08329D98:: @ 8329D98 + .incbin "baserom.gba", 0x329d98, 0x60 + +gUnknown_08329DF8:: @ 8329DF8 + .incbin "baserom.gba", 0x329df8, 0xc0 + +gUnknown_08329EB8:: @ 8329EB8 + .incbin "baserom.gba", 0x329eb8, 0xa + +gUnknown_08329EC2:: @ 8329EC2 + .incbin "baserom.gba", 0x329ec2, 0x6 + +gUnknown_08329EC8:: @ 8329EC8 + .incbin "baserom.gba", 0x329ec8, 0x6 + +gUnknown_08329ECE:: @ 8329ECE + .incbin "baserom.gba", 0x329ece, 0x1c + +gUnknown_08329EEA:: @ 8329EEA + .incbin "baserom.gba", 0x329eea, 0x12 + +gUnknown_08329EFC:: @ 8329EFC + .incbin "baserom.gba", 0x329efc, 0x2 + +gUnknown_08329EFE:: @ 8329EFE + .incbin "baserom.gba", 0x329efe, 0x2a + +gUnknown_08329F28:: @ 8329F28 + .incbin "baserom.gba", 0x329f28, 0x18 -- cgit v1.2.3 From 2702b0ec9b4b2ae25d847ccd3b5b8ec1ad8cf1ff Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 4 Sep 2017 21:43:13 +0200 Subject: decomp calc dmg and clean up battle ai --- data/data2c.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/data2c.s') diff --git a/data/data2c.s b/data/data2c.s index 75c146269..a3395365c 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -67,7 +67,7 @@ gUnknown_08329D26:: @ 8329D26 gUnknown_08329D2A:: @ 8329D2A .incbin "baserom.gba", 0x329d2a, 0x4 -gUnknown_08329D2E:: @ 8329D2E +gStatStageRatios:: @ 8329D2E .incbin "baserom.gba", 0x329d2e, 0x1a gUnknown_08329D48:: @ 8329D48 -- cgit v1.2.3 From b6661e7736138bb61c4d58e61add686cec9e7739 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 5 Sep 2017 20:13:34 +0200 Subject: name some pokemon and battle labels --- data/data2c.s | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'data/data2c.s') diff --git a/data/data2c.s b/data/data2c.s index a3395365c..ddfa2e9be 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -11,7 +11,8 @@ @ 831C898 .include "data/battle_moves.inc" - .incbin "baserom.gba", 0x31d93c, 0x10 + @ 0x31d93c unreferenced unknown data +.byte 0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00 @ 831D94C .include "data/pokedex_order.inc" -- cgit v1.2.3 From 0cc4cadd2f02b19cea6eba1826aab8c3668dc677 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 6 Sep 2017 18:34:18 +0200 Subject: label pokemon2 and some box stuff --- data/data2c.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/data2c.s') diff --git a/data/data2c.s b/data/data2c.s index ddfa2e9be..895a764f2 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -86,7 +86,7 @@ gUnknown_08329D98:: @ 8329D98 gUnknown_08329DF8:: @ 8329DF8 .incbin "baserom.gba", 0x329df8, 0xc0 -gUnknown_08329EB8:: @ 8329EB8 +gSecretBaseTrainerClasses:: @ 8329EB8 .incbin "baserom.gba", 0x329eb8, 0xa gUnknown_08329EC2:: @ 8329EC2 -- cgit v1.2.3 From cdd36116f221d62566c771fec2df15a2f33f507e Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 6 Sep 2017 21:48:30 +0200 Subject: label pokemon3.s --- data/data2c.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/data2c.s') diff --git a/data/data2c.s b/data/data2c.s index 895a764f2..94d9c30e8 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -98,13 +98,13 @@ gUnknown_08329EC8:: @ 8329EC8 gUnknown_08329ECE:: @ 8329ECE .incbin "baserom.gba", 0x329ece, 0x1c -gUnknown_08329EEA:: @ 8329EEA +gHMMoves:: @ 8329EEA .incbin "baserom.gba", 0x329eea, 0x12 gUnknown_08329EFC:: @ 8329EFC .incbin "baserom.gba", 0x329efc, 0x2 -gUnknown_08329EFE:: @ 8329EFE +gAlteringCaveWildMonHeldItems:: @ 8329EFE .incbin "baserom.gba", 0x329efe, 0x2a gUnknown_08329F28:: @ 8329F28 -- cgit v1.2.3