diff options
| author | 2Tie <foxman95@ymail.com> | 2018-06-17 01:05:52 -0600 |
|---|---|---|
| committer | 2Tie <foxman95@ymail.com> | 2018-06-17 01:05:52 -0600 |
| commit | f123dd89d49f6f70d823947a47a3ce117d6cd01a (patch) | |
| tree | 1841ab02ca4e37c1e0bbe34a6d41bef24c6dad94 /home/talk_to_npc.asm | |
| parent | a9149c6cc3be2a1cab6a374b2c10f359ce5f29f5 (diff) | |
more npc code and some audio stuff, slimmin down the shim
Diffstat (limited to 'home/talk_to_npc.asm')
| -rw-r--r-- | home/talk_to_npc.asm | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/home/talk_to_npc.asm b/home/talk_to_npc.asm index 1820692..3371b3c 100644 --- a/home/talk_to_npc.asm +++ b/home/talk_to_npc.asm @@ -260,7 +260,7 @@ CheckInlineTrainer:: ; 00:31C4 add hl, de ld a, [hl] call GetObjectStruct ; de is the address of the number of object we want - call $31EB + call GetInlineMapObject jr nc, .escape ; if c flag isn't set, leave ld hl, $000B ; map_object script add hl, de @@ -354,4 +354,20 @@ SetFFInAccumulator:: ; 3240 dec a ret -; 3243
\ No newline at end of file +Function3243:: ; 3243 + ldh a, [hROMBank] + push af + ld a, $03 + call Bankswitch + push hl + push de + push bc + call _TossItem + pop bc + pop de + pop hl + pop af + call Bankswitch + ret + +;3259
\ No newline at end of file |