From 90888c79b3fc0bdf33b9ed8196d4ed3d20291dac Mon Sep 17 00:00:00 2001 From: scbroede <32247405+scbroede@users.noreply.github.com> Date: Fri, 15 Aug 2025 13:26:13 -0400 Subject: [PATCH] document underground inventory scrcmds (#675) --- asm/macros/scrcmd.inc | 128 ++++++------ include/scrcmd_underground_inventory.h | 23 ++ include/unk_0204E974.h | 23 -- platinum.us/main.lsf | 2 +- res/field/scripts/scripts_common.s | 6 +- ...cripts_eterna_city_underground_man_house.s | 8 +- res/field/scripts/scripts_hearthome_city.s | 22 +- src/meson.build | 2 +- src/scrcmd.c | 34 +-- src/scrcmd_underground_inventory.c | 191 +++++++++++++++++ src/unk_0204E974.c | 196 ------------------ 11 files changed, 315 insertions(+), 320 deletions(-) create mode 100644 include/scrcmd_underground_inventory.h delete mode 100644 include/unk_0204E974.h create mode 100644 src/scrcmd_underground_inventory.c delete mode 100644 src/unk_0204E974.c diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 569fa6ca3e..a8d7c4b589 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -807,116 +807,116 @@ .short 130 .endm - .macro ScrCmd_083 arg0, arg1, arg2 + .macro SendGoodToPC goodID, unused, destVar .short 131 - .short \arg0 - .short \arg1 - .short \arg2 + .short \goodID + .short \unused + .short \destVar .endm - .macro ScrCmd_084 arg0, arg1, arg2 + .macro Dummy084 dummy, dummy2, dummy3 .short 132 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm - .macro ScrCmd_085 arg0, arg1, arg2 + .macro CheckHasRoomForGoodsInPC unused, unused2, destVar .short 133 - .short \arg0 - .short \arg1 - .short \arg2 + .short \unused + .short \unused2 + .short \destVar .endm - .macro ScrCmd_086 arg0, arg1, arg2 + .macro Dummy086 dummy, dummy2, dummy3 .short 134 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm - .macro ScrCmd_087 arg0, arg1, arg2 + .macro GiveTrap trapID, unused, destVar .short 135 - .short \arg0 - .short \arg1 - .short \arg2 + .short \trapID + .short \unused + .short \destVar .endm - .macro ScrCmd_088 arg0, arg1, arg2 + .macro Dummy088 dummy, dummy2, dummy3 .short 136 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm - .macro ScrCmd_089 arg0, arg1, arg2 + .macro Dummy089 dummy, dummy2, dummy3 .short 137 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm - .macro ScrCmd_08A arg0, arg1, arg2 + .macro Dummy08A dummy, dummy2, dummy3 .short 138 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm - .macro ScrCmd_08B arg0, arg1, arg2 + .macro Dummy08B dummy, dummy2, dummy3 .short 139 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm - .macro ScrCmd_08C arg0, arg1, arg2 + .macro Dummy08C dummy, dummy2, dummy3 .short 140 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm - .macro ScrCmd_08D arg0, arg1, arg2 + .macro Dummy08D dummy, dummy2, dummy3 .short 141 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm - .macro ScrCmd_08E arg0, arg1, arg2 + .macro Dummy08E dummy, dummy2, dummy3 .short 142 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm - .macro ScrCmd_08F arg0, arg1, arg2 + .macro GiveSphere type, size, destVar .short 143 - .short \arg0 - .short \arg1 - .short \arg2 + .short \type + .short \size + .short \destVar .endm - .macro ScrCmd_090 arg0, arg1, arg2 + .macro Dummy090 dummy, dummy2, dummy3 .short 144 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm - .macro ScrCmd_091 arg0, arg1, arg2 + .macro Dummy091 dummy, dummy2, dummy3 .short 145 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm - .macro ScrCmd_092 arg0, arg1, arg2 + .macro Dummy092 dummy, dummy2, dummy3 .short 146 - .short \arg0 - .short \arg1 - .short \arg2 + .short \dummy + .short \dummy2 + .short \dummy3 .endm .macro ScrCmd_093 arg0, arg1 diff --git a/include/scrcmd_underground_inventory.h b/include/scrcmd_underground_inventory.h new file mode 100644 index 0000000000..b667d29198 --- /dev/null +++ b/include/scrcmd_underground_inventory.h @@ -0,0 +1,23 @@ +#ifndef POKEPLATINUM_SCRCMD_UNDERGROUND_INVENTORY_H +#define POKEPLATINUM_SCRCMD_UNDERGROUND_INVENTORY_H + +#include "field_script_context.h" + +BOOL ScrCmd_SendGoodToPC(ScriptContext *ctx); +BOOL ScrCmd_Dummy084(ScriptContext *ctx); +BOOL ScrCmd_CheckHasRoomForGoodsInPC(ScriptContext *ctx); +BOOL ScrCmd_Dummy086(ScriptContext *ctx); +BOOL ScrCmd_GiveTrap(ScriptContext *ctx); +BOOL ScrCmd_Dummy088(ScriptContext *ctx); +BOOL ScrCmd_Dummy089(ScriptContext *ctx); +BOOL ScrCmd_Dummy08A(ScriptContext *ctx); +BOOL ScrCmd_Dummy08B(ScriptContext *ctx); +BOOL ScrCmd_Dummy08C(ScriptContext *ctx); +BOOL ScrCmd_Dummy08D(ScriptContext *ctx); +BOOL ScrCmd_Dummy08E(ScriptContext *ctx); +BOOL ScrCmd_GiveSphere(ScriptContext *ctx); +BOOL ScrCmd_Dummy090(ScriptContext *ctx); +BOOL ScrCmd_Dummy091(ScriptContext *ctx); +BOOL ScrCmd_Dummy092(ScriptContext *ctx); + +#endif // POKEPLATINUM_SCRCMD_UNDERGROUND_INVENTORY_H diff --git a/include/unk_0204E974.h b/include/unk_0204E974.h deleted file mode 100644 index 425e41d7a4..0000000000 --- a/include/unk_0204E974.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef POKEPLATINUM_UNK_0204E974_H -#define POKEPLATINUM_UNK_0204E974_H - -#include "field_script_context.h" - -BOOL ScrCmd_083(ScriptContext *param0); -BOOL ScrCmd_084(ScriptContext *param0); -BOOL ScrCmd_085(ScriptContext *param0); -BOOL ScrCmd_086(ScriptContext *param0); -BOOL ScrCmd_087(ScriptContext *param0); -BOOL ScrCmd_088(ScriptContext *param0); -BOOL ScrCmd_089(ScriptContext *param0); -BOOL ScrCmd_08A(ScriptContext *param0); -BOOL ScrCmd_08B(ScriptContext *param0); -BOOL ScrCmd_08C(ScriptContext *param0); -BOOL ScrCmd_08D(ScriptContext *param0); -BOOL ScrCmd_08E(ScriptContext *param0); -BOOL ScrCmd_08F(ScriptContext *param0); -BOOL ScrCmd_090(ScriptContext *param0); -BOOL ScrCmd_091(ScriptContext *param0); -BOOL ScrCmd_092(ScriptContext *param0); - -#endif // POKEPLATINUM_UNK_0204E974_H diff --git a/platinum.us/main.lsf b/platinum.us/main.lsf index b79622c083..13b32ec4b3 100644 --- a/platinum.us/main.lsf +++ b/platinum.us/main.lsf @@ -207,7 +207,7 @@ Static main Object main.nef.p/src_scrcmd_game_corner_prize.c.o Object main.nef.p/src_scrcmd_system_flags.c.o Object main.nef.p/src_scrcmd_item.c.o - Object main.nef.p/src_unk_0204E974.c.o + Object main.nef.p/src_scrcmd_underground_inventory.c.o Object main.nef.p/src_unk_0204EDA4.c.o Object main.nef.p/src_scrcmd_dummy_23F_242.c.o Object main.nef.p/src_unk_0204F04C.c.o diff --git a/res/field/scripts/scripts_common.s b/res/field/scripts/scripts_common.s index efd4204bb9..1a6f19acd2 100644 --- a/res/field/scripts/scripts_common.s +++ b/res/field/scripts/scripts_common.s @@ -678,7 +678,7 @@ _0910: _091D: PlaySound SEQ_FANFA4 - ScrCmd_083 VAR_0x8004, VAR_0x8005, VAR_RESULT + SendGoodToPC VAR_0x8004, VAR_0x8005, VAR_RESULT ScrCmd_33E 0, VAR_0x8004 Message 108 BufferUndergroundGoodsName 0, VAR_0x8004 @@ -692,7 +692,7 @@ _093A: _0944: PlaySound SEQ_FANFA4 - ScrCmd_087 VAR_0x8004, VAR_0x8005, VAR_RESULT + GiveTrap VAR_0x8004, VAR_0x8005, VAR_RESULT BufferUndergroundTrapName 0, VAR_0x8004 Message 80 WaitSound @@ -705,7 +705,7 @@ _095C: _0966: PlaySound SEQ_FANFA4 - ScrCmd_08F VAR_0x8004, VAR_0x8005, VAR_RESULT + GiveSphere VAR_0x8004, VAR_0x8005, VAR_RESULT BufferUndergroundItemName 0, VAR_0x8004 BufferNumber 1, VAR_0x8005 Message 81 diff --git a/res/field/scripts/scripts_eterna_city_underground_man_house.s b/res/field/scripts/scripts_eterna_city_underground_man_house.s index 80a12fd9e0..cc1bf8b96f 100644 --- a/res/field/scripts/scripts_eterna_city_underground_man_house.s +++ b/res/field/scripts/scripts_eterna_city_underground_man_house.s @@ -288,7 +288,7 @@ _03D9: CallIfUnset FLAG_UNK_0x00FC, _0443 SetVar VAR_0x8004, 81 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _056B CallCommonScript 0x7FE SetVar VAR_UNK_0x40B6, 6 @@ -311,7 +311,7 @@ _0448: CallIfUnset FLAG_UNK_0x00FC, _04A4 SetVar VAR_0x8004, 82 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _056B CallCommonScript 0x7DC SetVar VAR_UNK_0x40B6, 7 @@ -331,7 +331,7 @@ _04A9: CallIfUnset FLAG_UNK_0x00FC, _0505 SetVar VAR_0x8004, 83 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _056B CallCommonScript 0x7DC SetVar VAR_UNK_0x40B6, 8 @@ -351,7 +351,7 @@ _050A: CallIfUnset FLAG_UNK_0x00FC, _0566 SetVar VAR_0x8004, 84 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _056B CallCommonScript 0x7DC SetVar VAR_UNK_0x40B6, 9 diff --git a/res/field/scripts/scripts_hearthome_city.s b/res/field/scripts/scripts_hearthome_city.s index 4719d6e976..53e9ebe81d 100644 --- a/res/field/scripts/scripts_hearthome_city.s +++ b/res/field/scripts/scripts_hearthome_city.s @@ -319,7 +319,7 @@ _03AC: Message 33 SetVar VAR_0x8004, 46 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _06F3 CallCommonScript 0x7DC SetFlag FLAG_UNK_0x014A @@ -334,7 +334,7 @@ _03F4: Message 34 SetVar VAR_0x8004, 47 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _06F3 CallCommonScript 0x7DC SetFlag FLAG_UNK_0x014B @@ -348,7 +348,7 @@ _0442: Message 35 SetVar VAR_0x8004, 72 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _06F3 CallCommonScript 0x7DC SetFlag FLAG_UNK_0x014C @@ -362,7 +362,7 @@ _048A: Message 36 SetVar VAR_0x8004, 73 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _06F3 CallCommonScript 0x7DC SetFlag FLAG_UNK_0x014D @@ -376,7 +376,7 @@ _04D2: Message 37 SetVar VAR_0x8004, 74 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _06F3 CallCommonScript 0x7DC SetFlag FLAG_UNK_0x014E @@ -390,7 +390,7 @@ _051A: Message 38 SetVar VAR_0x8004, 75 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _06F3 CallCommonScript 0x7DC SetFlag FLAG_UNK_0x014F @@ -404,7 +404,7 @@ _0562: Message 39 SetVar VAR_0x8004, 76 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _06F3 CallCommonScript 0x7DC SetFlag FLAG_UNK_0x0150 @@ -419,7 +419,7 @@ _05AA: Message 40 SetVar VAR_0x8004, 77 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _06F3 CallCommonScript 0x7DC SetFlag FLAG_UNK_0x0151 @@ -434,7 +434,7 @@ _05F8: Message 41 SetVar VAR_0x8004, 78 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _06F3 CallCommonScript 0x7DC SetFlag FLAG_UNK_0x0152 @@ -449,7 +449,7 @@ _0646: Message 42 SetVar VAR_0x8004, 79 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _06F3 CallCommonScript 0x7DC SetFlag FLAG_UNK_0x0153 @@ -464,7 +464,7 @@ _0694: Message 43 SetVar VAR_0x8004, 80 SetVar VAR_0x8005, 1 - ScrCmd_085 VAR_0x8004, VAR_0x8005, VAR_RESULT + CheckHasRoomForGoodsInPC VAR_0x8004, VAR_0x8005, VAR_RESULT GoToIfEq VAR_RESULT, 0, _06F3 CallCommonScript 0x7DC SetFlag FLAG_UNK_0x0154 diff --git a/src/meson.build b/src/meson.build index ac6b57bdd7..da7d2edec2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -195,7 +195,7 @@ pokeplatinum_c = files( 'scrcmd_game_corner_prize.c', 'scrcmd_system_flags.c', 'scrcmd_item.c', - 'unk_0204E974.c', + 'scrcmd_underground_inventory.c', 'unk_0204EDA4.c', 'scrcmd_dummy_23F_242.c', 'unk_0204F04C.c', diff --git a/src/scrcmd.c b/src/scrcmd.c index 74140290ba..665bebdc91 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -155,6 +155,7 @@ #include "scrcmd_shop.h" #include "scrcmd_sound.h" #include "scrcmd_system_flags.h" +#include "scrcmd_underground_inventory.h" #include "screen_fade.h" #include "script_manager.h" #include "sound.h" @@ -193,7 +194,6 @@ #include "unk_0204B64C.h" #include "unk_0204CFFC.h" #include "unk_0204E240.h" -#include "unk_0204E974.h" #include "unk_0204EDA4.h" #include "unk_0204F04C.h" #include "unk_0204F13C.h" @@ -901,22 +901,22 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_GetItemPocket, ScrCmd_Dummy081, ScrCmd_Dummy082, - ScrCmd_083, - ScrCmd_084, - ScrCmd_085, - ScrCmd_086, - ScrCmd_087, - ScrCmd_088, - ScrCmd_089, - ScrCmd_08A, - ScrCmd_08B, - ScrCmd_08C, - ScrCmd_08D, - ScrCmd_08E, - ScrCmd_08F, - ScrCmd_090, - ScrCmd_091, - ScrCmd_092, + ScrCmd_SendGoodToPC, + ScrCmd_Dummy084, + ScrCmd_CheckHasRoomForGoodsInPC, + ScrCmd_Dummy086, + ScrCmd_GiveTrap, + ScrCmd_Dummy088, + ScrCmd_Dummy089, + ScrCmd_Dummy08A, + ScrCmd_Dummy08B, + ScrCmd_Dummy08C, + ScrCmd_Dummy08D, + ScrCmd_Dummy08E, + ScrCmd_GiveSphere, + ScrCmd_Dummy090, + ScrCmd_Dummy091, + ScrCmd_Dummy092, ScrCmd_093, ScrCmd_094, ScrCmd_GetPartyMonForm, diff --git a/src/scrcmd_underground_inventory.c b/src/scrcmd_underground_inventory.c new file mode 100644 index 0000000000..68546ecffe --- /dev/null +++ b/src/scrcmd_underground_inventory.c @@ -0,0 +1,191 @@ +#include "scrcmd_underground_inventory.h" + +#include +#include + +#include "struct_defs/underground.h" + +#include "field/field_system.h" + +#include "field_script_context.h" +#include "inlines.h" +#include "savedata.h" +#include "unk_0202854C.h" + +BOOL ScrCmd_SendGoodToPC(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + SaveData *saveData = fieldSystem->saveData; + u16 goodID = ScriptContext_GetVar(ctx); + u16 unused = ScriptContext_GetVar(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); + + Underground *underground = SaveData_GetUnderground(saveData); + *destVar = Underground_TryAddGoodPC(underground, goodID); + + return FALSE; +} + +BOOL ScrCmd_Dummy084(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + return FALSE; +} + +BOOL ScrCmd_CheckHasRoomForGoodsInPC(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + SaveData *saveData = fieldSystem->saveData; + u16 unused = ScriptContext_GetVar(ctx); + u16 unused2 = ScriptContext_GetVar(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); + + Underground *underground = SaveData_GetUnderground(saveData); + *destVar = Underground_IsRoomForGoodsInPC(underground, unused); + + return FALSE; +} + +BOOL ScrCmd_Dummy086(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + return FALSE; +} + +BOOL ScrCmd_GiveTrap(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + SaveData *saveData = fieldSystem->saveData; + u16 trapID = ScriptContext_GetVar(ctx); + u16 unused = ScriptContext_GetVar(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); + + Underground *underground = SaveData_GetUnderground(saveData); + *destVar = Underground_TryAddTrap(underground, trapID); + + return FALSE; +} + +BOOL ScrCmd_Dummy088(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + return FALSE; +} + +BOOL ScrCmd_Dummy089(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + return FALSE; +} + +BOOL ScrCmd_Dummy08A(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + return FALSE; +} + +BOOL ScrCmd_Dummy08B(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + SaveData *saveData = fieldSystem->saveData; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + Underground *dummy4 = SaveData_GetUnderground(saveData); + + return FALSE; +} + +BOOL ScrCmd_Dummy08C(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + return FALSE; +} + +BOOL ScrCmd_Dummy08D(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + return FALSE; +} + +BOOL ScrCmd_Dummy08E(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + return FALSE; +} + +BOOL ScrCmd_GiveSphere(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + SaveData *saveData = fieldSystem->saveData; + u16 type = ScriptContext_GetVar(ctx); + u16 size = ScriptContext_GetVar(ctx); + u16 *destVar = ScriptContext_GetVarPointer(ctx); + + Underground *underground = SaveData_GetUnderground(saveData); + *destVar = Underground_TryAddSphere(underground, type, size); + return FALSE; +} + +BOOL ScrCmd_Dummy090(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + return FALSE; +} + +BOOL ScrCmd_Dummy091(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + return FALSE; +} + +BOOL ScrCmd_Dummy092(ScriptContext *ctx) +{ + FieldSystem *fieldSystem = ctx->fieldSystem; + u16 dummy = ScriptContext_GetVar(ctx); + u16 dummy2 = ScriptContext_GetVar(ctx); + u16 *dummy3 = ScriptContext_GetVarPointer(ctx); + + return FALSE; +} diff --git a/src/unk_0204E974.c b/src/unk_0204E974.c deleted file mode 100644 index 92cc0a2306..0000000000 --- a/src/unk_0204E974.c +++ /dev/null @@ -1,196 +0,0 @@ -#include "unk_0204E974.h" - -#include -#include - -#include "struct_defs/underground.h" - -#include "field/field_system.h" - -#include "field_script_context.h" -#include "inlines.h" -#include "savedata.h" -#include "unk_0202854C.h" - -BOOL ScrCmd_083(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - SaveData *saveData = fieldSystem->saveData; - Underground *v2; - u16 v3 = ScriptContext_GetVar(param0); - u16 v4 = ScriptContext_GetVar(param0); - u16 *v5 = ScriptContext_GetVarPointer(param0); - - v2 = SaveData_GetUnderground(saveData); - *v5 = Underground_TryAddGoodPC(v2, v3); - - return 0; -} - -BOOL ScrCmd_084(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - - return 0; -} - -BOOL ScrCmd_085(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - SaveData *saveData = fieldSystem->saveData; - Underground *v2; - u16 v3 = ScriptContext_GetVar(param0); - u16 v4 = ScriptContext_GetVar(param0); - u16 *v5 = ScriptContext_GetVarPointer(param0); - - v2 = SaveData_GetUnderground(saveData); - *v5 = Underground_IsRoomForGoodsInPC(v2, v3); - - return 0; -} - -BOOL ScrCmd_086(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - - return 0; -} - -BOOL ScrCmd_087(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - SaveData *saveData = fieldSystem->saveData; - Underground *v2; - u16 v3 = ScriptContext_GetVar(param0); - u16 v4 = ScriptContext_GetVar(param0); - u16 *v5 = ScriptContext_GetVarPointer(param0); - - v2 = SaveData_GetUnderground(saveData); - *v5 = Underground_TryAddTrap(v2, v3); - - return 0; -} - -BOOL ScrCmd_088(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - - return 0; -} - -BOOL ScrCmd_089(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - - return 0; -} - -BOOL ScrCmd_08A(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - - return 0; -} - -BOOL ScrCmd_08B(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - SaveData *saveData = fieldSystem->saveData; - Underground *v2; - u16 v3 = ScriptContext_GetVar(param0); - u16 v4 = ScriptContext_GetVar(param0); - u16 *v5 = ScriptContext_GetVarPointer(param0); - - v2 = SaveData_GetUnderground(saveData); - - return 0; -} - -BOOL ScrCmd_08C(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - - return 0; -} - -BOOL ScrCmd_08D(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - - return 0; -} - -BOOL ScrCmd_08E(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - - return 0; -} - -BOOL ScrCmd_08F(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - SaveData *saveData = fieldSystem->saveData; - Underground *v2; - u16 v3 = ScriptContext_GetVar(param0); - u16 v4 = ScriptContext_GetVar(param0); - u16 *v5 = ScriptContext_GetVarPointer(param0); - - v2 = SaveData_GetUnderground(saveData); - *v5 = Underground_TryAddSphere(v2, v3, v4); - return 0; -} - -BOOL ScrCmd_090(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - - return 0; -} - -BOOL ScrCmd_091(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - - return 0; -} - -BOOL ScrCmd_092(ScriptContext *param0) -{ - FieldSystem *fieldSystem = param0->fieldSystem; - u16 v1 = ScriptContext_GetVar(param0); - u16 v2 = ScriptContext_GetVar(param0); - u16 *v3 = ScriptContext_GetVarPointer(param0); - - return 0; -}