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

Sync macros to have Give/Take Add/Remove unity

Browse Source
This commit is contained in:
GriffinR
2020-01-13 22:35:09 -05:00
parent 8c560386ed
commit a5d8b98fde
16 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+1 -1
View File
@@ -1910,7 +1910,7 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1B292B
playse SE_SHOP
takemoney 50, 0
removemoney 50, 0
updatemoneybox 0, 0, 0
waitse
message gUnknown_81B1E24
data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+3 -3
View File
@@ -246,15 +246,15 @@ EventScript_16C0A5:: @ 816C0A5
end
EventScript_16C0B6:: @ 816C0B6
takemoney 200, 0
removemoney 200, 0
return
EventScript_16C0BD:: @ 816C0BD
takemoney 300, 0
removemoney 300, 0
return
EventScript_16C0C4:: @ 816C0C4
takemoney 350, 0
removemoney 350, 0
return
EventScript_16C0CB:: @ 816C0CB
data/maps/CeladonCity_GameCorner/scripts.inc
+7 -7
View File
@@ -52,8 +52,8 @@ EventScript_16C706:: @ 816C706
checkmoney 10000, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16C7AC
givecoins 500
takemoney 10000, 0
addcoins 500
removemoney 10000, 0
goto EventScript_16C762
end
@@ -64,8 +64,8 @@ EventScript_16C734:: @ 816C734
checkmoney 1000, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16C7AC
givecoins 50
takemoney 1000, 0
addcoins 50
removemoney 1000, 0
goto EventScript_16C762
end
@@ -133,7 +133,7 @@ CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
checkcoins VAR_TEMP_1
compare VAR_TEMP_1, 9990
goto_if_ge EventScript_16C82B
givecoins 10
addcoins 10
textcolor 3
msgbox gUnknown_8196B0D
playse SE_SHOP
@@ -194,7 +194,7 @@ CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
checkcoins VAR_TEMP_1
compare VAR_TEMP_1, 9980
goto_if_ge EventScript_16C8E2
givecoins 20
addcoins 20
textcolor 3
msgbox gUnknown_8196D47
playse SE_SHOP
@@ -222,7 +222,7 @@ CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
checkcoins VAR_TEMP_1
compare VAR_TEMP_1, 9980
goto_if_ge EventScript_16C942
givecoins 20
addcoins 20
textcolor 3
msgbox gUnknown_8196DF8
playse SE_SHOP
data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+3 -3
View File
@@ -213,7 +213,7 @@ EventScript_16CDA5:: @ 816CDA5
end
EventScript_16CDB3:: @ 816CDB3
takecoins VAR_TEMP_2
removecoins VAR_TEMP_2
updatecoinsbox 0, 5
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
@@ -227,7 +227,7 @@ EventScript_16CDB3:: @ 816CDB3
end
EventScript_16CDE0:: @ 816CDE0
takecoins VAR_TEMP_2
removecoins VAR_TEMP_2
updatecoinsbox 0, 5
getspeciesname 0, VAR_TEMP_1
playfanfare MUS_FANFA1
@@ -330,7 +330,7 @@ EventScript_16CF3F:: @ 816CF3F
checkitemspace VAR_TEMP_1, 1
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16CF79
takecoins VAR_TEMP_2
removecoins VAR_TEMP_2
updatecoinsbox 0, 5
giveitem VAR_TEMP_1
goto EventScript_16CC10
data/maps/CinnabarIsland_Gym/scripts.inc
+6 -6
View File
@@ -251,7 +251,7 @@ EventScript_16DC68:: @ 816DC68
EventScript_16DC6A:: @ 816DC6A
call EventScript_16DC34
goto_if_undefeated TRAINER_BURGLAR_QUINN, EventScript_16DC7A
goto_if_not_defeated TRAINER_BURGLAR_QUINN, EventScript_16DC7A
releaseall
end
@@ -327,7 +327,7 @@ EventScript_16DD31:: @ 816DD31
EventScript_16DD41:: @ 816DD41
call EventScript_16DC34
goto_if_undefeated TRAINER_SUPER_NERD_AVERY, EventScript_16DD51
goto_if_not_defeated TRAINER_SUPER_NERD_AVERY, EventScript_16DD51
releaseall
end
@@ -412,7 +412,7 @@ EventScript_16DE0F:: @ 816DE0F
EventScript_16DE1F:: @ 816DE1F
call EventScript_16DC34
goto_if_undefeated TRAINER_BURGLAR_RAMON, EventScript_16DE2F
goto_if_not_defeated TRAINER_BURGLAR_RAMON, EventScript_16DE2F
releaseall
end
@@ -488,7 +488,7 @@ EventScript_16DEE6:: @ 816DEE6
EventScript_16DEF6:: @ 816DEF6
call EventScript_16DC34
goto_if_undefeated TRAINER_SUPER_NERD_DEREK, EventScript_16DF06
goto_if_not_defeated TRAINER_SUPER_NERD_DEREK, EventScript_16DF06
releaseall
end
@@ -564,7 +564,7 @@ EventScript_16DFBD:: @ 816DFBD
EventScript_16DFCD:: @ 816DFCD
call EventScript_16DC34
goto_if_undefeated TRAINER_BURGLAR_DUSTY, EventScript_16DFDD
goto_if_not_defeated TRAINER_BURGLAR_DUSTY, EventScript_16DFDD
releaseall
end
@@ -640,7 +640,7 @@ EventScript_16E094:: @ 816E094
EventScript_16E0A4:: @ 816E0A4
call EventScript_16DC34
goto_if_undefeated TRAINER_SUPER_NERD_ZAC, EventScript_16E0B4
goto_if_not_defeated TRAINER_SUPER_NERD_ZAC, EventScript_16E0B4
releaseall
end
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+1 -1
View File
@@ -113,7 +113,7 @@ EventScript_16D3CA:: @ 816D3CA
checkmoney 500, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_16D48C
takemoney 500, 0
removemoney 500, 0
updatemoneybox 0, 0, 0
msgbox gUnknown_8197D07
textcolor 3
data/maps/PewterCity_Museum_1F/scripts.inc
+1 -1
View File
@@ -86,7 +86,7 @@ EventScript_16A402:: @ 816A402
compare VAR_TEMP_1, 2
call_if_eq EventScript_16A46B
playse SE_SHOP
takemoney 50, 0
removemoney 50, 0
updatemoneybox 0, 0, 0
waitse
msgbox gUnknown_8190505
data/maps/RocketHideout_B1F/scripts.inc
+1 -1
View File
@@ -4,7 +4,7 @@ RocketHideout_B1F_MapScripts:: @ 8161195
.byte 0
RocketHideout_B1F_OnLoad:: @ 81611A0
call_if_undefeated TRAINER_TEAM_ROCKET_GRUNT_12 EventScript_161233
call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 EventScript_161233
end
RocketHideout_B1F_OnTransition:: @ 81611AA
data/maps/Route4_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -105,7 +105,7 @@ EventScript_16F86A:: @ 816F86A
end
EventScript_16F86F:: @ 816F86F
takemoney 500, 0
removemoney 500, 0
updatemoneybox 0, 0, 0
playfanfare MUS_FANFA1
message Text_19DBD3
data/script_cmd_table.inc
+7 -7
View File
@@ -69,12 +69,12 @@ gScriptCmdTable:: @ 815F9B4
.4byte ScrCmd_setholewarp
.4byte ScrCmd_getplayerxy
.4byte ScrCmd_getpartysize
.4byte ScrCmd_giveitem
.4byte ScrCmd_takeitem
.4byte ScrCmd_additem
.4byte ScrCmd_removeitem
.4byte ScrCmd_checkitemspace
.4byte ScrCmd_checkitem
.4byte ScrCmd_checkitemtype
.4byte ScrCmd_givepcitem
.4byte ScrCmd_addpcitem
.4byte ScrCmd_checkpcitem
.4byte ScrCmd_givedecoration
.4byte ScrCmd_takedecoration
@@ -145,8 +145,8 @@ gScriptCmdTable:: @ 815F9B4
.4byte ScrCmd_showcontestresults
.4byte ScrCmd_contestlinktransfer
.4byte ScrCmd_random
.4byte ScrCmd_givemoney
.4byte ScrCmd_takemoney
.4byte ScrCmd_addmoney
.4byte ScrCmd_removemoney
.4byte ScrCmd_checkmoney
.4byte ScrCmd_showmoneybox
.4byte ScrCmd_hidemoneybox
@@ -181,8 +181,8 @@ gScriptCmdTable:: @ 815F9B4
.4byte ScrCmd_addelevmenuitem
.4byte ScrCmd_showelevmenu
.4byte ScrCmd_checkcoins
.4byte ScrCmd_givecoins
.4byte ScrCmd_takecoins
.4byte ScrCmd_addcoins
.4byte ScrCmd_removecoins
.4byte ScrCmd_setwildbattle
.4byte ScrCmd_dowildbattle
.4byte ScrCmd_setvaddress
data/scripts/obtain_item.inc
+1 -1
View File
@@ -217,7 +217,7 @@ EventScript_TryPickUpHiddenCoins::
specialvar VAR_RESULT, Special_CheckAddCoins
compare VAR_RESULT, FALSE
goto_if_eq EventScript_HiddenCoinsButCaseIsFull
givecoins VAR_0x8006
addcoins VAR_0x8006
getstdstring 1, 0x17
call EventScript_PlayFanfareObtainedItem
call EventScript_FoundCoins