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/time_capsule_2.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/time_capsule_2.asm') diff --git a/engine/time_capsule_2.asm b/engine/time_capsule_2.asm index 5da72e7c8..d50bffd3f 100644 --- a/engine/time_capsule_2.asm +++ b/engine/time_capsule_2.asm @@ -18,7 +18,7 @@ ConvertMon_2to1: ; fb8f1 ret ; fb908 -ConvertMon_1to2: ; fb908 +Predef_ConvertMon_1to2: ; fb908 ; Takes the Gen-1 Pokemon number stored in wd265 and returns the corresponding value from Pokered_MonIndices in wd265. push bc push hl -- cgit v1.2.3 From 10bd011d0619996783e370a602619ea802833600 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 3 Jan 2018 02:23:54 -0500 Subject: More relevant data file locations --- engine/time_capsule_2.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/time_capsule_2.asm') diff --git a/engine/time_capsule_2.asm b/engine/time_capsule_2.asm index 5da72e7c8..0378ed697 100644 --- a/engine/time_capsule_2.asm +++ b/engine/time_capsule_2.asm @@ -36,4 +36,4 @@ ConvertMon_1to2: ; fb908 ; fb91c -INCLUDE "data/time_capsule/mon_order.asm" +INCLUDE "data/pokemon/rby_order.asm" -- 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/time_capsule_2.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/time_capsule_2.asm') diff --git a/engine/time_capsule_2.asm b/engine/time_capsule_2.asm index c114e6952..0378ed697 100644 --- a/engine/time_capsule_2.asm +++ b/engine/time_capsule_2.asm @@ -18,7 +18,7 @@ ConvertMon_2to1: ; fb8f1 ret ; fb908 -Predef_ConvertMon_1to2: ; fb908 +ConvertMon_1to2: ; fb908 ; Takes the Gen-1 Pokemon number stored in wd265 and returns the corresponding value from Pokered_MonIndices in wd265. push bc push hl -- cgit v1.2.3