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

Review changes

Browse Source
This commit is contained in:
Eduardo Quezada
2023-02-15 13:56:11 -03:00
parent a937b3221a
commit bd54990333
15 changed files with 253 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+2 -2
View File
@@ -1933,9 +1933,9 @@
.endm .endm
@ Creates a Pokémon with the modernFatefulEncounter bit set for an encounter @ Creates a Pokémon with the modernFatefulEncounter bit set for an encounter
.macro setmodernfatefulencountermon species:req, level:req, item=ITEM_NONE .macro seteventmon species:req, level:req, item=ITEM_NONE
setvar VAR_0x8004, \species setvar VAR_0x8004, \species
setvar VAR_0x8005, \level setvar VAR_0x8005, \level
setvar VAR_0x8006, \item setvar VAR_0x8006, \item
special CreateModernFatefulEncounterEnemyMon special CreateEnemyEventMon
.endm .endm
data/maps/BirthIsland_Exterior/scripts.inc
+1 -1
View File
@@ -85,7 +85,7 @@ BirthIsland_Exterior_EventScript_Deoxys::
delay 40 delay 40
waitmoncry waitmoncry
setvar VAR_LAST_TALKED, LOCALID_DEOXYS setvar VAR_LAST_TALKED, LOCALID_DEOXYS
setmodernfatefulencountermon SPECIES_DEOXYS, 30 seteventmon SPECIES_DEOXYS, 30
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
special BattleSetup_StartLegendaryBattle special BattleSetup_StartLegendaryBattle
waitstate waitstate
data/maps/FarawayIsland_Interior/scripts.inc
+1 -1
View File
@@ -129,7 +129,7 @@ FarawayIsland_Interior_EventScript_Mew::
special DestroyMewEmergingGrassSprite special DestroyMewEmergingGrassSprite
delay 40 delay 40
waitmoncry waitmoncry
setmodernfatefulencountermon SPECIES_MEW, 30 seteventmon SPECIES_MEW, 30
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
special BattleSetup_StartLegendaryBattle special BattleSetup_StartLegendaryBattle
waitstate waitstate
data/maps/NavelRock_Bottom/scripts.inc
+1 -1
View File
@@ -53,7 +53,7 @@ NavelRock_Bottom_EventScript_Lugia::
playmoncry SPECIES_LUGIA, CRY_MODE_ENCOUNTER playmoncry SPECIES_LUGIA, CRY_MODE_ENCOUNTER
waitmoncry waitmoncry
delay 20 delay 20
setmodernfatefulencountermon SPECIES_LUGIA, 70 seteventmon SPECIES_LUGIA, 70
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
special BattleSetup_StartLegendaryBattle special BattleSetup_StartLegendaryBattle
waitstate waitstate
data/maps/NavelRock_Top/scripts.inc
+1 -1
View File
@@ -57,7 +57,7 @@ NavelRock_Top_EventScript_HoOh::
applymovement LOCALID_HO_OH, NavelRock_Top_Movement_HoOhApproach applymovement LOCALID_HO_OH, NavelRock_Top_Movement_HoOhApproach
waitmovement 0 waitmovement 0
special RemoveCameraObject special RemoveCameraObject
setmodernfatefulencountermon SPECIES_HO_OH, 70 seteventmon SPECIES_HO_OH, 70
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
special BattleSetup_StartLegendaryBattle special BattleSetup_StartLegendaryBattle
waitstate waitstate
data/maps/SouthernIsland_Interior/scripts.inc
+2 -2
View File
@@ -105,11 +105,11 @@ SouthernIsland_Interior_EventScript_Sign::
end end
SouthernIsland_Interior_EventScript_SetLatiosBattleVars:: SouthernIsland_Interior_EventScript_SetLatiosBattleVars::
setmodernfatefulencountermon SPECIES_LATIOS, 50, ITEM_SOUL_DEW seteventmon SPECIES_LATIOS, 50, ITEM_SOUL_DEW
return return
SouthernIsland_Interior_EventScript_SetLatiasBattleVars:: SouthernIsland_Interior_EventScript_SetLatiasBattleVars::
setmodernfatefulencountermon SPECIES_LATIAS, 50, ITEM_SOUL_DEW seteventmon SPECIES_LATIAS, 50, ITEM_SOUL_DEW
return return
SouthernIsland_Interior_Movement_CameraPanUp: SouthernIsland_Interior_Movement_CameraPanUp:
data/script_cmd_table.inc
+227 -227
View File
@@ -1,232 +1,232 @@
.align 2 .align 2
gScriptCmdTable:: gScriptCmdTable::
.4byte ScrCmd_nop @ 0x00 .4byte ScrCmd_nop @ 0x00
.4byte ScrCmd_nop1 @ 0x01 .4byte ScrCmd_nop1 @ 0x01
.4byte ScrCmd_end @ 0x02 .4byte ScrCmd_end @ 0x02
.4byte ScrCmd_return @ 0x03 .4byte ScrCmd_return @ 0x03
.4byte ScrCmd_call @ 0x04 .4byte ScrCmd_call @ 0x04
.4byte ScrCmd_goto @ 0x05 .4byte ScrCmd_goto @ 0x05
.4byte ScrCmd_goto_if @ 0x06 .4byte ScrCmd_goto_if @ 0x06
.4byte ScrCmd_call_if @ 0x07 .4byte ScrCmd_call_if @ 0x07
.4byte ScrCmd_gotostd @ 0x08 .4byte ScrCmd_gotostd @ 0x08
.4byte ScrCmd_callstd @ 0x09 .4byte ScrCmd_callstd @ 0x09
.4byte ScrCmd_gotostd_if @ 0x0a .4byte ScrCmd_gotostd_if @ 0x0a
.4byte ScrCmd_callstd_if @ 0x0b .4byte ScrCmd_callstd_if @ 0x0b
.4byte ScrCmd_returnram @ 0x0c .4byte ScrCmd_returnram @ 0x0c
.4byte ScrCmd_endram @ 0x0d .4byte ScrCmd_endram @ 0x0d
.4byte ScrCmd_setmysteryeventstatus @ 0x0e .4byte ScrCmd_setmysteryeventstatus @ 0x0e
.4byte ScrCmd_loadword @ 0x0f .4byte ScrCmd_loadword @ 0x0f
.4byte ScrCmd_loadbyte @ 0x10 .4byte ScrCmd_loadbyte @ 0x10
.4byte ScrCmd_setptr @ 0x11 .4byte ScrCmd_setptr @ 0x11
.4byte ScrCmd_loadbytefromptr @ 0x12 .4byte ScrCmd_loadbytefromptr @ 0x12
.4byte ScrCmd_setptrbyte @ 0x13 .4byte ScrCmd_setptrbyte @ 0x13
.4byte ScrCmd_copylocal @ 0x14 .4byte ScrCmd_copylocal @ 0x14
.4byte ScrCmd_copybyte @ 0x15 .4byte ScrCmd_copybyte @ 0x15
.4byte ScrCmd_setvar @ 0x16 .4byte ScrCmd_setvar @ 0x16
.4byte ScrCmd_addvar @ 0x17 .4byte ScrCmd_addvar @ 0x17
.4byte ScrCmd_subvar @ 0x18 .4byte ScrCmd_subvar @ 0x18
.4byte ScrCmd_copyvar @ 0x19 .4byte ScrCmd_copyvar @ 0x19
.4byte ScrCmd_setorcopyvar @ 0x1a .4byte ScrCmd_setorcopyvar @ 0x1a
.4byte ScrCmd_compare_local_to_local @ 0x1b .4byte ScrCmd_compare_local_to_local @ 0x1b
.4byte ScrCmd_compare_local_to_value @ 0x1c .4byte ScrCmd_compare_local_to_value @ 0x1c
.4byte ScrCmd_compare_local_to_ptr @ 0x1d .4byte ScrCmd_compare_local_to_ptr @ 0x1d
.4byte ScrCmd_compare_ptr_to_local @ 0x1e .4byte ScrCmd_compare_ptr_to_local @ 0x1e
.4byte ScrCmd_compare_ptr_to_value @ 0x1f .4byte ScrCmd_compare_ptr_to_value @ 0x1f
.4byte ScrCmd_compare_ptr_to_ptr @ 0x20 .4byte ScrCmd_compare_ptr_to_ptr @ 0x20
.4byte ScrCmd_compare_var_to_value @ 0x21 .4byte ScrCmd_compare_var_to_value @ 0x21
.4byte ScrCmd_compare_var_to_var @ 0x22 .4byte ScrCmd_compare_var_to_var @ 0x22
.4byte ScrCmd_callnative @ 0x23 .4byte ScrCmd_callnative @ 0x23
.4byte ScrCmd_gotonative @ 0x24 .4byte ScrCmd_gotonative @ 0x24
.4byte ScrCmd_special @ 0x25 .4byte ScrCmd_special @ 0x25
.4byte ScrCmd_specialvar @ 0x26 .4byte ScrCmd_specialvar @ 0x26
.4byte ScrCmd_waitstate @ 0x27 .4byte ScrCmd_waitstate @ 0x27
.4byte ScrCmd_delay @ 0x28 .4byte ScrCmd_delay @ 0x28
.4byte ScrCmd_setflag @ 0x29 .4byte ScrCmd_setflag @ 0x29
.4byte ScrCmd_clearflag @ 0x2a .4byte ScrCmd_clearflag @ 0x2a
.4byte ScrCmd_checkflag @ 0x2b .4byte ScrCmd_checkflag @ 0x2b
.4byte ScrCmd_initclock @ 0x2c .4byte ScrCmd_initclock @ 0x2c
.4byte ScrCmd_dotimebasedevents @ 0x2d .4byte ScrCmd_dotimebasedevents @ 0x2d
.4byte ScrCmd_gettime @ 0x2e .4byte ScrCmd_gettime @ 0x2e
.4byte ScrCmd_playse @ 0x2f .4byte ScrCmd_playse @ 0x2f
.4byte ScrCmd_waitse @ 0x30 .4byte ScrCmd_waitse @ 0x30
.4byte ScrCmd_playfanfare @ 0x31 .4byte ScrCmd_playfanfare @ 0x31
.4byte ScrCmd_waitfanfare @ 0x32 .4byte ScrCmd_waitfanfare @ 0x32
.4byte ScrCmd_playbgm @ 0x33 .4byte ScrCmd_playbgm @ 0x33
.4byte ScrCmd_savebgm @ 0x34 .4byte ScrCmd_savebgm @ 0x34
.4byte ScrCmd_fadedefaultbgm @ 0x35 .4byte ScrCmd_fadedefaultbgm @ 0x35
.4byte ScrCmd_fadenewbgm @ 0x36 .4byte ScrCmd_fadenewbgm @ 0x36
.4byte ScrCmd_fadeoutbgm @ 0x37 .4byte ScrCmd_fadeoutbgm @ 0x37
.4byte ScrCmd_fadeinbgm @ 0x38 .4byte ScrCmd_fadeinbgm @ 0x38
.4byte ScrCmd_warp @ 0x39 .4byte ScrCmd_warp @ 0x39
.4byte ScrCmd_warpsilent @ 0x3a .4byte ScrCmd_warpsilent @ 0x3a
.4byte ScrCmd_warpdoor @ 0x3b .4byte ScrCmd_warpdoor @ 0x3b
.4byte ScrCmd_warphole @ 0x3c .4byte ScrCmd_warphole @ 0x3c
.4byte ScrCmd_warpteleport @ 0x3d .4byte ScrCmd_warpteleport @ 0x3d
.4byte ScrCmd_setwarp @ 0x3e .4byte ScrCmd_setwarp @ 0x3e
.4byte ScrCmd_setdynamicwarp @ 0x3f .4byte ScrCmd_setdynamicwarp @ 0x3f
.4byte ScrCmd_setdivewarp @ 0x40 .4byte ScrCmd_setdivewarp @ 0x40
.4byte ScrCmd_setholewarp @ 0x41 .4byte ScrCmd_setholewarp @ 0x41
.4byte ScrCmd_getplayerxy @ 0x42 .4byte ScrCmd_getplayerxy @ 0x42
.4byte ScrCmd_getpartysize @ 0x43 .4byte ScrCmd_getpartysize @ 0x43
.4byte ScrCmd_additem @ 0x44 .4byte ScrCmd_additem @ 0x44
.4byte ScrCmd_removeitem @ 0x45 .4byte ScrCmd_removeitem @ 0x45
.4byte ScrCmd_checkitemspace @ 0x46 .4byte ScrCmd_checkitemspace @ 0x46
.4byte ScrCmd_checkitem @ 0x47 .4byte ScrCmd_checkitem @ 0x47
.4byte ScrCmd_checkitemtype @ 0x48 .4byte ScrCmd_checkitemtype @ 0x48
.4byte ScrCmd_addpcitem @ 0x49 .4byte ScrCmd_addpcitem @ 0x49
.4byte ScrCmd_checkpcitem @ 0x4a .4byte ScrCmd_checkpcitem @ 0x4a
.4byte ScrCmd_adddecoration @ 0x4b .4byte ScrCmd_adddecoration @ 0x4b
.4byte ScrCmd_removedecoration @ 0x4c .4byte ScrCmd_removedecoration @ 0x4c
.4byte ScrCmd_checkdecor @ 0x4d .4byte ScrCmd_checkdecor @ 0x4d
.4byte ScrCmd_checkdecorspace @ 0x4e .4byte ScrCmd_checkdecorspace @ 0x4e
.4byte ScrCmd_applymovement @ 0x4f .4byte ScrCmd_applymovement @ 0x4f
.4byte ScrCmd_applymovementat @ 0x50 .4byte ScrCmd_applymovementat @ 0x50
.4byte ScrCmd_waitmovement @ 0x51 .4byte ScrCmd_waitmovement @ 0x51
.4byte ScrCmd_waitmovementat @ 0x52 .4byte ScrCmd_waitmovementat @ 0x52
.4byte ScrCmd_removeobject @ 0x53 .4byte ScrCmd_removeobject @ 0x53
.4byte ScrCmd_removeobjectat @ 0x54 .4byte ScrCmd_removeobjectat @ 0x54
.4byte ScrCmd_addobject @ 0x55 .4byte ScrCmd_addobject @ 0x55
.4byte ScrCmd_addobjectat @ 0x56 .4byte ScrCmd_addobjectat @ 0x56
.4byte ScrCmd_setobjectxy @ 0x57 .4byte ScrCmd_setobjectxy @ 0x57
.4byte ScrCmd_showobjectat @ 0x58 .4byte ScrCmd_showobjectat @ 0x58
.4byte ScrCmd_hideobjectat @ 0x59 .4byte ScrCmd_hideobjectat @ 0x59
.4byte ScrCmd_faceplayer @ 0x5a .4byte ScrCmd_faceplayer @ 0x5a
.4byte ScrCmd_turnobject @ 0x5b .4byte ScrCmd_turnobject @ 0x5b
.4byte ScrCmd_trainerbattle @ 0x5c .4byte ScrCmd_trainerbattle @ 0x5c
.4byte ScrCmd_dotrainerbattle @ 0x5d .4byte ScrCmd_dotrainerbattle @ 0x5d
.4byte ScrCmd_gotopostbattlescript @ 0x5e .4byte ScrCmd_gotopostbattlescript @ 0x5e
.4byte ScrCmd_gotobeatenscript @ 0x5f .4byte ScrCmd_gotobeatenscript @ 0x5f
.4byte ScrCmd_checktrainerflag @ 0x60 .4byte ScrCmd_checktrainerflag @ 0x60
.4byte ScrCmd_settrainerflag @ 0x61 .4byte ScrCmd_settrainerflag @ 0x61
.4byte ScrCmd_cleartrainerflag @ 0x62 .4byte ScrCmd_cleartrainerflag @ 0x62
.4byte ScrCmd_setobjectxyperm @ 0x63 .4byte ScrCmd_setobjectxyperm @ 0x63
.4byte ScrCmd_copyobjectxytoperm @ 0x64 .4byte ScrCmd_copyobjectxytoperm @ 0x64
.4byte ScrCmd_setobjectmovementtype @ 0x65 .4byte ScrCmd_setobjectmovementtype @ 0x65
.4byte ScrCmd_waitmessage @ 0x66 .4byte ScrCmd_waitmessage @ 0x66
.4byte ScrCmd_message @ 0x67 .4byte ScrCmd_message @ 0x67
.4byte ScrCmd_closemessage @ 0x68 .4byte ScrCmd_closemessage @ 0x68
.4byte ScrCmd_lockall @ 0x69 .4byte ScrCmd_lockall @ 0x69
.4byte ScrCmd_lock @ 0x6a .4byte ScrCmd_lock @ 0x6a
.4byte ScrCmd_releaseall @ 0x6b .4byte ScrCmd_releaseall @ 0x6b
.4byte ScrCmd_release @ 0x6c .4byte ScrCmd_release @ 0x6c
.4byte ScrCmd_waitbuttonpress @ 0x6d .4byte ScrCmd_waitbuttonpress @ 0x6d
.4byte ScrCmd_yesnobox @ 0x6e .4byte ScrCmd_yesnobox @ 0x6e
.4byte ScrCmd_multichoice @ 0x6f .4byte ScrCmd_multichoice @ 0x6f
.4byte ScrCmd_multichoicedefault @ 0x70 .4byte ScrCmd_multichoicedefault @ 0x70
.4byte ScrCmd_multichoicegrid @ 0x71 .4byte ScrCmd_multichoicegrid @ 0x71
.4byte ScrCmd_drawbox @ 0x72 .4byte ScrCmd_drawbox @ 0x72
.4byte ScrCmd_erasebox @ 0x73 .4byte ScrCmd_erasebox @ 0x73
.4byte ScrCmd_drawboxtext @ 0x74 .4byte ScrCmd_drawboxtext @ 0x74
.4byte ScrCmd_showmonpic @ 0x75 .4byte ScrCmd_showmonpic @ 0x75
.4byte ScrCmd_hidemonpic @ 0x76 .4byte ScrCmd_hidemonpic @ 0x76
.4byte ScrCmd_showcontestpainting @ 0x77 .4byte ScrCmd_showcontestpainting @ 0x77
.4byte ScrCmd_braillemessage @ 0x78 .4byte ScrCmd_braillemessage @ 0x78
.4byte ScrCmd_givemon @ 0x79 .4byte ScrCmd_givemon @ 0x79
.4byte ScrCmd_giveegg @ 0x7a .4byte ScrCmd_giveegg @ 0x7a
.4byte ScrCmd_setmonmove @ 0x7b .4byte ScrCmd_setmonmove @ 0x7b
.4byte ScrCmd_checkpartymove @ 0x7c .4byte ScrCmd_checkpartymove @ 0x7c
.4byte ScrCmd_bufferspeciesname @ 0x7d .4byte ScrCmd_bufferspeciesname @ 0x7d
.4byte ScrCmd_bufferleadmonspeciesname @ 0x7e .4byte ScrCmd_bufferleadmonspeciesname @ 0x7e
.4byte ScrCmd_bufferpartymonnick @ 0x7f .4byte ScrCmd_bufferpartymonnick @ 0x7f
.4byte ScrCmd_bufferitemname @ 0x80 .4byte ScrCmd_bufferitemname @ 0x80
.4byte ScrCmd_bufferdecorationname @ 0x81 .4byte ScrCmd_bufferdecorationname @ 0x81
.4byte ScrCmd_buffermovename @ 0x82 .4byte ScrCmd_buffermovename @ 0x82
.4byte ScrCmd_buffernumberstring @ 0x83 .4byte ScrCmd_buffernumberstring @ 0x83
.4byte ScrCmd_bufferstdstring @ 0x84 .4byte ScrCmd_bufferstdstring @ 0x84
.4byte ScrCmd_bufferstring @ 0x85 .4byte ScrCmd_bufferstring @ 0x85
.4byte ScrCmd_pokemart @ 0x86 .4byte ScrCmd_pokemart @ 0x86
.4byte ScrCmd_pokemartdecoration @ 0x87 .4byte ScrCmd_pokemartdecoration @ 0x87
.4byte ScrCmd_pokemartdecoration2 @ 0x88 .4byte ScrCmd_pokemartdecoration2 @ 0x88
.4byte ScrCmd_playslotmachine @ 0x89 .4byte ScrCmd_playslotmachine @ 0x89
.4byte ScrCmd_setberrytree @ 0x8a .4byte ScrCmd_setberrytree @ 0x8a
.4byte ScrCmd_choosecontestmon @ 0x8b .4byte ScrCmd_choosecontestmon @ 0x8b
.4byte ScrCmd_startcontest @ 0x8c .4byte ScrCmd_startcontest @ 0x8c
.4byte ScrCmd_showcontestresults @ 0x8d .4byte ScrCmd_showcontestresults @ 0x8d
.4byte ScrCmd_contestlinktransfer @ 0x8e .4byte ScrCmd_contestlinktransfer @ 0x8e
.4byte ScrCmd_random @ 0x8f .4byte ScrCmd_random @ 0x8f
.4byte ScrCmd_addmoney @ 0x90 .4byte ScrCmd_addmoney @ 0x90
.4byte ScrCmd_removemoney @ 0x91 .4byte ScrCmd_removemoney @ 0x91
.4byte ScrCmd_checkmoney @ 0x92 .4byte ScrCmd_checkmoney @ 0x92
.4byte ScrCmd_showmoneybox @ 0x93 .4byte ScrCmd_showmoneybox @ 0x93
.4byte ScrCmd_hidemoneybox @ 0x94 .4byte ScrCmd_hidemoneybox @ 0x94
.4byte ScrCmd_updatemoneybox @ 0x95 .4byte ScrCmd_updatemoneybox @ 0x95
.4byte ScrCmd_getpokenewsactive @ 0x96 .4byte ScrCmd_getpokenewsactive @ 0x96
.4byte ScrCmd_fadescreen @ 0x97 .4byte ScrCmd_fadescreen @ 0x97
.4byte ScrCmd_fadescreenspeed @ 0x98 .4byte ScrCmd_fadescreenspeed @ 0x98
.4byte ScrCmd_setflashlevel @ 0x99 .4byte ScrCmd_setflashlevel @ 0x99
.4byte ScrCmd_animateflash @ 0x9a .4byte ScrCmd_animateflash @ 0x9a
.4byte ScrCmd_messageautoscroll @ 0x9b .4byte ScrCmd_messageautoscroll @ 0x9b
.4byte ScrCmd_dofieldeffect @ 0x9c .4byte ScrCmd_dofieldeffect @ 0x9c
.4byte ScrCmd_setfieldeffectargument @ 0x9d .4byte ScrCmd_setfieldeffectargument @ 0x9d
.4byte ScrCmd_waitfieldeffect @ 0x9e .4byte ScrCmd_waitfieldeffect @ 0x9e
.4byte ScrCmd_setrespawn @ 0x9f .4byte ScrCmd_setrespawn @ 0x9f
.4byte ScrCmd_checkplayergender @ 0xa0 .4byte ScrCmd_checkplayergender @ 0xa0
.4byte ScrCmd_playmoncry @ 0xa1 .4byte ScrCmd_playmoncry @ 0xa1
.4byte ScrCmd_setmetatile @ 0xa2 .4byte ScrCmd_setmetatile @ 0xa2
.4byte ScrCmd_resetweather @ 0xa3 .4byte ScrCmd_resetweather @ 0xa3
.4byte ScrCmd_setweather @ 0xa4 .4byte ScrCmd_setweather @ 0xa4
.4byte ScrCmd_doweather @ 0xa5 .4byte ScrCmd_doweather @ 0xa5
.4byte ScrCmd_setstepcallback @ 0xa6 .4byte ScrCmd_setstepcallback @ 0xa6
.4byte ScrCmd_setmaplayoutindex @ 0xa7 .4byte ScrCmd_setmaplayoutindex @ 0xa7
.4byte ScrCmd_setobjectsubpriority @ 0xa8 .4byte ScrCmd_setobjectsubpriority @ 0xa8
.4byte ScrCmd_resetobjectsubpriority @ 0xa9 .4byte ScrCmd_resetobjectsubpriority @ 0xa9
.4byte ScrCmd_createvobject @ 0xaa .4byte ScrCmd_createvobject @ 0xaa
.4byte ScrCmd_turnvobject @ 0xab .4byte ScrCmd_turnvobject @ 0xab
.4byte ScrCmd_opendoor @ 0xac .4byte ScrCmd_opendoor @ 0xac
.4byte ScrCmd_closedoor @ 0xad .4byte ScrCmd_closedoor @ 0xad
.4byte ScrCmd_waitdooranim @ 0xae .4byte ScrCmd_waitdooranim @ 0xae
.4byte ScrCmd_setdooropen @ 0xaf .4byte ScrCmd_setdooropen @ 0xaf
.4byte ScrCmd_setdoorclosed @ 0xb0 .4byte ScrCmd_setdoorclosed @ 0xb0
.4byte ScrCmd_addelevmenuitem @ 0xb1 .4byte ScrCmd_addelevmenuitem @ 0xb1
.4byte ScrCmd_showelevmenu @ 0xb2 .4byte ScrCmd_showelevmenu @ 0xb2
.4byte ScrCmd_checkcoins @ 0xb3 .4byte ScrCmd_checkcoins @ 0xb3
.4byte ScrCmd_addcoins @ 0xb4 .4byte ScrCmd_addcoins @ 0xb4
.4byte ScrCmd_removecoins @ 0xb5 .4byte ScrCmd_removecoins @ 0xb5
.4byte ScrCmd_setwildbattle @ 0xb6 .4byte ScrCmd_setwildbattle @ 0xb6
.4byte ScrCmd_dowildbattle @ 0xb7 .4byte ScrCmd_dowildbattle @ 0xb7
.4byte ScrCmd_setvaddress @ 0xb8 .4byte ScrCmd_setvaddress @ 0xb8
.4byte ScrCmd_vgoto @ 0xb9 .4byte ScrCmd_vgoto @ 0xb9
.4byte ScrCmd_vcall @ 0xba .4byte ScrCmd_vcall @ 0xba
.4byte ScrCmd_vgoto_if @ 0xbb .4byte ScrCmd_vgoto_if @ 0xbb
.4byte ScrCmd_vcall_if @ 0xbc .4byte ScrCmd_vcall_if @ 0xbc
.4byte ScrCmd_vmessage @ 0xbd .4byte ScrCmd_vmessage @ 0xbd
.4byte ScrCmd_vbuffermessage @ 0xbe .4byte ScrCmd_vbuffermessage @ 0xbe
.4byte ScrCmd_vbufferstring @ 0xbf .4byte ScrCmd_vbufferstring @ 0xbf
.4byte ScrCmd_showcoinsbox @ 0xc0 .4byte ScrCmd_showcoinsbox @ 0xc0
.4byte ScrCmd_hidecoinsbox @ 0xc1 .4byte ScrCmd_hidecoinsbox @ 0xc1
.4byte ScrCmd_updatecoinsbox @ 0xc2 .4byte ScrCmd_updatecoinsbox @ 0xc2
.4byte ScrCmd_incrementgamestat @ 0xc3 .4byte ScrCmd_incrementgamestat @ 0xc3
.4byte ScrCmd_setescapewarp @ 0xc4 .4byte ScrCmd_setescapewarp @ 0xc4
.4byte ScrCmd_waitmoncry @ 0xc5 .4byte ScrCmd_waitmoncry @ 0xc5
.4byte ScrCmd_bufferboxname @ 0xc6 .4byte ScrCmd_bufferboxname @ 0xc6
.4byte ScrCmd_nop1 @ 0xc7 .4byte ScrCmd_nop1 @ 0xc7
.4byte ScrCmd_nop1 @ 0xc8 .4byte ScrCmd_nop1 @ 0xc8
.4byte ScrCmd_nop1 @ 0xc9 .4byte ScrCmd_nop1 @ 0xc9
.4byte ScrCmd_nop1 @ 0xca .4byte ScrCmd_nop1 @ 0xca
.4byte ScrCmd_nop1 @ 0xcb .4byte ScrCmd_nop1 @ 0xcb
.4byte ScrCmd_nop1 @ 0xcc .4byte ScrCmd_nop1 @ 0xcc
.4byte ScrCmd_setmonmodernfatefulencounter @ 0xcd .4byte ScrCmd_setmonmodernfatefulencounter @ 0xcd
.4byte ScrCmd_checkmonmodernfatefulencounter @ 0xce .4byte ScrCmd_checkmonmodernfatefulencounter @ 0xce
.4byte ScrCmd_trywondercardscript @ 0xcf .4byte ScrCmd_trywondercardscript @ 0xcf
.4byte ScrCmd_nop1 @ 0xd0 .4byte ScrCmd_nop1 @ 0xd0
.4byte ScrCmd_warpspinenter @ 0xd1 .4byte ScrCmd_warpspinenter @ 0xd1
.4byte ScrCmd_setmonmetlocation @ 0xd2 .4byte ScrCmd_setmonmetlocation @ 0xd2
.4byte ScrCmd_moverotatingtileobjects @ 0xd3 .4byte ScrCmd_moverotatingtileobjects @ 0xd3
.4byte ScrCmd_turnrotatingtileobjects @ 0xd4 .4byte ScrCmd_turnrotatingtileobjects @ 0xd4
.4byte ScrCmd_initrotatingtilepuzzle @ 0xd5 .4byte ScrCmd_initrotatingtilepuzzle @ 0xd5
.4byte ScrCmd_freerotatingtilepuzzle @ 0xd6 .4byte ScrCmd_freerotatingtilepuzzle @ 0xd6
.4byte ScrCmd_warpmossdeepgym @ 0xd7 .4byte ScrCmd_warpmossdeepgym @ 0xd7
.4byte ScrCmd_selectapproachingtrainer @ 0xd8 .4byte ScrCmd_selectapproachingtrainer @ 0xd8
.4byte ScrCmd_lockfortrainer @ 0xd9 .4byte ScrCmd_lockfortrainer @ 0xd9
.4byte ScrCmd_closebraillemessage @ 0xda .4byte ScrCmd_closebraillemessage @ 0xda
.4byte ScrCmd_messageinstant @ 0xdb .4byte ScrCmd_messageinstant @ 0xdb
.4byte ScrCmd_fadescreenswapbuffers @ 0xdc .4byte ScrCmd_fadescreenswapbuffers @ 0xdc
.4byte ScrCmd_buffertrainerclassname @ 0xdd .4byte ScrCmd_buffertrainerclassname @ 0xdd
.4byte ScrCmd_buffertrainername @ 0xde .4byte ScrCmd_buffertrainername @ 0xde
.4byte ScrCmd_pokenavcall @ 0xdf .4byte ScrCmd_pokenavcall @ 0xdf
.4byte ScrCmd_warpwhitefade @ 0xe0 .4byte ScrCmd_warpwhitefade @ 0xe0
.4byte ScrCmd_buffercontestname @ 0xe1 .4byte ScrCmd_buffercontestname @ 0xe1
.4byte ScrCmd_bufferitemnameplural @ 0xe2 .4byte ScrCmd_bufferitemnameplural @ 0xe2
gScriptCmdTableEnd:: gScriptCmdTableEnd::
.4byte ScrCmd_nop .4byte ScrCmd_nop
data/specials.inc
+1 -1
View File
@@ -490,7 +490,7 @@ gSpecials::
def_special ScrollableMultichoice_ClosePersistentMenu def_special ScrollableMultichoice_ClosePersistentMenu
def_special DoDeoxysRockInteraction def_special DoDeoxysRockInteraction
def_special SetDeoxysRockPalette def_special SetDeoxysRockPalette
def_special CreateModernFatefulEncounterEnemyMon def_special CreateEnemyEventMon
def_special StartMirageTowerDisintegration def_special StartMirageTowerDisintegration
def_special StartMirageTowerShake def_special StartMirageTowerShake
def_special StartMirageTowerFossilFallAndSink def_special StartMirageTowerFossilFallAndSink
include/pokemon.h
+2 -3
View File
@@ -85,7 +85,7 @@ enum {
MON_DATA_EARTH_RIBBON, MON_DATA_EARTH_RIBBON,
MON_DATA_WORLD_RIBBON, MON_DATA_WORLD_RIBBON,
MON_DATA_UNUSED_RIBBONS, MON_DATA_UNUSED_RIBBONS,
MON_DATA_FATEFUL_ENCOUNTER, MON_DATA_MODERN_FATEFUL_ENCOUNTER,
MON_DATA_KNOWN_MOVES, MON_DATA_KNOWN_MOVES,
MON_DATA_RIBBON_COUNT, MON_DATA_RIBBON_COUNT,
MON_DATA_RIBBONS, MON_DATA_RIBBONS,
@@ -408,12 +408,11 @@ void CreateBattleTowerMon_HandleLevel(struct Pokemon *mon, struct BattleTowerPok
void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId); void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId);
void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId); void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId);
void ConvertPokemonToBattleTowerPokemon(struct Pokemon *mon, struct BattleTowerPokemon *dest); void ConvertPokemonToBattleTowerPokemon(struct Pokemon *mon, struct BattleTowerPokemon *dest);
void CreateModernFatefulEncounterMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId);
bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battlerId); bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battlerId);
void SetDeoxysStats(void); void SetDeoxysStats(void);
u16 GetUnionRoomTrainerPic(void); u16 GetUnionRoomTrainerPic(void);
u16 GetUnionRoomTrainerClass(void); u16 GetUnionRoomTrainerClass(void);
void CreateModernFatefulEncounterEnemyMon(void); void CreateEnemyEventMon(void);
void CalculateMonStats(struct Pokemon *mon); void CalculateMonStats(struct Pokemon *mon);
void BoxMonToMon(const struct BoxPokemon *src, struct Pokemon *dest); void BoxMonToMon(const struct BoxPokemon *src, struct Pokemon *dest);
u8 GetLevelFromMonExp(struct Pokemon *mon); u8 GetLevelFromMonExp(struct Pokemon *mon);
src/battle_util.c
+1 -1
View File
@@ -3892,7 +3892,7 @@ static bool32 IsBattlerModernFatefulEncounter(u8 battlerId)
if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS if (GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_DEOXYS
&& GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_MEW) && GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_SPECIES, NULL) != SPECIES_MEW)
return TRUE; return TRUE;
return GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_FATEFUL_ENCOUNTER, NULL); return GetMonData(&gPlayerParty[gBattlerPartyIndexes[battlerId]], MON_DATA_MODERN_FATEFUL_ENCOUNTER, NULL);
} }
u8 IsMonDisobedient(void) u8 IsMonDisobedient(void)
src/egg_hatch.c
+2 -2
View File
@@ -332,7 +332,7 @@ static void CreateHatchedMon(struct Pokemon *egg, struct Pokemon *temp)
gameMet = GetMonData(egg, MON_DATA_MET_GAME); gameMet = GetMonData(egg, MON_DATA_MET_GAME);
markings = GetMonData(egg, MON_DATA_MARKINGS); markings = GetMonData(egg, MON_DATA_MARKINGS);
pokerus = GetMonData(egg, MON_DATA_POKERUS); pokerus = GetMonData(egg, MON_DATA_POKERUS);
isModernFatefulEncounter = GetMonData(egg, MON_DATA_FATEFUL_ENCOUNTER); isModernFatefulEncounter = GetMonData(egg, MON_DATA_MODERN_FATEFUL_ENCOUNTER);
CreateMon(temp, species, EGG_HATCH_LEVEL, USE_RANDOM_IVS, TRUE, personality, OT_ID_PLAYER_ID, 0); CreateMon(temp, species, EGG_HATCH_LEVEL, USE_RANDOM_IVS, TRUE, personality, OT_ID_PLAYER_ID, 0);
@@ -350,7 +350,7 @@ static void CreateHatchedMon(struct Pokemon *egg, struct Pokemon *temp)
friendship = 120; friendship = 120;
SetMonData(temp, MON_DATA_FRIENDSHIP, &friendship); SetMonData(temp, MON_DATA_FRIENDSHIP, &friendship);
SetMonData(temp, MON_DATA_POKERUS, &pokerus); SetMonData(temp, MON_DATA_POKERUS, &pokerus);
SetMonData(temp, MON_DATA_FATEFUL_ENCOUNTER, &isModernFatefulEncounter); SetMonData(temp, MON_DATA_MODERN_FATEFUL_ENCOUNTER, &isModernFatefulEncounter);
*egg = *temp; *egg = *temp;
} }
src/party_menu.c
+2 -2
View File
@@ -3591,7 +3591,7 @@ static void CursorCb_Register(u8 taskId)
{ {
u16 species2 = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES2); u16 species2 = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES2);
u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES); u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES);
u8 isModernFatefulEncounter = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_FATEFUL_ENCOUNTER); u8 isModernFatefulEncounter = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MODERN_FATEFUL_ENCOUNTER);
switch (CanRegisterMonForTradingBoard(*(struct RfuGameCompatibilityData *)GetHostRfuGameData(), species2, species, isModernFatefulEncounter)) switch (CanRegisterMonForTradingBoard(*(struct RfuGameCompatibilityData *)GetHostRfuGameData(), species2, species, isModernFatefulEncounter))
{ {
@@ -3618,7 +3618,7 @@ static void CursorCb_Trade1(u8 taskId)
{ {
u16 species2 = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES2); u16 species2 = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES2);
u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES); u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES);
u8 isModernFatefulEncounter = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_FATEFUL_ENCOUNTER); u8 isModernFatefulEncounter = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MODERN_FATEFUL_ENCOUNTER);
u32 stringId = GetUnionRoomTradeMessageId(*(struct RfuGameCompatibilityData *)GetHostRfuGameData(), gRfuPartnerCompatibilityData, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, isModernFatefulEncounter); u32 stringId = GetUnionRoomTradeMessageId(*(struct RfuGameCompatibilityData *)GetHostRfuGameData(), gRfuPartnerCompatibilityData, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, isModernFatefulEncounter);
if (stringId != UR_TRADE_MSG_NONE) if (stringId != UR_TRADE_MSG_NONE)
src/pokemon.c
+6 -6
View File
@@ -2623,12 +2623,12 @@ void ConvertPokemonToBattleTowerPokemon(struct Pokemon *mon, struct BattleTowerP
GetMonData(mon, MON_DATA_NICKNAME, dest->nickname); GetMonData(mon, MON_DATA_NICKNAME, dest->nickname);
} }
void CreateModernFatefulEncounterMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId) static void CreateEventMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedIV, u8 hasFixedPersonality, u32 fixedPersonality, u8 otIdType, u32 fixedOtId)
{ {
bool32 isModernFatefulEncounter = TRUE; bool32 isModernFatefulEncounter = TRUE;
CreateMon(mon, species, level, fixedIV, hasFixedPersonality, fixedPersonality, otIdType, fixedOtId); CreateMon(mon, species, level, fixedIV, hasFixedPersonality, fixedPersonality, otIdType, fixedOtId);
SetMonData(mon, MON_DATA_FATEFUL_ENCOUNTER, &isModernFatefulEncounter); SetMonData(mon, MON_DATA_MODERN_FATEFUL_ENCOUNTER, &isModernFatefulEncounter);
} }
// If FALSE, should load this game's Deoxys form. If TRUE, should load normal Deoxys form // If FALSE, should load this game's Deoxys form. If TRUE, should load normal Deoxys form
@@ -2763,14 +2763,14 @@ u16 GetUnionRoomTrainerClass(void)
return gFacilityClassToTrainerClass[gUnionRoomFacilityClasses[arrId]]; return gFacilityClassToTrainerClass[gUnionRoomFacilityClasses[arrId]];
} }
void CreateModernFatefulEncounterEnemyMon(void) void CreateEnemyEventMon(void)
{ {
s32 species = gSpecialVar_0x8004; s32 species = gSpecialVar_0x8004;
s32 level = gSpecialVar_0x8005; s32 level = gSpecialVar_0x8005;
s32 itemId = gSpecialVar_0x8006; s32 itemId = gSpecialVar_0x8006;
ZeroEnemyPartyMons(); ZeroEnemyPartyMons();
CreateModernFatefulEncounterMon(&gEnemyParty[0], species, level, USE_RANDOM_IVS, FALSE, 0, OT_ID_PLAYER_ID, 0); CreateEventMon(&gEnemyParty[0], species, level, USE_RANDOM_IVS, FALSE, 0, OT_ID_PLAYER_ID, 0);
if (itemId) if (itemId)
{ {
u8 heldItem[2]; u8 heldItem[2];
@@ -3957,7 +3957,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
case MON_DATA_UNUSED_RIBBONS: case MON_DATA_UNUSED_RIBBONS:
retVal = substruct3->unusedRibbons; retVal = substruct3->unusedRibbons;
break; break;
case MON_DATA_FATEFUL_ENCOUNTER: case MON_DATA_MODERN_FATEFUL_ENCOUNTER:
retVal = substruct3->modernFatefulEncounter; retVal = substruct3->modernFatefulEncounter;
break; break;
case MON_DATA_SPECIES2: case MON_DATA_SPECIES2:
@@ -4341,7 +4341,7 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
case MON_DATA_UNUSED_RIBBONS: case MON_DATA_UNUSED_RIBBONS:
SET8(substruct3->unusedRibbons); SET8(substruct3->unusedRibbons);
break; break;
case MON_DATA_FATEFUL_ENCOUNTER: case MON_DATA_MODERN_FATEFUL_ENCOUNTER:
SET8(substruct3->modernFatefulEncounter); SET8(substruct3->modernFatefulEncounter);
break; break;
case MON_DATA_IVS: case MON_DATA_IVS:
src/scrcmd.c
+2 -2
View File
@@ -2212,7 +2212,7 @@ bool8 ScrCmd_setmonmodernfatefulencounter(struct ScriptContext *ctx)
bool8 isModernFatefulEncounter = TRUE; bool8 isModernFatefulEncounter = TRUE;
u16 partyIndex = VarGet(ScriptReadHalfword(ctx)); u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
SetMonData(&gPlayerParty[partyIndex], MON_DATA_FATEFUL_ENCOUNTER, &isModernFatefulEncounter); SetMonData(&gPlayerParty[partyIndex], MON_DATA_MODERN_FATEFUL_ENCOUNTER, &isModernFatefulEncounter);
return FALSE; return FALSE;
} }
@@ -2220,7 +2220,7 @@ bool8 ScrCmd_checkmonmodernfatefulencounter(struct ScriptContext *ctx)
{ {
u16 partyIndex = VarGet(ScriptReadHalfword(ctx)); u16 partyIndex = VarGet(ScriptReadHalfword(ctx));
gSpecialVar_Result = GetMonData(&gPlayerParty[partyIndex], MON_DATA_FATEFUL_ENCOUNTER, NULL); gSpecialVar_Result = GetMonData(&gPlayerParty[partyIndex], MON_DATA_MODERN_FATEFUL_ENCOUNTER, NULL);
return FALSE; return FALSE;
} }
src/trade.c
+2 -2
View File
@@ -1577,7 +1577,7 @@ static u8 CheckValidityOfTradeMons(u8 *aliveMons, u8 playerPartyCount, u8 player
// Partner cant trade illegitimate Deoxys or Mew // Partner cant trade illegitimate Deoxys or Mew
if (partnerSpecies == SPECIES_DEOXYS || partnerSpecies == SPECIES_MEW) if (partnerSpecies == SPECIES_DEOXYS || partnerSpecies == SPECIES_MEW)
{ {
if (!GetMonData(&gEnemyParty[partnerMonIdx], MON_DATA_FATEFUL_ENCOUNTER)) if (!GetMonData(&gEnemyParty[partnerMonIdx], MON_DATA_MODERN_FATEFUL_ENCOUNTER))
return PARTNER_MON_INVALID; return PARTNER_MON_INVALID;
} }
@@ -2426,7 +2426,7 @@ static u32 CanTradeSelectedMon(struct Pokemon *playerParty, int partyCount, int
if (species[monIdx] == SPECIES_DEOXYS || species[monIdx] == SPECIES_MEW) if (species[monIdx] == SPECIES_DEOXYS || species[monIdx] == SPECIES_MEW)
{ {
if (!GetMonData(&playerParty[monIdx], MON_DATA_FATEFUL_ENCOUNTER)) if (!GetMonData(&playerParty[monIdx], MON_DATA_MODERN_FATEFUL_ENCOUNTER))
return CANT_TRADE_INVALID_MON; return CANT_TRADE_INVALID_MON;
} }