diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle/anim/normal.c | 12 | ||||
| -rw-r--r-- | src/data/battle_strings_en.h | 4 | ||||
| -rw-r--r-- | src/field_special_scene.c | 4 | ||||
| -rw-r--r-- | src/libs/agb_flash_mx.c | 2 | ||||
| -rw-r--r-- | src/map_name_popup.c | 2 | ||||
| -rw-r--r-- | src/scanline_effect.c | 2 |
6 files changed, 19 insertions, 7 deletions
diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index c3100a15d..9053d7844 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -746,7 +746,11 @@ static void sub_80E24B8(struct Sprite *sprite) break; } + #if MODERN + sprite->data[4] = *(u16 *)(sprite->data[6] | (sprite->data[7] << 16)); + #else sprite->data[4] = *(u32 *)(sprite->data[6] | (sprite->data[7] << 16)); + #endif sprite->data[5] = gBattleAnimArgs[3]; var0 = sprite->data[5] - 2; if (var0 < 2) @@ -770,13 +774,21 @@ static void sub_80E255C(struct Sprite *sprite) else { sprite->data[1] = sprite->data[2]; + #if MODERN + *(u16 *)(sprite->data[6] | (sprite->data[7] << 16)) += sprite->data[0]; + #else *(u32 *)(sprite->data[6] | (sprite->data[7] << 16)) += sprite->data[0]; + #endif sprite->data[0] = -sprite->data[0]; } } else { + #if MODERN + *(u16 *)(sprite->data[6] | (sprite->data[7] << 16)) = sprite->data[4]; + #else *(u32 *)(sprite->data[6] | (sprite->data[7] << 16)) = sprite->data[4]; + #endif var0 = sprite->data[5] - 2; if (var0 < 2) { diff --git a/src/data/battle_strings_en.h b/src/data/battle_strings_en.h index 4534516c1..9686f1543 100644 --- a/src/data/battle_strings_en.h +++ b/src/data/battle_strings_en.h @@ -638,9 +638,9 @@ const u8 BattleText_Failed[] = _("But it failed!"); const u8 BattleText_HurtItself[] = _("It hurt itself in its\nconfusion!"); const u8 BattleText_MirrorFail[] = _("The MIRROR MOVE failed!"); const u8 BattleText_RainStart[] = _("It started to rain!"); -const u8 BattleText_PourStart[] = _("A downpour started!"); +const u8 BattleText_PourStart[] = _("A downpour started!"); // corresponds to DownpourText in pokegold and pokecrystal and is used by Rain Dance in GSC const u8 BattleText_RainCont1[] = _("Rain continues to fall."); -const u8 BattleText_PourCont[] = _("The downpour continues."); +const u8 BattleText_PourCont[] = _("The downpour continues."); // unused const u8 BattleText_RainStop[] = _("The rain stopped."); const u8 BattleText_SandBrewed[] = _("A sandstorm brewed!"); const u8 BattleText_SandRages[] = _("The sandstorm rages."); diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 0fb0ca097..03854a5ff 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -339,7 +339,7 @@ void Task_HandlePorthole(u8 taskId) break; case EXIT_PORTHOLE: // exit porthole. FlagClear(FLAG_DONT_TRANSITION_MUSIC); - FlagClear(FLAG_SPECIAL_FLAG_0); + FlagClear(FLAG_HIDE_MAP_NAME_POPUP); copy_saved_warp2_bank_and_enter_x_to_warp1(0); sp13E_warp_to_last_warp(); DestroyTask(taskId); @@ -376,7 +376,7 @@ void sub_80C7958(void) { FlagSet(FLAG_SYS_CRUISE_MODE); FlagSet(FLAG_DONT_TRANSITION_MUSIC); - FlagSet(FLAG_SPECIAL_FLAG_0); + FlagSet(FLAG_HIDE_MAP_NAME_POPUP); saved_warp2_set(0, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1); sub_80C7754(); sub_8080F9C(); diff --git a/src/libs/agb_flash_mx.c b/src/libs/agb_flash_mx.c index 5e2b0bce1..b164e27a9 100644 --- a/src/libs/agb_flash_mx.c +++ b/src/libs/agb_flash_mx.c @@ -26,7 +26,7 @@ const struct FlashSetupInfo MX29L010 = 0 // appears to be unused }, { 3, 1 }, // wait state setup data -#if (GERMAN && SAPPHIRE && !DEBUG) // OK, why !DEBUG? +#if (GERMAN && SAPPHIRE && (REVISION == 0) && !DEBUG) // OK, why !DEBUG? { { 0xBF, 0xD4 } } // ID #else { { 0xC2, 0x09 } } // ID diff --git a/src/map_name_popup.c b/src/map_name_popup.c index 102254f22..7e4aa60e5 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -19,7 +19,7 @@ bool8 unref_sub_80A2F44(void) void ShowMapNamePopup(void) { - if (FlagGet(FLAG_SPECIAL_FLAG_0) != TRUE) + if (FlagGet(FLAG_HIDE_MAP_NAME_POPUP) != TRUE) { if (!FuncIsActiveTask(Task_MapNamePopup)) { diff --git a/src/scanline_effect.c b/src/scanline_effect.c index b4de0689f..0e88799de 100644 --- a/src/scanline_effect.c +++ b/src/scanline_effect.c @@ -92,7 +92,7 @@ void ScanlineEffect_InitHBlankDmaTransfer(void) { DmaStop(0); // Set DMA to copy to dest register on each HBlank for the next frame. - // The HBlank DMA transfers do not occurr during VBlank, so the transfer + // The HBlank DMA transfers do not occur during VBlank, so the transfer // will begin on the HBlank after the first scanline DmaSet(0, gScanlineEffect.dmaSrcBuffers[gScanlineEffect.srcBuffer], gScanlineEffect.dmaDest, gScanlineEffect.dmaControl); // Manually set the reg for the first scanline |