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

Merge pull request #76 from jiangzhengwenjz/misc

Browse Source 
new_menu_helpers, multiboot, hof_pc, play_time, decompress, reset_save_heap, save_location, mail_data, fldeff_*
This commit is contained in:
PikalaxALT
2019-07-01 21:45:36 -04:00
committed by GitHub
parent 7f06718571 062238aa12
commit 74d771ef90
164 changed files with 3911 additions and 8956 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/data_83FECCC.s
+2 -25
View File
@@ -553,21 +553,8 @@ gUnknown_841F1C8:: @ 841F1C8
gTMCaseMainWindowPalette:: @ 841F408
.incbin "graphics/tm_case/unk_841F408.gbapal"
gUnknown_841F428:: @ 841F428
.incbin "baserom.gba", 0x41F428, 0x4
gUnknown_841F42C:: @ 841F42C
.incbin "baserom.gba", 0x41F42C, 0x10
gUnknown_841F43C:: @ 841F43C
.incbin "baserom.gba", 0x41F43C, 0x8
gUnknown_841F444:: @ 841F444
.incbin "baserom.gba", 0x41F444, 0x60
gUnknown_841F4A4:: @ 841F4A4
.incbin "baserom.gba", 0x41F4A4, 0x10
.section .rodata.841F4B4
.align 2
gUnknown_841F4B4:: @ 841F4B4
.incbin "baserom.gba", 0x41F4B4, 0x1F534
@@ -982,17 +969,7 @@ gUnknown_8452F6C:: @ 8452F6C
gUnknown_8452F7C:: @ 8452F7C
.incbin "baserom.gba", 0x452F7C, 0xC0
gUnknown_845303C:: @ 845303C
.incbin "baserom.gba", 0x45303C, 0x56
gUnknown_8453092:: @ 8453092
.incbin "baserom.gba", 0x453092, 0x2
gUnknown_8453094:: @ 8453094
.incbin "baserom.gba", 0x453094, 0x4
.section .rodata.8453F6C
// mailbox_pc.o
gUnknown_8453FE8:: @ 8453FE8
.incbin "baserom.gba", 0x453FE8, 0x18
data/map_event_scripts.inc
+3 -3
View File
@@ -3545,7 +3545,7 @@ CeruleanCave_B1F_EventScript_1BE00C:: @ 81BE00C
CeruleanCave_1F_EventScript_1BE00C:: @ 81BE00C
.incbin "baserom.gba", 0x1BE00C, 0x58
gUnknown_81BE064:: @ 81BE064
EventScript_FldEffRockSmash:: @ 81BE064
.incbin "baserom.gba", 0x1BE064, 0xB9
MtEmber_Exterior_EventScript_1BE11D:: @ 81BE11D
@@ -3566,7 +3566,7 @@ SeafoamIslands_B1F_EventScript_1BE11D:: @ 81BE11D
VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D
.incbin "baserom.gba", 0x1BE11D, 0x51
gUnknown_81BE16E:: @ 81BE16E
EventScript_FldEffStrength:: @ 81BE16E
.incbin "baserom.gba", 0x1BE16E, 0x149
gUnknown_81BE2B7:: @ 81BE2B7
@@ -3575,7 +3575,7 @@ gUnknown_81BE2B7:: @ 81BE2B7
gUnknown_81BE2FF:: @ 81BE2FF
.incbin "baserom.gba", 0x1BE2FF, 0x265
gUnknown_81BE564:: @ 81BE564
EventScript_FailSweetScent:: @ 81BE564
.incbin "baserom.gba", 0x1BE564, 0x2A
Route2_EventScript_1BE58E:: @ 81BE58E
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+1 -1
View File
@@ -113,7 +113,7 @@ FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
EventScript_1640A2:: @ 81640A2
getplayerxy VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, player_get_direction_lower_nybble
specialvar VAR_RESULT, GetPlayerFacingDirection
compare_var_to_value VAR_RESULT, 2
call_if 1, EventScript_16412E
msgbox gUnknown_817B7AE
data/specials.inc
+5 -5
View File
@@ -162,7 +162,7 @@ gSpecials:: @ 815FD60
def_special sub_80CA758
def_special nullsub_75
def_special nullsub_75
def_special sub_8055DC4
def_special Overworld_PlaySpecialMapMusic
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -271,8 +271,8 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sp109_CreatePCMenu
def_special sub_80CA574
def_special ScrSpecial_CreatePCMenu
def_special HallOfFamePCBeginFade
def_special sub_80CA618
def_special nullsub_75
def_special nullsub_75
@@ -296,7 +296,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special sub_80CAAAC
def_special sub_80CAABC
def_special player_get_direction_lower_nybble
def_special GetPlayerFacingDirection
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -435,7 +435,7 @@ gSpecials:: @ 815FD60
def_special sub_809D764
def_special sub_809D8C0
def_special sub_8147500
def_special player_get_direction_lower_nybble
def_special GetPlayerFacingDirection
def_special sub_80CCDFC
def_special sub_80CD008
def_special sub_8147594