diff options
Diffstat (limited to 'gba')
| -rw-r--r-- | gba/source/gamedata.c | 20 | ||||
| -rw-r--r-- | gba/source/link.c | 6 | ||||
| -rw-r--r-- | gba/source/main.c | 12 |
3 files changed, 18 insertions, 20 deletions
| diff --git a/gba/source/gamedata.c b/gba/source/gamedata.c index 6868b2b..bbcf4dd 100644 --- a/gba/source/gamedata.c +++ b/gba/source/gamedata.c | |||
| @@ -244,11 +244,11 @@ bool initSaveData( | |||
| 244 | break; | 244 | break; |
| 245 | } | 245 | } |
| 246 | 246 | ||
| 247 | /// --- FR/LG --- | 247 | /// --- FR/LG --- |
| 248 | // In FR/LG, the function that initialises the save-block pointers to | 248 | // In FR/LG, the function that initialises the save-block pointers to |
| 249 | // default does not set up saveblock3. Which will need to be set up before | 249 | // default does not set up saveblock3. Which will need to be set up before |
| 250 | // loading the save if we want boxed Pokémon to not disappear. Oh, and | 250 | // loading the save if we want boxed Pokémon to not disappear. Oh, and |
| 251 | // loadsave() offset is different between FR and LG... | 251 | // loadsave() offset is different between FR and LG... |
| 252 | 252 | ||
| 253 | case 'DRPB': // FireRed German | 253 | case 'DRPB': // FireRed German |
| 254 | case 'DGPB': // LeafGreen German | 254 | case 'DGPB': // LeafGreen German |
| @@ -401,11 +401,11 @@ bool initSaveData( | |||
| 401 | break; | 401 | break; |
| 402 | } | 402 | } |
| 403 | 403 | ||
| 404 | /// --- Emerald --- | 404 | /// --- Emerald --- |
| 405 | // In Emerald, the saveblock pointer that isn't set up is saveblock1 (in | 405 | // In Emerald, the saveblock pointer that isn't set up is saveblock1 (in |
| 406 | // FR/LG it was saveblock3). The initial save loading code after the | 406 | // FR/LG it was saveblock3). The initial save loading code after the |
| 407 | // copyright screen is also updated, now it sets up ASLR/crypto here before | 407 | // copyright screen is also updated, now it sets up ASLR/crypto here before |
| 408 | // loading the save. | 408 | // loading the save. |
| 409 | 409 | ||
| 410 | case 'DEPB': // Emerald German | 410 | case 'DEPB': // Emerald German |
| 411 | { | 411 | { |
| diff --git a/gba/source/link.c b/gba/source/link.c index c84e44d..acadf3b 100644 --- a/gba/source/link.c +++ b/gba/source/link.c | |||
| @@ -12,8 +12,8 @@ | |||
| 12 | 12 | ||
| 13 | void initializeLink() | 13 | void initializeLink() |
| 14 | { | 14 | { |
| 15 | REG_HS_CTRL |= JOY_RW; | 15 | REG_HS_CTRL |= JOY_RW; |
| 16 | REG_JOYTR = 0; | 16 | REG_JOYTR = 0; |
| 17 | while ((REG_HS_CTRL & JOY_WRITE) == 0); | 17 | while ((REG_HS_CTRL & JOY_WRITE) == 0); |
| 18 | REG_HS_CTRL |= JOY_RW; | 18 | REG_HS_CTRL |= JOY_RW; |
| 19 | } | 19 | } |
| @@ -22,7 +22,7 @@ void waitForAck() | |||
| 22 | { | 22 | { |
| 23 | while ((REG_HS_CTRL & JOY_WRITE) == 0); | 23 | while ((REG_HS_CTRL & JOY_WRITE) == 0); |
| 24 | REG_HS_CTRL |= JOY_RW; | 24 | REG_HS_CTRL |= JOY_RW; |
| 25 | REG_JOYTR = 0; | 25 | REG_JOYTR = 0; |
| 26 | while ((REG_HS_CTRL & JOY_WRITE) == 0); | 26 | while ((REG_HS_CTRL & JOY_WRITE) == 0); |
| 27 | REG_HS_CTRL |= JOY_RW; | 27 | REG_HS_CTRL |= JOY_RW; |
| 28 | } | 28 | } |
| diff --git a/gba/source/main.c b/gba/source/main.c index 9f97324..6207685 100644 --- a/gba/source/main.c +++ b/gba/source/main.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | int main(void) | 11 | int main(void) |
| 12 | { | 12 | { |
| 13 | initializeLink(); | 13 | initializeLink(); |
| 14 | 14 | ||
| 15 | // Identify the host game. | 15 | // Identify the host game. |
| 16 | if (GAME_RUBY) | 16 | if (GAME_RUBY) |
| @@ -30,9 +30,9 @@ int main(void) | |||
| 30 | sendS32(5); | 30 | sendS32(5); |
| 31 | } else { | 31 | } else { |
| 32 | sendS32(-1); | 32 | sendS32(-1); |
| 33 | waitForAck(); | 33 | waitForAck(); |
| 34 | 34 | ||
| 35 | return 0; | 35 | return 0; |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | waitForAck(); | 38 | waitForAck(); |
| @@ -46,9 +46,9 @@ int main(void) | |||
| 46 | { | 46 | { |
| 47 | // Unsupported game version. | 47 | // Unsupported game version. |
| 48 | sendS32(-1); | 48 | sendS32(-1); |
| 49 | waitForAck(); | 49 | waitForAck(); |
| 50 | 50 | ||
| 51 | return 0; | 51 | return 0; |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | sendS32(1); | 54 | sendS32(1); |
| @@ -105,6 +105,4 @@ int main(void) | |||
| 105 | 105 | ||
| 106 | sendU32(tti); | 106 | sendU32(tti); |
| 107 | waitForAck(); | 107 | waitForAck(); |
| 108 | |||
| 109 | // Halt(); | ||
| 110 | } | 108 | } |
