From e3dd705dfe001f99528c609a38bd222c449ea1f0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 25 Mar 2022 09:45:14 -0400 Subject: [PATCH] Rename some script env attrs --- asm/macros/script.inc | 6 +- asm/scrcmd.s | 24 ++-- .../script/scr_seq/scr_seq_0152_P01R0101.s | 4 +- global.inc | 6 +- include/npc_trade.h | 2 - include/scrcmd.h | 6 +- include/script.h | 124 ++++++++-------- src/data/fieldmap/script_cmd_table.h | 12 +- src/field_follow_poke.c | 4 +- src/field_use_item.c | 22 +-- src/field_warp_tasks.c | 22 +-- src/fieldmap.c | 132 +++++++++--------- src/map_events.c | 2 +- src/save_flypoints.c | 4 +- src/scrcmd_c.c | 22 +-- src/scrcmd_daycare.c | 16 +-- src/scrcmd_size_record.c | 2 +- src/scrcmd_strbuf.c | 84 +++++------ tools/py_scripts/scrcmd.json | 6 +- 19 files changed, 250 insertions(+), 250 deletions(-) diff --git a/asm/macros/script.inc b/asm/macros/script.inc index 954ca3a52..d58fa9fd1 100644 --- a/asm/macros/script.inc +++ b/asm/macros/script.inc @@ -2636,7 +2636,7 @@ .short \arg0 .endm - .macro scrcmd_463 + .macro enable_mass_outbreaks .short 463 .endm @@ -2685,7 +2685,7 @@ .byte \arg0 .endm - .macro scrcmd_471 arg0 + .macro get_offered_species arg0 .short 471 .short \arg0 .endm @@ -3455,7 +3455,7 @@ .short \arg6 .endm - .macro scrcmd_612 arg0 + .macro get_npc_trade_unused_flag arg0 .short 612 .short \arg0 .endm diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 32ebc1203..6faab4cd3 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -497,7 +497,7 @@ gScriptCmdTable: .word ScrCmd_LoadPhoneDat ; 460 .word ScrCmd_GetPhoneContactMsgIds ; 461 .word ScrCmd_462 ; 462 - .word ScrCmd_463 ; 463 + .word ScrCmd_EnableMassOutbreaks ; 463 .word ScrCmd_CreateRoamer ; 464 .word ScrCmd_465 ; 465 .word ScrCmd_466 ; 466 @@ -505,7 +505,7 @@ gScriptCmdTable: .word ScrCmd_MoveTutorInit ; 468 .word ScrCmd_MoveRelearnerGetResult ; 469 .word ScrCmd_LoadNPCTrade ; 470 - .word ScrCmd_471 ; 471 + .word ScrCmd_GetOfferedSpecies ; 471 .word ScrCmd_NPCTradeGetReqSpecies ; 472 .word ScrCmd_NPCTradeExec ; 473 .word ScrCmd_NPCTradeEnd ; 474 @@ -646,7 +646,7 @@ gScriptCmdTable: .word ScrCmd_609 ; 609 .word ScrCmd_610 ; 610 .word ScrCmd_Pokeathlon ; 611 - .word ScrCmd_612 ; 612 + .word ScrCmd_GetNpcTradeUnusedFlag ; 612 .word ScrCmd_GetPhoneContactRandomGiftBerry ; 613 .word ScrCmd_GetPhoneContactGiftItem ; 614 .word ScrCmd_CameronPhoto ; 615 @@ -9494,8 +9494,8 @@ ScrCmd_456: ; 0x0204523C pop {r3, pc} thumb_func_end ScrCmd_456 - thumb_func_start ScrCmd_463 -ScrCmd_463: ; 0x02045254 + thumb_func_start ScrCmd_EnableMassOutbreaks +ScrCmd_EnableMassOutbreaks: ; 0x02045254 push {r3, lr} add r0, #0x80 ldr r0, [r0] @@ -9503,7 +9503,7 @@ ScrCmd_463: ; 0x02045254 bl RoamerSave_SetOutbreakActive mov r0, #0 pop {r3, pc} - thumb_func_end ScrCmd_463 + thumb_func_end ScrCmd_EnableMassOutbreaks thumb_func_start ScrCmd_CreateRoamer ScrCmd_CreateRoamer: ; 0x02045264 @@ -9546,8 +9546,8 @@ ScrCmd_LoadNPCTrade: ; 0x0204527C _020452AC: .word FS_OVERLAY_ID(npc_trade) thumb_func_end ScrCmd_LoadNPCTrade - thumb_func_start ScrCmd_471 -ScrCmd_471: ; 0x020452B0 + thumb_func_start ScrCmd_GetOfferedSpecies +ScrCmd_GetOfferedSpecies: ; 0x020452B0 push {r3, r4, r5, lr} add r5, r0, #0 add r0, #0x80 @@ -9568,7 +9568,7 @@ ScrCmd_471: ; 0x020452B0 mov r0, #0 pop {r3, r4, r5, pc} .balign 4, 0 - thumb_func_end ScrCmd_471 + thumb_func_end ScrCmd_GetOfferedSpecies thumb_func_start ScrCmd_NPCTradeGetReqSpecies ScrCmd_NPCTradeGetReqSpecies: ; 0x020452E0 @@ -9594,8 +9594,8 @@ ScrCmd_NPCTradeGetReqSpecies: ; 0x020452E0 .balign 4, 0 thumb_func_end ScrCmd_NPCTradeGetReqSpecies - thumb_func_start ScrCmd_612 -ScrCmd_612: ; 0x02045310 + thumb_func_start ScrCmd_GetNpcTradeUnusedFlag +ScrCmd_GetNpcTradeUnusedFlag: ; 0x02045310 push {r3, r4, r5, lr} add r5, r0, #0 add r0, #0x80 @@ -9616,7 +9616,7 @@ ScrCmd_612: ; 0x02045310 mov r0, #0 pop {r3, r4, r5, pc} .balign 4, 0 - thumb_func_end ScrCmd_612 + thumb_func_end ScrCmd_GetNpcTradeUnusedFlag thumb_func_start ScrCmd_NPCTradeExec ScrCmd_NPCTradeExec: ; 0x02045340 diff --git a/files/fielddata/script/scr_seq/scr_seq_0152_P01R0101.s b/files/fielddata/script/scr_seq/scr_seq_0152_P01R0101.s index 0c56ecb5f..27ce2ab61 100644 --- a/files/fielddata/script/scr_seq/scr_seq_0152_P01R0101.s +++ b/files/fielddata/script/scr_seq/scr_seq_0152_P01R0101.s @@ -48,7 +48,7 @@ scr_seq_P01R0101_002: play_fanfare SEQ_ME_ITEM npc_msg msg_0255_P01R0101_00011 wait_fanfare - scrcmd_463 + enable_mass_outbreaks npc_msg msg_0255_P01R0101_00012 closemsg apply_movement obj_P01R0101_ookido, _0120 @@ -66,7 +66,7 @@ scr_seq_P01R0101_002: releaseall compare VAR_UNK_40D3, 1 call_if_eq _00DE - scrcmd_463 + enable_mass_outbreaks end _00DE: diff --git a/global.inc b/global.inc index bb6864de8..b6fbaedc8 100644 --- a/global.inc +++ b/global.inc @@ -2940,10 +2940,10 @@ .public ScrCmd_458 .public ScrCmd_459 .public ScrCmd_462 -.public ScrCmd_463 +.public ScrCmd_EnableMassOutbreaks .public ScrCmd_465 .public ScrCmd_466 -.public ScrCmd_471 +.public ScrCmd_GetOfferedSpecies .public ScrCmd_475 .public ScrCmd_476 .public ScrCmd_478 @@ -3037,7 +3037,7 @@ .public ScrCmd_608 .public ScrCmd_609 .public ScrCmd_610 -.public ScrCmd_612 +.public ScrCmd_GetNpcTradeUnusedFlag .public ScrCmd_616 .public ScrCmd_617 .public ScrCmd_619 diff --git a/include/npc_trade.h b/include/npc_trade.h index 60baf67bb..77bda4971 100644 --- a/include/npc_trade.h +++ b/include/npc_trade.h @@ -31,8 +31,6 @@ typedef struct NPC_TRADE { int unk_50; } NPC_TRADE; // size=0x54 -typedef struct _NPC_TRADE_WORK NPC_TRADE_WORK; - NPC_TRADE_WORK *NPCTrade_AllocWork(HeapID heapId, u32 tradeno); void NPCTrade_DeleteWork(NPC_TRADE_WORK *work); void NPCTrade_MakeAndGiveLoanMon(FieldSystem *fsys, u8 tradeno, u8 level, u16 mapno); diff --git a/include/scrcmd.h b/include/scrcmd.h index 15d599d6e..91b56c516 100644 --- a/include/scrcmd.h +++ b/include/scrcmd.h @@ -499,7 +499,7 @@ BOOL ScrCmd_459(SCRIPTCONTEXT* ctx); BOOL ScrCmd_LoadPhoneDat(SCRIPTCONTEXT* ctx); BOOL ScrCmd_GetPhoneContactMsgIds(SCRIPTCONTEXT* ctx); BOOL ScrCmd_462(SCRIPTCONTEXT* ctx); -BOOL ScrCmd_463(SCRIPTCONTEXT* ctx); +BOOL ScrCmd_EnableMassOutbreaks(SCRIPTCONTEXT* ctx); BOOL ScrCmd_CreateRoamer(SCRIPTCONTEXT* ctx); BOOL ScrCmd_465(SCRIPTCONTEXT* ctx); BOOL ScrCmd_466(SCRIPTCONTEXT* ctx); @@ -507,7 +507,7 @@ BOOL ScrCmd_MoveRelearnerInit(SCRIPTCONTEXT* ctx); BOOL ScrCmd_MoveTutorInit(SCRIPTCONTEXT* ctx); BOOL ScrCmd_MoveRelearnerGetResult(SCRIPTCONTEXT* ctx); BOOL ScrCmd_LoadNPCTrade(SCRIPTCONTEXT* ctx); -BOOL ScrCmd_471(SCRIPTCONTEXT* ctx); +BOOL ScrCmd_GetOfferedSpecies(SCRIPTCONTEXT* ctx); BOOL ScrCmd_NPCTradeGetReqSpecies(SCRIPTCONTEXT* ctx); BOOL ScrCmd_NPCTradeExec(SCRIPTCONTEXT* ctx); BOOL ScrCmd_NPCTradeEnd(SCRIPTCONTEXT* ctx); @@ -648,7 +648,7 @@ BOOL ScrCmd_608(SCRIPTCONTEXT* ctx); BOOL ScrCmd_609(SCRIPTCONTEXT* ctx); BOOL ScrCmd_610(SCRIPTCONTEXT* ctx); BOOL ScrCmd_Pokeathlon(SCRIPTCONTEXT* ctx); -BOOL ScrCmd_612(SCRIPTCONTEXT* ctx); +BOOL ScrCmd_GetNpcTradeUnusedFlag(SCRIPTCONTEXT* ctx); BOOL ScrCmd_GetPhoneContactRandomGiftBerry(SCRIPTCONTEXT* ctx); BOOL ScrCmd_GetPhoneContactGiftItem(SCRIPTCONTEXT* ctx); BOOL ScrCmd_CameronPhoto(SCRIPTCONTEXT* ctx); diff --git a/include/script.h b/include/script.h index 4af2c8c45..2746f8013 100644 --- a/include/script.h +++ b/include/script.h @@ -38,6 +38,8 @@ typedef struct EngagedTrainer { int unk18; } EngagedTrainer; +typedef struct _NPC_TRADE_WORK NPC_TRADE_WORK; + typedef struct ScriptEnvironment { u32 check; u8 state; @@ -67,71 +69,71 @@ typedef struct ScriptEnvironment { u16 specialVars[NUM_SPECIAL_VARS]; void (*scrctx_end_cb)(FieldSystem* fsys); void *unk_AC; - u32 unk_B0; - u32 unk_B4; - u32 unk_B8; + void *genericWorkPtr; + void *unk_B4; + void *unk_B8; WINDOW unk_BC; WINDOW unk_CC; - u32 unk_DC; + void *unk_DC; } ScriptEnvironment; enum ScriptEnvField { - UNK80_10_C_10 = 0, - UNK80_10_C_14 = 1, - UNK80_10_C_24 = 2, - UNK80_10_C_05 = 3, - UNK80_10_C_NUM_ACTIVE_MOVEMENT = 4, - UNK80_10_C_07 = 5, - UNK80_10_C_08 = 6, - UNK80_10_C_NUM_ACTIVE_SCRCTX = 7, - UNK80_10_C_SCRIPT = 8, - UNK80_10_C_FACING_DIRECTION = 9, - UNK80_10_C_LAST_TALKED = 10, - UNK80_10_C_30 = 11, - UNK80_10_C_34 = 12, - UNK80_10_C_SCRCTX_0 = 13, - UNK80_10_C_SCRCTX_1 = 14, - UNK80_10_C_SCRCTX_2 = 15, - UNK80_10_C_MSGFMT = 16, - UNK80_10_C_STRBUF1 = 17, - UNK80_10_C_STRBUF2 = 18, - UNK80_10_C_50 = 19, - UNK80_10_C_AC = 20, - UNK80_10_C_B0 = 21, - UNK80_10_C_B4 = 22, - UNK80_10_C_B8 = 23, - UNK80_10_C_0C = 24, - UNK80_10_C_54_0_00 = 25, - UNK80_10_C_54_0_04 = 26, - UNK80_10_C_54_0_08 = 27, - SCRIPTENV_EYE_TRAINER_1_NUM = 28, - UNK80_10_C_54_0_10 = 29, - UNK80_10_C_54_0_14 = 30, - UNK80_10_C_54_0_18 = 31, - UNK80_10_C_54_1_00 = 32, - UNK80_10_C_54_1_04 = 33, - UNK80_10_C_54_1_08 = 34, - SCRIPTENV_EYE_TRAINER_2_NUM = 35, - UNK80_10_C_54_1_10 = 36, - UNK80_10_C_54_1_14 = 37, - UNK80_10_C_54_1_18 = 38, - UNK80_10_C_BC = 39, - UNK80_10_C_CC = 40, - UNK80_10_C_DC = 41, - UNK80_10_C_SPECIAL_VAR_8000 = 42, - UNK80_10_C_SPECIAL_VAR_8001 = 43, - UNK80_10_C_SPECIAL_VAR_8002 = 44, - UNK80_10_C_SPECIAL_VAR_8003 = 45, - UNK80_10_C_SPECIAL_VAR_8004 = 46, - UNK80_10_C_SPECIAL_VAR_8005 = 47, - UNK80_10_C_SPECIAL_VAR_8006 = 48, - UNK80_10_C_SPECIAL_VAR_8007 = 49, - UNK80_10_C_SPECIAL_VAR_8008 = 50, - UNK80_10_C_SPECIAL_VAR_8009 = 51, - UNK80_10_C_SPECIAL_VAR_800A = 52, - UNK80_10_C_SPECIAL_VAR_800B = 53, - UNK80_10_C_SPECIAL_VAR_RESULT = 54, - UNK80_10_C_SPECIAL_VAR_LAST_TALKED = 55, + SCRIPTENV_10 = 0, + SCRIPTENV_14 = 1, + SCRIPTENV_24 = 2, + SCRIPTENV_05 = 3, + SCRIPTENV_NUM_ACTIVE_MOVEMENT = 4, + SCRIPTENV_07 = 5, + SCRIPTENV_08 = 6, + SCRIPTENV_NUM_ACTIVE_SCRCTX = 7, + SCRIPTENV_SCRIPT = 8, + SCRIPTENV_FACING_DIRECTION = 9, + SCRIPTENV_LAST_TALKED = 10, + SCRIPTENV_30 = 11, + SCRIPTENV_34 = 12, + SCRIPTENV_SCRCTX_0 = 13, + SCRIPTENV_SCRCTX_1 = 14, + SCRIPTENV_SCRCTX_2 = 15, + SCRIPTENV_MSGFMT = 16, + SCRIPTENV_STRBUF1 = 17, + SCRIPTENV_STRBUF2 = 18, + SCRIPTENV_50 = 19, + SCRIPTENV_AC = 20, + SCRIPTENV_GENERIC_WORK_PTR = 21, + SCRIPTENV_B4 = 22, + SCRIPTENV_B8 = 23, + SCRIPTENV_0C = 24, + SCRIPTENV_54_0_00 = 25, + SCRIPTENV_54_0_04 = 26, + SCRIPTENV_54_0_08 = 27, + SCRIPTENV_EYE_TRAINER_1_NUM = 28, + SCRIPTENV_EYE_TRAINER_1_ENCTYPE = 29, + SCRIPTENV_EYE_TRAINER_1_OBJPTR = 30, + SCRIPTENV_54_0_18 = 31, + SCRIPTENV_54_1_00 = 32, + SCRIPTENV_54_1_04 = 33, + SCRIPTENV_54_1_08 = 34, + SCRIPTENV_EYE_TRAINER_2_NUM = 35, + SCRIPTENV_EYE_TRAINER_2_ENCTYPE = 36, + SCRIPTENV_EYE_TRAINER_2_OBJPTR = 37, + SCRIPTENV_54_1_18 = 38, + SCRIPTENV_BC = 39, + SCRIPTENV_CC = 40, + SCRIPTENV_DC = 41, + SCRIPTENV_SPECIAL_VAR_8000 = 42, + SCRIPTENV_SPECIAL_VAR_8001 = 43, + SCRIPTENV_SPECIAL_VAR_8002 = 44, + SCRIPTENV_SPECIAL_VAR_8003 = 45, + SCRIPTENV_SPECIAL_VAR_8004 = 46, + SCRIPTENV_SPECIAL_VAR_8005 = 47, + SCRIPTENV_SPECIAL_VAR_8006 = 48, + SCRIPTENV_SPECIAL_VAR_8007 = 49, + SCRIPTENV_SPECIAL_VAR_8008 = 50, + SCRIPTENV_SPECIAL_VAR_8009 = 51, + SCRIPTENV_SPECIAL_VAR_800A = 52, + SCRIPTENV_SPECIAL_VAR_800B = 53, + SCRIPTENV_SPECIAL_VAR_RESULT = 54, + SCRIPTENV_SPECIAL_VAR_LAST_TALKED = 55, }; typedef struct TaskManager TaskManager; @@ -204,7 +206,7 @@ struct FieldSystem { u8 filler24[0xC]; MAPMATRIX* map_matrix; u8 filler34[0x8]; - MapObjectMan* unk3C; + MapObjectMan* mapObjectMan; FIELD_PLAYER_AVATAR *playerAvatar; u8 filler44[0x1C]; u32 unk60; diff --git a/src/data/fieldmap/script_cmd_table.h b/src/data/fieldmap/script_cmd_table.h index 7b655d242..92adaaa2a 100644 --- a/src/data/fieldmap/script_cmd_table.h +++ b/src/data/fieldmap/script_cmd_table.h @@ -463,7 +463,7 @@ extern BOOL ScrCmd_459(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_LoadPhoneDat(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_GetPhoneContactMsgIds(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_462(SCRIPTCONTEXT *ctx); -extern BOOL ScrCmd_463(SCRIPTCONTEXT *ctx); +extern BOOL ScrCmd_EnableMassOutbreaks(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_CreateRoamer(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_465(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_466(SCRIPTCONTEXT *ctx); @@ -471,7 +471,7 @@ extern BOOL ScrCmd_MoveRelearnerInit(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_MoveTutorInit(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_MoveRelearnerGetResult(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_LoadNPCTrade(SCRIPTCONTEXT *ctx); -extern BOOL ScrCmd_471(SCRIPTCONTEXT *ctx); +extern BOOL ScrCmd_GetOfferedSpecies(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_NPCTradeGetReqSpecies(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_NPCTradeExec(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_NPCTradeEnd(SCRIPTCONTEXT *ctx); @@ -612,7 +612,7 @@ extern BOOL ScrCmd_608(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_609(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_610(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_Pokeathlon(SCRIPTCONTEXT *ctx); -extern BOOL ScrCmd_612(SCRIPTCONTEXT *ctx); +extern BOOL ScrCmd_GetNpcTradeUnusedFlag(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_GetPhoneContactRandomGiftBerry(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_GetPhoneContactGiftItem(SCRIPTCONTEXT *ctx); extern BOOL ScrCmd_CameronPhoto(SCRIPTCONTEXT *ctx); @@ -1318,7 +1318,7 @@ const ScrCmdFunc gScriptCmdTable[] = { ScrCmd_LoadPhoneDat, ScrCmd_GetPhoneContactMsgIds, ScrCmd_462, - ScrCmd_463, + ScrCmd_EnableMassOutbreaks, ScrCmd_CreateRoamer, ScrCmd_465, ScrCmd_466, @@ -1326,7 +1326,7 @@ const ScrCmdFunc gScriptCmdTable[] = { ScrCmd_MoveTutorInit, ScrCmd_MoveRelearnerGetResult, ScrCmd_LoadNPCTrade, - ScrCmd_471, + ScrCmd_GetOfferedSpecies, ScrCmd_NPCTradeGetReqSpecies, ScrCmd_NPCTradeExec, ScrCmd_NPCTradeEnd, @@ -1467,7 +1467,7 @@ const ScrCmdFunc gScriptCmdTable[] = { ScrCmd_609, ScrCmd_610, ScrCmd_Pokeathlon, - ScrCmd_612, + ScrCmd_GetNpcTradeUnusedFlag, ScrCmd_GetPhoneContactRandomGiftBerry, ScrCmd_GetPhoneContactGiftItem, ScrCmd_CameronPhoto, diff --git a/src/field_follow_poke.c b/src/field_follow_poke.c index 8370e0cd7..a24ba973b 100644 --- a/src/field_follow_poke.c +++ b/src/field_follow_poke.c @@ -1580,7 +1580,7 @@ void sub_02069B74(MapObjectMan *mapObjectMan, u32 mapno) { species = GetMonData(pokemon, MON_DATA_SPECIES, NULL); FsysUnkSub108_Set(fsys->unk108, pokemon, species, GetMonData(pokemon, MON_DATA_PERSONALITY, NULL)); if (GetFollowPokePermissionBySpeciesAndMap(species, mapno)) { - followPokeObj = GetMapObjectByID(fsys->unk3C, obj_partner_poke); + followPokeObj = GetMapObjectByID(fsys->mapObjectMan, obj_partner_poke); if (followPokeObj == NULL) { fsys->followMon.unk15 = 1; } else { @@ -1613,7 +1613,7 @@ void sub_02069B74(MapObjectMan *mapObjectMan, u32 mapno) { sub_0205F6AC(fsys->followMon.mapObject, 0); } } else { - followPokeObj = GetMapObjectByID(fsys->unk3C, obj_partner_poke); + followPokeObj = GetMapObjectByID(fsys->mapObjectMan, obj_partner_poke); if (followPokeObj != NULL) { forme = GetMonData(pokemon, MON_DATA_FORME, NULL); gender = GetMonGender(pokemon); diff --git a/src/field_use_item.c b/src/field_use_item.c index 58bbe065e..841ac5e34 100644 --- a/src/field_use_item.c +++ b/src/field_use_item.c @@ -196,10 +196,10 @@ static BOOL Task_UseItemInAlphChamber(TaskManager *taskManager) { case 0: Fsys_GetFacingObject(fsys, &sp0); QueueScript(taskManager, env->scriptNo, sp0, NULL); - *(u16 *)FieldSysGetAttrAddr(fsys, UNK80_10_C_SPECIAL_VAR_8000) = env->var_8000; - *(u16 *)FieldSysGetAttrAddr(fsys, UNK80_10_C_SPECIAL_VAR_8001) = env->var_8001; - *(u16 *)FieldSysGetAttrAddr(fsys, UNK80_10_C_SPECIAL_VAR_8002) = env->var_8002; - *(u16 *)FieldSysGetAttrAddr(fsys, UNK80_10_C_SPECIAL_VAR_8003) = env->var_8003; + *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8000) = env->var_8000; + *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8001) = env->var_8001; + *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8002) = env->var_8002; + *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8003) = env->var_8003; (*state_p)++; break; case 1: @@ -304,7 +304,7 @@ static BOOL Task_MountOrDismountBicycle(TaskManager *taskManager) { (*state_p)++; break; case 2: - MapObjectMan_UnpauseAllMovement(fsys->unk3C); + MapObjectMan_UnpauseAllMovement(fsys->mapObjectMan); return TRUE; } @@ -489,7 +489,7 @@ static BOOL Task_PrintRegisteredKeyItemUseMessage(TaskManager *taskManager) { switch (env->state) { case 0: fsys->unkD2_6 = TRUE; - MapObjectMan_PauseAllMovement(fsys->unk3C); + MapObjectMan_PauseAllMovement(fsys->mapObjectMan); sub_0205B514(fsys->bg_config, &env->window, 3); options = Sav2_PlayerData_GetOptionsAddr(fsys->savedata); sub_0205B564(&env->window, options); @@ -506,7 +506,7 @@ static BOOL Task_PrintRegisteredKeyItemUseMessage(TaskManager *taskManager) { } break; case 2: - MapObjectMan_UnpauseAllMovement(fsys->unk3C); + MapObjectMan_UnpauseAllMovement(fsys->mapObjectMan); RemoveWindow(&env->window); String_dtor(env->strbuf); FreeToHeap(env); @@ -659,7 +659,7 @@ static BOOL Task_ActivateDowsingMchnUI(TaskManager *taskManager) { break; case 1: if (ov01_021F6B10(fsys) == TRUE) { - MapObjectMan_UnpauseAllMovement(fsys->unk3C); + MapObjectMan_UnpauseAllMovement(fsys->mapObjectMan); return TRUE; } break; @@ -815,7 +815,7 @@ static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager) { switch (env->state) { case 0: - MapObjectMan_PauseAllMovement(fsys->unk3C); + MapObjectMan_PauseAllMovement(fsys->mapObjectMan); ov01_021E636C(0); env->state = 1; break; @@ -843,14 +843,14 @@ static BOOL Task_RegisteredItem_GoToApp(TaskManager *taskManager) { break; case 4: if (sub_020505C8(fsys)) { - MapObjectMan_PauseAllMovement(fsys->unk3C); + MapObjectMan_PauseAllMovement(fsys->mapObjectMan); ov01_021E636C(1); env->state = 5; } break; case 5: if (IsPaletteFadeActive()) { - MapObjectMan_UnpauseAllMovement(fsys->unk3C); + MapObjectMan_UnpauseAllMovement(fsys->mapObjectMan); FreeToHeap(env); return TRUE; } diff --git a/src/field_warp_tasks.c b/src/field_warp_tasks.c index e6a6c4469..304090eb0 100644 --- a/src/field_warp_tasks.c +++ b/src/field_warp_tasks.c @@ -222,15 +222,15 @@ static void sub_0205316C(FieldSystem *fsys) { if (fsys->unkAC) { gender = PlayerProfile_GetTrainerGender(Sav2_PlayerData_GetProfileAddr(fsys->savedata)); avatar_sub = SaveFlyPoints_GetPlayerSub(Save_FlyPoints_get(fsys->savedata)); - fsys->playerAvatar = sub_0205C390(fsys->unk3C, fsys->location->x, fsys->location->z, fsys->location->direction, avatar_sub->unk4, gender, 2, avatar_sub); + fsys->playerAvatar = sub_0205C390(fsys->mapObjectMan, fsys->location->x, fsys->location->z, fsys->location->direction, avatar_sub->unk4, gender, 2, avatar_sub); } else { - fsys->unk3C = sub_0205E0BC(fsys, 64, 5); + fsys->mapObjectMan = sub_0205E0BC(fsys, 64, 5); gender = PlayerProfile_GetTrainerGender(Sav2_PlayerData_GetProfileAddr(fsys->savedata)); avatar_sub = SaveFlyPoints_GetPlayerSub(Save_FlyPoints_get(fsys->savedata)); - fsys->playerAvatar = sub_0205C390(fsys->unk3C, fsys->location->x, fsys->location->z, fsys->location->direction, avatar_sub->unk4, gender, 2, avatar_sub); - sub_020699F8(fsys->unk3C, fsys->location->x, fsys->location->z, fsys->location->direction, fsys->location->mapId); + fsys->playerAvatar = sub_0205C390(fsys->mapObjectMan, fsys->location->x, fsys->location->z, fsys->location->direction, avatar_sub->unk4, gender, 2, avatar_sub); + sub_020699F8(fsys->mapObjectMan, fsys->location->x, fsys->location->z, fsys->location->direction, fsys->location->mapId); Field_InitMapObjectsFromZoneEventData(fsys); - sub_0205F55C(fsys->unk3C); + sub_0205F55C(fsys->mapObjectMan); } } @@ -240,8 +240,8 @@ static void sub_02053210(FieldSystem *fsys) { } else { sub_02056E38(); sub_0205C4C4(fsys->playerAvatar); - sub_0205E494(fsys->unk3C); - sub_0205E0E8(fsys->unk3C); + sub_0205E494(fsys->mapObjectMan); + sub_0205E0E8(fsys->mapObjectMan); } } @@ -249,13 +249,13 @@ static void sub_0205323C(FieldSystem *fsys) { u32 gender; struct FlypointsPlayerSub *avatar_sub; - fsys->unk3C = sub_0205E0BC(fsys, 64, 5); + fsys->mapObjectMan = sub_0205E0BC(fsys, 64, 5); sub_0203B9F4(fsys); avatar_sub = SaveFlyPoints_GetPlayerSub(Save_FlyPoints_get(fsys->savedata)); gender = PlayerProfile_GetTrainerGender(Sav2_PlayerData_GetProfileAddr(fsys->savedata)); - fsys->playerAvatar = sub_0205C408(fsys->unk3C, avatar_sub, gender); - sub_02069B74(fsys->unk3C, fsys->location->mapId); - sub_0205F55C(fsys->unk3C); + fsys->playerAvatar = sub_0205C408(fsys->mapObjectMan, avatar_sub, gender); + sub_02069B74(fsys->mapObjectMan, fsys->location->mapId); + sub_0205F55C(fsys->mapObjectMan); } static void sub_02053284(FieldSystem *fsys) { diff --git a/src/fieldmap.c b/src/fieldmap.c index 62ab53e48..de4d279b5 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -156,7 +156,7 @@ void DestroyScriptContext(SCRIPTCONTEXT *ctx) { } void SetupScriptEngine(FieldSystem *fsys, ScriptEnvironment *env, u16 script, LocalMapObject *lastTalked, void* a4) { - u16 *varLastTalked = FieldSysGetAttrAddrInternal(env, UNK80_10_C_SPECIAL_VAR_LAST_TALKED); + u16 *varLastTalked = FieldSysGetAttrAddrInternal(env, SCRIPTENV_SPECIAL_VAR_LAST_TALKED); env->facingDirection = PlayerAvatar_GetFacingDirection(fsys->playerAvatar); env->lastTalked = lastTalked; env->script = script; @@ -218,103 +218,103 @@ void LoadScriptsAndMessagesForCurrentMap(FieldSystem *fsys, SCRIPTCONTEXT *ctx) void *FieldSysGetAttrAddrInternal(ScriptEnvironment *unk, enum ScriptEnvField field) { switch (field) { - case UNK80_10_C_10: + case SCRIPTENV_10: return &unk->unk_10; - case UNK80_10_C_14: + case SCRIPTENV_14: return &unk->unk_14; - case UNK80_10_C_24: + case SCRIPTENV_24: return &unk->unk_24; - case UNK80_10_C_05: + case SCRIPTENV_05: return &unk->unk_5; - case UNK80_10_C_NUM_ACTIVE_MOVEMENT: + case SCRIPTENV_NUM_ACTIVE_MOVEMENT: return &unk->numActiveMovement; - case UNK80_10_C_07: + case SCRIPTENV_07: return &unk->unk_7; - case UNK80_10_C_08: + case SCRIPTENV_08: return &unk->unk_8; - case UNK80_10_C_NUM_ACTIVE_SCRCTX: + case SCRIPTENV_NUM_ACTIVE_SCRCTX: return &unk->numActiveScrCtx; - case UNK80_10_C_SCRIPT: + case SCRIPTENV_SCRIPT: return &unk->script; - case UNK80_10_C_FACING_DIRECTION: + case SCRIPTENV_FACING_DIRECTION: return &unk->facingDirection; - case UNK80_10_C_LAST_TALKED: + case SCRIPTENV_LAST_TALKED: return &unk->lastTalked; - case UNK80_10_C_30: + case SCRIPTENV_30: return &unk->unk_30; - case UNK80_10_C_34: + case SCRIPTENV_34: return &unk->unk_34; - case UNK80_10_C_SCRCTX_0: - case UNK80_10_C_SCRCTX_1: - case UNK80_10_C_SCRCTX_2: - return &unk->scriptContexts[field - UNK80_10_C_SCRCTX_0]; - case UNK80_10_C_MSGFMT: + case SCRIPTENV_SCRCTX_0: + case SCRIPTENV_SCRCTX_1: + case SCRIPTENV_SCRCTX_2: + return &unk->scriptContexts[field - SCRIPTENV_SCRCTX_0]; + case SCRIPTENV_MSGFMT: return &unk->msgfmt; - case UNK80_10_C_STRBUF1: + case SCRIPTENV_STRBUF1: return &unk->strbuf1; - case UNK80_10_C_STRBUF2: + case SCRIPTENV_STRBUF2: return &unk->strbuf2; - case UNK80_10_C_50: + case SCRIPTENV_50: return &unk->unk_50; - case UNK80_10_C_AC: + case SCRIPTENV_AC: return &unk->unk_AC; - case UNK80_10_C_B0: - return &unk->unk_B0; - case UNK80_10_C_B4: + case SCRIPTENV_GENERIC_WORK_PTR: + return &unk->genericWorkPtr; + case SCRIPTENV_B4: return &unk->unk_B4; - case UNK80_10_C_B8: + case SCRIPTENV_B8: return &unk->unk_B8; - case UNK80_10_C_0C: + case SCRIPTENV_0C: return &unk->unk_C; - case UNK80_10_C_54_0_00: + case SCRIPTENV_54_0_00: return &unk->engagedTrainers[0].unk0; - case UNK80_10_C_54_0_04: + case SCRIPTENV_54_0_04: return &unk->engagedTrainers[0].unk4; - case UNK80_10_C_54_0_08: + case SCRIPTENV_54_0_08: return &unk->engagedTrainers[0].unk8; case SCRIPTENV_EYE_TRAINER_1_NUM: return &unk->engagedTrainers[0].trainerNum; - case UNK80_10_C_54_0_10: + case SCRIPTENV_EYE_TRAINER_1_ENCTYPE: return &unk->engagedTrainers[0].encounterType; - case UNK80_10_C_54_0_14: + case SCRIPTENV_EYE_TRAINER_1_OBJPTR: return &unk->engagedTrainers[0].objectEvent; - case UNK80_10_C_54_0_18: + case SCRIPTENV_54_0_18: return &unk->engagedTrainers[0].unk18; - case UNK80_10_C_54_1_00: + case SCRIPTENV_54_1_00: return &unk->engagedTrainers[1].unk0; - case UNK80_10_C_54_1_04: + case SCRIPTENV_54_1_04: return &unk->engagedTrainers[1].unk4; - case UNK80_10_C_54_1_08: + case SCRIPTENV_54_1_08: return &unk->engagedTrainers[1].unk8; case SCRIPTENV_EYE_TRAINER_2_NUM: return &unk->engagedTrainers[1].trainerNum; - case UNK80_10_C_54_1_10: + case SCRIPTENV_EYE_TRAINER_2_ENCTYPE: return &unk->engagedTrainers[1].encounterType; - case UNK80_10_C_54_1_14: + case SCRIPTENV_EYE_TRAINER_2_OBJPTR: return &unk->engagedTrainers[1].objectEvent; - case UNK80_10_C_54_1_18: + case SCRIPTENV_54_1_18: return &unk->engagedTrainers[1].unk18; - case UNK80_10_C_BC: + case SCRIPTENV_BC: return &unk->unk_BC; - case UNK80_10_C_CC: + case SCRIPTENV_CC: return &unk->unk_CC; - case UNK80_10_C_DC: + case SCRIPTENV_DC: return &unk->unk_DC; - case UNK80_10_C_SPECIAL_VAR_8000: - case UNK80_10_C_SPECIAL_VAR_8001: - case UNK80_10_C_SPECIAL_VAR_8002: - case UNK80_10_C_SPECIAL_VAR_8003: - case UNK80_10_C_SPECIAL_VAR_8004: - case UNK80_10_C_SPECIAL_VAR_8005: - case UNK80_10_C_SPECIAL_VAR_8006: - case UNK80_10_C_SPECIAL_VAR_8007: - case UNK80_10_C_SPECIAL_VAR_8008: - case UNK80_10_C_SPECIAL_VAR_8009: - case UNK80_10_C_SPECIAL_VAR_800A: - case UNK80_10_C_SPECIAL_VAR_800B: - case UNK80_10_C_SPECIAL_VAR_RESULT: - case UNK80_10_C_SPECIAL_VAR_LAST_TALKED: - return &unk->specialVars[field - UNK80_10_C_SPECIAL_VAR_8000]; + case SCRIPTENV_SPECIAL_VAR_8000: + case SCRIPTENV_SPECIAL_VAR_8001: + case SCRIPTENV_SPECIAL_VAR_8002: + case SCRIPTENV_SPECIAL_VAR_8003: + case SCRIPTENV_SPECIAL_VAR_8004: + case SCRIPTENV_SPECIAL_VAR_8005: + case SCRIPTENV_SPECIAL_VAR_8006: + case SCRIPTENV_SPECIAL_VAR_8007: + case SCRIPTENV_SPECIAL_VAR_8008: + case SCRIPTENV_SPECIAL_VAR_8009: + case SCRIPTENV_SPECIAL_VAR_800A: + case SCRIPTENV_SPECIAL_VAR_800B: + case SCRIPTENV_SPECIAL_VAR_RESULT: + case SCRIPTENV_SPECIAL_VAR_LAST_TALKED: + return &unk->specialVars[field - SCRIPTENV_SPECIAL_VAR_8000]; default: GF_ASSERT(0); return NULL; @@ -355,7 +355,7 @@ u16 *GetVarPointer(FieldSystem *fsys, u16 varIdx) { } else if (varIdx < SPECIAL_VAR_BASE) { return GetVarAddr(state, varIdx); } else { - return FieldSysGetAttrAddr(fsys, UNK80_10_C_SPECIAL_VAR_8000 + varIdx - SPECIAL_VAR_BASE); + return FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8000 + varIdx - SPECIAL_VAR_BASE); } } @@ -413,10 +413,10 @@ void ClearDailyFlags(FieldSystem *fsys) { } void FieldMoveArgsSet(FieldSystem *fsys, u16 v8000, u16 v8001, u16 v8002, u16 v8003) { - *(u16 *)FieldSysGetAttrAddr(fsys, UNK80_10_C_SPECIAL_VAR_8000) = v8000; - *(u16 *)FieldSysGetAttrAddr(fsys, UNK80_10_C_SPECIAL_VAR_8001) = v8001; - *(u16 *)FieldSysGetAttrAddr(fsys, UNK80_10_C_SPECIAL_VAR_8002) = v8002; - *(u16 *)FieldSysGetAttrAddr(fsys, UNK80_10_C_SPECIAL_VAR_8003) = v8003; + *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8000) = v8000; + *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8001) = v8001; + *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8002) = v8002; + *(u16 *)FieldSysGetAttrAddr(fsys, SCRIPTENV_SPECIAL_VAR_8003) = v8003; } u16 ScriptNumToTrainerNum(u16 script) { @@ -484,9 +484,9 @@ BOOL GetHiddenItemParams(ScriptEnvironment *env, u16 script) { u16 *var_8001; u16 *var_8002; - var_8000 = FieldSysGetAttrAddrInternal(env, UNK80_10_C_SPECIAL_VAR_8000); - var_8001 = FieldSysGetAttrAddrInternal(env, UNK80_10_C_SPECIAL_VAR_8001); - var_8002 = FieldSysGetAttrAddrInternal(env, UNK80_10_C_SPECIAL_VAR_8002); + var_8000 = FieldSysGetAttrAddrInternal(env, SCRIPTENV_SPECIAL_VAR_8000); + var_8001 = FieldSysGetAttrAddrInternal(env, SCRIPTENV_SPECIAL_VAR_8001); + var_8002 = FieldSysGetAttrAddrInternal(env, SCRIPTENV_SPECIAL_VAR_8002); table = sHiddenItemParam; idx = HiddenItemScriptNoToHiddenItemIdx(script); diff --git a/src/map_events.c b/src/map_events.c index d2a8790cc..72b3a00ed 100644 --- a/src/map_events.c +++ b/src/map_events.c @@ -36,7 +36,7 @@ void Field_InitMapObjectsFromZoneEventData(FieldSystem *fsys) { u32 obj_count = fsys->map_events->num_object_events; GF_ASSERT(fsys->map_events != NULL); if (obj_count != 0) { - InitMapObjectsFromEventTemplates(fsys->unk3C, fsys->location->mapId, obj_count, fsys->map_events->object_events); + InitMapObjectsFromEventTemplates(fsys->mapObjectMan, fsys->location->mapId, obj_count, fsys->map_events->object_events); } } diff --git a/src/save_flypoints.c b/src/save_flypoints.c index da9c565d5..1b386bc83 100644 --- a/src/save_flypoints.c +++ b/src/save_flypoints.c @@ -122,7 +122,7 @@ struct SavStructUnk10 *sub_0203B9D0(SAVEDATA *saveData) { void sub_0203B9DC(FieldSystem *fsys) { struct SavStructUnk10 *unk = sub_0203B9D0(fsys->savedata); - sub_0205E5EC(fsys, fsys->unk3C, unk->subs, 64); + sub_0205E5EC(fsys, fsys->mapObjectMan, unk->subs, 64); } void sub_0203B9F4(FieldSystem *fsys) { @@ -142,5 +142,5 @@ void sub_0203B9F4(FieldSystem *fsys) { follower->unk_12 = SPRITE_TSURE_POKE_SHAYMIN; } } - sub_0205E648(fsys->unk3C, unk->subs, 64); + sub_0205E648(fsys->mapObjectMan, unk->subs, 64); } diff --git a/src/scrcmd_c.c b/src/scrcmd_c.c index 1ed7ef59d..f06bfd8d8 100644 --- a/src/scrcmd_c.c +++ b/src/scrcmd_c.c @@ -213,8 +213,8 @@ BOOL ScrCmd_CompareVarToVar(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_RunScript(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, UNK80_10_C_NUM_ACTIVE_SCRCTX); - SCRIPTCONTEXT** new_context_ptr = FieldSysGetAttrAddr(fsys, UNK80_10_C_SCRCTX_1); + u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_NUM_ACTIVE_SCRCTX); + SCRIPTCONTEXT** new_context_ptr = FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRCTX_1); u16 script_to_run = ScriptReadHalfword(ctx); *new_context_ptr = CreateScriptContext(fsys, script_to_run); @@ -227,9 +227,9 @@ static BOOL ScrNative_WaitStd(SCRIPTCONTEXT* ctx); BOOL ScrCmd_CallStd(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* unk = FieldSysGetAttrAddr(fsys, UNK80_10_C_07); - u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, UNK80_10_C_NUM_ACTIVE_SCRCTX); - SCRIPTCONTEXT** new_context_ptr = (SCRIPTCONTEXT**)FieldSysGetAttrAddr(fsys, UNK80_10_C_SCRCTX_0 + *num_active_script_contexts); + u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_07); + u8* num_active_script_contexts = FieldSysGetAttrAddr(fsys, SCRIPTENV_NUM_ACTIVE_SCRCTX); + SCRIPTCONTEXT** new_context_ptr = (SCRIPTCONTEXT**)FieldSysGetAttrAddr(fsys, SCRIPTENV_SCRCTX_0 + *num_active_script_contexts); u16 script_to_run = ScriptReadHalfword(ctx); SCRIPTCONTEXT* new_context = CreateScriptContext(fsys, script_to_run); @@ -246,16 +246,16 @@ BOOL ScrCmd_CallStd(SCRIPTCONTEXT* ctx) { static BOOL ScrNative_WaitStd(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* unk = FieldSysGetAttrAddr(fsys, UNK80_10_C_07); - u8* unused = FieldSysGetAttrAddr(fsys, UNK80_10_C_NUM_ACTIVE_SCRCTX); + u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_07); + u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_NUM_ACTIVE_SCRCTX); return (*unk & (1 << ctx->id)) == 0; } BOOL ScrCmd_RestartCurrentScript(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - u8* unk = FieldSysGetAttrAddr(fsys, UNK80_10_C_07); - u8* unused = FieldSysGetAttrAddr(fsys, UNK80_10_C_NUM_ACTIVE_SCRCTX); + u8* unk = FieldSysGetAttrAddr(fsys, SCRIPTENV_07); + u8* unused = FieldSysGetAttrAddr(fsys, SCRIPTENV_NUM_ACTIVE_SCRCTX); *unk ^= (1 << (ctx->id - 1)); return FALSE; @@ -269,7 +269,7 @@ BOOL ScrCmd_GoTo(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_ObjectGoTo(SCRIPTCONTEXT* ctx) { - LocalMapObject** lmo = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_LAST_TALKED); + LocalMapObject** lmo = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_LAST_TALKED); u8 id = ScriptReadByte(ctx); u32 offset_in_script = ScriptReadWord(ctx); @@ -293,7 +293,7 @@ BOOL ScrCmd_BgGoTo(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_DirectionGoTo(SCRIPTCONTEXT* ctx) { - u32* direction = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_FACING_DIRECTION); + u32* direction = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_FACING_DIRECTION); u8 required_direction = ScriptReadByte(ctx); u32 offset_in_script = ScriptReadWord(ctx); diff --git a/src/scrcmd_daycare.c b/src/scrcmd_daycare.c index 527692f19..950f3db86 100644 --- a/src/scrcmd_daycare.c +++ b/src/scrcmd_daycare.c @@ -14,7 +14,7 @@ static LocalMapObject* CreateDayCareMonSpriteInternal(MapObjectMan* object_man, BOOL ScrCmd_BufferDayCareMonNicks(SCRIPTCONTEXT* ctx) { SAVEDATA* savedata = ctx->fsys->savedata; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); DAYCARE* daycare = Sav2_DayCare_get(savedata); Sav2_DayCare_BufferStoredMonNicks(daycare, *msg_fmt); @@ -54,7 +54,7 @@ BOOL ScrCmd_GiveDayCareEgg(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_RetrieveDayCareMon(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); SAVEDATA* savedata = fsys->savedata; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 daycare_mon_idx = ScriptGetVar(ctx); @@ -68,7 +68,7 @@ BOOL ScrCmd_RetrieveDayCareMon(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferDayCareWithdrawCost(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); SAVEDATA* savedata = fsys->savedata; u16* ret_ptr = ScriptGetVarPointer(ctx); u16 daycare_mon_idx = ScriptGetVar(ctx); @@ -81,7 +81,7 @@ BOOL ScrCmd_BufferDayCareWithdrawCost(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferDayCareMonGrowth(SCRIPTCONTEXT* ctx) { SAVEDATA* savedata = ctx->fsys->savedata; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u16* ret_ptr = ScriptGetVarPointer(ctx); u16 daycare_mon_idx = ScriptGetVar(ctx); DAYCARE* daycare = SavArray_get(savedata, SAVE_DAYCARE); @@ -93,7 +93,7 @@ BOOL ScrCmd_BufferDayCareMonGrowth(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_GetTailDayCareMonSpeciesAndNick(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u16* ret_ptr = ScriptGetVarPointer(ctx); DAYCARE* daycare = Sav2_DayCare_get(fsys->savedata); @@ -116,7 +116,7 @@ BOOL ScrCmd_PutMonInDayCare(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferDayCareMonStats(SCRIPTCONTEXT* ctx) { SAVEDATA* savedata = ctx->fsys->savedata; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u16 nickname_idx = ScriptGetVar(ctx); u16 level_idx = ScriptGetVar(ctx); u16 gender_idx = ScriptGetVar(ctx); @@ -157,7 +157,7 @@ BOOL ScrCmd_UpdateDayCareMonObjects(SCRIPTCONTEXT* ctx) { daycare = Sav2_DayCare_get(fsys->savedata); for (s32 dc_mon_idx = 0, y = 5, x = 8; dc_mon_idx < 2; dc_mon_idx++, y += 4, x += 2) { - LocalMapObject* mon_map_object = GetMapObjectByID(fsys->unk3C, obj_daycare_poke_1 + dc_mon_idx); + LocalMapObject* mon_map_object = GetMapObjectByID(fsys->mapObjectMan, obj_daycare_poke_1 + dc_mon_idx); if (mon_map_object) { DeleteMapObject(mon_map_object); } @@ -172,7 +172,7 @@ BOOL ScrCmd_UpdateDayCareMonObjects(SCRIPTCONTEXT* ctx) { u32 gender = GetBoxMonData(dc_box_mon, MON_DATA_GENDER, NULL); BOOL shiny = BoxMonIsShiny(dc_box_mon); - CreateDayCareMonSpriteInternal(fsys->unk3C, (u8)dc_mon_idx, species, forme, gender, 1, x, y, fsys->location->mapId, shiny); + CreateDayCareMonSpriteInternal(fsys->mapObjectMan, (u8)dc_mon_idx, species, forme, gender, 1, x, y, fsys->location->mapId, shiny); } return FALSE; diff --git a/src/scrcmd_size_record.c b/src/scrcmd_size_record.c index 1411e3c42..c755fda77 100644 --- a/src/scrcmd_size_record.c +++ b/src/scrcmd_size_record.c @@ -70,7 +70,7 @@ static void FormatSizeRecord(FieldSystem *fsys, u8 idx0, u8 idx1, u16 species, u u32 score; u32 r4; - msgFmt = FieldSysGetAttrAddr(fsys, UNK80_10_C_MSGFMT); + msgFmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); score = GetMonSize(species, rand); r4 = LengthConvertToImperial(score); BufferIntegerAsString(*msgFmt, idx0, r4 / 10, 3, STRCONVMODE_LEFT_ALIGN, TRUE); diff --git a/src/scrcmd_strbuf.c b/src/scrcmd_strbuf.c index 376786f5e..ba5f5fde0 100644 --- a/src/scrcmd_strbuf.c +++ b/src/scrcmd_strbuf.c @@ -18,7 +18,7 @@ extern u32 sub_0208E55C(u8, u32); extern u32 sub_0205BB1C(u32 num); BOOL ScrCmd_BufferStatName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u8 stat_id = ScriptGetVar(ctx); @@ -29,7 +29,7 @@ BOOL ScrCmd_BufferStatName(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferPlayersName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); PLAYERPROFILE* profile = Sav2_PlayerData_GetProfileAddr(Fsys_GetSaveDataPtr(fsys)); @@ -40,7 +40,7 @@ BOOL ScrCmd_BufferPlayersName(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferRivalsName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); BufferRivalsName(*msg_fmt, idx, fsys->savedata); @@ -50,7 +50,7 @@ BOOL ScrCmd_BufferRivalsName(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferFriendsName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); BufferFriendsName(*msg_fmt, idx, fsys->savedata); @@ -60,7 +60,7 @@ BOOL ScrCmd_BufferFriendsName(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferMonSpeciesName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 party_mon_idx = ScriptGetVar(ctx); @@ -72,7 +72,7 @@ BOOL ScrCmd_BufferMonSpeciesName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferTypeName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 type_id = ScriptGetVar(ctx); @@ -82,7 +82,7 @@ BOOL ScrCmd_BufferTypeName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferItemName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); @@ -92,7 +92,7 @@ BOOL ScrCmd_BufferItemName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferPocketName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 pocket_id = ScriptGetVar(ctx); @@ -102,7 +102,7 @@ BOOL ScrCmd_BufferPocketName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferTMHMMoveName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 move_id = ScriptGetVar(ctx); @@ -112,7 +112,7 @@ BOOL ScrCmd_BufferTMHMMoveName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferMoveName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 move_id = ScriptGetVar(ctx); @@ -122,7 +122,7 @@ BOOL ScrCmd_BufferMoveName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferInt(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 number = ScriptGetVar(ctx); @@ -132,7 +132,7 @@ BOOL ScrCmd_BufferInt(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferIntEx(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 number = ScriptGetVar(ctx); u8 str_conv_mode = ScriptReadByte(ctx); @@ -149,7 +149,7 @@ BOOL ScrCmd_BufferIntEx(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_661(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u32 number = ScriptReadWord(ctx); u8 str_conv_mode = ScriptReadByte(ctx); @@ -167,7 +167,7 @@ BOOL ScrCmd_661(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferPartyMonNick(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 party_mon_idx = ScriptGetVar(ctx); @@ -181,7 +181,7 @@ BOOL ScrCmd_BufferPartyMonNick(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferBoxMonNick(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; PC_STORAGE* pc = GetStoragePCPointer(fsys->savedata); - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 box_mon_slot = ScriptGetVar(ctx); @@ -192,7 +192,7 @@ BOOL ScrCmd_BufferBoxMonNick(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferTrainerClassName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 trainer_class_id = ScriptGetVar(ctx); @@ -205,7 +205,7 @@ BOOL ScrCmd_BufferPlayerUnionAvatarClassName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; SAVEDATA* savedata = Fsys_GetSaveDataPtr(fsys); PLAYERPROFILE* profile = Sav2_PlayerData_GetProfileAddr(savedata); - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u32 gender = PlayerProfile_GetTrainerGender(profile); u8 avatar = PlayerProfile_GetAvatar(profile); @@ -216,7 +216,7 @@ BOOL ScrCmd_BufferPlayerUnionAvatarClassName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferSpeciesName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 species = ScriptGetVar(ctx); u16 unk2 = ScriptReadHalfword(ctx); @@ -237,7 +237,7 @@ STRING* _get_species_name(u16 species, HeapID heap_id) { } BOOL ScrCmd_BufferStarterSpeciesName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 species = GetStarterFromScriptState(SavArray_Flags_get(ctx->fsys->savedata)); @@ -249,7 +249,7 @@ BOOL ScrCmd_BufferStarterSpeciesName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferDPPtRivalStarterSpeciesName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 species = DPPtLeftover_GetRivalSpecies(SavArray_Flags_get(ctx->fsys->savedata)); @@ -261,7 +261,7 @@ BOOL ScrCmd_BufferDPPtRivalStarterSpeciesName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferDPPtFriendStarterSpeciesName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 species = DPPtLeftover_GetFriendStarterSpecies(SavArray_Flags_get(ctx->fsys->savedata)); @@ -273,7 +273,7 @@ BOOL ScrCmd_BufferDPPtFriendStarterSpeciesName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferDecorationName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 decoration_id = ScriptGetVar(ctx); @@ -284,7 +284,7 @@ BOOL ScrCmd_BufferDecorationName(SCRIPTCONTEXT* ctx) { // This may be what's left of ScrCmd_GetUndergroundTrapName from D/P/Pt. BOOL ScrCmd_208(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 unused_id = ScriptGetVar(ctx); @@ -293,7 +293,7 @@ BOOL ScrCmd_208(SCRIPTCONTEXT* ctx) { // This may be what's left of ScrCmd_GetUndergroundItemName from D/P/Pt. BOOL ScrCmd_209(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 unused_id = ScriptGetVar(ctx); @@ -302,7 +302,7 @@ BOOL ScrCmd_209(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferMapSecName(SCRIPTCONTEXT* ctx) { STRING* str = String_ctor(22, 4); - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 mapno = ScriptGetVar(ctx); @@ -314,7 +314,7 @@ BOOL ScrCmd_BufferMapSecName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferBerryName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 berry_id = ScriptGetVar(ctx); u16 unk = ScriptGetVar(ctx); @@ -327,7 +327,7 @@ BOOL ScrCmd_BufferBerryName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferNatureName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 nature_id = ScriptGetVar(ctx); @@ -337,7 +337,7 @@ BOOL ScrCmd_BufferNatureName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferFashionName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 fashion_id = ScriptGetVar(ctx); @@ -348,7 +348,7 @@ BOOL ScrCmd_BufferFashionName(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferPartyMonMoveName(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 party_slot = ScriptGetVar(ctx); u16 move_slot = ScriptGetVar(ctx); @@ -362,7 +362,7 @@ BOOL ScrCmd_BufferPartyMonMoveName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferRibbonName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u8 unk = ScriptGetVar(ctx); @@ -373,7 +373,7 @@ BOOL ScrCmd_BufferRibbonName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferSealName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 seal_id = ScriptGetVar(ctx); @@ -383,7 +383,7 @@ BOOL ScrCmd_BufferSealName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferTrainerName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 trainer_id = ScriptGetVar(ctx); @@ -393,7 +393,7 @@ BOOL ScrCmd_BufferTrainerName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferApricornName(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u8 apricorn_id = ScriptGetVar(ctx); @@ -403,7 +403,7 @@ BOOL ScrCmd_BufferApricornName(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferItemNameIndef(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); @@ -413,7 +413,7 @@ BOOL ScrCmd_BufferItemNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferItemNamePlural(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); @@ -424,7 +424,7 @@ BOOL ScrCmd_BufferItemNamePlural(SCRIPTCONTEXT* ctx) { BOOL ScrCmd_BufferPartyMonSpeciesNameIndef(SCRIPTCONTEXT* ctx) { FieldSystem* fsys = ctx->fsys; - MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 party_mon_slot = ScriptGetVar(ctx); @@ -436,7 +436,7 @@ BOOL ScrCmd_BufferPartyMonSpeciesNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferSpeciesNameIndef(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 item_id = ScriptGetVar(ctx); u16 unused1 = ScriptReadHalfword(ctx); @@ -448,7 +448,7 @@ BOOL ScrCmd_BufferSpeciesNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferDPPtFriendStarterSpeciesNameIndef(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 species = DPPtLeftover_GetFriendStarterSpecies(SavArray_Flags_get(ctx->fsys->savedata)); @@ -458,7 +458,7 @@ BOOL ScrCmd_BufferDPPtFriendStarterSpeciesNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferFashionNameIndef(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 fashion_id = ScriptGetVar(ctx); @@ -468,7 +468,7 @@ BOOL ScrCmd_BufferFashionNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferTrainerClassNameIndef(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 trainer_class_id = ScriptGetVar(ctx); @@ -478,7 +478,7 @@ BOOL ScrCmd_BufferTrainerClassNameIndef(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_BufferSealNamePlural(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); u16 seal_id = ScriptGetVar(ctx); @@ -488,7 +488,7 @@ BOOL ScrCmd_BufferSealNamePlural(SCRIPTCONTEXT* ctx) { } BOOL ScrCmd_Capitalize(SCRIPTCONTEXT* ctx) { - MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, UNK80_10_C_MSGFMT); + MSGFMT** msg_fmt = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_MSGFMT); u8 idx = ScriptReadByte(ctx); ScrStrBufs_UpperFirstChar(*msg_fmt, idx); diff --git a/tools/py_scripts/scrcmd.json b/tools/py_scripts/scrcmd.json index f95cb9683..932313bec 100644 --- a/tools/py_scripts/scrcmd.json +++ b/tools/py_scripts/scrcmd.json @@ -2879,7 +2879,7 @@ ] }, { - "name": "scrcmd_463", + "name": "enable_mass_outbreaks", "args": [] }, { @@ -2956,7 +2956,7 @@ ] }, { - "name": "scrcmd_471", + "name": "get_offered_species", "args": [ 2 ] @@ -3849,7 +3849,7 @@ ] }, { - "name": "scrcmd_612", + "name": "get_npc_trade_unused_flag", "args": [ 2 ]