diff options
author | YamaArashi <shadow962@live.com> | 2016-11-05 14:57:02 -0700 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-11-05 15:10:37 -0700 |
commit | 716476e798c19e528bfa502444118d7fb412f88d (patch) | |
tree | 7b8169062d4848ed2edd4fa98add7fff135b3909 /src | |
parent | e31301d6ea7a772df3f25b7ce60d261e0c039cc0 (diff) |
script special variables
Diffstat (limited to 'src')
-rw-r--r-- | src/battle_setup.c | 6 | ||||
-rw-r--r-- | src/berry.c | 26 | ||||
-rw-r--r-- | src/dewford_trend.c | 4 | ||||
-rw-r--r-- | src/link.c | 4 | ||||
-rw-r--r-- | src/lottery_corner.c | 24 | ||||
-rw-r--r-- | src/map_obj_lock.c | 4 | ||||
-rw-r--r-- | src/record_mixing.c | 4 | ||||
-rw-r--r-- | src/scrcmd.c | 20 | ||||
-rw-r--r-- | src/wallclock.c | 4 |
9 files changed, 48 insertions, 48 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 9a28b2d35..dc8564a99 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -150,7 +150,7 @@ extern struct TrainerEyeTrainer gTrainerEyeTrainers[]; extern u8 gOtherText_CancelWithTerminator[]; extern u16 gUnknown_020239F8; -extern u16 gUnknown_0202E8DE; +extern u16 gScriptLastTalked; extern u8 gUnknown_02024D26; extern u16 gBadgeFlags[]; @@ -696,7 +696,7 @@ void battle_80801F0(void) { if (gTrainerMapObjectLocalId) { - gUnknown_0202E8DE = gTrainerMapObjectLocalId; + gScriptLastTalked = gTrainerMapObjectLocalId; gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(gTrainerMapObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); } } @@ -745,7 +745,7 @@ u8 *TrainerBattleConfigure(u8 *data) void TrainerWantsBattle(u8 trainerMapObjId, u8 *trainerScript) { gSelectedMapObject = trainerMapObjId; - gUnknown_0202E8DE = gMapObjects[trainerMapObjId].localId; + gScriptLastTalked = gMapObjects[trainerMapObjId].localId; TrainerBattleConfigure(trainerScript + 1); ScriptContext1_SetupScript(gUnknown_0819F80B); ScriptContext2_Enable(); diff --git a/src/berry.c b/src/berry.c index 410f5950e..79e716480 100644 --- a/src/berry.c +++ b/src/berry.c @@ -19,10 +19,11 @@ extern u8 *GetFieldObjectScriptPointerForComparison(); extern struct Berry gBerries[]; extern u8 BerryTreeScript; extern struct BerryTree gUnknown_083CD780; -extern u16 gUnknown_0202E8DE; -extern u16 gUnknown_0202E8CC; -extern u16 gUnknown_0202E8CE; -extern u16 gUnknown_0202E8D0; +extern u16 gScriptItemId; +extern u16 gScriptLastTalked; +extern u16 gSpecialVar_0x8004; +extern u16 gSpecialVar_0x8005; +extern u16 gSpecialVar_0x8006; u8 CalcBerryYield(struct BerryTree *tree); @@ -388,17 +389,17 @@ void FieldObjectInteractionGetBerryTreeData(void) id = FieldObjectGetBerryTreeId(gSelectedMapObject); berry = GetBerryTypeByBerryTreeId(id); ResetBerryTreeSparkleFlag(id); - unk = gUnknown_0202E8DE; + unk = gScriptLastTalked; num = gSaveBlock1.location.mapNum; group = gSaveBlock1.location.mapGroup; if (sub_8060234(unk, num, group)) - gUnknown_0202E8CC = 0xff; + gSpecialVar_0x8004 = 0xff; else - gUnknown_0202E8CC = (u8)GetStageByBerryTreeId(id); + gSpecialVar_0x8004 = (u8)GetStageByBerryTreeId(id); - gUnknown_0202E8CE = (u8)GetNumStagesWateredByBerryTreeId(id); - gUnknown_0202E8D0 = (u8)GetBerryCountByBerryTreeId(id); + gSpecialVar_0x8005 = (u8)GetNumStagesWateredByBerryTreeId(id); + gSpecialVar_0x8006 = (u8)GetBerryCountByBerryTreeId(id); GetBerryNameByBerryType(berry, gStringVar1); } @@ -409,8 +410,7 @@ void sub_80B4EE4(void) void FieldObjectInteractionPlantBerryTree(void) { - extern u16 word_203855E; - u8 berry = ItemIdToBerryType(word_203855E); + u8 berry = ItemIdToBerryType(gScriptItemId); PlantBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject), berry, 1, 1); FieldObjectInteractionGetBerryTreeData(); } @@ -421,7 +421,7 @@ void FieldObjectInteractionPickBerryTree(void) u8 berry; id = FieldObjectGetBerryTreeId(gSelectedMapObject); berry = GetBerryTypeByBerryTreeId(id); - gUnknown_0202E8CC = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); + gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id)); } void FieldObjectInteractionRemoveBerryTree(void) @@ -431,7 +431,7 @@ void FieldObjectInteractionRemoveBerryTree(void) u8 group, num; id = FieldObjectGetBerryTreeId(gSelectedMapObject); RemoveBerryTree(id); - unk = gUnknown_0202E8DE; + unk = gScriptLastTalked; num = gSaveBlock1.location.mapNum; group = gSaveBlock1.location.mapGroup; sub_8060288(unk, num, group); diff --git a/src/dewford_trend.c b/src/dewford_trend.c index 6ae7a6ae7..8d683e072 100644 --- a/src/dewford_trend.c +++ b/src/dewford_trend.c @@ -10,7 +10,7 @@ extern u8 ConvertEasyChatWordsToString(u8 *dst, u16 *words, u16, u16); extern struct EasyChatPair unk_2007800[5]; extern struct EasyChatPair unk_2007900[5]; extern u16 gScriptResult; -extern u16 gUnknown_0202E8CC; +extern u16 gSpecialVar_0x8004; void sub_80FA740(struct EasyChatPair *); void sub_80FA46C(struct EasyChatPair *, u16, u8); @@ -514,7 +514,7 @@ _080FA5B8: .4byte gSaveBlock1 + 0x2DD4\n\ void sub_80FA5BC(void) { - struct EasyChatPair *s = &gSaveBlock1.easyChatPairs[gUnknown_0202E8CC]; + struct EasyChatPair *s = &gSaveBlock1.easyChatPairs[gSpecialVar_0x8004]; ConvertEasyChatWordsToString(gStringVar1, s->words, 2, 1); } diff --git a/src/link.c b/src/link.c index 2a412ee35..47820185c 100644 --- a/src/link.c +++ b/src/link.c @@ -34,7 +34,7 @@ extern void sub_80516C4(u8, u16); extern u8 unk_2000000[]; extern u8 unk_2004000[]; extern u16 gUnknown_020239F8; -extern u16 word_203855E; +extern u16 gScriptItemId; extern u16 word_3004858; @@ -619,7 +619,7 @@ static void BuildSendCmd(u16 code) break; case 0xAAAB: gSendCmd[0] = 0xAAAB; - gSendCmd[1] = word_203855E; + gSendCmd[1] = gScriptItemId; break; case 0xCCCC: gSendCmd[0] = 0xCCCC; diff --git a/src/lottery_corner.c b/src/lottery_corner.c index 7b0ca6153..c807237af 100644 --- a/src/lottery_corner.c +++ b/src/lottery_corner.c @@ -5,12 +5,12 @@ #include "var.h" extern u16 gScriptResult; -extern u16 gUnknown_0202E8CC; +extern u16 gSpecialVar_0x8004; extern struct Pokemon gPlayerParty[6]; extern struct PokemonStorage gPokemonStorage; -extern u16 gUnknown_0202E8CE; +extern u16 gSpecialVar_0x8005; extern u16 gUnknown_0840CB04[]; -extern u16 gUnknown_0202E8D0; +extern u16 gSpecialVar_0x8006; static EWRAM_DATA u16 sWinNumberDigit = 0; static EWRAM_DATA u16 sOtIdDigit = 0; @@ -51,7 +51,7 @@ void PickLotteryCornerTicket(void) u32 box; u32 slot; - gUnknown_0202E8CC = 0; + gSpecialVar_0x8004 = 0; slot = 0; box = 0; for(i = 0; i < 6; i++) @@ -66,9 +66,9 @@ void PickLotteryCornerTicket(void) u32 otId = GetMonData(pkmn, MON_DATA_OT_ID); u8 a = GetMatchingDigits(gScriptResult, otId); - if(a > gUnknown_0202E8CC && a > 1) + if(a > gSpecialVar_0x8004 && a > 1) { - gUnknown_0202E8CC = a - 1; + gSpecialVar_0x8004 = a - 1; box = 14; slot = i; } @@ -91,9 +91,9 @@ void PickLotteryCornerTicket(void) u32 otId = GetBoxMonData(pkmn, MON_DATA_OT_ID); u8 a = GetMatchingDigits(gScriptResult, otId); - if(a > gUnknown_0202E8CC && a > 1) + if(a > gSpecialVar_0x8004 && a > 1) { - gUnknown_0202E8CC = a - 1; + gSpecialVar_0x8004 = a - 1; box = i; slot = j; } @@ -101,18 +101,18 @@ void PickLotteryCornerTicket(void) } } - if(gUnknown_0202E8CC != 0) + if(gSpecialVar_0x8004 != 0) { - gUnknown_0202E8CE = gUnknown_0840CB04[gUnknown_0202E8CC - 1]; + gSpecialVar_0x8005 = gUnknown_0840CB04[gSpecialVar_0x8004 - 1]; if(box == 14) { - gUnknown_0202E8D0 = 0; + gSpecialVar_0x8006 = 0; GetMonData(&gPlayerParty[slot], MON_DATA_NICKNAME, gStringVar1); } else { - gUnknown_0202E8D0 = 1; + gSpecialVar_0x8006 = 1; GetBoxMonData(&gPokemonStorage.boxes[box][slot], MON_DATA_NICKNAME, gStringVar1); } StringGetEnd10(gStringVar1); diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c index d4115418b..422903a97 100644 --- a/src/map_obj_lock.c +++ b/src/map_obj_lock.c @@ -13,7 +13,7 @@ extern void sub_80A2178(void); extern void sub_806451C(void); extern u8 FieldObjectFaceOppositeDirection(void *, u8); -extern u16 gUnknown_0202E8E0; +extern u16 gScriptFacing; bool8 walkrun_is_standing_still(void) { @@ -116,7 +116,7 @@ void unref_sub_8064E5C(void) void sub_8064EAC(void) { - FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gUnknown_0202E8E0); + FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gScriptFacing); } void sub_8064ED4(void) diff --git a/src/record_mixing.c b/src/record_mixing.c index a7955f76a..4996dc01f 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -23,7 +23,7 @@ extern u8 gUnknown_083D028A[2][3]; extern u8 gUnknown_083D0290[9][4]; extern u8 gUnknown_02038738[]; //Don't know what type this points to -extern u16 gUnknown_0202E8CE; +extern u16 gSpecialVar_0x8005; extern u32 gUnknown_03005D2C; extern u8 gUnknown_03000718; extern u8 gUnknown_0300071C[]; @@ -247,7 +247,7 @@ void sub_80B9484(u8 taskId) switch(taskData[TD_STATE]) { case 0: - sub_8007270(gUnknown_0202E8CE); + sub_8007270(gSpecialVar_0x8005); VarSet(0x4000, 1); gUnknown_03000718 = 0; sub_80B92AC(); diff --git a/src/scrcmd.c b/src/scrcmd.c index dbdbc6674..f3eb96ba0 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -152,16 +152,16 @@ extern u16 gUnknown_0202E8B6; extern u16 gUnknown_0202E8B8; extern u16 gUnknown_0202E8BA; extern u16 gUnknown_0202E8BC; -extern u16 gUnknown_0202E8C4; -extern u16 gUnknown_0202E8C6; -extern u16 gUnknown_0202E8C8; -extern u16 gUnknown_0202E8CC; +extern u16 gSpecialVar_0x8000; +extern u16 gSpecialVar_0x8001; +extern u16 gSpecialVar_0x8002; +extern u16 gSpecialVar_0x8004; extern u16 gScriptResult; extern u32 gUnknown_0202FF84[]; -extern u16 gUnknown_0203869C; +extern u16 gSpecialVar_0x8011; extern SpecialFunc gSpecials[]; extern u8 *gStdScripts[]; @@ -714,9 +714,9 @@ bool8 ScrCmd_checkdailyflags(struct ScriptContext *ctx) bool8 ScrCmd_resetvars(struct ScriptContext *ctx) { RtcCalcLocalTime(); - gUnknown_0202E8C4 = gLocalTime.hours; - gUnknown_0202E8C6 = gLocalTime.minutes; - gUnknown_0202E8C8 = gLocalTime.seconds; + gSpecialVar_0x8000 = gLocalTime.hours; + gSpecialVar_0x8001 = gLocalTime.minutes; + gSpecialVar_0x8002 = gLocalTime.seconds; return FALSE; } @@ -1571,7 +1571,7 @@ bool8 ScrCmd_checkattack(struct ScriptContext *ctx) if (!GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG) && pokemon_has_move(&gPlayerParty[i], moveId) == TRUE) { gScriptResult = i; - gUnknown_0202E8CC = species; + gSpecialVar_0x8004 = species; break; } } @@ -1792,7 +1792,7 @@ bool8 ScrCmd_showcontestresults(struct ScriptContext *ctx) bool8 ScrCmd_contestlinktransfer(struct ScriptContext *ctx) { - sub_80C4980(gUnknown_0203869C); + sub_80C4980(gSpecialVar_0x8011); ScriptContext1_Stop(); return TRUE; } diff --git a/src/wallclock.c b/src/wallclock.c index 8706649d6..05e30a8cb 100644 --- a/src/wallclock.c +++ b/src/wallclock.c @@ -14,7 +14,7 @@ void remove_some_task(void); void LoadCompressedObjectPic(void *); -extern u16 gUnknown_0202E8CC; +extern u16 gSpecialVar_0x8004; extern u16 gMiscClockMale_Pal[]; extern u16 gMiscClockFemale_Pal[]; extern u8 gMiscClock_Gfx[]; @@ -118,7 +118,7 @@ static void LoadWallClockGraphics(void) DmaClear16(3, PLTT, PLTT_SIZE); LZ77UnCompVram(gMiscClock_Gfx, (void *)VRAM); - if(gUnknown_0202E8CC == MALE) + if(gSpecialVar_0x8004 == MALE) LoadPalette(gMiscClockMale_Pal, 0, 32); else LoadPalette(gMiscClockFemale_Pal, 0, 32); |