Port some macro/script fixes from pokefirered

This commit is contained in:
GriffinR
2020-01-11 12:02:58 -05:00
parent 8b1595ebc3
commit f2e7b1507e
107 changed files with 528 additions and 561 deletions

View File

@@ -1,5 +1,5 @@
Std_ObtainItem:: @ 8271AD3
giveitem VAR_0x8000, VAR_0x8001
additem VAR_0x8000, VAR_0x8001
copyvar VAR_0x8007, VAR_RESULT
call EventScript_ObtainItemMessage
return
@@ -73,7 +73,7 @@ EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3
return
Std_ObtainDecoration:: @ 8271BB7
givedecoration VAR_0x8000
adddecoration VAR_0x8000
copyvar VAR_0x8007, VAR_RESULT
call EventScript_ObtainDecorationMessage
return
@@ -118,7 +118,7 @@ Std_FindItem:: @ 8271BFD
EventScript_PickUpItem:: @ 8271C3A
removeobject VAR_LAST_TALKED
giveitem VAR_0x8004, VAR_0x8005
additem VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, BufferTMHMMoveName
copyvar VAR_0x8008, VAR_RESULT
compare VAR_0x8008, 1
@@ -156,7 +156,7 @@ EventScript_NoRoomToPickUpItem:: @ 8271CA1
EventScript_HiddenItemScript:: @ 8271CB7
lockall
waitse
giveitem VAR_0x8005, 1
additem VAR_0x8005
copyvar VAR_0x8007, VAR_RESULT
bufferitemnameplural 1, VAR_0x8005, 1
checkitemtype VAR_0x8005