ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

trailing spaces

Browse Source
This commit is contained in:
DizzyEggg 2017-12-24 19:26:44 +01:00
parent b2eadfa16c
commit 71b522b212
8 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
data/graphics.s
View File

@ -20,7 +20,7 @@ gUnknown_08C01644:: @ 8C01644
gUnknown_08C01724:: @ 8C01724
.incbin "baserom.gba", 0xc01724, 0x18
.align 2
gInterfaceGfx_PokeBall::
.incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC
@ -253,28 +253,28 @@ gSubstituteDollGfx:: @ 8C2CEE0
gSubstituteDollTilemap:: @ 8C2D120
.incbin "baserom.gba", 0xc2d120, 552
gUnknown_08C2D348:: @ 8C2D348
.incbin "baserom.gba", 0xC2D348, 196
gUnknown_08C2D40C:: @ 8C2D40C
.incbin "baserom.gba", 0xC2D40C, 28
gContestConfetti_Gfx:: @ 8C2D428
.incbin "baserom.gba", 0xC2D428, 288
gContestConfetti_Pal:: @ 8C2D548
.incbin "baserom.gba", 0xC2D548, 40
gUnknown_08C2D570:: @ 8C2D570
.incbin "baserom.gba", 0xC2D570, 316
gUnknown_08C2D6AC:: @ 8C2D6AC
.incbin "baserom.gba", 0xC2D6AC, 36
gUnknown_08C2D6D0:: @ 8C2D6D0
.incbin "baserom.gba", 0xC2D6D0, 40
gUnknown_08C2D6F8:: @ 8C2D6F8
.incbin "baserom.gba", 0xC2D6F8, 40
@ -897,7 +897,7 @@ gMenuMoneyPal:: @ 8D9B0C8
gBuyMenuFrame_Tilemap:: @ 8D9B0F0
.incbin "baserom.gba", 0xd9b0f0, 0x140
gMenuMoneyGfx:: @ 8D9B230
.incbin "baserom.gba", 0xd9b230, 0x84
@ -906,16 +906,16 @@ gMenuPokeblock_Gfx:: @ 8D9B2B4
gMenuPokeblock_Pal:: @ 8D9B470
.incbin "baserom.gba", 0xd9b470, 0x70
gMenuPokeblockDevice_Gfx:: @ 8D9B4E0
.incbin "baserom.gba", 0xd9b4e0, 0x2c0
gMenuPokeblockDevice_Pal:: @ 8D9B7A0
.incbin "baserom.gba", 0xd9b7a0, 0x28
gMenuPokeblock_Tilemap:: @ 8D9B7C8
.incbin "baserom.gba", 0xd9b7c8, 0x148
.align 2
gPokeblock_Gfx::
.incbin "graphics/pokeblock/pokeblock.4bpp.lz"
@ -996,25 +996,25 @@ gUnknown_08D9C13C:: @ 8D9C13C
gUnknown_08DA1E78:: @ 8DA1E78
.incbin "baserom.gba", 0xda1e78, 0xBE4
gUnknown_08DA2A5C:: @ 8DA2A5C
.incbin "baserom.gba", 0xDA2A5C, 0xCC
gUnknown_08DA2B28:: @ 8DA2B28
.incbin "baserom.gba", 0xDA2B28, 0x1F4
gUnknown_08DA2D1C:: @ 8DA2D1C
.incbin "baserom.gba", 0xDA2D1C, 0x534
gUnknown_08DA3250:: @ 8DA3250
.incbin "baserom.gba", 0xDA3250, 0x54
gUnknown_08DA32A4:: @ 8DA32A4
.incbin "baserom.gba", 0xDA32A4, 0xCC
gUnknown_08DA3370:: @ 8DA3370
.incbin "baserom.gba", 0xDA3370, 0x28
gUnknown_08DA3398:: @ 8DA3398
.incbin "baserom.gba", 0xDA3398, 0x28
@ -1032,10 +1032,10 @@ gUnknown_08DA3988:: @ 8DA3988
gUnknown_08DA3A88:: @ 8DA3A88
.incbin "baserom.gba", 0xda3a88, 0x138
gUnknown_08DA3BC0:: @ 8DA3BC0
.incbin "baserom.gba", 0xDA3BC0, 0xBC
gUnknown_08DA3C7C:: @ 8DA3C7C
.incbin "baserom.gba", 0xDA3C7C, 0x18
@ -1053,10 +1053,10 @@ gUnknown_08DA4F70:: @ 8DA4F70
gUnknown_08DA60B8:: @ 8DA60B8
.incbin "baserom.gba", 0xda60b8, 0x388
gUnknown_08DA6440:: @ 8DA6440
.incbin "baserom.gba", 0xDA6440, 0x46C
gUnknown_08DA68AC:: @ 8DA68AC
.incbin "baserom.gba", 0xDA68AC, 0x110
@ -1098,34 +1098,34 @@ gUnknown_08DA8D6C:: @ 8DA8D6C
gUnknown_08DA8E84:: @ 8DA8E84
.incbin "baserom.gba", 0xda8e84, 0x54
gUnknown_08DA8ED8:: @ 8DA8ED8
.incbin "baserom.gba", 0xDA8ED8, 0x798
gUnknown_08DA9670:: @ 8DA9670
.incbin "baserom.gba", 0xDA9670, 0x44
gUnknown_08DA96B4:: @ 8DA96B4
.incbin "baserom.gba", 0xDA96B4, 0x248
gUnknown_08DA98FC:: @ 8DA98FC
.incbin "baserom.gba", 0xDA98FC, 0xCA8
gUnknown_08DAA5A4:: @ 8DAA5A4
.incbin "baserom.gba", 0xDAA5A4, 0x1F0
gUnknown_08DAA794:: @ 8DAA794
.incbin "baserom.gba", 0xDAA794, 0x98
gUnknown_08DAA82C:: @ 8DAA82C
.incbin "baserom.gba", 0xDAA82C, 0x28
gUnknown_08DAA854:: @ 8DAA854
.incbin "baserom.gba", 0xDAA854, 0x28
gUnknown_08DAA87C:: @ 8DAA87C
.incbin "baserom.gba", 0xDAA87C, 0x28
gUnknown_08DAA8A4:: @ 8DAA8A4
.incbin "baserom.gba", 0xDAA8A4, 0x10
@ -1332,7 +1332,7 @@ gUnknown_08DC1876:: @ 8DC1876
gUnknown_08DC1934:: @ 8DC1934
.incbin "baserom.gba", 0xdc1934, 0xA18
gUnknown_08DC234C:: @ 8DC234C
.incbin "baserom.gba", 0xDC234C, 0x6BC
@ -1525,43 +1525,43 @@ gUnknown_08DC9608:: @ 8DC9608
gUnknown_08DC9628:: @ 8DC9628
.incbin "baserom.gba", 0xdc9628, 0x320
gBerryBlenderMiscPalette:: @ 8DCAB88
.incbin "graphics/berry_blender/misc.gbapal"
gBerryBlenderArrowPalette:: @ 8DC9948
.incbin "graphics/berry_blender/arrow.gbapal"
gUnknown_8DC9988:: @ 8DC9988
.incbin "baserom.gba", 0xdc9988, 0x200
.align 2
gBerryBlenderMarubatsuTiles:: @ 8DC9B88
.incbin "graphics/berry_blender/marubatsu.4bpp"
.align 2
gBerryBlenderParticlesTiles:: @ 8E90818
.incbin "graphics/berry_blender/particles.4bpp"
.space 0x120
.align 2
gBerryBlenderCountdownNumbersTiles:: @ 8DC9F88
.incbin "graphics/berry_blender/countdown_numbers.4bpp"
.align 2
gBerryBlenderStartTiles:: @ 8DCA588
.incbin "graphics/berry_blender/start.4bpp"
.space 0x200
.align 2
gBerryBlenderArrowTiles:: @ 8DCAB88
.incbin "graphics/berry_blender/arrow.4bpp"
gUnknown_08DCB388:: @ 8DCB388
.incbin "baserom.gba", 0xdcb388, 0xA28
gUnknown_08DCBDB0:: @ 8DCBDB0
.incbin "baserom.gba", 0xdcbdb0, 0x20
@ -1687,7 +1687,7 @@ gUnknown_08DD46E0:: @ 8DD46E0
gUnknown_08DD47A0:: @ 8DD47A0
.incbin "baserom.gba", 0xdd47a0, 0xc0
gUnknown_08DD4860:: @ 8DD4860
.incbin "baserom.gba", 0xdd4860, 0x20
@ -1743,61 +1743,61 @@ gUnknown_08DD7300:: @ 8DD7300
.incbin "baserom.gba", 0xdd7300, 0x60
gUnknown_08DD7360:: @ 8DD7360
.incbin "baserom.gba", 0xdd7360, 0x1420
.incbin "baserom.gba", 0xdd7360, 0x1420
gUnknown_08DD8780:: @ 8DD8780
.incbin "baserom.gba", 0xdd8780, 0x40
.incbin "baserom.gba", 0xdd8780, 0x40
gUnknown_08DD87C0:: @ 8DD87C0
.incbin "baserom.gba", 0xdd87c0, 0x720
.incbin "baserom.gba", 0xdd87c0, 0x720
gUnknown_08DD8EE0:: @ 8DD8EE0
.incbin "baserom.gba", 0xdd8ee0, 0x1a0
.incbin "baserom.gba", 0xdd8ee0, 0x1a0
gUnknown_08DD9080:: @ 8DD9080
.incbin "baserom.gba", 0xdd9080, 0x60
.incbin "baserom.gba", 0xdd9080, 0x60
gUnknown_08DD90E0:: @ 8DD90E0
.incbin "baserom.gba", 0xdd90e0, 0x638
.incbin "baserom.gba", 0xdd90e0, 0x638
gUnknown_08DD9718:: @ 8DD9718
.incbin "baserom.gba", 0xdd9718, 0x15c
.incbin "baserom.gba", 0xdd9718, 0x15c
gUnknown_08DD9874:: @ 8DD9874
.incbin "baserom.gba", 0xdd9874, 0x40
.incbin "baserom.gba", 0xdd9874, 0x40
gUnknown_08DD98B4:: @ 8DD98B4
.incbin "baserom.gba", 0xdd98b4, 0x5a4
.incbin "baserom.gba", 0xdd98b4, 0x5a4
gUnknown_08DD9E58:: @ 8DD9E58
.incbin "baserom.gba", 0xdd9e58, 0x194
.incbin "baserom.gba", 0xdd9e58, 0x194
gUnknown_08DD9FEC:: @ 8DD9FEC
.incbin "baserom.gba", 0xdd9fec, 0x40
.incbin "baserom.gba", 0xdd9fec, 0x40
gUnknown_08DDA02C:: @ 8DDA02C
.incbin "baserom.gba", 0xdda02c, 0x610
.incbin "baserom.gba", 0xdda02c, 0x610
gUnknown_08DDA63C:: @ 8DDA63C
.incbin "baserom.gba", 0xdda63c, 0x1c4
.incbin "baserom.gba", 0xdda63c, 0x1c4
gUnknown_08DDA800:: @ 8DDA800
.incbin "baserom.gba", 0xdda800, 0x40
.incbin "baserom.gba", 0xdda800, 0x40
gUnknown_08DDA840:: @ 8DDA840
.incbin "baserom.gba", 0xdda840, 0x600
.incbin "baserom.gba", 0xdda840, 0x600
gUnknown_08DDAE40:: @ 8DDAE40
.incbin "baserom.gba", 0xddae40, 0x1a0
.incbin "baserom.gba", 0xddae40, 0x1a0
gUnknown_08DDAFE0:: @ 8DDAFE0
.incbin "baserom.gba", 0xddafe0, 0x40
.incbin "baserom.gba", 0xddafe0, 0x40
gUnknown_08DDB020:: @ 8DDB020
.incbin "baserom.gba", 0xddb020, 0x2a4
.incbin "baserom.gba", 0xddb020, 0x2a4
gUnknown_08DDB2C4:: @ 8DDB2C4
.incbin "baserom.gba", 0xddb2c4, 0x120
.incbin "baserom.gba", 0xddb2c4, 0x120
gUnknown_08DDB3E4:: @ 8DDB3E4
.incbin "baserom.gba", 0xddb3e4, 0x80

4
data/pokedex.s
View File

@ -3,7 +3,7 @@
.section .rodata
.align 2, 0
.macro unk_dex_struct texts, a2, a3, a4
.4byte \texts
.byte \a2, \a3, \a4
@ -30,7 +30,7 @@ gUnknown_0855D2BE:: @ 855D2BE
sText_TenDashes:: @ 855D2FE
.string "----------$"
.align 2
gUnknown_0855D30C:: @ 855D30C

6
data/pokemon_storage_system.s
View File

@ -45,10 +45,10 @@ gUnknown_085724A4:: @ 85724A4
gUnknown_085724BC:: @ 85724BC
.incbin "baserom.gba", 0x5724bc, 0x18
gUnknown_085724D4:: @ 85724D4
.incbin "baserom.gba", 0x5724d4, 0x20
gUnknown_085724F4:: @ 85724F4
.incbin "baserom.gba", 0x5724f4, 0x200
@ -107,7 +107,7 @@ gUnknown_0857276C:: @ 857276C
gUnknown_08572864:: @ 8572864
window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x5C
.align 2
gOamData_857286C:: @ 857286C
.2byte 0x0000

24
data/pokenav.s
View File

@ -2,7 +2,7 @@
.include "constants/constants.inc"
.section .rodata
gUnknown_0861F3EC:: @ 861F3EC
.4byte sub_81C9298
.4byte sub_81C941C
@ -109,10 +109,10 @@ gUnknown_0861F3EC:: @ 861F3EC
.4byte sub_81CFE70
.4byte sub_81CFA48
.4byte sub_81CFE98
gUnknown_0861F590:: @ 861F590
.incbin "baserom.gba", 0x61F590, 0x20
gUnknown_0861F5B0:: @ 861F5B0
.incbin "baserom.gba", 0x61f5b0, 0x454
@ -165,13 +165,13 @@ gUnknown_0861FA9C:: @ 861FA9C
.4byte gUnknown_08DC838C, 2
.4byte gUnknown_08DC80DC, 0
.4byte gUnknown_08DC8D50, 0
gUnknown_0861FAD4:: @ 861FAD4
.2byte 0x0
.2byte 0x8000
.2byte 0x0
.2byte 0x0
gUnknown_0861FADC::
obj_image_anim_frame 0, 8
obj_image_anim_frame 16, 8
@ -182,7 +182,7 @@ gUnknown_0861FADC::
obj_image_anim_frame 96, 8
obj_image_anim_frame 112, 8
obj_image_anim_jump 0
gUnknown_0861FB00::
.4byte gUnknown_0861FADC
@ -194,13 +194,13 @@ gUnknown_0861FB1C::
.2byte 0xC000
.2byte 0x400
.2byte 0x0
gUnknown_0861FB24::
.2byte 0x4000
.2byte 0x8000
.2byte 0x400
.2byte 0x0
gUnknown_0861FB2C:: @ 861FB2C
spr_template 2, 1, gUnknown_0861FB1C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
@ -1409,7 +1409,7 @@ gUnknown_08622810:: @ 8622810
gUnknown_08622818:: @ 8622818
obj_pal gUnknown_08622698, 12
obj_pal NULL, 0
gUnknown_08622828:: @ 8622828
.2byte 0x8000
.2byte 0x0
@ -1424,7 +1424,7 @@ gUnknown_08622848:: @ 8622848
.2byte 0xC000
.2byte 0x400
.2byte 0x0
gUnknown_08622850:: @ 8622850
spr_template 8, 13, gUnknown_08622848, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
@ -1543,7 +1543,7 @@ gUnknown_08623118:: @ 8623118
.4byte 0xE, gUnknown_08622ED4
.4byte 0xF, gUnknown_08622F14
.4byte 0x1000F, gUnknown_08622F5C
gUnknown_086231C8:: @ 86231C8
.2byte 0x4000
.2byte 0x4000
@ -1765,7 +1765,7 @@ gUnknown_08624C80:: @ 8624C80
gUnknown_08624CB0:: @ 8624CB0
.incbin "baserom.gba", 0x624cb0, 0x54
gUnknown_08624D04:: @ 8624D04
.incbin "baserom.gba", 0x624d04, 0x78

2
data/strings.s
View File

@ -2,7 +2,7 @@
.include "constants/constants.inc"
.section .rodata
gExpandedPlaceholder_Empty:: @ 85E8218
.string "$"

2
data/trade.s
View File

@ -3,7 +3,7 @@
.section .rodata
.align 2, 0
gUnknown_0832C6A8:: @ 832C6A8
.incbin "baserom.gba", 0x32C6A8, 0x18

2
data/trainer_card.s
View File

@ -3,7 +3,7 @@
.section .rodata
.align 2, 0
.macro unk_trainer_card_struct text1, text2, short1, short2, short3, short4
.4byte \text1
.4byte \text2

2
data/use_pokeblock.s
View File

@ -2,7 +2,7 @@
.include "constants/constants.inc"
.section .rodata
gUnknown_085DFA60:: @ 85DFA60
.incbin "baserom.gba", 0x5dfa60, 0x20