ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve event script object calls

Browse Source
This commit is contained in:
Melody 2018-12-24 20:12:51 -05:00 committed by Marcus Huderle
parent a54aa03d20
commit c7971ecb20
15 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/event_scripts.s
View File

@ -1799,11 +1799,11 @@ RustboroCity_EventScript_271ED7:: @ 8271ED7
end end
RustboroCity_EventScript_271EEF:: @ 8271EEF RustboroCity_EventScript_271EEF:: @ 8271EEF
setvar VAR_OBJ_GFX_ID_0, 105 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return
RustboroCity_EventScript_271EF5:: @ 8271EF5 RustboroCity_EventScript_271EF5:: @ 8271EF5
setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
LavaridgeTown_EventScript_271EFB:: @ 8271EFB LavaridgeTown_EventScript_271EFB:: @ 8271EFB
@ -1817,11 +1817,11 @@ Route119_EventScript_271EFB:: @ 8271EFB
end end
LavaridgeTown_EventScript_271F13:: @ 8271F13 LavaridgeTown_EventScript_271F13:: @ 8271F13
setvar VAR_OBJ_GFX_ID_3, 106 setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE
return return
LavaridgeTown_EventScript_271F19:: @ 8271F19 LavaridgeTown_EventScript_271F19:: @ 8271F19
setvar VAR_OBJ_GFX_ID_3, 101 setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
return return
EventScript_271F1F:: @ 8271F1F EventScript_271F1F:: @ 8271F1F
@ -1833,11 +1833,11 @@ EventScript_271F1F:: @ 8271F1F
end end
EventScript_271F37:: @ 8271F37 EventScript_271F37:: @ 8271F37
setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
EventScript_271F3D:: @ 8271F3D EventScript_271F3D:: @ 8271F3D
setvar VAR_OBJ_GFX_ID_0, 105 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return
DewfordTown_Gym_EventScript_271F43:: @ 8271F43 DewfordTown_Gym_EventScript_271F43:: @ 8271F43
@ -8977,8 +8977,8 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE
.2byte 0 .2byte 0
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8 BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
setvar VAR_OBJ_GFX_ID_1, 28 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, 28 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 3 compare VAR_RESULT, 3

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

@ -24,11 +24,11 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
return return
BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6 BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6
setvar VAR_OBJ_GFX_ID_1, 100 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC
setvar VAR_OBJ_GFX_ID_1, 105 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return
BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2 BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2

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

@ -27,11 +27,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4 BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4
setvar VAR_OBJ_GFX_ID_1, 100 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA
setvar VAR_OBJ_GFX_ID_1, 105 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return
BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00 BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00

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

@ -39,11 +39,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24
end end
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25 BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25
setvar VAR_OBJ_GFX_ID_F, 100 setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B
setvar VAR_OBJ_GFX_ID_F, 105 setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return
BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31 BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31

8
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
View File

@ -19,13 +19,13 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
return return
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B
setvar VAR_OBJ_GFX_ID_1, 100 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856
setvar VAR_OBJ_GFX_ID_1, 105 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, 105 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return
BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861 BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861

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

@ -17,11 +17,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
checkplayergender checkplayergender
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29 goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
setvar VAR_OBJ_GFX_ID_F, 0 setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
return return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29 BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
setvar VAR_OBJ_GFX_ID_F, 89 setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
return return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F

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

@ -17,11 +17,11 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
checkplayergender checkplayergender
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
setvar VAR_OBJ_GFX_ID_F, 0 setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
return return
BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B
setvar VAR_OBJ_GFX_ID_F, 89 setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
return return
BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91 BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91

16
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
View File

@ -25,14 +25,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
end end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA
setvar VAR_OBJ_GFX_ID_0, 7 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_1, 7 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_2, 7 setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_3, 7 setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_4, 7 setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_5, 7 setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_6, 7 setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_7, 7 setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_BOY_1
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
setvar VAR_TEMP_3, 1 setvar VAR_TEMP_3, 1
setobjectxyperm 1, 10, 2 setobjectxyperm 1, 10, 2

2
data/maps/BirthIsland_Exterior/scripts.inc
View File

@ -10,7 +10,7 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
setflag FLAG_0x8D3 setflag FLAG_0x8D3
setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_0x4034, 0 setvar VAR_0x4034, 0
setvar VAR_0x4035, 0 setvar VAR_0x4035, 0
call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E

8
data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
View File

@ -17,13 +17,13 @@ FallarborTown_BattleTentBattleRoom_EventScript_2008AF:: @ 82008AF
return return
FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7 FallarborTown_BattleTentBattleRoom_EventScript_2008C7:: @ 82008C7
setvar VAR_OBJ_GFX_ID_1, 100 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2 FallarborTown_BattleTentBattleRoom_EventScript_2008D2:: @ 82008D2
setvar VAR_OBJ_GFX_ID_1, 105 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, 105 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return
FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD FallarborTown_BattleTentBattleRoom_MapScript2_2008DD: @ 82008DD

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

@ -60,11 +60,11 @@ Route111_EventScript_1F0DC2:: @ 81F0DC2
return return
Route111_EventScript_1F0DDA:: @ 81F0DDA Route111_EventScript_1F0DDA:: @ 81F0DDA
setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
Route111_EventScript_1F0DE0:: @ 81F0DE0 Route111_EventScript_1F0DE0:: @ 81F0DE0
setvar VAR_OBJ_GFX_ID_0, 105 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return
Route111_EventScript_1F0DE6:: @ 81F0DE6 Route111_EventScript_1F0DE6:: @ 81F0DE6

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

@ -17,11 +17,11 @@ SlateportCity_BattleTentBattleRoom_EventScript_209976:: @ 8209976
return return
SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E SlateportCity_BattleTentBattleRoom_EventScript_20998E:: @ 820998E
setvar VAR_OBJ_GFX_ID_1, 100 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994 SlateportCity_BattleTentBattleRoom_EventScript_209994:: @ 8209994
setvar VAR_OBJ_GFX_ID_1, 105 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return
SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A SlateportCity_BattleTentBattleRoom_MapScript2_20999A: @ 820999A

8
data/maps/SouthernIsland_Interior/scripts.inc
View File

@ -23,12 +23,12 @@ SouthernIsland_Interior_MapScript1_242A6E: @ 8242A6E
end end
SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A SouthernIsland_Interior_EventScript_242A8A:: @ 8242A8A
setvar VAR_OBJ_GFX_ID_1, 188 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS
setvar VAR_TEMP_4, 408 setvar VAR_TEMP_4, 408
return return
SouthernIsland_Interior_EventScript_242A95:: @ 8242A95 SouthernIsland_Interior_EventScript_242A95:: @ 8242A95
setvar VAR_OBJ_GFX_ID_1, 187 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS
setvar VAR_TEMP_4, 407 setvar VAR_TEMP_4, 407
return return
@ -41,11 +41,11 @@ SouthernIsland_Interior_EventScript_242AA0:: @ 8242AA0
end end
SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8 SouthernIsland_Interior_EventScript_242AB8:: @ 8242AB8
setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
SouthernIsland_Interior_EventScript_242ABE:: @ 8242ABE SouthernIsland_Interior_EventScript_242ABE:: @ 8242ABE
setvar VAR_OBJ_GFX_ID_0, 105 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return
SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4 SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4

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

@ -449,10 +449,10 @@ LilycoveCity_ContestLobby_EventScript_23BEB6:: @ 823BEB6
return return
LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE LilycoveCity_ContestLobby_EventScript_23BECE:: @ 823BECE
setvar VAR_OBJ_GFX_ID_3, 100 setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4 LilycoveCity_ContestLobby_EventScript_23BED4:: @ 823BED4
setvar VAR_OBJ_GFX_ID_3, 105 setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return

8
data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
View File

@ -17,13 +17,13 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202310:: @ 8202310
return return
VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328 VerdanturfTown_BattleTentBattleRoom_EventScript_202328:: @ 8202328
setvar VAR_OBJ_GFX_ID_1, 100 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, 100 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return return
VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333 VerdanturfTown_BattleTentBattleRoom_EventScript_202333:: @ 8202333
setvar VAR_OBJ_GFX_ID_1, 105 setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, 105 setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return return
VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E VerdanturfTown_BattleTentBattleRoom_MapScript2_20233E: @ 820233E