diff options
Diffstat (limited to 'predef')
| -rw-r--r-- | predef/cgb.asm | 15 | ||||
| -rw-r--r-- | predef/sgb.asm | 23 |
2 files changed, 23 insertions, 15 deletions
diff --git a/predef/cgb.asm b/predef/cgb.asm index 3f2bcb230..89b8cee99 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -93,16 +93,18 @@ Function8ddb: ; 8ddb ld a, [EnemyHPPal] ld l, a ld h, $0 +rept 2 add hl, hl - add hl, hl +endr ld bc, Palettes_a8be add hl, bc call Function9643 ld a, [PlayerHPPal] ld l, a ld h, $0 +rept 2 add hl, hl - add hl, hl +endr ld bc, Palettes_a8be add hl, bc call Function9643 @@ -213,8 +215,9 @@ Function8edb: ; 8edb ld a, [wcda1] ld l, a ld h, $0 +rept 2 add hl, hl - add hl, hl +endr ld bc, Palettes_a8be add hl, bc call Function9643 @@ -488,8 +491,9 @@ Function90f8: ; 90f8 Function9122: ; 9122 ld b, 0 ld hl, Jumptable_912d +rept 2 add hl, bc - add hl, bc +endr ld a, [hli] ld h, [hl] ld l, a @@ -797,8 +801,9 @@ Function9373: ; 9373 ld a, [PlayerHPPal] ld l, a ld h, 0 +rept 2 add hl, hl - add hl, hl +endr ld bc, Palettes_a8be add hl, bc call Function9643 diff --git a/predef/sgb.asm b/predef/sgb.asm index cd3b3b2bf..5db1c14bd 100644 --- a/predef/sgb.asm +++ b/predef/sgb.asm @@ -74,8 +74,9 @@ Function86b4: ; 86b4 ld a, [PlayerHPPal] ld l, a ld h, 0 +rept 2 add hl, hl - add hl, hl +endr ld de, Palettes_a8be add hl, de ld a, [hli] @@ -89,8 +90,9 @@ Function86b4: ; 86b4 ld a, [EnemyHPPal] ld l, a ld h, $0 +rept 2 add hl, hl - add hl, hl +endr ld de, Palettes_a8be add hl, de ld a, [hli] @@ -137,8 +139,9 @@ Function873c: ; 873c call CopyBytes ld hl, wcda9 + 1 ld [hl], $10 +rept 2 inc hl - inc hl +endr ld a, [PlayerHPPal] add $2f ld [hl], a @@ -161,8 +164,9 @@ Function8763: ; 8763 ld a, [wcda1] ld l, a ld h, $0 +rept 2 add hl, hl - add hl, hl +endr ld de, Palettes_a8be add hl, de ld a, [hli] @@ -303,10 +307,9 @@ Function8860: ; 8860 Function8867: ; 8867 ld b, 0 ld hl, Unknown_8878 +rept 4 add hl, bc - add hl, bc - add hl, bc - add hl, bc +endr ld e, [hl] inc hl ld d, [hl] @@ -461,9 +464,9 @@ Function8969: ; 8969 ld a, [CurPartySpecies] ld l, a ld h, 0 +rept 3 add hl, hl - add hl, hl - add hl, hl +endr ld de, PokemonPalettes add hl, de ld a, [wcf65] @@ -548,7 +551,7 @@ Function8a0c: ; 8a0c ret .asm_8a16 - ld a, [wd19a] + ld a, [wPermission] cp $2 jr z, .asm_8a39 cp $4 |