diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-21 00:06:42 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-21 00:06:42 +0200 |
| commit | 16026fe91d5628f138be434841ae764534946b2c (patch) | |
| tree | bc647520019d0078e1fc68869107908c4af30a9e /data | |
| parent | f4e55999a5282dc1d2b94e0ca14081de6aae93ba (diff) | |
More battle tower.
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_tower.s | 10 | ||||
| -rw-r--r-- | data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/data/battle_tower.s b/data/battle_tower.s index 2cc0aa639..ec5ee924e 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -21,16 +21,16 @@ @ 85D97BC .include "data/battle_frontier/battle_frontier_mons.inc" -gUnknown_085DCEDC:: @ 85DCEDC +gTowerMaleFacilityClasses:: @ 85DCEDC .byte 0x0e, 0x11, 0x03, 0x15, 0x17, 0x07, 0x0a, 0x19, 0x1a, 0x1b, 0x1d, 0x1e, 0x20, 0x26, 0x29, 0x09, 0x2b, 0x2d, 0x2e, 0x30, 0x32, 0x34, 0x04, 0x35, 0x3a, 0x05, 0x42, 0x44, 0x43, 0x00 -gUnknown_085DCEFA:: @ 85DCEFA +gTowerFemaleFacilityClasses:: @ 85DCEFA .byte 0x0d, 0x10, 0x12, 0x0c, 0x13, 0x14, 0x1f, 0x27, 0x2a, 0x16, 0x2f, 0x31, 0x33, 0x36, 0x37, 0x38, 0x1c, 0x02, 0x45, 0x47 -gUnknown_085DCF0E:: @ 85DCF0E +gTowerMaleTrainerGfxIds:: @ 85DCF0E .byte 0x37, 0x36, 0x21, 0x0f, 0x27, 0x33, 0x2c, 0x42, 0x42, 0x1f, 0x27, 0x25, 0x30, 0x26, 0x19, 0x15, 0x23, 0x32, 0x38, 0x33, 0x33, 0x21, 0x42, 0x05, 0x31, 0x27, 0x41, 0x1f, 0x24, 0x37 -gUnknown_085DCF2C:: @ 85DCF2C +gTowerFemaleTrainerGfxIds:: @ 85DCF2C .byte 0x14, 0x35, 0x22, 0x28, 0x14, 0x2d, 0x2f, 0x0e, 0x12, 0x16, 0x39, 0x34, 0x34, 0x0e, 0x22, 0x34, 0x20, 0x14, 0x20, 0x2f gUnknown_085DCF40:: @ 85DCF40 @@ -683,7 +683,7 @@ gUnknown_085DF96C:: @ 85DF96C .4byte sub_8161F94 .4byte sub_8162054 .4byte sub_81620F4 - .4byte sub_81623F0 + .4byte ChooseNextBattleTowerTrainer .4byte sub_81621C0 .4byte sub_816502C .4byte sub_8164040 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index b29ef99a5..6eea58f9f 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -4,7 +4,7 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F .byte 0 SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A - special sub_8162794 + special SetEReaderTrainerGfxId end SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E diff --git a/data/specials.inc b/data/specials.inc index cec36932a..3c5318309 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -332,7 +332,7 @@ gSpecials:: @ 81DBA64 def_special sp13F_fall_to_last_warp def_special sub_80F8D28 def_special sub_80F8EB8 - def_special sub_8162794 + def_special SetEReaderTrainerGfxId def_special BattleSetup_StartLatiBattle def_special SetRoute119Weather def_special SetRoute123Weather |