mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-11-16 11:37:40 +01:00
decompile fldeff_80F9BCC with data
This commit is contained in:
garak
parent
50f00b0827
commit
b4312648e2
2415
asm/fldeff_80F9BCC.s
2415
asm/fldeff_80F9BCC.s
File diff suppressed because it is too large
Load Diff
@ -1,244 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858D978:: @ 858D978
|
||||
.incbin "graphics/unknown/858E588/0.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858D9F8:: @ 858D9F8
|
||||
.incbin "graphics/unknown/858E588/1.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858DA78:: @ 858DA78
|
||||
.incbin "graphics/unknown/858E588/2.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858DAF8:: @ 858DAF8
|
||||
.incbin "graphics/unknown/858E588/3.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858DB78:: @ 858DB78
|
||||
.incbin "graphics/unknown/858E588/4.4bpp"
|
||||
|
||||
.space 32
|
||||
|
||||
.align 2
|
||||
gFieldEffectObjectPalette7:: @ 858DC18
|
||||
.incbin "graphics/event_objects/palettes/field_effect_object_palette_07.gbapal"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858DC38:: @ 858DC38
|
||||
.incbin "graphics/unknown/858E5D8/0.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858DCB8:: @ 858DCB8
|
||||
.incbin "graphics/unknown/858E5D8/1.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858DD38:: @ 858DD38
|
||||
.incbin "graphics/unknown/858E5D8/2.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858DDB8:: @ 858DDB8
|
||||
.incbin "graphics/unknown/858E5D8/3.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858DE38:: @ 858DE38
|
||||
.incbin "graphics/unknown/858E5D8/4.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858DEB8:: @ 858DEB8
|
||||
.incbin "graphics/unknown/858E5B0/0.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858DF38:: @ 858DF38
|
||||
.incbin "graphics/unknown/858E5B0/1.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858DFB8:: @ 858DFB8
|
||||
.incbin "graphics/unknown/858E5B0/2.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858E038:: @ 858E038
|
||||
.incbin "graphics/unknown/858E5B0/3.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858E0B8:: @ 858E0B8
|
||||
.incbin "graphics/unknown/858E5B0/4.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858E138:: @ 858E138
|
||||
.incbin "graphics/unknown/858E5B0/5.4bpp"
|
||||
|
||||
.align 2
|
||||
gFieldEffectObjectPalette8:: @ 858E1B8
|
||||
.incbin "graphics/event_objects/palettes/field_effect_object_palette_08.gbapal"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858E1D8:: @ 858E1D8
|
||||
.incbin "graphics/unknown/858E674/0.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858E2D8:: @ 858E2D8
|
||||
.incbin "graphics/unknown/858E674/1.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858E3D8:: @ 858E3D8
|
||||
.incbin "graphics/unknown/858E674/2.4bpp"
|
||||
|
||||
.align 2
|
||||
gOamData_858E4D8:: @ 858E4D8
|
||||
.2byte 0x0000, 0x4000, 0x0800, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_858E4E0:: @ 858E4E0
|
||||
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_858E4F8:: @ 858E4F8
|
||||
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_858E510:: @ 858E510
|
||||
.2byte 0x0004, 0x0008, 0x0003, 0x0008, 0x0002, 0x0008, 0x0001, 0x0008, 0x0000, 0x0008, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_858E528:: @ 858E528
|
||||
.2byte 0x0000, 0x0048, 0x0001, 0x0048, 0x0002, 0x0048, 0x0003, 0x0048, 0x0004, 0x0048, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_858E540:: @ 858E540
|
||||
.2byte 0x0004, 0x0048, 0x0003, 0x0048, 0x0002, 0x0048, 0x0001, 0x0048, 0x0000, 0x0048, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_858E558:: @ 858E558
|
||||
.2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_858E570:: @ 858E570
|
||||
.4byte gSpriteAnim_858E4E0
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_858E574:: @ 858E574
|
||||
.4byte gSpriteAnim_858E4F8
|
||||
.4byte gSpriteAnim_858E510
|
||||
.4byte gSpriteAnim_858E528
|
||||
.4byte gSpriteAnim_858E540
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_858E584:: @ 858E584
|
||||
.4byte gSpriteAnim_858E558
|
||||
|
||||
.align 2
|
||||
gUnknown_858E588:: @ 858E588
|
||||
obj_frame_tiles gSpriteImage_858D978, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858D9F8, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858DA78, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858DAF8, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858DB78, 0x0080
|
||||
|
||||
.align 2
|
||||
gUnknown_858E5B0:: @ 858E5B0
|
||||
obj_frame_tiles gSpriteImage_858DEB8, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858DF38, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858DFB8, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858E038, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858E0B8, 0x0080
|
||||
|
||||
.align 2
|
||||
gUnknown_858E5D8:: @ 858E5D8
|
||||
obj_frame_tiles gSpriteImage_858DC38, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858DCB8, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858DD38, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858DDB8, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858DE38, 0x0080
|
||||
|
||||
.align 2
|
||||
gUnknown_0858E600:: @ 858E600
|
||||
spr_template 0xffff, 0x1003, gOamData_858E4D8, gSpriteAnimTable_858E570, gUnknown_858E588, gDummySpriteAffineAnimTable, sub_80FA18C
|
||||
|
||||
.align 2
|
||||
gUnknown_0858E618:: @ 858E618
|
||||
spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E574, gUnknown_858E5B0, gDummySpriteAffineAnimTable, sub_80FA2D8
|
||||
|
||||
.align 2
|
||||
gUnknown_0858E630:: @ 858E630
|
||||
spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E584, gUnknown_858E5D8, gDummySpriteAffineAnimTable, sub_80FA3FC
|
||||
|
||||
.align 2
|
||||
gFieldEffectObjectPaletteInfo7:: @ 858E648
|
||||
obj_pal gFieldEffectObjectPalette7, 0x1003
|
||||
|
||||
.align 2
|
||||
gFieldEffectObjectPaletteInfo8:: @ 858E650
|
||||
obj_pal gFieldEffectObjectPalette8, 0x1008
|
||||
|
||||
.align 2
|
||||
gOamData_858E658:: @ 858E658
|
||||
.2byte 0x8000, 0x8000, 0x0800, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_858E660:: @ 858E660
|
||||
.2byte 0x0000, 0x0006, 0x0001, 0x0006, 0x0002, 0x0006, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_858E670:: @ 858E670
|
||||
.4byte gSpriteAnim_858E660
|
||||
|
||||
.align 2
|
||||
gUnknown_0858E674:: @ 858E674
|
||||
obj_frame_tiles gSpriteImage_858E1D8, 0x0100
|
||||
obj_frame_tiles gSpriteImage_858E2D8, 0x0100
|
||||
obj_frame_tiles gSpriteImage_858E3D8, 0x0100
|
||||
|
||||
.align 2
|
||||
gUnknown_0858E68C:: @ 858E68C
|
||||
spr_template 0xffff, 0x100e, gOamData_858E658, gSpriteAnimTable_858E670, gUnknown_0858E674, gDummySpriteAffineAnimTable, door_restore_tilemap
|
||||
|
||||
.align 2
|
||||
@ This uses one of the secret base palettes, so there is no
|
||||
@ "field_effect_object_palette_09.pal" file.
|
||||
gFieldEffectObjectPaletteInfo9:: @ 858E6A4
|
||||
obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858E6AC:: @ 858E6AC
|
||||
.incbin "graphics/unknown/858E84C/0.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858E72C:: @ 858E72C
|
||||
.incbin "graphics/unknown/858E84C/1.4bpp"
|
||||
|
||||
.align 2
|
||||
gSpriteImage_858E7AC:: @ 858E7AC
|
||||
.incbin "graphics/unknown/858E84C/2.4bpp"
|
||||
|
||||
.align 2
|
||||
gUnknown_0858E82C:: @ 858E82C
|
||||
.incbin "graphics/unknown/unknown_58E82C.gbapal"
|
||||
|
||||
.align 2
|
||||
gUnknown_0858E84C:: @ 858E84C
|
||||
obj_frame_tiles gSpriteImage_858E6AC, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858E72C, 0x0080
|
||||
obj_frame_tiles gSpriteImage_858E7AC, 0x0080
|
||||
|
||||
.align 2
|
||||
gUnknown_0858E864:: @ 858E864
|
||||
obj_pal gUnknown_0858E82C, 0x1000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_858E86C:: @ 858E86C
|
||||
.2byte 0x0000, 0x001e, 0x0001, 0x001e, 0x0002, 0x001e, 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_858E87C:: @ 858E87C
|
||||
.4byte gSpriteAnim_858E86C
|
||||
|
||||
.align 2
|
||||
gUnknown_0858E880:: @ 858E880
|
||||
spr_template 0xffff, 0x1000, gEventObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
@ -100,7 +100,7 @@
|
||||
#define VAR_0x4051 0x4051
|
||||
#define VAR_0x4052 0x4052
|
||||
#define VAR_0x4053 0x4053
|
||||
#define VAR_0x4054 0x4054
|
||||
#define VAR_CURRENT_SECRET_BASE 0x4054
|
||||
#define VAR_0x4055 0x4055
|
||||
#define VAR_0x4056 0x4056
|
||||
#define VAR_0x4057 0x4057
|
||||
|
||||
@ -58,5 +58,7 @@ u8 GetJumpSpecialMovementAction(u32);
|
||||
bool8 PartyHasMonWithSurf(void);
|
||||
bool8 IsPlayerFacingSurfableFishableWater(void);
|
||||
bool8 IsPlayerSurfingNorth(void);
|
||||
void sub_808C228(u8 direction);
|
||||
u8 sub_808BCD0(void);
|
||||
|
||||
#endif // GUARD_FIELD_PLAYER_AVATAR_H
|
||||
|
||||
@ -23,4 +23,12 @@ void sub_80EB9E0(void);
|
||||
void sub_80EBB28(void);
|
||||
void sub_80E9668(const struct MapPosition *position, const struct MapEvents *events);
|
||||
|
||||
// SetCurrentSecretBaseFromPosition
|
||||
void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events);
|
||||
// SetCurrentSecretBaseVar
|
||||
void sub_80E8B6C(void);
|
||||
void sub_80E8BC8(void);
|
||||
void sub_80E8D4C(void);
|
||||
void EnableBothScriptContexts(void);
|
||||
|
||||
#endif //GUARD_SECRET_BASE_H
|
||||
|
||||
@ -140,6 +140,8 @@ extern const u8 gText_Cancel4[];
|
||||
extern const u8 gText_IsThisTheCorrectTime[];
|
||||
extern const u8 gText_PkmnFainted3[];
|
||||
extern const u8 gText_Coins[];
|
||||
extern const u8 gText_Silver[];
|
||||
extern const u8 gText_Gold[];
|
||||
|
||||
extern const u8 gText_Var1AteTheVar2[];
|
||||
extern const u8 gText_Var1HappilyAteVar2[];
|
||||
|
||||
@ -151,7 +151,6 @@ SECTIONS {
|
||||
src/field_poison.o(.text);
|
||||
src/pokemon_size_record.o(.text);
|
||||
src/fldeff_80F9BCC.o(.text);
|
||||
asm/fldeff_80F9BCC.o(.text);
|
||||
src/field_special_scene.o(.text);
|
||||
src/rotating_gate.o(.text);
|
||||
src/safari_zone.o(.text);
|
||||
@ -476,7 +475,7 @@ SECTIONS {
|
||||
data/contest_link_80F57C4.o(.rodata);
|
||||
src/script_pokemon_util_80F87D8.o(.rodata);
|
||||
src/pokemon_size_record.o(.rodata)
|
||||
data/field_effect_misc.o(.rodata);
|
||||
src/fldeff_80F9BCC.o(.rodata);
|
||||
src/field_special_scene.o(.rodata);
|
||||
src/rotating_gate.o(.rodata);
|
||||
src/item_use.o(.rodata);
|
||||
|
||||
@ -42,7 +42,7 @@ void AllocateBattleResources(void)
|
||||
|
||||
if (gBattleTypeFlags & BATTLE_TYPE_SECRET_BASE)
|
||||
{
|
||||
u16 currSecretBaseId = VarGet(VAR_0x4054);
|
||||
u16 currSecretBaseId = VarGet(VAR_CURRENT_SECRET_BASE);
|
||||
CreateSecretBaseEnemyParty(&gSaveBlock1Ptr->secretBases[currSecretBaseId]);
|
||||
}
|
||||
}
|
||||
|
||||
1606
src/fldeff_80F9BCC.c
1606
src/fldeff_80F9BCC.c
File diff suppressed because it is too large
Load Diff
@ -190,7 +190,7 @@ void sub_80E8B6C(void)
|
||||
continue;
|
||||
}
|
||||
gSpecialVar_Result = TRUE;
|
||||
VarSet(VAR_0x4054, i);
|
||||
VarSet(VAR_CURRENT_SECRET_BASE, i);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -320,7 +320,7 @@ void sub_80E8E18(void)
|
||||
{
|
||||
gSaveBlock1Ptr->secretBases[0].trainerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
|
||||
}
|
||||
VarSet(VAR_0x4054, 0);
|
||||
VarSet(VAR_CURRENT_SECRET_BASE, 0);
|
||||
StringCopyN(gSaveBlock1Ptr->secretBases[0].trainerName, gSaveBlock2Ptr->playerName, sub_80E8DF4(gSaveBlock2Ptr->playerName));
|
||||
gSaveBlock1Ptr->secretBases[0].gender = gSaveBlock2Ptr->playerGender;
|
||||
gSaveBlock1Ptr->secretBases[0].language = GAME_LANGUAGE;
|
||||
@ -383,7 +383,7 @@ void sub_80E8FD0(u8 taskId)
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
secretBaseRecordId = VarGet(VAR_0x4054);
|
||||
secretBaseRecordId = VarGet(VAR_CURRENT_SECRET_BASE);
|
||||
if (gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_10 < 255)
|
||||
{
|
||||
gSaveBlock1Ptr->secretBases[secretBaseRecordId].sbr_field_10 ++;
|
||||
@ -479,7 +479,7 @@ void sub_80E9238(u8 flagIn)
|
||||
|
||||
if (CurrentMapIsSecretBase())
|
||||
{
|
||||
curBaseId = VarGet(VAR_0x4054);
|
||||
curBaseId = VarGet(VAR_CURRENT_SECRET_BASE);
|
||||
decorations = gSaveBlock1Ptr->secretBases[curBaseId].decorations;
|
||||
decorPos = gSaveBlock1Ptr->secretBases[curBaseId].decorationPos;
|
||||
for (x = 0; x < 16; x ++)
|
||||
@ -522,7 +522,7 @@ void sub_80E933C(void)
|
||||
}
|
||||
else
|
||||
{
|
||||
curBase = VarGet(VAR_0x4054);
|
||||
curBase = VarGet(VAR_CURRENT_SECRET_BASE);
|
||||
roomDecor = gSaveBlock1Ptr->secretBases[curBase].decorations;
|
||||
roomDecorPos = gSaveBlock1Ptr->secretBases[curBase].decorationPos;
|
||||
nDecor = 16;
|
||||
@ -558,7 +558,7 @@ void sub_80E933C(void)
|
||||
show_sprite(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
|
||||
sub_808EBA8(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
|
||||
sub_808F254(gSpecialVar_Result, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
|
||||
if (CurrentMapIsSecretBase() == TRUE && VarGet(VAR_0x4054) != 0)
|
||||
if (CurrentMapIsSecretBase() == TRUE && VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
if (category == DECORCAT_DOLL)
|
||||
{
|
||||
@ -594,7 +594,7 @@ void sub_80E9578(void)
|
||||
|
||||
void sub_80E95D4(void)
|
||||
{
|
||||
VarSet(VAR_OBJ_GFX_ID_F, gUnknown_0858D060[sub_80EA20C(VarGet(VAR_0x4054))]);
|
||||
VarSet(VAR_OBJ_GFX_ID_F, gUnknown_0858D060[sub_80EA20C(VarGet(VAR_CURRENT_SECRET_BASE))]);
|
||||
}
|
||||
|
||||
void sub_80E9608(const struct MapPosition *position, const struct MapEvents *events)
|
||||
@ -681,7 +681,7 @@ u8 *sub_80E9780(u8 *dest, u8 secretBaseRecordId)
|
||||
|
||||
u8 *GetSecretBaseMapName(u8 *dest)
|
||||
{
|
||||
return sub_80E9780(dest, VarGet(VAR_0x4054));
|
||||
return sub_80E9780(dest, VarGet(VAR_CURRENT_SECRET_BASE));
|
||||
}
|
||||
|
||||
void sub_80E980C(void)
|
||||
@ -689,7 +689,7 @@ void sub_80E980C(void)
|
||||
u8 secretBaseRecordId;
|
||||
const u8 *src;
|
||||
|
||||
secretBaseRecordId = VarGet(VAR_0x4054);
|
||||
secretBaseRecordId = VarGet(VAR_CURRENT_SECRET_BASE);
|
||||
src = gSaveBlock1Ptr->secretBases[secretBaseRecordId].trainerName;
|
||||
*StringCopyN(gStringVar1, src, sub_80E8DF4(src)) = EOS;
|
||||
ConvertInternationalString(gStringVar1, gSaveBlock1Ptr->secretBases[secretBaseRecordId].language);
|
||||
@ -829,7 +829,7 @@ u8 sub_80E9BA8(void)
|
||||
|
||||
void sub_80E9BDC(void)
|
||||
{
|
||||
if (sub_80E9878(VarGet(VAR_0x4054)) == TRUE)
|
||||
if (sub_80E9878(VarGet(VAR_CURRENT_SECRET_BASE)) == TRUE)
|
||||
{
|
||||
gSpecialVar_Result = 1;
|
||||
}
|
||||
@ -845,7 +845,7 @@ void sub_80E9BDC(void)
|
||||
|
||||
void sub_80E9C2C(void)
|
||||
{
|
||||
gSaveBlock1Ptr->secretBases[VarGet(VAR_0x4054)].sbr_field_1_6 ^= 1;
|
||||
gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].sbr_field_1_6 ^= 1;
|
||||
FlagSet(0x10C);
|
||||
}
|
||||
|
||||
@ -1081,7 +1081,7 @@ void sub_80EA18C(u8 taskId)
|
||||
|
||||
void task_pc_turn_off(u8 taskId)
|
||||
{
|
||||
if (VarGet(VAR_0x4054) == 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) == 0)
|
||||
{
|
||||
ScriptContext1_SetupScript(gUnknown_0823B4E8);
|
||||
}
|
||||
@ -1101,7 +1101,7 @@ const u8 *GetSecretBaseTrainerLoseText(void)
|
||||
{
|
||||
u8 param;
|
||||
|
||||
param = sub_80EA20C(VarGet(VAR_0x4054));
|
||||
param = sub_80EA20C(VarGet(VAR_CURRENT_SECRET_BASE));
|
||||
if (param == 0)
|
||||
{
|
||||
return SecretBase_RedCave1_Text_274966;
|
||||
@ -1150,7 +1150,7 @@ void sub_80EA2E4(void)
|
||||
|
||||
void sub_80EA30C(void)
|
||||
{
|
||||
gSaveBlock1Ptr->secretBases[VarGet(VAR_0x4054)].sbr_field_1_5 = gSpecialVar_Result;
|
||||
gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].sbr_field_1_5 = gSpecialVar_Result;
|
||||
}
|
||||
|
||||
void sub_80EA354(void)
|
||||
@ -1158,7 +1158,7 @@ void sub_80EA354(void)
|
||||
u16 secretBaseRecordId;
|
||||
u8 i;
|
||||
|
||||
secretBaseRecordId = VarGet(VAR_0x4054);
|
||||
secretBaseRecordId = VarGet(VAR_CURRENT_SECRET_BASE);
|
||||
if (!FlagGet(0x922))
|
||||
{
|
||||
for (i = 0; i < 20; i ++)
|
||||
@ -1183,7 +1183,7 @@ void sub_80EA3E4(u8 taskId)
|
||||
switch (data[1])
|
||||
{
|
||||
case 0:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
gUnknown_0203A01D = TRUE;
|
||||
}
|
||||
@ -1783,7 +1783,7 @@ void sub_80EB1AC(void)
|
||||
VarSet(VAR_0x40ED, 0);
|
||||
VarSet(VAR_0x40EE, 0);
|
||||
VarSet(VAR_0x40EF, 0);
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40F0, TRUE);
|
||||
}
|
||||
@ -1811,7 +1811,7 @@ void sub_80EB218(void)
|
||||
|
||||
void sub_80EB290(void)
|
||||
{
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x800);
|
||||
}
|
||||
@ -1819,7 +1819,7 @@ void sub_80EB290(void)
|
||||
|
||||
void sub_80EB2C8(void)
|
||||
{
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x400);
|
||||
}
|
||||
@ -1827,7 +1827,7 @@ void sub_80EB2C8(void)
|
||||
|
||||
void sub_80EB300(void)
|
||||
{
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800);
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001);
|
||||
@ -1837,7 +1837,7 @@ void sub_80EB300(void)
|
||||
|
||||
void sub_80EB368(void)
|
||||
{
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800);
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001);
|
||||
@ -1847,7 +1847,7 @@ void sub_80EB368(void)
|
||||
|
||||
void sub_80EB3D0(void)
|
||||
{
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800);
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001);
|
||||
@ -1857,7 +1857,7 @@ void sub_80EB3D0(void)
|
||||
|
||||
void sub_80EB438(void)
|
||||
{
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) & ~0x3800);
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) & ~0x001);
|
||||
@ -1888,7 +1888,7 @@ void sub_80EB498(void)
|
||||
case 0x332:
|
||||
case 0x333:
|
||||
case 0x334:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x4000);
|
||||
}
|
||||
@ -1906,7 +1906,7 @@ void sub_80EB56C(void)
|
||||
{
|
||||
case 0x28a:
|
||||
case 0x28b:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x40);
|
||||
}
|
||||
@ -1929,21 +1929,21 @@ void sub_80EB56C(void)
|
||||
case 0x2f9:
|
||||
case 0x2fa:
|
||||
case 0x2fb:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EE, VarGet(VAR_0x40EE) | 0x8);
|
||||
}
|
||||
break;
|
||||
case 0x22c:
|
||||
case 0x233:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x40);
|
||||
}
|
||||
break;
|
||||
case 0x288:
|
||||
case 0x289:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x100);
|
||||
}
|
||||
@ -1951,7 +1951,7 @@ void sub_80EB56C(void)
|
||||
case 0x22d:
|
||||
case 0x22e:
|
||||
case 0x22f:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x10);
|
||||
}
|
||||
@ -1979,7 +1979,7 @@ void sub_80EB56C(void)
|
||||
case 0x2cd:
|
||||
case 0x2ce:
|
||||
case 0x2cf:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x8);
|
||||
}
|
||||
@ -2006,7 +2006,7 @@ void sub_80EB9E0(void)
|
||||
case 0x2be:
|
||||
case 0x2c3:
|
||||
case 0x2c6:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x8);
|
||||
}
|
||||
@ -2044,14 +2044,14 @@ void sub_80EBB28(void)
|
||||
case 0x2c4:
|
||||
case 0x2c5:
|
||||
case 0x2c7:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x8);
|
||||
}
|
||||
break;
|
||||
case 0x280:
|
||||
case 0x281:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x100);
|
||||
}
|
||||
@ -2059,7 +2059,7 @@ void sub_80EBB28(void)
|
||||
case 0x225:
|
||||
case 0x226:
|
||||
case 0x227:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x10);
|
||||
}
|
||||
@ -2077,7 +2077,7 @@ void sub_80EBE7C(void)
|
||||
{
|
||||
case 0x28d:
|
||||
case 0x28e:
|
||||
if (VarGet(VAR_0x4054) != 0)
|
||||
if (VarGet(VAR_CURRENT_SECRET_BASE) != 0)
|
||||
{
|
||||
VarSet(VAR_0x40EF, VarGet(VAR_0x40EF) | 0x4);
|
||||
}
|
||||
|
||||
4
src/tv.c
4
src/tv.c
@ -2572,13 +2572,13 @@ void sub_80EEA70(void)
|
||||
show->secretBaseSecrets.flags = VarGet(0x40ee) + (VarGet(0x40ef) << 16);
|
||||
tv_store_id_3x(show);
|
||||
show->secretBaseSecrets.language = gGameLanguage;
|
||||
if (show->secretBaseSecrets.language == LANGUAGE_JAPANESE || gSaveBlock1Ptr->secretBases[VarGet(VAR_0x4054)].language == LANGUAGE_JAPANESE)
|
||||
if (show->secretBaseSecrets.language == LANGUAGE_JAPANESE || gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].language == LANGUAGE_JAPANESE)
|
||||
{
|
||||
show->secretBaseSecrets.baseOwnersNameLanguage = LANGUAGE_JAPANESE;
|
||||
}
|
||||
else
|
||||
{
|
||||
show->secretBaseSecrets.baseOwnersNameLanguage = gSaveBlock1Ptr->secretBases[VarGet(VAR_0x4054)].language;
|
||||
show->secretBaseSecrets.baseOwnersNameLanguage = gSaveBlock1Ptr->secretBases[VarGet(VAR_CURRENT_SECRET_BASE)].language;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user