From d9883945954a30e4b753ecbd5d807f4b6cd2a38a Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 12 Aug 2021 17:26:01 -0700 Subject: More data dumping and some code cleaning (#46) * more data dumping and some code cleaning * split out cutscene scripts * initial start at script conversion * more script work * use correct type * clearer up struct field names * split known scripts into seperate files * no need to preproc pure ascii strings in debug * more cutscene work * split out personality test scripts * solidify text macros and doc some dungeon fields * more scripting work --- src/code_80958E8.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/code_80958E8.c') diff --git a/src/code_80958E8.c b/src/code_80958E8.c index cd9fa20..72cc735 100644 --- a/src/code_80958E8.c +++ b/src/code_80958E8.c @@ -123,25 +123,25 @@ bool8 ValidateWonderMail(struct WonderMail *data) if(sub_809017C(&(data->dungeon))) return FALSE; - if(data->clientPoke == SPECIES_NONE) + if(data->clientSpecies == SPECIES_NONE) return FALSE; - if(data->clientPoke > SPECIES_RAYQUAZA_CUTSCENE) + if(data->clientSpecies > SPECIES_RAYQUAZA_CUTSCENE) return FALSE; - if(data->clientPoke != GetBaseSpecies(data->clientPoke)) + if(data->clientSpecies != GetBaseSpecies(data->clientSpecies)) return FALSE; - if(sub_803C0DC(data->clientPoke) == 0) + if(sub_803C0DC(data->clientSpecies) == 0) return FALSE; - if(data->targetPoke > SPECIES_RAYQUAZA_CUTSCENE) + if(data->targetSpecies > SPECIES_RAYQUAZA_CUTSCENE) return FALSE; - if(data->targetPoke != GetBaseSpecies(data->targetPoke)) + if(data->targetSpecies != GetBaseSpecies(data->targetSpecies)) return FALSE; - if(sub_803C0DC(data->targetPoke) == 0) + if(sub_803C0DC(data->targetSpecies) == 0) return FALSE; // Item Delivery/Finding if((u8)(data->missionType - 1) > FIND_POKE) - if(data->targetPoke != data->clientPoke) + if(data->targetSpecies != data->clientSpecies) return FALSE; if(sub_8092040(data->targetItem)) -- cgit v1.2.3