Leahnaya/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2026-05-20 02:38:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Address review comments, part 2

Browse Source
This commit is contained in:
PikalaxALT 2025-08-20 17:02:30 -04:00
parent 1059105750
commit 76aec05bb0
No known key found for this signature in database
GPG Key ID: 7774E96AA69E5B61
11 changed files with 1137 additions and 1537 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_01_021E6880.inc
View File

@ -86,7 +86,7 @@
.public sub_0205B76C
.public sub_0205B78C
.public sub_0205B7E0
.public sub_0205B7EC
.public MetatileBehavior_IsTownMap
.public sub_0205B7F8
.public sub_0205B804
.public sub_0205B810

2
asm/overlay_01_021E6880.s
View File

@ -1554,7 +1554,7 @@ _021E74C4:
pop {r3, r4, r5, r6, r7, pc}
_021E74D2:
add r0, r4, #0
bl sub_0205B7EC
bl MetatileBehavior_IsTownMap
cmp r0, #0
beq _021E74E0
ldr r0, _021E7604 ; =std_town_map

2
include/application/pokegear/map/pokegear_map_internal.h
View File

@ -151,7 +151,7 @@ typedef struct PokegearMapLocationSpec {
u16 objXoffset : 4;
u16 objYoffset : 4;
u8 flavorText;
u8 tilemapUnk170BlockID;
u8 tilemapUnk174BlockID;
u8 unk_8; // unused
u8 unk_9; // unused
u8 unk_A; // unused

2
include/metatile_behavior.h
View File

@ -24,7 +24,7 @@ BOOL sub_0205B7BC(u8 tile);
BOOL sub_0205B7C8(u8 tile);
BOOL sub_0205B7D4(u8 tile);
BOOL sub_0205B7E0(u8 tile);
BOOL sub_0205B7EC(u8 tile);
BOOL MetatileBehavior_IsTownMap(u8 tile);
BOOL sub_0205B7F8(u8 tile);
BOOL sub_0205B804(u8 tile);
BOOL sub_0205B810(u8 tile);

4
src/application/pokegear/map/overlay_101_021E9270.c
View File

@ -845,9 +845,9 @@ static void ov101_021EAA0C(PokegearMapAppData *mapApp, BOOL a1, BOOL isKanto) {
ScheduleBgTilemapBufferTransfer(mapApp->pokegear->bgConfig, GF_BG_LYR_SUB_2);
return;
}
if (locationSpec->tilemapUnk170BlockID != 0) {
if (locationSpec->tilemapUnk174BlockID != 0) {
tilemap16CsrcX = 8;
tilemap174blockId = locationSpec->tilemapUnk170BlockID - 1;
tilemap174blockId = locationSpec->tilemapUnk174BlockID - 1;
} else {
tilemap16CsrcX = 0;
tilemap174blockId = 0;

2610
src/application/pokegear/map/pokegear_map.c
View File

File diff suppressed because it is too large Load Diff

4
src/field/overlay_2_gear_phone.c
View File

@ -85,8 +85,8 @@ u8 ov02_02251EE8(GearPhoneRingManager *gearPhone, Unk_PokegearSTRUCT_14 *a1) {
}
a1->unk_0 = gearPhone->unk_arr5[0];
a1->unk_1 = gearPhone->unk_arr5[1];
a1->isScriptedCall = gearPhone->isScriptedCall; // 2 = scripted?
a1->callScriptID = gearPhone->callScriptID; // message ID?
a1->isScriptedCall = gearPhone->isScriptedCall;
a1->callScriptID = gearPhone->callScriptID;
a1->unk_2 = gearPhone->unk_var7;
return gearPhone->callerId;
}

2
src/metatile_behavior.c
View File

@ -92,7 +92,7 @@ BOOL sub_0205B7E0(u8 tile) {
return tile == TILE_BEHAVIOR_131;
}
BOOL sub_0205B7EC(u8 tile) {
BOOL MetatileBehavior_IsTownMap(u8 tile) {
return tile == TILE_BEHAVIOR_TOWN_MAP;
}

6
src/scrcmd_c.c
View File

@ -1734,11 +1734,11 @@ BOOL ScrCmd_PokemonSummaryScreen(ScriptContext *ctx) {
}
BOOL ScrCmd_GetPhoneBookRematch(ScriptContext *ctx) {
u16 r4 = ScriptGetVar(ctx);
u16 *r6 = ScriptGetVarPointer(ctx);
u16 idx = ScriptGetVar(ctx);
u16 *pRet = ScriptGetVarPointer(ctx);
struct PhoneBook *phoneBook = AllocAndReadPhoneBook(HEAP_ID_32);
HandleLoadOverlay(FS_OVERLAY_ID(OVY_26), OVY_LOAD_ASYNC);
*r6 = PhoneBookTrainerGetRematchInfo(r4, ctx->fieldSystem->saveData, phoneBook, Field_GetTimeOfDayWildParam(ctx->fieldSystem));
*pRet = PhoneBookTrainerGetRematchInfo(idx, ctx->fieldSystem->saveData, phoneBook, Field_GetTimeOfDayWildParam(ctx->fieldSystem));
UnloadOverlayByID(FS_OVERLAY_ID(OVY_26));
FreePhoneBook(phoneBook);
return FALSE;

2
src/start_menu.c
View File

@ -1376,7 +1376,7 @@ BOOL Task_UseFlyInField(TaskManager *taskManager) {
StartMenu_SetExitTaskFunc(startMenu, Task_StartMenu_HandleReturn_Pokemon);
} else {
Pokemon *pokemon = Party_GetMonByIndex(SaveArray_Party_Get(fieldSystem->saveData), partySlot);
struct UnkStruct_02067BF8 *r5 = sub_02067BF8(HEAP_ID_FIELD, fieldSystem, pokemon, partySlot, pokegearArgs->selectedFlyDest, pokegearArgs->mapCursorX * 32 + 0x10, pokegearArgs->mapCursorY * 32 + 0x10);
struct UnkStruct_02067BF8 *r5 = sub_02067BF8(HEAP_ID_FIELD, fieldSystem, pokemon, partySlot, pokegearArgs->selectedFlyDest, pokegearArgs->mapCursorX * 32 + 16, pokegearArgs->mapCursorY * 32 + 16);
Heap_FreeExplicit(HEAP_ID_FIELD, startMenu->exitTaskEnvironment);
FieldSystem_LoadFieldOverlay(fieldSystem);
startMenu->exitTaskFunc = sub_02067C30;

38
src/voltorb_flip/voltorb_flip.c
View File

@ -1823,35 +1823,35 @@ _021E7BE4:
// clang-format on
#endif // NONMATCHING
static ManagedSprite *ov122_021E7C9C(SpriteSystem *a0, SpriteManager *a1, u16 a2, u16 a3, u16 a4, u16 a5) {
static ManagedSprite *ov122_021E7C9C(SpriteSystem *spriteSystem, SpriteManager *spriteManager, u16 x, u16 y, u16 animation, u16 drawPriority) {
ManagedSpriteTemplate temp1 = ov122_021E9374;
GF_ASSERT(a0 != NULL);
GF_ASSERT(a1 != NULL);
GF_ASSERT(spriteSystem != NULL);
GF_ASSERT(spriteManager != NULL);
temp1.x = a2;
temp1.y = a3;
temp1.animation = a4;
temp1.drawPriority = a5;
temp1.x = x;
temp1.y = y;
temp1.animation = animation;
temp1.drawPriority = drawPriority;
ManagedSprite *var1 = SpriteSystem_NewSpriteWithYOffset(a0, a1, &temp1, 0x20c000);
ManagedSprite_SetAnimateFlag(var1, 1);
ManagedSprite_SetDrawFlag(var1, 0);
return var1;
ManagedSprite *ret = SpriteSystem_NewSpriteWithYOffset(spriteSystem, spriteManager, &temp1, 0x20c000);
ManagedSprite_SetAnimateFlag(ret, 1);
ManagedSprite_SetDrawFlag(ret, 0);
return ret;
}
static ManagedSprite *ov122_021E7D04(SpriteSystem *a0, SpriteManager *a1, u16 a2, u16 a3, u16 a4, u16 a5) {
static ManagedSprite *ov122_021E7D04(SpriteSystem *spriteSystem, SpriteManager *spriteManager, u16 x, u16 y, u16 animation, u16 drawPriority) {
ManagedSpriteTemplate temp1 = ov122_021E93A8;
GF_ASSERT(a0 != NULL);
GF_ASSERT(a1 != NULL);
GF_ASSERT(spriteSystem != NULL);
GF_ASSERT(spriteManager != NULL);
temp1.x = a2;
temp1.y = a3;
temp1.animation = a4;
temp1.drawPriority = a5;
temp1.x = x;
temp1.y = y;
temp1.animation = animation;
temp1.drawPriority = drawPriority;
ManagedSprite *var1 = SpriteSystem_NewSpriteWithYOffset(a0, a1, &temp1, 0x20c000);
ManagedSprite *var1 = SpriteSystem_NewSpriteWithYOffset(spriteSystem, spriteManager, &temp1, 0x20c000);
ManagedSprite_SetAnimateFlag(var1, 1);
ManagedSprite_SetDrawFlag(var1, 0);
return var1;