diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/mobile_40.asm | 6 | ||||
| -rw-r--r-- | misc/mobile_42.asm | 12 | ||||
| -rwxr-xr-x | misc/mobile_46.asm | 4 | ||||
| -rwxr-xr-x | misc/mobile_5c.asm | 8 | ||||
| -rw-r--r-- | misc/mobile_5f.asm | 8 |
5 files changed, 19 insertions, 19 deletions
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 5afe9e3a9..3e1635959 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -63,7 +63,7 @@ Function100063: ; 100063 ld a, [rIE] ld [BGMapBuffer], a xor a - ld [$ffde], a + ld [hMapAnims], a ld [hLCDStatCustom], a ret ; 100082 @@ -80,7 +80,7 @@ Function100082: ; 100082 ld a, 1 << VBLANK + 1 << LCD_STAT + 1 << TIMER + 1 << SERIAL ld [rIE], a xor a - ld [$ffde], a + ld [hMapAnims], a ld [hLCDStatCustom], a ld a, $1 ld [$ffc9], a @@ -5403,7 +5403,7 @@ Function102423: ; 102423 ret nc callba Function14a58 callba MobileFn_1060af - callba Function106187 + callba BackupMobileEventIndex ld hl, wcd4b set 1, [hl] ld a, $0 diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 613c21bc3..847422b7c 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -67,10 +67,10 @@ Function10805b: ; 10805b ld [hl], e inc hl ld [hl], d - ld a, [$ffde] + ld a, [hMapAnims] push af xor a - ld [$ffde], a + ld [hMapAnims], a ld hl, VramState ld a, [hl] push af @@ -88,7 +88,7 @@ Function10805b: ; 10805b pop af ld [VramState], a pop af - ld [$ffde], a + ld [hMapAnims], a ret ; 108089 @@ -97,10 +97,10 @@ Function108089: ; 108089 ld [hl], e inc hl ld [hl], d - ld a, [$ffde] + ld a, [hMapAnims] push af xor a - ld [$ffde], a + ld [hMapAnims], a ld hl, VramState ld a, [hl] push af @@ -118,7 +118,7 @@ Function108089: ; 108089 pop af ld [VramState], a pop af - ld [$ffde], a + ld [hMapAnims], a ret ; 1080b7 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 37d0223a2..494f848a6 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -5862,7 +5862,7 @@ Function11ac51: ; 11ac51 ld a, $1 ld [hInMenu], a xor a - ld [$ffde], a + ld [hMapAnims], a ld [wcd49], a ld [wcd4a], a ld [wcd4c], a @@ -7919,7 +7919,7 @@ Function11b98f: ; 11b98f call CopyBytes ld a, "@" ld [de], a - ld hl, s0_a600 + ld hl, sPartyScratch1 ld bc, PARTYMON_STRUCT_LENGTH - 1 ld a, [wcd2a] .loop5 diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index 6a0de4e47..b9b0553ce 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -993,7 +993,7 @@ endr dw Function170881 ; 0x08 dw Function17089a ; 0x09 dw Function1708b1 ; 0x0a - dw Function1708b9 ; 0x0b + dw CheckMobileEventIndex ; 0x0b dw Function1708c8 ; 0x0c dw Function1708f0 ; 0x0d dw Function17093c ; 0x0e @@ -1302,10 +1302,10 @@ Function1708b1: ; 1708b1 (5c:48b1) call MaxVolume ret -Function1708b9: ; 1708b9 (5c:48b9) something to do with GS Ball - ld a, BANK(s1_be3c) +CheckMobileEventIndex: ; 1708b9 (5c:48b9) something to do with GS Ball + ld a, BANK(sMobileEventIndex) call GetSRAMBank - ld a, [s1_be3c] + ld a, [sMobileEventIndex] ld [ScriptVar], a call CloseSRAM ret diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index a58c6eb0d..49f7353b7 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -3123,7 +3123,7 @@ Function17e3c3: ; 17e3c3 ld a, $1 ld [rSVBK], a callba MobileFn_106155 - callba Function106187 + callba BackupMobileEventIndex pop af ld [rSVBK], a ret @@ -3855,7 +3855,7 @@ endr ld b, a ld a, [wcd57] ld c, a - call Function31a4 + call MobilePrintNum ld a, l ld [wcd52], a ld a, h @@ -4246,7 +4246,7 @@ Function17f2cb: ; 17f2cb ld b, $1 ld a, [wcd54] ld c, a - call Function31a4 + call MobilePrintNum ld a, l ld [wcd52], a ld a, h @@ -4562,7 +4562,7 @@ endr ld b, a ld a, [wcd58] ld c, a - call Function31a4 + call MobilePrintNum ld a, l ld [wcd52], a ld a, h |