Merge branch 'master' into pokenav_match_call
This commit is contained in:
PikalaxALT
@@ -1,174 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A4AC:: @ 860A4AC
|
||||
.2byte 0x0044, 0x005a, 0x0075, 0x00f3, 0x0020, 0x00af, 0x00b3, 0x00ed, 0x0149, 0x0108, 0x011c, 0x0143, 0x008a, 0x0137, 0x00ad, 0x00dc
|
||||
.2byte 0x000c, 0x00da, 0x00d8, 0x011b, 0x00d9, 0x0117, 0xffff, 0x00de, 0x0095, 0xffff
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A4E0:: @ 860A4E0
|
||||
.2byte 0x0001, 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0001, 0x0000, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001
|
||||
.2byte 0x0001, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0005, 0x0005, 0x0004, 0x0005, 0x0001, 0x0003, 0x0001
|
||||
.2byte 0x0003, 0x0005, 0x0001, 0x0007, 0x0001, 0x0007, 0x0007, 0x0001, 0x0005, 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0005, 0x0001
|
||||
.2byte 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001
|
||||
.2byte 0x0001, 0x0007, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0001, 0x0004
|
||||
.2byte 0x0005, 0x0002, 0x0004, 0x0001, 0x0004, 0x0001, 0x0007, 0x0002, 0x0001, 0x0005, 0x0007, 0x0003, 0x0003, 0x0004, 0x0003, 0x0003
|
||||
.2byte 0x0003, 0x0003, 0x0003, 0x0002, 0x0004, 0x0001, 0x0005, 0x0001, 0x0001, 0x0004, 0x0005, 0x0003, 0x0001, 0x0002, 0x0001, 0x0005
|
||||
.2byte 0x0004, 0x0003, 0x0006, 0x0004, 0x0003, 0x0003, 0x0003, 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0005, 0x0001, 0x0001, 0x0007
|
||||
.2byte 0x0002, 0x0002, 0x0001, 0x0001, 0x0004, 0x0004, 0x0004, 0x0001, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0007, 0x0007
|
||||
.2byte 0x0006, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0003, 0x0001, 0x0001, 0x0004, 0x0004
|
||||
.2byte 0x0003, 0x0003, 0x0003, 0x0001, 0x0004, 0x0007, 0x0007, 0x0005, 0x0007, 0x0001, 0x0007, 0x0001, 0x0005, 0x0000, 0x0004, 0x0004
|
||||
.2byte 0x0004, 0x0004, 0x0004, 0x0002, 0x0002, 0x0006, 0x0003, 0x0006, 0x0004, 0x0004, 0x0002, 0x0005, 0x0002, 0x0001, 0x0001, 0x0006
|
||||
.2byte 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0006, 0x0001, 0x0004, 0x0001, 0x0001, 0x0003, 0x0001, 0x0001, 0x0001
|
||||
.2byte 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0003
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A68C:: @ 860A68C
|
||||
.2byte 0x0004, 0xfffd, 0xfffa
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A692:: @ 860A692
|
||||
.2byte 0x0004, 0x0004, 0x0006, 0x0006, 0x0007, 0x0006, 0x0002
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A6A0:: @ 860A6A0
|
||||
.2byte 0x0091, 0x0003, 0x00fa, 0x0003, 0x00be, 0x0003, 0x0080, 0x0003, 0x006e, 0x0003, 0x0098, 0x0003, 0x0143, 0x0003, 0x0123, 0x0003
|
||||
.2byte 0x007f, 0x0003, 0x014a, 0x0003, 0x0039, 0x0003, 0x0134, 0x0003, 0x0038, 0x0003, 0x003d, 0x0003, 0x015a, 0x0000, 0x0037, 0x0003
|
||||
.2byte 0x0160, 0x0003, 0x0137, 0x0003, 0x0057, 0x0003, 0x004c, 0xfffc, 0x013b, 0xfffc, 0x00ac, 0xfffc, 0x0035, 0xfffc, 0x00dd, 0xfffc
|
||||
.2byte 0x007e, 0xfffc, 0x0101, 0xfffc, 0x0034, 0xfffc, 0x0133, 0xfffc, 0x012b, 0xfffc, 0x011c, 0xfffc, 0x0053, 0xfffc, 0x0007, 0xfffc
|
||||
.2byte 0x004c, 0xfffc, 0xffff, 0x0000
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A728:: @ 860A728
|
||||
.2byte 0x013b, 0x0003, 0x00ac, 0x0003, 0x0035, 0x0003, 0x00dd, 0x0003, 0x007e, 0x0003, 0x0101, 0x0003, 0x0034, 0x0003, 0x0133, 0x0003
|
||||
.2byte 0x012b, 0x0003, 0x011c, 0x0003, 0x0053, 0x0003, 0x0007, 0x0003, 0x004c, 0x0005, 0x00eb, 0x0003, 0x00ea, 0x0003, 0x00ec, 0x0003
|
||||
.2byte 0x0137, 0x0003, 0xffff, 0x0000
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A770:: @ 860A770
|
||||
.2byte 0x0137, 0x0003, 0x004c, 0xfffd, 0xffff, 0x0000
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A77C:: @ 860A77C
|
||||
.2byte 0x0137, 0x0003, 0x004c, 0xfffd, 0xffff, 0x0000
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A788:: @ 860A788
|
||||
.2byte 0x0055, 0x0003, 0x0009, 0x0003, 0x00d1, 0x0003, 0x0054, 0x0003, 0x00c0, 0x0003, 0x015f, 0x0003, 0x0056, 0x0000, 0x0057, 0x0003
|
||||
.2byte 0x0158, 0x0003, 0xffff, 0x0000
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7B0:: @ 860A7B0
|
||||
.2byte 0x0005, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7BE:: @ 860A7BE
|
||||
.2byte 0x0005, 0x0005, 0x0005, 0x0005, 0x0005
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7C8:: @ 860A7C8
|
||||
.2byte 0x0004
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7CA:: @ 860A7CA
|
||||
.2byte 0x0005
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7CC:: @ 860A7CC
|
||||
.2byte 0x0005
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7CE:: @ 860A7CE
|
||||
.2byte 0x0003
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7D0:: @ 860A7D0
|
||||
.2byte 0x0003
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7D2:: @ 860A7D2
|
||||
.2byte 0x0004
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7D4:: @ 860A7D4
|
||||
.2byte 0x0003
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7D6:: @ 860A7D6
|
||||
.2byte 0x0006
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7D8:: @ 860A7D8
|
||||
.2byte 0x0006
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7DA:: @ 860A7DA
|
||||
.2byte 0x0006
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7DC:: @ 860A7DC
|
||||
.2byte 0x0004
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7DE:: @ 860A7DE
|
||||
.2byte 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7EC:: @ 860A7EC
|
||||
.2byte 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A7FA:: @ 860A7FA
|
||||
.2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A808:: @ 860A808
|
||||
.2byte 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A816:: @ 860A816
|
||||
.2byte 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A824:: @ 860A824
|
||||
.2byte 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe
|
||||
|
||||
.align 2
|
||||
gUnknown_0860A834:: @ 860A834
|
||||
.4byte gUnknown_0860A4E0
|
||||
.4byte gUnknown_0860A68C
|
||||
.4byte gUnknown_0860A692
|
||||
.4byte gUnknown_0860A6A0
|
||||
.4byte gUnknown_0860A728
|
||||
.4byte gUnknown_0860A770
|
||||
.4byte gUnknown_0860A77C
|
||||
.4byte gUnknown_0860A788
|
||||
.4byte gUnknown_0860A7B0
|
||||
.4byte gUnknown_0860A7BE
|
||||
.4byte gUnknown_0860A7C8
|
||||
.4byte gUnknown_0860A7CA
|
||||
.4byte gUnknown_0860A7CC
|
||||
.4byte gUnknown_0860A7CE
|
||||
.4byte gUnknown_0860A7D0
|
||||
.4byte gUnknown_0860A7D2
|
||||
.4byte gUnknown_0860A7D4
|
||||
.4byte gUnknown_0860A7D6
|
||||
.4byte gUnknown_0860A7D8
|
||||
.4byte gUnknown_0860A7DA
|
||||
.4byte gUnknown_0860A7DA
|
||||
.4byte gUnknown_0860A7DC
|
||||
.4byte gUnknown_0860A7DE
|
||||
.4byte gUnknown_0860A7EC
|
||||
.4byte gUnknown_0860A7FA
|
||||
.4byte gUnknown_0860A808
|
||||
.4byte gUnknown_0860A816
|
||||
.4byte gUnknown_0860A824
|
||||
|
||||
.align 1
|
||||
gUnknown_0860A8A4:: @ 860A8A4
|
||||
.2byte 0x0097, 0x00b2, 0x00bc, 0x008c, 0x00b4, 0x00b5, 0x0093, 0x006a, 0x0091, 0x005e, 0x0030, 0x002a, 0x0095, 0x001c, 0x001d, 0x0064
|
||||
.2byte 0x0060, 0xffff
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -4866,21 +4866,3 @@ gUnknown_0831ACDC:: @ 831ACDC
|
||||
.align 2
|
||||
gUnknown_0831ACE0:: @ 831ACE0
|
||||
.byte 0xe0, 0xf0, 0xf0, 0xe0, 0xe0, 0x00, 0x00, 0x00
|
||||
|
||||
@ 831ACE8
|
||||
.include "data/type_effectiveness.inc"
|
||||
|
||||
@ 831AE38
|
||||
.include "data/text/type_names.inc"
|
||||
|
||||
@ 831AEB8
|
||||
.include "data/trainer_money.inc"
|
||||
|
||||
@ 831AF98
|
||||
.include "data/text/ability_descriptions.inc"
|
||||
|
||||
@ 831B6DB
|
||||
.include "data/text/ability_names.inc"
|
||||
|
||||
@ 831BAD4
|
||||
.include "data/text/ability_description_pointers.inc"
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
#include "constants/abilities.h"
|
||||
#include "constants/items.h"
|
||||
#include "constants/moves.h"
|
||||
#include "constants/species.h"
|
||||
#include "constants/pokemon.h"
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
|
||||
@ 831C898
|
||||
.include "data/battle_moves.inc"
|
||||
|
||||
@ 0x31d93c
|
||||
@ unreferenced unknown data
|
||||
.byte 0x34, 0x00, 0x10, 0x00, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00
|
||||
@@ -1161,7 +1161,7 @@ EventScript_2715DE:: @ 82715DE
|
||||
setflag FLAG_0x376
|
||||
setflag FLAG_0x374
|
||||
setflag FLAG_0x375
|
||||
setflag FLAG_0x3C1
|
||||
setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
|
||||
setflag FLAG_0x378
|
||||
setflag FLAG_0x2F0
|
||||
setflag FLAG_0x2F5
|
||||
@@ -1177,7 +1177,7 @@ EventScript_2715DE:: @ 82715DE
|
||||
setflag FLAG_0x38F
|
||||
setflag FLAG_0x393
|
||||
setflag FLAG_0x358
|
||||
setflag FLAG_0x390
|
||||
setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
|
||||
setflag FLAG_0x2FD
|
||||
setflag FLAG_0x398
|
||||
setflag FLAG_0x399
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gUnknown_085B27C8:: @ 85B27C8
|
||||
.byte 0x01, 0x04, 0x01, 0x00
|
||||
.4byte sub_81375A8
|
||||
|
||||
.byte 0x02, 0x04, 0x01, 0x00
|
||||
.4byte sub_81375A8
|
||||
|
||||
.byte 0x03, 0x04, 0x01, 0x00
|
||||
.4byte sub_81375A8
|
||||
|
||||
.byte 0x05, 0x04, 0x01, 0x00
|
||||
.4byte sub_81375A8
|
||||
|
||||
.byte 0x06, 0x04, 0x01, 0x00
|
||||
.4byte sub_81375A8
|
||||
|
||||
.byte 0x07, 0x04, 0x01, 0x00
|
||||
.4byte sub_81375A8
|
||||
|
||||
.byte 0x08, 0x04, 0x01, 0x00
|
||||
.4byte sub_81375A8
|
||||
|
||||
.byte 0x09, 0x04, 0x01, 0x00
|
||||
.4byte sub_81375A8
|
||||
|
||||
.byte 0x04, 0x01, 0x00, 0x01
|
||||
.4byte sub_81373F0
|
||||
|
||||
.byte 0x04, 0x02, 0x00, 0x01
|
||||
.4byte sub_81373F0
|
||||
|
||||
.byte 0x04, 0x03, 0x00, 0x01
|
||||
.4byte sub_81373F0
|
||||
|
||||
.byte 0x04, 0x05, 0x00, 0x01
|
||||
.4byte sub_81373F0
|
||||
|
||||
.byte 0x04, 0x06, 0x00, 0x01
|
||||
.4byte sub_81373F0
|
||||
|
||||
.byte 0x04, 0x07, 0x00, 0x01
|
||||
.4byte sub_81373F0
|
||||
|
||||
.byte 0x04, 0x08, 0x00, 0x01
|
||||
.4byte sub_81373F0
|
||||
|
||||
.byte 0x04, 0x09, 0x00, 0x01
|
||||
.4byte sub_81373F0
|
||||
|
||||
.byte 0x00, 0x00, 0x00, 0x00
|
||||
.4byte NULL
|
||||
|
||||
.align 2
|
||||
gCaveTransitionPalette_White:: @ 85B2850
|
||||
.incbin "graphics/misc/cave_transition_white.gbapal"
|
||||
|
||||
.align 2
|
||||
gCaveTransitionPalette_Black:: @ 85B2870
|
||||
.incbin "graphics/misc/cave_transition_black.gbapal"
|
||||
|
||||
.align 2
|
||||
gUnknown_085B2890:: @ 85B2890
|
||||
.incbin "graphics/misc/85B2890.gbapal"
|
||||
|
||||
.align 2
|
||||
gUnknown_085B28A0:: @ 85B28A0
|
||||
.incbin "graphics/misc/85B28A0.gbapal"
|
||||
|
||||
.align 2
|
||||
gCaveTransitionTilemap:: @ 85B28B0
|
||||
.incbin "graphics/misc/cave_transition_map.bin.lz"
|
||||
|
||||
.align 2
|
||||
gCaveTransitionTiles:: @ 85B2A90
|
||||
.incbin "graphics/misc/cave_transition.4bpp.lz"
|
||||
@@ -1,98 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gUnknown_08617274:: @ 8617274
|
||||
.space 0x20
|
||||
.incbin "graphics/misc/mirage_tower.4bpp"
|
||||
|
||||
.align 2
|
||||
gUnknown_08617B94:: @ 8617B94
|
||||
.incbin "graphics/misc/mirage_tower.bin"
|
||||
|
||||
.align 2
|
||||
gRootFossil_Pal:: @ 8617C24
|
||||
.incbin "graphics/misc/fossil.gbapal"
|
||||
|
||||
.align 2
|
||||
gRootFossil_Gfx:: @ 8617C44
|
||||
.incbin "graphics/misc/fossil.4bpp"
|
||||
|
||||
.align 2
|
||||
gMirageTowerCrumbles_Gfx:: @ 8617CC4
|
||||
.incbin "graphics/misc/mirage_tower_crumbles.4bpp"
|
||||
|
||||
.align 2
|
||||
gMirageTowerCrumbles_Palette:: @ 8617D44
|
||||
.incbin "graphics/misc/mirage_tower_crumbles.gbapal"
|
||||
|
||||
.align 1
|
||||
gUnknown_08617D64:: @ 8617D64
|
||||
.2byte 0x0000, 0x000a, 0x0041, 0x0011, 0x0003, 0x0032, 0xfff4, 0x0000, 0x004b, 0x000a, 0x000f, 0x005a, 0x0007, 0x0008, 0x0041, 0xffee
|
||||
.2byte 0x0005, 0x004b, 0x0016, 0xfff6, 0x0037, 0xffe8, 0xfffc, 0x0041
|
||||
|
||||
.align 2
|
||||
gUnknown_08617D94:: @ 8617D94
|
||||
obj_tiles gMirageTowerCrumbles_Gfx, 0x0080, 0x0fa0
|
||||
null_obj_tiles
|
||||
|
||||
.align 2
|
||||
gUnknown_08617DA4:: @ 8617DA4
|
||||
.byte 0x12, 0x35, 0x51, 0x02, 0x13, 0x35, 0x51, 0x02, 0x14, 0x35, 0x51, 0x02, 0x12, 0x36, 0x51, 0x02, 0x13, 0x36, 0x51, 0x02, 0x14, 0x36, 0x51, 0x02, 0x12, 0x37, 0x51, 0x02, 0x13, 0x37, 0x51, 0x02
|
||||
.byte 0x14, 0x37, 0x51, 0x02, 0x12, 0x38, 0x51, 0x02, 0x13, 0x38, 0x51, 0x02, 0x14, 0x38, 0x51, 0x02, 0x12, 0x39, 0x59, 0x02, 0x13, 0x39, 0x59, 0x02, 0x14, 0x39, 0x59, 0x02, 0x12, 0x3a, 0x21, 0x01
|
||||
.byte 0x13, 0x3a, 0x21, 0x01, 0x14, 0x3a, 0x21, 0x01
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8617DEC:: @ 8617DEC
|
||||
.2byte 0x0000, 0x0001, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gOamData_8617DF4:: @ 8617DF4
|
||||
.2byte 0x0000, 0x4000, 0x3000, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_8617DFC:: @ 8617DFC
|
||||
.4byte gSpriteAnim_8617DEC
|
||||
|
||||
.align 2
|
||||
gUnknown_08617E00:: @ 8617E00
|
||||
spr_template 0xffff, 0xffff, gOamData_8617DF4, gSpriteAnimTable_8617DFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_08617E18:: @ 8617E18
|
||||
.byte 0x3b, 0x43, 0x61, 0x00, 0x0f, 0x05, 0xff, 0x9b
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8617E20:: @ 8617E20
|
||||
.2byte 0x0000, 0x000c, 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnimTable_8617E28:: @ 8617E28
|
||||
.4byte gSpriteAnim_8617E20
|
||||
|
||||
.align 2
|
||||
gUnknown_08617E2C:: @ 8617E2C
|
||||
.2byte 0x0000, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_08617E34:: @ 8617E34
|
||||
spr_template 0x0fa0, 0xffff, gUnknown_08617E2C, gSpriteAnimTable_8617E28, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8617E4C:: @ 8617E4C
|
||||
.2byte 0x0000, 0x000c, 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gSpriteAnim_8617E54:: @ 8617E54
|
||||
.4byte gSpriteAnim_8617E4C
|
||||
|
||||
.align 2
|
||||
gOamData_8617E58:: @ 8617E58
|
||||
.2byte 0x0000, 0x4000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_08617E60:: @ 8617E60
|
||||
spr_template 0x0fa0, 0xffff, gOamData_8617E58, gSpriteAnim_8617E54, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8
|
||||
|
||||
@@ -5,18 +5,18 @@ MauvilleCity_MapScripts:: @ 81DF385
|
||||
MauvilleCity_MapScript1_1DF38B: @ 81DF38B
|
||||
setflag FLAG_VISITED_MAUVILLE_CITY
|
||||
clearflag FLAG_0x09D
|
||||
clearflag FLAG_0x3C1
|
||||
clearflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION
|
||||
setflag FLAG_SYS_TV_START
|
||||
clearflag FLAG_0x063
|
||||
setvar VAR_0x4093, 0
|
||||
checkflag FLAG_0x0D1
|
||||
checkflag FLAG_GOT_TM24_FROM_WATTSON
|
||||
call_if 1, MauvilleCity_EventScript_1DF3A9
|
||||
end
|
||||
|
||||
MauvilleCity_EventScript_1DF3A9:: @ 81DF3A9
|
||||
clearflag FLAG_0x391
|
||||
setflag FLAG_0x390
|
||||
setflag FLAG_0x05B
|
||||
clearflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
|
||||
setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
|
||||
setflag FLAG_WATTSON_REMATCH_AVAILABLE
|
||||
return
|
||||
|
||||
MauvilleCity_EventScript_1DF3B3:: @ 81DF3B3
|
||||
@@ -424,15 +424,15 @@ MauvilleCity_Movement_1DF72F: @ 81DF72F
|
||||
MauvilleCity_EventScript_1DF73A:: @ 81DF73A
|
||||
lock
|
||||
faceplayer
|
||||
checkflag FLAG_0x0D1
|
||||
checkflag FLAG_GOT_TM24_FROM_WATTSON
|
||||
goto_eq MauvilleCity_EventScript_1DF7B0
|
||||
compare VAR_0x40BA, 2
|
||||
goto_eq MauvilleCity_EventScript_1DF784
|
||||
checkflag FLAG_0x0D0
|
||||
checkflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
|
||||
goto_eq MauvilleCity_EventScript_1DF77A
|
||||
msgbox MauvilleCity_Text_1DFFE4, 4
|
||||
giveitem_std ITEM_BASEMENT_KEY
|
||||
setflag FLAG_0x0D0
|
||||
setflag FLAG_GOT_BASEMENT_KEY_FROM_WATTSON
|
||||
msgbox MauvilleCity_Text_1E0154, 4
|
||||
release
|
||||
end
|
||||
@@ -447,7 +447,7 @@ MauvilleCity_EventScript_1DF784:: @ 81DF784
|
||||
giveitem_std ITEM_TM24
|
||||
compare VAR_RESULT, 0
|
||||
goto_eq MauvilleCity_EventScript_272054
|
||||
setflag FLAG_0x0D1
|
||||
setflag FLAG_GOT_TM24_FROM_WATTSON
|
||||
msgbox MauvilleCity_Text_1E02AA, 4
|
||||
release
|
||||
end
|
||||
|
||||
@@ -423,8 +423,8 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
|
||||
setflag FLAG_BADGE05_GET
|
||||
special sub_813B9A0
|
||||
call PetalburgCity_Gym_EventScript_2721F8
|
||||
setflag FLAG_0x391
|
||||
clearflag FLAG_0x390
|
||||
setflag FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON
|
||||
clearflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON
|
||||
setvar VAR_0x8008, 5
|
||||
call PetalburgCity_Gym_EventScript_271F43
|
||||
clearflag FLAG_0x3AC
|
||||
|
||||
@@ -1,80 +0,0 @@
|
||||
.align 2
|
||||
gAbilityDescriptionPointers:: @ 831BAD4
|
||||
.4byte gNoneAbilityDescription
|
||||
.4byte gStenchAbilityDescription
|
||||
.4byte gDrizzleAbilityDescription
|
||||
.4byte gSpeedBoostAbilityDescription
|
||||
.4byte gBattleArmorAbilityDescription
|
||||
.4byte gSturdyAbilityDescription
|
||||
.4byte gDampAbilityDescription
|
||||
.4byte gLimberAbilityDescription
|
||||
.4byte gSandVeilAbilityDescription
|
||||
.4byte gStaticAbilityDescription
|
||||
.4byte gVoltAbsorbAbilityDescription
|
||||
.4byte gWaterAbsorbAbilityDescription
|
||||
.4byte gObliviousAbilityDescription
|
||||
.4byte gCloudNineAbilityDescription
|
||||
.4byte gCompoundEyesAbilityDescription
|
||||
.4byte gInsomniaAbilityDescription
|
||||
.4byte gColorChangeAbilityDescription
|
||||
.4byte gImmunityAbilityDescription
|
||||
.4byte gFlashFireAbilityDescription
|
||||
.4byte gShieldDustAbilityDescription
|
||||
.4byte gOwnTempoAbilityDescription
|
||||
.4byte gSuctionCupsAbilityDescription
|
||||
.4byte gIntimidateAbilityDescription
|
||||
.4byte gShadowTagAbilityDescription
|
||||
.4byte gRoughSkinAbilityDescription
|
||||
.4byte gWonderGuardAbilityDescription
|
||||
.4byte gLevitateAbilityDescription
|
||||
.4byte gEffectSporeAbilityDescription
|
||||
.4byte gSynchronizeAbilityDescription
|
||||
.4byte gClearBodyAbilityDescription
|
||||
.4byte gNaturalCureAbilityDescription
|
||||
.4byte gLightningRodAbilityDescription
|
||||
.4byte gSereneGraceAbilityDescription
|
||||
.4byte gSwiftSwimAbilityDescription
|
||||
.4byte gChlorophyllAbilityDescription
|
||||
.4byte gIlluminateAbilityDescription
|
||||
.4byte gTraceAbilityDescription
|
||||
.4byte gHugePowerAbilityDescription
|
||||
.4byte gPoisonPointAbilityDescription
|
||||
.4byte gInnerFocusAbilityDescription
|
||||
.4byte gMagmaArmorAbilityDescription
|
||||
.4byte gWaterVeilAbilityDescription
|
||||
.4byte gMagnetPullAbilityDescription
|
||||
.4byte gSoundproofAbilityDescription
|
||||
.4byte gRainDishAbilityDescription
|
||||
.4byte gSandStreamAbilityDescription
|
||||
.4byte gPressureAbilityDescription
|
||||
.4byte gThickFatAbilityDescription
|
||||
.4byte gEarlyBirdAbilityDescription
|
||||
.4byte gFlameBodyAbilityDescription
|
||||
.4byte gRunAwayAbilityDescription
|
||||
.4byte gKeenEyeAbilityDescription
|
||||
.4byte gHyperCutterAbilityDescription
|
||||
.4byte gPickupAbilityDescription
|
||||
.4byte gTruantAbilityDescription
|
||||
.4byte gHustleAbilityDescription
|
||||
.4byte gCuteCharmAbilityDescription
|
||||
.4byte gPlusAbilityDescription
|
||||
.4byte gMinusAbilityDescription
|
||||
.4byte gForecastAbilityDescription
|
||||
.4byte gStickyHoldAbilityDescription
|
||||
.4byte gShedSkinAbilityDescription
|
||||
.4byte gGutsAbilityDescription
|
||||
.4byte gMarvelScaleAbilityDescription
|
||||
.4byte gLiquidOozeAbilityDescription
|
||||
.4byte gOvergrowAbilityDescription
|
||||
.4byte gBlazeAbilityDescription
|
||||
.4byte gTorrentAbilityDescription
|
||||
.4byte gSwarmAbilityDescription
|
||||
.4byte gRockHeadAbilityDescription
|
||||
.4byte gDroughtAbilityDescription
|
||||
.4byte gArenaTrapAbilityDescription
|
||||
.4byte gVitalSpiritAbilityDescription
|
||||
.4byte gWhiteSmokeAbilityDescription
|
||||
.4byte gPurePowerAbilityDescription
|
||||
.4byte gShellArmorAbilityDescription
|
||||
.4byte gCacophonyAbilityDescription
|
||||
.4byte gAirLockAbilityDescription
|
||||
@@ -1,233 +0,0 @@
|
||||
gNoneAbilityDescription:: @ 831AF98
|
||||
.string "No special ability.$"
|
||||
|
||||
gStenchAbilityDescription:: @ 831AFAC
|
||||
.string "Helps repel wild POKéMON.$"
|
||||
|
||||
gDrizzleAbilityDescription:: @ 831AFC6
|
||||
.string "Summons rain in battle.$"
|
||||
|
||||
gSpeedBoostAbilityDescription:: @ 831AFDE
|
||||
.string "Gradually boosts SPEED.$"
|
||||
|
||||
gBattleArmorAbilityDescription:: @ 831AFF6
|
||||
.string "Blocks critical hits.$"
|
||||
|
||||
gSturdyAbilityDescription:: @ 831B00C
|
||||
.string "Negates 1-hit KO attacks.$"
|
||||
|
||||
gDampAbilityDescription:: @ 831B026
|
||||
.string "Prevents self-destruction.$"
|
||||
|
||||
gLimberAbilityDescription:: @ 831B041
|
||||
.string "Prevents paralysis.$"
|
||||
|
||||
gSandVeilAbilityDescription:: @ 831B055
|
||||
.string "Ups evasion in a sandstorm.$"
|
||||
|
||||
gStaticAbilityDescription:: @ 831B071
|
||||
.string "Paralyzes on contact.$"
|
||||
|
||||
gVoltAbsorbAbilityDescription:: @ 831B087
|
||||
.string "Turns electricity into HP.$"
|
||||
|
||||
gWaterAbsorbAbilityDescription:: @ 831B0A2
|
||||
.string "Changes water into HP.$"
|
||||
|
||||
gObliviousAbilityDescription:: @ 831B0B9
|
||||
.string "Prevents attraction.$"
|
||||
|
||||
gCloudNineAbilityDescription:: @ 831B0CE
|
||||
.string "Negates weather effects.$"
|
||||
|
||||
gCompoundEyesAbilityDescription:: @ 831B0E7
|
||||
.string "Raises accuracy.$"
|
||||
|
||||
gInsomniaAbilityDescription:: @ 831B0F8
|
||||
.string "Prevents sleep.$"
|
||||
|
||||
gColorChangeAbilityDescription:: @ 831B108
|
||||
.string "Changes type to foe’s move.$"
|
||||
|
||||
gImmunityAbilityDescription:: @ 831B124
|
||||
.string "Prevents poisoning.$"
|
||||
|
||||
gFlashFireAbilityDescription:: @ 831B138
|
||||
.string "Powers up if hit by fire.$"
|
||||
|
||||
gShieldDustAbilityDescription:: @ 831B152
|
||||
.string "Prevents added effects.$"
|
||||
|
||||
gOwnTempoAbilityDescription:: @ 831B16A
|
||||
.string "Prevents confusion.$"
|
||||
|
||||
gSuctionCupsAbilityDescription:: @ 831B17E
|
||||
.string "Firmly anchors the body.$"
|
||||
|
||||
gIntimidateAbilityDescription:: @ 831B197
|
||||
.string "Lowers the foe’s ATTACK.$"
|
||||
|
||||
gShadowTagAbilityDescription:: @ 831B1B0
|
||||
.string "Prevents the foe’s escape.$"
|
||||
|
||||
gRoughSkinAbilityDescription:: @ 831B1CB
|
||||
.string "Hurts to touch.$"
|
||||
|
||||
gWonderGuardAbilityDescription:: @ 831B1DB
|
||||
.string "“Super effective” hits.$"
|
||||
|
||||
gLevitateAbilityDescription:: @ 831B1F3
|
||||
.string "Not hit by GROUND attacks.$"
|
||||
|
||||
gEffectSporeAbilityDescription:: @ 831B20E
|
||||
.string "Leaves spores on contact.$"
|
||||
|
||||
gSynchronizeAbilityDescription:: @ 831B228
|
||||
.string "Passes on status problems.$"
|
||||
|
||||
gClearBodyAbilityDescription:: @ 831B243
|
||||
.string "Prevents ability reduction.$"
|
||||
|
||||
gNaturalCureAbilityDescription:: @ 831B25F
|
||||
.string "Heals upon switching out.$"
|
||||
|
||||
gLightningRodAbilityDescription:: @ 831B279
|
||||
.string "Draws electrical moves.$"
|
||||
|
||||
gSereneGraceAbilityDescription:: @ 831B291
|
||||
.string "Promotes added effects.$"
|
||||
|
||||
gSwiftSwimAbilityDescription:: @ 831B2A9
|
||||
.string "Raises SPEED in rain.$"
|
||||
|
||||
gChlorophyllAbilityDescription:: @ 831B2BF
|
||||
.string "Raises SPEED in sunshine.$"
|
||||
|
||||
gIlluminateAbilityDescription:: @ 831B2D9
|
||||
.string "Encounter rate increases.$"
|
||||
|
||||
gTraceAbilityDescription:: @ 831B2F3
|
||||
.string "Copies special ability.$"
|
||||
|
||||
gHugePowerAbilityDescription:: @ 831B30B
|
||||
.string "Raises ATTACK.$"
|
||||
|
||||
gPoisonPointAbilityDescription:: @ 831B31A
|
||||
.string "Poisons foe on contact.$"
|
||||
|
||||
gInnerFocusAbilityDescription:: @ 831B332
|
||||
.string "Prevents flinching.$"
|
||||
|
||||
gMagmaArmorAbilityDescription:: @ 831B346
|
||||
.string "Prevents freezing.$"
|
||||
|
||||
gWaterVeilAbilityDescription:: @ 831B359
|
||||
.string "Prevents burns.$"
|
||||
|
||||
gMagnetPullAbilityDescription:: @ 831B369
|
||||
.string "Traps STEEL-type POKéMON.$"
|
||||
|
||||
gSoundproofAbilityDescription:: @ 831B383
|
||||
.string "Avoids sound-based moves.$"
|
||||
|
||||
gRainDishAbilityDescription:: @ 831B39D
|
||||
.string "Slight HP recovery in rain.$"
|
||||
|
||||
gSandStreamAbilityDescription:: @ 831B3B9
|
||||
.string "Summons a sandstorm.$"
|
||||
|
||||
gPressureAbilityDescription:: @ 831B3CE
|
||||
.string "Raises foe’s PP usage.$"
|
||||
|
||||
gThickFatAbilityDescription:: @ 831B3E5
|
||||
.string "Heat-and-cold protection.$"
|
||||
|
||||
gEarlyBirdAbilityDescription:: @ 831B3FF
|
||||
.string "Awakens quickly from sleep.$"
|
||||
|
||||
gFlameBodyAbilityDescription:: @ 831B41B
|
||||
.string "Burns the foe on contact.$"
|
||||
|
||||
gRunAwayAbilityDescription:: @ 831B435
|
||||
.string "Makes escaping easier.$"
|
||||
|
||||
gKeenEyeAbilityDescription:: @ 831B44C
|
||||
.string "Prevents loss of accuracy.$"
|
||||
|
||||
gHyperCutterAbilityDescription:: @ 831B467
|
||||
.string "Prevents ATTACK reduction.$"
|
||||
|
||||
gPickupAbilityDescription:: @ 831B482
|
||||
.string "May pick up items.$"
|
||||
|
||||
gTruantAbilityDescription:: @ 831B495
|
||||
.string "Moves only every two turns.$"
|
||||
|
||||
gHustleAbilityDescription:: @ 831B4B1
|
||||
.string "Trades accuracy for power.$"
|
||||
|
||||
gCuteCharmAbilityDescription:: @ 831B4CC
|
||||
.string "Infatuates on contact.$"
|
||||
|
||||
gPlusAbilityDescription:: @ 831B4E3
|
||||
.string "Powers up with MINUS.$"
|
||||
|
||||
gMinusAbilityDescription:: @ 831B4F9
|
||||
.string "Powers up with PLUS.$"
|
||||
|
||||
gForecastAbilityDescription:: @ 831B50E
|
||||
.string "Changes with the weather.$"
|
||||
|
||||
gStickyHoldAbilityDescription:: @ 831B528
|
||||
.string "Prevents item theft.$"
|
||||
|
||||
gShedSkinAbilityDescription:: @ 831B53D
|
||||
.string "Heals the body by shedding.$"
|
||||
|
||||
gGutsAbilityDescription:: @ 831B559
|
||||
.string "Ups ATTACK if suffering.$"
|
||||
|
||||
gMarvelScaleAbilityDescription:: @ 831B572
|
||||
.string "Ups DEFENSE if suffering.$"
|
||||
|
||||
gLiquidOozeAbilityDescription:: @ 831B58C
|
||||
.string "Draining causes injury.$"
|
||||
|
||||
gOvergrowAbilityDescription:: @ 831B5A4
|
||||
.string "Ups GRASS moves in a pinch.$"
|
||||
|
||||
gBlazeAbilityDescription:: @ 831B5C0
|
||||
.string "Ups FIRE moves in a pinch.$"
|
||||
|
||||
gTorrentAbilityDescription:: @ 831B5DB
|
||||
.string "Ups WATER moves in a pinch.$"
|
||||
|
||||
gSwarmAbilityDescription:: @ 831B5F7
|
||||
.string "Ups BUG moves in a pinch.$"
|
||||
|
||||
gRockHeadAbilityDescription:: @ 831B611
|
||||
.string "Prevents recoil damage.$"
|
||||
|
||||
gDroughtAbilityDescription:: @ 831B629
|
||||
.string "Summons sunlight in battle.$"
|
||||
|
||||
gArenaTrapAbilityDescription:: @ 831B645
|
||||
.string "Prevents fleeing.$"
|
||||
|
||||
gVitalSpiritAbilityDescription:: @ 831B657
|
||||
.string "Prevents sleep.$"
|
||||
|
||||
gWhiteSmokeAbilityDescription:: @ 831B667
|
||||
.string "Prevents ability reduction.$"
|
||||
|
||||
gPurePowerAbilityDescription:: @ 831B683
|
||||
.string "Raises ATTACK.$"
|
||||
|
||||
gShellArmorAbilityDescription:: @ 831B692
|
||||
.string "Blocks critical hits.$"
|
||||
|
||||
gCacophonyAbilityDescription:: @ 831B6A8
|
||||
.string "Avoids sound-based moves.$"
|
||||
|
||||
gAirLockAbilityDescription:: @ 831B6C2
|
||||
.string "Negates weather effects.$"
|
||||
@@ -1,79 +0,0 @@
|
||||
gAbilityNames:: @ 831B6DB
|
||||
.string "-------$", 13
|
||||
.string "STENCH$", 13
|
||||
.string "DRIZZLE$", 13
|
||||
.string "SPEED BOOST$", 13
|
||||
.string "BATTLE ARMOR$", 13
|
||||
.string "STURDY$", 13
|
||||
.string "DAMP$", 13
|
||||
.string "LIMBER$", 13
|
||||
.string "SAND VEIL$", 13
|
||||
.string "STATIC$", 13
|
||||
.string "VOLT ABSORB$", 13
|
||||
.string "WATER ABSORB$", 13
|
||||
.string "OBLIVIOUS$", 13
|
||||
.string "CLOUD NINE$", 13
|
||||
.string "COMPOUNDEYES$", 13
|
||||
.string "INSOMNIA$", 13
|
||||
.string "COLOR CHANGE$", 13
|
||||
.string "IMMUNITY$", 13
|
||||
.string "FLASH FIRE$", 13
|
||||
.string "SHIELD DUST$", 13
|
||||
.string "OWN TEMPO$", 13
|
||||
.string "SUCTION CUPS$", 13
|
||||
.string "INTIMIDATE$", 13
|
||||
.string "SHADOW TAG$", 13
|
||||
.string "ROUGH SKIN$", 13
|
||||
.string "WONDER GUARD$", 13
|
||||
.string "LEVITATE$", 13
|
||||
.string "EFFECT SPORE$", 13
|
||||
.string "SYNCHRONIZE$", 13
|
||||
.string "CLEAR BODY$", 13
|
||||
.string "NATURAL CURE$", 13
|
||||
.string "LIGHTNINGROD$", 13
|
||||
.string "SERENE GRACE$", 13
|
||||
.string "SWIFT SWIM$", 13
|
||||
.string "CHLOROPHYLL$", 13
|
||||
.string "ILLUMINATE$", 13
|
||||
.string "TRACE$", 13
|
||||
.string "HUGE POWER$", 13
|
||||
.string "POISON POINT$", 13
|
||||
.string "INNER FOCUS$", 13
|
||||
.string "MAGMA ARMOR$", 13
|
||||
.string "WATER VEIL$", 13
|
||||
.string "MAGNET PULL$", 13
|
||||
.string "SOUNDPROOF$", 13
|
||||
.string "RAIN DISH$", 13
|
||||
.string "SAND STREAM$", 13
|
||||
.string "PRESSURE$", 13
|
||||
.string "THICK FAT$", 13
|
||||
.string "EARLY BIRD$", 13
|
||||
.string "FLAME BODY$", 13
|
||||
.string "RUN AWAY$", 13
|
||||
.string "KEEN EYE$", 13
|
||||
.string "HYPER CUTTER$", 13
|
||||
.string "PICKUP$", 13
|
||||
.string "TRUANT$", 13
|
||||
.string "HUSTLE$", 13
|
||||
.string "CUTE CHARM$", 13
|
||||
.string "PLUS$", 13
|
||||
.string "MINUS$", 13
|
||||
.string "FORECAST$", 13
|
||||
.string "STICKY HOLD$", 13
|
||||
.string "SHED SKIN$", 13
|
||||
.string "GUTS$", 13
|
||||
.string "MARVEL SCALE$", 13
|
||||
.string "LIQUID OOZE$", 13
|
||||
.string "OVERGROW$", 13
|
||||
.string "BLAZE$", 13
|
||||
.string "TORRENT$", 13
|
||||
.string "SWARM$", 13
|
||||
.string "ROCK HEAD$", 13
|
||||
.string "DROUGHT$", 13
|
||||
.string "ARENA TRAP$", 13
|
||||
.string "VITAL SPIRIT$", 13
|
||||
.string "WHITE SMOKE$", 13
|
||||
.string "PURE POWER$", 13
|
||||
.string "SHELL ARMOR$", 13
|
||||
.string "CACOPHONY$", 13
|
||||
.string "AIR LOCK$", 13
|
||||
@@ -1,19 +0,0 @@
|
||||
gTypeNames:: @ 831AE38
|
||||
.string "NORMAL$", 7
|
||||
.string "FIGHT$", 7
|
||||
.string "FLYING$", 7
|
||||
.string "POISON$", 7
|
||||
.string "GROUND$", 7
|
||||
.string "ROCK$", 7
|
||||
.string "BUG$", 7
|
||||
.string "GHOST$", 7
|
||||
.string "STEEL$", 7
|
||||
.string "???$", 7
|
||||
.string "FIRE$", 7
|
||||
.string "WATER$", 7
|
||||
.string "GRASS$", 7
|
||||
.string "ELECTR$", 7
|
||||
.string "PSYCHC$", 7
|
||||
.string "ICE$", 7
|
||||
.string "DRAGON$", 7
|
||||
.string "DARK$", 7
|
||||
@@ -1,59 +0,0 @@
|
||||
@ This is a factor in how much money you get for beating a trainer.
|
||||
.align 2
|
||||
gTrainerMoneyTable:: @ 831AEB8
|
||||
.byte TRAINER_CLASS_TEAM_AQUA, 5, 0, 0
|
||||
.byte TRAINER_CLASS_AQUA_ADMIN, 10, 0, 0
|
||||
.byte TRAINER_CLASS_AQUA_LEADER, 20, 0, 0
|
||||
.byte TRAINER_CLASS_AROMA_LADY, 10, 0, 0
|
||||
.byte TRAINER_CLASS_RUIN_MANIAC, 15, 0, 0
|
||||
.byte TRAINER_CLASS_INTERVIEWER, 12, 0, 0
|
||||
.byte TRAINER_CLASS_TUBER_1, 1, 0, 0
|
||||
.byte TRAINER_CLASS_TUBER_2, 1, 0, 0
|
||||
.byte TRAINER_CLASS_SIS_AND_BRO, 3, 0, 0
|
||||
.byte TRAINER_CLASS_COOLTRAINER_1, 12, 0, 0
|
||||
.byte TRAINER_CLASS_HEX_MANIAC, 6, 0, 0
|
||||
.byte TRAINER_CLASS_LADY, 50, 0, 0
|
||||
.byte TRAINER_CLASS_BEAUTY, 20, 0, 0
|
||||
.byte TRAINER_CLASS_RICH_BOY, 50, 0, 0
|
||||
.byte TRAINER_CLASS_POKEMANIAC, 15, 0, 0
|
||||
.byte TRAINER_CLASS_SWIMMER_M, 2, 0, 0
|
||||
.byte TRAINER_CLASS_BLACK_BELT, 8, 0, 0
|
||||
.byte TRAINER_CLASS_GUITARIST, 8, 0, 0
|
||||
.byte TRAINER_CLASS_KINDLER, 8, 0, 0
|
||||
.byte TRAINER_CLASS_CAMPER, 4, 0, 0
|
||||
.byte TRAINER_CLASS_OLD_COUPLE, 10, 0, 0
|
||||
.byte TRAINER_CLASS_BUG_MANIAC, 15, 0, 0
|
||||
.byte TRAINER_CLASS_PSYCHIC, 6, 0, 0
|
||||
.byte TRAINER_CLASS_GENTLEMAN, 20, 0, 0
|
||||
.byte TRAINER_CLASS_ELITE_FOUR, 25, 0, 0
|
||||
.byte TRAINER_CLASS_LEADER, 25, 0, 0
|
||||
.byte TRAINER_CLASS_SCHOOL_KID, 5, 0, 0
|
||||
.byte TRAINER_CLASS_SR_AND_JR, 4, 0, 0
|
||||
.byte TRAINER_CLASS_POKEFAN, 20, 0, 0
|
||||
.byte TRAINER_CLASS_EXPERT, 10, 0, 0
|
||||
.byte TRAINER_CLASS_YOUNGSTER, 4, 0, 0
|
||||
.byte TRAINER_CLASS_CHAMPION, 50, 0, 0
|
||||
.byte TRAINER_CLASS_FISHERMAN, 10, 0, 0
|
||||
.byte TRAINER_CLASS_TRIATHLETE, 10, 0, 0
|
||||
.byte TRAINER_CLASS_DRAGON_TAMER, 12, 0, 0
|
||||
.byte TRAINER_CLASS_BIRD_KEEPER, 8, 0, 0
|
||||
.byte TRAINER_CLASS_NINJA_BOY, 3, 0, 0
|
||||
.byte TRAINER_CLASS_BATTLE_GIRL, 6, 0, 0
|
||||
.byte TRAINER_CLASS_PARASOL_LADY, 10, 0, 0
|
||||
.byte TRAINER_CLASS_SWIMMER_F, 2, 0, 0
|
||||
.byte TRAINER_CLASS_PICNICKER, 4, 0, 0
|
||||
.byte TRAINER_CLASS_TWINS, 3, 0, 0
|
||||
.byte TRAINER_CLASS_SAILOR, 8, 0, 0
|
||||
.byte TRAINER_CLASS_COLLECTOR, 15, 0, 0
|
||||
.byte TRAINER_CLASS_PKMN_TRAINER_3, 15, 0, 0
|
||||
.byte TRAINER_CLASS_PKMN_BREEDER, 10, 0, 0
|
||||
.byte TRAINER_CLASS_PKMN_RANGER, 12, 0, 0
|
||||
.byte TRAINER_CLASS_TEAM_MAGMA, 5, 0, 0
|
||||
.byte TRAINER_CLASS_MAGMA_ADMIN, 10, 0, 0
|
||||
.byte TRAINER_CLASS_MAGMA_LEADER, 20, 0, 0
|
||||
.byte TRAINER_CLASS_LASS, 4, 0, 0
|
||||
.byte TRAINER_CLASS_BUG_CATCHER, 4, 0, 0
|
||||
.byte TRAINER_CLASS_HIKER, 10, 0, 0
|
||||
.byte TRAINER_CLASS_YOUNG_COUPLE, 8, 0, 0
|
||||
.byte TRAINER_CLASS_WINSTRATE, 10, 0, 0
|
||||
.byte -1, 5, 0, 0
|
||||
@@ -1,10 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
gUnknown_0862AD34:: @ 862AD34
|
||||
.2byte 0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048
|
||||
|
||||
gUnknown_0862AD44:: @ 862AD44
|
||||
.2byte 0x0041, 0x0042, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0000
|
||||
@@ -1,119 +0,0 @@
|
||||
@ format: attacking type, defending type, damage multiplier
|
||||
@ the multiplier is a (decimal) fixed-point number:
|
||||
@ 20 is ×2.0
|
||||
@ 05 is ×0.5
|
||||
@ 00 is ×0
|
||||
|
||||
gTypeEffectiveness:: @ 831ACE8
|
||||
.byte TYPE_NORMAL, TYPE_ROCK, 5
|
||||
.byte TYPE_NORMAL, TYPE_STEEL, 5
|
||||
.byte TYPE_FIRE, TYPE_FIRE, 5
|
||||
.byte TYPE_FIRE, TYPE_WATER, 5
|
||||
.byte TYPE_FIRE, TYPE_GRASS, 20
|
||||
.byte TYPE_FIRE, TYPE_ICE, 20
|
||||
.byte TYPE_FIRE, TYPE_BUG, 20
|
||||
.byte TYPE_FIRE, TYPE_ROCK, 5
|
||||
.byte TYPE_FIRE, TYPE_DRAGON, 5
|
||||
.byte TYPE_FIRE, TYPE_STEEL, 20
|
||||
.byte TYPE_WATER, TYPE_FIRE, 20
|
||||
.byte TYPE_WATER, TYPE_WATER, 5
|
||||
.byte TYPE_WATER, TYPE_GRASS, 5
|
||||
.byte TYPE_WATER, TYPE_GROUND, 20
|
||||
.byte TYPE_WATER, TYPE_ROCK, 20
|
||||
.byte TYPE_WATER, TYPE_DRAGON, 5
|
||||
.byte TYPE_ELECTRIC, TYPE_WATER, 20
|
||||
.byte TYPE_ELECTRIC, TYPE_ELECTRIC, 5
|
||||
.byte TYPE_ELECTRIC, TYPE_GRASS, 5
|
||||
.byte TYPE_ELECTRIC, TYPE_GROUND, 0
|
||||
.byte TYPE_ELECTRIC, TYPE_FLYING, 20
|
||||
.byte TYPE_ELECTRIC, TYPE_DRAGON, 5
|
||||
.byte TYPE_GRASS, TYPE_FIRE, 5
|
||||
.byte TYPE_GRASS, TYPE_WATER, 20
|
||||
.byte TYPE_GRASS, TYPE_GRASS, 5
|
||||
.byte TYPE_GRASS, TYPE_POISON, 5
|
||||
.byte TYPE_GRASS, TYPE_GROUND, 20
|
||||
.byte TYPE_GRASS, TYPE_FLYING, 5
|
||||
.byte TYPE_GRASS, TYPE_BUG, 5
|
||||
.byte TYPE_GRASS, TYPE_ROCK, 20
|
||||
.byte TYPE_GRASS, TYPE_DRAGON, 5
|
||||
.byte TYPE_GRASS, TYPE_STEEL, 5
|
||||
.byte TYPE_ICE, TYPE_WATER, 5
|
||||
.byte TYPE_ICE, TYPE_GRASS, 20
|
||||
.byte TYPE_ICE, TYPE_ICE, 5
|
||||
.byte TYPE_ICE, TYPE_GROUND, 20
|
||||
.byte TYPE_ICE, TYPE_FLYING, 20
|
||||
.byte TYPE_ICE, TYPE_DRAGON, 20
|
||||
.byte TYPE_ICE, TYPE_STEEL, 5
|
||||
.byte TYPE_ICE, TYPE_FIRE, 5
|
||||
.byte TYPE_FIGHTING, TYPE_NORMAL, 20
|
||||
.byte TYPE_FIGHTING, TYPE_ICE, 20
|
||||
.byte TYPE_FIGHTING, TYPE_POISON, 5
|
||||
.byte TYPE_FIGHTING, TYPE_FLYING, 5
|
||||
.byte TYPE_FIGHTING, TYPE_PSYCHIC, 5
|
||||
.byte TYPE_FIGHTING, TYPE_BUG, 5
|
||||
.byte TYPE_FIGHTING, TYPE_ROCK, 20
|
||||
.byte TYPE_FIGHTING, TYPE_DARK, 20
|
||||
.byte TYPE_FIGHTING, TYPE_STEEL, 20
|
||||
.byte TYPE_POISON, TYPE_GRASS, 20
|
||||
.byte TYPE_POISON, TYPE_POISON, 5
|
||||
.byte TYPE_POISON, TYPE_GROUND, 5
|
||||
.byte TYPE_POISON, TYPE_ROCK, 5
|
||||
.byte TYPE_POISON, TYPE_GHOST, 5
|
||||
.byte TYPE_POISON, TYPE_STEEL, 0
|
||||
.byte TYPE_GROUND, TYPE_FIRE, 20
|
||||
.byte TYPE_GROUND, TYPE_ELECTRIC, 20
|
||||
.byte TYPE_GROUND, TYPE_GRASS, 5
|
||||
.byte TYPE_GROUND, TYPE_POISON, 20
|
||||
.byte TYPE_GROUND, TYPE_FLYING, 0
|
||||
.byte TYPE_GROUND, TYPE_BUG, 5
|
||||
.byte TYPE_GROUND, TYPE_ROCK, 20
|
||||
.byte TYPE_GROUND, TYPE_STEEL, 20
|
||||
.byte TYPE_FLYING, TYPE_ELECTRIC, 5
|
||||
.byte TYPE_FLYING, TYPE_GRASS, 20
|
||||
.byte TYPE_FLYING, TYPE_FIGHTING, 20
|
||||
.byte TYPE_FLYING, TYPE_BUG, 20
|
||||
.byte TYPE_FLYING, TYPE_ROCK, 5
|
||||
.byte TYPE_FLYING, TYPE_STEEL, 5
|
||||
.byte TYPE_PSYCHIC, TYPE_FIGHTING, 20
|
||||
.byte TYPE_PSYCHIC, TYPE_POISON, 20
|
||||
.byte TYPE_PSYCHIC, TYPE_PSYCHIC, 5
|
||||
.byte TYPE_PSYCHIC, TYPE_DARK, 0
|
||||
.byte TYPE_PSYCHIC, TYPE_STEEL, 5
|
||||
.byte TYPE_BUG, TYPE_FIRE, 5
|
||||
.byte TYPE_BUG, TYPE_GRASS, 20
|
||||
.byte TYPE_BUG, TYPE_FIGHTING, 5
|
||||
.byte TYPE_BUG, TYPE_POISON, 5
|
||||
.byte TYPE_BUG, TYPE_FLYING, 5
|
||||
.byte TYPE_BUG, TYPE_PSYCHIC, 20
|
||||
.byte TYPE_BUG, TYPE_GHOST, 5
|
||||
.byte TYPE_BUG, TYPE_DARK, 20
|
||||
.byte TYPE_BUG, TYPE_STEEL, 5
|
||||
.byte TYPE_ROCK, TYPE_FIRE, 20
|
||||
.byte TYPE_ROCK, TYPE_ICE, 20
|
||||
.byte TYPE_ROCK, TYPE_FIGHTING, 5
|
||||
.byte TYPE_ROCK, TYPE_GROUND, 5
|
||||
.byte TYPE_ROCK, TYPE_FLYING, 20
|
||||
.byte TYPE_ROCK, TYPE_BUG, 20
|
||||
.byte TYPE_ROCK, TYPE_STEEL, 5
|
||||
.byte TYPE_GHOST, TYPE_NORMAL, 0
|
||||
.byte TYPE_GHOST, TYPE_PSYCHIC, 20
|
||||
.byte TYPE_GHOST, TYPE_DARK, 5
|
||||
.byte TYPE_GHOST, TYPE_STEEL, 5
|
||||
.byte TYPE_GHOST, TYPE_GHOST, 20
|
||||
.byte TYPE_DRAGON, TYPE_DRAGON, 20
|
||||
.byte TYPE_DRAGON, TYPE_STEEL, 5
|
||||
.byte TYPE_DARK, TYPE_FIGHTING, 5
|
||||
.byte TYPE_DARK, TYPE_PSYCHIC, 20
|
||||
.byte TYPE_DARK, TYPE_GHOST, 20
|
||||
.byte TYPE_DARK, TYPE_DARK, 5
|
||||
.byte TYPE_DARK, TYPE_STEEL, 5
|
||||
.byte TYPE_STEEL, TYPE_FIRE, 5
|
||||
.byte TYPE_STEEL, TYPE_WATER, 5
|
||||
.byte TYPE_STEEL, TYPE_ELECTRIC, 5
|
||||
.byte TYPE_STEEL, TYPE_ICE, 20
|
||||
.byte TYPE_STEEL, TYPE_ROCK, 20
|
||||
.byte TYPE_STEEL, TYPE_STEEL, 5
|
||||
.byte 0xFE, 0xFE, 0
|
||||
.byte TYPE_NORMAL, TYPE_GHOST, 0
|
||||
.byte TYPE_FIGHTING, TYPE_GHOST, 0
|
||||
.byte 0xFF, 0xFF, 0
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2, 0
|
||||
gUnknown_0862AD54:: @ 862AD54
|
||||
.incbin "graphics/battle_transitions/frontier_transition.4bpp.lz"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user