diff options
| author | YamaArashi <shadow962@live.com> | 2016-08-31 20:57:14 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-08-31 21:17:51 -0700 |
| commit | ea8a0cf5f027472208175d2a0fc05ee3185148a0 (patch) | |
| tree | d1b81daa2589674e777d72ecc701946a45371dd9 | |
| parent | 6cea01f088c37fed9d219ab49f18c51fcd2caa70 (diff) | |
battle tower banned pokemon list
| -rw-r--r-- | asm/rom5.s | 8 | ||||
| -rw-r--r-- | data/data2.s | 26 |
2 files changed, 26 insertions, 8 deletions
diff --git a/asm/rom5.s b/asm/rom5.s index 53729d87c..dcd2cb78d 100644 --- a/asm/rom5.s +++ b/asm/rom5.s @@ -343201,7 +343201,7 @@ _081220B8: pop {r1} bx r1 .align 2, 0 -_081220C0: .4byte gUnknown_08405EC4 +_081220C0: .4byte gBattleTowerBanlist _081220C4: .4byte 0x0000ffff thumb_func_end sub_8122030 @@ -382892,7 +382892,7 @@ _081350CE: pop {r1} bx r1 .align 2, 0 -_081350D8: .4byte gUnknown_08405EC4 +_081350D8: .4byte gBattleTowerBanlist _081350DC: .4byte 0x0000ffff thumb_func_end sub_813509C @@ -383142,7 +383142,7 @@ _081352CE: pop {r0} bx r0 .align 2, 0 -_081352DC: .4byte gUnknown_08405EC4 +_081352DC: .4byte gBattleTowerBanlist _081352E0: .4byte 0x0000ffff thumb_func_end sub_8135200 @@ -383259,7 +383259,7 @@ _081353C4: .4byte 0x03004360 _081353C8: .4byte 0x0202e8dc _081353CC: .4byte 0x020231cc _081353D0: .4byte 0x0202e8cc -_081353D4: .4byte gUnknown_08405EC4 +_081353D4: .4byte gBattleTowerBanlist _081353D8: .4byte 0x0000ffff _081353DC: .4byte gUnknown_08400E2C _081353E0: .4byte gUnknown_08400E32 diff --git a/data/data2.s b/data/data2.s index f14181097..b1802daac 100644 --- a/data/data2.s +++ b/data/data2.s @@ -24334,6 +24334,7 @@ gSpriteTemplate_83F7F84:: @ 83F7F84 gUnknown_083F7F9C:: @ 83F7F9C .incbin "baserom.gba", 0x003f7f9c, 0x28 + .align 2 gUnknown_083F7FC4:: @ 83F7FC4 .byte 1, 4, 1, 0 .4byte sub_810CFF8 @@ -24372,11 +24373,17 @@ gUnknown_083F7FC4:: @ 83F7FC4 .byte 0, 0, 0, 0 .4byte NULL + .align 2 gUnknown_083F804C:: @ 83F804C - .incbin "baserom.gba", 0x003f804c, 0x20 + .rept 16 + .2byte 0x7FFF + .endr + .align 2 gUnknown_083F806C:: @ 83F806C - .space 32 + .rept 16 + .2byte 0x0000 + .endr gUnknown_083F808C:: @ 83F808C .incbin "baserom.gba", 0x003f808c, 0x10 @@ -26902,8 +26909,19 @@ gUnknown_08405E92:: @ 8405E92 gUnknown_08405EB0:: @ 8405EB0 .incbin "baserom.gba", 0x00405eb0, 0x14 -gUnknown_08405EC4:: @ 8405EC4 - .incbin "baserom.gba", 0x00405ec4, 0x16 + .align 1 +gBattleTowerBanlist:: @ 8405EC4 + .2byte SPECIES_MEW + .2byte SPECIES_MEWTWO + .2byte SPECIES_HO_OH + .2byte SPECIES_LUGIA + .2byte SPECIES_CELEBI + .2byte SPECIES_KYOGRE + .2byte SPECIES_GROUDON + .2byte SPECIES_RAYQUAZA + .2byte SPECIES_JIRACHI + .2byte SPECIES_DEOXYS + .2byte -1 gUnknown_08405EDA:: @ 8405EDA .incbin "baserom.gba", 0x00405eda, 0xc |