ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-28 16:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed trailing spaces in the most relevant files

Browse Source 
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
This commit is contained in:
LOuroboros 2021-08-24 19:59:32 -03:00
parent 63e6b914e4
commit 554210c5e3
466 changed files with 26928 additions and 26928 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
asm/macros/battle_frontier/apprentice.inc
View File

@ -53,7 +53,7 @@
special CallApprenticeFunction
.endm
@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason
@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason
.macro apprentice_shouldcheckgone
setvar VAR_0x8004, APPRENTICE_FUNC_CHECK_GONE
special CallApprenticeFunction
@ -109,7 +109,7 @@
special CallApprenticeFunction
.endm
@ Set which mon the Apprentice should lead with
@ Set which mon the Apprentice should lead with
.macro apprentice_setleadmon monId:req
copyvar VAR_0x8005, \monId
setvar VAR_0x8004, APPRENTICE_FUNC_SET_LEAD_MON
@ -141,7 +141,7 @@
special CallApprenticeFunction
.endm
@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason
@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason
.macro apprentice_shouldleave
setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE
special CallApprenticeFunction

2
asm/macros/battle_frontier/battle_factory.inc
View File

@ -88,7 +88,7 @@
.endm
@ Return the FACTORY_STYLE_* dependent on what types of moves the opponents team has, or FACTORY_NUM_STYLES if multiple styles tie for the same amount of moves
.macro factory_getopponentstyle
.macro factory_getopponentstyle
setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GET_OPPONENT_STYLE
special CallBattleFactoryFunction
.endm

2
asm/macros/battle_frontier/battle_palace.inc
View File

@ -31,7 +31,7 @@
special CallBattlePalaceFunction
.endm
@ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory
@ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory
.macro palace_getopponentintro
setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO
special CallBattlePalaceFunction

12
asm/macros/battle_frontier/battle_pyramid.inc
View File

@ -1,7 +1,7 @@
@ Initialize the Battle Pyramid challenge
.macro pyramid_init
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT
special CallBattlePyramidFunction
special CallBattlePyramidFunction
.endm
@ Get the value of some PYRAMID_DATA_*. See GetBattlePyramidData for the data types that can be retrieved
@ -59,7 +59,7 @@
@ Set the facility trainers to gBattleFrontierTrainers
.macro pyramid_settrainers
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_TRAINERS
special CallBattlePyramidFunction
special CallBattlePyramidFunction
.endm
@ Show the post-battle hint text
@ -68,11 +68,11 @@
special CallBattlePyramidFunction
.endm
@ VAR_RESULT is 1 if player is on a Pyramid floor, 2 if on the Pyramid peak, 0 otherwise
@ VAR_RESULT is 1 if player is on a Pyramid floor, 2 if on the Pyramid peak, 0 otherwise
.macro pyramid_inchallenge
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
special CallBattlePyramidFunction
.endm
.endm
@ Update the light around the player. 2 different modes, for setting or incrementing light. See PYRAMID_LIGHT_*
.macro pyramid_updatelight radius:req, mode:req, sound=0xFFFF
@ -83,7 +83,7 @@
setvar VAR_0x8007, \sound
.endif
special CallBattlePyramidFunction
.endm
.endm
@ Reset the held items to what they were at the start of the challenge
.macro pyramid_clearhelditems
@ -100,5 +100,5 @@
@ Reset sketched moves and update the party order in the saveblock
.macro pyramid_resetparty
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
special CallBattlePyramidFunction
special CallBattlePyramidFunction
.endm

18
asm/macros/battle_tent.inc
View File

@ -26,7 +26,7 @@
special CallVerdanturfTentFunction
.endm
@ Buffers the opponents intro speech to STR_VAR_4. Despite being a Verdanturf Tent function, it serves the same purpose for all 3 tents.
@ Buffers the opponents intro speech to STR_VAR_4. Despite being a Verdanturf Tent function, it serves the same purpose for all 3 tents.
.macro battletent_getopponentintro
setvar VAR_0x8004, VERDANTURF_TENT_FUNC_GET_OPPONENT_INTRO
special CallVerdanturfTentFunction
@ -36,7 +36,7 @@
.macro verdanturftent_save challengeStatus:req
setvar VAR_0x8004, VERDANTURF_TENT_FUNC_SAVE
setvar VAR_0x8005, \challengeStatus
special CallVerdanturfTentFunction
special CallVerdanturfTentFunction
.endm
@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
@ -49,7 +49,7 @@
.macro verdanturftent_giveprize
setvar VAR_0x8004, VERDANTURF_TENT_FUNC_GIVE_PRIZE
special CallVerdanturfTentFunction
.endm
.endm
@ Fallarbor Tent
@ -79,7 +79,7 @@
setvar VAR_0x8004, FALLARBOR_TENT_FUNC_SAVE
setvar VAR_0x8005, \challengeStatus
special CallFallarborTentFunction
.endm
.endm
@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
.macro fallarbortent_setrandomprize
@ -97,7 +97,7 @@
.macro fallarbortent_getopponentname
setvar VAR_0x8004, FALLARBOR_TENT_FUNC_GET_OPPONENT_NAME
special CallFallarborTentFunction
.endm
.endm
@ Slateport Tent
@ -127,15 +127,15 @@
setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SAVE
setvar VAR_0x8005, \challengeStatus
special CallSlateportTentFunction
.endm
.endm
@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
.macro slateporttent_setrandomprize
setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SET_RANDOM_PRIZE
special CallSlateportTentFunction
.endm
@ Give the current prize item. FALSE if no room for prize
@ Give the current prize item. FALSE if no room for prize
.macro slateporttent_giveprize
setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GIVE_PRIZE
special CallSlateportTentFunction
@ -157,7 +157,7 @@
.macro slateporttent_generateopponentmons
setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GENERATE_OPPONENT_MONS
special CallSlateportTentFunction
.endm
.endm
@ Slateport Tent's version of factory_generaterentalmons
.macro slateporttent_generaterentalmons

60
asm/macros/event.inc
View File

@ -274,8 +274,8 @@
.2byte \functionId
.endm
@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific
@ commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock
@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific
@ commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock
@ state, the script will remain blocked indefinitely (essentially a hang).
.macro waitstate
.byte 0x27
@ -317,7 +317,7 @@
.byte 0x2d
.endm
@ Sets the values of variables 0x8000, 0x8001, and 0x8002 to the current hour, minute, and second. In FRLG,
@ Sets the values of variables 0x8000, 0x8001, and 0x8002 to the current hour, minute, and second. In FRLG,
@ this command sets those variables to zero.
.macro gettime
.byte 0x2e
@ -382,7 +382,7 @@
.byte \speed
.endm
@ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF,
@ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF,
@ then the player will instead be sent to (X, Y) on the map.
.macro warp map:req, warp:req, X:req, Y:req
.byte 0x39
@ -434,7 +434,7 @@
.2byte \Y
.endm
@ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to.
@ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to.
@ Useful when a map has warps that need to go to script-controlled locations (i.e. elevators).
.macro setdynamicwarp map:req, warp:req, X:req, Y:req
.byte 0x3f
@ -474,7 +474,7 @@
.byte 0x43
.endm
@ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and
@ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and
@ VAR_RESULT will be set to TRUE; otherwise, VAR_RESULT is set to FALSE.
.macro additem index:req, quantity=1
.byte 0x44
@ -489,7 +489,7 @@
.2byte \quantity
.endm
@ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets VAR_RESULT to
@ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets VAR_RESULT to
@ TRUE if there is room, or FALSE is there is no room.
.macro checkitemspace index:req, quantity:req
.byte 0x46
@ -505,7 +505,7 @@
.2byte \quantity
.endm
@ Checks which Bag pocket the specified item belongs in, and writes the pocket value (POCKET_*) to VAR_RESULT.
@ Checks which Bag pocket the specified item belongs in, and writes the pocket value (POCKET_*) to VAR_RESULT.
@ This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE).
.macro checkitemtype index:req
.byte 0x48
@ -544,7 +544,7 @@
.2byte \decoration
.endm
@ Checks if the player has enough space in their PC to hold decoration. Sets VAR_RESULT to TRUE if there is room, or
@ Checks if the player has enough space in their PC to hold decoration. Sets VAR_RESULT to TRUE if there is room, or
@ FALSE is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
.macro checkdecorspace decoration:req
.byte 0x4e
@ -567,9 +567,9 @@
.endif
.endm
@ Blocks script execution until the movements being applied to the specified (index) Object finish.
@ If the specified Object is 0x0000, then the command will block script execution until all Objects
@ affected by applymovement finish their movements. If the specified Object is not currently being
@ Blocks script execution until the movements being applied to the specified (index) Object finish.
@ If the specified Object is 0x0000, then the command will block script execution until all Objects
@ affected by applymovement finish their movements. If the specified Object is not currently being
@ manipulated with applymovement, then this command does nothing.
@ If no map is specified, then the current map is used.
.macro waitmovement index:req, map
@ -583,8 +583,8 @@
.endif
.endm
@ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map,
@ by setting its visibility flag if it has a valid one. If the Object does not have a valid
@ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map,
@ by setting its visibility flag if it has a valid one. If the Object does not have a valid
@ visibility flag, this command does nothing.
@ If no map is specified, then the current map is used.
.macro removeobject index:req, map
@ -598,7 +598,7 @@
.endif
.endm
@ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one.
@ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one.
@ If the Object does not have a valid visibility flag, this command does nothing.
@ If no map is specified, then the current map is used.
.macro addobject index:req, map
@ -740,7 +740,7 @@
.endm
@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this
@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this
@ command behind-the-scenes), and blocks script execution until the battle finishes.
.macro trainerbattlebegin
.byte 0x5d
@ -781,7 +781,7 @@
.2byte \y
.endm
@ Copies a live object event's xy position to its template, so that if the sprite goes off screen,
@ Copies a live object event's xy position to its template, so that if the sprite goes off screen,
@ it'll still be there when it comes back on screen.
.macro copyobjectxytoperm index:req
.byte 0x64
@ -794,14 +794,14 @@
.byte \byte
.endm
@ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the
@ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the
@ box and its text have been fully drawn.
.macro waitmessage
.byte 0x66
.endm
@ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at
@ that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as
@ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at
@ that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as
@ a pointer to the text. (You can use loadpointer to place a string pointer in a script bank.)
.macro message text:req
.byte 0x67
@ -846,7 +846,7 @@
.byte \y
.endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId.
@ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoice x:req, y:req, multichoiceId:req, ignoreBPress:req
@ -859,7 +859,7 @@
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId.
@ The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00.
@ The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00.
@ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoicedefault x:req, y:req, multichoiceId:req, default:req, ignoreBPress:req
.byte 0x70
@ -925,8 +925,8 @@
.byte \winnerId
.endm
@ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille
@ characters and needs to provide six extra starting characters that are skipped (in RS, these characters determined the
@ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille
@ characters and needs to provide six extra starting characters that are skipped (in RS, these characters determined the
@ box's size and position, but in Emerald these are calculated automatically).
.macro braillemessage text:req
.byte 0x78
@ -996,7 +996,7 @@
.2byte \slot
.endm
@ Writes the name of the item at index item to the specified buffer. If the specified index is larger than
@ Writes the name of the item at index item to the specified buffer. If the specified index is larger than
@ the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead.
.macro bufferitemname out:req, item:req
.byte 0x80
@ -1112,7 +1112,7 @@
.byte \check
.endm
@ If check is 0x00, this command will check if the player has money >= value; VAR_RESULT is set to TRUE if the player
@ If check is 0x00, this command will check if the player has money >= value; VAR_RESULT is set to TRUE if the player
@ has enough money, or FALSE if they do not.
.macro checkmoney value:req, check:req
.byte 0x92
@ -1446,7 +1446,7 @@
.2byte \box
.endm
@ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text,
@ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text,
@ 0xFF resets the color to the default for the current OW's gender, and all other values produce black text.
@ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro textcolor color:req
@ -1454,7 +1454,7 @@
.byte \color
.endm
@ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom
@ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom
@ of the screen when the Main Menu is opened.
@ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro loadhelp pointer:req
@ -1643,7 +1643,7 @@
.macro goto_if_lt dest:req @ LESS THAN
goto_if 0, \dest
.endm
.endm
.macro goto_if_eq dest:req @ EQUAL
goto_if 1, \dest
@ -1677,7 +1677,7 @@
.macro call_if_lt dest:req @ LESS THAN
call_if 0, \dest
.endm
.endm
.macro call_if_eq dest:req @ EQUAL
call_if 1, \dest

6
data/contest_ai_scripts.s
View File

@ -48,7 +48,7 @@ gContestAI_ScriptsTable::
.4byte AI_Nothing @ CONTEST_AI_DUMMY_25
@ Unused. Encourages improving condition on the 1st appeal, or startling mons if the users turn is later
@ Unused. Encourages improving condition on the 1st appeal, or startling mons if the users turn is later
AI_CheckTiming:
if_appeal_num_not_eq 0, AI_CheckTiming_SkipCondition
if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, AI_CheckTiming_SkipCondition
@ -388,7 +388,7 @@ AI_CGM_AppealAsGoodAsPrevOnes_Last:
score +20
end
@ Encourages move more for each opponent who will have a turn before the user
@ Encourages move more for each opponent who will have a turn before the user
AI_CGM_AppealAsGoodAsPrevOne:
if_user_order_eq MON_1, AI_CGM_AppealAsGoodAsPrevOne_1stUp
if_user_order_eq MON_2, AI_CGM_AppealAsGoodAsPrevOne_2ndUp
@ -456,7 +456,7 @@ AI_CGM_BetterWhenAudienceExcited_Not1stUp:
score +10
end
@ Encourage move more for each condition star the prev mons have
@ Encourage move more for each condition star the prev mons have
AI_CGM_WorsenConditionOfPrevMons:
if_user_order_eq MON_1, AI_CGM_End
goto AI_CGM_WorsenConditionOfPrevMons_CheckMon1

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

@ -2,7 +2,7 @@ BattleFrontier_Lounge2_MapScripts::
.byte 0
@ This NPC gives hints about a random facility or battle mode.
@ For battle modes he gives generic advice
@ For battle modes he gives generic advice
@ For facilities, depending on how far the player has progressed he will say either
@ The name of the Frontier Brain there
@ The type and description of the 3 pokemon they use in their silver battle

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

@ -4,7 +4,7 @@
.equ LOCALID_BRINEY_DEWFORD, 2
.equ LOCALID_BOAT_DEWFORD, 4
.equ LOCALID_BOAT_R109, 1
.equ LOCALID_BOAT_R109, 1
.equ LOCALID_BRINEY_R109, 2
.equ LOCALID_BOAT_R104, 7

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

@ -33,7 +33,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls:
.2byte DECOR_PIKACHU_DOLL
.2byte DECOR_MARILL_DOLL
.2byte DECOR_JIGGLYPUFF_DOLL
.2byte DECOR_DUSKULL_DOLL
.2byte DECOR_DUSKULL_DOLL
.2byte DECOR_WYNAUT_DOLL
.2byte DECOR_BALTOY_DOLL
.2byte DECOR_KECLEON_DOLL

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

@ -29,7 +29,7 @@ LilycoveCity_Harbor_EventScript_FerryAttendant::
goto_if_eq LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime
compare VAR_TEMP_B, 4
goto_if_eq LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime
compare VAR_TEMP_B, 8
compare VAR_TEMP_B, 8
goto_if_eq LilycoveCity_Harbor_EventScript_MysticTicketFirstTime
compare VAR_TEMP_B, 0
goto_if_ne LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime

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

@ -1,4 +1,4 @@
@ NOTE: Route 104's sail to Dewford script references local IDs from Dewford's map.
@ NOTE: Route 104's sail to Dewford script references local IDs from Dewford's map.
@ These are labeled in DewfordTown/scripts.inc
.set LOCALID_RIVAL, 34

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

@ -1,4 +1,4 @@
@ NOTE: Route 109's sail to Dewford script references local IDs from Dewford's map.
@ NOTE: Route 109's sail to Dewford script references local IDs from Dewford's map.
@ These are labeled in DewfordTown/scripts.inc
Route109_MapScripts::

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

@ -84,7 +84,7 @@ VictoryRoad_1F_EventScript_EntranceWally::
msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_NPC
end
@ This Wally appears and remains at the exit after the Hall of Fame is entered
@ This Wally appears and remains at the exit after the Hall of Fame is entered
VictoryRoad_1F_EventScript_ExitWally::
trainerbattle_single TRAINER_WALLY_VR_2, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
specialvar VAR_RESULT, ShouldTryRematchBattle

2
data/scripts/berry_blender.inc
View File

@ -641,7 +641,7 @@ BerryBlender_EventScript_DoLinkBerryBlending:
fadescreen FADE_TO_BLACK
removeobject 240 @ Unclear where these local IDs come from,
removeobject 239 @ but presumably they'd be the 4 link players
removeobject 238
removeobject 238
removeobject 237
special DoBerryBlending
waitstate

4
gflib/io_reg.c
View File

@ -17,8 +17,8 @@ static const u32 sUnused[] = {
(1 << 26) | (1 << 4) | (1 << 2) | (1 << 1),
(1 << 26) | (1 << 4) | (1 << 3) | (1 << 1),
(1 << 26) | (1 << 4) | (1 << 3) | (1 << 2) | (1 << 1),
(1 << 25) | (1 << 8),
(1 << 27) | (1 << 10),
(1 << 25) | (1 << 8),
(1 << 27) | (1 << 10),
};
const u16 gOverworldBackgroundLayerFlags[] = {

8
gflib/sprite.c
View File

@ -248,7 +248,7 @@ static const AffineAnimCmdFunc sAffineAnimCmdFuncs[] =
static const struct OamDimensions32 sOamDimensions32[3][4] =
{
[ST_OAM_SQUARE] =
[ST_OAM_SQUARE] =
{
[SPRITE_SIZE(8x8)] = { 8, 8 },
[SPRITE_SIZE(16x16)] = { 16, 16 },
@ -262,7 +262,7 @@ static const struct OamDimensions32 sOamDimensions32[3][4] =
[SPRITE_SIZE(32x16)] = { 32, 16 },
[SPRITE_SIZE(64x32)] = { 64, 32 },
},
[ST_OAM_V_RECTANGLE] =
[ST_OAM_V_RECTANGLE] =
{
[SPRITE_SIZE(8x16)] = { 8, 16 },
[SPRITE_SIZE(8x32)] = { 8, 32 },
@ -273,7 +273,7 @@ static const struct OamDimensions32 sOamDimensions32[3][4] =
static const struct OamDimensions sOamDimensions[3][4] =
{
[ST_OAM_SQUARE] =
[ST_OAM_SQUARE] =
{
[SPRITE_SIZE(8x8)] = { 8, 8 },
[SPRITE_SIZE(16x16)] = { 16, 16 },
@ -287,7 +287,7 @@ static const struct OamDimensions sOamDimensions[3][4] =
[SPRITE_SIZE(32x16)] = { 32, 16 },
[SPRITE_SIZE(64x32)] = { 64, 32 },
},
[ST_OAM_V_RECTANGLE] =
[ST_OAM_V_RECTANGLE] =
{
[SPRITE_SIZE(8x16)] = { 8, 16 },
[SPRITE_SIZE(8x32)] = { 8, 32 },

22
gflib/string_util.c
View File

@ -384,18 +384,18 @@ u8 *StringExpandPlaceholders(u8 *dest, const u8 *src)
u8 *StringBraille(u8 *dest, const u8 *src)
{
const u8 setBrailleFont[] = {
EXT_CTRL_CODE_BEGIN,
EXT_CTRL_CODE_SIZE,
6,
EOS
const u8 setBrailleFont[] = {
EXT_CTRL_CODE_BEGIN,
EXT_CTRL_CODE_SIZE,
6,
EOS
};
const u8 gotoLine2[] = {
CHAR_NEWLINE,
EXT_CTRL_CODE_BEGIN,
EXT_CTRL_CODE_SHIFT_DOWN,
2,
EOS
const u8 gotoLine2[] = {
CHAR_NEWLINE,
EXT_CTRL_CODE_BEGIN,
EXT_CTRL_CODE_SHIFT_DOWN,
2,
EOS
};
dest = StringCopy(dest, setBrailleFont);

4
gflib/text.h
View File

@ -18,7 +18,7 @@
#define CHAR_O_ACUTE 0x0E
#define CHAR_O_CIRCUMFLEX 0x0F
#define CHAR_OE 0x10
#define CHAR_U_GRAVE 0x11
#define CHAR_U_GRAVE 0x11
#define CHAR_U_ACUTE 0x12
#define CHAR_U_CIRCUMFLEX 0x13
#define CHAR_N_TILDE 0x14
@ -258,7 +258,7 @@
#define PLACEHOLDER_ID_VERSION 0x7
#define PLACEHOLDER_ID_AQUA 0x8
#define PLACEHOLDER_ID_MAGMA 0x9
#define PLACEHOLDER_ID_ARCHIE 0xA
#define PLACEHOLDER_ID_ARCHIE 0xA
#define PLACEHOLDER_ID_MAXIE 0xB
#define PLACEHOLDER_ID_KYOGRE 0xC
#define PLACEHOLDER_ID_GROUDON 0xD

2
include/constants/battle_dome.h
View File

@ -118,7 +118,7 @@
#define MOVE_POINTS_ACCURATE 9
#define MOVE_POINTS_POWERFUL 10 // Most of the moves that are >= 100 power
#define MOVE_POINTS_POPULAR 11 // Group seems arbitrary. All using it are TM/HMs, but its only 11/58
#define MOVE_POINTS_LUCK 12
#define MOVE_POINTS_LUCK 12
#define MOVE_POINTS_STRONG 13 // Most of the moves that are >= 90 power
#define MOVE_POINTS_LOW_PP 14
#define MOVE_POINTS_EFFECT 15 // Moves with additional effects

2
include/constants/battle_frontier_trainers.h
View File

@ -2,7 +2,7 @@
#define GUARD_CONSTANTS_BATTLE_FRONTIER_TRAINERS_H
#define FRONTIER_TRAINER_BRADY 0
#define FRONTIER_TRAINER_CONNER 1
#define FRONTIER_TRAINER_CONNER 1
#define FRONTIER_TRAINER_BRADLEY 2
#define FRONTIER_TRAINER_CYBIL 3
#define FRONTIER_TRAINER_RODETTE 4

2
include/constants/battle_pyramid.h
View File

@ -23,7 +23,7 @@
#define OBJ_POSITIONS_UNIFORM 0
#define OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE 1
#define OBJ_POSITIONS_IN_AND_NEAR_EXIT 2
#define OBJ_POSITIONS_NEAR_ENTRANCE 3
#define OBJ_POSITIONS_NEAR_ENTRANCE 3
#define OBJ_POSITIONS_NEAR_EXIT 4
// Functions IDs for sBattlePyramidFunctions / CallBattlePyramidFunction

2
include/constants/field_effects.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_FIELD_EFFECT_CONSTANTS_H
#define GUARD_FIELD_EFFECT_CONSTANTS_H
#define FLDEFF_EXCLAMATION_MARK_ICON 0
#define FLDEFF_EXCLAMATION_MARK_ICON 0
#define FLDEFF_USE_CUT_ON_GRASS 1
#define FLDEFF_USE_CUT_ON_TREE 2
#define FLDEFF_SHADOW 3

26
include/constants/flags.h
View File

@ -337,7 +337,7 @@
#define FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS 0x139
#define FLAG_RECEIVED_AURORA_TICKET 0x13A
#define FLAG_RECEIVED_MYSTIC_TICKET 0x13B
#define FLAG_RECEIVED_OLD_SEA_MAP 0x13C
#define FLAG_RECEIVED_OLD_SEA_MAP 0x13C
#define FLAG_UNUSED_MYSTERY_GIFT_0x13D 0x13D
#define FLAG_UNUSED_MYSTERY_GIFT_0x13E 0x13E
#define FLAG_UNUSED_MYSTERY_GIFT_0x13F 0x13F
@ -1135,18 +1135,18 @@
#define FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL 0x440
#define FLAG_ITEM_MT_PYRE_6F_TM_30 0x441
#define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 0x442
#define FLAG_ITEM_FIERY_PATH_TM06 0x443
#define FLAG_ITEM_ROUTE_124_RED_SHARD 0x444
#define FLAG_ITEM_ROUTE_124_BLUE_SHARD 0x445
#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 0x446
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL 0x447
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE 0x448
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL 0x449
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 0x44A
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE 0x44B
#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 0x44E
#define FLAG_ITEM_FIERY_PATH_TM06 0x443
#define FLAG_ITEM_ROUTE_124_RED_SHARD 0x444
#define FLAG_ITEM_ROUTE_124_BLUE_SHARD 0x445
#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 0x446
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL 0x447
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE 0x448
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL 0x449
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 0x44A
#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE 0x44B
#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY 0x44C
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE 0x44D
#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 0x44E
#define FLAG_ITEM_ROUTE_121_CARBOS 0x44F
#define FLAG_ITEM_ROUTE_123_ULTRA_BALL 0x450
#define FLAG_ITEM_ROUTE_126_GREEN_SHARD 0x451

2
include/constants/item_effects.h
View File

@ -23,7 +23,7 @@
#define ITEM3_POISON 0x10
#define ITEM3_SLEEP 0x20
#define ITEM3_LEVEL_UP 0x40
#define ITEM3_GUARD_SPEC 0x80 // Works the same way as the move Mist.
#define ITEM3_GUARD_SPEC 0x80 // Works the same way as the move Mist.
#define ITEM3_STATUS_ALL (ITEM3_CONFUSION | ITEM3_PARALYSIS | ITEM3_FREEZE | ITEM3_BURN | ITEM3_POISON | ITEM3_SLEEP)

4
include/constants/lilycove_lady.h
View File

@ -10,7 +10,7 @@
#define LILYCOVE_LADY_STATE_COMPLETED 1
#define LILYCOVE_LADY_STATE_PRIZE 2
#define LILYCOVE_LADY_GIFT_THRESHOLD 5
#define LILYCOVE_LADY_GIFT_THRESHOLD 5
#define QUIZ_AUTHOR_PLAYER 0
#define QUIZ_AUTHOR_OTHER_PLAYER 1
@ -20,7 +20,7 @@
#define QUIZ_AUTHOR_NAME_LADY 0
#define QUIZ_AUTHOR_NAME_PLAYER 1
#define QUIZ_AUTHOR_NAME_OTHER_PLAYER 2
#define QUIZ_QUESTION_LEN 9
// Constants for how many good Pokéblocks the Contest Lady was given

2
include/constants/map_scripts.h
View File

@ -9,7 +9,7 @@
They are numbered in the order that they will be called when entering a map (from a warp or camera transition).
NOTE: These descriptions are just of what they generally do, not what they always or have to do
3. ON_LOAD: Run after the layout is loaded (but not drawn yet).
3. ON_LOAD: Run after the layout is loaded (but not drawn yet).
Almost exclusively used to set metatiles on the map before it's first drawn
6. ON_FRAME_TABLE: Run every frame after the map has faded in, before player input is processed.

4
include/constants/metatile_labels.h
View File

@ -16,7 +16,7 @@
#define METATILE_General_MuddySlope_Frame2 0x0EA
#define METATILE_General_MuddySlope_Frame3 0x0EB
#define METATILE_General_SandPit_Center 0x121
#define METATILE_General_Door 0x021
#define METATILE_General_Door 0x021
#define METATILE_General_Door_PokeMart 0x041
#define METATILE_General_Door_PokeCenter 0x061
#define METATILE_General_Door_Gym 0x1CD
@ -35,7 +35,7 @@
#define METATILE_General_SecretBase_VineLeft 0x036
#define METATILE_General_SecretBase_VineRight 0x037
#define METATILE_General_RedCaveIndent 0x1A0
#define METATILE_General_RedCaveOpen 0x1A1
#define METATILE_General_RedCaveOpen 0x1A1
#define METATILE_General_YellowCaveIndent 0x1A8
#define METATILE_General_YellowCaveOpen 0x1A9
#define METATILE_General_BlueCaveIndent 0x1B0

16
include/constants/party_menu.h
View File

@ -49,14 +49,14 @@
#define PARTY_LAYOUT_COUNT 4
#define KEEP_PARTY_LAYOUT 0xFF
#define PARTY_MENU_TYPE_FIELD 0
#define PARTY_MENU_TYPE_IN_BATTLE 1
#define PARTY_MENU_TYPE_CONTEST 2
#define PARTY_MENU_TYPE_CHOOSE_MON 3
#define PARTY_MENU_TYPE_FIELD 0
#define PARTY_MENU_TYPE_IN_BATTLE 1
#define PARTY_MENU_TYPE_CONTEST 2
#define PARTY_MENU_TYPE_CHOOSE_MON 3
#define PARTY_MENU_TYPE_CHOOSE_HALF 4 // multi battles, eReader battles, and some battle facilities
#define PARTY_MENU_TYPE_MULTI_SHOWCASE 5
#define PARTY_MENU_TYPE_DAYCARE 6
#define PARTY_MENU_TYPE_MOVE_RELEARNER 7
#define PARTY_MENU_TYPE_DAYCARE 6
#define PARTY_MENU_TYPE_MOVE_RELEARNER 7
#define PARTY_MENU_TYPE_UNION_ROOM_REGISTER 8 // trading board
#define PARTY_MENU_TYPE_UNION_ROOM_TRADE 9 // trading board
#define PARTY_MENU_TYPE_SPIN_TRADE 10 // Unused beta for Gen IV's Spin Trade
@ -68,7 +68,7 @@
#define PARTY_ACTION_CANT_SWITCH 2
#define PARTY_ACTION_USE_ITEM 3
#define PARTY_ACTION_ABILITY_PREVENTS 4
#define PARTY_ACTION_GIVE_ITEM 5
#define PARTY_ACTION_GIVE_ITEM 5
#define PARTY_ACTION_GIVE_PC_ITEM 6 // Unused. Not possible to give non-mail items directly from PC
#define PARTY_ACTION_GIVE_MAILBOX_MAIL 7
#define PARTY_ACTION_SWITCH 8
@ -83,7 +83,7 @@
#define PARTY_MSG_CHOOSE_MON 0
#define PARTY_MSG_CHOOSE_MON_OR_CANCEL 1
#define PARTY_MSG_CHOOSE_MON_AND_CONFIRM 2
#define PARTY_MSG_MOVE_TO_WHERE 3
#define PARTY_MSG_MOVE_TO_WHERE 3
#define PARTY_MSG_TEACH_WHICH_MON 4
#define PARTY_MSG_USE_ON_WHICH_MON 5
#define PARTY_MSG_GIVE_TO_WHICH_MON 6

2
include/constants/pokemon.h
View File

@ -225,7 +225,7 @@
// 1 bit each in the Pokémon struct. Gen 4 hard-codes
// each of these to the given name. In Gen 3 they're
// used to get an index into giftRibbons in the save block,
// which can have a value 0-64 (0 is 'no ribbon') that
// which can have a value 0-64 (0 is 'no ribbon') that
// corresponds to one of the special ribbons listed
// in gGiftRibbonDescriptionPointers. Most of these were
// never distributed

6
include/constants/script_menu.h
View File

@ -65,7 +65,7 @@
#define MULTI_RIGHTLEFT 54
#define MULTI_GAME_CORNER_TMS 55
#define MULTI_SSTIDAL_SLATEPORT_NO_BF 56
#define MULTI_FLOORS 57
#define MULTI_FLOORS 57
#define MULTI_SHARDS_R 58
#define MULTI_SHARDS_Y 59
#define MULTI_SHARDS_RY 60
@ -82,9 +82,9 @@
#define MULTI_SHARDS_YBG 71
#define MULTI_SHARDS_RYBG 72
#define MULTI_TOURNEY_WITH_RECORD 73
#define MULTI_CABLE_CLUB_NO_RECORD_MIX 74
#define MULTI_CABLE_CLUB_NO_RECORD_MIX 74
#define MULTI_WIRELESS_NO_RECORD_BERRY 75
#define MULTI_CABLE_CLUB_WITH_RECORD_MIX 76
#define MULTI_CABLE_CLUB_WITH_RECORD_MIX 76
#define MULTI_WIRELESS_NO_BERRY 77
#define MULTI_WIRELESS_NO_RECORD 78
#define MULTI_WIRELESS_ALL_SERVICES 79

2
include/constants/songs.h
View File

@ -267,7 +267,7 @@
#define SE_RG_HELP_ERROR 259 // SE_RG_HELP_NG
#define SE_RG_DEOXYS_MOVE 260 // SE_RG_DEOMOV
#define SE_RG_POKE_JUMP_SUCCESS 261 // SE_RG_EXCELLENT
#define SE_RG_POKE_JUMP_FAILURE 262 // SE_RG_NAWAMISS
#define SE_RG_POKE_JUMP_FAILURE 262 // SE_RG_NAWAMISS
// New Emerald SFX
#define SE_POKENAV_CALL 263 // SE_TOREEYE
#define SE_POKENAV_HANG_UP 264 // SE_TOREOFF

2
include/constants/tv.h
View File

@ -35,7 +35,7 @@
// TVGROUP_RECORD_MIX
#define TVGROUP_RECORD_MIX_START 21
#define TVSHOW_POKEMON_TODAY_CAUGHT 21
#define TVSHOW_POKEMON_TODAY_CAUGHT 21
#define TVSHOW_SMART_SHOPPER 22
#define TVSHOW_POKEMON_TODAY_FAILED 23
#define TVSHOW_FISHING_ADVICE 24

2
include/constants/vars.h
View File

@ -149,7 +149,7 @@
#define VAR_LITTLEROOT_HOUSES_STATE_MAY 0x4082
#define VAR_UNUSED_0x4083 0x4083 // Unused Var
#define VAR_BIRCH_LAB_STATE 0x4084
#define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman
#define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman
#define VAR_CONTEST_HALL_STATE 0x4086
#define VAR_CABLE_CLUB_STATE 0x4087
#define VAR_CONTEST_TYPE 0x4088

2
include/constants/weather.h
View File

@ -16,7 +16,7 @@
#define WEATHER_DROUGHT 12
#define WEATHER_DOWNPOUR 13
#define WEATHER_UNDERWATER_BUBBLES 14
#define WEATHER_ABNORMAL 15 // The alternating weather during Groudon/Kyogre conflict
#define WEATHER_ABNORMAL 15 // The alternating weather during Groudon/Kyogre conflict
#define WEATHER_ROUTE119_CYCLE 20
#define WEATHER_ROUTE123_CYCLE 21

74
include/event_scripts.h
View File

@ -240,48 +240,48 @@ extern const u8 gTVWhatsNo1InHoennTodayText05[];
extern const u8 gTVWhatsNo1InHoennTodayText06[];
extern const u8 gTVWhatsNo1InHoennTodayText07[];
extern const u8 gTVWhatsNo1InHoennTodayText08[];
extern const u8 TVSecretBaseSecrets_Text_Intro[];
extern const u8 TVSecretBaseSecrets_Text_Intro[];
extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext1[];
extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext2[];
extern const u8 TVSecretBaseSecrets_Text_TookXStepsBeforeLeaving[];
extern const u8 TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer[];
extern const u8 TVSecretBaseSecrets_Text_PlayerEnjoyedBase[];
extern const u8 TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer[];
extern const u8 TVSecretBaseSecrets_Text_PlayerEnjoyedBase[];
extern const u8 TVSecretBaseSecrets_Text_PlayerHugeFanOfBase[];
extern const u8 TVSecretBaseSecrets_Text_Outro[];
extern const u8 TVSecretBaseSecrets_Text_StoppedMoving1[];
extern const u8 TVSecretBaseSecrets_Text_StoppedMoving2[];
extern const u8 TVSecretBaseSecrets_Text_UsedChair[];
extern const u8 TVSecretBaseSecrets_Text_UsedBalloon[];
extern const u8 TVSecretBaseSecrets_Text_UsedTent[];
extern const u8 TVSecretBaseSecrets_Text_UsedPlant[];
extern const u8 TVSecretBaseSecrets_Text_UsedGoldShield[];
extern const u8 TVSecretBaseSecrets_Text_UsedSilverShield[];
extern const u8 TVSecretBaseSecrets_Text_UsedGlassOrnament[];
extern const u8 TVSecretBaseSecrets_Text_UsedTV[];
extern const u8 TVSecretBaseSecrets_Text_UsedMudBall[];
extern const u8 TVSecretBaseSecrets_Text_UsedBag[];
extern const u8 TVSecretBaseSecrets_Text_UsedCushion[];
extern const u8 TVSecretBaseSecrets_Text_HitCushion[];
extern const u8 TVSecretBaseSecrets_Text_HuggedCushion[];
extern const u8 TVSecretBaseSecrets_Text_BattledWon[];
extern const u8 TVSecretBaseSecrets_Text_BattledLost[];
extern const u8 TVSecretBaseSecrets_Text_DeclinedBattle[];
extern const u8 TVSecretBaseSecrets_Text_UsedPoster[];
extern const u8 TVSecretBaseSecrets_Text_UsedNoteMat[];
extern const u8 TVSecretBaseSecrets_Text_BattledDraw[];
extern const u8 TVSecretBaseSecrets_Text_UsedSpinMat[];
extern const u8 TVSecretBaseSecrets_Text_UsedSandOrnament[];
extern const u8 TVSecretBaseSecrets_Text_UsedDesk[];
extern const u8 TVSecretBaseSecrets_Text_UsedBrick[];
extern const u8 TVSecretBaseSecrets_Text_UsedSolidBoard[];
extern const u8 TVSecretBaseSecrets_Text_UsedFence[];
extern const u8 TVSecretBaseSecrets_Text_UsedGlitterMat[];
extern const u8 TVSecretBaseSecrets_Text_UsedTire[];
extern const u8 TVSecretBaseSecrets_Text_UsedStand[];
extern const u8 TVSecretBaseSecrets_Text_Outro[];
extern const u8 TVSecretBaseSecrets_Text_StoppedMoving1[];
extern const u8 TVSecretBaseSecrets_Text_StoppedMoving2[];
extern const u8 TVSecretBaseSecrets_Text_UsedChair[];
extern const u8 TVSecretBaseSecrets_Text_UsedBalloon[];
extern const u8 TVSecretBaseSecrets_Text_UsedTent[];
extern const u8 TVSecretBaseSecrets_Text_UsedPlant[];
extern const u8 TVSecretBaseSecrets_Text_UsedGoldShield[];
extern const u8 TVSecretBaseSecrets_Text_UsedSilverShield[];
extern const u8 TVSecretBaseSecrets_Text_UsedGlassOrnament[];
extern const u8 TVSecretBaseSecrets_Text_UsedTV[];
extern const u8 TVSecretBaseSecrets_Text_UsedMudBall[];
extern const u8 TVSecretBaseSecrets_Text_UsedBag[];
extern const u8 TVSecretBaseSecrets_Text_UsedCushion[];
extern const u8 TVSecretBaseSecrets_Text_HitCushion[];
extern const u8 TVSecretBaseSecrets_Text_HuggedCushion[];
extern const u8 TVSecretBaseSecrets_Text_BattledWon[];
extern const u8 TVSecretBaseSecrets_Text_BattledLost[];
extern const u8 TVSecretBaseSecrets_Text_DeclinedBattle[];
extern const u8 TVSecretBaseSecrets_Text_UsedPoster[];
extern const u8 TVSecretBaseSecrets_Text_UsedNoteMat[];
extern const u8 TVSecretBaseSecrets_Text_BattledDraw[];
extern const u8 TVSecretBaseSecrets_Text_UsedSpinMat[];
extern const u8 TVSecretBaseSecrets_Text_UsedSandOrnament[];
extern const u8 TVSecretBaseSecrets_Text_UsedDesk[];
extern const u8 TVSecretBaseSecrets_Text_UsedBrick[];
extern const u8 TVSecretBaseSecrets_Text_UsedSolidBoard[];
extern const u8 TVSecretBaseSecrets_Text_UsedFence[];
extern const u8 TVSecretBaseSecrets_Text_UsedGlitterMat[];
extern const u8 TVSecretBaseSecrets_Text_UsedTire[];
extern const u8 TVSecretBaseSecrets_Text_UsedStand[];
extern const u8 TVSecretBaseSecrets_Text_BrokeDoor[];
extern const u8 TVSecretBaseSecrets_Text_UsedDoll[];
extern const u8 TVSecretBaseSecrets_Text_UsedSlide[];
extern const u8 TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown[];
extern const u8 TVSecretBaseSecrets_Text_UsedDoll[];
extern const u8 TVSecretBaseSecrets_Text_UsedSlide[];
extern const u8 TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown[];
extern const u8 TVSecretBaseSecrets_Text_UsedJumpMat[];
extern const u8 gTVSafariFanClubText00[];
extern const u8 gTVSafariFanClubText01[];

2
include/global.fieldmap.h
View File

@ -146,7 +146,7 @@ struct MapHeader
/* 0x1A */ bool8 allowCycling:1;
bool8 allowEscaping:1; // Escape Rope and Dig
bool8 allowRunning:1;
bool8 showMapName:5; // the last 4 bits are unused
bool8 showMapName:5; // the last 4 bits are unused
// but the 5 bit sized bitfield is required to match
/* 0x1B */ u8 battleType;
};

4
include/global.h
View File

@ -312,7 +312,7 @@ struct BattleTowerEReaderTrainer
/*0xB8*/ u32 checksum;
};
// For displaying party information on the player's Battle Dome tourney page
// For displaying party information on the player's Battle Dome tourney page
struct DomeMonData
{
u16 moves[MAX_MON_MOVES];
@ -436,7 +436,7 @@ struct PlayersApprentice
/*0xB1*/ u8 questionsAnswered:4;
/*0xB1*/ u8 leadMonId:2;
/*0xB2*/ u8 party:3;
/*0xB2*/ u8 saveId:2;
/*0xB2*/ u8 saveId:2;
/*0xB3*/ u8 unused;
/*0xB4*/ u8 speciesIds[MULTI_PARTY_SIZE];
/*0xB8*/ struct ApprenticeQuestion questions[APPRENTICE_MAX_QUESTIONS];

14
include/librfu.h
View File

@ -30,12 +30,12 @@
Calculate the number of the transferable DMA count based on this 42 cycles and the access cycles of the destination and source.
For example, if both the CPU internal RAM --> VRAM have a one cycle access, then a 21 count DMA can occur.
If RFU is used outside of these restrictions, problems, such as the loss of data caused by the failure of the AGB, as a clock slave,
If RFU is used outside of these restrictions, problems, such as the loss of data caused by the failure of the AGB, as a clock slave,
to notify that data has been received from the RFU, will occur.
When this problem occurs, the REQ callback will send a REQ_commandID=ID_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA_REQ notification.
(When using Link Manager, the LMAN call back will send a LMAN_msg=LMAN_MSG_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA notification.)
*/
// REQ-COMMAND (STWI) ID CODE LIST
@ -137,7 +137,7 @@
// Definition Data Returned by Return Values for Library Functions
// *******************************************************
// The function doesn't have return value.
// The function doesn't have return value.
// Value of u8 *status for rfu_REQ_pollConnectParent (Connection Trial Status)
// #define CP_STATUS_DONE 0x00 // Connection successful
// #define CP_STATUS_IN_PROCESS 0x01 // Connecting
@ -145,7 +145,7 @@
// #define CP_STATUS_DISCONNECTED 0x03 // Disconnected by parent device while connecting
// #define CP_STATUS_UNKNOWN 0xff // Cannot read status due to REQ-API execution error
// The function doesn't exist.
// The function doesn't exist.
// Value of u8 *status argument for rfu_REQ_pollRecoveryConnect (Link Restore Status)
// #define RC_STATUS_DONE 0x00 // Connection restore successful
// #define RC_STATUS_FAILED 0x01 // Connection restore failure (meaningless to try anymore)
@ -324,7 +324,7 @@ struct STWIStatus
vu8 sending;
};
// This struct is used as u8 array in SDK.
// This struct is used as u8 array in SDK.
struct RfuIntrStruct
{
union RfuPacket rxPacketAlloc;
@ -475,7 +475,7 @@ extern struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX];
// librfu_sio32id
s32 AgbRFU_checkID(u8 maxTries);
// Arguments with "bm..." specify slots of the form (0x01 << slot number) that are the object of a function operation.
// Arguments with "bm..." specify slots of the form (0x01 << slot number) that are the object of a function operation.
// librfu_rfu
// API Initialization and Initial Settings

4
include/link.h
View File

@ -75,7 +75,7 @@
#define LINKCMD_SEND_BLOCK_REQ 0xCCCC
#define LINKCMD_START_TRADE 0xCCDD
#define LINKCMD_CONFIRM_FINISH_TRADE 0xDCBA
#define LINKCMD_SET_MONS_TO_TRADE 0xDDDD
#define LINKCMD_SET_MONS_TO_TRADE 0xDDDD
#define LINKCMD_PLAYER_CANCEL_TRADE 0xDDEE
#define LINKCMD_REQUEST_CANCEL 0xEEAA
#define LINKCMD_BOTH_CANCEL_TRADE 0xEEBB
@ -92,7 +92,7 @@
#define LINKTYPE_DOUBLE_BATTLE 0x2244
#define LINKTYPE_MULTI_BATTLE 0x2255
#define LINKTYPE_BATTLE_TOWER_50 0x2266
#define LINKTYPE_BATTLE_TOWER_OPEN 0x2277
#define LINKTYPE_BATTLE_TOWER_OPEN 0x2277
#define LINKTYPE_BATTLE_TOWER 0x2288
#define LINKTYPE_RECORD_MIX_BEFORE 0x3311
#define LINKTYPE_RECORD_MIX_AFTER 0x3322

2
include/overworld.h
View File

@ -15,7 +15,7 @@
// These two are a hack to stop user input until link stuff can be
// resolved.
#define LINK_KEY_CODE_HANDLE_RECV_QUEUE 0x1B
#define LINK_KEY_CODE_HANDLE_RECV_QUEUE 0x1B
#define LINK_KEY_CODE_HANDLE_SEND_QUEUE 0x1C
#define LINK_KEY_CODE_EXIT_SEAT 0x1D
#define LINK_KEY_CODE_UNK_8 0x1E

2
include/pokeball.h
View File

@ -21,7 +21,7 @@ enum
enum {
BALL_AFFINE_ANIM_0,
BALL_ROTATE_RIGHT,
BALL_ROTATE_LEFT,
BALL_ROTATE_LEFT,
BALL_AFFINE_ANIM_3,
BALL_AFFINE_ANIM_4
};

4
include/pokemon_storage_system.h
View File

@ -6,8 +6,8 @@
#define IN_BOX_COLUMNS 6 // Number of columns, 5 Pokémon per column
#define IN_BOX_COUNT (IN_BOX_ROWS * IN_BOX_COLUMNS)
/*
COLUMNS
/*
COLUMNS
ROWS 0 1 2 3 4 5
6 7 8 9 10 11
12 13 14 15 16 17

72
include/strings.h
View File

@ -1607,10 +1607,10 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon1[]
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon1[];
@ -1620,8 +1620,8 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyRejec
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon2Ask[];
@ -1634,13 +1634,13 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorAccept[
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon1[];
@ -1649,20 +1649,20 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyAccept[
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacAccept[];
@ -1673,28 +1673,28 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon2Ask[]
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFIntro[];
@ -1706,27 +1706,27 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMIntro[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon1[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMAccept[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject[];
extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject[];
// Battle Dome.
extern const u8 BattleDome_Text_Potential1[];

10
include/trainer_hill.h
View File

@ -23,19 +23,19 @@ struct TrHillRoomTrainers
struct TrHillDisplay
{
// Metatile data. Add 0x200 to the values in this array to get metatiles.
// Metatile data. Add 0x200 to the values in this array to get metatiles.
// This data then overwrites the metatiles in the map starting at (0,5)
u8 metatileData[0x100];
// Collision data. One bit for each tile in column-major order,
u8 metatileData[0x100];
// Collision data. One bit for each tile in column-major order,
// so every array entry is one row. 1 = impassable, 0 = passable
u16 collisionData[16];
// Trainer coordinates, starting at (0,6). Format is 0bYYYYXXXX.
u8 coords[2];
// Trainer facing directions. Same as (DIR_* - 1).
// Trainer facing directions. Same as (DIR_* - 1).
// Effectively an array of nibbles, one for each trainer.
u8 direction;
// Trainer sight ranges. Effectively an array of nibbles, one for each trainer.
u8 range;
u8 range;
};
struct TrHillFloor

1552
sound/cry_tables.inc
View File

File diff suppressed because it is too large Load Diff

2
sound/songs/se_m_absorb.s
View File

@ -29,7 +29,7 @@ se_m_absorb_1:
.byte W01
.byte VOICE , 38
.byte VOL , 58*se_m_absorb_mvl/mxv
.byte N08 , Gn4
.byte N08 , Gn4
.byte W01
.byte VOL , 68*se_m_absorb_mvl/mxv
.byte PAN , c_v+8

20
sound/songs/se_m_absorb_2.s
View File

@ -26,15 +26,15 @@ se_m_absorb_2_1:
.byte W01
.byte N02 , Dn6 , v112
.byte W02
.byte Cs6
.byte Cs6
.byte W03
.byte PAN , c_v+8
.byte N02 , An5
.byte N02 , An5
.byte W02
.byte Fs5
.byte Fs5
.byte W01
.byte W01
.byte Dn5
.byte Dn5
.byte W02
.byte PAN , c_v-7
.byte W01
@ -52,7 +52,7 @@ se_m_absorb_2_1:
.byte W02
.byte PAN , c_v+15
.byte W01
.byte N02 , Dn6
.byte N02 , Dn6
.byte W02
.byte Cs6 , v084
.byte W03
@ -89,17 +89,17 @@ se_m_absorb_2_2:
.byte BEND , c_v+15
.byte N02 , An6 , v112
.byte W02
.byte Fs6
.byte Fs6
.byte W01
.byte W01
.byte Dn6
.byte Dn6
.byte W02
.byte W01
.byte Cs6
.byte Cs6
.byte W02
.byte An5
.byte An5
.byte W03
.byte N02
.byte N02
.byte W02
.byte Fs5 , v104
.byte W01

30
sound/songs/se_m_acid_armor.s
View File

@ -35,15 +35,15 @@ se_m_acid_armor_1:
.byte W02
.byte VOICE , 23
.byte PAN , c_v+11
.byte N01 , Cn1
.byte N01 , Cn1
.byte W01
.byte PAN , c_v-10
.byte N01 , Cn2
.byte N01 , Cn2
.byte W01
.byte VOICE , 31
.byte PAN , c_v+6
.byte BEND , c_v-37
.byte N06 , Dn1
.byte N06 , Dn1
.byte W01
.byte BEND , c_v-16
.byte W01
@ -55,15 +55,15 @@ se_m_acid_armor_1:
.byte W01
.byte VOICE , 23
.byte PAN , c_v-1
.byte N01 , Fn1
.byte N01 , Fn1
.byte W01
.byte PAN , c_v-10
.byte N01 , Fn2
.byte N01 , Fn2
.byte W01
.byte VOICE , 31
.byte PAN , c_v+0
.byte BEND , c_v-37
.byte N02 , Gn0
.byte N02 , Gn0
.byte W02
.byte BEND , c_v-16
.byte W01
@ -71,21 +71,21 @@ se_m_acid_armor_1:
.byte W01
.byte PAN , c_v+5
.byte BEND , c_v+27
.byte N02
.byte N02
.byte W01
.byte BEND , c_v+46
.byte W01
.byte VOICE , 23
.byte PAN , c_v+10
.byte N01 , Cn1
.byte N01 , Cn1
.byte W02
.byte PAN , c_v-9
.byte N01 , Cn2
.byte N01 , Cn2
.byte W01
.byte VOICE , 31
.byte PAN , c_v+0
.byte BEND , c_v-37
.byte N06 , Dn1
.byte N06 , Dn1
.byte W01
.byte BEND , c_v-16
.byte W01
@ -97,10 +97,10 @@ se_m_acid_armor_1:
.byte W01
.byte VOICE , 23
.byte PAN , c_v+5
.byte N01 , Cn1
.byte N01 , Cn1
.byte W01
.byte PAN , c_v-8
.byte N01 , Cn2
.byte N01 , Cn2
.byte W01
.byte VOICE , 31
.byte PAN , c_v+0
@ -125,7 +125,7 @@ se_m_acid_armor_1:
.byte VOICE , 31
.byte PAN , c_v+6
.byte BEND , c_v-37
.byte N06 , Dn1
.byte N06 , Dn1
.byte W01
.byte BEND , c_v-16
.byte W01
@ -140,7 +140,7 @@ se_m_acid_armor_1:
.byte N01 , Fn1 , v084
.byte W01
.byte PAN , c_v-10
.byte N01 , Fn2
.byte N01 , Fn2
.byte W01
.byte VOICE , 31
.byte PAN , c_v+0
@ -162,7 +162,7 @@ se_m_acid_armor_1:
.byte N01 , Cn1 , v068
.byte W01
.byte PAN , c_v-9
.byte N01 , Cn2
.byte N01 , Cn2
.byte W01
.byte VOICE , 31
.byte PAN , c_v+0

6
sound/songs/se_m_attract2.s
View File

@ -34,7 +34,7 @@ se_m_attract2_1:
.byte W12
.byte c_v+0
.byte W06
.byte N54 , Cn4
.byte N54 , Cn4
.byte W06
.byte PAN , c_v+6
.byte W12
@ -45,7 +45,7 @@ se_m_attract2_1:
.byte c_v+0
.byte W12
.byte c_v-4
.byte N54 , Dn4
.byte N54 , Dn4
.byte W12
.byte PAN , c_v-10
.byte W12
@ -55,7 +55,7 @@ se_m_attract2_1:
.byte W12
.byte c_v+6
.byte W06
.byte N54 , Cn4
.byte N54 , Cn4
.byte W06
.byte PAN , c_v+9
.byte W12

6
sound/songs/se_m_bite.s
View File

@ -25,11 +25,11 @@ se_m_bite_1:
.byte BEND , c_v+0
.byte N02 , Gn3 , v112
.byte W02
.byte Gs3
.byte Gs3
.byte W01
.byte PAN , c_v-7
.byte W01
.byte N02 , An3
.byte N02 , An3
.byte W02
.byte PAN , c_v+7
.byte W02
@ -79,7 +79,7 @@ se_m_bite_2:
.byte W10
.byte N01 , Gn2 , v040
.byte W08
.byte N01
.byte N01
.byte W06
.byte FINE

10
sound/songs/se_m_bonemerang.s
View File

@ -26,18 +26,18 @@ se_m_bonemerang_1:
.byte N01 , Cn5 , v127
.byte W01
.byte PAN , c_v+10
.byte N01 , Cn6
.byte N01 , Cn6
.byte W01
.byte PAN , c_v+0
.byte N01 , Cn5
.byte N01 , Cn5
.byte W04
.byte N01
.byte N01
.byte W01
.byte PAN , c_v-11
.byte N01 , Cn6
.byte N01 , Cn6
.byte W01
.byte PAN , c_v+0
.byte N01 , Cn5
.byte N01 , Cn5
.byte W04
.byte FINE

10
sound/songs/se_m_brick_break.s
View File

@ -23,7 +23,7 @@ se_m_brick_break_1:
.byte PAN , c_v+0
.byte N01 , Cn4 , v127
.byte W01
.byte N03 , Cn5
.byte N03 , Cn5
.byte W01
.byte PAN , c_v+5
.byte W01
@ -63,23 +63,23 @@ se_m_brick_break_2:
.byte PAN , c_v+0
.byte N01 , Cn3 , v064
.byte W01
.byte N03 , Gn3
.byte N03 , Gn3
.byte W05
.byte W01
.byte N02 , En4 , v040
.byte W05
.byte Gn3
.byte Gn3
.byte W04
.byte En4 , v032
.byte W02
.byte W03
.byte Gn3
.byte Gn3
.byte W03
.byte W02
.byte En4 , v020
.byte W04
.byte W01
.byte Gn3
.byte Gn3
.byte W05
.byte FINE

2
sound/songs/se_m_bubble.s
View File

@ -37,7 +37,7 @@ se_m_bubble_1:
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v-1
.byte N03 , En3
.byte N03 , En3
.byte W15
.byte FINE

2
sound/songs/se_m_bubble3.s
View File

@ -38,7 +38,7 @@ se_m_bubble3_1:
.byte PAN , c_v+0
.byte BEND , c_v-1
.byte W03
.byte N06
.byte N06
.byte W03
.byte BEND , c_v+6
.byte W01

2
sound/songs/se_m_charm.s
View File

@ -32,7 +32,7 @@ se_m_charm_1:
.byte VOL , 62*se_m_charm_mvl/mxv
.byte PAN , c_v-4
.byte BEND , c_v+0
.byte N15
.byte N15
.byte W01
.byte VOL , 77*se_m_charm_mvl/mxv
.byte PAN , c_v+0

4
sound/songs/se_m_confuse_ray.s
View File

@ -56,7 +56,7 @@ se_m_confuse_ray_1:
.byte c_v-17
.byte W01
.byte c_v-1
.byte N12 , As2
.byte N12 , As2
.byte W02
.byte PAN , c_v+4
.byte BEND , c_v+8
@ -82,7 +82,7 @@ se_m_confuse_ray_1:
.byte c_v-16
.byte W01
.byte c_v-1
.byte N12 , As2
.byte N12 , As2
.byte W03
.byte PAN , c_v+4
.byte BEND , c_v+8

20
sound/songs/se_m_cosmic_power.s
View File

@ -27,24 +27,24 @@ se_m_cosmic_power_1:
.byte W06
.byte W03
.byte PAN , c_v-5
.byte N08 , Cn5
.byte N08 , Cn5
.byte W03
.byte W06
.byte PAN , c_v-9
.byte N10 , Gn5
.byte N10 , Gn5
.byte W06
.byte W04
.byte PAN , c_v-5
.byte N09 , Fn6
.byte N09 , Fn6
.byte W02
.byte W06
.byte W02
.byte PAN , c_v+0
.byte N09 , An5
.byte N09 , An5
.byte W04
.byte W06
.byte PAN , c_v+4
.byte N09 , As5
.byte N09 , As5
.byte W06
.byte W03
.byte PAN , c_v+9
@ -129,19 +129,19 @@ se_m_cosmic_power_2:
.byte W02
.byte W06
.byte W01
.byte N10 , Ds5
.byte N10 , Ds5
.byte W05
.byte W06
.byte N09 , As6
.byte N09 , As6
.byte W06
.byte W03
.byte Cn6
.byte Cn6
.byte W03
.byte W06
.byte N10 , Fn5
.byte N10 , Fn5
.byte W06
.byte W04
.byte N08
.byte N08
.byte W02
.byte W06
.byte W01

8
sound/songs/se_m_detect.s
View File

@ -31,7 +31,7 @@ se_m_detect_1:
.byte c_v+4
.byte W01
.byte c_v+1
.byte N06 , Bn5
.byte N06 , Bn5
.byte W01
.byte PAN , c_v+0
.byte W02
@ -45,7 +45,7 @@ se_m_detect_1:
.byte c_v+4
.byte W01
.byte c_v+1
.byte N06 , Bn5
.byte N06 , Bn5
.byte W01
.byte PAN , c_v+0
.byte W04
@ -59,7 +59,7 @@ se_m_detect_1:
.byte c_v+4
.byte W01
.byte c_v+1
.byte N06 , Bn5
.byte N06 , Bn5
.byte W02
.byte PAN , c_v+0
.byte W04
@ -72,7 +72,7 @@ se_m_detect_1:
.byte c_v+4
.byte W01
.byte c_v+1
.byte N06 , Bn5
.byte N06 , Bn5
.byte W01
.byte PAN , c_v+0
.byte W03

2
sound/songs/se_m_dig.s
View File

@ -32,7 +32,7 @@ se_m_dig_1:
.byte BEND , c_v+4
.byte W01
.byte c_v+16
.byte N03
.byte N03
.byte W01
.byte PAN , c_v-8
.byte BEND , c_v+28

4
sound/songs/se_m_dive.s
View File

@ -30,7 +30,7 @@ se_m_dive_1:
.byte W04
.byte PAN , c_v+6
.byte BEND , c_v-14
.byte N04
.byte N04
.byte W03
.byte PAN , c_v+3
.byte BEND , c_v-11
@ -90,7 +90,7 @@ se_m_dive_2:
.byte VOL , 105*se_m_dive_mvl/mxv
.byte N06 , An2 , v040
.byte W06
.byte Gn2
.byte Gn2
.byte W06
.byte Gs3 , v044
.byte W07

2
sound/songs/se_m_dizzy_punch.s
View File

@ -46,7 +46,7 @@ se_m_dizzy_punch_1:
.byte W01
.byte PAN , c_v-13
.byte BEND , c_v+0
.byte N04 , Cn6
.byte N04 , Cn6
.byte W01
.byte VOL , 66*se_m_dizzy_punch_mvl/mxv
.byte PAN , c_v+0

10
sound/songs/se_m_dragon_rage.s
View File

@ -39,7 +39,7 @@ se_m_dragon_rage_1:
.byte W01
.byte VOL , 21*se_m_dragon_rage_mvl/mxv
.byte BEND , c_v+10
.byte N10 , Bn2
.byte N10 , Bn2
.byte W02
.byte PAN , c_v+5
.byte W01
@ -54,7 +54,7 @@ se_m_dragon_rage_1:
.byte PAN , c_v-2
.byte VOL , 21*se_m_dragon_rage_mvl/mxv
.byte BEND , c_v+18
.byte N10 , Cs3
.byte N10 , Cs3
.byte W03
.byte PAN , c_v+5
.byte VOL , 47*se_m_dragon_rage_mvl/mxv
@ -69,7 +69,7 @@ se_m_dragon_rage_1:
.byte W02
.byte VOL , 20*se_m_dragon_rage_mvl/mxv
.byte BEND , c_v+29
.byte N10 , Dn3
.byte N10 , Dn3
.byte W01
.byte PAN , c_v+0
.byte W01
@ -86,7 +86,7 @@ se_m_dragon_rage_1:
.byte W01
.byte VOL , 21*se_m_dragon_rage_mvl/mxv
.byte BEND , c_v+37
.byte N10 , En3
.byte N10 , En3
.byte W02
.byte PAN , c_v-2
.byte VOL , 46*se_m_dragon_rage_mvl/mxv
@ -101,7 +101,7 @@ se_m_dragon_rage_1:
.byte c_v-5
.byte VOL , 20*se_m_dragon_rage_mvl/mxv
.byte BEND , c_v+42
.byte N20 , Fs3
.byte N20 , Fs3
.byte W02
.byte VOL , 47*se_m_dragon_rage_mvl/mxv
.byte W01

36
sound/songs/se_m_earthquake.s
View File

@ -209,9 +209,9 @@ se_m_earthquake_2:
.byte VOL , 110*se_m_earthquake_mvl/mxv
.byte N02 , Fn2 , v072
.byte W02
.byte N01
.byte N01
.byte W01
.byte N02 , Gn2
.byte N02 , Gn2
.byte W03
.byte N01 , Gs2 , v060
.byte W06
@ -223,87 +223,87 @@ se_m_earthquake_2_000:
.byte N06 , Bn1 , v080
.byte W06
.byte PEND
.byte N06
.byte N06
.byte W06
.byte N06
.byte N06
.byte W06
.byte PATT
.word se_m_earthquake_2_000
.byte N06 , Bn1 , v080
.byte W06
.byte N06
.byte N06
.byte W06
.byte PATT
.word se_m_earthquake_2_000
.byte N06 , Bn1 , v080
.byte W06
.byte N06
.byte N06
.byte W06
.byte PATT
.word se_m_earthquake_2_000
.byte N06 , Bn1 , v080
.byte W06
.byte N06
.byte N06
.byte W06
.byte PATT
.word se_m_earthquake_2_000
.byte N06 , Bn1 , v080
.byte W06
.byte N06
.byte N06
.byte W06
.byte PATT
.word se_m_earthquake_2_000
.byte N06 , Bn1 , v080
.byte W06
.byte N06
.byte N06
.byte W06
.byte PATT
.word se_m_earthquake_2_000
.byte N06 , Bn1 , v080
.byte W06
.byte N06
.byte N06
.byte W06
.byte PATT
.word se_m_earthquake_2_000
.byte N06 , Bn1 , v080
.byte W06
.byte N06
.byte N06
.byte W06
.byte VOL , 106*se_m_earthquake_mvl/mxv
.byte PAN , c_v+0
.byte N06
.byte N06
.byte W03
.byte VOL , 103*se_m_earthquake_mvl/mxv
.byte W03
.byte N06
.byte N06
.byte W01
.byte VOL , 97*se_m_earthquake_mvl/mxv
.byte W03
.byte 89*se_m_earthquake_mvl/mxv
.byte W02
.byte N06
.byte N06
.byte W02
.byte VOL , 85*se_m_earthquake_mvl/mxv
.byte W04
.byte 78*se_m_earthquake_mvl/mxv
.byte PAN , c_v+0
.byte N06
.byte N06
.byte W03
.byte VOL , 72*se_m_earthquake_mvl/mxv
.byte W03
.byte N06
.byte N06
.byte W01
.byte VOL , 66*se_m_earthquake_mvl/mxv
.byte W03
.byte 58*se_m_earthquake_mvl/mxv
.byte W02
.byte N06
.byte N06
.byte W02
.byte VOL , 46*se_m_earthquake_mvl/mxv
.byte W04
.byte 30*se_m_earthquake_mvl/mxv
.byte PAN , c_v+0
.byte N06
.byte N06
.byte W03
.byte VOL , 12*se_m_earthquake_mvl/mxv
.byte W03

2
sound/songs/se_m_encore2.s
View File

@ -154,7 +154,7 @@ se_m_encore2_1_000:
.byte 12*se_m_encore2_mvl/mxv
.byte PAN , c_v-2
.byte W02
.byte EOT , Cn3
.byte EOT , Cn3
.byte FINE
@******************************************************@

12
sound/songs/se_m_explosion.s
View File

@ -25,19 +25,19 @@ se_m_explosion_1:
.byte BEND , c_v+0
.byte N01 , Ds3 , v127
.byte W01
.byte As2
.byte As2
.byte W02
.byte PAN , c_v-8
.byte N02 , Gn3
.byte N02 , Gn3
.byte W01
.byte PAN , c_v+7
.byte W03
.byte c_v+0
.byte N01 , Ds3
.byte N01 , Ds3
.byte W01
.byte As2
.byte As2
.byte W02
.byte N54 , Fn3
.byte N54 , Fn3
.byte W11
.byte BEND , c_v+3
.byte W03
@ -93,7 +93,7 @@ se_m_explosion_2:
.byte VOL , 74*se_m_explosion_mvl/mxv
.byte W06
.byte 125*se_m_explosion_mvl/mxv
.byte N02
.byte N02
.byte W01
.byte VOL , 74*se_m_explosion_mvl/mxv
.byte W16

2
sound/songs/se_m_flamethrower.s
View File

@ -129,7 +129,7 @@ se_m_flamethrower_1_000:
.byte W03
.byte c_v+0
.byte W03
.byte EOT , Cn3
.byte EOT , Cn3
.byte FINE
@********************** Track 2 **********************@

4
sound/songs/se_m_flatter.s
View File

@ -25,9 +25,9 @@ se_m_flatter_1:
.byte BEND , c_v+0
.byte N01 , Dn5 , v127
.byte W01
.byte Gn4
.byte Gn4
.byte W01
.byte N09 , En5
.byte N09 , En5
.byte W02
.byte PAN , c_v+6
.byte W02

12
sound/songs/se_m_grasswhistle.s
View File

@ -35,12 +35,12 @@ se_m_grasswhistle_1:
.byte W09
.byte 0
.byte W03
.byte N09 , An5
.byte N09 , An5
.byte W12
.byte En5
.byte En5
.byte W12
.byte BEND , c_v-14
.byte N66 , Gn5
.byte N66 , Gn5
.byte W06
.byte BEND , c_v-8
.byte W06
@ -85,14 +85,14 @@ se_m_grasswhistle_2:
.byte 0
.byte W03
.byte PAN , c_v-12
.byte N09 , An5
.byte N09 , An5
.byte W12
.byte PAN , c_v+14
.byte N09 , En5
.byte N09 , En5
.byte W12
.byte PAN , c_v-15
.byte BEND , c_v-14
.byte N66 , Gn5
.byte N66 , Gn5
.byte W06
.byte BEND , c_v-8
.byte W06

14
sound/songs/se_m_hail.s
View File

@ -31,7 +31,7 @@ se_m_hail_1:
.byte N01 , Gn4 , v112
.byte W01
.byte PAN , c_v+0
.byte N01 , Ds5
.byte N01 , Ds5
.byte W03
.byte W01
.byte PAN , c_v+6
@ -41,7 +41,7 @@ se_m_hail_1:
.byte N01 , Gn4 , v064
.byte W02
.byte PAN , c_v+0
.byte N01 , Ds5
.byte N01 , Ds5
.byte W03
.byte PAN , c_v+11
.byte N02 , Ds5 , v020
@ -51,7 +51,7 @@ se_m_hail_1:
.byte N01 , Gn4 , v064
.byte W01
.byte PAN , c_v+0
.byte N01 , Ds5
.byte N01 , Ds5
.byte W04
.byte FINE
@ -64,20 +64,20 @@ se_m_hail_2:
.byte PAN , c_v+0
.byte N01 , Dn4 , v040
.byte W04
.byte Bn3
.byte Bn3
.byte W02
.byte W03
.byte Dn4
.byte Dn4
.byte W03
.byte W01
.byte Bn3 , v032
.byte W05
.byte Dn4
.byte Dn4
.byte W03
.byte Bn3 , v012
.byte W03
.byte W02
.byte Dn4
.byte Dn4
.byte W04
.byte FINE

18
sound/songs/se_m_haze.s
View File

@ -175,7 +175,7 @@ se_m_haze_1:
.byte W03
.byte 6*se_m_haze_mvl/mxv
.byte W02
.byte EOT
.byte EOT
.byte FINE
@********************** Track 2 **********************@
@ -192,42 +192,42 @@ se_m_haze_2:
.byte W06
.byte W06
.byte W06
.byte Fs4
.byte Fs4
.byte W06
.byte W06
.byte W06
.byte W06
.byte Gn4
.byte Gn4
.byte W06
.byte W06
.byte W06
.byte W06
.byte Gs4
.byte Gs4
.byte W06
.byte W06
.byte W06
.byte W06
.byte Gn4
.byte Gn4
.byte W06
.byte W06
.byte W06
.byte W06
.byte Fs4
.byte Fs4
.byte W06
.byte W06
.byte W06
.byte W06
.byte Fn4
.byte Fn4
.byte W06
.byte W06
.byte W06
.byte W06
.byte En4
.byte En4
.byte W06
.byte W06
.byte W06
.byte W06
.byte N18 , Ds4
.byte N18 , Ds4
.byte W06
.byte W06
.byte W06

4
sound/songs/se_m_heal_bell.s
View File

@ -30,10 +30,10 @@ se_m_heal_bell_1:
.byte c_v+11
.byte W01
.byte c_v+1
.byte N01 , An5
.byte N01 , An5
.byte W01
.byte MOD , 7
.byte N18 , Bn5
.byte N18 , Bn5
.byte W02
.byte PAN , c_v+11
.byte W01

2
sound/songs/se_m_heat_wave.s
View File

@ -145,7 +145,7 @@ se_m_heat_wave_1:
.byte W02
.byte VOL , 17*se_m_heat_wave_mvl/mxv
.byte W03
.byte EOT
.byte EOT
.byte FINE
@********************** Track 2 **********************@

2
sound/songs/se_m_hydro_pump.s
View File

@ -76,7 +76,7 @@ se_m_hydro_pump_1:
.byte W01
.byte VOL , 6*se_m_hydro_pump_mvl/mxv
.byte W05
.byte EOT
.byte EOT
.byte FINE
@********************** Track 2 **********************@

18
sound/songs/se_m_hyper_beam.s
View File

@ -25,21 +25,21 @@ se_m_hyper_beam_1:
.byte BEND , c_v+0
.byte N02 , En3 , v127
.byte W03
.byte N01 , As3
.byte N01 , As3
.byte W03
.byte N02 , Gn3
.byte N02 , Gn3
.byte W03
.byte N01 , Cs4
.byte N01 , Cs4
.byte W03
.byte PAN , c_v+7
.byte N02 , En3 , v072
.byte W03
.byte N01 , As3
.byte N01 , As3
.byte W03
.byte PAN , c_v-7
.byte N02 , Gn3 , v040
.byte W03
.byte N01 , Cs4
.byte N01 , Cs4
.byte W03
.byte FINE
@ -51,16 +51,16 @@ se_m_hyper_beam_2:
.byte VOL , 110*se_m_hyper_beam_mvl/mxv
.byte N01 , Cn3 , v040
.byte W02
.byte N01
.byte N01
.byte W04
.byte N01
.byte N01
.byte W02
.byte N01
.byte N01
.byte W04
se_m_hyper_beam_2_000:
.byte N01 , Cn3 , v020
.byte W02
.byte N01
.byte N01
.byte W04
.byte PEND
.byte PATT

18
sound/songs/se_m_hyper_beam2.s
View File

@ -30,19 +30,19 @@ se_m_hyper_beam2_1:
.byte c_v+28
.byte W01
.byte c_v+0
.byte N02 , Cs4
.byte N02 , Cs4
.byte W01
.byte BEND , c_v+30
.byte W02
.byte c_v+0
.byte N03 , As3
.byte N03 , As3
.byte W01
.byte BEND , c_v+11
.byte W01
.byte c_v+28
.byte W01
.byte c_v+0
.byte N02 , En4
.byte N02 , En4
.byte W01
.byte BEND , c_v+30
.byte W02
@ -55,7 +55,7 @@ se_m_hyper_beam2_1:
.byte c_v+28
.byte W01
.byte c_v+0
.byte N02 , Cs4
.byte N02 , Cs4
.byte W01
.byte BEND , c_v+30
.byte W02
@ -68,7 +68,7 @@ se_m_hyper_beam2_1:
.byte c_v+28
.byte W01
.byte c_v+0
.byte N02 , En4
.byte N02 , En4
.byte W01
.byte BEND , c_v+30
.byte W02
@ -82,16 +82,16 @@ se_m_hyper_beam2_2:
.byte VOL , 110*se_m_hyper_beam2_mvl/mxv
.byte N01 , Cn3 , v032
.byte W02
.byte N01
.byte N01
.byte W04
.byte N01
.byte N01
.byte W02
.byte N01
.byte N01
.byte W04
se_m_hyper_beam2_2_000:
.byte N01 , Cn3 , v020
.byte W02
.byte N01
.byte N01
.byte W04
.byte PEND
.byte PATT

6
sound/songs/se_m_icy_wind.s
View File

@ -30,7 +30,7 @@ se_m_icy_wind_1:
.byte N01 , Ds4 , v112
.byte W01
.byte PAN , c_v+0
.byte N01 , Bn4
.byte N01 , Bn4
.byte W03
.byte FINE
@ -43,13 +43,13 @@ se_m_icy_wind_2:
.byte PAN , c_v+0
.byte N01 , Dn4 , v040
.byte W04
.byte Bn3
.byte Bn3
.byte W02
.byte PAN , c_v-7
.byte W02
.byte c_v+9
.byte W01
.byte N01 , Dn4
.byte N01 , Dn4
.byte W01
.byte PAN , c_v-7
.byte W02

2
sound/songs/se_m_lock_on.s
View File

@ -37,7 +37,7 @@ se_m_lock_on_1:
.byte W02
.byte PAN , c_v+6
.byte BEND , c_v+6
.byte N01 , Cn4
.byte N01 , Cn4
.byte W01
.byte Gn3 , v064
.byte W02

2
sound/songs/se_m_milk_drink.s
View File

@ -103,7 +103,7 @@ se_m_milk_drink_2:
.byte N06 , Fs6 , v040
.byte W04
.byte W04
.byte N06
.byte N06
.byte W02
.byte W06
.byte W01

2
sound/songs/se_m_minimize.s
View File

@ -68,7 +68,7 @@ se_m_minimize_1:
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+28
.byte N06 , An3
.byte N06 , An3
.byte W01
.byte BEND , c_v+20
.byte W01

50
sound/songs/se_m_moonlight.s
View File

@ -26,18 +26,18 @@ se_m_moonlight_1:
.byte BEND , c_v+3
.byte N01 , Ds6 , v092
.byte W01
.byte Dn6
.byte Dn6
.byte W01
.byte Gn5
.byte Gn5
.byte W01
.byte N20 , Gn6 , v100
.byte W21
se_m_moonlight_1_000:
.byte N01 , Ds6 , v056
.byte W01
.byte Dn6
.byte Dn6
.byte W01
.byte Gn5
.byte Gn5
.byte W01
.byte N20 , Gn6 , v064
.byte W03
@ -54,9 +54,9 @@ se_m_moonlight_1_001:
.byte PAN , c_v+0
.byte N01 , Gs5 , v092
.byte W01
.byte Gn5
.byte Gn5
.byte W01
.byte Cn5
.byte Cn5
.byte W01
.byte N20 , Cn6 , v100
.byte W21
@ -65,9 +65,9 @@ se_m_moonlight_1_002:
.byte PAN , c_v+16
.byte N01 , Gs5 , v056
.byte W01
.byte Gn5
.byte Gn5
.byte W01
.byte Cn5
.byte Cn5
.byte W01
.byte N20 , Cn6 , v064
.byte W21
@ -76,31 +76,31 @@ se_m_moonlight_1_003:
.byte PAN , c_v-16
.byte N01 , Gs5 , v040
.byte W01
.byte Gn5
.byte Gn5
.byte W01
.byte Cn5
.byte Cn5
.byte W01
.byte N20 , Cn6
.byte N20 , Cn6
.byte W21
.byte PEND
se_m_moonlight_1_004:
.byte PAN , c_v+32
.byte N01 , Gs5 , v020
.byte W01
.byte Gn5
.byte Gn5
.byte W01
.byte Cn5
.byte Cn5
.byte W01
.byte PAN , c_v-32
.byte N20 , Cn6
.byte N20 , Cn6
.byte W21
.byte PEND
.byte PAN , c_v+0
.byte N01 , Ds6 , v092
.byte W01
.byte Dn6
.byte Dn6
.byte W01
.byte Gn5
.byte Gn5
.byte W01
.byte N20 , Gn6 , v100
.byte W21
@ -127,11 +127,11 @@ se_m_moonlight_2:
.byte W10
.byte N01 , Ds6 , v112
.byte W02
.byte Dn6
.byte Dn6
.byte W01
.byte Gn5
.byte Gn5
.byte W01
.byte N04 , Gn6
.byte N04 , Gn6
.byte W05
.byte Gn6 , v096
.byte W05
@ -154,11 +154,11 @@ se_m_moonlight_2_001:
.byte W10
.byte N01 , Gs5 , v112
.byte W02
.byte Gn5
.byte Gn5
.byte W01
.byte Cn5
.byte Cn5
.byte W01
.byte N04 , Cn6
.byte N04 , Cn6
.byte W05
.byte Cn6 , v096
.byte W05
@ -183,11 +183,11 @@ se_m_moonlight_2_002:
.byte W10
.byte N01 , Ds6 , v112
.byte W02
.byte Dn6
.byte Dn6
.byte W01
.byte Gn5
.byte Gn5
.byte W01
.byte N04 , Gn6
.byte N04 , Gn6
.byte W05
.byte Gn6 , v096
.byte W05

2
sound/songs/se_m_morning_sun.s
View File

@ -82,7 +82,7 @@ se_m_morning_sun_2:
.byte N06 , Gs6 , v108
.byte W03
.byte W03
.byte Bn5
.byte Bn5
.byte W03
.byte W03
.byte Gs6 , v100

34
sound/songs/se_m_nightmare.s
View File

@ -37,10 +37,10 @@ se_m_nightmare_1:
.byte N03 , Fs3 , v088
.byte W06
.byte PAN , c_v+0
.byte N03 , Ds3
.byte N03 , Ds3
.byte W06
.byte PAN , c_v-16
.byte N03
.byte N03
.byte W09
.byte PAN , c_v-1
.byte N03 , An2 , v096
@ -56,10 +56,10 @@ se_m_nightmare_1:
.byte W03
.byte W03
.byte PAN , c_v-1
.byte N03 , Fn3
.byte N03 , Fn3
.byte W06
.byte PAN , c_v+16
.byte N03
.byte N03
.byte W15
.byte FINE
@ -77,55 +77,55 @@ se_m_nightmare_2:
.byte W06
.byte PAN , c_v+6
.byte BEND , c_v+36
.byte N03
.byte N03
.byte W06
.byte PAN , c_v-7
.byte BEND , c_v+17
.byte N03
.byte N03
.byte W06
.byte PAN , c_v+6
.byte BEND , c_v+2
.byte N03
.byte N03
.byte W06
.byte PAN , c_v-7
.byte BEND , c_v-8
.byte N03
.byte N03
.byte W06
.byte PAN , c_v+6
.byte BEND , c_v+12
.byte N03
.byte N03
.byte W06
.byte PAN , c_v-7
.byte BEND , c_v+6
.byte N03
.byte N03
.byte W06
.byte PAN , c_v+6
.byte BEND , c_v+0
.byte N03
.byte N03
.byte W06
.byte PAN , c_v-7
.byte BEND , c_v-6
.byte N03
.byte N03
.byte W06
.byte PAN , c_v+6
.byte BEND , c_v-19
.byte N03
.byte N03
.byte W06
.byte PAN , c_v-7
.byte BEND , c_v-31
.byte N03
.byte N03
.byte W06
.byte PAN , c_v+6
.byte BEND , c_v-44
.byte N03
.byte N03
.byte W06
.byte PAN , c_v-7
.byte BEND , c_v-55
.byte N03
.byte N03
.byte W06
.byte PAN , c_v+6
.byte BEND , c_v-64
.byte N03
.byte N03
.byte W18
.byte FINE

8
sound/songs/se_m_petal_dance.s
View File

@ -33,7 +33,7 @@ se_m_petal_dance_1:
.byte Dn6 , v100
.byte W03
.byte W03
.byte An5
.byte An5
.byte W03
.byte W03
.byte PAN , c_v-4
@ -61,7 +61,7 @@ se_m_petal_dance_1:
.byte W03
.byte W03
.byte PAN , c_v+4
.byte N06 , Dn6
.byte N06 , Dn6
.byte W03
.byte W03
.byte PAN , c_v+0
@ -137,7 +137,7 @@ se_m_petal_dance_2:
.byte Bn5 , v088
.byte W03
.byte W03
.byte En6
.byte En6
.byte W03
.byte W03
.byte Bn5 , v084
@ -158,7 +158,7 @@ se_m_petal_dance_2:
.byte En6 , v064
.byte W03
.byte W03
.byte Bn5
.byte Bn5
.byte W03
.byte W03
.byte En6 , v060

2
sound/songs/se_m_rain_dance.s
View File

@ -97,7 +97,7 @@ se_m_rain_dance_1:
.byte 1*se_m_rain_dance_mvl/mxv
.byte PAN , c_v+4
.byte W06
.byte EOT
.byte EOT
.byte FINE
@******************************************************@

22
sound/songs/se_m_reversal.s
View File

@ -232,35 +232,35 @@ se_m_reversal_2:
.byte W02
.byte W01
.byte c_v+31
.byte N03 , Cs5
.byte N03 , Cs5
.byte W01
.byte BEND , c_v+0
.byte W01
.byte c_v-33
.byte W03
.byte c_v+31
.byte N03 , Dn5
.byte N03 , Dn5
.byte W01
.byte BEND , c_v+0
.byte W01
.byte c_v-33
.byte W02
.byte c_v+31
.byte N03 , Ds5
.byte N03 , Ds5
.byte W02
.byte BEND , c_v+0
.byte W01
.byte c_v-33
.byte W02
.byte c_v+31
.byte N03 , En5
.byte N03 , En5
.byte W01
.byte BEND , c_v+0
.byte W02
.byte c_v-33
.byte W02
.byte c_v+31
.byte N03 , Fn5
.byte N03 , Fn5
.byte W01
.byte BEND , c_v+0
.byte W01
@ -268,35 +268,35 @@ se_m_reversal_2:
.byte W02
.byte W01
.byte c_v+31
.byte N03 , Fs5
.byte N03 , Fs5
.byte W01
.byte BEND , c_v+0
.byte W01
.byte c_v-33
.byte W03
.byte c_v+31
.byte N03 , Gn5
.byte N03 , Gn5
.byte W01
.byte BEND , c_v+0
.byte W01
.byte c_v-33
.byte W02
.byte c_v+31
.byte N03 , Gs5
.byte N03 , Gs5
.byte W02
.byte BEND , c_v+0
.byte W01
.byte c_v-33
.byte W02
.byte c_v+31
.byte N03 , An5
.byte N03 , An5
.byte W01
.byte BEND , c_v+0
.byte W02
.byte c_v-33
.byte W02
.byte c_v+31
.byte N03 , As5
.byte N03 , As5
.byte W01
.byte BEND , c_v+0
.byte W01
@ -304,7 +304,7 @@ se_m_reversal_2:
.byte W02
.byte W01
.byte c_v+31
.byte N03 , Bn5
.byte N03 , Bn5
.byte W01
.byte BEND , c_v+0
.byte W01

6
sound/songs/se_m_sacred_fire.s
View File

@ -27,7 +27,7 @@ se_m_sacred_fire_1:
.byte W03
.byte PAN , c_v+0
.byte W01
.byte N18 , Gn4
.byte N18 , Gn4
.byte W02
.byte PAN , c_v-5
.byte W01
@ -70,9 +70,9 @@ se_m_sacred_fire_2:
.byte VOL , 110*se_m_sacred_fire_mvl/mxv
.byte N01 , Gn2 , v032
.byte W02
.byte N01
.byte N01
.byte W02
.byte N18
.byte N18
.byte W03
.byte VOL , 98*se_m_sacred_fire_mvl/mxv
.byte W03

14
sound/songs/se_m_sand_tomb.s
View File

@ -126,45 +126,45 @@ se_m_sand_tomb_2:
.byte W03
.byte En3 , v080
.byte W04
.byte Dn3
.byte Dn3
.byte W03
.byte Cn3 , v100
.byte W04
.byte En3 , v080
.byte W04
.byte Dn3
.byte Dn3
.byte W03
.byte Cn3 , v100
.byte W03
.byte W01
.byte En3 , v080
.byte W03
.byte Dn3
.byte Dn3
.byte W04
.byte Cn3 , v100
.byte W04
.byte En3 , v080
.byte W03
.byte Dn3
.byte Dn3
.byte W04
.byte Cn3 , v100
.byte W03
.byte En3 , v080
.byte W02
.byte W02
.byte Dn3
.byte Dn3
.byte W04
.byte Cn3 , v100
.byte W03
.byte En3 , v080
.byte W04
.byte Dn3
.byte Dn3
.byte W03
.byte Cn3 , v100
.byte W04
.byte En3 , v080
.byte W04
.byte Dn3
.byte Dn3
.byte W03
.byte Cn3 , v092
.byte W04

20
sound/songs/se_m_sandstorm.s
View File

@ -161,7 +161,7 @@ se_m_sandstorm_1:
.byte 13*se_m_sandstorm_mvl/mxv
.byte BEND , c_v-6
.byte W03
.byte EOT
.byte EOT
.byte FINE
@********************** Track 2 **********************@
@ -175,13 +175,13 @@ se_m_sandstorm_2:
.byte W03
.byte En3 , v080
.byte W04
.byte Dn3
.byte Dn3
.byte W03
.byte Cn3 , v100
.byte W04
.byte En3 , v080
.byte W04
.byte Dn3
.byte Dn3
.byte W03
.byte Cn3 , v100
.byte W03
@ -189,13 +189,13 @@ se_m_sandstorm_2_000:
.byte W01
.byte N03 , En3 , v080
.byte W03
.byte Dn3
.byte Dn3
.byte W04
.byte Cn3 , v100
.byte W04
.byte En3 , v080
.byte W03
.byte Dn3
.byte Dn3
.byte W04
.byte Cn3 , v100
.byte W03
@ -203,13 +203,13 @@ se_m_sandstorm_2_000:
.byte W02
.byte PEND
.byte W02
.byte Dn3
.byte Dn3
.byte W04
.byte Cn3 , v100
.byte W03
.byte En3 , v080
.byte W04
.byte Dn3
.byte Dn3
.byte W03
.byte Cn3 , v100
.byte W04
@ -219,13 +219,13 @@ se_m_sandstorm_2_000:
.byte W03
.byte En3 , v080
.byte W04
.byte Dn3
.byte Dn3
.byte W03
.byte Cn3 , v100
.byte W04
.byte En3 , v080
.byte W04
.byte Dn3
.byte Dn3
.byte W03
.byte Cn3 , v100
.byte W03
@ -254,7 +254,7 @@ se_m_sandstorm_2_000:
.byte W04
.byte En3 , v032
.byte W04
.byte Dn3
.byte Dn3
.byte W03
.byte Cn3 , v048
.byte W03

4
sound/songs/se_m_self_destruct.s
View File

@ -25,9 +25,9 @@ se_m_self_destruct_1:
.byte BEND , c_v+0
.byte N01 , Gn3 , v127
.byte W01
.byte Cn3
.byte Cn3
.byte W01
.byte N24 , An3
.byte N24 , An3
.byte W06
.byte PAN , c_v+6
.byte W04

4
sound/songs/se_m_sing.s
View File

@ -46,7 +46,7 @@ se_m_sing_1:
.byte MOD , 0
.byte W03
.byte VOL , 95*se_m_sing_mvl/mxv
.byte N21 , Fn5
.byte N21 , Fn5
.byte W06
.byte W06
se_m_sing_1_000:
@ -128,7 +128,7 @@ se_m_sing_2:
.byte W03
.byte VOL , 95*se_m_sing_mvl/mxv
.byte PAN , c_v-12
.byte N21 , Fn5
.byte N21 , Fn5
.byte W06
.byte W06
se_m_sing_2_000:

4
sound/songs/se_m_sketch.s
View File

@ -31,7 +31,7 @@ se_m_sketch_1:
.byte VOICE , 31
.byte VOL , 40*se_m_sketch_mvl/mxv
.byte BEND , c_v-1
.byte N03 , Cs5
.byte N03 , Cs5
.byte W01
.byte VOL , 64*se_m_sketch_mvl/mxv
.byte PAN , c_v-6
@ -44,7 +44,7 @@ se_m_sketch_1:
.byte VOL , 110*se_m_sketch_mvl/mxv
.byte PAN , c_v+0
.byte BEND , c_v+0
.byte N02 , As5
.byte N02 , As5
.byte W01
.byte BEND , c_v+12
.byte W01

6
sound/songs/se_m_sky_uppercut.s
View File

@ -29,7 +29,7 @@ se_m_sky_uppercut_1:
.byte W03
.byte 93*se_m_sky_uppercut_mvl/mxv
.byte PAN , c_v-6
.byte N02 , Cn5
.byte N02 , Cn5
.byte W03
.byte VOL , 110*se_m_sky_uppercut_mvl/mxv
.byte W01
@ -74,9 +74,9 @@ se_m_sky_uppercut_2:
.byte VOL , 110*se_m_sky_uppercut_mvl/mxv
.byte N02 , Cn3 , v060
.byte W03
.byte Gn2
.byte Gn2
.byte W03
.byte Gs4
.byte Gs4
.byte W04
.byte Gs4 , v020
.byte W02

18
sound/songs/se_m_snore.s
View File

@ -63,28 +63,28 @@ se_m_snore_2:
.byte VOICE , 27
.byte N01 , En2 , v052
.byte W02
.byte Dn2
.byte Dn2
.byte W02
.byte En2
.byte En2
.byte W02
.byte W01
.byte Dn2
.byte Dn2
.byte W02
.byte En2
.byte En2
.byte W03
.byte W01
.byte En2 , v064
.byte W02
.byte Gs2
.byte Gs2
.byte W03
.byte Dn3
.byte Dn3
.byte W02
.byte En2
.byte En2
.byte W02
.byte Gs2
.byte Gs2
.byte W02
.byte W01
.byte Dn3
.byte Dn3
.byte W05
.byte FINE

2
sound/songs/se_m_solar_beam.s
View File

@ -145,7 +145,7 @@ se_m_solar_beam_1:
.byte W02
.byte VOL , 5*se_m_solar_beam_mvl/mxv
.byte W04
.byte EOT
.byte EOT
.byte FINE
@******************************************************@

4
sound/songs/se_m_spit_up.s
View File

@ -34,7 +34,7 @@ se_m_spit_up_1:
.byte W01
.byte PAN , c_v+0
.byte BEND , c_v+0
.byte N03 , Gn4
.byte N03 , Gn4
.byte W02
.byte PAN , c_v-7
.byte BEND , c_v+15
@ -63,7 +63,7 @@ se_m_spit_up_2:
.byte N03 , En3 , v052
.byte W03
.byte W01
.byte N03
.byte N03
.byte W02
.byte W03
.byte En3 , v032

82
sound/songs/se_m_stat_decrease.s
View File

@ -30,13 +30,13 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v+6
.byte BEND , c_v+16
.byte N02 , Cs5
.byte N02 , Cs5
.byte W01
.byte BEND , c_v+12
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+8
.byte N02 , Fs5
.byte N02 , Fs5
.byte W01
.byte BEND , c_v+5
.byte W01
@ -44,11 +44,11 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v-6
.byte BEND , c_v+0
.byte N02 , Fs4
.byte N02 , Fs4
.byte W03
.byte PAN , c_v+0
.byte BEND , c_v+42
.byte N02 , Cn6
.byte N02 , Cn6
.byte W01
.byte BEND , c_v+31
.byte W01
@ -56,13 +56,13 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v+6
.byte BEND , c_v+16
.byte N02 , Cn5
.byte N02 , Cn5
.byte W01
.byte BEND , c_v+12
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+8
.byte N02 , Fn5
.byte N02 , Fn5
.byte W01
.byte BEND , c_v+5
.byte W01
@ -70,11 +70,11 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v-6
.byte BEND , c_v+0
.byte N02 , Fn4
.byte N02 , Fn4
.byte W03
.byte PAN , c_v+0
.byte BEND , c_v+42
.byte N02 , Bn5
.byte N02 , Bn5
.byte W01
.byte BEND , c_v+31
.byte W01
@ -82,13 +82,13 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v+6
.byte BEND , c_v+16
.byte N02 , Bn4
.byte N02 , Bn4
.byte W01
.byte BEND , c_v+12
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+8
.byte N02 , En5
.byte N02 , En5
.byte W01
.byte BEND , c_v+5
.byte W01
@ -96,11 +96,11 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v-6
.byte BEND , c_v+0
.byte N02 , En4
.byte N02 , En4
.byte W03
.byte PAN , c_v+0
.byte BEND , c_v+42
.byte N02 , As5
.byte N02 , As5
.byte W01
.byte BEND , c_v+31
.byte W01
@ -108,13 +108,13 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v+6
.byte BEND , c_v+16
.byte N02 , As4
.byte N02 , As4
.byte W01
.byte BEND , c_v+12
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+8
.byte N02 , Ds5
.byte N02 , Ds5
.byte W01
.byte BEND , c_v+5
.byte W01
@ -122,11 +122,11 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v-6
.byte BEND , c_v+0
.byte N02 , Ds4
.byte N02 , Ds4
.byte W03
.byte PAN , c_v+0
.byte BEND , c_v+42
.byte N02 , An5
.byte N02 , An5
.byte W01
.byte BEND , c_v+31
.byte W01
@ -134,7 +134,7 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v+6
.byte BEND , c_v+16
.byte N02 , An4
.byte N02 , An4
.byte W01
.byte BEND , c_v+12
.byte W02
@ -148,11 +148,11 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v-12
.byte BEND , c_v+0
.byte N02 , Cs4
.byte N02 , Cs4
.byte W03
.byte PAN , c_v+0
.byte BEND , c_v+42
.byte N02 , An5
.byte N02 , An5
.byte W01
.byte BEND , c_v+31
.byte W01
@ -160,7 +160,7 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v+12
.byte BEND , c_v+16
.byte N02 , An4
.byte N02 , An4
.byte W01
.byte BEND , c_v+12
.byte W02
@ -174,11 +174,11 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v-16
.byte BEND , c_v+0
.byte N02 , Cs4
.byte N02 , Cs4
.byte W03
.byte PAN , c_v+0
.byte BEND , c_v+42
.byte N02 , An5
.byte N02 , An5
.byte W01
.byte BEND , c_v+31
.byte W01
@ -186,7 +186,7 @@ se_m_stat_decrease_1:
.byte W01
.byte PAN , c_v+16
.byte BEND , c_v+16
.byte N02 , An4
.byte N02 , An4
.byte W01
.byte BEND , c_v+12
.byte W02
@ -202,55 +202,55 @@ se_m_stat_decrease_2:
.byte VOL , 70*se_m_stat_decrease_mvl/mxv
.byte N02 , As3 , v052
.byte W03
.byte N02
.byte N02
.byte W03
.byte W01
.byte An3
.byte An3
.byte W03
.byte N02
.byte N02
.byte W02
.byte W02
.byte Gs3
.byte Gs3
.byte W04
.byte N02
.byte N02
.byte W03
.byte Gn3
.byte Gn3
.byte W03
.byte W01
.byte N02
.byte N02
.byte W03
.byte Fs3
.byte Fs3
.byte W02
.byte W02
.byte N02
.byte N02
.byte W04
.byte Fn3
.byte Fn3
.byte W03
.byte N02
.byte N02
.byte W03
.byte W01
.byte En3
.byte En3
.byte W03
.byte N02
.byte N02
.byte W02
.byte W02
.byte Ds3
.byte Ds3
.byte W04
.byte Ds3 , v032
.byte W03
.byte Dn3
.byte Dn3
.byte W03
.byte W01
.byte N02
.byte N02
.byte W03
.byte Cs3 , v020
.byte W02
.byte W02
.byte N02
.byte N02
.byte W04
.byte Cn3 , v012
.byte W03
.byte N02
.byte N02
.byte W03
.byte FINE

82
sound/songs/se_m_stat_increase.s
View File

@ -30,13 +30,13 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v+6
.byte BEND , c_v+5
.byte N02 , An4
.byte N02 , An4
.byte W01
.byte BEND , c_v+8
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+12
.byte N02 , Dn5
.byte N02 , Dn5
.byte W01
.byte BEND , c_v+16
.byte W01
@ -44,13 +44,13 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v-6
.byte BEND , c_v+32
.byte N02 , Dn4
.byte N02 , Dn4
.byte W01
.byte BEND , c_v+42
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+0
.byte N02 , As5
.byte N02 , As5
.byte W01
.byte BEND , c_v+0
.byte W01
@ -58,13 +58,13 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v+6
.byte BEND , c_v+5
.byte N02 , As4
.byte N02 , As4
.byte W01
.byte BEND , c_v+8
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+12
.byte N02 , Ds5
.byte N02 , Ds5
.byte W01
.byte BEND , c_v+16
.byte W01
@ -72,13 +72,13 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v-6
.byte BEND , c_v+32
.byte N02 , Ds4
.byte N02 , Ds4
.byte W01
.byte BEND , c_v+42
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+0
.byte N02 , Bn5
.byte N02 , Bn5
.byte W01
.byte BEND , c_v+0
.byte W01
@ -86,13 +86,13 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v+6
.byte BEND , c_v+5
.byte N02 , Bn4
.byte N02 , Bn4
.byte W01
.byte BEND , c_v+8
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+12
.byte N02 , En5
.byte N02 , En5
.byte W01
.byte BEND , c_v+16
.byte W01
@ -100,13 +100,13 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v-6
.byte BEND , c_v+32
.byte N02 , En4
.byte N02 , En4
.byte W01
.byte BEND , c_v+42
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+0
.byte N02 , Cn6
.byte N02 , Cn6
.byte W01
.byte BEND , c_v+0
.byte W01
@ -114,13 +114,13 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v+6
.byte BEND , c_v+5
.byte N02 , Cn5
.byte N02 , Cn5
.byte W01
.byte BEND , c_v+8
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+12
.byte N02 , Fn5
.byte N02 , Fn5
.byte W01
.byte BEND , c_v+16
.byte W01
@ -128,13 +128,13 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v-6
.byte BEND , c_v+32
.byte N02 , Fn4
.byte N02 , Fn4
.byte W01
.byte BEND , c_v+42
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+0
.byte N02 , Cs6
.byte N02 , Cs6
.byte W01
.byte BEND , c_v+0
.byte W01
@ -142,7 +142,7 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v+6
.byte BEND , c_v+5
.byte N02 , Cs5
.byte N02 , Cs5
.byte W01
.byte BEND , c_v+8
.byte W02
@ -156,13 +156,13 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v-12
.byte BEND , c_v+32
.byte N02 , Fn4
.byte N02 , Fn4
.byte W01
.byte BEND , c_v+42
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+0
.byte N02 , Cs6
.byte N02 , Cs6
.byte W01
.byte BEND , c_v+0
.byte W01
@ -170,7 +170,7 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v+12
.byte BEND , c_v+5
.byte N02 , Cs5
.byte N02 , Cs5
.byte W01
.byte BEND , c_v+8
.byte W02
@ -184,13 +184,13 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v-16
.byte BEND , c_v+32
.byte N02 , Fn4
.byte N02 , Fn4
.byte W01
.byte BEND , c_v+42
.byte W02
.byte PAN , c_v+0
.byte BEND , c_v+0
.byte N02 , Cs6
.byte N02 , Cs6
.byte W01
.byte BEND , c_v+0
.byte W01
@ -198,7 +198,7 @@ se_m_stat_increase_1:
.byte W01
.byte PAN , c_v+16
.byte BEND , c_v+5
.byte N02 , Cs5
.byte N02 , Cs5
.byte W01
.byte BEND , c_v+8
.byte W02
@ -214,55 +214,55 @@ se_m_stat_increase_2:
.byte VOL , 70*se_m_stat_increase_mvl/mxv
.byte N02 , Cn3 , v052
.byte W03
.byte N02
.byte N02
.byte W03
.byte W01
.byte Cs3
.byte Cs3
.byte W03
.byte N02
.byte N02
.byte W02
.byte W02
.byte Dn3
.byte Dn3
.byte W04
.byte N02
.byte N02
.byte W03
.byte Ds3
.byte Ds3
.byte W03
.byte W01
.byte N02
.byte N02
.byte W03
.byte En3
.byte En3
.byte W02
.byte W02
.byte N02
.byte N02
.byte W04
.byte Fn3
.byte Fn3
.byte W03
.byte N02
.byte N02
.byte W03
.byte W01
.byte Fs3
.byte Fs3
.byte W03
.byte N02
.byte N02
.byte W02
.byte W02
.byte Gn3
.byte Gn3
.byte W04
.byte Gn3 , v032
.byte W03
.byte Gs3
.byte Gs3
.byte W03
.byte W01
.byte N02
.byte N02
.byte W03
.byte An3 , v020
.byte W02
.byte W02
.byte N02
.byte N02
.byte W04
.byte As3 , v012
.byte W03
.byte N02
.byte N02
.byte W03
.byte FINE

4
sound/songs/se_m_strength.s
View File

@ -51,9 +51,9 @@ se_m_strength_2:
.byte VOL , 110*se_m_strength_mvl/mxv
.byte N02 , Fn2 , v072
.byte W02
.byte N01
.byte N01
.byte W01
.byte N02 , Gn2
.byte N02 , Gn2
.byte W03
.byte N01 , Gs2 , v060
.byte W01

12
sound/songs/se_m_string_shot2.s
View File

@ -32,7 +32,7 @@ se_m_string_shot2_1:
.byte c_v+8
.byte W01
.byte PAN , c_v+16
.byte N09 , Gn4
.byte N09 , Gn4
.byte W03
.byte BEND , c_v-8
.byte W03
@ -40,7 +40,7 @@ se_m_string_shot2_1:
.byte W06
.byte PAN , c_v+0
.byte BEND , c_v-11
.byte N09 , En4
.byte N09 , En4
.byte W03
.byte BEND , c_v-5
.byte W03
@ -49,7 +49,7 @@ se_m_string_shot2_1:
.byte c_v-3
.byte W01
.byte PAN , c_v-16
.byte N09 , Gn4
.byte N09 , Gn4
.byte W03
.byte BEND , c_v-19
.byte W03
@ -57,7 +57,7 @@ se_m_string_shot2_1:
.byte W06
.byte PAN , c_v+0
.byte BEND , c_v-19
.byte N09 , En4
.byte N09 , En4
.byte W03
.byte BEND , c_v-13
.byte W03
@ -101,14 +101,14 @@ se_m_string_shot2_2:
.byte N09 , Cn3 , v052
.byte W12
.byte PAN , c_v-7
.byte N09 , Gn2
.byte N09 , Gn2
.byte W12
se_m_string_shot2_2_000:
.byte PAN , c_v+9
.byte N09 , Cn3 , v052
.byte W12
.byte PAN , c_v-6
.byte N09 , Gn2
.byte N09 , Gn2
.byte W12
.byte PEND
.byte PATT

Some files were not shown because too many files have changed in this diff Show More