From 1caed4e6320570e9815ef43a4f0ebd14cc52c066 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sun, 14 Jul 2019 05:31:17 +0800 Subject: updated headers --- include/data2.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/data2.h') diff --git a/include/data2.h b/include/data2.h index e383b1c9a..cc4998f32 100644 --- a/include/data2.h +++ b/include/data2.h @@ -19,4 +19,10 @@ extern const u8 gMoveNames[][13]; extern const u8 gAbilityNames[][13]; extern const u8 gTypeNames[][7]; +extern const struct CompressedSpritePalette gMonPaletteTable[]; +extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; +extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[]; +extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; +extern const union AnimCmd *const gUnknown_82349BC[]; + #endif // GUARD_DATA2_H -- cgit v1.2.3 From 6e2ae504b86d0b72c797d441d7ea204bc7d5e2d3 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sun, 14 Jul 2019 09:36:11 +0800 Subject: finished data decomp --- include/data2.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'include/data2.h') diff --git a/include/data2.h b/include/data2.h index cc4998f32..96250f7db 100644 --- a/include/data2.h +++ b/include/data2.h @@ -18,11 +18,36 @@ extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; extern const u8 gMoveNames[][13]; extern const u8 gAbilityNames[][13]; extern const u8 gTypeNames[][7]; +extern u16 gUnknown_8251CB8[]; +extern u16 gUnknown_8251FEE[]; +extern u16 gUnknown_8252324[]; +extern u16 gUnknown_82539D4[]; +extern struct SpindaSpot gSpindaSpotGraphics[]; +extern s8 gNatureStatTable[][5]; +extern u32 gTMHMLearnsets[][2]; extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[]; extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; + extern const union AnimCmd *const gUnknown_82349BC[]; +extern const union AffineAnimCmd *const gUnknown_82348C8[]; +extern const union AffineAnimCmd *const gUnknown_8234944[]; + +extern const struct SpriteFrameImage gUnknown_8234698[]; +extern const struct SpriteFrameImage gUnknown_82346B8[]; +extern const struct SpriteFrameImage gUnknown_82346D8[]; +extern const struct SpriteFrameImage gUnknown_82346F8[]; +extern const struct SpriteFrameImage gUnknown_8234718[]; +extern const struct SpriteFrameImage gUnknown_8234740[]; +extern const struct SpriteFrameImage gUnknown_8234768[]; +extern const struct SpriteFrameImage gUnknown_8234788[]; +extern const struct SpriteFrameImage gUnknown_82347A8[]; +extern const struct SpriteFrameImage gUnknown_82347C8[]; + +extern const struct OamData gUnknown_824F010; +extern const struct OamData gUnknown_824F018; + #endif // GUARD_DATA2_H -- cgit v1.2.3 From 277726fd5e8c6da021206deeecb163f40073ff3c Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sun, 14 Jul 2019 12:22:44 +0800 Subject: interpret filler with empty agbstring --- include/data2.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'include/data2.h') diff --git a/include/data2.h b/include/data2.h index 96250f7db..5601fc16c 100644 --- a/include/data2.h +++ b/include/data2.h @@ -31,11 +31,11 @@ extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; extern const union AnimCmd *const *const gTrainerBackAnimsPtrTable[]; extern const union AnimCmd *const *const gTrainerFrontAnimsPtrTable[]; +extern const struct OamData gUnknown_824F010; +extern const struct OamData gUnknown_824F018; extern const union AnimCmd *const gUnknown_82349BC[]; - extern const union AffineAnimCmd *const gUnknown_82348C8[]; extern const union AffineAnimCmd *const gUnknown_8234944[]; - extern const struct SpriteFrameImage gUnknown_8234698[]; extern const struct SpriteFrameImage gUnknown_82346B8[]; extern const struct SpriteFrameImage gUnknown_82346D8[]; @@ -47,7 +47,4 @@ extern const struct SpriteFrameImage gUnknown_8234788[]; extern const struct SpriteFrameImage gUnknown_82347A8[]; extern const struct SpriteFrameImage gUnknown_82347C8[]; -extern const struct OamData gUnknown_824F010; -extern const struct OamData gUnknown_824F018; - #endif // GUARD_DATA2_H -- cgit v1.2.3 From 1e390204cb15b0fbae322fca3be3fde03b81955f Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 15 Jul 2019 09:30:28 +0800 Subject: thru gTMHMLearnsets --- include/data2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/data2.h') diff --git a/include/data2.h b/include/data2.h index 5601fc16c..045505364 100644 --- a/include/data2.h +++ b/include/data2.h @@ -24,7 +24,7 @@ extern u16 gUnknown_8252324[]; extern u16 gUnknown_82539D4[]; extern struct SpindaSpot gSpindaSpotGraphics[]; extern s8 gNatureStatTable[][5]; -extern u32 gTMHMLearnsets[][2]; +extern const u32 gTMHMLearnsets[][2]; extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; -- cgit v1.2.3 From 00cd1d483d76c9e63b010eb98a3e1f03386934ca Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 15 Jul 2019 10:06:01 +0800 Subject: thru sSpindaSpotGraphics --- include/data2.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/data2.h') diff --git a/include/data2.h b/include/data2.h index 045505364..f663df247 100644 --- a/include/data2.h +++ b/include/data2.h @@ -18,12 +18,12 @@ extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; extern const u8 gMoveNames[][13]; extern const u8 gAbilityNames[][13]; extern const u8 gTypeNames[][7]; -extern u16 gUnknown_8251CB8[]; -extern u16 gUnknown_8251FEE[]; -extern u16 gUnknown_8252324[]; -extern u16 gUnknown_82539D4[]; -extern struct SpindaSpot gSpindaSpotGraphics[]; -extern s8 gNatureStatTable[][5]; +extern const u16 gUnknown_8251CB8[]; +extern const u16 gUnknown_8251FEE[]; +extern const u16 gUnknown_8252324[]; +extern const u16 gUnknown_82539D4[]; +extern const struct SpindaSpot gSpindaSpotGraphics[]; +extern const s8 gNatureStatTable[][5]; extern const u32 gTMHMLearnsets[][2]; extern const struct CompressedSpritePalette gMonPaletteTable[]; -- cgit v1.2.3 From 51a779aa7b0318d9c4388d839b2210f963607a82 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 15 Jul 2019 13:10:29 +0800 Subject: finished pokemon data decomp --- include/data2.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include/data2.h') diff --git a/include/data2.h b/include/data2.h index f663df247..3ce3c33c8 100644 --- a/include/data2.h +++ b/include/data2.h @@ -22,9 +22,6 @@ extern const u16 gUnknown_8251CB8[]; extern const u16 gUnknown_8251FEE[]; extern const u16 gUnknown_8252324[]; extern const u16 gUnknown_82539D4[]; -extern const struct SpindaSpot gSpindaSpotGraphics[]; -extern const s8 gNatureStatTable[][5]; -extern const u32 gTMHMLearnsets[][2]; extern const struct CompressedSpritePalette gMonPaletteTable[]; extern const struct CompressedSpritePalette gMonShinyPaletteTable[]; -- cgit v1.2.3