Merge branch 'master' into dump_pointers

This commit is contained in:
DizzyEggg
2017-12-22 16:22:16 +01:00
1390 changed files with 527546 additions and 19712 deletions
+10 -4
View File
@@ -1,3 +1,5 @@
#include "constants/flags.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -1391,10 +1393,14 @@ gUnknown_0860EFF4:: @ 860EFF4
.4byte gText_BattlePyramid
gUnknown_0860F010:: @ 860F010
.4byte gUnknown_08680867
.4byte gUnknown_086A0869
.4byte gUnknown_086C086B
.4byte gUnknown_086E086D
.2byte FLAG_BADGE01_GET
.2byte FLAG_BADGE02_GET
.2byte FLAG_BADGE03_GET
.2byte FLAG_BADGE04_GET
.2byte FLAG_BADGE05_GET
.2byte FLAG_BADGE06_GET
.2byte FLAG_BADGE07_GET
.2byte FLAG_BADGE08_GET
gUnknown_0860F020:: @ 860F020
.4byte gUnknown_082A5D6C
+2 -2
View File
@@ -3177,7 +3177,7 @@ BattleScript_Pausex20::
return
BattleScript_LevelUp::
fanfare BGM_FANFA1
fanfare MUS_FANFA1
printstring STRINGID_PKMNGREWTOLV
setbyte sLVLBOX_STATE, 0x0
drawlvlupbox
@@ -3205,7 +3205,7 @@ BattleScript_ForgotAndLearnedNewMove::
printstring STRINGID_ANDELLIPSIS
BattleScript_LearnedNewMove::
buffermovetolearn
fanfare BGM_FANFA1
fanfare MUS_FANFA1
printstring STRINGID_PKMNLEARNEDMOVE
waitmessage 0x40
updatechoicemoveonlvlup ATTACKER
-55
View File
@@ -5,60 +5,6 @@
.section .rodata
gPokeblockFlavorCompatibilityTable:: @ 85B25A0
.incbin "baserom.gba", 0x5b25a0, 0x80
gUnknown_085B2620:: @ 85B2620
.incbin "baserom.gba", 0x5b2620, 0xc
gPokeblockNames:: @ 85B262C
.incbin "baserom.gba", 0x5b262c, 0x3c
gUnknown_085B2668:: @ 85B2668
.incbin "baserom.gba", 0x5b2668, 0x30
gUnknown_085B2698:: @ 85B2698
.incbin "baserom.gba", 0x5b2698, 0x3
gUnknown_085B269B:: @ 85B269B
.incbin "baserom.gba", 0x5b269b, 0x2
gUnknown_085B269D:: @ 85B269D
.incbin "baserom.gba", 0x5b269d, 0x2
gUnknown_085B269F:: @ 85B269F
.incbin "baserom.gba", 0x5b269f, 0x5
gUnknown_085B26A4:: @ 85B26A4
.incbin "baserom.gba", 0x5b26a4, 0x4c
gUnknown_085B26F0:: @ 85B26F0
.incbin "baserom.gba", 0x5b26f0, 0x4
gUnknown_085B26F4:: @ 85B26F4
.incbin "baserom.gba", 0x5b26f4, 0x8
gUnknown_085B26FC:: @ 85B26FC
.incbin "baserom.gba", 0x5b26fc, 0x8
gUnknown_085B2704:: @ 85B2704
.incbin "baserom.gba", 0x5b2704, 0x18
gUnknown_085B271C:: @ 85B271C
.incbin "baserom.gba", 0x5b271c, 0x4
gUnknown_085B2720:: @ 85B2720
.incbin "baserom.gba", 0x5b2720, 0x28
gUnknown_085B2748:: @ 85B2748
.incbin "baserom.gba", 0x5b2748, 0x60
gUnknown_085B27A8:: @ 85B27A8
.incbin "baserom.gba", 0x5b27a8, 0x8
gUnknown_085B27B0:: @ 85B27B0
.incbin "baserom.gba", 0x5b27b0, 0x18
gUnknown_085B27C8:: @ 85B27C8
.incbin "baserom.gba", 0x5b27c8, 0x88
@@ -797,4 +743,3 @@ gUnknown_085C9A30:: @ 85C9A30
gUnknown_085C9A53:: @ 85C9A53
.incbin "baserom.gba", 0x5c9a53, 0x41
+367 -367
View File
File diff suppressed because it is too large Load Diff
+71 -5
View File
@@ -880,14 +880,80 @@ gBuyMenuFrame_Tilemap:: @ 8D9B0F0
gMenuMoneyGfx:: @ 8D9B230
.incbin "baserom.gba", 0xd9b230, 0x84
gUnknown_08D9B2B4:: @ 8D9B2B4
gMenuPokeblock_Gfx:: @ 8D9B2B4
.incbin "baserom.gba", 0xd9b2b4, 0x1bc
gUnknown_08D9B470:: @ 8D9B470
.incbin "baserom.gba", 0xd9b470, 0x358
gMenuPokeblock_Pal:: @ 8D9B470
.incbin "baserom.gba", 0xd9b470, 0x70
gMenuPokeblockDevice_Gfx:: @ 8D9B4E0
.incbin "baserom.gba", 0xd9b4e0, 0x2c0
gMenuPokeblockDevice_Pal:: @ 8D9B7A0
.incbin "baserom.gba", 0xd9b7a0, 0x28
gUnknown_08D9B7C8:: @ 8D9B7C8
.incbin "baserom.gba", 0xd9b7c8, 0x27c
gMenuPokeblock_Tilemap:: @ 8D9B7C8
.incbin "baserom.gba", 0xd9b7c8, 0x148
.align 2
gPokeblock_Gfx::
.incbin "graphics/pokeblock/pokeblock.4bpp.lz"
.align 2
gPokeblockRed_Pal::
.incbin "graphics/pokeblock/red.gbapal.lz"
.align 2
gPokeblockBlue_Pal::
.incbin "graphics/pokeblock/blue.gbapal.lz"
.align 2
gPokeblockPink_Pal::
.incbin "graphics/pokeblock/pink.gbapal.lz"
.align 2
gPokeblockGreen_Pal::
.incbin "graphics/pokeblock/green.gbapal.lz"
.align 2
gPokeblockYellow_Pal::
.incbin "graphics/pokeblock/yellow.gbapal.lz"
.align 2
gPokeblockPurple_Pal::
.incbin "graphics/pokeblock/purple.gbapal.lz"
.align 2
gPokeblockIndigo_Pal::
.incbin "graphics/pokeblock/indigo.gbapal.lz"
.align 2
gPokeblockBrown_Pal::
.incbin "graphics/pokeblock/brown.gbapal.lz"
.align 2
gPokeblockLiteBlue_Pal::
.incbin "graphics/pokeblock/liteblue.gbapal.lz"
.align 2
gPokeblockOlive_Pal::
.incbin "graphics/pokeblock/olive.gbapal.lz"
.align 2
gPokeblockGray_Pal::
.incbin "graphics/pokeblock/gray.gbapal.lz"
.align 2
gPokeblockBlack_Pal::
.incbin "graphics/pokeblock/black.gbapal.lz"
.align 2
gPokeblockWhite_Pal::
.incbin "graphics/pokeblock/white.gbapal.lz"
.align 2
gPokeblockGold_Pal::
.incbin "graphics/pokeblock/gold.gbapal.lz"
gUnknown_08D9BA44:: @ 8D9BA44
.incbin "baserom.gba", 0xd9ba44, 0x100
@@ -3,7 +3,7 @@ AbandonedShip_CaptainsOffice: @ 84845A4
.4byte AbandonedShip_CaptainsOffice_MapEvents
.4byte AbandonedShip_CaptainsOffice_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte MUS_DAN02
.2byte 195
.byte 61
.byte 0
@@ -3,7 +3,7 @@ AbandonedShip_Corridors_1F: @ 84844C4
.4byte AbandonedShip_Corridors_1F_MapEvents
.4byte AbandonedShip_Corridors_1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte MUS_DAN02
.2byte 187
.byte 61
.byte 0
@@ -3,7 +3,7 @@ AbandonedShip_Corridors_B1F: @ 84844FC
.4byte AbandonedShip_Corridors_B1F_MapEvents
.4byte AbandonedShip_Corridors_B1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte MUS_DAN02
.2byte 189
.byte 61
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Deck: @ 84844A8
.4byte AbandonedShip_Deck_MapEvents
.4byte AbandonedShip_Deck_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte MUS_DAN02
.2byte 186
.byte 61
.byte 0
@@ -3,7 +3,7 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
.4byte AbandonedShip_HiddenFloorCorridors_MapEvents
.4byte AbandonedShip_HiddenFloorCorridors_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte MUS_DAN02
.2byte 289
.byte 61
.byte 0
@@ -3,7 +3,7 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
.4byte AbandonedShip_HiddenFloorRooms_MapEvents
.4byte AbandonedShip_HiddenFloorRooms_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte MUS_DAN02
.2byte 310
.byte 61
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Room_B1F: @ 848456C
.4byte AbandonedShip_Room_B1F_MapEvents
.4byte AbandonedShip_Room_B1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte MUS_DAN02
.2byte 193
.byte 61
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F: @ 8484588
.4byte AbandonedShip_Rooms2_1F_MapEvents
.4byte AbandonedShip_Rooms2_1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte MUS_DAN02
.2byte 194
.byte 61
.byte 0
@@ -3,7 +3,7 @@ AbandonedShip_Rooms2_B1F: @ 8484534
.4byte AbandonedShip_Rooms2_B1F_MapEvents
.4byte AbandonedShip_Rooms2_B1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte MUS_DAN02
.2byte 191
.byte 61
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Rooms_1F: @ 84844E0
.4byte AbandonedShip_Rooms_1F_MapEvents
.4byte AbandonedShip_Rooms_1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte MUS_DAN02
.2byte 188
.byte 61
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F: @ 8484518
.4byte AbandonedShip_Rooms_B1F_MapEvents
.4byte AbandonedShip_Rooms_B1F_MapScripts
.4byte 0x0
.2byte BGM_DAN02
.2byte MUS_DAN02
.2byte 190
.byte 61
.byte 0
@@ -3,7 +3,7 @@ AbandonedShip_Underwater1: @ 8484550
.4byte AbandonedShip_Underwater1_MapEvents
.4byte AbandonedShip_Underwater1_MapScripts
.4byte 0x0
.2byte BGM_DEEPDEEP
.2byte MUS_DEEPDEEP
.2byte 192
.byte 61
.byte 0
@@ -3,7 +3,7 @@ AbandonedShip_Underwater2: @ 84845C0
.4byte AbandonedShip_Underwater2_MapEvents
.4byte AbandonedShip_Underwater2_MapScripts
.4byte 0x0
.2byte BGM_DEEPDEEP
.2byte MUS_DEEPDEEP
.2byte 196
.byte 61
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ AlteringCave: @ 8484A58
.4byte AlteringCave_MapEvents
.4byte AlteringCave_MapScripts
.4byte 0x0
.2byte BGM_FRLG_MT_EMBER
.2byte MUS_RG_NANADUNGEON
.2byte 420
.byte 210
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ AncientTomb: @ 8484630
.4byte AncientTomb_MapEvents
.4byte AncientTomb_MapScripts
.4byte 0x0
.2byte BGM_MABOROSI
.2byte MUS_MABOROSI
.2byte 281
.byte 83
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ AquaHideout_1F: @ 8484144
.4byte AquaHideout_1F_MapEvents
.4byte AquaHideout_1F_MapScripts
.4byte 0x0
.2byte BGM_AJITO
.2byte MUS_AJITO
.2byte 143
.byte 197
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ AquaHideout_B1F: @ 8484160
.4byte AquaHideout_B1F_MapEvents
.4byte AquaHideout_B1F_MapScripts
.4byte 0x0
.2byte BGM_AJITO
.2byte MUS_AJITO
.2byte 144
.byte 197
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ AquaHideout_B2F: @ 848417C
.4byte AquaHideout_B2F_MapEvents
.4byte AquaHideout_B2F_MapScripts
.4byte 0x0
.2byte BGM_AJITO
.2byte MUS_AJITO
.2byte 145
.byte 197
.byte 0
@@ -3,7 +3,7 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
.4byte AquaHideout_UnusedRubyMap1_MapEvents
.4byte AquaHideout_UnusedRubyMap1_MapScripts
.4byte 0x0
.2byte BGM_AJITO
.2byte MUS_AJITO
.2byte 316
.byte 197
.byte 0
@@ -3,7 +3,7 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
.4byte AquaHideout_UnusedRubyMap2_MapEvents
.4byte AquaHideout_UnusedRubyMap2_MapScripts
.4byte 0x0
.2byte BGM_AJITO
.2byte MUS_AJITO
.2byte 317
.byte 197
.byte 0
@@ -3,7 +3,7 @@ AquaHideout_UnusedRubyMap3: @ 8484710
.4byte AquaHideout_UnusedRubyMap3_MapEvents
.4byte AquaHideout_UnusedRubyMap3_MapScripts
.4byte 0x0
.2byte BGM_AJITO
.2byte MUS_AJITO
.2byte 318
.byte 197
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ ArtisanCave_1F: @ 84849B0
.4byte ArtisanCave_1F_MapEvents
.4byte ArtisanCave_1F_MapScripts
.4byte 0x0
.2byte BGM_DAN01
.2byte MUS_DAN01
.2byte 401
.byte 202
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ ArtisanCave_B1F: @ 8484994
.4byte ArtisanCave_B1F_MapEvents
.4byte ArtisanCave_B1F_MapScripts
.4byte 0x0
.2byte BGM_DAN01
.2byte MUS_DAN01
.2byte 400
.byte 202
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
.4byte BattleFrontier_BattleArenaBattleRoom_MapEvents
.4byte BattleFrontier_BattleArenaBattleRoom_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_ARENA
.2byte MUS_B_ARENA
.2byte 356
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
.4byte BattleFrontier_BattleArenaCorridor_MapEvents
.4byte BattleFrontier_BattleArenaCorridor_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_ARENA
.2byte MUS_B_ARENA
.2byte 355
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleArenaLobby: @ 848544C
.4byte BattleFrontier_BattleArenaLobby_MapEvents
.4byte BattleFrontier_BattleArenaLobby_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_ARENA
.2byte MUS_B_ARENA
.2byte 354
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
.4byte BattleFrontier_BattleDomeBattleRoom_MapEvents
.4byte BattleFrontier_BattleDomeBattleRoom_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_DOME_TOURNAMENT
.2byte MUS_B_DOME
.2byte 335
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
.4byte BattleFrontier_BattleDomeCorridor_MapEvents
.4byte BattleFrontier_BattleDomeCorridor_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_DOME
.2byte MUS_B_DOME1
.2byte 333
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleDomeLobby: @ 8485334
.4byte BattleFrontier_BattleDomeLobby_MapEvents
.4byte BattleFrontier_BattleDomeLobby_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_DOME
.2byte MUS_B_DOME1
.2byte 332
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
.4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents
.4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_DOME_TOURNAMENT
.2byte MUS_B_DOME
.2byte 334
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
.4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents
.4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_FACTORY
.2byte MUS_B_FACTORY
.2byte 348
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
.4byte BattleFrontier_BattleFactoryLobby_MapEvents
.4byte BattleFrontier_BattleFactoryLobby_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_FACTORY
.2byte MUS_B_FACTORY
.2byte 346
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents
.4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_FACTORY
.2byte MUS_B_FACTORY
.2byte 347
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
.4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents
.4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_PALACE
.2byte MUS_B_PALACE
.2byte 344
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
.4byte BattleFrontier_BattlePalaceCorridor_MapEvents
.4byte BattleFrontier_BattlePalaceCorridor_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_PALACE
.2byte MUS_B_PALACE
.2byte 343
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
.4byte BattleFrontier_BattlePalaceLobby_MapEvents
.4byte BattleFrontier_BattlePalaceLobby_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_PALACE
.2byte MUS_B_PALACE
.2byte 342
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
.4byte BattleFrontier_BattlePikeCorridor_MapEvents
.4byte BattleFrontier_BattlePikeCorridor_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_PIKE
.2byte MUS_B_TUBE
.2byte 350
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
.4byte BattleFrontier_BattlePikeLobby_MapEvents
.4byte BattleFrontier_BattlePikeLobby_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_PIKE
.2byte MUS_B_TUBE
.2byte 349
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
.4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents
.4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_PIKE
.2byte MUS_B_TUBE
.2byte 352
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
.4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents
.4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_PIKE
.2byte MUS_B_TUBE
.2byte 353
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
.4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents
.4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_PIKE
.2byte MUS_B_TUBE
.2byte 358
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
.4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents
.4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_PIKE
.2byte MUS_B_TUBE
.2byte 351
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents
.4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 398
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
.4byte BattleFrontier_BattlePyramidLobby_MapEvents
.4byte BattleFrontier_BattlePyramidLobby_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_PYRAMID
.2byte MUS_PYRAMID
.2byte 360
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C
.4byte BattleFrontier_BattleTowerBattleRoom_MapEvents
.4byte BattleFrontier_BattleTowerBattleRoom_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_TOWER
.2byte MUS_SATTOWER
.2byte 268
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318
.4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents
.4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_TOWER
.2byte MUS_SATTOWER
.2byte 268
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerCorridor: @ 8485200
.4byte BattleFrontier_BattleTowerCorridor_MapEvents
.4byte BattleFrontier_BattleTowerCorridor_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_TOWER
.2byte MUS_SATTOWER
.2byte 267
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC
.4byte BattleFrontier_BattleTowerCorridor2_MapEvents
.4byte BattleFrontier_BattleTowerCorridor2_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_TOWER
.2byte MUS_SATTOWER
.2byte 391
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerElevator: @ 84851E4
.4byte BattleFrontier_BattleTowerElevator_MapEvents
.4byte BattleFrontier_BattleTowerElevator_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_TOWER
.2byte MUS_SATTOWER
.2byte 266
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerLobby: @ 84851C8
.4byte BattleFrontier_BattleTowerLobby_MapEvents
.4byte BattleFrontier_BattleTowerLobby_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_TOWER
.2byte MUS_SATTOWER
.2byte 264
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents
.4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts
.4byte 0x0
.2byte BGM_BATTLE_TOWER
.2byte MUS_SATTOWER
.2byte 390
.byte 58
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge1: @ 84855B8
.4byte BattleFrontier_Lounge1_MapEvents
.4byte BattleFrontier_Lounge1_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 429
.byte 58
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge2: @ 84855F0
.4byte BattleFrontier_Lounge2_MapEvents
.4byte BattleFrontier_Lounge2_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 397
.byte 58
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge3: @ 848560C
.4byte BattleFrontier_Lounge3_MapEvents
.4byte BattleFrontier_Lounge3_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 429
.byte 58
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge4: @ 8485628
.4byte BattleFrontier_Lounge4_MapEvents
.4byte BattleFrontier_Lounge4_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 429
.byte 58
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge5: @ 8485660
.4byte BattleFrontier_Lounge5_MapEvents
.4byte BattleFrontier_Lounge5_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 397
.byte 58
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge6: @ 848567C
.4byte BattleFrontier_Lounge6_MapEvents
.4byte BattleFrontier_Lounge6_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 429
.byte 58
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge7: @ 8485698
.4byte BattleFrontier_Lounge7_MapEvents
.4byte BattleFrontier_Lounge7_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 429
.byte 58
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge8: @ 84856D0
.4byte BattleFrontier_Lounge8_MapEvents
.4byte BattleFrontier_Lounge8_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 429
.byte 58
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Lounge9: @ 84856EC
.4byte BattleFrontier_Lounge9_MapEvents
.4byte BattleFrontier_Lounge9_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 429
.byte 58
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ BattleFrontier_Mart: @ 8485740
.4byte BattleFrontier_Mart_MapEvents
.4byte BattleFrontier_Mart_MapScripts
.4byte 0x0
.2byte BGM_FRIENDLY
.2byte MUS_FRIENDLY
.2byte 63
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_OutsideEast: @ 84852C4
.4byte BattleFrontier_OutsideEast_MapEvents
.4byte BattleFrontier_OutsideEast_MapScripts
.4byte BattleFrontier_OutsideEast_MapConnections
.2byte BGM_BATTLE_FRONTIER
.2byte MUS_B_FRONTIER
.2byte 345
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_OutsideWest: @ 84851AC
.4byte BattleFrontier_OutsideWest_MapEvents
.4byte BattleFrontier_OutsideWest_MapScripts
.4byte BattleFrontier_OutsideWest_MapConnections
.2byte BGM_BATTLE_FRONTIER
.2byte MUS_B_FRONTIER
.2byte 265
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_PokemonCenter_1F: @ 8485708
.4byte BattleFrontier_PokemonCenter_1F_MapEvents
.4byte BattleFrontier_PokemonCenter_1F_MapScripts
.4byte 0x0
.2byte BGM_POKECEN
.2byte MUS_POKECEN
.2byte 61
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_PokemonCenter_2F: @ 8485724
.4byte BattleFrontier_PokemonCenter_2F_MapEvents
.4byte BattleFrontier_PokemonCenter_2F_MapScripts
.4byte 0x0
.2byte BGM_POKECEN
.2byte MUS_POKECEN
.2byte 62
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_RankingHall: @ 848559C
.4byte BattleFrontier_RankingHall_MapEvents
.4byte BattleFrontier_RankingHall_MapScripts
.4byte 0x0
.2byte BGM_BIJYUTU
.2byte MUS_BIJYUTU
.2byte 396
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_ReceptionGate: @ 84856B4
.4byte BattleFrontier_ReceptionGate_MapEvents
.4byte BattleFrontier_ReceptionGate_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 399
.byte 58
.byte 0
@@ -3,7 +3,7 @@ BattleFrontier_ScottsHouse: @ 8485644
.4byte BattleFrontier_ScottsHouse_MapEvents
.4byte BattleFrontier_ScottsHouse_MapScripts
.4byte 0x0
.2byte BGM_B_TOWER
.2byte MUS_B_TOWER
.2byte 430
.byte 58
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ CaveOfOrigin_1F: @ 84842E8
.4byte CaveOfOrigin_1F_MapEvents
.4byte CaveOfOrigin_1F_MapScripts
.4byte 0x0
.2byte BGM_DAN03
.2byte MUS_DAN03
.2byte 158
.byte 72
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ CaveOfOrigin_Entrance: @ 84842CC
.4byte CaveOfOrigin_Entrance_MapEvents
.4byte CaveOfOrigin_Entrance_MapScripts
.4byte 0x0
.2byte BGM_DAN03
.2byte MUS_DAN03
.2byte 157
.byte 72
.byte 0
@@ -3,7 +3,7 @@ CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304
.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents
.4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts
.4byte 0x0
.2byte BGM_DAN03
.2byte MUS_DAN03
.2byte 159
.byte 72
.byte 1
@@ -3,7 +3,7 @@ CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320
.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents
.4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts
.4byte 0x0
.2byte BGM_DAN03
.2byte MUS_DAN03
.2byte 160
.byte 72
.byte 1
@@ -3,7 +3,7 @@ CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C
.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents
.4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts
.4byte 0x0
.2byte BGM_DAN03
.2byte MUS_DAN03
.2byte 161
.byte 72
.byte 1
+1 -1
View File
@@ -3,7 +3,7 @@ DesertRuins: @ 8483F68
.4byte DesertRuins_MapEvents
.4byte DesertRuins_MapScripts
.4byte 0x0
.2byte BGM_MABOROSI
.2byte MUS_MABOROSI
.2byte 131
.byte 82
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ DesertUnderpass: @ 8484978
.4byte DesertUnderpass_MapEvents
.4byte DesertUnderpass_MapScripts
.4byte 0x0
.2byte BGM_TOZAN
.2byte MUS_TOZAN
.2byte 389
.byte 209
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ DewfordTown: @ 84825EC
.4byte DewfordTown_MapEvents
.4byte DewfordTown_MapScripts
.4byte DewfordTown_MapConnections
.2byte BGM_HIGHTOWN
.2byte MUS_HIGHTOWN
.2byte 12
.byte 2
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ DewfordTown_Gym: @ 8482C60
.4byte DewfordTown_Gym_MapEvents
.4byte DewfordTown_Gym_MapScripts
.4byte 0x0
.2byte BGM_GIM
.2byte MUS_GIM
.2byte 65
.byte 2
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ DewfordTown_Hall: @ 8482C7C
.4byte DewfordTown_Hall_MapEvents
.4byte DewfordTown_Hall_MapScripts
.4byte 0x0
.2byte BGM_HIGHTOWN
.2byte MUS_HIGHTOWN
.2byte 66
.byte 2
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ DewfordTown_House1: @ 8482C0C
.4byte DewfordTown_House1_MapEvents
.4byte DewfordTown_House1_MapScripts
.4byte 0x0
.2byte BGM_HIGHTOWN
.2byte MUS_HIGHTOWN
.2byte 64
.byte 2
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ DewfordTown_House2: @ 8482C98
.4byte DewfordTown_House2_MapEvents
.4byte DewfordTown_House2_MapScripts
.4byte 0x0
.2byte BGM_HIGHTOWN
.2byte MUS_HIGHTOWN
.2byte 67
.byte 2
.byte 0
@@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F: @ 8482C28
.4byte DewfordTown_PokemonCenter_1F_MapEvents
.4byte DewfordTown_PokemonCenter_1F_MapScripts
.4byte 0x0
.2byte BGM_POKECEN
.2byte MUS_POKECEN
.2byte 61
.byte 2
.byte 0
@@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_2F: @ 8482C44
.4byte DewfordTown_PokemonCenter_2F_MapEvents
.4byte DewfordTown_PokemonCenter_2F_MapScripts
.4byte 0x0
.2byte BGM_POKECEN
.2byte MUS_POKECEN
.2byte 62
.byte 2
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ DoubleBattleColosseum: @ 8484D84
.4byte DoubleBattleColosseum_MapEvents
.4byte DoubleBattleColosseum_MapScripts
.4byte 0x0
.2byte BGM_RAINBOW
.2byte MUS_RAINBOW
.2byte 224
.byte 87
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ EverGrandeCity: @ 8482598
.4byte EverGrandeCity_MapEvents
.4byte EverGrandeCity_MapScripts
.4byte EverGrandeCity_MapConnections
.2byte BGM_RAINBOW
.2byte MUS_RAINBOW
.2byte 9
.byte 15
.byte 0
@@ -3,7 +3,7 @@ EverGrandeCity_ChampionsRoom: @ 8483C3C
.4byte EverGrandeCity_ChampionsRoom_MapEvents
.4byte EverGrandeCity_ChampionsRoom_MapScripts
.4byte 0x0
.2byte BGM_C_ROAD
.2byte MUS_C_ROAD
.2byte 115
.byte 15
.byte 0
@@ -3,7 +3,7 @@ EverGrandeCity_DrakesRoom: @ 8483C20
.4byte EverGrandeCity_DrakesRoom_MapEvents
.4byte EverGrandeCity_DrakesRoom_MapScripts
.4byte 0x0
.2byte BGM_C_ROAD
.2byte MUS_C_ROAD
.2byte 114
.byte 15
.byte 0
@@ -3,7 +3,7 @@ EverGrandeCity_GlaciasRoom: @ 8483C04
.4byte EverGrandeCity_GlaciasRoom_MapEvents
.4byte EverGrandeCity_GlaciasRoom_MapScripts
.4byte 0x0
.2byte BGM_C_ROAD
.2byte MUS_C_ROAD
.2byte 113
.byte 15
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ EverGrandeCity_Hall1: @ 8483C58
.4byte EverGrandeCity_Hall1_MapEvents
.4byte EverGrandeCity_Hall1_MapScripts
.4byte 0x0
.2byte BGM_C_ROAD
.2byte MUS_C_ROAD
.2byte 116
.byte 15
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ EverGrandeCity_Hall2: @ 8483C74
.4byte EverGrandeCity_Hall2_MapEvents
.4byte EverGrandeCity_Hall2_MapScripts
.4byte 0x0
.2byte BGM_C_ROAD
.2byte MUS_C_ROAD
.2byte 116
.byte 15
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ EverGrandeCity_Hall3: @ 8483C90
.4byte EverGrandeCity_Hall3_MapEvents
.4byte EverGrandeCity_Hall3_MapScripts
.4byte 0x0
.2byte BGM_C_ROAD
.2byte MUS_C_ROAD
.2byte 116
.byte 15
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ EverGrandeCity_Hall4: @ 8483CAC
.4byte EverGrandeCity_Hall4_MapEvents
.4byte EverGrandeCity_Hall4_MapScripts
.4byte 0x0
.2byte BGM_C_ROAD
.2byte MUS_C_ROAD
.2byte 315
.byte 15
.byte 0
+1 -1
View File
@@ -3,7 +3,7 @@ EverGrandeCity_Hall5: @ 8483CC8
.4byte EverGrandeCity_Hall5_MapEvents
.4byte EverGrandeCity_Hall5_MapScripts
.4byte 0x0
.2byte BGM_C_ROAD
.2byte MUS_C_ROAD
.2byte 116
.byte 15
.byte 0
@@ -3,7 +3,7 @@ EverGrandeCity_HallOfFame: @ 8483D00
.4byte EverGrandeCity_HallOfFame_MapEvents
.4byte EverGrandeCity_HallOfFame_MapScripts
.4byte 0x0
.2byte BGM_EIKOU_R
.2byte MUS_EIKOU_R
.2byte 298
.byte 15
.byte 0
@@ -3,7 +3,7 @@ EverGrandeCity_PhoebesRoom: @ 8483BE8
.4byte EverGrandeCity_PhoebesRoom_MapEvents
.4byte EverGrandeCity_PhoebesRoom_MapScripts
.4byte 0x0
.2byte BGM_C_ROAD
.2byte MUS_C_ROAD
.2byte 112
.byte 15
.byte 0
@@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F: @ 8483D1C
.4byte EverGrandeCity_PokemonCenter_1F_MapEvents
.4byte EverGrandeCity_PokemonCenter_1F_MapScripts
.4byte 0x0
.2byte BGM_POKECEN
.2byte MUS_POKECEN
.2byte 61
.byte 15
.byte 0

Some files were not shown because too many files have changed in this diff Show More