From 248763b238b6f8e8cb0bc0c5db05a270f1931ae7 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Wed, 27 May 2020 16:59:14 +0200 Subject: Prevent OaksPKMNTalk from looping forever if NUM_GRASSMON is changed That should cause no real problems because of a range check right after it. --- engine/pokegear/radio.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine') diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index c5961bea8..c4ca19255 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -246,7 +246,7 @@ endr .loop3 ; Choose one of the middle three Pokemon. call Random - and NUM_GRASSMON + maskbits NUM_GRASSMON cp 2 jr c, .loop3 cp 5 -- cgit v1.2.3 From 79bb2784e92de0524c69c87556f7647861c47fb8 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sat, 20 Jun 2020 17:56:18 +0200 Subject: Better label 2D menu data --- engine/items/item_effects.asm | 2 +- engine/pokemon/mon_menu.asm | 32 ++++++++++++++++---------------- engine/pokemon/party_menu.asm | 28 ++++++++++------------------ 3 files changed, 27 insertions(+), 35 deletions(-) (limited to 'engine') diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 4de0fc3bc..36bdd8a8d 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1141,7 +1141,7 @@ EvoStoneEffect: cp EVERSTONE jr z, .NoEffect - ld a, $1 + ld a, TRUE ld [wForceEvolution], a farcall EvolvePokemon diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index c8d35a59f..fd51ae928 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -811,8 +811,8 @@ ChooseMoveToDelete: .ChooseMoveToDelete call SetUpMoveScreenBG - ld de, DeleteMoveScreenAttrs - call SetMenuAttributes + ld de, DeleteMoveScreen2DMenuData + call Load2DMenuData call SetUpMoveList ld hl, w2DMenuFlags1 set 6, [hl] @@ -848,12 +848,12 @@ ChooseMoveToDelete: pop af ret -DeleteMoveScreenAttrs: - db 3, 1 - db 3, 1 - db $40, $00 - dn 2, 0 - db D_UP | D_DOWN | A_BUTTON | B_BUTTON +DeleteMoveScreen2DMenuData: + db 3, 1 ; cursor start y, x + db 3, 1 ; rows, columns + db $40, $00 ; flags + dn 2, 0 ; cursor offset + db D_UP | D_DOWN | A_BUTTON | B_BUTTON ; accepted buttons ManagePokemonMoves: ld a, [wCurPartySpecies] @@ -878,8 +878,8 @@ MoveScreenLoop: ld [wPartyMenuCursor], a call SetUpMoveScreenBG call PlaceMoveScreenArrows - ld de, MoveScreenAttributes - call SetMenuAttributes + ld de, MoveScreen2DMenuData + call Load2DMenuData .loop call SetUpMoveList ld hl, w2DMenuFlags1 @@ -1077,12 +1077,12 @@ MoveScreenLoop: call ClearSprites jp ClearTilemap -MoveScreenAttributes: - db 3, 1 - db 3, 1 - db $40, $00 - dn 2, 0 - db D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON +MoveScreen2DMenuData: + db 3, 1 ; cursor start y, x + db 3, 1 ; rows, columns + db $40, $00 ; flags + dn 2, 0 ; cursor offsets + db D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON ; accepted buttons String_MoveWhere: db "Where?@" diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index c9f4dde31..fe470ed96 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -612,8 +612,8 @@ InitPartyMenuWithCancel: ; with cancel xor a ld [wSwitchMon], a - ld de, PartyMenuAttributes - call SetMenuAttributes + ld de, PartyMenu2DMenuData + call Load2DMenuData ld a, [wPartyCount] inc a ld [w2DMenuNumRows], a ; list length @@ -637,8 +637,8 @@ InitPartyMenuWithCancel: InitPartyMenuNoCancel: ; no cancel - ld de, PartyMenuAttributes - call SetMenuAttributes + ld de, PartyMenu2DMenuData + call Load2DMenuData ld a, [wPartyCount] ld [w2DMenuNumRows], a ; list length ld b, a @@ -656,20 +656,12 @@ InitPartyMenuNoCancel: ld [wMenuJoypadFilter], a ret -PartyMenuAttributes: -; cursor y -; cursor x -; num rows -; num cols -; bit 6: animate sprites bit 5: wrap around -; ? -; distance between items (hi: y, lo: x) -; allowed buttons (mask) - db 1, 0 - db 0, 1 - db $60, $00 - dn 2, 0 - db 0 +PartyMenu2DMenuData: + db 1, 0 ; cursor start y, x + db 0, 1 ; rows, columns + db $60, $00 ; flags + dn 2, 0 ; cursor offset + db 0 ; accepted buttons PartyMenuSelect: ; sets carry if exitted menu. -- cgit v1.2.3 From 58b45443e8fa22d027d14e6c991da9ee4c30d3f3 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 3 Aug 2020 22:55:50 +0200 Subject: Minor title screen fixes --- engine/menus/intro_menu.asm | 2 +- engine/movie/title.asm | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'engine') diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 31809be46..be0e3a188 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -969,7 +969,7 @@ IntroSequence: StartTitleScreen: ldh a, [rSVBK] push af - ld a, BANK(wBGPals1) + ld a, BANK(wLYOverrides) ldh [rSVBK], a call .TitleScreen diff --git a/engine/movie/title.asm b/engine/movie/title.asm index dce02804f..c478c572a 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -74,7 +74,7 @@ _TitleScreen: ; 'CRYSTAL VERSION' hlbgcoord 5, 9 - ld bc, NAME_LENGTH ; length of version text + ld bc, 11 ; length of version text ld a, 1 call ByteFill @@ -85,7 +85,7 @@ _TitleScreen: call ByteFill ; Back to VRAM bank 0 - ld a, $0 + ld a, 0 ldh [rVBK], a ; Decompress logo @@ -108,14 +108,14 @@ _TitleScreen: hlcoord 0, 3 lb bc, 7, 20 ld d, $80 - ld e, $14 + ld e, 20 call DrawTitleGraphic ; Draw copyright text hlbgcoord 3, 0, vBGMap1 lb bc, 1, 13 ld d, $c - ld e, $10 + ld e, 16 call DrawTitleGraphic ; Initialize running Suicune? @@ -125,14 +125,12 @@ _TitleScreen: ; Initialize background crystal call InitializeBackground -; Save WRAM bank +; Update palette colors ldh a, [rSVBK] push af -; WRAM bank 5 ld a, BANK(wBGPals1) ldh [rSVBK], a -; Update palette colors ld hl, TitleScreenPalettes ld de, wBGPals1 ld bc, 16 palettes @@ -143,7 +141,6 @@ _TitleScreen: ld bc, 16 palettes call CopyBytes -; Restore WRAM bank pop af ldh [rSVBK], a @@ -201,7 +198,7 @@ _TitleScreen: ld a, -112 ldh [hWY], a - ld a, $1 + ld a, 1 ldh [hCGBPalUpdate], a ; Update BG Map 0 (bank 0) -- cgit v1.2.3 From 2d2a7dec7d8bea0c456e4598f73c24e4b5635c24 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 3 Aug 2020 22:56:11 +0200 Subject: Label some mobile battle screen functions --- engine/battle/core.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine') diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 0cbdd66fe..cc7ef2e37 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -4920,7 +4920,7 @@ LoadBattleMenu2: ret .mobile - farcall Function100b12 + farcall Mobile_LoadBattleMenu ld a, [wcd2b] and a ret z @@ -5311,7 +5311,7 @@ CheckAmuletCoin: MoveSelectionScreen: call IsMobileBattle jr nz, .not_mobile - farcall MobileMoveSelectionScreen + farcall Mobile_MoveSelectionScreen ret .not_mobile -- cgit v1.2.3 From ac48d654987ef1df3a7ca6e5a40d8e6eab477d7f Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 3 Aug 2020 23:00:41 +0200 Subject: Document wTitleScreenSelectedOption variable --- engine/menus/intro_menu.asm | 10 +++++----- engine/movie/title.asm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'engine') diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index be0e3a188..6126cb1b9 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -999,8 +999,8 @@ StartTitleScreen: ld b, SCGB_DIPLOMA call GetSGBLayout call UpdateTimePals - ld a, [wIntroSceneFrameCounter] - cp $5 + ld a, [wTitleScreenSelectedOption] + cp 5 jr c, .ok xor a .ok @@ -1200,7 +1200,7 @@ TitleScreenMain: ld a, 1 .done - ld [wIntroSceneFrameCounter], a + ld [wTitleScreenSelectedOption], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1225,7 +1225,7 @@ TitleScreenMain: .clock_reset ld a, 4 - ld [wIntroSceneFrameCounter], a + ld [wTitleScreenSelectedOption], a ; Return to the intro sequence. ld hl, wJumptableIndex @@ -1243,7 +1243,7 @@ TitleScreenEnd: ret nz ld a, 2 - ld [wIntroSceneFrameCounter], a + ld [wTitleScreenSelectedOption], a ; Back to the intro. ld hl, wJumptableIndex diff --git a/engine/movie/title.asm b/engine/movie/title.asm index c478c572a..982bd0873 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -10,7 +10,7 @@ _TitleScreen: ; Reset timing variables ld hl, wJumptableIndex ld [hli], a ; wJumptableIndex - ld [hli], a ; wIntroSceneFrameCounter + ld [hli], a ; wTitleScreenSelectedOption ld [hli], a ; wTitleScreenTimer ld [hl], a ; wTitleScreenTimer + 1 -- cgit v1.2.3 From b6055b19446e2de0a885565c0b6749fc11627b46 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 3 Aug 2020 23:41:01 +0200 Subject: Use TRUE for hCGBPalUpdate --- engine/battle/battle_transition.asm | 2 +- engine/battle_anims/anim_commands.asm | 4 ++-- engine/battle_anims/bg_effects.asm | 4 ++-- engine/debug/color_picker.asm | 4 ++-- engine/events/heal_machine_anim.asm | 4 ++-- engine/events/poisonstep_pals.asm | 2 +- engine/gfx/cgb_layouts.asm | 32 ++++++++++++++++---------------- engine/gfx/color.asm | 4 ++-- engine/gfx/crystal_layouts.asm | 2 +- engine/movie/intro.asm | 14 +++++++------- engine/movie/title.asm | 2 +- engine/movie/unused_title.asm | 2 +- engine/overworld/init_map.asm | 2 +- 13 files changed, 39 insertions(+), 39 deletions(-) (limited to 'engine') diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index a36927820..89760611b 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -673,7 +673,7 @@ StartTrainerBattle_LoadPokeBallGraphics: call CopyBytes pop af ldh [rSVBK], a - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a call DelayFrame call BattleStart_CopyTilemapAtOnce diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 76a85a76a..4897ae6c4 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -1417,7 +1417,7 @@ BattleAnim_SetBGPals: call CopyPals pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -1438,7 +1438,7 @@ BattleAnim_SetOBPals: call CopyPals pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 63c610850..bdb88d76c 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -2546,7 +2546,7 @@ BGEffects_LoadBGPal0_OBPal1: pop bc pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -2573,7 +2573,7 @@ BGEffects_LoadBGPal1_OBPal0: pop bc pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm index 6062e71aa..310244c75 100644 --- a/engine/debug/color_picker.asm +++ b/engine/debug/color_picker.asm @@ -448,7 +448,7 @@ Function81c33: hlcoord 15, 2 ld de, wc608 + 2 call Function81ca7 - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ld a, $3 ld [wJumptableIndex], a @@ -1227,7 +1227,7 @@ Function822a3: call Function81ca7 pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a call DelayFrame ret diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm index 2259752b3..38ccbf12c 100644 --- a/engine/events/heal_machine_anim.asm +++ b/engine/events/heal_machine_anim.asm @@ -167,7 +167,7 @@ INCBIN "gfx/overworld/heal_machine.2bpp" ld bc, 1 palettes ld a, BANK(wOBPals2) call FarCopyWRAM - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -231,7 +231,7 @@ INCLUDE "gfx/overworld/heal_machine.pal" pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm index b2de25fa6..07bd246a1 100644 --- a/engine/events/poisonstep_pals.asm +++ b/engine/events/poisonstep_pals.asm @@ -39,7 +39,7 @@ LoadPoisonBGPals: jr nz, .loop pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ld c, 4 call DelayFrames diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index a31c86ea0..c58b27cd9 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -189,7 +189,7 @@ _CGB_PokegearPals: ld a, BANK(wBGPals1) call FarCopyWRAM call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -243,7 +243,7 @@ _CGB_StatsScreenHPPals: call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -282,7 +282,7 @@ _CGB_Pokedex: call FarCopyWRAM call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -317,7 +317,7 @@ _CGB_BillsPC: call InitPartyMenuOBPals call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -339,7 +339,7 @@ Function9009: call InitPartyMenuOBPals call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -362,7 +362,7 @@ _CGB_PokedexUnownMode: call InitPartyMenuOBPals call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -415,7 +415,7 @@ _CGB_SlotMachine: call ByteFill call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -433,7 +433,7 @@ _CGB_BetaTitleScreen: call FillBoxCGB call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -573,7 +573,7 @@ _CGB_Evolution: call WipeAttrmap call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -591,7 +591,7 @@ _CGB_GSTitleScreen: ld a, SCGB_DIPLOMA ld [wDefaultSGBLayout], a call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -725,7 +725,7 @@ _CGB_TrainerCard: ld [hl], a call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -749,7 +749,7 @@ _CGB_MoveList: call FillBoxCGB call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -759,7 +759,7 @@ _CGB_BetaPikachuMinigame: call WipeAttrmap call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -771,7 +771,7 @@ _CGB_PokedexSearchOption: call WipeAttrmap call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -819,7 +819,7 @@ _CGB_PackPals: call FillBoxCGB call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -877,7 +877,7 @@ _CGB_MagnetTrain: call FillBoxCGB call ApplyAttrmap call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index cece60834..530122bb3 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -150,7 +150,7 @@ Function8b07: ; unreferenced call FarCopyWRAM call ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -352,7 +352,7 @@ ApplyHPBarPals: ld bc, 4 ld a, BANK(wBGPals2) call FarCopyWRAM - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret diff --git a/engine/gfx/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm index dadf40e95..9c47797d1 100644 --- a/engine/gfx/crystal_layouts.asm +++ b/engine/gfx/crystal_layouts.asm @@ -157,7 +157,7 @@ MG_Mobile_Layout01: .asm_49467 farcall ApplyAttrmap farcall ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index b923f4862..c05d1202c 100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -308,7 +308,7 @@ GameFreakLogoScene4: ld [wOBPals2 + 13], a pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -1508,7 +1508,7 @@ Intro_Scene24_ApplyPaletteFade: jr nz, .loop1 pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -1632,7 +1632,7 @@ CrystalIntro_UnownFade: pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -1710,7 +1710,7 @@ Intro_Scene20_AppearUnown: pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -1773,7 +1773,7 @@ endr pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -1886,7 +1886,7 @@ Intro_RustleGrass: dw IntroGrass2GFX Intro_SetCGBPalUpdate: - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ret @@ -1903,7 +1903,7 @@ Intro_ClearBGPals: pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a call DelayFrame call DelayFrame diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 982bd0873..ad06343c9 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -198,7 +198,7 @@ _TitleScreen: ld a, -112 ldh [hWY], a - ld a, 1 + ld a, TRUE ldh [hCGBPalUpdate], a ; Update BG Map 0 (bank 0) diff --git a/engine/movie/unused_title.asm b/engine/movie/unused_title.asm index c086cf566..615d92d36 100644 --- a/engine/movie/unused_title.asm +++ b/engine/movie/unused_title.asm @@ -88,7 +88,7 @@ UnusedTitleScreen: pop af ldh [rSVBK], a - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a ld de, MUSIC_TITLE diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm index d2d6145c7..68cb3b265 100644 --- a/engine/overworld/init_map.asm +++ b/engine/overworld/init_map.asm @@ -33,7 +33,7 @@ ReanchorBGMap_NoOAMUpdate:: call _OpenAndCloseMenu_HDMATransferTilemapAndAttrmap farcall LoadOW_BGPal7 farcall ApplyPals - ld a, $1 + ld a, TRUE ldh [hCGBPalUpdate], a xor a ldh [hBGMapMode], a -- cgit v1.2.3 From aabfc0b413e32198ebdc32d3719bf9be85b2306e Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 4 Aug 2020 18:09:09 +0200 Subject: `d` is the multiplier for Sprites_Sine --- engine/gfx/sprite_anims.asm | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'engine') diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm index 89203b561..91d53dca1 100644 --- a/engine/gfx/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm @@ -180,12 +180,12 @@ DoAnimFrame: ld a, [hl] sla a sla a - ld d, $2 + ld d, 2 ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] - add $3 + add 3 ld [hl], a call .Sprites_Sine @@ -204,7 +204,7 @@ DoAnimFrame: ld a, [hl] inc a ld [hl], a - ld d, $2 + ld d, 2 call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET @@ -391,7 +391,7 @@ DoAnimFrame: inc [hl] .move_vertical ld a, e - ld d, $20 + ld d, 32 call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET @@ -456,10 +456,10 @@ DoAnimFrame: ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] - cp $30 + cp 48 jr c, .asm_8d4cd dec [hl] - ld d, $28 + ld d, 40 call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET @@ -492,8 +492,8 @@ DoAnimFrame: ld a, [hl] and a jr z, .asm_8d51c - ld d, a + ld d, a ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -759,11 +759,11 @@ DoAnimFrame: ld hl, SPRITEANIMSTRUCT_0D add hl, bc ld a, [hl] - add $2 + add 2 ld [hl], a xor $ff inc a - ld d, $20 + ld d, 32 call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET @@ -777,13 +777,13 @@ DoAnimFrame: ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] - cp $14 + cp 20 jr nc, .asm_8d67f - add $2 + add 2 ld [hl], a xor $ff inc a - ld d, $20 + ld d, 32 call .Sprites_Sine ld hl, SPRITEANIMSTRUCT_YOFFSET @@ -799,7 +799,6 @@ DoAnimFrame: inc [hl] inc [hl] inc [hl] - ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] -- cgit v1.2.3 From 8befc889adcaf3988ad63a36de74fa345aeab7ee Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 4 Aug 2020 20:26:26 +0200 Subject: Remove a verifiably false comment wSpriteAnimCount starts at 0, keeps incrementing and never decrements. When it reaches $ff, the next value is 1. Its purpose is unknown, as this value is used nowhere else. --- engine/gfx/sprites.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'engine') diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index c5a91a9b5..fd87f398b 100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm @@ -135,16 +135,16 @@ _InitSpriteAnimStruct:: ; Back up the structure address to bc. ld c, l ld b, h -; Value [wSpriteAnimCount] is initially set to -1. Set it to -; the number of objects loaded into this array. + +; Increment [wSpriteAnimCount], skipping a 0 value. ld hl, wSpriteAnimCount inc [hl] ld a, [hl] and a - jr nz, .initialized + jr nz, .nonzero inc [hl] +.nonzero -.initialized ; Get row a of SpriteAnimSeqData, copy the pointer into de pop af ld e, a @@ -228,9 +228,9 @@ DeinitializeAllSprites: UpdateAnimFrame: call InitSpriteAnimBuffer ; init WRAM call GetSpriteAnimFrame ; read from a memory array - cp -3 + cp dowait_command jr z, .done - cp -4 + cp delanim_command jr z, .delete call GetFrameOAMPointer ; add byte to [wCurAnimVTile] -- cgit v1.2.3 From 315d6c665ea0ee4e103f6d8b9dbfb531659ae381 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 18 Aug 2020 22:20:16 +0200 Subject: Add wTitleScreenSelectedOption constants --- engine/menus/intro_menu.asm | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'engine') diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 6126cb1b9..754a5ac86 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -959,6 +959,15 @@ Intro_PlacePlayerSprite: db 10 * 8 + 4, 9 * 8, 2 db 10 * 8 + 4, 10 * 8, 3 + + const_def + const TITLESCREENOPTION_MAIN_MENU + const TITLESCREENOPTION_DELETE_SAVE_DATA + const TITLESCREENOPTION_RESTART + const TITLESCREENOPTION_UNUSED + const TITLESCREENOPTION_RESET_CLOCK +NUM_TITLESCREENOPTIONS EQU const_value + IntroSequence: callfar Copyright_GameFreakPresents jr c, StartTitleScreen @@ -1000,7 +1009,7 @@ StartTitleScreen: call GetSGBLayout call UpdateTimePals ld a, [wTitleScreenSelectedOption] - cp 5 + cp NUM_TITLESCREENOPTIONS jr c, .ok xor a .ok @@ -1183,7 +1192,7 @@ TitleScreenMain: ld a, [hl] and D_LEFT + D_UP cp D_LEFT + D_UP - jr z, .clock_reset + jr z, .reset_clock ; Press Start or A to start the game. .check_start @@ -1193,11 +1202,11 @@ TitleScreenMain: ret .incave - ld a, 0 + ld a, TITLESCREENOPTION_MAIN_MENU jr .done .delete_save_data - ld a, 1 + ld a, TITLESCREENOPTION_DELETE_SAVE_DATA .done ld [wTitleScreenSelectedOption], a @@ -1223,8 +1232,8 @@ TitleScreenMain: inc [hl] ret -.clock_reset - ld a, 4 +.reset_clock + ld a, TITLESCREENOPTION_RESET_CLOCK ld [wTitleScreenSelectedOption], a ; Return to the intro sequence. @@ -1242,7 +1251,7 @@ TitleScreenEnd: and a ret nz - ld a, 2 + ld a, TITLESCREENOPTION_RESTART ld [wTitleScreenSelectedOption], a ; Back to the intro. -- cgit v1.2.3