From a6c0088073949fe3007bf600fd2de8948b3874a7 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 16 Oct 2019 08:28:19 +0800 Subject: battle_main data decomp --- include/data.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/data.h') diff --git a/include/data.h b/include/data.h index 9dd386482..005c798b3 100644 --- a/include/data.h +++ b/include/data.h @@ -45,8 +45,8 @@ extern const u8 *const gBattleAnims_Special[]; 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 struct OamData gOamData_824F010; +extern const struct OamData gOamData_824F018; extern const union AnimCmd *const gSpriteAnimTable_82349BC[]; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_82348C8[]; extern const union AffineAnimCmd *const gSpriteAffineAnimTable_8234944[]; -- cgit v1.2.3 From 34b440a3584d4d2c6d4f28cb4d8bf77efb734bc3 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 18 Oct 2019 10:59:49 +0800 Subject: clean up --- include/data.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/data.h') diff --git a/include/data.h b/include/data.h index 005c798b3..82fc527dc 100644 --- a/include/data.h +++ b/include/data.h @@ -17,8 +17,6 @@ extern struct MonCoords gTrainerFrontPicCoords[]; extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; extern const u8 gMoveNames[][13]; -extern const u8 gAbilityNames[][13]; -extern const u8 gTypeNames[][7]; extern const u16 gUnknown_8251CB8[]; extern const u16 gUnknown_8251FEE[]; extern const u16 gUnknown_8252324[]; -- cgit v1.2.3 From 1230a5c48a465d42ae7035ca9c1a6e2152c54d1a Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 26 Oct 2019 00:33:42 +0800 Subject: clean up --- include/data.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/data.h') diff --git a/include/data.h b/include/data.h index 9726b95e5..9ea1f7c96 100644 --- a/include/data.h +++ b/include/data.h @@ -5,6 +5,7 @@ #include "constants/species.h" #define SPECIES_SHINY_TAG 500 +#define TRAINER_ENCOUNTER_MUSIC(trainer)((gTrainers[trainer].encounterMusic_gender & 0x7F)) struct MonCoords { -- cgit v1.2.3