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

fix PR merge conflicts

Browse Source
This commit is contained in:
Evan
2019-11-21 09:31:40 -07:00
parent e6bc189a03 1234d0252c
commit 407d22af8e
47 changed files with 1979 additions and 4704 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_message.s
+5 -5
View File
@@ -1797,7 +1797,7 @@ gUnknown_83FDDEB:: @ 83FDDEB
.string "$"
.align 2
gUnknown_83FDF3C:: @ 83FDF3C
gBattleStringsTable:: @ 83FDF3C
.4byte gUnknown_83FB219
.4byte gUnknown_83FB265
.4byte gUnknown_83FB28E
@@ -2448,21 +2448,21 @@ gTrappingMoves:: @ 83FE664
.2byte MOVE_SAND_TOMB
.2byte 0xFFFF
gUnknown_83FE672:: @ 83FE672
gText_PkmnIsEvolving:: @ 83FE672
.string "What?\n"
.string "{STR_VAR_1} is evolving!$"
gUnknown_83FE688:: @ 83FE688
gText_CongratsPkmnEvolved:: @ 83FE688
.string "Congratulations! Your {STR_VAR_1}\n"
.string "evolved into {STR_VAR_2}!{WAIT_SE}\p"
.string "$"
gUnknown_83FE6B5:: @ 83FE6B5
gText_PkmnStoppedEvolving:: @ 83FE6B5
.string "Huh? {STR_VAR_1}\n"
.string "stopped evolving!\p"
.string "$"
gUnknown_83FE6D0:: @ 83FE6D0
gText_EllipsisQuestionMark:: @ 83FE6D0
.string "……?\p"
.string "$"
data/evolution_scene.s
-33
View File
@@ -1,33 +0,0 @@
#include "constants/species.h"
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83F6C90:: @ 83F6C90
.incbin "baserom.gba", 0x3F6C90, 0x20
gUnknown_83F6CB0:: @ 83F6CB0
.incbin "baserom.gba", 0x3F6CB0, 0x6F8
gUnknown_83F73A8:: @ 83F73A8
.incbin "baserom.gba", 0x3F73A8, 0x4E4
gUnknown_83F788C:: @ 83F788C
.incbin "baserom.gba", 0x3F788C, 0x4D4
gUnknown_83F7D60:: @ 83F7D60
.incbin "baserom.gba", 0x3F7D60, 0x6A0
gUnknown_83F8400:: @ 83F8400
.incbin "baserom.gba", 0x3F8400, 0x40
gUnknown_83F8440:: @ 83F8440
.incbin "baserom.gba", 0x3F8440, 0x2D
gUnknown_83F846D:: @ 83F846D
.incbin "baserom.gba", 0x3F846D, 0x10
gUnknown_83F847D:: @ 83F847D
.incbin "baserom.gba", 0x3F847D, 0x323
data/field_ground_effect.s
+1 -1
View File
@@ -31,4 +31,4 @@ gUnknown_83A70AC:: @ 83A70AC
.incbin "baserom.gba", 0x3A70AC, 0x10
gUnknown_83A70BC:: @ 83A70BC
.incbin "baserom.gba", 0x3A70BC, 0xE0
.incbin "baserom.gba", 0x3A70BC, 0x50
data/field_map_obj.s
+9 -4
View File
@@ -3,19 +3,24 @@
.section .rodata
.align 2
gUnknown_835B934:: @ 835B934
.incbin "baserom.gba", 0x35B934, 0x10
.byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00
gUnknown_835B944:: @ 835B944
.incbin "baserom.gba", 0x35B944, 0x18
spr_template 0, 65535, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject
gUnknown_835B95C:: @ 835B95C
.incbin "baserom.gba", 0x35B95C, 0xC
.4byte CameraObject_0
.4byte CameraObject_1
.4byte CameraObject_2
gUnknown_835B968:: @ 835B968
.incbin "graphics/map_objects/0.gbapal"
gUnknown_835B988::
.incbin "baserom.gba", 0x35B988, 0x1E0
.incbin "graphics/map_objects/unk_835B988.gbapal"
gUnknown_835B9A0::
.space 0x1C0
gUnknown_835BB68:: @ 835BB68
.incbin "graphics/map_objects/000.4bpp"
data/fldeff_flash.s
+56 -9
View File
@@ -6,22 +6,69 @@
.align 2
gUnknown_83F5738:: @ 83F5738
.incbin "baserom.gba", 0x3F5738, 0xCC
.byte 1, 4, 1, 0
.4byte sub_80C9FD4
.4byte sub_80CA160
.byte 2, 4, 1, 0
.4byte sub_80C9FD4
.4byte sub_80CA160
.byte 3, 4, 1, 0
.4byte sub_80C9FD4
.4byte sub_80CA160
.byte 5, 4, 1, 0
.4byte sub_80C9FD4
.4byte sub_80CA160
.byte 6, 4, 1, 0
.4byte sub_80C9FD4
.4byte sub_80CA160
.byte 7, 4, 1, 0
.4byte sub_80C9FD4
.4byte sub_80CA160
.byte 8, 4, 1, 0
.4byte sub_80C9FD4
.4byte sub_80CA160
.byte 9, 4, 1, 0
.4byte sub_80C9FD4
.4byte sub_80CA160
.byte 4, 1, 0, 1
.4byte sub_80C9E1C
.4byte sub_80CA160
.byte 4, 2, 0, 1
.4byte sub_80C9E1C
.4byte sub_80CA160
.byte 4, 3, 0, 1
.4byte sub_80C9E1C
.4byte sub_80CA160
.byte 4, 5, 0, 1
.4byte sub_80C9E1C
.4byte sub_80CA160
.byte 4, 6, 0, 1
.4byte sub_80C9E1C
.4byte sub_80CA160
.byte 4, 7, 0, 1
.4byte sub_80C9E1C
.4byte sub_80CA160
.byte 4, 8, 0, 1
.4byte sub_80C9E1C
.4byte sub_80CA160
.byte 4, 9, 0, 1
.4byte sub_80C9E1C
.4byte sub_80CA160
.byte 0, 0, 0, 0
.4byte NULL
.4byte NULL
gUnknown_83F5804:: @ 83F5804
.incbin "baserom.gba", 0x3F5804, 0x20
.incbin "graphics/field_effects/flash_white.gbapal"
gUnknown_83F5824:: @ 83F5824
.incbin "baserom.gba", 0x3F5824, 0x20
.incbin "graphics/field_effects/flash_black.gbapal"
gUnknown_83F5844:: @ 83F5844
.incbin "baserom.gba", 0x3F5844, 0x10
gUnknown_83F5854:: @ 83F5854
.incbin "baserom.gba", 0x3F5854, 0x10
.incbin "graphics/field_effects/flash_gradient.gbapal"
gUnknown_83F5864:: @ 83F5864
.incbin "baserom.gba", 0x3F5864, 0x1E0
.incbin "graphics/field_effects/flash_effect_map.bin.lz"
gUnknown_83F5A44:: @ 83F5A44
.incbin "baserom.gba", 0x3F5A44, 0xB4
.incbin "graphics/field_effects/flash_effect_tiles.4bpp.lz"
data/map_obj_80688E4.s
+72 -7
View File
@@ -1,25 +1,90 @@
.section .rodata
.align 2
gUnknown_83A710C::
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
.4byte little_step
gUnknown_83A714C::
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
.4byte double_little_steps
gUnknown_83A716C::
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
.4byte double_little_steps
.4byte triple_little_steps
.4byte triple_little_steps
gUnknown_83A7184::
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
.4byte quad_little_steps
gUnknown_83A7194::
.4byte oct_little_steps
.4byte oct_little_steps
gUnknown_83A719C:: @ 83A719C
.incbin "baserom.gba", 0x3A719C, 0x14
.4byte gUnknown_83A710C
.4byte gUnknown_83A714C
.4byte gUnknown_83A716C
.4byte gUnknown_83A7184
.4byte gUnknown_83A7194
gUnknown_83A71B0:: @ 83A71B0
.incbin "baserom.gba", 0x3A71B0, 0x3C
.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
gUnknown_83A71BA::
.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
gUnknown_83A71CA::
.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
gUnknown_83A71DA::
.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
.align 2
gUnknown_83A71EC:: @ 83A71EC
.incbin "baserom.gba", 0x3A71EC, 0xC
.4byte gUnknown_83A71BA
.4byte gUnknown_83A71CA
.4byte gUnknown_83A71DA
.align 1
gUnknown_83A71F8:: @ 83A71F8
.incbin "baserom.gba", 0x3A71F8, 0x6
.2byte 0x10, 0x10, 0x20
gUnknown_83A71FE:: @ 83A71FE
.incbin "baserom.gba", 0x3A71FE, 0x4
.byte 0, 0, 1
.align 1
gUnknown_83A7202:: @ 83A7202
.incbin "baserom.gba", 0x3A7202, 0x6
.2byte 0x20, 0x20, 0x40
gUnknown_83A7208:: @ 83A7208
.incbin "baserom.gba", 0x3A7208, 0x4
.byte 1, 1, 2
.align 2
gUnknown_83A720C:: @ 83A720C
data/smokescreen.s
+44 -6
View File
@@ -1,17 +1,55 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.balign 4
.align 2
gUnknown_825098C:: @ 825098C
.incbin "baserom.gba", 0x25098C, 0x8
obj_tiles gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet, 0x0180, 55019
gUnknown_8250994:: @ 8250994
.incbin "baserom.gba", 0x250994, 0x60
obj_pal gFile_graphics_battle_anims_sprites_smokescreen_impact_palette, 55019
gOamData_835099C::
.4byte 0x40000000, 0x00000400
gAnimCmd_82509A4::
obj_image_anim_frame 0, 4
obj_image_anim_frame 4, 4
obj_image_anim_frame 8, 4
obj_image_anim_end
gAnimCmd_82509B4::
obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
obj_image_anim_end
gAnimCmd_82509C4::
obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_end
gAnimCmd_82509D4::
obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
obj_image_anim_end
gSpriteAnimTable_82509E4::
.4byte gAnimCmd_82509A4
.4byte gAnimCmd_82509B4
.4byte gAnimCmd_82509C4
.4byte gAnimCmd_82509D4
gUnknown_82509F4:: @ 82509F4
.incbin "baserom.gba", 0x2509F4, 0x18
spr_template 55019, 55019, gOamData_835099C, gSpriteAnimTable_82509E4, NULL, gDummySpriteAffineAnimTable, sub_804A904
gSpriteSheet_EnemyShadow:: @ 8250A0C
.incbin "baserom.gba", 0x250A0C, 0x10
obj_tiles gFile_graphics_battle_interface_enemy_mon_shadow_sheet, 0x0080, 55129
gOamData_8250A14::
.4byte 0x40004000, 0x00000c00
gSpriteTemplate_EnemyShadow:: @ 8250A1C
.incbin "baserom.gba", 0x250A1C, 0x18
spr_template 55129, 55039, gOamData_8250A14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_SetInvisible
data/strings.s
+1 -1
View File
@@ -4517,7 +4517,7 @@ gUnknown_841E2F5:: @ 841E2F5
gUnknown_841E322:: @ 841E322
.string "{ID}$"
gUnknown_841E325:: @ 841E325
gText_CommunicationStandby5:: @ 841E325
.string "Communication standby…$"
gDaycareText_GetAlongVeryWell:: @ 841E33C