diff options
Diffstat (limited to 'mobile')
-rw-r--r-- | mobile/fixed_words.asm | 58 | ||||
-rw-r--r-- | mobile/mobile_12.asm | 54 | ||||
-rw-r--r-- | mobile/mobile_12_2.asm | 10 | ||||
-rw-r--r-- | mobile/mobile_22.asm | 60 | ||||
-rw-r--r-- | mobile/mobile_22_2.asm | 8 | ||||
-rw-r--r-- | mobile/mobile_40.asm | 160 | ||||
-rw-r--r-- | mobile/mobile_41.asm | 106 | ||||
-rw-r--r-- | mobile/mobile_42.asm | 282 | ||||
-rw-r--r-- | mobile/mobile_45.asm | 140 | ||||
-rw-r--r-- | mobile/mobile_45_sprite_engine.asm | 116 | ||||
-rw-r--r-- | mobile/mobile_46.asm | 274 | ||||
-rw-r--r-- | mobile/mobile_5b.asm | 60 | ||||
-rw-r--r-- | mobile/mobile_5c.asm | 50 | ||||
-rw-r--r-- | mobile/mobile_5e.asm | 30 | ||||
-rw-r--r-- | mobile/mobile_5f.asm | 146 | ||||
-rw-r--r-- | mobile/print_opp_message.asm | 6 |
16 files changed, 780 insertions, 780 deletions
diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index 00bf03b4e..125eefccd 100644 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -218,10 +218,10 @@ GetLengthOfWordAtC608: jr .loop CopyMobileEZChatToC608: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld a, "@" ld hl, $c608 ld bc, NAME_LENGTH @@ -256,7 +256,7 @@ CopyMobileEZChatToC608: call CopyBytes ld de, $c608 pop af - ld [rSVBK], a + ldh [rSVBK], a ret .get_name @@ -268,24 +268,24 @@ CopyMobileEZChatToC608: jr .copy_string Function11c1ab: - ld a, [hInMenu] + ldh a, [hInMenu] push af ld a, $1 - ld [hInMenu], a + ldh [hInMenu], a call Function11c1b9 pop af - ld [hInMenu], a + ldh [hInMenu], a ret Function11c1b9: call .InitKanaMode - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a call EZChat_MasterLoop pop af - ld [rSVBK], a + ldh [rSVBK], a ret .InitKanaMode: @@ -323,16 +323,16 @@ Function11c1b9: farcall ClearSpriteAnims farcall LoadPokemonData farcall Pokedex_ABCMode - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, $c6d0 ld de, wLYOverrides ld bc, $100 call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a call EZChat_GetCategoryWordsByKana call EZChat_GetSeenPokemonByKana ret @@ -367,8 +367,8 @@ EZChat_ClearBottom12Rows: EZChat_MasterLoop: .loop call JoyTextDelay - ld a, [hJoyPressed] - ld [hJoypadPressed], a + ldh a, [hJoyPressed] + ldh [hJoypadPressed], a ld a, [wJumptableIndex] bit 7, a jr nz, .exit @@ -1338,13 +1338,13 @@ BCD2String: inc a push af and $f - ld [hDividend], a + ldh [hDividend], a pop af and $f0 swap a - ld [hDividend + 1], a + ldh [hDividend + 1], a xor a - ld [hDividend + 2], a + ldh [hDividend + 2], a push hl farcall Function11a80c pop hl @@ -2863,16 +2863,16 @@ AnimateEZChatCursor: ret Function11d323: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_11d33a ld de, wBGPals1 ld bc, 16 palettes call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a ret Palette_11d33a: @@ -2957,7 +2957,7 @@ Palette_11d33a: RGB 00, 00, 00 EZChat_GetSeenPokemonByKana: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld hl, $c648 ld a, LOW(w5_d800) @@ -3014,21 +3014,21 @@ EZChat_GetSeenPokemonByKana: .loop1 ; copy 2*bc bytes from 3:hl to 5:de ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld a, [hli] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a pop af ld [de], a inc de ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld a, [hli] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a pop af ld [de], a inc de @@ -3130,7 +3130,7 @@ EZChat_GetSeenPokemonByKana: .ExitMasterLoop: pop af - ld [rSVBK], a + ldh [rSVBK], a ret .CheckSeenMon: @@ -3151,10 +3151,10 @@ EZChat_GetSeenPokemonByKana: ret EZChat_GetCategoryWordsByKana: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ; load pointers ld hl, MobileEZChatCategoryPointers @@ -3231,7 +3231,7 @@ EZChat_GetCategoryWordsByKana: dec a jr nz, .loop1 pop af - ld [rSVBK], a + ldh [rSVBK], a ret INCLUDE "data/pokemon/ezchat_order.asm" diff --git a/mobile/mobile_12.asm b/mobile/mobile_12.asm index d9528fbf6..ee25e5f80 100644 --- a/mobile/mobile_12.asm +++ b/mobile/mobile_12.asm @@ -371,7 +371,7 @@ Function48304: call ExitMenu call ExitMenu pop af - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit 0, a jr z, .asm_48377 call Function483bb @@ -812,10 +812,10 @@ Function4876f: call PlaceString ld hl, MenuHeader_0x48509 call LoadMenuHeader - ld a, [hInMenu] + ldh a, [hInMenu] push af ld a, $1 - ld [hInMenu], a + ldh [hInMenu], a hlcoord 10, 5 ld b, $1 ld c, $8 @@ -861,7 +861,7 @@ Function4876f: hlcoord 11, 6 call Function487ec pop af - ld [hInMenu], a + ldh [hInMenu], a jp Function4840c Function487ec: @@ -891,10 +891,10 @@ String_4880d: db "@" Function4880e: - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and A_BUTTON jp nz, Function488b9 - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and B_BUTTON jp nz, Function488b4 ld hl, hJoyLast @@ -1012,10 +1012,10 @@ Function488d3: jp c, Function4840c ld hl, MenuHeader_0x4850e call LoadMenuHeader - ld a, [hInMenu] + ldh a, [hInMenu] push af ld a, $1 - ld [hInMenu], a + ldh [hInMenu], a hlcoord 10, 9 ld b, $1 ld c, $8 @@ -1042,7 +1042,7 @@ Function488d3: asm_48922: push bc call JoyTextDelay - ld a, [hJoyDown] + ldh a, [hJoyDown] and a jp z, Function4896e bit 0, a @@ -1073,7 +1073,7 @@ asm_48922: jr asm_48972 Function4895a: - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and a jr z, .asm_48965 pop bc @@ -1082,7 +1082,7 @@ Function4895a: jr asm_48972 .asm_48965 - ld a, [hJoyLast] + ldh a, [hJoyLast] and a jr z, asm_48972 @@ -1159,7 +1159,7 @@ asm_48972: lb bc, 1, 8 call ClearBox pop af - ld [hInMenu], a + ldh [hInMenu], a jp Function4840c Function489ea: @@ -1258,10 +1258,10 @@ String_48aa1: next "Tell Later@" Function48ab5: - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and A_BUTTON jp nz, Function48c0f - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and B_BUTTON jp nz, Function48c0d ld a, d @@ -1746,8 +1746,8 @@ Function48d4a: add c ld [hld], a xor a - ld [hMultiplicand + 0], a - ld [hMultiplicand + 1], a + ldh [hMultiplicand + 0], a + ldh [hMultiplicand + 1], a ld a, [hl] srl a srl a @@ -1759,13 +1759,13 @@ Function48d4a: ld a, [hli] and $f add b - ld [hMultiplicand + 2], a + ldh [hMultiplicand + 2], a ld a, 100 - ld [hMultiplier], a + ldh [hMultiplier], a call Multiply - ld a, [hProduct + 2] + ldh a, [hProduct + 2] ld b, a - ld a, [hProduct + 3] + ldh a, [hProduct + 3] ld c, a ld e, [hl] add e @@ -1780,17 +1780,17 @@ Function48d4a: Function48d94: xor a - ld [hDividend + 0], a - ld [hDividend + 1], a + ldh [hDividend + 0], a + ldh [hDividend + 1], a ld a, [hli] - ld [hDividend + 0], a + ldh [hDividend + 0], a ld a, [hl] - ld [hDividend + 1], a + ldh [hDividend + 1], a ld a, 100 - ld [hDivisor], a + ldh [hDivisor], a ld b, 2 call Divide - ld a, [hRemainder] + ldh a, [hRemainder] ld c, 10 call SimpleDivide sla b @@ -1799,7 +1799,7 @@ Function48d94: sla b or b ld [hld], a - ld a, [hQuotient + 2] + ldh a, [hQuotient + 2] ld c, 10 call SimpleDivide sla b diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index d85b0eba7..d886f85ed 100644 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -424,15 +424,15 @@ Function4aad3: ld c, a xor a - ld [hObjectStructIndexBuffer], a + ldh [hObjectStructIndexBuffer], a .loop push bc push hl ld e, MONICON_PARTYMENU farcall LoadMenuMonIcon - ld a, [hObjectStructIndexBuffer] + ldh a, [hObjectStructIndexBuffer] inc a - ld [hObjectStructIndexBuffer], a + ldh [hObjectStructIndexBuffer], a pop hl pop bc dec c @@ -686,7 +686,7 @@ Function4ac58: .asm_4ac96 ld a, $1 - ld [hBGMapMode], a + ldh [hBGMapMode], a call Function4acaa call ExitMenu and a @@ -728,7 +728,7 @@ Function4acaa: call StaticMenuJoypad ld de, SFX_READ_TEXT_2 call PlaySFX - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit 0, a jr nz, .asm_4acf4 bit 1, a diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index d9aa43687..e09a504a1 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -190,12 +190,12 @@ Mobile22_ButtonSound: Mobile22_SetBGMapMode0: xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a ret Mobile22_SetBGMapMode1: ld a, $1 - ld [hBGMapMode], a + ldh [hBGMapMode], a ret Function89245: @@ -585,16 +585,16 @@ Function89492: ret Function8949c: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, 5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_894b3 ld de, wBGPals1 palette 7 ld bc, 1 palettes call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a ret Palette_894b3: @@ -624,10 +624,10 @@ Function894ca: Function894dc: push bc - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, 5 - ld [rSVBK], a + ldh [rSVBK], a ld c, d ld b, 0 @@ -646,7 +646,7 @@ Function894dc: call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a pop bc ret @@ -732,17 +732,17 @@ Function8956f: farcall GetMobileOTTrainerClass ld a, c ld [wTrainerClass], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, 5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wd030 ld a, -1 ld [hli], a ld a, " " ld [hl], a pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, [wTrainerClass] ld h, 0 ld l, a @@ -750,10 +750,10 @@ Function8956f: add hl, hl ld de, TrainerPalettes add hl, de - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld de, wd032 ld c, 4 .loop @@ -769,21 +769,21 @@ Function8956f: ld [hli], a ld [hl], a pop af - ld [rSVBK], a + ldh [rSVBK], a pop bc ret Function895c7: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, 5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_895de ld de, wd030 ld bc, 8 call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a ret Palette_895de: @@ -1184,7 +1184,7 @@ Function897d5: .asm_897f3 ld a, $37 - ld [hGraphicStartTile], a + ldh [hGraphicStartTile], a hlcoord 12, 3 lb bc, 7, 7 predef PlaceGraphic @@ -2038,10 +2038,10 @@ Function89cdf: Function89d0d: call Mobile22_SetBGMapMode0 - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld c, 8 ld de, wBGPals1 @@ -2060,7 +2060,7 @@ Function89d0d: call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a call SetPalettes farcall PrintMail @@ -2266,16 +2266,16 @@ Function89e6f: jp Function89e36 Function89e9a: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_89eb1 ld de, wBGPals1 palette 5 ld bc, 1 palettes call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a ret Palette_89eb1: @@ -3235,10 +3235,10 @@ Function8a5a3: ret Function8a5b6: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_8a5e5 ld de, wBGPals1 + 4 palettes ld bc, 3 palettes @@ -3252,7 +3252,7 @@ Function8a5b6: ld bc, 1 palettes call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a ret Palette_8a5e5: @@ -3284,16 +3284,16 @@ Palette_8a605: RGB 31, 31, 31 Function8a60d: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_8a624 ld de, wOBPals1 ld bc, 1 palettes call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a ret Palette_8a624: diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index be1c897d8..e317adb8d 100644 --- a/mobile/mobile_22_2.asm +++ b/mobile/mobile_22_2.asm @@ -257,7 +257,7 @@ Function8b45c: call Function8b4fd call Function89c44 ld a, $1 - ld [hBGMapMode], a + ldh [hBGMapMode], a pop bc call Function8b3dd jr nc, .asm_8b46e @@ -593,16 +593,16 @@ Function8b690: ret Function8b6bb: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_8b6d5 ld de, wBGPals1 ld bc, 3 palettes call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a call Function8949c ret diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 72703bbb9..5ab12d24f 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -4,10 +4,10 @@ Function100000: ; d: 1 or 2 ; e: bank ; bc: addr - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, 1 - ld [rSVBK], a + ldh [rSVBK], a call Function100022 call Function1000ba @@ -21,7 +21,7 @@ Function100000: pop bc pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function100022: @@ -62,11 +62,11 @@ SetRAMStateForMobile: ld hl, wc300 ld bc, $100 call ByteFill - ld a, [rIE] + ldh a, [rIE] ld [wBGMapBuffer], a xor a - ld [hMapAnims], a - ld [hLCDCPointer], a + ldh [hMapAnims], a + ldh [hLCDCPointer], a ret EnableMobile: @@ -78,15 +78,15 @@ EnableMobile: di call DoubleSpeed xor a - ld [rIF], a + ldh [rIF], a ld a, 1 << VBLANK | 1 << LCD_STAT | 1 << TIMER | 1 << SERIAL - ld [rIE], a + ldh [rIE], a xor a - ld [hMapAnims], a - ld [hLCDCPointer], a + ldh [hMapAnims], a + ldh [hLCDCPointer], a ld a, $01 - ld [hMobileReceive], a - ld [hMobile], a + ldh [hMobileReceive], a + ldh [hMobile], a ei ret @@ -94,15 +94,15 @@ EnableMobile: DisableMobile: di xor a - ld [hMobileReceive], a - ld [hMobile], a + ldh [hMobileReceive], a + ldh [hMobile], a xor a - ld [hVBlank], a + ldh [hVBlank], a call NormalSpeed xor a - ld [rIF], a + ldh [rIF], a ld a, [wBGMapBuffer] - ld [rIE], a + ldh [rIE], a ei ret @@ -160,13 +160,13 @@ Function1000fa: .asm_100117 di xor a - ld [rIF], a - ld a, [rIE] + ldh [rIF], a + ldh a, [rIE] and $13 - ld [rIE], a + ldh [rIE], a xor a - ld [hMobileReceive], a - ld [hMobile], a + ldh [hMobileReceive], a + ldh [hMobile], a ei ld a, [wLinkMode] @@ -311,15 +311,15 @@ Function10020b: call HideSprites call DelayFrame - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $01 - ld [rSVBK], a + ldh [rSVBK], a farcall DisplayMobileError pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function100232: @@ -401,10 +401,10 @@ Function1002c9: Function1002dc: ld a, MAPSETUP_LINKRETURN - ld [hMapEntryMethod], a + ldh [hMapEntryMethod], a farcall RunMapSetupScript xor a - ld [hMapEntryMethod], a + ldh [hMapEntryMethod], a call LoadStandardFont ret @@ -412,7 +412,7 @@ Function1002ed: farcall LoadOW_BGPal7 farcall ApplyPals ld a, $01 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a call DelayFrame ret @@ -989,11 +989,11 @@ IncrementMobileInactivityTimerByCFrames: Function100665: call UpdateTime ld hl, wcd36 - ld a, [hHours] + ldh a, [hHours] ld [hli], a - ld a, [hMinutes] + ldh a, [hMinutes] ld [hli], a - ld a, [hSeconds] + ldh a, [hSeconds] ld [hl], a ret @@ -1062,7 +1062,7 @@ Function1006d3: Function1006dc: ld a, [hld] ld c, a - ld a, [hSeconds] + ldh a, [hSeconds] sub c jr nc, .asm_1006e5 add $3c @@ -1072,7 +1072,7 @@ Function1006dc: dec de ld a, [hld] ld c, a - ld a, [hMinutes] + ldh a, [hMinutes] sbc c jr nc, .asm_1006f0 add $3c @@ -1082,7 +1082,7 @@ Function1006dc: dec de ld a, [hl] ld c, a - ld a, [hHours] + ldh a, [hHours] sbc c jr nc, .asm_1006fb add $18 @@ -1119,11 +1119,11 @@ Function100720: xor a ld [wcd6a], a call UpdateTime - ld a, [hHours] + ldh a, [hHours] ld [wcd72], a - ld a, [hMinutes] + ldh a, [hMinutes] ld [wcd73], a - ld a, [hSeconds] + ldh a, [hSeconds] ld [wcd74], a ld a, $04 ld hl, $a800 @@ -1141,11 +1141,11 @@ Function100720: Function100754: call UpdateTime - ld a, [hHours] + ldh a, [hHours] ld [wcd72], a - ld a, [hMinutes] + ldh a, [hMinutes] ld [wcd73], a - ld a, [hSeconds] + ldh a, [hSeconds] ld [wcd74], a ld a, [wcd6d] ld [wcd6b], a @@ -1256,11 +1256,11 @@ Function1007f6: call CloseSRAM ld hl, wcd6e call Function100826 - ld a, [hHours] + ldh a, [hHours] ld [wcd72], a - ld a, [hMinutes] + ldh a, [hMinutes] ld [wcd73], a - ld a, [hSeconds] + ldh a, [hSeconds] ld [wcd74], a ret @@ -1372,24 +1372,24 @@ Function1008a6: ret Function1008e0: - ld a, [hBGMapMode] + ldh a, [hBGMapMode] ld b, a - ld a, [hVBlank] + ldh a, [hVBlank] ld c, a push bc xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a ld a, $03 - ld [hVBlank], a + ldh [hVBlank], a call Function100970 call Function100902 call Function100989 call DelayFrame pop bc ld a, c - ld [hVBlank], a + ldh [hVBlank], a ld a, b - ld [hBGMapMode], a + ldh [hBGMapMode], a ret Function100902: @@ -1462,10 +1462,10 @@ Function1009a5: ret Function1009ae: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $03 - ld [rSVBK], a + ldh [rSVBK], a ld hl, w3_d800 decoord 0, 0, wAttrMap @@ -1486,19 +1486,19 @@ Function1009ae: jr nz, .loop_row pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function1009d2: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $03 - ld [rSVBK], a + ldh [rSVBK], a - ld a, [rVBK] + ldh a, [rVBK] push af ld a, $01 - ld [rVBK], a + ldh [rVBK], a ld hl, w3_d800 debgcoord 0, 0 @@ -1506,14 +1506,14 @@ Function1009d2: call Get2bpp pop af - ld [rVBK], a + ldh [rVBK], a pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function1009f3: - ld a, [hJoyDown] + ldh a, [hJoyDown] and SELECT + A_BUTTON cp SELECT + A_BUTTON jr nz, .select_a @@ -1768,7 +1768,7 @@ MobileMoveSelectionScreen: .GetMoveSelection: xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call Function100c74 call Function100c98 .master_loop @@ -1923,7 +1923,7 @@ Mobile_PartyMenuSelect: cp b jr z, .done ld [wPartyMenuCursor], a - ld a, [hJoyLast] + ldh a, [hJoyLast] ld b, a bit 1, b jr nz, .done @@ -1993,7 +1993,7 @@ Function100d67: ld hl, .MenuHeader call CopyMenuHeader xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call MenuBox call UpdateSprites call PlaceVerticalMenuItems @@ -2215,7 +2215,7 @@ Function100eca: Function100ed4: farcall ApplyPals ld a, $01 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret Function100edf: @@ -2993,7 +2993,7 @@ asm_101416 Function101418: call GetJoypad - ld a, [hJoyDown] + ldh a, [hJoyDown] and SELECT + A_BUTTON cp SELECT + A_BUTTON jr z, .asm_101425 @@ -3088,7 +3088,7 @@ Function1014a6: Function1014b7: call GetJoypad - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and $03 jr nz, .asm_1014c5 ld hl, wcd42 @@ -3719,7 +3719,7 @@ Function101913: ld hl, wcd29 res 7, [hl] ld a, $90 - ld [hWY], a + ldh [hWY], a ld a, [wcd21] cp $01 jr z, .asm_10193f @@ -3807,17 +3807,17 @@ _StartMobileBattle: ret .CopyOTDetails: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, 5 - ld [rSVBK], a + ldh [rSVBK], a ld bc, w5_dc0d ld de, w5_dc11 farcall GetMobileOTTrainerClass pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, c ld [wOtherTrainerClass], a @@ -3831,7 +3831,7 @@ _StartMobileBattle: jr z, .got_link_player_number ld a, USING_EXTERNAL_CLOCK .got_link_player_number - ld [hSerialConnectionStatus], a + ldh [hSerialConnectionStatus], a ret StartMobileBattle: @@ -3850,7 +3850,7 @@ StartMobileBattle: xor a ld [wDisableTextAcceleration], a ld a, CONNECTION_NOT_ESTABLISHED - ld [hSerialConnectionStatus], a + ldh [hSerialConnectionStatus], a pop af ld [wOptions], a ret @@ -5239,7 +5239,7 @@ Function1024de: ld hl, wcd4e dec [hl] jr z, .asm_1024e9 - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and A_BUTTON | B_BUTTON ret z @@ -5528,7 +5528,7 @@ Function1026de: ret Function1026f3: - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit A_BUTTON_F, a jr nz, .asm_102723 bit D_UP_F, a @@ -5612,7 +5612,7 @@ Function102775: ret Function10278c: - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit A_BUTTON_F, a jr nz, asm_1027c6 bit B_BUTTON_F, a @@ -5637,7 +5637,7 @@ Function1027a0: ret Function1027b7: - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit A_BUTTON_F, a jr nz, asm_1027d1 bit B_BUTTON_F, a @@ -6535,7 +6535,7 @@ Function102e4f: push de push hl ld a, c - ld [hDividend], a + ldh [hDividend], a call GetPokemonName pop hl call PlaceString @@ -6717,12 +6717,12 @@ Function10305d: Function10306e: ld a, $01 - ld [hOAMUpdate], a + ldh [hOAMUpdate], a call ClearSprites ld de, wVirtualOAM call Function1030cd xor a - ld [hOAMUpdate], a + ldh [hOAMUpdate], a ret Function10307f: @@ -6928,7 +6928,7 @@ Function103302: Function103309: xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a ld hl, wBuffer1 ld bc, 10 xor a @@ -7014,7 +7014,7 @@ Function10339a: Function1033af: call GetJoypad - ld a, [hJoyPressed] + ldh a, [hJoyPressed] bit D_LEFT_F, a jr nz, .left bit D_RIGHT_F, a diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index 087467710..3d997ae71 100644 --- a/mobile/mobile_41.asm +++ b/mobile/mobile_41.asm @@ -105,7 +105,7 @@ StubbedTrainerRankings_BugContestScore: ret ld a, BANK(sTrainerRankingBugContestScore) call GetSRAMBank - ld a, [hProduct] + ldh a, [hProduct] ld hl, sTrainerRankingBugContestScore cp [hl] jr z, .isLowByteHigher @@ -114,15 +114,15 @@ StubbedTrainerRankings_BugContestScore: .isLowByteHigher inc hl - ld a, [hMultiplicand] + ldh a, [hMultiplicand] cp [hl] jr c, .done dec hl .newHighScore - ld a, [hProduct] + ldh a, [hProduct] ld [hli], a - ld a, [hMultiplicand] + ldh a, [hMultiplicand] ld [hl], a .done @@ -375,7 +375,7 @@ StubbedTrainerRankings_LinkBattles: StubbedTrainerRankings_Splash: ret ; Only counts if it’s the player’s turn - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a ret nz ld hl, sTrainerRankingSplash @@ -410,7 +410,7 @@ StubbedTrainerRankings_ColosseumDraws: ; draw StubbedTrainerRankings_Selfdestruct: ret ; Only counts if it’s the player’s turn - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a ret nz ld hl, sTrainerRankingSelfdestruct @@ -586,9 +586,9 @@ _MobilePrintNum:: ; hl: where to print the converted string push bc xor a - ld [hPrintNum1], a - ld [hPrintNum2], a - ld [hPrintNum3], a + ldh [hPrintNum1], a + ldh [hPrintNum2], a + ldh [hPrintNum3], a ld a, b and $f cp $1 @@ -599,29 +599,29 @@ _MobilePrintNum:: jr z, .three_bytes ; four bytes ld a, [de] - ld [hPrintNum1], a + ldh [hPrintNum1], a inc de .three_bytes ld a, [de] - ld [hPrintNum2], a + ldh [hPrintNum2], a inc de .two_bytes ld a, [de] - ld [hPrintNum3], a + ldh [hPrintNum3], a inc de .one_byte ld a, [de] - ld [hPrintNum4], a + ldh [hPrintNum4], a inc de push de xor a - ld [hPrintNum9], a + ldh [hPrintNum9], a ld a, b - ld [hPrintNum10], a + ldh [hPrintNum10], a ld a, c cp 2 jr z, .two_digits @@ -668,7 +668,7 @@ endr .two_digits ld c, 0 - ld a, [hPrintNum4] + ldh a, [hPrintNum4] .mod_ten_loop cp 10 jr c, .simple_divide_done @@ -678,9 +678,9 @@ endr .simple_divide_done ld b, a - ld a, [hPrintNum9] + ldh a, [hPrintNum9] or c - ld [hPrintNum9], a + ldh [hPrintNum9], a jr nz, .create_digit call .LoadMinusTenIfNegative jr .done @@ -714,53 +714,53 @@ endr ld a, [de] dec de ld b, a - ld a, [hPrintNum4] + ldh a, [hPrintNum4] sub b - ld [hPrintNum8], a + ldh [hPrintNum8], a ld a, [de] dec de ld b, a - ld a, [hPrintNum3] + ldh a, [hPrintNum3] sbc b - ld [hPrintNum7], a + ldh [hPrintNum7], a ld a, [de] dec de ld b, a - ld a, [hPrintNum2] + ldh a, [hPrintNum2] sbc b - ld [hPrintNum6], a + ldh [hPrintNum6], a ld a, [de] inc de inc de inc de ld b, a - ld a, [hPrintNum1] + ldh a, [hPrintNum1] sbc b - ld [hPrintNum5], a + ldh [hPrintNum5], a jr c, .asm_1062eb - ld a, [hPrintNum5] - ld [hPrintNum1], a - ld a, [hPrintNum6] - ld [hPrintNum2], a - ld a, [hPrintNum7] - ld [hPrintNum3], a - ld a, [hPrintNum8] - ld [hPrintNum4], a + ldh a, [hPrintNum5] + ldh [hPrintNum1], a + ldh a, [hPrintNum6] + ldh [hPrintNum2], a + ldh a, [hPrintNum7] + ldh [hPrintNum3], a + ldh a, [hPrintNum8] + ldh [hPrintNum4], a inc c jr .asm_1062b4 .asm_1062eb - ld a, [hPrintNum9] + ldh a, [hPrintNum9] or c jr z, .LoadMinusTenIfNegative ld a, -10 add c ld [hl], a - ld [hPrintNum9], a + ldh [hPrintNum9], a ret .LoadMinusTenIfNegative: - ld a, [hPrintNum10] + ldh a, [hPrintNum10] bit 7, a ret z @@ -768,12 +768,12 @@ endr ret .Function1062ff: - ld a, [hPrintNum10] + ldh a, [hPrintNum10] bit 7, a jr nz, .asm_10630d bit 6, a jr z, .asm_10630d - ld a, [hPrintNum9] + ldh a, [hPrintNum9] and a ret z @@ -988,8 +988,8 @@ Function106442: ld a, $36 call Function3e32 xor a - ld [hMobile], a - ld [hMobileReceive], a + ldh [hMobile], a + ldh [hMobileReceive], a ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a @@ -1048,10 +1048,10 @@ Function10649b: ret Function1064c3: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $6 - ld [rSVBK], a + ldh [rSVBK], a push bc push hl ld hl, Function3f88 @@ -1060,14 +1060,14 @@ Function1064c3: pop hl pop bc pop af - ld [rSVBK], a + ldh [rSVBK], a jr asm_1064ed Function1064d8: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $6 - ld [rSVBK], a + ldh [rSVBK], a push bc push hl ld hl, Function3f9f @@ -1076,25 +1076,25 @@ Function1064d8: pop hl pop bc pop af - ld [rSVBK], a + ldh [rSVBK], a jr asm_1064ed asm_1064ed ld de, wDecompressScratch ld b, $0 - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $6 - ld [rSVBK], a - ld a, [rVBK] + ldh [rSVBK], a + ldh a, [rVBK] push af ld a, $1 - ld [rVBK], a + ldh [rVBK], a call Get2bpp pop af - ld [rVBK], a + ldh [rVBK], a pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function10650a: diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 6bd8a3c4c..48684f383 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -82,10 +82,10 @@ RunMobileTradeAnim_Frontpics: ld [hl], e inc hl ld [hl], d - ld a, [hMapAnims] + ldh a, [hMapAnims] push af xor a - ld [hMapAnims], a + ldh [hMapAnims], a ld hl, wVramState ld a, [hl] push af @@ -103,7 +103,7 @@ RunMobileTradeAnim_Frontpics: pop af ld [wVramState], a pop af - ld [hMapAnims], a + ldh [hMapAnims], a ret RunMobileTradeAnim_NoFrontpics: @@ -111,10 +111,10 @@ RunMobileTradeAnim_NoFrontpics: ld [hl], e inc hl ld [hl], d - ld a, [hMapAnims] + ldh a, [hMapAnims] push af xor a - ld [hMapAnims], a + ldh [hMapAnims], a ld hl, wVramState ld a, [hl] push af @@ -132,7 +132,7 @@ RunMobileTradeAnim_NoFrontpics: pop af ld [wVramState], a pop af - ld [hMapAnims], a + ldh [hMapAnims], a ret Function1080b7: @@ -148,13 +148,13 @@ Function1080b7: call LoadFontsBattleExtra ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld hl, LZ_108da7 ld de, vTiles2 call Decompress ld a, $0 - ld [rVBK], a + ldh [rVBK], a ld hl, LZ_108d27 ld de, vTiles0 tile $20 call Decompress @@ -162,12 +162,12 @@ Function1080b7: call EnableLCD xor a - ld [hSCX], a - ld [hSCY], a + ldh [hSCX], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $90 - ld [hWY], a + ldh [hWY], a farcall ClearSpriteAnims call DelayFrame @@ -223,12 +223,12 @@ Function108157: call LoadFontsBattleExtra call EnableLCD xor a - ld [hSCX], a - ld [hSCY], a + ldh [hSCX], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $90 - ld [hWY], a + ldh [hWY], a farcall ClearSpriteAnims xor a ld hl, wSpriteAnimDict @@ -248,13 +248,13 @@ Function108157: MobileTradeAnim_ClearTiles: ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld hl, vTiles0 ld bc, 3 * $80 tiles xor a call ByteFill ld a, $0 - ld [rVBK], a + ldh [rVBK], a ld hl, vTiles0 ld bc, 3 * $80 tiles xor a @@ -263,13 +263,13 @@ MobileTradeAnim_ClearTiles: MobileTradeAnim_ClearBGMap: ld a, $1 - ld [rVBK], a + ldh [rVBK], a hlbgcoord 0, 0 ld bc, 2 * BG_MAP_HEIGHT * BG_MAP_WIDTH ld a, $0 call ByteFill ld a, $0 - ld [rVBK], a + ldh [rVBK], a hlbgcoord 0, 0 ld bc, 2 * BG_MAP_HEIGHT * BG_MAP_WIDTH ld a, $7f @@ -337,12 +337,12 @@ MobileTradeAnim_JumptableLoop: .StopAnim: xor a - ld [hSCX], a - ld [hSCY], a + ldh [hSCX], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $90 - ld [hWY], a + ldh [hWY], a call LoadStandardFont call LoadFontsBattleExtra farcall Stubbed_Function106462 @@ -450,13 +450,13 @@ MobileTradeAnim_ShowPlayerMonToBeSent: ld de, MUSIC_EVOLUTION call PlayMusic2 ld a, $80 - ld [hSCX], a + ldh [hSCX], a xor a - ld [hSCY], a + ldh [hSCY], a ld a, $87 - ld [hWX], a + ldh [hWX], a ld a, $50 - ld [hWY], a + ldh [hWY], a call MobileTradeAnim_DisplayMonToBeSent ld a, [wPlayerTrademonSpecies] ld [wCurPartySpecies], a @@ -471,22 +471,22 @@ MobileTradeAnim_ShowPlayerMonToBeSent: call DmgToCgbBGPals call WaitBGMap .loop - ld a, [hWX] + ldh a, [hWX] cp $7 jr z, .okay sub $4 - ld [hWX], a - ld a, [hSCX] + ldh [hWX], a + ldh a, [hSCX] sub $4 - ld [hSCX], a + ldh [hSCX], a call DelayFrame jr .loop .okay ld a, $7 - ld [hWX], a + ldh [hWX], a xor a - ld [hSCX], a + ldh [hSCX], a ld a, [wPlayerTrademonSpecies] call GetCryIndex jr c, .skip_cry @@ -526,12 +526,12 @@ MobileTradeAnim_ShowOTMonFromTrade: call EnableLCD farcall DeinitializeAllSprites xor a - ld [hSCX], a - ld [hSCY], a + ldh [hSCX], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $90 - ld [hWY], a + ldh [hWY], a depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL call _InitSpriteAnimStruct @@ -545,12 +545,12 @@ MobileTradeAnim_ShowOTMonFromTrade: call PlaySFX call MobileTradeAnim_DisplayReceivedMon xor a - ld [hSCX], a - ld [hSCY], a + ldh [hSCX], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $50 - ld [hWY], a + ldh [hWY], a ld a, [wOTTrademonSpecies] ld [wCurPartySpecies], a ld a, [wOTTrademonDVs] @@ -573,13 +573,13 @@ MobileTradeAnim_ShowPlayerMonForGTS: ld de, MUSIC_EVOLUTION call PlayMusic2 ld a, $80 - ld [hSCX], a + ldh [hSCX], a xor a - ld [hSCY], a + ldh [hSCY], a ld a, $87 - ld [hWX], a + ldh [hWX], a ld a, $50 - ld [hWY], a + ldh [hWY], a call MobileTradeAnim_DisplayMonToBeSent ld a, [wPlayerTrademonSpecies] ld [wCurPartySpecies], a @@ -604,22 +604,22 @@ MobileTradeAnim_ShowPlayerMonForGTS: call DmgToCgbBGPals call WaitBGMap .loop - ld a, [hWX] + ldh a, [hWX] cp $7 jr z, .done sub $4 - ld [hWX], a - ld a, [hSCX] + ldh [hWX], a + ldh a, [hSCX] sub $4 - ld [hSCX], a + ldh [hSCX], a call DelayFrame jr .loop .done ld a, $7 - ld [hWX], a + ldh [hWX], a xor a - ld [hSCX], a + ldh [hSCX], a ld a, [wPlayerTrademonSpecies] call GetCryIndex jr c, .skip_cry @@ -668,12 +668,12 @@ MobileTradeAnim_ShowOTMonFromGTS: lb bc, BANK(TradePoofGFX), 12 call Request2bpp xor a - ld [hSCX], a - ld [hSCY], a + ldh [hSCX], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $90 - ld [hWY], a + ldh [hWY], a depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL call _InitSpriteAnimStruct @@ -687,12 +687,12 @@ MobileTradeAnim_ShowOTMonFromGTS: call PlaySFX call MobileTradeAnim_DisplayReceivedMon xor a - ld [hSCX], a - ld [hSCY], a + ldh [hSCX], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $50 - ld [hWY], a + ldh [hWY], a ld a, [wOTTrademonSpecies] ld [wCurPartySpecies], a ld a, [wOTTrademonDVs] @@ -736,12 +736,12 @@ MobileTradeAnim_GetOddEgg: lb bc, BANK(TradePoofGFX), 12 call Request2bpp xor a - ld [hSCX], a - ld [hSCY], a + ldh [hSCX], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $90 - ld [hWY], a + ldh [hWY], a depixel 10, 11, 4, 0 ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL call _InitSpriteAnimStruct @@ -755,12 +755,12 @@ MobileTradeAnim_GetOddEgg: call PlaySFX call Function108a33 xor a - ld [hSCX], a - ld [hSCY], a + ldh [hSCX], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $50 - ld [hWY], a + ldh [hWY], a ld a, [wOTTrademonSpecies] ld [wCurPartySpecies], a ld a, [wOTTrademonDVs] @@ -786,30 +786,30 @@ MobileTradeAnim_02: call ClearSprites call ClearTileMap xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call DisableLCD call MobileTradeAnim_ClearBGMap call Function108c80 call Function108c6d call EnableLCD ld a, $c - ld [hSCX], a + ldh [hSCX], a ld a, $78 - ld [hSCY], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $90 - ld [hWY], a - ld a, [rSVBK] + ldh [hWY], a + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_109107 ld de, wBGPals1 ld bc, 8 palettes call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a call Function108d07 call Function108af4 call GetMobileTradeAnimByte @@ -821,16 +821,16 @@ MobileTradeAnim_10: call ClearSprites call ClearTileMap xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call DisableLCD call MobileTradeAnim_ClearBGMap ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld hl, LZ_108da7 ld de, vTiles2 call Decompress ld a, $0 - ld [rVBK], a + ldh [rVBK], a ld hl, LZ_108d27 ld de, vTiles0 tile $20 call Decompress @@ -838,23 +838,23 @@ MobileTradeAnim_10: call Function108c6d call EnableLCD ld a, $c - ld [hSCX], a + ldh [hSCX], a ld a, $78 - ld [hSCY], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $90 - ld [hWY], a - ld a, [rSVBK] + ldh [hWY], a + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_109107 ld de, wBGPals1 ld bc, 8 palettes call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a call Function108d07 call Function108af4 call GetMobileTradeAnimByte @@ -865,15 +865,15 @@ MobileTradeAnim_11: call ClearSprites call ClearTileMap xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call DisableLCD ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld hl, LZ_108da7 ld de, vTiles2 call Decompress ld a, $0 - ld [rVBK], a + ldh [rVBK], a ld hl, LZ_108d27 ld de, vTiles0 tile $20 call Decompress @@ -881,28 +881,28 @@ MobileTradeAnim_11: call Function108c6d call EnableLCD ld a, $80 - ld [hSCX], a + ldh [hSCX], a ld a, $90 - ld [hSCY], a + ldh [hSCY], a ld a, $7 - ld [hWX], a + ldh [hWX], a ld a, $90 - ld [hWY], a - ld a, [rSVBK] + ldh [hWY], a + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_109107 ld de, wBGPals1 ld bc, 8 palettes call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a call Function108d07 call Function108af4 call Function108b5a ld a, $e0 - ld [hSCX], a + ldh [hSCX], a ld de, MUSIC_EVOLUTION call PlayMusic2 call GetMobileTradeAnimByte @@ -916,12 +916,12 @@ MobileTradeAnim_GiveTrademon1: call Function1082f0 call Function108af4 .loop - ld a, [hSCX] + ldh a, [hSCX] cp $e0 jr z, .loop2 dec a dec a - ld [hSCX], a + ldh [hSCX], a cp $f8 jr nz, .next depixel 10, 11, 4, 0 @@ -934,12 +934,12 @@ MobileTradeAnim_GiveTrademon1: jr .loop .loop2 - ld a, [hSCY] + ldh a, [hSCY] cp $f8 jr z, .done dec a dec a - ld [hSCY], a + ldh [hSCY], a cp $40 jr z, .init cp $30 @@ -992,11 +992,11 @@ MobileTradeAnim_GiveTrademon2: ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE call _InitSpriteAnimStruct .loop - ld a, [hSCY] + ldh a, [hSCY] cp $90 jr z, .done sub $8 - ld [hSCY], a + ldh [hSCY], a ld c, 1 call WaitMobileTradeSpriteAnims jr .loop @@ -1047,11 +1047,11 @@ MobileTradeAnim_GetTrademon1: ld c, 40 call WaitMobileTradeSpriteAnims .loop - ld a, [hSCY] + ldh a, [hSCY] cp $f8 jr z, .done add $8 - ld [hSCY], a + ldh [hSCY], a ld c, 1 call WaitMobileTradeSpriteAnims jr .loop @@ -1078,12 +1078,12 @@ MobileTradeAnim_GetTrademon2: call Function1082fa call Function108af4 .asm_1088ad - ld a, [hSCY] + ldh a, [hSCY] cp $78 jr z, .asm_1088ee inc a inc a - ld [hSCY], a + ldh [hSCY], a cp $30 jr z, .asm_1088c5 cp $40 @@ -1118,12 +1118,12 @@ MobileTradeAnim_GetTrademon2: jr .asm_1088ad .asm_1088ee - ld a, [hSCX] + ldh a, [hSCX] cp $c jr z, .asm_108906 inc a inc a - ld [hSCX], a + ldh [hSCX], a cp -8 jr nz, .asm_1088e7 call MobileTradeAnim_DeleteSprites @@ -1159,7 +1159,7 @@ MobileTradeAnim_0f: MobileTradeAnim_FadeToBlack: .loop - ld a, [rBGP] + ldh a, [rBGP] and a jr z, .blank sla a @@ -1192,7 +1192,7 @@ asm_108966 call MobileTradeAnim_ClearTilemap hlcoord 7, 2 xor a - ld [hGraphicStartTile], a + ldh [hGraphicStartTile], a lb bc, 7, 7 predef PlaceGraphic call WaitBGMap @@ -1205,7 +1205,7 @@ Function10898a: call MobileTradeAnim_ClearTilemap hlcoord 7, 2 xor a - ld [hGraphicStartTile], a + ldh [hGraphicStartTile], a lb bc, 7, 7 predef PlaceGraphic call WaitBGMap @@ -1251,7 +1251,7 @@ MobileTradeAnim_DisplayEggData: call WaitTop call MobileTradeAnim_ClearTilemap ld a, HIGH(vBGMap1) - ld [hBGMapAddress + 1], a + ldh [hBGMapAddress + 1], a hlcoord 5, 0 ld b, 6 ld c, 9 @@ -1272,7 +1272,7 @@ Function108a33: call WaitTop call MobileTradeAnim_ClearTilemap ld a, HIGH(vBGMap1) - ld [hBGMapAddress + 1], a + ldh [hBGMapAddress + 1], a hlcoord 5, 0 ld b, 6 ld c, 9 @@ -1290,7 +1290,7 @@ MobileTradeAnim_LoadMonTemplate: call WaitTop call MobileTradeAnim_ClearTilemap ld a, HIGH(vBGMap1) - ld [hBGMapAddress + 1], a + ldh [hBGMapAddress + 1], a hlcoord 4, 0 ld b, 6 ld c, 10 @@ -1311,7 +1311,7 @@ MobileTradeAnim_MonDisplay_UpdateBGMap: call WaitBGMap call WaitTop ld a, HIGH(vBGMap0) - ld [hBGMapAddress + 1], a + ldh [hBGMapAddress + 1], a ret MobileTradeAnim_MonDisplay_PrintSpeciesNumber: @@ -1371,20 +1371,20 @@ Function108ad4: ld de, GFX_1091c7 .asm_108adf ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld hl, vTiles2 tile $4a lb bc, BANK(GFX_1092c7), 16 call Get2bpp_2 call DelayFrame ld a, $0 - ld [rVBK], a + ldh [rVBK], a ret Function108af4: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wcf65] and $1 jr z, .copy_palette_109147 @@ -1410,7 +1410,7 @@ Function108af4: .done_copy pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, %11100100 ; 3,2,1,0 call DmgToCgbObjPal0 ld a, %11100100 ; 3,2,1,0 @@ -1419,10 +1419,10 @@ Function108af4: ret Function108b45: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld de, PALRGB_WHITE ld hl, wBGPals1 ld a, e @@ -1430,14 +1430,14 @@ Function108b45: ld d, a ld [hli], a pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function108b5a: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld de, palred 18 + palgreen 31 + palblue 15 ld hl, wBGPals2 + 4 palettes ld c, $10 @@ -1449,16 +1449,16 @@ Function108b5a: dec c jr nz, .loop pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret Function108b78: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld a, c and $2 jr z, .Orange @@ -1473,9 +1473,9 @@ Function108b78: ld a, d ld [hld], a pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret Palette_108b98: @@ -1483,10 +1483,10 @@ Palette_108b98: Function108b98: ld d, a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wcf65] and $1 xor d @@ -1501,7 +1501,7 @@ Function108b98: ld bc, 8 palettes call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a ret MobileTradeAnim_DeleteSprites: @@ -1538,7 +1538,7 @@ Function108be0: Function108bec: ld a, $90 - ld [hWY], a + ldh [hWY], a ld hl, .PlayerWillTradeMon call PrintText ld c, 80 @@ -1563,7 +1563,7 @@ Function108bec: Function108c16: ld a, $90 - ld [hWY], a + ldh [hWY], a ld hl, .TakeGoodCareOfMon call PrintText ld c, 80 @@ -1576,7 +1576,7 @@ Function108c16: Function108c2b: ld a, $90 - ld [hWY], a + ldh [hWY], a ld hl, .PlayersMonTrade call PrintText ld c, 80 @@ -1589,7 +1589,7 @@ Function108c2b: Function108c40: ld a, $90 - ld [hWY], a + ldh [hWY], a ld a, [wcf65] and %10000000 jr z, .Getmon @@ -1625,7 +1625,7 @@ Function108c6d: Function108c80: ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld hl, LZ_1090a7 debgcoord 0, 0 call Decompress @@ -1633,7 +1633,7 @@ Function108c80: debgcoord 0, 0, vBGMap1 call Decompress ld a, $0 - ld [rVBK], a + ldh [rVBK], a ret DebugMobileTrade: diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 64ddaff6b..fab4f954b 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -128,7 +128,7 @@ String_114232: Function114243:: ld a, SRAM_ENABLE ld [MBC3SRamEnable], a - ld a, [hFF8C] + ldh a, [hFF8C] push af ; if [$dc02] == 0, this is popped to pc. push de ld a, [$dc02] @@ -146,8 +146,8 @@ Function114243:: Function11425c: ld [$dc02], a pop af - ld [hFF8C], a - ld [hFF8C], a + ldh [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ret @@ -162,7 +162,7 @@ Function114269: ld [$dc03], a ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -359,7 +359,7 @@ Function11433c: pop bc ld a, [$dc03] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a call Function114c0b ld hl, String_114004 @@ -417,7 +417,7 @@ Function1143b7: push af ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] ld h, [hl] @@ -472,7 +472,7 @@ Function1143f3: Function114412: ld a, c ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld hl, Unknown_11417f ld a, b @@ -659,7 +659,7 @@ Function1144d1: pop hl ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -676,7 +676,7 @@ Function1144d1: ld hl, $dc06 ld a, [hl] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld hl, $dc09 ld e, [hl] @@ -734,7 +734,7 @@ Function114576: jr nz, .asm_1145b4 ld a, h ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a push hl push de @@ -752,7 +752,7 @@ Function114576: jr nz, .asm_1145ba ld a, h ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld hl, String_114218 call Function114acf @@ -924,7 +924,7 @@ Function11463c: pop de pop af ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a xor a ld [wDecoCarpet], a @@ -945,7 +945,7 @@ Function1146a4: ld hl, $dc03 ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -959,7 +959,7 @@ Function1146a4: ld hl, $dc03 ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1002,7 +1002,7 @@ Function1146fa: ld hl, $dc03 ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1016,7 +1016,7 @@ Function1146fa: ld a, $1 ld [$dc0e], a ld a, [$dc00] - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld a, $1 ld [wDecoRightOrnament], a @@ -1043,7 +1043,7 @@ Function1146fa: ld hl, $dc03 ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1097,7 +1097,7 @@ Function1146fa: ld hl, $dc03 ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a call Function114a7a and a @@ -1207,7 +1207,7 @@ Function114843: ld a, [$dc00] push af push de - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a call Function114a18 and a @@ -1230,7 +1230,7 @@ Function114867: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1295,7 +1295,7 @@ Function1148c2: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1393,7 +1393,7 @@ Function11494d: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1483,7 +1483,7 @@ Function1149cc: ld hl, $dc06 ld a, [hl] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a push de ld hl, $dc09 @@ -1830,7 +1830,7 @@ endr ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1868,7 +1868,7 @@ Function114bbc: jr nz, .asm_114bff ld a, h ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a call Function114c0b ld hl, $dc24 @@ -1879,7 +1879,7 @@ Function114bbc: pop hl ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -2085,7 +2085,7 @@ Function114cd9: ld [$dc04], a ld a, h ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld hl, $dc24 call Function114d39 @@ -2104,7 +2104,7 @@ endr pop hl ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -2402,7 +2402,7 @@ Function114ea0: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -2602,7 +2602,7 @@ Function114f59: inc hl ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -2680,7 +2680,7 @@ Function115020: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -2737,7 +2737,7 @@ Function115062: ld c, a ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -2888,7 +2888,7 @@ Function115136: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -2941,7 +2941,7 @@ Function115179: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -3059,7 +3059,7 @@ Function115217: ld hl, $dc06 ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -3152,7 +3152,7 @@ Function11528f: inc hl ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -3401,7 +3401,7 @@ Function1153d2: .asm_1153f5 ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -3535,7 +3535,7 @@ Function1153d2: ld hl, wDecoRightOrnament ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -3768,7 +3768,7 @@ Function11560a: ld [wCurrMapBGEventCount], a ld a, [$dc17] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld hl, $dc1a ld c, [hl] @@ -3841,7 +3841,7 @@ Function11560a: ld [hl], d pop bc ld a, [wCurrMapBGEventCount] - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld hl, wCurrMapSceneScriptCount ld e, [hl] @@ -4147,7 +4147,7 @@ Function11581e: ld hl, $dc02 ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -4201,7 +4201,7 @@ Function11581e: ld hl, wCurrMapSceneScriptCount ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -4668,7 +4668,7 @@ Function115b00: ld hl, $dc02 ld a, [hli] ld [$dc00], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -4756,7 +4756,7 @@ Function115b00: ld hl, wCurrMapSceneScriptCount ld a, [hli] ld [wCurrMapBGEventCount], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -5149,7 +5149,7 @@ Function115d80: ld a, [bc] inc a ld [bc], a - ld [hFF8C], a + ldh [hFF8C], a ld [MBC3SRamBank], a ld a, e ld d, $a0 @@ -5337,7 +5337,7 @@ Function11665c: .asm_116675 ld [wc30f], a call Random - ld a, [hRandomAdd] + ldh a, [hRandomAdd] and $7 sla a sla a @@ -5413,7 +5413,7 @@ Function1166f4: ld hl, wc30f .asm_116702 call Random - ld a, [hRandomAdd] + ldh a, [hRandomAdd] and $7 jr z, .asm_11670c dec a @@ -5439,7 +5439,7 @@ Function11671f: ld hl, wc30e .asm_11672d call Random - ld a, [hRandomAdd] + ldh a, [hRandomAdd] and $7 sla a sla a @@ -6618,21 +6618,21 @@ GiveOddEgg: ret Function11765d: - ld a, [hInMenu] + ldh a, [hInMenu] push af ld a, $1 - ld [hInMenu], a + ldh [hInMenu], a call Function11766b pop af - ld [hInMenu], a + ldh [hInMenu], a ret Function11766b: call Function117699 - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a call Function1176ee ld a, $5 call GetSRAMBank @@ -6645,7 +6645,7 @@ Function11766b: call CopyBytes call CloseSRAM pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function117699: @@ -6964,7 +6964,7 @@ Function1178aa: jp MobilePassword_IncrementJumptable Function1178e8: - ld a, [hJoyPressed] + ldh a, [hJoyPressed] cp B_BUTTON jr z, .b_button cp A_BUTTON @@ -7111,13 +7111,13 @@ INCBIN "data/mobile/ascii-sym.txt" ; Mobile Stadium option from the continue/newgame menu. ; Needs better function names MobileStudium: - ld a, [hInMenu] + ldh a, [hInMenu] push af ld a, $1 - ld [hInMenu], a + ldh [hInMenu], a call Function117a8d pop af - ld [hInMenu], a + ldh [hInMenu], a ret Function117a8d: @@ -7215,7 +7215,7 @@ Function117b31: jp MobileStudium_JumptableIncrement Function117b4f: - ld a, [hJoyPressed] + ldh a, [hJoyPressed] cp B_BUTTON jr z, .b_button cp A_BUTTON @@ -7272,7 +7272,7 @@ Function117b4f: Function117bb6: call Function117c89 ld a, $1 - ld [hBGMapMode], a + ldh [hBGMapMode], a farcall Function118284 call ClearSprites ld a, [wc300] @@ -7294,10 +7294,10 @@ Function117bb6: ret .asm_117be7 - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wcd89] and $1 jr nz, .asm_117c16 @@ -7322,19 +7322,19 @@ Function117bb6: .asm_117c16 pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, $d3 ld [wc300], a jr .asm_117bd0 .asm_117c20 pop af - ld [rSVBK], a + ldh [rSVBK], a farcall Function172eb9 - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld a, $7 call GetSRAMBank ld hl, w3_d002 @@ -7343,7 +7343,7 @@ Function117bb6: call CopyBytes call CloseSRAM pop af - ld [rSVBK], a + ldh [rSVBK], a jp MobileStudium_JumptableIncrement Function117c4a: @@ -7354,10 +7354,10 @@ Function117c4a: farcall ReloadMapPart ld hl, MobileStadiumSuccessText call PrintText - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wBGPals1 ld de, 1 palettes ld c, 8 @@ -7373,7 +7373,7 @@ Function117c4a: jr nz, .loop call RotateThreePalettesRight pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, $80 ld [wJumptableIndex], a ret diff --git a/mobile/mobile_45_sprite_engine.asm b/mobile/mobile_45_sprite_engine.asm index eb1b74ab2..e2863efc6 100644 --- a/mobile/mobile_45_sprite_engine.asm +++ b/mobile/mobile_45_sprite_engine.asm @@ -375,11 +375,11 @@ Function1161b8: dw Function116441 Function1161d5: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $6 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Unknown_117356 ld de, wDecompressScratch @@ -390,86 +390,86 @@ Function1161d5: .wait_for_vblank ; Wait until a vblank would occur had interrupts not just been disabled. - ld a, [rLY] + ldh a, [rLY] cp LY_VBLANK + 1 jr nz, .wait_for_vblank ld a, $d0 - ld [rHDMA1], a + ldh [rHDMA1], a ld a, $0 - ld [rHDMA2], a + ldh [rHDMA2], a ld a, $1c - ld [rHDMA3], a + ldh [rHDMA3], a xor a - ld [rHDMA4], a + ldh [rHDMA4], a ld a, $8 - ld [rHDMA5], a + ldh [rHDMA5], a ld a, $d0 - ld [rHDMA1], a + ldh [rHDMA1], a ld a, $80 - ld [rHDMA2], a + ldh [rHDMA2], a ld a, $1c - ld [rHDMA3], a + ldh [rHDMA3], a ld a, $80 - ld [rHDMA4], a + ldh [rHDMA4], a ld a, $8 - ld [rHDMA5], a + ldh [rHDMA5], a ld a, $d1 - ld [rHDMA1], a + ldh [rHDMA1], a ld a, $0 - ld [rHDMA2], a + ldh [rHDMA2], a ld a, $1d - ld [rHDMA3], a + ldh [rHDMA3], a xor a - ld [rHDMA4], a + ldh [rHDMA4], a ld a, $8 - ld [rHDMA5], a + ldh [rHDMA5], a ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld a, $d1 - ld [rHDMA1], a + ldh [rHDMA1], a ld a, $80 - ld [rHDMA2], a + ldh [rHDMA2], a ld a, $1c - ld [rHDMA3], a + ldh [rHDMA3], a xor a - ld [rHDMA4], a + ldh [rHDMA4], a ld a, $8 - ld [rHDMA5], a + ldh [rHDMA5], a ld a, $d2 - ld [rHDMA1], a + ldh [rHDMA1], a ld a, $0 - ld [rHDMA2], a + ldh [rHDMA2], a ld a, $1c - ld [rHDMA3], a + ldh [rHDMA3], a ld a, $80 - ld [rHDMA4], a + ldh [rHDMA4], a ld a, $8 - ld [rHDMA5], a + ldh [rHDMA5], a ld a, $d2 - ld [rHDMA1], a + ldh [rHDMA1], a ld a, $80 - ld [rHDMA2], a + ldh [rHDMA2], a ld a, $1d - ld [rHDMA3], a + ldh [rHDMA3], a xor a - ld [rHDMA4], a + ldh [rHDMA4], a ld a, $8 - ld [rHDMA5], a + ldh [rHDMA5], a xor a - ld [rVBK], a + ldh [rVBK], a ei pop af - ld [rSVBK], a + ldh [rSVBK], a farcall ReloadMapPart ld a, $8 @@ -495,10 +495,10 @@ Function116294: ld a, [$c319] inc a ld [$c319], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wBGPals1 palette 6 ld de, $c320 ld bc, 2 palettes @@ -509,9 +509,9 @@ Function116294: call CopyBytes call SetPalettes pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, $30 - ld [hWY], a + ldh [hWY], a ret Function1162cb: @@ -519,17 +519,17 @@ Function1162cb: ld a, [$c319] inc a ld [$c319], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_11730e ld de, wOBPals1 + 2 palettes ld bc, 6 palettes call CopyBytes call SetPalettes pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function1162f2: @@ -622,30 +622,30 @@ Function1162f2: ret Function11636e: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wBGPals2 ld de, wBGPals1 ld bc, 8 palettes call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a call SetPalettes - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld a, $a0 ld hl, wVirtualOAM ld bc, 16 * SPRITEOAMSTRUCT_LENGTH call ByteFill ld a, $90 - ld [hWY], a + ldh [hWY], a call UpdateSprites pop af - ld [rSVBK], a + ldh [rSVBK], a farcall ReloadMapPart ld a, $8 ld [wMusicFade], a @@ -659,10 +659,10 @@ Function11636e: ret Function1163c0: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld a, $a0 ld hl, wVirtualOAM ld bc, 16 * SPRITEOAMSTRUCT_LENGTH @@ -671,24 +671,24 @@ Function1163c0: farcall Function14146 ld b, SCGB_MAPPALS call GetSGBLayout - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, $c320 ld de, wd030 ld bc, $0010 call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a call SetPalettes call DelayFrame ld a, $90 - ld [hWY], a + ldh [hWY], a call UpdateSprites farcall Function14157 pop af - ld [rSVBK], a + ldh [rSVBK], a farcall ReloadMapPart ld a, [wLinkMode] cp $4 @@ -718,7 +718,7 @@ Function1163c0: Function116441: farcall Function17d405 ld a, $90 - ld [hWY], a + ldh [hWY], a farcall ReloadMapPart ld a, $8 ld [wMusicFade], a diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index d9b9d7af7..d00a248b5 100644 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -17,10 +17,10 @@ asm_11800b ld [wcd34], a ld a, $4 ld [wc3f0], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a .loop call JoyTextDelay call Function118473 @@ -41,7 +41,7 @@ asm_11800b cp [hl] jr nz, .loop pop af - ld [rSVBK], a + ldh [rSVBK], a call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu BattleTowerRoomMenu_DoNothing: @@ -57,10 +57,10 @@ Function11805f: ld [wcd34], a ld a, $4 ld [wc3f0], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a .asm_11807d call JoyTextDelay call Function118473 @@ -81,7 +81,7 @@ Function11805f: cp [hl] jr nz, .asm_11807d pop af - ld [rSVBK], a + ldh [rSVBK], a call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret @@ -94,10 +94,10 @@ Function1180b8: ld [wcd34], a ld a, $4 ld [wc3f0], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a .asm_1180d1 call JoyTextDelay call Function118473 @@ -126,7 +126,7 @@ Function1180b8: cp [hl] jr nz, .asm_1180d1 pop af - ld [rSVBK], a + ldh [rSVBK], a call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret @@ -147,10 +147,10 @@ Function118125: ld [wcd34], a ld a, $4 ld [wc3f0], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a .loop call JoyTextDelay call Function118473 @@ -172,7 +172,7 @@ Function118125: xor a ld [w3_d000], a pop af - ld [rSVBK], a + ldh [rSVBK], a call BattleTowerRoomMenu_Cleanup call Function118180 call ReturnToMapFromSubmenu @@ -192,10 +192,10 @@ Function118180: ld bc, $0016 call CopyBytes - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld de, w3_d202 ld c, $96 @@ -213,7 +213,7 @@ Function118180: call CopyBytes .reset_banks pop af - ld [rSVBK], a + ldh [rSVBK], a call CloseSRAM ret @@ -233,10 +233,10 @@ Function1181da: ld [wcd34], a ld a, $4 ld [wc3f0], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a .asm_1181f8 call JoyTextDelay call Function118473 @@ -257,7 +257,7 @@ Function1181da: cp [hl] jr nz, .asm_1181f8 pop af - ld [rSVBK], a + ldh [rSVBK], a call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret @@ -270,10 +270,10 @@ Function118233: ld [wcd34], a ld a, $6 ld [wc3f0], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a .asm_11824c call JoyTextDelay call Function118473 @@ -294,7 +294,7 @@ Function118233: cp [hl] jr nz, .asm_11824c pop af - ld [rSVBK], a + ldh [rSVBK], a call BattleTowerRoomMenu_Cleanup ret @@ -306,10 +306,10 @@ Function118284: ld [wcd34], a ld a, $5 ld [wc3f0], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a .asm_11829d call JoyTextDelay call Function118473 @@ -329,7 +329,7 @@ Function118284: cp [hl] jr nz, .asm_11829d pop af - ld [rSVBK], a + ldh [rSVBK], a call BattleTowerRoomMenu_Cleanup ret @@ -341,10 +341,10 @@ Function1182d5: ld [wcd34], a ld a, $4 ld [wc3f0], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a .asm_1182ee call JoyTextDelay call Function118473 @@ -365,7 +365,7 @@ Function1182d5: cp [hl] jr nz, .asm_1182ee pop af - ld [rSVBK], a + ldh [rSVBK], a call BattleTowerRoomMenu_Cleanup call ReturnToMapFromSubmenu ret @@ -378,10 +378,10 @@ Function118329: ld [wcd34], a ld a, $6 ld [wc3f0], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a .asm_118342 call JoyTextDelay call Function118473 @@ -402,7 +402,7 @@ Function118329: cp [hl] jr nz, .asm_118342 pop af - ld [rSVBK], a + ldh [rSVBK], a call BattleTowerRoomMenu_Cleanup ret @@ -414,10 +414,10 @@ Function11837a: ld [wcd34], a ld a, $6 ld [wc3f0], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a .asm_118393 call JoyTextDelay call Function118473 @@ -438,17 +438,17 @@ Function11837a: cp [hl] jr nz, .asm_118393 pop af - ld [rSVBK], a + ldh [rSVBK], a call BattleTowerRoomMenu_Cleanup ret BattleTowerRoomMenu_InitRAM: di - ld a, [rIE] + ldh a, [rIE] ld [wcd32], a call DoubleSpeed xor a - ld [rIF], a + ldh [rIF], a ld [wc300], a ld [wc301], a ld [wc302], a @@ -470,10 +470,10 @@ BattleTowerRoomMenu_InitRAM: ld [wcd7f], a set 1, [hl] ld a, $f - ld [rIE], a + ldh [rIE], a ld a, $1 - ld [hMobileReceive], a - ld [hMobile], a + ldh [hMobileReceive], a + ldh [hMobile], a ei farcall Stubbed_Function106462 farcall Function106464 @@ -500,14 +500,14 @@ Function118440: BattleTowerRoomMenu_Cleanup: di xor a - ld [hMobileReceive], a - ld [hMobile], a - ld [hVBlank], a + ldh [hMobileReceive], a + ldh [hMobile], a + ldh [hVBlank], a call NormalSpeed xor a - ld [rIF], a + ldh [rIF], a ld a, [wcd32] - ld [rIE], a + ldh [rIE], a ei ld a, [wcd7f] ld [wVramState], a @@ -904,7 +904,7 @@ Function11878d: and $1 jr z, .asm_1187a7 ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a .asm_1187a7 jp BattleTowerRoomMenu_IncrementJumptable .asm_1187aa @@ -932,7 +932,7 @@ Function11878d: jr nz, .asm_118803 set 0, [hl] ld a, $6 - ld [rSVBK], a + ldh [rSVBK], a ld de, $d000 ld bc, $1000 ld a, [hl] @@ -977,7 +977,7 @@ Function118821: jr c, .asm_11884a cp $4 jr z, .asm_11884a - ld a, [hJoyDown] + ldh a, [hJoyDown] cp $5 jr nz, .asm_11884a ld a, $a @@ -995,7 +995,7 @@ Function118821: ret Function11884c: - ld a, [hJoyDown] + ldh a, [hJoyDown] cp $5 jr nz, .asm_118864 ld a, $a @@ -1154,7 +1154,7 @@ BattleTowerRoomMenu_PlacePickLevelMenu: ld a, $1 ld [wcd4f], a ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wStatusFlags] bit STATUSFLAGS_HALL_OF_FAME_F, a jr nz, .asm_11896b @@ -1173,7 +1173,7 @@ BattleTowerRoomMenu_PlacePickLevelMenu: ld a, h ld [wcd4c], a ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a call BattleTowerRoomMenu_IncrementJumptable BattleTowerRoomMenu_UpdatePickLevelMenu: @@ -1199,10 +1199,10 @@ BattleTowerRoomMenu_UpdatePickLevelMenu: ld e, a ld a, h ld d, a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld bc, wStringBuffer3 .asm_1189b5 ld a, [hli] @@ -1220,7 +1220,7 @@ BattleTowerRoomMenu_UpdatePickLevelMenu: .asm_1189c4 ld [bc], a pop af - ld [rSVBK], a + ldh [rSVBK], a hlcoord 13, 9 call PlaceString ld hl, hJoyPressed @@ -1267,13 +1267,13 @@ BattleTowerRoomMenu_UpdatePickLevelMenu: and $fe srl a ld [wcf65], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a call CloseWindow pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, [wcd38] and a jr nz, .asm_118a30 @@ -1291,13 +1291,13 @@ BattleTowerRoomMenu_UpdatePickLevelMenu: call PlayClickSFX .asm_118a3c - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a call CloseWindow pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, $7 ld [wcf66], a ld a, $0 @@ -1346,7 +1346,7 @@ Function118aa4: ld bc, $80 call CopyBytes ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld de, w3_d100 ld bc, $e00 jr Function118b10 @@ -1608,13 +1608,13 @@ Function118ded: ld a, [wcd38] and a jr z, .asm_118e03 - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a farcall Function11b93b pop af - ld [rSVBK], a + ldh [rSVBK], a .asm_118e03 jp BattleTowerRoomMenu_IncrementJumptable @@ -1958,7 +1958,7 @@ Function119054: and $1 jr z, .asm_11908a ld a, $6 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wd002 ld a, [w3_d000] ld c, a @@ -1970,7 +1970,7 @@ Function119054: .asm_11908a call CloseSRAM ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld a, $5 call GetSRAMBank ld a, [wcd4f] @@ -1981,10 +1981,10 @@ Function119054: ld de, $aa7f ld bc, $000c call CopyBytes - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wd474] ld [$b2f3], a ld hl, wd475 @@ -1992,13 +1992,13 @@ Function119054: ld bc, $0004 call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a call CloseSRAM jp BattleTowerRoomMenu_IncrementJumptable Function1190d0: ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wcd57] ld l, a ld a, [wcd58] @@ -2037,7 +2037,7 @@ Function1190ec: and $1 jr z, .asm_11913e ld a, $6 - ld [rSVBK], a + ldh [rSVBK], a ld a, [w3_d000] ld c, a ld a, [w3_d000 + 1] @@ -2048,7 +2048,7 @@ Function1190ec: .asm_11913e ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a call CloseSRAM ld hl, Text_ReceivedNews call BattleTowerRoomMenu_SetMessage @@ -2125,7 +2125,7 @@ Function1191ad: push bc ld c, $0 ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a .asm_1191b4 ld a, [hli] ld [de], a @@ -2139,14 +2139,14 @@ Function1191ad: ld a, $da call Function118805 ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a pop bc scf ret .asm_1191cc ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a pop bc and a ret @@ -2517,7 +2517,7 @@ Function119413: and $1 jr z, .asm_119447 ld a, $6 - ld [rSVBK], a + ldh [rSVBK], a ld a, [w3_d000] ld c, a ld a, [w3_d000 + 1] @@ -2528,7 +2528,7 @@ Function119413: .asm_119447 ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a call CloseSRAM jp BattleTowerRoomMenu_IncrementJumptable @@ -3006,14 +3006,14 @@ Function1196f2: jr z, .asm_11974c .asm_119735 - ld a, [hRandomSub] + ldh a, [hRandomSub] cp d jr c, .asm_11974c jr z, .asm_11973e jr .asm_119745 .asm_11973e - ld a, [hRandomAdd] + ldh a, [hRandomAdd] cp e jr c, .asm_11974c jr z, .asm_11974c @@ -3164,13 +3164,13 @@ Function119800: ld a, [wcf66] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a call FadeToMenu farcall Function10803d call Function11a9ce call RestartMapMusic ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a pop af ld [wcf66], a pop af @@ -3199,13 +3199,13 @@ Function11984e: ld a, [wcf66] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a call FadeToMenu farcall MobileTradeAnimation_SendGivemonToGTS call Function11a9ce call RestartMapMusic ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a pop af ld [wcf66], a pop af @@ -3233,13 +3233,13 @@ Function11984e: ld a, [wcf66] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a call FadeToMenu farcall MobileTradeAnimation_RetrieveGivemonFromGTS call Function11a9ce call RestartMapMusic ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a pop af ld [wcf66], a pop af @@ -3882,10 +3882,10 @@ String_119d8c: db "CANCEL@" BattleTower_LevelCheck: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wcd4f] ld c, 10 call SimpleMultiply @@ -3912,7 +3912,7 @@ BattleTower_LevelCheck: dec a jr nz, .party_loop pop af - ld [rSVBK], a + ldh [rSVBK], a and a ret @@ -3921,18 +3921,18 @@ BattleTower_LevelCheck: ld a, $4 ld [wcf66], a pop af - ld [rSVBK], a + ldh [rSVBK], a scf ret BattleTower_UbersCheck: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, [wcd4f] cp 70 / 10 jr nc, .level_70_or_more ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wPartyMon1Level ld bc, PARTYMON_STRUCT_LENGTH ld de, wPartySpecies @@ -3960,7 +3960,7 @@ BattleTower_UbersCheck: jr nz, .loop .level_70_or_more pop af - ld [rSVBK], a + ldh [rSVBK], a and a ret @@ -3976,7 +3976,7 @@ BattleTower_UbersCheck: ld a, $a ld [wcf66], a pop af - ld [rSVBK], a + ldh [rSVBK], a scf ret @@ -4120,17 +4120,17 @@ Function119ec2: ret BattleTowerRoomMenu2: - ld a, [rSVBK] + ldh a, [rSVBK] ld [wcd8c], a ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a call .RunJumptable ld a, [wcd8c] - ld [rSVBK], a + ldh [rSVBK], a ld a, $1 - ld [hBGMapMode], a + ldh [hBGMapMode], a ret .RunJumptable: @@ -4295,24 +4295,24 @@ Function11a00e: .asm_11a039 ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld hl, $c608 ld de, w3_d800 ld bc, $00f6 call CopyBytes ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a call FadeToMenu farcall Function11765d call Function11a9ce ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld hl, w3_d800 ld de, $c608 ld bc, $00f6 call CopyBytes ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a farcall Function115d99 ld c, $0 farcall Function115e18 @@ -5153,31 +5153,31 @@ Function11a80c: call Function11a88c xor a ld b, a - ld a, [hDivisor] + ldh a, [hDivisor] and $f ld e, a - ld a, [hPrintNum7] + ldh a, [hPrintNum7] and $f call Function11a884 ld e, a - ld a, [hPrintNum9] + ldh a, [hPrintNum9] and $f call Function11a884 ld [wcd62], a ld e, b xor a ld b, a - ld a, [hDivisor] + ldh a, [hDivisor] and $f0 swap a call Function11a884 ld e, a - ld a, [hPrintNum7] + ldh a, [hPrintNum7] and $f0 swap a call Function11a884 ld e, a - ld a, [hPrintNum9] + ldh a, [hPrintNum9] and $f0 swap a call Function11a884 @@ -5185,15 +5185,15 @@ Function11a80c: ld e, b xor a ld b, a - ld a, [hMathBuffer] + ldh a, [hMathBuffer] and $f call Function11a884 ld e, a - ld a, [hPrintNum8] + ldh a, [hPrintNum8] and $f call Function11a884 ld e, a - ld a, [hPrintNum10] + ldh a, [hPrintNum10] and $f call Function11a884 ld [wcd64], a @@ -5253,7 +5253,7 @@ BattleTowerRoomMenu_WriteMessage: Function11a90f: ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a call SpeechTextBox ld a, $50 ld hl, $c320 @@ -5307,14 +5307,14 @@ Function11a90f: ld hl, $c31a inc [hl] ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a BattleTowerRoomMenu_WriteMessage_DoNothing: ret Function11a971: ld hl, $c31f - ld a, [hJoyDown] + ldh a, [hJoyDown] and a jr nz, .asm_11a97f ld a, [hl] @@ -5513,7 +5513,7 @@ Function11ac3e: Function11ac51: xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a ld hl, wOptions ld a, [hl] push af @@ -5522,12 +5522,12 @@ Function11ac51: push af xor a ld [wVramState], a - ld a, [hInMenu] + ldh a, [hInMenu] push af ld a, $1 - ld [hInMenu], a + ldh [hInMenu], a xor a - ld [hMapAnims], a + ldh [hMapAnims], a ld [wcd49], a ld [wcd4a], a ld [wcd4c], a @@ -5552,7 +5552,7 @@ Function11ac51: .asm_11aca8 call ClearSprites pop af - ld [hInMenu], a + ldh [hInMenu], a pop af ld [wVramState], a pop af @@ -5619,7 +5619,7 @@ Function11ad1b: ld a, [wMenuCursorY] ld [wcd82], a dec a - ld [hObjectStructIndexBuffer], a + ldh [hObjectStructIndexBuffer], a ld a, $10 ld [wCurIconTile], a ld hl, LoadMenuMonIcon @@ -6194,10 +6194,10 @@ Function11b0ff: and $3 ld [wcd4c], a xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call Function11b099 ld a, $1 - ld [hBGMapMode], a + ldh [hBGMapMode], a ret .asm_11b125 @@ -7006,7 +7006,7 @@ Function11b570: .SaveData: ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld hl, w3_d800 ld de, $c608 @@ -7014,7 +7014,7 @@ Function11b570: call CopyBytes ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld a, $5 call GetSRAMBank @@ -7029,13 +7029,13 @@ Function11b570: push de pop hl - ld a, [hRTCMinutes] + ldh a, [hRTCMinutes] ld [hli], a - ld a, [hRTCHours] + ldh a, [hRTCHours] ld [hli], a - ld a, [hRTCDayLo] + ldh a, [hRTCDayLo] ld [hli], a - ld a, [hRTCDayHi] + ldh a, [hRTCDayHi] ld [hl], a call CloseSRAM @@ -7117,14 +7117,14 @@ Function11b66d: ld a, [wScriptVar] and a jr nz, .asm_11b6b0 - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld a, [w3_d090] ld b, a pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, b and a jr z, .asm_11b691 @@ -7140,14 +7140,14 @@ Function11b66d: jr z, .asm_11b6b0 xor a ld [wScriptVar], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld a, $2 ld [w3_d090], a pop af - ld [rSVBK], a + ldh [rSVBK], a .asm_11b6b0 jp Function11ad8a @@ -7372,15 +7372,15 @@ Function11b879: and a ret z ld hl, wcd4c - ld a, [hRTCDayHi] + ldh a, [hRTCDayHi] cp [hl] ret nz dec hl - ld a, [hRTCDayLo] + ldh a, [hRTCDayLo] cp [hl] ret nz ld hl, wcd4a - ld a, [hRTCHours] + ldh a, [hRTCHours] cp [hl] jr nc, .asm_11b8d8 ld a, $18 @@ -7388,16 +7388,16 @@ Function11b879: ld hl, hRTCHours add [hl] ld [wcd4c], a - ld a, [hRTCMinutes] + ldh a, [hRTCMinutes] ld [wcd4b], a xor a ld [wcd4a], a jr .asm_11b8e2 .asm_11b8d8 - ld a, [hRTCMinutes] + ldh a, [hRTCMinutes] ld [wcd4b], a - ld a, [hRTCHours] + ldh a, [hRTCHours] ld [wcd4c], a .asm_11b8e2 diff --git a/mobile/mobile_5b.asm b/mobile/mobile_5b.asm index 9388e8d04..885d9835d 100644 --- a/mobile/mobile_5b.asm +++ b/mobile/mobile_5b.asm @@ -1,10 +1,10 @@ Unreferenced_Function16c000: ; Only for CGB - ld a, [hCGB] + ldh a, [hCGB] and a ret z ; Only do this once per boot cycle - ld a, [hSystemBooted] + ldh a, [hSystemBooted] and a ret z ; Set some flag, preserving the old state @@ -21,7 +21,7 @@ Unreferenced_Function16c000: ; Prevent this routine from running again ; until the next time the system is turned on xor a - ld [hSystemBooted], a + ldh [hSystemBooted], a ; Restore the flag state pop af ld [wcfbe], a @@ -81,7 +81,7 @@ Function16c089: ld [wBuffer2], a ld [wd1f1], a xor a - ld [hWY], a + ldh [hWY], a call Function16c0fa ld a, [wd002] ld [wcf64], a @@ -100,7 +100,7 @@ Function16c0a8: ld [wd1f1], a call ClearSprites ld a, $90 - ld [hWY], a + ldh [hWY], a call Function16c0fa ret @@ -167,7 +167,7 @@ MobileSystemSplashScreen_InitGFX: call Function16cc73 call Function16cc02 xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call EnableLCD ret @@ -218,22 +218,22 @@ Function16c943: ld a, [wd003] and a jr nz, .asm_16c95e - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld a, $ff ld bc, 1 palettes ld hl, wBGPals1 call ByteFill pop af - ld [rSVBK], a + ldh [rSVBK], a .asm_16c95e - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld e, $0 ld a, $0 .asm_16c969 @@ -313,26 +313,26 @@ Function16c943: jr nz, .asm_16c969 farcall ApplyPals call SetPalettes - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wd003] cp $1f jr z, .asm_16ca09 pop af - ld [rSVBK], a + ldh [rSVBK], a ld e, $0 pop af - ld [rSVBK], a + ldh [rSVBK], a and a ret .asm_16ca09 pop af - ld [rSVBK], a + ldh [rSVBK], a pop af - ld [rSVBK], a + ldh [rSVBK], a scf ret @@ -343,10 +343,10 @@ Function16ca11: farcall ApplyPals .asm_16ca1d - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld e, $0 ld a, $0 .asm_16ca28 @@ -414,25 +414,25 @@ Function16ca11: jr nz, .asm_16ca28 farcall ApplyPals call SetPalettes - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wd003] cp $1f jr z, .asm_16caae pop af - ld [rSVBK], a + ldh [rSVBK], a pop af - ld [rSVBK], a + ldh [rSVBK], a and a ret .asm_16caae pop af - ld [rSVBK], a + ldh [rSVBK], a pop af - ld [rSVBK], a + ldh [rSVBK], a scf ret @@ -651,7 +651,7 @@ Function16cbd1: call FarCopyWRAM farcall ApplyPals ld a, $1 - ld [hCGBPalUpdate], a + ldh [hCGBPalUpdate], a ret Unknown_16cbfb: @@ -721,20 +721,20 @@ Function16cc6e: jr Function16cc73 Function16cc73: - ld a, [rVBK] + ldh a, [rVBK] push af ld a, $0 - ld [rVBK], a + ldh [rVBK], a push hl decoord 0, 0 call Function16cc90 pop hl ld a, $1 - ld [rVBK], a + ldh [rVBK], a decoord 0, 0, wAttrMap call Function16cc90 pop af - ld [rVBK], a + ldh [rVBK], a ret Function16cc90: diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 355678096..2aefe9ca5 100644 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -249,21 +249,21 @@ CheckBTMonMovesForErrors: ret Function170cc6: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, BANK(wDecompressScratch) - ld [rSVBK], a + ldh [rSVBK], a ld hl, PichuAnimatedMobileGFX ld de, wDecompressScratch call Decompress ld a, 1 - ld [rVBK], a + ldh [rVBK], a ld de, wDecompressScratch ld hl, vTiles0 lb bc, BANK(wDecompressScratch), 193 call Get2bpp xor a - ld [rVBK], a + ldh [rVBK], a ld hl, ElectroBallMobileGFX ld de, wDecompressScratch call Decompress @@ -272,18 +272,18 @@ Function170cc6: lb bc, BANK(wDecompressScratch), 83 call Get2bpp pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function170d02: ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld de, GFX_171848 ld hl, vTiles0 tile $c1 lb bc, BANK(GFX_171848), 24 call Get2bpp xor a - ld [rVBK], a + ldh [rVBK], a ret PichuAnimatedMobileGFX: @@ -296,25 +296,25 @@ GFX_171848: INCBIN "gfx/unknown/171848.2bpp" Function1719c8: - ld a, [hInMenu] + ldh a, [hInMenu] push af ld a, $1 - ld [hInMenu], a + ldh [hInMenu], a call Function1719d6 pop af - ld [hInMenu], a + ldh [hInMenu], a ret Function1719d6: farcall BattleTowerRoomMenu_InitRAM call Function1719ed - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a call Function171a11 pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function1719ed: @@ -389,13 +389,13 @@ Function171a5d: ld [wc302], a ld a, $a call Function3e32 - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a farcall BattleTowerRoomMenu_Cleanup pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, $a ld [wcd49], a ret @@ -431,13 +431,13 @@ Function171ad7: jp Function171c66 Function171aec: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a farcall BattleTowerRoomMenu_Cleanup pop af - ld [rSVBK], a + ldh [rSVBK], a hlcoord 2, 6 ld a, $8 .asm_171b01 @@ -684,10 +684,10 @@ Function171c87: ret Function171ccd: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_171d71 ld de, wBGPals1 ld bc, 8 palettes @@ -699,7 +699,7 @@ Function171ccd: ld [hl], a call SetPalettes pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function171cf0: @@ -846,10 +846,10 @@ Function172e78: ret Function172eb9: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_172edf ld de, wBGPals1 ld bc, 8 palettes @@ -860,7 +860,7 @@ Function172eb9: call CopyBytes call SetPalettes pop af - ld [rSVBK], a + ldh [rSVBK], a ret Palette_172edf: diff --git a/mobile/mobile_5e.asm b/mobile/mobile_5e.asm index 1035bb026..748a71d55 100644 --- a/mobile/mobile_5e.asm +++ b/mobile/mobile_5e.asm @@ -138,24 +138,24 @@ Function17a751: ret Function17a770: - ld a, [hOAMUpdate] + ldh a, [hOAMUpdate] push af ld a, $1 - ld [hOAMUpdate], a + ldh [hOAMUpdate], a call HideSprites call Function17a9cb pop af - ld [hOAMUpdate], a + ldh [hOAMUpdate], a ret Function17a781: - ld a, [hInMenu] + ldh a, [hInMenu] push af ld a, $1 - ld [hInMenu], a + ldh [hInMenu], a call JoyTextDelay pop af - ld [hInMenu], a + ldh [hInMenu], a ret Function17a78f: @@ -243,7 +243,7 @@ Function17a7ff: Function17a81a: call IsSFXPlaying ret nc - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and $3 ret z call ExitMenu @@ -258,10 +258,10 @@ Function17a81a: ret Function17a83c: - ld a, [hJoyLast] + ldh a, [hJoyLast] and $f0 ld c, a - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and $b or c ld c, a @@ -724,10 +724,10 @@ Unknown_17aaf7: db $0, $0,$f0,$10, $e, $c, $c, $b, $9, $b, $9, $b, $9 Function17aba0: - ld a, [rVBK] + ldh a, [rVBK] push af ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld hl, vTiles5 tile $00 ld de, GFX_17afa5 @@ -735,7 +735,7 @@ Function17aba0: call Get2bpp pop af - ld [rVBK], a + ldh [rVBK], a ld hl, vTiles0 tile $00 ld de, GFX_17afa5 + $4c0 @@ -749,10 +749,10 @@ Function17aba0: ret Function17abcf: - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, BANK(wBGPals1) - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_17ac55 ld de, wBGPals1 ; $d000 @@ -776,7 +776,7 @@ Function17abcf: call FarCopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function17ac0c: diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 4b2c330c0..c37ecd4c6 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -41,11 +41,11 @@ Function17c000: dec a jr nz, .y - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, BANK(wBGPals1) - ld [rSVBK], a + ldh [rSVBK], a ld hl, HaveWantPals ld de, wBGPals1 @@ -53,7 +53,7 @@ Function17c000: call CopyBytes pop af - ld [rSVBK], a + ldh [rSVBK], a ld hl, MobileSelectGFX ld de, vTiles0 tile $30 @@ -61,7 +61,7 @@ Function17c000: call CopyBytes ld a, 1 - ld [rVBK], a + ldh [rVBK], a ld hl, HaveWantGFX ld de, vTiles2 @@ -74,7 +74,7 @@ Function17c000: call CopyBytes xor a - ld [rVBK], a + ldh [rVBK], a call EnableLCD farcall ReloadMapPart @@ -522,14 +522,14 @@ Function17d2ce: ret c call SpeechTextBox call FadeToMenu - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a call Function17d370 call Function17d45a pop af - ld [rSVBK], a + ldh [rSVBK], a ld de, MUSIC_MOBILE_CENTER ld a, e ld [wMapMusic], a @@ -610,7 +610,7 @@ Function17d370: ld bc, 1 tiles call CopyBytes ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld hl, PokemonNewsGFX ld de, vTiles1 ld bc, $48 tiles @@ -624,7 +624,7 @@ Function17d370: ld bc, 1 tiles call CopyBytes xor a - ld [rVBK], a + ldh [rVBK], a ld hl, GFX_17eb7e ld de, vTiles2 tile $60 ld bc, 1 tiles @@ -657,7 +657,7 @@ Function17d405: ld bc, 1 tiles call CopyBytes ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld hl, PokemonNewsGFX ld de, vTiles1 ld bc, $48 tiles @@ -671,19 +671,19 @@ Function17d405: ld bc, 1 tiles call CopyBytes xor a - ld [rVBK], a + ldh [rVBK], a call EnableLCD - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, Palette_17eff6 ld de, wBGPals1 ld bc, 8 palettes call CopyBytes call SetPalettes pop af - ld [rSVBK], a + ldh [rSVBK], a ret Function17d45a: @@ -900,7 +900,7 @@ Function17d5be: call Function17e438 Function17d5c4: - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and a ret z ld c, 0 @@ -937,13 +937,13 @@ Function17d5c4: Function17d5f6: ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wc608 ld de, wBGPals1 ld bc, 8 palettes call CopyBytes ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a ret Function17d60b: @@ -1325,7 +1325,7 @@ Function17d85d: cp $c0 jr c, .asm_17d89b ld a, [wcd4f] - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17d8a1 .asm_17d89b @@ -1353,7 +1353,7 @@ Function17d85d: cp $c0 jr c, .asm_17d8c2 ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17d878 .asm_17d8c2 @@ -1364,13 +1364,13 @@ Function17d85d: call HlToCrashCheckPointer push bc ld a, $3 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wc608 ld de, wBGPals1 ld b, $0 call CopyBytes ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a call Function17e32b pop bc ld a, c @@ -1431,10 +1431,10 @@ Function17d93a: call CopyBytes call HlToCrashCheckPointer call Function17e32b - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wc70c] call Function17e6de ld a, [wc70a] @@ -1455,7 +1455,7 @@ Function17d93a: ld d, h farcall HOF_AnimateFrontpic pop af - ld [rSVBK], a + ldh [rSVBK], a call Function17e349 ret @@ -1466,10 +1466,10 @@ Function17d98b: call CopyBytes call HlToCrashCheckPointer call Function17e32b - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wc70b] call Function17e6de ld a, [wc70a] @@ -1491,7 +1491,7 @@ Function17d98b: ld bc, $707 predef PlaceGraphic pop af - ld [rSVBK], a + ldh [rSVBK], a call Function17e349 ret @@ -1506,7 +1506,7 @@ Function17d9e3: cp $c0 jr c, .asm_17da01 ld a, [wc70c] - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17da07 .asm_17da01 @@ -1531,7 +1531,7 @@ Function17d9e3: cp $c0 jr c, .asm_17da2d ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17da30 .asm_17da2d @@ -1551,7 +1551,7 @@ Function17da31: cp $c0 jr c, .asm_17da4f ld a, [wc70a] - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17da55 .asm_17da4f @@ -1591,7 +1591,7 @@ Function17da31: cp $c0 jr c, .asm_17da88 ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17da8b .asm_17da88 @@ -1828,10 +1828,10 @@ Function17dc1f: ld bc, $6 call CopyBytes call Function17e32b - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wc688 ld a, $40 ld [wc708], a @@ -1859,7 +1859,7 @@ Function17dc1f: .asm_17dc6e call CloseWindow pop af - ld [rSVBK], a + ldh [rSVBK], a ld a, [wMenuCursorY] cp $1 jr nz, .asm_17dc85 @@ -1900,7 +1900,7 @@ Function17dca9: Function17dcaf: ld a, $5 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wBGPals1 ld de, 1 palettes ld c, 8 @@ -1916,7 +1916,7 @@ Function17dcaf: jr nz, .asm_17dcbb call RotateThreePalettesRight ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a ret Function17dccf: @@ -2016,7 +2016,7 @@ Function17dd49: cp $c0 jr c, .sram ld a, [wc708] - ld [rSVBK], a + ldh [rSVBK], a jr .got_bank .sram @@ -2037,7 +2037,7 @@ Function17dd49: cp $c0 jr c, .close_sram ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a jr .exited_bank .close_sram @@ -2092,7 +2092,7 @@ Function17ddcd: cp $c0 jr c, .asm_17dde7 ld a, [wc708] - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17dded .asm_17dde7 @@ -2113,7 +2113,7 @@ Function17ddcd: cp $c0 jr c, .asm_17de0c ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17de0f .asm_17de0c @@ -2250,10 +2250,10 @@ Function17ded9: ld bc, $1f call CopyBytes call Function17e32b - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wc708 ld a, [hli] ld [wCurPartySpecies], a @@ -2576,7 +2576,7 @@ asm_17e0ee ld h, [hl] ld l, a pop af - ld [rSVBK], a + ldh [rSVBK], a push hl call Function17e349 pop hl @@ -2588,10 +2588,10 @@ Function17e0fd: ld de, wc708 ld bc, $6 call CopyBytes - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wc708 ld a, [hli] ld [wCurItem], a @@ -2612,7 +2612,7 @@ Function17e0fd: ld h, a ld l, b pop af - ld [rSVBK], a + ldh [rSVBK], a call Function17e40f ret @@ -2621,10 +2621,10 @@ Function17e133: ld de, wc708 ld bc, $5 call CopyBytes - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wc708 ld a, [hli] ld [wScriptVar], a @@ -2642,7 +2642,7 @@ Function17e133: ld h, a ld l, b pop af - ld [rSVBK], a + ldh [rSVBK], a call Function17e40f ret @@ -2651,10 +2651,10 @@ Function17e165: ld de, wc708 ld bc, $5 call CopyBytes - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wc708 ld a, [hli] ld [wCurItem], a @@ -2678,7 +2678,7 @@ Function17e165: ld h, a ld l, b pop af - ld [rSVBK], a + ldh [rSVBK], a call Function17e40f ret @@ -2691,7 +2691,7 @@ Function17e1a1: cp $c0 jr c, .asm_17e1bb ld a, [wc708] - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17e1c1 .asm_17e1bb @@ -2712,7 +2712,7 @@ Function17e1a1: cp $c0 jr c, .asm_17e1e2 ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17e1e5 .asm_17e1e2 @@ -2723,7 +2723,7 @@ Function17e1a1: cp $c0 jr c, .asm_17e1f3 ld a, [wc70c] - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17e1f9 .asm_17e1f3 @@ -2744,7 +2744,7 @@ Function17e1a1: cp $c0 jr c, .asm_17e21a ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17e21d .asm_17e21a @@ -2953,16 +2953,16 @@ Function17e349: inc_crash_check_pointer_farcall: MACRO call IncCrashCheckPointer call HlToCrashCheckPointer ; redundant - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a rept _NARG farcall \1 shift endr pop af - ld [rSVBK], a + ldh [rSVBK], a ret ENDM @@ -2987,7 +2987,7 @@ Function17e3e0: ld c, a call HlToCrashCheckPointer ld a, $1 - ld [hBGMapMode], a + ldh [hBGMapMode], a call DelayFrames ret @@ -3901,7 +3901,7 @@ Function17f1d0: add hl, de ld a, [hl] ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld [wNamedObjectIndexBuffer], a call GetPokemonName pop hl @@ -3911,7 +3911,7 @@ Function17f1d0: ld a, b ld [wcd53], a ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wcd54] call Function17f50f pop de @@ -4020,7 +4020,7 @@ Function17f27b: add hl, de ld a, [hl] ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld [wNamedObjectIndexBuffer], a call GetItemName pop hl @@ -4030,7 +4030,7 @@ Function17f27b: ld a, b ld [wcd53], a ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a ld a, [wcd54] call Function17f50f pop de @@ -4077,13 +4077,13 @@ Function17f2ff: push hl push bc ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld hl, wPlayerName ld de, wc608 ld bc, $6 call CopyBytes ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a pop hl ld de, wc608 call PlaceString @@ -4325,7 +4325,7 @@ Function17f44f: cp $c0 jr c, .asm_17f488 ld a, [wcd54] - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17f48e .asm_17f488 @@ -4346,7 +4346,7 @@ Function17f44f: cp $c0 jr c, .asm_17f4af ld a, $4 - ld [rSVBK], a + ldh [rSVBK], a jr .asm_17f4b7 .asm_17f4af @@ -4461,15 +4461,15 @@ BattleTowerMobileError: call FadeToMenu xor a ld [wc303], a - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a call DisplayMobileError pop af - ld [rSVBK], a + ldh [rSVBK], a call ExitAllMenus ret @@ -5087,7 +5087,7 @@ String_17fedf: db "@" Function17ff23: - ld a, [hJoyPressed] + ldh a, [hJoyPressed] and a ret z ld a, $8 diff --git a/mobile/print_opp_message.asm b/mobile/print_opp_message.asm index 9c94297a8..fc9d7d9c7 100644 --- a/mobile/print_opp_message.asm +++ b/mobile/print_opp_message.asm @@ -13,17 +13,17 @@ Mobile_PrintOpponentBattleMessage: ld a, BANK(w5_MobileOpponentBattleMessages) call FarCopyWRAM - ld a, [rSVBK] + ldh a, [rSVBK] push af ld a, $1 - ld [rSVBK], a + ldh [rSVBK], a ld bc, wMobileOpponentBattleMessage decoord 1, 14 farcall PrintEZChatBattleMessage pop af - ld [rSVBK], a + ldh [rSVBK], a ld c, 180 call DelayFrames |