From 645c45431b0e091234699c3706ff90d1654cfb57 Mon Sep 17 00:00:00 2001 From: Dennis Date: Mon, 26 Jul 2021 06:11:01 +0200 Subject: Pokemon related decomp (#47) * decompile last function in pokemon_1.s * some pokemon related decomp * more decomp * decomp another function * decompile function * another one * decompile GetPokemonLevelData * decompile more * more decomp * more structure and decomp * decomp another function (need to do some renaming) * rename some stuff * I cant do anything without committing these 2 files --- src/code_80958E8.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/code_80958E8.c') diff --git a/src/code_80958E8.c b/src/code_80958E8.c index a6ff84a..cd9fa20 100644 --- a/src/code_80958E8.c +++ b/src/code_80958E8.c @@ -32,7 +32,7 @@ struct unkStruct_203B490 extern bool8 sub_809095C(u8); extern s32 sub_8090298(u8); extern bool8 sub_809017C(u8 *); -extern s16 sub_808E770(s16); +extern s16 GetBaseSpecies(s16); extern bool8 sub_8092040(u8); extern u8 sub_803C1D0(u8 *, u8); extern bool8 IsNotMoneyOrUsedTMItem(u8); @@ -127,14 +127,14 @@ bool8 ValidateWonderMail(struct WonderMail *data) return FALSE; if(data->clientPoke > SPECIES_RAYQUAZA_CUTSCENE) return FALSE; - if(data->clientPoke != sub_808E770(data->clientPoke)) + if(data->clientPoke != GetBaseSpecies(data->clientPoke)) return FALSE; if(sub_803C0DC(data->clientPoke) == 0) return FALSE; if(data->targetPoke > SPECIES_RAYQUAZA_CUTSCENE) return FALSE; - if(data->targetPoke != sub_808E770(data->targetPoke)) + if(data->targetPoke != GetBaseSpecies(data->targetPoke)) return FALSE; if(sub_803C0DC(data->targetPoke) == 0) return FALSE; -- cgit v1.2.3