Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update hardware.inc to 5.1.0

Browse Source
This commit is contained in:
Rangi42
2025-06-29 15:53:34 -04:00
committed by Rangi
parent 8f5a8c5b5b
commit 5abf8d01fb
84 changed files with 845 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
home/audio.asm
View File

@@ -10,13 +10,13 @@ InitSound::
push af
ld a, BANK(_InitSound)
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
call _InitSound
pop af
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
pop af
pop bc
@@ -34,13 +34,13 @@ UpdateSound::
push af
ld a, BANK(_UpdateSound)
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
call _UpdateSound
pop af
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
pop af
pop bc
@@ -51,14 +51,14 @@ UpdateSound::
_LoadMusicByte::
; [wCurMusicByte] = [a:de]
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
ld a, [de]
ld [wCurMusicByte], a
ld a, BANK(LoadMusicByte)
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
ret
PlayMusic::
@@ -73,7 +73,7 @@ PlayMusic::
push af
ld a, BANK(_PlayMusic) ; aka BANK(_InitSound)
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
ld a, e
and a
@@ -88,7 +88,7 @@ PlayMusic::
.end
pop af
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
pop af
pop bc
pop de
@@ -107,7 +107,7 @@ PlayMusic2::
push af
ld a, BANK(_PlayMusic)
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
push de
ld de, MUSIC_NONE
@@ -118,7 +118,7 @@ PlayMusic2::
pop af
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
pop af
pop bc
@@ -140,7 +140,7 @@ PlayCry::
; Cries are stuck in one bank.
ld a, BANK(PokemonCries)
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
ld hl, PokemonCries
rept MON_CRY_LENGTH
@@ -163,13 +163,13 @@ endr
ld a, BANK(_PlayCry)
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
call _PlayCry
pop af
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
pop af
pop bc
@@ -200,7 +200,7 @@ PlaySFX::
push af
ld a, BANK(_PlaySFX)
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
ld a, e
ld [wCurSFX], a
@@ -208,7 +208,7 @@ PlaySFX::
pop af
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
.done
pop af

4
home/battle.asm
View File

@@ -163,7 +163,7 @@ FarCopyRadioText::
ld d, a
ld a, [hli]
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
ld a, e
ld l, a
ld a, d
@@ -173,7 +173,7 @@ FarCopyRadioText::
call CopyBytes
pop af
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
ret
MobileTextBorder::

2
home/flag.asm
View File

@@ -110,7 +110,7 @@ CheckBPressedDebug:: ; unreferenced
ret z
ldh a, [hJoyDown]
bit B_BUTTON_F, a
bit B_PAD_B, a
ret
xor_a::

2
home/header.asm
View File

@@ -11,7 +11,7 @@ FarCall::
SECTION "rst10", ROM0[$0010]
Bankswitch::
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
ret
SECTION "rst18", ROM0[$0018]

16
home/joypad.asm
View File

@@ -97,8 +97,8 @@ endr
; Now that we have the input, we can do stuff with it.
; For example, soft reset:
and A_BUTTON | B_BUTTON | SELECT | START
cp A_BUTTON | B_BUTTON | SELECT | START
and PAD_A | PAD_B | PAD_SELECT | PAD_START
cp PAD_A | PAD_B | PAD_SELECT | PAD_START
jp z, Reset
ret
@@ -271,12 +271,12 @@ JoyTitleScreenInput:: ; unreferenced
; Save data can be deleted by pressing Up + B + Select.
ldh a, [hJoyDown]
cp D_UP | SELECT | B_BUTTON
cp PAD_UP | PAD_SELECT | PAD_B
jr z, .keycombo
; Press Start or A to start the game.
ldh a, [hJoyLast]
and START | A_BUTTON
and PAD_START | PAD_A
jr nz, .keycombo
dec c
@@ -294,7 +294,7 @@ JoyWaitAorB::
call DelayFrame
call GetJoypad
ldh a, [hJoyPressed]
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
ret nz
call UpdateTimeAndPals
jr .loop
@@ -363,7 +363,7 @@ WaitPressAorB_BlinkCursor::
call JoyTextDelay
ldh a, [hJoyLast]
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
jr z, .loop
pop af
@@ -376,7 +376,7 @@ SimpleWaitPressAorB::
.loop
call JoyTextDelay
ldh a, [hJoyLast]
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
jr z, .loop
ret
@@ -412,7 +412,7 @@ PromptButton::
call .blink_cursor
call JoyTextDelay
ldh a, [hJoyPressed]
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
jr nz, .received_input
call UpdateTimeAndPals
ld a, $1

32
home/menu.asm
View File

@@ -36,10 +36,10 @@ GetMenuJoypad::
push bc
push af
ldh a, [hJoyLast]
and D_PAD
and PAD_CTRL_PAD
ld b, a
ldh a, [hJoyPressed]
and BUTTONS
and PAD_BUTTONS
or b
ld b, a
pop af
@@ -379,7 +379,7 @@ VerticalMenu::
call InitVerticalMenuCursor
call StaticMenuJoypad
call MenuClickSound
bit B_BUTTON_F, a
bit B_PAD_B, a
jr z, .okay
.cancel
scf
@@ -623,14 +623,14 @@ InitMenuCursorAndButtonPermissions::
ld a, [wMenuDataFlags]
bit STATICMENU_ENABLE_START_F, a
jr z, .disallow_start
set START_F, [hl]
set B_PAD_START, [hl]
.disallow_start
ld a, [wMenuDataFlags]
bit STATICMENU_ENABLE_LEFT_RIGHT_F, a
jr z, .disallow_left_right
set D_LEFT_F, [hl]
set D_RIGHT_F, [hl]
set B_PAD_LEFT, [hl]
set B_PAD_RIGHT, [hl]
.disallow_left_right
ret
@@ -647,32 +647,32 @@ GetStaticMenuJoypad::
call StaticMenuJoypad
ContinueGettingMenuJoypad:
bit A_BUTTON_F, a
bit B_PAD_A, a
jr nz, .a_button
bit B_BUTTON_F, a
bit B_PAD_B, a
jr nz, .b_start
bit START_F, a
bit B_PAD_START, a
jr nz, .b_start
bit D_RIGHT_F, a
bit B_PAD_RIGHT, a
jr nz, .d_right
bit D_LEFT_F, a
bit B_PAD_LEFT, a
jr nz, .d_left
xor a
ld [wMenuJoypad], a
jr .done
.d_right
ld a, D_RIGHT
ld a, PAD_RIGHT
ld [wMenuJoypad], a
jr .done
.d_left
ld a, D_LEFT
ld a, PAD_LEFT
ld [wMenuJoypad], a
jr .done
.a_button
ld a, A_BUTTON
ld a, PAD_A
ld [wMenuJoypad], a
.done
@@ -689,7 +689,7 @@ ContinueGettingMenuJoypad:
ret
.b_start
ld a, B_BUTTON
ld a, PAD_B
ld [wMenuJoypad], a
ld a, -1
ld [wMenuSelection], a
@@ -792,7 +792,7 @@ ClearWindowData::
MenuClickSound::
push af
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
jr z, .nosound
ld hl, wMenuFlags
bit MENU_NO_CLICK_SFX_F, [hl]

4
home/print_text.asm
View File

@@ -56,11 +56,11 @@ PrintLetterDelay::
; Wait one frame if holding A or B.
ldh a, [hJoyDown]
bit A_BUTTON_F, a
bit B_PAD_A, a
jr z, .checkb
jr .delay
.checkb
bit B_BUTTON_F, a
bit B_PAD_B, a
jr z, .wait
.delay

4
home/scrolling_menu.asm
View File

@@ -52,10 +52,10 @@ JoyTextDelay_ForcehJoyDown::
ldh [hInMenu], a
ldh a, [hJoyLast]
and D_RIGHT + D_LEFT + D_UP + D_DOWN
and PAD_RIGHT + PAD_LEFT + PAD_UP + PAD_DOWN
ld c, a
ldh a, [hJoyPressed]
and A_BUTTON + B_BUTTON + SELECT + START
and PAD_A + PAD_B + PAD_SELECT + PAD_START
or c
ld c, a
ret

8
home/text.asm
View File

@@ -760,7 +760,7 @@ TextCommand_FAR::
ld a, [hli]
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
push hl
ld h, d
@@ -770,7 +770,7 @@ TextCommand_FAR::
pop af
ldh [hROMBank], a
ld [rROMB0], a
ld [rROMB], a
ret
TextCommand_BCD::
@@ -891,7 +891,7 @@ TextCommand_PAUSE::
push bc
call GetJoypad
ldh a, [hJoyDown]
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
jr nz, .done
ld c, 30
call DelayFrames
@@ -968,7 +968,7 @@ TextCommand_DOTS::
ld [hli], a
call GetJoypad
ldh a, [hJoyDown]
and A_BUTTON | B_BUTTON
and PAD_A | PAD_B
jr nz, .next
ld c, 10
call DelayFrames