From cdc705f7e36436924b4ce5f7815983a862c52873 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 13 Apr 2020 08:42:56 -0400 Subject: Label GCN link flags field --- include/global.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.h b/include/global.h index 18645efd8..e88cc620b 100644 --- a/include/global.h +++ b/include/global.h @@ -276,7 +276,7 @@ struct SaveBlock2 /*0x090*/ u8 filler_90[0x8]; /*0x098*/ struct Time localTimeOffset; /*0x0A0*/ struct Time lastBerryTreeUpdate; - /*0x0A8*/ u32 field_A8; + /*0x0A8*/ u32 gcnLinkFlags; // Read by Pokemon Colosseum/XD /*0x0AC*/ u8 field_AC; /*0x0AD*/ u8 field_AD; /*0x0B0*/ struct BattleTowerData battleTower; -- cgit v1.2.3 From 9634b58d7ae9acb42c1cad41553a1806879d47cf Mon Sep 17 00:00:00 2001 From: fieldy101 Date: Wed, 22 Apr 2020 22:29:35 +1000 Subject: Port emerald water functions into firered --- include/battle_anim.h | 16 ++++++++++------ include/graphics.h | 6 ++++++ include/random.h | 2 ++ 3 files changed, 18 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index e987457c7..eacb51f2c 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -218,6 +218,7 @@ void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite); void sub_80A2F0C(u8 taskId); // battle_anim_effects_2.c +extern const union AffineAnimCmd *const gGrowingRingAffineAnimTable[]; void sub_80A6E48(struct Sprite *); void sub_80A6E98(struct Sprite *); void sub_80A6F8C(struct Sprite *); @@ -345,7 +346,6 @@ void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId); // battle_anim_mons.c extern const struct MonCoords gCastformFrontSpriteCoords[]; - u8 GetBattlerSpriteCoord(u8 battlerId, u8 coordType); u8 GetBattlerSpriteCoord2(u8 battlerId, u8 coordType); u8 GetBattlerSpriteDefault_Y(u8 battlerId); @@ -447,7 +447,7 @@ void sub_8076F58(struct Sprite *sprite); void sub_8076FD0(struct Sprite *sprite); void sub_8077030(u8 taskId); void sub_807729C(struct Sprite *sprite); -void sub_8077350(struct Sprite *sprite); +void AnimWeatherBallDown(struct Sprite *sprite); // battle_anim_mon_movement.c void AnimTask_ShakeMon(u8 taskId); @@ -467,6 +467,7 @@ void sub_8099BD4(u8 taskId); // normal.c extern const struct SpriteTemplate gUnknown_83E7C98; extern const struct SpriteTemplate gBasicHitSplatSpriteTemplate; +extern const struct SpriteTemplate gWaterHitSplatSpriteTemplate; u32 UnpackSelectedBattleAnimPalettes(s16 selector); void AnimTask_CurseBlendEffect(u8 taskId); void sub_80B9CE4(u8 taskId); @@ -478,7 +479,7 @@ void sub_80BA47C(u8 taskId); // ground.c void sub_80B8E94(u8 taskId); void sub_80B90EC(u8 taskId); -void sub_80B94B4(u8 taskId); +void AnimTask_HorizontalShake(u8 taskId); void AnimTask_IsPowerOver99(u8 taskId); void sub_80B9800(u8 taskId); @@ -527,10 +528,14 @@ void sub_80B194C(u8 taskId); void sub_80B1D3C(struct Sprite *sprite); void sub_80B2868(u8 taskId); +// poison.c +extern const union AffineAnimCmd *const gAffineAnims_Droplet[]; + // fighting.c void sub_80B1530(u8 taskId); // ice.c +extern const union AnimCmd *const gAnims_SmallBubblePair[]; void AnimTask_Haze1(u8 taskId); void AnimTask_LoadMistTiles(u8 taskId); void AnimTask_Hail1(u8 taskId); @@ -546,15 +551,14 @@ void sub_80AEFA0(u8 taskId); // fire.c extern const union AnimCmd *const gUnknown_83E5D48[]; - void sub_80ACEA4(u8 taskId); void sub_80ADAD8(u8 taskId); void AnimTask_BlendBackground(u8 taskId); void sub_80AD800(u8 taskId); // water.s -extern const union AnimCmd *const gUnknown_83E5958[]; -extern const union AnimCmd *const gUnknown_83E5A78[]; +extern const union AnimCmd *const gAnims_WaterMudOrb[]; +extern const union AnimCmd *const gAnims_WaterBubble[]; void AnimWaterPulseRing(struct Sprite *sprite); // smokescreen.s diff --git a/include/graphics.h b/include/graphics.h index 40a41b87e..35ef29391 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4241,6 +4241,7 @@ extern const u32 gBattleAnimBgImage_Cosmic[]; extern const u32 gBattleAnimBgImage_InAir[]; extern const u32 gBattleAnimBgImage_Aurora[]; extern const u32 gBattleAnimBgImage_Fissure[]; +extern const u32 gBattleAnimBgImage_Surf[]; extern const u32 gBattleAnimBgPalette_Dark[]; extern const u32 gBattleAnimBgPalette_Ghost[]; extern const u32 gBattleAnimBgPalette_Psychic[]; @@ -4252,11 +4253,13 @@ extern const u32 gBattleAnimBgPalette_Guillotine[]; extern const u32 gBattleAnimBgPalette_Ice[]; extern const u32 gBattleAnimBgPalette_Cosmic[]; extern const u32 gBattleAnimBgPalette_InAir[]; +extern const u32 gBattleAnimBgPalette_MuddyWater[]; extern const u32 gBattleAnimBgPalette_Sky[]; extern const u32 gBattleAnimBgPalette_Aurora[]; extern const u32 gBattleAnimBgPalette_Fissure[]; extern const u32 gBattleAnimBgPalette_Bug[]; extern const u32 gBattleAnimBgPalette_Solarbeam[]; +extern const u32 gBattleAnimBgPalette_Surf[]; extern const u32 gBattleAnimBgTilemap_Dark[]; extern const u32 gBattleAnimBgTilemap_Ghost[]; extern const u32 gBattleAnimBgTilemap_Psychic[]; @@ -4276,6 +4279,9 @@ extern const u32 gBattleAnimBgTilemap_Cosmic[]; extern const u32 gBattleAnimBgTilemap_InAir[]; extern const u32 gBattleAnimBgTilemap_Aurora[]; extern const u32 gBattleAnimBgTilemap_Fissure[]; +extern const u32 gBattleAnimBgTilemap_SurfOpponent[]; +extern const u32 gBattleAnimBgTilemap_SurfPlayer[]; +extern const u32 gBattleAnimBgTilemap_SurfContest[]; // dark extern const u32 gMetalShineGfx[]; diff --git a/include/random.h b/include/random.h index 139316f9d..1eaff3245 100644 --- a/include/random.h +++ b/include/random.h @@ -13,6 +13,8 @@ u16 Random2(void); //Returns a 32-bit pseudorandom number #define Random32() (Random() | (Random() << 16)) +#define ISO_RANDOMIZE2(val)(1103515245 * (val) + 12345) + //Sets the initial seed value of the pseudorandom number generator void SeedRng(u16 seed); void SeedRng2(u16 seed); -- cgit v1.2.3 From 4c409fa343e04a17e88c5a43162d2cf8eb295a00 Mon Sep 17 00:00:00 2001 From: fieldy101 Date: Thu, 23 Apr 2020 10:05:19 +1000 Subject: Resolving PR review --- include/battle_anim.h | 4 ++-- include/random.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index eacb51f2c..81c626f39 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -556,12 +556,12 @@ void sub_80ADAD8(u8 taskId); void AnimTask_BlendBackground(u8 taskId); void sub_80AD800(u8 taskId); -// water.s +// water.c extern const union AnimCmd *const gAnims_WaterMudOrb[]; extern const union AnimCmd *const gAnims_WaterBubble[]; void AnimWaterPulseRing(struct Sprite *sprite); -// smokescreen.s +// smokescreen.c u8 SmokescreenImpact(s16 x, s16 y, u8 a3); // battle_anim_utility_funcs.c diff --git a/include/random.h b/include/random.h index 1eaff3245..139316f9d 100644 --- a/include/random.h +++ b/include/random.h @@ -13,8 +13,6 @@ u16 Random2(void); //Returns a 32-bit pseudorandom number #define Random32() (Random() | (Random() << 16)) -#define ISO_RANDOMIZE2(val)(1103515245 * (val) + 12345) - //Sets the initial seed value of the pseudorandom number generator void SeedRng(u16 seed); void SeedRng2(u16 seed); -- cgit v1.2.3 From 87ba2b8bde8130b684723a6b2c8b74cead817ac5 Mon Sep 17 00:00:00 2001 From: Evan Date: Thu, 23 Apr 2020 22:40:13 -0600 Subject: battle anim documentation --- include/battle_anim.h | 132 +++++++++++++++++++++++++------------------------- 1 file changed, 66 insertions(+), 66 deletions(-) (limited to 'include') diff --git a/include/battle_anim.h b/include/battle_anim.h index 81c626f39..866ca663e 100644 --- a/include/battle_anim.h +++ b/include/battle_anim.h @@ -215,7 +215,7 @@ void AnimMetronomeFinger(struct Sprite *); void AnimFollowMeFinger(struct Sprite *); void AnimTauntFinger(struct Sprite *); void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite); -void sub_80A2F0C(u8 taskId); +void AnimTask_ShrinkTargetCopy(u8 taskId); // battle_anim_effects_2.c extern const union AffineAnimCmd *const gGrowingRingAffineAnimTable[]; @@ -421,9 +421,9 @@ void AnimThrowProjectile(struct Sprite *sprite); void AnimSnoreZ(struct Sprite *sprite); s16 CloneBattlerSpriteWithBlend(u8 animBattler); void obj_delete_but_dont_free_vram(struct Sprite *sprite); -void sub_8076048(u8 taskId); +void AnimTask_AlphaFadeIn(u8 taskId); void AnimTask_BlendMonInAndOut(u8 task); -void sub_8076288(u8 taskId); +void AnimTask_BlendPalInAndOutByTag(u8 taskId); void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds); bool8 RunAffineAnimFromTaskData(struct Task *task); void SetBattlerSpriteYOffsetFromYScale(u8 spriteId); @@ -445,7 +445,7 @@ u8 sub_8076E34(s32 battlerId, u8 spriteId, s32 species); void sub_8076ED8(struct Sprite *sprite); void sub_8076F58(struct Sprite *sprite); void sub_8076FD0(struct Sprite *sprite); -void sub_8077030(u8 taskId); +void AnimTask_AttackerPunchWithTrace(u8 taskId); void sub_807729C(struct Sprite *sprite); void AnimWeatherBallDown(struct Sprite *sprite); @@ -457,82 +457,82 @@ void AnimTask_ShakeAndSinkMon(u8 taskId); void AnimTask_TranslateMonElliptical(u8 taskId); void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId); void AnimTask_WindUpLunge(u8 taskId); -void sub_80995FC(u8 taskId); +void AnimTask_SlideOffScreen(u8 taskId); void AnimTask_SwayMon(u8 taskId); void AnimTask_ScaleMonAndRestore(u8 taskId); -void sub_8099980(u8 taskId); -void sub_8099A78(u8 taskId); -void sub_8099BD4(u8 taskId); +void AnimTask_RotateMonSpriteToSide(u8 taskId); +void AnimTask_RotateMonToSideAndRestore(u8 taskId); +void AnimTask_ShakeTargetBasedOnMovePowerOrDmg(u8 taskId); // normal.c -extern const struct SpriteTemplate gUnknown_83E7C98; +extern const struct SpriteTemplate gFlashingHitSplatSpriteTemplate; extern const struct SpriteTemplate gBasicHitSplatSpriteTemplate; extern const struct SpriteTemplate gWaterHitSplatSpriteTemplate; u32 UnpackSelectedBattleAnimPalettes(s16 selector); void AnimTask_CurseBlendEffect(u8 taskId); -void sub_80B9CE4(u8 taskId); -void sub_80B9E58(u8 taskId); -void sub_80B9F6C(u8 taskId); -void sub_80BA0E8(u8 taskId); -void sub_80BA47C(u8 taskId); +void AnimTask_BlendColorCycleExclude(u8 taskId); +void AnimTask_BlendColorCycleByTag(u8 taskId); +void AnimTask_FlashAnimTagWithColor(u8 taskId); +void AnimTask_InvertScreenColor(u8 taskId); +void AnimTask_ShakeBattleTerrain(u8 taskId); // ground.c -void sub_80B8E94(u8 taskId); -void sub_80B90EC(u8 taskId); +void AnimTask_DigDownMovement(u8 taskId); +void AnimTask_DigUpMovement(u8 taskId); void AnimTask_HorizontalShake(u8 taskId); void AnimTask_IsPowerOver99(u8 taskId); -void sub_80B9800(u8 taskId); +void AnimTask_PositionFissureBgOnBattler(u8 taskId); // dragon.c -void sub_80B75E0(u8 taskId); +void AnimTask_DragonDanceWaver(u8 taskId); // ghost.c -void sub_80B54E8(u8 taskId); -void sub_80B58AC(u8 taskId); -void sub_80B5AAC(u8 taskId); -void sub_80B6020(u8 taskId); -void sub_80B63B4(u8 taskId); -void sub_80B68C8(u8 taskId); +void AnimTask_NightShadeClone(u8 taskId); +void AnimTask_NightmareClone(u8 taskId); +void AnimTask_SpiteTargetShadow(u8 taskId); +void AnimTask_DestinyBondWhiteShadow(u8 taskId); +void AnimTask_CurseStretchingBlackBg(u8 taskId); +void AnimTask_GrudgeFlames(u8 taskId); void sub_80B6BBC(u8 taskId); // rock.c void AnimTask_LoadSandstormBackground(u8 taskId); -void sub_80B4BD0(u8 taskId); +void AnimTask_Rollout(u8 taskId); void AnimTask_GetSeismicTossDamageLevel(u8 taskId); -void sub_80B5188(u8 taskId); -void sub_80B51EC(u8 taskId); +void AnimTask_MoveSeismicTossBg(u8 taskId); +void AnimTask_SeismicTossBgAccelerateDownAtEnd(u8 taskId); // psychic.c -void sub_80B3418(u8 taskId); -void sub_80B3480(u8 taskId); -void sub_80B3584(u8 taskId); -void sub_80B3834(u8 taskId); -void sub_80B3A58(u8 taskId); -void sub_80B3C78(u8 taskId); +void AnimTask_MeditateStretchAttacker(u8 taskId); +void AnimTask_Teleport(u8 taskId); +void AnimTask_ImprisonOrbs(u8 taskId); +void AnimTask_SkillSwap(u8 taskId); +void AnimTask_ExtrasensoryDistortion(u8 taskId); +void AnimTask_TransparentCloneGrowAndShrink(u8 taskId); // dark.c -extern const union AffineAnimCmd *const gUnknown_83E7910[]; -void sub_80B78E0(u8 taskId); -void sub_80B79DC(u8 taskId); -void sub_80B7A80(u8 taskId); -void sub_80B7DA4(u8 taskId); -void sub_80B8070(u8 taskId); -void sub_80B85B8(u8 taskId); +extern const union AffineAnimCmd *const gAffineAnims_Bite[]; +void AnimTask_AttackerFadeToInvisible(u8 taskId); +void AnimTask_AttackerFadeFromInvisible(u8 taskId); +void AnimTask_InitAttackerFadeFromInvisible(u8 taskId); +void AnimTask_MoveAttackerMementoShadow(u8 taskId); +void AnimTask_MoveTargetMementoShadow(u8 taskId); +void AnimTask_InitMementoShadow(u8 taskId); void sub_80B8664(u8 taskId); void AnimTask_MetallicShine(u8 taskId); void AnimTask_SetGreyscaleOrOriginalPal(u8 taskId); -void sub_80B8B38(u8 taskId); +void GetIsDoomDesireHitTurn(u8 taskId); // flying.c -void sub_80B194C(u8 taskId); +void AnimTask_AnimateGustTornadoPalette(u8 taskId); void sub_80B1D3C(struct Sprite *sprite); -void sub_80B2868(u8 taskId); +void AnimTask_DrillPeckHitSplats(u8 taskId); // poison.c extern const union AffineAnimCmd *const gAffineAnims_Droplet[]; // fighting.c -void sub_80B1530(u8 taskId); +void AnimTask_MoveSkyUppercutBg(u8 taskId); // ice.c extern const union AnimCmd *const gAnims_SmallBubblePair[]; @@ -542,19 +542,19 @@ void AnimTask_Hail1(u8 taskId); void AnimTask_GetRolloutCounter(u8 taskId); // electric.c -void sub_80AE220(u8 taskId); -void sub_80AE540(u8 taskId); -void sub_80AE8A0(u8 taskId); -void sub_80AEA10(u8 taskId); -void sub_80AECE0(u8 taskId); -void sub_80AEFA0(u8 taskId); +void AnimTask_ElectricBolt(u8 taskId); +void AnimTask_ElectricChargingParticles(u8 taskId); +void AnimTask_VoltTackleAttackerReappear(u8 taskId); +void AnimTask_VoltTackleBolt(u8 taskId); +void AnimTask_ShockWaveProgressingBolt(u8 taskId); +void AnimTask_ShockWaveLightning(u8 taskId); // fire.c -extern const union AnimCmd *const gUnknown_83E5D48[]; -void sub_80ACEA4(u8 taskId); -void sub_80ADAD8(u8 taskId); +extern const union AnimCmd *const gAnims_BasicFire[]; +void AnimTask_EruptionLaunchRocks(u8 taskId); +void AnimTask_ShakeTargetInPattern(u8 taskId); void AnimTask_BlendBackground(u8 taskId); -void sub_80AD800(u8 taskId); +void AnimTask_MoveHeatWaveTargets(u8 taskId); // water.c extern const union AnimCmd *const gAnims_WaterMudOrb[]; @@ -574,25 +574,25 @@ void AnimTask_CloneBattlerSpriteWithBlend(u8 taskId); void AnimTask_SetUpCurseBackground(u8 taskId); void sub_80BB088(u8 taskId); void sub_80BB660(u8 taskId); -void sub_80BB7DC(u8 taskId); -void sub_80BB82C(u8 taskId); +void AnimTask_BlendNonAttackerPalettes(u8 taskId); +void AnimTask_StartSlidingBg(u8 taskId); void AnimTask_GetAttackerSide(u8 taskId); void AnimTask_GetTargetSide(u8 taskId); void AnimTask_GetTargetIsAttackerPartner(u8 taskId); -void sub_80BB9B0(u8 taskId); +void AnimTask_SetAllNonAttackersInvisiblity(u8 taskId); void sub_80BBA20(u8 taskId, s32 unused, u16 arg2, u8 battler1, u8 arg4, u8 arg5, u8 arg6, u8 arg7, const u32 *gfx, const u32 *tilemap, const u32 *palette); void AnimTask_GetBattleTerrain(u8 taskId); -void sub_80BBE10(u8 taskId); -void sub_80BBE3C(u8 taskId); -void sub_80BBE6C(u8 taskId); -void sub_80BBF08(u8 taskId); -void sub_80BBFA4(u8 taskId); +void AnimTask_AllocBackupPalBuffer(u8 taskId); +void AnimTask_FreeBackupPalBuffer(u8 taskId); +void AnimTask_CopyPalUnfadedToBackup(u8 taskId); +void AnimTask_CopyPalUnfadedFromBackup(u8 taskId); +void AnimTask_CopyPalFadedToUnfaded(u8 taskId); void AnimTask_IsContest(u8 taskId); -void sub_80BC060(u8 taskId); +void AnimTask_SetAnimAttackerAndTargetForEffectTgt(u8 taskId); void AnimTask_IsTargetSameSide(u8 taskId); -void sub_80BC0DC(u8 taskId); -void sub_80BC0FC(u8 taskId); -void sub_80BC12C(u8 taskId); +void AnimTask_SetAnimTargetToBattlerTarget(u8 taskId); +void AnimTask_SetAnimAttackerAndTargetForEffectAtk(u8 taskId); +void AnimTask_SetAttackerInvisibleWaitForSignal(u8 taskId); // battle_anim_scripts.s extern const u8 *const gBattleAnims_StatusConditions[]; -- cgit v1.2.3 From 151f583f0c2c6cf52b29236b407a64588caa3740 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 27 Apr 2020 06:53:47 +0800 Subject: librfu issues --- include/librfu.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include') diff --git a/include/librfu.h b/include/librfu.h index 3c9d776f1..6b5a1e126 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -90,13 +90,8 @@ #define RFU_MBOOT_DOWNLOADER_SERIAL_NO 0x0000 // The game serial number of the multi-boot downloader (programs that boot without a Game Pak) -#if LIBRFU_VERSION >= 1028 -#define RFU_API_BUFF_SIZE_RAM 0x0e8c // Necessary size for buffer specified by rfu_initializeAPI (fast communication version that operates the library SIO interrupt routines in RAM) -#define RFU_API_BUFF_SIZE_ROM 0x052c // Necessary size for buffer specified by rfu_initializeAPI (fast communication version that operates the library SIO interrupt routines in ROM) -#else #define RFU_API_BUFF_SIZE_RAM 0x0e64 // Necessary size for buffer specified by rfu_initializeAPI (fast communication version that operates the library SIO interrupt routines in RAM) #define RFU_API_BUFF_SIZE_ROM 0x0504 // Necessary size for buffer specified by rfu_initializeAPI (fast communication version that operates the library SIO interrupt routines in ROM) -#endif #define RFU_CHILD_MAX 4 // Maximum number of slaves that can be connected to one parent device -- cgit v1.2.3 From 2d0dace7e0ea18aec09d26a3f6a92e337e2d6028 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 28 Apr 2020 04:45:15 +0800 Subject: fix remainSize type --- include/librfu.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include') diff --git a/include/librfu.h b/include/librfu.h index 3c9d776f1..de5cdcdbc 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -376,8 +376,7 @@ struct NIComm u16 state; // Communication state of slot u16 failCounter; // Count of failed transmissions/receptions (Count is increased when transmission/reception of data does not succeed within 1PF=16.7 ms) const u8 *now_p[WINDOW_COUNT]; // Address of current send/receive (The data is divided into WINDOW_COUNT blocks and sent in payloadSize units.) - // remainSize is u32 in SDK. This is a hack to match ASM - s32 remainSize; // Size of remaining communication data + u32 remainSize; // Size of remaining communication data u16 errorCode; // Error code u8 bmSlot; // Expresses the current communication slot in bits // (When sending from the Master, because multiple slaves can be specified with bmSlot, communications are terminated based on the failCounter for each child device) -- cgit v1.2.3 From fcb999beea38668efc60ddec8b4f6fbed63cacc5 Mon Sep 17 00:00:00 2001 From: Evan Date: Fri, 1 May 2020 19:54:35 -0600 Subject: document battle_message.c --- include/strings.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/strings.h b/include/strings.h index 50c132829..fd224aea4 100644 --- a/include/strings.h +++ b/include/strings.h @@ -188,7 +188,7 @@ extern const u8 gText_Ghost[]; // pokemon extern const u8 gBattleText_Rose[]; -extern const u8 gBattleText_UnknownString3[]; +extern const u8 gText_PkmnsStatChanged2[]; extern const u8 gBattleText_GetPumped[]; extern const u8 gBattleText_MistShroud[]; extern const u8 gText_BadEgg[]; @@ -215,9 +215,9 @@ extern const u8 gString_QuitPlaying[]; extern const u8 gString_SlotMachineControls[]; // battle_controller_safari -extern const u8 gUnknown_83FDA4C[]; +extern const u8 gText_EmptyString3[]; extern const u8 gUnknown_83FE747[]; -extern const u8 gUnknown_83FE6E6[]; +extern const u8 gText_WhatWillPlayerThrow[]; // battle_controller_player extern const u8 gText_BattleSwitchWhich[]; @@ -225,23 +225,23 @@ extern const u8 gUnknown_83FE770[]; extern const u8 gText_MoveInterfacePP[]; extern const u8 gText_MoveInterfaceType[]; extern const u8 gText_LinkStandby[]; -extern const u8 gUnknown_83FE725[]; +extern const u8 gText_BattleMenu[]; extern const u8 gText_WhatWillPkmnDo[]; // battle_script_commands extern const u8 gText_BattleYesNoChoice[]; // battle_controller_oak_old_man -extern const u8 gUnknown_83FDAE2[]; -extern const u8 gUnknown_83FDB92[]; -extern const u8 gUnknown_83FDBEF[]; -extern const u8 gUnknown_83FDC58[]; -extern const u8 gUnknown_83FDC95[]; -extern const u8 gUnknown_83FDD23[]; -extern const u8 gUnknown_83FDD64[]; -extern const u8 gUnknown_83FDDEB[]; -extern const u8 gUnknown_83FDCD2[]; -extern const u8 gUnknown_83FE6FA[]; +extern const u8 gText_ForPetesSake[]; +extern const u8 gText_TheTrainerThat[]; +extern const u8 gText_TryBattling[]; +extern const u8 gText_InflictingDamageIsKey[]; +extern const u8 gText_LoweringStats[]; +extern const u8 gText_KeepAnEyeOnHP[]; +extern const u8 gText_OakNoRunningFromATrainer[]; +extern const u8 gText_WinEarnsPrizeMoney[]; +extern const u8 gText_HowDissapointing[]; +extern const u8 gText_WhatWillOldManDo[]; // battle_controller_pokedude extern const u8 Pokedude_Text_SpeedierBattlerGoesFirst[]; -- cgit v1.2.3 From 5a5e68269d3fbf6eb314b8c947a156faa80a1eb2 Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 5 May 2020 11:00:39 -0600 Subject: fix PLAYER_AVATAR_FLAG_WATERING define --- include/global.fieldmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index fceec9daf..2db346980 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -304,7 +304,7 @@ enum { #define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER) #define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << PLAYER_AVATAR_STATE_FIELD_MOVE) #define PLAYER_AVATAR_FLAG_FISHING (1 << PLAYER_AVATAR_STATE_FISHING) -#define PLAYER_AVATAR_FLAG_WATERING (1 << PLAYER_AVATAR_STATE_WATERING) +#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING) enum { -- cgit v1.2.3 From f5c694c5b444c07d6bb44d73612b1c7e0bb6dae8 Mon Sep 17 00:00:00 2001 From: Evan Date: Tue, 5 May 2020 11:07:56 -0600 Subject: alignment fix --- include/global.fieldmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 2db346980..e681f069a 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -304,7 +304,7 @@ enum { #define PLAYER_AVATAR_FLAG_UNDERWATER (1 << PLAYER_AVATAR_STATE_UNDERWATER) #define PLAYER_AVATAR_FLAG_FIELD_MOVE (1 << PLAYER_AVATAR_STATE_FIELD_MOVE) #define PLAYER_AVATAR_FLAG_FISHING (1 << PLAYER_AVATAR_STATE_FISHING) -#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING) +#define PLAYER_AVATAR_FLAG_DASH (1 << PLAYER_AVATAR_STATE_WATERING) enum { -- cgit v1.2.3 From ea01b132b26b5b129a8150f72388aba80a834384 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 14 May 2020 16:29:19 -0400 Subject: Label in_connection's field in ObjectEventTemplate --- include/global.fieldmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index fceec9daf..b2e835591 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -94,7 +94,7 @@ struct ObjectEventTemplate { /*0x00*/ u8 localId; /*0x01*/ u8 graphicsId; - /*0x02*/ u8 unk2; + /*0x02*/ u8 inConnection; /*0x04*/ s16 x; /*0x06*/ s16 y; /*0x08*/ u8 elevation; -- cgit v1.2.3 From e055d3afa44e9a9f8dba5332e256194a2db91b9f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 17 May 2020 16:45:58 -0400 Subject: Add MAX_MAP_DATA_SIZE alias --- include/fieldmap.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/fieldmap.h b/include/fieldmap.h index c12dea340..4ac3a4712 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -9,7 +9,8 @@ #define NUM_METATILES_TOTAL 1024 #define NUM_PALS_IN_PRIMARY 7 #define NUM_PALS_TOTAL 13 -#define VIRTUAL_MAP_SIZE 0x2800 +#define MAX_MAP_DATA_SIZE 0x2800 +#define VIRTUAL_MAP_SIZE (MAX_MAP_DATA_SIZE) extern struct BackupMapLayout VMap; extern const struct MapLayout Route1_Layout; -- cgit v1.2.3