Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-09-11 11:16:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move badges to their own consts file, add leader aliases and max badges constant

Browse Source
This commit is contained in:
RavePossum
2024-08-24 17:41:41 -04:00
parent c913870f24
commit 8be77c1a1d
5 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
asm/macros/scrcmd.inc
View File

@@ -1,4 +1,5 @@
.include "macros/movement.inc"
.include "consts/badges.inc"
.include "consts/game_records.inc"
.include "consts/items.inc"
.include "consts/map.inc"

32
consts/badges.json Normal file
View File

@@ -0,0 +1,32 @@
{
"definitions": {
"@BadgeID": {
"type": "enum",
"values": [
"BADGE_ID_COAL",
"BADGE_ID_FOREST",
"BADGE_ID_COBBLE",
"BADGE_ID_FEN",
"BADGE_ID_RELIC",
"BADGE_ID_MINE",
"BADGE_ID_ICICLE",
"BADGE_ID_BEACON",
"MAX_BADGES"
]
},
"@BadgeLeaderID": {
"type": "aliases",
"as_preproc": true,
"values": {
"BADGE_ID_ROARK": "BADGE_ID_COAL",
"BADGE_ID_GARDENIA": "BADGE_ID_FOREST",
"BADGE_ID_MAYLENE": "BADGE_ID_COBBLE",
"BADGE_ID_CRASHER_WAKE": "BADGE_ID_FEN",
"BADGE_ID_FANTINA": "BADGE_ID_RELIC",
"BADGE_ID_BYRON": "BADGE_ID_MINE",
"BADGE_ID_CANDICE": "BADGE_ID_ICICLE",
"BADGE_ID_VOLKNER": "BADGE_ID_BEACON"
}
}
}
}

1
consts/meson.build
View File

@@ -1,5 +1,6 @@
consts_manifest_basenames = [
'abilities',
'badges',
'battle',
'battle_subscripts',
'btlcmd',

13
consts/scrcmd.json
View File

@@ -8,19 +8,6 @@
"SAVE_TYPE_FULL_SAVE",
"SAVE_TYPE_QUICK_SAVE"
]
},
"@BadgeID": {
"type": "enum",
"values": [
"BADGE_ID_COAL",
"BADGE_ID_FOREST",
"BADGE_ID_COBBLE",
"BADGE_ID_FEN",
"BADGE_ID_RELIC",
"BADGE_ID_MINE",
"BADGE_ID_ICICLE",
"BADGE_ID_BEACON"
]
}
}
}

4
src/unk_0204E3CC.c
View File

@@ -4,6 +4,8 @@
#include <nitro/code16.h>
#include <string.h>
#include "consts/badges.h"
#include "struct_decls/pokedexdata_decl.h"
#include "struct_decls/struct_0203A790_decl.h"
#include "struct_defs/struct_0205EC34.h"
@@ -65,7 +67,7 @@ BOOL ScrCmd_CheckBadge(ScriptContext *ctx)
u16 badgeNum = ScriptContext_GetVar(ctx);
u16 *destVar = ScriptContext_GetVarPointer(ctx);
GF_ASSERT(badgeNum < 8);
GF_ASSERT(badgeNum < MAX_BADGES);
*destVar = TrainerInfo_HasBadge(SaveData_GetTrainerInfo(ctx->fieldSystem->saveData), badgeNum);
return FALSE;