diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-05-17 11:08:02 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-05-17 11:08:02 +0100 |
| commit | 91af4cb51631ea4257a8aeb61b836fa304aa17f5 (patch) | |
| tree | b3795815fedc99b5f108b4867513de4b9cd8ea03 /src/engine/home.asm | |
| parent | ef5a54d4d18baa51aea8552f184880e3ccd4d423 (diff) | |
NPC functions disasm and documenting
Diffstat (limited to 'src/engine/home.asm')
| -rw-r--r-- | src/engine/home.asm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/home.asm b/src/engine/home.asm index 0b60609..dc95294 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -10600,9 +10600,9 @@ OverworldDoFrameFunction: ; 380e (0:380e) call BankswitchROM call SetScreenScrollWram call Func_c554 - ld a, BANK(Func_1c610) + ld a, BANK(HandleAllNPCMovement) call BankswitchROM - call Func_1c610 + call HandleAllNPCMovement call Func_3cb4 ld a, BANK(DoLoadedFramesetSubgroupsFrame) call BankswitchROM @@ -10948,9 +10948,11 @@ PlayDefaultSong: ; 39fc (0:39fc) ; returns [wDefaultSong] or MUSIC_RONALD in a GetDefaultSong: ; 3a1f (0:3a1f) - ld a, [wd3b8] + ld a, [wRonaldIsInMap] or a jr z, .default_song + ; only return Ronald's theme if it's + ; not in one of the following maps ld a, [wOverworldMapSelection] cp OWMAP_ISHIHARAS_HOUSE jr z, .default_song |