From 6f0b81504d6471afe7df6adae83791cc81933ca6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 16:04:21 +0100 Subject: More unreferenced labels cleanup --- engine/intro_menu.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 7d17b62e5..d51e32a54 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -10,7 +10,7 @@ _MainMenu: ; 5ae8 jp StartTitleScreen ; 5b04 -; unreferenced +; unused ret ; 5b05 @@ -827,7 +827,7 @@ NamePlayer: ; 0x6074 db "KRIS@@@@@@@" ; 60e9 -Function60e9: ; Unreferenced +Unreferenced_Function60e9: call LoadMenuDataHeader call VerticalMenu ld a, [wMenuCursorY] @@ -1094,7 +1094,7 @@ RunTitleScreen: ; 627b ret ; 6292 -Function6292: ; 6292 ; unreferenced +Unreferenced_Function6292: ; 6292 ld a, [hVBlankCounter] and $7 ret nz @@ -1125,7 +1125,7 @@ TitleScreenScene: ; 62a3 dw TitleScreenEnd ; 62b7 -.NextScene: ; Unreferenced +.Unreferenced_NextScene: ld hl, wJumptableIndex inc [hl] ret @@ -1329,7 +1329,7 @@ ResetClock: ; 6392 jp Init ; 639b -Function639b: ; unreferenced +Unreferenced_Function639b: ; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here. ld a, [wTitleScreenTimer] and $3 -- cgit v1.2.3 From f1ea15bbfe8528143ace793b050891a9b1f99d03 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 17:13:57 +0100 Subject: Consolidate Special function names --- engine/intro_menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index d51e32a54..a3efd8afe 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1048,7 +1048,7 @@ StartTitleScreen: ; 6219 ld [hWY], a ld b, SCGB_DIPLOMA call GetSGBLayout - call UpdateTimePals + call Special_UpdateTimePals ld a, [wIntroSceneFrameCounter] cp $5 jr c, .ok -- cgit v1.2.3 From d7970f749ac23786728926109be430ab732f19e6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 18:49:25 +0100 Subject: Consistent predef function names --- engine/intro_menu.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index a3efd8afe..da2d4b800 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -943,24 +943,24 @@ Intro_WipeInFrontpic: ; 6182 Intro_PrepTrainerPic: ; 619c ld de, vTiles2 - farcall GetTrainerPic + farcall Predef_GetTrainerPic xor a ld [hGraphicStartTile], a hlcoord 6, 4 lb bc, 7, 7 - predef PlaceGraphic + predef Predef_PlaceGraphic ret ; 61b4 ShrinkFrame: ; 61b4 ld de, vTiles2 ld c, $31 - predef DecompressPredef + predef Predef_Decompress xor a ld [hGraphicStartTile], a hlcoord 6, 4 lb bc, 7, 7 - predef PlaceGraphic + predef Predef_PlaceGraphic ret ; 61cd @@ -1048,7 +1048,7 @@ StartTitleScreen: ; 6219 ld [hWY], a ld b, SCGB_DIPLOMA call GetSGBLayout - call Special_UpdateTimePals + call UpdateTimePals ld a, [wIntroSceneFrameCounter] cp $5 jr c, .ok -- cgit v1.2.3 From 9d0ba6bfd3b2f10fae9969a784aa7b2b573e8411 Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Wed, 3 Jan 2018 19:12:45 -0500 Subject: Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). --- engine/intro_menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 7d17b62e5..441119342 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1019,7 +1019,7 @@ CrystalIntroSequence: ; 620b StartTitleScreen: ; 6219 ld a, [rSVBK] push af - ld a, $5 + ld a, BANK(wBGPals1) ld [rSVBK], a call .TitleScreen -- cgit v1.2.3 From a8cf8979d9acf66d1bdf4ea115ab6a0faa8f9d34 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 17:20:47 -0500 Subject: Do a little cleanup towards issue #465 --- engine/intro_menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 7d17b62e5..3a93a9b84 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -853,7 +853,7 @@ ShrinkPlayer: ; 610f ld a, [hROMBank] push af - ld a, 0 << 7 | 32 ; fade out + ld a, 32 ; fade time ld [MusicFade], a ld de, MUSIC_NONE ld a, e -- cgit v1.2.3 From 417937cffc2a7c3cfac49f3b00caf1a856d0a925 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 10 Jan 2018 13:47:57 -0500 Subject: Resolve #461 --- engine/intro_menu.asm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 3a93a9b84..8d482f53e 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -971,7 +971,7 @@ Intro_PlacePlayerSprite: ; 61cd ld hl, vTiles0 call Request2bpp - ld hl, Sprites + ld hl, Sprite01 ld de, .sprites ld a, [de] inc de @@ -980,19 +980,19 @@ Intro_PlacePlayerSprite: ; 61cd .loop ld a, [de] inc de - ld [hli], a + ld [hli], a ; y ld a, [de] inc de - ld [hli], a + ld [hli], a ; x ld a, [de] inc de - ld [hli], a + ld [hli], a ; tile id - ld b, 0 + ld b, PAL_OW_RED ld a, [wPlayerGender] bit 0, a jr z, .male - ld b, 1 + ld b, PAL_OW_BLUE .male ld a, b @@ -1004,6 +1004,7 @@ Intro_PlacePlayerSprite: ; 61cd .sprites ; 61fe db 4 + ; y pxl, x pxl, tile offset db 9 * 8 + 4, 9 * 8, 0 db 9 * 8 + 4, 10 * 8, 1 db 10 * 8 + 4, 9 * 8, 2 -- cgit v1.2.3 From 94d6a327218fc56753238b424df208245092d96c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 12:00:01 -0500 Subject: Use maskbits some more --- engine/intro_menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 8d482f53e..08e004e1b 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1333,7 +1333,7 @@ ResetClock: ; 6392 Function639b: ; unreferenced ; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here. ld a, [wTitleScreenTimer] - and $3 + and %00000011 ret nz ld bc, SpriteAnim10 ld hl, SPRITEANIMSTRUCT_FRAME -- cgit v1.2.3 From 2ab60fa8a49dfe9e20ebb620471ba4c2ca64a4aa Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 13 Jan 2018 16:38:14 -0500 Subject: menu_coords macro for (x1, y1, x2, y2) order (see issue #440) --- engine/intro_menu.asm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 08e004e1b..31e19778c 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -554,8 +554,7 @@ Continue_LoadMenuHeader: ; 5ebf .MenuDataHeader_Dex: ; 5ed9 db $40 ; flags - db 00, 00 ; start coords - db 09, 15 ; end coords + menu_coords 0, 0, 15, 9 dw .MenuData2_Dex db 1 ; default option ; 5ee1 @@ -571,8 +570,7 @@ Continue_LoadMenuHeader: ; 5ebf .MenuDataHeader_NoDex: ; 5efb db $40 ; flags - db 00, 00 ; start coords - db 09, 15 ; end coords + menu_coords 0, 0, 15, 9 dw .MenuData2_NoDex db 1 ; default option ; 5f03 -- cgit v1.2.3 From 11d67567d2c0182864a755a7bebcff0f29e877d6 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sun, 14 Jan 2018 11:59:56 +0100 Subject: Use constants for menu flags Added a bunch of constants for the bitflags of each kind of menu. Some are slightly vague or too long, but I'm not sure how to else name them. --- engine/intro_menu.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 7d17b62e5..a91327b1c 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -553,7 +553,7 @@ Continue_LoadMenuHeader: ; 5ebf ; 5ed9 .MenuDataHeader_Dex: ; 5ed9 - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 09, 15 ; end coords dw .MenuData2_Dex @@ -561,7 +561,7 @@ Continue_LoadMenuHeader: ; 5ebf ; 5ee1 .MenuData2_Dex: ; 5ee1 - db $00 ; flags + db 0 ; flags db 4 ; items db "PLAYER@" db "BADGES@" @@ -570,7 +570,7 @@ Continue_LoadMenuHeader: ; 5ebf ; 5efb .MenuDataHeader_NoDex: ; 5efb - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 00, 00 ; start coords db 09, 15 ; end coords dw .MenuData2_NoDex @@ -578,7 +578,7 @@ Continue_LoadMenuHeader: ; 5ebf ; 5f03 .MenuData2_NoDex: ; 5f03 - db $00 ; flags + db 0 ; flags db 4 ; items db "PLAYER @" db "BADGES@" -- cgit v1.2.3 From 7a09fc9f750aec50dd568226083b279004ffe155 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 14 Jan 2018 19:43:35 -0500 Subject: GFX tile sizes in decimal --- engine/intro_menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 31e19778c..b92ddc22e 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1376,7 +1376,7 @@ Copyright: ; 63e2 call LoadFontsExtra ld de, CopyrightGFX ld hl, vTiles2 tile $60 - lb bc, BANK(CopyrightGFX), $1d + lb bc, BANK(CopyrightGFX), 29 call Request2bpp hlcoord 2, 7 ld de, CopyrightString -- cgit v1.2.3 From 80480821142d7a7b16dd2b1a98a213e7b389af0f Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 14:30:10 -0500 Subject: Remove Predef_ prefix from routines listed in PredefPointers --- engine/intro_menu.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index fa9cd1a92..57d6eb6ce 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -941,24 +941,24 @@ Intro_WipeInFrontpic: ; 6182 Intro_PrepTrainerPic: ; 619c ld de, vTiles2 - farcall Predef_GetTrainerPic + farcall GetTrainerPic xor a ld [hGraphicStartTile], a hlcoord 6, 4 lb bc, 7, 7 - predef Predef_PlaceGraphic + predef PlaceGraphic ret ; 61b4 ShrinkFrame: ; 61b4 ld de, vTiles2 - ld c, $31 - predef Predef_Decompress + ld c, 7 * 7 + predef DecompressGet2bpp xor a ld [hGraphicStartTile], a hlcoord 6, 4 lb bc, 7, 7 - predef Predef_PlaceGraphic + predef PlaceGraphic ret ; 61cd -- cgit v1.2.3 From bf074f359886707d2ffb2e0b525b03dc7af0fe29 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 22:57:19 -0500 Subject: =?UTF-8?q?map=5Fheader=20=E2=86=92=20map=5Fdef;=20map=5Fheader=5F?= =?UTF-8?q?2=20=E2=86=92=20map=5Fdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/intro_menu.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 57d6eb6ce..15c2a4cbb 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -542,10 +542,10 @@ Continue_LoadMenuHeader: ; 5ebf ld hl, .MenuDataHeader_Dex ld a, [wStatusFlags] bit 0, a ; pokedex - jr nz, .pokedex_header + jr nz, .show_menu ld hl, .MenuDataHeader_NoDex -.pokedex_header +.show_menu call _OffsetMenuDataHeader call MenuBox call PlaceVerticalMenuItems -- cgit v1.2.3 From 6d20cf3e80780af15ed15acea2f7feac1ffd9705 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 23:47:45 -0500 Subject: =?UTF-8?q?"CryHeader"=20=E2=86=92=20"Cry";=20"Cry"=20=E2=86=92=20?= =?UTF-8?q?"MonCry"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/intro_menu.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/intro_menu.asm') diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 15c2a4cbb..a26ac1f81 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -754,7 +754,7 @@ OakText2: ; 0x604a text_jump _OakText2 start_asm ld a, WOOPER - call PlayCry + call PlayMonCry call WaitSFX ld hl, OakText3 ret -- cgit v1.2.3