From 154a70e22829891ec56561e454a73a67e609679d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 11 Sep 2017 11:35:41 +0200 Subject: start pokemon3 decomp --- data/battle_message.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_message.s b/data/battle_message.s index 34a2ad3c8..75bd65d23 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -548,7 +548,7 @@ gUnknown_085CBDBD:: @ 85CBDBD gUnknown_085CBDBF:: @ 85CBDBF .incbin "baserom.gba", 0x5cbdbf, 0x41 -gUnknown_085CBE00:: @ 85CBE00 +gStatNamesTable:: @ 85CBE00 .incbin "baserom.gba", 0x5cbe00, 0x6c gUnknown_085CBE6C:: @ 85CBE6C -- cgit v1.2.3 From 5394435520c4942ec9935454ff420acbab2ff4e4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 11 Sep 2017 14:42:13 +0200 Subject: more of pokemon3 decompiled --- data/battle_message.s | 4 ++-- data/data2c.s | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/battle_message.s b/data/battle_message.s index 75bd65d23..d1bd0c8ef 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -249,7 +249,7 @@ gUnknown_085CA459:: @ 85CA459 .string "{STRING 19} transformed!$" .string "{STRING 16}’s {STRING 25}\ntook the attack!$" -gUnknown_085CB2A1:: @ 85CB2A1 +BattleText_PreventedSwitch:: @ 85CB2A1 .string "{STRING 0}’s {STRING 23}\nprevents switching!\p$" .string "{STRING 16}’s {STRING 25}\nprevented {STRING 19}’s\l{STRING 0} from working!$" @@ -682,7 +682,7 @@ gUnknown_085CCB8C:: @ 85CCB8C gUnknown_085CCB90:: @ 85CCB90 .incbin "baserom.gba", 0x5ccb90, 0x8 -gUnknown_085CCB98:: @ 85CCB98 +BattleText_Wally:: @ 85CCB98 .incbin "baserom.gba", 0x5ccb98, 0x6 gUnknown_085CCB9E:: @ 85CCB9E diff --git a/data/data2c.s b/data/data2c.s index 94d9c30e8..92e26785d 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -101,11 +101,8 @@ gUnknown_08329ECE:: @ 8329ECE gHMMoves:: @ 8329EEA .incbin "baserom.gba", 0x329eea, 0x12 -gUnknown_08329EFC:: @ 8329EFC - .incbin "baserom.gba", 0x329efc, 0x2 - -gAlteringCaveWildMonHeldItems:: @ 8329EFE - .incbin "baserom.gba", 0x329efe, 0x2a +gAlteringCaveWildMonHeldItems:: @ 8329EFC + .incbin "baserom.gba", 0x329efc, 0x2c gUnknown_08329F28:: @ 8329F28 .incbin "baserom.gba", 0x329f28, 0x18 -- cgit v1.2.3 From 8e88f2790af8e98d695c35088cf7b493356ae03c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 11 Sep 2017 18:27:54 +0200 Subject: pokemon2 get mon data troubles --- data/battle_message.s | 2 +- data/strings.s | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/battle_message.s b/data/battle_message.s index d1bd0c8ef..93a921b5e 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -679,7 +679,7 @@ gUnknown_085CCB88:: @ 85CCB88 gUnknown_085CCB8C:: @ 85CCB8C .incbin "baserom.gba", 0x5ccb8c, 0x4 -gUnknown_085CCB90:: @ 85CCB90 +gBadEggNickname:: @ 85CCB90 .incbin "baserom.gba", 0x5ccb90, 0x8 BattleText_Wally:: @ 85CCB98 diff --git a/data/strings.s b/data/strings.s index 94cf82c59..4adbf17bd 100644 --- a/data/strings.s +++ b/data/strings.s @@ -45,7 +45,7 @@ gExpandedPlaceholder_Brendan:: @ 85E8258 gExpandedPlaceholder_May:: @ 85E8260 .string "MAY$" -gUnknown_085E8264:: @ 85E8264 +gEggNickname:: @ 85E8264 .string "EGG$" -- cgit v1.2.3 From 4242ede44580122ee1b0e340737149e8311da8a5 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 12 Sep 2017 00:01:12 +0200 Subject: almost there, troubles --- data/trainer_class_name_indices.inc | 2 +- data/trainer_pic_indices.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/trainer_class_name_indices.inc b/data/trainer_class_name_indices.inc index ece8c6b48..4335bafe0 100644 --- a/data/trainer_class_name_indices.inc +++ b/data/trainer_class_name_indices.inc @@ -1,4 +1,4 @@ -gTrainerClassNameIndices:: @ 831F5CA +gTrainerClassToNameIndex:: @ 831F5CA .byte TRAINER_CLASS_NAME_HIKER .byte TRAINER_CLASS_NAME_TEAM_AQUA .byte TRAINER_CLASS_NAME_PKMN_BREEDER diff --git a/data/trainer_pic_indices.inc b/data/trainer_pic_indices.inc index 77ab090e9..12207563b 100644 --- a/data/trainer_pic_indices.inc +++ b/data/trainer_pic_indices.inc @@ -1,5 +1,5 @@ .align 2 -gTrainerPicIndices:: @ 831F578 +gTrainerClassToPicIndex:: @ 831F578 .byte TRAINER_PIC_HIKER .byte TRAINER_PIC_AQUA_GRUNT_M .byte TRAINER_PIC_POKEMON_BREEDER_F -- cgit v1.2.3 From 6539188fa65826e2c2b101d6502f3b7794dd5197 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 12 Sep 2017 13:05:54 +0200 Subject: label and decomp some pokemon animation stuff --- data/data2c.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/data2c.s b/data/data2c.s index 92e26785d..26f237c1c 100644 --- a/data/data2c.s +++ b/data/data2c.s @@ -53,10 +53,10 @@ @ 832937C .include "data/level_up_learnset_pointers.inc" -gUnknown_083299EC:: @ 83299EC +gMonFrontAnimIdsTable:: @ 83299EC .incbin "baserom.gba", 0x3299ec, 0x19b -gUnknown_08329B87:: @ 8329B87 +gMonAnimationDelayTable:: @ 8329B87 .incbin "baserom.gba", 0x329b87, 0x19b gUnknown_08329D22:: @ 8329D22 -- cgit v1.2.3 From 0fe703023011421d9686ab0666904ae594906e7b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 12 Sep 2017 15:05:40 +0200 Subject: pokemon 3 is almost decompiled --- data/trainer_pic_indices.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/trainer_pic_indices.inc b/data/trainer_pic_indices.inc index 12207563b..22fb9aaa2 100644 --- a/data/trainer_pic_indices.inc +++ b/data/trainer_pic_indices.inc @@ -1,5 +1,5 @@ .align 2 -gTrainerClassToPicIndex:: @ 831F578 +gUnknown_0831F578:: @ 831F578 .byte TRAINER_PIC_HIKER .byte TRAINER_PIC_AQUA_GRUNT_M .byte TRAINER_PIC_POKEMON_BREEDER_F -- cgit v1.2.3