From 6bc9c5dc3f389eb5c6b3ca4c265c4580e7aac4aa Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Thu, 15 Dec 2011 18:22:21 -0700 Subject: [PATCH] Add title screen monsters from Green and Blue as well. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Having data from all versions is a long‐term goal, but until the ROMs for those versions can be easily built and compared to the originals, it will be very easy for errors to slip in. Adding stuff from Green, Blue, and Yellow is okay with me, but for now Red is the only version guaranteed to have correct data. hg-commit-id: c595f0981208 --- constants.asm | 4 ++++ pokered.asm | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/constants.asm b/constants.asm index 2aafb6c0..520aa073 100644 --- a/constants.asm +++ b/constants.asm @@ -1,3 +1,7 @@ +RED EQU 1 +BLUE EQU 0 +GREEN EQU 0 + FuncCoord: MACRO Coord = $C3A0 + 20 * \2 + \1 ENDM diff --git a/pokered.asm b/pokered.asm index 945e61aa..ee77f359 100644 --- a/pokered.asm +++ b/pokered.asm @@ -1182,6 +1182,7 @@ INCBIN "baserom.gbc",$425B,$4588-$425B TitleMons: ; 4588 ; mons on the title screen are randomly chosen from here +IF RED db CHARMANDER db SQUIRTLE db BULBASAUR @@ -1198,6 +1199,43 @@ TitleMons: ; 4588 db ONIX db PONYTA db MAGIKARP +ENDC +IF GREEN + db BULBASAUR + db CHARMANDER + db SQUIRTLE + db CATERPIE + db NIDORAN_F + db PINSIR + db PIKACHU + db CLEFAIRY + db RHYDON + db ABRA + db GASTLY + db DITTO + db PIDGEOTTO + db ONIX + db PONYTA + db MAGIKARP +ENDC +IF BLUE + db SQUIRTLE + db CHARMANDER + db BULBASAUR + db MANKEY + db HITMONLEE + db VULPIX + db CHANSEY + db AERODACTYL + db JOLTEON + db SNORLAX + db GLOOM + db POLIWAG + db DODUO + db PORYGON + db GENGAR + db RAICHU +ENDC INCBIN "baserom.gbc",$4598,$5AF2-$4598