Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged Emerald Expansion and Follower Pokemon

Browse Source
This commit is contained in:
Suppai_Neko committed 2023-04-07 19:22:49 -07:00
1 parent ff2afb0eec
commit d28afca972
988 files changed
+22901 -829
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/event_scripts.s
+1
View File
@@ -55,6 +55,7 @@
#include "constants/union_room.h"
#include "constants/vars.h"
#include "constants/weather.h"
#include "constants/follow_me.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
data/field_effect_scripts.s
+15
View File
@@ -72,6 +72,9 @@ gFieldEffectScriptPointers::
.4byte gFieldEffectScript_RayquazaSpotlight @ FLDEFF_RAYQUAZA_SPOTLIGHT
.4byte gFieldEffectScript_DestroyDeoxysRock @ FLDEFF_DESTROY_DEOXYS_ROCK
.4byte gFieldEffectScript_MoveDeoxysRock @ FLDEFF_MOVE_DEOXYS_ROCK
.4byte gFieldEffectScript_TracksSlither @ FLDEFF_TRACKS_SLITHER
.4byte gFieldEffectScript_TracksBug @ FLDEFF_TRACKS_BUG
.4byte gFieldEffectScript_TracksSpot @ FLDEFF_TRACKS_SPOT
gFieldEffectScript_ExclamationMarkIcon1::
field_eff_callnative FldEff_ExclamationMarkIcon
@@ -128,6 +131,18 @@ gFieldEffectScript_JumpTallGrass::
gFieldEffectScript_SandFootprints::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints
field_eff_end
gFieldEffectScript_TracksBug:: @ 82DBB42
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksBug
field_eff_end
gFieldEffectScript_TracksSpot:: @ 82DBB42
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSpot
field_eff_end
gFieldEffectScript_TracksSlither:: @ 82DBBFF
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSlither
field_eff_end
gFieldEffectScript_JumpBigSplash::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash
data/maps/AbandonedShip_CaptainsOffice/scripts.inc
+1 -1
View File
@@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice_EventScript_CaptSternAide::
goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
checkitem ITEM_SCANNER
goto_if_eq VAR_RESULT, TRUE, AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner
goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
msgbox AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner, MSGBOX_DEFAULT
release
end
data/maps/AbandonedShip_HiddenFloorRooms/map.json
+1 -1
View File
@@ -38,7 +38,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER"
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER"
},
{
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
data/maps/LittlerootTown_ProfessorBirchsLab/map.json
+13
View File
@@ -91,6 +91,19 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita",
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA"
},
{
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
"x": 6,
"y": 6,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "FLAG_FOLLOWER_ACTIVE"
}
],
"warp_events": [
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+5
View File
@@ -29,6 +29,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts::
LittlerootTown_ProfessorBirchsLab_OnTransition:
call Common_EventScript_SetupRivalGfxId
call ProfBirch_EventScript_UpdateLocation
setflag FLAG_FOLLOWER_ACTIVE
goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout
goto_if_ge VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout
goto_if_eq VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3, LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter
@@ -139,6 +140,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival::
msgbox LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou, MSGBOX_DEFAULT
clearflag FLAG_HIDE_ROUTE_101_BOY
setvar VAR_BIRCH_LAB_STATE, 3
addobject 7
hideobjectat 7, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB
setfollower 7, 0x7E
updatefollowerpokemongraphic
releaseall
end
data/script_cmd_table.inc
+4
View File
@@ -227,6 +227,10 @@ gScriptCmdTable::
.4byte ScrCmd_warpwhitefade @ 0xe0
.4byte ScrCmd_buffercontestname @ 0xe1
.4byte ScrCmd_bufferitemnameplural @ 0xe2
.4byte ScrCmd_setfollower @ 0xe3
.4byte ScrCmd_destroyfollower @ 0xe4
.4byte ScrCmd_facefollower @ 0xe5
.4byte ScrCmd_checkfollower @ 0xe6
gScriptCmdTableEnd::
.4byte ScrCmd_nop
data/scripts/field_move_scripts.inc
+66
View File
@@ -287,3 +287,69 @@ EventScript_FailSweetScent::
Text_FailSweetScent:
.string "Looks like there's nothing here…$"
FollowerPositionFixScript::
setvar 0x8000 0x0
callnative FollowerTrainerSightingPositionFix
compare VAR_RESULT 0xFFFF
goto_if_eq FollowerPositionFixScriptReturn
call WalkCall
setvar 0x8000 0x1
callnative FollowerTrainerSightingPositionFix
FollowerPositionFixScriptReturn:
return
FollowerIntoPlayerScript::
setvar 0x8000 0x0
callnative FollowerIntoPlayer
compare VAR_RESULT 0xFFFF
goto_if_eq FollowerPositionFixScriptReturn
setvar 0x8005 0xFE @ follower
call WalkCall
setvar 0x8000 0x1
callnative FollowerIntoPlayer
return
WalkCall:
compare VAR_RESULT 0x0
call_if_eq WalkDownCall
compare VAR_RESULT 0x1
call_if_eq WalkUpCall
compare VAR_RESULT 0x2
call_if_eq WalkLeftCall
compare VAR_RESULT 0x3
call_if_eq WalkRightCall
waitmovement 0x8005
return
WalkDownCall:
applymovement 0x8005 WalkDown
return
WalkUpCall:
applymovement 0x8005 WalkUp
return
WalkLeftCall:
applymovement 0x8005 WalkLeft
return
WalkRightCall:
applymovement 0x8005 WalkRight
return
WalkDown:
walk_down
step_end
WalkUp:
walk_up
step_end
WalkLeft:
walk_left
step_end
WalkRight:
walk_right
step_end
data/scripts/mauville_man.inc
+5 -5
View File
@@ -64,9 +64,9 @@ MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics::
MauvilleCity_PokemonCenter_1F_EventScript_Hipster::
lock
faceplayer
setflag FLAG_SYS_HIPSTER_MEET
setflag FLAG_UNLOCKED_TRENDY_SAYINGS
msgbox MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening, MSGBOX_DEFAULT
special GetHipsterSpokenFlag
special HasHipsterTaughtWord
goto_if_eq VAR_RESULT, FALSE, MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord
msgbox MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou, MSGBOX_DEFAULT
release
@@ -80,8 +80,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord::
end
MauvilleCity_PokemonCenter_1F_EventScript_TeachWord::
msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase, MSGBOX_DEFAULT
special SetHipsterSpokenFlag
msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfWord, MSGBOX_DEFAULT
special SetHipsterTaughtWord
release
end
@@ -969,7 +969,7 @@ MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach:
.string "what's hip and happening.\p"
.string "I've got nothing new to teach you!$"
MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase:
MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfWord:
.string "Hey, have you heard about\n"
.string "“{STR_VAR_1}”?\p"
.string "What's it mean? Well…\n"
data/scripts/pkmn_center_nurse.inc
+8
View File
@@ -33,6 +33,8 @@ EventScript_PkmnCenterNurse_IllTakeYourPkmn2::
return
EventScript_PkmnCenterNurse_TakeAndHealPkmn::
followerintopokeball
call_if_eq VAR_UNUSED_0x8014, 1, EventScript_FollowerIntoPokeballDelay
applymovement VAR_0x800B, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0
dofieldeffect FLDEFF_POKECENTER_HEAL
@@ -40,6 +42,12 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn::
applymovement VAR_0x800B, Common_Movement_WalkInPlaceFasterDown
waitmovement 0
special HealPlayerParty
updatefollowerpokemongraphic
return
EventScript_FollowerIntoPokeballDelay::
delay 21
setvar VAR_UNUSED_0x8014, 0
return
EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom::
data/specials.inc
+2 -2
View File
@@ -111,8 +111,8 @@ gSpecials::
def_special Script_GetCurrentMauvilleMan
def_special HasBardSongBeenChanged
def_special SaveBardSongLyrics
def_special GetHipsterSpokenFlag
def_special SetHipsterSpokenFlag
def_special HasHipsterTaughtWord
def_special SetHipsterTaughtWord
def_special HipsterTryTeachWord
def_special PlayBardSong
def_special SetMauvilleOldManObjEventGfx