dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

fix pokeblock merge conflicts

Browse Source
This commit is contained in:
DizzyEggg
2017-12-20 17:16:56 +01:00
parent cb229f56e8 7e6a68a99a
commit b615af4184
35 changed files with 2910 additions and 3839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
data/data2b.s
View File

@@ -4750,74 +4750,74 @@ gUnknown_0831ABA0:: @ 831ABA0
.align 2
gBattleTerrainTable:: @ 831ABA8
@ tall_grass
.4byte gUnknown_08D77D68
.4byte gUnknown_08D78350
.4byte gUnknown_08D7E280
.4byte gUnknown_08D7E808
.4byte gUnknown_08D78318
.4byte gBattleTerrainTiles_TallGrass
.4byte gBattleTerrainTilemap_TallGrass
.4byte gBattleTerrainAnimTiles_TallGrass
.4byte gBattleTerrainAnimTilemap_TallGrass
.4byte gBattleTerrainPalette_TallGrass
@ long_grass
.4byte gUnknown_08D78600
.4byte gUnknown_08D78CB8
.4byte gUnknown_08D7E9C4
.4byte gUnknown_08D7F0D4
.4byte gUnknown_08D78C78
.4byte gBattleTerrainTiles_LongGrass
.4byte gBattleTerrainTilemap_LongGrass
.4byte gBattleTerrainAnimTiles_LongGrass
.4byte gBattleTerrainAnimTilemap_LongGrass
.4byte gBattleTerrainPalette_LongGrass
@ sand
.4byte gUnknown_08D78F68
.4byte gUnknown_08D795A8
.4byte gUnknown_08D7F30C
.4byte gUnknown_08D7F850
.4byte gUnknown_08D79560
.4byte gBattleTerrainTiles_Sand
.4byte gBattleTerrainTilemap_Sand
.4byte gBattleTerrainAnimTiles_Sand
.4byte gBattleTerrainAnimTilemap_Sand
.4byte gBattleTerrainPalette_Sand
@ underwater
.4byte gUnknown_08D79858
.4byte gUnknown_08D79E58
.4byte gUnknown_08D7F9F8
.4byte gUnknown_08D7FEC4
.4byte gUnknown_08D79E10
.4byte gBattleTerrainTiles_Underwater
.4byte gBattleTerrainTilemap_Underwater
.4byte gBattleTerrainAnimTiles_Underwater
.4byte gBattleTerrainAnimTilemap_Underwater
.4byte gBattleTerrainPalette_Underwater
@ water
.4byte gUnknown_08D7A108
.4byte gUnknown_08D7A720
.4byte gUnknown_08D80054
.4byte gUnknown_08D80660
.4byte gUnknown_08D7A6DC
.4byte gBattleTerrainTiles_Water
.4byte gBattleTerrainTilemap_Water
.4byte gBattleTerrainAnimTiles_Water
.4byte gBattleTerrainAnimTilemap_Water
.4byte gBattleTerrainPalette_Water
@ pond_water
.4byte gUnknown_08D7A9D0
.4byte gUnknown_08D7AFB8
.4byte gUnknown_08D80804
.4byte gUnknown_08D80D50
.4byte gUnknown_08D7AF78
.4byte gBattleTerrainTiles_PondWater
.4byte gBattleTerrainTilemap_PondWater
.4byte gBattleTerrainAnimTiles_PondWater
.4byte gBattleTerrainAnimTilemap_PondWater
.4byte gBattleTerrainPalette_PondWater
@ rock
.4byte gUnknown_08D7B268
.4byte gUnknown_08D7B864
.4byte gUnknown_08D80E9C
.4byte gUnknown_08D8147C
.4byte gUnknown_08D7B828
.4byte gBattleTerrainTiles_Rock
.4byte gBattleTerrainTilemap_Rock
.4byte gBattleTerrainAnimTiles_Rock
.4byte gBattleTerrainAnimTilemap_Rock
.4byte gBattleTerrainPalette_Rock
@ cave
.4byte gUnknown_08D7BB14
.4byte gUnknown_08D7C154
.4byte gUnknown_08D81610
.4byte gUnknown_08D81E2C
.4byte gUnknown_08D7C10C
.4byte gBattleTerrainTiles_Cave
.4byte gBattleTerrainTilemap_Cave
.4byte gBattleTerrainAnimTiles_Cave
.4byte gBattleTerrainAnimTilemap_Cave
.4byte gBattleTerrainPalette_Cave
@ building
.4byte gBattleTerrainTiles_Building
.4byte gUnknown_08D7CA28
.4byte gUnknown_08D820D4
.4byte gUnknown_08D824E4
.4byte gUnknown_08D7DEB4
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Building
@ plain
.4byte gBattleTerrainTiles_Building
.4byte gUnknown_08D7CA28
.4byte gUnknown_08D820D4
.4byte gUnknown_08D824E4
.4byte gUnknown_08D7C404
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Plain
.align 2
gUnknown_0831AC70:: @ 831AC70

132
data/graphics.s
View File

@@ -1,12 +1,12 @@
.section gfx_data, "aw", %progbits
gUnknown_08C00000:: @ 8C00000
gBattleTextboxTiles:: @ 8C00000
.incbin "baserom.gba", 0xc00000, 0x4e0
gUnknown_08C004E0:: @ 8C004E0
gBattleTextboxPalette:: @ 8C004E0
.incbin "baserom.gba", 0xc004e0, 0x44
gUnknown_08C00524:: @ 8C00524
gBattleTextboxTilemap:: @ 8C00524
.incbin "baserom.gba", 0xc00524, 0x22c
@ 8C00750
@@ -352,79 +352,79 @@ gUnknown_08D77AE4:: @ 8D77AE4
gUnknown_08D77B0C:: @ 8D77B0C
.incbin "baserom.gba", 0xd77b0c, 0x25c
gUnknown_08D77D68:: @ 8D77D68
gBattleTerrainTiles_TallGrass:: @ 8D77D68
.incbin "baserom.gba", 0xd77d68, 0x5b0
gUnknown_08D78318:: @ 8D78318
gBattleTerrainPalette_TallGrass:: @ 8D78318
.incbin "baserom.gba", 0xd78318, 0x38
gUnknown_08D78350:: @ 8D78350
gBattleTerrainTilemap_TallGrass:: @ 8D78350
.incbin "baserom.gba", 0xd78350, 0x2b0
gUnknown_08D78600:: @ 8D78600
gBattleTerrainTiles_LongGrass:: @ 8D78600
.incbin "baserom.gba", 0xd78600, 0x678
gUnknown_08D78C78:: @ 8D78C78
gBattleTerrainPalette_LongGrass:: @ 8D78C78
.incbin "baserom.gba", 0xd78C78, 0x40
gUnknown_08D78CB8:: @ 8D78CB8
gBattleTerrainTilemap_LongGrass:: @ 8D78CB8
.incbin "baserom.gba", 0xd78CB8, 0x2b0
gUnknown_08D78F68:: @ 8D78F68
gBattleTerrainTiles_Sand:: @ 8D78F68
.incbin "baserom.gba", 0xd78f68, 0x5f8
gUnknown_08D79560:: @ 8D79560
gBattleTerrainPalette_Sand:: @ 8D79560
.incbin "baserom.gba", 0xd79560, 0x48
gUnknown_08D795A8:: @ 8D795A8
gBattleTerrainTilemap_Sand:: @ 8D795A8
.incbin "baserom.gba", 0xd795A8, 0x2b0
gUnknown_08D79858:: @ 8D79858
gBattleTerrainTiles_Underwater:: @ 8D79858
.incbin "baserom.gba", 0xd79858, 0x5b8
gUnknown_08D79E10:: @ 8D79E10
gBattleTerrainPalette_Underwater:: @ 8D79E10
.incbin "baserom.gba", 0xd79E10, 0x48
gUnknown_08D79E58:: @ 8D79E58
gBattleTerrainTilemap_Underwater:: @ 8D79E58
.incbin "baserom.gba", 0xd79e58, 0x2b0
gUnknown_08D7A108:: @ 8D7A108
gBattleTerrainTiles_Water:: @ 8D7A108
.incbin "baserom.gba", 0xd7a108, 0x5d4
gUnknown_08D7A6DC:: @ 8D7A6DC
gBattleTerrainPalette_Water:: @ 8D7A6DC
.incbin "baserom.gba", 0xd7a6DC, 0x44
gUnknown_08D7A720:: @ 8D7A720
gBattleTerrainTilemap_Water:: @ 8D7A720
.incbin "baserom.gba", 0xd7a720, 0x2b0
gUnknown_08D7A9D0:: @ 8D7A9D0
gBattleTerrainTiles_PondWater:: @ 8D7A9D0
.incbin "baserom.gba", 0xd7a9D0, 0x5a8
gUnknown_08D7AF78:: @ 8D7AF78
gBattleTerrainPalette_PondWater:: @ 8D7AF78
.incbin "baserom.gba", 0xd7af78, 0x40
gUnknown_08D7AFB8:: @ 8D7AFB8
gBattleTerrainTilemap_PondWater:: @ 8D7AFB8
.incbin "baserom.gba", 0xd7aFB8, 0x2b0
gUnknown_08D7B268:: @ 8D7B268
gBattleTerrainTiles_Rock:: @ 8D7B268
.incbin "baserom.gba", 0xd7b268, 0x5c0
gUnknown_08D7B828:: @ 8D7B828
gBattleTerrainPalette_Rock:: @ 8D7B828
.incbin "baserom.gba", 0xd7b828, 0x3c
gUnknown_08D7B864:: @ 8D7B864
gBattleTerrainTilemap_Rock:: @ 8D7B864
.incbin "baserom.gba", 0xd7b864, 0x2b0
gUnknown_08D7BB14:: @ 8D7BB14
gBattleTerrainTiles_Cave:: @ 8D7BB14
.incbin "baserom.gba", 0xd7bb14, 0x5f8
gUnknown_08D7C10C:: @ 8D7C10C
gBattleTerrainPalette_Cave:: @ 8D7C10C
.incbin "baserom.gba", 0xd7c10c, 0x48
gUnknown_08D7C154:: @ 8D7C154
gBattleTerrainTilemap_Cave:: @ 8D7C154
.incbin "baserom.gba", 0xd7c154, 0x2b0
gUnknown_08D7C404:: @ 8D7C404
gBattleTerrainPalette_Plain:: @ 8D7C404
.incbin "baserom.gba", 0xd7c404, 0x3c
gBattleTerrainTiles_Building:: @ 8D7C440
@@ -433,118 +433,118 @@ gBattleTerrainTiles_Building:: @ 8D7C440
gBattleTerrainPalette_Frontier:: @ 8D7C9EC
.incbin "baserom.gba", 0xd7c9ec, 0x3c
gUnknown_08D7CA28:: @ 8D7CA28
gBattleTerrainTilemap_Building:: @ 8D7CA28
.incbin "baserom.gba", 0xd7ca28, 0x2b0
gUnknown_08D7CCD8:: @ 8D7CCD8
gBattleTerrainTiles_Stadium:: @ 8D7CCD8
.incbin "baserom.gba", 0xd7ccd8, 0x608
gUnknown_08D7D2E0:: @ 8D7D2E0
gBattleTerrainTilemap_Stadium:: @ 8D7D2E0
.incbin "baserom.gba", 0xd7d2e0, 0x2b0
gUnknown_08D7D590:: @ 8D7D590
gBattleTerrainTiles_Rayquaza:: @ 8D7D590
.incbin "baserom.gba", 0xd7d590, 0x674
gUnknown_08D7DC04:: @ 8D7DC04
gBattleTerrainTilemap_Rayquaza:: @ 8D7DC04
.incbin "baserom.gba", 0xd7dc04, 0x2b0
gUnknown_08D7DEB4:: @ 8D7DEB4
gBattleTerrainPalette_Building:: @ 8D7DEB4
.incbin "baserom.gba", 0xd7deb4, 0x40
gUnknown_08D7DEF4:: @ 8D7DEF4
gBattleTerrainPalette_Kyogre:: @ 8D7DEF4
.incbin "baserom.gba", 0xd7def4, 0x3c
gUnknown_08D7DF30:: @ 8D7DF30
gBattleTerrainPalette_Groudon:: @ 8D7DF30
.incbin "baserom.gba", 0xd7df30, 0x58
gUnknown_08D7DF88:: @ 8D7DF88
gBattleTerrainPalette_BuildingGym:: @ 8D7DF88
.incbin "baserom.gba", 0xd7df88, 0x3c
gUnknown_08D7DFC4:: @ 8D7DFC4
gBattleTerrainPalette_BuildingLeader:: @ 8D7DFC4
.incbin "baserom.gba", 0xd7dfc4, 0x3c
gUnknown_08D7E000:: @ 8D7E000
gBattleTerrainPalette_StadiumAqua:: @ 8D7E000
.incbin "baserom.gba", 0xd7e000, 0x60
gUnknown_08D7E060:: @ 8D7E060
gBattleTerrainPalette_StadiumMagma:: @ 8D7E060
.incbin "baserom.gba", 0xd7e060, 0x6c
gUnknown_08D7E0CC:: @ 8D7E0CC
gBattleTerrainPalette_StadiumSidney:: @ 8D7E0CC
.incbin "baserom.gba", 0xd7e0cc, 0x50
gUnknown_08D7E11C:: @ 8D7E11C
gBattleTerrainPalette_StadiumPhoebe:: @ 8D7E11C
.incbin "baserom.gba", 0xd7e11c, 0x48
gUnknown_08D7E164:: @ 8D7E164
gBattleTerrainPalette_StadiumGlacia:: @ 8D7E164
.incbin "baserom.gba", 0xd7e164, 0x44
gUnknown_08D7E1A8:: @ 8D7E1A8
gBattleTerrainPalette_StadiumDrake:: @ 8D7E1A8
.incbin "baserom.gba", 0xd7e1a8, 0x50
gUnknown_08D7E1F8:: @ 8D7E1F8
gBattleTerrainPalette_StadiumWallace:: @ 8D7E1F8
.incbin "baserom.gba", 0xd7e1f8, 0x3c
gUnknown_08D7E234:: @ 8D7E234
gBattleTerrainPalette_Rayquaza:: @ 8D7E234
.incbin "baserom.gba", 0xd7e234, 0x4c
gUnknown_08D7E280:: @ 8D7E280
gBattleTerrainAnimTiles_TallGrass:: @ 8D7E280
.incbin "baserom.gba", 0xd7e280, 0x588
gUnknown_08D7E808:: @ 8D7E808
gBattleTerrainAnimTilemap_TallGrass:: @ 8D7E808
.incbin "baserom.gba", 0xd7e808, 0x1bc
gUnknown_08D7E9C4:: @ 8D7E9C4
gBattleTerrainAnimTiles_LongGrass:: @ 8D7E9C4
.incbin "baserom.gba", 0xd7e9C4, 0x710
gUnknown_08D7F0D4:: @ 8D7F0D4
gBattleTerrainAnimTilemap_LongGrass:: @ 8D7F0D4
.incbin "baserom.gba", 0xd7F0D4, 0x238
gUnknown_08D7F30C:: @ 8D7F30C
gBattleTerrainAnimTiles_Sand:: @ 8D7F30C
.incbin "baserom.gba", 0xd7F30c, 0x544
gUnknown_08D7F850:: @ 8D7F850
gBattleTerrainAnimTilemap_Sand:: @ 8D7F850
.incbin "baserom.gba", 0xd7F850, 0x1a8
gUnknown_08D7F9F8:: @ 8D7F9F8
gBattleTerrainAnimTiles_Underwater:: @ 8D7F9F8
.incbin "baserom.gba", 0xd7f9f8, 0x4cc
gUnknown_08D7FEC4:: @ 8D7FEC4
gBattleTerrainAnimTilemap_Underwater:: @ 8D7FEC4
.incbin "baserom.gba", 0xd7fec4, 0x190
gUnknown_08D80054:: @ 8D80054
gBattleTerrainAnimTiles_Water:: @ 8D80054
.incbin "baserom.gba", 0xd80054, 0x60c
gUnknown_08D80660:: @ 8D80660
gBattleTerrainAnimTilemap_Water:: @ 8D80660
.incbin "baserom.gba", 0xd80660, 0x1a4
gUnknown_08D80804:: @ 8D80804
gBattleTerrainAnimTiles_PondWater:: @ 8D80804
.incbin "baserom.gba", 0xd80804, 0x54c
gUnknown_08D80D50:: @ 8D80D50
gBattleTerrainAnimTilemap_PondWater:: @ 8D80D50
.incbin "baserom.gba", 0xd80d50, 0x14C
gUnknown_08D80E9C:: @ 8D80E9C
gBattleTerrainAnimTiles_Rock:: @ 8D80E9C
.incbin "baserom.gba", 0xd80e9c, 0x5e0
gUnknown_08D8147C:: @ 8D8147C
gBattleTerrainAnimTilemap_Rock:: @ 8D8147C
.incbin "baserom.gba", 0xd8147C, 0x194
gUnknown_08D81610:: @ 8D81610
gBattleTerrainAnimTiles_Cave:: @ 8D81610
.incbin "baserom.gba", 0xd81610, 0x81c
gUnknown_08D81E2C:: @ 8D81E2C
gBattleTerrainAnimTilemap_Cave:: @ 8D81E2C
.incbin "baserom.gba", 0xd81e2c, 0x2a8
gUnknown_08D820D4:: @ 8D820D4
gBattleTerrainAnimTiles_Building:: @ 8D820D4
.incbin "baserom.gba", 0xd820d4, 0x410
gUnknown_08D824E4:: @ 8D824E4
gBattleTerrainAnimTilemap_Building:: @ 8D824E4
.incbin "baserom.gba", 0xd824e4, 0x124
gUnknown_08D82608:: @ 8D82608
gBattleTerrainAnimTiles_Rayquaza:: @ 8D82608
.incbin "baserom.gba", 0xd82608, 0x668
gUnknown_08D82C70:: @ 8D82C70
gBattleTerrainAnimTilemap_Rayquaza:: @ 8D82C70
.incbin "baserom.gba", 0xd82c70, 0x2a0
gUnknown_08D82F10:: @ 8D82F10