diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-11 09:15:47 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-11 09:15:47 -0400 |
| commit | 69d6b38f0ba52ee14b3de9aa926e38e400e03d78 (patch) | |
| tree | 1dcf094c43203a03c08af41572fedcd58724a66c | |
| parent | 9062e78b640ae5aa412e7d5f405d874305d61ada (diff) | |
Some label changes
| -rw-r--r-- | home/talk_to_npc.asm | 17 | ||||
| -rw-r--r-- | hram.asm | 2 | ||||
| -rw-r--r-- | shim.sym | 2 | ||||
| -rw-r--r-- | wram.asm | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/home/talk_to_npc.asm b/home/talk_to_npc.asm index 924c723..9ef5dd3 100644 --- a/home/talk_to_npc.asm +++ b/home/talk_to_npc.asm @@ -22,13 +22,13 @@ Function3036:: ; 3036 .Text: ; 00:303a db "@" -Function303b:: +CallMapTextSubroutine:: ld a, [wcdb0] bit 0, a jr z, asm_3062 call Function3055 ret z - ld hl, hUnknownFFF3 + ld hl, hCurMapTextSubroutinePtr ld a, [hli] ld h, [hl] ld l, a @@ -105,24 +105,24 @@ Function3085:: ; 00:3085 pop hl ret -Function30b7:: +QueueMapTextSubroutine:: ldh a, [hJoyState] bit A_BUTTON_F, a jp z, Function323e - call Function3103 + call GetFacingPersonText jp nc, Function30e8 ld d, $0 ld e, a ld a, [wce63] bit 1, a call nz, Function3085 - ld hl, wd668 + ld hl, wMapTextPtr ld a, [hli] ld h, [hl] ld l, a add hl, de add hl, de - ld de, hUnknownFFF3 + ld de, hCurMapTextSubroutinePtr ld a, [hli] ld [de], a inc de @@ -134,7 +134,7 @@ Function30b7:: ret Function30e8:: ; 00:30e8 - call Function2f1d + call GetFacingSignpost jp nc, Function323e ld a, e ldh [hFFEB], a @@ -149,10 +149,9 @@ Function30e8:: ; 00:30e8 call Function3240 ret -Function3103:: ; 00:3103 +GetFacingPersonText:: ; 00:3103 callba Function776e ret nc call Function319b scf ret - @@ -233,6 +233,6 @@ hRTCRandom:: db ; fff1 hBattleTurn:: db ; fff2 -hUnknownFFF3:: dw ; fff3 +hCurMapTextSubroutinePtr:: dw ; fff3 ; TODO @@ -1,5 +1,5 @@ ; ROM0 -00:2F1D Function2f1d +00:2F1D GetFacingSignpost 00:3111 Function3111 00:3171 Function3171 00:319B Function319b @@ -756,7 +756,7 @@ wMapWidth:: ; d665 db wMapBlocksPointer:: ; d666 dw -wd668:: +wMapTextPtr:: dw wMapScriptPtr:: ; d66a dw |