diff options
| -rw-r--r-- | engine/pokemon/party_menu.asm | 6 | ||||
| -rw-r--r-- | mobile/mobile_40.asm | 4 | ||||
| -rw-r--r-- | mobile/mobile_41.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_42.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_45.asm | 5 | ||||
| -rw-r--r-- | mobile/mobile_46.asm | 21 | ||||
| -rw-r--r-- | mobile/mobile_5f.asm | 4 |
7 files changed, 21 insertions, 23 deletions
diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index d0f916aa7..eb72713d2 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -84,7 +84,7 @@ PlacePartyNicknames: and a jr z, .end ld c, a - ld b, $0 + ld b, 0 .loop push bc push hl @@ -119,7 +119,7 @@ PlacePartyHPBar: and a ret z ld c, a - ld b, $0 + ld b, 0 hlcoord 11, 2 .loop push bc @@ -185,7 +185,7 @@ PlacePartyMenuHPDigits: and a ret z ld c, a - ld b, $0 + ld b, 0 hlcoord 13, 1 .loop push bc diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 05f8a6b80..d3c4dfdf1 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -686,7 +686,7 @@ Function100493: Function100495: jr asm_100497 -asm_100497 +asm_100497: call Function100337 ret c ret z @@ -2987,7 +2987,7 @@ Function101406: and a ret -asm_101416 +asm_101416: scf ret diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index e772ce14b..da5e95347 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -1079,7 +1079,7 @@ Function1064d8: ldh [rSVBK], a jr asm_1064ed -asm_1064ed +asm_1064ed: ld de, wDecompressScratch ld b, $0 ldh a, [rSVBK] diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 48684f383..886eee3db 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1183,7 +1183,7 @@ Function10895e: Function108963: ld de, vTiles2 tile $31 -asm_108966 +asm_108966: call DelayFrame ld hl, vTiles2 lb bc, $a, $31 ; $a is the bank of ????? diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index fefa145c5..842ad74b0 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -5534,8 +5534,7 @@ Function1167a6: ld hl, wc312 inc [hl] -asm_1167af -.asm_1167af +asm_1167af: ld a, [wc311] cp $ff ret z @@ -5562,7 +5561,7 @@ asm_1167af jr nz, .asm_1167e3 xor a ld [wc312], a - jr .asm_1167af + jr asm_1167af .asm_1167dc ld a, $ff diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 8a795536a..6e4188dac 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -9,7 +9,7 @@ Function118007: xor a ld [wcd38], a -asm_11800b +asm_11800b: call BattleTowerRoomMenu_InitRAM ld a, $18 ld [wcd33], a @@ -1022,7 +1022,7 @@ Function11886a: Function11886e: xor a -asm_11886f +asm_11886f: ld [wBGMapPalBuffer], a ld a, $0 ld [wcd3c], a @@ -1562,7 +1562,7 @@ Function118d9b: call BattleTowerRoomMenu2 ret c -asm_118d9f +asm_118d9f: ld hl, $c608 call Function119940 ld a, [wcd38] @@ -1655,16 +1655,15 @@ Function118e06: jr asm_118e3e Function118e39: -.asm_118e39 ld a, [hli] and a - jr nz, .asm_118e39 + jr nz, Function118e39 dec hl -asm_118e3e -.asm_118e3e + +asm_118e3e: ld a, [hld] cp $2f - jr nz, .asm_118e3e + jr nz, asm_118e3e inc hl inc hl ld de, wcd85 @@ -3564,7 +3563,7 @@ Function119b45: ld a, [wcf65] ld h, a -asm_119b4d +asm_119b4d: ld a, $26 jp Function119e2b @@ -6444,13 +6443,13 @@ Function11b267: ld [hl], $ef ret -asm_11b26a +asm_11b26a: xor a ld [bc], a ld [hl], $7f ret -asm_11b26f +asm_11b26f: ld a, $2 ld [bc], a diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index c37ecd4c6..dbaa0f43e 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -1109,7 +1109,7 @@ Function17d711: ld l, a jp hl -asm_17d721 +asm_17d721: call Function17e5af ld a, $2 ld [wcd77], a @@ -2571,7 +2571,7 @@ Function17e026: ld bc, $1a add hl, bc -asm_17e0ee +asm_17e0ee: ld a, [hli] ld h, [hl] ld l, a |