From 9a3088e50cf58158cbfb8de5ad80170967d975dc Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 13:24:05 +0100 Subject: Clean up XXX comments for unused content --- engine/pic_animation.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/pic_animation.asm') diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 33b770b14..b20dfef8b 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -695,7 +695,7 @@ PokeAnim_ConvertAndApplyBitmask: ; d036b ret ; d03f4 -; XXX +; unused db 6, 5, 4 .GetTilemap: ; d03f7 -- cgit v1.2.3 From 7a24703398aba3ab112ed770368805a17c601c03 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 15:05:14 +0100 Subject: Clean up Predef function names --- engine/pic_animation.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'engine/pic_animation.asm') diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index b20dfef8b..65e067298 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -1110,9 +1110,10 @@ PokeAnim_GetSpeciesOrUnown: ; d065c ret ; d0669 -Predef48: ; d0669 Predef 48 +UnreferencedPredef48: ; d0669 Predef 48 ld a, $1 ld [wBoxAlignment], a + HOF_AnimateFrontpic: ; d066e Predef 49 call AnimateMon_CheckIfPokemon jr c, .fail -- 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/pic_animation.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/pic_animation.asm') diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 65e067298..09c800c60 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -1110,7 +1110,7 @@ PokeAnim_GetSpeciesOrUnown: ; d065c ret ; d0669 -UnreferencedPredef48: ; d0669 Predef 48 +UnusedPredef48: ; d0669 Predef 48 ld a, $1 ld [wBoxAlignment], a -- 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/pic_animation.asm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'engine/pic_animation.asm') diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 09c800c60..0356f9922 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -1,54 +1,54 @@ ; Pic animation arrangement. -AnimateMon_Slow_Normal: ; d0000 +UnusedPredef_AnimateMon_Slow_Normal: ; d0000 hlcoord 12, 0 ld a, [wBattleMode] cp WILD_BATTLE jr z, .wild ld e, ANIM_MON_SLOW ld d, $0 - call AnimateFrontpic + call Predef_AnimateFrontpic ret .wild ld e, ANIM_MON_NORMAL ld d, $0 - call AnimateFrontpic + call Predef_AnimateFrontpic ret ; d001a AnimateMon_Menu: ; d001a ld e, ANIM_MON_MENU ld d, $0 - call AnimateFrontpic + call Predef_AnimateFrontpic ret ; d0022 AnimateMon_Trade: ; d0022 ld e, ANIM_MON_TRADE ld d, $0 - call AnimateFrontpic + call Predef_AnimateFrontpic ret ; d002a AnimateMon_Evolve: ; d002a ld e, ANIM_MON_EVOLVE ld d, $0 - call AnimateFrontpic + call Predef_AnimateFrontpic ret ; d0032 AnimateMon_Hatch: ; d0032 ld e, ANIM_MON_HATCH ld d, $0 - call AnimateFrontpic + call Predef_AnimateFrontpic ret ; d003a AnimateMon_Unused: ; d003a ld e, ANIM_MON_UNUSED ld d, $0 - call AnimateFrontpic + call Predef_AnimateFrontpic ret ; d0042 @@ -86,10 +86,10 @@ PokeAnims: ; d0042 .Egg2: pokeanim Idle, Play -AnimateFrontpic: ; d008e +Predef_AnimateFrontpic: ; d008e call AnimateMon_CheckIfPokemon ret c - call LoadMonAnimation + call Predef_LoadMonAnimation .loop call SetUpPokeAnim push af @@ -99,7 +99,7 @@ AnimateFrontpic: ; d008e ret ; d00a3 -LoadMonAnimation: ; d00a3 +Predef_LoadMonAnimation: ; d00a3 push hl ld c, e ld b, 0 @@ -1114,7 +1114,7 @@ UnusedPredef48: ; d0669 Predef 48 ld a, $1 ld [wBoxAlignment], a -HOF_AnimateFrontpic: ; d066e Predef 49 +HOF_Predef_AnimateFrontpic: ; d066e Predef 49 call AnimateMon_CheckIfPokemon jr c, .fail ld h, d @@ -1122,12 +1122,12 @@ HOF_AnimateFrontpic: ; d066e Predef 49 push bc push hl ld de, vTiles2 - predef GetAnimatedFrontpicPredef + predef Predef_GetAnimatedFrontpic pop hl pop bc ld d, 0 ld e, c - call AnimateFrontpic + call Predef_AnimateFrontpic xor a ld [wBoxAlignment], a ret -- 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/pic_animation.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/pic_animation.asm') diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 33b770b14..e10dcc360 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -279,7 +279,7 @@ PokeAnim_StereoCry: ; d0196 PokeAnim_DeinitFrames: ; d01a9 ld a, [rSVBK] push af - ld a, $2 + ld a, BANK(wPokeAnimCoord) ld [rSVBK], a call PokeAnim_PlaceGraphic farcall HDMATransferTileMapToWRAMBank3 @@ -876,7 +876,7 @@ PokeAnim_PlaceGraphic: ; d04bd PokeAnim_SetVBank1: ; d0504 ld a, [rSVBK] push af - ld a, $2 + ld a, BANK(wPokeAnimCoord) ld [rSVBK], a xor a ld [hBGMapMode], a -- cgit v1.2.3 From fb422e8d9c78c56db27d974baa04c7a16bf5df41 Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Thu, 4 Jan 2018 14:53:50 -0500 Subject: Use BANK for hardcoded WRAM banks preceding FarCopyWRAM/GetFarWRAMByte calls. --- engine/pic_animation.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/pic_animation.asm') diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index e10dcc360..9a6ae4a75 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -335,12 +335,12 @@ PokeAnim_InitPicAttributes: ; d01d6 ld a, d ld [wPokeAnimGraphicStartTile], a - ld a, $1 + ld a, BANK(CurPartySpecies) ld hl, CurPartySpecies call GetFarWRAMByte ld [wPokeAnimSpecies], a - ld a, $1 + ld a, BANK(UnownLetter) ld hl, UnownLetter call GetFarWRAMByte ld [wPokeAnimUnownLetter], a -- cgit v1.2.3 From 8e1e583640fcb82cb8d6327a0174a892b4ba0ad2 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 14 Jan 2018 20:58:49 -0500 Subject: Close #470 (JOHTO_POKEMON) --- engine/pic_animation.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/pic_animation.asm') diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 33b770b14..4617c5f70 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -1024,7 +1024,7 @@ GetMonFramesPointer: ; d05ce ld hl, UnownFramesPointers jr z, .got_frames ld a, [wPokeAnimSpecies] - cp CHIKORITA + cp JOHTO_POKEMON ld b, BANK(FramesPointers) ld c, BANK(KantoFrames) ld hl, FramesPointers -- cgit v1.2.3 From 9bb584798e0b54a5f953665288165af86524a47c Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 15 Jan 2018 10:55:44 -0500 Subject: =?UTF-8?q?=5FSpecial=5FBugContestJudging=20=E2=86=92=20=5FBugCont?= =?UTF-8?q?estJudging;=20HOF=5FPredef=5FAnimateFrontpic=20=E2=86=92=20Pred?= =?UTF-8?q?ef=5FHOF=5FAnimateFrontpic=20(close=20#473)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/pic_animation.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/pic_animation.asm') diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 062998e5f..6f38967fe 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -1114,7 +1114,7 @@ UnusedPredef48: ; d0669 Predef 48 ld a, $1 ld [wBoxAlignment], a -HOF_Predef_AnimateFrontpic: ; d066e Predef 49 +Predef_HOF_AnimateFrontpic: ; d066e Predef 49 call AnimateMon_CheckIfPokemon jr c, .fail ld h, d -- 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/pic_animation.asm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'engine/pic_animation.asm') diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 6f38967fe..18c68ded9 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -1,54 +1,54 @@ ; Pic animation arrangement. -UnusedPredef_AnimateMon_Slow_Normal: ; d0000 +Unused_AnimateMon_Slow_Normal: ; d0000 hlcoord 12, 0 ld a, [wBattleMode] cp WILD_BATTLE jr z, .wild ld e, ANIM_MON_SLOW ld d, $0 - call Predef_AnimateFrontpic + call AnimateFrontpic ret .wild ld e, ANIM_MON_NORMAL ld d, $0 - call Predef_AnimateFrontpic + call AnimateFrontpic ret ; d001a AnimateMon_Menu: ; d001a ld e, ANIM_MON_MENU ld d, $0 - call Predef_AnimateFrontpic + call AnimateFrontpic ret ; d0022 AnimateMon_Trade: ; d0022 ld e, ANIM_MON_TRADE ld d, $0 - call Predef_AnimateFrontpic + call AnimateFrontpic ret ; d002a AnimateMon_Evolve: ; d002a ld e, ANIM_MON_EVOLVE ld d, $0 - call Predef_AnimateFrontpic + call AnimateFrontpic ret ; d0032 AnimateMon_Hatch: ; d0032 ld e, ANIM_MON_HATCH ld d, $0 - call Predef_AnimateFrontpic + call AnimateFrontpic ret ; d003a AnimateMon_Unused: ; d003a ld e, ANIM_MON_UNUSED ld d, $0 - call Predef_AnimateFrontpic + call AnimateFrontpic ret ; d0042 @@ -86,10 +86,10 @@ PokeAnims: ; d0042 .Egg2: pokeanim Idle, Play -Predef_AnimateFrontpic: ; d008e +AnimateFrontpic: ; d008e call AnimateMon_CheckIfPokemon ret c - call Predef_LoadMonAnimation + call LoadMonAnimation .loop call SetUpPokeAnim push af @@ -99,7 +99,7 @@ Predef_AnimateFrontpic: ; d008e ret ; d00a3 -Predef_LoadMonAnimation: ; d00a3 +LoadMonAnimation: ; d00a3 push hl ld c, e ld b, 0 @@ -1110,11 +1110,11 @@ PokeAnim_GetSpeciesOrUnown: ; d065c ret ; d0669 -UnusedPredef48: ; d0669 Predef 48 +Unused_HOF_AnimateAlignedFrontpic: ; d0669 ld a, $1 ld [wBoxAlignment], a -Predef_HOF_AnimateFrontpic: ; d066e Predef 49 +HOF_AnimateFrontpic: ; d066e call AnimateMon_CheckIfPokemon jr c, .fail ld h, d @@ -1122,12 +1122,12 @@ Predef_HOF_AnimateFrontpic: ; d066e Predef 49 push bc push hl ld de, vTiles2 - predef Predef_GetAnimatedFrontpic + predef GetAnimatedFrontpic pop hl pop bc ld d, 0 ld e, c - call Predef_AnimateFrontpic + call AnimateFrontpic xor a ld [wBoxAlignment], a ret -- 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/pic_animation.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/pic_animation.asm') diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 18c68ded9..4317d96f8 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -249,7 +249,7 @@ PokeAnim_Finish: ; d0171 PokeAnim_Cry: ; d017a ld a, [wPokeAnimSpecies] - call _PlayCry + call _PlayMonCry ld a, [wPokeAnimSceneIndex] inc a ld [wPokeAnimSceneIndex], a @@ -258,7 +258,7 @@ PokeAnim_Cry: ; d017a PokeAnim_CryNoWait: ; d0188 ld a, [wPokeAnimSpecies] - call PlayCry2 + call PlayMonCry2 ld a, [wPokeAnimSceneIndex] inc a ld [wPokeAnimSceneIndex], a -- cgit v1.2.3