diff options
author | entrpntr <entrpntr@gmail.com> | 2020-04-06 14:28:33 -0400 |
---|---|---|
committer | entrpntr <entrpntr@gmail.com> | 2020-04-06 14:48:14 -0400 |
commit | 07a5cc60d0c3e37699ad5e45366cb9b093d6b7e7 (patch) | |
tree | d24dd2f6ac9f79f3247415d136b290a17766df3a /engine | |
parent | d46fcef6bc2c8054f873d238e020d43b6f1774f2 (diff) |
Add unnamed.py and update for rgbds v0.4.x before continuing.
Diffstat (limited to 'engine')
-rwxr-xr-x | engine/events/overworld.asm | 6 | ||||
-rwxr-xr-x | engine/items/item_effects.asm | 14 | ||||
-rwxr-xr-x | engine/items/items.asm | 6 | ||||
-rwxr-xr-x | engine/items/pack.asm | 12 | ||||
-rw-r--r-- | engine/menus/intro_menu.asm | 2 | ||||
-rw-r--r-- | engine/menus/naming_screen.asm | 8 | ||||
-rwxr-xr-x | engine/movement_pattern.asm | 2 | ||||
-rwxr-xr-x | engine/overworld/map_object_action.asm | 2 | ||||
-rwxr-xr-x | engine/overworld/map_objects.asm | 12 | ||||
-rwxr-xr-x | engine/overworld/movement.asm | 8 | ||||
-rwxr-xr-x | engine/overworld/npc_movement.asm | 4 | ||||
-rwxr-xr-x | engine/overworld/player_object.asm | 4 | ||||
-rwxr-xr-x | engine/overworld/time.asm | 8 | ||||
-rw-r--r-- | engine/pokemon/bills_pc_top.asm | 2 |
14 files changed, 45 insertions, 45 deletions
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 2ec6d857..086587b2 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -721,7 +721,7 @@ EscapeRopeFunction: DigFunction: call FieldMoveBufferReset ld a, $2 -asm_cbaa +asm_cbaa: ld [wBuffer2], a .asm_cbad ld hl, .Jumptable @@ -943,11 +943,11 @@ Text_AlreadyUsingStrength: text_far Text_AlreadyUsingStrength_ db "@" -asm_cd09 +asm_cd09: ld a, $80 ret -asm_cd0c +asm_cd0c: ld hl, Script_StrengthFromMenu call QueueScript ld a, $81 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index e270734d..cb441179 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1509,7 +1509,7 @@ Energypowder: ; f1e2 (3:71e2) EnergyRoot: ; f1e6 (3:71e6) ld c, $10 -asm_f1e8 +asm_f1e8: push bc call Functionf1ff pop bc @@ -1671,7 +1671,7 @@ Functionf310: ; f310 (3:7310) Functionf319: ; f319 (3:7319) call GetCurHPAnimMaxHP -asm_f31c +asm_f31c: ld a, MON_HP call GetPartyParamLocation ld [hl], d @@ -1950,7 +1950,7 @@ MaxRepel: ; f4bc (3:74bc) Repel: ; f4c0 (3:74c0) ld b, 100 -asm_f4c2 +asm_f4c2: ld a, [wRepelSteps] and a ld hl, Text_RepelsEffectsStillLinger @@ -2226,11 +2226,11 @@ PPUp: ; f606 (3:7606) call Functionf7c7 ld hl, Text_PPsIncreased ; $777b call PrintText -asm_f693 +asm_f693: call ClearPalettes jp Functionf7dc -asm_f699 +asm_f699: ld a, [wBattleMode] and a jr z, .asm_f6b3 @@ -2412,7 +2412,7 @@ NormalBox: ; f7aa (3:77aa) GorgeousBox: ; f7ae (3:77ae) ld c, DECOFLAG_GOLD_TROPHY_DOLL -asm_f7b0 +asm_f7b0: farcall ReceiveDecorationC ; 9:70d5 ld hl, Text_TrophyInside ; $77bf call PrintText @@ -2591,7 +2591,7 @@ Functionf843: Functionf848: ld hl, Text_CantGetOnYourItemNow -asm_f84b +asm_f84b: xor a ld [wFieldMoveSucceeded], a jp PrintText diff --git a/engine/items/items.asm b/engine/items/items.asm index 428f652e..7cd1de67 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -76,7 +76,7 @@ RemoveKeyItem: RemoveNormalItem: ld h, d ld l, e -remove_item_from_bag_or_pc +remove_item_from_bag_or_pc: jp RemoveItemAndQuantity _CheckItem:: ; d251 (3:5251) @@ -117,7 +117,7 @@ CheckKeyItem: CheckNormalItem: ld h, d ld l, e -check_item_in_bag_or_pc +check_item_in_bag_or_pc: jp CheckItemWithQuantity CheckBagOrPC: ; d288 (3:5288) @@ -531,7 +531,7 @@ GetItemAttr: ; d46d (3:546d) pop hl ret -ItemAttr_ReturnCarry +ItemAttr_ReturnCarry: ld a, $1 ld [wItemAttributeParamBuffer], a scf diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 1f2d533d..8edd2555 100755 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -866,23 +866,23 @@ Function10a86: call Function10e5b ret -asm_10a9c +asm_10a9c: call ClearBGPalettes jr asm_10aae -Function10aa1 +Function10aa1: call DoItemEffect ld a, [wFieldMoveSucceeded] and a jr z, Function10a75 cp $2 jr z, asm_10ab4 -asm_10aae +asm_10aae: ld a, $a ld [wce63], a ret -asm_10ab4 +asm_10ab4: xor a ld [wFieldMoveSucceeded], a ret @@ -918,7 +918,7 @@ DepositSellInitPackBuffers: ; 10ad5 (4:4ad5) call Function10e5b ret -DepositSellPack +DepositSellPack: .loop call Function10af7 call Function10b9f @@ -1152,7 +1152,7 @@ TutorialBallsMenuDataHeader: dba PlaceMenuItemQuantity dba UpdateItemDescription -asm_10c8a +asm_10c8a: push hl call Function10b92 pop hl diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 40feb4ad..b9d0d316 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -979,7 +979,7 @@ MovePlayerPicRight: ; 617e (1:617e) MovePlayerPicLeft: ; 6186 (1:6186) hlcoord 13, 4 ld de, -1 -MovePlayerPic +MovePlayerPic: ld c, $8 .asm_618e push bc diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 2101cf84..d5b35a8e 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -208,7 +208,7 @@ Function11c48: ; 11c48 (4:5c48) hlcoord 5, 4 jr asm_11c4f -asm_11c4f +asm_11c4f: ld [wc5d3], a ld a, l ld [wc5d8], a @@ -648,10 +648,10 @@ Function11ee4: ; 11ee4 (4:5ee4) cp c ret nc ld a, [wc5d7] -asm_11ef0 +asm_11ef0: call Function11f9d ld [hl], a -asm_11ef4 +asm_11ef4: ld hl, wc5d2 inc [hl] call Function11f9d @@ -666,7 +666,7 @@ asm_11ef4 scf ret -asm_11f06 +asm_11f06: ld a, [wc5d2] and a ret z diff --git a/engine/movement_pattern.asm b/engine/movement_pattern.asm index 1909f480..29d09229 100755 --- a/engine/movement_pattern.asm +++ b/engine/movement_pattern.asm @@ -635,7 +635,7 @@ Function4aff: ; 4aff (1:4aff) call Random ldh a, [hRandomAdd] and $1f -asm_4b06 +asm_4b06: ld hl, $a add hl, bc ld [hl], a diff --git a/engine/overworld/map_object_action.asm b/engine/overworld/map_object_action.asm index 553243c4..f895fe15 100755 --- a/engine/overworld/map_object_action.asm +++ b/engine/overworld/map_object_action.asm @@ -30,7 +30,7 @@ Pointers4460: dw Function45b3, Function44a0 dw Function45c6, Function44a0 -Function44a0 +Function44a0: ld hl, $d add hl, bc ld [hl], $ff diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 392cb86e..87f422d5 100755 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -152,18 +152,18 @@ Function437c: bit 5, [hl] jr nz, asm_4449 ld de, Pointers4460 - jr asm_444e + jr _HandleObjectAction Function4441: ld hl, $4 add hl, bc bit 0, [hl] jr nz, Function44a0 -asm_4449 +asm_4449: ld de, Pointers4460 + 2 - jr asm_444e + jr _HandleObjectAction -asm_444e +_HandleObjectAction: INCLUDE "engine/overworld/map_object_action.asm" CopyNextCoordsTileToStandingCoordsTile: ; 45d9 (1:45d9) @@ -662,7 +662,7 @@ Function557f:: ; 557f (1:557f) jr nz, .asm_5589 ret -Function55a1 +Function55a1: call Function55d8 ld a, $0 call Function55bc @@ -962,7 +962,7 @@ Function5761: ; 5761 (1:5761) Function5770: ; 5770 (1:5770) ld a, $0 -asm_5772 +asm_5772: ld bc, wObjectStructs call SetSpriteDirection ret diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index d98b47ee..39f99480 100755 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -35,7 +35,7 @@ Function4fdf: ; 4fdf (1:4fdf) ld hl, GetMovementPerson jp Function4fe9 -GetMovementPerson +GetMovementPerson: ld a, [wMovementObject] ret @@ -358,7 +358,7 @@ Function51e1: ; 51e1 (1:51e1) call Function5006 jr asm_51e6 -asm_51e6 +asm_51e6: ld hl, $a add hl, bc ld [hl], a @@ -470,7 +470,7 @@ Function5289: ; 5289 (1:5289) ld a, $c jr asm_528d -asm_528d +asm_528d: ld hl, $8 add hl, bc ld [hl], a @@ -690,7 +690,7 @@ Function539b: ; 539b (1:539b) ld a, $c jr asm_539f -asm_539f +asm_539f: ld hl, $1d add hl, bc ld [hl], a diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 84235570..38fe15d0 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -84,7 +84,7 @@ Function700b: ; 700b (1:700b) scf ret -Function701d +Function701d: ld hl, $e add hl, bc ld a, [hl] @@ -437,7 +437,7 @@ IsPersonMovingOffEdgeOfScreen: ; 71cc (1:71cc) scf ret -Function71f2 +Function71f2: ld a, [wPlayerStandingMapX] ld d, a ld a, [wPlayerStandingMapY] diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 26dbe9fd..5cde13e7 100755 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -282,7 +282,7 @@ Function87ce: Function87d5: ld a, [wYCoord] add $9 -asm_87da +asm_87da: ld d, a ld a, [wXCoord] ld e, a @@ -337,7 +337,7 @@ Function8822: Function8829: ld a, [wXCoord] add $a -asm_882e +asm_882e: ld e, a ld a, [wYCoord] ld d, a diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index 01273a75..9cce323c 100755 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm @@ -78,7 +78,7 @@ Function11857: ; 11857 (4:5857) call Function11972 ret -asm_11867 +asm_11867: ld hl, wDailyResetTimer jp Function1182e @@ -282,7 +282,7 @@ Function119b4: ; 119b4 (4:59b4) ld a, [wDaysSince] ret -asm_119b8 +asm_119b8: ld a, $ff ret @@ -314,7 +314,7 @@ CalcSecsMinsHoursDaysSince: ; 119c7 (4:59c7) ld [hl], c dec hl ld [wSecsSince], a -CalcMinsHoursDaysSince_ +CalcMinsHoursDaysSince_: ldh a, [hMinutes] ld c, a sbc [hl] @@ -324,7 +324,7 @@ CalcMinsHoursDaysSince_ ld [hl], c dec hl ld [wMinsSince], a -CalcHoursDaysSince_ +CalcHoursDaysSince_: ldh a, [hHours] ld c, a sbc [hl] diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 749718db..0ad87023 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -243,7 +243,7 @@ Functione566: ; e566 (3:6566) call SetPalettes ret -CopyBoxmonToTempMon +CopyBoxmonToTempMon: ld a, [wCurPartyMon] ld hl, sBoxMon1Species ld bc, $20 |