diff options
| -rw-r--r-- | engine/battle_anims/functions.asm | 6 | ||||
| -rw-r--r-- | engine/games/dummy_game.asm | 2 | ||||
| -rw-r--r-- | engine/menus/naming_screen.asm | 4 | ||||
| -rw-r--r-- | engine/menus/savemenu_copytilemapatonce.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 6 | ||||
| -rw-r--r-- | mobile/fixed_words.asm | 18 | ||||
| -rw-r--r-- | mobile/mobile_45.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_5c.asm | 4 |
8 files changed, 22 insertions, 22 deletions
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index e6e21382d..d92bd704d 100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -1619,7 +1619,7 @@ Functioncd913: ld hl, BATTLEANIMSTRUCT_10 add hl, bc ld e, [hl] - ld hl, hTransferVirtualOAM ; $ff80 + ld hl, hTransferVirtualOAM add hl, de ld e, l ld d, h @@ -2116,7 +2116,7 @@ asm_cdbfa: ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld e, [hl] - ld hl, hTransferVirtualOAM ; $ff80 + ld hl, hTransferVirtualOAM add hl, de ld e, l ld d, h @@ -3356,7 +3356,7 @@ Functionce306: ld hl, BATTLEANIMSTRUCT_0F add hl, bc ld e, [hl] - ld hl, hTransferVirtualOAM ; $ff80 + ld hl, hTransferVirtualOAM add hl, de ld e, l ld d, h diff --git a/engine/games/dummy_game.asm b/engine/games/dummy_game.asm index 6a2c6b962..b637dd6a1 100644 --- a/engine/games/dummy_game.asm +++ b/engine/games/dummy_game.asm @@ -500,7 +500,7 @@ DummyGame_InterpretJoypad_AnimateCursor: cp $7 jr nc, .quit call JoyTextDelay - ld hl, hJoypadPressed ; $ffa3 + ld hl, hJoypadPressed ld a, [hl] and A_BUTTON jr nz, .pressed_a diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index d6b596f5d..fee38ac26 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -400,7 +400,7 @@ NamingScreenJoypadLoop: ret .ReadButtons: - ld hl, hJoyPressed ; $ffa7 + ld hl, hJoyPressed ld a, [hl] and A_BUTTON jr nz, .a @@ -1083,7 +1083,7 @@ INCBIN "gfx/icons/mail_big.2bpp" ret .process_joypad - ld hl, hJoyPressed ; $ffa7 + ld hl, hJoyPressed ld a, [hl] and A_BUTTON jr nz, .a diff --git a/engine/menus/savemenu_copytilemapatonce.asm b/engine/menus/savemenu_copytilemapatonce.asm index 8951b1745..cfe922015 100644 --- a/engine/menus/savemenu_copytilemapatonce.asm +++ b/engine/menus/savemenu_copytilemapatonce.asm @@ -39,7 +39,7 @@ SaveMenu_CopyTilemapAtOnce: ret .CopyTilemapAtOnce: - ld [hSPBuffer], sp ; $ffd9 + ld [hSPBuffer], sp ld sp, hl ldh a, [hBGMapAddress + 1] ld h, a diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 2fec62c45..012d0e5d2 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -70,7 +70,7 @@ _DepositPKMN: ret .HandleJoypad: - ld hl, hJoyPressed ; $ffa7 + ld hl, hJoyPressed ld a, [hl] and B_BUTTON jr nz, .b_button @@ -328,7 +328,7 @@ _WithdrawPKMN: ret .Joypad: - ld hl, hJoyPressed ; $ffa7 + ld hl, hJoyPressed ld a, [hl] and B_BUTTON jr nz, .b_button @@ -1660,7 +1660,7 @@ BillsPC_StatsScreen: ret StatsScreenDPad: - ld hl, hJoyPressed ; $ffa7 + ld hl, hJoyPressed ld a, [hl] and A_BUTTON | B_BUTTON | D_RIGHT | D_LEFT ld [wMenuJoypad], a diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index 125eefccd..2bca1cbd8 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -561,7 +561,7 @@ Function11c3c2: Function11c3ed: ld hl, wcd20 ; wcd20 - ld de, hJoypadPressed ; $ffa3 + ld de, hJoypadPressed ld a, [de] and $8 jr nz, .asm_11c426 @@ -726,7 +726,7 @@ Function11c52c: Function11c53d: ld hl, wcd21 - ld de, hJoypadPressed ; $ffa3 + ld de, hJoypadPressed ld a, [de] and START @@ -935,7 +935,7 @@ Function11c658: Function11c675: ld hl, wMobileCommsJumptableIndex - ld de, hJoypadPressed ; $ffa3 + ld de, hJoypadPressed ld a, [de] and A_BUTTON jr nz, .a @@ -1507,7 +1507,7 @@ Function11c9bd: Function11c9c3: ld hl, wcd2a - ld de, hJoypadPressed ; $ffa3 + ld de, hJoypadPressed ld a, [de] and $1 jr nz, .asm_11c9de @@ -1650,7 +1650,7 @@ Function11caad: Function11cab3: ld hl, wcd2a - ld de, hJoypadPressed ; $ffa3 + ld de, hJoypadPressed ld a, [de] and $1 jr nz, .asm_11cace @@ -1743,7 +1743,7 @@ Function11cb52: Function11cb66: ld hl, wcd2a - ld de, hJoypadPressed ; $ffa3 + ld de, hJoypadPressed ld a, [de] and $1 jr nz, .asm_11cb81 @@ -1898,7 +1898,7 @@ Function11ccef: call Function11cfb5 Function11cd04: - ld de, hJoypadPressed ; $ffa3 + ld de, hJoypadPressed ld a, [de] and a ret z @@ -1934,7 +1934,7 @@ Function11cd20: Function11cd54: ld hl, wcd2c - ld de, hJoypadPressed ; $ffa3 + ld de, hJoypadPressed ld a, [de] and A_BUTTON jr nz, .asm_11cd6f @@ -2039,7 +2039,7 @@ Function11ce2b: ld hl, Unknown_11ceb9 add hl, bc - ld de, hJoypadPressed ; $ffa3 + ld de, hJoypadPressed ld a, [de] and START jr nz, .start diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index fab4f954b..c3de14d51 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -6748,7 +6748,7 @@ Function117764: xor a .asm_117770 ld [wcd24], a - ld hl, hJoyPressed ; $ffa7 + ld hl, hJoyPressed ld a, [hl] and SELECT jr nz, Function117764_select diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 2aefe9ca5..5a73ea8a6 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -522,7 +522,7 @@ Function171b4b: jp Function171c66 Function171b85: - ld hl, hJoyPressed ; $ffa7 + ld hl, hJoyPressed ld a, [hl] and $2 jp nz, Function171b9f @@ -569,7 +569,7 @@ Function171bbd: jp Function171c66 Function171bcc: - ld hl, hJoyPressed ; $ffa7 + ld hl, hJoyPressed ld a, [hl] and $2 jp nz, Function171bdc |