mirror
/
pokeheartgold
mirror of https://github.com/pret/pokeheartgold
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

address review comments

This commit is contained in:
PikalaxALT 2025-11-25 17:11:30 -05:00
parent 16920eeb9d
commit 7e923b2032
No known key found for this signature in database
GPG Key ID: 7774E96AA69E5B61
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/application/pokegear/pokegear_internal.h
View File

@ -214,7 +214,7 @@ void PokegearUIManager_Delete(PokegearUIManager *uiManager);
void PokegearUIManager_LoadSkinGfx(PokegearUIManager *uiManager, u8 a1);
void PokegearUIManager_AnimateSprites(PokegearUIManager *uiManager);
ManagedSprite *PokegearUIManager_CreateSprite(PokegearUIManager *uiManager, u8 x, u8 y, u8 z, u8 priority, u8 drawPriority, u8 index, u8 seq, int isBottomScreen);
void PokegearUIManager_DeleteSprite(ManagedSprite *a0);
void PokegearUIManager_DeleteSprite(ManagedSprite *managedSprite);
PokegearObjectsManager *PokegearObjectsManager_Create(int count, enum HeapID heapID);
void PokegearObjectsManager_Release(PokegearObjectsManager *mgr);

4
include/save_pokegear.h
View File

@ -69,8 +69,8 @@ void SavePokegear_RegisterCard(SavePokegear *pokegear, int card);
u8 Pokegear_GetRegisteredCardsArray(SavePokegear *pokegear);
void Pokegear_SetMapUnlockLevel(SavePokegear *pokegear, u8 mapUnlockMenu);
u8 Pokegear_GetMapUnlockLevel(SavePokegear *pokegear);
u32 Pokegear_GetBackgroundStyle(SavePokegear *pokegear);
void Pokegear_SetBackgroundStyle(SavePokegear *pokegear, u32 a1);
u32 Pokegear_GetSkin(SavePokegear *pokegear);
void Pokegear_SetSkin(SavePokegear *pokegear, u32 skin);
u16 Pokegear_GetUnlockedSkins(SavePokegear *pokegear);
BOOL sub_0202EEA4(SavePokegear *pokegear);
void sub_0202EEA8(SavePokegear *pokegear, u8 a1);

6
include/touchscreen_list_menu.h
View File

@ -8,9 +8,9 @@
#include "touchscreen.h"
enum TouchscreenListMenuTextAlignment {
TSMENU_ALN_LEFT,
TSMENU_ALN_CENTER,
TSMENU_ALN_RIGHT,
TSMENU_ALIGN_LEFT,
TSMENU_ALIGN_CENTER,
TSMENU_ALIGN_RIGHT,
};
typedef struct TouchscreenListMenuTemplate {

12
src/application/pokegear/configure/overlay_101_021EF1D8.c
View File

@ -24,12 +24,12 @@ static const TouchscreenListMenuTemplate sContextMenuTemplate = {
};
static const PokegearConfigureContextMenuParam sContextMenuParam[] = {
{ 10, 2, TSMENU_ALN_LEFT },
{ 20, 2, TSMENU_ALN_LEFT },
{ 22, 2, TSMENU_ALN_RIGHT },
{ 10, 11, TSMENU_ALN_LEFT },
{ 20, 11, TSMENU_ALN_LEFT },
{ 22, 11, TSMENU_ALN_RIGHT },
{ 10, 2, TSMENU_ALIGN_LEFT },
{ 20, 2, TSMENU_ALIGN_LEFT },
{ 22, 2, TSMENU_ALIGN_RIGHT },
{ 10, 11, TSMENU_ALIGN_LEFT },
{ 20, 11, TSMENU_ALIGN_LEFT },
{ 22, 11, TSMENU_ALIGN_RIGHT },
};
void PokegearConfigure_LoadGraphics_Internal(PokegearConfigureAppData *configureApp) {

6
src/application/pokegear/configure/pokegear_configure.c
View File

@ -85,13 +85,13 @@ BOOL PokegearConfigure_Exit(OverlayManager *man, int *state) {
static void PokegearConfigure_InitInternal(PokegearConfigureAppData *configureApp) {
configureApp->pokegear->childAppdata = configureApp;
configureApp->pokegear->reselectAppCB = PokegearConfigure_OnReselectApp;
configureApp->skin = Pokegear_GetBackgroundStyle(configureApp->pokegear->savePokegear);
configureApp->skin = Pokegear_GetSkin(configureApp->pokegear->savePokegear);
configureApp->unlockedSkins = Pokegear_GetUnlockedSkins(configureApp->pokegear->savePokegear);
configureApp->unlockedSkins = 0xFF; // nani the fuck?
configureApp->unlockedSkins = 0xFF; // the ability to unlock skins was likely removed late in development, and dev was lazy
}
static void PokegearConfigure_ExitInternal(PokegearConfigureAppData *configureApp) {
Pokegear_SetBackgroundStyle(configureApp->pokegear->savePokegear, configureApp->skin);
Pokegear_SetSkin(configureApp->pokegear->savePokegear, configureApp->skin);
configureApp->pokegear->reselectAppCB = NULL;
configureApp->pokegear->deselectAppCB = NULL;
}

2
src/application/pokegear/main/pokegear_main.c
View File

@ -68,7 +68,7 @@ BOOL Pokegear_Init(OverlayManager *man, int *state) {
pokegearApp->profile = Save_PlayerData_GetProfile(pokegearApp->args->saveData);
pokegearApp->registeredCards = Pokegear_GetRegisteredCardsArray(pokegearApp->savePokegear);
pokegearApp->menuInputState = MenuInputStateMgr_GetState(pokegearApp->args->menuInputStatePtr);
pokegearApp->skin = Pokegear_GetBackgroundStyle(pokegearApp->savePokegear);
pokegearApp->skin = Pokegear_GetSkin(pokegearApp->savePokegear);
switch (pokegearApp->args->isScriptedLaunch) {
case 1: // scripted phone call
pokegearApp->app = GEAR_APP_PHONE;

2
src/application/pokegear/phone/pokegear_phone.c
View File

@ -104,7 +104,7 @@ BOOL PokegearPhone_Exit(OverlayManager *man, int *state) {
static void PokegearPhone_LoadContactsAndInitFromArgs(PokegearPhoneAppData *phoneApp) {
phoneApp->pokegear->childAppdata = phoneApp;
phoneApp->pokegear->reselectAppCB = PokegearPhone_OnReselectApp;
phoneApp->skin = Pokegear_GetBackgroundStyle(phoneApp->pokegear->savePokegear);
phoneApp->skin = Pokegear_GetSkin(phoneApp->pokegear->savePokegear);
phoneApp->saveContacts = SavePokegear_AllocAndCopyPhonebook(phoneApp->pokegear->savePokegear, phoneApp->heapID);
phoneApp->numContacts = SavePokegear_FindEmptyPhonebookSlot(phoneApp->pokegear->savePokegear);
PokegearPhone_ContactList_CreateLinkedList(phoneApp);

2
src/application/pokegear/radio/pokegear_radio.c
View File

@ -83,7 +83,7 @@ void Radio_Load(PokegearRadioAppData *radioApp) {
radioApp->pokegear->childAppdata = radioApp;
radioApp->pokegear->reselectAppCB = Radio_OnReselectApp;
radioApp->pokegear->deselectAppCB = Radio_UnknownCB;
radioApp->skin = Pokegear_GetBackgroundStyle(radioApp->pokegear->savePokegear);
radioApp->skin = Pokegear_GetSkin(radioApp->pokegear->savePokegear);
Pokegear_GetRadioCursorCoords(radioApp->pokegear->savePokegear, &radioApp->cursorX, &radioApp->cursorY);
radioApp->selectedButton = 3;
radioApp->stationSelection = Radio_GetAvailableChannels(radioApp);

6
src/save_pokegear.c
View File

@ -82,12 +82,12 @@ u8 Pokegear_GetMapUnlockLevel(SavePokegear *pokegear) {
return pokegear->mapUnlockLevel;
}
u32 Pokegear_GetBackgroundStyle(SavePokegear *pokegear) {
u32 Pokegear_GetSkin(SavePokegear *pokegear) {
return pokegear->skin;
}
void Pokegear_SetBackgroundStyle(SavePokegear *pokegear, u32 newStyle) {
pokegear->skin = newStyle;
void Pokegear_SetSkin(SavePokegear *pokegear, u32 skin) {
pokegear->skin = skin;
}
u16 Pokegear_GetUnlockedSkins(SavePokegear *pokegear) {

10
src/touchscreen_list_menu.c
View File

@ -72,10 +72,10 @@ static TouchscreenListMenu *TouchscreenListMenu_CreateInternal(TouchscreenListMe
switch (alignment) {
default:
GF_ASSERT(FALSE);
case TSMENU_ALN_LEFT:
case TSMENU_ALIGN_LEFT:
ret->x = x;
break;
case TSMENU_ALN_CENTER:
case TSMENU_ALIGN_CENTER:
ret->width = (ret->width + 1) & ~1;
if (x - (ret->width + 2) / 2 < 0) {
ret->x = 0;
@ -83,7 +83,7 @@ static TouchscreenListMenu *TouchscreenListMenu_CreateInternal(TouchscreenListMe
ret->x = x - (ret->width + 2) / 2;
}
break;
case TSMENU_ALN_RIGHT:
case TSMENU_ALIGN_RIGHT:
if (x - (ret->width + 2) < 0) {
ret->x = 0;
} else {
@ -102,7 +102,7 @@ static TouchscreenListMenu *TouchscreenListMenu_CreateInternal(TouchscreenListMe
}
TouchscreenListMenu *TouchscreenListMenu_Create(TouchscreenListMenuSpawner *spawner, TouchscreenListMenuHeader *header, u8 isTouch, u8 x, u8 y, u8 width, u8 selection) {
return TouchscreenListMenu_CreateInternal(spawner, header, isTouch, x, y, width, selection, NULL, NULL, FALSE, TSMENU_ALN_LEFT);
return TouchscreenListMenu_CreateInternal(spawner, header, isTouch, x, y, width, selection, NULL, NULL, FALSE, TSMENU_ALIGN_LEFT);
}
TouchscreenListMenu *TouchscreenListMenu_CreateWithAlignment(TouchscreenListMenuSpawner *spawner, TouchscreenListMenuHeader *header, u8 isTouch, u8 x, u8 y, u8 width, u8 selection, enum TouchscreenListMenuTextAlignment alignment) {
@ -110,7 +110,7 @@ TouchscreenListMenu *TouchscreenListMenu_CreateWithAlignment(TouchscreenListMenu
}
TouchscreenListMenu *TouchscreenListMenu_CreateWithCallback(TouchscreenListMenuSpawner *spawner, TouchscreenListMenuHeader *header, u8 isTouch, u8 x, u8 y, u8 width, u8 selection, TouchscreenListMenuCallback callback, void *callbackArg, BOOL silent) {
return TouchscreenListMenu_CreateInternal(spawner, header, isTouch, x, y, width, selection, callback, callbackArg, silent, TSMENU_ALN_LEFT);
return TouchscreenListMenu_CreateInternal(spawner, header, isTouch, x, y, width, selection, callback, callbackArg, silent, TSMENU_ALIGN_LEFT);
}
u8 TouchscreenListMenu_WasLastInputTouch(TouchscreenListMenu *menu) {