diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-22 19:22:57 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-22 19:22:57 +0200 |
| commit | b330bdba51b86959e702e904c4a5d8039e6395c7 (patch) | |
| tree | 88c9552bc137c9185c2c8c7ece049fa91a5cd605 /data | |
| parent | 0ab27e44b14a0dc4523b5bac7fef18312ab4fdde (diff) | |
More and more battle tower
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_tower.s | 6 | ||||
| -rw-r--r-- | data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/data/battle_tower.s b/data/battle_tower.s index 296db3577..63eec4347 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -33,7 +33,7 @@ gTowerMaleTrainerGfxIds:: @ 85DCF0E 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 +sRubyFacilityClassToEmerald:: @ 85DCF40 .byte 0x00, 0x0b, 0x01, 0x01, 0x02, 0x06, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x06, 0x10, 0x07, 0x11, 0x08, 0x03, 0x09, 0x12, 0x0a, 0x0c, 0x0b, 0x13, 0x0c, 0x14, 0x0d, 0x15, 0x0e, 0x17, 0x0f, 0x07 .byte 0x10, 0x0a, 0x11, 0x19, 0x12, 0x1a, 0x13, 0x1b, 0x14, 0x1d, 0x15, 0x1e, 0x16, 0x1f, 0x17, 0x20, 0x18, 0x21, 0x19, 0x22, 0x1a, 0x23, 0x1b, 0x24, 0x1c, 0x25, 0x1d, 0x26, 0x1e, 0x27, 0x1f, 0x28 .byte 0x20, 0x29, 0x21, 0x2a, 0x22, 0x09, 0x23, 0x16, 0x24, 0x2b, 0x25, 0x2c, 0x26, 0x2d, 0x27, 0x2e, 0x28, 0x2f, 0x29, 0x30, 0x2a, 0x31, 0x2b, 0x32, 0x2c, 0x33, 0x2d, 0x34, 0x2e, 0x04, 0x2f, 0x35 @@ -640,7 +640,7 @@ gUnknown_085DD690:: @ 85DD690 .4byte gUnknown_085DD0F0 .4byte gUnknown_085DD104 -gUnknown_085DD6D0:: @ 85DD6D0 +sStevenMons:: @ 85DD6D0 .byte 0x8f, 0x01, 0x1f, 0x2a, 0x02 gUnknown_085DD6D5:: @ 85DD6D5 @@ -685,7 +685,7 @@ gUnknown_085DF96C:: @ 85DF96C .4byte sub_81620F4 .4byte ChooseNextBattleTowerTrainer .4byte sub_81621C0 - .4byte sub_816502C + .4byte AwardBattleTowerRibbons .4byte SaveBattleTowerProgress .4byte sub_8163914 .4byte nullsub_61 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index 1ecf08399..eb21ead54 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -15,7 +15,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 lockall applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3 waitmovement 0 - special sub_8165360 + special CopyEReaderTrainerGreeting msgbox gStringVar4, 4 closemessage setvar VAR_0x8004, SPECIAL_BATTLE_EREADER diff --git a/data/specials.inc b/data/specials.inc index 09f74cb51..08e12e5e0 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -246,7 +246,7 @@ gSpecials:: @ 81DBA64 def_special sub_8161F74 def_special CallBattleDomeFunction def_special sub_8195960 - def_special sub_8165360 + def_special CopyEReaderTrainerGreeting def_special DoSpecialTrainerBattle def_special sub_81A5238 def_special sub_81A5E74 |