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/events/move_tutor.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/events/move_tutor.asm') diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index a15ecaf93..9630b07a8 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -54,7 +54,7 @@ CheckCanLearnMoveTutorMove: ; 492b9 ld hl, .MenuDataHeader call LoadMenuDataHeader - predef CanLearnTMHMMove + predef Predef_CanLearnTMHMMove push bc ld a, [CurPartyMon] @@ -78,7 +78,7 @@ CheckCanLearnMoveTutorMove: ; 492b9 callfar KnowsMove jr c, .didnt_learn - predef LearnMove + predef Predef_LearnMove ld a, b and a jr z, .didnt_learn -- cgit v1.2.3 From d83aefb30af180eae03bbd65878e8de45166f3d0 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 01:40:20 -0500 Subject: Use more constants in scripts --- engine/events/move_tutor.asm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'engine/events/move_tutor.asm') diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index a15ecaf93..802b9ef21 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -22,7 +22,7 @@ Special_MoveTutor: ; 4925b .enter_loop call CheckCanLearnMoveTutorMove jr nc, .loop - xor a + xor a ; FALSE ld [ScriptVar], a jr .quit @@ -35,10 +35,11 @@ Special_MoveTutor: ; 4925b .GetMoveTutorMove: ; 492a5 ld a, [ScriptVar] - cp 1 + cp MOVETUTOR_FLAMETHROWER jr z, .flamethrower - cp 2 + cp MOVETUTOR_THUNDERBOLT jr z, .thunderbolt + ; MOVETUTOR_ICE_BEAM ld a, ICE_BEAM ret -- 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/events/move_tutor.asm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'engine/events/move_tutor.asm') diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index 802b9ef21..7b475c169 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -100,5 +100,4 @@ CheckCanLearnMoveTutorMove: ; 492b9 .MenuDataHeader: ; 0x4930a db $40 ; flags - db 12, 00 ; start coords - db 17, 19 ; end coords + menu_coords 0, 12, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 -- 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/events/move_tutor.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/events/move_tutor.asm') diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index a15ecaf93..5082364e0 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -98,6 +98,6 @@ CheckCanLearnMoveTutorMove: ; 492b9 ret .MenuDataHeader: ; 0x4930a - db $40 ; flags + db MENU_BACKUP_TILES ; flags db 12, 00 ; start coords db 17, 19 ; end coords -- 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/events/move_tutor.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/events/move_tutor.asm') diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index 8bb29f9ae..be5f37564 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -55,7 +55,7 @@ CheckCanLearnMoveTutorMove: ; 492b9 ld hl, .MenuDataHeader call LoadMenuDataHeader - predef Predef_CanLearnTMHMMove + predef CanLearnTMHMMove push bc ld a, [CurPartyMon] @@ -79,7 +79,7 @@ CheckCanLearnMoveTutorMove: ; 492b9 callfar KnowsMove jr c, .didnt_learn - predef Predef_LearnMove + predef LearnMove ld a, b and a jr z, .didnt_learn -- cgit v1.2.3