dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into trade

Browse Source
This commit is contained in:
PikalaxALT
2019-10-14 10:41:27 -04:00
parent 9fe74ac590 8efae5c807
commit b8fec3d9f6
145 changed files with 17677 additions and 37125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_anim.s
-18
View File
@@ -242,21 +242,3 @@ gUnknown_83ADE18:: @ 83ADE18
gUnknown_83ADF5C:: @ 83ADF5C
.incbin "baserom.gba", 0x3ADF5C, 0xC0
gUnknown_83AE01C:: @ 83AE01C
.incbin "baserom.gba", 0x3AE01C, 0x20
gUnknown_83AE03C:: @ 83AE03C
.incbin "baserom.gba", 0x3AE03C, 0x10
gUnknown_83AE04C:: @ 83AE04C
.incbin "baserom.gba", 0x3AE04C, 0x4
gUnknown_83AE050:: @ 83AE050
.incbin "baserom.gba", 0x3AE050, 0x4
gUnknown_83AE054:: @ 83AE054
.incbin "baserom.gba", 0x3AE054, 0x30
gUnknown_83AE084:: @ 0x83AE084
.incbin "baserom.gba", 0x3AE084, 0x10
data/data.s
+2 -2
View File
@@ -59,7 +59,7 @@ gUnknown_823499C:: @ 823499C
gUnknown_82349BC:: @ 82349BC
.incbin "baserom.gba", 0x2349BC, 0x10
gUnknown_82349CC:: @ 82349CC
gMonFrontPicCoords:: @ 82349CC
.incbin "baserom.gba", 0x2349CC, 0x6E0
gMonFrontPicTable:: @ 82350AC
@@ -68,7 +68,7 @@ gMonFrontPicTable:: @ 82350AC
gUnknown_8235194:: @ 8235194
.incbin "baserom.gba", 0x235194, 0xCD8
gUnknown_8235E6C:: @ 8235E6C
gMonBackPicCoords:: @ 8235E6C
.incbin "baserom.gba", 0x235E6C, 0x6E0
gMonBackPicTable:: @ 823654C
data/data_835B488.s
+10 -53
View File
@@ -843,13 +843,19 @@ gUnknown_83E4410:: @ 83E4410
.incbin "baserom.gba", 0x3E4410, 0x1488
gUnknown_83E5898:: @ 83E5898
.incbin "baserom.gba", 0x3E5898, 0x248
.incbin "baserom.gba", 0x3E5898, 0xC0
gUnknown_83E5958:: @ 83E5958
.incbin "baserom.gba", 0x3E5958, 0x188
gUnknown_83E5AE0:: @ 83E5AE0
.incbin "baserom.gba", 0x3E5AE0, 0xA8
gUnknown_83E5B88:: @ 83E5B88
.incbin "baserom.gba", 0x3E5B88, 0x2A4
.incbin "baserom.gba", 0x3E5B88, 0x1C0
gUnknown_83E5D48:: @ 83E5D48
.incbin "baserom.gba", 0x3E5D48, 0xE4
gUnknown_83E5E2C:: @ 83E5E2C
.incbin "baserom.gba", 0x3E5E2C, 0x18
@@ -900,58 +906,9 @@ gUnknown_83E652C:: @ 83E652C
.incbin "baserom.gba", 0x3E652C, 0x78
gUnknown_83E65A4:: @ 83E65A4
.incbin "baserom.gba", 0x3E65A4, 0xA4C
.incbin "baserom.gba", 0x3E65A4, 0x544
gUnknown_83E6FF0:: @ 83E6FF0
.incbin "baserom.gba", 0x3E6FF0, 0x1C
gUnknown_83E700C:: @ 83E700C
.incbin "baserom.gba", 0x3E700C, 0x20
gUnknown_83E702C:: @ 83E702C
.incbin "baserom.gba", 0x3E702C, 0x18
gUnknown_83E7044:: @ 83E7044
.incbin "baserom.gba", 0x3E7044, 0xD0
gUnknown_83E7114:: @ 83E7114
.incbin "baserom.gba", 0x3E7114, 0x35C
gUnknown_83E7470:: @ 83E7470
.incbin "baserom.gba", 0x3E7470, 0x68
gUnknown_83E74D8:: @ 83E74D8
.incbin "baserom.gba", 0x3E74D8, 0x18
gUnknown_83E74F0:: @ 83E74F0
.incbin "baserom.gba", 0x3E74F0, 0x178
gUnknown_83E7668:: @ 83E7668
.incbin "baserom.gba", 0x3E7668, 0x78
gUnknown_83E76E0:: @ 83E76E0
.incbin "baserom.gba", 0x3E76E0, 0x528
gUnknown_83E7C08:: @ 83E7C08
.incbin "baserom.gba", 0x3E7C08, 0x30
gUnknown_83E7C38:: @ 83E7C38
.incbin "baserom.gba", 0x3E7C38, 0x60
gUnknown_83E7C98:: @ 83E7C98
.incbin "baserom.gba", 0x3E7C98, 0x30
gUnknown_83E7CC8:: @ 83E7CC8
.incbin "baserom.gba", 0x3E7CC8, 0x2
gUnknown_83E7CCA:: @ 83E7CCA
.incbin "baserom.gba", 0x3E7CCA, 0x4
gUnknown_83E7CCE:: @ 83E7CCE
.incbin "baserom.gba", 0x3E7CCE, 0x6
gUnknown_83E7CD4:: @ 83E7CD4
.incbin "baserom.gba", 0x3E7CD4, 0x28
.section .rodata.83E7CFC
gUnknown_83E7CFC:: @ 83E7CFC
.incbin "baserom.gba", 0x3E7CFC, 0x14
data/data_83FECCC.s
-31
View File
@@ -139,37 +139,6 @@ gUnknown_84020E6:: @ 84020E6
gUnknown_84020F8:: @ 84020F8
.incbin "baserom.gba", 0x4020F8, 0xE4
gUnknown_84021DC:: @ 84021DC
.incbin "baserom.gba", 0x4021DC, 0xC
gUnknown_84021E8:: @ 84021E8
.incbin "baserom.gba", 0x4021E8, 0x18
gUnknown_8402200:: @ 8402200
.incbin "baserom.gba", 0x402200, 0x3
gUnknown_8402203:: @ 8402203
.incbin "baserom.gba", 0x402203, 0x5
gUnknown_8402208:: @ 8402208
.incbin "baserom.gba", 0x402208, 0x18
gUnknown_8402220:: @ 8402220
.incbin "baserom.gba", 0x402220, 0x8
gUnknown_8402228:: @ 8402228
.incbin "baserom.gba", 0x402228, 0x20
gUnknown_8402248:: @ 8402248
.incbin "baserom.gba", 0x402248, 0x8
gUnknown_8402250:: @ 8402250
.incbin "baserom.gba", 0x402250, 0x8
gUnknown_8402258:: @ 8402258
.incbin "baserom.gba", 0x402258, 0x8
.section .rodata.battle_anim_special
gUnknown_840BF3C:: @ 840BF3C
data/graphics.s
+15 -15
View File
@@ -1624,15 +1624,15 @@ gFile_graphics_battle_anims_backgrounds_00_tilemap:: @ 8D1CFD4
.incbin "graphics/battle_anims/backgrounds/00.bin.lz"
.align 2
gFile_graphics_battle_anims_masks_metal_shine_sheet:: @ 8D1D224
gMetalShineGfx:: @ 8D1D224
.incbin "graphics/battle_anims/masks/metal_shine.4bpp.lz"
.align 2
gFile_graphics_battle_anims_masks_metal_shine_palette:: @ 8D1D360
gMetalShinePalette:: @ 8D1D360
.incbin "graphics/battle_anims/masks/metal_shine.gbapal.lz"
.align 2
gFile_graphics_battle_anims_masks_metal_shine_tilemap:: @ 8D1D388
gMetalShineTilemap:: @ 8D1D388
.incbin "graphics/battle_anims/masks/metal_shine.bin.lz"
.align 2
@@ -2412,47 +2412,47 @@ gFile_graphics_battle_anims_sprites_243_palette:: @ 8D2D8CC
.incbin "graphics/battle_anims/sprites/243.gbapal.lz"
.align 2
gFile_graphics_battle_anims_masks_stat_sheet:: @ 8D2D8F4
gBattleStatMask_Gfx:: @ 8D2D8F4
.incbin "graphics/battle_anims/masks/stat.4bpp.lz"
.align 2
gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap:: @ 8D2DB04
gBattleStatMask1_Tilemap:: @ 8D2DB04
.incbin "graphics/battle_anims/masks/stat_tilemap_1.bin.lz"
.align 2
gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap:: @ 8D2DC20
gBattleStatMask2_Tilemap:: @ 8D2DC20
.incbin "graphics/battle_anims/masks/stat_tilemap_2.bin.lz"
.align 2
gFile_graphics_battle_anims_masks_stat1_palette:: @ 8D2DD3C
gBattleStatMask1_Pal:: @ 8D2DD3C
.incbin "graphics/battle_anims/masks/stat1.gbapal.lz"
.align 2
gFile_graphics_battle_anims_masks_stat2_palette:: @ 8D2DD5C
gBattleStatMask2_Pal:: @ 8D2DD5C
.incbin "graphics/battle_anims/masks/stat2.gbapal.lz"
.align 2
gFile_graphics_battle_anims_masks_stat3_palette:: @ 8D2DD7C
gBattleStatMask3_Pal:: @ 8D2DD7C
.incbin "graphics/battle_anims/masks/stat3.gbapal.lz"
.align 2
gFile_graphics_battle_anims_masks_stat4_palette:: @ 8D2DD9C
gBattleStatMask4_Pal:: @ 8D2DD9C
.incbin "graphics/battle_anims/masks/stat4.gbapal.lz"
.align 2
gFile_graphics_battle_anims_masks_stat5_palette:: @ 8D2DDBC
gBattleStatMask5_Pal:: @ 8D2DDBC
.incbin "graphics/battle_anims/masks/stat5.gbapal.lz"
.align 2
gFile_graphics_battle_anims_masks_stat6_palette:: @ 8D2DDDC
gBattleStatMask6_Pal:: @ 8D2DDDC
.incbin "graphics/battle_anims/masks/stat6.gbapal.lz"
.align 2
gFile_graphics_battle_anims_masks_stat7_palette:: @ 8D2DDFC
gBattleStatMask7_Pal:: @ 8D2DDFC
.incbin "graphics/battle_anims/masks/stat7.gbapal.lz"
.align 2
gFile_graphics_battle_anims_masks_stat8_palette:: @ 8D2DE1C
gBattleStatMask8_Pal:: @ 8D2DE1C
.incbin "graphics/battle_anims/masks/stat8.gbapal.lz"
.align 2
@@ -13554,7 +13554,7 @@ gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet:: @ 8E794D0
.incbin "graphics/battle_anims/backgrounds/sandstorm_brew.4bpp.lz"
.align 2
gFile_graphics_battle_anims_sprites_261_palette:: @ 8E799FC
gBattleAnimSpritePal_FlyingDirt:: @ 8E799FC
.incbin "graphics/battle_anims/sprites/261.gbapal.lz"
.align 2
data/map_event_scripts.inc
+23 -11
View File
@@ -774,7 +774,7 @@ EventScript_1A4EAE:: @ 81A4EAE
return
EventScript_1A4EAF:: @ 81A4EAF
special sub_806F67C
special Field_AskSaveTheGame
waitstate
return
@@ -4447,21 +4447,33 @@ SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA
gUnknown_81C555B:: @ 81C555B
.incbin "baserom.gba", 0x1C555B, 0x6E
gUnknown_81C55C9:: @ 81C55C9
.incbin "baserom.gba", 0x1C55C9, 0x21
gText_WouldYouLikeToSaveTheGame:: @ 81C55C9
.string "Would you like to save the game?$"
gUnknown_81C55EA:: @ 81C55EA
.incbin "baserom.gba", 0x1C55EA, 0x3B
gText_AlreadySaveFile_WouldLikeToOverwrite:: @ 81C55EA
.string "There is already a saved file.\n"
.string "Is it okay to overwrite it?$"
gUnknown_81C5625:: @ 81C5625
.incbin "baserom.gba", 0x1C5625, 0x22
gText_SavingDontTurnOffThePower:: @ 81C5625
.string "SAVING…\n"
.string "DON'T TURN OFF THE POWER.$"
gUnknown_81C5647:: @ 81C5647
.incbin "baserom.gba", 0x1C5647, 0x23
gText_PlayerSavedTheGame:: @ 81C5647
.string "{PLAYER} saved the game.$"
gUnknown_81C565A::
.string "セーブに　しっぱい　しました‥$"
@ 0xE5
gUnknown_81C566A:: @ 81C566A
.incbin "baserom.gba", 0x1C566A, 0xE5
gText_DifferentGameFile:: @ 81C566A
.string "WARNING!\p"
.string "There is a different game file that\n"
.string "is already saved.\p"
.string "If you save now, the other file's\n"
.string "adventure, including items and\l"
.string "POKéMON, will be entirely lost.\p"
.string "Are you sure you want to save now\n"
.string "and overwrite the other save file?$"
gOtherText_NewName:: @ 81C574F
.string "NEW NAME$"
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+2 -2
View File
@@ -36,7 +36,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
goto_if_eq EventScript_1A7AE0
lockall
setvar VAR_0x8004, 32
special sub_812B220
special Special_SetSomeVariable
setvar VAR_0x8004, 1
special sub_80CA86C
playse SE_PC_ON
@@ -47,7 +47,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4
releaseall
end
gUnknown_8168D17:: @ 8168D17
EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17
setvar VAR_0x8004, 1
playse SE_PC_OFF
special sub_80CA9A8
data/specials.inc
+4 -4
View File
@@ -102,7 +102,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special sub_8081128
def_special sub_806F67C
def_special Field_AskSaveTheGame
def_special nullsub_56
def_special sub_80FEE44
def_special sub_80BDA7C
@@ -390,9 +390,9 @@ gSpecials:: @ 815FD60
def_special TakePokemonFromRoute5Daycare
def_special ScrSpecial_SeaGallopFerry
def_special sub_80CC48C
def_special sub_812B220
def_special sub_812B234
def_special sub_812B248
def_special Special_SetSomeVariable
def_special HelpSystem_BackupSomeVariable
def_special HelpSystem_RestoreSomeVariable
def_special ValidateReceivedWonderCard
def_special sub_810B810
def_special sub_811999C
data/start_menu.s
-28
View File
@@ -1,28 +0,0 @@
.section .rodata
.align 2
gUnknown_83A7344:: @ 83A7344
.incbin "baserom.gba", 0x3A7344, 0x48
gUnknown_83A738C:: @ 83A738C
.incbin "baserom.gba", 0x3A738C, 0x8
gUnknown_83A7394:: @ 83A7394
.incbin "baserom.gba", 0x3A7394, 0x24
gUnknown_83A73B8:: @ 83A73B8
.incbin "baserom.gba", 0x3A73B8, 0x4
gUnknown_83A73BC:: @ 83A73BC
.incbin "baserom.gba", 0x3A73BC, 0x10
gUnknown_83A73CC:: @ 83A73CC
.incbin "baserom.gba", 0x3A73CC, 0x8
gUnknown_83A73D4:: @ 83A73D4
.incbin "baserom.gba", 0x3A73D4, 0x4
gUnknown_83A73D8:: @ 83A73D8
.incbin "baserom.gba", 0x3A73D8, 0x4
gUnknown_83A73DC:: @ 83A73DC
.incbin "baserom.gba", 0x3A73DC, 0x284
data/strings.s
+831 -280
View File
File diff suppressed because it is too large Load Diff
data/tileset_anims.s
+3
View File
@@ -1,5 +1,8 @@
.section .rodata
.align 2
gUnknown_83A73E0:: @ 83A73E0
.incbin "baserom.gba", 0x3A73E0, 0x280
gUnknown_83A7660:: @ 83A7660
.incbin "baserom.gba", 0x3A7660, 0x2FF4