diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/copy.asm | 24 | ||||
| -rw-r--r-- | home/map.asm | 32 | ||||
| -rw-r--r-- | home/map_objects.asm | 4 | ||||
| -rw-r--r-- | home/menu.asm | 12 | ||||
| -rw-r--r-- | home/text.asm | 8 | ||||
| -rw-r--r-- | home/time.asm | 4 |
6 files changed, 21 insertions, 63 deletions
diff --git a/home/copy.asm b/home/copy.asm index ad25c96e6..633c993be 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -106,44 +106,32 @@ Functiondfd: ; dfd Functione4a: ; e4a - ld a, $5 - ld hl, $4135 - rst FarCall + callba Function14135 ret ; e51 Functione51: ; e51 - ld a, $3e - ld hl, $7449 - rst FarCall + callba Functionfb449 ret ; e58 Functione58: ; e58 - ld a, $3e - ld hl, $74be - rst FarCall + callba Functionfb4be ret ; e5f Functione5f: ; e5f - ld a, $3e - ld hl, $748a - rst FarCall - ld a, $3e - ld hl, $74b0 - rst FarCall + callba Functionfb48a + callba Functionfb4b0 ret ; e6c Functione6c: ; e6c - ld a, $3e - ld hl, $74b0 - rst FarCall + callba Functionfb4b0 ret ; e73 diff --git a/home/map.asm b/home/map.asm index d4cfe1be9..3c2e0e645 100644 --- a/home/map.asm +++ b/home/map.asm @@ -696,9 +696,7 @@ Function248a: ; 248a call Function24ba .asm_24b3 - ld a, $41 - ld hl, $486d - rst FarCall + callba Function10486d ret ; 24ba @@ -1418,9 +1416,7 @@ Function2821: ; 2821 jr .asm_2875 .asm_286f - ld a, $7 - ld hl, $4000 - rst FarCall + callba Function1c000 .asm_2875 xor a @@ -1944,9 +1940,7 @@ FadeToMenu: ; 2b29 xor a ld [hBGMapMode], a call Function1d6e - ld a, $23 - ld hl, $4084 - rst FarCall + callba Function8c084 call ClearSprites call Function2ed3 ret @@ -1973,13 +1967,9 @@ Function2b4d: ; 2b4d Function2b5c: ; 2b5c ld b, $9 call GetSGBLayout - ld a, $12 - ld hl, $5409 - rst FarCall + callba Function49409 call Function3200 - ld a, $23 - ld hl, $4079 - rst FarCall + callba Function8c079 call Function2ee4 ret ; 2b74 @@ -2013,9 +2003,7 @@ Function2b74: ; 0x2b74 Function2bae: ; 2bae call DisableLCD call ClearSprites - ld a, $5 - ld hl, $4168 - rst FarCall + callba Function14168 call Functione51 call Functione5f ld a, [hROMBank] @@ -2025,9 +2013,7 @@ Function2bae: ; 2bae ld a, [MapNumber] ld c, a call Function2c24 - ld a, $23 - ld hl, $4001 - rst FarCall + callba Function8c001 call Function2173 call Function2821 ld a, $9 @@ -2278,9 +2264,7 @@ Function2cbd: ; 2cbd jr z, .asm_2cee bit 7, c jr nz, .asm_2cda - ld a, $22 - ld hl, $7342 - rst FarCall + callba Function8b342 ld e, c ld d, $0 .asm_2cd7 diff --git a/home/map_objects.asm b/home/map_objects.asm index 3ebc1b597..a803f6ee1 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -337,9 +337,7 @@ Function1956: ; 1956 call Function271e ld a, [hConnectionStripLength] call GetMapObject - ld a, $2 - ld hl, $40e7 - rst FarCall + callba Function80e7 ret ; 1967 diff --git a/home/menu.asm b/home/menu.asm index c761a927c..cf5958d95 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -561,9 +561,7 @@ Function201c: ; 201c Function202a: ; 202a ld a, [hROMBank] ld [$cf94], a - ld a, $9 - ld hl, $400e - rst FarCall + callba Function2400e ld a, [$cf88] ret ; 2039 @@ -571,9 +569,7 @@ Function202a: ; 202a Function2039: ; 2039 ld a, [hROMBank] ld [$cf94], a - ld a, $9 - ld hl, $4022 - rst FarCall + callba Function24022 ld a, [$cf88] ret ; 2048 @@ -581,9 +577,7 @@ Function2039: ; 2039 Function2048: ; 2048 ld a, [hROMBank] ld [$cf94], a - ld a, $9 - ld hl, $403c - rst FarCall + callba Function2403c ld a, [$cf88] ret ; 2057 diff --git a/home/text.asm b/home/text.asm index a0b1eb644..6833f3ddc 100644 --- a/home/text.asm +++ b/home/text.asm @@ -315,9 +315,7 @@ CheckDict: ; 1087 Function117b: ; 117b ld c, l ld b, h - ld a, $5f - ld hl, $7036 - rst FarCall + callba Function17f036 jp PlaceNextChar ; 1186 @@ -463,9 +461,7 @@ Function1205: ; 1205 ld de, String12a2 call PlaceString push bc - ld hl, $5939 - ld a, $e - rst FarCall + callab Function39939 pop hl ld de, StringBuffer1 jr .asm_126a ; 0x1246 $22 diff --git a/home/time.asm b/home/time.asm index bb2d8966b..f767dad04 100644 --- a/home/time.asm +++ b/home/time.asm @@ -204,9 +204,7 @@ Function658: ; 658 jr Function677 Function677 - ld a, $5 - ld hl, $40ed - rst FarCall + callba Function140ed ret ; 67e |