pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #450 from roukaour/master

Browse Source 
Constants for TextBoxFlags
This commit is contained in:
yenatch
2017-12-30 21:32:45 -05:00
committed by GitHub
parent 93916b5536 b40181db41
commit 92fba8821c
12 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/events.asm
View File

@@ -875,10 +875,10 @@ CheckMenuOW: ; 96b30
ld [hMenuReturn + 1], a
ld a, [hJoyPressed]
bit 2, a ; SELECT
bit SELECT_F, a
jr nz, .Select
bit 3, a ; START
bit START_F, a
jr z, .NoMenu
ld a, BANK(StartMenuScript)

6
engine/events/magnet_train.asm
View File

@@ -262,19 +262,19 @@ SetMagnetTrainPals: ; 8cdc3
; bushes
hlbgcoord 0, 0
ld bc, 4 bgrows
ld bc, 4 * BG_MAP_WIDTH
ld a, $2
call ByteFill
; train
hlbgcoord 0, 4
ld bc, 10 bgrows
ld bc, 10 * BG_MAP_WIDTH
xor a
call ByteFill
; more bushes
hlbgcoord 0, 14
ld bc, 4 bgrows
ld bc, 4 * BG_MAP_WIDTH
ld a, $2
call ByteFill

4
engine/mon_menu.asm
View File

@@ -89,9 +89,9 @@ MonMenuLoop: ; 24d59
ld de, SFX_READ_TEXT_2
call PlaySFX
ld a, [hJoyPressed]
bit 0, a ; A
bit A_BUTTON_F, a
jr nz, .select
bit 1, a ; B
bit B_BUTTON_F, a
jr nz, .cancel
jr .loop

16
engine/scrolling_menu.asm
View File

@@ -65,21 +65,21 @@ ScrollingMenuJoyAction: ; 24609
ld a, [hJoyPressed]
and BUTTONS
or b
bit 0, a ; A
bit A_BUTTON_F, a
jp nz, .a_button
bit 1, a ; B
bit B_BUTTON_F, a
jp nz, .b_button
bit 2, a ; Select
bit SELECT_F, a
jp nz, .select
bit 3, a ; Start
bit START_F, a
jp nz, .start
bit 4, a ; Right
bit D_RIGHT_F, a
jp nz, .d_right
bit 5, a ; Left
bit D_LEFT_F, a
jp nz, .d_left
bit 6, a ; Up
bit D_UP_F, a
jp nz, .d_up
bit 7, a ; Down
bit D_DOWN_F, a
jp nz, .d_down
jr .loop
; 24640

18
engine/title.asm
View File

@@ -32,7 +32,7 @@ _TitleScreen: ; 10ed67
; Clear screen palettes
hlbgcoord 0, 0
ld bc, 20 bgrows
ld bc, 20 * BG_MAP_WIDTH
xor a
call ByteFill
@@ -43,7 +43,7 @@ _TitleScreen: ; 10ed67
; line 0 (copyright)
hlbgcoord 0, 0, vBGMap1
ld bc, 1 bgrows
ld bc, BG_MAP_WIDTH
ld a, 7 ; palette
call ByteFill
@@ -54,27 +54,27 @@ _TitleScreen: ; 10ed67
; lines 3-4
hlbgcoord 0, 3
ld bc, 2 bgrows
ld bc, 2 * BG_MAP_WIDTH
ld a, 2
call ByteFill
; line 5
hlbgcoord 0, 5
ld bc, 1 bgrows
ld bc, BG_MAP_WIDTH
ld a, 3
call ByteFill
; line 6
hlbgcoord 0, 6
ld bc, 1 bgrows
ld bc, BG_MAP_WIDTH
ld a, 4
call ByteFill
; line 7
hlbgcoord 0, 7
ld bc, 1 bgrows
ld bc, BG_MAP_WIDTH
ld a, 5
call ByteFill
; lines 8-9
hlbgcoord 0, 8
ld bc, 2 bgrows
ld bc, 2 * BG_MAP_WIDTH
ld a, 6
call ByteFill
@@ -87,7 +87,7 @@ _TitleScreen: ; 10ed67
; Suicune gfx
hlbgcoord 0, 12
ld bc, 6 bgrows ; the rest of the screen
ld bc, 6 * BG_MAP_WIDTH ; the rest of the screen
ld a, 0 | VRAM_BANK_1
call ByteFill
@@ -110,7 +110,7 @@ _TitleScreen: ; 10ed67
; Clear screen tiles
hlbgcoord 0, 0
ld bc, 64 bgrows
ld bc, 64 * BG_MAP_WIDTH
ld a, " "
call ByteFill