diff options
| -rwxr-xr-x | engine/home.asm | 28 | ||||
| -rwxr-xr-x | engine/overworldmap.asm | 36 | ||||
| -rwxr-xr-x | macros.asm | 11 | ||||
| -rwxr-xr-x | main.asm | 18 |
4 files changed, 42 insertions, 51 deletions
diff --git a/engine/home.asm b/engine/home.asm index 1bdad46..5e0367b 100755 --- a/engine/home.asm +++ b/engine/home.asm @@ -1884,48 +1884,34 @@ Func_3212: ; 3212 (0:3212) INCBIN "baserom.gbc",$321d,$377f - $321d Func_377f: ; 377f (0:377f) - rst $28 - db BANK(Func_f4000) - dw Func_f4000 + farcall Func_f4000 ret Func_3784: ; 3784 (0:3784) xor a - rst $28 - db BANK(Func_f4006) - dw Func_f4006 + farcall Func_f4006 ret Func_378a: ; 378a (0:378a) - rst $28 - db BANK(Func_f400f) - dw Func_f400f + farcall Func_f400f ret Func_378f: ; 378f (0:378f) - rst $28 - db BANK(Func_f4012) - dw Func_f4012 + farcall Func_f4012 ret Func_3794: ; 3794 (0:3794) ld a, $04 Func_3796: ; 3796 (0:3796) - rst $28 - db BANK(Func_f4009) - dw Func_f4009 + farcall Func_f4009 ret Func_379b: ; 379b (0:379b) - rst $28 - db BANK(Func_f401b) - dw Func_f401b + farcall Func_f401b ret Func_37a0: ; 37a0 (0:37a0) - rst $28 - db BANK(Func_f401e) - dw Func_f401e + farcall Func_f401e ret ; 0x37a5 diff --git a/engine/overworldmap.asm b/engine/overworldmap.asm index 1ed17ff..fd6da16 100755 --- a/engine/overworldmap.asm +++ b/engine/overworldmap.asm @@ -21,9 +21,7 @@ Func_10e71: ; 10e71 (4:4e71) ld a, [$ff91] and $f0 jr z, .asm_10e83 - rst $28 - db $03 - dw $45d5 + farcall Func_c5d5 ld [$d334], a call Func_10e97 jr .asm_10e96 @@ -116,9 +114,7 @@ Func_10f4a: ; 10f4a (4:4f4a) jr nz, .asm_10f5f ld c, a ld a, $1e - rst $28 - db $03 - dw $4a6c + farcall Func_ca6c or a ld a, c jr nz, .asm_10f5f @@ -173,9 +169,7 @@ OverworldMapIndexes: ; 10f88 (4:4f88) Func_10fbc: ; 10fbc (4:4fbc) XXXX ld a, $25 - rst $28 - db BANK(Func_1299f) - dw Func_1299f + farcall Func_1299f ld c, $2 call Func_3dbf ld a, $80 @@ -189,9 +183,7 @@ Func_10fbc: ; 10fbc (4:4fbc) XXXX ld b, $37 .asm_10fd8 ld a, b - rst $28 - db BANK(Func_12ab5) - dw Func_12ab5 + farcall Func_12ab5 ret Func_10fde: ; 10fde (4:4fde) XXXX @@ -213,9 +205,7 @@ Func_10fde: ; 10fde (4:4fde) XXXX ld [$d33c], a call Func_12ab5 ld a, $3e - rst $28 - db $03 - dw $4a6c + farcall Func_ca6c or a jr nz, .asm_11015 ld c, $f @@ -357,9 +347,7 @@ Func_110a6: ; 110a6 (4:50a6) xor a ld [$d347], a ld [$d348], a - rst $28 - db $03 - dw $45e9 + farcall Func_c5e9 pop hl ret @@ -579,12 +567,8 @@ Func_12ae2: ; 12ae2 (4:6ae2) ld [hli], a push hl ld l, $6 - rst $28 - db $20 - dw $420f - rst $28 - db $20 - dw $4229 + farcall Func_8020f + farcall Func_80229 pop hl ld a, [$d4c6] ld [hli], a @@ -784,9 +768,7 @@ Func_12c4f: ; 12c4f (4:6c4f) ld a, d ld [$d4ca], a pop af - rst $28 - db $20 - dw $425b + farcall Func_8025b ret INCBIN "baserom.gbc",$12c5e,$14000 - $12c5e
\ No newline at end of file @@ -2,6 +2,17 @@ RGB: MACRO dw (\3 << 10 | \2 << 5 | \1) ENDM +bank1call: MACRO + rst $18 + dw \1 +ENDM + +farcall: MACRO + rst $28 + db BANK(\1) + dw \1 +ENDM + emptybank: MACRO rept $4000 db $ff @@ -12,9 +12,15 @@ SECTION "bank2",ROMX,BANK[$2] INCBIN "baserom.gbc",$8000,$4000 SECTION "bank3",ROMX,BANK[$3] -INCBIN "baserom.gbc",$C000,$CC42 - $C000 +INCBIN "baserom.gbc",$c000,$c5d5 - $c000 +Func_c5d5: ; c5d5 (3:45d5) +INCBIN "baserom.gbc",$c5d5,$c5e9 - $c5d5 +Func_c5e9: ; c5e9 (3:45e9) +INCBIN "baserom.gbc",$c5e9,$ca6c - $c5e9 +Func_ca6c: ; ca6c (3:4a6c) +INCBIN "baserom.gbc",$ca6c,$cc42 - $ca6c RST20: ; cc42 (3:4c42) -INCBIN "baserom.gbc",$CC42,$10000 - $CC42 +INCBIN "baserom.gbc",$cc42,$10000 - $cc42 SECTION "bank4",ROMX,BANK[$4] INCLUDE "engine/overworldmap.asm" @@ -101,7 +107,13 @@ SECTION "bank1F",ROMX,BANK[$1F] emptybank SECTION "bank20",ROMX,BANK[$20] -INCBIN "baserom.gbc",$80000,$4000 +INCBIN "baserom.gbc",$80000,$8020f - $80000 +Func_8020f: ; 8020f (20:420f) +INCBIN "baserom.gbc",$8020f,$80229 - $8020f +Func_80229: ; 80229 (20:4229) +INCBIN "baserom.gbc",$80229,$8025b - $80229 +Func_8025b: ; 8025b (20:425b) +INCBIN "baserom.gbc",$8025b,$84000 - $8025b SECTION "bank21",ROMX,BANK[$21] INCBIN "baserom.gbc",$84000,$4000 |