From fa47323db2e2731a5af032e81fc96445caa39d24 Mon Sep 17 00:00:00 2001 From: libjet Date: Sat, 30 May 2020 16:20:48 +0100 Subject: Add savemenu/phonering_copytilemapatonce.asm --- main.asm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 39f8fb6d..15a474db 100644 --- a/main.asm +++ b/main.asm @@ -229,10 +229,9 @@ INCLUDE "engine/events/halloffame.asm" SECTION "bank23", ROMX -SaveMenu_CopyTilemapAtOnce:: - dr $8c000, $8c0b9 -PhoneRing_CopyTilemapAtOnce:: - dr $8c0b9, $8c17a +INCLUDE "engine/menus/savemenu_copytilemapatonce.asm" +INCLUDE "engine/phone/phonering_copytilemapatonce.asm" + _ResetClock:: dr $8c17a, $8c310 _DeleteSaveData:: -- cgit v1.2.3 From 070088a723f31437e8bd383d33a2af0b5e185642 Mon Sep 17 00:00:00 2001 From: libjet Date: Sat, 30 May 2020 16:30:58 +0100 Subject: Add engine/rtc/reset_password.asm --- main.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 15a474db..a5a72b74 100644 --- a/main.asm +++ b/main.asm @@ -231,9 +231,8 @@ SECTION "bank23", ROMX INCLUDE "engine/menus/savemenu_copytilemapatonce.asm" INCLUDE "engine/phone/phonering_copytilemapatonce.asm" +INCLUDE "engine/rtc/reset_password.asm" -_ResetClock:: - dr $8c17a, $8c310 _DeleteSaveData:: dr $8c310, $8c355 DummyPredef35:: -- cgit v1.2.3 From d4d4f779750868f70a9b4d696d4a4ce7677d917f Mon Sep 17 00:00:00 2001 From: libjet Date: Sat, 30 May 2020 16:49:28 +0100 Subject: Add engine/menus/delete_save.asm --- main.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index a5a72b74..a886c0de 100644 --- a/main.asm +++ b/main.asm @@ -232,12 +232,12 @@ SECTION "bank23", ROMX INCLUDE "engine/menus/savemenu_copytilemapatonce.asm" INCLUDE "engine/phone/phonering_copytilemapatonce.asm" INCLUDE "engine/rtc/reset_password.asm" +INCLUDE "engine/menus/delete_save.asm" -_DeleteSaveData:: - dr $8c310, $8c355 DummyPredef35:: DummyPredef36:: ret + UpdateTimeOfDayPal:: dr $8c356, $8c366 _TimeOfDayPals:: -- cgit v1.2.3 From 2d45f5d1726ba1b6022f8404c3c14de90f5321bc Mon Sep 17 00:00:00 2001 From: libjet Date: Sat, 30 May 2020 17:10:33 +0100 Subject: Add engine/tilesets/timeofday_pals.asm --- main.asm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index a886c0de..0d6e403f 100644 --- a/main.asm +++ b/main.asm @@ -233,27 +233,8 @@ INCLUDE "engine/menus/savemenu_copytilemapatonce.asm" INCLUDE "engine/phone/phonering_copytilemapatonce.asm" INCLUDE "engine/rtc/reset_password.asm" INCLUDE "engine/menus/delete_save.asm" +INCLUDE "engine/tilesets/timeofday_pals.asm" -DummyPredef35:: -DummyPredef36:: - ret - -UpdateTimeOfDayPal:: - dr $8c356, $8c366 -_TimeOfDayPals:: - dr $8c366, $8c397 -_UpdateTimePals:: - dr $8c397, $8c3a0 -FadeInPalettes:: - dr $8c3a0, $8c3ab -FadeOutPalettes:: - dr $8c3ab, $8c3b9 -FadeInQuickly:: - dr $8c3b9, $8c3c4 -FadeBlackQuickly:: - dr $8c3c4, $8c3e9 -ReplaceTimeOfDayPals:: - dr $8c3e9, $8c513 DoBattleTransition:: dr $8c513, $8ca5e PlayWhirlpoolSound:: -- cgit v1.2.3 From 61f53d2e8fb66c105485216757612756fddb6e8d Mon Sep 17 00:00:00 2001 From: libjet Date: Sun, 31 May 2020 01:14:47 +0100 Subject: Add engine/battle/battle_transition.asm --- main.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 0d6e403f..a4c7ecc9 100644 --- a/main.asm +++ b/main.asm @@ -234,9 +234,8 @@ INCLUDE "engine/phone/phonering_copytilemapatonce.asm" INCLUDE "engine/rtc/reset_password.asm" INCLUDE "engine/menus/delete_save.asm" INCLUDE "engine/tilesets/timeofday_pals.asm" +INCLUDE "engine/battle/battle_transition.asm" -DoBattleTransition:: - dr $8c513, $8ca5e PlayWhirlpoolSound:: dr $8ca5e, $8ca6b BlindingFlash:: -- cgit v1.2.3 From 8a892f8240d1ed4fc69a00b4740dafa438d2efca Mon Sep 17 00:00:00 2001 From: libjet Date: Sun, 31 May 2020 02:42:16 +0100 Subject: Add engine/events/field_moves.asm --- main.asm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index a4c7ecc9..421702f8 100644 --- a/main.asm +++ b/main.asm @@ -235,19 +235,8 @@ INCLUDE "engine/rtc/reset_password.asm" INCLUDE "engine/menus/delete_save.asm" INCLUDE "engine/tilesets/timeofday_pals.asm" INCLUDE "engine/battle/battle_transition.asm" +INCLUDE "engine/events/field_moves.asm" -PlayWhirlpoolSound:: - dr $8ca5e, $8ca6b -BlindingFlash:: - dr $8ca6b, $8ca8e -ShakeHeadbuttTree:: - dr $8ca8e, $8cbb8 -OWCutAnimation:: - dr $8cbb8, $8cd65 -FlyFromAnim:: - dr $8cd65, $8cdab -FlyToAnim:: - dr $8cdab, $8ce7c MagnetTrain:: dr $8ce7c, $8d174 @@ -256,7 +245,9 @@ ClearSpriteAnims:: PlaySpriteAnimationsAndDelayFrame:: dr $8d183, $8d18a PlaySpriteAnimations:: - dr $8d18a, $8d1c9 + dr $8d18a, $8d19b +DoNextFrameForAllSprites:: + dr $8d19b, $8d1c9 DoNextFrameForFirst16Sprites:: dr $8d1c9, $8d1f7 _InitSpriteAnimStruct:: -- cgit v1.2.3 From 8ed6e954221473960c336d2d96171212525e68c6 Mon Sep 17 00:00:00 2001 From: libjet Date: Sun, 31 May 2020 03:31:15 +0100 Subject: Add engine/events/magnet_train.asm --- main.asm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 421702f8..faf3faa2 100644 --- a/main.asm +++ b/main.asm @@ -236,9 +236,7 @@ INCLUDE "engine/menus/delete_save.asm" INCLUDE "engine/tilesets/timeofday_pals.asm" INCLUDE "engine/battle/battle_transition.asm" INCLUDE "engine/events/field_moves.asm" - -MagnetTrain:: - dr $8ce7c, $8d174 +INCLUDE "engine/events/magnet_train.asm" ClearSpriteAnims:: dr $8d174, $8d183 -- cgit v1.2.3 From 68123f3682e75c5ebd48158052b3a5d818a96c9c Mon Sep 17 00:00:00 2001 From: libjet Date: Sun, 31 May 2020 18:49:09 +0100 Subject: Start on sprites.asm, partially disassemble sprite_anims.asm --- main.asm | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index faf3faa2..9005fb38 100644 --- a/main.asm +++ b/main.asm @@ -237,28 +237,10 @@ INCLUDE "engine/tilesets/timeofday_pals.asm" INCLUDE "engine/battle/battle_transition.asm" INCLUDE "engine/events/field_moves.asm" INCLUDE "engine/events/magnet_train.asm" +INCLUDE "engine/gfx/sprites.asm" -ClearSpriteAnims:: - dr $8d174, $8d183 -PlaySpriteAnimationsAndDelayFrame:: - dr $8d183, $8d18a -PlaySpriteAnimations:: - dr $8d18a, $8d19b -DoNextFrameForAllSprites:: - dr $8d19b, $8d1c9 -DoNextFrameForFirst16Sprites:: - dr $8d1c9, $8d1f7 -_InitSpriteAnimStruct:: - dr $8d1f7, $8d332 - -_ReinitSpriteAnimFrame:: -IF DEF(_GOLD) - dr $8d332, $8e6fd -AnimateEndOfExpBar:: - dr $8e6fd, $8e774 -ClearSpriteAnims2:: - dr $8e774, $8e78b LoadOverworldMonIcon:: +IF DEF(_GOLD) dr $8e78b, $8e79f LoadMenuMonIcon:: dr $8e79f, $8e88f @@ -276,12 +258,6 @@ InitDisplayForRedCredits:: dr $8fdff, $8fe43 ELIF DEF(_SILVER) - dr $8d332, $8e6e3 -AnimateEndOfExpBar:: - dr $8e6e3, $8e75a -ClearSpriteAnims2:: - dr $8e75a, $8e771 -LoadOverworldMonIcon:: dr $8e771, $8e785 LoadMenuMonIcon:: dr $8e785, $8e875 -- cgit v1.2.3 From 991832399b893fc0ec92a8d67f3da134c2652674 Mon Sep 17 00:00:00 2001 From: libjet Date: Tue, 2 Jun 2020 02:50:34 +0100 Subject: Add engine/gfx/mon_icons.asm --- main.asm | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index 9005fb38..c43f52b0 100644 --- a/main.asm +++ b/main.asm @@ -238,38 +238,15 @@ INCLUDE "engine/battle/battle_transition.asm" INCLUDE "engine/events/field_moves.asm" INCLUDE "engine/events/magnet_train.asm" INCLUDE "engine/gfx/sprites.asm" +INCLUDE "engine/gfx/mon_icons.asm" -LoadOverworldMonIcon:: -IF DEF(_GOLD) - dr $8e78b, $8e79f -LoadMenuMonIcon:: - dr $8e79f, $8e88f -GetSpeciesIcon:: - dr $8e88f, $8e8fb -FreezeMonIcons:: - dr $8e8fb, $8e922 -UnfreezeMonIcons:: - dr $8e922, $8e93d -HoldSwitchmonIcon:: - dr $8e93d, $8fdbe InitDisplayForHallOfFame:: +IF DEF(_GOLD) dr $8fdbe, $8fdff InitDisplayForRedCredits:: dr $8fdff, $8fe43 ELIF DEF(_SILVER) - dr $8e771, $8e785 -LoadMenuMonIcon:: - dr $8e785, $8e875 -GetSpeciesIcon:: - dr $8e875, $8e8e1 -FreezeMonIcons:: - dr $8e8e1, $8e908 -UnfreezeMonIcons:: - dr $8e908, $8e923 -HoldSwitchmonIcon:: - dr $8e923, $8fda4 -InitDisplayForHallOfFame:: dr $8fda4, $8fde5 InitDisplayForRedCredits:: dr $8fde5, $8fe43 -- cgit v1.2.3 From ea845793bb1d3d2b5e2e7778ec83ed932bbf1adc Mon Sep 17 00:00:00 2001 From: libjet Date: Tue, 2 Jun 2020 02:53:22 +0100 Subject: Add engine/movie/init_hof_credits.asm --- main.asm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index c43f52b0..ece4cd9b 100644 --- a/main.asm +++ b/main.asm @@ -239,18 +239,7 @@ INCLUDE "engine/events/field_moves.asm" INCLUDE "engine/events/magnet_train.asm" INCLUDE "engine/gfx/sprites.asm" INCLUDE "engine/gfx/mon_icons.asm" - -InitDisplayForHallOfFame:: -IF DEF(_GOLD) - dr $8fdbe, $8fdff -InitDisplayForRedCredits:: - dr $8fdff, $8fe43 - -ELIF DEF(_SILVER) - dr $8fda4, $8fde5 -InitDisplayForRedCredits:: - dr $8fde5, $8fe43 -ENDC +INCLUDE "engine/movie/init_hof_credits.asm" SECTION "bank24", ROMX -- cgit v1.2.3 From 20f612793ecc50bc4767decbd7e90d37bd4eb162 Mon Sep 17 00:00:00 2001 From: entrpntr Date: Tue, 2 Jun 2020 06:07:53 -0400 Subject: Start cleaning up. --- main.asm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index ece4cd9b..4a90c13c 100644 --- a/main.asm +++ b/main.asm @@ -332,7 +332,9 @@ INCBIN "gfx/font/font_inversed.1bpp" SECTION "bank38", ROMX +ret_e0000: ret +; unused ret _Diploma:: dr $e0002, $e0009 @@ -341,7 +343,9 @@ PlaceDiplomaOnScreen:: PrintDiplomaPage2:: dr $e00ae, $e081b RotateUnownFrontpic:: - dr $e081b, $e0909 + dr $e081b, $e0908 +ret_e0908:: + ret _CardFlip:: dr $e0909, $e199d @@ -349,7 +353,9 @@ _UnownPuzzle:: dr $e199d, $e2668 _DummyGame:: - dr $e2668, $e2b9e + dr $e2668, $e29ae +DummyGame_InterpretJoypad_AnimateCursor:: + dr $e29ae, $e2b9e _DepositPKMN:: dr $e2b9e, $e2d71 _WithdrawPKMN:: -- cgit v1.2.3