Merge branch 'master' into romhack

asm/macros/event.inc

@@ -918,10 +918,10 @@
 	.byte 0x76
 	.endm
 
-	@ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.)
-	.macro showcontestwinner a:req
+	@ Draws an image of the winner of the contest. winnerId is any CONTEST_WINNER_* constant.
+	.macro showcontestpainting winnerId:req
 	.byte 0x77
-	.byte \a
+	.byte \winnerId
 	.endm
 
 	@ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille 

data/maps/LilycoveCity/scripts.inc

@@ -160,7 +160,7 @@ LilycoveCity_EventScript_MotelSign:: @ 81E2D11
 
 LilycoveCity_EventScript_MuseumSign:: @ 81E2D1A
 	lockall
-	specialvar VAR_0x8004, CountPlayerContestPaintings
+	specialvar VAR_0x8004, CountPlayerMuseumPaintings
 	switch VAR_0x8004
 	case 0, LilycoveCity_EventScript_MuseumSignNoPaintings
 	msgbox LilycoveCity_Text_MuseumSignPlayersExhibit, MSGBOX_DEFAULT

data/maps/LilycoveCity_ContestLobby/scripts.inc

@@ -49,7 +49,7 @@ LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264
 	msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
 	lockall
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_ARTIST
+	showcontestpainting CONTEST_WINNER_ARTIST
 	lockall
 	msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -108,7 +108,7 @@ LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon:: @ 821A314
 	return
 
 LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons:: @ 821A360
-	specialvar VAR_0x8004, CountPlayerContestPaintings
+	specialvar VAR_0x8004, CountPlayerMuseumPaintings
 	switch VAR_0x8004
 	case 1, LilycoveCity_ContestLobby_EventScript_ShowPatron1
 	case 2, LilycoveCity_ContestLobby_EventScript_ShowPatron2
@@ -223,7 +223,7 @@ LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436
 	msgbox LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint, MSGBOX_DEFAULT
 	lockall
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_ARTIST
+	showcontestpainting CONTEST_WINNER_ARTIST
 	msgbox LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink
@@ -511,42 +511,42 @@ LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735
 LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E
 	lockall
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_HALL_1
+	showcontestpainting CONTEST_WINNER_HALL_1
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner2:: @ 821A745
 	lockall
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_HALL_2
+	showcontestpainting CONTEST_WINNER_HALL_2
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner3:: @ 821A74C
 	lockall
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_HALL_3
+	showcontestpainting CONTEST_WINNER_HALL_3
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner4:: @ 821A753
 	lockall
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_HALL_4
+	showcontestpainting CONTEST_WINNER_HALL_4
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner5:: @ 821A75A
 	lockall
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_HALL_5
+	showcontestpainting CONTEST_WINNER_HALL_5
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761
 	lockall
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_HALL_6
+	showcontestpainting CONTEST_WINNER_HALL_6
 	releaseall
 	end
 

data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc

@@ -94,7 +94,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall: @ 8219863
 LilycoveCity_LilycoveMuseum_2F_EventScript_Curator:: @ 8219866
 	lockall
 	goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament
-	specialvar VAR_0x8004, CountPlayerContestPaintings
+	specialvar VAR_0x8004, CountPlayerMuseumPaintings
 	switch VAR_0x8004
 	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
 	case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting
@@ -185,35 +185,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy:: @ 821999C
 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting:: @ 82199A5
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_MUSEUM_COOL
+	showcontestpainting CONTEST_WINNER_MUSEUM_COOL
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting:: @ 82199B3
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_MUSEUM_BEAUTY
+	showcontestpainting CONTEST_WINNER_MUSEUM_BEAUTY
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting:: @ 82199C1
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_MUSEUM_CUTE
+	showcontestpainting CONTEST_WINNER_MUSEUM_CUTE
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting:: @ 82199CF
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_MUSEUM_SMART
+	showcontestpainting CONTEST_WINNER_MUSEUM_SMART
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting:: @ 82199DD
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen FADE_TO_BLACK
-	showcontestwinner CONTEST_WINNER_MUSEUM_TOUGH
+	showcontestpainting CONTEST_WINNER_MUSEUM_TOUGH
 	releaseall
 	end
 

data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc

@@ -173,7 +173,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan:: @ 821C9AE
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_TrySetUpTVShow:: @ 821C9B4
-	special TrySetUpTrainerFanClubSpecial
+	special TryPutTrainerFanClubOnAir
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 821C9B8

data/script_cmd_table.inc

@@ -1,233 +1,233 @@
 	.align 2
 gScriptCmdTable:: @ 81DB67C
-	.4byte ScrCmd_nop
-	.4byte ScrCmd_nop1
-	.4byte ScrCmd_end
-	.4byte ScrCmd_return
-	.4byte ScrCmd_call
-	.4byte ScrCmd_goto
-	.4byte ScrCmd_goto_if
-	.4byte ScrCmd_call_if
-	.4byte ScrCmd_gotostd
-	.4byte ScrCmd_callstd
-	.4byte ScrCmd_gotostd_if
-	.4byte ScrCmd_callstd_if
-	.4byte ScrCmd_returnram
-	.4byte ScrCmd_killscript
-	.4byte ScrCmd_setmysteryeventstatus
-	.4byte ScrCmd_loadword
-	.4byte ScrCmd_loadbyte
-	.4byte ScrCmd_writebytetoaddr
-	.4byte ScrCmd_loadbytefromaddr
-	.4byte ScrCmd_setptrbyte
-	.4byte ScrCmd_copylocal
-	.4byte ScrCmd_copybyte
-	.4byte ScrCmd_setvar
-	.4byte ScrCmd_addvar
-	.4byte ScrCmd_subvar
-	.4byte ScrCmd_copyvar
-	.4byte ScrCmd_setorcopyvar
-	.4byte ScrCmd_compare_local_to_local
-	.4byte ScrCmd_compare_local_to_value
-	.4byte ScrCmd_compare_local_to_addr
-	.4byte ScrCmd_compare_addr_to_local
-	.4byte ScrCmd_compare_addr_to_value
-	.4byte ScrCmd_compare_addr_to_addr
-	.4byte ScrCmd_compare_var_to_value
-	.4byte ScrCmd_compare_var_to_var
-	.4byte ScrCmd_callnative
-	.4byte ScrCmd_gotonative
-	.4byte ScrCmd_special
-	.4byte ScrCmd_specialvar
-	.4byte ScrCmd_waitstate
-	.4byte ScrCmd_delay
-	.4byte ScrCmd_setflag
-	.4byte ScrCmd_clearflag
-	.4byte ScrCmd_checkflag
-	.4byte ScrCmd_initclock
-	.4byte ScrCmd_dotimebasedevents
-	.4byte ScrCmd_gettime
-	.4byte ScrCmd_playse
-	.4byte ScrCmd_waitse
-	.4byte ScrCmd_playfanfare
-	.4byte ScrCmd_waitfanfare
-	.4byte ScrCmd_playbgm
-	.4byte ScrCmd_savebgm
-	.4byte ScrCmd_fadedefaultbgm
-	.4byte ScrCmd_fadenewbgm
-	.4byte ScrCmd_fadeoutbgm
-	.4byte ScrCmd_fadeinbgm
-	.4byte ScrCmd_warp
-	.4byte ScrCmd_warpsilent
-	.4byte ScrCmd_warpdoor
-	.4byte ScrCmd_warphole
-	.4byte ScrCmd_warpteleport
-	.4byte ScrCmd_setwarp
-	.4byte ScrCmd_setdynamicwarp
-	.4byte ScrCmd_setdivewarp
-	.4byte ScrCmd_setholewarp
-	.4byte ScrCmd_getplayerxy
-	.4byte ScrCmd_getpartysize
-	.4byte ScrCmd_additem
-	.4byte ScrCmd_removeitem
-	.4byte ScrCmd_checkitemspace
-	.4byte ScrCmd_checkitem
-	.4byte ScrCmd_checkitemtype
-	.4byte ScrCmd_addpcitem
-	.4byte ScrCmd_checkpcitem
-	.4byte ScrCmd_adddecoration
-	.4byte ScrCmd_removedecoration
-	.4byte ScrCmd_checkdecor
-	.4byte ScrCmd_checkdecorspace
-	.4byte ScrCmd_applymovement
-	.4byte ScrCmd_applymovement_at
-	.4byte ScrCmd_waitmovement
-	.4byte ScrCmd_waitmovement_at
-	.4byte ScrCmd_removeobject
-	.4byte ScrCmd_removeobject_at
-	.4byte ScrCmd_addobject
-	.4byte ScrCmd_addobject_at
-	.4byte ScrCmd_setobjectxy
-	.4byte ScrCmd_showobject_at
-	.4byte ScrCmd_hideobject_at
-	.4byte ScrCmd_faceplayer
-	.4byte ScrCmd_turnobject
-	.4byte ScrCmd_trainerbattle
-	.4byte ScrCmd_dotrainerbattle
-	.4byte ScrCmd_gotopostbattlescript
-	.4byte ScrCmd_gotobeatenscript
-	.4byte ScrCmd_checktrainerflag
-	.4byte ScrCmd_settrainerflag
-	.4byte ScrCmd_cleartrainerflag
-	.4byte ScrCmd_setobjectxyperm
-	.4byte ScrCmd_copyobjectxytoperm
-	.4byte ScrCmd_setobjectmovementtype
-	.4byte ScrCmd_waitmessage
-	.4byte ScrCmd_message
-	.4byte ScrCmd_closemessage
-	.4byte ScrCmd_lockall
-	.4byte ScrCmd_lock
-	.4byte ScrCmd_releaseall
-	.4byte ScrCmd_release
-	.4byte ScrCmd_waitbuttonpress
-	.4byte ScrCmd_yesnobox
-	.4byte ScrCmd_multichoice
-	.4byte ScrCmd_multichoicedefault
-	.4byte ScrCmd_multichoicegrid
-	.4byte ScrCmd_drawbox
-	.4byte ScrCmd_erasebox
-	.4byte ScrCmd_drawboxtext
-	.4byte ScrCmd_showmonpic
-	.4byte ScrCmd_hidemonpic
-	.4byte ScrCmd_showcontestwinner
-	.4byte ScrCmd_braillemessage
-	.4byte ScrCmd_givemon
-	.4byte ScrCmd_giveegg
-	.4byte ScrCmd_setmonmove
-	.4byte ScrCmd_checkpartymove
-	.4byte ScrCmd_bufferspeciesname
-	.4byte ScrCmd_bufferleadmonspeciesname
-	.4byte ScrCmd_bufferpartymonnick
-	.4byte ScrCmd_bufferitemname
-	.4byte ScrCmd_bufferdecorationname
-	.4byte ScrCmd_buffermovename
-	.4byte ScrCmd_buffernumberstring
-	.4byte ScrCmd_bufferstdstring
-	.4byte ScrCmd_bufferstring
-	.4byte ScrCmd_pokemart
-	.4byte ScrCmd_pokemartdecoration
-	.4byte ScrCmd_pokemartdecoration2
-	.4byte ScrCmd_playslotmachine
-	.4byte ScrCmd_setberrytree
-	.4byte ScrCmd_choosecontestmon
-	.4byte ScrCmd_startcontest
-	.4byte ScrCmd_showcontestresults
-	.4byte ScrCmd_contestlinktransfer
-	.4byte ScrCmd_random
-	.4byte ScrCmd_addmoney
-	.4byte ScrCmd_removemoney
-	.4byte ScrCmd_checkmoney
-	.4byte ScrCmd_showmoneybox
-	.4byte ScrCmd_hidemoneybox
-	.4byte ScrCmd_updatemoneybox
-	.4byte ScrCmd_getpricereduction
-	.4byte ScrCmd_fadescreen
-	.4byte ScrCmd_fadescreenspeed
-	.4byte ScrCmd_setflashradius
-	.4byte ScrCmd_animateflash
-	.4byte ScrCmd_messageautoscroll
-	.4byte ScrCmd_dofieldeffect
-	.4byte ScrCmd_setfieldeffectarg
-	.4byte ScrCmd_waitfieldeffect
-	.4byte ScrCmd_setrespawn
-	.4byte ScrCmd_checkplayergender
-	.4byte ScrCmd_playmoncry
-	.4byte ScrCmd_setmetatile
-	.4byte ScrCmd_resetweather
-	.4byte ScrCmd_setweather
-	.4byte ScrCmd_doweather
-	.4byte ScrCmd_setstepcallback
-	.4byte ScrCmd_setmaplayoutindex
-	.4byte ScrCmd_setobjectpriority
-	.4byte ScrCmd_resetobjectpriority
-	.4byte ScrCmd_createvobject
-	.4byte ScrCmd_turnvobject
-	.4byte ScrCmd_opendoor
-	.4byte ScrCmd_closedoor
-	.4byte ScrCmd_waitdooranim
-	.4byte ScrCmd_setdooropen
-	.4byte ScrCmd_setdoorclosed
-	.4byte ScrCmd_addelevmenuitem
-	.4byte ScrCmd_showelevmenu
-	.4byte ScrCmd_checkcoins
-	.4byte ScrCmd_addcoins
-	.4byte ScrCmd_removecoins
-	.4byte ScrCmd_setwildbattle
-	.4byte ScrCmd_dowildbattle
-	.4byte ScrCmd_setvaddress
-	.4byte ScrCmd_vgoto
-	.4byte ScrCmd_vcall
-	.4byte ScrCmd_vgoto_if
-	.4byte ScrCmd_vcall_if
-	.4byte ScrCmd_vmessage
-	.4byte ScrCmd_vloadword
-	.4byte ScrCmd_vbufferstring
-	.4byte ScrCmd_showcoinsbox
-	.4byte ScrCmd_hidecoinsbox
-	.4byte ScrCmd_updatecoinsbox
-	.4byte ScrCmd_incrementgamestat
-	.4byte ScrCmd_setescapewarp
-	.4byte ScrCmd_waitmoncry
-	.4byte ScrCmd_bufferboxname
-	.4byte ScrCmd_nop1
-	.4byte ScrCmd_nop1
-	.4byte ScrCmd_nop1
-	.4byte ScrCmd_nop1
-	.4byte ScrCmd_nop1
-	.4byte ScrCmd_nop1
-	.4byte ScrCmd_setmoneventlegal
-	.4byte ScrCmd_checkmoneventlegal
-	.4byte ScrCmd_gotoram
-	.4byte ScrCmd_nop1
-	.4byte ScrCmd_warpspinenter
-	.4byte ScrCmd_setmonmetlocation
-	.4byte ScrCmd_moverotatingtileobjects
-	.4byte ScrCmd_turnrotatingtileobjects
-	.4byte ScrCmd_initrotatingtilepuzzle
-	.4byte ScrCmd_freerotatingtilepuzzle
-	.4byte ScrCmd_warpmossdeepgym
-	.4byte ScrCmd_selectapproachingtrainer
-	.4byte ScrCmd_lockfortrainer
-	.4byte ScrCmd_closebraillemessage
-	.4byte ScrCmd_messageautoscroll
-	.4byte ScrCmd_fadescreenswapbuffers
-	.4byte ScrCmd_buffertrainerclassname
-	.4byte ScrCmd_buffertrainername
-	.4byte ScrCmd_pokenavcall
-	.4byte ScrCmd_warpsootopolislegend
-	.4byte ScrCmd_buffercontesttype
-	.4byte ScrCmd_bufferitemnameplural
-  .4byte ScrCmd_callfunc
+	.4byte ScrCmd_nop      	                @ 0x00
+	.4byte ScrCmd_nop1                      @ 0x01
+	.4byte ScrCmd_end      	                @ 0x02
+	.4byte ScrCmd_return                    @ 0x03
+	.4byte ScrCmd_call                      @ 0x04
+	.4byte ScrCmd_goto                      @ 0x05
+	.4byte ScrCmd_goto_if                   @ 0x06
+	.4byte ScrCmd_call_if                   @ 0x07
+	.4byte ScrCmd_gotostd                   @ 0x08
+	.4byte ScrCmd_callstd                   @ 0x09
+	.4byte ScrCmd_gotostd_if                @ 0x0a
+	.4byte ScrCmd_callstd_if                @ 0x0b
+	.4byte ScrCmd_returnram                 @ 0x0c
+	.4byte ScrCmd_killscript                @ 0x0d
+	.4byte ScrCmd_setmysteryeventstatus     @ 0x0e
+	.4byte ScrCmd_loadword                  @ 0x0f
+	.4byte ScrCmd_loadbyte                  @ 0x10
+	.4byte ScrCmd_writebytetoaddr           @ 0x11
+	.4byte ScrCmd_loadbytefromaddr          @ 0x12
+	.4byte ScrCmd_setptrbyte                @ 0x13
+	.4byte ScrCmd_copylocal                 @ 0x14
+	.4byte ScrCmd_copybyte                  @ 0x15
+	.4byte ScrCmd_setvar                    @ 0x16
+	.4byte ScrCmd_addvar                    @ 0x17
+	.4byte ScrCmd_subvar                    @ 0x18
+	.4byte ScrCmd_copyvar                   @ 0x19
+	.4byte ScrCmd_setorcopyvar              @ 0x1a
+	.4byte ScrCmd_compare_local_to_local    @ 0x1b
+	.4byte ScrCmd_compare_local_to_value    @ 0x1c
+	.4byte ScrCmd_compare_local_to_addr     @ 0x1d
+	.4byte ScrCmd_compare_addr_to_local     @ 0x1e
+	.4byte ScrCmd_compare_addr_to_value     @ 0x1f
+	.4byte ScrCmd_compare_addr_to_addr      @ 0x20
+	.4byte ScrCmd_compare_var_to_value      @ 0x21
+	.4byte ScrCmd_compare_var_to_var        @ 0x22
+	.4byte ScrCmd_callnative                @ 0x23
+	.4byte ScrCmd_gotonative                @ 0x24
+	.4byte ScrCmd_special                   @ 0x25
+	.4byte ScrCmd_specialvar                @ 0x26
+	.4byte ScrCmd_waitstate                 @ 0x27
+	.4byte ScrCmd_delay                     @ 0x28
+	.4byte ScrCmd_setflag                   @ 0x29
+	.4byte ScrCmd_clearflag                 @ 0x2a
+	.4byte ScrCmd_checkflag                 @ 0x2b
+	.4byte ScrCmd_initclock                 @ 0x2c
+	.4byte ScrCmd_dotimebasedevents         @ 0x2d
+	.4byte ScrCmd_gettime                   @ 0x2e
+	.4byte ScrCmd_playse                    @ 0x2f
+	.4byte ScrCmd_waitse                    @ 0x30
+	.4byte ScrCmd_playfanfare               @ 0x31
+	.4byte ScrCmd_waitfanfare               @ 0x32
+	.4byte ScrCmd_playbgm                   @ 0x33
+	.4byte ScrCmd_savebgm                   @ 0x34
+	.4byte ScrCmd_fadedefaultbgm            @ 0x35
+	.4byte ScrCmd_fadenewbgm                @ 0x36
+	.4byte ScrCmd_fadeoutbgm                @ 0x37
+	.4byte ScrCmd_fadeinbgm                 @ 0x38
+	.4byte ScrCmd_warp                      @ 0x39
+	.4byte ScrCmd_warpsilent                @ 0x3a
+	.4byte ScrCmd_warpdoor                  @ 0x3b
+	.4byte ScrCmd_warphole                  @ 0x3c
+	.4byte ScrCmd_warpteleport              @ 0x3d
+	.4byte ScrCmd_setwarp                   @ 0x3e
+	.4byte ScrCmd_setdynamicwarp            @ 0x3f
+	.4byte ScrCmd_setdivewarp               @ 0x40
+	.4byte ScrCmd_setholewarp               @ 0x41
+	.4byte ScrCmd_getplayerxy               @ 0x42
+	.4byte ScrCmd_getpartysize              @ 0x43
+	.4byte ScrCmd_additem                   @ 0x44
+	.4byte ScrCmd_removeitem                @ 0x45
+	.4byte ScrCmd_checkitemspace            @ 0x46
+	.4byte ScrCmd_checkitem                 @ 0x47
+	.4byte ScrCmd_checkitemtype             @ 0x48
+	.4byte ScrCmd_addpcitem                 @ 0x49
+	.4byte ScrCmd_checkpcitem               @ 0x4a
+	.4byte ScrCmd_adddecoration             @ 0x4b
+	.4byte ScrCmd_removedecoration          @ 0x4c
+	.4byte ScrCmd_checkdecor                @ 0x4d
+	.4byte ScrCmd_checkdecorspace           @ 0x4e
+	.4byte ScrCmd_applymovement             @ 0x4f
+	.4byte ScrCmd_applymovement_at          @ 0x50
+	.4byte ScrCmd_waitmovement              @ 0x51
+	.4byte ScrCmd_waitmovement_at           @ 0x52
+	.4byte ScrCmd_removeobject              @ 0x53
+	.4byte ScrCmd_removeobject_at           @ 0x54
+	.4byte ScrCmd_addobject                 @ 0x55
+	.4byte ScrCmd_addobject_at              @ 0x56
+	.4byte ScrCmd_setobjectxy               @ 0x57
+	.4byte ScrCmd_showobject_at             @ 0x58
+	.4byte ScrCmd_hideobject_at             @ 0x59
+	.4byte ScrCmd_faceplayer                @ 0x5a
+	.4byte ScrCmd_turnobject                @ 0x5b
+	.4byte ScrCmd_trainerbattle             @ 0x5c
+	.4byte ScrCmd_dotrainerbattle           @ 0x5d
+	.4byte ScrCmd_gotopostbattlescript      @ 0x5e
+	.4byte ScrCmd_gotobeatenscript          @ 0x5f
+	.4byte ScrCmd_checktrainerflag          @ 0x60
+	.4byte ScrCmd_settrainerflag            @ 0x61
+	.4byte ScrCmd_cleartrainerflag          @ 0x62
+	.4byte ScrCmd_setobjectxyperm           @ 0x63
+	.4byte ScrCmd_copyobjectxytoperm        @ 0x64
+	.4byte ScrCmd_setobjectmovementtype     @ 0x65
+	.4byte ScrCmd_waitmessage               @ 0x66
+	.4byte ScrCmd_message                   @ 0x67
+	.4byte ScrCmd_closemessage              @ 0x68
+	.4byte ScrCmd_lockall                   @ 0x69
+	.4byte ScrCmd_lock                      @ 0x6a
+	.4byte ScrCmd_releaseall                @ 0x6b
+	.4byte ScrCmd_release                   @ 0x6c
+	.4byte ScrCmd_waitbuttonpress           @ 0x6d
+	.4byte ScrCmd_yesnobox                  @ 0x6e
+	.4byte ScrCmd_multichoice               @ 0x6f
+	.4byte ScrCmd_multichoicedefault        @ 0x70
+	.4byte ScrCmd_multichoicegrid           @ 0x71
+	.4byte ScrCmd_drawbox                   @ 0x72
+	.4byte ScrCmd_erasebox                  @ 0x73
+	.4byte ScrCmd_drawboxtext               @ 0x74
+	.4byte ScrCmd_showmonpic                @ 0x75
+	.4byte ScrCmd_hidemonpic                @ 0x76
+	.4byte ScrCmd_showcontestpainting       @ 0x77
+	.4byte ScrCmd_braillemessage            @ 0x78
+	.4byte ScrCmd_givemon                   @ 0x79
+	.4byte ScrCmd_giveegg                   @ 0x7a
+	.4byte ScrCmd_setmonmove                @ 0x7b
+	.4byte ScrCmd_checkpartymove            @ 0x7c
+	.4byte ScrCmd_bufferspeciesname         @ 0x7d
+	.4byte ScrCmd_bufferleadmonspeciesname  @ 0x7e
+	.4byte ScrCmd_bufferpartymonnick        @ 0x7f
+	.4byte ScrCmd_bufferitemname            @ 0x80
+	.4byte ScrCmd_bufferdecorationname      @ 0x81
+	.4byte ScrCmd_buffermovename            @ 0x82
+	.4byte ScrCmd_buffernumberstring        @ 0x83
+	.4byte ScrCmd_bufferstdstring           @ 0x84
+	.4byte ScrCmd_bufferstring              @ 0x85
+	.4byte ScrCmd_pokemart                  @ 0x86
+	.4byte ScrCmd_pokemartdecoration        @ 0x87
+	.4byte ScrCmd_pokemartdecoration2       @ 0x88
+	.4byte ScrCmd_playslotmachine           @ 0x89
+	.4byte ScrCmd_setberrytree              @ 0x8a
+	.4byte ScrCmd_choosecontestmon          @ 0x8b
+	.4byte ScrCmd_startcontest              @ 0x8c
+	.4byte ScrCmd_showcontestresults        @ 0x8d
+	.4byte ScrCmd_contestlinktransfer       @ 0x8e
+	.4byte ScrCmd_random                    @ 0x8f
+	.4byte ScrCmd_addmoney                  @ 0x90
+	.4byte ScrCmd_removemoney               @ 0x91
+	.4byte ScrCmd_checkmoney                @ 0x92
+	.4byte ScrCmd_showmoneybox              @ 0x93
+	.4byte ScrCmd_hidemoneybox              @ 0x94
+	.4byte ScrCmd_updatemoneybox            @ 0x95
+	.4byte ScrCmd_getpricereduction         @ 0x96
+	.4byte ScrCmd_fadescreen                @ 0x97
+	.4byte ScrCmd_fadescreenspeed           @ 0x98
+	.4byte ScrCmd_setflashradius            @ 0x99
+	.4byte ScrCmd_animateflash              @ 0x9a
+	.4byte ScrCmd_messageautoscroll         @ 0x9b
+	.4byte ScrCmd_dofieldeffect             @ 0x9c
+	.4byte ScrCmd_setfieldeffectarg         @ 0x9d
+	.4byte ScrCmd_waitfieldeffect           @ 0x9e
+	.4byte ScrCmd_setrespawn                @ 0x9f
+	.4byte ScrCmd_checkplayergender         @ 0xa0
+	.4byte ScrCmd_playmoncry                @ 0xa1
+	.4byte ScrCmd_setmetatile               @ 0xa2
+	.4byte ScrCmd_resetweather              @ 0xa3
+	.4byte ScrCmd_setweather                @ 0xa4
+	.4byte ScrCmd_doweather                 @ 0xa5
+	.4byte ScrCmd_setstepcallback           @ 0xa6
+	.4byte ScrCmd_setmaplayoutindex         @ 0xa7
+	.4byte ScrCmd_setobjectpriority         @ 0xa8
+	.4byte ScrCmd_resetobjectpriority       @ 0xa9
+	.4byte ScrCmd_createvobject             @ 0xaa
+	.4byte ScrCmd_turnvobject               @ 0xab
+	.4byte ScrCmd_opendoor                  @ 0xac
+	.4byte ScrCmd_closedoor                 @ 0xad
+	.4byte ScrCmd_waitdooranim              @ 0xae
+	.4byte ScrCmd_setdooropen               @ 0xaf
+	.4byte ScrCmd_setdoorclosed             @ 0xb0
+	.4byte ScrCmd_addelevmenuitem           @ 0xb1
+	.4byte ScrCmd_showelevmenu              @ 0xb2
+	.4byte ScrCmd_checkcoins                @ 0xb3
+	.4byte ScrCmd_addcoins                  @ 0xb4
+	.4byte ScrCmd_removecoins               @ 0xb5
+	.4byte ScrCmd_setwildbattle             @ 0xb6
+	.4byte ScrCmd_dowildbattle              @ 0xb7
+	.4byte ScrCmd_setvaddress               @ 0xb8
+	.4byte ScrCmd_vgoto                     @ 0xb9
+	.4byte ScrCmd_vcall                     @ 0xba
+	.4byte ScrCmd_vgoto_if                  @ 0xbb
+	.4byte ScrCmd_vcall_if                  @ 0xbc
+	.4byte ScrCmd_vmessage                  @ 0xbd
+	.4byte ScrCmd_vloadword                 @ 0xbe
+	.4byte ScrCmd_vbufferstring             @ 0xbf
+	.4byte ScrCmd_showcoinsbox              @ 0xc0
+	.4byte ScrCmd_hidecoinsbox              @ 0xc1
+	.4byte ScrCmd_updatecoinsbox            @ 0xc2
+	.4byte ScrCmd_incrementgamestat         @ 0xc3
+	.4byte ScrCmd_setescapewarp             @ 0xc4
+	.4byte ScrCmd_waitmoncry                @ 0xc5
+	.4byte ScrCmd_bufferboxname             @ 0xc6
+	.4byte ScrCmd_nop1                      @ 0xc7
+	.4byte ScrCmd_nop1                      @ 0xc8
+	.4byte ScrCmd_nop1                      @ 0xc9
+	.4byte ScrCmd_nop1                      @ 0xca
+	.4byte ScrCmd_nop1                      @ 0xcb
+	.4byte ScrCmd_nop1                      @ 0xcc
+	.4byte ScrCmd_setmoneventlegal          @ 0xcd
+	.4byte ScrCmd_checkmoneventlegal        @ 0xce
+	.4byte ScrCmd_gotoram                   @ 0xcf
+	.4byte ScrCmd_nop1                      @ 0xd0
+	.4byte ScrCmd_warpspinenter             @ 0xd1
+	.4byte ScrCmd_setmonmetlocation         @ 0xd2
+	.4byte ScrCmd_moverotatingtileobjects   @ 0xd3
+	.4byte ScrCmd_turnrotatingtileobjects   @ 0xd4
+	.4byte ScrCmd_initrotatingtilepuzzle    @ 0xd5
+	.4byte ScrCmd_freerotatingtilepuzzle    @ 0xd6
+	.4byte ScrCmd_warpmossdeepgym           @ 0xd7
+	.4byte ScrCmd_selectapproachingtrainer  @ 0xd8
+	.4byte ScrCmd_lockfortrainer            @ 0xd9
+	.4byte ScrCmd_closebraillemessage       @ 0xda
+	.4byte ScrCmd_messageinstant            @ 0xdb
+	.4byte ScrCmd_fadescreenswapbuffers     @ 0xdc
+	.4byte ScrCmd_buffertrainerclassname    @ 0xdd
+	.4byte ScrCmd_buffertrainername         @ 0xde
+	.4byte ScrCmd_pokenavcall               @ 0xdf
+	.4byte ScrCmd_warpsootopolislegend      @ 0xe0
+	.4byte ScrCmd_buffercontesttype         @ 0xe1
+	.4byte ScrCmd_bufferitemnameplural      @ 0xe2
+  .4byte ScrCmd_callfunc                  @ 0xe3
 
 gScriptCmdTableEnd:: @ 81DBA08
 	.4byte ScrCmd_nop

data/scripts/gabby_and_ty.inc

@@ -1,6 +1,6 @@
 @ Gabby and Ty always move to the same spots for the first 5 battles
 @ From the 6th battle onwards, they move randomly between locations 6-8
-@ Note: The local IDs of Gabby and Ty are hard-coded in GabbyAndTySetScriptVarsToObjectEventLocalIds
+@ Note: The local IDs of Gabby and Ty are hard-coded in GetGabbyAndTyLocalIds
 GabbyAndTy_EventScript_UpdateLocation:: @ 828CCC7
 	cleartrainerflag TRAINER_GABBY_AND_TY_6
 	specialvar VAR_RESULT, GabbyAndTyGetBattleNum
@@ -198,7 +198,7 @@ GabbyAndTy_EventScript_TyBattle6:: @ 828CF36
 
 GabbyAndTy_EventScript_FirstInterview:: @ 828CF56
 	special GabbyAndTyBeforeInterview
-	special GabbyAndTySetScriptVarsToObjectEventLocalIds
+	special GetGabbyAndTyLocalIds
 	compare VAR_FACING, DIR_NORTH
 	call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
 	compare VAR_FACING, DIR_SOUTH
@@ -229,7 +229,7 @@ GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1
 
 GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3
 	special GabbyAndTyBeforeInterview
-	special GabbyAndTySetScriptVarsToObjectEventLocalIds
+	special GetGabbyAndTyLocalIds
 	compare VAR_FACING, DIR_NORTH
 	call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
 	compare VAR_FACING, DIR_SOUTH

data/scripts/tv.inc

@@ -2,14 +2,14 @@ EventScript_TV:: @ 827EE0B
 	lockall
 	incrementgamestat GAME_STAT_WATCHED_TV
 	special ResetTVShowState
-	specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV
-	compare VAR_RESULT, 2
+	specialvar VAR_RESULT, CheckForPlayersHouseNews
+	compare VAR_RESULT, PLAYERS_HOUSE_TV_MOVIE
 	goto_if_eq EventScript_PlayersHouseMovie
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, PLAYERS_HOUSE_TV_LATI
 	goto_if_eq EventScript_PlayersHouseLatiNewsFlash
 	goto_if_unset FLAG_SYS_TV_START, EventScript_MomDadMightLikeThis1
 	goto_if_set FLAG_SYS_TV_WATCH, EventScript_MomDadMightLikeThis1
-	specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring
+	specialvar VAR_RESULT, IsGabbyAndTyShowOnTheAir
 	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_DoInSearchOfTrainers
 	goto EventScript_TryDoPokeNews

data/specials.inc

@@ -83,20 +83,20 @@ gSpecials:: @ 81DBA64
 	def_special IsLeadMonNicknamedOrNotEnglish
 	def_special SetContestCategoryStringVarForInterview
 	def_special GetNextActiveShowIfMassOutbreak
-	def_special TV_IsScriptShowKindAlreadyInQueue
-	def_special CheckForBigMovieOrEmergencyNewsOnTV
+	def_special IsTVShowAlreadyInQueue
+	def_special CheckForPlayersHouseNews
 	def_special GetMomOrDadStringForTVMessage
 	def_special ResetTVShowState
 	def_special GetContestWinnerId
 	def_special GetContestPlayerId
-	def_special sub_80F8814
+	def_special GetNpcContestantLocalId
 	def_special BufferContestWinnerTrainerName
 	def_special BufferContestWinnerMonName
 	def_special BufferContestTrainerAndMonNames
 	def_special GetContestMonConditionRanking
 	def_special SetContestTrainerGfxIds
 	def_special TryEnterContestMon
-	def_special sub_80F8970
+	def_special GetContestantNamesAtRank
 	def_special SetLinkContestPlayerGfx
 	def_special GetContestMonCondition
 	def_special HasMonWonThisContestBefore
@@ -147,9 +147,9 @@ gSpecials:: @ 81DBA64
 	def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
 	def_special ShouldReadyContestArtist
 	def_special SaveMuseumContestPainting
-	def_special DoesContestCategoryHaveWinner
-	def_special CountPlayerContestPaintings
-	def_special ShowContestWinnerPainting
+	def_special DoesContestCategoryHaveMuseumPainting
+	def_special CountPlayerMuseumPaintings
+	def_special ShowContestPainting  @ Unused, redundant with showcontestpainting command
 	def_special MauvilleGymSetDefaultBarriers
 	def_special MauvilleGymPressSwitch
 	def_special ShowFieldMessageStringVar4
@@ -187,10 +187,10 @@ gSpecials:: @ 81DBA64
 	def_special GabbyAndTyAfterInterview
 	def_special GabbyAndTyBeforeInterview
 	def_special DoTVShowInSearchOfTrainers
-	def_special IsTVShowInSearchOfTrainersAiring
+	def_special IsGabbyAndTyShowOnTheAir
 	def_special GabbyAndTyGetLastQuote
 	def_special GabbyAndTyGetLastBattleTrivia
-	def_special GabbyAndTySetScriptVarsToObjectEventLocalIds
+	def_special GetGabbyAndTyLocalIds
 	def_special GetBattleOutcome
 	def_special GetDaycareMonNicknames
 	def_special GetDaycareState
@@ -354,7 +354,7 @@ gSpecials:: @ 81DBA64
 	def_special SetChampionSaveWarp
 	def_special TryPutTreasureInvestigatorsOnAir
 	def_special TryPutLotteryWinnerReportOnAir
-	def_special TrySetUpTrainerFanClubSpecial
+	def_special TryPutTrainerFanClubOnAir
 	def_special ShouldHideFanClubInterviewer
 	def_special ShowGlassWorkshopMenu
 	def_special PutFanClubSpecialOnTheAir

data/text/contest_painting.inc

@@ -1,4 +1,4 @@
-gContestPaintingCaption:: @ 827EA0C
+gContestHallPaintingCaption:: @ 827EA0C
 	.string "{STR_VAR_1}\n"
 	.string "{STR_VAR_2}'s {STR_VAR_3}$"
 

gflib/text.h

@@ -71,7 +71,7 @@
 //
 #define CHAR_i_ACUTE           0x6F
 //
-#define CHAR_UNK_SPACER        0x77
+#define CHAR_GENDERLESS        0x77 // Empty space for lack of gender icon
 //
 #define CHAR_UP_ARROW          0x79
 #define CHAR_DOWN_ARROW        0x7A