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

Merge branch 'master' into multiplayer-stuff

Browse Source
This commit is contained in:
Phlosioneer
2019-02-21 21:21:10 -05:00
parent 0a7b97ee06 b105d20d1e
commit eca329f9c5
48 changed files with 5297 additions and 8331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
data/easy_chat.s
View File

@@ -17,7 +17,7 @@ gUnknown_08597530:: @ 8597530
.4byte 0x0000001b
.4byte sub_811A938
gUnknown_08597550:: @ 8597550
gEasyChatScreenTemplates:: @ 8597550
.byte 0x00, 0x02, 0x02, 0x00
.align 2
@@ -208,13 +208,20 @@ gUnknown_08597550:: @ 8597550
.4byte gText_IsAsShownOkay
gUnknown_08597748:: @ 8597748
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00
.byte 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00
.byte 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13
.byte 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
gUnknown_08597764:: @ 8597764
.2byte 0x0209, 0x140b, 0x1030, 0x102a
gUnknown_0859776C:: @ 859776C
.2byte 0x1240, 0x0628, 0x061f, 0x2204, 0x1422, 0x0197, 0x0415, 0x0198, 0x2207, 0x0449
.2byte 0x1240, 0x0628
.2byte 0x061f, 0x2204
.2byte 0x1422, 0x0197
.2byte 0x0415, 0x0198
.2byte 0x2207, 0x0449
.align 2
gUnknown_08597780:: @ 8597780

2
data/event_scripts.s
View File

@@ -940,7 +940,7 @@ EventScript_27149D:: @ 827149D
setberrytree 82, 36, 5
return
EventScript_2715DE:: @ 82715DE
EventScript_ResetAllMapFlags:: @ 82715DE
setflag FLAG_LINK_CONTEST_POKE_BALL
setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE

4
data/field_effect_scripts.s
View File

@@ -65,7 +65,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_Unknown57
.4byte gFieldEffectScript_Unknown58
.4byte gFieldEffectScript_FieldMoveShowMonInit
.4byte gFieldEffectScript_Unknown60
.4byte gFieldEffectScript_UsePuzzleEffect
.4byte gFieldEffectScript_Unknown61
.4byte gFieldEffectScript_Unknown62
.4byte gFieldEffectScript_Unknown63
@@ -315,7 +315,7 @@ gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
field_eff_callnative FldEff_FieldMoveShowMonInit
field_eff_end
gFieldEffectScript_Unknown60:: @ 82DBCD2
gFieldEffectScript_UsePuzzleEffect:: @ 82DBCD2
field_eff_callnative FldEff_UsePuzzleEffect
field_eff_end

4
data/maps/AncientTomb/scripts.inc
View File

@@ -25,7 +25,7 @@ AncientTomb_EventScript_238FEE:: @ 8238FEE
return
AncientTomb_MapScript1_238FF2: @ 8238FF2
call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_238FFC
call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_238FFC
end
AncientTomb_EventScript_238FFC:: @ 8238FFC
@@ -39,7 +39,7 @@ AncientTomb_EventScript_238FFC:: @ 8238FFC
AncientTomb_EventScript_239033:: @ 8239033
lockall
goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_239046
goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_239046
braillemessage AncientTomb_Braille_2A6D06
waitbuttonpress
hidebox2

4
data/maps/DesertRuins/scripts.inc
View File

@@ -16,7 +16,7 @@ DesertRuins_EventScript_22D975:: @ 822D975
return
DesertRuins_MapScript1_22D989: @ 822D989
call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D993
call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D993
end
DesertRuins_EventScript_22D993:: @ 822D993
@@ -39,7 +39,7 @@ DesertRuins_EventScript_22D9D7:: @ 822D9D7
DesertRuins_EventScript_22D9DB:: @ 822D9DB
lockall
goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_22D9EE
goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_22D9EE
braillemessage DesertRuins_Braille_2A6CA0
waitbuttonpress
hidebox2

14
data/maps/IslandCave/scripts.inc
View File

@@ -16,7 +16,7 @@ IslandCave_EventScript_238E44:: @ 8238E44
return
IslandCave_MapScript1_238E58: @ 8238E58
call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238E62
call_if_unset FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238E62
end
IslandCave_EventScript_238E62:: @ 8238E62
@@ -47,13 +47,13 @@ IslandCave_EventScript_238EAF:: @ 8238EAF
setmetatile 9, 20, 564, 1
special DrawWholeMapView
playse SE_BAN
setflag FLAG_SYS_BRAILLE_WAIT
setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED
end
IslandCave_EventScript_238EEF:: @ 8238EEF
lockall
call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F13
goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F13
braillemessage IslandCave_Braille_2A6CD4
setflag FLAG_TEMP_2
special ShouldDoBrailleRegicePuzzle
@@ -69,7 +69,7 @@ IslandCave_EventScript_238F1D:: @ 8238F1D
lockall
call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
braillemessage IslandCave_Braille_2A6CD4
goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_238F41
goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F41
setflag FLAG_TEMP_2
special ShouldDoBrailleRegicePuzzle
goto IslandCave_EventScript_238F41
@@ -82,9 +82,9 @@ IslandCave_EventScript_238F41:: @ 8238F41
end
IslandCave_EventScript_238F45:: @ 8238F45
setvar VAR_0x403B, 0
setvar VAR_0x403C, 0
setvar VAR_0x403D, 0
setvar VAR_REGICE_STEPS_1, 0
setvar VAR_REGICE_STEPS_2, 0
setvar VAR_REGICE_STEPS_3, 0
clearflag FLAG_TEMP_3
return

156
data/pokenav.s
View File

@@ -3,162 +3,6 @@
.section .rodata
gUnknown_0861F3EC:: @ 861F3EC
.4byte sub_81C9298
.4byte sub_81C941C
.4byte sub_81C9924
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81C9298
.4byte sub_81C941C
.4byte sub_81C9940
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81C9338
.4byte sub_81C941C
.4byte sub_81C9940
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81C9368
.4byte sub_81C941C
.4byte sub_81C9940
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81C92CC
.4byte sub_81C941C
.4byte sub_81C9940
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81C9304
.4byte sub_81C941C
.4byte sub_81C9940
.4byte sub_81C9990
.4byte sub_81C99C0
.4byte sub_81C9430
.4byte sub_81C99D4
.4byte sub_81CC4D4
.4byte sub_81CC554
.4byte sub_81CC5F4
.4byte sub_81CC62C
.4byte sub_81CC65C
.4byte sub_81CC524
.4byte sub_81CC670
.4byte sub_81CCFD8
.4byte sub_81CD070
.4byte sub_81CDDD4
.4byte sub_81CDE2C
.4byte sub_81CDE64
.4byte sub_81CD1C0
.4byte sub_81CECA0
.4byte sub_81CEF3C
.4byte sub_81CEFDC
.4byte sub_81CF330
.4byte sub_81CF3A0
.4byte sub_81CF3D0
.4byte sub_81CEFF0
.4byte sub_81CF3F8
.4byte sub_81CD024
.4byte sub_81CD070
.4byte sub_81CDDD4
.4byte sub_81CDE2C
.4byte sub_81CDE64
.4byte sub_81CD1C0
.4byte sub_81CECA0
.4byte sub_81CEF98
.4byte sub_81CEFDC
.4byte sub_81CF368
.4byte sub_81CF3A0
.4byte sub_81CF3D0
.4byte sub_81CEFF0
.4byte sub_81CF3F8
.4byte sub_81CAAE8
.4byte sub_81CAB24
.4byte sub_81CB260
.4byte sub_81CB29C
.4byte sub_81CB2CC
.4byte sub_81CAB38
.4byte sub_81CB2E0
.4byte sub_81CF9BC
.4byte sub_81CFA34
.4byte sub_81CFDD0
.4byte sub_81CFE40
.4byte sub_81CFE70
.4byte sub_81CFA48
.4byte sub_81CFE98
.4byte sub_81D0450
.4byte sub_81D04A0
.4byte sub_81D0978
.4byte sub_81D09B0
.4byte sub_81D09E0
.4byte sub_81D04B8
.4byte sub_81D09F4
.4byte sub_81CFA04
.4byte sub_81CFA34
.4byte sub_81CFE08
.4byte sub_81CFE40
.4byte sub_81CFE70
.4byte sub_81CFA48
.4byte sub_81CFE98
gUnknown_0861F590:: @ 861F590
.incbin "graphics/pokenav/icon2.gbapal"
gUnknown_0861F5B0:: @ 861F5B0
.incbin "graphics/pokenav/icon2.4bpp.lz"
gUnknown_0861F994:: @ 861F994
.incbin "graphics/pokenav/icon2_unused.4bpp.lz"
gUnknown_0861FA04:: @ 861FA04
.byte 0x50
.byte 0x0
.byte 0x0
.byte 0x0
gUnknown_0861FA08:: @ 861FA08
window_template 0, 1, 0x16, 0x10, 0x2, 0x0, 0x36
null_window_template
gUnknown_0861FA18:: @ 861FA18
.4byte gUnknown_085EBED5
.4byte gUnknown_085EBED9
.4byte gUnknown_085EBEE9
.4byte gUnknown_085EBEF9
.4byte gUnknown_085EBF0E
.4byte gUnknown_085EBF22
.4byte gUnknown_085EBF39
.4byte gUnknown_085EBF49
.4byte gUnknown_085EBF57
.4byte gUnknown_085EBF60
.4byte gUnknown_085EBF73
.4byte gUnknown_085EBF84
gUnknown_0861FA48:: @ 861FA48
.byte 0x4
.byte 0x1
.byte 0x2
.byte 0x0
gUnknown_0861FA4C:: @ 861FA4C
obj_tiles gUnknown_0861F5B0, 0x1000, 0
gUnknown_0861FA54:: @ 861FA54
obj_pal gUnknown_0861F590, 0
null_obj_pal
gUnknown_0861FA64:: @ 861FA64
obj_tiles gPokenavLeftHeaderHoennMap_Gfx, 0xC00, 2
gUnknown_0861FA6C:: @ 861FA6C
obj_tiles gPokenavLeftHeaderMainMenu_Gfx, 0x20, 3
obj_tiles gPokenavLeftHeaderCondition_Gfx, 0x20, 1

2
data/specials.inc
View File

@@ -291,7 +291,7 @@ gSpecials:: @ 81DBA64
def_special GetPokeblockNameByMonNature
def_special GetSecretBaseNearbyMapName
def_special CheckRelicanthWailord
def_special ShouldDoBrailleStrengthEffectOld
def_special ShouldDoBrailleRegirockEffectOld
def_special sub_80B0534
def_special sub_80B058C
def_special WaitWeather