diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-05 14:06:03 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-05 14:06:03 -0500 |
| commit | adf2fe712d372bad8c68590ae77b1dde85290d8f (patch) | |
| tree | 3f41aa52ea49ad17f355870097ecbe9cc46be917 /engine | |
| parent | 893b3a217eefd354d8b0023aa91d9b6a7d03604a (diff) | |
Various labels
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/map_setup.asm | 6 | ||||
| -rw-r--r-- | engine/pokedex.asm | 2 | ||||
| -rw-r--r-- | engine/save.asm | 18 | ||||
| -rw-r--r-- | engine/scripting.asm | 2 | ||||
| -rw-r--r-- | engine/specials.asm | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 957747406..8ae9838f0 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -252,7 +252,7 @@ MapSetupCommands: ; 15440 dba FadeOutMapAndMusic ; 06 dba EnterMapMusic ; 07 dba ForceMapMusic ; 08 - dba CrankUpTheVolume ; 09 + dba FadeInMusic ; 09 dba LoadBlockData ; 0a dba LoadNeighboringBlockData ; 0b dba SaveScreen ; 0c @@ -300,13 +300,13 @@ DontScrollText: ; 154ca ActivateMapAnims: ; 154cf ld a, $1 - ld [$ffde], a + ld [hMapAnims], a ret ; 154d3 SuspendMapAnims: ; 154d3 xor a - ld [$ffde], a + ld [hMapAnims], a ret ; 154d7 diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 005129f5f..01ea1c7c2 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -22,7 +22,7 @@ Pokedex: ; 40000 ld [hInMenu], a xor a - ld [$ffde], a + ld [hMapAnims], a call InitPokedex call DelayFrame diff --git a/engine/save.asm b/engine/save.asm index 338d6bc40..21382a802 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -30,7 +30,7 @@ Function14a58: ; 14a58 call Function14e13 call SaveBackupPokemonData call SaveBackupChecksum - callba Function44725 + callba BackupScratchmons callba Function1406a call ClearWRAMStateAfterSave ret @@ -106,8 +106,8 @@ Function14ad5: ; 14ad5 call SaveBackupPlayerData call SaveBackupPokemonData call SaveBackupChecksum - callba Function44725 - callba Function106187 + callba BackupScratchmons + callba BackupMobileEventIndex callba Function1406a call LoadBox call ClearWRAMStateAfterSave @@ -284,8 +284,8 @@ SaveGameData_: ; 14c10 call SaveBackupPokemonData call SaveBackupChecksum call UpdateStackTop - callba Function44725 - callba Function106187 + callba BackupScratchmons + callba BackupMobileEventIndex callba Function1406a ld a, BANK(s1_be45) call GetSRAMBank @@ -630,8 +630,8 @@ TryLoadSaveFile: ; 14ea5 (5:4ea5) call LoadPlayerData call LoadPokemonData call LoadBox - callba Function44745 - callba Function10619d + callba RestoreScratchmons + callba RestoreMobileEventIndex callba Function1050ea call ValidateBackupSave call SaveBackupOptions @@ -647,8 +647,8 @@ TryLoadSaveFile: ; 14ea5 (5:4ea5) call LoadBackupPlayerData call LoadBackupPokemonData call LoadBox - callba Function44745 - callba Function10619d + callba RestoreScratchmons + callba RestoreMobileEventIndex callba Function1050ea call ValidateSave call SaveOptions diff --git a/engine/scripting.asm b/engine/scripting.asm index c37d82594..115ed77f8 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1222,7 +1222,7 @@ ApplyPersonFacing: ; 0x9728b ; 0x972bc .DisableTextTiles: ; 0x972bc - call Function217a + call LoadMapPart hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT .loop diff --git a/engine/specials.asm b/engine/specials.asm index ac8c220d8..68543f2d9 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -124,7 +124,7 @@ SpecialsPointers:: ; c029 add_special ProfOaksPCBoot add_special SpecialGameboyCheck add_special SpecialTrainerHouse - add_special Function16dc7 + add_special PhotoStudio add_special InitRoamMons add_special Functionc48f add_special Functionc49f |