Make compatible with rgbds 0.3.7

bank_ends.txt

@@ -1,27 +1,27 @@
-Free space: 841588/2097152 (40.13%)
+Free space: 829777/2097152 (39.57%)
 
 bank	end	free
 $00	$39a2	$065e
-$01	$7fb7	$0049
+$01	$7ff7	$0009
 $02	$7ff4	$000c
 $03	$7fea	$0016
 $04	$8000	$0000
-$05	$7ef6	$010a
+$05	$7f6c	$0094
 $06	$7fff	$0001
 $07	$7fff	$0001
 $08	$7ff1	$000f
 $09	$7fe3	$001d
-$0a	$7f5e	$00a2
-$0b	$7faf	$0051
+$0a	$7f1e	$00e2
+$0b	$7fdf	$0021
 $0c	$7fec	$0014
-$0d	$7fd1	$002f
+$0d	$7fd5	$002b
 $0e	$7f08	$00f8
-$0f	$7f52	$00ae
-$10	$7fe6	$001a
+$0f	$7f04	$00fc
+$10	$7fd7	$0029
 $11	$7f14	$00ec
-$12	$7fe6	$001a
-$13	$7fd3	$002d
-$14	$7f9a	$0066
+$12	$7f3e	$00c2
+$13	$7f7c	$0084
+$14	$7f90	$0070
 $15	$7fee	$0012
 $16	$7f5a	$00a6
 $17	$7fd5	$002b
@@ -35,10 +35,10 @@ $1e	$7f80	$0080
 $1f	$7f80	$0080
 $20	$7fa4	$005c
 $21	$7ec5	$013b
-$22	$7fe7	$0019
+$22	$7fb1	$004f
 $23	$7c87	$0379
 $24	$7ffa	$0006
-$25	$7cda	$0326
+$25	$7f5a	$00a6
 $26	$7f80	$0080
 $27	$7f67	$0099
 $28	$7f60	$00a0
@@ -48,36 +48,36 @@ $2b	$7ed0	$0130
 $2c	$7cab	$0355
 $2d	$7fcd	$0033
 $2e	$7fd5	$002b
-$2f	$7fbd	$0043
-$30	$7f46	$00ba
-$31	$7dd7	$0229
+$2f	$7ffb	$0005
+$30	$7f94	$006c
+$31	$7f44	$00bc
 $32	$7fc3	$003d
 $33	$7d42	$02be
-$34	$7ed0	$0130
+$34	$7f3e	$00c2
 $35	$7faa	$0056
-$36	$7fef	$0011
-$37	$7f30	$00d0
+$36	$7f93	$006d
+$37	$7fae	$0052
 $38	$7f13	$00ed
-$39	$7d8e	$0272
-$3a	$7e87	$0179
-$3b	$7de9	$0217
-$3c	$7f49	$00b7
-$3d	$7dd8	$0228
-$3e	$7f79	$0087
-$3f	$7fc5	$003b
-$40	$7f89	$0077
-$41	$7f05	$00fb
-$42	$7e6c	$0194
-$43	$7f7b	$0085
+$39	$7dea	$0216
+$3a	$7f00	$0100
+$3b	$7e61	$019f
+$3c	$7f2a	$00d6
+$3d	$7d3d	$02c3
+$3e	$7ccd	$0333
+$3f	$7a16	$05ea
+$40	$7ffd	$0003
+$41	$7f28	$00d8
+$42	$7edc	$0124
+$43	$7a96	$056a
 $44	$8000	$0000
-$45	$7f28	$00d8
-$46	$7ed2	$012e
-$47	$7d98	$0268
-$48	$7c0f	$03f1
-$49	$7c1e	$03e2
-$4a	$7dc3	$023d
-$4b	$7054	$0fac
-$4c	$4000	$4000
+$45	$7fa5	$005b
+$46	$7f02	$00fe
+$47	$7e10	$01f0
+$48	$7b00	$0500
+$49	$7c4f	$03b1
+$4a	$7a6d	$0593
+$4b	$797e	$0682
+$4c	$6f87	$1079
 $4d	$4000	$4000
 $4e	$4000	$4000
 $4f	$4000	$4000
@@ -115,7 +115,7 @@ $6e	$4000	$4000
 $6f	$4cc0	$3340
 $70	$5ad0	$2530
 $71	$51c2	$2e3e
-$72	$6bd4	$142c
+$72	$6be4	$141c
 $73	$4000	$4000
 $74	$4000	$4000
 $75	$4000	$4000

macros.asm

@@ -106,11 +106,11 @@ add_pics: MACRO ; dba Frontpic, Backpic
 	ENDM
 
 lb: MACRO ; r, hi, lo
-	ld \1, (\2 & $ff) << 8 + (\3 & $ff)
+	ld \1, ((\2) & $ff) << 8 + ((\3) & $ff)
 	ENDM
 
 ln: MACRO ; r, hi, lo
-	ld \1, (\2 & $f) << 4 + (\3 & $f)
+	ld \1, ((\2) & $f) << 4 + ((\3) & $f)
 	ENDM
 
 bccoord equs "coord bc,"

macros/move_anim.asm

@@ -11,8 +11,8 @@ endc
 anim_obj: macro
 	db anim_obj_command
 	db \1 ; obj
-	db (\2 << 3) + \3 ; x
-	db (\4 << 3) + \5 ; y
+	db (\2) * 8 + (\3) ; x
+	db (\4) * 8 + (\5) ; y
 	db \6 ; param
 	endm
 

roms.md5

@@ -1 +1 @@
-cf63169b48c6f6588c5b7bce2cd810da *pokeorange.gbc
+9e27f2233b35273a37ca3a5688107eb0 *pokeorange.gbc