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

Unify showmonpic and hidemonpic script command names with their function names

Browse Source
This commit is contained in:
Marcus Huderle
2019-10-12 17:30:45 -05:00
committed by huderlem
parent 0278209376
commit e47b3efdfe
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/macros/event.inc
+3 -3
View File
@@ -878,15 +878,15 @@
.endm .endm
@ Displays a box containing the front sprite for the specified (species) Pokemon species. @ Displays a box containing the front sprite for the specified (species) Pokemon species.
.macro drawmonpic species:req, x:req, y:req .macro showmonpic species:req, x:req, y:req
.byte 0x75 .byte 0x75
.2byte \species .2byte \species
.byte \x .byte \x
.byte \y .byte \y
.endm .endm
@ Hides all boxes displayed with drawmonpic. @ Hides all boxes displayed with showmonpic.
.macro erasemonpic .macro hidemonpic
.byte 0x76 .byte 0x76
.endm .endm
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+10 -10
View File
@@ -288,7 +288,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceRight applymovement 2, Common_Movement_WalkInPlaceRight
waitmovement 0 waitmovement 0
drawmonpic SPECIES_CYNDAQUIL, 10, 3 showmonpic SPECIES_CYNDAQUIL, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -301,7 +301,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceRight applymovement 2, Common_Movement_WalkInPlaceRight
waitmovement 0 waitmovement 0
drawmonpic SPECIES_TOTODILE, 10, 3 showmonpic SPECIES_TOTODILE, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -314,7 +314,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceRight applymovement 2, Common_Movement_WalkInPlaceRight
waitmovement 0 waitmovement 0
drawmonpic SPECIES_CHIKORITA, 10, 3 showmonpic SPECIES_CHIKORITA, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA061
@@ -327,7 +327,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA057:: @ 81FA057
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061 LittlerootTown_ProfessorBirchsLab_EventScript_1FA061:: @ 81FA061
erasemonpic hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB959, MSGBOX_DEFAULT
releaseall releaseall
end end
@@ -340,7 +340,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA06C:: @ 81FA06C
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0A1
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA0CC
erasemonpic hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon goto Common_EventScript_NoMoreRoomForPokemon
end end
@@ -371,7 +371,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD
erasemonpic hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
releaseall releaseall
@@ -385,7 +385,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA10D:: @ 81FA10D
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA142
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA16D
erasemonpic hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon goto Common_EventScript_NoMoreRoomForPokemon
end end
@@ -416,7 +416,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E
erasemonpic hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
releaseall releaseall
@@ -430,7 +430,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA1AE:: @ 81FA1AE
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA1E3
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA20E
erasemonpic hidemonpic
goto Common_EventScript_NoMoreRoomForPokemon goto Common_EventScript_NoMoreRoomForPokemon
end end
@@ -461,7 +461,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234
end end
LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F
erasemonpic hidemonpic
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
releaseall releaseall