diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/link/link.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/map_objects.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 6 | ||||
| -rw-r--r-- | engine/overworld/warp_connection.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/breeding.asm | 6 |
5 files changed, 9 insertions, 9 deletions
diff --git a/engine/link/link.asm b/engine/link/link.asm index b51567c31..3550c2b20 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -585,7 +585,7 @@ FixDataForLinkTransfer: ld [hli], a dec b jr nz, .loop3 - ld hl, wTimeCapsulePartyMon1 - 1 + 6 + ld hl, wTimeCapsulePartyMon1 - 1 + PARTY_LENGTH ld de, wc612 lb bc, 0, 0 .loop4 diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 26152625d..cf532fea6 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -1836,7 +1836,7 @@ Function5000: ; unscripted? ret GetMovementByte: - ld hl, wMovementDataPointer + ld hl, wMovementDataBank call _GetMovementByte ret diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 4f6c6568e..ee6e15b51 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -137,7 +137,7 @@ ScriptCommandTable: dw Script_opentext ; 47 dw Script_refreshscreen ; 48 dw Script_closetext ; 49 - dw Script_loadbytec2cf ; 4a + dw Script_writeunusedbytebuffer ; 4a dw Script_farwritetext ; 4b dw Script_writetext ; 4c dw Script_repeattext ; 4d @@ -2636,12 +2636,12 @@ Script_refreshscreen: call GetScriptByte ret -Script_loadbytec2cf: +Script_writeunusedbytebuffer: ; script command 0x4a ; parameters: byte call GetScriptByte - ld [wc2cf], a + ld [wUnusedScriptByteBuffer], a ret db closetext_command ; unused diff --git a/engine/overworld/warp_connection.asm b/engine/overworld/warp_connection.asm index 2630ad913..2b36d1e42 100644 --- a/engine/overworld/warp_connection.asm +++ b/engine/overworld/warp_connection.asm @@ -1,6 +1,6 @@ HandleNewMap: - call ClearUnusedC7E8 + call ClearUnusedMapBuffer call ResetMapBufferEventFlags call ResetFlashIfOutOfCave call GetCurrentMapSceneID diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 2598ddd3e..66d227ce5 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -254,7 +254,7 @@ HatchEggs: ld [wCurSpecies], a call GetPokemonName xor a - ld [wd26b], a + ld [wUnusedEggHatchFlag], a call GetBaseData ld a, [wCurPartyMon] ld hl, wPartyMon1 @@ -325,8 +325,8 @@ HatchEggs: pop de jr c, .nonickname - ld a, $1 - ld [wd26b], a + ld a, TRUE + ld [wUnusedEggHatchFlag], a xor a ld [wMonType], a push de |