From 91a041f1ad369b99a2ae4a427181f37bcce095bc Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Fri, 27 Jan 2012 22:15:45 -0600 Subject: insert MewBaseStats hg-commit-id: 35f5a02b395f --- extras/insert_texts.py | 8 ++++---- main.asm | 32 +++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/extras/insert_texts.py b/extras/insert_texts.py index bbf7a09d..0f142b55 100644 --- a/extras/insert_texts.py +++ b/extras/insert_texts.py @@ -713,7 +713,7 @@ def base_data_pretty_printer(id): """ output = "" rom = extract_maps.rom - base_address = 0x383de + (28 * (id)) + base_address = 0x425b #0x383de + (28 * (id)) pokedex_number = id mon_name = get_mon_name(id) @@ -775,7 +775,7 @@ def base_data_pretty_printer(id): def insert_base_stats(id): insert_asm = base_data_pretty_printer(id) - address = 0x383de + (28 * (id)) + address = 0x425b #0x383de + (28 * (id)) line_number = find_incbin_to_replace_for(address) label = get_mon_name(id).title() + "BaseStats" if line_number == None: @@ -836,8 +836,8 @@ if __name__ == "__main__": load_asm() isolate_incbins() process_incbins() - #insert_base_stats(1) - insert_all_base_stats() + insert_base_stats(150) + #insert_all_base_stats() #load texts (these two have different formats) #all_texts = pretty_map_headers.analyze_texts.analyze_texts() diff --git a/main.asm b/main.asm index 7b9fafaa..72f87876 100644 --- a/main.asm +++ b/main.asm @@ -6102,7 +6102,37 @@ MewPicBack: ; 0x4205 INCBIN "pic/monback/mewb.pic" ; 0x425b -INCBIN "baserom.gbc",$425b,$42a7 - $425b +MewBaseStats: ; 0x425b + db 151 ; pokedex id + db 100 ; base hp + db 100 ; base attack + db 100 ; base defense + db 100 ; base speed + db 100 ; base special + + db PSYCHIC ; species type 1 + db PSYCHIC ; species type 2 + + db 45 ; catch rate + db 64 ; base exp yield + db $55 ; sprite dimensions + + dw MewPicFront + dw MewPicBack + + ; attacks known at lvl 0 + db POUND + db 0 + db 0 + db 0 + + db 3 ; growth rate + + ; include learnset directly + INCBIN "baserom.gbc",$426f,$4276 - $426f + db $ff ; probably "learn anything" not padding + +INCBIN "baserom.gbc",$4277,$30 UnnamedText_42a7: ; 0x42a7 TX_FAR SafariZoneEatingText -- cgit v1.2.3