diff options
| author | libjet <libj3t@gmail.com> | 2020-02-18 16:37:51 +0000 |
|---|---|---|
| committer | libjet <libj3t@gmail.com> | 2020-02-18 16:37:51 +0000 |
| commit | 76b10c0a49ee07470a326804588217b1c7b9b59b (patch) | |
| tree | fe2ca6a78b39d24b85cb8762f360a00d7a79aca2 /engine | |
| parent | 0a998a5dde8c419eca48a3b2519209f1b3b80733 (diff) | |
Add copy_name.asm
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/events/overworld.asm | 2 | ||||
| -rwxr-xr-x | engine/main_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/move_mon.asm | 2 | ||||
| -rwxr-xr-x | engine/pack.asm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index c4967028..16ba1044 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -25,7 +25,7 @@ FieldMoveGetPartyNick: ; c74b (3:474b) ld [wMonType], a ld a, [wCurPartyMon] call GetNick - call Function317b + call CopyName1 ld de, wStringBuffer2 ld hl, wStringBuffer3 call CopyName2 diff --git a/engine/main_menu.asm b/engine/main_menu.asm index 0bd56b1a..08242ad1 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -248,7 +248,7 @@ MainMenu_Options: MainMenu_NewGame: xor a - ld [wMonStatusFlags], a + ld [wDebugFlags], a call Function5c3a call Function5bf7 call OakSpeech diff --git a/engine/move_mon.asm b/engine/move_mon.asm index bbfea25e..70e62498 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -1057,7 +1057,7 @@ GiveEgg: ; df92 (3:5f92) ld hl, wPartyMon1Happiness ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes - ld a, [wMonStatusFlags] + ld a, [wDebugFlags] bit 1, a ld a, $1 jr nz, .asm_e028 diff --git a/engine/pack.asm b/engine/pack.asm index 27db7cd2..959c6e19 100755 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -1404,7 +1404,7 @@ Function10e38: ; 10e38 (4:4e38) ld a, [wd002] ld [wd151], a call GetItemName - call Function317b + call CopyName1 ret Pack_ClearTilemap: |