Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-03-21 17:55:13 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Document reminder of scrcmd_system_flags.c and associated script command usages

Browse Source
This commit is contained in:
Rachel 2024-11-03 11:48:44 -08:00
parent 5aa97bc404
commit 604bab4114
38 changed files with 141 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
asm/macros/scrcmd.inc
View File

@ -1840,38 +1840,38 @@
.short \arg0
.endm
.macro ScrCmd_157 arg0
.macro CheckPokedexAcquired destVarID
.short 343
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_158
.macro GivePokedex
.short 344
.endm
.macro ScrCmd_159 arg0
.macro CheckRunningShoesAcquired destVarID
.short 345
.short \arg0
.short \destVarID
.endm
.macro ScrCmd_15A
.macro GiveRunningShoes
.short 346
.endm
.macro CheckBadge badgeID, destVarID
.macro CheckBadgeAcquired badgeID, destVarID
.short 347
.short \badgeID
.short \destVarID
.endm
.macro ScrCmd_15C arg0
.macro GiveBadge badgeID
.short 348
.short \arg0
.short \badgeID
.endm
.macro ScrCmd_15D arg0
.macro CountBadgesAcquired destVarID
.short 349
.short \arg0
.short \destVarID
.endm
.macro CheckBagAcquired destVarID

20
include/unk_0204E3CC.h → include/scrcmd_system_flags.h
View File

@ -1,15 +1,15 @@
#ifndef POKEPLATINUM_UNK_0204E3CC_H
#define POKEPLATINUM_UNK_0204E3CC_H
#ifndef POKEPLATINUM_SCRCMD_SYSTEM_FLAGS_H
#define POKEPLATINUM_SCRCMD_SYSTEM_FLAGS_H
#include "field_script_context.h"
BOOL ScrCmd_157(ScriptContext *param0);
BOOL ScrCmd_158(ScriptContext *param0);
BOOL ScrCmd_159(ScriptContext *param0);
BOOL ScrCmd_15A(ScriptContext *param0);
BOOL ScrCmd_CheckBadge(ScriptContext *ctx);
BOOL ScrCmd_15C(ScriptContext *param0);
BOOL ScrCmd_15D(ScriptContext *param0);
BOOL ScrCmd_CheckPokedexAcquired(ScriptContext *ctx);
BOOL ScrCmd_GivePokedex(ScriptContext *ctx);
BOOL ScrCmd_CheckRunningShoesAcquired(ScriptContext *ctx);
BOOL ScrCmd_GiveRunningShoes(ScriptContext *ctx);
BOOL ScrCmd_CheckBadgeAcquired(ScriptContext *ctx);
BOOL ScrCmd_GiveBadge(ScriptContext *ctx);
BOOL ScrCmd_CountBadgesAcquired(ScriptContext *ctx);
BOOL ScrCmd_CheckBagAcquired(ScriptContext *ctx);
BOOL ScrCmd_GiveBag(ScriptContext *ctx);
BOOL ScrCmd_CheckHasPartner(ScriptContext *ctx);
@ -24,4 +24,4 @@ BOOL ScrCmd_Strength(ScriptContext *ctx);
BOOL ScrCmd_Flash(ScriptContext *ctx);
BOOL ScrCmd_Defog(ScriptContext *ctx);
#endif // POKEPLATINUM_UNK_0204E3CC_H
#endif // POKEPLATINUM_SCRCMD_SYSTEM_FLAGS_H

2
include/unk_0202631C.h
View File

@ -45,7 +45,7 @@ BOOL sub_020274D0(const PokedexData *param0, u16 param1, u32 param2);
void sub_02027508(PokedexData *param0);
BOOL sub_02027514(const PokedexData *param0);
BOOL Pokedex_IsObtained(const PokedexData *pokedex);
void sub_02027540(PokedexData *param0);
void Pokedex_FlagObtained(PokedexData *param0);
PokedexData *SaveData_Pokedex(SaveData *saveData);
u32 sub_0202756C(const PokedexData *param0, int param1, int param2);
u32 sub_020276C8(const PokedexData *param0, int param1);

2
platinum.us/main.lsf
View File

@ -203,7 +203,7 @@ Static main
Object main.nef.p/src_unk_0204CFFC.c.o
Object main.nef.p/src_unk_0204E240.c.o
Object main.nef.p/src_unk_0204E378.c.o
Object main.nef.p/src_unk_0204E3CC.c.o
Object main.nef.p/src_scrcmd_system_flags.c.o
Object main.nef.p/src_unk_0204E75C.c.o
Object main.nef.p/src_unk_0204E974.c.o
Object main.nef.p/src_unk_0204EDA4.c.o

2
res/field/scripts/scripts_acuity_lakefront.s
View File

@ -24,7 +24,7 @@ _003C:
End
_004E:
CheckBadge BADGE_ID_ICICLE, 0x4000
CheckBadgeAcquired BADGE_ID_ICICLE, 0x4000
CallIfEq 0x4000, 1, _0079
GoToIfUnset 186, _002A
GoToIfSet 186, _003C

2
res/field/scripts/scripts_canalave_city.s
View File

@ -396,7 +396,7 @@ _054D:
LockAll
FacePlayer
GoToIfSet 168, _0586
CheckBadge BADGE_ID_MINE, 0x800C
CheckBadgeAcquired BADGE_ID_MINE, 0x800C
GoToIfEq 0x800C, 1, _0591
GoTo _057B
End

8
res/field/scripts/scripts_canalave_city_gym.s
View File

@ -16,7 +16,7 @@ _0016:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_MINE, 0x800C
CheckBadgeAcquired BADGE_ID_MINE, 0x800C
GoToIfEq 0x800C, 1, _0107
ScrCmd_1CD 9, 35, 0, 0, 0
Message 0
@ -29,7 +29,7 @@ _0016:
Message 2
PlaySound SEQ_BADGE
WaitSound
ScrCmd_15C 5
GiveBadge BADGE_ID_MINE
ScrCmd_260 23
SetTrainerFlag 232
SetTrainerFlag 0x100
@ -88,7 +88,7 @@ _0126:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_MINE, 0x800C
CheckBadgeAcquired BADGE_ID_MINE, 0x800C
GoToIfEq 0x800C, 1, _014C
Message 6
WaitABXPadPress
@ -107,7 +107,7 @@ _014C:
_015A:
PlayFanfare SEQ_SE_CONFIRM
LockAll
CheckBadge BADGE_ID_MINE, 0x800C
CheckBadgeAcquired BADGE_ID_MINE, 0x800C
GoToIfEq 0x800C, 1, _0184
BufferRivalName 0
BufferRivalName 1

8
res/field/scripts/scripts_eterna_city_gym.s
View File

@ -19,7 +19,7 @@ _0022:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_FOREST, 0x800C
CheckBadgeAcquired BADGE_ID_FOREST, 0x800C
GoToIfEq 0x800C, 1, _0048
Message 13
WaitABXPadPress
@ -38,7 +38,7 @@ _0048:
_0056:
PlayFanfare SEQ_SE_CONFIRM
LockAll
CheckBadge BADGE_ID_FOREST, 0x800C
CheckBadgeAcquired BADGE_ID_FOREST, 0x800C
GoToIfEq 0x800C, 1, _0080
BufferRivalName 0
BufferRivalName 1
@ -62,7 +62,7 @@ _0094:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_FOREST, 0x800C
CheckBadgeAcquired BADGE_ID_FOREST, 0x800C
GoToIfEq 0x800C, 1, _0161
ScrCmd_1CD 9, 67, 0, 0, 0
Message 0
@ -75,7 +75,7 @@ _0094:
Message 2
PlaySound SEQ_BADGE
WaitSound
ScrCmd_15C 1
GiveBadge BADGE_ID_FOREST
ScrCmd_260 23
SetTrainerFlag 0x103
SetTrainerFlag 0x104

2
res/field/scripts/scripts_hearthome_city.s
View File

@ -337,7 +337,7 @@ _03AC:
_03F4:
GoToIfSet 0x14B, _0442
ScrCmd_15D 0x800C
CountBadgesAcquired 0x800C
GoToIfLt 0x800C, 8, _0442
Message 34
SetVar 0x8004, 47

4
res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s
View File

@ -40,7 +40,7 @@ _0086:
GoTo _0096
_0096:
CheckBadge BADGE_ID_RELIC, 0x800C
CheckBadgeAcquired BADGE_ID_RELIC, 0x800C
GoToIfEq 0x800C, 1, _0173
ScrCmd_1CD 9, 100, 0, 0, 0
Message 0
@ -53,7 +53,7 @@ _0096:
Message 2
PlaySound SEQ_BADGE
WaitSound
ScrCmd_15C 4
GiveBadge BADGE_ID_RELIC
ScrCmd_260 23
SetTrainerFlag 0x10A
SetTrainerFlag 0x118

4
res/field/scripts/scripts_hearthome_city_gym_entrance_room.s
View File

@ -11,7 +11,7 @@ _000E:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_RELIC, 0x800C
CheckBadgeAcquired BADGE_ID_RELIC, 0x800C
GoToIfEq 0x800C, 1, _006A
Message 1
ScrCmd_03E 0x800C
@ -44,7 +44,7 @@ _006A:
_0078:
PlayFanfare SEQ_SE_CONFIRM
LockAll
CheckBadge BADGE_ID_RELIC, 0x800C
CheckBadgeAcquired BADGE_ID_RELIC, 0x800C
GoToIfEq 0x800C, 1, _00A2
BufferRivalName 0
BufferRivalName 1

4
res/field/scripts/scripts_hearthome_city_gym_leader_room.s
View File

@ -53,7 +53,7 @@ _00AB:
GoTo _00BB
_00BB:
CheckBadge BADGE_ID_RELIC, 0x800C
CheckBadgeAcquired BADGE_ID_RELIC, 0x800C
GoToIfEq 0x800C, 1, _01A0
ScrCmd_1CD 9, 91, 0, 0, 0
Message 0
@ -68,7 +68,7 @@ _00BB:
Message 2
PlaySound SEQ_BADGE
WaitSound
ScrCmd_15C 4
GiveBadge BADGE_ID_RELIC
ScrCmd_260 23
SetTrainerFlag 0x10A
SetTrainerFlag 0x118

2
res/field/scripts/scripts_iron_island.s
View File

@ -97,7 +97,7 @@ _00FC:
SetVar 0x8004, 0x1A7
SetVar 0x8005, 1
CallCommonScript 0x7FC
CheckBadge BADGE_ID_MINE, 0x800C
CheckBadgeAcquired BADGE_ID_MINE, 0x800C
GoToIfEq 0x800C, 0, _0140
GoTo _0135
End

2
res/field/scripts/scripts_jubilife_city.s
View File

@ -440,7 +440,7 @@ _058C:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_COAL, 0x800C
CheckBadgeAcquired BADGE_ID_COAL, 0x800C
GoToIfEq 0x800C, 1, _05B2
Message 29
WaitABXPadPress

2
res/field/scripts/scripts_oreburgh_city.s
View File

@ -52,7 +52,7 @@ _0090:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_COAL, 0x800C
CheckBadgeAcquired BADGE_ID_COAL, 0x800C
GoToIfEq 0x800C, 1, _00C1
GoToIfSet 122, _00CC
Message 8

8
res/field/scripts/scripts_oreburgh_city_gym.s
View File

@ -11,7 +11,7 @@ _000E:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_COAL, 0x800C
CheckBadgeAcquired BADGE_ID_COAL, 0x800C
GoToIfEq 0x800C, 1, _0103
ScrCmd_1CD 9, 47, 0, 0, 0
Message 0
@ -26,7 +26,7 @@ _000E:
WaitSound
SetTrainerFlag 244
SetTrainerFlag 245
ScrCmd_15C 0
GiveBadge BADGE_ID_COAL
ScrCmd_260 23
SetTrainerFlag 244
SetTrainerFlag 245
@ -82,7 +82,7 @@ _011F:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_COAL, 0x800C
CheckBadgeAcquired BADGE_ID_COAL, 0x800C
GoToIfEq 0x800C, 1, _0145
Message 6
WaitABXPadPress
@ -101,7 +101,7 @@ _0145:
_0153:
PlayFanfare SEQ_SE_CONFIRM
LockAll
CheckBadge BADGE_ID_COAL, 0x800C
CheckBadgeAcquired BADGE_ID_COAL, 0x800C
GoToIfEq 0x800C, 1, _017D
BufferRivalName 0
BufferRivalName 1

2
res/field/scripts/scripts_oreburgh_gate_1f.s
View File

@ -15,7 +15,7 @@ _0014:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_COAL, 0x800C
CheckBadgeAcquired BADGE_ID_COAL, 0x800C
GoToIfEq 0x800C, 0, _003A
Message 2
WaitABXPadPress

2
res/field/scripts/scripts_pastoria_city.s
View File

@ -86,7 +86,7 @@ _00FE:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_FEN, 0x800C
CheckBadgeAcquired BADGE_ID_FEN, 0x800C
GoToIfEq 0x800C, 1, _0124
Message 33
WaitABXPadPress

8
res/field/scripts/scripts_pastoria_city_gym.s
View File

@ -43,7 +43,7 @@ _0076:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_FEN, 0x800C
CheckBadgeAcquired BADGE_ID_FEN, 0x800C
GoToIfEq 0x800C, 1, _0155
ScrCmd_1CD 9, 122, 0, 0, 0
Message 0
@ -56,7 +56,7 @@ _0076:
Message 2
PlaySound SEQ_BADGE
WaitSound
ScrCmd_15C 3
GiveBadge BADGE_ID_FEN
ScrCmd_260 23
SetTrainerFlag 0x125
SetTrainerFlag 0x153
@ -110,7 +110,7 @@ _0171:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_FEN, 0x800C
CheckBadgeAcquired BADGE_ID_FEN, 0x800C
GoToIfEq 0x800C, 1, _0197
Message 6
WaitABXPadPress
@ -129,7 +129,7 @@ _0197:
_01A5:
PlayFanfare SEQ_SE_CONFIRM
LockAll
CheckBadge BADGE_ID_FEN, 0x800C
CheckBadgeAcquired BADGE_ID_FEN, 0x800C
GoToIfEq 0x800C, 1, _01CF
BufferRivalName 0
BufferRivalName 1

10
res/field/scripts/scripts_poketch_co_1f.s
View File

@ -25,7 +25,7 @@ _0042:
LockAll
FacePlayer
Message 0
ScrCmd_15D 0x8000
CountBadgesAcquired 0x8000
GoToIfEq 0x8000, 0, _0181
ScrCmd_134 2, 0x800C
GoToIfEq 0x800C, 0, _00C5
@ -40,22 +40,22 @@ _0042:
GoTo _01AD
_00C5:
ScrCmd_15D 0x800C
CountBadgesAcquired 0x800C
GoToIfGe 0x800C, 1, _0121
GoTo _0181
_00DC:
ScrCmd_15D 0x800C
CountBadgesAcquired 0x800C
GoToIfGe 0x800C, 3, _0139
GoTo _018C
_00F3:
ScrCmd_15D 0x800C
CountBadgesAcquired 0x800C
GoToIfGe 0x800C, 5, _0151
GoTo _0197
_010A:
ScrCmd_15D 0x800C
CountBadgesAcquired 0x800C
GoToIfGe 0x800C, 7, _0169
GoTo _01A2

2
res/field/scripts/scripts_route_213.s
View File

@ -17,7 +17,7 @@ _0022:
End
_002F:
CheckBadge BADGE_ID_FEN, 0x4000
CheckBadgeAcquired BADGE_ID_FEN, 0x4000
GoToIfEq 0x4000, 1, _0044
End

2
res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s
View File

@ -245,7 +245,7 @@ _0375:
_0394:
Message 12
ScrCmd_158
GivePokedex
SetFlag 144
BufferPlayerName 0
Message 13

8
res/field/scripts/scripts_snowpoint_city_gym.s
View File

@ -20,7 +20,7 @@ _0025:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_ICICLE, 0x800C
CheckBadgeAcquired BADGE_ID_ICICLE, 0x800C
GoToIfEq 0x800C, 1, _00F8
ScrCmd_1CD 9, 167, 0, 0, 0
Message 0
@ -33,7 +33,7 @@ _0025:
Message 2
PlaySound SEQ_BADGE
WaitSound
ScrCmd_15C 6
GiveBadge BADGE_ID_ICICLE
ScrCmd_260 23
SetTrainerFlag 0x10C
SetTrainerFlag 0x10D
@ -84,7 +84,7 @@ _0114:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_ICICLE, 0x800C
CheckBadgeAcquired BADGE_ID_ICICLE, 0x800C
GoToIfEq 0x800C, 1, _013A
Message 6
WaitABXPadPress
@ -103,7 +103,7 @@ _013A:
_0148:
PlayFanfare SEQ_SE_CONFIRM
LockAll
CheckBadge BADGE_ID_ICICLE, 0x800C
CheckBadgeAcquired BADGE_ID_ICICLE, 0x800C
GoToIfEq 0x800C, 1, _0172
BufferRivalName 0
BufferRivalName 1

2
res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s
View File

@ -51,7 +51,7 @@ _0067:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_ICICLE, 0x800C
CheckBadgeAcquired BADGE_ID_ICICLE, 0x800C
GoToIfEq 0x800C, 1, _00EC
ScrCmd_1BD 0x8000
CallIfEq 0x8000, 0, _00C8

2
res/field/scripts/scripts_solaceon_town.s
View File

@ -42,7 +42,7 @@ _0062:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_RELIC, 0x800C
CheckBadgeAcquired BADGE_ID_RELIC, 0x800C
GoToIfEq 0x800C, 1, _0088
Message 4
WaitABXPadPress

2
res/field/scripts/scripts_sunyshore_city.s
View File

@ -417,7 +417,7 @@ _0530:
FacePlayer
GoToIfSet 154, _056C
Message 8
CheckBadge BADGE_ID_BEACON, 0x800C
CheckBadgeAcquired BADGE_ID_BEACON, 0x800C
GoToIfEq 0x800C, 0, _0561
GoTo _056C
End

4
res/field/scripts/scripts_sunyshore_city_gym_room_1.s
View File

@ -21,7 +21,7 @@ _0022:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_BEACON, 0x800C
CheckBadgeAcquired BADGE_ID_BEACON, 0x800C
GoToIfEq 0x800C, 1, _0048
Message 0
WaitABXPadPress
@ -40,7 +40,7 @@ _0048:
_0056:
PlayFanfare SEQ_SE_CONFIRM
LockAll
CheckBadge BADGE_ID_BEACON, 0x800C
CheckBadgeAcquired BADGE_ID_BEACON, 0x800C
GoToIfEq 0x800C, 1, _007A
Message 2
WaitABXPadPress

4
res/field/scripts/scripts_sunyshore_city_gym_room_3.s
View File

@ -25,7 +25,7 @@ _0027:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_BEACON, 0x800C
CheckBadgeAcquired BADGE_ID_BEACON, 0x800C
GoToIfEq 0x800C, 1, _0104
ScrCmd_1CD 9, 156, 0, 0, 0
Message 0
@ -38,7 +38,7 @@ _0027:
Message 2
PlaySound SEQ_BADGE
WaitSound
ScrCmd_15C 7
GiveBadge BADGE_ID_BEACON
ScrCmd_260 23
SetTrainerFlag 0x119
SetTrainerFlag 0x11D

2
res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s
View File

@ -27,7 +27,7 @@ _0031:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_BEACON, 0x800C
CheckBadgeAcquired BADGE_ID_BEACON, 0x800C
GoToIfEq 0x800C, 1, _0057
Message 1
WaitABXPadPress

2
res/field/scripts/scripts_twinleaf_town_player_house_1f.s
View File

@ -129,7 +129,7 @@ _017C:
WaitTime 30, 0x800C
BufferPlayerName 0
Message 7
ScrCmd_15A
GiveRunningShoes
BufferPlayerName 0
Message 8
PlaySound SEQ_FANFA4

2
res/field/scripts/scripts_unk_0211.s
View File

@ -1205,7 +1205,7 @@ _103A:
Message 43
Call _10C7
Call _01C1
CheckBadge BADGE_ID_COAL, 0x800C
CheckBadgeAcquired BADGE_ID_COAL, 0x800C
GoToIfEq 0x800C, 1, _10A2
Message 44
ApplyMovement 0xFF, _02F4

10
res/field/scripts/scripts_unk_0409.s
View File

@ -26,7 +26,7 @@ _0042:
FacePlayer
ScrCmd_09A 0x800C, 15
GoToIfEq 0x800C, 6, _008E
CheckBadge BADGE_ID_FOREST, 0x800C
CheckBadgeAcquired BADGE_ID_FOREST, 0x800C
GoToIfEq 0x800C, 0, _008E
Message 0
ScrCmd_03E 0x800C
@ -131,7 +131,7 @@ _0223:
ScrCmd_09A 0x800C, 249
SetVar 0x8004, 0x800C
GoToIfEq 0x800C, 6, _0275
CheckBadge BADGE_ID_COAL, 0x800C
CheckBadgeAcquired BADGE_ID_COAL, 0x800C
GoToIfEq 0x800C, 0, _0275
Message 3
ScrCmd_03E 0x800C
@ -188,7 +188,7 @@ _0314:
GoToIfEq 0x800C, 1, _03BD
ScrCmd_09A 0x800C, 70
GoToIfEq 0x800C, 6, _0372
CheckBadge BADGE_ID_MINE, 0x800C
CheckBadgeAcquired BADGE_ID_MINE, 0x800C
GoToIfEq 0x800C, 0, _0372
Message 6
ScrCmd_03E 0x800C
@ -248,7 +248,7 @@ _040E:
LockAll
ScrCmd_09A 0x800C, 0x1AF
GoToIfEq 0x800C, 6, _0469
CheckBadge BADGE_ID_ICICLE, 0x800C
CheckBadgeAcquired BADGE_ID_ICICLE, 0x800C
GoToIfEq 0x800C, 0, _0469
CheckHasPartner 0x800C
GoToIfEq 0x800C, 1, _0478
@ -419,7 +419,7 @@ _0679:
LockAll
ScrCmd_09A 0x800C, 127
GoToIfEq 0x800C, 6, _06C3
CheckBadge BADGE_ID_BEACON, 0x800C
CheckBadgeAcquired BADGE_ID_BEACON, 0x800C
GoToIfEq 0x800C, 0, _06C3
Message 22
ScrCmd_03E 0x800C

4
res/field/scripts/scripts_veilstone_city.s
View File

@ -1173,7 +1173,7 @@ _0D5C:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_COBBLE, 0x800C
CheckBadgeAcquired BADGE_ID_COBBLE, 0x800C
GoToIfEq 0x800C, 1, _0D82
Message 12
WaitABXPadPress
@ -1192,7 +1192,7 @@ _0D8D:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_COBBLE, 0x800C
CheckBadgeAcquired BADGE_ID_COBBLE, 0x800C
GoToIfEq 0x800C, 1, _0DB3
Message 13
WaitABXPadPress

8
res/field/scripts/scripts_veilstone_city_gym.s
View File

@ -19,7 +19,7 @@ _0022:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_COBBLE, 0x800C
CheckBadgeAcquired BADGE_ID_COBBLE, 0x800C
GoToIfEq 0x800C, 1, _00FF
ScrCmd_1CD 9, 133, 0, 0, 0
Message 0
@ -32,7 +32,7 @@ _0022:
Message 2
PlaySound SEQ_BADGE
WaitSound
ScrCmd_15C 2
GiveBadge BADGE_ID_COBBLE
ScrCmd_260 23
SetTrainerFlag 0x135
SetTrainerFlag 0x136
@ -86,7 +86,7 @@ _011E:
PlayFanfare SEQ_SE_CONFIRM
LockAll
FacePlayer
CheckBadge BADGE_ID_COBBLE, 0x800C
CheckBadgeAcquired BADGE_ID_COBBLE, 0x800C
GoToIfEq 0x800C, 1, _0144
Message 6
WaitABXPadPress
@ -105,7 +105,7 @@ _0144:
_0152:
PlayFanfare SEQ_SE_CONFIRM
LockAll
CheckBadge BADGE_ID_COBBLE, 0x800C
CheckBadgeAcquired BADGE_ID_COBBLE, 0x800C
GoToIfEq 0x800C, 1, _017C
BufferRivalName 0
BufferRivalName 1

2
src/meson.build
View File

@ -192,7 +192,7 @@ pokeplatinum_c = files(
'unk_0204CFFC.c',
'unk_0204E240.c',
'unk_0204E378.c',
'unk_0204E3CC.c',
'scrcmd_system_flags.c',
'unk_0204E75C.c',
'unk_0204E974.c',
'unk_0204EDA4.c',

16
src/scrcmd.c
View File

@ -124,6 +124,7 @@
#include "rtc.h"
#include "save_player.h"
#include "savedata.h"
#include "scrcmd_system_flags.h"
#include "script_manager.h"
#include "strbuf.h"
#include "string_template.h"
@ -173,7 +174,6 @@
#include "unk_0204CFFC.h"
#include "unk_0204E240.h"
#include "unk_0204E378.h"
#include "unk_0204E3CC.h"
#include "unk_0204E75C.h"
#include "unk_0204E974.h"
#include "unk_0204EDA4.h"
@ -1106,13 +1106,13 @@ const ScrCmdFunc Unk_020EAC58[] = {
ScrCmd_154,
ScrCmd_155,
ScrCmd_156,
ScrCmd_157,
ScrCmd_158,
ScrCmd_159,
ScrCmd_15A,
ScrCmd_CheckBadge,
ScrCmd_15C,
ScrCmd_15D,
ScrCmd_CheckPokedexAcquired,
ScrCmd_GivePokedex,
ScrCmd_CheckRunningShoesAcquired,
ScrCmd_GiveRunningShoes,
ScrCmd_CheckBadgeAcquired,
ScrCmd_GiveBadge,
ScrCmd_CountBadgesAcquired,
ScrCmd_CheckBagAcquired,
ScrCmd_GiveBag,
ScrCmd_CheckHasPartner,

102
src/unk_0204E3CC.c → src/scrcmd_system_flags.c
View File

@ -1,8 +1,4 @@
#include "unk_0204E3CC.h"
#include <nitro.h>
#include <nitro/code16.h>
#include <string.h>
#include "scrcmd_system_flags.h"
#include "consts/badges.h"
@ -20,49 +16,39 @@
#include "unk_0202631C.h"
#include "vars_flags.h"
BOOL ScrCmd_157(ScriptContext *param0)
BOOL ScrCmd_CheckPokedexAcquired(ScriptContext *ctx)
{
const PokedexData *pokedex = SaveData_Pokedex(param0->fieldSystem->saveData);
u16 *v1 = ScriptContext_GetVarPointer(param0);
*v1 = Pokedex_IsObtained(pokedex);
const PokedexData *pokedex = SaveData_Pokedex(ctx->fieldSystem->saveData);
u16 *destVar = ScriptContext_GetVarPointer(ctx);
*destVar = Pokedex_IsObtained(pokedex);
return FALSE;
}
BOOL ScrCmd_158(ScriptContext *param0)
BOOL ScrCmd_GivePokedex(ScriptContext *ctx)
{
PokedexData *v0 = SaveData_Pokedex(param0->fieldSystem->saveData);
sub_02027540(v0);
return 0;
PokedexData *pokedex = SaveData_Pokedex(ctx->fieldSystem->saveData);
Pokedex_FlagObtained(pokedex);
return FALSE;
}
BOOL ScrCmd_159(ScriptContext *param0)
BOOL ScrCmd_CheckRunningShoesAcquired(ScriptContext *ctx)
{
FieldOverworldState *v0;
PlayerData *v1;
u16 *v2 = ScriptContext_GetVarPointer(param0);
v0 = SaveData_GetFieldOverworldState(param0->fieldSystem->saveData);
v1 = FieldOverworldState_GetPlayerData(v0);
*v2 = PlayerData_HasRunningShoes(v1);
return 0;
u16 *destVar = ScriptContext_GetVarPointer(ctx);
FieldOverworldState *overworldState = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData);
PlayerData *playerData = FieldOverworldState_GetPlayerData(overworldState);
*destVar = PlayerData_HasRunningShoes(playerData);
return FALSE;
}
BOOL ScrCmd_15A(ScriptContext *param0)
BOOL ScrCmd_GiveRunningShoes(ScriptContext *ctx)
{
FieldOverworldState *v0;
PlayerData *v1;
v0 = SaveData_GetFieldOverworldState(param0->fieldSystem->saveData);
v1 = FieldOverworldState_GetPlayerData(v0);
PlayerData_SetRunningShoes(v1, 1);
return 0;
FieldOverworldState *overworldState = SaveData_GetFieldOverworldState(ctx->fieldSystem->saveData);
PlayerData *playerData = FieldOverworldState_GetPlayerData(overworldState);
PlayerData_SetRunningShoes(playerData, TRUE);
return FALSE;
}
BOOL ScrCmd_CheckBadge(ScriptContext *ctx)
BOOL ScrCmd_CheckBadgeAcquired(ScriptContext *ctx)
{
u16 badgeNum = ScriptContext_GetVar(ctx);
u16 *destVar = ScriptContext_GetVarPointer(ctx);
@ -73,14 +59,14 @@ BOOL ScrCmd_CheckBadge(ScriptContext *ctx)
return FALSE;
}
BOOL ScrCmd_15C(ScriptContext *param0)
BOOL ScrCmd_GiveBadge(ScriptContext *ctx)
{
u16 v0 = ScriptContext_GetVar(param0);
u16 badgeNum = ScriptContext_GetVar(ctx);
GF_ASSERT(v0 < 8);
TrainerInfo_SetBadge(SaveData_GetTrainerInfo(param0->fieldSystem->saveData), v0);
GF_ASSERT(badgeNum < MAX_BADGES);
TrainerInfo_SetBadge(SaveData_GetTrainerInfo(ctx->fieldSystem->saveData), badgeNum);
return 0;
return FALSE;
}
BOOL ScrCmd_CheckBagAcquired(ScriptContext *ctx)
@ -90,30 +76,30 @@ BOOL ScrCmd_CheckBagAcquired(ScriptContext *ctx)
return FALSE;
}
const u8 Unk_020EC064[8] = {
0x0,
0x1,
0x2,
0x3,
0x4,
0x5,
0x6,
0x7
// Game Freak moment.
static const u8 sBadgeIDs[MAX_BADGES] = {
BADGE_ID_COAL,
BADGE_ID_FOREST,
BADGE_ID_COBBLE,
BADGE_ID_FEN,
BADGE_ID_RELIC,
BADGE_ID_MINE,
BADGE_ID_ICICLE,
BADGE_ID_BEACON,
};
BOOL ScrCmd_15D(ScriptContext *param0)
BOOL ScrCmd_CountBadgesAcquired(ScriptContext *ctx)
{
u16 v0, v1;
u16 *v2 = ScriptContext_GetVarPointer(param0);
for (v0 = 0, v1 = 0; v0 < 8; v0++) {
if (TrainerInfo_HasBadge(SaveData_GetTrainerInfo(param0->fieldSystem->saveData), Unk_020EC064[v0]) == 1) {
v1++;
u16 i, count;
u16 *destVar = ScriptContext_GetVarPointer(ctx);
for (i = 0, count = 0; i < MAX_BADGES; i++) {
if (TrainerInfo_HasBadge(SaveData_GetTrainerInfo(ctx->fieldSystem->saveData), sBadgeIDs[i]) == TRUE) {
count++;
}
}
*v2 = v1;
return 0;
*destVar = count;
return FALSE;
}
BOOL ScrCmd_GiveBag(ScriptContext *ctx)

6
src/unk_0202631C.c
View File

@ -1183,10 +1183,10 @@ BOOL Pokedex_IsObtained(const PokedexData *pokedex)
return pokedex->pokedexObtained;
}
void sub_02027540(PokedexData *param0)
void Pokedex_FlagObtained(PokedexData *pokedex)
{
CheckPokedexIntegrity(param0);
param0->pokedexObtained = 1;
CheckPokedexIntegrity(pokedex);
pokedex->pokedexObtained = TRUE;
}
PokedexData *SaveData_Pokedex(SaveData *saveData)