diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/color.asm | 2 | ||||
| -rwxr-xr-x | engine/main_menu.asm | 2 | ||||
| -rwxr-xr-x | engine/move_mon.asm | 8 | ||||
| -rwxr-xr-x | engine/overworld/player_object.asm | 7 | ||||
| -rwxr-xr-x | engine/specials.asm | 17 |
5 files changed, 27 insertions, 9 deletions
diff --git a/engine/color.asm b/engine/color.asm index 16e4c29d..0f73ff99 100755 --- a/engine/color.asm +++ b/engine/color.asm @@ -1469,7 +1469,7 @@ Pointers_b6ce: dw .OutdoorColors ; ROUTE dw .IndoorColors ; INDOOR dw .DungeonColors ; CAVE - dw .Perm5Colors ; PERM_5 + dw .Perm5Colors ; ENVIRONMENT_5 dw .IndoorColors ; GATE dw .DungeonColors ; DUNGEON diff --git a/engine/main_menu.asm b/engine/main_menu.asm index 2da93de6..40acea32 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -345,8 +345,6 @@ Function5c41: ; 5c41 (1:5c41) ld [wCoins], a ld [wCoins + 1], a -START_MONEY EQU 3000 - IF START_MONEY / $10000 ld a, START_MONEY / $10000 ENDC diff --git a/engine/move_mon.asm b/engine/move_mon.asm index 007f3b2a..e1ffa672 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -1534,7 +1534,7 @@ GivePoke: ; Give a Pokemon from script call GetPokemonName ld hl, wStringBuffer1 ld de, wMonOrItemNameBuffer - ld bc, PKMN_NAME_LENGTH + ld bc, MON_NAME_LENGTH call CopyBytes pop af and a @@ -1546,7 +1546,7 @@ GivePoke: ; Give a Pokemon from script push hl ld a, [wScriptBank] call GetFarHalfword - ld bc, PKMN_NAME_LENGTH + ld bc, MON_NAME_LENGTH ld a, [wScriptBank] call FarCopyBytes pop hl @@ -1582,7 +1582,7 @@ GivePoke: ; Give a Pokemon from script ld a, BANK(sBoxMonOT) call OpenSRAM ld de, sBoxMonOT - ld bc, PKMN_NAME_LENGTH + ld bc, MON_NAME_LENGTH ld a, [wScriptBank] call FarCopyBytes ld hl, sBoxMon1ID @@ -1610,7 +1610,7 @@ GivePoke: ; Give a Pokemon from script call OpenSRAM ld hl, wMonOrItemNameBuffer ld de, sBoxMonNicknames - ld bc, PKMN_NAME_LENGTH + ld bc, MON_NAME_LENGTH call CopyBytes call CloseSRAM ld b, $1 diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 45562e8e..40edd8b5 100755 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -37,7 +37,10 @@ SpawnPlayer: ; 861a (2:461a) ret .PlayerObjectTemplate - person_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, PERSONTYPE_SCRIPT, 0, 0, -1 +; A dummy map object used to initialize the player object. +; Shorter than the actual amount copied by two bytes. +; Said bytes seem to be unused. + object_event -4, -4, SPRITE_CHRIS, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1 CopyDECoordsToMapObject: ; 8653 (2:4653) push de @@ -117,7 +120,7 @@ SpawnPlayer2: ret .PlayerObjectTemplate: - person_event SPRITE_CHRIS, -4, -4, SPRITEMOVEDATA_12, 15, 15, -1, -1, 0, PERSONTYPE_SCRIPT, 0, 0, -1 + object_event -4, -4, SPRITE_CHRIS, SPRITEMOVEDATA_12, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1 CopyObjectStruct_:: ; 86d7 (2:46d7) call CheckObjectMask diff --git a/engine/specials.asm b/engine/specials.asm index 4232bb9e..2179c3af 100755 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -12,8 +12,23 @@ Special:: ; c22b rst FarCall ret +; Special routines can be used with the "special" map script command. +; They often use wScriptVar for arguments and return values. + +add_special: MACRO +; Some ROM0 specials have a nonzero bank. +\1Special:: +IF _NARG == 1 + dba \1 +ELSE + dbw \2, \1 +ENDC +ENDM + SpecialsPointers: add_special WarpToSpawnPoint + +; Communications add_special Function29b22 add_special Function29b4b add_special Function29bcc @@ -33,6 +48,8 @@ SpecialsPointers: add_special Special_CheckMysteryGift add_special Special_GetMysteryGiftItem add_special Function2a4e7 + +; Map events add_special BugContestJudging add_special Functionc7bbf add_special Function13dce |